Import binutils-2.22 tarball

Required for build-essential bootstrapping

824 files changed, 77670 insertions, 72528 deletions

diff --git a/ChangeLog b/ChangeLog
index cff1dfb1e6..e572d9582a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,105 +1,3 @@
-2012-03-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (enable_libgomp): Remove *-*-irix6*.
-	(unsupported_languages): Remove mips-sgi-irix6.*.
-	(noconfigdirs): Don't add ${libgcj} for mips*-*-irix6*.
-	(with_stabs): Remove.
-	* configure: Regenerate.
-
-2012-03-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* configure.ac (enable_libgomp): Remove *-*-osf*.
-	(with_stabs): Remove alpha*-*-osf*.
-	* configure: Regenerate.
-
-2012-03-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Modify DJ Delorie license to include
-	modification rights in clause as permitted by DJ Delorie.
-	* COPYING.LIBGLOSS: Ditto.
-
-2012-03-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Remove two unused licenses.
-
-2012-03-05  Tristan Gingold  <gingold@adacore.com>
-
-	* configure.ac: Enable gdb and readline for ia64*-*-*vms*.
-	* configure: Regenerate.
-
-2012-02-21  Joern Rennecke  <joern.rennecke@embecosm.com>
-
-	* COPYING.NEWLIB: Add Adapteva notice.
-	* COPYING.LIBGLOSS: Add Adapteva notice.
-
-2011-12-18  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* configure: Regenerate.
-
-2011-12-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.LIBGLOSS: Add GPL with exception license.
-
-2011-11-09  Roland McGrath  <mcgrathr@google.com>
-
-	* configure.ac: Add tool checks for READELF and READELF_FOR_TARGET.
-	* configure: Rebuild.
-	* Makefile.def (flags_to_pass): Add READELF_FOR_TARGET.
-	* Makefile.tpl (READELF, READELF_FOR_TARGET): New variables.
-	(HOST_EXPORTS): Add READELF, READELF_FOR_TARGET.
-	(BASE_FLAGS_TO_PASS): Add READELF_FOR_TARGET.
-	(BASE_TARGET_EXPORTS, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS):
-	Add READELF.
-	* Makefile.in: Rebuild.
-
-2011-11-08  Richard Henderson  <rth@redhat.com>
-
-	* configure.ac: Test for libitm directory present first.
-
-	* configure.ac: Adjust srcdir for running libitm/configure.tgt.
-
-	* configure.ac: Test libitm/configure.tgt to disable libitm.
-	* configure: Rebuild.
-
-2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* Makefile.tpl (EXTRA_GCC_FLAGS): Remove LIBGCC2_CFLAGS,
-	LIBGCC2_DEBUG_CFLAGS, LIBGCC2_INCLUDES.
-	* Makefile.in: Regenerate.
-
-2011-11-01  DJ Delorie  <dj@redhat.com>
-
-	* configure.ac (rl78-*-*) New case.
-	* configure: Regenerate.
-
-2011-11-01  DJ Delorie  <dj@redhat.com>
-
-	* config.sub: Update to version 2011-10-29 (added rl78)
-
-2011-10-27  Nick Clifton  <nickc@redhat.com>
-
-	* config.sub: Import these changes from the config project:
-
-	2011-10-08  Joern Rennecke <joern.rennecke@embecosm.com>
-	    Ben Elliston  <bje@gnu.org>
-
-	* config.sub (epiphany): New.
-
-	2011-09-09  Linas Vepstas  <linasvepstas@gmail.com>
-	    Ben Elliston  <bje@gnu.org>
-
-        * config.sub (hexagon, hexagon-*): New.
-
-	2011-08-23  Roland McGrath  <mcgrathr@google.com>
-
-	* config.sub: Rename 32eb to be32, 32el to le32, 64el to le64, and
-	64eb to be64.
-
-	2011-08-16  Roland McGrath  <mcgrathr@google.com>
-
-	* config.sub (32eb, 32el, 64eb, 64el): New (pseudo-)CPUs.
-	(nacl): Grok as alias for 32el-unknown-nacl.
-
 2011-08-19  Joel Brobecker  <brobecker@adacore.com>
 
 	* src-release (GDB_SUPPORT_DIRS): Add 'cpu'.
diff --git a/Makefile.def b/Makefile.def
index 9e41ff50a5..5116341d12 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -259,7 +259,6 @@ flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= NM_FOR_TARGET ; };
 flags_to_pass = { flag= OBJDUMP_FOR_TARGET ; };
 flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
-flags_to_pass = { flag= READELF_FOR_TARGET ; };
 flags_to_pass = { flag= STRIP_FOR_TARGET ; };
 flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
 flags_to_pass = { flag= WINDMC_FOR_TARGET ; };
diff --git a/Makefile.in b/Makefile.in
index 038f801243..d1206bda65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
@@ -206,7 +206,6 @@ HOST_EXPORTS = \
 	WINDMC="$(WINDMC)"; export WINDMC; \
 	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	READELF="$(READELF)"; export READELF; \
 	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
 	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
 	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
@@ -214,7 +213,6 @@ HOST_EXPORTS = \
 	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
 	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
-	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
@@ -287,7 +285,6 @@ BASE_TARGET_EXPORTS = \
 	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
 	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	READELF="$(READELF_FOR_TARGET)"; export READELF; \
 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
@@ -400,7 +397,6 @@ LIPO = @LIPO@
 NM = @NM@
 OBJDUMP = @OBJDUMP@
 RANLIB = @RANLIB@
-READELF = @READELF@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
 WINDMC = @WINDMC@
@@ -559,7 +555,6 @@ LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
 WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
 WINDMC_FOR_TARGET=@WINDMC_FOR_TARGET@
@@ -772,7 +767,6 @@ BASE_FLAGS_TO_PASS = \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
 	"OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
-	"READELF_FOR_TARGET=$(READELF_FOR_TARGET)" \
 	"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
 	"WINDMC_FOR_TARGET=$(WINDMC_FOR_TARGET)" \
@@ -821,7 +815,6 @@ EXTRA_HOST_FLAGS = \
 	'NM=$(NM)' \
 	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
-	'READELF=$(READELF)' \
 	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)' \
 	'WINDMC=$(WINDMC)'
@@ -862,7 +855,6 @@ EXTRA_TARGET_FLAGS = \
 	'NM=$(COMPILER_NM_FOR_TARGET)' \
 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-	'READELF=$$(READELF_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
 	'WINDMC=$$(WINDMC_FOR_TARGET)' \
 	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
@@ -879,7 +871,10 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 EXTRA_GCC_FLAGS = \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
diff --git a/Makefile.tpl b/Makefile.tpl
index ae263e6d36..4dd23915be 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -6,7 +6,7 @@ in
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
@@ -209,7 +209,6 @@ HOST_EXPORTS = \
 	WINDMC="$(WINDMC)"; export WINDMC; \
 	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	READELF="$(READELF)"; export READELF; \
 	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
 	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
 	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
@@ -217,7 +216,6 @@ HOST_EXPORTS = \
 	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
 	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
-	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
@@ -290,7 +288,6 @@ BASE_TARGET_EXPORTS = \
 	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
 	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	READELF="$(READELF_FOR_TARGET)"; export READELF; \
 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
@@ -403,7 +400,6 @@ LIPO = @LIPO@
 NM = @NM@
 OBJDUMP = @OBJDUMP@
 RANLIB = @RANLIB@
-READELF = @READELF@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
 WINDMC = @WINDMC@
@@ -497,7 +493,6 @@ LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
 WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
 WINDMC_FOR_TARGET=@WINDMC_FOR_TARGET@
@@ -617,7 +612,6 @@ EXTRA_HOST_FLAGS = \
 	'NM=$(NM)' \
 	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
-	'READELF=$(READELF)' \
 	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)' \
 	'WINDMC=$(WINDMC)'
@@ -658,7 +652,6 @@ EXTRA_TARGET_FLAGS = \
 	'NM=$(COMPILER_NM_FOR_TARGET)' \
 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-	'READELF=$$(READELF_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
 	'WINDMC=$$(WINDMC_FOR_TARGET)' \
 	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
@@ -675,7 +668,10 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 EXTRA_GCC_FLAGS = \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 04c3b31601..65db027c8d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,878 +1,2698 @@
-2012-03-23  Alan Modra  <amodra@gmail.com>
+2011-11-21  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Bump version to 2.22
+	* Makefile.am (RELEASE): Set.
+	* configure, Makefile.in: Regenerate.
+
+2011-11-15  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	Backport from mainline:
+
+	2011-11-14  Maxim Kuvyrkov  <maxim@codesourcery.com>
+        * elfxx-mips.c (mips_n64_exe_plt0_entry): Use 64-bit move.
+
+2011-11-15  Alan Modra  <amodra@gmail.com>
+	    Andreas Tobler  <andreast@fgznet.ch>
+
+	* elflink.c (_bfd_elf_create_got_section): Replace
+	bfd_make_section_with_flags with bfd_make_section_anyway_with_flags.
+	(_bfd_elf_link_create_dynamic_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_create_glink): Likewise.
+	(ppc_elf_create_dynamic_sections): Likewise.
+
+2011-11-09  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Mark syms in
+	executables when export_dynamic.
+
+2011-11-08  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Rename
+	ha_relocs_not_using_r2 to unexpected_toc_insn.
+	(ok_lo_toc_insn): New function.
+	(ppc64_elf_edit_toc): Check insn on lo toc reloc.  Emit warning.
+	(ppc64_elf_relocate_section): Don't check insn on lo toc reloc here.
+	Handle addic on lo toc reloc.
+
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-20  Alan Modra  <amodra@gmail.com>
+	* elf32-i386.c (i386_opcode16): Delete.
+	(elf_i386_check_tls_transition): Use memcmp to compare contents.
+	* elf64-x86-64.c (x86_64_opcode16, x86_64_opcode32): Delete.
+	(elf_x86_64_check_tls_transition): Use memcmp to compare contents.
+
+	2011-10-19  Alan Modra  <amodra@gmail.com>
+	PR ld/13311
+	* elflink.c (elf_link_output_extsym): Correct test for warning when
+	forced local executable syms are referenced from shared libraries.
+
+	2011-10-19  Alan Modra  <amodra@gmail.com>
+	PR ld/13254
+	* elflink.c (bfd_elf_final_link): Emit error_textrel error.
+
+	2011-10-17  Alan Modra  <amodra@gmail.com>
+	PR ld/12975
+	PR ld/13195
+	* elf64-ppc.c (ppc64_elf_gc_mark_dynamic_ref): Apply 2011-09-15
+	and 2011-09-29 bfd_elf_gc_mark_dynamic_ref_symbol changes here too.
+
+	2011-10-11  Alan Modra  <amodra@gmail.com>
+	PR binutils/13278
+	* archive.c (bfd_generic_archive_p): Only check first element
+	when target_defaulted.
+	(_bfd_construct_extended_name_table): Use ar_maxnamelen.
+	(_bfd_archive_bsd44_construct_extended_name_table): Likewise.
+
+	2011-10-11  Alan Modra  <amodra@gmail.com>
+	PR binutils/13257
+	* archive.c (_bfd_find_nested_archive, _bfd_get_elt_at_filepos): Open
+	thin archive element using container target if not defaulted.
+
+	2011-10-10  Alan Modra  <amodra@gmail.com>
+	* elf64-ppc.c (ppc64_elf_howto_table): Add R_PPC64_TOCSAVE entry.
+	(struct ppc_link_hash_table): Add tocsave_htab.
+	(struct tocsave_entry): New.
+	(tocsave_htab_hash, tocsave_htab_eq, tocsave_find): New functions.
+	(ppc64_elf_link_hash_table_create): Create tocsave_htab..
+	(ppc64_elf_link_hash_table_free): ..and delete it.
+	(build_plt_stub): Always put STD_R2_40R1 first.
+	(ppc64_elf_size_stubs): Check for R_PPC64_TOCSAVE following reloc
+	on plt call.  If present add prologue nop location to tocsave_htab.
+	(ppc64_elf_relocate_section): Convert prologue nop to std.  Skip
+	first insn of plt call stub when R_PPC64_TOCSAVE present.
+
+	2011-10-08  H.J. Lu  <hongjiu.lu@intel.com>
+	PR ld/13250
+	* elflink.c (elf_link_add_object_symbols): Preserve the maximum
+	alignment and size for common symbols.
+
+	2011-10-08  Alan Modra  <amodra@gmail.com>
+	PR ld/13229
+	PR ld/13244
+	* elflink.c (elf_link_add_object_symbols): Don't make IR symbols
+	dynamic.
+
+	2011-10-08  Alan Modra  <amodra@gmail.com>
+	* elflink.c (elf_link_output_extsym): Strip defined plugin symbols
+	even when strip_discarded is false.
+
+	2011-09-30  Alan Modra  <amodra@gmail.com>
+	PR ld/13235
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Add ha_relocs_not_using_r2.
+	(ppc64_elf_edit_toc): Check HA relocs.
+	(ha_reloc_match): Delete function.
+	(ppc64_elf_relocate_section): Remove delayed HA nop optimization.
+	Instead do it and low part optimization based on
+	ha_relocs_not_using_r2.
+
+2011-10-18  David S. Miller  <davem@davemloft.net>
+
+	PR binutils/13301
+	* elfxx-sparc.c (sparc_elf_find_reloc_at_ofs): New function.
+	(_bfd_sparc_elf_relocate_section): Always move the __tls_get_addr
+	call delay slot instruction forward 4 bytes when performing
+	relaxation.
+
+2011-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13177
+	* elflink.c (elf_gc_sweep_symbol): Don't hide symbols without PLT
+	nor GOT references.
+
+2011-10-14  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_gc_sweep_hook) <R_CRIS_16_GOTPLT>
+	<R_CRIS_32_GOTPLT>: Fix missing update of gotplt refcount for
+	global symbols.
+	<R_CRIS_8, R_CRIS_16, R_CRIS_32>: New cases for similar missing
+	updates of the plt refcount.
+	(elf_cris_adjust_gotplt_to_got): Assert integrity of the gotplt
+	refcount in relation to the plt refcount.
+
+2011-10-13  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Mark PLT calls via
+	stubs as resolved.
+
+2011-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13195
+	* elflink.c (_bfd_elf_merge_symbol): Don't set dynamic_def when
+	clearing def_dynamic.
+	(elf_link_add_object_symbols): Likewise.  Set dynamic_def when
+	setting def_dynamic.
+	(bfd_elf_gc_mark_dynamic_ref_symbol): Check if a symbol is
+	versioned.
+
+2011-09-29  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13233
+	* elflink.c (_bfd_elf_gc_mark_extra_sections): Mark single member
+	debug and special section groups.
+
+2011-09-26  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Bump version to 2.21.90
+	* configure: Regenerate.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_merge_private_bfd_data): New.
+	* elfxx-sparc.h: Declare it.
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Call it.
+	* elf64-sparc.c (elf64_sparc_merge_private_bfd_data): Likewise.
+
+2011-09-21  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_convert_section_name_to_bfd): Add comment.
+	Deals with size limited strings.
+	(bfd_mach_o_build_commands): Initialize more fields.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13177
+	* elflink.c (elf_gc_sweep_symbol): Also hide symbols without PLT
+	nor GOT references.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12975
+	* bfd-in.h (bfd_elf_size_dynamic_sections): Remove pointer
+	to struct bfd_elf_version_tree.
+
+	* elflink.c (elf_info_failed): Remove verdefs.
+	(_bfd_elf_export_symbol): Updated.
+	_bfd_elf_link_assign_sym_version): Likewise.
+	(bfd_elf_size_dynamic_sections): Remove pointer to struct
+	bfd_elf_version_tree.  Updated.
+	(bfd_elf_gc_mark_dynamic_ref_symbol): Check if a symbol is hidden
+	by linker script.
+
+	* linker.c (bfd_hide_sym_by_version): New.
+
+	* bfd-in2.h: Regenerated.
+
+2011-09-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13178
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Use .got.plt
+	if there are no GOT relocations.
+
+2011-09-09  Kai Tietz  <ktietz@redhat.com>
+
+	* peicode.h (pe_ILF_build_a_bfd): Don't remove leading underscore
+	for targets without symbol_leading_char.
 
-	* elf.c (assign_file_positions_for_non_load_sections): Don't warn
-	on empty alloc sections.
+2011-09-08  Bernd Jendrissek  <bernd.jendrissek@gmail.com>
 
-2012-03-23  Alan Modra  <amodra@gmail.com>
+	* bfdwin.c (bfd_get_file_window): Fix memory leak.
 
-	* linker.c (_bfd_nearby_section): New function, split out from..
-	(fix_syms): ..here.
-	* bfd-in.h (_bfd_nearby_section): Declare.
+2011-09-07  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13131
+	* bfd/elf64-ppc.c (adjust_toc_syms): Ensure ppc64_elf_howto_table
+	is initialized.
+
+2011-09-06  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13131
+	* elf64-ppc.c (adjust_toc_syms): Delete redundant code.
+	(ppc64_elf_edit_toc): Fix style nit.  Report some details
+	on linker failure due to reference in debug or non-alloc
+	sections to optimized away toc entry, and don't abort.
+
+2011-09-01  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_output_arch_local_syms): Skip excluded
+	sections.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-19  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Ignore can_optimize bit if
+	we haven't seen expected -mcmodel=medium/large code relocs.
+
+2011-08-18  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_read_segment): Initialize list.
+
+2011-08-17  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_write_section_32): Fix typo.
+
+2011-08-17  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12762
+	* bfd-in.h (struct bfd_section_already_linked): Forward declare.
+	(_bfd_handle_already_linked): Declare.
+	* coff-alpha.c (_bfd_ecoff_section_already_linked): Define as
+	_bfd_coff_section_already_linked.
+	* coff-mips.c (_bfd_ecoff_section_already_linked): Likewise.
+	* coffcode.h (coff_section_already_linked): Likewise.
+	* cofflink.c (coff_link_add_symbols): Revert 2011-07-09 changes.
+	* elf-bfd.h: Likewise.
+	* libbfd-in.h: Likewise.
+	* targets.c: Likewise.
+	* linker.c (bfd_section_already_linked): Likewise.
+	(bfd_section_already_linked_table_lookup): Likewise.
+	(bfd_section_already_linked_table_insert): Likewise.
+	(_bfd_generic_section_already_linked): Likewise.  Call
+	_bfd_handle_already_linked.
+	(_bfd_handle_already_linked): New function, split out from..
+	* elflink.c (_bfd_elf_section_already_linked): ..here.  Revert
+	2011-07-09 changes.  Avoid unnecessary strcmp when matching
+	already_linked_list entries.  Match plugin linkonce section.
+	(section_signature): Delete.
+	* coffgen.c (_bfd_coff_section_already_linked): New function.
+	* libcoff-in.h (_bfd_coff_section_already_linked): Declare.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
 	* bfd-in2.h: Regenerate.
-	* elflink.c (elf_link_input_bfd): Don't use text_index_section or
-	data_index_section with ld -q or ld -r output relocs against
-	stripped output sections.  Instead use _bfd_nearby_section.
 
-2012-03-23  Alan Modra  <amodra@gmail.com>
+2011-08-14  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_select_plt_layout): Force bss-plt when
+	shared and call to _mcount will go via plt.
+
+2011-08-14  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c: Prefix all einfo error strings with "%P: ".
+	* elf32-ppc.c: Likewise.
+	(ppc_elf_select_plt_layout): Use einfo rather than info to report
+	forced bss-plt.
+
+2011-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13082
+	* elf64-x86-64.c (x86_64_elf_howto_table): Add R_X86_64_RELATIVE64.
+	(elf_x86_64_relocate_section): Treat R_X86_64_64 like R_X86_64_32
+	and zero-extend it to 64bit if addend is zero for x32.  Generate
+	R_X86_64_RELATIVE64 for x32.
+
+2011-08-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.
+	* bfd-in2.h (bfd_elf32_arm_set_target_relocs): Likewise.
+	* elf32-arm.c (elf32_arm_link_hash_table): New field.
+	(elf232_arm_link_hash_table_create): Initialise new field.
+	(check_use_blx): Change test depending on fix_arm1176.
+	(bfd_elf32_arm_set_target_relocs): Set fix_arm1176 from
+	command line options.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (struct mach_o_segment_name_xlat): Add comments.
+	(segsec_names_xlat): Reorder elements.
+	(bfd_mach_o_read_section_32): Fix typo.
+	(bfd_mach_o_read_section_64): Fix typo.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (BFD_MACH_O_SEGNAME_SIZE): New macro.
+	(BFD_MACH_O_SECTNAME_SIZE): Ditto.
+	(bfd_mach_o_section): Use them.  Add next field.
+	(bfd_mach_o_segment_command): Replace sections array by
+	sect_head and sect_tail.
+	(bfd_mach_o_get_mach_o_section): New macro.
+	(bfd_mach_o_lookup_section): Remove.
+	(bfd_mach_o_new_section_hook): New function.
+	* mach-o.c (bfd_mach_o_normalize_section_name): Use strncmp
+	instead of strcmp.
+	(bfd_mach_o_convert_section_name_to_bfd): Replaces section
+	parameter with segname and sectname parameters.  Adjust.
+	(bfd_mach_o_append_section_to_segment): New function.  Use a
+	linked list for Mach-O sections.
+	(bfd_mach_o_write_segment_32): Adjust.
+	(bfd_mach_o_write_segment_64): Ditto.
+	(bfd_mach_o_build_commands): Fix comment.  Adjust.
+	(bfd_mach_o_flatten_sections): Adjust.
+	(bfd_mach_o_print_section_map): Adjust.
+	(bfd_mach_o_set_section_flags_from_bfd): Ditto.
+	(bfd_mach_o_new_section_hook): New function.
+	(bfd_mach_o_init_section_from_mach_o): Ditto.
+	(bfd_mach_o_read_section_32): Remove section parameter.
+	Return a section instead.
+	(bfd_mach_o_read_section_64): Ditto.
+	(bfd_mach_o_read_section): Ditto.
+	(bfd_mach_o_make_bfd_section): Adjust.
+	(bfd_mach_o_read_segment): Adjust for new profile of
+	bfd_mach_o_read_section.
+	(bfd_mach_o_lookup_section): Remove.
+	* mach-o-target.c (bfd_mach_o_new_section_hook): Remove.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (bfd_mach_o_version_min_command): New structure.
+	(bfd_mach_o_load_command): Add version_min.
+	(mach_o_data_struct): Fix comment.
+	* mach-o.c (bfd_mach_o_read_version_min): New function.
+	(bfd_mach_o_read_command): Handle BFD_MACH_O_LC_FUNCTION_STARTS,
+	BFD_MACH_O_LC_VERSION_MIN_MACOSX and
+	BFD_MACH_O_LC_VERSION_MIN_IPHONEOS.
+	(bfd_mach_o_get_name_or_null): New function.
+	(bfd_mach_o_get_name): Use the above new one.
+	(bfd_mach_o_load_command_name): Add the above new commands.
+	(bfd_mach_o_bfd_print_private_bfd_data): Display numerically
+	unknown commands.  Handle BFD_MACH_O_LC_FUNCTION_STARTS,
+	BFD_MACH_O_LC_VERSION_MIN_MACOSX and
+	BFD_MACH_O_LC_VERSION_MIN_IPHONEOS.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h: Move size macros to external.h
+	Move reloc macros to reloc.h and x86-64.h.
+	* mach-o-i386.c: Includes mach-o/reloc.h
+	* mach-o-x86-64.c: Ditto and includes mach-o/x86-64.h
+	* mach-o.c: Add includes.
+	(bfd_mach_o_write_header): Use structure from external.h to convert.
+	(bfd_mach_o_write_thread): Ditto.
+	(bfd_mach_o_write_relocs): Ditto.
+	(bfd_mach_o_write_section_32): Ditto.
+	(bfd_mach_o_write_section_64): Ditto.
+	(bfd_mach_o_write_segment_32): Ditto.
+	(bfd_mach_o_write_segment_64): Ditto.
+	(bfd_mach_o_write_symtab): Ditto.
+	(bfd_mach_o_write_contents): Ditto.
+	(bfd_mach_o_read_header): Ditto.
+	(bfd_mach_o_read_section_32): Ditto.
+	(bfd_mach_o_read_section_64): Ditto.
+	(bfd_mach_o_read_symtab_symbol): Ditto.
+	(bfd_mach_o_read_dylinker): Ditto.
+	(bfd_mach_o_read_dylib): Ditto.
+	(bfd_mach_o_read_dysymtab): Ditto.
+	(bfd_mach_o_read_symtab): Ditto.
+	(bfd_mach_o_read_linkedit): Ditto.
+	(bfd_mach_o_read_str): Ditto.
+	(bfd_mach_o_read_dyld_info): Ditto.
+	(bfd_mach_o_read_segment): Ditto.
+	(bfd_mach_o_read_command): Ditto.
+	(bfd_mach_o_archive_p): Ditto.
+	(bfd_mach_o_canonicalize_one_reloc): Ditto. Change the BUF parameter.
+	(bfd_mach_o_canonicalize_relocs): Adjust to call the above function.
+	(bfd_mach_o_read_dysymtab_symbol): Rename BUF variable.
+	(bfd_mach_o_read_uuid): Remove useless cast.  Use a macro instead
+	of an hard-coded value.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o-x86-64.c (bfd_mach_o_x86_64_mkobject): Fix cut-and-past typos.
+	(bfd_mach_o_x86_64_swap_reloc_out): Handle BFD_RELOC_32_PCREL,
+	BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64 and
+	BFD_RELOC_MACH_O_X86_64_GOT_LOAD.  Share common code.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_normalize_section_name): New function.
+	(bfd_mach_o_convert_section_name_to_bfd): Use it.
+	(bfd_mach_o_get_section_type_from_name): New function.
+	(bfd_mach_o_get_section_attribute_from_name): Ditto.
+	* mach-o.h (bfd_mach_o_section): Move bfdsection field at the end.
+	Add comments.  Add prototypes for the above new functions.
+
+2011-08-05  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c (netbsd_core_vec): Init match_priority field.
+
+2011-08-05  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (maybe_strip_output): New function.
+	(ppc64_elf_size_stubs): Use it to strip .branch_lt and .eh_frame.
+
+2011-08-05  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12762
+	* elflink.c (_bfd_elf_section_already_linked): Return matched
+	status.  Remove COFF comdat section handling.
+	* linker.c (_bfd_generic_section_already_linked): Return matched
+	status.  Don't set SEC_GROUP in l_flags for plugin entries.
+	(bfd_section_already_linked): Update prototype.
+	* targets.c (_section_already_linked): Likewise.
+	* elf-bfd.h (_bfd_elf_section_already_linked): Likewise.
+	* libbfd-in.h (_bfd_generic_section_already_linked): Likewise.
+	(_bfd_nolink_section_already_linked): Update.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
 
-	PR binutils/13894
-	* elf64-ppc.c (opd_entry_value): Read full symbol table when
-	sym hashes unavailable.
+2011-08-05  Alan Modra  <amodra@gmail.com>
 
-2012-03-21  Eliot Dresselhaus  <eliot@sonic.net>
+	* elf32-ppc.c: Include dwarf2.h.
+	(struct ppc_elf_link_hash_table): Add glink_eh_frame.
+	(ppc_elf_create_glink): Create .eh_frame section.
+	(glink_eh_frame_cie): New array.
+	(ppc_elf_size_dynamic_sections): Size glink_eh_frame.
+	(ppc_elf_finish_dynamic_sections): Write glink_eh_frame.
 
-	* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
-	for non-C6X objects.
+2011-08-04  Tristan Gingold  <gingold@adacore.com>
 
-2012-03-20  Kai Tietz  <ktietz@redhat.com>
+	* vms-alpha.c (_bfd_vms_write_eeom): Round vms_linkage_index.
+	(_bfd_vms_write_etir): Initialize vms_linkage_index to 0.
 
-	PR ld/12742
-	* configure.in (AC_CHECK_HEADERS): Test for windows.h and dlfcn.h.
-	* plugin.c: Guard include of dlfcn.h if HAVE_DLFCN_H is defined.
-	Add windows.h header include if HAVE_WINDOWS_H is defined.
-	(dlerror): New static function if windows variant is used instead
-	of dlfcn.h.
-	(dlclose): Likewise.
-	(dlopen): Likewise.
-	(dlsym): Likewise.
-	* configure: Regenerated.
-	* config.in: Regenerated.
+2011-08-03  Tristan Gingold  <gingold@adacore.com>
 
-2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+	* mach-o.c (bfd_mach_o_canonicalize_symtab): Handle no symbols case.
+	(bfd_mach_o_read_symtab_symbols): Return if no symbols.
 
-	PR ld/13880
-	* elf32-i386.c (elf_i386_relocate_section): Don't issue an error
-	for R_386_GOTOFF relocation against protected function if
-	SYMBOLIC_BIND is true.
+2011-08-02  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	* elf64-x86-64.c (elf_x86_64_relocate_section): Don't issue an
-	error for R_X86_64_GOTOFF64 relocation against protected function
-	when building executable or SYMBOLIC_BIND is true.
+	* elfxx-mips.c (check_4byte_branch): Remove function.
+	(check_relocated_bzc): New function.
+	(_bfd_mips_elf_relax_section): Permit the relaxation of LUI
+	instructions that immediately follow a compact branch
+	instruction.
 
-2012-03-16  Roland McGrath  <mcgrathr@google.com>
+2011-08-02  Alan Modra  <amodra@gmail.com>
 
-	* config.bfd: Handle x86_64-*-nacl*.
-	* elf64-x86-64.c (bfd_elf64_x86_64_nacl_vec): New backend vector stanza.
-	(bfd_elf32_x86_64_nacl_vec): Likewise.
-	* targets.c: Support them.
-	* configure.in: Likewise.
-	* configure: Regenerated.
+	* elf64-ppc.c (build_plt_stub): Correct emitted relocs when no
+	plt_static_chain.
+	(ppc_build_one_stub): Adjust get_relocs call to suit..
+	(ppc_size_one_stub): ..and reloc sizing.  Correct plt size corner case.
 
-2012-03-16  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* elf32-arm.c (elf32_arm_attributes_accept_div): New function.
-	(elf32_arm_attributes_forbid_div): Likewise.
-	(elf32_arm_merge_eabi_attributes): Correct handling of
-	Tag_DIV_use.
+	PR ld/13048
+	* archures.c (bfd_mach_i386_intel_syntax): New.
+	(bfd_mach_i386_i8086): Updated.
+	(bfd_mach_i386_i386): Likewise.
+	(bfd_mach_x86_64): Likewise.
+	(bfd_mach_x64_32): Likewise.
+	(bfd_mach_i386_i386_intel_syntax): Likewise.
+	(bfd_mach_x86_64_intel_syntax): Likewise.
+	(bfd_mach_x64_32_intel_syntax): Likewise.
+	(bfd_mach_l1om): Likewise.
+	(bfd_mach_l1om_intel_syntax): Likewise.
+	(bfd_mach_k1om): Likewise.
+	(bfd_mach_k1om_intel_syntax): Likewise.
 
-2012-03-15  Roland McGrath  <mcgrathr@google.com>
+	* bfd-in2.h: Regenerated.
 
-	* elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Use
-	elf_x86_64_backend_data parameters for plt_eh_frame.
+	* cpu-i386.c (bfd_i386_compatible): Check mach instead of
+	bits_per_address.
+	(bfd_x64_32_arch_intel_syntax): Set bits_per_address to 64.
+	(bfd_x64_32_arch): Likewise.
 
-	* elf64-x86-64.c (struct elf_x86_64_backend_data): New type.
-	(get_elf_x86_64_backend_data, GET_PLT_ENTRY_SIZE): New macros.
-	(elf_x86_64_arch_bed): New variable.
-	(elf_backend_arch_data): New macro.
-	(elf_x86_64_adjust_dynamic_symbol): Use GET_PLT_ENTRY_SIZE.
-	(elf_x86_64_allocate_dynrelocs): Likewise.
+	* elf64-x86-64.c: Include "libiberty.h".
+	(x86_64_elf_howto_table): Append x32 R_X86_64_32.
+	(elf_x86_64_rtype_to_howto): Support x32 R_X86_64_32.
+	(elf_x86_64_reloc_type_lookup): Likewise.
+	(elf_x86_64_reloc_name_lookup): Likewise.
 	(elf_x86_64_relocate_section): Likewise.
-	(elf_x86_64_plt_sym_val): Likewise.
-	(elf_x86_64_finish_dynamic_symbol): Use elf_x86_64_backend_data
-	parameters for PLT details.
-	(elf_x86_64_finish_dynamic_sections): Likewise.
-
-2012-03-14  Roland McGrath  <mcgrathr@google.com>
-
-	* elf32-i386.c (elf_i386_nacl_pic_plt0_entry): Initialize up
-	to the full size, padding out with nop instructions.
-
-2012-03-12  Alan Modra  <amodra@gmail.com>
-
-	* elf-m10300.c (_bfd_mn10300_elf_adjust_dynamic_symbol): Don't warn
-	on zero size dynbss symbol.
-	* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Likewise.
-	* elf32-cr16.c (_bfd_cr16_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-cris.c (elf_cris_adjust_dynamic_symbol): Likewise.
-	* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
-	* elf32-i370.c (i370_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
-	* elf32-lm32.c (lm32_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-m32r.c (m32r_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
-	* elf32-sh.c (sh_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-tic6x.c (elf32_tic6x_adjust_dynamic_symbol): Likewise.
-	* elf32-tilepro.c (tilepro_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-vax.c (elf_vax_adjust_dynamic_symbol): Likewise.
-	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
-	* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
-	* elf64-sh64.c (sh64_elf64_adjust_dynamic_symbol): Likewise.
-	* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol): Likewise.
-	* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol): Likewise.
-	* elfxx-tilegx.c (tilegx_elf_adjust_dynamic_symbol): Likewise.
-
-2012-03-10  Edmar Wienskoski  <edmar@freescale.com>
-
-	* archures.c: Add bfd_mach_ppc_e5500 and bfd_mach_ppc_e6500.
+	(elf_x86_64_check_relocs): Allow R_X86_64_64 relocations for x32.
+
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (check_br32): Fix return type.
+
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (bz_insn_16): Correct opcode mask.
+
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c: Adjust comments throughout.
+	(mips_elf_relax_delete_bytes): Reshape code.
+	(_bfd_mips_elf_relax_section): Remove check for
+	R_MICROMIPS_GPREL16 relocations.  Reshape code.
+
+2011-07-28  Roland McGrath  <mcgrathr@google.com>
+
+	* elf32-i386.c (NACL_PLT_ENTRY_SIZE, NACLMASK): New macros.
+	(elf_i386_nacl_plt0_entry): New variable.
+	(elf_i386_plt_entry): New variable.
+	(elf_i386_nacl_pic_plt0_entry): New variable.
+	(elf_i386_nacl_pic_plt_entry): New variable.
+	(elf_i386_nacl_plt, elf_i386_nacl_arch_bed): New variables.
+	(elf_backend_arch_data): New macro setting for elf_i386_nacl_vec stanza.
+	(elf_backend_plt_alignment): Likewise.
+
+	* config.bfd: Handle i[3-7]86-*-nacl*.
+	* elf32-i386.c (bfd_elf32_i386_nacl_vec): New backend vector stanza.
+	* targets.c: Support bfd_elf32_i386_nacl_vec.
+	* configure.in: Likewise.
+	* configure: Regenerated.
+
+	* elf32-i386.c (struct elf_i386_plt_layout): New type.
+	(GET_PLT_ENTRY_SIZE): New macro.
+	(elf_i386_plt): New variable.
+	(struct elf_i386_backend_data): New member `plt'.
+	(elf_i386_arch_bed): Add initializer for it.
+	(elf_i386_vxworks_arch_bed): Likewise.
+	(elf_i386_allocate_dynrelocs): Use GET_PLT_ENTRY_SIZE.
+	(elf_i386_plt_sym_val): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	Also use other elf_i386_plt_layout members for PLT details.
+	(elf_i386_finish_dynamic_sections): Likewise.
+
+	* elf32-i386.c (struct elf_i386_backend_data): New type.
+	(get_elf_i386_backend_data): New macro.
+	(elf_i386_arch_bed): New variable.
+	(elf_backend_arch_data): New macro.
+	(struct elf_i386_link_hash_table): Remove plt0_pad_byte and is_vxworks.
+	(elf_i386_link_hash_table_create): Don't initialize them.
+	(elf_i386_create_dynamic_sections): Find is_vxworks flags in
+	elf_i386_backend_data, not elf_i386_link_hash_table.
+	(elf_i386_adjust_dynamic_symbol): Likewise.
+	(elf_i386_allocate_dynrelocs): Likewise.
+	(elf_i386_readonly_dynrelocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	(elf_i386_finish_dynamic_sections): Likewise.  Same for plt0_pad_byte.
+	(elf_i386_vxworks_link_hash_table_create): Function removed.
+	(elf_i386_vxworks_arch_bed): New variable.
+	(elf_backend_arch_data): New macro in elf32-i386-vxworks stanza.
+
+	* elf-bfd.h (elf_backend_data): New member arch_backend_data.
+	* elfxx-target.h (elf_backend_arch_data): New macro.
+	(elfNN_bed): Use it as initializer for the new member.
+
+2011-07-28  Mikulas Patocka  <mikulas@artax.karlin.mff.cuni.cz>
+
+	* elf64-hppa.c (elf_hppa_final_link_relocate): Fix handling of out
+	of range branches.
+
+2011-07-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.c (dwarf_debug_sections): Add .debug_macro
+	and .zdebug_macro entry.
+	(dwarf_debug_section_enum): Add debug_macro.
+
+2011-07-26  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c: Include dwarf2.h.
+	(struct ppc_link_hash_table): Add glink_eh_frame.
+	(create_linkage_sections): Create .eh_frame section.
+	(ppc64_elf_size_dynamic_sections): Arrange to drop unneeded
+	glink_eh_frame.
+	(glink_eh_frame_cie): New array.
+	(ppc64_elf_size_stubs): Size glink_eh_frame.
+	(ppc64_elf_build_stubs): Init glink_eh_frame contents.
+	(ppc64_elf_finish_dynamic_sections): Write glink_eh_frame.
+
+2011-07-25  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	PR ld/12815
+	* elf64-mmix.c (struct _mmix_elf_section_data): New members
+	has_warned_bpo and has_warned_pushj.
+	(mmix_final_link_relocate): Remove PARAMS and PTR macros,
+	converting to ISO C.  Add new parameter error_message.  All
+	callers changed.
+	(mmix_elf_perform_relocation): Ditto.
+	<case R_MMIX_PUSHJ_STUBBABLE, case R_MMIX_BASE_PLUS_OFFSET>:
+	Handle the case where mmix_elf_check_common_relocs has not been
+	called, missing preparations for relocs of the respective type.
+
+2011-07-24  Chao-ying Fu  <fu@mips.com>
+	    Ilie Garbacea  <ilie@mips.com>
+	    Maciej W. Rozycki  <macro@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+	    Catherine Moore  <clm@codesourcery.com>
+	    Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* archures.c (bfd_mach_mips_micromips): New macro.
+	* cpu-mips.c (I_micromips): New enum value.
+	(arch_info_struct): Add bfd_mach_mips_micromips.
+	* elfxx-mips.h (_bfd_mips_elf_is_target_special_symbol): New
+	prototype.
+	(_bfd_mips_elf_relax_section): Likewise.
+	(_bfd_mips16_elf_reloc_unshuffle): Rename to...
+	(_bfd_mips_elf_reloc_unshuffle): ... this.  Handle microMIPS
+	ASE.
+	(_bfd_mips16_elf_reloc_shuffle): Rename to...
+	(_bfd_mips_elf_reloc_shuffle): ... this.  Handle microMIPS ASE.
+	(gprel16_reloc_p): Handle microMIPS ASE.
+	(literal_reloc_p): New function.
+	* elf32-mips.c (elf_micromips_howto_table_rel): New variable.
+	(_bfd_mips_elf32_gprel16_reloc): Handle microMIPS ASE.
+	(mips16_gprel_reloc): Update for _bfd_mips_elf_reloc_unshuffle
+	and _bfd_mips_elf_reloc_shuffle changes.
+	(mips_elf_gprel32_reloc): Update comment.
+	(micromips_reloc_map): New variable.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle microMIPS ASE.
+	(mips_elf32_rtype_to_howto): Likewise.
+	(mips_info_to_howto_rel): Likewise.
+	(bfd_elf32_bfd_is_target_special_symbol): Define.
+	(bfd_elf32_bfd_relax_section): Likewise.
+	* elf64-mips.c (micromips_elf64_howto_table_rel): New variable.
+	(micromips_elf64_howto_table_rela): Likewise.
+	(mips16_gprel_reloc): Update for _bfd_mips_elf_reloc_unshuffle
+	and _bfd_mips_elf_reloc_shuffle changes.
+	(micromips_reloc_map): Likewise.
+	(bfd_elf64_bfd_reloc_type_lookup): Handle microMIPS ASE.
+	(bfd_elf64_bfd_reloc_name_lookup): Likewise.
+	(mips_elf64_rtype_to_howto): Likewise.
+	(bfd_elf64_bfd_is_target_special_symbol): Define.
+	* elfn32-mips.c (elf_micromips_howto_table_rel): New variable.
+	(elf_micromips_howto_table_rela): Likewise.
+	(mips16_gprel_reloc): Update for _bfd_mips_elf_reloc_unshuffle
+	and _bfd_mips_elf_reloc_shuffle changes.
+	(micromips_reloc_map): Likewise.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle microMIPS ASE.
+	(bfd_elf32_bfd_reloc_name_lookup): Likewise.
+	(mips_elf_n32_rtype_to_howto): Likewise.
+	(bfd_elf32_bfd_is_target_special_symbol): Define.
+	* elfxx-mips.c (LA25_LUI_MICROMIPS_1): New macro.
+	(LA25_LUI_MICROMIPS_2): Likewise.
+	(LA25_J_MICROMIPS_1, LA25_J_MICROMIPS_2): Likewise.
+	(LA25_ADDIU_MICROMIPS_1, LA25_ADDIU_MICROMIPS_2): Likewise.
+	(TLS_RELOC_P): Handle microMIPS ASE.
+	(mips_elf_create_stub_symbol): Adjust value of stub symbol if
+	target is a microMIPS function.
+	(micromips_reloc_p): New function.
+	(micromips_reloc_shuffle_p): Likewise.
+	(got16_reloc_p, call16_reloc_p): Handle microMIPS ASE.
+	(got_disp_reloc_p, got_page_reloc_p): New functions.
+	(got_ofst_reloc_p): Likewise.
+	(got_hi16_reloc_p, got_lo16_reloc_p): Likewise.
+	(call_hi16_reloc_p, call_lo16_reloc_p): Likewise.
+	(hi16_reloc_p, lo16_reloc_p, jal_reloc_p): Handle microMIPS ASE.
+	(micromips_branch_reloc_p): New function.
+	(tls_gd_reloc_p, tls_ldm_reloc_p): Likewise.
+	(tls_gottprel_reloc_p): Likewise.
+	(_bfd_mips16_elf_reloc_unshuffle): Rename to...
+	(_bfd_mips_elf_reloc_unshuffle): ... this.  Handle microMIPS
+	ASE.
+	(_bfd_mips16_elf_reloc_shuffle): Rename to...
+	(_bfd_mips_elf_reloc_shuffle): ... this.  Handle microMIPS ASE.
+	(_bfd_mips_elf_lo16_reloc): Handle microMIPS ASE.
+	(mips_tls_got_index, mips_elf_got_page): Likewise.
+	(mips_elf_create_local_got_entry): Likewise.
+	(mips_elf_relocation_needs_la25_stub): Likewise.
+	(mips_elf_calculate_relocation): Likewise.
+	(mips_elf_perform_relocation): Likewise.
+	(_bfd_mips_elf_symbol_processing): Likewise.
+	(_bfd_mips_elf_add_symbol_hook): Likewise.
+	(_bfd_mips_elf_link_output_symbol_hook): Likewise.
+	(mips_elf_add_lo16_rel_addend): Likewise.
+	(_bfd_mips_elf_check_relocs): Likewise.
+	(mips_elf_adjust_addend): Likewise.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	(mips_elf_create_la25_stub): Likewise.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_gc_sweep_hook): Likewise.
+	(_bfd_mips_elf_is_target_special_symbol): New function.
+	(mips_elf_relax_delete_bytes): Likewise.
+	(opcode_descriptor): New structure.
+	(RA): New macro.
+	(OP32_SREG, OP32_TREG, OP16_VALID_REG): Likewise.
+	(b_insns_32, bc_insn_32, bz_insn_32, bzal_insn_32): New variables.
+	(beq_insn_32): Likewise.
+	(b_insn_16, bz_insn_16): New variables.
+	(BZC32_REG_FIELD): New macro.
+	(bz_rs_insns_32, bz_rt_insns_32): New variables.
+	(bzc_insns_32, bz_insns_16):Likewise.
+	(BZ16_REG, BZ16_REG_FIELD): New macros.
+	(jal_insn_32_bd16, jal_insn_32_bd32): New variables.
+	(jal_x_insn_32_bd32): Likewise.
+	(j_insn_32, jalr_insn_32): Likewise.
+	(ds_insns_32_bd16, ds_insns_32_bd32): Likewise.
+	(jalr_insn_16_bd16, jalr_insn_16_bd32, jr_insn_16): Likewise.
+	(JR16_REG): New macro.
+	(ds_insns_16_bd16): New variable.
+	(lui_insn): Likewise.
+	(addiu_insn, addiupc_insn): Likewise.
+	(ADDIUPC_REG_FIELD): New macro.
+	(MOVE32_RD, MOVE32_RS): Likewise.
+	(MOVE16_RD_FIELD, MOVE16_RS_FIELD): Likewise.
+	(move_insns_32, move_insns_16): New variables.
+	(nop_insn_32, nop_insn_16): Likewise.
+	(MATCH): New macro.
+	(find_match): New function.
+	(check_br16_dslot, check_br32_dslot): Likewise.
+	(check_br16, check_br32): Likewise.
+	(IS_BITSIZE): New macro.
+	(check_4byte_branch): New function.
+	(_bfd_mips_elf_relax_section): Likewise.
+	(_bfd_mips_elf_merge_private_bfd_data): Disallow linking MIPS16
+	and microMIPS modules together.
+	(_bfd_mips_elf_print_private_bfd_data):	Handle microMIPS ASE.
+	* reloc.c (BFD_RELOC_MICROMIPS_7_PCREL_S1): New relocation.
+	(BFD_RELOC_MICROMIPS_10_PCREL_S1): Likewise.
+	(BFD_RELOC_MICROMIPS_16_PCREL_S1): Likewise.
+	(BFD_RELOC_MICROMIPS_GPREL16): Likewise.
+	(BFD_RELOC_MICROMIPS_JMP, BFD_RELOC_MICROMIPS_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_HI16_S): Likewise.
+	(BFD_RELOC_MICROMIPS_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_LITERAL): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT16): Likewise.
+	(BFD_RELOC_MICROMIPS_CALL16): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_CALL_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_CALL_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_SUB): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_PAGE): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_OFST): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_DISP): Likewise.
+	(BFD_RELOC_MICROMIPS_HIGHEST): Likewise.
+	(BFD_RELOC_MICROMIPS_HIGHER): Likewise.
+	(BFD_RELOC_MICROMIPS_SCN_DISP): Likewise.
+	(BFD_RELOC_MICROMIPS_JALR): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_GD): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_LDM): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_DTPREL_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_DTPREL_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_GOTTPREL): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_TPREL_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_TPREL_LO16): Likewise.
 	* bfd-in2.h: Regenerate.
-	* cpu-powerpc.c (bfd_powerpc_archs): Add entries for
-	bfd_mach_ppc_e5500 and bfd_mach_ppc_e6500.
+	* libbfd.h: Regenerate.
 
-2012-03-09  H.J. Lu  <hongjiu.lu@intel.com>
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
 
-	PR ld/13817
-	* bfd/elf32-i386.c (elf_i386_relocate_section): Restore
-	R_386_IRELATIVE.
+	* Makefile.am (ALL_MACHINES): Add cpu-k1om.lo.
+	(ALL_MACHINES_CFILES): Add cpu-k1om.c.
+	* Makefile.in: Regenerated.
 
-	* * elf64-x86-64.c (elf_x86_64_relocate_section): Restore
-	R_X86_64_IRELATIVE.
+	* archures.c (bfd_architecture): Add bfd_arch_k1om.
+	(bfd_k1om_arch): New.
+	(bfd_archures_list): Add &bfd_k1om_arch.
+	* bfd-in2.h: Regenerated.
 
-2012-03-08  Tristan Gingold  <gingold@adacore.com>
+	* config.bfd (targ64_selvecs): Add bfd_elf64_k1om_vec if
+	bfd_elf64_x86_64_vec is supported.  Add bfd_elf64_k1om_freebsd_vec
+	if bfd_elf64_x86_64_freebsd_vec is supported.
+	(targ_selvecs): Likewise.
 
-	* vms-lib.c (_bfd_vms_lib_write_archive_contents): Set maximum
-	keylen according to archive kind.  Set nextvbn and nextrfa lhd
-	fields.  Add comments.
+	* configure.in: Support bfd_elf64_k1om_vec and
+	bfd_elf64_k1om_freebsd_vec.
+	* configure: Regenerated.
 
-2012-03-07  Nick Clifton  <nickc@redhat.com>
+	* cpu-k1om.c: New.
 
-	* elf-m10300.c (elf32_mn10300_link_hash_entry): Add tls_type
-	field.
-	(elf32_mn10300_link_hash_table): Add tls_ldm_got entry;
-	(elf_mn10300_tdata): Define.
-	(elf_mn10300_local_got_tls_type): Define.
-	(elf_mn10300_howto_table): Add entries for R_MN10300_TLS_GD,
-	R_MN10300_TLS_LD, R_MN10300_TLS_LDO, R_MN10300_TLS_GOTIE,
-	R_MN10300_TLS_IE, R_MN10300_TLS_LE, R_MN10300_TLS_DPTMOD,
-	R_MN10300_TLS_DTPOFF, R_MN10300_TLS_TPOFF relocs.
-	(mn10300_reloc_map): Likewise.
-	(elf_mn10300_tls_transition): New function.
-	(dtpoff, tpoff, mn10300_do_tls_transition): New functions.
-	(mn10300_elf_check_relocs): Add TLS support.
-	(mn10300_elf_final_link_relocate): Likewise.
-	(mn10300_elf_relocate_section): Likewise.
-	(mn10300_elf_relax_section): Likewise.
-	(elf32_mn10300_link_hash_newfunc): Initialise new field.
-	(_bfd_mn10300_copy_indirect_symbol): New function.
-	(elf32_mn10300_link_hash_table_create): Initialise new fields.
-	(_bfd_mn10300_elf_size_dynamic_sections): Add TLS support.
-	(_bfd_mn10300_elf_finish_dynamic_symbol): Likewise.
-	(_bfd_mn10300_elf_reloc_type_class): Allocate an
-	elf_mn10300_obj_tdata structure.
-	(elf_backend_copy_indirect_symbol): Define.
-	* reloc.c (BFD_MN10300_TLS_GD, BFD_MN10300_TLS_LD,
-	BFD_MN10300_TLS_LDO, BFD_MN10300_TLS_GOTIE, BFD_MN10300_TLS_IE,
-	BFD_MN10300_TLS_LE, BFD_MN10300_TLS_DPTMOD,
-	BFD_MN10300_TLS_DTPOFF, BFD_MN10300_TLS_TPOFF): New relocations.
-	(BFD_RELOC_MN10300_32_PCREL, BFD_RELOC_MN10300_16_PCREL): Move to
-	alongside other MN10300 relocations.
+	* elf64-x86-64.c (elf64_k1om_elf_object_p): New.
+	(bfd_elf64_k1om_vec): Likewise.
+	(bfd_elf64_k1om_freebsd_vec): Likewise.
+
+	* targets.c (bfd_elf64_k1om_vec): New.
+	(bfd_elf64_k1om_freebsd_vec): Likewise.
+	(_bfd_target_vector): Add bfd_elf64_k1om_vec and
+	bfd_elf64_k1om_freebsd_vec.
+
+2011-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix false coff-go32-exe matches.
+	* coff-i386.c (TARGET_SYM) <_bfd_check_format>: Conditionally use
+	COFF_CHECK_FORMAT.
+	* coff-stgo32.c (go32_check_format): New forward declaration.
+	(COFF_CHECK_FORMAT): New defintion.
+	(go32_check_format): New function.
+
+2011-07-15  Alan Modra  <amodra@gmail.com>
+
+	* configure.in: Bump version.
+	* configure: Regenerate.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* linker.c (_bfd_generic_section_already_linked): Set l_flags.
+	* elf-bfd.h (struct already_linked): Forward declare.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_fix_symbol_flags): Loop on indirect syms.
+	(_bfd_elf_adjust_dynamic_symbol): Remove FIXME.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add plt_static_chain.
+	(build_plt_stub): Add plt_static_chain param, don't load r11 if false.
+	(build_tls_get_addr_stub): Likewise.
+	(ppc_build_one_stub): Update calls to above.
+	(ppc_size_one_stub): Adjust stub size.
+	(ppc64_elf_size_stubs): Add plt_static_chain param, save to htab.
+	* elf64-ppc.h (ppc64_elf_size_stubs): Update prototype.
+
+2011-07-12  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (elf32_arm_section_flags): Delete.
+	(elf_backend_section_flags): Remove.
+
+2011-07-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12982
+	* elflink.c (bfd_elf_size_dynamic_sections): Also skip BFD_PLUGIN
+	when setting stack_flags.
+
+2011-07-11  Catherine Moore  <clm@codesourcery.com>
+
+	* aout-adobe.c (aout_32_bfd_lookup_section_flags): New definition.
+	* aout-target.h (MY_bfd_lookup_section_flags): New definition.
+	* aout-tic30.c (MY_bfd_lookup_section_flags): New definition.
+	* bfd-in2.h: Regenerated.
+	* bfd.c (bfd_lookup_section_flags): New definition.
+	* binary.c (binary_bfd_lookup_section_flags): New definition.
+	* bout.c (b_out_bfd_lookup_section_flags): New definition.
+	* coff-alpha.c (_bfd_ecoff_bfd_lookup_section_flags): New definition.
+	* coff-mips.c (_bfd_ecoff_bfd_lookup_section_flags): New definition.
+	* coff-rs6000.c (rs6000coff_vec): Include
+	bfd_generic_lookup_section_flags.
+	(pmac_xcoff_vec): Likewise.
+	* coffcode.h (coff_bfd_lookup_section_flags): New definition.
+	* coff64-rs6000.c (rs6000coff64_vec): Include
+	bfd_generic_lookup_section_flags.
+	(aix5coff64_vec): Likewise.
+	* ecoff.c (bfd_debug_section): Initialize flag_info field.
+	* elf-bfd.h (elf_backend_lookup_section_flags_hook): Declare.
+	(bfd_elf_lookup_section_flags): Declare.
+	* elflink.c (bfd_elf_lookup_section_flags): New function.
+	* elfxx-target.h (bfd_elfNN_bfd_lookup_section_flags): Define.
+	(elf_backend_lookup_section_flags_hook): Define.
+	(elf_backend_data): Add elf_backend_lookup_section_flags_hook.
+	* i386msdos.c (msdos_bfd_lookup_section_flags): New define.
+	* i386os9k.c (os9k_bfd_lookup_section_flags): New define.
+	* ieee.c (ieee_bfd_lookup_section_flags): New define.
+	* ihex.c (ihex_bfd_lookup_section_flags): New define.
+	* libbfd-in.h (_bfd_nolink_bfd_lookup_section_flags): Declare.
+	(bfd_generic_lookup_section_flags): Declare.
+	* libbfd.h: Regenerated.
+	* mach-o-target.c (bfd_mach_o_bfd_lookup_section_flags): New.
+	* mmo.c (mmo_bfd_lookup_section_flags): New definition.
+	* nlm-target.h (nlm_bfd_lookup_section_flags): New definition.
+	* oasys.c (oasys_bfd_lookup_section_flags): New definition.
+	* pef.c (bfd_pef_bfd_lookup_section_flags): New definition.
+	* plugin.c (bfd_plugin_bfd_lookup_section_flags): New definition.
+	* ppcboot.c (ppcboot_bfd_lookup_section_flags): New definition.
+	* reloc.c (bfd_generic_lookup_section_flags): New function.
+	* som.c (som_bfd_lookup_section_flags): New definition.
+	* srec.c (srec_bfd_lookup_section_flags): New definition.
+	* targets.c (flag_info): Declare.
+	(NAME##_bfd_lookup_section_flags): Add to LINK jump table.
+	(_bfd_lookup_section_flags): New.
+	* tekhex.c (tekhex_bfd_lookup_section_flags): New definition.
+	* versados.c (versados_bfd_lookup_section_flags): New definition.
+	* vms-alpha.c (alpha_vms_bfd_lookup_section_flag): New definition.
+	* xsym.c (bfd_sym_bfd_lookup_section_flags): New definition.
+
+2011-07-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12978
+	* elfnn-ia64.c (count_dyn_reloc): Fix a typo.
+
+2011-07-09  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12942
+	* elflink.c (elf_link_add_object_symbols): Use elf_discarded_section
+	rather than kept_section to determine whether a symbol is from
+	a discarded section.
+	* cofflink.c (coff_link_add_symbols): Make symbols from discarded
+	sections appear undefined.
+
+2011-07-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12942
+	* elf-bfd.h (_bfd_elf_section_already_linked): Replace
+	"asection *" with "struct already_linked *".
+	* libbfd-in.h (_bfd_nolink_section_already_linked): Likewise.
+	(_bfd_generic_section_already_linked): Likewise.
+	(bfd_section_already_linked_table_insert): Likewise.
+	(struct already_linked): New.
+	(struct bfd_section_already_linked): Use it.
+	* elflink.c (_bfd_elf_section_already_linked): Replace.
+	"asection *" with "struct already_linked *".  Replace the plugin
+	dummy with the LTO output.
+	* linker.c (_bfd_generic_section_already_linked): Likewise.
+	* targets.c (struct already_linked): Add forward declaration.
+	(bfd_target): Replace "struct bfd_section *" with
+	"struct already_linked *" in _section_already_linked.
 	* bfd-in2.h: Regenerate.
 	* libbfd.h: Regenerate.
 
-2012-03-06  Jakub Jelinek  <jakub@redhat.com>
-
-	* elf64-x86-64.c (elf_x86_64_relocate_section): For R_X86_64_RELATIVE
-	set relocate to TRUE.
-
-2012-03-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR ld/12152
-	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Also ignore
-	overflows for R_SPARC_UA32 in .stab sections.
-
-2012-03-01  Alan Modra  <amodra@gmail.com>
-
-	* elfxx-tilegx.c (tilegx_elf_relocate_section): Silence bogus warning.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* elf32-sh.c (sh_elf_osec_to_segment): Check for elf flavour bfd
-	before calling elf specific function.
-	(sh_elf_osec_readonly_p): Test for error return from above.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* elf32-spu.c (build_stub): Fix malloc under-allocation.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-	* reloc.c: Add BFD_RELOC_TILEPRO_TLS_GD_CALL,
-	BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD,
-	BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD,
-	BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD,
-	BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD,
-	BFD_RELOC_TILEPRO_TLS_IE_LOAD, BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE,
-	BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE,
-	BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_LO,
-	BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_LO,
-	BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HI,
-	BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HI,
-	BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HA,
-	BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HA,
-	BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_LE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_LE,
-	BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_LE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_LE,
-	BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_LE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_LE,
-	BFD_RELOC_TILEGX_TLS_GD_CALL, BFD_RELOC_TILEGX_IMM8_X0_TLS_GD_ADD,
-	BFD_RELOC_TILEGX_IMM8_X1_TLS_GD_ADD,
-	BFD_RELOC_TILEGX_IMM8_Y0_TLS_GD_ADD,
-	BFD_RELOC_TILEGX_IMM8_Y1_TLS_GD_ADD, BFD_RELOC_TILEGX_TLS_IE_LOAD,
-	BFD_RELOC_TILEGX_IMM8_X0_TLS_ADD,
-	BFD_RELOC_TILEGX_IMM8_X1_TLS_ADD,
-	BFD_RELOC_TILEGX_IMM8_Y0_TLS_ADD, BFD_RELOC_TILEGX_IMM8_Y1_TLS_ADD.
-	Delete BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT,
-	BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT,
-	BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT,
-	BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT,
-	BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT,
-	BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT,
-	BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT,
-	BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT,
-	BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD,
-	BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE,
-	BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE.
-	* elf32-tilepro.c (tilepro_elf_howto_table): Update tilepro
-	relocations.
-	(tilepro_reloc_map): Ditto.
-	(tilepro_info_to_howto_rela): Ditto.
-	(reloc_to_create_func): Ditto.
-	(tilepro_tls_translate_to_le): New.
-	(tilepro_tls_translate_to_ie): New.
-	(tilepro_elf_tls_transition): New.
-	(tilepro_elf_check_relocs): Handle new tls relocations.
-	(tilepro_elf_gc_sweep_hook): Ditto.
-	(allocate_dynrelocs): Ditto.
-	(tilepro_elf_relocate_section): Ditto.
-	(tilepro_replace_insn): New.
-	(insn_mask_X1): New.
-	(insn_mask_X0_no_dest_no_srca): New
-	(insn_mask_X1_no_dest_no_srca): New
-	(insn_mask_Y0_no_dest_no_srca): New
-	(insn_mask_Y1_no_dest_no_srca): New
-	(srca_mask_X0): New
-	(srca_mask_X1): New
-	(insn_tls_le_move_X1): New
-	(insn_tls_le_move_zero_X0X1): New
-	(insn_tls_ie_lw_X1): New
-	(insn_tls_ie_add_X0X1): New
-	(insn_tls_ie_add_Y0Y1): New
-	(insn_tls_gd_add_X0X1): New
-	(insn_tls_gd_add_Y0Y1): New
-	* elfxx-tilegx.c (tilegx_elf_howto_table): Update tilegx
-	relocations.
-	(tilegx_reloc_map): Ditto.
-	(tilegx_info_to_howto_rela): Ditto.
-	(reloc_to_create_func): Ditto.
-	(tilegx_elf_link_hash_table): New field disable_le_transition.
-	(tilegx_tls_translate_to_le): New.
-	(tilegx_tls_translate_to_ie): New.
-	(tilegx_elf_tls_transition): New.
-	(tilegx_elf_check_relocs): Handle new tls relocations.
-	(tilegx_elf_gc_sweep_hook): Ditto.
-	(allocate_dynrelocs): Ditto.
-	(tilegx_elf_relocate_section): Ditto.
-	(tilegx_copy_bits): New.
-	(tilegx_replace_insn): New.
-	(insn_mask_X1): New.
-	(insn_mask_X0_no_dest_no_srca): New.
-	(insn_mask_X1_no_dest_no_srca): New.
-	(insn_mask_Y0_no_dest_no_srca): New.
-	(insn_mask_Y1_no_dest_no_srca): New.
-	(insn_mask_X0_no_operand): New.
-	(insn_mask_X1_no_operand): New.
-	(insn_mask_Y0_no_operand): New.
-	(insn_mask_Y1_no_operand): New.
-	(insn_tls_ie_ld_X1): New.
-	(insn_tls_ie_ld4s_X1): New.
-	(insn_tls_ie_add_X0X1): New.
-	(insn_tls_ie_add_Y0Y1): New.
-	(insn_tls_ie_addx_X0X1): New.
-	(insn_tls_ie_addx_Y0Y1): New.
-	(insn_tls_gd_add_X0X1): New.
-	(insn_tls_gd_add_Y0Y1): New.
-	(insn_move_X0X1): New.
-	(insn_move_Y0Y1): New.
-	(insn_add_X0X1): New.
-	(insn_add_Y0Y1): New.
-	(insn_addx_X0X1): New.
-	(insn_addx_Y0Y1): New.
+2011-07-06  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h: Move loader related definitions to
+	include/mach-o/loader.h.  Include it.
+
+2011-07-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_post_process_headers): Always
+	define to _bfd_elf_set_osabi.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* elf.c (_bfd_elf_set_osabi): Use ELFOSABI_GNU name instead of
+	ELFOSABI_LINUX alias.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf64-hppa.c: Likewise.
+
+2011-07-01  Ian Lance Taylor  <iant@google.com>
+
+	* elf32-i386.c (elf_i386_eh_frame_plt): Correct expression: change
+	DW_OP_lit3 to DW_OP_lit2.
+
+2011-07-01  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Don't look at
+	dyn relocs when called to copy flags for a weak sym.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	(ppc64_elf_merge_private_bfd_data): Delete.
+	(bfd_elf64_bfd_merge_private_bfd_data): Define as
+	_bfd_generic_verify_endian_match.
+
+2011-06-30  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* bfd/elf32-tic6x.c (elf32_tic6x_set_osabi): Also set it if
+	link_info is NULL.
+
+2011-06-28  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (vms_private_data_struct): Make vms_linkage_index
+	unsigned int.
+	(_bfd_vms_write_etir): Write linkage index from reloc.
+
+2011-06-28  Fawzi Mohamed <fawzi.mohamed@nokia.com>
+
+	* mach-o.c (bfd_mach_o_read_command): Also ignore
+	BFD_MACH_O_LC_ROUTINES_64.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_write_etir): Use 'section' to get current
+	section target index.
+
+2011-06-27  Nick Clifton  <nickc@redhat.com>
+
+	* cisco-core.c (cisco_core_little_vec): Add initialization of
+	match_priority field.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* cache.c: Include bfd_stdint.h.
+	(cache_bmmap): Change profile.  Return region start and size.
+	* bfdio.c (struct bfd_iovec): Change bmmap profile.
+	(bfd_mmap): Change profile and adjust.   Update comment.
+	(memory_bmmap): Change profile.
+	* opncls.c (opncls_bmmap): Change profile.
+	* vms-lib.c (vms_lib_bmmap): Likewise.
 	* libbfd.h: Regenerate.
 	* bfd-in2.h: Regenerate.
 
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* config.bfd (tilegx-*-*): rename little endian vector; add big
-	endian vector.
-	(tilegxbe-*-*): New case.
-	* configure.in (bfd_elf32_tilegx_vec): Rename...
-	(bfd_elf32_tilegx_le_vec): ... to this.
-	(bfd_elf32_tilegx_be_vec): New vector.
-	(bfd_elf64_tilegx_vec): Rename...
-	(bfd_elf64_tilegx_le_vec): ... to this.
-	(bfd_elf64_tilegx_be_vec): New vector.
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-misc.c (vms_time_to_time_t): Adjust overflow detection.
+	Add comment.
+
+2011-06-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_post_process_headers): Don't
+	define for FreeBSD/x86-64 nor FreeBSD/L1OM.  Define for L1OM.
+
+2011-06-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf64-x86-64.c (elf_x86_64_link_hash_table_create): Initialize
+	PLT_EH_FRAME.
+	* elf32-i386.c (elf_i386_link_hash_table): Likewise.
+
+2011-06-24  Richard Henderson  <rth@redhat.com>
+
+	PR ld/12928
+	* elf64-alpha.c (elf64_alpha_relax_tls_get_addr): Recover the
+	tlsgd insn before swapping adjacent insns.
+
+2011-06-24  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_slurp_relocs): Add a guard for relocs in the
+	absolute section.
+
+2011-06-24  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12921
+	* elf.c (assign_file_positions_for_load_sections): Don't align
+	sh_offset for all SHT_NOBITS sections here, just .tbss sections
+	that don't get a PT_LOAD.
+
+2011-06-22  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_relocate_section): Allow R_SH_TLS_LE_32 for PIE.
+	(sh_elf_check_relocs): Likewise.
+
+2011-06-22  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): No dynamic reloc for
+	TPREL in a PIE image.
+	(alpha_dynamic_entries_for_reloc): Likewise.
+	(elf64_alpha_relocate_section): Allow TPREL in PIE images.
+	(elf64_alpha_relax_got_load): Likewise.
+
+2011-06-22  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Allow R_ARM_TLS_LE32
+	for PIE.
+
+2011-06-22  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Allow type changes for
+	plugin symbols.  Fix segfault on linker scrip defined syms.
+
+2011-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/12570
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): Allow no relocations
+	at all for linker created .eh_frame sections.
+	(_bfd_elf_discard_section_eh_frame): Handle linker created
+	.eh_frame sections with no relocations.
+	* elf64-x86-64.c: Include dwarf2.h.
+	(elf_x86_64_eh_frame_plt): New variable.
+	(PLT_CIE_LENGTH, PLT_FDE_LENGTH, PLT_FDE_START_OFFSET,
+	PLT_FDE_LEN_OFFSET): Define.
+	(struct elf_x86_64_link_hash_table): Add plt_eh_frame field.
+	(elf_x86_64_create_dynamic_sections): Create and fill in
+	.eh_frame section for .plt section.
+	(elf_x86_64_size_dynamic_sections): Write .plt section size
+	into .eh_frame FDE covering .plt section.
+	(elf_x86_64_finish_dynamic_sections): Write .plt section
+	start into .eh_frame FDE covering .plt section.  Call
+	_bfd_elf_write_section_eh_frame on htab->plt_eh_frame section.
+	(elf_backend_plt_alignment): Define to 4.
+	* elf32-i386.c: Include dwarf2.h.
+	(elf_i386_eh_frame_plt): New variable.
+	(PLT_CIE_LENGTH, PLT_FDE_LENGTH, PLT_FDE_START_OFFSET,
+	PLT_FDE_LEN_OFFSET): Define.
+	(struct elf_i386_link_hash_table): Add plt_eh_frame field.
+	(elf_i386_create_dynamic_sections): Create and fill in
+	.eh_frame section for .plt section.
+	(elf_i386_size_dynamic_sections): Write .plt section size
+	into .eh_frame FDE covering .plt section.
+	(elf_i386_finish_dynamic_sections): Write .plt section
+	start into .eh_frame FDE covering .plt section.  Call
+	_bfd_elf_write_section_eh_frame on htab->plt_eh_frame section.
+	(elf_backend_plt_alignment): Define to 4.
+
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_post_process_headers): Defined
+	for x32.
+
+2011-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c: Include <stdarg.h> and CORE_HEADER if
+	CORE_HEADER is defined.
+	(elf_x86_64_write_core_note): New.
+	(elf_backend_write_core_note): Likewise.
+
+	* hosts/x86-64linux.h (uint64_t): New.
+	(user_regsx32_struct): Likewise.
+	(elf_gregx32_t): Likewise.
+	(ELF_NGREGX32): Likewise.
+	(elf_gregsetx32_t): Likewise.
+	(elf_prstatusx32): Likewise.
+	(prstatusx32_t): Likewise.
+	(user_fpregs32_struct): Removed.
+	(user_fpxregs32_struct): Likewise.
+	(user32): Likewise.
+	(elf_fpregset32_t): Likewise.
+	(elf_fpxregset32_t): Likewise.
+	(prgregset32_t): Likewise.
+	(prfpregset32_t): Likewise.
+
+2011-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_grok_prstatus): Support x32.
+	(elf_x86_64_grok_psinfo): Likewise.
+
+2011-06-16  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (elf_find_function): Fail if not provided with a symbol
+	table.
+
+2011-06-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* elf-bfd.h (elfcore_write_arm_vfp): Add prototype.
+	* elf.c (elfcore_grok_arm_vfp): New function.
+	(elfcore_grok_note): Call it to handle NT_ARM_VFP notes.
+	(elfcore_write_arm_vfp): New function.
+	(elfcore_write_register_note): Call it to handle .reg-arm-vfp.
+
+2011-06-14  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_copy_indirect_symbol): Rename from
+	elf64_alpha_merge_ind_symbols; adjust for the generic interface.
+	(elf64_alpha_always_size_sections): Don't call
+	elf64_alpha_merge_ind_symbols.
+	(elf_backend_copy_indirect_symbol): New.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12887
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): Check sec_info_type
+	before doing anything.
+	(_bfd_elf_discard_section_eh_frame): Likewise.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* Makefile.am: Formatting.
+	* Makefile.in: Regenerate.
+	* configure.in (bfd_elf64_tilegx_vec): Add elfxx-tilegx.lo.
+	* po/SRC-POTFILES.in: Regnerate.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* elf32-tilepro.c (tilepro_elf_size_dynamic_sections): Don't use PTR.
+	(allocate_dynrelocs, readonly_dynrelocs): Replace PTR with void *.
+	Don't handle warning symbols here.
+	* elfxx-tilegx.c (tilegx_elf_size_dynamic_sections): As above.
+	(allocate_dynrelocs, readonly_dynrelocs): As above.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12851
+	* elflink.c (_bfd_elf_gc_mark_extra_sections): New function.
+	(elf_gc_sweep): Don't treat debug and sections like .comment
+	specially here.
+	(bfd_elf_gc_sections): Treat note sections as gc roots only when
+	not part of a group.  Always call gc_mark_extra_sections.
+	* elf-bfd.h (_bfd_elf_gc_mark_extra_sections): Declare.
+	* elfxx-target.h (elf_backend_gc_mark_extra_sections): Default to
+	_bfd_elf_gc_mark_extra_sections.
+	* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Call
+	_bfd_elf_gc_mark_extra_sections.
+	* elf32-tic6x.c (elf32_tic6x_gc_mark_extra_sections): Likewise.
+
+2011-06-13  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-tilepro.c (tilepro_elf_check_relocs): Delete unused local
+	variable 'local_got_offsets'.
+	* elfxx-tilegx.c (tilegx_elf_check_relocs): Likewise.
+	(tilegx_finish_dyn): Delete unused local variable 'abi_64_p'.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-tilegx.lo and cpu-tilepro.lo.
+	(ALL_MACHINE_CFILES): Add cpu-tilegx.c and cpu-tilepro.c.
+	(BFD32_BACKENDS): Add elf32-tilegx.lo, elf32-tilepro.lo,
+	and elfxx-tilegx.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-tilegx.c elf32-tilepro.c, and
+	elfxx-tilegx.c.
+	(BFD64_BACKENDS): Add elf64-tilegx.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-tilegx.c.
+	* Makefile.in: Regenerate.
+	* arctures.c (bfd_architecture): Define bfd_arch_tilepro,
+	bfd_arch_tilegx, bfd_mach_tilepro, bfd_mach_tilegx.
+	(bfd_arch_info): Add bfd_tilegx_arch, bfd_tilepro_arch.
+	(bfd_archures_list): Add bfd_tilegx_arch, bfd_tilepro_arch.
+	bfd-in2.h: Regenerate.
+	* config.bfd: Handle tilegx-*-* and tilepro-*-*.
+	* configure.in: Handle bfd_elf32_tilegx_vec, bfd_elf32_tilepro_vec,
+	and bfd_elf64_tilegx_vec.
+	* configure: Regenerate.
+	* elf-bfd.h (enum elf_target_id): Define TILEGX_ELF_DATA and
+	TILEPRO_ELF_DATA.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_TILEPRO_{COPY, GLOB_DAT, JMP_SLOT,
+	RELATIVE, BROFF_X1, JOFFLONG_X1, JOFFLONG_X1_PLT, IMM8_X0,
+	IMM8_Y0, IMM8_X1, IMM8_Y1, DEST_IMM8_X1, MT_IMM15_X1, MF_IMM15_X1,
+	IMM16_X0, IMM16_X1, IMM16_X0_LO, IMM16_X1_LO, IMM16_X0_HI,
+	IMM16_X1_HI, IMM16_X0_HA, IMM16_X1_HA, IMM16_X0_PCREL,
+	IMM16_X1_PCREL, IMM16_X0_LO_PCREL, IMM16_X1_LO_PCREL,
+	IMM16_X0_HI_PCREL, IMM16_X1_HI_PCREL, IMM16_X0_HA_PCREL,
+	IMM16_X1_HA_PCREL, IMM16_X0_GOT, IMM16_X1_GOT, IMM16_X0_GOT_LO,
+	IMM16_X1_GOT_LO, IMM16_X0_GOT_HI, IMM16_X1_GOT_HI,
+	IMM16_X0_GOT_HA, IMM16_X1_GOT_HA, MMSTART_X0, MMEND_X0,
+	MMSTART_X1, MMEND_X1, SHAMT_X0, SHAMT_X1, SHAMT_Y0, SHAMT_Y1,
+	IMM16_X0_TLS_GD, IMM16_X1_TLS_GD, IMM16_X0_TLS_GD_LO,
+	IMM16_X1_TLS_GD_LO, IMM16_X0_TLS_GD_HI, IMM16_X1_TLS_GD_HI,
+	IMM16_X0_TLS_GD_HA, IMM16_X1_TLS_GD_HA, IMM16_X0_TLS_IE,
+	IMM16_X1_TLS_IE, IMM16_X0_TLS_IE_LO, IMM16_X1_TLS_IE_LO,
+	IMM16_X0_TLS_IE_HI, IMM16_X1_TLS_IE_HI, IMM16_X0_TLS_IE_HA,
+	IMM16_X1_TLS_IE_HA, TLS_DTPMOD32, TLS_DTPOFF32, TLS_TPOFF32}
+	Add BFD_RELOC_TILEGX_{HW0, HW1, HW2, HW3, HW0_LAST, HW1_LAST,
+	HW2_LAST, COPY, GLOB_DAT, JMP_SLOT, RELATIVE, BROFF_X1,
+	JUMPOFF_X1, JUMPOFF_X1_PLT, IMM8_X0, IMM8_Y0, IMM8_X1, IMM8_Y1,
+	DEST_IMM8_X1, MT_IMM14_X1, MF_IMM14_X1, MMSTART_X0, MMEND_X0,
+	SHAMT_X0, SHAMT_X1, SHAMT_Y0, SHAMT_Y1, IMM16_X0_HW0,
+	IMM16_X1_HW0, IMM16_X0_HW1, IMM16_X1_HW1, IMM16_X0_HW2,
+	IMM16_X1_HW2, IMM16_X0_HW3, IMM16_X1_HW3, IMM16_X0_HW0_LAST,
+	IMM16_X1_HW0_LAST, IMM16_X0_HW1_LAST, IMM16_X1_HW1_LAST,
+	IMM16_X0_HW2_LAST, IMM16_X1_HW2_LAST, IMM16_X0_HW0_PCREL,
+	IMM16_X1_HW0_PCREL, IMM16_X0_HW1_PCREL, IMM16_X1_HW1_PCREL,
+	IMM16_X0_HW2_PCREL, IMM16_X1_HW2_PCREL, IMM16_X0_HW3_PCREL,
+	IMM16_X1_HW3_PCREL, IMM16_X0_HW0_LAST_PCREL,
+	IMM16_X1_HW0_LAST_PCREL, IMM16_X0_HW1_LAST_PCREL,
+	IMM16_X1_HW1_LAST_PCREL, IMM16_X0_HW2_LAST_PCREL,
+	IMM16_X1_HW2_LAST_PCREL, IMM16_X0_HW0_GOT, IMM16_X1_HW0_GOT,
+	IMM16_X0_HW1_GOT, IMM16_X1_HW1_GOT, IMM16_X0_HW2_GOT,
+	IMM16_X1_HW2_GOT, IMM16_X0_HW3_GOT, IMM16_X1_HW3_GOT,
+	IMM16_X0_HW0_LAST_GOT, IMM16_X1_HW0_LAST_GOT,
+	IMM16_X0_HW1_LAST_GOT, IMM16_X1_HW1_LAST_GOT,
+	IMM16_X0_HW2_LAST_GOT, IMM16_X1_HW2_LAST_GOT, IMM16_X0_HW0_TLS_GD,
+	IMM16_X1_HW0_TLS_GD, IMM16_X0_HW1_TLS_GD, IMM16_X1_HW1_TLS_GD,
+	IMM16_X0_HW2_TLS_GD, IMM16_X1_HW2_TLS_GD, IMM16_X0_HW3_TLS_GD,
+	IMM16_X1_HW3_TLS_GD, IMM16_X0_HW0_LAST_TLS_GD,
+	IMM16_X1_HW0_LAST_TLS_GD, IMM16_X0_HW1_LAST_TLS_GD,
+	IMM16_X1_HW1_LAST_TLS_GD, IMM16_X0_HW2_LAST_TLS_GD,
+	IMM16_X1_HW2_LAST_TLS_GD, IMM16_X0_HW0_TLS_IE,
+	IMM16_X1_HW0_TLS_IE, IMM16_X0_HW1_TLS_IE, IMM16_X1_HW1_TLS_IE,
+	IMM16_X0_HW2_TLS_IE, IMM16_X1_HW2_TLS_IE, IMM16_X0_HW3_TLS_IE,
+	IMM16_X1_HW3_TLS_IE, IMM16_X0_HW0_LAST_TLS_IE,
+	IMM16_X1_HW0_LAST_TLS_IE, IMM16_X0_HW1_LAST_TLS_IE,
+	IMM16_X1_HW1_LAST_TLS_IE, IMM16_X0_HW2_LAST_TLS_IE,
+	IMM16_X1_HW2_LAST_TLS_IE, TLS_DTPMOD64, TLS_DTPOFF64, TLS_TPOFF64,
+	TLS_DTPMOD32, TLS_DTPOFF32, TLS_TPOFF32}
+	* targets.c (bfd_elf32_tilegx_vec): Declare.
+	(bfd_elf32_tilepro_vec): Declare.
+	(bfd_elf64_tilegx_vec): Declare.
+	(bfd_target_vector): Add bfd_elf32_tilegx_vec, bfd_elf32_tilepro_vec,
+	and bfd_elf64_tilegx_vec.
+	* cpu-tilegx.c: New file.
+	* cpu-tilepro.c: New file.
+	* elf32-tilepro.h: New file.
+	* elf32-tilepro.c: New file.
+	* elf32-tilegx.c: New file.
+	* elf32-tilegx.h: New file.
+	* elf64-tilegx.c: New file.
+	* elf64-tilegx.h: New file.
+	* elfxx-tilegx.c: New file.
+	* elfxx-tilegx.h: New file.
+
+2011-06-13  Alan Modra  <amodra@gmail.com>
+
+	* linker.c (bfd_link_hash_traverse): Follow warning symbol link.
+	(_bfd_generic_link_write_global_symbol, fix_syms): Don't handle
+	warning symbols here.
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Likewise.
+	* elf32-arm.c (allocate_dynrelocs_for_symbol,
+	elf32_arm_readonly_dynrelocs): Likewise.
+	* elf32-bfin.c (bfin_discard_copies): Likewise.
+	* elf32-cris.c (elf_cris_adjust_gotplt_to_got,
+	elf_cris_discard_excess_dso_dynamics,
+	elf_cris_discard_excess_program_dynamics): Likewise.
+	* elf32-hppa.c (allocate_plt_static, allocate_dynrelocs,
+	clobber_millicode_symbols, readonly_dynrelocs): Likewise.
+	* elf32-i370.c (i370_elf_adjust_dynindx): Likewise.
+	* elf32-i386.c (elf_i386_allocate_dynrelocs,
+	elf_i386_readonly_dynrelocs): Likewise.
+	* elf32-lm32.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-m32c.c (m32c_relax_plt_check, m32c_relax_plt_realloc): Likewise.
+	* elf32-m32r.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-m68k.c (elf_m68k_discard_copies): Likewise.
+	* elf32-microblaze.c (allocate_dynrelocs): Likewise.
+	* elf32-ppc.c (allocate_dynrelocs, maybe_set_textrel): Likewise.
+	* elf32-s390.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-score.c (score_elf_sort_hash_table_f): Likewise.
+	* elf32-score7.c (score_elf_sort_hash_table_f): Likewise.
+	* elf32-sh.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-tic6x.c (elf32_tic6x_allocate_dynrelocs,
+	elf32_tic6x_readonly_dynrelocs): Likewise.
+	* elf32-vax.c (elf_vax_discard_copies): Likewise.
+	* elf32-xstormy16.c (xstormy16_relax_plt_check,
+	xstormy16_relax_plt_realloc): Likewise.
+	* elf32-xtensa.c (elf_xtensa_allocate_dynrelocs): Likewise.
+	* elf64-alpha.c (elf64_alpha_output_extsym,
+	elf64_alpha_calc_got_offsets_for_symbol,
+	elf64_alpha_calc_dynrel_sizes, elf64_alpha_size_rela_got_1): Likewise.
+	* elf64-hppa.c (elf64_hppa_mark_exported_functions,
+	allocate_global_data_opd, elf64_hppa_mark_milli_and_exported_functions,
+	elf_hppa_unmark_useless_dynamic_symbols,
+	elf_hppa_remark_useless_dynamic_symbols): Likewise.
+	* elf64-ppc.c (ppc64_elf_gc_mark_dynamic_ref, func_desc_adjust,
+	adjust_opd_syms, adjust_toc_syms, allocate_dynrelocs,
+	readonly_dynrelocs, merge_global_got, reallocate_got,
+	undo_symbol_twiddle): Likewise.
+	* elf64-s390.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf64-sh64.c (sh64_elf64_discard_copies): Likewise.
+	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs,
+	elf_x86_64_readonly_dynrelocs): Likewise.
+	* elflink.c (elf_link_renumber_hash_table_dynsyms,
+	elf_link_renumber_local_hash_table_dynsyms, _bfd_elf_export_symbol,
+	_bfd_elf_link_find_version_dependencies,
+	_bfd_elf_link_assign_sym_version, _bfd_elf_adjust_dynamic_symbol,
+	_bfd_elf_link_sec_merge_syms, elf_adjust_dynstr_offsets,
+	elf_collect_hash_codes, elf_collect_gnu_hash_codes,
+	elf_renumber_gnu_hash_syms, elf_gc_sweep_symbol,
+	elf_gc_propagate_vtable_entries_used,
+	elf_gc_smash_unused_vtentry_relocs, bfd_elf_gc_mark_dynamic_ref_symbol,
+	elf_gc_allocate_got_offsets): Likewise.
+	* elfnn-ia64.c (elfNN_ia64_global_dyn_info_free,
+	elfNN_ia64_global_dyn_sym_thunk): Likewise.
+	* elfxx-mips.c (mips_elf_check_symbols, mips_elf_output_extsym,
+	mips_elf_sort_hash_table_f, allocate_dynrelocs): Likewise.
+	* elfxx-sparc.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* i386linux.c (linux_tally_symbols): Likewise.
+	* m68klinux.c (linux_tally_symbols): Likewise.
+	* sparclinux.c (linux_tally_symbols): Likewise.
+	* sunos.c (sunos_scan_dynamic_symbol): Likewise.
+	* xcofflink.c (xcoff_post_gc_symbol): Likewise.
+
+	* elflink.c (elf_link_output_extsym): Make it a bfd_hash_traverse
+	function.  Update all callers.
+	* aoutx.h (aout_link_write_other_symbol): Likewise.
+	* pdp11.c (aout_link_write_other_symbol): Likewise.
+	* cofflink.c (_bfd_coff_write_global_sym): Likewise.
+	* ecoff.c (ecoff_link_write_external): Likewise.
+	* xcofflink.c (xcoff_write_global_symbol): Likewise.
+	* vms-alpha.c (alpha_vms_link_output_symbol): Likewise.  Handle
+	warning symbols.
+	* ecoff.c (ecoff_link_hash_traverse): Delete.
+	* coff-ppc.c (ppc_bfd_coff_final_link): Use bfd_hash_traverse for
+	_bfd_coff_write_global_sym.
+	* libcoff-in.h (_bfd_coff_write_global_sym): Update prototype.
+	* libcoff.h: Regenerate.
+
+2011-06-10  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): If the
+	backend does not provide a function for creating dynamic sections
+	then fail.
+	(bfd_elf_final_link): Issue a warning message if a dynamic section
+	has the SHT_NOTE type.
+	(bfd_elf_final_link): Do not look for dynamic strings in a section
+	that does not have the SHT_STRTAB type or the name .dynstr.
+	* elf32-arm.c (elf32_arm_finish_dynamic_sections): Fail if the got
+	section is not in the output binary.
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Likewise.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* elfnn-ia64.c (elfNN_ia64_relax_section, elfNN_ia64_choose_gp)
+	(elfNN_ia64_relocate_section, elfNN_vms_object_p): Remove trailing
+	spaces.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* bfd.c (bfd_get_sign_extend_vma): Handle aixcoff.
+
+2011-06-09  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12845
+	* elf.c (_bfd_elf_init_private_section_data): Add an assertion
+	that the output section has an allocated bfd_elf_section_data
+	structure.
+	* elfxx-mips.c (mips_elf_check_symbols): Do not create a stub for
+	symbols in sections that have been removed by garbage collection.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Allow R_X86_64_64
+	relocations in SEC_DEBUGGING sections when building shared
+	libraries.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12851
+	* elflink.c (elf_gc_sweep): Don't check SHT_NOTE sections here.
+	(bfd_elf_gc_sections): Also check SHT_NOTE sections.
+
+2011-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (OBJS): Add elfxx-ia64.obj
+	Remove vax case.
+
+2011-06-08  Alan Modra  <amodra@gmail.com>
+
+	* aix386-core.c, * cisco-core.c, * hpux-core.c, * osf-core.c,
+	* sco5-core.c: Init match_priority field.
+
+2011-06-08  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_archive_symbol_lookup): Follow warning and
+	indirect links here.
+
+2011-06-07  Joel Brobecker  <brobecker@adacore.com>
+
+	* irix-core.c (irix_core_vec): Add match_priority field.
+
+2011-06-06  Alan Modra  <amodra@gmail.com>
+
+	* targets.c (bfd_target): Make ar_max_namelen an unsigned char.
+	Add match_priority.
+	* configure.in: Bump bfd version.
+	* elfcode.h (elf_object_p): Delete hacks preventing match of
+	EM_NONE and ELFOSABI_NONE targets when a better match exists.
+	* elfxx-target.h (elf_match_priority): Define and use.
+	* format.c (bfd_check_format_matches): Use target match_priority
+	to choose best of multiple matching targets.  In cases with multiple
+	matches rerun _bfd_check_format if we don't choose the last match.
+	* aout-adobe.c, * aout-arm.c, * aout-target.h, * aout-tic30.c,
+	* binary.c, * bout.c, * coff-alpha.c, * coff-i386.c, * coff-i860.c,
+	* coff-i960.c, * coff-ia64.c, * coff-mips.c, * coff-or32.c,
+	* coff-ppc.c, * coff-rs6000.c, * coff-sh.c, * coff-tic30.c,
+	* coff-tic54x.c, * coff-x86_64.c, * coff64-rs6000.c, * coffcode.h,
+	* i386msdos.c, * i386os9k.c, * ieee.c, * ihex.c, * mach-o-target.c,
+	* mipsbsd.c, * mmo.c, * nlm-target.h, * oasys.c, * pdp11.c,
+	* pe-mips.c, * pef.c, * plugin.c, * ppcboot.c, * som.c, * srec.c,
+	* tekhex.c, * trad-core.c, * verilog.c, * versados.c, * vms-alpha.c,
+	* vms-lib.c, * xsym.c: Init match_priority field.
 	* configure: Regenerate.
-	* elf32-tilegx.c (TARGET_LITTLE_SYM): Rename.
-	(TARGET_LITTLE_NAME): Ditto.
-	(TARGET_BIG_SYM): Define.
-	(TARGET_BIG_NAME): Define.
-	* elf64-tilegx.c (TARGET_LITTLE_SYM): Rename.
-	(TARGET_LITTLE_NAME): Ditto.
-	(TARGET_BIG_SYM): Define.
-	(TARGET_BIG_NAME): Define.
-	* targets.c (bfd_elf32_tilegx_vec): Rename...
-	(bfd_elf32_tilegx_le_vec): ... to this.
-	(bfd_elf32_tilegx_be_vec): Declare.
-	(bfd_elf64_tilegx_vec): Rename...
-	(bfd_elf64_tilegx_le_vec): ... to this.
-	(bfd_elf64_tilegx_be_vec): Declare.
-	(_bfd_target_vector): Add / rename above vectors.
-	* arctures.c (bfd_architecture): Define bfd_mach_tilegx32.
 	* bfd-in2.h: Regenerate.
-	* cpu-tilegx.c (bfd_tilegx32_arch): define.
-	(bfd_tilegx_arch): link to bfd_tilegx32_arch.
 
-2012-02-24  Nick Clifton  <nickc@redhat.com>
+2011-06-04  H.J. Lu  <hongjiu.lu@intel.com>
 
-	PR ld/13730
-	* reloc.c (bfd_generic_get_relocated_section_contents): Issue an
-	error message instead of aborting, when an outofrange reloc is
-	encountered.
+	PR ld/12842
+	* elfcode.h (elf_object_p): Revert the last change.
 
-2012-02-23  Iain Sandoe  <idsandoe@googlemail.com>
+2011-06-04  Alan Modra  <amodra@gmail.com>
 
-	* mach-o.c (bfd_mach_o_swap_in_non_scattered_reloc): New.
-	(bfd_mach_o_canonicalize_one_reloc):  Swap non-scattered reloc
-	bit-fields when target and host differ in endian-ness.  When
-	PAIRs are non-scattered	find the 'symbol' from the preceding
-	reloc.  Add FIXME re. reloc symbols on section boundaries.
-	(bfd_mach_o_swap_out_non_scattered_reloc): New.
-	(bfd_mach_o_write_relocs): Use bfd_mach_o_encode_non_scattered_reloc.
+	* archures.c (bfd_arch_get_compatible): If one arch is unknown,
+	return the other arch.
+	* elfcode.h (elf_object_p): Allow explicit match to generic ELF
+	target.
 
-2012-02-17  Iain Sandoe  <idsandoe@googlemail.com>
+2011-06-03  Bertram Felgenhauer  <bertram.felgenhauer@gmail.com>
 
-	* mach-o-i386.c (i386_howto_table): Add support for 16 bit
-	sect-diffs.
-	(bfd_mach_o_i386_swap_reloc_in): Handle 16bit sect-diffs.
-	(bfd_mach_o_i386_swap_reloc_out): Likewise.
+	PR ld/12682
+	* hash.c (higher_primer_number): Add more, small, prime numbers.
+	(bfd_hash_set_default_size): Likewise.
 
-2012-02-17  Tristan Gingold  <gingold@adacore.com>
+2011-06-02  Nick Clifton  <nickc@redhat.com>
 
-	* reloc.c (BFD_RELOC_MACH_O_LOCAL_SECTDIFF):
-	* libbfd.h: Regenerated.
-	* bfd-in2.h: Likewise.
-	* mach-o-i386.c (i386_howto_table): Include local sectdiff.
-	(bfd_mach_o_i386_swap_reloc_in): Update for local sectdiff.
-	(bfd_mach_o_i386_swap_reloc_out): Likewise.
+	* coff-mcore.c: Fix spelling typo.
+	* coff-stgo32.c: Likewise.
+	* elf32-arm.c: Likewise.
+	* elf32-avr.c: Likewise.
+	* elf-m68hc1x.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-mep.c: Likewise.
+	* elf32-mt.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* netbsd.h: Likewise.
+	* nlmcode.h: Likewise.
+	* vms-alpha.c: Likewise.
+	* po/bfd.pot: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2011-06-01  DJ Delorie  <dj@redhat.com>
+
+	* config.bfd: Add bfd_elf32_rx_be_ns_vec.
+	* target.c: Likewise.
+	* configure.in: Likewise.
+	* configure.in: Regenerate.
+	* elf32-rx.c: Add elf32-rx-be-ns target.
+	(rx_elf_object_p): Never allow the be-ns target by default,
+	only allow it if the user requests it.
+
+2011-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Properly warn
+	relocation in readonly section in a shared object.
+	* elf64-x86-64.c (elf_x86_64_size_dynamic_sections): Likewise.
+
+2011-05-31  Nick Clifton  <nickc@redhat.com>
+
+	* archive.c (adjust_relative_path): Fix comment to prevent it
+	corrupting the auto-generated bfd.h.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Only do bl conversion
+	for known functions.
+	(elf32_arm_swap_symbol_in): Only set ST_BRANCH_TO_ARM for function
+	symbols.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (arm_stub_is_thumb): Add
+	arm_stub_long_branch_v4t_thumb_tls_pic.
+	(elf32_arm_final_link_relocate): TLS stubs are always ARM.
+	Handle Thumb stubs.
+
+2011-05-27  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12710
+	* archive.c (_bfd_get_elt_at_filepos): Set correct error value if
+	unable to read a file pointed to by an entry in a thin archive.
+	(adjust_relative_path): Use lrealpath to canonicalize paths.
+	Handle the case where the reference path is above the current
+	path in the directory tree.
+
+2011-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12809
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Handle
+	R_X86_64_TPOFF64 in executable.
+
+2011-05-26  Alan Modra  <amodra@gmail.com>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL): Remove most of comment.
+	* elflink.c (_bfd_elf_symbol_refs_local_p): Expand
+	local_protected comment.
+
+2011-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in (bfd_elf32_ia64_big_vec, bfd_elf32_ia64_hpux_big_vec)
+	(bfd_elf64_ia64_big_vec, bfd_elf64_ia64_hpux_big_vec)
+	(bfd_elf64_ia64_little_vec, bfd_elf64_ia64_vms_vec): Add elfxx-ia64.lo
+	* Makefile.am (BFD64_BACKENDS): Add elfxx-ia64.lo
+	(BFD64_BACKENDS_CFILES): Add elfxx-ia64.c
+	(elf32-ia64.c): Created from elfnn-ia64.c
+	(elf64-ia64.c): Likewise.
+	* elfxx-ia64.h: New file.
+	* elfxx-ia64.c: Split with elfnn-ia64.c.  Keep only the following
+	functions.Includes elfxx-ia64.h.
+	(elfNN_ia64_reloc): Renames to ia64_elf_reloc.  Adjust error message.
+	(IA64_HOWTO): Adjust.
+	(lookup_howto): Renames to ia64_elf_lookup_howto.  Make it public.
+	(elfNN_ia64_reloc_type_lookup): Renames to
+	ia64_elf_reloc_type_lookup. Make it public. Adjust calls.
+	(elfNN_ia64_reloc_name_lookup): Renames to
+	ia64_elf_reloc_name_lookup. Make it public.
+	(elfNN_ia64_relax_br): Renames to ia64_elf_relax_br.  Make it public.
+	(elfNN_ia64_relax_brl): Renames to ia64_elf_relax_brl. Make it
+	public.
+	(elfNN_ia64_relax_ldxmov): Renames to ia64_elf_relax_ldxmov.
+	Move it and make it public.  Move prototype to elfxx-ia64.h
+	(elfNN_ia64_install_value): Renames to ia64_elf_install_value.
+	Move prototype to elfxx-ia64.h
+	* elfnn-ia64.c: New file, split from elfxx-ia64.c.
+	(elfNN_ia64_info_to_howto): Adjust calls.
+	(elfNN_ia64_relax_section): Adjust calls.
+	(count_dyn_reloc): Fix typo.
+	(elfNN_ia64_relocate_section): Adjust calls.
+	(elfNN_ia64_finish_dynamic_symbol): Likewise.
+	(bfd_elfNN_bfd_reloc_type_lookup)
+	(bfd_elfNN_bfd_reloc_name_lookup): Adjust macros.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
 
-2012-02-17  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+2011-05-23  DJ Delorie  <dj@redhat.com>
 
-	* elf32-s390.c (elf_s390_relocate_section): Support basr in the
-	GD->LE and LD->LE optimizations.
+	* elf32-rx.c (rx_elf_object_p): When reading an RX object in, undo
+	the vma/lma swapping done in elf32_rx_modify_program_headers.
 
-2012-02-16  Alan Modra  <amodra@gmail.com>
+2011-05-23  Nick Clifton  <nickc@redhat.com>
 
-	PR binutils/13355
-	* elf32-rx.c (elf32_rx_relax_section): Correct width check.
+	* elf-m10300.c (mn10300_elf_mkobject): New function.
+	(bfd_elf32_mkobject): Define.
 
-2012-02-13  Richard Henderson  <rth@redhat.com>
+2011-05-23  Alan Modra  <amodra@gmail.com>
 
-	PR ld/13621
-	* linker.c (fix_syms): Force symbols outside any section into
-	bfd_abs_section_ptr.
+	* elf-bfd.h: Comment typo fix.
+	* elf32-ppc.c (struct ppc_elf_dyn_relocs): Delete.  Replace with
+	struct elf_dyn_relocs throughout.
+	* elf64-ppc.c (struct ppc_dyn_relocs): Likewise.
 
-2012-02-13  Alan Modra  <amodra@gmail.com>
+2011-05-23  Alan Modra  <amodra@gmail.com>
 
-	* elf32-m68hc1x.c (elf32_m68hc11_merge_symbol_attribute): New function.
-	* elf32-m68hc1x.h (elf32_m68hc11_merge_symbol_attribute): Declare.
-	* elf32-m68hc11.c (elf_backend_merge_symbol_attribute): Define.
-	* elf32-m68hc12.c (elf_backend_merge_symbol_attribute): Define.
+	* elf32-frv.c: Use info->callbacks->einfo throughout file in linker
+	functions rather than warning callback or _bfd_error_handler.
+	* elf32-ppc.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf32-ppc.c (ppc_elf_tls_optimize): Use %H in __tls_get_addr lost
+	arg error.
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Likewise.
 
-2012-02-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
-	    Nick Clifton  <nickc@redhat.com>
+2011-05-23  Alan Modra  <amodra@gmail.com>
 
-	* oasys.c (oasys_write_header): Fix compilation warning on zero-sized
-	memset.
+	PR 12763
+	* elf.c (assign_file_positions_for_load_sections): Set sh_offset for
+	.tbss, and page align same for all SHT_NOBITS sections.
 
-2012-02-10  Iain Sandoe  <idsandoe@googlemail.com>
+2011-05-21  Alan Modra  <amodra@gmail.com>
 
-	* mach-o.c (bfd_mach_o_build_seg_command): Count zerofill section
-	vma additions in their logical, rather than physical order.
+	PR 12763
+	* elf.c (_bfd_elf_make_section_from_shdr): Set up TLS section LMAs
+	from PT_TLS header.
+	(_bfd_elf_map_sections_to_segments): Don't create a final PT_LOAD
+	segment if just for .tbss.
+	(assign_file_positions_for_load_sections): Don't report "can't
+	allocate in segment" errors for .tbss.
+	(assign_file_positions_for_non_load_sections): Don't set p_filesz
+	from SHT_NOBITS section filepos.
 
-2012-02-10  Iain Sandoe  <idsandoe@googlemail.com>
+2011-05-20  Bernd Schmidt  <bernds@codesourcery.com>
 
-	* mach-o.c (mach_o_section_name_xlat): Correct eh-frame section
-	parameters.
-	* mach-o-x86-64.c (text_section_names_xlat): New.
-	(mach_o_x86_64_segsec_names_xlat): New.
-	(bfd_mach_o_tgt_seg_table): Define to mach_o_x86_64_segsec_names_xlat.
-	* mach-o-i386.c (text_section_names_xlat): Correct section parameters.
+	* elf32-tic6x.c (elf32_tic6x_howto_table): Add entries for
+	R_C6000_PCR_H16 and R_C6000_PCR_L16.
+	(elf32_tic6x_relocate_section): Handle them.
 
-2012-02-10  Tristan Gingold  <gingold@adacore.com>
+2011-05-18  Nick Clifton  <nickc@redhat.com>
 
-	* elfnn-ia64.c (elfNN_vms_object_p): Change comparison operator
-	to avoid infinite loop.  Add comments.
+	PR ld/12761
+	* elflink.c (elf_link_add_object_symbols): Process .gnu.warning
+	sections when building shared libraries.
 
-2012-02-09  H.J. Lu  <hongjiu.lu@intel.com>
+2011-05-18  Rafał Krypa  <r.krypa@samsung.com>
 
-	PR ld/13675
-	* cpu-i386.c (bfd_arch_i386_fill): Updated to support multi byte
-	nop instructions.
-	(bfd_arch_i386_short_nop_fill): New.
-	(bfd_arch_i386_long_nop_fill): Likewise.
-	Use bfd_arch_i386_short_nop_fill in 32bit bfd_arch_info
-	initializers.  Use bfd_arch_i386_long_nop_fill on 64bit
-	bfd_arch_info initializers.
+	PR ld/12778
+	* elf32-arm.c (elf32_arm_gc_sweep_hook): Use the computed dynamic
+	reloc pointer.
 
-	* cpu-k1om.c (bfd_arch_i386_fill): Renamed to ...
-	(bfd_arch_i386_short_nop_fill): This.
-	Update bfd_arch_info initializers.
-	* cpu-l1om.c: Likewise.
+2011-05-18  Tristan Gingold  <gingold@adacore.com>
 
-2012-02-08  Alan Modra  <amodra@gmail.com>
+	* xcofflink.c (xcoff_link_add_symbols): Handle C_DWARF symbols.
+	(xcoff_sweep): Always keep dwarf sections.
+	(xcoff_link_input_bfd): Handle dwarf symbols and sections.
 
-	* elflink.c (_bfd_elf_gc_mark_rsec): Mark weakdef syms too.
-	(_bfd_elf_fix_symbol_flags): When a weakdef is def_regular, clear
-	the correct h->u.weakdef.
+2011-05-18  Tristan Gingold  <gingold@adacore.com>
 
-2012-02-07  Alan Modra  <amodra@gmail.com>
+	* libxcoff.h (struct xcoff_dwsect_name): New type.
+	(XCOFF_DWSECT_NBR_NAMES): New macro.
+	(xcoff_dwsect_names): Declare.
+	* coffcode.h (sec_to_styp_flags): Handle xcoff dwarf sections.
+	(styp_to_sec_flags): Ditto.
+	(coff_new_section_hook): Ditto.
+	(coff_slurp_symbol_table): Handle C_DWARF and C_INFO.
+	* coff-rs6000.c (xcoff_dwsect_name): New variable.
 
-	* elf.c (elf_find_function): Don't use internal_elf_sym.
-	(_bfd_elf_maybe_function_sym): Likewise.  Replace elf_symbol_type
-	parameter with asymbol.
-	* elf64-ppc.c (ppc64_elf_maybe_function_sym): Likewise.
-	* elf-bfd.h (_bfd_elf_maybe_function_sym): Update prototype.
-	(struct elf_backend_data <maybe_function_sym>): Likewise.
+2011-05-17  Tomohiro Kashiwada  <kikairoya@gmail.com>
 
-2012-02-02  Vidya Praveen (vidya.praveen@atmel.com)
+	PR ld/12759
+	* elf32-rx.c (ignore_lma): New variable.
+	(bfd_elf32_rx_set_target_flags): Add ignore_lma parameter.
+	(rx_modify_program_headers): Only copy the LMA into the VMA if
+	ignore_lma is true.
 
-	PR bfd/13410
-	* bfd/elf32-avr.c (elf32_avr_relax_section): Correct the
-	condition that qualifies the candidates for relaxation.
+2011-05-17  Alan Modra  <amodra@gmail.com>
 
-2012-02-02  Tristan Gingold  <gingold@adacore.com>
+	PR ld/12760
+	* coff-aux.c (coff_m68k_aux_link_add_one_symbol): Adjust "notice" call.
+	* elflink.c (elf_link_add_object_symbols): Likewise.
+	* linker.c (_bfd_generic_link_add_one_symbol): Likewise.
 
-	* bfdio.c (real_fopen): Remove unused vms_modes variable.
+2011-05-16  Alan Modra  <amodra@gmail.com>
 
-2012-02-02  Tristan Gingold  <gingold@adacore.com>
+	* linker.c (_bfd_generic_link_add_one_symbol): Don't init u.undef.weak.
 
-	* mach-o.c (bfd_mach_o_read_header): Silent uninitialized
-	variable warning.
+2011-05-15  Richard Sandiford  <rdsandiford@googlemail.com>
 
-2012-02-02  Tristan Gingold  <gingold@adacore.com>
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Record both local and
+	global GOT entries for GOT_PAGE relocations against global symbols.
 
-	* archive.c (bfd_slurp_armap): Fix thinko in cast.
+2011-05-13  Bernd Schmidt  <bernds@codesourcery.com>
 
-2012-01-31  H.J. Lu  <hongjiu.lu@intel.com>
+	* config.bfd (tic6x-*-elf, tic6x-*-uclinux): New.
+	(tic6x-*-*): Replaced by these.
+	* elf32-tic6x.c (elf32_tic6x_set_osabi): New static function.
+	(elf32_tic6x_check_relocs): Create dynamic sections if -shared.
+	(elf_backend_relocs_compatible, elf_backend_post_process_headers):
+	Define.
+	(elf32_bed, TARGET_LITTLE_SYM, TARGET_LITTLE_NAME, TARGET_BIG_SYM,
+	TARGET_BIG_NAME, ELF_OSABI): Redefine twice, and include
+	"elf32-target.h" two more times.
+	* configure.in: Handle bfd_elf32_tic6x_linux_be_vec,
+	bfd_elf32_tic6x_linux_le_vec, bfd_elf32_tic6x_elf_be_vec and
+	bfd_elf32_tic6x_elf_le_vec.
+	* configure: Regenerate.
+
+2011-05-13  Jan Beulich  <jbeulich@novell.com>
 
-	PR ld/13616
-	* archures.c (bfd_arch_info): Add fill.
-	(bfd_default_arch_struct): Add bfd_arch_default_fill.
-	(bfd_arch_default_fill): New.
+	* config.bfd: Add targets x86_64-*-pe and x86_64-*-pep.
 
-	* configure.in: Set bfd version to 2.22.52.
+2011-05-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* config.in: Regenerated.
 	* configure: Regenerated.
+	* configure.in: New tests for HAVE_PRPSINFO_T_PR_PID,
+	HAVE_PRPSINFO32_T_PR_PID, HAVE_PSINFO_T_PR_PID and
+	HAVE_PSINFO32_T_PR_PID.
+	* elf.c (elfcore_grok_psinfo): Protect reading psinfo.pr_pid by
+	HAVE_PRPSINFO_T_PR_PID, HAVE_PRPSINFO32_T_PR_PID, HAVE_PSINFO_T_PR_PID
+	and HAVE_PSINFO32_T_PR_PID.
+	* hosts/x86-64linux.h (HAVE_PRPSINFO32_T_PR_PID): New redefinition.
+
+2011-05-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf.c (elfcore_grok_psinfo): Initialize CORE_PID for both native and
+	32bit psinfo.
+	* elf32-ppc.c (ppc_elf_grok_psinfo): Initialize core_pid.
+	* elf64-ppc.c (ppc64_elf_grok_psinfo): Likewise.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (elf32_tic6x_fix_exidx_coverage): Add prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-tic6x.c: Include limits.h.
+	(tic6x_unwind_edit_type, tic6x_unwind_table_edit,
+	_tic6x_elf_section_data): New.
+	(elf32_tic6x_section_data): Define.
+	(elf32_tic6x_new_section_hook): Allocate target specific data.
+	(elf32_tic6x_add_unwind_table_edit): New function.
+	(get_tic6x_elf_section_data, elf32_tic6x_adjust_exidx_size,
+	elf32_tic6x_insert_cantunwind_after, elf32_tic6x_add_low31,
+	elf32_tic6x_copy_exidx_entry): New functions.
+	(elf_backend_write_section): Define.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-tic6x.c (is_tic6x_elf_unwind_section_name,
+	elf32_tic6x_fake_sections): New functions.
+	(elf_backend_fake_sections): Define.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_gc_mark_extra_sections): New function.
+	(elf_backend_gc_mark_extra_sections): Define.
+
+2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR ld/12365
+	* cofflink.c (bfd_coff_link_input_bfd): Check for and warn about
+	references to symbols defined in discarded sections.
+
+2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR ld/12365
+	* coffgen.c (coff_write_symbol): Assume input section is its own
+	output section if output_section member not set.
+	(coff_write_alien_symbol): Likewise.
 
-	* cpu-alpha.c: Add bfd_arch_default_fill to bfd_arch_info
-	initializer.
-	* cpu-arc.c: Likewise.
-	* cpu-arm.c: Likewise.
-	* cpu-avr.c: Likewise.
-	* cpu-bfin.c: Likewise.
-	* cpu-cr16.c: Likewise.
-	* cpu-cr16c.c: Likewise.
-	* cpu-cris.c: Likewise.
-	* cpu-crx.c: Likewise.
-	* cpu-d10v.c: Likewise.
-	* cpu-d30v.c: Likewise.
-	* cpu-dlx.c: Likewise.
-	* cpu-epiphany.c: Likewise.
-	* cpu-fr30.c: Likewise.
-	* cpu-frv.c: Likewise.
-	* cpu-h8300.c: Likewise.
-	* cpu-h8500.c: Likewise.
-	* cpu-hppa.c: Likewise.
-	* cpu-i370.c: Likewise.
-	* cpu-i860.c: Likewise.
-	* cpu-i960.c: Likewise.
-	* cpu-ia64.c: Likewise.
-	* cpu-ip2k.c: Likewise.
-	* cpu-iq2000.c: Likewise.
-	* cpu-lm32.c: Likewise.
-	* cpu-m10200.c: Likewise.
-	* cpu-m10300.c: Likewise.
-	* cpu-m32c.c: Likewise.
-	* cpu-m32r.c: Likewise.
-	* cpu-m68hc11.c: Likewise.
-	* cpu-m68hc12.c: Likewise.
-	* cpu-m68k.c: Likewise.
-	* cpu-m88k.c: Likewise.
-	* cpu-mcore.c: Likewise.
-	* cpu-mep.c: Likewise.
-	* cpu-microblaze.c: Likewise.
-	* cpu-mips.c: Likewise.
-	* cpu-mmix.c: Likewise.
-	* cpu-moxie.c: Likewise.
-	* cpu-msp430.c: Likewise.
-	* cpu-mt.c: Likewise.
-	* cpu-ns32k.c: Likewise.
-	* cpu-openrisc.c: Likewise.
-	* cpu-or32.c: Likewise.
-	* cpu-pdp11.c: Likewise.
-	* cpu-pj.c: Likewise.
-	* cpu-plugin.c: Likewise.
-	* cpu-powerpc.c: Likewise.
-	* cpu-rl78.c: Likewise.
-	* cpu-rs6000.c: Likewise.
-	* cpu-rx.c: Likewise.
-	* cpu-s390.c: Likewise.
-	* cpu-score.c: Likewise.
-	* cpu-sh.c: Likewise.
-	* cpu-sparc.c: Likewise.
-	* cpu-spu.c: Likewise.
-	* cpu-tic30.c: Likewise.
-	* cpu-tic4x.c: Likewise.
-	* cpu-tic54x.c: Likewise.
-	* cpu-tic6x.c: Likewise.
-	* cpu-tic80.c: Likewise.
-	* cpu-tilegx.c: Likewise.
-	* cpu-tilepro.c: Likewise.
-	* cpu-v850.c: Likewise.
-	* cpu-vax.c: Likewise.
-	* cpu-w65.c: Likewise.
-	* cpu-we32k.c: Likewise.
-	* cpu-xc16x.c: Likewise.
-	* cpu-xstormy16.c: Likewise.
-	* cpu-xtensa.c: Likewise.
-	* cpu-z80.c: Likewise.
-	* cpu-z8k.c: Likewise.
-
-	* cpu-i386.c: Include "libiberty.h".
-	(bfd_arch_i386_fill): New.
-	Add bfd_arch_i386_fill to  bfd_arch_info initializer.
-
-	* cpu-k1om.c: Add bfd_arch_i386_fill to  bfd_arch_info initializer.
-	* cpu-l1om.c: Likewise.
-
-	* linker.c (default_data_link_order): Call abfd->arch_info->fill
-	if fill size is 0.
+2011-05-07  H.J. Lu  <hongjiu.lu@intel.com>
 
+	PR ld/12730
+	* elf.c (_bfd_elf_section_offset): Check SEC_ELF_REVERSE_COPY.
+
+	* elflink.c (elf_link_input_bfd): Reverse copy .ctors/.dtors
+	sections if needed.
+
+	* section.c (SEC_ELF_REVERSE_COPY): New.
 	* bfd-in2.h: Regenerated.
 
-2012-01-27  Michael Eager  <eager@eagercon.com>
-
-	* bfd/elf32-microblaze.c (create_got_section):
-	Reuse existing .rela.got section.
-
-2012-01-23  Alan Modra  <amodra@gmail.com>
-
-	* elf-bfd.h: Formatting.
-	(struct elf_backend_data): Add "maybe_function_sym".
-	(_bfd_elf_maybe_function_sym): Declare.
-	* elfxx-target.h (elf_backend_maybe_function_sym): Define.
-	(elfNN_bed): Init new field.
-	* elf.c (elf_find_function): Use maybe_function_sym.
-	(_bfd_elf_maybe_function_sym): New function.
-	* elf64-ppc.c (elf_backend_maybe_function_sym): Define.
-	(ppc64_elf_maybe_function_sym): New function.
-
-2012-01-20  Francois Gouget  <fgouget@codeweavers.com>
-
-	PR binutils/13534
-	* archive.c (_bfd_ar_sizepad): New function. Correctly install and
-	pad the size field in an archive header.
-	(_bfd_generic_read_ar_hdr_mag): Use the correct type and scan
-	function for the archive size field.
-	(bfd_generic_openr_next_archived_file): Likewise.
-	(do_slurp_coff_armap): Likewise.
-	(_bfd_write_archive_contents): Likewise.
-	(_bfd_bsd44_write_ar_hdr): Use the new function.
-	(bfd_ar_hdr_from_filesystem): Likewise.
-	(_bfd_write_archive_contents): Likewise.
-	(bsd_write_armap): Likewise.
-	(coff_write_armap): Likewise.
-	* archive64.c (bfd_elf64_archive_write_armap): Likewise.
-	* bfdio.c (bfd_bread): Use correct type for archive element
-	sizes.
-	* ar.c (open_inarch): Likewise.
-	(extract_file): Likewise.
-	* libbfd-in.h (struct areltdata): Use correct types for
-	parsed_size and extra_size fields.
-	Prototype _bfd_ar_sizepad function.
+2011-05-07  Anders Kaseorg  <andersk@ksplice.com>
+
+	PR 12739
+	* libbfd.c (bfd_get_8, bfd_get_signed_8): Use const cast.
+	* bfd-in2.h: Regenerate.
+
+2011-05-06  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_section_flags): Remove SEC_IN_MEMORY.
+	(_bfd_vms_slurp_egsd): Rename old_flags to vms_flags.  Handle
+	any code section.  Add comments.
+	(alpha_vms_object_p): Use void * instead of PTR.
+	(alpha_vms_create_eisd_for_section): Fix test for setting DZRO.
+	(build_module_list): Guard against no DST section.  Add comments.
+	(alpha_vms_link_output_symbol): Discard undefined symbols.
+	(alpha_vms_get_section_contents): Simply memcpy if the section was
+	already loaded.  Fix typo.
+	(vms_new_section_hook): Use void * instead of PTR.
+	(vms_alpha_vec): Ditto.
+
+2011-05-06  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (cortex_a8_erratum_scan): If the stub is a Thumb
+	branch to a PLT entry, redirect it to the PLT's Thumb entry point.
+
+2011-05-05  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_final_link): New function.
+	(elf32_tic6x_merge_attributes): Do not warn for PID or PIC
+	mismatch.  Choose the lower of the two values.
+	(bfd_elf32_bfd_final_link): New macro.
+
+2011-04-28  Tristan Gingold  <gingold@adacore.com>
+
+	* coff-rs6000.c (_bfd_xcoff_swap_aux_in): Adjust for x_file.
+	(bfd_xcoff_swap_aux_out): Ditto.
+	* coff64-rs6000.c (_bfd_xcoff64_swap_aux_in): Ditto.
+	(bfd_xcoff64_swap_aux_out): Ditto.
+
+2011-05-04  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12727
+	* elf64-ppc.c (ppc_build_one_stub <ppc_sub_plt_call>): Clear
+	was_undefined on dot-symbols.
+
+2011-05-03  Paul Brook  <paul@codesourcery.com>
+
+
+	* elf32-tic6x.c (elf32_tic6x_howto_table,
+	elf32_tic6x_howto_table_rel, (elf32_tic6x_gc_sweep_hook,
+	elf32_tic6x_relocate_section, elf32_tic6x_check_relocs):
+	Add R_C6000_EHTYPE.
+
+2011-05-01  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12718
+	* elf32-i386.c (elf_i386_check_relocs): Ensure dynobj set before
+	creating ifunc sections.
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Likewise.
+
+2011-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter
+	names.
+
+2011-04-28  Tom Tromey  <tromey@redhat.com>
+
+	* bfdio.c (memory_bstat): Pass correct size to memset.
+
+2011-04-28  Mike Frysinger  <vapier@gentoo.org>
+
+	* dwarf2.c (dwarf_debug_sections): Mark const.
+	* elf.c (special_sections): Likewise.
+	* libbfd-in.h (dwarf_debug_sections): Likewise.
 	* libbfd.h: Regenerate.
 
-2012-01-20  Ulrich Weigand  <ulrich.weigand@linaro.org>
+2011-04-26  Kai Tietz  <ktietz@redhat.com>
 
-	* elf.c (elfcore_write_prpsinfo): Provide unconditionally.
-	Return NULL if core file generation is unsupported.
-	(elfcore_write_prstatus): Likewise.
-	* elf32-arm.c (elf32_arm_nabi_write_core_note): New function.
-	(elf_backend_write_core_note): Define.
+	* coffcode.h (sec_to_styp_flags): Allow linkonce for
+	debugging sections.
 
-2012-01-19  Tristan Gingold  <gingold@adacore.com>
+2011-04-26  Tristan Gingold  <gingold@adacore.com>
 
-	* pef.c: Add a comment.
-	* xsym.c: Likewise.
+	* coff64-rs6000.c: Convert to ISO-C.  Remove PARAMS and PTR macros.
 
-2012-01-17  Alan Modra  <amodra@gmail.com>
+2011-04-24  Alan Modra  <amodra@gmail.com>
 
-	* elf32-ppc.c (ppc_elf_write_core_note <NT_PRPSINFO>): Don't leave
-	trailing garbage in the note.
-	* elf64-ppc.c (ppc64_elf_write_core_note <NT_PRPSINFO>): Likewise.
+	PR ld/12365
+	PR ld/12696
+	* coff-aux.c (coff_m68k_aux_link_add_one_symbol): Update "notice" call.
+	* linker.c (_bfd_link_hash_newfunc): Clear bitfields.
+	(_bfd_generic_link_add_one_symbol): Update "notice" call.
+	* elflink.c (_bfd_elf_merge_symbol): Don't skip weak redefs when
+	it is a redef of an IR symbol in a real BFD.
 
-2012-01-16  Daniel Green  <venix1@gmail.com>
+2011-04-22  H.J. Lu  <hongjiu.lu@intel.com>
 
-	PR ld/13491
-	* coff-i386.c (coff_i386_rtype_to_howto <R_SECREL32>): Test
-	h->root.type not h->type.
-	* coff-x86_64.c (coff_amd64_rtype_to_howto <R_AMD64_SECREL>): Likewise.
+	* elf32-i386.c (elf_i386_readonly_dynrelocs): Warn relocation
+	in readonly section in a shared object.
+	(elf_i386_size_dynamic_sections): Likewise.
+	* elf64-x86-64.c (elf_x86_64_readonly_dynrelocs): Likewise.
+	(elf_x86_64_size_dynamic_sections): Likewise.
 
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
+2011-04-21  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* mach-o.c (bfd_mach_o_build_dysymtab_command): Handle absolute
-	indirect symbols.
+	PR ld/12694
+	* elf32-i386.c (elf_i386_readonly_dynrelocs): Skip local IFUNC
+	symbols.
+	* elf64-x86-64.c (elf_x86_64_readonly_dynrelocs): Likewise.
 
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
+2011-04-21  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* mach-o.c (bfd_mach_o_write_relocs): Move computation of relocs file
-	position from here... to (bfd_mach_o_build_seg_command): Here.
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Return false
+	on dynamic symbol error.
+	* elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Likewise.
 
-2012-01-12  Iain Sandoe  <idsandoe@googlemail.com>
+2011-04-20  Tristan Gingold  <gingold@adacore.com>
 
-	* mach-o.c (bfd_mach_o_count_indirect_symbols): New.
-	(bfd_mach_o_build_dysymtab_command): Populate indirect symbol table.
-	* mach-o.h (bfd_mach_o_asymbol): Move declaration to start of the
-	file. (bfd_mach_o_section): Add indirect_syms field.
+	* config.bfd (alpha*-*-*vms*, ia64*-*-*vms*): Define targ_selvecs.
 
-2012-01-11  Iain Sandoe  <idsandoe@googlemail.com>
+2011-04-20  Alan Modra  <amodra@gmail.com>
 
-	* mach-o.c (bfd_mach_o_build_seg_command): Separate computation of
-	vmsize from filesize.  Don't compute offsets or file sizes for
-	zerofill sections.
+	* hash.c (bfd_default_hash_table_size): Make it an unsigned long.
+	(bfd_hash_table_init_n): Overflow checking.
+	(bfd_hash_set_default_size): Return current size.  Take unsigned long
+	arg.  Add 65537 to hash_size primes.
+	* bfd-in.h (bfd_hash_set_default_size): Update prototype.
+	* bfd-in2.h: Regenerate.
+
+2011-04-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Fix +1 overrun of
+	memmove elements.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	* libbfd.c (bfd_log2): Do return rounded up value.
+	* elflink.c (bfd_elf_size_dynsym_hash_dynstr): Replace bfd_log2
+	call with expanded old round down version of the function.
+
+	* archive.c (_bfd_get_elt_at_filepos): Don't release n_nfd.
+	* elflink.c (elf_link_add_object_symbols): Delete redundant code.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	* elfcode.h (elf_slurp_symbol_table): Put common plugin IR symbols
+	in their own common section.
+	* elflink.c (elf_link_add_object_symbols): Likewise.
+	* linker.c (generic_link_check_archive_element): Don't lose flags
+	if common section is pre-existing.
+	(_bfd_generic_link_add_one_symbol): Likewise.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
 
-2012-01-11  Iain Sandoe  <idsandoe@googlemail.com>
+	PR ld/12365
+	* elflink.c (_bfd_elf_merge_symbol): Update multiple_common calls.
+	* linker.c (_bfd_generic_link_add_one_symbol): Likewise.  Call
+	multiple_definition regardless of allow_multiple_definition.
+	* simple.c (simple_dummy_multiple_definition): Update.
+	* xcofflink.c (xcoff_link_add_symbols): Update multiple_definition
+	calls.
 
-	* mach-o.c (bfd_mach_o_build_commands): Make the building of each
-	command type independent.
+2011-04-18  Tristan Gingold  <gingold@adacore.com>
 
-2012-01-11  Alan Modra  <amodra@gmail.com>
+	* coff-rs6000.c: Convert to ISO-C.  Remove PARAMS macro.
 
-	* elf64-ppc.c: Define more insns used in plt call stubs.
-	(ppc64_elf_brtaken_reloc): Assume isa version 2 or above.
-	(ppc64_elf_relocate_section): Likewise.
-	(enum ppc_stub_type): Add ppc_stub_plt_call_r2save.
-	(struct ppc_link_hash_table): Increase size of stub_count array.
-	Add plt_stub_align and plt_thread_safe.
-	(ALWAYS_USE_FAKE_DEP, ALWAYS_EMIT_R2SAVE): Define.
-	(plt_stub_size, plt_stub_pad): New functions.
-	(build_plt_stub): Emit barriers for power7 thread safety.  Don't
-	emit needless save of r2.
-	(build_tls_get_addr_stub): Adjust params.
-	(ppc_build_one_stub): Handle ppc_stub_plt_call_r2save and aligning
-	plt stubs.  Adjust build_*plt_stub calls.
-	(ppc_size_one_stub): Similarly.
-	(ppc64_elf_size_stubs): Accept plt_thread_safe and plt_stub_align
-	params.  Choose default for plt_thread_safe based on existence of
-	calls to thread creation functions.  Modify plt_call to
-	plt_call_r2save when no tocsave reloc found.  Align tail of stub
+2011-04-18  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	PR ld/12672
+	* bfd.c (BFD_PLUGIN): Define.
+	(BFD_FLAGS_SAVED, BFD_FLAGS_FOR_BFD_USE_MASK): Add BFD_PLUGIN.
+	* bfd-in2.h: Regenerate.
+	* elflink.c (elf_link_output_extsym): Strip undefined plugin syms.
+	* opncls.c (bfd_make_readable): Don't lose original bfd flags.
+
+2011-04-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Do not check for
+	SEC_LOAD.
+
+2011-04-15  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* elf-bfd.h (struct sdt_note): New struct.
+	(struct elf_obj_tdata) <sdt_note_head>: New field.
+	* elf.c (elfobj_grok_stapsdt_note_1): New function.
+	(elfobj_grok_stapsdt_note): Likewise.
+	(elf_parse_notes): Added code to treat SystemTap note
 	sections.
-	(ppc64_elf_build_stubs): Align tail of stub sections.  Adjust
-	output of stub statistics.
-	(ppc64_elf_relocate_section): Handle ppc_stub_plt_call_r2save.
-	* elf64-ppc.h (ppc64_elf_size_stubs): Update prototype.
 
-2012-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+2011-04-12  Richard Henderson  <rth@redhat.com>
 
-	PR ld/13581
-	* elf64-x86-64.c (elf_x86_64_relocate_section): Remove ABI_64_P
-	check on R_X86_64_PCXX.
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Do not
+	exclude empty .got sections.
 
-2012-01-10  Tristan Gingold  <gingold@adacore.com>
+2011-04-11  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* mach-o.c (bfd_mach_o_build_commands): Avoid uninitialized false
-	warning.
+	* elf32-i386.c (elf_i386_reloc_type_lookup): Fix the out of bound
+	array access for BFD_RELOC_386_IRELATIVE.
 
-2012-01-10  Tristan Gingold  <gingold@adacore.com>
+2011-04-11  Bernd Schmidt  <bernds@codesourcery.com>
 
-	* bfdio.c (bfd_tell): Handle nested archives.
-	(bfd_seek): Ditto.
-	* cache.c (bfd_cache_lookup_worker): Ditto.
-	* archive.c (_bfd_get_elt_at_filepos): Remove code dealing with
-	nested archives.
-	(bfd_generic_openr_next_archived_file): Likewise.
+	* elf32-tic6x.c (elf32_tic6x_check_relocs): Initialize pc_count field.
 
-2012-01-09  Iain Sandoe  <idsandoe@googlemail.com>
+2011-04-11  Mark Wielaard  <mjw@redhat.com>
 
-	* mach-o.c (bfd_mach_o_bfd_copy_private_symbol_data): Implement.
-	(bfd_mach_o_write_symtab): Remove handling for indirect syms.
-	(bfd_mach_o_primary_symbol_sort_key): Likewise.
-	(bfd_mach_o_cf_symbols): Likewise.
-	(bfd_mach_o_sort_symbol_table): Remove.
-	(bfd_mach_o_mangle_symbols): Adjust arguments, remove handling
-	for indirect and dysymtab counts.  Do the symbol sorting here.
-	(bfd_mach_o_build_dysymtab_command): Count the symbol types here.
-	Make the indirect symbols a TODO.
-	(bfd_mach_o_build_commands): Adjust call to bfd_mach_o_mangle_symbols.
-	(bfd_mach_o_make_empty_symbol): Specifically flag unset symbols with
-	a non-zero value.
-	(bfd_mach_o_read_symtab_symbol): Record the symbol index.
-	(bfd_mach_o_read_symtab_symbol): Adjust recording of global status.
-	* mach-o.h (mach_o_data_struct): Remove indirect and dysymtab entries.
-	(IS_MACHO_INDIRECT): Remove.
-	(SYM_MACHO_FIELDS_UNSET, SYM_MACHO_FIELDS_NOT_VALIDATED): New.
+	PR 10549
+	* elf-bfd.h (has_ifunc_symbols): Renamed to has_gnu_symbols.
+	(has_gnu_symbols): Renamed from has_ifunc_symbols.
+	* elf.c (_bfd_elf_set_osabi): Use new has_gnu_symbols name.
+	* elf32-arm.c (elf32_arm_add_symbol_hook): Set has_gnu_symbols
+	also if STB_GNU_UNIQUE symbol binding was seen.
+	* elf32-i386.c (elf_i386_add_symbol_hook): Likewise.
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_add_symbol_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise.
+	* elf64-sparc.c (elf64_sparc_add_symbol_hook): Likewise.
+	* elf64-x86-64.c (elf_x86_64_add_symbol_hook): Likewise.
 
-2012-01-06  Nick Clifton  <nickc@redhat.com>
+2011-04-11  Alan Modra  <amodra@gmail.com>
 
-	PR binutils/13121
-	* reloc.c (bfd_generic_lookup_section_flags): Rename 'finfo' to
-	'flaginfo' to avoid conflicts with AIX system headers.
+	* bfd-in.h (bfd_get_section_limit): Don't use rawsize with output
+	sections.
+	* libbfd.c (_bfd_generic_get_section_contents): Likewise.
+	(_bfd_generic_get_section_contents_in_window): Likewise.
+	* section.c (bfd_get_section_contents): Likewise.
+	* compress.c (bfd_get_full_section_contents): Likewise.
+	* elf32-rx.c (rx_final_link): Ignore rawsize.
+	* elf32-microblaze.c (microblaze_elf_relocate_section): Use correct
+	bfd with bfd_get_section_limit.
+	* elfxx-ia64.c (elfNN_ia64_choose_gp): Add "final" parameter.  Use
+	os->size during final link.  Update callers.
+	* bfd-in2.h: Regenerate.
+
+2011-04-10  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR ld/12637
+	* elfxx-mips.c (mips_elf_merge_got_with): Use arg->global_count
+	as the number of global entries when merging with the primary GOT.
+
+2011-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c: Update copyright year.
+	* elf64-x86-64.c: Likewise.
+
+2011-04-09  Kai Tietz  <ktietz@redhat.com>
+
+	* peXXigen.c (_bfd_XXi_final_link_postscripte): Sort pdata in temporary
+	buffer and use rawsize for sorting.
+	* coffcode.h (coff_compute_section_file_positions): Set rawsize
+	before doing alignment.
+
+2011-04-09  H.J. Lu  <hongjiu.lu@intel.com>
 
-2012-01-06  Tristan Gingold  <gingold@adacore.com>
+	* elf32-i386.c (elf_i386_relocate_section): Return relocation
+	error on unsupported relocation.
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.
+
+2011-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12657
+	* hosts/x86-64linux.h (elf_prstatus32): Replace __pid_t with
+	pid_t.
+
+2011-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12654
+	* elf32-i386.c (elf_i386_relocate_section): Check !executable
+	instead of shared for R_386_TLS_LDO_32.
+
+2011-04-08  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.am (SOURCE_HFILES): Remove xcoff-target.h
+	* coff-pmac: Remove
+	* xcoff-target.h: Remove
+	* Makefile.in: Regenerate.
+
+2011-04-07  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2.c (scan_unit_for_symbols): Check for DW_AT_specification.
+
+2011-04-07  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_howto_table): R_C6000_PREL31 is
+	pc-relative.
+	(elf32_tic6x_howto_table_rel): Ditto.
+	(elf32_tic6x_relocate_section): Implement R_C6000_PREL31.
+	(elf32_tic6x_check_relocs): Ditto.
 
-	* bfdio.c (bfd_bread): Use arelt_size macro.
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
 
-2012-01-06  Tristan Gingold  <gingold@adacore.com>
+	* config.bfd (thumb-*-oabi): Don't handle in list of obsolete
+	targets.
+	(strongarm*, thumb*, xscale*): Remove architectures.
+	(strongarm-*-kaos*, thumb-*-coff, thumb-*-elf, thumb-epoc-pe*,
+	thumb-*-pe*, strongarm-*-elf, strongarm-*-coff, xscale-*-elf,
+	xscale-*-coff): Remove targets.
 
-	* config.bfd (i[3-7]86-*-darwin*): Define targ64_selvecs.
+2011-04-01  Tristan Gingold  <gingold@adacore.com>
 
-2012-01-05  Nick Clifton  <nickc@redhat.com>
+	* elfxx-ia64.c: include bfd_stdint.h
 
-	PR ld/12161
-	* elf32-avr.c (elf32_avr_relax_delete_bytes): Read in relocs if
-	necessary.
+2011-03-31  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf32-tic6x.c (elf32_tic6x_relocate_section): Remove unused variable
+	dynobj and its initialization.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (DEFS): Add HAVE_bfd_elf64_ia64_vms_vec.
+	* configure.com: Set BFD_HOST_64BIT_LONG_LONG and
+	BFD_HOST_LONG_LONG to 1.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (vms_get_remaining_object_record): Fix dec-c warning.
+	(_bfd_vms_write_etir): Ditto.
+	(_bfd_vms_slurp_etir): Avoid to use intptr_t
+	* configure.com: Generate bfd_stdint.h
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.h (struct elf32_tic6x_params): New.
+	(elf32_tic6x_setup): Declare.
+	* elf32-tic6x.c: Include <limits.h>.
+	(ELF_DYNAMIC_LINKER, DEFAULT_STACK_SIZE, PLT_ENTRY_SIZE): Define.
+	(struct elf32_tic6x_link_hash_table, struct elf32_link_hash_entry):
+	New structures.
+	(elf32_tic6x_link_hash_table, is_tic6x_elf): New macros.
+	(tic6x_elf_scom_section, tic6x_elf_scom_symbol,
+	tic6x_elf_scom_symbol_ptr): New static variables.
+	(elf32_tic6x_howto_table, elf32_tic6x_howto_table_rel,
+	elf32_tic6x_reloc_map): Add R_C6000_JUMP_SLOT, R_C6000_EHTYPE,
+	R_C6000_PCR_H16 and R_C6000_PCR_L16.
+	(elf32_tic6x_link_hash_newfunc, elf32_tic6x_link_hash_table_create,
+	elf32_tic6x_link_hash_table_free, elf32_tic6x_setup,
+	elf32_tic6x_using_dsbt, elf32_tic6x_install_rela,
+	elf32_tic6x_create_dynamic_sections, elf32_tic6x_make_got_dynreloc,
+	elf32_tic6x_finish_dynamic_symbol, elf32_tic6x_gc_sweep_hook,
+	elf32_tic6x_adjust_dynamic_symbol): New static functions.
+	(elf32_tic6x_relocate_section): For R_C6000_PCR_S21, convert branches
+	to weak symbols as required by the ABI.
+	Handle GOT and DSBT_INDEX relocs, and copy relocs to the output file
+	as needed when generating DSBT output.
+	(elf32_tic6x_check_relocs, elf32_tic6x_add_symbol_hook,
+	elf32_tic6x_symbol_processing, elf32_tic6x_section_from_bfd_section,
+	elf32_tic6x_allocate_dynrelocs, elf32_tic6x_size_dynamic_sections,
+	elf32_tic6x_always_size_sections, elf32_tic6x_modify_program_headers,
+	elf32_tic6x_finish_dynamic_sections, elf32_tic6x_plt_sym_val,
+	elf32_tic6x_copy_private_data, elf32_tic6x_link_omit_section_dynsym):
+	New static functions.
+	(ELF_MAXPAGESIZE): Define to 0x1000.
+	(bfd_elf32_bfd_copy_private_bfd_data,
+	bfd_elf32_bfd_link_hash_table_create,
+	bfd_elf32_bfd_link_hash_table_free, elf_backend_can_refcount,
+	elf_backend_want_got_plt, elf_backend_want_dynbss,
+	elf_backend_plt_readonly, elf_backend_got_header_size,
+	elf_backend_gc_sweep_hook, elf_backend_modify_program_headers,
+	elf_backend_create_dynamic_sections, elf_backend_adjust_dynamic_symbol,
+	elf_backend_check_relocs, elf_backend_add_symbol_hook,
+	elf_backend_symbol_processing, elf_backend_link_output_symbol_hook,
+	elf_backend_section_from_bfd_section,
+	elf_backend_finish_dynamic_symbol, elf_backend_always_size_sections,
+	elf32_tic6x_size_dynamic_sections, elf_backend_finish_dynamic_sections,
+	elf_backend_omit_section_dynsym, elf_backend_plt_sym_val): Define.
+
+	* bfd/reloc.c (BFD_RELOC_C6000_JUMP_SLOT, BFD_RELOC_C6000_EHTYPE,
+	BFD_RELOC_C6000_PCR_H16, BFD_RELOC_C6000_PCR_S16): Add.
+	* bfd/bfd-in2.h: Regenerate.
+	* bfd/libbfd.h: Regenerate.
+	* config.bfd: Accept tic6x-*-* instead of tic6x-*-elf.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* coffcode.h (coff_slurp_symbol_table): Silently discard C_NULL
+	entry on xcoff when value is C_NULL_VALUE.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* libcoff-in.h (exec_hdr): Remove.
+	* libcoff.h: Regenerate.
+
+2011-03-30  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-03-29  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_gc_mark_hook): New.
+	(elf64_alpha_gc_sweep_hook): New.
+	(elf_backend_gc_mark_hook, elf_backend_gc_sweep_hook): New.
+	(elf_backend_can_gc_sections): New.
+
+2011-03-26  John Marino  <binutils@marino.st>
+
+	* config.bfd: Add x86_64-*-dragonfly*, fix i386-*-dragonfly*.
+	* configure.in: Delete unused bfd_elf32_i386_dragonfly_vec.
+	* configure: Regenerate.
 
-2012-01-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+2011-03-25  Michael Snyder  <msnyder@vmware.com>
 
-	Fix zero registers core files when built by gcc-4.7.
-	* elf64-x86-64.c (elf_x86_64_write_core_note): Remove variables p and
-	size.  Call elfcore_write_note for the local variables.  Remove the
-	final elfcore_write_note call.  Add NOTREACHED comments.
+	* coffcode.h (coff_set_alignment_hook): Check return of bfd_seek.
 
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
+2011-03-25  Tristan Gingold  <gingold@adacore.com>
 
-	* mach-o.c (bfd_mach_o_fat_stat_arch_elt): New function.
-	(bfd_mach_o_generic_stat_arch_elt): Adjust.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* mach-o.c (bfd_mach_o_fat_member_init): New function.
-	(bfd_mach_o_openr_next_archived_file): Reindent.
-	Adjust to call bfd_mach_o_fat_member_init.
-	(bfd_mach_o_fat_extract): Adjust to call bfd_mach_o_fat_member_init.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* mach-o-x86-64.c (bfd_mach_o_x86_64_swap_reloc_out): Handle
-	BFD_RELOC_32, BFD_RELOC_MACH_O_X86_64_PCREL32_1,
-	BFD_RELOC_MACH_O_X86_64_PCREL32_2,
-	BFD_RELOC_MACH_O_X86_64_PCREL32_4,
-	BFD_RELOC_MACH_O_X86_64_BRANCH32,
-	BFD_RELOC_MACH_O_X86_64_SUBTRACTOR32,
-	BFD_RELOC_MACH_O_X86_64_GOT.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* mach-o.h (bfd_mach_o_fvmlib_command): New structure.
-	(bfd_mach_o_load_command): Add fvmlib field.
-
-	* mach-o.c (bfd_mach_o_read_fvmlib): New function.
-	(bfd_mach_o_read_command): Handle fvmlib.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* mach-o.c (bfd_mach_o_convert_architecture): Reindent.
-	Decode msubtype for ARM.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* mach-o.c (bfd_mach_o_get_synthetic_symtab): Add comments.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* mach-o.h: Reindent header.
-	(bfd_mach_o_encryption_info_command): New structure.
-	(bfd_mach_o_load_command): Add encryption_info field.
-
-	* mach-o.c (bfd_mach_o_read_encryption_info): New function.
-	(bfd_mach_o_read_command): Handle BFD_MACH_O_LC_ENCRYPTION_INFO.
-	(bfd_mach_o_read_command): Adjust error message.
-
-2012-01-04  Shinichiro Hamaji  <shinichiro.hamaji@gmail.com>
-
-	* dwarf2.c (_bfd_dwarf2_slurp_debug_info): Factor out the part
-	which reads DWARF2 and stores in stash from find_line.
-	(find_line) Call _bfd_dwarf2_slurp_debug_info.
-	* libbfd-in.h (_bfd_dwarf2_slurp_debug_info): Add declaration.
-	* libbfd.h (_bfd_dwarf2_slurp_debug_info): Regenerate.
-	* mach-o.c (dsym_subdir): The name of subdir where debug
-	information may be stored.
-	(bfd_mach_o_lookup_uuid_command): New. Lookup a load command whose
-	type is UUID.
-	(bfd_mach_o_dsym_for_uuid_p): New. Check if the specified BFD is
-	corresponding to the executable.
-	(bfd_mach_o_find_dsym): New. Find a debug information BFD in the
-	specified binary file.
-	(bfd_mach_o_follow_dsym): New. Find a debug information BFD for
-	the original BFD.
-	(bfd_mach_o_find_nearest_line): Check dSYM files for Mach-O
-	executables, dylibs, and bundles.
-	(bfd_mach_o_close_and_cleanup): Clean up BFDs for the dSYM file.
-	* mach-o.h (dsym_bfd): The BFD of the dSYM file.
+	* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Allow the use
+	of find_nearest_line on object files.
+
+2011-03-25  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_section_flags): Make $CODE$ section read-only.
+	Minor reordering.
+	(alpha_vms_create_eisd_for_section): Make code sections read-only.
+
+2011-03-24  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_tls_optimize): Catch more cases where
+	old-style __tls_get_addr calls without marker relocs don't match
+	their arg setup insn one for one.  If such mismatches are found
+	report the reloc and don't do any tls optimization.
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Likewise.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* bfd-in2.h: Regenerate.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* archures.c: Add AVR XMEGA architecture information.
+	* cpu-avr.c (arch_info_struct): Likewise.
+	* elf32-avr.c (bfd_elf_avr_final_write_processing): Likewise.
+	(elf32_avr_object_p): Likewise.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* reloc.c (BFD_RELOC_ARM_IRELATIVE): New relocation.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_howto_table_2): Rename existing definition
+	to elf32_arm_howto_table_3 and replace with a single R_ARM_IRELATIVE
+	entry.
+	(elf32_arm_howto_from_type): Update accordingly.
+	(elf32_arm_reloc_map): Map BFD_RELOC_ARM_IRELATIVE to R_ARM_IRELATIVE.
+	(elf32_arm_reloc_name_lookup): Handle elf32_arm_howto_table_3.
+	(arm_plt_info): New structure, split out from elf32_arm_link_hash_entry
+	with an extra noncall_refcount field.
+	(arm_local_iplt_info): New structure.
+	(elf_arm_obj_tdata): Add local_iplt.
+	(elf32_arm_local_iplt): New accessor macro.
+	(elf32_arm_link_hash_entry): Replace plt_thumb_refcount,
+	plt_maybe_thumb_refcount and plt_got_offset with an arm_plt_info.
+	Change tls_type to a bitfield and add is_iplt.
+	(elf32_arm_link_hash_newfunc): Update accordingly.
+	(elf32_arm_allocate_local_sym_info): New function.
+	(elf32_arm_create_local_iplt): Likewise.
+	(elf32_arm_get_plt_info): Likewise.
+	(elf32_arm_plt_needs_thumb_stub_p): Likewise.
+	(elf32_arm_get_local_dynreloc_list): Likewise.
+	(create_ifunc_sections): Likewise.
+	(elf32_arm_copy_indirect_symbol): Update after the changes to
+	elf32_arm_link_hash_entry.  Assert the is_iplt has not yet been set.
+	(arm_type_of_stub): Add an st_type argument.  Use elf32_arm_get_plt_info
+	to get PLT information.  Assert that all STT_GNU_IFUNC references
+	are turned into PLT references.
+	(arm_build_one_stub): Pass the symbol type to
+	elf32_arm_final_link_relocate.
+	(elf32_arm_size_stubs): Pass the symbol type to arm_type_of_stub.
+	(elf32_arm_allocate_irelocs): New function.
+	(elf32_arm_add_dynreloc): In static objects, use .rel.iplt for
+	all R_ARM_IRELATIVE.
+	(elf32_arm_allocate_plt_entry): New function.
+	(elf32_arm_populate_plt_entry): Likewise.
+	(elf32_arm_final_link_relocate): Add an st_type parameter.
+	Set srelgot to null for static objects.  Use separate variables
+	to record which st_value and st_type should be used when generating
+	a dynamic relocation.  Use elf32_arm_get_plt_info to find the
+	symbol's PLT information, setting has_iplt_entry, splt,
+	plt_offset and gotplt_offset accordingly.  Check whether
+	STT_GNU_IFUNC symbols should resolve to an .iplt entry, and change
+	the relocation target accordingly.  Broaden assert to include
+	.iplts.  Don't set sreloc for static relocations.  Assert that
+	we only generate dynamic R_ARM_RELATIVE relocations for R_ARM_ABS32
+	and R_ARM_ABS32_NOI.  Generate R_ARM_IRELATIVE relocations instead
+	of R_ARM_RELATIVE relocations if the target is an STT_GNU_IFUNC
+	symbol.  Pass the symbol type to arm_type_of_stub.  Conditionally
+	resolve GOT references to the .igot.plt entry.
+	(elf32_arm_relocate_section): Update the call to
+	elf32_arm_final_link_relocate.
+	(elf32_arm_gc_sweep_hook): Use elf32_arm_get_plt_info to get PLT
+	information.  Treat R_ARM_REL32 and R_ARM_REL32_NOI as call
+	relocations in shared libraries and relocatable executables.
+	Count non-call PLT references.  Use elf32_arm_get_local_dynreloc_list
+	to get the list of dynamic relocations for a local symbol.
+	(elf32_arm_check_relocs): Always create ifunc sections.  Set isym
+	at the same time as setting h.  Use elf32_arm_allocate_local_sym_info
+	to allocate local symbol information.  Treat R_ARM_REL32 and
+	R_ARM_REL32_NOI as call relocations in shared libraries and
+	relocatable executables.  Record PLT information for local
+	STT_GNU_IFUNC functions as well as global functions.   Count
+	non-call PLT references.  Use elf32_arm_get_local_dynreloc_list
+	to get the list of dynamic relocations for a local symbol.
+	(elf32_arm_adjust_dynamic_symbol): Handle STT_GNU_IFUNC symbols.
+	Don't remove STT_GNU_IFUNC PLTs unless all references have been
+	removed.  Update after the changes to elf32_arm_link_hash_entry.
+	(allocate_dynrelocs_for_symbol): Decide whether STT_GNU_IFUNC PLT
+	entries should live in .plt or .iplt.  Check whether the .igot.plt
+	and .got entries can be combined.  Use elf32_arm_allocate_plt_entry
+	to allocate .plt and .(i)got.plt entries.  Detect which .got
+	entries will need R_ARM_IRELATIVE relocations and use
+	elf32_arm_allocate_irelocs to allocate them.  Likewise other
+	non-.got dynamic relocations.
+	(elf32_arm_size_dynamic_sections): Allocate .iplt, .igot.plt
+	and dynamic relocations for local STT_GNU_IFUNC symbols.
+	Check whether the .igot.plt and .got entries can be combined.
+	Detect which .got entries will need R_ARM_IRELATIVE relocations
+	and use elf32_arm_allocate_irelocs to allocate them.  Use stashed
+	section pointers intead of strcmp checks.  Handle iplt and igotplt.
+	(elf32_arm_finish_dynamic_symbol): Use elf32_arm_populate_plt_entry
+	to fill in .plt, .got.plt and .rel(a).plt entries.  Point
+	STT_GNU_IFUNC symbols at an .iplt entry if non-call relocations
+	resolve to it.
+	(elf32_arm_output_plt_map_1): New function, split out from
+	elf32_arm_output_plt_map.  Handle .iplt entries.  Use
+	elf32_arm_plt_needs_thumb_stub_p.
+	(elf32_arm_output_plt_map): Call it.
+	(elf32_arm_output_arch_local_syms): Add mapping symbols for
+	local .iplt entries.
+	(elf32_arm_swap_symbol_in): Handle Thumb STT_GNU_IFUNC symbols.
+	(elf32_arm_swap_symbol_out): Likewise.
+	(elf32_arm_add_symbol_hook): New function.
+	(elf_backend_add_symbol_hook): Define for all targets.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf-bfd.h (elf_link_hash_entry): Add target_internal.
+	* elf.c (swap_out_syms): Set st_target_internal for each
+	Elf_Internal_Sym.
+	* elfcode.h (elf_swap_symbol_in): Likewise.
+	* elf32-i370.c (i370_elf_finish_dynamic_sections): Likewise.
+	* elf32-sh-symbian.c (sh_symbian_relocate_section): Likewise.
+	* elf64-sparc.c (elf64_sparc_output_arch_syms): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Likewise.
+	* elflink.c (elf_link_output_extsym): Likewise.
+	(bfd_elf_final_link): Likewise.
+	(elf_link_add_object_symbols): Copy st_target_internal
+	to the hash table if we see a definition.
+	(_bfd_elf_copy_link_hash_symbol_type): Copy target_internal.
+	* elf32-arm.c (elf32_arm_stub_hash_entry): Replace st_type with
+	a branch_type field.
+	(a8_erratum_fix, a8_erratum_reloc): Likewise.
+	(arm_type_of_stub): Replace actual_st_type with an
+	actual_branch_type parameter.
+	(arm_build_one_stub): Use branch types rather than st_types to
+	determine the type of branch.
+	(cortex_a8_erratum_scan): Likewise.
+	(elf32_arm_size_stubs): Likewise.
+	(bfd_elf32_arm_process_before_allocation): Likewise.
+	(allocate_dynrelocs_for_symbol): Likewise.
+	(elf32_arm_finish_dynamic_sections): Likewise.
+	(elf32_arm_final_link_relocate): Replace sym_flags parameter with
+	a branch_type parameter.
+	(elf32_arm_relocate_section): Update call accordingly.
+	(elf32_arm_adjust_dynamic_symbol): Don't check STT_ARM_TFUNC.
+	(elf32_arm_output_map_sym): Initialize st_target_internal.
+	(elf32_arm_output_stub_sym): Likewise.
+	(elf32_arm_symbol_processing): Delete.
+	(elf32_arm_swap_symbol_in): Convert STT_ARM_TFUNCs into STT_FUNCs.
+	Use st_target_internal to record the branch type.
+	(elf32_arm_swap_symbol_out): Use st_target_internal to test for
+	Thumb functions.
+	(elf32_arm_is_function_type): Delete.
+	(elf_backend_symbol_processing): Likewise.
+	(elf_backend_is_function_type): Likewise.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Always assign a dynobj.
+	(elf32_arm_finish_dynamic_sections): Move sgot != NULL assertion
+	into the PLT block.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Use call_reloc_p,
+	may_need_local_target_p and may_become_dynamic_p to classify
+	the relocation type.  Don't check info->symbolic or h->def_regular
+	when deciding whether to record a potential dynamic reloc.
+	Don't treat potential dynamic relocs as PLT references.
+	(elf32_arm_gc_sweep_hook): Update to match.  Assert that we don't
+	try to make the PLT reference count go negative.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Always fill in the
+	GOT entry here, rather than leaving it to finish_dynamic_symbol.
+	Only create a dynamic relocation for local references if
+	info->shared.
+	(allocate_dynrelocs_for_symbol): Update dynamic relocation
+	allocation accordingly.
+	(elf32_arm_finish_dynamic_symbol): Don't initialise the GOT entry here.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_allocate_dynrelocs): New function.
+	(elf32_arm_add_dynreloc): Likewise.
+	(elf32_arm_adjust_dynamic_symbol): Use elf32_arm_allocate_dynrelocs
+	to allocate dynamic relocations.
+	(elf32_arm_size_dynamic_sections): Likewise.
+	(allocate_dynrelocs): Likewise.  Rename to
+	allocate_dynrelocs_for_symbol.
+	(elf32_arm_final_link_relocate): Use elf32_arm_add_dynreloc to
+	create dynamic relocations.
+	(elf32_arm_finish_dynamic_symbol): Likewise.
+
+2011-03-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_tls_transition): Supprt TLS
+	x32 GD->IE and GD->LE transitions.
+	(elf_x86_64_relocate_section): Supprt TLS x32 GD->IE, GD->LE
+	and LD->LE transitions.
+
+2011-03-10  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Provide section/offset
+	for LO_DS error message and correct multiple.
+
+2011-03-10  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (bfd_elf64_bfd_link_just_syms): Define.
+	(ppc64_elf_link_just_syms): New function.
+	(opd_entry_value): Don't assume big-endian host.
+	(get_r2off): New function.
+	(ppc_build_one_stub, ppc_size_one_stub): Use it here.
+
+2011-03-06  Michael Snyder  <msnyder@vmware.com>
+
+	* compress.c (bfd_compress_section_contents): Check for out of mem.
+
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Document
+	that case statement falls through intentionally.
+
+	* elf32-i386.c (elf_i386_relocate_section): Document fall through.
+
+2011-03-04  Alan Modra  <amodra@gmail.com>
+
+	* archive.c (bsd_write_armap): Don't call stat in deterministic
+	mode, and don't use st_mtime if stat returns error.
+
+2011-03-03  Michael Snyder  <msnyder@vmware.com>
+
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Remove dead code.
+
+	* coff-x86_64.c (coff_amd64_rtype_to_howto): Fencepost error.
+
+	* aoutx.h (aout_final_link): Use sizeof int not sizeof int*.
+	(aout_link_write_other_symbol): Missing break statement.
+
+	* dwarf2.c (scan_unit_for_symbols): Stop memory leak.
+
+	* archive.c (_bfd_slurp_extended_name_table): Fail if bfd_seek fails.
+
+2011-03-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_tls_transition): Supprt TLS
+	x32 IE->LE transition.
+	(elf_x86_64_relocate_section): Likewise.
+
+2011-03-02  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elflink.c (is_reloc_section): Remove function.
+	(get_dynamic_reloc_section_name): Construct string manually.
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* archive.c (_bfd_find_nested_archive): Use filename_(n)cmp.
+	(adjust_relative_path): Likewise.
+	(_bfd_construct_extended_name_table): Likewise.
+	* corefile.c (generic_core_file_matches_executable_p): Likewise.
+	* elf32-bfin.c (bfinfdpic_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-spu.c (sort_bfds): Likewise.
+	(spu_elf_auto_overlay): Likewise.
+	* syms.c (_bfd_stab_section_find_nearest_line): Likewise.
+	* xcofflink.c (xcoff_set_import_path): Likewise.
+	* xtensa-isa.c (xtensa_regfile_lookup): Likewise.
+	(xtensa_regfile_lookup_shortname): Likewise.
+
+2011-02-28  Alan Modra  <amodra@gmail.com>
+
+	PR 12513
+	* archive.c (bfd_slurp_bsd_armap_f2): Sanity check parsed_size and
+	stringsize.  Properly sanity check symdef_count.  Remove redundant
+	bfd_release.
+
+2011-02-25  Rafael �vila de Espíndola <respindola@mozilla.com>
+
+	* plugin.c (bfd_plugin_object_p): Correctly set the filesize
+	and handle claim_file seeking. Only try to load the plugin once.
+
+2011-02-22  Andreas Schwab  <schwab@redhat.com>
+
+	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): For a TLS_GD
+	relocation read the value from the second GOT slot.
+
+2011-02-15  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_link_add_archive_symbols): Add a comment.
+
+2011-02-15  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Reinstate second read of
+	toc relocs.  Fuss over free(NULL).
+
+2011-02-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* elflink.c (bfd_elf_size_dynamic_sections): Add
+	bfd_get_symbol_leading_char to the start of newname.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-09  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Don't free toc relocs until
+	we are done.  When optimising large toc, check that a global
+	symbol on a toc reloc is defined in a kept section.
+
+2011-02-08  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12467
+	* elf.c (assign_file_positions_for_load_sections): Set the program
+	header offset and entry size to zero if there are no program
+	headers.
+
+2011-02-08  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Don't segfault on NULL
+	local_syms when looking for local symbols in .toc.
+
+2011-02-01  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_next_input_section): Use elf_gp value
+	for toc pointer on any section having makes_toc_func_call set.
+	(check_pasted_section): Ensure pasted .init/.fini fragments use
+	the same toc if any has makes_toc_func_call set.
+
+2011-01-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_link_hash_newfunc): Initialize has_sda_refs
+	field.
+
+2011-01-22  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Ignore
+	common sections too.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_want_plt_sym): Redefine to 0 after
+	Solaris target.
+
+2011-01-18  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	Fix compilation for mingw64.
+	* coffcode.h (coff_slurp_symbol_table): Add intptr_t intermediate
+	typecast to avoid warning.
+	* elf32-rx.c: Add "bfd_stdint.h" include required for int32_t type
+	usage.
+	* elfxx-ia64.c (elfNN_ia64_relax_br): Use intptr_t typeacast instead
+	of long for pointer to avoid warning.
+	(elfNN_ia64_relax_brl): Idem.
+	(elfNN_ia64_install_value): Idem.
+	* vms-alpha.c (_bfd_vms_slurp_etir): Idem.
+
+2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Check needs_plt rather than
+	h->needs_plt when deciding whether to record a possible dynamic reloc.
+
+2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_gc_sweep_hook): Remove all registered
+	dynamic relocs for the removed section.
+
+2011-01-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Check invalid x32
+	relocations.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_link_hash_table): Add pointer_r_type.
+	(elf_x86_64_link_hash_table_create): Set pointer_r_type.
+	(elf_x86_64_check_relocs): Handle R_X86_64_32 like R_X86_64_64
+	for ILP32.  Remove ABI_64_P PIC check for R_X86_64_8,
+	R_X86_64_16, R_X86_64_32 and R_X86_64_32S.
+	(elf_x86_64_relocate_section):  Handle R_X86_64_32 like R_X86_64_64
+	for ILP32.
+
+2011-01-14  Alan Modra  <amodra@gmail.com>
+
+	* bfd.c (bfd_perror): Flush stdout before and stderr after printing
+	error.
+	(_bfd_default_error_handler): Likewise.
+	* elf.c (print_segment_map): Likewise.
+	* libbfd.c (warn_deprecated): Likewise.
+	* som.c (som_sizeof_headers): No need to do so here.
+	* coff-i860.c: Replace use of printf for error messages with
+	_bfd_error_handler.
+	* coff-ppc.c: Likewise.
+	* coff-sh.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-dlx.c: Likewise.
+	* elf32-mep.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* mach-o.c: Likewise.
+	* pef.c: Likewise.
+
+2011-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_link_hash_table): Remove
+	swap_reloca_out.
+	(elf_x86_64_link_hash_table_create): Don't set swap_reloca_out.
+	(elf_x86_64_check_relocs): Align relocation section to 4 byte
+	for 32bit.
+	(elf_x86_64_gc_sweep_hook): Replace ELF64_ST_TYPE with
+	ELF_ST_TYPE.
+	(elf_x86_64_finish_dynamic_symbol): Updated.
+	(elf_x86_64_finish_dynamic_sections): Don't use
+	Elf64_External_Dyn, bfd_elf64_swap_dyn_in, nor
+	bfd_elf64_swap_dyn_out.
+
+2011-01-14  J. Park  <grassman@gmail.com>
+
+	PR ld/12339
+	* elf32-arm.c (allocate_dynrelocs): Don't set up eh before
+	following bfd_link_hash_warning symbol link.
+
+2011-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+	    Glauber de Oliveira Costa  <glommer@gmail.com>
+
+	* reloc.c (BFD_RELOC_ARM_TLS_GOTDESC, BFD_RELOC_ARM_TLS_CALL,
+	BFD_RELOC_ARM_THM_TLS_CALL, BFD_RELOC_ARM_TLS_DESCSEQ,
+	BFD_RELOC_ARM_THM_TLS_DESCSEQ, BFD_RELOC_ARM_TLS_DESC): New
+	relocations.
+	* libbfd.h: Rebuilt.
+	* bfd-in2.h: Rebuilt.
+	* elf32-arm.c (elf32_arm_howto_table_1): Add new relocations.
+	(elf32_arm_reloc_map): Likewise.
+	(tls_trampoline, dl_tlsdesc_lazy_trampoline): New PLT templates.
+	(elf32_arm_stub_long_branch_any_tls_pic,
+	elf32_arm_stub_long_branch_v4t_thumb_tls_pic): New stub templates.
+	(DEF_STUBS): Add new stubs.
+	(struct_elf_arm_obj_data): Add local_tlsdesc_gotent field.
+	(elf32_arm_local_tlsdesc_gotent): New.
+	(GOT_TLS_GDESC): New mask.
+	(GOT_TLS_GD_ANY): Define.
+	(struct elf32_arm_link_hash_entry): Add tlsdesc_got field.
+	(elf32_arm_compute_jump_table_size): New.
+	(struct elf32_arm_link_hash_table): Add next_tls_desc_index,
+	num_tls_desc, dt_tlsdesc_plt, dt_tlsdesc_got, tls_trampoline,
+	sgotplt_jump_table_size fields.
+	(elf32_arm_link_hash_newfunc): Initialize tlsdesc_got field.
+	(elf32_arm_link_hash_table_create): Initialize new fields.
+	(arm_type_of_stub): Check TLS desc relocs too.
+	(elf32_arm_stub_name): TLS desc relocs can be shared.
+	(elf32_arm_tls_transition): Determine relaxation.
+	(arm_stub_required_alignment): Add tls stubs.
+	(elf32_arm_size_stubs): Likewise.
+	(elf32_arm_tls_relax): Perform TLS relaxing.
+	(elf32_arm_final_link_relocate): Process TLS DESC relocations.
+	(IS_ARM_TLS_GNU_RELOC): New.
+	(IS_ARM_TLS_RELOC): Use it.
+	(elf32_arm_relocate_section): Perform TLS relaxing.
+	(elf32_arm_check_relocs): Anticipate TLS relaxing, process tls
+	desc relocations.
+	(allocate_dynrelocs): Allocate tls desc relcoations.
+	(elf32_arm_output_arch_local_syms): Emit tls trampoline mapping
+	symbols.
+	(elf32_arm_size_dynamic_sections): Allocate tls trampolines and
+	got slots.
+	(elf32_arm_always_size_sections): New. Create _TLS_MODULE_BASE
+	symbol.
+	(elf32_arm_finish_dynamic_symbol): Adjust.
+	(arm_put_trampoline): New.
+	(elf32_arm_finish_dynamic_sections): Emit new dynamic tags and tls
+	trampolines.
+	(elf_backend_always_size_sections): Define.
+
+2011-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Optimized.
+
+2011-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12366
+	PR ld/12371
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Properly
+	handle symbols marked with regular reference, but not non-GOT
+	reference when building shared library.
+
+	* elf32-i386.c (elf_i386_gc_sweep_hook): Properly handle
+	local and global STT_GNU_IFUNC symols when building shared
+	library.
+	* elf64-x86-64.c (elf_x86_64_gc_sweep_hook): Likewise.
+
+2011-01-05  DJ Delorie  <dj@redhat.com>
+
+	* reloc.c: Add BFD_RELOC_RX_OP_NEG.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* elf32-rx.c: Add it to the list, corresponding to R_RX_OPneg.
 
-2012-01-03  Iain Sandoe  <idsandoe@googlemail.com>
+2011-01-03  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* mach-o.c (bfd_mach_o_mangle_symbols): Put in the section index
-	for stabd symbols.
-	(bfd_mach_o_primary_symbol_sort_key): Adjust for stabs.
-	(bfd_mach_o_cf_symbols): Likewise.
+	* cpu-i386.c (bfd_i386_compatible): New.
+	(bfd_x64_32_arch_intel_syntax): Replace bfd_default_compatible
+	with bfd_i386_compatible.
+	(bfd_x86_64_arch_intel_syntax): Likewise.
+	(bfd_i386_arch_intel_syntax): Likewise.
+	(i8086_arch): Likewise.
+	(bfd_x64_32_arch): Likewise.
+	(bfd_x86_64_arch): Likewise.
+	(bfd_i386_arch): Likewise.
 
-2012-01-03  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* mach-o.c (bfd_mach_o_mangle_symbols): Correct typo.
-
-2012-01-03  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* mach-o.c (bfd_mach_o_write_symtab): Fill in the string table index
-	as the value of an indirect symbol.  Keep the string table index in
-	non-indirect syms for reference.
-	(bfd_mach_o_write_dysymtab): New.
-	(bfd_mach_o_primary_symbol_sort_key): New.
-	(bfd_mach_o_cf_symbols): New.
-	(bfd_mach_o_sort_symbol_table): New.
-	(bfd_mach_o_mangle_symbols): Return early if no symbols.  Sort symbols.
-	If we are emitting a dysymtab, process indirect symbols and count the
-	number of each other kind.
-	(bfd_mach_o_mangle_sections): New.
-	(bfd_mach_o_write_contents): Split out some pre-requisite code into
-	the command builder. Write dysymtab if the command is present.
-	(bfd_mach_o_count_sections_for_seg): New.
-	(bfd_mach_o_build_seg_command): New.
-	(bfd_mach_o_build_dysymtab_command): New.
-	(bfd_mach_o_build_commands): Reorganize to support the fact that some
-	commands are optional and should not be emitted if there are no
-	sections or symbols.
-	(bfd_mach_o_set_section_contents): Amend comment.
-	* mach-o.h: Amend and add to comments.
-	(mach_o_data_struct): Add fields for dysymtab symbols counts and a
-	pointer to the indirects, when present.
-	(bfd_mach_o_should_emit_dysymtab): New macro.
-	(IS_MACHO_INDIRECT): Likewise.
-
-For older changes see ChangeLog-2011
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 8f4fbee863..ea4fd284a2 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
 # Uncomment the following line when doing a release.
-# RELEASE=y
+RELEASE=y
 
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
@@ -83,7 +83,6 @@ ALL_MACHINES = \
 	cpu-d10v.lo \
 	cpu-d30v.lo \
 	cpu-dlx.lo \
-	cpu-epiphany.lo \
 	cpu-fr30.lo \
 	cpu-frv.lo \
 	cpu-h8300.lo \
@@ -123,7 +122,6 @@ ALL_MACHINES = \
 	cpu-plugin.lo \
 	cpu-powerpc.lo \
 	cpu-rs6000.lo \
-	cpu-rl78.lo \
 	cpu-rx.lo \
 	cpu-s390.lo \
 	cpu-score.lo \
@@ -160,7 +158,6 @@ ALL_MACHINES_CFILES = \
 	cpu-d10v.c \
 	cpu-d30v.c \
 	cpu-dlx.c \
-	cpu-epiphany.c \
 	cpu-fr30.c \
 	cpu-frv.c \
 	cpu-h8300.c \
@@ -200,7 +197,6 @@ ALL_MACHINES_CFILES = \
 	cpu-plugin.c \
 	cpu-powerpc.c \
 	cpu-rs6000.c \
-	cpu-rl78.c \
 	cpu-rx.c \
 	cpu-s390.c \
 	cpu-score.c \
@@ -290,7 +286,6 @@ BFD32_BACKENDS = \
 	elf32-d10v.lo \
 	elf32-d30v.lo \
 	elf32-dlx.lo \
-	elf32-epiphany.lo \
 	elf32-fr30.lo \
 	elf32-frv.lo \
 	elf32-gen.lo \
@@ -321,7 +316,6 @@ BFD32_BACKENDS = \
 	elf32-or32.lo \
 	elf32-pj.lo \
 	elf32-ppc.lo \
-	elf32-rl78.lo \
 	elf32-rx.lo \
 	elf32-s390.lo \
 	elf32-sh-symbian.lo \
@@ -476,7 +470,6 @@ BFD32_BACKENDS_CFILES = \
 	elf32-d10v.c \
 	elf32-d30v.c \
 	elf32-dlx.c \
-	elf32-epiphany.c \
 	elf32-fr30.c \
 	elf32-frv.c \
 	elf32-gen.c \
@@ -507,7 +500,6 @@ BFD32_BACKENDS_CFILES = \
 	elf32-or32.c \
 	elf32-pj.c \
 	elf32-ppc.c \
-	elf32-rl78.c \
 	elf32-rx.c \
 	elf32-s390.c \
 	elf32-sh-symbian.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 437bafcde0..741809c98e 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -320,7 +320,7 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
 # Uncomment the following line when doing a release.
-# RELEASE=y
+RELEASE = y
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 SUBDIRS = doc po
@@ -382,7 +382,6 @@ ALL_MACHINES = \
 	cpu-d10v.lo \
 	cpu-d30v.lo \
 	cpu-dlx.lo \
-	cpu-epiphany.lo \
 	cpu-fr30.lo \
 	cpu-frv.lo \
 	cpu-h8300.lo \
@@ -422,7 +421,6 @@ ALL_MACHINES = \
 	cpu-plugin.lo \
 	cpu-powerpc.lo \
 	cpu-rs6000.lo \
-	cpu-rl78.lo \
 	cpu-rx.lo \
 	cpu-s390.lo \
 	cpu-score.lo \
@@ -459,7 +457,6 @@ ALL_MACHINES_CFILES = \
 	cpu-d10v.c \
 	cpu-d30v.c \
 	cpu-dlx.c \
-	cpu-epiphany.c \
 	cpu-fr30.c \
 	cpu-frv.c \
 	cpu-h8300.c \
@@ -499,7 +496,6 @@ ALL_MACHINES_CFILES = \
 	cpu-plugin.c \
 	cpu-powerpc.c \
 	cpu-rs6000.c \
-	cpu-rl78.c \
 	cpu-rx.c \
 	cpu-s390.c \
 	cpu-score.c \
@@ -590,7 +586,6 @@ BFD32_BACKENDS = \
 	elf32-d10v.lo \
 	elf32-d30v.lo \
 	elf32-dlx.lo \
-	elf32-epiphany.lo \
 	elf32-fr30.lo \
 	elf32-frv.lo \
 	elf32-gen.lo \
@@ -621,7 +616,6 @@ BFD32_BACKENDS = \
 	elf32-or32.lo \
 	elf32-pj.lo \
 	elf32-ppc.lo \
-	elf32-rl78.lo \
 	elf32-rx.lo \
 	elf32-s390.lo \
 	elf32-sh-symbian.lo \
@@ -776,7 +770,6 @@ BFD32_BACKENDS_CFILES = \
 	elf32-d10v.c \
 	elf32-d30v.c \
 	elf32-dlx.c \
-	elf32-epiphany.c \
 	elf32-fr30.c \
 	elf32-frv.c \
 	elf32-gen.c \
@@ -807,7 +800,6 @@ BFD32_BACKENDS_CFILES = \
 	elf32-or32.c \
 	elf32-pj.c \
 	elf32-ppc.c \
-	elf32-rl78.c \
 	elf32-rx.c \
 	elf32-s390.c \
 	elf32-sh-symbian.c \
@@ -1268,7 +1260,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-d10v.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-d30v.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-dlx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-epiphany.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-fr30.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-frv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8300.Plo@am__quote@
@@ -1307,7 +1298,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pj.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-powerpc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-rl78.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-rs6000.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-rx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-s390.Plo@am__quote@
@@ -1356,7 +1346,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-d10v.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-d30v.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-dlx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-epiphany.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-fr30.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-frv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-gen.Plo@am__quote@
@@ -1388,7 +1377,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-or32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-pj.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ppc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-rl78.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-rx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-s390.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-score.Plo@am__quote@
diff --git a/bfd/archive.c b/bfd/archive.c
index fd44f5405f..3e333c7e89 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -1,7 +1,7 @@
 /* BFD back-end for archive files (libraries).
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-   2012  Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
    Written by Cygnus Support.  Mostly Gumby Henkel-Wallace's fault.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -178,29 +178,6 @@ _bfd_ar_spacepad (char *p, size_t n, const char *fmt, long val)
   else
     memcpy (p, buf, n);
 }
-
-bfd_boolean
-_bfd_ar_sizepad (char *p, size_t n, bfd_size_type size)
-{
-  static char buf[21];
-  size_t len;
-
-  snprintf (buf, sizeof (buf), "%-10" BFD_VMA_FMT "u", size);
-  len = strlen (buf);
-  if (len > n)
-    {
-      bfd_set_error (bfd_error_file_too_big);
-      return FALSE;
-    }
-  if (len < n)
-    {
-      memcpy (p, buf, len);
-      memset (p + len, ' ', n - len);
-    }
-  else
-    memcpy (p, buf, n);
-  return TRUE;
-}
 
 bfd_boolean
 _bfd_generic_mkarchive (bfd *abfd)
@@ -447,7 +424,7 @@ _bfd_generic_read_ar_hdr_mag (bfd *abfd, const char *mag)
 {
   struct ar_hdr hdr;
   char *hdrp = (char *) &hdr;
-  bfd_size_type parsed_size;
+  size_t parsed_size;
   struct areltdata *ared;
   char *filename = NULL;
   bfd_size_type namelen = 0;
@@ -471,7 +448,8 @@ _bfd_generic_read_ar_hdr_mag (bfd *abfd, const char *mag)
     }
 
   errno = 0;
-  if (sscanf (hdr.ar_size, "%" BFD_VMA_FMT "u", &parsed_size) != 1)
+  parsed_size = strtol (hdr.ar_size, NULL, 10);
+  if (errno != 0)
     {
       bfd_set_error (bfd_error_malformed_archive);
       return NULL;
@@ -603,6 +581,12 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos)
   bfd *n_nfd;
   char *filename;
 
+  if (archive->my_archive)
+    {
+      filepos += archive->origin;
+      archive = archive->my_archive;
+    }
+
   n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos);
   if (n_nfd)
     return n_nfd;
@@ -743,11 +727,13 @@ bfd_generic_openr_next_archived_file (bfd *archive, bfd *last_file)
     filestart = bfd_ardata (archive)->first_file_filepos;
   else
     {
-      bfd_size_type size = arelt_size (last_file);
+      unsigned int size = arelt_size (last_file);
 
       filestart = last_file->proxy_origin;
       if (! bfd_is_thin_archive (archive))
         filestart += size;
+      if (archive->my_archive)
+	filestart -= archive->origin;
       /* Pad to an even boundary...
 	 Note that last_file->origin can be odd in the case of
 	 BSD-4.4-style element with a long odd size.  */
@@ -939,7 +925,7 @@ do_slurp_coff_armap (bfd *abfd)
   struct artdata *ardata = bfd_ardata (abfd);
   char *stringbase;
   bfd_size_type stringsize;
-  bfd_size_type parsed_size;
+  unsigned int parsed_size;
   carsym *carsyms;
   bfd_size_type nsymz;		/* Number of symbols in armap.  */
   bfd_vma (*swap) (const void *);
@@ -1103,7 +1089,7 @@ bfd_slurp_armap (bfd *abfd)
       /* Read the extended name.  We know its length.  */
       if (bfd_bread (extname, 20, abfd) != 20)
         return FALSE;
-      if (bfd_seek (abfd, -(file_ptr) (sizeof (hdr) + 20), SEEK_CUR) != 0)
+      if (bfd_seek (abfd, (file_ptr) -(sizeof (hdr) + 20), SEEK_CUR) != 0)
         return FALSE;
       if (CONST_STRNEQ (extname, "__.SYMDEF SORTED")
           || CONST_STRNEQ (extname, "__.SYMDEF"))
@@ -1784,16 +1770,14 @@ _bfd_bsd44_write_ar_hdr (bfd *archive, bfd *abfd)
 
       BFD_ASSERT (padded_len == arch_eltdata (abfd)->extra_size);
 
-      if (!_bfd_ar_sizepad (hdr->ar_size, sizeof (hdr->ar_size),
-                            arch_eltdata (abfd)->parsed_size + padded_len))
-        return FALSE;
+      _bfd_ar_spacepad (hdr->ar_size, sizeof (hdr->ar_size), "%-10ld",
+                        arch_eltdata (abfd)->parsed_size + padded_len);
 
       if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr))
         return FALSE;
 
       if (bfd_bwrite (fullname, len, archive) != len)
         return FALSE;
-
       if (len & 3)
         {
           static const char pad[3] = { 0, 0, 0 };
@@ -1907,11 +1891,8 @@ bfd_ar_hdr_from_filesystem (bfd *abfd, const char *filename, bfd *member)
                       status.st_gid);
   _bfd_ar_spacepad (hdr->ar_mode, sizeof (hdr->ar_mode), "%-8lo",
                     status.st_mode);
-  if (!_bfd_ar_sizepad (hdr->ar_size, sizeof (hdr->ar_size), status.st_size))
-    {
-      free (ared);
-      return NULL;
-    }
+  _bfd_ar_spacepad (hdr->ar_size, sizeof (hdr->ar_size), "%-10ld",
+                    status.st_size);
   memcpy (hdr->ar_fmag, ARFMAG, 2);
   ared->parsed_size = status.st_size;
   ared->arch_header = (char *) hdr;
@@ -2151,9 +2132,8 @@ _bfd_write_archive_contents (bfd *arch)
       memset (&hdr, ' ', sizeof (struct ar_hdr));
       memcpy (hdr.ar_name, ename, strlen (ename));
       /* Round size up to even number in archive header.  */
-      if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size),
-                            (elength + 1) & ~(bfd_size_type) 1))
-        return FALSE;
+      _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld",
+                        (elength + 1) & ~(bfd_size_type) 1);
       memcpy (hdr.ar_fmag, ARFMAG, 2);
       if ((bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
 	   != sizeof (struct ar_hdr))
@@ -2171,7 +2151,7 @@ _bfd_write_archive_contents (bfd *arch)
        current = current->archive_next)
     {
       char buffer[DEFAULT_BUFFERSIZE];
-      bfd_size_type remaining = arelt_size (current);
+      unsigned int remaining = arelt_size (current);
 
       /* Write ar header.  */
       if (!_bfd_write_ar_hdr (arch, current))
@@ -2429,8 +2409,7 @@ bsd_write_armap (bfd *arch,
                     bfd_ardata (arch)->armap_timestamp);
   _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld", uid);
   _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld", gid);
-  if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize))
-    return FALSE;
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld", mapsize);
   memcpy (hdr.ar_fmag, ARFMAG, 2);
   if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
       != sizeof (struct ar_hdr))
@@ -2585,8 +2564,8 @@ coff_write_armap (bfd *arch,
 
   memset (&hdr, ' ', sizeof (struct ar_hdr));
   hdr.ar_name[0] = '/';
-  if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize))
-    return FALSE;
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld",
+                    mapsize);
   _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
                     ((arch->flags & BFD_DETERMINISTIC_OUTPUT) == 0
                      ? time (NULL) : 0));
diff --git a/bfd/archive64.c b/bfd/archive64.c
index f3a13d341e..bbc4c3f72f 100644
--- a/bfd/archive64.c
+++ b/bfd/archive64.c
@@ -1,6 +1,6 @@
 /* MIPS-specific support for 64-bit ELF
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007,
-   2010, 2012  Free Software Foundation, Inc.
+   2010  Free Software Foundation, Inc.
    Ian Lance Taylor, Cygnus Support
    Linker support added by Mark Mitchell, CodeSourcery, LLC.
    <mark@codesourcery.com>
@@ -169,8 +169,8 @@ bfd_elf64_archive_write_armap (bfd *arch,
 
   memset (&hdr, ' ', sizeof (struct ar_hdr));
   memcpy (hdr.ar_name, "/SYM64/", strlen ("/SYM64/"));
-  if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize))
-    return FALSE;
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld",
+                    mapsize);
   _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
                     time (NULL));
   /* This, at least, is what Intel coff sets the values to.: */
diff --git a/bfd/archures.c b/bfd/archures.c
index d38d806793..44850e75dc 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -1,7 +1,7 @@
 /* BFD library support routines for architectures.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-   2012 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
    Hacked by John Gilmore and Steve Chamberlain of Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -176,8 +176,6 @@ DESCRIPTION
 .#define bfd_mach_mips_loongson_3a      3003
 .#define bfd_mach_mips_sb1              12310201 {* octal 'SB', 01 *}
 .#define bfd_mach_mips_octeon		6501
-.#define bfd_mach_mips_octeonp		6601
-.#define bfd_mach_mips_octeon2		6502
 .#define bfd_mach_mips_xlr              887682   {* decimal 'XLR'  *}
 .#define bfd_mach_mipsisa32             32
 .#define bfd_mach_mipsisa32r2           33
@@ -241,8 +239,6 @@ DESCRIPTION
 .#define bfd_mach_ppc_e500      500
 .#define bfd_mach_ppc_e500mc    5001
 .#define bfd_mach_ppc_e500mc64  5005
-.#define bfd_mach_ppc_e5500     5006
-.#define bfd_mach_ppc_e6500     5007
 .#define bfd_mach_ppc_titan     83
 .  bfd_arch_rs6000,    {* IBM RS/6000 *}
 .#define bfd_mach_rs6k		6000
@@ -369,9 +365,6 @@ DESCRIPTION
 . bfd_arch_iq2000,     {* Vitesse IQ2000.  *}
 .#define bfd_mach_iq2000        1
 .#define bfd_mach_iq10          2
-.  bfd_arch_epiphany,	{* Adapteva EPIPHANY *}
-.#define bfd_mach_epiphany16	1
-.#define bfd_mach_epiphany32	2
 .  bfd_arch_mt,
 .#define bfd_mach_ms1           1
 .#define bfd_mach_mrisc2        2
@@ -407,8 +400,6 @@ DESCRIPTION
 .#define bfd_mach_cris_v0_v10	255
 .#define bfd_mach_cris_v32	32
 .#define bfd_mach_cris_v10_v32	1032
-.  bfd_arch_rl78,
-.#define bfd_mach_rl78	0x75
 .  bfd_arch_rx,        {* Renesas RX.  *}
 .#define bfd_mach_rx            0x75
 .  bfd_arch_s390,      {* IBM s390 *}
@@ -455,7 +446,6 @@ DESCRIPTION
 .  bfd_arch_tilegx, {* Tilera TILE-Gx *}
 .#define bfd_mach_tilepro   1
 .#define bfd_mach_tilegx    1
-.#define bfd_mach_tilegx32  2
 .  bfd_arch_last
 .  };
 */
@@ -488,12 +478,6 @@ DESCRIPTION
 .
 .  bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
 .
-.  {* Allocate via bfd_malloc and return a fill buffer of size COUNT.  If
-.     IS_BIGENDIAN is TRUE, the order of bytes is big endian.  If CODE is
-.     TRUE, the buffer contains code.  *}
-.  void *(*fill) (bfd_size_type count, bfd_boolean is_bigendian,
-.		  bfd_boolean code);
-.
 .  const struct bfd_arch_info *next;
 .}
 .bfd_arch_info_type;
@@ -512,7 +496,6 @@ extern const bfd_arch_info_type bfd_crx_arch;
 extern const bfd_arch_info_type bfd_d10v_arch;
 extern const bfd_arch_info_type bfd_d30v_arch;
 extern const bfd_arch_info_type bfd_dlx_arch;
-extern const bfd_arch_info_type bfd_epiphany_arch;
 extern const bfd_arch_info_type bfd_fr30_arch;
 extern const bfd_arch_info_type bfd_frv_arch;
 extern const bfd_arch_info_type bfd_h8300_arch;
@@ -553,7 +536,6 @@ extern const bfd_arch_info_type bfd_plugin_arch;
 extern const bfd_arch_info_type bfd_powerpc_archs[];
 #define bfd_powerpc_arch bfd_powerpc_archs[0]
 extern const bfd_arch_info_type bfd_rs6000_arch;
-extern const bfd_arch_info_type bfd_rl78_arch;
 extern const bfd_arch_info_type bfd_rx_arch;
 extern const bfd_arch_info_type bfd_s390_arch;
 extern const bfd_arch_info_type bfd_score_arch;
@@ -594,7 +576,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
     &bfd_d10v_arch,
     &bfd_d30v_arch,
     &bfd_dlx_arch,
-    &bfd_epiphany_arch,
     &bfd_fr30_arch,
     &bfd_frv_arch,
     &bfd_h8300_arch,
@@ -632,7 +613,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
     &bfd_pdp11_arch,
     &bfd_powerpc_arch,
     &bfd_rs6000_arch,
-    &bfd_rl78_arch,
     &bfd_rx_arch,
     &bfd_s390_arch,
     &bfd_score_arch,
@@ -823,7 +803,6 @@ const bfd_arch_info_type bfd_default_arch_struct = {
   32, 32, 8, bfd_arch_unknown, 0, "unknown", "unknown", 2, TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   0,
 };
 
@@ -1319,29 +1298,3 @@ bfd_arch_mach_octets_per_byte (enum bfd_architecture arch,
     return ap->bits_per_byte / 8;
   return 1;
 }
-
-/*
-INTERNAL_FUNCTION
-	bfd_arch_default_fill
-
-SYNOPSIS
-	void *bfd_arch_default_fill (bfd_size_type count,
-				     bfd_boolean is_bigendian,
-				     bfd_boolean code);
-
-DESCRIPTION
-	Allocate via bfd_malloc and return a fill buffer of size COUNT.
-	If IS_BIGENDIAN is TRUE, the order of bytes is big endian.  If
-	CODE is TRUE, the buffer contains code.
-*/
-
-void *
-bfd_arch_default_fill (bfd_size_type count,
-		       bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
-		       bfd_boolean code ATTRIBUTE_UNUSED)
-{
-  void *fill = bfd_malloc (count);
-  if (fill != NULL)
-    memset (fill, 0, count);
-  return fill;
-}
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index c331f3bbf8..a477b49e39 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -31,8 +31,6 @@ extern "C" {
 
 #include "ansidecl.h"
 #include "symcat.h"
-#include <sys/stat.h>
-
 #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #ifndef SABER
 /* This hack is to avoid a problem with some strict ANSI C preprocessors.
@@ -302,6 +300,9 @@ typedef struct bfd_section *sec_ptr;
    && bfd_is_abs_section ((sec)->output_section)		\
    && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
    && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
+
+/* Forward define.  */
+struct stat;
 
 typedef enum bfd_print_symbol
 {
@@ -705,9 +706,6 @@ extern int bfd_get_sign_extend_vma
 extern struct bfd_section *_bfd_elf_tls_setup
   (bfd *, struct bfd_link_info *);
 
-extern struct bfd_section *
-_bfd_nearby_section (bfd *, struct bfd_section *, bfd_vma);
-
 extern void _bfd_fix_excluded_sec_syms
   (bfd *, struct bfd_link_info *);
 
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 61513f20ed..22fcdf65bd 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -38,8 +38,6 @@ extern "C" {
 
 #include "ansidecl.h"
 #include "symcat.h"
-#include <sys/stat.h>
-
 #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #ifndef SABER
 /* This hack is to avoid a problem with some strict ANSI C preprocessors.
@@ -309,6 +307,9 @@ typedef struct bfd_section *sec_ptr;
    && bfd_is_abs_section ((sec)->output_section)		\
    && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
    && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
+
+/* Forward define.  */
+struct stat;
 
 typedef enum bfd_print_symbol
 {
@@ -712,9 +713,6 @@ extern int bfd_get_sign_extend_vma
 extern struct bfd_section *_bfd_elf_tls_setup
   (bfd *, struct bfd_link_info *);
 
-extern struct bfd_section *
-_bfd_nearby_section (bfd *, struct bfd_section *, bfd_vma);
-
 extern void _bfd_fix_excluded_sec_syms
   (bfd *, struct bfd_link_info *);
 
@@ -1885,8 +1883,6 @@ enum bfd_architecture
 #define bfd_mach_mips_loongson_3a      3003
 #define bfd_mach_mips_sb1              12310201 /* octal 'SB', 01 */
 #define bfd_mach_mips_octeon           6501
-#define bfd_mach_mips_octeonp          6601
-#define bfd_mach_mips_octeon2          6502
 #define bfd_mach_mips_xlr              887682   /* decimal 'XLR'  */
 #define bfd_mach_mipsisa32             32
 #define bfd_mach_mipsisa32r2           33
@@ -1950,8 +1946,6 @@ enum bfd_architecture
 #define bfd_mach_ppc_e500      500
 #define bfd_mach_ppc_e500mc    5001
 #define bfd_mach_ppc_e500mc64  5005
-#define bfd_mach_ppc_e5500     5006
-#define bfd_mach_ppc_e6500     5007
 #define bfd_mach_ppc_titan     83
   bfd_arch_rs6000,    /* IBM RS/6000 */
 #define bfd_mach_rs6k          6000
@@ -2078,9 +2072,6 @@ enum bfd_architecture
  bfd_arch_iq2000,     /* Vitesse IQ2000.  */
 #define bfd_mach_iq2000        1
 #define bfd_mach_iq10          2
-  bfd_arch_epiphany,   /* Adapteva EPIPHANY */
-#define bfd_mach_epiphany16    1
-#define bfd_mach_epiphany32    2
   bfd_arch_mt,
 #define bfd_mach_ms1           1
 #define bfd_mach_mrisc2        2
@@ -2116,8 +2107,6 @@ enum bfd_architecture
 #define bfd_mach_cris_v0_v10   255
 #define bfd_mach_cris_v32      32
 #define bfd_mach_cris_v10_v32  1032
-  bfd_arch_rl78,
-#define bfd_mach_rl78  0x75
   bfd_arch_rx,        /* Renesas RX.  */
 #define bfd_mach_rx            0x75
   bfd_arch_s390,      /* IBM s390 */
@@ -2164,7 +2153,6 @@ enum bfd_architecture
   bfd_arch_tilegx, /* Tilera TILE-Gx */
 #define bfd_mach_tilepro   1
 #define bfd_mach_tilegx    1
-#define bfd_mach_tilegx32  2
   bfd_arch_last
   };
 
@@ -2187,12 +2175,6 @@ typedef struct bfd_arch_info
 
   bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
 
-  /* Allocate via bfd_malloc and return a fill buffer of size COUNT.  If
-     IS_BIGENDIAN is TRUE, the order of bytes is big endian.  If CODE is
-     TRUE, the buffer contains code.  */
-  void *(*fill) (bfd_size_type count, bfd_boolean is_bigendian,
-                 bfd_boolean code);
-
   const struct bfd_arch_info *next;
 }
 bfd_arch_info_type;
@@ -2798,15 +2780,6 @@ to compensate for the borrow when the low bits are added.  */
 /* MIPS16 low 16 bits.  */
   BFD_RELOC_MIPS16_LO16,
 
-/* MIPS16 TLS relocations  */
-  BFD_RELOC_MIPS16_TLS_GD,
-  BFD_RELOC_MIPS16_TLS_LDM,
-  BFD_RELOC_MIPS16_TLS_DTPREL_HI16,
-  BFD_RELOC_MIPS16_TLS_DTPREL_LO16,
-  BFD_RELOC_MIPS16_TLS_GOTTPREL,
-  BFD_RELOC_MIPS16_TLS_TPREL_HI16,
-  BFD_RELOC_MIPS16_TLS_TPREL_LO16,
-
 /* Relocation against a MIPS literal section.  */
   BFD_RELOC_MIPS_LITERAL,
   BFD_RELOC_MICROMIPS_LITERAL,
@@ -2968,25 +2941,6 @@ be honoured at the offset's location, regardless of linker
 relaxation.  */
   BFD_RELOC_MN10300_ALIGN,
 
-/* Various TLS-related relocations.  */
-  BFD_RELOC_MN10300_TLS_GD,
-  BFD_RELOC_MN10300_TLS_LD,
-  BFD_RELOC_MN10300_TLS_LDO,
-  BFD_RELOC_MN10300_TLS_GOTIE,
-  BFD_RELOC_MN10300_TLS_IE,
-  BFD_RELOC_MN10300_TLS_LE,
-  BFD_RELOC_MN10300_TLS_DTPMOD,
-  BFD_RELOC_MN10300_TLS_DTPOFF,
-  BFD_RELOC_MN10300_TLS_TPOFF,
-
-/* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
-instruction.  */
-  BFD_RELOC_MN10300_32_PCREL,
-
-/* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
-instruction.  */
-  BFD_RELOC_MN10300_16_PCREL,
-
 
 /* i386/elf relocations  */
   BFD_RELOC_386_GOT32,
@@ -3822,6 +3776,14 @@ instructions.  */
 /* start data in text.  */
   BFD_RELOC_V850_DATA,
 
+/* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
+instruction.  */
+  BFD_RELOC_MN10300_32_PCREL,
+
+/* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
+instruction.  */
+  BFD_RELOC_MN10300_16_PCREL,
+
 /* This is a 8bit DP reloc for the tms320c30, where the most
 significant 8 bits of a 24 bit word are placed into the least
 significant 8 bits of the opcode.  */
@@ -4093,40 +4055,6 @@ instructions  */
 instructions  */
   BFD_RELOC_AVR_6_ADIW,
 
-/* Renesas RL78 Relocations.  */
-  BFD_RELOC_RL78_NEG8,
-  BFD_RELOC_RL78_NEG16,
-  BFD_RELOC_RL78_NEG24,
-  BFD_RELOC_RL78_NEG32,
-  BFD_RELOC_RL78_16_OP,
-  BFD_RELOC_RL78_24_OP,
-  BFD_RELOC_RL78_32_OP,
-  BFD_RELOC_RL78_8U,
-  BFD_RELOC_RL78_16U,
-  BFD_RELOC_RL78_24U,
-  BFD_RELOC_RL78_DIR3U_PCREL,
-  BFD_RELOC_RL78_DIFF,
-  BFD_RELOC_RL78_GPRELB,
-  BFD_RELOC_RL78_GPRELW,
-  BFD_RELOC_RL78_GPRELL,
-  BFD_RELOC_RL78_SYM,
-  BFD_RELOC_RL78_OP_SUBTRACT,
-  BFD_RELOC_RL78_OP_NEG,
-  BFD_RELOC_RL78_OP_AND,
-  BFD_RELOC_RL78_OP_SHRA,
-  BFD_RELOC_RL78_ABS8,
-  BFD_RELOC_RL78_ABS16,
-  BFD_RELOC_RL78_ABS16_REV,
-  BFD_RELOC_RL78_ABS32,
-  BFD_RELOC_RL78_ABS32_REV,
-  BFD_RELOC_RL78_ABS16U,
-  BFD_RELOC_RL78_ABS16UW,
-  BFD_RELOC_RL78_ABS16UL,
-  BFD_RELOC_RL78_RELAX,
-  BFD_RELOC_RL78_HI16,
-  BFD_RELOC_RL78_HI8,
-  BFD_RELOC_RL78_LO16,
-
 /* Renesas RX Relocations.  */
   BFD_RELOC_RX_NEG8,
   BFD_RELOC_RX_NEG16,
@@ -4842,9 +4770,6 @@ BFD_RELOC_XTENSA_ASM_EXPAND.  */
 BFD_RELOC_MACH_O_PAIR.  */
   BFD_RELOC_MACH_O_SECTDIFF,
 
-/* Like BFD_RELOC_MACH_O_SECTDIFF but with a local symbol.  */
-  BFD_RELOC_MACH_O_LOCAL_SECTDIFF,
-
 /* Pair of relocation.  Contains the first symbol.  */
   BFD_RELOC_MACH_O_PAIR,
 
@@ -4975,12 +4900,6 @@ the dynamic object into the runtime process image.  */
   BFD_RELOC_TILEPRO_SHAMT_X1,
   BFD_RELOC_TILEPRO_SHAMT_Y0,
   BFD_RELOC_TILEPRO_SHAMT_Y1,
-  BFD_RELOC_TILEPRO_TLS_GD_CALL,
-  BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD,
-  BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD,
-  BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD,
-  BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD,
-  BFD_RELOC_TILEPRO_TLS_IE_LOAD,
   BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD,
   BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD,
   BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO,
@@ -5000,14 +4919,6 @@ the dynamic object into the runtime process image.  */
   BFD_RELOC_TILEPRO_TLS_DTPMOD32,
   BFD_RELOC_TILEPRO_TLS_DTPOFF32,
   BFD_RELOC_TILEPRO_TLS_TPOFF32,
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE,
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE,
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_LO,
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_LO,
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HI,
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HI,
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HA,
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HA,
 
 /* Tilera TILE-Gx Relocations.  */
   BFD_RELOC_TILEGX_HW0,
@@ -5067,65 +4978,52 @@ the dynamic object into the runtime process image.  */
   BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_PCREL,
   BFD_RELOC_TILEGX_IMM16_X0_HW0_GOT,
   BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT,
   BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT,
   BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT,
   BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_GOT,
   BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT,
   BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD,
   BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD,
-  BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_LE,
-  BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_LE,
-  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_LE,
-  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_LE,
-  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_LE,
-  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_LE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD,
   BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD,
   BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD,
   BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD,
   BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD,
   BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE,
   BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE,
   BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE,
   BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE,
   BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE,
   BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE,
   BFD_RELOC_TILEGX_TLS_DTPMOD64,
   BFD_RELOC_TILEGX_TLS_DTPOFF64,
   BFD_RELOC_TILEGX_TLS_TPOFF64,
   BFD_RELOC_TILEGX_TLS_DTPMOD32,
   BFD_RELOC_TILEGX_TLS_DTPOFF32,
   BFD_RELOC_TILEGX_TLS_TPOFF32,
-  BFD_RELOC_TILEGX_TLS_GD_CALL,
-  BFD_RELOC_TILEGX_IMM8_X0_TLS_GD_ADD,
-  BFD_RELOC_TILEGX_IMM8_X1_TLS_GD_ADD,
-  BFD_RELOC_TILEGX_IMM8_Y0_TLS_GD_ADD,
-  BFD_RELOC_TILEGX_IMM8_Y1_TLS_GD_ADD,
-  BFD_RELOC_TILEGX_TLS_IE_LOAD,
-  BFD_RELOC_TILEGX_IMM8_X0_TLS_ADD,
-  BFD_RELOC_TILEGX_IMM8_X1_TLS_ADD,
-  BFD_RELOC_TILEGX_IMM8_Y0_TLS_ADD,
-  BFD_RELOC_TILEGX_IMM8_Y1_TLS_ADD,
-
-/* Adapteva EPIPHANY - 8 bit signed pc-relative displacement  */
-  BFD_RELOC_EPIPHANY_SIMM8,
-
-/* Adapteva EPIPHANY - 24 bit signed pc-relative displacement  */
-  BFD_RELOC_EPIPHANY_SIMM24,
-
-/* Adapteva EPIPHANY - 16 most-significant bits of absolute address  */
-  BFD_RELOC_EPIPHANY_HIGH,
-
-/* Adapteva EPIPHANY - 16 least-significant bits of absolute address  */
-  BFD_RELOC_EPIPHANY_LOW,
-
-/* Adapteva EPIPHANY - 11 bit signed number - add/sub immediate  */
-  BFD_RELOC_EPIPHANY_SIMM11,
-
-/* Adapteva EPIPHANY - 11 bit sign-magnitude number (ld/st displacement)  */
-  BFD_RELOC_EPIPHANY_IMM11,
-
-/* Adapteva EPIPHANY - 8 bit immediate for 16 bit mov instruction.  */
-  BFD_RELOC_EPIPHANY_IMM8,
   BFD_RELOC_UNUSED };
 typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
 reloc_howto_type *bfd_reloc_type_lookup
diff --git a/bfd/bfdio.c b/bfd/bfdio.c
index 43a7684d7b..841c781f4b 100644
--- a/bfd/bfdio.c
+++ b/bfd/bfdio.c
@@ -87,6 +87,7 @@ FILE *
 real_fopen (const char *filename, const char *modes)
 {
 #ifdef VMS
+  char vms_modes[4];
   char *vms_attr;
 
   /* On VMS, fopen allows file attributes as optionnal arguments.
@@ -184,8 +185,7 @@ bfd_bread (void *ptr, bfd_size_type size, bfd *abfd)
      this element.  */
   if (abfd->arelt_data != NULL)
     {
-      bfd_size_type maxbytes = arelt_size (abfd);
-
+      size_t maxbytes = ((struct areltdata *) abfd->arelt_data)->parsed_size;
       if (abfd->where + size > maxbytes)
         {
           if (abfd->where >= maxbytes)
@@ -233,14 +233,10 @@ bfd_tell (bfd *abfd)
 
   if (abfd->iovec)
     {
-      bfd *parent_bfd = abfd;
       ptr = abfd->iovec->btell (abfd);
 
-      while (parent_bfd->my_archive != NULL)
-	{
-	  ptr -= parent_bfd->origin;
-	  parent_bfd = parent_bfd->my_archive;
-	}
+      if (abfd->my_archive)
+	ptr -= abfd->origin;
     }
   else
     ptr = 0;
@@ -312,16 +308,8 @@ bfd_seek (bfd *abfd, file_ptr position, int direction)
     }
 
   file_position = position;
-  if (direction == SEEK_SET)
-    {
-      bfd *parent_bfd = abfd;
-
-      while (parent_bfd->my_archive != NULL)
-        {
-          file_position += parent_bfd->origin;
-          parent_bfd = parent_bfd->my_archive;
-        }
-    }
+  if (direction == SEEK_SET && abfd->my_archive != NULL)
+    file_position += abfd->origin;
 
   if (abfd->iovec)
     result = abfd->iovec->bseek (abfd, file_position, direction);
diff --git a/bfd/cache.c b/bfd/cache.c
index 3842f517d1..5ddbbe470a 100644
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -198,7 +198,7 @@ bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
   if ((abfd->flags & BFD_IN_MEMORY) != 0)
     abort ();
 
-  while (abfd->my_archive)
+  if (abfd->my_archive)
     abfd = abfd->my_archive;
 
   if (abfd->iostream != NULL)
diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c
index adc343329b..2f17a55650 100644
--- a/bfd/coff-i386.c
+++ b/bfd/coff-i386.c
@@ -528,8 +528,8 @@ coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
     {
       bfd_vma osect_vma;
 
-      if (h && (h->root.type == bfd_link_hash_defined
-		|| h->root.type == bfd_link_hash_defweak))
+      if (h && (h->type == bfd_link_hash_defined
+		|| h->type == bfd_link_hash_defweak))
 	osect_vma = h->root.u.def.section->output_section->vma;
       else
 	{
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index ffa7a654fe..5d9b5aeb53 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -405,50 +405,6 @@ _bfd_xcoff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
 {
   return FALSE;
 }
-
-static const struct dwarf_debug_section xcoff_debug_sections[] =
-{
-  { ".dwabrev",		NULL },
-  { ".dwarnge",		NULL },
-  { NULL,	NULL }, /* .debug_frame */
-  { ".dwinfo",		NULL },
-  { ".dwline",		NULL },
-  { NULL,	NULL }, /* .debug_loc */
-  { NULL,	NULL }, /* .debug_macinfo */
-  { NULL,	NULL }, /* .debug_macro */
-  { ".dwpbnms",		NULL },
-  { ".dwpbtyp",		NULL },
-  { ".dwrnges",		NULL },
-  { NULL,	NULL }, /* .debug_static_func */
-  { NULL,	NULL }, /* .debug_static_vars */
-  { ".dwstr",	NULL },
-  { NULL,	NULL }, /* .debug_types */
-  /* GNU DWARF 1 extensions */
-  { NULL,	NULL }, /* .debug_sfnames */
-  { NULL,	NULL }, /* .debug_srcinfo */
-  /* SGI/MIPS DWARF 2 extensions */
-  { NULL,	NULL }, /* .debug_funcnames */
-  { NULL,	NULL }, /* .debug_typenames */
-  { NULL,	NULL }, /* .debug_varnames */
-  { NULL,	NULL }, /* .debug_weaknames */
-  { NULL,	NULL },
-};
-
-static bfd_boolean
-xcoff_find_nearest_line (bfd *abfd,
-                         asection *section,
-                         asymbol **symbols,
-                         bfd_vma offset,
-                         const char **filename_ptr,
-                         const char **functionname_ptr,
-                         unsigned int *line_ptr)
-{
-  return coff_find_nearest_line_with_names (abfd, xcoff_debug_sections,
-                                            section, symbols, offset,
-                                            filename_ptr, functionname_ptr,
-                                            line_ptr);
-}
-
 
 void
 _bfd_xcoff_swap_sym_in (bfd *abfd, PTR ext1, PTR in1)
@@ -4117,7 +4073,7 @@ const bfd_target rs6000coff_vec =
     _bfd_xcoff_is_local_label_name,
     coff_bfd_is_target_special_symbol,
     coff_get_lineno,
-    xcoff_find_nearest_line,
+    coff_find_nearest_line,
     _bfd_generic_find_line,
     coff_find_inliner_info,
     coff_bfd_make_debug_symbol,
@@ -4372,7 +4328,7 @@ const bfd_target pmac_xcoff_vec =
     _bfd_xcoff_is_local_label_name,
     coff_bfd_is_target_special_symbol,
     coff_get_lineno,
-    xcoff_find_nearest_line,
+    coff_find_nearest_line,
     _bfd_generic_find_line,
     coff_find_inliner_info,
     coff_bfd_make_debug_symbol,
diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
index 4f00b78d41..d8a8a2e6c6 100644
--- a/bfd/coff-x86_64.c
+++ b/bfd/coff-x86_64.c
@@ -619,8 +619,7 @@ coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
     {
       bfd_vma osect_vma;
 
-      if (h && (h->root.type == bfd_link_hash_defined
-		|| h->root.type == bfd_link_hash_defweak))
+      if (h && (h->type == bfd_link_hash_defined || h->type == bfd_link_hash_defweak))
 	osect_vma = h->root.u.def.section->output_section->vma;
       else
 	{
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 62eeb20d76..6f9685b4ee 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -670,9 +670,7 @@ sec_to_styp_flags (const char *sec_name, flagword sec_flags)
   /* FIXME: There is no gas syntax to specify the debug section flag.  */
   if (is_dbg)
     {
-      sec_flags &= (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD
-      		    | SEC_LINK_DUPLICATES_SAME_CONTENTS
-      		    | SEC_LINK_DUPLICATES_SAME_SIZE);
+      sec_flags &= (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD);
       sec_flags |= SEC_DEBUGGING | SEC_READONLY;
     }
 
@@ -700,11 +698,7 @@ sec_to_styp_flags (const char *sec_name, flagword sec_flags)
   /* skip SORT */
   if (sec_flags & SEC_LINK_ONCE)
     styp_flags |= IMAGE_SCN_LNK_COMDAT;
-  if ((sec_flags
-       & (SEC_LINK_DUPLICATES_DISCARD | SEC_LINK_DUPLICATES_SAME_CONTENTS
-          | SEC_LINK_DUPLICATES_SAME_SIZE)) != 0)
-    styp_flags |= IMAGE_SCN_LNK_COMDAT;
-  
+  /* skip LINK_DUPLICATES */
   /* skip LINKER_CREATED */
 
   if ((sec_flags & SEC_COFF_NOREAD) == 0)
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index c0505c6c02..bbb0acc1c6 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -983,36 +983,23 @@ coff_write_symbol (bfd *abfd,
    file originally.  This symbol may have been created by the linker,
    or we may be linking a non COFF file to a COFF file.  */
 
-bfd_boolean
+static bfd_boolean
 coff_write_alien_symbol (bfd *abfd,
 			 asymbol *symbol,
-			 struct internal_syment *isym,
 			 bfd_vma *written,
 			 bfd_size_type *string_size_p,
 			 asection **debug_string_section_p,
 			 bfd_size_type *debug_string_size_p)
 {
   combined_entry_type *native;
-  combined_entry_type dummy[2];
+  combined_entry_type dummy;
   asection *output_section = symbol->section->output_section
 			       ? symbol->section->output_section
 			       : symbol->section;
-  struct bfd_link_info *link_info = coff_data (abfd)->link_info;
-  bfd_boolean ret;
 
-  if ((!link_info || link_info->strip_discarded)
-      && !bfd_is_abs_section (symbol->section)
-      && symbol->section->output_section == bfd_abs_section_ptr)
-    {
-      symbol->name = "";
-      if (isym != NULL)
-        memset (isym, 0, sizeof(*isym));
-      return TRUE;
-    }
-  native = dummy;
+  native = &dummy;
   native->u.syment.n_type = T_NULL;
   native->u.syment.n_flags = 0;
-  native->u.syment.n_numaux = 0;
   if (bfd_is_und_section (symbol->section))
     {
       native->u.syment.n_scnum = N_UNDEF;
@@ -1023,11 +1010,6 @@ coff_write_alien_symbol (bfd *abfd,
       native->u.syment.n_scnum = N_UNDEF;
       native->u.syment.n_value = symbol->value;
     }
-  else if (symbol->flags & BSF_FILE)
-    {
-      native->u.syment.n_scnum = N_DEBUG;
-      native->u.syment.n_numaux = 1;
-    }
   else if (symbol->flags & BSF_DEBUGGING)
     {
       /* There isn't much point to writing out a debugging symbol
@@ -1035,8 +1017,6 @@ coff_write_alien_symbol (bfd *abfd,
          format.  So, we just ignore them.  We must clobber the symbol
          name to keep it from being put in the string table.  */
       symbol->name = "";
-      if (isym != NULL)
-        memset (isym, 0, sizeof(*isym));
       return TRUE;
     }
   else
@@ -1057,20 +1037,16 @@ coff_write_alien_symbol (bfd *abfd,
     }
 
   native->u.syment.n_type = 0;
-  if (symbol->flags & BSF_FILE)
-    native->u.syment.n_sclass = C_FILE;
-  else if (symbol->flags & BSF_LOCAL)
+  if (symbol->flags & BSF_LOCAL)
     native->u.syment.n_sclass = C_STAT;
   else if (symbol->flags & BSF_WEAK)
     native->u.syment.n_sclass = obj_pe (abfd) ? C_NT_WEAK : C_WEAKEXT;
   else
     native->u.syment.n_sclass = C_EXT;
+  native->u.syment.n_numaux = 0;
 
-  ret = coff_write_symbol (abfd, symbol, native, written, string_size_p,
-			   debug_string_section_p, debug_string_size_p);
-  if (isym != NULL)
-    *isym = native->u.syment;
-  return ret;
+  return coff_write_symbol (abfd, symbol, native, written, string_size_p,
+			    debug_string_section_p, debug_string_size_p);
 }
 
 /* Write a native symbol to a COFF file.  */
@@ -1085,15 +1061,6 @@ coff_write_native_symbol (bfd *abfd,
 {
   combined_entry_type *native = symbol->native;
   alent *lineno = symbol->lineno;
-  struct bfd_link_info *link_info = coff_data (abfd)->link_info;
-
-  if ((!link_info || link_info->strip_discarded)
-      && !bfd_is_abs_section (symbol->symbol.section)
-      && symbol->symbol.section->output_section == bfd_abs_section_ptr)
-    {
-      symbol->symbol.name = "";
-      return TRUE;
-    }
 
   /* If this symbol has an associated line number, we must store the
      symbol index in the line number field.  We also tag the auxent to
@@ -1186,8 +1153,8 @@ coff_write_symbols (bfd *abfd)
       if (c_symbol == (coff_symbol_type *) NULL
 	  || c_symbol->native == (combined_entry_type *) NULL)
 	{
-	  if (!coff_write_alien_symbol (abfd, symbol, NULL, &written,
-					&string_size, &debug_string_section,
+	  if (!coff_write_alien_symbol (abfd, symbol, &written, &string_size,
+					&debug_string_section,
 					&debug_string_size))
 	    return FALSE;
 	}
@@ -2118,14 +2085,13 @@ _bfd_coff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
    nearest to the wanted location.  */
 
 bfd_boolean
-coff_find_nearest_line_with_names (bfd *abfd,
-                                   const struct dwarf_debug_section *debug_sections,
-                                   asection *section,
-                                   asymbol **symbols,
-                                   bfd_vma offset,
-                                   const char **filename_ptr,
-                                   const char **functionname_ptr,
-                                   unsigned int *line_ptr)
+coff_find_nearest_line (bfd *abfd,
+			asection *section,
+			asymbol **symbols,
+			bfd_vma offset,
+			const char **filename_ptr,
+			const char **functionname_ptr,
+			unsigned int *line_ptr)
 {
   bfd_boolean found;
   unsigned int i;
@@ -2150,8 +2116,7 @@ coff_find_nearest_line_with_names (bfd *abfd,
     return TRUE;
 
   /* Also try examining DWARF2 debugging information.  */
-  if (_bfd_dwarf2_find_nearest_line (abfd, debug_sections,
-                                     section, symbols, offset,
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     &coff_data(abfd)->dwarf2_find_line_info))
@@ -2334,21 +2299,6 @@ coff_find_nearest_line_with_names (bfd *abfd,
 }
 
 bfd_boolean
-coff_find_nearest_line (bfd *abfd,
-			asection *section,
-			asymbol **symbols,
-			bfd_vma offset,
-			const char **filename_ptr,
-			const char **functionname_ptr,
-			unsigned int *line_ptr)
-{
-  return coff_find_nearest_line_with_names (abfd, dwarf_debug_sections,
-                                            section, symbols, offset,
-                                            filename_ptr, functionname_ptr,
-                                            line_ptr);
-}
-
-bfd_boolean
 coff_find_inliner_info (bfd *abfd,
 			const char **filename_ptr,
 			const char **functionname_ptr,
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index 1ebdfdd800..bca136445d 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -866,7 +866,7 @@ _bfd_coff_final_link (bfd *abfd,
       size_t sz;
 
       sub->output_has_begun = FALSE;
-      sz = bfd_family_coff (sub) ? obj_raw_syment_count (sub) : 2;
+      sz = obj_raw_syment_count (sub);
       if (sz > max_sym_count)
 	max_sym_count = sz;
     }
@@ -943,92 +943,6 @@ _bfd_coff_final_link (bfd *abfd,
 	}
     }
 
-  if (finfo.info->strip != strip_all && finfo.info->discard != discard_all)
-    {
-      /* Add local symbols from foreign inputs.  */
-      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-	{
-	  unsigned int i;
-
-	  if (bfd_family_coff (sub) || ! bfd_get_outsymbols (sub))
-	    continue;
-	  for (i = 0; i < bfd_get_symcount (sub); ++i)
-	    {
-	      asymbol *sym = bfd_get_outsymbols (sub) [i];
-	      file_ptr pos;
-	      struct internal_syment isym;
-	      bfd_size_type string_size = 0;
-	      bfd_vma written = 0;
-	      bfd_boolean rewrite = FALSE;
-
-	      if (! (sym->flags & BSF_LOCAL)
-		  || (sym->flags & (BSF_SECTION_SYM | BSF_DEBUGGING_RELOC
-				    | BSF_THREAD_LOCAL | BSF_RELC | BSF_SRELC
-				    | BSF_SYNTHETIC))
-		  || ((sym->flags & BSF_DEBUGGING)
-		      && ! (sym->flags & BSF_FILE)))
-		continue;
-
-	      /* See if we are discarding symbols with this name.  */
-	      if ((finfo.info->strip == strip_some
-		   && (bfd_hash_lookup (finfo.info->keep_hash,
-					bfd_asymbol_name(sym), FALSE, FALSE)
-		       == NULL))
-		  || (((finfo.info->discard == discard_sec_merge
-			&& (bfd_get_section (sym)->flags & SEC_MERGE)
-			&& ! finfo.info->relocatable)
-		       || finfo.info->discard == discard_l)
-		      && bfd_is_local_label_name (sub, bfd_asymbol_name(sym))))
-		continue;
-
-	      pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd)
-					     * symesz;
-	      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
-		goto error_return;
-	      if (! coff_write_alien_symbol(abfd, sym, &isym, &written,
-					    &string_size, NULL, NULL))
-		goto error_return;
-
-	      if (string_size)
-		{
-		  bfd_boolean hash = ! (abfd->flags & BFD_TRADITIONAL_FORMAT);
-		  bfd_size_type indx;
-
-		  indx = _bfd_stringtab_add (finfo.strtab,
-					     bfd_asymbol_name (sym), hash,
-					     FALSE);
-		  if (indx == (bfd_size_type) -1)
-		    goto error_return;
-		  isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-		  bfd_coff_swap_sym_out (abfd, &isym, finfo.outsyms);
-		  rewrite = TRUE;
-		}
-
-	      if (isym.n_sclass == C_FILE)
-		{
-		  if (finfo.last_file_index != -1)
-		    {
-		      finfo.last_file.n_value = obj_raw_syment_count (abfd);
-		      bfd_coff_swap_sym_out (abfd, &finfo.last_file,
-					     finfo.outsyms);
-		      pos = obj_sym_filepos (abfd) + finfo.last_file_index
-						     * symesz;
-		      rewrite = TRUE;
-		    }
-		  finfo.last_file_index = obj_raw_syment_count (abfd);
-		  finfo.last_file = isym;
-		}
-
-	      if (rewrite
-		  && (bfd_seek (abfd, pos, SEEK_SET) != 0
-		      || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz))
-		goto error_return;
-
-	      obj_raw_syment_count (abfd) += written;
-	    }
-	}
-    }
-
   if (! bfd_coff_final_link_postscript (abfd, & finfo))
     goto error_return;
 
diff --git a/bfd/config.bfd b/bfd/config.bfd
index e84ba58531..3b9872a2a4 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -361,10 +361,6 @@ case "${targ}" in
     targ_defvec=bfd_elf32_d30v_vec
     ;;
 
-  epiphany-*-elf)
-    targ_defvec=bfd_elf32_epiphany_vec
-    ;;
-
   fido-*-elf* )
     targ_defvec=bfd_elf32_m68k_vec
     targ_selvecs="m68kcoff_vec ieee_vec"
@@ -507,10 +503,9 @@ case "${targ}" in
   i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
     targ_defvec=mach_o_i386_vec
     targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
-    targ64_selvecs=mach_o_x86_64_vec
     targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
     ;;
-  i[3-7]86-sequent-bsd*)
+ i[3-7]86-sequent-bsd*)
     targ_defvec=i386dynix_vec
     targ_underscore=yes
     ;;
@@ -574,7 +569,6 @@ case "${targ}" in
   i[3-7]86-*-nacl*)
     targ_defvec=bfd_elf32_i386_nacl_vec
     targ_selvecs="bfd_elf32_i386_vec"
-    targ64_selvecs="bfd_elf64_x86_64_nacl_vec bfd_elf32_x86_64_nacl_vec"
     ;;
 #ifdef BFD64
   x86_64-*-darwin*)
@@ -613,11 +607,6 @@ case "${targ}" in
     targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
     want64=true
     ;;
-  x86_64-*-nacl*)
-    targ_defvec=bfd_elf32_x86_64_nacl_vec
-    targ_selvecs="bfd_elf32_i386_nacl_vec bfd_elf64_x86_64_nacl_vec"
-    want64=true
-    ;;
   x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep)
     targ_defvec=x86_64pe_vec
     targ_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386pe_vec i386pei_vec bfd_elf32_i386_vec"
@@ -1139,11 +1128,6 @@ case "${targ}" in
     targ_selvecs=rs6000coff_vec
     want64=true
     ;;
-  powerpc64-*-freebsd*)
-    targ_defvec=bfd_elf64_powerpc_freebsd_vec
-    targ_selvecs="bfd_elf64_powerpc_vec bfd_elf32_powerpc_vec bfd_elf32_powerpc_freebsd_vec bfd_elf32_powerpcle_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec"
-    want64=true
-    ;;
   powerpc64-*-elf* | powerpc-*-elf64* | powerpc64-*-linux* | \
   powerpc64-*-*bsd*)
     targ_defvec=bfd_elf64_powerpc_vec
@@ -1156,11 +1140,6 @@ case "${targ}" in
     want64=true
     ;;
 #endif
-  powerpc-*-*freebsd*)
-    targ_defvec=bfd_elf32_powerpc_freebsd_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec bfd_elf64_powerpc_freebsd_vec"
-    ;;
   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
   powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
   powerpc-*-chorus*)
@@ -1214,10 +1193,6 @@ case "${targ}" in
     targ_selvecs="bfd_powerpcle_pei_vec bfd_powerpc_pei_vec bfd_powerpcle_pe_vec bfd_powerpc_pe_vec"
     ;;
 
-  rl78-*-elf)
-    targ_defvec=bfd_elf32_rl78_vec
-    ;;
-
   rx-*-elf)
     targ_defvec=bfd_elf32_rx_le_vec
     targ_selvecs="bfd_elf32_rx_be_vec bfd_elf32_rx_le_vec bfd_elf32_rx_be_ns_vec"
@@ -1513,12 +1488,8 @@ case "${targ}" in
 
 #ifdef BFD64
   tilegx-*-*)
-    targ_defvec=bfd_elf64_tilegx_le_vec
-    targ_selvecs="bfd_elf64_tilegx_be_vec bfd_elf32_tilegx_be_vec bfd_elf32_tilegx_le_vec"
-    ;;
-  tilegxbe-*-*)
-    targ_defvec=bfd_elf64_tilegx_be_vec
-    targ_selvecs="bfd_elf64_tilegx_le_vec bfd_elf32_tilegx_be_vec bfd_elf32_tilegx_le_vec"
+    targ_defvec=bfd_elf64_tilegx_vec
+    targ_selvecs=bfd_elf32_tilegx_vec
     ;;
 #endif
 
diff --git a/bfd/config.in b/bfd/config.in
index cb53b14741..98157e13e0 100644
--- a/bfd/config.in
+++ b/bfd/config.in
@@ -245,9 +245,6 @@
 /* Define if <sys/procfs.h> has win32_pstatus_t. */
 #undef HAVE_WIN32_PSTATUS_T
 
-/* Define to 1 if you have the <windows.h> header file. */
-#undef HAVE_WINDOWS_H
-
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
diff --git a/bfd/configure b/bfd/configure
index 58a57baa59..bc242b9956 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -3988,7 +3988,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=bfd
- VERSION=2.22.52
+ VERSION=2.22
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13508,22 +13508,6 @@ fi
 
 fi
 
-
-for ac_header in windows.h dlfcn.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5
 $as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }
 if test "${gcc_cv_header_string+set}" = set; then :
@@ -15215,7 +15199,6 @@ do
     bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
     bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
     bfd_elf32_dlx_big_vec)	tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
-    bfd_elf32_epiphany_vec)	tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
     bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
     bfd_elf32_frv_vec)		tb="$tb elf32-frv.lo elf32.lo $elf" ;;
     bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
@@ -15279,9 +15262,7 @@ do
     bfd_elf32_pjl_vec)          tb="$tb elf32-pj.lo elf32.lo $elf";;
     bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
     bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_freebsd_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
     bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_rl78_vec)         tb="$tb elf32-rl78.lo $elf" ;;
     bfd_elf32_rx_le_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
     bfd_elf32_rx_be_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
     bfd_elf32_rx_be_ns_vec)     tb="$tb elf32-rx.lo elf32.lo $elf" ;;
@@ -15318,8 +15299,7 @@ do
     bfd_elf32_tic6x_linux_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
     bfd_elf32_tic6x_elf_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
     bfd_elf32_tic6x_elf_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tilegx_be_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
-    bfd_elf32_tilegx_le_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    bfd_elf32_tilegx_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
     bfd_elf32_tilepro_vec)	tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
     bfd_elf32_tradbigmips_vec | bfd_elf32_tradbigmips_freebsd_vec)
 				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
@@ -15347,7 +15327,6 @@ do
     bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
     bfd_elf64_powerpc_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_powerpcle_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_powerpc_freebsd_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
     bfd_elf64_s390_vec)		tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_sh64_vec)		tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
     bfd_elf64_sh64l_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
@@ -15358,18 +15337,15 @@ do
     bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_sparc_freebsd_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_sparc_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_tilegx_be_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
-    bfd_elf64_tilegx_le_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    bfd_elf64_tilegx_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
     bfd_elf64_tradbigmips_vec | bfd_elf64_tradbigmips_freebsd_vec)
 				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
     bfd_elf64_tradlittlemips_vec | bfd_elf64_tradlittlemips_freebsd_vec)
 				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
     bfd_elf64_x86_64_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_x86_64_sol2_vec)  tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf32_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf32_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
     bfd_elf64_l1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_l1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_k1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
@@ -18768,3 +18744,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
diff --git a/bfd/configure.in b/bfd/configure.in
index f443915760..435aaaa1ce 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([libbfd.c])
 AC_CANONICAL_TARGET
 AC_ISC_POSIX
 
-AM_INIT_AUTOMAKE(bfd, 2.22.52)
+AM_INIT_AUTOMAKE(bfd, 2.22)
 
 dnl These must be called before LT_INIT, because it may want
 dnl to call AC_CHECK_PROG.
@@ -109,7 +109,7 @@ if test $want_elf_stt_common = true; then
   AC_DEFINE(USE_STT_COMMON, 1,
     [Define if we may generate symbols with ELF's STT_COMMON type])
 fi
-
+	 
 ACX_PKGVERSION([GNU Binutils])
 ACX_BUGURL([http://www.sourceware.org/bugzilla/])
 
@@ -190,9 +190,6 @@ AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h sys/stat.h)
 GCC_HEADER_STDINT(bfd_stdint.h)
 AC_HEADER_TIME
 AC_HEADER_DIRENT
-
-AC_CHECK_HEADERS(windows.h dlfcn.h)
-
 ACX_HEADER_STRING
 AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
 AC_CHECK_FUNCS(strtoull)
@@ -687,9 +684,9 @@ do
     bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
     bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
     bfd_elf32_bigarm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_symbian_vec)
+    bfd_elf32_bigarm_symbian_vec)	
                                 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_vxworks_vec)
+    bfd_elf32_bigarm_vxworks_vec)	
                                 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
     bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
     bfd_elf32_bigmips_vxworks_vec)
@@ -697,11 +694,10 @@ do
     bfd_elf32_cr16_vec)		tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
     bfd_elf32_cr16c_vec)	tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
     bfd_elf32_cris_vec)		tb="$tb elf32-cris.lo elf32.lo $elf" ;;
-    bfd_elf32_crx_vec)          tb="$tb elf32-crx.lo elf32.lo $elf" ;;
+    bfd_elf32_crx_vec)          tb="$tb elf32-crx.lo elf32.lo $elf" ;;    
     bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
     bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
     bfd_elf32_dlx_big_vec)	tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
-    bfd_elf32_epiphany_vec)	tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
     bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
     bfd_elf32_frv_vec)		tb="$tb elf32-frv.lo elf32.lo $elf" ;;
     bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
@@ -765,9 +761,7 @@ do
     bfd_elf32_pjl_vec)          tb="$tb elf32-pj.lo elf32.lo $elf";;
     bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
     bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_freebsd_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
     bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_rl78_vec)         tb="$tb elf32-rl78.lo $elf" ;;
     bfd_elf32_rx_le_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
     bfd_elf32_rx_be_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
     bfd_elf32_rx_be_ns_vec)     tb="$tb elf32-rx.lo elf32.lo $elf" ;;
@@ -804,8 +798,7 @@ do
     bfd_elf32_tic6x_linux_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
     bfd_elf32_tic6x_elf_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
     bfd_elf32_tic6x_elf_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tilegx_be_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
-    bfd_elf32_tilegx_le_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    bfd_elf32_tilegx_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
     bfd_elf32_tilepro_vec)	tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
     bfd_elf32_tradbigmips_vec | bfd_elf32_tradbigmips_freebsd_vec)
 				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
@@ -833,7 +826,6 @@ do
     bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
     bfd_elf64_powerpc_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_powerpcle_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_powerpc_freebsd_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
     bfd_elf64_s390_vec)		tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_sh64_vec)		tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
     bfd_elf64_sh64l_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
@@ -844,18 +836,15 @@ do
     bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_sparc_freebsd_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_sparc_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_tilegx_be_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
-    bfd_elf64_tilegx_le_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    bfd_elf64_tilegx_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
     bfd_elf64_tradbigmips_vec | bfd_elf64_tradbigmips_freebsd_vec)
 				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
     bfd_elf64_tradlittlemips_vec | bfd_elf64_tradlittlemips_freebsd_vec)
 				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
     bfd_elf64_x86_64_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_x86_64_sol2_vec)  tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf32_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf32_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
     bfd_elf64_l1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_l1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_k1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
@@ -1155,3 +1144,4 @@ AC_SUBST(htmldir)
 AC_SUBST(pdfdir)
 
 AC_OUTPUT
+
diff --git a/bfd/cpu-alpha.c b/bfd/cpu-alpha.c
index 902eb8d1c6..9456b65782 100644
--- a/bfd/cpu-alpha.c
+++ b/bfd/cpu-alpha.c
@@ -36,7 +36,6 @@
     DEFAULT,						\
     bfd_default_compatible, 				\
     bfd_default_scan,					\
-    bfd_arch_default_fill,				\
     NEXT,						\
   }
 
diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index 5acfc1c1c9..820c948919 100644
--- a/bfd/cpu-arc.c
+++ b/bfd/cpu-arc.c
@@ -37,7 +37,6 @@
     default_p,				\
     bfd_default_compatible,		\
     bfd_default_scan,			\
-    bfd_arch_default_fill,		\
     next,				\
   }
 
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index 21a8d0f033..2238720e54 100644
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -124,8 +124,7 @@ scan (const struct bfd_arch_info *info, const char *string)
 }
 
 #define N(number, print, default, next)  \
-{  32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, \
-   scan, bfd_arch_default_fill, next }
+{  32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, scan, next }
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
diff --git a/bfd/cpu-avr.c b/bfd/cpu-avr.c
index 37ccee1da1..07ba6dc39b 100644
--- a/bfd/cpu-avr.c
+++ b/bfd/cpu-avr.c
@@ -96,7 +96,6 @@ compatible (const bfd_arch_info_type * a,
   default,			/* Is this the default ?  */	\
   compatible,							\
   bfd_default_scan,						\
-  bfd_arch_default_fill,					\
   next								\
 }
 
diff --git a/bfd/cpu-bfin.c b/bfd/cpu-bfin.c
index ec515eacf5..37e314b498 100644
--- a/bfd/cpu-bfin.c
+++ b/bfd/cpu-bfin.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_bfin_arch =
     4,                	/* Section align power.  */
     TRUE,             	/* The one and only.  */
     bfd_default_compatible, 
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-cr16.c b/bfd/cpu-cr16.c
index bcaaf60fa5..6c77738c7a 100644
--- a/bfd/cpu-cr16.c
+++ b/bfd/cpu-cr16.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_cr16_arch =
     1,                /* Unsigned int section alignment power.  */
     TRUE,             /* The one and only.  */
     bfd_default_compatible, 
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-cr16c.c b/bfd/cpu-cr16c.c
index 7653f2c25e..e8ee1db1da 100644
--- a/bfd/cpu-cr16c.c
+++ b/bfd/cpu-cr16c.c
@@ -34,7 +34,6 @@ const bfd_arch_info_type bfd_cr16c_arch =
     1,
     TRUE, 	/* The one and only.  */
     bfd_default_compatible, 
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c
index 9cdcf18a93..c77e8f5c58 100644
--- a/bfd/cpu-cris.c
+++ b/bfd/cpu-cris.c
@@ -69,7 +69,7 @@ get_compatible (a,b)
 
 #define N(NUMBER, PRINT, NEXT)  \
  { 32, 32, 8, bfd_arch_cris, NUMBER, "cris", PRINT, 1, FALSE, \
-   get_compatible, bfd_default_scan, bfd_arch_default_fill, NEXT }
+   get_compatible, bfd_default_scan, NEXT }
 
 static const bfd_arch_info_type bfd_cris_arch_compat_v10_v32 =
  N (bfd_mach_cris_v10_v32, "cris:common_v10_v32", NULL);
@@ -98,7 +98,6 @@ const bfd_arch_info_type bfd_cris_arch =
 				   bfd_arch_info_type.  */
   bfd_default_scan,		/* Check if a bfd_arch_info_type is a
 				   match.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   &bfd_cris_arch_v32		/* Pointer to next bfd_arch_info_type in
 				   the same family.  */
 };
diff --git a/bfd/cpu-crx.c b/bfd/cpu-crx.c
index 8edd2cacc2..3201c3cac2 100644
--- a/bfd/cpu-crx.c
+++ b/bfd/cpu-crx.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_crx_arch =
     1,      	/* Unsigned int section alignment power.  */
     TRUE, 	/* The one and only.  */
     bfd_default_compatible, 
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-d10v.c b/bfd/cpu-d10v.c
index 7bc208e262..b161115788 100644
--- a/bfd/cpu-d10v.c
+++ b/bfd/cpu-d10v.c
@@ -37,7 +37,6 @@ static const bfd_arch_info_type d10v_ts3_info =
   FALSE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   0,
 };
 
@@ -54,7 +53,6 @@ static const bfd_arch_info_type d10v_ts2_info =
   FALSE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   & d10v_ts3_info,
 };
 
@@ -71,6 +69,5 @@ const bfd_arch_info_type bfd_d10v_arch =
   TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   & d10v_ts2_info,
 };
diff --git a/bfd/cpu-d30v.c b/bfd/cpu-d30v.c
index 69515eb63d..d528e9bf67 100644
--- a/bfd/cpu-d30v.c
+++ b/bfd/cpu-d30v.c
@@ -36,6 +36,5 @@ const bfd_arch_info_type bfd_d30v_arch =
     TRUE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
 };
diff --git a/bfd/cpu-dlx.c b/bfd/cpu-dlx.c
index 2c17849a3e..fda48dccf4 100644
--- a/bfd/cpu-dlx.c
+++ b/bfd/cpu-dlx.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_dlx_arch =
     4,
     TRUE, /* The one and only.  */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
 };
diff --git a/bfd/cpu-fr30.c b/bfd/cpu-fr30.c
index dc2e5fa724..b60e43e657 100644
--- a/bfd/cpu-fr30.c
+++ b/bfd/cpu-fr30.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_fr30_arch =
   TRUE,				/* the default ? */
   bfd_default_compatible,	/* architecture comparison fn */
   bfd_default_scan,		/* string to architecture convert fn */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL				/* next in list */
 };
diff --git a/bfd/cpu-frv.c b/bfd/cpu-frv.c
index ac4d8988f9..fd2aedb828 100644
--- a/bfd/cpu-frv.c
+++ b/bfd/cpu-frv.c
@@ -35,7 +35,6 @@
   DEFAULT,			/* is this the default? */		\
   bfd_default_compatible,	/* architecture comparison fn */	\
   bfd_default_scan,		/* string to architecture convert fn */	\
-  bfd_arch_default_fill,	/* Default fill.  */			\
   NEXT				/* next in list */			\
 }
 
diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index e667a0358b..0fd77d64e3 100644
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -127,7 +127,6 @@ static const bfd_arch_info_type h8300sxn_info_struct =
   FALSE,			/* the default machine */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   0
 };
 
@@ -144,7 +143,6 @@ static const bfd_arch_info_type h8300sx_info_struct =
   FALSE,			/* the default machine */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   &h8300sxn_info_struct
 };
 
@@ -161,7 +159,6 @@ static const bfd_arch_info_type h8300sn_info_struct =
   FALSE,			/* The default machine.  */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   &h8300sx_info_struct
 };
 
@@ -178,7 +175,6 @@ static const bfd_arch_info_type h8300hn_info_struct =
   FALSE,			/* The default machine.  */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   &h8300sn_info_struct
 };
 
@@ -195,7 +191,6 @@ static const bfd_arch_info_type h8300s_info_struct =
   FALSE,			/* The default machine.  */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   & h8300hn_info_struct
 };
 
@@ -212,7 +207,6 @@ static const bfd_arch_info_type h8300h_info_struct =
   FALSE,			/* The default machine.  */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   &h8300s_info_struct
 };
 
@@ -229,7 +223,6 @@ const bfd_arch_info_type bfd_h8300_arch =
   TRUE,				/* The default machine.  */
   compatible,
   h8300_scan,
-  bfd_arch_default_fill,
   &h8300h_info_struct
 };
 
diff --git a/bfd/cpu-h8500.c b/bfd/cpu-h8500.c
index b87179b3ad..362d369a3b 100644
--- a/bfd/cpu-h8500.c
+++ b/bfd/cpu-h8500.c
@@ -56,6 +56,5 @@ const bfd_arch_info_type bfd_h8500_arch =
   TRUE,				/* the default machine */
   bfd_default_compatible,
   scan_mach,
-  bfd_arch_default_fill,
   0,
 };
diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
index 885a11a8ea..034e321433 100644
--- a/bfd/cpu-hppa.c
+++ b/bfd/cpu-hppa.c
@@ -35,8 +35,7 @@ static const bfd_arch_info_type bfd_hppa10_arch =
   3,
   TRUE,				/* Unless we use 1.1 specific features */
   bfd_default_compatible,
-  bfd_default_scan,
-  bfd_arch_default_fill,
+  bfd_default_scan ,
   0,
 };
 
@@ -53,8 +52,7 @@ static const bfd_arch_info_type bfd_hppa20_arch =
   3,
   FALSE,			/* Unless we use 1.1 specific features */
   bfd_default_compatible,
-  bfd_default_scan,
-  bfd_arch_default_fill,
+  bfd_default_scan ,
   &bfd_hppa10_arch,
 };
 
@@ -71,8 +69,7 @@ static const bfd_arch_info_type bfd_hppa20w_arch =
   3,
   FALSE,			/* Unless we use 1.1 specific features */
   bfd_default_compatible,
-  bfd_default_scan,
-  bfd_arch_default_fill,
+  bfd_default_scan ,
   &bfd_hppa20_arch,
 };
 
@@ -88,7 +85,6 @@ const bfd_arch_info_type bfd_hppa_arch =
   3,
   FALSE,			/* 1.1 specific features used */
   bfd_default_compatible,
-  bfd_default_scan,
-  bfd_arch_default_fill,
+  bfd_default_scan ,
   &bfd_hppa20w_arch,
 };
diff --git a/bfd/cpu-i370.c b/bfd/cpu-i370.c
index 99daf88deb..d12b9ae9e2 100644
--- a/bfd/cpu-i370.c
+++ b/bfd/cpu-i370.c
@@ -40,7 +40,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE, 	/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[1]
   },
   {
@@ -55,7 +54,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE, 	/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0
   },
 };
@@ -73,6 +71,5 @@ const bfd_arch_info_type bfd_i370_arch =
   TRUE, 	/* The default.  */
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   & arch_info_struct[0]
 };
diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 4cb59ed898..f98c0e5052 100644
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -23,10 +23,6 @@
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
-#include "libiberty.h"
-
-extern void * bfd_arch_i386_short_nop_fill (bfd_size_type, bfd_boolean,
-					    bfd_boolean);
 
 static const bfd_arch_info_type *
 bfd_i386_compatible (const bfd_arch_info_type *a,
@@ -42,83 +38,6 @@ bfd_i386_compatible (const bfd_arch_info_type *a,
   return compat;
 }
 
-/* Fill the buffer with zero or nop instruction if CODE is TRUE.  Use
-   multi byte nop instructions if LONG_NOP is TRUE.  */
-
-static void *
-bfd_arch_i386_fill (bfd_size_type count, bfd_boolean code,
-		    bfd_boolean long_nop)
-{
-  /* nop */
-  static const char nop_1[] = { 0x90 };	
-  /* xchg %ax,%ax */
-  static const char nop_2[] = { 0x66, 0x90 };
-  /* nopl (%[re]ax) */
-  static const char nop_3[] = { 0x0f, 0x1f, 0x00 };
-  /* nopl 0(%[re]ax) */
-  static const char nop_4[] = { 0x0f, 0x1f, 0x40, 0x00 };
-  /* nopl 0(%[re]ax,%[re]ax,1) */
-  static const char nop_5[] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 };
-  /* nopw 0(%[re]ax,%[re]ax,1) */
-  static const char nop_6[] = { 0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00 };
-  /* nopl 0L(%[re]ax) */
-  static const char nop_7[] = { 0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00 };
-  /* nopl 0L(%[re]ax,%[re]ax,1) */
-  static const char nop_8[] =
-    { 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00};
-  /* nopw 0L(%[re]ax,%[re]ax,1) */
-  static const char nop_9[] =
-    { 0x66, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 };
-  /* nopw %cs:0L(%[re]ax,%[re]ax,1) */
-  static const char nop_10[] =
-    { 0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 };
-  static const char *const nops[] =
-    { nop_1, nop_2, nop_3, nop_4, nop_5,
-      nop_6, nop_7, nop_8, nop_9, nop_10 };
-  bfd_size_type nop_size = long_nop ? ARRAY_SIZE (nops) : 2;
-
-  void *fill = bfd_malloc (count);
-  if (fill == NULL)
-    return fill;
-
-  if (code)
-    {
-      bfd_byte *p = fill;
-      while (count >= nop_size)
-	{
-	  memcpy (p, nops[nop_size - 1], nop_size);
-	  p += nop_size;
-	  count -= nop_size;
-	}
-      if (count != 0)
-	memcpy (p, nops[count - 1], count);
-    }
-  else
-    memset (fill, 0, count);
-
-  return fill;
-}
-
-/* Fill the buffer with zero or short nop instruction if CODE is TRUE.  */
-
-void *
-bfd_arch_i386_short_nop_fill (bfd_size_type count,
-			      bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
-			      bfd_boolean code)
-{
-  return bfd_arch_i386_fill (count, code, FALSE);
-}
-
-/* Fill the buffer with zero or long nop instruction if CODE is TRUE.  */
-
-static void *
-bfd_arch_i386_long_nop_fill (bfd_size_type count,
-			     bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
-			     bfd_boolean code)
-{
-  return bfd_arch_i386_fill (count, code, TRUE);
-}
-
 static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax =
 {
   64, /* 64 bits in a word */
@@ -132,7 +51,6 @@ static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax =
   FALSE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_long_nop_fill,
   0
 };
 
@@ -149,7 +67,6 @@ static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   FALSE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_long_nop_fill,
   &bfd_x64_32_arch_intel_syntax,
 };
 
@@ -166,7 +83,6 @@ static const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   TRUE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   &bfd_x86_64_arch_intel_syntax
 };
 
@@ -183,7 +99,6 @@ static const bfd_arch_info_type i8086_arch =
   FALSE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   &bfd_i386_arch_intel_syntax
 };
 
@@ -200,7 +115,6 @@ static const bfd_arch_info_type bfd_x64_32_arch =
   FALSE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_long_nop_fill,
   &i8086_arch
 };
 
@@ -217,7 +131,6 @@ static const bfd_arch_info_type bfd_x86_64_arch =
   FALSE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_long_nop_fill,
   &bfd_x64_32_arch
 };
 
@@ -234,6 +147,5 @@ const bfd_arch_info_type bfd_i386_arch =
   TRUE,
   bfd_i386_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   &bfd_x86_64_arch
 };
diff --git a/bfd/cpu-i860.c b/bfd/cpu-i860.c
index 77c5e84095..ae9ebcdb99 100644
--- a/bfd/cpu-i860.c
+++ b/bfd/cpu-i860.c
@@ -38,6 +38,5 @@ const bfd_arch_info_type bfd_i860_arch =
     TRUE,			/* Is this the default architecture? */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,				/* Next in list */
   };
diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c
index cef2f802de..c7d9231b67 100644
--- a/bfd/cpu-i960.c
+++ b/bfd/cpu-i960.c
@@ -166,8 +166,7 @@ compatible (a,b)
 }
 
 #define N(a,b,d,n) \
-{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach, \
-  bfd_arch_default_fill, n,}
+{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,}
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
diff --git a/bfd/cpu-ia64.c b/bfd/cpu-ia64.c
index 4ea37c79c5..c97de1a099 100644
--- a/bfd/cpu-ia64.c
+++ b/bfd/cpu-ia64.c
@@ -35,8 +35,7 @@ const bfd_arch_info_type bfd_ia64_elf32_arch =
     3,	/* log2 of section alignment */
     TRUE, /* the one and only */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
 
@@ -52,8 +51,7 @@ const bfd_arch_info_type bfd_ia64_arch =
     3,	/* log2 of section alignment */
     TRUE, /* the one and only */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     &bfd_ia64_elf32_arch,
   };
 
diff --git a/bfd/cpu-ip2k.c b/bfd/cpu-ip2k.c
index d8eaf3c2a5..0b959bd8d2 100644
--- a/bfd/cpu-ip2k.c
+++ b/bfd/cpu-ip2k.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_ip2k_nonext_arch =
   FALSE,		        /* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL				/* Next in list.  */
 };
 
@@ -52,6 +51,5 @@ const bfd_arch_info_type bfd_ip2k_arch =
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   & bfd_ip2k_nonext_arch	/* Next in list.  */
 };
diff --git a/bfd/cpu-iq2000.c b/bfd/cpu-iq2000.c
index 648380e634..72d83639cb 100644
--- a/bfd/cpu-iq2000.c
+++ b/bfd/cpu-iq2000.c
@@ -36,7 +36,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* the default ? */
     bfd_default_compatible,	/* architecture comparison fn */
     bfd_default_scan,		/* string to architecture convert fn */
-    bfd_arch_default_fill,	/* Default fill.  */
     NULL			/* next in list */
   }
 };
@@ -54,6 +53,5 @@ const bfd_arch_info_type bfd_iq2000_arch =
   TRUE,				/* the default ? */
   bfd_default_compatible,	/* architecture comparison fn */
   bfd_default_scan,		/* string to architecture convert fn */
-  bfd_arch_default_fill,	/* Default fill.  */
   &arch_info_struct[0],		/* next in list */
 };
diff --git a/bfd/cpu-k1om.c b/bfd/cpu-k1om.c
index 54b6e58c1d..fa030aef0c 100644
--- a/bfd/cpu-k1om.c
+++ b/bfd/cpu-k1om.c
@@ -23,9 +23,6 @@
 #include "bfd.h"
 #include "libbfd.h"
 
-extern void * bfd_arch_i386_short_nop_fill (bfd_size_type, bfd_boolean,
-					    bfd_boolean);
-
 static const bfd_arch_info_type bfd_k1om_arch_intel_syntax =
 {
   64, /* 64 bits in a word */
@@ -39,7 +36,6 @@ static const bfd_arch_info_type bfd_k1om_arch_intel_syntax =
   TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   0
 };
 
@@ -56,6 +52,5 @@ const bfd_arch_info_type bfd_k1om_arch =
   TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   &bfd_k1om_arch_intel_syntax
 };
diff --git a/bfd/cpu-l1om.c b/bfd/cpu-l1om.c
index 46ac3a00c8..c1057c4e9b 100644
--- a/bfd/cpu-l1om.c
+++ b/bfd/cpu-l1om.c
@@ -23,9 +23,6 @@
 #include "bfd.h"
 #include "libbfd.h"
 
-extern void * bfd_arch_i386_short_nop_fill (bfd_size_type, bfd_boolean,
-					    bfd_boolean);
-
 static const bfd_arch_info_type bfd_l1om_arch_intel_syntax =
 {
   64, /* 64 bits in a word */
@@ -39,7 +36,6 @@ static const bfd_arch_info_type bfd_l1om_arch_intel_syntax =
   TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   0
 };
 
@@ -56,6 +52,5 @@ const bfd_arch_info_type bfd_l1om_arch =
   TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_i386_short_nop_fill,
   &bfd_l1om_arch_intel_syntax
 };
diff --git a/bfd/cpu-lm32.c b/bfd/cpu-lm32.c
index 5ddce0438b..227612f22d 100644
--- a/bfd/cpu-lm32.c
+++ b/bfd/cpu-lm32.c
@@ -36,7 +36,6 @@ const bfd_arch_info_type bfd_lm32_arch =
     TRUE,                         /* Is this the default machine for the target.  */
     bfd_default_compatible,       /* Function callback to test if two files have compatible machines.  */
     bfd_default_scan,
-    bfd_arch_default_fill,
     NULL                          /* Next.  */
 };
 
diff --git a/bfd/cpu-m10200.c b/bfd/cpu-m10200.c
index f42a5ea286..218891df61 100644
--- a/bfd/cpu-m10200.c
+++ b/bfd/cpu-m10200.c
@@ -34,7 +34,6 @@ const bfd_arch_info_type bfd_mn10200_arch =
     2,
     TRUE, /* the one and only */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-m10300.c b/bfd/cpu-m10300.c
index 6fd8c67da8..7f89665b09 100644
--- a/bfd/cpu-m10300.c
+++ b/bfd/cpu-m10300.c
@@ -36,7 +36,6 @@ const bfd_arch_info_type bfd_am33_2_arch =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
   };
 
@@ -53,7 +52,6 @@ const bfd_arch_info_type bfd_am33_arch =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_am33_2_arch,
   };
 
@@ -70,6 +68,5 @@ const bfd_arch_info_type bfd_mn10300_arch =
     TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_am33_arch,
   };
diff --git a/bfd/cpu-m32c.c b/bfd/cpu-m32c.c
index 9c269383d0..d2f9cb17b4 100644
--- a/bfd/cpu-m32c.c
+++ b/bfd/cpu-m32c.c
@@ -49,7 +49,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* the default ? */
     bfd_default_compatible,	/* architecture comparison fn */
     m32c_scan,			/* string to architecture convert fn */
-    bfd_arch_default_fill,	/* Default fill.  */
     NULL			/* next in list */
   },
 };
@@ -67,6 +66,5 @@ const bfd_arch_info_type bfd_m32c_arch =
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   m32c_scan,			/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   &arch_info_struct[0],		/* Next in list.  */
 };
diff --git a/bfd/cpu-m32r.c b/bfd/cpu-m32r.c
index 8f373b43a9..8180d6c0d4 100644
--- a/bfd/cpu-m32r.c
+++ b/bfd/cpu-m32r.c
@@ -25,7 +25,7 @@
 
 #define N(number, print, default, next)  \
 {  32, 32, 8, bfd_arch_m32r, number, "m32r", print, 4, default, \
-     bfd_default_compatible, bfd_default_scan, bfd_arch_default_fill, next }
+     bfd_default_compatible, bfd_default_scan, next }
 
 #define M32R2_NEXT   & arch_info_struct [1]
 #define NEXT         & arch_info_struct [0]
diff --git a/bfd/cpu-m68hc11.c b/bfd/cpu-m68hc11.c
index 7f3c0747df..313d820cb9 100644
--- a/bfd/cpu-m68hc11.c
+++ b/bfd/cpu-m68hc11.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_m68hc11_arch =
     TRUE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
 };
diff --git a/bfd/cpu-m68hc12.c b/bfd/cpu-m68hc12.c
index 2dbf627242..2a115b9917 100644
--- a/bfd/cpu-m68hc12.c
+++ b/bfd/cpu-m68hc12.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_m68hc12s_arch =
     TRUE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
 };
 
@@ -52,6 +51,5 @@ const bfd_arch_info_type bfd_m68hc12_arch =
     TRUE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_m68hc12s_arch,
 };
diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
index 009ff043d9..ec9bccd075 100644
--- a/bfd/cpu-m68k.c
+++ b/bfd/cpu-m68k.c
@@ -30,8 +30,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
 		     const bfd_arch_info_type *b);
 
 #define N(name, print,d,next)  \
-{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible, \
-   bfd_default_scan, bfd_arch_default_fill, next, }
+{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible,bfd_default_scan, next, }
 
 static const bfd_arch_info_type arch_info_struct[] =
   {
diff --git a/bfd/cpu-m88k.c b/bfd/cpu-m88k.c
index d345902046..7e7c18d39c 100644
--- a/bfd/cpu-m88k.c
+++ b/bfd/cpu-m88k.c
@@ -36,7 +36,6 @@ const bfd_arch_info_type bfd_m88k_arch =
     3,
     TRUE, /* the one and only */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-mcore.c b/bfd/cpu-mcore.c
index 80b3290e05..c01dd1020c 100644
--- a/bfd/cpu-mcore.c
+++ b/bfd/cpu-mcore.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_mcore_arch =
   TRUE,		  		/* Is this the default architecture ? */
   bfd_default_compatible,	/* Architecture comparison function */
   bfd_default_scan,	   	/* String to architecture conversion */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL			   	/* Next in list */
 };
diff --git a/bfd/cpu-mep.c b/bfd/cpu-mep.c
index 94cb08086d..7ac871f67b 100644
--- a/bfd/cpu-mep.c
+++ b/bfd/cpu-mep.c
@@ -22,8 +22,7 @@
 #include "libbfd.h"
 
 #define MA(x, n, def, y) { 32, 32, 8, bfd_arch_mep, x, "mep", n, \
-	2, def, bfd_default_compatible, bfd_default_scan, \
-	bfd_arch_default_fill, y }
+	2, def, bfd_default_compatible, bfd_default_scan, y }
 
 static const bfd_arch_info_type bfd_c5_arch = MA (bfd_mach_mep_c5, "c5", FALSE, NULL);
 static const bfd_arch_info_type bfd_h1_arch = MA (bfd_mach_mep_h1, "h1", FALSE, & bfd_c5_arch);
diff --git a/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c
index c59fa45d52..45a4a2b95e 100644
--- a/bfd/cpu-microblaze.c
+++ b/bfd/cpu-microblaze.c
@@ -36,6 +36,5 @@ const bfd_arch_info_type bfd_microblaze_arch =
   TRUE,		  		/* Is this the default architecture ?  */
   bfd_default_compatible,	/* Architecture comparison function.  */
   bfd_default_scan,	   	/* String to architecture conversion.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL			   	/* Next in list.  */
 };
diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index c55cbf0a26..42d43a96bb 100644
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -55,7 +55,6 @@ mips_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
     DEFAULT,						\
     mips_compatible,					\
     bfd_default_scan,					\
-    bfd_arch_default_fill,				\
     NEXT,						\
   }
 
@@ -94,8 +93,6 @@ enum
   I_loongson_2f,
   I_loongson_3a,
   I_mipsocteon,
-  I_mipsocteonp,
-  I_mipsocteon2,
   I_xlr,
   I_micromips
 };
@@ -137,8 +134,6 @@ static const bfd_arch_info_type arch_info_struct[] =
   N (64, 64, bfd_mach_mips_loongson_2f, "mips:loongson_2f",       FALSE, NN(I_loongson_2f)),
   N (64, 64, bfd_mach_mips_loongson_3a, "mips:loongson_3a",       FALSE, NN(I_loongson_3a)),
   N (64, 64, bfd_mach_mips_octeon,"mips:octeon",  FALSE, NN(I_mipsocteon)),
-  N (64, 64, bfd_mach_mips_octeonp,"mips:octeon+",  FALSE, NN(I_mipsocteonp)),
-  N (64, 64, bfd_mach_mips_octeon2,"mips:octeon2",  FALSE, NN(I_mipsocteon2)),
   N (64, 64, bfd_mach_mips_xlr, "mips:xlr",       FALSE, NN(I_xlr)),
   N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0)
 };
diff --git a/bfd/cpu-mmix.c b/bfd/cpu-mmix.c
index f706b4962c..6cf8753812 100644
--- a/bfd/cpu-mmix.c
+++ b/bfd/cpu-mmix.c
@@ -38,6 +38,5 @@ bfd_mmix_arch =
    TRUE,			/* This is the default architecture.  */
    bfd_default_compatible,	/* Architecture comparison function.  */
    bfd_default_scan,		/* String to architecture conversion.  */
-   bfd_arch_default_fill,	/* Default fill.  */
    NULL				/* Next in list.  */
 };
diff --git a/bfd/cpu-moxie.c b/bfd/cpu-moxie.c
index f514fe7e84..39debbc09c 100644
--- a/bfd/cpu-moxie.c
+++ b/bfd/cpu-moxie.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_moxie_arch =
     2,                /* Unsigned int section alignment power.  */
     TRUE,             /* The one and only.  */
     bfd_default_compatible, 
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
diff --git a/bfd/cpu-msp430.c b/bfd/cpu-msp430.c
index a17f4c55fb..63c301a7ea 100644
--- a/bfd/cpu-msp430.c
+++ b/bfd/cpu-msp430.c
@@ -39,7 +39,6 @@ static const bfd_arch_info_type *compatible
   default,			/* The default machine.  */	\
   compatible,							\
   bfd_default_scan,						\
-  bfd_arch_default_fill,					\
   next								\
 }
 
diff --git a/bfd/cpu-mt.c b/bfd/cpu-mt.c
index 0ec10c8652..519871d424 100644
--- a/bfd/cpu-mt.c
+++ b/bfd/cpu-mt.c
@@ -36,7 +36,6 @@ const bfd_arch_info_type arch_info_struct[] =
   FALSE,		        /* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   &arch_info_struct[1]          /* Next in list.  */
 },
 {
@@ -51,7 +50,6 @@ const bfd_arch_info_type arch_info_struct[] =
   FALSE,		        /* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL				/* Next in list.  */
 },
 };
@@ -69,7 +67,6 @@ const bfd_arch_info_type bfd_mt_arch =
   TRUE,		        	/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   &arch_info_struct[0]		/* Next in list.  */
 };
 
diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c
index 28fff5a3fb..216b24869f 100644
--- a/bfd/cpu-ns32k.c
+++ b/bfd/cpu-ns32k.c
@@ -27,8 +27,7 @@
 #include "ns32k.h"
 
 #define N(machine, printable, d, next)  \
-{  32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d, \
-   bfd_default_compatible,bfd_default_scan,bfd_arch_default_fill,next, }
+{  32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d,bfd_default_compatible,bfd_default_scan, next, }
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
diff --git a/bfd/cpu-openrisc.c b/bfd/cpu-openrisc.c
index 8e3e8784a3..a43034979e 100644
--- a/bfd/cpu-openrisc.c
+++ b/bfd/cpu-openrisc.c
@@ -36,7 +36,6 @@
     DEFAULT,                                                  \
     bfd_default_compatible,                                   \
     bfd_default_scan,                                         \
-    bfd_arch_default_fill,				      \
     NEXT,                                                     \
   }
 
diff --git a/bfd/cpu-or32.c b/bfd/cpu-or32.c
index 34ea52b043..b9803ed312 100644
--- a/bfd/cpu-or32.c
+++ b/bfd/cpu-or32.c
@@ -35,8 +35,7 @@ const bfd_arch_info_type bfd_or32_arch =
     4,
     TRUE,         /* The one and only.  */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
 
diff --git a/bfd/cpu-pdp11.c b/bfd/cpu-pdp11.c
index 57c3068f93..3147f5604d 100644
--- a/bfd/cpu-pdp11.c
+++ b/bfd/cpu-pdp11.c
@@ -34,8 +34,7 @@ const bfd_arch_info_type bfd_pdp11_arch =
     1,		/* aligment = 16 bit */
     TRUE, /* the one and only */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     0,
   };
 
diff --git a/bfd/cpu-pj.c b/bfd/cpu-pj.c
index 35762272ca..bb5c85b853 100644
--- a/bfd/cpu-pj.c
+++ b/bfd/cpu-pj.c
@@ -37,6 +37,5 @@ const bfd_arch_info_type bfd_pj_arch =
   TRUE,				/* the default machine */
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   0
 };
diff --git a/bfd/cpu-plugin.c b/bfd/cpu-plugin.c
index 6b25c589d7..f0f7dbd4b3 100644
--- a/bfd/cpu-plugin.c
+++ b/bfd/cpu-plugin.c
@@ -36,6 +36,5 @@ const bfd_arch_info_type bfd_plugin_arch =
   TRUE,
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   0
 };
diff --git a/bfd/cpu-powerpc.c b/bfd/cpu-powerpc.c
index 19604c3b97..9bd60af33e 100644
--- a/bfd/cpu-powerpc.c
+++ b/bfd/cpu-powerpc.c
@@ -1,6 +1,6 @@
 /* BFD PowerPC CPU definition
-   Copyright 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2005, 2007, 2008,
-   2010, 2012 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2010
+   Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor, Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -65,7 +65,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     TRUE, /* default for 64 bit target */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[1]
   },
   /* elf32-ppc:ppc_elf_object_p relies on the default 32 bit arch
@@ -82,7 +81,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE,
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[2],
   },
 #else
@@ -99,7 +97,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     TRUE, /* default for 32 bit target */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[1],
   },
   /* elf64-ppc:ppc64_elf_object_p relies on the default 64 bit arch
@@ -116,7 +113,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE,
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[2]
   },
 #endif
@@ -132,7 +128,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[3]
   },
   {
@@ -147,7 +142,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[4]
   },
   {
@@ -162,7 +156,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[5]
   },
   {
@@ -177,7 +170,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[6]
   },
   {
@@ -192,7 +184,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[7]
   },
   {
@@ -207,7 +198,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[8]
   },
   {
@@ -222,7 +212,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[9]
   },
   {
@@ -237,7 +226,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[10]
   },
   {
@@ -252,7 +240,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[11]
   },
   {
@@ -267,7 +254,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[12]
   },
   {
@@ -282,7 +268,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[13]
   },
   {
@@ -297,7 +282,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE,
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[14]
   },
   {
@@ -312,7 +296,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[15]
   },
   {
@@ -327,7 +310,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[16]
   },
   {
@@ -342,7 +324,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[17]
   },
   {
@@ -357,7 +338,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_powerpc_archs[18]
   },
   {
@@ -372,37 +352,6 @@ const bfd_arch_info_type bfd_powerpc_archs[] =
     FALSE, /* not the default */
     powerpc_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
-    &bfd_powerpc_archs[19]
-  },
-  {
-    64, /* 64 bits in a word */
-    64, /* 64 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_powerpc,
-    bfd_mach_ppc_e5500,
-    "powerpc",
-    "powerpc:e5500",
-    3,
-    FALSE, /* not the default */
-    powerpc_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
-    &bfd_powerpc_archs[20]
-  },
-  {
-    64, /* 64 bits in a word */
-    64, /* 64 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_powerpc,
-    bfd_mach_ppc_e6500,
-    "powerpc",
-    "powerpc:e6500",
-    3,
-    FALSE, /* not the default */
-    powerpc_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
     0
   }
 };
diff --git a/bfd/cpu-rs6000.c b/bfd/cpu-rs6000.c
index c914816c40..91d043198d 100644
--- a/bfd/cpu-rs6000.c
+++ b/bfd/cpu-rs6000.c
@@ -65,7 +65,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE, /* not the default */
     rs6000_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[1]
   },
   {
@@ -80,7 +79,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE, /* not the default */
     rs6000_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[2]
   },
   {
@@ -95,7 +93,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE, /* not the default */
     rs6000_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0
   }
 };
@@ -113,6 +110,5 @@ const bfd_arch_info_type bfd_rs6000_arch =
     TRUE, /* the default */
     rs6000_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[0]
   };
diff --git a/bfd/cpu-rx.c b/bfd/cpu-rx.c
index 31489adac9..92eebb0a64 100644
--- a/bfd/cpu-rx.c
+++ b/bfd/cpu-rx.c
@@ -36,7 +36,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* The default ?  */
     bfd_default_compatible,	/* Architecture comparison fn.  */
     bfd_default_scan,		/* String to architecture convert fn.  */
-    bfd_arch_default_fill,	/* Default fill.  */
     NULL			/* Next in list.  */
   },
 };
@@ -54,6 +53,5 @@ const bfd_arch_info_type bfd_rx_arch =
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   & arch_info_struct[0],	/* Next in list.  */
 };
diff --git a/bfd/cpu-s390.c b/bfd/cpu-s390.c
index 1a581e4720..805e825620 100644
--- a/bfd/cpu-s390.c
+++ b/bfd/cpu-s390.c
@@ -36,7 +36,6 @@ const bfd_arch_info_type bfd_s390_64_arch =
     TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     NULL
 };
 
@@ -53,6 +52,5 @@ const bfd_arch_info_type bfd_s390_arch =
     TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &bfd_s390_64_arch
 };
diff --git a/bfd/cpu-score.c b/bfd/cpu-score.c
index 7a8d7b4959..0ed4095c1a 100644
--- a/bfd/cpu-score.c
+++ b/bfd/cpu-score.c
@@ -56,7 +56,6 @@ compatible (const bfd_arch_info_type * a, const bfd_arch_info_type * b)
   default,			/* The default machine.  */	\
   compatible,							\
   bfd_default_scan,						\
-  bfd_arch_default_fill,					\
   next								\
 }
 
diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c
index 6fe6c15527..af97a47367 100644
--- a/bfd/cpu-sh.c
+++ b/bfd/cpu-sh.c
@@ -61,7 +61,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2_NEXT
   },
   {
@@ -76,7 +75,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2E_NEXT
   },
   {
@@ -91,7 +89,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH_DSP_NEXT
   },
   {
@@ -106,7 +103,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH3_NEXT
   },
   {
@@ -121,7 +117,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH3_NOMMU_NEXT
   },
   {
@@ -136,7 +131,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH3_DSP_NEXT
   },
   {
@@ -151,7 +145,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH3E_NEXT
   },
   {
@@ -166,7 +159,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH4_NEXT
   },
   {
@@ -181,7 +173,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH4A_NEXT
   },
   {
@@ -196,7 +187,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH4AL_DSP_NEXT
   },
   {
@@ -211,7 +201,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH4_NOFPU_NEXT
   },
   {
@@ -226,7 +215,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH4_NOMMU_NOFPU_NEXT
   },
   {
@@ -241,7 +229,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH4A_NOFPU_NEXT
   },
   {
@@ -256,7 +243,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2A_NEXT
   },
   {
@@ -271,7 +257,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2A_NOFPU_NEXT
   },
   {
@@ -286,7 +271,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2A_NOFPU_OR_SH4_NOMMU_NOFPU_NEXT
   },
   {
@@ -301,7 +285,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2A_NOFPU_OR_SH3_NOMMU_NEXT
   },
   {
@@ -316,7 +299,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2A_OR_SH4_NEXT
   },
   {
@@ -331,7 +313,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH2A_OR_SH3E_NEXT
   },
   {
@@ -346,7 +327,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,			/* Not the default.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     SH64_NEXT
   },
 };
@@ -364,7 +344,6 @@ const bfd_arch_info_type bfd_sh_arch =
   TRUE,				/* The default machine.  */
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   SH_NEXT
 };
 
diff --git a/bfd/cpu-sparc.c b/bfd/cpu-sparc.c
index ccdd7d1d65..f86ccc54df 100644
--- a/bfd/cpu-sparc.c
+++ b/bfd/cpu-sparc.c
@@ -37,7 +37,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[1],
   },
   {
@@ -52,7 +51,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[2],
   },
   {
@@ -67,7 +65,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[3],
   },
   {
@@ -82,7 +79,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[4],
   },
   {
@@ -97,7 +93,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[5],
   },
   {
@@ -112,7 +107,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[6],
   },
   {
@@ -127,7 +121,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[7],
   },
   {
@@ -142,7 +135,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[8],
   },
   {
@@ -157,7 +149,6 @@ static const bfd_arch_info_type arch_info_struct[] =
     FALSE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
   }
 };
@@ -175,6 +166,5 @@ const bfd_arch_info_type bfd_sparc_arch =
     TRUE, /* the default */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     &arch_info_struct[0],
   };
diff --git a/bfd/cpu-spu.c b/bfd/cpu-spu.c
index b3dfc62b4f..64ba357f54 100644
--- a/bfd/cpu-spu.c
+++ b/bfd/cpu-spu.c
@@ -49,7 +49,6 @@ const bfd_arch_info_type bfd_spu_arch[] =
     TRUE, 		/* the default machine for the architecture */
     spu_compatible,	/* the spu is only compatible with itself, see above */
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,			/* next -- there are none! */
   }
 };
diff --git a/bfd/cpu-tic30.c b/bfd/cpu-tic30.c
index a9d291d85b..e08cf47a7e 100644
--- a/bfd/cpu-tic30.c
+++ b/bfd/cpu-tic30.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_tic30_arch =
   TRUE,				/* the one and only */
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   0,
 };
diff --git a/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
index e962233ffb..bd8b8f4070 100644
--- a/bfd/cpu-tic4x.c
+++ b/bfd/cpu-tic4x.c
@@ -64,7 +64,6 @@ const bfd_arch_info_type bfd_tic3x_arch =
     FALSE,			/* Not the default architecture.  */
     bfd_default_compatible,
     tic4x_scan,
-    bfd_arch_default_fill,
     0
   };
 
@@ -81,7 +80,6 @@ const bfd_arch_info_type bfd_tic4x_arch =
     TRUE,			/* The default architecture.  */
     bfd_default_compatible,
     tic4x_scan,
-    bfd_arch_default_fill,
     &bfd_tic3x_arch,
   };
 
diff --git a/bfd/cpu-tic54x.c b/bfd/cpu-tic54x.c
index 95d990e16a..b7e316cace 100644
--- a/bfd/cpu-tic54x.c
+++ b/bfd/cpu-tic54x.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_tic54x_arch =
   TRUE,				/* the one and only */
   bfd_default_compatible,
   bfd_default_scan,
-  bfd_arch_default_fill,
   0,
 };
diff --git a/bfd/cpu-tic6x.c b/bfd/cpu-tic6x.c
index d5a9cb987d..163f4b3b15 100644
--- a/bfd/cpu-tic6x.c
+++ b/bfd/cpu-tic6x.c
@@ -36,6 +36,5 @@ const bfd_arch_info_type bfd_tic6x_arch =
     TRUE, /* Default machine for this architecture.  */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
   };
diff --git a/bfd/cpu-tic80.c b/bfd/cpu-tic80.c
index c11233dff7..f030ce1b79 100644
--- a/bfd/cpu-tic80.c
+++ b/bfd/cpu-tic80.c
@@ -35,7 +35,6 @@ const bfd_arch_info_type bfd_tic80_arch =
     2,				/* section alignment power */
     TRUE,			/* default machine for architecture */
     bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
+    bfd_default_scan ,
     NULL,				/* Pointer to next in chain */
   };
diff --git a/bfd/cpu-tilegx.c b/bfd/cpu-tilegx.c
index f98cb0c467..aa2fe807cf 100644
--- a/bfd/cpu-tilegx.c
+++ b/bfd/cpu-tilegx.c
@@ -22,23 +22,6 @@
 #include "sysdep.h"
 #include "libbfd.h"
 
-const bfd_arch_info_type bfd_tilegx32_arch =
-  {
-    32, /* 32 bits in a word */
-    32, /* 32 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_tilegx,
-    bfd_mach_tilegx32,
-    "tilegx32",
-    "tilegx32",
-    3,
-    FALSE,
-    bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
-    0,
-  };
-
 const bfd_arch_info_type bfd_tilegx_arch =
   {
     64, /* 64 bits in a word */
@@ -52,6 +35,5 @@ const bfd_arch_info_type bfd_tilegx_arch =
     TRUE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
-    &bfd_tilegx32_arch,
+    0,
   };
diff --git a/bfd/cpu-tilepro.c b/bfd/cpu-tilepro.c
index 33bfab0139..cadd006548 100644
--- a/bfd/cpu-tilepro.c
+++ b/bfd/cpu-tilepro.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_tilepro_arch =
     TRUE,
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
   };
diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index d124220146..6ebc96c8e8 100644
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -26,7 +26,7 @@
 
 #define N(number, print, default, next)  \
 {  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
-   bfd_default_compatible, bfd_default_scan, bfd_arch_default_fill, next }
+     bfd_default_compatible, bfd_default_scan, next }
 
 #define NEXT NULL
 
diff --git a/bfd/cpu-vax.c b/bfd/cpu-vax.c
index 9e2b19d4b9..c9d9c8d7b3 100644
--- a/bfd/cpu-vax.c
+++ b/bfd/cpu-vax.c
@@ -37,6 +37,5 @@ const bfd_arch_info_type bfd_vax_arch =
     TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan,
-    bfd_arch_default_fill,
     0,
   };
diff --git a/bfd/cpu-w65.c b/bfd/cpu-w65.c
index 0200d704c8..e5e78d9e94 100644
--- a/bfd/cpu-w65.c
+++ b/bfd/cpu-w65.c
@@ -52,6 +52,5 @@ const bfd_arch_info_type bfd_w65_arch =
   TRUE,				/* the default machine */
   bfd_default_compatible,
   scan_mach,
-  bfd_arch_default_fill,
   0,
 };
diff --git a/bfd/cpu-we32k.c b/bfd/cpu-we32k.c
index 99a8ff001e..d93d76a81f 100644
--- a/bfd/cpu-we32k.c
+++ b/bfd/cpu-we32k.c
@@ -36,6 +36,5 @@ const bfd_arch_info_type bfd_we32k_arch =
     TRUE, /* the one and only */
     bfd_default_compatible,
     bfd_default_scan ,
-    bfd_arch_default_fill,
     0,
   };
diff --git a/bfd/cpu-xc16x.c b/bfd/cpu-xc16x.c
index 3d28659846..552952c0c4 100644
--- a/bfd/cpu-xc16x.c
+++ b/bfd/cpu-xc16x.c
@@ -37,7 +37,6 @@ const bfd_arch_info_type xc16xs_info_struct =
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL				/* Next in list.  */
 };
 
@@ -54,7 +53,6 @@ const bfd_arch_info_type xc16xl_info_struct =
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   & xc16xs_info_struct		/* Next in list.  */
 };
 
@@ -71,6 +69,5 @@ const bfd_arch_info_type bfd_xc16x_arch =
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   & xc16xl_info_struct		/* Next in list.  */
 };
diff --git a/bfd/cpu-xstormy16.c b/bfd/cpu-xstormy16.c
index 94de989204..d1c7e56840 100644
--- a/bfd/cpu-xstormy16.c
+++ b/bfd/cpu-xstormy16.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_xstormy16_arch =
   TRUE,				/* the default ? */
   bfd_default_compatible,	/* architecture comparison fn */
   bfd_default_scan,		/* string to architecture convert fn */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL				/* next in list */
 };
diff --git a/bfd/cpu-xtensa.c b/bfd/cpu-xtensa.c
index 5c1008e9ad..ee3767a891 100644
--- a/bfd/cpu-xtensa.c
+++ b/bfd/cpu-xtensa.c
@@ -35,6 +35,5 @@ const bfd_arch_info_type bfd_xtensa_arch =
   TRUE,				/* The default?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
   bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
   NULL				/* Next in list.  */
 };
diff --git a/bfd/cpu-z80.c b/bfd/cpu-z80.c
index a46f71d9a1..5da39f1c5c 100644
--- a/bfd/cpu-z80.c
+++ b/bfd/cpu-z80.c
@@ -42,7 +42,7 @@ compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
 
 #define N(name,print,default,next)  \
 { 16, 16, 8, bfd_arch_z80, name, "z80", print, 0, default, \
-  compatible, bfd_default_scan, bfd_arch_default_fill, next }
+    compatible, bfd_default_scan, next }
 
 #define M(n) &arch_info_struct[n]
 
diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
index fd34218653..6e910e9af6 100644
--- a/bfd/cpu-z8k.c
+++ b/bfd/cpu-z8k.c
@@ -38,12 +38,11 @@ compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
 static const bfd_arch_info_type arch_info_struct[] =
 {
   { 32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, FALSE,
-    compatible, bfd_default_scan, bfd_arch_default_fill, 0 }
+    compatible, bfd_default_scan, 0 }
 };
 
 const bfd_arch_info_type bfd_z8k_arch =
 {
   32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, TRUE,
-  compatible, bfd_default_scan, bfd_arch_default_fill,
-  &arch_info_struct[0]
+  compatible, bfd_default_scan, &arch_info_struct[0]
 };
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index 37a7e384b0..87e2a2e2a6 100644
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,7 +1,3 @@
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* chew.c (print_stack_level, main): Use %ld to print stack delta.
-
 2010-10-28  Matthias Klose  <doko@ubuntu.com>
 
 	* bfd.texinfo: Add directory section for info document.
diff --git a/bfd/doc/chew.c b/bfd/doc/chew.c
index f949e1f7ff..2276c8a6d5 100644
--- a/bfd/doc/chew.c
+++ b/bfd/doc/chew.c
@@ -1,6 +1,6 @@
 /* chew
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
-   2002, 2003, 2005, 2007, 2009, 2012
+   2002, 2003, 2005, 2007, 2009
    Free Software Foundation, Inc.
    Contributed by steve chamberlain @cygnus
 
@@ -476,8 +476,8 @@ remove_noncomments (src, dst)
 static void
 print_stack_level ()
 {
-  fprintf (stderr, "current string stack depth = %ld, ", tos - stack);
-  fprintf (stderr, "current integer stack depth = %ld\n", isp - istack);
+  fprintf (stderr, "current string stack depth = %d, ", tos - stack);
+  fprintf (stderr, "current integer stack depth = %d\n", isp - istack);
   pc++;
 }
 
@@ -1563,7 +1563,7 @@ main (ac, av)
   write_buffer (stack + 0, stdout);
   if (tos != stack)
     {
-      fprintf (stderr, "finishing with current stack level %ld\n",
+      fprintf (stderr, "finishing with current stack level %d\n",
 	       tos - stack);
       return 1;
     }
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 66fd16f2f4..3cd2f7d7d4 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -90,9 +90,6 @@ struct dwarf2_debug
   /* Last comp unit in list above.  */
   struct comp_unit *last_comp_unit;
 
-  /* Names of the debug sections.  */
-  const struct dwarf_debug_section *debug_sections;
-
   /* The next unread compilation unit within the .debug_info section.
      Zero indicates that the .debug_info section has not been loaded
      into a buffer yet.  */
@@ -472,14 +469,14 @@ lookup_info_hash_table (struct info_hash_table *hash_table, const char *key)
 
 static bfd_boolean
 read_section (bfd *           abfd,
-	      const struct dwarf_debug_section *sec,
+	      enum dwarf_debug_section_enum sec,
 	      asymbol **      syms,
 	      bfd_uint64_t    offset,
 	      bfd_byte **     section_buffer,
 	      bfd_size_type * section_size)
 {
   asection *msec;
-  const char *section_name = sec->uncompressed_name;
+  const char *section_name = dwarf_debug_sections[sec].uncompressed_name;
 
   /* read_section is a noop if the section has already been read.  */
   if (!*section_buffer)
@@ -487,14 +484,12 @@ read_section (bfd *           abfd,
       msec = bfd_get_section_by_name (abfd, section_name);
       if (! msec)
 	{
-	  section_name = sec->compressed_name;
-          if (section_name != NULL)
-            msec = bfd_get_section_by_name (abfd, section_name);
+	  section_name = dwarf_debug_sections[sec].compressed_name;
+	  msec = bfd_get_section_by_name (abfd, section_name);
 	}
       if (! msec)
 	{
-	  (*_bfd_error_handler) (_("Dwarf Error: Can't find %s section."),
-                                 sec->uncompressed_name);
+	  (*_bfd_error_handler) (_("Dwarf Error: Can't find %s section."), section_name);
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
@@ -611,8 +606,7 @@ read_indirect_string (struct comp_unit * unit,
 
   *bytes_read_ptr = unit->offset_size;
 
-  if (! read_section (unit->abfd, &stash->debug_sections[debug_str],
-                      stash->syms, offset,
+  if (! read_section (unit->abfd, debug_str, stash->syms, offset,
 		      &stash->dwarf_str_buffer, &stash->dwarf_str_size))
     return NULL;
 
@@ -694,8 +688,7 @@ read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash)
   unsigned int abbrev_form, hash_number;
   bfd_size_type amt;
 
-  if (! read_section (abfd, &stash->debug_sections[debug_abbrev],
-                      stash->syms, offset,
+  if (! read_section (abfd, debug_abbrev, stash->syms, offset,
 		      &stash->dwarf_abbrev_buffer, &stash->dwarf_abbrev_size))
     return NULL;
 
@@ -1403,8 +1396,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
   unsigned char op_code, extended_op, adj_opcode;
   bfd_size_type amt;
 
-  if (! read_section (abfd, &stash->debug_sections[debug_line],
-                      stash->syms, unit->line_offset,
+  if (! read_section (abfd, debug_line, stash->syms, unit->line_offset,
 		      &stash->dwarf_line_buffer, &stash->dwarf_line_size))
     return NULL;
 
@@ -1819,8 +1811,7 @@ static bfd_boolean
 read_debug_ranges (struct comp_unit *unit)
 {
   struct dwarf2_debug *stash = unit->stash;
-  return read_section (unit->abfd, &stash->debug_sections[debug_ranges],
-                       stash->syms, 0,
+  return read_section (unit->abfd, debug_ranges, stash->syms, 0,
 		       &stash->dwarf_ranges_buffer, &stash->dwarf_ranges_size);
 }
 
@@ -2726,18 +2717,18 @@ comp_unit_hash_info (struct dwarf2_debug *stash,
 /* Locate a section in a BFD containing debugging info.  The search starts
    from the section after AFTER_SEC, or from the first section in the BFD if
    AFTER_SEC is NULL.  The search works by examining the names of the
-   sections.  There are three permissiable names.  The first two are given
-   by DEBUG_SECTIONS[debug_info] (whose standard DWARF2 names are .debug_info
-   and .zdebug_info).  The third is a prefix .gnu.linkonce.wi.
+   sections.  There are two permissiable names.  The first is .debug_info.
+   This is the standard DWARF2 name.  The second is a prefix .gnu.linkonce.wi.
    This is a variation on the .debug_info section which has a checksum
    describing the contents appended onto the name.  This allows the linker to
    identify and discard duplicate debugging sections for different
    compilation units.  */
+#define DWARF2_DEBUG_INFO ".debug_info"
+#define DWARF2_COMPRESSED_DEBUG_INFO ".zdebug_info"
 #define GNU_LINKONCE_INFO ".gnu.linkonce.wi."
 
 static asection *
-find_debug_info (bfd *abfd, const struct dwarf_debug_section *debug_sections,
-                 asection *after_sec)
+find_debug_info (bfd *abfd, asection *after_sec)
 {
   asection * msec;
 
@@ -2745,13 +2736,10 @@ find_debug_info (bfd *abfd, const struct dwarf_debug_section *debug_sections,
 
   while (msec)
     {
-      if (strcmp (msec->name,
-                  debug_sections[debug_info].uncompressed_name) == 0)
+      if (strcmp (msec->name, DWARF2_DEBUG_INFO) == 0)
 	return msec;
 
-      if (debug_sections[debug_info].compressed_name != NULL
-          && strcmp (msec->name,
-                     debug_sections[debug_info].compressed_name) == 0)
+      if (strcmp (msec->name, DWARF2_COMPRESSED_DEBUG_INFO) == 0)
 	return msec;
 
       if (CONST_STRNEQ (msec->name, GNU_LINKONCE_INFO))
@@ -2798,9 +2786,7 @@ place_sections (bfd *abfd, struct dwarf2_debug *stash)
       asection *sect;
       bfd_vma last_vma = 0, last_dwarf = 0;
       bfd_size_type amt;
-      const char *debug_info_name;
 
-      debug_info_name = stash->debug_sections[debug_info].uncompressed_name;
       i = 0;
       for (sect = abfd->sections; sect != NULL; sect = sect->next)
 	{
@@ -2813,7 +2799,7 @@ place_sections (bfd *abfd, struct dwarf2_debug *stash)
 	  /* We need to adjust the VMAs of any .debug_info sections.
 	     Skip compressed ones, since no relocations could target
 	     them - they should not appear in object files anyway.  */
-	  if (strcmp (sect->name, debug_info_name) == 0)
+	  if (strcmp (sect->name, DWARF2_DEBUG_INFO) == 0)
 	    is_debug_info = 1;
 	  else if (CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO))
 	    is_debug_info = 1;
@@ -2849,7 +2835,7 @@ place_sections (bfd *abfd, struct dwarf2_debug *stash)
 	  /* We need to adjust the VMAs of any .debug_info sections.
 	     Skip compressed ones, since no relocations could target
 	     them - they should not appear in object files anyway.  */
-	  if (strcmp (sect->name, debug_info_name) == 0)
+	  if (strcmp (sect->name, DWARF2_DEBUG_INFO) == 0)
 	    is_debug_info = 1;
 	  else if (CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO))
 	    is_debug_info = 1;
@@ -3117,122 +3103,6 @@ stash_find_line_fast (struct dwarf2_debug *stash,
 				   filename_ptr, linenumber_ptr);
 }
 
-/* Read debug information from DEBUG_BFD when DEBUG_BFD is specified.
-   If DEBUG_BFD is not specified, we read debug information from ABFD
-   or its gnu_debuglink. The results will be stored in PINFO.
-   The function returns TRUE iff debug information is ready.  */
-
-bfd_boolean
-_bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd,
-                              const struct dwarf_debug_section *debug_sections,
-                              asymbol **symbols,
-                              void **pinfo)
-{
-  bfd_size_type amt = sizeof (struct dwarf2_debug);
-  bfd_size_type total_size;
-  asection *msec;
-  struct dwarf2_debug *stash = (struct dwarf2_debug *) *pinfo;
-
-  if (stash != NULL)
-    return TRUE;
-
-  stash = (struct dwarf2_debug *) bfd_zalloc (abfd, amt);
-  if (! stash)
-    return FALSE;
-  stash->debug_sections = debug_sections;
-
-  *pinfo = stash;
-
-  if (debug_bfd == NULL)
-    debug_bfd = abfd;
-
-  msec = find_debug_info (debug_bfd, debug_sections, NULL);
-  if (msec == NULL && abfd == debug_bfd)
-    {
-      char * debug_filename = bfd_follow_gnu_debuglink (abfd, DEBUGDIR);
-
-      if (debug_filename == NULL)
-	/* No dwarf2 info, and no gnu_debuglink to follow.
-	   Note that at this point the stash has been allocated, but
-	   contains zeros.  This lets future calls to this function
-	   fail more quickly.  */
-	return FALSE;
-
-      if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
-	  || ! bfd_check_format (debug_bfd, bfd_object)
-	  || (msec = find_debug_info (debug_bfd,
-				      debug_sections, NULL)) == NULL)
-	{
-	  if (debug_bfd)
-	    bfd_close (debug_bfd);
-	  /* FIXME: Should we report our failure to follow the debuglink ?  */
-	  free (debug_filename);
-	  return FALSE;
-	}
-    }
-
-  /* There can be more than one DWARF2 info section in a BFD these
-     days.  First handle the easy case when there's only one.  If
-     there's more than one, try case two: none of the sections is
-     compressed.  In that case, read them all in and produce one
-     large stash.  We do this in two passes - in the first pass we
-     just accumulate the section sizes, and in the second pass we
-     read in the section's contents.  (The allows us to avoid
-     reallocing the data as we add sections to the stash.)  If
-     some or all sections are compressed, then do things the slow
-     way, with a bunch of reallocs.  */
-
-  if (! find_debug_info (debug_bfd, debug_sections, msec))
-    {
-      /* Case 1: only one info section.  */
-      total_size = msec->size;
-      if (! read_section (debug_bfd, &stash->debug_sections[debug_info],
-			  symbols, 0,
-			  &stash->info_ptr_memory, &total_size))
-	return FALSE;
-    }
-  else
-    {
-      /* Case 2: multiple sections.  */
-      for (total_size = 0;
-	   msec;
-	   msec = find_debug_info (debug_bfd, debug_sections, msec))
-	total_size += msec->size;
-
-      stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
-      if (stash->info_ptr_memory == NULL)
-	return FALSE;
-
-      total_size = 0;
-      for (msec = find_debug_info (debug_bfd, debug_sections, NULL);
-	   msec;
-	   msec = find_debug_info (debug_bfd, debug_sections, msec))
-	{
-	  bfd_size_type size;
-
-	  size = msec->size;
-	  if (size == 0)
-	    continue;
-
-	  if (!(bfd_simple_get_relocated_section_contents
-		(debug_bfd, msec, stash->info_ptr_memory + total_size,
-		 symbols)))
-	    return FALSE;
-
-	  total_size += size;
-	}
-    }
-
-  stash->info_ptr = stash->info_ptr_memory;
-  stash->info_ptr_end = stash->info_ptr + total_size;
-  stash->sec = find_debug_info (debug_bfd, debug_sections, NULL);
-  stash->sec_info_ptr = stash->info_ptr;
-  stash->syms = symbols;
-  stash->bfd_ptr = debug_bfd;
-
-  return TRUE;
-}
-
 /* Find the source code location of SYMBOL.  If SYMBOL is NULL
    then find the nearest source code location corresponding to
    the address SECTION + OFFSET.
@@ -3240,14 +3110,12 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd,
    FILENAME_PTR and LINENUMBER_PTR.  In the case where SYMBOL was
    NULL the FUNCTIONNAME_PTR is also filled in.
    SYMBOLS contains the symbol table for ABFD.
-   DEBUG_SECTIONS contains the name of the dwarf debug sections.
    ADDR_SIZE is the number of bytes in the initial .debug_info length
    field and in the abbreviation offset, or zero to indicate that the
    default value should be used.  */
 
 static bfd_boolean
 find_line (bfd *abfd,
-           const struct dwarf_debug_section *debug_sections,
 	   asection *section,
 	   bfd_vma offset,
 	   asymbol *symbol,
@@ -3273,16 +3141,16 @@ find_line (bfd *abfd,
   bfd_vma found = FALSE;
   bfd_boolean do_line;
 
-  *filename_ptr = NULL;
-  if (functionname_ptr != NULL)
-    *functionname_ptr = NULL;
-  *linenumber_ptr = 0;
+  stash = (struct dwarf2_debug *) *pinfo;
 
-  if (! _bfd_dwarf2_slurp_debug_info (abfd, NULL,
-				      debug_sections, symbols, pinfo))
-    return FALSE;
+  if (! stash)
+    {
+      bfd_size_type amt = sizeof (struct dwarf2_debug);
 
-  stash = (struct dwarf2_debug *) *pinfo;
+      stash = (struct dwarf2_debug *) bfd_zalloc (abfd, amt);
+      if (! stash)
+	return FALSE;
+    }
 
   /* In a relocatable file, 2 functions may have the same address.
      We change the section vma so that they won't overlap.  */
@@ -3312,11 +3180,106 @@ find_line (bfd *abfd,
     addr += section->output_section->vma + section->output_offset;
   else
     addr += section->vma;
+  *filename_ptr = NULL;
+  if (! do_line)
+    *functionname_ptr = NULL;
+  *linenumber_ptr = 0;
+
+  if (! *pinfo)
+    {
+      bfd *debug_bfd;
+      bfd_size_type total_size;
+      asection *msec;
+
+      *pinfo = stash;
+
+      msec = find_debug_info (abfd, NULL);
+      if (msec == NULL)
+	{
+	  char * debug_filename = bfd_follow_gnu_debuglink (abfd, DEBUGDIR);
+
+	  if (debug_filename == NULL)
+	    /* No dwarf2 info, and no gnu_debuglink to follow.
+	       Note that at this point the stash has been allocated, but
+	       contains zeros.  This lets future calls to this function
+	       fail more quickly.  */
+	    goto done;
+
+	  if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
+	      || ! bfd_check_format (debug_bfd, bfd_object)
+	      || (msec = find_debug_info (debug_bfd, NULL)) == NULL)
+	    {
+	      if (debug_bfd)
+		bfd_close (debug_bfd);
+	      /* FIXME: Should we report our failure to follow the debuglink ?  */
+	      free (debug_filename);
+	      goto done;
+	    }
+	}
+      else
+	debug_bfd = abfd;
+
+      /* There can be more than one DWARF2 info section in a BFD these
+	 days.  First handle the easy case when there's only one.  If
+	 there's more than one, try case two: none of the sections is
+	 compressed.  In that case, read them all in and produce one
+	 large stash.  We do this in two passes - in the first pass we
+	 just accumulate the section sizes, and in the second pass we
+	 read in the section's contents.  (The allows us to avoid
+	 reallocing the data as we add sections to the stash.)  If
+	 some or all sections are compressed, then do things the slow
+	 way, with a bunch of reallocs.  */
+
+      if (! find_debug_info (debug_bfd, msec))
+	{
+	  /* Case 1: only one info section.  */
+	  total_size = msec->size;
+	  if (! read_section (debug_bfd, debug_info, symbols, 0,
+			      &stash->info_ptr_memory, &total_size))
+	    goto done;
+	}
+      else
+	{
+	  /* Case 2: multiple sections.  */
+	  for (total_size = 0; msec; msec = find_debug_info (debug_bfd, msec))
+	    total_size += msec->size;
+
+	  stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
+	  if (stash->info_ptr_memory == NULL)
+	    goto done;
+
+	  total_size = 0;
+	  for (msec = find_debug_info (debug_bfd, NULL);
+	       msec;
+	       msec = find_debug_info (debug_bfd, msec))
+	    {
+	      bfd_size_type size;
+
+	      size = msec->size;
+	      if (size == 0)
+		continue;
+
+	      if (!(bfd_simple_get_relocated_section_contents
+		    (debug_bfd, msec, stash->info_ptr_memory + total_size,
+		     symbols)))
+		goto done;
+
+	      total_size += size;
+	    }
+	}
+
+      stash->info_ptr = stash->info_ptr_memory;
+      stash->info_ptr_end = stash->info_ptr + total_size;
+      stash->sec = find_debug_info (debug_bfd, NULL);
+      stash->sec_info_ptr = stash->info_ptr;
+      stash->syms = symbols;
+      stash->bfd_ptr = debug_bfd;
+    }
 
   /* A null info_ptr indicates that there is no dwarf2 info
      (or that an error occured while setting up the stash).  */
   if (! stash->info_ptr)
-    return FALSE;
+    goto done;
 
   stash->inliner_chain = NULL;
 
@@ -3462,8 +3425,7 @@ find_line (bfd *abfd,
 	  if ((bfd_vma) (stash->info_ptr - stash->sec_info_ptr)
 	      == stash->sec->size)
 	    {
-	      stash->sec = find_debug_info (stash->bfd_ptr, debug_sections,
-                                            stash->sec);
+	      stash->sec = find_debug_info (stash->bfd_ptr, stash->sec);
 	      stash->sec_info_ptr = stash->info_ptr;
 	    }
 
@@ -3484,7 +3446,6 @@ done:
 
 bfd_boolean
 _bfd_dwarf2_find_nearest_line (bfd *abfd,
-                               const struct dwarf_debug_section *debug_sections,
 			       asection *section,
 			       asymbol **symbols,
 			       bfd_vma offset,
@@ -3494,8 +3455,8 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd,
 			       unsigned int addr_size,
 			       void **pinfo)
 {
-  return find_line (abfd, debug_sections, section, offset, NULL, symbols,
-                    filename_ptr, functionname_ptr, linenumber_ptr, addr_size,
+  return find_line (abfd, section, offset, NULL, symbols, filename_ptr,
+		    functionname_ptr, linenumber_ptr, addr_size,
 		    pinfo);
 }
 
@@ -3511,8 +3472,9 @@ _bfd_dwarf2_find_line (bfd *abfd,
 		       unsigned int addr_size,
 		       void **pinfo)
 {
-  return find_line (abfd, dwarf_debug_sections, NULL, 0, symbol, symbols,
-                    filename_ptr, NULL, linenumber_ptr, addr_size, pinfo);
+  return find_line (abfd, NULL, 0, symbol, symbols, filename_ptr,
+		    NULL, linenumber_ptr, addr_size,
+		    pinfo);
 }
 
 bfd_boolean
@@ -3543,12 +3505,17 @@ _bfd_dwarf2_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 void
-_bfd_dwarf2_cleanup_debug_info (bfd *abfd, void **pinfo)
+_bfd_dwarf2_cleanup_debug_info (bfd *abfd)
 {
-  struct dwarf2_debug *stash = (struct dwarf2_debug *) *pinfo;;
   struct comp_unit *each;
+  struct dwarf2_debug *stash;
+
+  if (abfd == NULL || elf_tdata (abfd) == NULL)
+    return;
+
+  stash = (struct dwarf2_debug *) elf_tdata (abfd)->dwarf2_find_line_info;
 
-  if (abfd == NULL || stash == NULL)
+  if (stash == NULL)
     return;
 
   for (each = stash->all_comp_units; each; each = each->next_unit)
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index db414e90fd..d6e2ab29ce 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -1,6 +1,6 @@
 /* BFD back-end data structures for ELF files.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -1221,11 +1221,6 @@ struct elf_backend_data
   /* Return TRUE if type is a function symbol type.  */
   bfd_boolean (*is_function_type) (unsigned int type);
 
-  /* Return TRUE if symbol may be a function.  Set *CODE_SEC and *CODE_VAL
-     to the function's entry point.  */
-  bfd_boolean (*maybe_function_sym) (const asymbol *sym,
-				     asection **code_sec, bfd_vma *code_off);
-
   /* Used to handle bad SHF_LINK_ORDER input.  */
   bfd_error_handler_type link_order_error_handler;
 
@@ -1418,14 +1413,14 @@ struct bfd_elf_section_data
   void *sec_info;
 };
 
-#define elf_section_data(sec) ((struct bfd_elf_section_data*)(sec)->used_by_bfd)
+#define elf_section_data(sec)  ((struct bfd_elf_section_data*)(sec)->used_by_bfd)
 #define elf_linked_to_section(sec) (elf_section_data(sec)->linked_to)
-#define elf_section_type(sec)	(elf_section_data(sec)->this_hdr.sh_type)
-#define elf_section_flags(sec)	(elf_section_data(sec)->this_hdr.sh_flags)
-#define elf_group_name(sec)	(elf_section_data(sec)->group.name)
-#define elf_group_id(sec)	(elf_section_data(sec)->group.id)
-#define elf_next_in_group(sec)	(elf_section_data(sec)->next_in_group)
-#define elf_fde_list(sec)	(elf_section_data(sec)->fde_list)
+#define elf_section_type(sec)  (elf_section_data(sec)->this_hdr.sh_type)
+#define elf_section_flags(sec) (elf_section_data(sec)->this_hdr.sh_flags)
+#define elf_group_name(sec)    (elf_section_data(sec)->group.name)
+#define elf_group_id(sec)      (elf_section_data(sec)->group.id)
+#define elf_next_in_group(sec) (elf_section_data(sec)->next_in_group)
+#define elf_fde_list(sec)      (elf_section_data(sec)->fde_list)
 #define elf_sec_group(sec)	(elf_section_data(sec)->sec_group)
 
 #define xvec_get_elf_backend_data(xvec) \
@@ -2137,6 +2132,9 @@ extern unsigned int _bfd_elf_common_section_index
 extern asection *_bfd_elf_common_section
   (asection *);
 
+extern void _bfd_dwarf2_cleanup_debug_info
+  (bfd *);
+
 extern bfd_vma _bfd_elf_default_got_elt_size
 (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *, bfd *,
  unsigned long);
@@ -2202,9 +2200,6 @@ extern bfd_boolean _bfd_elf_map_sections_to_segments
 
 extern bfd_boolean _bfd_elf_is_function_type (unsigned int);
 
-extern bfd_boolean _bfd_elf_maybe_function_sym (const asymbol *,
-						asection **, bfd_vma *);
-
 extern int bfd_elf_get_default_section_type (flagword);
 
 extern void bfd_elf_lookup_section_flags
@@ -2242,10 +2237,6 @@ extern char *elfcore_write_s390_ctrs
   (bfd *, char *, int *, const void *, int);
 extern char *elfcore_write_s390_prefix
   (bfd *, char *, int *, const void *, int);
-extern char *elfcore_write_s390_last_break
-  (bfd *, char *, int *, const void *, int);
-extern char *elfcore_write_s390_system_call
-  (bfd *, char *, int *, const void *, int);
 extern char *elfcore_write_arm_vfp
   (bfd *, char *, int *, const void *, int);
 extern char *elfcore_write_lwpstatus
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 428de4c9e0..8276a2fb0b 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -1,6 +1,6 @@
 /* Matsushita 10300 specific support for 32-bit ELF
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -69,14 +69,6 @@ struct elf32_mn10300_link_hash_entry
 
   /* Calculated value.  */
   bfd_vma value;
-
-#define GOT_UNKNOWN	0
-#define GOT_NORMAL	1
-#define GOT_TLS_GD	2
-#define GOT_TLS_LD	3
-#define GOT_TLS_IE	4
-  /* Used to distinguish GOT entries for TLS types from normal GOT entries.  */
-  unsigned char tls_type;
 };
 
 /* We derive a hash table from the main elf linker hash table so
@@ -95,31 +87,8 @@ struct elf32_mn10300_link_hash_table
   /* Random linker state flags.  */
 #define MN10300_HASH_ENTRIES_INITIALIZED 0x1
   char flags;
-  struct
-  {
-    bfd_signed_vma  refcount;
-    bfd_vma         offset;
-    char            got_allocated;
-    char            rel_emitted;
-  } tls_ldm_got;
 };
 
-#define elf_mn10300_hash_entry(ent) ((struct elf32_mn10300_link_hash_entry *)(ent))
-
-struct elf_mn10300_obj_tdata
-{
-  struct elf_obj_tdata root;
-
-  /* tls_type for each local got entry.  */
-  char * local_got_tls_type;
-};
-
-#define elf_mn10300_tdata(abfd) \
-  ((struct elf_mn10300_obj_tdata *) (abfd)->tdata.any)
-
-#define elf_mn10300_local_got_tls_type(abfd) \
-  (elf_mn10300_tdata (abfd)->local_got_tls_type)
-
 #ifndef streq
 #define streq(a, b) (strcmp ((a),(b)) == 0)
 #endif
@@ -479,131 +448,15 @@ static reloc_howto_type elf_mn10300_howto_table[] =
 	 0xffffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
-  HOWTO (R_MN10300_TLS_GD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_GD",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_LD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_LD",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_LDO,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_LDO",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_GOTIE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_GOTIE",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_IE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_IE",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_LE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_LE",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_DTPMOD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_DTPMOD",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_DTPOFF,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_DTPOFF",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  HOWTO (R_MN10300_TLS_TPOFF,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* */
-	 "R_MN10300_TLS_TPOFF",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
+  EMPTY_HOWTO (24),
+  EMPTY_HOWTO (25),
+  EMPTY_HOWTO (26),
+  EMPTY_HOWTO (27),
+  EMPTY_HOWTO (28),
+  EMPTY_HOWTO (29),
+  EMPTY_HOWTO (30),
+  EMPTY_HOWTO (31),
+  EMPTY_HOWTO (32),
   
   HOWTO (R_MN10300_SYM_DIFF,	/* type */
 	 0,			/* rightshift */
@@ -666,15 +519,6 @@ static const struct mn10300_reloc_map mn10300_reloc_map[] =
   { BFD_RELOC_MN10300_GLOB_DAT, R_MN10300_GLOB_DAT },
   { BFD_RELOC_MN10300_JMP_SLOT, R_MN10300_JMP_SLOT },
   { BFD_RELOC_MN10300_RELATIVE, R_MN10300_RELATIVE },
-  { BFD_RELOC_MN10300_TLS_GD, R_MN10300_TLS_GD },
-  { BFD_RELOC_MN10300_TLS_LD, R_MN10300_TLS_LD },
-  { BFD_RELOC_MN10300_TLS_LDO, R_MN10300_TLS_LDO },
-  { BFD_RELOC_MN10300_TLS_GOTIE, R_MN10300_TLS_GOTIE },
-  { BFD_RELOC_MN10300_TLS_IE, R_MN10300_TLS_IE },
-  { BFD_RELOC_MN10300_TLS_LE, R_MN10300_TLS_LE },
-  { BFD_RELOC_MN10300_TLS_DTPMOD, R_MN10300_TLS_DTPMOD },
-  { BFD_RELOC_MN10300_TLS_DTPOFF, R_MN10300_TLS_DTPOFF },
-  { BFD_RELOC_MN10300_TLS_TPOFF, R_MN10300_TLS_TPOFF },
   { BFD_RELOC_MN10300_SYM_DIFF, R_MN10300_SYM_DIFF },
   { BFD_RELOC_MN10300_ALIGN, R_MN10300_ALIGN }
 };
@@ -806,223 +650,6 @@ mn10300_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
   cache_ptr->howto = elf_mn10300_howto_table + r_type;
 }
 
-static int
-elf_mn10300_tls_transition (struct bfd_link_info *        info,
-			    int                           r_type,
-			    struct elf_link_hash_entry *  h,
-			    asection *                    sec,
-			    bfd_boolean                   counting)
-{
-  bfd_boolean is_local;
-
-  if (r_type == R_MN10300_TLS_GD
-      && h != NULL
-      && elf_mn10300_hash_entry (h)->tls_type == GOT_TLS_IE)
-    return R_MN10300_TLS_GOTIE;
-
-  if (info->shared)
-    return r_type;
-
-  if (! (sec->flags & SEC_CODE))
-    return r_type;
-
-  if (! counting && h != NULL && ! elf_hash_table (info)->dynamic_sections_created)
-    is_local = TRUE;
-  else
-    is_local = SYMBOL_CALLS_LOCAL (info, h);
-
-  /* For the main program, these are the transitions we do.  */
-  switch (r_type)
-    {
-    case R_MN10300_TLS_GD: return is_local ? R_MN10300_TLS_LE : R_MN10300_TLS_GOTIE;
-    case R_MN10300_TLS_LD: return R_MN10300_NONE;
-    case R_MN10300_TLS_LDO: return R_MN10300_TLS_LE;
-    case R_MN10300_TLS_IE:
-    case R_MN10300_TLS_GOTIE: return is_local ? R_MN10300_TLS_LE : r_type;
-    }
-
-  return r_type;
-}
-
-/* Return the relocation value for @tpoff relocation
-   if STT_TLS virtual address is ADDRESS.  */
-
-static bfd_vma
-dtpoff (struct bfd_link_info * info, bfd_vma address)
-{
-  struct elf_link_hash_table *htab = elf_hash_table (info);
-
-  /* If tls_sec is NULL, we should have signalled an error already.  */
-  if (htab->tls_sec == NULL)
-    return 0;
-  return address - htab->tls_sec->vma;
-}
-
-/* Return the relocation value for @tpoff relocation
-   if STT_TLS virtual address is ADDRESS.  */
-
-static bfd_vma
-tpoff (struct bfd_link_info * info, bfd_vma address)
-{
-  struct elf_link_hash_table *htab = elf_hash_table (info);
-
-  /* If tls_sec is NULL, we should have signalled an error already.  */
-  if (htab->tls_sec == NULL)
-    return 0;
-  return address - (htab->tls_size + htab->tls_sec->vma);
-}
-
-/* Returns nonzero if there's a R_MN10300_PLT32 reloc that we now need
-   to skip, after this one.  The actual value is the offset between
-   this reloc and the PLT reloc.  */
-
-static int
-mn10300_do_tls_transition (bfd *         input_bfd,
-			   unsigned int  r_type,
-			   unsigned int  tls_r_type,
-			   bfd_byte *    contents,
-			   bfd_vma       offset)
-{
-  bfd_byte *op = contents + offset;
-  int gotreg = 0;
-
-#define TLS_PAIR(r1,r2) ((r1) * R_MN10300_MAX + (r2))
-
-  /* This is common to all GD/LD transitions, so break it out.  */
-  if (r_type == R_MN10300_TLS_GD
-      || r_type == R_MN10300_TLS_LD)
-    {
-      op -= 2;
-      /* mov imm,d0.  */
-      BFD_ASSERT (bfd_get_8 (input_bfd, op) == 0xFC);
-      BFD_ASSERT (bfd_get_8 (input_bfd, op + 1) == 0xCC);
-      /* add aN,d0.  */
-      BFD_ASSERT (bfd_get_8 (input_bfd, op + 6) == 0xF1);
-      gotreg = (bfd_get_8 (input_bfd, op + 7) & 0x0c) >> 2;
-      /* Call.  */
-      BFD_ASSERT (bfd_get_8 (input_bfd, op + 8) == 0xDD);
-    }
-
-  switch (TLS_PAIR (r_type, tls_r_type))
-    {
-    case TLS_PAIR (R_MN10300_TLS_GD, R_MN10300_TLS_GOTIE):
-      {
-	/* Keep track of which register we put GOTptr in.  */
-	/* mov (_x@indntpoff,a2),a0.  */
-	memcpy (op, "\xFC\x20\x00\x00\x00\x00", 6);
-	op[1] |= gotreg;
-	/* add e2,a0.  */
-	memcpy (op+6, "\xF9\x78\x28", 3);
-	/* or  0x00000000, d0 - six byte nop.  */
-	memcpy (op+9, "\xFC\xE4\x00\x00\x00\x00", 6);
-      }
-      return 7;
-
-    case TLS_PAIR (R_MN10300_TLS_GD, R_MN10300_TLS_LE):
-      {
-	/* Register is *always* a0.  */
-	/* mov _x@tpoff,a0.  */
-	memcpy (op, "\xFC\xDC\x00\x00\x00\x00", 6);
-	/* add e2,a0.  */
-	memcpy (op+6, "\xF9\x78\x28", 3);
-	/* or  0x00000000, d0 - six byte nop.  */
-	memcpy (op+9, "\xFC\xE4\x00\x00\x00\x00", 6);
-      }
-      return 7;
-    case TLS_PAIR (R_MN10300_TLS_LD, R_MN10300_NONE):
-      {
-	/* Register is *always* a0.  */
-	/* mov e2,a0.  */
-	memcpy (op, "\xF5\x88", 2);
-	/* or  0x00000000, d0 - six byte nop.  */
-	memcpy (op+2, "\xFC\xE4\x00\x00\x00\x00", 6);
-	/* or  0x00000000, e2 - seven byte nop.  */
-	memcpy (op+8, "\xFE\x19\x22\x00\x00\x00\x00", 7);
-      }
-      return 7;
-
-    case TLS_PAIR (R_MN10300_TLS_LDO, R_MN10300_TLS_LE):
-      /* No changes needed, just the reloc change.  */
-      return 0;
-
-    /*  These are a little tricky, because we have to detect which
-	opcode is being used (they're different sizes, with the reloc
-	at different offsets within the opcode) and convert each
-	accordingly, copying the operands as needed.  The conversions
-	we do are as follows (IE,GOTIE,LE):
-
-	           1111 1100  1010 01Dn  [-- abs32 --]  MOV (x@indntpoff),Dn
-	           1111 1100  0000 DnAm  [-- abs32 --]  MOV (x@gotntpoff,Am),Dn
-	           1111 1100  1100 11Dn  [-- abs32 --]  MOV x@tpoff,Dn
-
-	           1111 1100  1010 00An  [-- abs32 --]  MOV (x@indntpoff),An
-	           1111 1100  0010 AnAm  [-- abs32 --]  MOV (x@gotntpoff,Am),An
-	           1111 1100  1101 11An  [-- abs32 --]  MOV x@tpoff,An
-
-	1111 1110  0000 1110  Rnnn Xxxx  [-- abs32 --]  MOV (x@indntpoff),Rn
-	1111 1110  0000 1010  Rnnn Rmmm  [-- abs32 --]  MOV (x@indntpoff,Rm),Rn
-	1111 1110  0000 1000  Rnnn Xxxx  [-- abs32 --]  MOV x@tpoff,Rn
-
-	Since the GOT pointer is always $a2, we assume the last
-	normally won't happen, but let's be paranoid and plan for the
-	day that GCC optimizes it somewhow.  */
-
-    case TLS_PAIR (R_MN10300_TLS_IE, R_MN10300_TLS_LE):
-      if (op[-2] == 0xFC)
-	{
-	  op -= 2;
-	  if ((op[1] & 0xFC) == 0xA4) /* Dn */
-	    {
-	      op[1] &= 0x03; /* Leaves Dn.  */
-	      op[1] |= 0xCC;
-	    }
-	  else /* An */
-	    {
-	      op[1] &= 0x03; /* Leaves An. */
-	      op[1] |= 0xDC;
-	    }
-	}
-      else if (op[-3] == 0xFE)
-	op[-2] = 0x08;
-      else
-	abort ();
-      break;
-
-    case TLS_PAIR (R_MN10300_TLS_GOTIE, R_MN10300_TLS_LE):
-      if (op[-2] == 0xFC)
-	{
-	  op -= 2;
-	  if ((op[1] & 0xF0) == 0x00) /* Dn */
-	    {
-	      op[1] &= 0x0C; /* Leaves Dn.  */
-	      op[1] >>= 2;
-	      op[1] |= 0xCC;
-	    }
-	  else /* An */
-	    {
-	      op[1] &= 0x0C; /* Leaves An.  */
-	      op[1] >>= 2;
-	      op[1] |= 0xDC;
-	    }
-	}
-      else if (op[-3] == 0xFE)
-	op[-2] = 0x08;
-      else
-	abort ();
-      break;
-
-    default:
-      (*_bfd_error_handler)
-	(_("%s: Unsupported transition from %s to %s"),
-	 bfd_get_filename (input_bfd),
-	 elf_mn10300_howto_table[r_type].name,
-	 elf_mn10300_howto_table[tls_r_type].name);
-      break;
-    }
-#undef TLS_PAIR
-  return 0;
-}
-
 /* Look through the relocs for a section during the first phase.
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
@@ -1033,7 +660,6 @@ mn10300_elf_check_relocs (bfd *abfd,
 			  asection *sec,
 			  const Elf_Internal_Rela *relocs)
 {
-  struct elf32_mn10300_link_hash_table * htab = elf32_mn10300_hash_table (info);
   bfd_boolean sym_diff_reloc_seen;
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Sym * isymbuf = NULL;
@@ -1068,7 +694,6 @@ mn10300_elf_check_relocs (bfd *abfd,
       struct elf_link_hash_entry *h;
       unsigned long r_symndx;
       unsigned int r_type;
-      int tls_type = GOT_NORMAL;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
@@ -1082,7 +707,6 @@ mn10300_elf_check_relocs (bfd *abfd,
 	}
 
       r_type = ELF32_R_TYPE (rel->r_info);
-      r_type = elf_mn10300_tls_transition (info, r_type, h, sec, TRUE);
 
       /* Some relocs require a global offset table.  */
       if (dynobj == NULL)
@@ -1097,10 +721,6 @@ mn10300_elf_check_relocs (bfd *abfd,
 	    case R_MN10300_GOTOFF16:
 	    case R_MN10300_GOTPC32:
 	    case R_MN10300_GOTPC16:
-	    case R_MN10300_TLS_GD:
-	    case R_MN10300_TLS_LD:
-	    case R_MN10300_TLS_GOTIE:
-	    case R_MN10300_TLS_IE:
 	      elf_hash_table (info)->dynobj = dynobj = abfd;
 	      if (! _bfd_mn10300_elf_create_got_section (dynobj, info))
 		goto fail;
@@ -1129,35 +749,11 @@ mn10300_elf_check_relocs (bfd *abfd,
 	    goto fail;
 	  break;
 
-	case R_MN10300_TLS_LD:
-	  htab->tls_ldm_got.refcount ++;
-	  tls_type = GOT_TLS_LD;
-
-	  if (htab->tls_ldm_got.got_allocated)
-	    break;
-	  goto create_got;
-
-	case R_MN10300_TLS_IE:
-	case R_MN10300_TLS_GOTIE:
-	  if (info->shared)
-	    info->flags |= DF_STATIC_TLS;
-	  /* Fall through */
-	  
-	case R_MN10300_TLS_GD:
 	case R_MN10300_GOT32:
 	case R_MN10300_GOT24:
 	case R_MN10300_GOT16:
-	create_got:
 	  /* This symbol requires a global offset table entry.  */
 
-	  switch (r_type)
-	    {
-	    case R_MN10300_TLS_IE:
-	    case R_MN10300_TLS_GOTIE: tls_type = GOT_TLS_IE; break;
-	    case R_MN10300_TLS_GD:    tls_type = GOT_TLS_GD; break;
-	    default:                  tls_type = GOT_NORMAL; break;
-	    }
-
 	  if (sgot == NULL)
 	    {
 	      sgot = bfd_get_section_by_name (dynobj, ".got");
@@ -1184,48 +780,22 @@ mn10300_elf_check_relocs (bfd *abfd,
 		}
 	    }
 
-	  if (r_type == R_MN10300_TLS_LD)
-	    {
-	      htab->tls_ldm_got.offset = sgot->size;
-	      htab->tls_ldm_got.got_allocated ++;
-	    }
-	  else if (h != NULL)
+	  if (h != NULL)
 	    {
-	      if (elf_mn10300_hash_entry (h)->tls_type != tls_type
-		  && elf_mn10300_hash_entry (h)->tls_type != GOT_UNKNOWN)
-		{
-		  if (tls_type == GOT_TLS_IE
-		      && elf_mn10300_hash_entry (h)->tls_type == GOT_TLS_GD)
-		    /* No change - this is ok.  */;
-		  else if (tls_type == GOT_TLS_GD
-		      && elf_mn10300_hash_entry (h)->tls_type == GOT_TLS_IE)
-		    /* Transition GD->IE.  */
-		    tls_type = GOT_TLS_IE;
-		  else
-		    (*_bfd_error_handler)
-		      (_("%B: %s' accessed both as normal and thread local symbol"),
-		       abfd, h ? h->root.root.string : "<local>");
-		}
-
-	      elf_mn10300_hash_entry (h)->tls_type = tls_type;
-
 	      if (h->got.offset != (bfd_vma) -1)
 		/* We have already allocated space in the .got.  */
 		break;
 
 	      h->got.offset = sgot->size;
 
-	      if (ELF_ST_VISIBILITY (h->other) != STV_INTERNAL
-		  /* Make sure this symbol is output as a dynamic symbol.  */
-		  && h->dynindx == -1)
+	      /* Make sure this symbol is output as a dynamic symbol.  */
+	      if (h->dynindx == -1)
 		{
 		  if (! bfd_elf_link_record_dynamic_symbol (info, h))
 		    goto fail;
 		}
 
 	      srelgot->size += sizeof (Elf32_External_Rela);
-	      if (r_type == R_MN10300_TLS_GD)
-		srelgot->size += sizeof (Elf32_External_Rela);
 	    }
 	  else
 	    {
@@ -1236,15 +806,13 @@ mn10300_elf_check_relocs (bfd *abfd,
 		  size_t       size;
 		  unsigned int i;
 
-		  size = symtab_hdr->sh_info * (sizeof (bfd_vma) + sizeof (char));
+		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
 		  local_got_offsets = bfd_alloc (abfd, size);
 
 		  if (local_got_offsets == NULL)
 		    goto fail;
 
 		  elf_local_got_offsets (abfd) = local_got_offsets;
-		  elf_mn10300_local_got_tls_type (abfd)
-		      = (char *) (local_got_offsets + symtab_hdr->sh_info);
 
 		  for (i = 0; i < symtab_hdr->sh_info; i++)
 		    local_got_offsets[i] = (bfd_vma) -1;
@@ -1257,26 +825,14 @@ mn10300_elf_check_relocs (bfd *abfd,
 	      local_got_offsets[r_symndx] = sgot->size;
 
 	      if (info->shared)
-		{
-		  /* If we are generating a shared object, we need to
-		     output a R_MN10300_RELATIVE reloc so that the dynamic
-		     linker can adjust this GOT entry.  */
-		  srelgot->size += sizeof (Elf32_External_Rela);
-
-		  if (r_type == R_MN10300_TLS_GD)
-		    /* And a R_MN10300_TLS_DTPOFF reloc as well.  */
-		    srelgot->size += sizeof (Elf32_External_Rela);
-		}
-
-	      elf_mn10300_local_got_tls_type (abfd) [r_symndx] = tls_type;
+		/* If we are generating a shared object, we need to
+		   output a R_MN10300_RELATIVE reloc so that the dynamic
+		   linker can adjust this GOT entry.  */
+		srelgot->size += sizeof (Elf32_External_Rela);
 	    }
 
 	  sgot->size += 4;
-	  if (r_type == R_MN10300_TLS_GD
-	      || r_type == R_MN10300_TLS_LD)
-	    sgot->size += 4;
-
-	  goto need_shared_relocs;
+	  break;
 
 	case R_MN10300_PLT32:
 	case R_MN10300_PLT16:
@@ -1317,7 +873,6 @@ mn10300_elf_check_relocs (bfd *abfd,
 	  if (h != NULL)
 	    h->non_got_ref = 1;
 
-	need_shared_relocs:
 	  /* If we are creating a shared library, then we
 	     need to copy the reloc into the shared library.  */
 	  if (info->shared
@@ -1426,7 +981,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
 				 asection *sym_sec ATTRIBUTE_UNUSED,
 				 int is_local ATTRIBUTE_UNUSED)
 {
-  struct elf32_mn10300_link_hash_table * htab = elf32_mn10300_hash_table (info);
   static asection *  sym_diff_section;
   static bfd_vma     sym_diff_value;
   bfd_boolean is_sym_diff_reloc;
@@ -1458,17 +1012,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
 	  && h != NULL
 	  && ! SYMBOL_REFERENCES_LOCAL (info, h))
 	return bfd_reloc_dangerous;
-    case R_MN10300_GOT32:
-      /* Issue 2052223:
-	 Taking the address of a protected function in a shared library
-	 is illegal.  Issue an error message here.  */
-      if (info->shared
-	  && (input_section->flags & SEC_ALLOC) != 0
-	  && h != NULL
-	  && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED
-	  && (h->type == STT_FUNC || h->type == STT_GNU_IFUNC)
-	  && ! SYMBOL_REFERENCES_LOCAL (info, h))
-	return bfd_reloc_dangerous;
     }
 
   is_sym_diff_reloc = FALSE;
@@ -1665,9 +1208,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
       return bfd_reloc_ok;
 
     case R_MN10300_GOTPC32:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
       /* Use global offset table as symbol value.  */
       value = bfd_get_section_by_name (dynobj,
 				       ".got")->output_section->vma;
@@ -1680,9 +1220,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
       return bfd_reloc_ok;
 
     case R_MN10300_GOTPC16:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
       /* Use global offset table as symbol value.  */
       value = bfd_get_section_by_name (dynobj,
 				       ".got")->output_section->vma;
@@ -1698,9 +1235,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
       return bfd_reloc_ok;
 
     case R_MN10300_GOTOFF32:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
       value -= bfd_get_section_by_name (dynobj,
 					".got")->output_section->vma;
       value += addend;
@@ -1709,9 +1243,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
       return bfd_reloc_ok;
 
     case R_MN10300_GOTOFF24:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
       value -= bfd_get_section_by_name (dynobj,
 					".got")->output_section->vma;
       value += addend;
@@ -1725,9 +1256,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
       return bfd_reloc_ok;
 
     case R_MN10300_GOTOFF16:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
       value -= bfd_get_section_by_name (dynobj,
 					".got")->output_section->vma;
       value += addend;
@@ -1744,9 +1272,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
 	  && ELF_ST_VISIBILITY (h->other) != STV_HIDDEN
 	  && h->plt.offset != (bfd_vma) -1)
 	{
-	  if (dynobj == NULL)
-	    return bfd_reloc_dangerous;
-
 	  splt = bfd_get_section_by_name (dynobj, ".plt");
 
 	  value = (splt->output_section->vma
@@ -1768,9 +1293,6 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
 	  && ELF_ST_VISIBILITY (h->other) != STV_HIDDEN
 	  && h->plt.offset != (bfd_vma) -1)
 	{
-	  if (dynobj == NULL)
-	    return bfd_reloc_dangerous;
-
 	  splt = bfd_get_section_by_name (dynobj, ".plt");
 
 	  value = (splt->output_section->vma
@@ -1789,102 +1311,41 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
       bfd_put_16 (input_bfd, value, hit_data);
       return bfd_reloc_ok;
 
-    case R_MN10300_TLS_LDO:
-      value = dtpoff (info, value);
-      bfd_put_32 (input_bfd, value + addend, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_TLS_LE:
-      value = tpoff (info, value);
-      bfd_put_32 (input_bfd, value + addend, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_TLS_LD:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-
-      BFD_ASSERT (sgot != NULL);
-      value = htab->tls_ldm_got.offset + sgot->output_offset;
-      bfd_put_32 (input_bfd, value, hit_data);
-
-      if (!htab->tls_ldm_got.rel_emitted)
-	{
-	  asection * srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	  Elf_Internal_Rela rel;
-
-	  BFD_ASSERT (srelgot != NULL);
-	  htab->tls_ldm_got.rel_emitted ++;
-	  rel.r_offset = (sgot->output_section->vma
-			  + sgot->output_offset
-			  + htab->tls_ldm_got.offset);
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + htab->tls_ldm_got.offset);
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + htab->tls_ldm_got.offset+4);
-	  rel.r_info = ELF32_R_INFO (0, R_MN10300_TLS_DTPMOD);
-	  rel.r_addend = 0;
-	  bfd_elf32_swap_reloca_out (output_bfd, & rel,
-				     (bfd_byte *) ((Elf32_External_Rela *) srelgot->contents
-						   + srelgot->reloc_count));
-	  ++ srelgot->reloc_count;
-	}
-
-      return bfd_reloc_ok;
-
-    case R_MN10300_TLS_GOTIE:
-      value = tpoff (info, value);
-      /* Fall Through.  */
-
-    case R_MN10300_TLS_GD:
-    case R_MN10300_TLS_IE:
     case R_MN10300_GOT32:
     case R_MN10300_GOT24:
     case R_MN10300_GOT16:
-      if (dynobj == NULL)
-	return bfd_reloc_dangerous;
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-
-      if (r_type == R_MN10300_TLS_GD)
-	value = dtpoff (info, value);
+      {
+	sgot = bfd_get_section_by_name (dynobj, ".got");
 
-      if (h != NULL)
-	{
-	  bfd_vma off;
-
-	  off = h->got.offset;
-	  /* Offsets in the GOT are allocated in check_relocs
-	     which is not called for shared libraries... */
-	  if (off == (bfd_vma) -1)
-	    off = 0;
-
-	  if (sgot->contents != NULL
-	      && (! elf_hash_table (info)->dynamic_sections_created
-		  || SYMBOL_REFERENCES_LOCAL (info, h)))
-	    /* This is actually a static link, or it is a
-	       -Bsymbolic link and the symbol is defined
-	       locally, or the symbol was forced to be local
-	       because of a version file.  We must initialize
-	       this entry in the global offset table.
-
-	       When doing a dynamic link, we create a .rela.got
-	       relocation entry to initialize the value.  This
-	       is done in the finish_dynamic_symbol routine.  */
-	    bfd_put_32 (output_bfd, value,
-			sgot->contents + off);
-
-	  value = sgot->output_offset + off;
-	}
-      else
-	{
-	  bfd_vma off;
+	  if (h != NULL)
+	    {
+	      bfd_vma off;
 
-	  off = elf_local_got_offsets (input_bfd)[symndx];
+	      off = h->got.offset;
+	      BFD_ASSERT (off != (bfd_vma) -1);
 
-	  if (off & 1)
-	    bfd_put_32 (output_bfd, value, sgot->contents + (off & ~ 1));
+	      if (! elf_hash_table (info)->dynamic_sections_created
+		  || SYMBOL_REFERENCES_LOCAL (info, h))
+		/* This is actually a static link, or it is a
+		   -Bsymbolic link and the symbol is defined
+		   locally, or the symbol was forced to be local
+		   because of a version file.  We must initialize
+		   this entry in the global offset table.
+
+		   When doing a dynamic link, we create a .rela.got
+		   relocation entry to initialize the value.  This
+		   is done in the finish_dynamic_symbol routine.  */
+		bfd_put_32 (output_bfd, value,
+			    sgot->contents + off);
+
+	      value = sgot->output_offset + off;
+	    }
 	  else
 	    {
+	      bfd_vma off;
+
+	      off = elf_local_got_offsets (input_bfd)[symndx];
+
 	      bfd_put_32 (output_bfd, value, sgot->contents + off);
 
 	      if (info->shared)
@@ -1898,58 +1359,22 @@ mn10300_elf_final_link_relocate (reloc_howto_type *howto,
 		  outrel.r_offset = (sgot->output_section->vma
 				     + sgot->output_offset
 				     + off);
-		  switch (r_type)
-		    {
-		    case R_MN10300_TLS_GD:
-		      outrel.r_info = ELF32_R_INFO (0, R_MN10300_TLS_DTPOFF);
-		      outrel.r_offset = (sgot->output_section->vma
-					 + sgot->output_offset
-					 + off + 4);
-		      bfd_elf32_swap_reloca_out (output_bfd, & outrel,
-						 (bfd_byte *) (((Elf32_External_Rela *)
-								srelgot->contents)
-							       + srelgot->reloc_count));
-		      ++ srelgot->reloc_count;
-		      outrel.r_info = ELF32_R_INFO (0, R_MN10300_TLS_DTPMOD);
-		      break;
-		    case R_MN10300_TLS_GOTIE:
-		    case R_MN10300_TLS_IE:
-		      outrel.r_info = ELF32_R_INFO (0, R_MN10300_TLS_TPOFF);
-		      break;
-		    default:
-		      outrel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
-		      break;
-		    }
-
+		  outrel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
 		  outrel.r_addend = value;
 		  bfd_elf32_swap_reloca_out (output_bfd, &outrel,
 					     (bfd_byte *) (((Elf32_External_Rela *)
 							    srelgot->contents)
 							   + srelgot->reloc_count));
 		  ++ srelgot->reloc_count;
-		  elf_local_got_offsets (input_bfd)[symndx] |= 1;
 		}
 
-	      value = sgot->output_offset + (off & ~(bfd_vma) 1);
+	      value = sgot->output_offset + off;
 	    }
-	}
+      }
 
       value += addend;
 
-      if (r_type == R_MN10300_TLS_IE)
-	{
-	  value += sgot->output_section->vma;
-	  bfd_put_32 (input_bfd, value, hit_data);
-	  return bfd_reloc_ok;
-	}
-      else if (r_type == R_MN10300_TLS_GOTIE
-	       || r_type == R_MN10300_TLS_GD
-	       || r_type == R_MN10300_TLS_LD)
-	{
-	  bfd_put_32 (input_bfd, value, hit_data);
-	  return bfd_reloc_ok;
-	}
-      else if (r_type == R_MN10300_GOT32)
+      if (r_type == R_MN10300_GOT32)
 	{
 	  bfd_put_32 (input_bfd, value, hit_data);
 	  return bfd_reloc_ok;
@@ -1994,7 +1419,6 @@ mn10300_elf_relocate_section (bfd *output_bfd,
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   Elf_Internal_Rela *rel, *relend;
-  Elf_Internal_Rela * trel;
 
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -2011,12 +1435,7 @@ mn10300_elf_relocate_section (bfd *output_bfd,
       struct elf32_mn10300_link_hash_entry *h;
       bfd_vma relocation;
       bfd_reloc_status_type r;
-      int tls_r_type;
-      bfd_boolean unresolved_reloc = FALSE;
-      bfd_boolean warned;
-      struct elf_link_hash_entry * hh;
 
-      relocation = 0;
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);
       howto = elf_mn10300_howto_table + r_type;
@@ -2030,42 +1449,24 @@ mn10300_elf_relocate_section (bfd *output_bfd,
       sym = NULL;
       sec = NULL;
       if (r_symndx < symtab_hdr->sh_info)
-	hh = NULL;
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
       else
 	{
+	  bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+	  struct elf_link_hash_entry *hh;
+
 	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
 				   r_symndx, symtab_hdr, sym_hashes,
 				   hh, sec, relocation,
 				   unresolved_reloc, warned);
-	}
-      h = elf_mn10300_hash_entry (hh);
 
-      tls_r_type = elf_mn10300_tls_transition (info, r_type, hh, input_section, 0);
-      if (tls_r_type != r_type)
-	{
-	  bfd_boolean had_plt;
-
-	  had_plt = mn10300_do_tls_transition (input_bfd, r_type, tls_r_type,
-					       contents, rel->r_offset);
-	  r_type = tls_r_type;
-	  howto = elf_mn10300_howto_table + r_type;
-
-	  if (had_plt)
-	    for (trel = rel+1; trel < relend; trel++)
-	      if ((ELF32_R_TYPE (trel->r_info) == R_MN10300_PLT32
-		   || ELF32_R_TYPE (trel->r_info) == R_MN10300_PCREL32)
-		  && rel->r_offset + had_plt == trel->r_offset)
-		trel->r_info = ELF32_R_INFO (0, R_MN10300_NONE);
-	}
+	  h = (struct elf32_mn10300_link_hash_entry *) hh;
 
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
-	}
-      else
-	{
 	  if ((h->root.root.type == bfd_link_hash_defined
 	      || h->root.root.type == bfd_link_hash_defweak)
 	      && (   r_type == R_MN10300_GOTPC32
@@ -2077,10 +1478,6 @@ mn10300_elf_relocate_section (bfd *output_bfd,
 		      && h->root.plt.offset != (bfd_vma) -1)
 		  || ((   r_type == R_MN10300_GOT32
 		       || r_type == R_MN10300_GOT24
-		       || r_type == R_MN10300_TLS_GD
-		       || r_type == R_MN10300_TLS_LD
-		       || r_type == R_MN10300_TLS_GOTIE
-		       || r_type == R_MN10300_TLS_IE
 		       || r_type == R_MN10300_GOT16)
 		      && elf_hash_table (info)->dynamic_sections_created
 		      && !SYMBOL_REFERENCES_LOCAL (info, hh))
@@ -2102,10 +1499,7 @@ mn10300_elf_relocate_section (bfd *output_bfd,
 	       obscure cases sec->output_section will be NULL.  */
 	    relocation = 0;
 
-	  else if (!info->relocatable && unresolved_reloc
-		   && _bfd_elf_section_offset (output_bfd, info, input_section,
-					       rel->r_offset) != (bfd_vma) -1)
-
+	  else if (!info->relocatable && unresolved_reloc)
 	    (*_bfd_error_handler)
 	      (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	       input_bfd,
@@ -2174,9 +1568,6 @@ mn10300_elf_relocate_section (bfd *output_bfd,
 	      if (r_type == R_MN10300_PCREL32)
 		msg = _("error: inappropriate relocation type for shared"
 			" library (did you forget -fpic?)");
-	      else if (r_type == R_MN10300_GOT32)
-		msg = _("%B: taking the address of protected function"
-			" '%s' cannot be done when making a shared library");
 	      else
 		msg = _("internal error: suspicious relocation type used"
 			" in shared library");
@@ -2187,9 +1578,11 @@ mn10300_elf_relocate_section (bfd *output_bfd,
 	      /* Fall through.  */
 
 	    common_error:
-	      _bfd_error_handler (msg, input_bfd, name);
-	      bfd_set_error (bfd_error_bad_value);
-	      return FALSE;
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
 	    }
 	}
     }
@@ -3185,7 +2578,6 @@ mn10300_elf_relax_section (bfd *abfd,
 		    {
 		      int bytes = 0;
 		      bfd_vma symval;
-		      struct elf_link_hash_entry **hh;
 
 		      /* Note that we've changed things.  */
 		      elf_section_data (section)->relocs = internal_relocs;
@@ -3216,25 +2608,6 @@ mn10300_elf_relax_section (bfd *abfd,
 							   bytes))
 			goto error_return;
 
-		      /* There may be other C++ functions symbols with the same
-			 address.  If so then mark these as having had their
-			 prologue bytes deleted as well.  */
-		      for (hh = elf_sym_hashes (input_bfd); hh < end_hashes; hh++)
-			{
-			  struct elf32_mn10300_link_hash_entry *h;
-
-			  h = (struct elf32_mn10300_link_hash_entry *) * hh;
-
-			  if (h != sym_hash
-			      && (h->root.root.type == bfd_link_hash_defined
-				  || h->root.root.type == bfd_link_hash_defweak)
-			      && h->root.root.u.def.section == section
-			      && ! (h->flags & MN10300_CONVERT_CALL_TO_CALLS)
-			      && h->root.root.u.def.value == symval
-			      && h->root.type == STT_FUNC)
-			    h->flags |= MN10300_DELETED_PROLOGUE_BYTES;
-			}
-
 		      /* Something changed.  Not strictly necessary, but
 			 may lead to more relaxing opportunities.  */
 		      *again = TRUE;
@@ -4228,8 +3601,8 @@ mn10300_elf_relax_section (bfd *abfd,
 			&& (value & 0x8000))
 		      continue;
 
-		    /* "mov imm16, an" zero-extends the immediate.  */
-		    if ((code & 0xfc) == 0xdc
+		    /* mov imm16, an zero-extends the immediate.  */
+		    if (code == 0xdc
 			&& (long) value < 0)
 		      continue;
 
@@ -4573,38 +3946,11 @@ elf32_mn10300_link_hash_newfunc (struct bfd_hash_entry *entry,
       ret->movm_stack_size = 0;
       ret->flags = 0;
       ret->value = 0;
-      ret->tls_type = GOT_UNKNOWN;
     }
 
   return (struct bfd_hash_entry *) ret;
 }
 
-static void
-_bfd_mn10300_copy_indirect_symbol (struct bfd_link_info *        info,
-				   struct elf_link_hash_entry *  dir,
-				   struct elf_link_hash_entry *  ind)
-{
-  struct elf32_mn10300_link_hash_entry * edir;
-  struct elf32_mn10300_link_hash_entry * eind;
-
-  edir = elf_mn10300_hash_entry (dir);
-  eind = elf_mn10300_hash_entry (ind);
-
-  if (ind->root.type == bfd_link_hash_indirect
-      && dir->got.refcount <= 0)
-    {
-      edir->tls_type = eind->tls_type;
-      eind->tls_type = GOT_UNKNOWN;
-    }
-  edir->direct_calls = eind->direct_calls;
-  edir->stack_size = eind->stack_size;
-  edir->movm_args = eind->movm_args;
-  edir->movm_stack_size = eind->movm_stack_size;
-  edir->flags = eind->flags;
-
-  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-}
-
 /* Create an mn10300 ELF linker hash table.  */
 
 static struct bfd_link_hash_table *
@@ -4627,11 +3973,6 @@ elf32_mn10300_link_hash_table_create (bfd *abfd)
     }
 
   ret->flags = 0;
-  ret->tls_ldm_got.refcount = 0;
-  ret->tls_ldm_got.offset = -1;
-  ret->tls_ldm_got.got_allocated = 0;
-  ret->tls_ldm_got.rel_emitted = 0;
-
   amt = sizeof (struct elf_link_hash_table);
   ret->static_hash_table = bfd_malloc (amt);
   if (ret->static_hash_table == NULL)
@@ -5023,6 +4364,13 @@ _bfd_mn10300_elf_adjust_dynamic_symbol (struct bfd_link_info * info,
   if (!h->non_got_ref)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -5040,7 +4388,7 @@ _bfd_mn10300_elf_adjust_dynamic_symbol (struct bfd_link_info * info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection * srel;
 
@@ -5059,7 +4407,6 @@ static bfd_boolean
 _bfd_mn10300_elf_size_dynamic_sections (bfd * output_bfd,
 					struct bfd_link_info * info)
 {
-  struct elf32_mn10300_link_hash_table *htab = elf32_mn10300_hash_table (info);
   bfd * dynobj;
   asection * s;
   bfd_boolean plt;
@@ -5092,13 +4439,6 @@ _bfd_mn10300_elf_size_dynamic_sections (bfd * output_bfd,
 	s->size = 0;
     }
 
-  if (htab->tls_ldm_got.refcount > 0)
-    {
-      s = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (s != NULL);
-      s->size += sizeof (Elf32_External_Rela);
-    }
-
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
@@ -5342,64 +4682,31 @@ _bfd_mn10300_elf_finish_dynamic_symbol (bfd * output_bfd,
 		      + sgot->output_offset
 		      + (h->got.offset & ~1));
 
-      switch (elf_mn10300_hash_entry (h)->tls_type)
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a RELATIVE reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic || h->dynindx == -1)
+	  && h->def_regular)
+	{
+	  rel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
+	  rel.r_addend = (h->root.u.def.value
+			  + h->root.u.def.section->output_section->vma
+			  + h->root.u.def.section->output_offset);
+	}
+      else
 	{
-	case GOT_TLS_GD:
 	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset + 4);
-	  rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_TLS_DTPMOD);
-	  rel.r_addend = 0;
-	  bfd_elf32_swap_reloca_out (output_bfd, & rel,
-				     (bfd_byte *) ((Elf32_External_Rela *) srel->contents
-						   + srel->reloc_count));
-	  ++ srel->reloc_count;
-	  rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_TLS_DTPOFF);
-	  rel.r_offset += 4;
+	  rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_GLOB_DAT);
 	  rel.r_addend = 0;
-	  break;
-
-	case GOT_TLS_IE:
-	  /* We originally stored the addend in the GOT, but at this
-	     point, we want to move it to the reloc instead as that's
-	     where the dynamic linker wants it.  */
-	  rel.r_addend = bfd_get_32 (output_bfd, sgot->contents + h->got.offset);
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  if (h->dynindx == -1)
-	    rel.r_info = ELF32_R_INFO (0, R_MN10300_TLS_TPOFF);
-	  else
-	    rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_TLS_TPOFF);
-	  break;
-
-	default:
-	  /* If this is a -Bsymbolic link, and the symbol is defined
-	     locally, we just want to emit a RELATIVE reloc.  Likewise if
-	     the symbol was forced to be local because of a version file.
-	     The entry in the global offset table will already have been
-	     initialized in the relocate_section function.  */
-	  if (info->shared
-	      && (info->symbolic || h->dynindx == -1)
-	      && h->def_regular)
-	    {
-	      rel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
-	      rel.r_addend = (h->root.u.def.value
-			      + h->root.u.def.section->output_section->vma
-			      + h->root.u.def.section->output_offset);
-	    }
-	  else
-	    {
-	      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	      rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_GLOB_DAT);
-	      rel.r_addend = 0;
-	    }
 	}
 
-      if (ELF32_R_TYPE (rel.r_info) != R_MN10300_NONE)
-	{
-	  bfd_elf32_swap_reloca_out (output_bfd, &rel,
-				     (bfd_byte *) ((Elf32_External_Rela *) srel->contents
-						   + srel->reloc_count));
-	  ++ srel->reloc_count;
-	}
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+				 (bfd_byte *) ((Elf32_External_Rela *) srel->contents
+					       + srel->reloc_count));
+      ++ srel->reloc_count;
     }
 
   if (h->needs_copy)
@@ -5536,14 +4843,6 @@ _bfd_mn10300_elf_finish_dynamic_sections (bfd * output_bfd,
 	  /* UnixWare sets the entsize of .plt to 4, although that doesn't
 	     really seem like the right value.  */
 	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
-
-	  /* UnixWare sets the entsize of .plt to 4, but this is incorrect
-	     as it means that the size of the PLT0 section (15 bytes) is not
-	     a multiple of the sh_entsize.  Some ELF tools flag this as an
-	     error.  We could pad PLT0 to 16 bytes, but that would introduce
-	     compatibilty issues with previous toolchains, so instead we
-	     just set the entry size to 1.  */
-	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 1;
 	}
     }
 
@@ -5585,7 +4884,12 @@ _bfd_mn10300_elf_reloc_type_class (const Elf_Internal_Rela *rela)
 static bfd_boolean
 mn10300_elf_mkobject (bfd *abfd)
 {
-  return bfd_elf_allocate_object (abfd, sizeof (struct elf_mn10300_obj_tdata),
+  /* We do not actually need any extra room in the bfd elf data structure.
+     But we do need the object_id of the structure to be set to
+     MN10300_ELF_DATA so that elflink.c:elf_link_add_object_symols() will call
+     our mn10300_elf_check_relocs function which will then allocate space in
+     the .got section for any GOT based relocs.  */
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_obj_tdata),
 				  MN10300_ELF_DATA);
 }
 
@@ -5641,8 +4945,7 @@ mn10300_elf_mkobject (bfd *abfd)
   _bfd_mn10300_elf_finish_dynamic_symbol
 #define elf_backend_finish_dynamic_sections \
   _bfd_mn10300_elf_finish_dynamic_sections
-#define elf_backend_copy_indirect_symbol \
-  _bfd_mn10300_copy_indirect_symbol
+
 #define elf_backend_reloc_type_class \
   _bfd_mn10300_elf_reloc_type_class
 
diff --git a/bfd/elf.c b/bfd/elf.c
index df43a6ad4c..aa40c33908 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1,7 +1,7 @@
 /* ELF executable support for BFD.
 
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -4820,13 +4820,12 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
 	BFD_ASSERT (hdr->sh_offset == hdr->bfd_section->filepos);
       else if ((hdr->sh_flags & SHF_ALLOC) != 0)
 	{
-	  if (hdr->sh_size != 0)
-	    (*_bfd_error_handler)
-	      (_("%B: warning: allocated section `%s' not in segment"),
-	       abfd,
-	       (hdr->bfd_section == NULL
-		? "*unknown*"
-		: hdr->bfd_section->name));
+	  (*_bfd_error_handler)
+	    (_("%B: warning: allocated section `%s' not in segment"),
+	     abfd,
+	     (hdr->bfd_section == NULL
+	      ? "*unknown*"
+	      : hdr->bfd_section->name));
 	  /* We don't need to page align empty sections.  */
 	  if ((abfd->flags & D_PAGED) != 0 && hdr->sh_size != 0)
 	    off += vma_page_aligned_bias (hdr->sh_addr, off,
@@ -7405,30 +7404,36 @@ elf_find_function (bfd *abfd,
 
   for (p = symbols; *p != NULL; p++)
     {
-      asymbol *sym = *p;
-      asection *code_sec;
-      bfd_vma code_off;
+      elf_symbol_type *q;
+      unsigned int type;
+
+      q = (elf_symbol_type *) *p;
 
-      if ((sym->flags & BSF_FILE) != 0)
+      type = ELF_ST_TYPE (q->internal_elf_sym.st_info);
+      switch (type)
 	{
-	  file = sym;
+	case STT_FILE:
+	  file = &q->symbol;
 	  if (state == symbol_seen)
 	    state = file_after_symbol_seen;
 	  continue;
-	}
-
-      if (bed->maybe_function_sym (sym, &code_sec, &code_off)
-	  && code_sec == section
-	  && code_off >= low_func
-	  && code_off <= offset)
-	{
-	  func = sym;
-	  low_func = code_off;
-	  filename = NULL;
-	  if (file != NULL
-	      && ((sym->flags & BSF_LOCAL) != 0
-		  || state != file_after_symbol_seen))
-	    filename = bfd_asymbol_name (file);
+	default:
+	  if (!bed->is_function_type (type))
+	    break;
+	case STT_NOTYPE:
+	  if (bfd_get_section (&q->symbol) == section
+	      && q->symbol.value >= low_func
+	      && q->symbol.value <= offset)
+	    {
+	      func = (asymbol *) q;
+	      low_func = q->symbol.value;
+	      filename = NULL;
+	      if (file != NULL
+		  && (ELF_ST_BIND (q->internal_elf_sym.st_info) == STB_LOCAL
+		      || state != file_after_symbol_seen))
+		filename = bfd_asymbol_name (file);
+	    }
+	  break;
 	}
       if (state == nothing_seen)
 	state = symbol_seen;
@@ -7471,8 +7476,7 @@ _bfd_elf_find_nearest_line (bfd *abfd,
       return TRUE;
     }
 
-  if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections,
-                                     section, symbols, offset,
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     &elf_tdata (abfd)->dwarf2_find_line_info))
@@ -7693,12 +7697,11 @@ _bfd_elf_validate_reloc (bfd *abfd, arelent *areloc)
 bfd_boolean
 _bfd_elf_close_and_cleanup (bfd *abfd)
 {
-  struct elf_obj_tdata *tdata = elf_tdata (abfd);
-  if (bfd_get_format (abfd) == bfd_object && tdata != NULL)
+  if (bfd_get_format (abfd) == bfd_object)
     {
-      if (elf_shstrtab (abfd) != NULL)
+      if (elf_tdata (abfd) != NULL && elf_shstrtab (abfd) != NULL)
 	_bfd_elf_strtab_free (elf_shstrtab (abfd));
-      _bfd_dwarf2_cleanup_debug_info (abfd, &tdata->dwarf2_find_line_info);
+      _bfd_dwarf2_cleanup_debug_info (abfd);
     }
 
   return _bfd_generic_close_and_cleanup (abfd);
@@ -7979,18 +7982,6 @@ elfcore_grok_s390_prefix (bfd *abfd, Elf_Internal_Note *note)
 }
 
 static bfd_boolean
-elfcore_grok_s390_last_break (bfd *abfd, Elf_Internal_Note *note)
-{
-  return elfcore_make_note_pseudosection (abfd, ".reg-s390-last-break", note);
-}
-
-static bfd_boolean
-elfcore_grok_s390_system_call (bfd *abfd, Elf_Internal_Note *note)
-{
-  return elfcore_make_note_pseudosection (abfd, ".reg-s390-system-call", note);
-}
-
-static bfd_boolean
 elfcore_grok_arm_vfp (bfd *abfd, Elf_Internal_Note *note)
 {
   return elfcore_make_note_pseudosection (abfd, ".reg-arm-vfp", note);
@@ -8415,20 +8406,6 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
       else
         return TRUE;
 
-    case NT_S390_LAST_BREAK:
-      if (note->namesz == 6
-          && strcmp (note->namedata, "LINUX") == 0)
-        return elfcore_grok_s390_last_break (abfd, note);
-      else
-        return TRUE;
-
-    case NT_S390_SYSTEM_CALL:
-      if (note->namesz == 6
-          && strcmp (note->namedata, "LINUX") == 0)
-        return elfcore_grok_s390_system_call (abfd, note);
-      else
-        return TRUE;
-
     case NT_ARM_VFP:
       if (note->namesz == 6
 	  && strcmp (note->namedata, "LINUX") == 0)
@@ -8885,6 +8862,7 @@ elfcore_write_note (bfd *abfd,
   return buf;
 }
 
+#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
 char *
 elfcore_write_prpsinfo (bfd  *abfd,
 			char *buf,
@@ -8892,6 +8870,7 @@ elfcore_write_prpsinfo (bfd  *abfd,
 			const char *fname,
 			const char *psargs)
 {
+  const char *note_name = "CORE";
   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
 
   if (bed->elf_backend_write_core_note != NULL)
@@ -8903,7 +8882,6 @@ elfcore_write_prpsinfo (bfd  *abfd,
 	return ret;
     }
 
-#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
 #if defined (HAVE_PRPSINFO32_T) || defined (HAVE_PSINFO32_T)
   if (bed->s->elfclass == ELFCLASS32)
     {
@@ -8919,7 +8897,7 @@ elfcore_write_prpsinfo (bfd  *abfd,
       strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
       strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
       return elfcore_write_note (abfd, buf, bufsiz,
-				 "CORE", note_type, &data, sizeof (data));
+				 note_name, note_type, &data, sizeof (data));
     }
   else
 #endif
@@ -8936,14 +8914,12 @@ elfcore_write_prpsinfo (bfd  *abfd,
       strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
       strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
       return elfcore_write_note (abfd, buf, bufsiz,
-				 "CORE", note_type, &data, sizeof (data));
+				 note_name, note_type, &data, sizeof (data));
     }
-#endif	/* PSINFO_T or PRPSINFO_T */
-
-  free (buf);
-  return NULL;
 }
+#endif	/* PSINFO_T or PRPSINFO_T */
 
+#if defined (HAVE_PRSTATUS_T)
 char *
 elfcore_write_prstatus (bfd *abfd,
 			char *buf,
@@ -8952,6 +8928,7 @@ elfcore_write_prstatus (bfd *abfd,
 			int cursig,
 			const void *gregs)
 {
+  const char *note_name = "CORE";
   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
 
   if (bed->elf_backend_write_core_note != NULL)
@@ -8964,7 +8941,6 @@ elfcore_write_prstatus (bfd *abfd,
 	return ret;
     }
 
-#if defined (HAVE_PRSTATUS_T)
 #if defined (HAVE_PRSTATUS32_T)
   if (bed->s->elfclass == ELFCLASS32)
     {
@@ -8974,7 +8950,7 @@ elfcore_write_prstatus (bfd *abfd,
       prstat.pr_pid = pid;
       prstat.pr_cursig = cursig;
       memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
-      return elfcore_write_note (abfd, buf, bufsiz, "CORE",
+      return elfcore_write_note (abfd, buf, bufsiz, note_name,
 				 NT_PRSTATUS, &prstat, sizeof (prstat));
     }
   else
@@ -8986,14 +8962,11 @@ elfcore_write_prstatus (bfd *abfd,
       prstat.pr_pid = pid;
       prstat.pr_cursig = cursig;
       memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
-      return elfcore_write_note (abfd, buf, bufsiz, "CORE",
+      return elfcore_write_note (abfd, buf, bufsiz, note_name,
 				 NT_PRSTATUS, &prstat, sizeof (prstat));
     }
-#endif /* HAVE_PRSTATUS_T */
-
-  free (buf);
-  return NULL;
 }
+#endif /* HAVE_PRSTATUS_T */
 
 #if defined (HAVE_LWPSTATUS_T)
 char *
@@ -9194,32 +9167,6 @@ elfcore_write_s390_prefix (bfd *abfd,
 }
 
 char *
-elfcore_write_s390_last_break (bfd *abfd,
-			       char *buf,
-			       int *bufsiz,
-			       const void *s390_last_break,
-			       int size)
-{
-  char *note_name = "LINUX";
-  return elfcore_write_note (abfd, buf, bufsiz,
-                             note_name, NT_S390_LAST_BREAK,
-			     s390_last_break, size);
-}
-
-char *
-elfcore_write_s390_system_call (bfd *abfd,
-				char *buf,
-				int *bufsiz,
-				const void *s390_system_call,
-				int size)
-{
-  char *note_name = "LINUX";
-  return elfcore_write_note (abfd, buf, bufsiz,
-                             note_name, NT_S390_SYSTEM_CALL,
-			     s390_system_call, size);
-}
-
-char *
 elfcore_write_arm_vfp (bfd *abfd,
 		       char *buf,
 		       int *bufsiz,
@@ -9261,10 +9208,6 @@ elfcore_write_register_note (bfd *abfd,
     return elfcore_write_s390_ctrs (abfd, buf, bufsiz, data, size);
   if (strcmp (section, ".reg-s390-prefix") == 0)
     return elfcore_write_s390_prefix (abfd, buf, bufsiz, data, size);
-  if (strcmp (section, ".reg-s390-last-break") == 0)
-    return elfcore_write_s390_last_break (abfd, buf, bufsiz, data, size);
-  if (strcmp (section, ".reg-s390-system-call") == 0)
-    return elfcore_write_s390_system_call (abfd, buf, bufsiz, data, size);
   if (strcmp (section, ".reg-arm-vfp") == 0)
     return elfcore_write_arm_vfp (abfd, buf, bufsiz, data, size);
   return NULL;
@@ -9685,19 +9628,3 @@ _bfd_elf_is_function_type (unsigned int type)
   return (type == STT_FUNC
 	  || type == STT_GNU_IFUNC);
 }
-
-/* Return TRUE iff the ELF symbol SYM might be a function.  Set *CODE_SEC
-   and *CODE_OFF to the function's entry point.  */
-
-bfd_boolean
-_bfd_elf_maybe_function_sym (const asymbol *sym,
-			     asection **code_sec, bfd_vma *code_off)
-{
-  if ((sym->flags & (BSF_SECTION_SYM | BSF_FILE | BSF_OBJECT
-		     | BSF_THREAD_LOCAL | BSF_RELC | BSF_SRELC)) != 0)
-    return FALSE;
-
-  *code_sec = sym->section;
-  *code_off = sym->value;
-  return TRUE;
-}
diff --git a/bfd/elf32-am33lin.c b/bfd/elf32-am33lin.c
index dd2aed413e..177a7140de 100644
--- a/bfd/elf32-am33lin.c
+++ b/bfd/elf32-am33lin.c
@@ -50,7 +50,6 @@ elf32_am33lin_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
       default:
 	return FALSE;
 
-      case 184:
       case 188:		/* Linux/am33 */
 	/* pr_cursig */
 	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 8721f949b0..1f6c1a07e4 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -1,6 +1,6 @@
 /* 32-bit ELF support for ARM
    Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -1966,8 +1966,6 @@ elf32_arm_nabi_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 	return FALSE;
 
       case 124:		/* Linux/ARM elf_prpsinfo.  */
-	elf_tdata (abfd)->core_pid
-	 = bfd_get_32 (abfd, note->descdata + 12);
 	elf_tdata (abfd)->core_program
 	 = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
 	elf_tdata (abfd)->core_command
@@ -1988,54 +1986,6 @@ elf32_arm_nabi_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
   return TRUE;
 }
 
-static char *
-elf32_arm_nabi_write_core_note (bfd *abfd, char *buf, int *bufsiz,
-				int note_type, ...)
-{
-  switch (note_type)
-    {
-    default:
-      return NULL;
-
-    case NT_PRPSINFO:
-      {
-	char data[124];
-	va_list ap;
-
-	va_start (ap, note_type);
-	memset (data, 0, sizeof (data));
-	strncpy (data + 28, va_arg (ap, const char *), 16);
-	strncpy (data + 44, va_arg (ap, const char *), 80);
-	va_end (ap);
-
-	return elfcore_write_note (abfd, buf, bufsiz,
-				   "CORE", note_type, data, sizeof (data));
-      }
-
-    case NT_PRSTATUS:
-      {
-	char data[148];
-	va_list ap;
-	long pid;
-	int cursig;
-	const void *greg;
-
-	va_start (ap, note_type);
-	memset (data, 0, sizeof (data));
-	pid = va_arg (ap, long);
-	bfd_put_32 (abfd, pid, data + 24);
-	cursig = va_arg (ap, int);
-	bfd_put_16 (abfd, cursig, data + 12);
-	greg = va_arg (ap, const void *);
-	memcpy (data + 72, greg, 72);
-	va_end (ap);
-
-	return elfcore_write_note (abfd, buf, bufsiz,
-				   "CORE", note_type, data, sizeof (data));
-      }
-    }
-}
-
 #define TARGET_LITTLE_SYM               bfd_elf32_littlearm_vec
 #define TARGET_LITTLE_NAME              "elf32-littlearm"
 #define TARGET_BIG_SYM                  bfd_elf32_bigarm_vec
@@ -2043,7 +1993,6 @@ elf32_arm_nabi_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 
 #define elf_backend_grok_prstatus	elf32_arm_nabi_grok_prstatus
 #define elf_backend_grok_psinfo		elf32_arm_nabi_grok_psinfo
-#define elf_backend_write_core_note	elf32_arm_nabi_write_core_note
 
 typedef unsigned long int insn32;
 typedef unsigned short int insn16;
@@ -2405,32 +2354,9 @@ static const insn_sequence elf32_arm_stub_a8_veneer_blx[] =
     ARM_REL_INSN(0xea000000, -8)	/* b original_branch_dest.  */
   };
 
-/* For each section group there can be a specially created linker section
-   to hold the stubs for that group.  The name of the stub section is based
-   upon the name of another section within that group with the suffix below
-   applied.
-
-   PR 13049: STUB_SUFFIX used to be ".stub", but this allowed the user to
-   create what appeared to be a linker stub section when it actually
-   contained user code/data.  For example, consider this fragment:
-   
-     const char * stubborn_problems[] = { "np" };
-
-   If this is compiled with "-fPIC -fdata-sections" then gcc produces a
-   section called:
-
-     .data.rel.local.stubborn_problems
-
-   This then causes problems in arm32_arm_build_stubs() as it triggers:
-
-      // Ignore non-stub sections.
-      if (!strstr (stub_sec->name, STUB_SUFFIX))
-	continue;
-
-   And so the section would be ignored instead of being processed.  Hence
-   the change in definition of STUB_SUFFIX to a name that cannot be a valid
-   C identifier.  */
-#define STUB_SUFFIX ".__stub"
+/* Section name for stubs is the associated section name plus this
+   string.  */
+#define STUB_SUFFIX ".stub"
 
 /* One entry per long/short branch stub defined above.  */
 #define DEF_STUBS \
@@ -3631,7 +3557,7 @@ arm_type_of_stub (struct bfd_link_info *info,
 		  stub_type = (info->shared | globals->pic_veneer)
 		    /* PIC stubs.  */
 		    ? ((globals->use_blx
-			&& (r_type == R_ARM_THM_CALL))
+			&& (r_type ==R_ARM_THM_CALL))
 		       /* V5T and above. Stub starts with ARM code, so
 			  we must be able to switch mode before
 			  reaching it, which is only possible for 'bl'
@@ -3642,7 +3568,7 @@ arm_type_of_stub (struct bfd_link_info *info,
 
 		    /* non-PIC stubs.  */
 		    : ((globals->use_blx
-			&& (r_type == R_ARM_THM_CALL))
+			&& (r_type ==R_ARM_THM_CALL))
 		       /* V5T and above.  */
 		       ? arm_stub_long_branch_any_any
 		       /* V4T.  */
@@ -3871,9 +3797,7 @@ elf32_arm_create_or_find_stub_sec (asection **link_sec_p, asection *section,
   asection *stub_sec;
 
   link_sec = htab->stub_group[section->id].link_sec;
-  BFD_ASSERT (link_sec != NULL);
   stub_sec = htab->stub_group[section->id].stub_sec;
-
   if (stub_sec == NULL)
     {
       stub_sec = htab->stub_group[link_sec->id].stub_sec;
@@ -6982,7 +6906,7 @@ elf32_thumb_to_arm_stub (struct bfd_link_info * info,
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%s): warning: interworking not enabled.\n"
-	       "  first occurrence: %B: Thumb call to ARM"),
+	       "  first occurrence: %B: thumb call to arm"),
 	     sym_sec->owner, input_bfd, name);
 
 	  return FALSE;
@@ -8296,6 +8220,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
 		{
 		  /* The target is out of reach, so redirect the
 		     branch to the local stub for this function.  */
+
 		  stub_entry = elf32_arm_get_stub_entry (input_section,
 							 sym_sec, h,
 							 rel, globals,
@@ -10462,9 +10387,7 @@ elf32_arm_relocate_section (bfd *                  output_bfd,
 	 not process them.  */
       if (unresolved_reloc
           && !((input_section->flags & SEC_DEBUGGING) != 0
-               && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+               && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
@@ -11268,46 +11191,6 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out,
 #undef T
 }
 
-/* Query attributes object to see if integer divide instructions may be
-   present in an object.  */
-static bfd_boolean
-elf32_arm_attributes_accept_div (const obj_attribute *attr)
-{
-  int arch = attr[Tag_CPU_arch].i;
-  int profile = attr[Tag_CPU_arch_profile].i;
-
-  switch (attr[Tag_DIV_use].i)
-    {
-    case 0:
-      /* Integer divide allowed if instruction contained in archetecture.  */
-      if (arch == TAG_CPU_ARCH_V7 && (profile == 'R' || profile == 'M'))
-	return TRUE;
-      else if (arch >= TAG_CPU_ARCH_V7E_M)
-	return TRUE;
-      else
-	return FALSE;
-
-    case 1:
-      /* Integer divide explicitly prohibited.  */
-      return FALSE;
-
-    default:
-      /* Unrecognised case - treat as allowing divide everywhere.  */
-    case 2:
-      /* Integer divide allowed in ARM state.  */
-      return TRUE;
-    }
-}
-
-/* Query attributes object to see if integer divide instructions are
-   forbidden to be in the object.  This is not the inverse of
-   elf32_arm_attributes_accept_div.  */
-static bfd_boolean
-elf32_arm_attributes_forbid_div (const obj_attribute *attr)
-{
-  return attr[Tag_DIV_use].i == 1;
-}
-
 /* Merge EABI object attributes from IBFD into OBFD.  Raise an error if there
    are conflicting attributes.  */
 
@@ -11640,7 +11523,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
 	case Tag_PCS_config:
 	  if (out_attr[i].i == 0)
 	    out_attr[i].i = in_attr[i].i;
-	  else if (in_attr[i].i != 0 && out_attr[i].i != in_attr[i].i)
+	  else if (in_attr[i].i != 0 && out_attr[i].i != 0)
 	    {
 	      /* It's sometimes ok to mix different configs, so this is only
 	         a warning.  */
@@ -11749,22 +11632,29 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
 	  break;
 
 	case Tag_DIV_use:
-	  /* A value of zero on input means that the divide instruction may
-	     be used if available in the base architecture as specified via
-	     Tag_CPU_arch and Tag_CPU_arch_profile.  A value of 1 means that
-	     the user did not want divide instructions.  A value of 2
-	     explicitly means that divide instructions were allowed in ARM
-	     and Thumb state.  */
-	  if (in_attr[i].i == out_attr[i].i)
-	    /* Do nothing.  */ ;
-	  else if (elf32_arm_attributes_forbid_div (in_attr)
-		   && !elf32_arm_attributes_accept_div (out_attr))
-	    out_attr[i].i = 1;
-	  else if (elf32_arm_attributes_forbid_div (out_attr)
-		   && elf32_arm_attributes_accept_div (in_attr))
-	    out_attr[i].i = in_attr[i].i;
-	  else if (in_attr[i].i == 2)
-	    out_attr[i].i = in_attr[i].i;
+	  /* This tag is set to zero if we can use UDIV and SDIV in Thumb
+	     mode on a v7-M or v7-R CPU; to one if we can not use UDIV or
+	     SDIV at all; and to two if we can use UDIV or SDIV on a v7-A
+	     CPU.  We will merge as follows: If the input attribute's value
+	     is one then the output attribute's value remains unchanged.  If
+	     the input attribute's value is zero or two then if the output
+	     attribute's value is one the output value is set to the input
+	     value, otherwise the output value must be the same as the
+	     inputs.  */ 
+	  if (in_attr[i].i != 1 && out_attr[i].i != 1) 
+	    { 
+	      if (in_attr[i].i != out_attr[i].i)
+		{
+		  _bfd_error_handler
+		    (_("DIV usage mismatch between %B and %B"),
+		     ibfd, obfd); 
+		  result = FALSE;
+		}
+	    } 
+
+	  if (in_attr[i].i != 1)
+	    out_attr[i].i = in_attr[i].i; 
+	  
 	  break;
 
 	case Tag_MPextension_use_legacy:
@@ -12731,8 +12621,7 @@ elf32_arm_find_nearest_line (bfd *          abfd,
 
   /* We skip _bfd_dwarf1_find_nearest_line since no known ARM toolchain uses it.  */
 
-  if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections,
-                                     section, symbols, offset,
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     & elf_tdata (abfd)->dwarf2_find_line_info))
@@ -12879,6 +12768,13 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info,
   if (info->shared || globals->root.is_relocatable_executable)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -12895,7 +12791,7 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rel(a).bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index 2a10162465..6d20aefdc2 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -1503,18 +1503,11 @@ elf32_avr_relax_delete_bytes (bfd *abfd,
        bfd_vma symval;
        bfd_vma shrinked_insn_address;
 
-       if (isec->reloc_count == 0)
-	 continue;
-
        shrinked_insn_address = (sec->output_section->vma
                                 + sec->output_offset + addr - count);
 
-       irel = elf_section_data (isec)->relocs;
-       /* PR 12161: Read in the relocs for this section if necessary.  */
-       if (irel == NULL)
-	 irel = _bfd_elf_link_read_relocs (abfd, isec, NULL, NULL, FALSE);
-
-       for (irelend = irel + isec->reloc_count;
+       irelend = elf_section_data (isec)->relocs + isec->reloc_count;
+       for (irel = elf_section_data (isec)->relocs;
             irel < irelend;
             irel++)
          {
@@ -1571,9 +1564,6 @@ elf32_avr_relax_delete_bytes (bfd *abfd,
 	   /* else...Reference symbol is extern.  No need for adjusting
 	      the addend.  */
 	 }
-
-       if (elf_section_data (isec)->relocs == NULL)
-	 free (irelend - isec->reloc_count);
      }
   }
 
@@ -1659,16 +1649,6 @@ elf32_avr_relax_section (bfd *abfd,
   Elf_Internal_Sym *isymbuf = NULL;
   struct elf32_avr_link_hash_table *htab;
 
-  /* If 'shrinkable' is FALSE, do not shrink by deleting bytes while
-     relaxing. Such shrinking can cause issues for the sections such 
-     as .vectors and .jumptables. Instead the unused bytes should be 
-     filled with nop instructions. */
-  bfd_boolean shrinkable = TRUE;
-
-  if (!strcmp (sec->name,".vectors")
-      || !strcmp (sec->name,".jumptables"))
-    shrinkable = FALSE;
-
   if (link_info->relocatable)
     (*link_info->callbacks->einfo)
       (_("%P%F: --relax and -r may not be used together\n"));
@@ -1825,16 +1805,10 @@ elf32_avr_relax_section (bfd *abfd,
             /* Compute the distance from this insn to the branch target.  */
             gap = value - dot;
 
-            /* Check if the gap falls in the range that can be accommodated
-               in 13bits signed (It is 12bits when encoded, as we deal with
-               word addressing). */
-            if (!shrinkable && ((int) gap >= -4096 && (int) gap <= 4095))
-              distance_short_enough = 1;
-            /* If shrinkable, then we can check for a range of distance which
-               is two bytes farther on both the directions because the call
-               or jump target will be closer by two bytes after the 
-               relaxation. */
-            else if (shrinkable && ((int) gap >= -4094 && (int) gap <= 4097))
+            /* If the distance is within -4094..+4098 inclusive, then we can
+               relax this jump/call.  +4098 because the call/jump target
+               will be closer after the relaxation.  */
+            if ((int) gap >= -4094 && (int) gap <= 4098)
               distance_short_enough = 1;
 
             /* Here we handle the wrap-around case.  E.g. for a 16k device
@@ -1908,9 +1882,11 @@ elf32_avr_relax_section (bfd *abfd,
                 irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
                                              R_AVR_13_PCREL);
 
-                /* We should not modify the ordering if 'shrinkable' is
-                   FALSE. */ 
-                if (!shrinkable)
+                /* Check for the vector section. There we don't want to
+                   modify the ordering!  */
+
+                if (!strcmp (sec->name,".vectors")
+                    || !strcmp (sec->name,".jumptables"))
                   {
                     /* Let's insert a nop.  */
                     bfd_put_8 (abfd, 0x00, contents + irel->r_offset + 2);
diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index f88e5d4991..b112dfc267 100644
--- a/bfd/elf32-bfin.c
+++ b/bfd/elf32-bfin.c
@@ -1585,9 +1585,7 @@ bfin_relocate_section (bfd * output_bfd,
          because such sections are not SEC_ALLOC and thus ld.so will
          not process them.  */
       if (unresolved_reloc
-	  && !((input_section->flags & SEC_DEBUGGING) != 0 && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	  && !((input_section->flags & SEC_DEBUGGING) != 0 && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
@@ -2733,9 +2731,7 @@ bfinfdpic_relocate_section (bfd * output_bfd,
 	default:
 	non_fdpic:
 	  picrel = NULL;
-	  if (h && ! BFINFDPIC_SYM_LOCAL (info, h)
-	      && _bfd_elf_section_offset (output_bfd, info, input_section,
-					  rel->r_offset) != (bfd_vma) -1)
+	  if (h && ! BFINFDPIC_SYM_LOCAL (info, h))
 	    {
 	      info->callbacks->warning
 		(info, _("relocation references symbol not defined in the module"),
diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
index 1f2fb49333..0118131bea 100644
--- a/bfd/elf32-cr16.c
+++ b/bfd/elf32-cr16.c
@@ -1,5 +1,5 @@
 /* BFD back-end for National Semiconductor's CR16 ELF
-   Copyright 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
+   Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by M R Swami Reddy.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -2446,6 +2446,13 @@ _bfd_cr16_elf_adjust_dynamic_symbol (struct bfd_link_info * info,
   if (!h->non_got_ref)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+                             h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2463,7 +2470,7 @@ _bfd_cr16_elf_adjust_dynamic_symbol (struct bfd_link_info * info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection * srel;
 
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index c0da35917b..243a8ec140 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1,6 +1,6 @@
 /* CRIS-specific support for 32-bit ELF.
    Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012 Free Software Foundation, Inc.
+   2010, 2011 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson, based on elf32-fr30.c
    PIC and shlib bits based primarily on elf32-m68k.c and elf32-i386.c.
@@ -1166,11 +1166,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 		      || r_type == R_CRIS_16_PCREL
 		      || r_type == R_CRIS_32_PCREL))
 		relocation = 0;
-	      else if (!info->relocatable && unresolved_reloc
-		       && (_bfd_elf_section_offset (output_bfd, info,
-						    input_section,
-						    rel->r_offset)
-			   != (bfd_vma) -1))
+	      else if (!info->relocatable && unresolved_reloc)
 		{
 		  _bfd_error_handler
 		    (_("%B, section %A: unresolvable relocation %s against symbol `%s'"),
@@ -3052,6 +3048,13 @@ elf_cris_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (!h->non_got_ref)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -3069,7 +3072,7 @@ elf_cris_adjust_dynamic_symbol (struct bfd_link_info *info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
@@ -3576,12 +3579,6 @@ cris_elf_check_relocs (bfd *abfd,
 		 sec,
 		 cris_elf_howto_table[r_type].name);
 	    }
-
-	  /* We don't need to handle relocs into sections not going into
-	     the "real" output.  */
-	  if ((sec->flags & SEC_ALLOC) == 0)
-	    break;
-
 	  if (h != NULL)
 	    {
 	      h->non_got_ref = 1;
@@ -3611,6 +3608,11 @@ cris_elf_check_relocs (bfd *abfd,
 	  if (! info->shared)
 	    break;
 
+	  /* We don't need to handle relocs into sections not going into
+	     the "real" output.  */
+	  if ((sec->flags & SEC_ALLOC) == 0)
+	    break;
+
 	  /* We may need to create a reloc section in the dynobj and made room
 	     for this reloc.  */
 	  if (sreloc == NULL)
diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index e4e7f2408c..7f3c4dd23e 100644
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -2896,10 +2896,7 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
 	default:
 	non_fdpic:
 	  picrel = NULL;
-	  if (h
-	      && ! FRVFDPIC_SYM_LOCAL (info, h)
-	      && _bfd_elf_section_offset (output_bfd, info, input_section,
-					  rel->r_offset) != (bfd_vma) -1)
+	  if (h && ! FRVFDPIC_SYM_LOCAL (info, h))
 	    {
 	      info->callbacks->einfo
 		(_("%H: relocation references symbol"
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 10ec4f50d7..7f0f2cb10e 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -1,6 +1,6 @@
 /* BFD back-end for HP PA-RISC ELF files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    Original code by
@@ -1789,12 +1789,10 @@ elf32_hppa_hide_symbol (struct bfd_link_info *info,
 	}
     }
 
-  /* STT_GNU_IFUNC symbol must go through PLT.  */
-  if (! hppa_elf_hash_entry (eh)->plabel
-      && eh->type != STT_GNU_IFUNC)
+  if (! hppa_elf_hash_entry (eh)->plabel)
     {
       eh->needs_plt = 0;
-      eh->plt = elf_hash_table (info)->init_plt_offset;
+      eh->plt = elf_hash_table (info)->init_plt_refcount;
     }
 }
 
@@ -1816,13 +1814,6 @@ elf32_hppa_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (eh->type == STT_FUNC
       || eh->needs_plt)
     {
-      /* If the symbol is used by a plabel, we must allocate a PLT slot.
-	 The refcounts are not reliable when it has been hidden since
-	 hide_symbol can be called before the plabel flag is set.  */
-      if (hppa_elf_hash_entry (eh)->plabel
-	  && eh->plt.refcount <= 0)
-	eh->plt.refcount = 1;
-
       if (eh->plt.refcount <= 0
 	  || (eh->def_regular
 	      && eh->root.type != bfd_link_hash_defweak
@@ -1898,6 +1889,13 @@ elf32_hppa_adjust_dynamic_symbol (struct bfd_link_info *info,
 	}
     }
 
+  if (eh->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     eh->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -1915,7 +1913,7 @@ elf32_hppa_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* We must generate a COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the
      runtime process image.  */
-  if ((eh->root.u.def.section->flags & SEC_ALLOC) != 0 && eh->size != 0)
+  if ((eh->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += sizeof (Elf32_External_Rela);
       eh->needs_copy = 1;
@@ -3342,16 +3340,10 @@ final_link_relocate (asection *input_section,
       switch (r_type)
 	{
 	  case R_PARISC_DLTIND21L:
-	  case R_PARISC_TLS_GD21L:
-	  case R_PARISC_TLS_LDM21L:
-	  case R_PARISC_TLS_IE21L:
 	    r_type = R_PARISC_DPREL21L;
 	    break;
 
 	  case R_PARISC_DLTIND14R:
-	  case R_PARISC_TLS_GD14R:
-	  case R_PARISC_TLS_LDM14R:
-	  case R_PARISC_TLS_IE14R:
 	    r_type = R_PARISC_DPREL14R;
 	    break;
 
@@ -3417,48 +3409,53 @@ final_link_relocate (asection *input_section,
     case R_PARISC_DPREL21L:
     case R_PARISC_DPREL14R:
     case R_PARISC_DPREL14F:
+    case R_PARISC_TLS_GD21L:
+    case R_PARISC_TLS_LDM21L:
+    case R_PARISC_TLS_IE21L:
       /* Convert instructions that use the linkage table pointer (r19) to
 	 instructions that use the global data pointer (dp).  This is the
 	 most efficient way of using PIC code in an incomplete executable,
 	 but the user must follow the standard runtime conventions for
 	 accessing data for this to work.  */
-      if (orig_r_type != r_type)
+      if (orig_r_type == R_PARISC_DLTIND21L
+	  || (!info->shared
+	      && (r_type == R_PARISC_TLS_GD21L
+		  || r_type == R_PARISC_TLS_LDM21L
+		  || r_type == R_PARISC_TLS_IE21L)))
 	{
-	  if (r_type == R_PARISC_DPREL21L)
-	    {
-	      /* GCC sometimes uses a register other than r19 for the
-		 operation, so we must convert any addil instruction
-		 that uses this relocation.  */
-	      if ((insn & 0xfc000000) == ((int) OP_ADDIL << 26))
-		insn = ADDIL_DP;
-	      else
-		/* We must have a ldil instruction.  It's too hard to find
-		   and convert the associated add instruction, so issue an
-		   error.  */
-		(*_bfd_error_handler)
-		  (_("%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"),
-		   input_bfd,
-		   input_section,
-		   (long) offset,
-		   howto->name,
-		   insn);
-	    }
-	  else if (r_type == R_PARISC_DPREL14F)
-	    {
-	      /* This must be a format 1 load/store.  Change the base
-		 register to dp.  */
-	      insn = (insn & 0xfc1ffff) | (27 << 21);
-	    }
+	  /* Convert addil instructions if the original reloc was a
+	     DLTIND21L.  GCC sometimes uses a register other than r19 for
+	     the operation, so we must convert any addil instruction
+	     that uses this relocation.  */
+	  if ((insn & 0xfc000000) == ((int) OP_ADDIL << 26))
+	    insn = ADDIL_DP;
+	  else
+	    /* We must have a ldil instruction.  It's too hard to find
+	       and convert the associated add instruction, so issue an
+	       error.  */
+	    (*_bfd_error_handler)
+	      (_("%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"),
+	       input_bfd,
+	       input_section,
+	       (long) offset,
+	       howto->name,
+	       insn);
+	}
+      else if (orig_r_type == R_PARISC_DLTIND14F)
+	{
+	  /* This must be a format 1 load/store.  Change the base
+	     register to dp.  */
+	  insn = (insn & 0xfc1ffff) | (27 << 21);
 	}
 
-      /* For all the DP relative relocations, we need to examine the symbol's
-	 section.  If it has no section or if it's a code section, then
-	 "data pointer relative" makes no sense.  In that case we don't
-	 adjust the "value", and for 21 bit addil instructions, we change the
-	 source addend register from %dp to %r0.  This situation commonly
-	 arises for undefined weak symbols and when a variable's "constness"
-	 is declared differently from the way the variable is defined.  For
-	 instance: "extern int foo" with foo defined as "const int foo".  */
+    /* For all the DP relative relocations, we need to examine the symbol's
+       section.  If it has no section or if it's a code section, then
+       "data pointer relative" makes no sense.  In that case we don't
+       adjust the "value", and for 21 bit addil instructions, we change the
+       source addend register from %dp to %r0.  This situation commonly
+       arises for undefined weak symbols and when a variable's "constness"
+       is declared differently from the way the variable is defined.  For
+       instance: "extern int foo" with foo defined as "const int foo".  */
       if (sym_sec == NULL || (sym_sec->flags & SEC_CODE) != 0)
 	{
 	  if ((insn & ((0x3f << 26) | (0x1f << 21)))
@@ -3475,9 +3472,6 @@ final_link_relocate (asection *input_section,
     case R_PARISC_DLTIND21L:
     case R_PARISC_DLTIND14R:
     case R_PARISC_DLTIND14F:
-    case R_PARISC_TLS_GD21L:
-    case R_PARISC_TLS_LDM21L:
-    case R_PARISC_TLS_IE21L:
     case R_PARISC_TLS_GD14R:
     case R_PARISC_TLS_LDM14R:
     case R_PARISC_TLS_IE14R:
diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c
index 5f713c794d..8082927033 100644
--- a/bfd/elf32-i370.c
+++ b/bfd/elf32-i370.c
@@ -1,6 +1,6 @@
 /* i370-specific support for 32-bit ELF
    Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Hacked by Linas Vepstas for i370 linas@linas.org
 
@@ -498,6 +498,13 @@ i370_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (info->shared)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -522,7 +529,7 @@ i370_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index f35e3c22a9..d518d01477 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1,6 +1,6 @@
 /* Intel 80386/80486-specific support for 32-bit ELF
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -806,12 +806,6 @@ struct elf_i386_link_hash_table
 
   /* The index of the next unused R_386_TLS_DESC slot in .rel.plt.  */
   bfd_vma next_tls_desc_index;
-
-  /* The index of the next unused R_386_JUMP_SLOT slot in .rel.plt.  */
-  bfd_vma next_jump_slot_index;
-
-  /* The index of the next unused R_386_IRELATIVE slot in .rel.plt.  */
-  bfd_vma next_irelative_index;
 };
 
 /* Get the i386 ELF linker hash table from a link_info structure.  */
@@ -952,8 +946,6 @@ elf_i386_link_hash_table_create (bfd *abfd)
   ret->sym_cache.abfd = NULL;
   ret->srelplt2 = NULL;
   ret->tls_module_base = NULL;
-  ret->next_jump_slot_index = 0;
-  ret->next_irelative_index = 0;
 
   ret->loc_hash_table = htab_try_create (1024,
 					 elf_i386_local_htab_hash,
@@ -2177,6 +2169,13 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
 	}
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2190,7 +2189,7 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* We must generate a R_386_COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the
      runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += sizeof (Elf32_External_Rel);
       h->needs_copy = 1;
@@ -2276,7 +2275,7 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 
 	  /* We also need to make an entry in the .rel.plt section.  */
 	  htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
-	  htab->elf.srelplt->reloc_count++;
+	  htab->next_tls_desc_index++;
 
 	  if (get_elf_i386_backend_data (info->output_bfd)->is_vxworks
               && !info->shared)
@@ -2701,19 +2700,9 @@ elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
      incremented.  However, when we reserve space for TLS descriptors,
      it's not incremented, so in order to compute the space reserved
      for them, it suffices to multiply the reloc count by the jump
-     slot size.
-
-     PR ld/13302: We start next_irelative_index at the end of .rela.plt
-     so that R_386_IRELATIVE entries come last.  */
+     slot size.  */
   if (htab->elf.srelplt)
-    {
-      htab->next_tls_desc_index = htab->elf.srelplt->reloc_count;
-      htab->sgotplt_jump_table_size = htab->next_tls_desc_index * 4;
-      htab->next_irelative_index = htab->elf.srelplt->reloc_count - 1;
-    }
-  else if (htab->elf.irelplt)
-    htab->next_irelative_index = htab->elf.irelplt->reloc_count - 1;
-
+    htab->sgotplt_jump_table_size = htab->next_tls_desc_index * 4;
 
   if (htab->elf.sgotplt)
     {
@@ -3243,7 +3232,7 @@ elf_i386_relocate_section (bfd *output_bfd,
 
 	    case R_386_32:
 	      /* Generate dynamic relcoation only when there is a
-		 non-GOT reference in a shared object.  */
+		 non-GOF reference in a shared object.  */
 	      if (info->shared && h->non_got_ref)
 		{
 		  Elf_Internal_Rela outrel;
@@ -3503,7 +3492,6 @@ elf_i386_relocate_section (bfd *output_bfd,
 		  return FALSE;
 		}
 	      else if (!info->executable
-		       && !SYMBOLIC_BIND (info, h)
 		       && h->type == STT_FUNC
 		       && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
 		{
@@ -4249,9 +4237,7 @@ elf_i386_relocate_section (bfd *output_bfd,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
@@ -4376,13 +4362,13 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
 
       if (plt == htab->elf.splt)
 	{
-	  got_offset = h->plt.offset / plt_entry_size - 1;
-	  got_offset = (got_offset + 3) * 4;
+	  plt_index = h->plt.offset / plt_entry_size - 1;
+	  got_offset = (plt_index + 3) * 4;
 	}
       else
 	{
-	  got_offset = h->plt.offset / plt_entry_size;
-	  got_offset = got_offset * 4;
+	  plt_index = h->plt.offset / plt_entry_size;
+	  got_offset = plt_index * 4;
 	}
 
       /* Fill in the entry in the procedure linkage table.  */
@@ -4443,6 +4429,18 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                       + abed->plt->plt_got_offset);
 	}
 
+      /* Don't fill PLT entry for static executables.  */
+      if (plt == htab->elf.splt)
+	{
+	  bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rel),
+		      plt->contents + h->plt.offset
+                      + abed->plt->plt_reloc_offset);
+	  bfd_put_32 (output_bfd, - (h->plt.offset
+                                     + abed->plt->plt_plt_offset + 4),
+		      plt->contents + h->plt.offset
+                      + abed->plt->plt_plt_offset);
+	}
+
       /* Fill in the entry in the global offset table.  */
       bfd_put_32 (output_bfd,
 		  (plt->output_section->vma
@@ -4470,29 +4468,12 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
 		       + h->root.u.def.section->output_offset),
 		      gotplt->contents + got_offset);
 	  rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
-	  /* R_386_IRELATIVE comes last.  */
-	  plt_index = htab->next_irelative_index--;
 	}
       else
-	{
-	  rel.r_info = ELF32_R_INFO (h->dynindx, R_386_JUMP_SLOT);
-	  plt_index = htab->next_jump_slot_index++;
-	}
+	rel.r_info = ELF32_R_INFO (h->dynindx, R_386_JUMP_SLOT);
       loc = relplt->contents + plt_index * sizeof (Elf32_External_Rel);
       bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
 
-      /* Don't fill PLT entry for static executables.  */
-      if (plt == htab->elf.splt)
-	{
-	  bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rel),
-		      plt->contents + h->plt.offset
-                      + abed->plt->plt_reloc_offset);
-	  bfd_put_32 (output_bfd, - (h->plt.offset
-                                     + abed->plt->plt_plt_offset + 4),
-		      plt->contents + h->plt.offset
-                      + abed->plt->plt_plt_offset);
-	}
-
       if (!h->def_regular)
 	{
 	  /* Mark the symbol as undefined, rather than as defined in
@@ -5110,10 +5091,7 @@ elf_i386_nacl_pic_plt0_entry[sizeof (elf_i386_nacl_plt0_entry)] =
     0x8b, 0x4b, 0x08,		/* mov 0x8(%ebx), %ecx */
     0x83, 0xe1, 0xe0,		/* and $NACLMASK, %ecx */
     0xff, 0xe1,			/* jmp *%ecx */
-
-    /* This is expected to be the same size as elf_i386_nacl_plt0_entry,
-       so pad to that size with nop instructions.  */
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90
+    0x90                        /* nop */
   };
 
 static const bfd_byte elf_i386_nacl_pic_plt_entry[NACL_PLT_ENTRY_SIZE] =
diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
index 667b01c1e0..07add20c47 100644
--- a/bfd/elf32-lm32.c
+++ b/bfd/elf32-lm32.c
@@ -1,5 +1,5 @@
 /* Lattice Mico32-specific support for 32-bit ELF
-   Copyright 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
    Contributed by Jon Beniston <jon@beniston.com>
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -1863,6 +1863,13 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -1884,7 +1891,7 @@ lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      to copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index 044e328d0e..51ef61e6b4 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -1,6 +1,6 @@
 /* M32R-specific support for 32-bit ELF.
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -1922,6 +1922,13 @@ m32r_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -1943,7 +1950,7 @@ m32r_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      to copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
@@ -2582,11 +2589,7 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 		relocation = (h->root.u.def.value
 			      + sec->output_section->vma
 			      + sec->output_offset);
-	      else if (!info->relocatable
-		       && (_bfd_elf_section_offset (output_bfd, info,
-						    input_section,
-						    rel->r_offset)
-			   != (bfd_vma) -1))
+	      else if (!info->relocatable)
 		{
 		  (*_bfd_error_handler)
 		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
index 49a58fb0c5..63d0786bb6 100644
--- a/bfd/elf32-m68hc11.c
+++ b/bfd/elf32-m68hc11.c
@@ -1,5 +1,5 @@
 /* Motorola 68HC11-specific support for 32-bit ELF
-   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2012
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010
    Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@nerim.fr)
    (Heavily copied from the D10V port by Martin Hunt (hunt@cygnus.com))
@@ -1302,7 +1302,6 @@ static const struct bfd_elf_special_section elf32_m68hc11_special_sections[] =
 #define elf_backend_final_write_processing	0
 #define elf_backend_can_gc_sections		1
 #define elf_backend_special_sections  elf32_m68hc11_special_sections
-#define elf_backend_merge_symbol_attribute elf32_m68hc11_merge_symbol_attribute
 
 #define bfd_elf32_bfd_link_hash_table_create \
                                 m68hc11_elf_bfd_link_hash_table_create
diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
index 2b16641008..1788856f8f 100644
--- a/bfd/elf32-m68hc12.c
+++ b/bfd/elf32-m68hc12.c
@@ -1,5 +1,5 @@
 /* Motorola 68HC12-specific support for 32-bit ELF
-   Copyright 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2012
+   Copyright 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@nerim.fr)
    (Heavily copied from the D10V port by Martin Hunt (hunt@cygnus.com))
@@ -581,7 +581,6 @@ static const struct bfd_elf_special_section elf32_m68hc12_special_sections[] =
 #define elf_backend_special_sections elf32_m68hc12_special_sections
 #define elf_backend_post_process_headers     elf32_m68hc11_post_process_headers
 #define elf_backend_add_symbol_hook  elf32_m68hc11_add_symbol_hook
-#define elf_backend_merge_symbol_attribute elf32_m68hc11_merge_symbol_attribute
 
 #define bfd_elf32_bfd_link_hash_table_create \
                                 m68hc12_elf_bfd_link_hash_table_create
diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
index e1da8b286c..961dce482e 100644
--- a/bfd/elf32-m68hc1x.c
+++ b/bfd/elf32-m68hc1x.c
@@ -1,6 +1,6 @@
 /* Motorola 68HC11/HC12-specific support for 32-bit ELF
    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2009, 2010, 2011  Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@nerim.fr)
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -214,20 +214,6 @@ elf32_m68hc11_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
   return TRUE;
 }
 
-/* Merge non-visibility st_other attributes, STO_M68HC12_FAR and
-   STO_M68HC12_INTERRUPT.  */
-
-void
-elf32_m68hc11_merge_symbol_attribute (struct elf_link_hash_entry *h,
-				      const Elf_Internal_Sym *isym,
-				      bfd_boolean definition,
-				      bfd_boolean dynamic ATTRIBUTE_UNUSED)
-{
-  if (definition)
-    h->other = ((isym->st_other & ~ELF_ST_VISIBILITY (-1))
-		| ELF_ST_VISIBILITY (h->other));
-}
-
 /* External entry points for sizing and building linker stubs.  */
 
 /* Set up various things so that we can make a list of input sections
diff --git a/bfd/elf32-m68hc1x.h b/bfd/elf32-m68hc1x.h
index 34b788e764..317371f6f3 100644
--- a/bfd/elf32-m68hc1x.h
+++ b/bfd/elf32-m68hc1x.h
@@ -1,5 +1,5 @@
 /* Motorola 68HC11/68HC12-specific support for 32-bit ELF
-   Copyright 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2012
+   Copyright 2003, 2004, 2005, 2006, 2007, 2009, 2010
    Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@nerim.fr)
 
@@ -176,10 +176,6 @@ bfd_boolean elf32_m68hc11_add_symbol_hook
    flagword *flagsp, asection **secp,
    bfd_vma *valp);
 
-void elf32_m68hc11_merge_symbol_attribute
-  (struct elf_link_hash_entry *, const Elf_Internal_Sym *,
-   bfd_boolean, bfd_boolean);
-
 /* Tweak the OSABI field of the elf header.  */
 
 extern void elf32_m68hc11_post_process_headers (bfd*, struct bfd_link_info*);
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 26cec399bf..612525c2ad 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -1,6 +1,6 @@
 /* Motorola 68k series support for 32-bit ELF
    Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -2816,11 +2816,6 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 	case R_68K_8:
 	case R_68K_16:
 	case R_68K_32:
-	  /* We don't need to handle relocs into sections not going into
-	     the "real" output.  */
-	  if ((sec->flags & SEC_ALLOC) == 0)
-	      break;
-
 	  if (h != NULL)
 	    {
 	      /* Make sure a plt entry is created for this symbol if it
@@ -2834,7 +2829,8 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 
 	  /* If we are creating a shared library, we need to copy the
 	     reloc into the shared library.  */
-	  if (info->shared)
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0)
 	    {
 	      /* When creating a shared object, we must copy these
 		 reloc types into the output file.  We create a reloc
@@ -3252,6 +3248,13 @@ elf_m68k_adjust_dynamic_symbol (info, h)
   if (!h->non_got_ref)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -3269,7 +3272,7 @@ elf_m68k_adjust_dynamic_symbol (info, h)
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
@@ -4145,9 +4148,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index a58f7b39a0..b180dc4308 100644
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -1880,8 +1880,7 @@ create_got_section (bfd *dynobj, struct bfd_link_info *info)
   if (!htab->sgot || !htab->sgotplt)
     return FALSE;
 
-  if (!(htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got")))
-    htab->srelgot = bfd_make_section (dynobj, ".rela.got");
+  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
   if (htab->srelgot == NULL
       || ! bfd_set_section_flags (dynobj, htab->srelgot, SEC_ALLOC
                                   | SEC_LOAD
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 61e8b454ff..fd3d4bae95 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -830,111 +830,6 @@ static reloc_howto_type elf_mips16_howto_table_rel[] =
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS general dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_GD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GD",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_LDM,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_LDM",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_HI16",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_LO16",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_GOTTPREL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GOTTPREL",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_HI16", /* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_LO16", /* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
 };
 
 static reloc_howto_type elf_micromips_howto_table_rel[] =
@@ -1901,15 +1796,6 @@ static const struct elf_reloc_map mips16_reloc_map[] =
   { BFD_RELOC_MIPS16_CALL16, R_MIPS16_CALL16 - R_MIPS16_min },
   { BFD_RELOC_MIPS16_HI16_S, R_MIPS16_HI16 - R_MIPS16_min },
   { BFD_RELOC_MIPS16_LO16, R_MIPS16_LO16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_GD, R_MIPS16_TLS_GD - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_LDM, R_MIPS16_TLS_LDM - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_DTPREL_HI16,
-    R_MIPS16_TLS_DTPREL_HI16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_DTPREL_LO16,
-    R_MIPS16_TLS_DTPREL_LO16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_GOTTPREL, R_MIPS16_TLS_GOTTPREL - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_TPREL_HI16, R_MIPS16_TLS_TPREL_HI16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_TPREL_LO16, R_MIPS16_TLS_TPREL_LO16 - R_MIPS16_min }
 };
 
 static const struct elf_reloc_map micromips_reloc_map[] =
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 3125c090f4..0c25c3e4ad 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -1,6 +1,6 @@
 /* PowerPC-specific support for 32-bit ELF
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
@@ -1920,7 +1920,7 @@ ppc_elf_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type, ...)
 	va_list ap;
 
 	va_start (ap, note_type);
-	memset (data, 0, sizeof (data));
+	memset (data, 0, 32);
 	strncpy (data + 32, va_arg (ap, const char *), 16);
 	strncpy (data + 48, va_arg (ap, const char *), 80);
 	va_end (ap);
@@ -2987,6 +2987,10 @@ ppc_elf_copy_indirect_symbol (struct bfd_link_info *info,
   edir->elf.needs_plt |= eind->elf.needs_plt;
   edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
 
+  /* If we were called to copy over info for a weak sym, that's all.  */
+  if (eind->elf.root.type != bfd_link_hash_indirect)
+    return;
+
   if (eind->dyn_relocs != NULL)
     {
       if (edir->dyn_relocs != NULL)
@@ -3018,16 +3022,6 @@ ppc_elf_copy_indirect_symbol (struct bfd_link_info *info,
       eind->dyn_relocs = NULL;
     }
 
-  /* If we were called to copy over info for a weak sym, that's all.
-     You might think dyn_relocs need not be copied over;  After all,
-     both syms will be dynamic or both non-dynamic so we're just
-     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
-     code in ppc_elf_adjust_dynamic_symbol needs to check for
-     dyn_relocs in read-only sections, and it does so on what is the
-     DIR sym here.  */
-  if (eind->elf.root.type != bfd_link_hash_indirect)
-    return;
-
   /* Copy over the GOT refcount entries that we may have already seen to
      the symbol which just became indirect.  */
   edir->elf.got.refcount += eind->elf.got.refcount;
@@ -5045,6 +5039,13 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      info->callbacks->einfo (_("%P: dynamic variable `%s' is zero size\n"),
+			      h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -5068,7 +5069,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
@@ -8149,9 +8150,7 @@ ppc_elf_relocate_section (bfd *output_bfd,
 
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	{
 	  info->callbacks->einfo
 	    (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"),
@@ -9128,24 +9127,6 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd,
 
 #include "elf32-target.h"
 
-/* FreeBSD Target */
-
-#undef  TARGET_LITTLE_SYM
-#undef  TARGET_LITTLE_NAME
-
-#undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM  bfd_elf32_powerpc_freebsd_vec
-#undef  TARGET_BIG_NAME
-#define TARGET_BIG_NAME "elf32-powerpc-freebsd"
-
-#undef  ELF_OSABI
-#define ELF_OSABI	ELFOSABI_FREEBSD
-
-#undef  elf32_bed
-#define elf32_bed	elf32_powerpc_fbsd_bed
-
-#include "elf32-target.h"
-
 /* VxWorks Target */
 
 #undef TARGET_LITTLE_SYM
@@ -9156,8 +9137,6 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd,
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-powerpc-vxworks"
 
-#undef  ELF_OSABI
-
 /* VxWorks uses the elf default section flags for .plt.  */
 static const struct bfd_elf_special_section *
 ppc_elf_vxworks_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 23e9a74140..f049f6e339 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -32,7 +32,6 @@
    endian-swap we would otherwise get.  We check for this in
    rx_elf_object_p().  */
 const bfd_target bfd_elf32_rx_be_ns_vec;
-const bfd_target bfd_elf32_rx_be_vec;
 
 #ifdef DEBUG
 char * rx_get_reloc (long);
@@ -463,13 +462,6 @@ rx_elf_relocate_section
   struct elf_link_hash_entry ** sym_hashes;
   Elf_Internal_Rela *           rel;
   Elf_Internal_Rela *           relend;
-  bfd_boolean			pid_mode;
-  bfd_boolean			saw_subtract = FALSE;
-
-  if (elf_elfheader (output_bfd)->e_flags & E_FLAG_RX_PID)
-    pid_mode = TRUE;
-  else
-    pid_mode = FALSE;
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
@@ -496,9 +488,6 @@ rx_elf_relocate_section
       sec    = NULL;
       relocation = 0;
 
-      if (rx_stack_top == 0)
-	saw_subtract = FALSE;
-
       if (r_symndx < symtab_hdr->sh_info)
 	{
 	  sym = local_syms + r_symndx;
@@ -564,28 +553,6 @@ rx_elf_relocate_section
       _bfd_error_handler (_("%B:%A: Warning: deprecated Red Hat reloc " type " detected against: %s."), \
       input_bfd, input_section, name)
 
-      /* Check for unsafe relocs in PID mode.  These are any relocs where
-	 an absolute address is being computed.  There are special cases
-	 for relocs against symbols that are known to be referenced in
-	 crt0.o before the PID base address register has been initialised.  */
-#define UNSAFE_FOR_PID							\
-  do									\
-    {									\
-      if (pid_mode							\
-          && sec != NULL						\
-	  && sec->flags & SEC_READONLY					\
-	  && !(input_section->flags & SEC_DEBUGGING)			\
-	  && strcmp (name, "__pid_base") != 0				\
-	  && strcmp (name, "__gp") != 0					\
-	  && strcmp (name, "__romdatastart") != 0			\
-	  && !saw_subtract)						\
-	_bfd_error_handler (_("%B(%A): unsafe PID relocation %s at 0x%08lx (against %s in %s)"), \
-			    input_bfd, input_section, howto->name,	\
-			    input_section->output_section->vma + input_section->output_offset + rel->r_offset, \
-			    name, sec->name);				\
-    }									\
-  while (0)
-
       /* Opcode relocs are always big endian.  Data relocs are bi-endian.  */
       switch (r_type)
 	{
@@ -606,19 +573,16 @@ rx_elf_relocate_section
 	  WARN_REDHAT ("RX_RH_8_NEG");
 	  relocation = - relocation;
 	case R_RX_DIR8S_PCREL:
-	  UNSAFE_FOR_PID;
 	  RANGE (-128, 127);
 	  OP (0) = relocation;
 	  break;
 
 	case R_RX_DIR8S:
-	  UNSAFE_FOR_PID;
 	  RANGE (-128, 255);
 	  OP (0) = relocation;
 	  break;
 
 	case R_RX_DIR8U:
-	  UNSAFE_FOR_PID;
 	  RANGE (0, 255);
 	  OP (0) = relocation;
 	  break;
@@ -627,7 +591,6 @@ rx_elf_relocate_section
 	  WARN_REDHAT ("RX_RH_16_NEG");
 	  relocation = - relocation;
 	case R_RX_DIR16S_PCREL:
-	  UNSAFE_FOR_PID;
 	  RANGE (-32768, 32767);
 #if RX_OPCODE_BIG_ENDIAN
 #else
@@ -638,7 +601,6 @@ rx_elf_relocate_section
 
 	case R_RX_RH_16_OP:
 	  WARN_REDHAT ("RX_RH_16_OP");
-	  UNSAFE_FOR_PID;
 	  RANGE (-32768, 32767);
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (1) = relocation;
@@ -650,7 +612,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_DIR16S:
-	  UNSAFE_FOR_PID;
 	  RANGE (-32768, 65535);
 	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
 	    {
@@ -665,7 +626,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_DIR16U:
-	  UNSAFE_FOR_PID;
 	  RANGE (0, 65536);
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (1) = relocation;
@@ -677,7 +637,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_DIR16:
-	  UNSAFE_FOR_PID;
 	  RANGE (-32768, 65536);
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (1) = relocation;
@@ -689,7 +648,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_DIR16_REV:
-	  UNSAFE_FOR_PID;
 	  RANGE (-32768, 65536);
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (0) = relocation;
@@ -707,7 +665,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_RH_24_NEG:
-	  UNSAFE_FOR_PID;
 	  WARN_REDHAT ("RX_RH_24_NEG");
 	  relocation = - relocation;
 	case R_RX_DIR24S_PCREL:
@@ -724,7 +681,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_RH_24_OP:
-	  UNSAFE_FOR_PID;
 	  WARN_REDHAT ("RX_RH_24_OP");
 	  RANGE (-0x800000, 0x7fffff);
 #if RX_OPCODE_BIG_ENDIAN
@@ -739,7 +695,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_DIR24S:
-	  UNSAFE_FOR_PID;
 	  RANGE (-0x800000, 0x7fffff);
 	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
 	    {
@@ -756,7 +711,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_RH_24_UNS:
-	  UNSAFE_FOR_PID;
 	  WARN_REDHAT ("RX_RH_24_UNS");
 	  RANGE (0, 0xffffff);
 #if RX_OPCODE_BIG_ENDIAN
@@ -771,7 +725,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_RH_32_NEG:
-	  UNSAFE_FOR_PID;
 	  WARN_REDHAT ("RX_RH_32_NEG");
 	  relocation = - relocation;
 #if RX_OPCODE_BIG_ENDIAN
@@ -788,7 +741,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_RH_32_OP:
-	  UNSAFE_FOR_PID;
 	  WARN_REDHAT ("RX_RH_32_OP");
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (3) = relocation;
@@ -968,7 +920,6 @@ rx_elf_relocate_section
 	  /* Complex reloc handling:  */
 
 	case R_RX_ABS32:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (3) = relocation;
@@ -984,7 +935,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS32_REV:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 #if RX_OPCODE_BIG_ENDIAN
 	  OP (0) = relocation;
@@ -1001,7 +951,6 @@ rx_elf_relocate_section
 
 	case R_RX_ABS24S_PCREL:
 	case R_RX_ABS24S:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  RANGE (-0x800000, 0x7fffff);
 	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
@@ -1019,7 +968,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS16:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  RANGE (-32768, 65535);
 #if RX_OPCODE_BIG_ENDIAN
@@ -1032,7 +980,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS16_REV:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  RANGE (-32768, 65535);
 #if RX_OPCODE_BIG_ENDIAN
@@ -1061,7 +1008,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS16U:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  RANGE (0, 65536);
 #if RX_OPCODE_BIG_ENDIAN
@@ -1074,7 +1020,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS16UL:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  relocation >>= 2;
 	  RANGE (0, 65536);
@@ -1088,7 +1033,6 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS16UW:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  relocation >>= 1;
 	  RANGE (0, 65536);
@@ -1102,21 +1046,18 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS8:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  RANGE (-128, 255);
 	  OP (0) = relocation;
 	  break;
 
 	case R_RX_ABS8U:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  RANGE (0, 255);
 	  OP (0) = relocation;
 	  break;
 
 	case R_RX_ABS8UL:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  relocation >>= 2;
 	  RANGE (0, 255);
@@ -1124,16 +1065,14 @@ rx_elf_relocate_section
 	  break;
 
 	case R_RX_ABS8UW:
-	  UNSAFE_FOR_PID;
 	  RX_STACK_POP (relocation);
 	  relocation >>= 1;
 	  RANGE (0, 255);
 	  OP (0) = relocation;
 	  break;
 
-	case R_RX_ABS8S:
-	  UNSAFE_FOR_PID;
 	case R_RX_ABS8S_PCREL:
+	case R_RX_ABS8S:
 	  RX_STACK_POP (relocation);
 	  RANGE (-128, 127);
 	  OP (0) = relocation;
@@ -1143,8 +1082,7 @@ rx_elf_relocate_section
 	  if (r_symndx < symtab_hdr->sh_info)
 	    RX_STACK_PUSH (sec->output_section->vma
 			   + sec->output_offset
-			   + sym->st_value
-			   + rel->r_addend);
+			   + sym->st_value);
 	  else
 	    {
 	      if (h != NULL
@@ -1152,8 +1090,7 @@ rx_elf_relocate_section
 		      || h->root.type == bfd_link_hash_defweak))
 		RX_STACK_PUSH (h->root.u.def.value
 			       + sec->output_section->vma
-			       + sec->output_offset
-			       + rel->r_addend);
+			       + sec->output_offset);
 	      else
 		_bfd_error_handler (_("Warning: RX_SYM reloc with an unknown symbol"));
 	    }
@@ -1184,7 +1121,6 @@ rx_elf_relocate_section
 	  {
 	    int32_t tmp1, tmp2;
 
-	    saw_subtract = TRUE;
 	    RX_STACK_POP (tmp1);
 	    RX_STACK_POP (tmp2);
 	    tmp2 -= tmp1;
@@ -1207,7 +1143,6 @@ rx_elf_relocate_section
 	  {
 	    int32_t tmp1, tmp2;
 
-	    saw_subtract = TRUE;
 	    RX_STACK_POP (tmp1);
 	    RX_STACK_POP (tmp2);
 	    tmp1 /= tmp2;
@@ -2115,7 +2050,7 @@ elf32_rx_relax_section (bfd *                  abfd,
 		   /* Decodable bits.  */
 		   && (insn[0] & 0xcc) == 0xcc
 		   /* Width.  */
-		   && (insn[0] & 0x30) != 0x30
+		   && (insn[0] & 0x30) != 3
 		   /* Register MSBs.  */
 		   && (insn[1] & 0x88)  == 0x00)
 	    {
@@ -2219,7 +2154,7 @@ elf32_rx_relax_section (bfd *                  abfd,
 		   /* Decodable bits.  */
 		   && (insn[0] & 0xc3) == 0xc3
 		   /* Width.  */
-		   && (insn[0] & 0x30) != 0x30
+		   && (insn[0] & 0x30) != 3
 		   /* Register MSBs.  */
 		   && (insn[1] & 0x88)  == 0x00)
 	    {
@@ -2958,7 +2893,7 @@ rx_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
     }
   else if (old_flags != new_flags)
     {
-      flagword known_flags = E_FLAG_RX_64BIT_DOUBLES | E_FLAG_RX_DSP | E_FLAG_RX_PID;
+      flagword known_flags = E_FLAG_RX_64BIT_DOUBLES | E_FLAG_RX_DSP;
 
       if ((old_flags ^ new_flags) & known_flags)
 	{
@@ -3029,7 +2964,6 @@ rx_elf_object_p (bfd * abfd)
   Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;
   int nphdrs = elf_elfheader (abfd)->e_phnum;
   sec_ptr bsec;
-  static int saw_be = FALSE;
 
   /* We never want to automatically choose the non-swapping big-endian
      target.  The user can only get that explicitly, such as with -I
@@ -3038,15 +2972,6 @@ rx_elf_object_p (bfd * abfd)
       && abfd->target_defaulted)
     return FALSE;
 
-  /* BFD->target_defaulted is not set to TRUE when a target is chosen
-     as a fallback, so we check for "scanning" to know when to stop
-     using the non-swapping target.  */
-  if (abfd->xvec == &bfd_elf32_rx_be_ns_vec
-      && saw_be)
-    return FALSE;
-  if (abfd->xvec == &bfd_elf32_rx_be_vec)
-    saw_be = TRUE;
-
   bfd_default_set_arch_mach (abfd, bfd_arch_rx,
 			     elf32_rx_machine (abfd));
 
@@ -3084,7 +3009,7 @@ rx_elf_object_p (bfd * abfd)
       bsec = abfd->sections;
       while (bsec)
 	{
-	  if (phdr[i].p_vaddr <= bsec->vma
+	  if (phdr[i].p_vaddr <= bsec->lma
 	      && bsec->vma <= phdr[i].p_vaddr + (phdr[i].p_filesz - 1))
 	    {
 	      bsec->lma = phdr[i].p_paddr + (bsec->vma - phdr[i].p_vaddr);
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index fcced0f922..98437d0df9 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -1,6 +1,6 @@
 /* IBM S/390-specific support for 32-bit ELF
    Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2011, 2012 Free Software Foundation, Inc.
+   2011 Free Software Foundation, Inc.
    Contributed by Carl B. Pedersen and Martin Schwidefsky.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -1647,6 +1647,13 @@ elf_s390_adjust_dynamic_symbol (info, h)
 	}
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -1662,7 +1669,7 @@ elf_s390_adjust_dynamic_symbol (info, h)
   /* We must generate a R_390_COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the
      runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += sizeof (Elf32_External_Rela);
       h->needs_copy = 1;
@@ -2855,7 +2862,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	  continue;
 
 	case R_390_TLS_LDO32:
-	  if (info->shared || (input_section->flags & SEC_DEBUGGING))
+	  if (info->shared)
 	    relocation -= dtpoff_base (info);
 	  else
 	    /* When converting LDO to LE, we must negate.  */
@@ -2912,18 +2919,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
 	      insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
 	      if ((insn & 0xff000fff) != 0x4d000000 &&
-		  (insn & 0xffff0000) != 0xc0e50000 &&
-		  (insn & 0xff000000) != 0x0d000000)
+		  (insn & 0xffff0000) != 0xc0e50000)
 		invalid_tls_insn (input_bfd, input_section, rel);
 	      if (!info->shared && (h == NULL || h->dynindx == -1))
 		{
-		  if ((insn & 0xff000000) == 0x0d000000)
-		    {
-		      /* GD->LE transition.
-			 basr rx, ry -> nopr r7 */
-		      insn = 0x07070000 | (insn & 0xffff);
-		    }
-		  else if ((insn & 0xff000000) == 0x4d000000)
+		  if ((insn & 0xff000000) == 0x4d000000)
 		    {
 		      /* GD->LE transition.
 			 bas %r14,0(%rx,%r13) -> bc 0,0  */
@@ -2932,7 +2932,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		  else
 		    {
 		      /* GD->LE transition.
-			 brasl %r14,_tls_get_offset@plt -> brcl 0,.  */
+			 brasl %r14,_tls_get_addr@plt -> brcl 0,.  */
 		      insn = 0xc0040000;
 		      bfd_put_16 (output_bfd, 0x0000,
 				  contents + rel->r_offset + 4);
@@ -2940,11 +2940,6 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		}
 	      else
 		{
-		  /* If basr is used in the pic case to invoke
-		     _tls_get_offset, something went wrong before.  */
-		  if ((insn & 0xff000000) == 0x0d000000)
-		    invalid_tls_insn (input_bfd, input_section, rel);
-
 		  if ((insn & 0xff000000) == 0x4d000000)
 		    {
 		      /* GD->IE transition.
@@ -2971,17 +2966,9 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
 		  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
 		  if ((insn & 0xff000fff) != 0x4d000000 &&
-		      (insn & 0xffff0000) != 0xc0e50000 &&
-		      (insn & 0xff000000) != 0x0d000000)
+		      (insn & 0xffff0000) != 0xc0e50000)
 		    invalid_tls_insn (input_bfd, input_section, rel);
-
-		  if ((insn & 0xff000000) == 0x0d000000)
-		    {
-		      /* LD->LE transition.
-			 basr rx, ry -> nopr r7 */
-		      insn = 0x07070000 | (insn & 0xffff);
-		    }
-		  else if ((insn & 0xff000000) == 0x4d000000)
+		  if ((insn & 0xff000000) == 0x4d000000)
 		    {
 		      /* LD->LE transition.
 			 bas %r14,0(%rx,%r13) -> bc 0,0  */
@@ -2990,7 +2977,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 		  else
 		    {
 		      /* LD->LE transition.
-			 brasl %r14,__tls_get_offset@plt -> brcl 0,. */
+			 brasl %r14,__tls_get_addr@plt -> brcl 0,. */
 		      insn = 0xc0040000;
 		      bfd_put_16 (output_bfd, 0x0000,
 				  contents + rel->r_offset + 4);
@@ -3009,9 +2996,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	(*_bfd_error_handler)
 	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 9bc2dd5a79..ca2c4af905 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -1,7 +1,6 @@
 /* Renesas / SuperH SH specific support for 32-bit ELF
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor, Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -2927,6 +2926,13 @@ sh_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2944,7 +2950,7 @@ sh_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
@@ -3782,10 +3788,8 @@ sh_elf_got_offset (struct elf_sh_link_hash_table *htab)
 static unsigned
 sh_elf_osec_to_segment (bfd *output_bfd, asection *osec)
 {
-  Elf_Internal_Phdr *p = NULL;
-
-  if (output_bfd->xvec->flavour == bfd_target_elf_flavour)
-    p = _bfd_elf_find_segment_containing_section (output_bfd, osec);
+  Elf_Internal_Phdr *p = _bfd_elf_find_segment_containing_section (output_bfd,
+								   osec);
 
   /* FIXME: Nothing ever says what this index is relative to.  The kernel
      supplies data in terms of the number of load segments but this is
@@ -3798,8 +3802,7 @@ sh_elf_osec_readonly_p (bfd *output_bfd, asection *osec)
 {
   unsigned seg = sh_elf_osec_to_segment (output_bfd, osec);
 
-  return (seg != (unsigned) -1
-	  && ! (elf_tdata (output_bfd)->phdr[seg].p_flags & PF_W));
+  return ! (elf_tdata (output_bfd)->phdr[seg].p_flags & PF_W);
 }
 
 /* Generate the initial contents of a local function descriptor, along
@@ -4205,11 +4208,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 				 STT_DATALABEL on the way to it.  */
 			      | ((h->other & STO_SH5_ISA32) != 0
 				 && ! seen_stt_datalabel));
-	      else if (!info->relocatable
-		       && (_bfd_elf_section_offset (output_bfd, info,
-						    input_section,
-						    rel->r_offset)
-			   != (bfd_vma) -1))
+	      else if (!info->relocatable)
 		{
 		  (*_bfd_error_handler)
 		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index ab13b7bb4d..ae3ed10c4e 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -1,7 +1,6 @@
 /* SPU specific support for 32-bit ELF
 
-   Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -1426,7 +1425,7 @@ build_stub (struct bfd_link_info *info,
 	add = (int) irela->r_addend & 0xffffffff;
       if (add != 0)
 	len += 1 + 8;
-      name = bfd_malloc (len + 1);
+      name = bfd_malloc (len);
       if (name == NULL)
 	return FALSE;
 
@@ -5001,9 +5000,7 @@ spu_elf_relocate_section (bfd *output_bfd,
       else if (is_ea_sym)
 	unresolved_reloc = TRUE;
 
-      if (unresolved_reloc
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+      if (unresolved_reloc)
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"),
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 8abfdd0271..19287fec18 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -1,5 +1,5 @@
 /* 32-bit ELF support for TI C6X
-   Copyright 2010, 2011, 2012
+   Copyright 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Joseph Myers <joseph@codesourcery.com>
    		  Bernd Schmidt  <bernds@codesourcery.com>
@@ -2157,6 +2157,13 @@ elf32_tic6x_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (htab == NULL)
     return FALSE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2170,7 +2177,7 @@ elf32_tic6x_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* We must generate a R_C6000_COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the
      runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += sizeof (Elf32_External_Rela);
       h->needs_copy = 1;
@@ -4011,9 +4018,6 @@ elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
   if (!_bfd_generic_verify_endian_match (ibfd, obfd))
     return FALSE;
 
-  if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (obfd))
-    return TRUE;
-
   if (!elf32_tic6x_merge_attributes (ibfd, obfd))
     return FALSE;
 
diff --git a/bfd/elf32-tilegx.c b/bfd/elf32-tilegx.c
index 1b4884b171..902e9baec1 100644
--- a/bfd/elf32-tilegx.c
+++ b/bfd/elf32-tilegx.c
@@ -87,10 +87,8 @@ tilegx_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 #define ELF_MAXPAGESIZE		0x10000
 #define ELF_COMMONPAGESIZE	0x10000
 
-#define TARGET_BIG_SYM          bfd_elf32_tilegx_be_vec
-#define TARGET_BIG_NAME         "elf32-tilegx-be"
-#define TARGET_LITTLE_SYM       bfd_elf32_tilegx_le_vec
-#define TARGET_LITTLE_NAME      "elf32-tilegx-le"
+#define TARGET_LITTLE_SYM       bfd_elf32_tilegx_vec
+#define TARGET_LITTLE_NAME	"elf32-tilegx"
 
 #define elf_backend_reloc_type_class	     tilegx_reloc_type_class
 
diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index a907342ec8..f2aed9cf1e 100644
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -1,5 +1,5 @@
 /* TILEPro-specific support for 32-bit ELF.
-   Copyright 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2011 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -380,26 +380,12 @@ static reloc_howto_type tilepro_elf_howto_table [] =
   EMPTY_HOWTO (57),
   EMPTY_HOWTO (58),
   EMPTY_HOWTO (59),
-
-  HOWTO (R_TILEPRO_TLS_GD_CALL, /* type */
-	 TILEPRO_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 29,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_TILEPRO_TLS_GD_CALL", /* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 -1,			/* dst_mask */
-	 TRUE), 		/* pcrel_offset */
-
-  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_X0_TLS_GD_ADD,  0,  8),
-  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_X1_TLS_GD_ADD,  0,  8),
-  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_Y0_TLS_GD_ADD,  0,  8),
-  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_Y1_TLS_GD_ADD,  0,  8),
-  TILEPRO_IMM_HOWTO(R_TILEPRO_TLS_IE_LOAD,  0,  8),
+  EMPTY_HOWTO (60),
+  EMPTY_HOWTO (61),
+  EMPTY_HOWTO (62),
+  EMPTY_HOWTO (63),
+  EMPTY_HOWTO (64),
+  EMPTY_HOWTO (65),
 
   /* Offsets into the GOT of TLS Descriptors. */
 
@@ -468,12 +454,17 @@ static reloc_howto_type tilepro_elf_howto_table [] =
 	 -1,			/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_IE_LO,  0),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_IE_LO,  0),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_IE_HI, 16),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_IE_HI, 16),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_IE_HA, 16),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_IE_HA, 16),
+#define TILEPRO_IMM16_HOWTO_TLS_IE(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X0_TLS_IE_LO,  0),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X1_TLS_IE_LO,  0),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X0_TLS_IE_HI, 16),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X1_TLS_IE_HI, 16),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X0_TLS_IE_HA, 16),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X1_TLS_IE_HA, 16),
 
   /* These are common with the Solaris TLS implementation. */
   HOWTO(R_TILEPRO_TLS_DTPMOD32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
@@ -484,42 +475,8 @@ static reloc_howto_type tilepro_elf_howto_table [] =
         FALSE, 0, 0xFFFFFFFF, TRUE),
   HOWTO(R_TILEPRO_TLS_TPOFF32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
         bfd_elf_generic_reloc, "R_TILEPRO_TLS_TPOFF32",
-        FALSE, 0, 0, TRUE),
-
-  HOWTO (R_TILEPRO_IMM16_X0_TLS_LE,/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_TILEPRO_IMM16_X0_TLS_LE",/* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 -1,			/* dst_mask */
-	 TRUE),			/* pcrel_offset */
+        FALSE, 0, 0, TRUE)
 
-  HOWTO (R_TILEPRO_IMM16_X1_TLS_LE,/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_TILEPRO_IMM16_X1_TLS_LE",/* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 -1,			/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_LE_LO,  0),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_LE_LO,  0),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_LE_HI, 16),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_LE_HI, 16),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_LE_HA, 16),
-  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_LE_HA, 16),
 };
 
 static reloc_howto_type tilepro_elf_howto_table2 [] =
@@ -633,13 +590,6 @@ static const reloc_map tilepro_reloc_map [] =
   TH_REMAP (BFD_RELOC_TILEPRO_SHAMT_Y0,    R_TILEPRO_SHAMT_Y0)
   TH_REMAP (BFD_RELOC_TILEPRO_SHAMT_Y1,    R_TILEPRO_SHAMT_Y1)
 
-  TH_REMAP (BFD_RELOC_TILEPRO_TLS_GD_CALL,        R_TILEPRO_TLS_GD_CALL)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD, R_TILEPRO_IMM8_X0_TLS_GD_ADD)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD, R_TILEPRO_IMM8_X1_TLS_GD_ADD)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD, R_TILEPRO_IMM8_Y0_TLS_GD_ADD)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD, R_TILEPRO_IMM8_Y1_TLS_GD_ADD)
-  TH_REMAP (BFD_RELOC_TILEPRO_TLS_IE_LOAD,        R_TILEPRO_TLS_IE_LOAD)
-
   TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD,    R_TILEPRO_IMM16_X0_TLS_GD)
   TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD,    R_TILEPRO_IMM16_X1_TLS_GD)
   TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO, R_TILEPRO_IMM16_X0_TLS_GD_LO)
@@ -662,15 +612,6 @@ static const reloc_map tilepro_reloc_map [] =
   TH_REMAP (BFD_RELOC_TILEPRO_TLS_DTPOFF32, R_TILEPRO_TLS_DTPOFF32)
   TH_REMAP (BFD_RELOC_TILEPRO_TLS_TPOFF32,  R_TILEPRO_TLS_TPOFF32)
 
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE,    R_TILEPRO_IMM16_X0_TLS_LE)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE,    R_TILEPRO_IMM16_X1_TLS_LE)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_LO, R_TILEPRO_IMM16_X0_TLS_LE_LO)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_LO, R_TILEPRO_IMM16_X1_TLS_LE_LO)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HI, R_TILEPRO_IMM16_X0_TLS_LE_HI)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HI, R_TILEPRO_IMM16_X1_TLS_LE_HI)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HA, R_TILEPRO_IMM16_X0_TLS_LE_HA)
-  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HA, R_TILEPRO_IMM16_X1_TLS_LE_HA)
-
 #undef TH_REMAP
 
   { BFD_RELOC_VTABLE_INHERIT, R_TILEPRO_GNU_VTINHERIT, tilepro_elf_howto_table2 },
@@ -804,7 +745,7 @@ tilepro_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
 {
   unsigned int r_type = ELF32_R_TYPE (dst->r_info);
 
-  if (r_type <= (unsigned int) R_TILEPRO_IMM16_X1_TLS_LE_HA)
+  if (r_type <= (unsigned int) R_TILEPRO_TLS_TPOFF32)
     cache_ptr->howto = &tilepro_elf_howto_table [r_type];
   else if (r_type - R_TILEPRO_GNU_VTINHERIT
 	   <= (unsigned int) R_TILEPRO_GNU_VTENTRY)
@@ -904,20 +845,7 @@ static const tilepro_create_func reloc_to_create_func[] =
   create_Imm16_X0,
   create_Imm16_X1,
   create_Imm16_X0,
-  create_Imm16_X1,
-
-  NULL,
-  NULL,
-  NULL,
-
-  create_Imm16_X0,
-  create_Imm16_X1,
-  create_Imm16_X0,
-  create_Imm16_X1,
-  create_Imm16_X0,
-  create_Imm16_X1,
-  create_Imm16_X0,
-  create_Imm16_X1,
+  create_Imm16_X1
 };
 
 #define NELEMS(a)	((int) (sizeof (a) / sizeof ((a)[0])))
@@ -1360,99 +1288,6 @@ tilepro_elf_copy_indirect_symbol (struct bfd_link_info *info,
   _bfd_elf_link_hash_copy_indirect (info, dir, ind);
 }
 
-static int
-tilepro_tls_translate_to_le (int r_type)
-{
-  switch (r_type)
-    {
-    case R_TILEPRO_IMM16_X0_TLS_GD:
-    case R_TILEPRO_IMM16_X0_TLS_IE:
-      return R_TILEPRO_IMM16_X0_TLS_LE;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD:
-    case R_TILEPRO_IMM16_X1_TLS_IE:
-      return R_TILEPRO_IMM16_X1_TLS_LE;
-
-    case R_TILEPRO_IMM16_X0_TLS_GD_LO:
-    case R_TILEPRO_IMM16_X0_TLS_IE_LO:
-      return R_TILEPRO_IMM16_X0_TLS_LE_LO;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD_LO:
-    case R_TILEPRO_IMM16_X1_TLS_IE_LO:
-      return R_TILEPRO_IMM16_X1_TLS_LE_LO;
-
-    case R_TILEPRO_IMM16_X0_TLS_GD_HI:
-    case R_TILEPRO_IMM16_X0_TLS_IE_HI:
-      return R_TILEPRO_IMM16_X0_TLS_LE_HI;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD_HI:
-    case R_TILEPRO_IMM16_X1_TLS_IE_HI:
-      return R_TILEPRO_IMM16_X1_TLS_LE_HI;
-
-    case R_TILEPRO_IMM16_X0_TLS_GD_HA:
-    case R_TILEPRO_IMM16_X0_TLS_IE_HA:
-      return R_TILEPRO_IMM16_X0_TLS_LE_HA;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD_HA:
-    case R_TILEPRO_IMM16_X1_TLS_IE_HA:
-      return R_TILEPRO_IMM16_X1_TLS_LE_HA;
-    }
-  return r_type;
-}
-
-static int
-tilepro_tls_translate_to_ie (int r_type)
-{
-  switch (r_type)
-    {
-    case R_TILEPRO_IMM16_X0_TLS_GD:
-    case R_TILEPRO_IMM16_X0_TLS_IE:
-      return R_TILEPRO_IMM16_X0_TLS_IE;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD:
-    case R_TILEPRO_IMM16_X1_TLS_IE:
-      return R_TILEPRO_IMM16_X1_TLS_IE;
-
-    case R_TILEPRO_IMM16_X0_TLS_GD_LO:
-    case R_TILEPRO_IMM16_X0_TLS_IE_LO:
-      return R_TILEPRO_IMM16_X0_TLS_IE_LO;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD_LO:
-    case R_TILEPRO_IMM16_X1_TLS_IE_LO:
-      return R_TILEPRO_IMM16_X1_TLS_IE_LO;
-
-    case R_TILEPRO_IMM16_X0_TLS_GD_HI:
-    case R_TILEPRO_IMM16_X0_TLS_IE_HI:
-      return R_TILEPRO_IMM16_X0_TLS_IE_HI;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD_HI:
-    case R_TILEPRO_IMM16_X1_TLS_IE_HI:
-      return R_TILEPRO_IMM16_X1_TLS_IE_HI;
-
-    case R_TILEPRO_IMM16_X0_TLS_GD_HA:
-    case R_TILEPRO_IMM16_X0_TLS_IE_HA:
-      return R_TILEPRO_IMM16_X0_TLS_IE_HA;
-
-    case R_TILEPRO_IMM16_X1_TLS_GD_HA:
-    case R_TILEPRO_IMM16_X1_TLS_IE_HA:
-      return R_TILEPRO_IMM16_X1_TLS_IE_HA;
-    }
-  return r_type;
-}
-
-static int
-tilepro_elf_tls_transition (struct bfd_link_info *info, int r_type,
-			    int is_local)
-{
-  if (info->shared)
-    return r_type;
-
-  if (is_local)
-    return tilepro_tls_translate_to_le (r_type);
-  else
-    return tilepro_tls_translate_to_ie (r_type);
-}
-
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
@@ -1513,21 +1348,8 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
 	}
 
-      r_type = tilepro_elf_tls_transition (info, r_type, h == NULL);
       switch (r_type)
 	{
-        case R_TILEPRO_IMM16_X0_TLS_LE:
-        case R_TILEPRO_IMM16_X1_TLS_LE:
-        case R_TILEPRO_IMM16_X0_TLS_LE_LO:
-        case R_TILEPRO_IMM16_X1_TLS_LE_LO:
-        case R_TILEPRO_IMM16_X0_TLS_LE_HI:
-        case R_TILEPRO_IMM16_X1_TLS_LE_HI:
-        case R_TILEPRO_IMM16_X0_TLS_LE_HA:
-        case R_TILEPRO_IMM16_X1_TLS_LE_HA:
-	  if (info->shared)
-	    goto r_tilepro_plt32;
-	  break;
-
         case R_TILEPRO_IMM16_X0_TLS_GD:
         case R_TILEPRO_IMM16_X1_TLS_GD:
         case R_TILEPRO_IMM16_X0_TLS_GD_LO:
@@ -1536,8 +1358,7 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
         case R_TILEPRO_IMM16_X1_TLS_GD_HI:
         case R_TILEPRO_IMM16_X0_TLS_GD_HA:
         case R_TILEPRO_IMM16_X1_TLS_GD_HA:
-	  BFD_ASSERT (info->shared);
-	  tls_type = GOT_TLS_GD;
+          tls_type = GOT_TLS_GD;
           goto have_got_reference;
 
         case R_TILEPRO_IMM16_X0_TLS_IE:
@@ -1633,24 +1454,6 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	    }
 	  break;
 
-	case R_TILEPRO_TLS_GD_CALL:
-	  if (info->shared)
-	    {
-	      /* These are basically R_TILEPRO_JOFFLONG_X1_PLT relocs
-		 against __tls_get_addr.  */
-	      struct bfd_link_hash_entry *bh = NULL;
-	      if (! _bfd_generic_link_add_one_symbol (info, abfd,
-						      "__tls_get_addr", 0,
-						      bfd_und_section_ptr, 0,
-						      NULL, FALSE, FALSE,
-						      &bh))
-		return FALSE;
-	      h = (struct elf_link_hash_entry *) bh;
-	    }
-	  else
-	    break;
-	  /* Fall through */
-
         case R_TILEPRO_JOFFLONG_X1_PLT:
 	  /* This symbol requires a procedure linkage table entry.  We
 	     actually build the entry in adjust_dynamic_symbol,
@@ -1720,14 +1523,15 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
         case R_TILEPRO_SHAMT_Y0:
         case R_TILEPRO_SHAMT_Y1:
 	  if (h != NULL)
+            {
               h->non_got_ref = 1;
 
-	r_tilepro_plt32:
-	  if (h != NULL && !info->shared)
-	    {
-	      /* We may need a .plt entry if the function this reloc
-		 refers to is in a shared lib.  */
-	      h->plt.refcount += 1;
+              if (!info->shared)
+                {
+                  /* We may need a .plt entry if the function this reloc
+                     refers to is in a shared lib.  */
+                  h->plt.refcount += 1;
+                }
             }
 
 	  /* If we are creating a shared library, and this is a reloc
@@ -1921,7 +1725,6 @@ tilepro_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
 	}
 
       r_type = ELF32_R_TYPE (rel->r_info);
-      r_type = tilepro_elf_tls_transition (info, r_type, h != NULL);
       switch (r_type)
 	{
         case R_TILEPRO_IMM16_X0_GOT:
@@ -1955,8 +1758,7 @@ tilepro_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
 	    }
 	  else
 	    {
-	      if (local_got_refcounts &&
-		  local_got_refcounts[r_symndx] > 0)
+	      if (local_got_refcounts[r_symndx] > 0)
 		local_got_refcounts[r_symndx]--;
 	    }
 	  break;
@@ -2133,6 +1935,13 @@ tilepro_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2147,7 +1956,7 @@ tilepro_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      to copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += TILEPRO_ELF_RELA_BYTES;
       h->needs_copy = 1;
@@ -2231,14 +2040,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
       h->needs_plt = 0;
     }
 
-  /* If a TLS_IE symbol is now local to the binary, make it a TLS_LE
-     requiring no TLS entry.  */
-  if (h->got.refcount > 0
-      && !info->shared
-      && h->dynindx == -1
-      && tilepro_elf_hash_entry(h)->tls_type == GOT_TLS_IE)
-    h->got.offset = (bfd_vma) -1;
-  else if (h->got.refcount > 0)
+  if (h->got.refcount > 0)
     {
       asection *s;
       bfd_boolean dyn;
@@ -2665,87 +2467,6 @@ tpoff (struct bfd_link_info *info, bfd_vma address)
   return (address - htab->tls_sec->vma);
 }
 
-/* Replace the MASK bits in ADDR with those in INSN, for the next
-   TILEPRO_BUNDLE_SIZE_IN_BYTES bytes.  */
-
-static void
-tilepro_replace_insn (bfd_byte *addr, const bfd_byte *mask,
-		      const bfd_byte *insn)
-{
-  int i;
-  for (i = 0; i < TILEPRO_BUNDLE_SIZE_IN_BYTES; i++)
-    {
-      addr[i] = (addr[i] & ~mask[i]) | (insn[i] & mask[i]);
-    }
-}
-
-/* Mask to extract the bits corresponding to an instruction in a
-   specific pipe of a bundle.  */
-static const bfd_byte insn_mask_X1[] = {
-  0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x7f
-};
-
-/* Mask to extract the bits corresponding to an instruction in a
-   specific pipe of a bundle, minus the destination operand and the
-   first source operand.  */
-static const bfd_byte insn_mask_X0_no_dest_no_srca[] = {
-  0x00, 0xf0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00
-};
-
-static const bfd_byte insn_mask_X1_no_dest_no_srca[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x7f
-};
-
-static const bfd_byte insn_mask_Y0_no_dest_no_srca[] = {
-  0x00, 0xf0, 0x0f, 0x78, 0x00, 0x00, 0x00, 0x00
-};
-
-static const bfd_byte insn_mask_Y1_no_dest_no_srca[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x78
-};
-
-/* Mask to extract the first source operand of an instruction.  */
-static const bfd_byte srca_mask_X0[] = {
-  0xc0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const bfd_byte srca_mask_X1[] = {
-  0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00
-};
-
-/* Various instructions synthesized to support tls references.  */
-
-/* move r0, r0 in the X1 pipe, used for tls le.  */
-static const bfd_byte insn_tls_le_move_X1[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x33, 0x08
-};
-
-/* move r0, zero in the X0 and X1 pipe, used for tls le.  */
-static const bfd_byte insn_tls_le_move_zero_X0X1[] = {
-  0xc0, 0xff, 0xcf, 0x00, 0xe0, 0xff, 0x33, 0x08
-};
-
-/* lw r0, r0 in the X1 pipe, used for tls ie.  */
-static const bfd_byte insn_tls_ie_lw_X1[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0b, 0x40
-};
-
-/* add r0, r0, tp in various pipes, used for tls ie.  */
-static const bfd_byte insn_tls_ie_add_X0X1[] = {
-  0x00, 0x50, 0x0f, 0x00, 0x00, 0xa8, 0x07, 0x08
-};
-static const bfd_byte insn_tls_ie_add_Y0Y1[] = {
-  0x00, 0x50, 0x03, 0x08, 0x00, 0xa8, 0x01, 0x8c
-};
-
-/* move r0, r0 in various pipes, used for tls gd.  */
-static const bfd_byte insn_tls_gd_add_X0X1[] = {
-  0x00, 0xf0, 0xcf, 0x00, 0x00, 0xf8, 0x33, 0x08
-};
-static const bfd_byte insn_tls_gd_add_Y0Y1[] = {
-  0x00, 0xf0, 0x0b, 0x18, 0x00, 0xf8, 0x05, 0x9c
-};
-
 /* Relocate an TILEPRO ELF section.
 
    The RELOCATE_SECTION function is called by the new ELF backend linker
@@ -2810,7 +2531,6 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   for (; rel < relend; rel++)
     {
       int r_type, tls_type;
-      bfd_boolean is_tls_iele, is_tls_le;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
@@ -2893,118 +2613,6 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 
       switch (r_type)
 	{
-	case R_TILEPRO_TLS_GD_CALL:
-	case R_TILEPRO_IMM8_X0_TLS_GD_ADD:
-	case R_TILEPRO_IMM8_Y0_TLS_GD_ADD:
-	case R_TILEPRO_IMM8_X1_TLS_GD_ADD:
-	case R_TILEPRO_IMM8_Y1_TLS_GD_ADD:
-	case R_TILEPRO_IMM16_X0_TLS_GD_HA:
-	case R_TILEPRO_IMM16_X1_TLS_GD_HA:
-	case R_TILEPRO_IMM16_X0_TLS_IE_HA:
-	case R_TILEPRO_IMM16_X1_TLS_IE_HA:
-	  tls_type = GOT_UNKNOWN;
-	  if (h == NULL && local_got_offsets)
-	    tls_type =
-	      _bfd_tilepro_elf_local_got_tls_type (input_bfd) [r_symndx];
-	  else if (h != NULL)
-	    tls_type = tilepro_elf_hash_entry(h)->tls_type;
-
-	  is_tls_iele = (! info->shared || tls_type == GOT_TLS_IE);
-	  is_tls_le = is_tls_iele && (!info->shared
-				      && (h == NULL || h->dynindx == -1));
-
-	  if (r_type == R_TILEPRO_TLS_GD_CALL)
-	    {
-	      if (is_tls_le)
-		{
-		  /* GD -> LE */
-		  tilepro_replace_insn (contents + rel->r_offset,
-					insn_mask_X1, insn_tls_le_move_X1);
-		  continue;
-		}
-	      else if (is_tls_iele)
-		{
-		  /* GD -> IE */
-		  tilepro_replace_insn (contents + rel->r_offset,
-					insn_mask_X1, insn_tls_ie_lw_X1);
-		  continue;
-		}
-
-	      /* GD -> GD */
-	      h = (struct elf_link_hash_entry *)
-		bfd_link_hash_lookup (info->hash, "__tls_get_addr", FALSE,
-				      FALSE, TRUE);
-	      BFD_ASSERT (h != NULL);
-	      r_type = R_TILEPRO_JOFFLONG_X1_PLT;
-	      howto = tilepro_elf_howto_table + r_type;
-	    }
-	  else if (r_type == R_TILEPRO_IMM16_X0_TLS_GD_HA
-		   || r_type == R_TILEPRO_IMM16_X0_TLS_IE_HA)
-	    {
-	      if (is_tls_le)
-		tilepro_replace_insn (contents + rel->r_offset, srca_mask_X0,
-				      insn_tls_le_move_zero_X0X1);
-	    }
-	  else if (r_type == R_TILEPRO_IMM16_X1_TLS_GD_HA
-		   || r_type == R_TILEPRO_IMM16_X1_TLS_IE_HA)
-	    {
-	      if (is_tls_le)
-		tilepro_replace_insn (contents + rel->r_offset, srca_mask_X1,
-				      insn_tls_le_move_zero_X0X1);
-	    }
-	  else
-	    {
-	      const bfd_byte *mask = NULL;
-	      const bfd_byte *add_insn = NULL;
-
-	      switch (r_type)
-		{
-		case R_TILEPRO_IMM8_X0_TLS_GD_ADD:
-		  add_insn = is_tls_iele ? insn_tls_ie_add_X0X1
-		    : insn_tls_gd_add_X0X1;
-		  mask = insn_mask_X0_no_dest_no_srca;
-		  break;
-		case R_TILEPRO_IMM8_X1_TLS_GD_ADD:
-		  add_insn = is_tls_iele ? insn_tls_ie_add_X0X1
-		    : insn_tls_gd_add_X0X1;
-		  mask = insn_mask_X1_no_dest_no_srca;
-		  break;
-		case R_TILEPRO_IMM8_Y0_TLS_GD_ADD:
-		  add_insn = is_tls_iele ? insn_tls_ie_add_Y0Y1
-		    : insn_tls_gd_add_Y0Y1;
-		  mask = insn_mask_Y0_no_dest_no_srca;
-		  break;
-		case R_TILEPRO_IMM8_Y1_TLS_GD_ADD:
-		  add_insn = is_tls_iele ? insn_tls_ie_add_Y0Y1
-		    : insn_tls_gd_add_Y0Y1;
-		  mask = insn_mask_Y1_no_dest_no_srca;
-		  break;
-		}
-
-	      tilepro_replace_insn (contents + rel->r_offset, mask, add_insn);
-
-	      continue;
-	    }
-	  break;
-	case R_TILEPRO_TLS_IE_LOAD:
-	  if (!info->shared && (h == NULL || h->dynindx == -1))
-	    /* IE -> LE */
-	    tilepro_replace_insn (contents + rel->r_offset,
-				  insn_mask_X1_no_dest_no_srca,
-				  insn_tls_le_move_X1);
-	  else
-	    /* IE -> IE */
-	    tilepro_replace_insn (contents + rel->r_offset,
-				  insn_mask_X1_no_dest_no_srca,
-				  insn_tls_ie_lw_X1);
-	  continue;
-	  break;
-	default:
-	  break;
-	}
-
-      switch (r_type)
-	{
         case R_TILEPRO_IMM16_X0_GOT:
         case R_TILEPRO_IMM16_X1_GOT:
         case R_TILEPRO_IMM16_X0_GOT_LO:
@@ -3300,45 +2908,6 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	    }
 	  break;
 
-        case R_TILEPRO_IMM16_X0_TLS_LE:
-        case R_TILEPRO_IMM16_X1_TLS_LE:
-        case R_TILEPRO_IMM16_X0_TLS_LE_LO:
-        case R_TILEPRO_IMM16_X1_TLS_LE_LO:
-        case R_TILEPRO_IMM16_X0_TLS_LE_HI:
-        case R_TILEPRO_IMM16_X1_TLS_LE_HI:
-        case R_TILEPRO_IMM16_X0_TLS_LE_HA:
-        case R_TILEPRO_IMM16_X1_TLS_LE_HA:
-	  if (info->shared)
-	    {
-	      Elf_Internal_Rela outrel;
-	      bfd_boolean skip;
-
-	      BFD_ASSERT (sreloc != NULL);
-	      skip = FALSE;
-	      outrel.r_offset =
-		_bfd_elf_section_offset (output_bfd, info, input_section,
-					 rel->r_offset);
-	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = TRUE;
-	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = TRUE;
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-	      if (skip)
-		memset (&outrel, 0, sizeof outrel);
-	      else
-		{
-		  outrel.r_info = ELF32_R_INFO (0, r_type);
-		  outrel.r_addend = relocation - dtpoff_base (info)
-				    + rel->r_addend;
-		}
-
-	      tilepro_elf_append_rela_32 (output_bfd, sreloc, &outrel);
-	      continue;
-	    }
-	  relocation = tpoff (info, relocation);
-	  break;
-
         case R_TILEPRO_IMM16_X0_TLS_GD:
         case R_TILEPRO_IMM16_X1_TLS_GD:
         case R_TILEPRO_IMM16_X0_TLS_GD_LO:
@@ -3347,6 +2916,9 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
         case R_TILEPRO_IMM16_X1_TLS_GD_HI:
         case R_TILEPRO_IMM16_X0_TLS_GD_HA:
         case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+          tls_type = GOT_TLS_GD;
+          goto have_tls_reference;
+
         case R_TILEPRO_IMM16_X0_TLS_IE:
         case R_TILEPRO_IMM16_X1_TLS_IE:
         case R_TILEPRO_IMM16_X0_TLS_IE_LO:
@@ -3355,32 +2927,45 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
         case R_TILEPRO_IMM16_X1_TLS_IE_HI:
         case R_TILEPRO_IMM16_X0_TLS_IE_HA:
         case R_TILEPRO_IMM16_X1_TLS_IE_HA:
-	  r_type = tilepro_elf_tls_transition (info, r_type, h == NULL);
-          tls_type = GOT_UNKNOWN;
+          tls_type = GOT_TLS_IE;
+          /* Fall through. */
+
+        have_tls_reference:
 	  if (h == NULL && local_got_offsets)
 	    tls_type
 	      = _bfd_tilepro_elf_local_got_tls_type (input_bfd) [r_symndx];
 	  else if (h != NULL)
 	    {
 	      tls_type = tilepro_elf_hash_entry(h)->tls_type;
-	      if (!info->shared && h->dynindx == -1 && tls_type == GOT_TLS_IE)
-		r_type = tilepro_tls_translate_to_le (r_type);
 	    }
 	  if (tls_type == GOT_TLS_IE)
-	    r_type = tilepro_tls_translate_to_ie (r_type);
-
-	  if (r_type == R_TILEPRO_IMM16_X0_TLS_LE
-	      || r_type == R_TILEPRO_IMM16_X1_TLS_LE
-	      || r_type == R_TILEPRO_IMM16_X0_TLS_LE_LO
-	      || r_type == R_TILEPRO_IMM16_X1_TLS_LE_LO
-	      || r_type == R_TILEPRO_IMM16_X0_TLS_LE_HI
-	      || r_type == R_TILEPRO_IMM16_X1_TLS_LE_HI
-	      || r_type == R_TILEPRO_IMM16_X0_TLS_LE_HA
-	      || r_type == R_TILEPRO_IMM16_X1_TLS_LE_HA)
-	    {
-	      relocation = tpoff (info, relocation);
-	      break;
-	    }
+	    switch (r_type)
+	      {
+              case R_TILEPRO_IMM16_X0_TLS_GD:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE;
+                break;
+              case R_TILEPRO_IMM16_X0_TLS_GD_LO:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE_LO;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD_LO:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE_LO;
+                break;
+              case R_TILEPRO_IMM16_X0_TLS_GD_HI:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE_HI;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD_HI:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE_HI;
+                break;
+              case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE_HA;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE_HA;
+                break;
+	      }
 
 	  if (h != NULL)
 	    {
@@ -3525,9 +3110,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	(*_bfd_error_handler)
 	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index 2908df4712..643381c5c4 100644
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -1,6 +1,6 @@
 /* VAX series support for 32-bit ELF
    Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Matt Thomas <matt@3am-software.com>.
 
@@ -1036,6 +1036,13 @@ elf_vax_adjust_dynamic_symbol (info, h)
   if (info->shared)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -1053,7 +1060,7 @@ elf_vax_adjust_dynamic_symbol (info, h)
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 877ab6ffcf..c6e4fb43a0 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -3058,9 +3058,7 @@ elf_xtensa_relocate_section (bfd *output_bfd,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	{
 	  (*_bfd_error_handler)
 	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 94ea6858d5..60767099c6 100644
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -1448,8 +1448,7 @@ elf64_alpha_find_nearest_line (bfd *abfd, asection *section, asymbol **symbols,
 {
   asection *msec;
 
-  if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections,
-                                     section, symbols, offset,
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, 0,
 				     &elf_tdata (abfd)->dwarf2_find_line_info))
@@ -4213,7 +4212,6 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
       bfd_vma value;
       bfd_vma addend;
       bfd_boolean dynamic_symbol_p;
-      bfd_boolean unresolved_reloc = FALSE;
       bfd_boolean undef_weak_ref = FALSE;
       unsigned long r_type;
 
@@ -4295,6 +4293,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
       else
 	{
 	  bfd_boolean warned;
+	  bfd_boolean unresolved_reloc;
 	  struct elf_link_hash_entry *hh;
 	  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
 
@@ -4527,12 +4526,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	    else if (info->shared
 		     && r_symndx != STN_UNDEF
 		     && (input_section->flags & SEC_ALLOC)
-		     && !undef_weak_ref
-		     && !(unresolved_reloc
-			  && (_bfd_elf_section_offset (output_bfd, info,
-						       input_section,
-						       rel->r_offset)
-			      == (bfd_vma) -1)))
+		     && !undef_weak_ref)
 	      {
 		if (r_type == R_ALPHA_REFLONG)
 		  {
@@ -4578,11 +4572,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  /* ??? .eh_frame references to discarded sections will be smashed
 	     to relocations against SHN_UNDEF.  The .eh_frame format allows
 	     NULL to be encoded as 0 in any format, so this works here.  */
-	  if (r_symndx == STN_UNDEF
-	      || (unresolved_reloc
-		  && _bfd_elf_section_offset (output_bfd, info,
-					      input_section,
-					      rel->r_offset) == (bfd_vma) -1))
+	  if (r_symndx == STN_UNDEF)
 	    howto = (elf64_alpha_howto_table
 		     + (r_type - R_ALPHA_SREL32 + R_ALPHA_REFLONG));
 	  goto default_reloc;
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index a835f66e62..3feb1bbd46 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -1340,7 +1340,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPMOD64", /* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1354,7 +1354,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPREL64",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1369,7 +1369,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_GD",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1384,7 +1384,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_LDM",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1399,7 +1399,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1414,7 +1414,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1429,7 +1429,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_GOTTPREL",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1446,7 +1446,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_TPREL64",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1461,7 +1461,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_TPREL_HI16", /* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1476,7 +1476,7 @@ static reloc_howto_type mips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_TPREL_LO16", /* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1590,111 +1590,6 @@ static reloc_howto_type mips16_elf64_howto_table_rel[] =
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS general dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_GD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GD",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_LDM,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_LDM",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_HI16",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_LO16",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_GOTTPREL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GOTTPREL",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_HI16", /* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_LO16", /* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
 };
 
 static reloc_howto_type mips16_elf64_howto_table_rela[] =
@@ -1713,7 +1608,7 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS16_26",		/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1728,7 +1623,7 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] =
 	 mips16_gprel_reloc,	/* special_function */
 	 "R_MIPS16_GPREL",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1743,7 +1638,7 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_got16_reloc, /* special_function */
 	 "R_MIPS16_GOT16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1758,7 +1653,7 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS16_CALL16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1773,7 +1668,7 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_hi16_reloc, /* special_function */
 	 "R_MIPS16_HI16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1788,111 +1683,6 @@ static reloc_howto_type mips16_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_lo16_reloc, /* special_function */
 	 "R_MIPS16_LO16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS general dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_GD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GD",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_LDM,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_LDM",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_HI16",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_LO16",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_GOTTPREL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GOTTPREL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_HI16", /* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_LO16", /* name */
-	 FALSE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
@@ -2206,7 +1996,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_26_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2221,7 +2011,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_hi16_reloc, /* special_function */
 	 "R_MICROMIPS_HI16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2236,7 +2026,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_lo16_reloc, /* special_function */
 	 "R_MICROMIPS_LO16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2251,7 +2041,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
 	 "R_MICROMIPS_GPREL16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2266,7 +2056,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
 	 "R_MICROMIPS_LITERAL",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2281,7 +2071,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_got16_reloc, /* special_function */
 	 "R_MICROMIPS_GOT16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2296,7 +2086,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_PC7_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000007f,		/* src_mask */
 	 0x0000007f,		/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
@@ -2310,7 +2100,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_PC10_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x000003ff,		/* src_mask */
 	 0x000003ff,		/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
@@ -2324,7 +2114,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_PC16_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
@@ -2339,7 +2129,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_CALL16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2357,7 +2147,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_DISP",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2372,7 +2162,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_PAGE",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2387,7 +2177,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_OFST",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2402,7 +2192,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_HI16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2417,7 +2207,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_LO16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2432,7 +2222,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_SUB",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2447,7 +2237,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_HIGHER",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2462,7 +2252,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_HIGHEST",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2477,7 +2267,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_CALL_HI16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2492,7 +2282,7 @@ static reloc_howto_type micromips_elf64_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_CALL_LO16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 };
@@ -3118,15 +2908,6 @@ static const struct elf_reloc_map mips16_reloc_map[] =
   { BFD_RELOC_MIPS16_CALL16, R_MIPS16_CALL16 - R_MIPS16_min },
   { BFD_RELOC_MIPS16_HI16_S, R_MIPS16_HI16 - R_MIPS16_min },
   { BFD_RELOC_MIPS16_LO16, R_MIPS16_LO16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_GD, R_MIPS16_TLS_GD - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_LDM, R_MIPS16_TLS_LDM - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_DTPREL_HI16,
-    R_MIPS16_TLS_DTPREL_HI16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_DTPREL_LO16,
-    R_MIPS16_TLS_DTPREL_LO16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_GOTTPREL, R_MIPS16_TLS_GOTTPREL - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_TPREL_HI16, R_MIPS16_TLS_TPREL_HI16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_TPREL_LO16, R_MIPS16_TLS_TPREL_LO16 - R_MIPS16_min }
 };
 
 static const struct elf_reloc_map micromips_reloc_map[] =
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index e7a01c2215..93d1314d5a 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -1,6 +1,6 @@
 /* PowerPC64-specific support for 64-bit ELF.
    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2009, 2010, 2011 Free Software Foundation, Inc.
    Written by Linus Nordberg, Swox AB <info@swox.com>,
    based on elf32-ppc.c by Ian Lance Taylor.
    Largely rewritten by Alan Modra.
@@ -105,7 +105,6 @@ static bfd_vma opd_entry_value
 #define elf_backend_gc_sweep_hook	      ppc64_elf_gc_sweep_hook
 #define elf_backend_adjust_dynamic_symbol     ppc64_elf_adjust_dynamic_symbol
 #define elf_backend_hide_symbol		      ppc64_elf_hide_symbol
-#define elf_backend_maybe_function_sym	      ppc64_elf_maybe_function_sym
 #define elf_backend_always_size_sections      ppc64_elf_func_desc_adjust
 #define elf_backend_size_dynamic_sections     ppc64_elf_size_dynamic_sections
 #define elf_backend_init_index_section	      _bfd_elf_init_2_index_sections
@@ -153,13 +152,6 @@ static bfd_vma opd_entry_value
 #define ADDIS_R2_R2	0x3c420000	/* addis %r2,%r2,off@ha  */
 #define ADDI_R2_R2	0x38420000	/* addi  %r2,%r2,off@l   */
 
-#define XOR_R11_R11_R11	0x7d6b5a78	/* xor   %r11,%r11,%r11  */
-#define ADD_R12_R12_R11	0x7d8c5a14	/* add   %r12,%r12,%r11  */
-#define ADD_R2_R2_R11	0x7c425a14	/* add   %r2,%r2,%r11    */
-#define CMPLDI_R2_0	0x28220000	/* cmpldi %r2,0          */
-#define BNECTR		0x4ca20420	/* bnectr+               */
-#define BNECTR_P4	0x4ce20420	/* bnectr+               */
-
 #define LD_R11_0R2	0xe9620000	/* ld	 %r11,xxx+0(%r2) */
 #define LD_R2_0R2	0xe8420000	/* ld	 %r2,xxx+0(%r2)  */
 
@@ -2364,8 +2356,8 @@ ppc64_elf_brtaken_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
   long insn;
   enum elf_ppc64_reloc_type r_type;
   bfd_size_type octets;
-  /* Assume 'at' branch hints.  */
-  bfd_boolean is_isa_v2 = TRUE;
+  /* Disabled until we sort out how ld should choose 'y' vs 'at'.  */
+  bfd_boolean is_power4 = FALSE;
 
   /* If this is a relocatable link (output_bfd test tells us), just
      call the generic function.  Any adjustment will be done at final
@@ -2382,7 +2374,7 @@ ppc64_elf_brtaken_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
       || r_type == R_PPC64_REL14_BRTAKEN)
     insn |= 0x01 << 21; /* 'y' or 't' bit, lowest bit of BO field.  */
 
-  if (is_isa_v2)
+  if (is_power4)
     {
       /* Set 'a' bit.  This is 0b00010 in BO field for branch
 	 on CR(BI) insns (BO == 001at or 011at), and 0b01000
@@ -2722,7 +2714,7 @@ ppc64_elf_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
 	va_list ap;
 
 	va_start (ap, note_type);
-	memset (data, 0, sizeof (data));
+	memset (data, 0, 40);
 	strncpy (data + 40, va_arg (ap, const char *), 16);
 	strncpy (data + 56, va_arg (ap, const char *), 80);
 	va_end (ap);
@@ -3592,8 +3584,7 @@ enum ppc_stub_type {
   ppc_stub_long_branch_r2off,
   ppc_stub_plt_branch,
   ppc_stub_plt_branch_r2off,
-  ppc_stub_plt_call,
-  ppc_stub_plt_call_r2save
+  ppc_stub_plt_call
 };
 
 struct ppc_stub_hash_entry {
@@ -3761,20 +3752,14 @@ struct ppc_link_hash_table
   bfd_size_type got_reli_size;
 
   /* Statistics.  */
-  unsigned long stub_count[ppc_stub_plt_call_r2save];
+  unsigned long stub_count[ppc_stub_plt_call];
 
   /* Number of stubs against global syms.  */
   unsigned long stub_globals;
 
-  /* Alignment of PLT call stubs.  */
-  unsigned int plt_stub_align:4;
-
   /* Set if PLT call stubs should load r11.  */
   unsigned int plt_static_chain:1;
 
-  /* Set if PLT call stubs need a read-read barrier.  */
-  unsigned int plt_thread_safe:1;
-
   /* Set if we should emit symbols for stubs.  */
   unsigned int emit_stub_syms:1;
 
@@ -4450,6 +4435,10 @@ ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info,
   edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
   edir->elf.needs_plt |= eind->elf.needs_plt;
 
+  /* If we were called to copy over info for a weak sym, that's all.  */
+  if (eind->elf.root.type != bfd_link_hash_indirect)
+    return;
+
   /* Copy over any dynamic relocs we may have on the indirect sym.  */
   if (eind->dyn_relocs != NULL)
     {
@@ -4482,16 +4471,6 @@ ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info,
       eind->dyn_relocs = NULL;
     }
 
-  /* If we were called to copy over info for a weak sym, that's all.
-     You might think dyn_relocs need not be copied over;  After all,
-     both syms will be dynamic or both non-dynamic so we're just
-     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
-     code in ppc64_elf_adjust_dynamic_symbol needs to check for
-     dyn_relocs in read-only sections, and it does so on what is the
-     DIR sym here.  */
-  if (eind->elf.root.type != bfd_link_hash_indirect)
-    return;
-
   /* Copy over got entries that we may have already seen to the
      symbol which just became indirect.  */
   if (eind->elf.got.glist != NULL)
@@ -5529,8 +5508,7 @@ opd_entry_value (asection *opd_sec,
   Elf_Internal_Rela *lo, *hi, *look;
   bfd_vma val;
 
-  /* No relocs implies we are linking a --just-symbols object, or looking
-     at a final linked executable with addr2line or somesuch.  */
+  /* No relocs implies we are linking a --just-symbols object.  */
   if (opd_sec->reloc_count == 0)
     {
       char buf[8];
@@ -5585,18 +5563,15 @@ opd_entry_value (asection *opd_sec,
 	      unsigned long symndx = ELF64_R_SYM (look->r_info);
 	      asection *sec;
 
-	      if (symndx < symtab_hdr->sh_info
-		  || elf_sym_hashes (opd_bfd) == NULL)
+	      if (symndx < symtab_hdr->sh_info)
 		{
 		  Elf_Internal_Sym *sym;
 
 		  sym = (Elf_Internal_Sym *) symtab_hdr->contents;
 		  if (sym == NULL)
 		    {
-		      size_t symcnt = symtab_hdr->sh_info;
-		      if (elf_sym_hashes (opd_bfd) == NULL)
-			symcnt = symtab_hdr->sh_size / symtab_hdr->sh_entsize;
-		      sym = bfd_elf_get_elf_syms (opd_bfd, symtab_hdr, symcnt,
+		      sym = bfd_elf_get_elf_syms (opd_bfd, symtab_hdr,
+						  symtab_hdr->sh_info,
 						  0, NULL, NULL, NULL);
 		      if (sym == NULL)
 			break;
@@ -5636,22 +5611,6 @@ opd_entry_value (asection *opd_sec,
   return val;
 }
 
-/* Return TRUE iff the ELF symbol SYM might be a function.  Set *CODE_SEC
-   and *CODE_OFF to the function's entry point.  */
-
-static bfd_boolean
-ppc64_elf_maybe_function_sym (const asymbol *sym,
-			      asection **code_sec, bfd_vma *code_off)
-{
-  if (_bfd_elf_maybe_function_sym (sym, code_sec, code_off))
-    {
-      if (strcmp (sym->section->name, ".opd") == 0)
-	opd_entry_value (sym->section, sym->value, code_sec, code_off);
-      return TRUE;
-    }
-  return FALSE;
-}
-
 /* Return true if symbol is defined in a regular object file.  */
 
 static bfd_boolean
@@ -6565,6 +6524,13 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* This is a reference to a symbol defined by a dynamic object which
      is not a function.  */
 
+  if (h->size == 0)
+    {
+      info->callbacks->einfo (_("%P: dynamic variable `%s' is zero size\n"),
+			      h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -6579,7 +6545,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      to copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->relbss->size += sizeof (Elf64_External_Rela);
       h->needs_copy = 1;
@@ -9499,126 +9465,21 @@ ppc_type_of_stub (asection *input_sec,
   return ppc_stub_none;
 }
 
-/* With power7 weakly ordered memory model, it is possible for ld.so
-   to update a plt entry in one thread and have another thread see a
-   stale zero toc entry.  To avoid this we need some sort of acquire
-   barrier in the call stub.  One solution is to make the load of the
-   toc word seem to appear to depend on the load of the function entry
-   word.  Another solution is to test for r2 being zero, and branch to
-   the appropriate glink entry if so.
-
-   .	fake dep barrier	compare
-   .	ld 11,xxx(2)		ld 11,xxx(2)
-   .	mtctr 11		mtctr 11
-   .	xor 11,11,11		ld 2,xxx+8(2)
-   .	add 2,2,11		cmpldi 2,0
-   .	ld 2,xxx+8(2)		bnectr+
-   .	bctr			b <glink_entry>
-
-   The solution involving the compare turns out to be faster, so
-   that's what we use unless the branch won't reach.  */
-
-#define ALWAYS_USE_FAKE_DEP 0
-#define ALWAYS_EMIT_R2SAVE 0
+/* Build a .plt call stub.  */
 
+static inline bfd_byte *
+build_plt_stub (bfd *obfd, bfd_byte *p, int offset, Elf_Internal_Rela *r,
+		bfd_boolean plt_static_chain)
+{
 #define PPC_LO(v) ((v) & 0xffff)
 #define PPC_HI(v) (((v) >> 16) & 0xffff)
 #define PPC_HA(v) PPC_HI ((v) + 0x8000)
 
-static inline unsigned int
-plt_stub_size (struct ppc_link_hash_table *htab,
-	       struct ppc_stub_hash_entry *stub_entry,
-	       bfd_vma off)
-{
-  unsigned size = PLT_CALL_STUB_SIZE;
-
-  if (!(ALWAYS_EMIT_R2SAVE
-	|| stub_entry->stub_type == ppc_stub_plt_call_r2save))
-    size -= 4;
-  if (!htab->plt_static_chain)
-    size -= 4;
-  if (htab->plt_thread_safe)
-    size += 8;
-  if (PPC_HA (off) == 0)
-    size -= 4;
-  if (PPC_HA (off + 8 + 8 * htab->plt_static_chain) != PPC_HA (off))
-    size += 4;
-  if (stub_entry->h != NULL
-      && (stub_entry->h == htab->tls_get_addr_fd
-	  || stub_entry->h == htab->tls_get_addr)
-      && !htab->no_tls_get_addr_opt)
-    size += 13 * 4;
-  return size;
-}
-
-/* If this stub would cross fewer 2**plt_stub_align boundaries if we align,
-   then return the padding needed to do so.  */
-static inline unsigned int
-plt_stub_pad (struct ppc_link_hash_table *htab,
-	      struct ppc_stub_hash_entry *stub_entry,
-	      bfd_vma plt_off)
-{
-  int stub_align = 1 << htab->plt_stub_align;
-  unsigned stub_size = plt_stub_size (htab, stub_entry, plt_off);
-  bfd_vma stub_off = stub_entry->stub_sec->size;
-
-  if (((stub_off + stub_size - 1) & -stub_align) - (stub_off & -stub_align)
-      > (stub_size & -stub_align))
-    return stub_align - (stub_off & (stub_align - 1));
-  return 0;
-}
-
-/* Build a .plt call stub.  */
-
-static inline bfd_byte *
-build_plt_stub (struct ppc_link_hash_table *htab,
-		struct ppc_stub_hash_entry *stub_entry,
-		bfd_byte *p, bfd_vma offset, Elf_Internal_Rela *r)
-{
-  bfd *obfd = htab->stub_bfd;
-  bfd_boolean plt_static_chain = htab->plt_static_chain;
-  bfd_boolean plt_thread_safe = htab->plt_thread_safe;
-  bfd_boolean use_fake_dep = plt_thread_safe;
-  bfd_vma cmp_branch_off = 0;
-
-  if (!ALWAYS_USE_FAKE_DEP
-      && plt_thread_safe
-      && !(stub_entry->h != NULL
-	   && (stub_entry->h == htab->tls_get_addr_fd
-	       || stub_entry->h == htab->tls_get_addr)
-	   && !htab->no_tls_get_addr_opt))
-    {
-      bfd_vma pltoff = stub_entry->plt_ent->plt.offset & ~1;
-      bfd_vma pltindex = (pltoff - PLT_INITIAL_ENTRY_SIZE) / PLT_ENTRY_SIZE;
-      bfd_vma glinkoff = GLINK_CALL_STUB_SIZE + pltindex * 8;
-      bfd_vma to, from;
-
-      if (pltindex > 32767)
-	glinkoff += (pltindex - 32767) * 4;
-      to = (glinkoff
-	    + htab->glink->output_offset
-	    + htab->glink->output_section->vma);
-      from = (p - stub_entry->stub_sec->contents
-	      + 4 * (ALWAYS_EMIT_R2SAVE
-		     || stub_entry->stub_type == ppc_stub_plt_call_r2save)
-	      + 4 * (PPC_HA (offset) != 0)
-	      + 4 * (PPC_HA (offset + 8 + 8 * plt_static_chain)
-		     != PPC_HA (offset))
-	      + 4 * (plt_static_chain != 0)
-	      + 20
-	      + stub_entry->stub_sec->output_offset
-	      + stub_entry->stub_sec->output_section->vma);
-      cmp_branch_off = to - from;
-      use_fake_dep = cmp_branch_off + (1 << 25) >= (1 << 26);
-    }
-
   if (PPC_HA (offset) != 0)
     {
       if (r != NULL)
 	{
-	  if (ALWAYS_EMIT_R2SAVE
-	      || stub_entry->stub_type == ppc_stub_plt_call_r2save)
-	    r[0].r_offset += 4;
+	  r[0].r_offset += 4;
 	  r[0].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_HA);
 	  r[1].r_offset = r[0].r_offset + 4;
 	  r[1].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO_DS);
@@ -9631,7 +9492,7 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 	    }
 	  else
 	    {
-	      r[2].r_offset = r[1].r_offset + 8 + 8 * use_fake_dep;
+	      r[2].r_offset = r[1].r_offset + 8;
 	      r[2].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO_DS);
 	      r[2].r_addend = r[0].r_addend + 8;
 	      if (plt_static_chain)
@@ -9642,9 +9503,7 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 		}
 	    }
 	}
-      if (ALWAYS_EMIT_R2SAVE
-	  || stub_entry->stub_type == ppc_stub_plt_call_r2save)
-	bfd_put_32 (obfd, STD_R2_40R1, p),			p += 4;
+      bfd_put_32 (obfd, STD_R2_40R1, p),			p += 4;
       bfd_put_32 (obfd, ADDIS_R12_R2 | PPC_HA (offset), p),	p += 4;
       bfd_put_32 (obfd, LD_R11_0R12 | PPC_LO (offset), p),	p += 4;
       if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
@@ -9653,22 +9512,16 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 	  offset = 0;
 	}
       bfd_put_32 (obfd, MTCTR_R11, p),				p += 4;
-      if (use_fake_dep)
-	{
-	  bfd_put_32 (obfd, XOR_R11_R11_R11, p),		p += 4;
-	  bfd_put_32 (obfd, ADD_R12_R12_R11, p),		p += 4;
-	}
       bfd_put_32 (obfd, LD_R2_0R12 | PPC_LO (offset + 8), p),	p += 4;
       if (plt_static_chain)
 	bfd_put_32 (obfd, LD_R11_0R12 | PPC_LO (offset + 16), p), p += 4;
+      bfd_put_32 (obfd, BCTR, p),				p += 4;
     }
   else
     {
       if (r != NULL)
 	{
-	  if (ALWAYS_EMIT_R2SAVE
-	      || stub_entry->stub_type == ppc_stub_plt_call_r2save)
-	    r[0].r_offset += 4;
+	  r[0].r_offset += 4;
 	  r[0].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_DS);
 	  if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
 	    {
@@ -9678,7 +9531,7 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 	    }
 	  else
 	    {
-	      r[1].r_offset = r[0].r_offset + 8 + 8 * use_fake_dep;
+	      r[1].r_offset = r[0].r_offset + 8;
 	      r[1].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_DS);
 	      r[1].r_addend = r[0].r_addend + 8 + 8 * plt_static_chain;
 	      if (plt_static_chain)
@@ -9689,9 +9542,7 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 		}
 	    }
 	}
-      if (ALWAYS_EMIT_R2SAVE
-	  || stub_entry->stub_type == ppc_stub_plt_call_r2save)
-	bfd_put_32 (obfd, STD_R2_40R1, p),			p += 4;
+      bfd_put_32 (obfd, STD_R2_40R1, p),			p += 4;
       bfd_put_32 (obfd, LD_R11_0R2 | PPC_LO (offset), p),	p += 4;
       if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
 	{
@@ -9699,23 +9550,11 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 	  offset = 0;
 	}
       bfd_put_32 (obfd, MTCTR_R11, p),				p += 4;
-      if (use_fake_dep)
-	{
-	  bfd_put_32 (obfd, XOR_R11_R11_R11, p),		p += 4;
-	  bfd_put_32 (obfd, ADD_R2_R2_R11, p),			p += 4;
-	}
       if (plt_static_chain)
 	bfd_put_32 (obfd, LD_R11_0R2 | PPC_LO (offset + 16), p), p += 4;
       bfd_put_32 (obfd, LD_R2_0R2 | PPC_LO (offset + 8), p),	p += 4;
+      bfd_put_32 (obfd, BCTR, p),				p += 4;
     }
-  if (plt_thread_safe && !use_fake_dep)
-    {
-      bfd_put_32 (obfd, CMPLDI_R2_0, p),			p += 4;
-      bfd_put_32 (obfd, BNECTR_P4, p),				p += 4;
-      bfd_put_32 (obfd, B_DOT + cmp_branch_off, p),		p += 4;
-    }
-  else
-    bfd_put_32 (obfd, BCTR, p),					p += 4;
   return p;
 }
 
@@ -9736,12 +9575,9 @@ build_plt_stub (struct ppc_link_hash_table *htab,
 #define MTLR_R11	0x7d6803a6
 
 static inline bfd_byte *
-build_tls_get_addr_stub (struct ppc_link_hash_table *htab,
-			 struct ppc_stub_hash_entry *stub_entry,
-			 bfd_byte *p, bfd_vma offset, Elf_Internal_Rela *r)
+build_tls_get_addr_stub (bfd *obfd, bfd_byte *p, int offset,
+			 Elf_Internal_Rela *r, bfd_boolean plt_static_chain)
 {
-  bfd *obfd = htab->stub_bfd;
-
   bfd_put_32 (obfd, LD_R11_0R3 + 0, p),		p += 4;
   bfd_put_32 (obfd, LD_R12_0R3 + 8, p),		p += 4;
   bfd_put_32 (obfd, MR_R0_R3, p),		p += 4;
@@ -9754,7 +9590,7 @@ build_tls_get_addr_stub (struct ppc_link_hash_table *htab,
 
   if (r != NULL)
     r[0].r_offset += 9 * 4;
-  p = build_plt_stub (htab, stub_entry, p, offset, r);
+  p = build_plt_stub (obfd, p, offset, r, plt_static_chain);
   bfd_put_32 (obfd, BCTRL, p - 4);
 
   bfd_put_32 (obfd, LD_R11_0R1 + 32, p),	p += 4;
@@ -10101,7 +9937,6 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
       break;
 
     case ppc_stub_plt_call:
-    case ppc_stub_plt_call_r2save:
       if (stub_entry->h != NULL
 	  && stub_entry->h->is_func_descriptor
 	  && stub_entry->h->oh != NULL)
@@ -10168,15 +10003,6 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
 	  return FALSE;
 	}
 
-      if (htab->plt_stub_align != 0)
-	{
-	  unsigned pad = plt_stub_pad (htab, stub_entry, off);
-
-	  stub_entry->stub_sec->size += pad;
-	  stub_entry->stub_offset = stub_entry->stub_sec->size;
-	  loc += pad;
-	}
-
       r = NULL;
       if (info->emitrelocations)
 	{
@@ -10196,9 +10022,11 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
 	  && (stub_entry->h == htab->tls_get_addr_fd
 	      || stub_entry->h == htab->tls_get_addr)
 	  && !htab->no_tls_get_addr_opt)
-	p = build_tls_get_addr_stub (htab, stub_entry, loc, off, r);
+	p = build_tls_get_addr_stub (htab->stub_bfd, loc, off, r,
+				     htab->plt_static_chain);
       else
-	p = build_plt_stub (htab, stub_entry, loc, off, r);
+	p = build_plt_stub (htab->stub_bfd, loc, off, r,
+			    htab->plt_static_chain);
       size = p - loc;
       break;
 
@@ -10218,7 +10046,6 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
 				       "long_branch_r2off",
 				       "plt_branch",
 				       "plt_branch_r2off",
-				       "plt_call",
 				       "plt_call" };
 
       len1 = strlen (stub_str[stub_entry->stub_type - 1]);
@@ -10269,8 +10096,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
   if (htab == NULL)
     return FALSE;
 
-  if (stub_entry->stub_type == ppc_stub_plt_call
-      || stub_entry->stub_type == ppc_stub_plt_call_r2save)
+  if (stub_entry->stub_type == ppc_stub_plt_call)
     {
       asection *plt;
       off = stub_entry->plt_ent->plt.offset & ~(bfd_vma) 1;
@@ -10286,9 +10112,18 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
 	      - elf_gp (plt->output_section->owner)
 	      - htab->stub_group[stub_entry->id_sec->id].toc_off);
 
-      size = plt_stub_size (htab, stub_entry, off);
-      if (htab->plt_stub_align)
-	size += plt_stub_pad (htab, stub_entry, off);
+      size = PLT_CALL_STUB_SIZE;
+      if (!htab->plt_static_chain)
+	size -= 4;
+      if (PPC_HA (off) == 0)
+	size -= 4;
+      if (PPC_HA (off + 8 + 8 * htab->plt_static_chain) != PPC_HA (off))
+	size += 4;
+      if (stub_entry->h != NULL
+	  && (stub_entry->h == htab->tls_get_addr_fd
+	      || stub_entry->h == htab->tls_get_addr)
+	  && !htab->no_tls_get_addr_opt)
+	size += 13 * 4;
       if (info->emitrelocations)
 	{
 	  stub_entry->stub_sec->reloc_count
@@ -11257,8 +11092,7 @@ maybe_strip_output (struct bfd_link_info *info, asection *isec)
 
 bfd_boolean
 ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
-		      bfd_boolean plt_static_chain, int plt_thread_safe,
-		      int plt_stub_align)
+		      bfd_boolean plt_static_chain)
 {
   bfd_size_type stub_group_size;
   bfd_boolean stubs_always_before_branch;
@@ -11268,40 +11102,6 @@ ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
     return FALSE;
 
   htab->plt_static_chain = plt_static_chain;
-  htab->plt_stub_align = plt_stub_align;
-  if (plt_thread_safe == -1)
-    {
-      const char *const thread_starter[] =
-	{
-	  "pthread_create",
-	  /* libstdc++ */
-	  "_ZNSt6thread15_M_start_threadESt10shared_ptrINS_10_Impl_baseEE",
-	  /* librt */
-	  "aio_init", "aio_read", "aio_write", "aio_fsync", "lio_listio",
-	  "mq_notify", "create_timer",
-	  /* libanl */
-	  "getaddrinfo_a",
-	  /* libgomp */
-	  "GOMP_parallel_start",
-	  "GOMP_parallel_loop_static_start",
-	  "GOMP_parallel_loop_dynamic_start",
-	  "GOMP_parallel_loop_guided_start",
-	  "GOMP_parallel_loop_runtime_start",
-	  "GOMP_parallel_sections_start", 
-	};
-      unsigned i;
-
-      for (i = 0; i < sizeof (thread_starter)/ sizeof (thread_starter[0]); i++)
-	{
-	  struct elf_link_hash_entry *h;
-	  h = elf_link_hash_lookup (&htab->elf, thread_starter[i],
-				    FALSE, FALSE, TRUE);
-	  plt_thread_safe = h != NULL && h->ref_regular;
-	  if (plt_thread_safe)
-	    break;
-	}
-    }
-  htab->plt_thread_safe = plt_thread_safe;
   stubs_always_before_branch = group_size < 0;
   if (group_size < 0)
     stub_group_size = -group_size;
@@ -11536,14 +11336,10 @@ ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
 		  if (stub_type == ppc_stub_plt_call
 		      && irela + 1 < irelaend
 		      && irela[1].r_offset == irela->r_offset + 4
-		      && ELF64_R_TYPE (irela[1].r_info) == R_PPC64_TOCSAVE)
-		    {
-		      if (!tocsave_find (htab, INSERT,
-					 &local_syms, irela + 1, input_bfd))
-			goto error_ret_free_internal;
-		    }
-		  else if (stub_type == ppc_stub_plt_call)
-		    stub_type = ppc_stub_plt_call_r2save;
+		      && ELF64_R_TYPE (irela[1].r_info) == R_PPC64_TOCSAVE
+		      && !tocsave_find (htab, INSERT,
+					&local_syms, irela + 1, input_bfd))
+		    goto error_ret_free_internal;
 
 		  /* Support for grouping stub sections.  */
 		  id_sec = htab->stub_group[section->id].link_sec;
@@ -11559,8 +11355,6 @@ ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
 		    {
 		      /* The proper stub has already been created.  */
 		      free (stub_name);
-		      if (stub_type == ppc_stub_plt_call_r2save)
-			stub_entry->stub_type = stub_type;
 		      continue;
 		    }
 
@@ -11580,8 +11374,7 @@ ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
 		    }
 
 		  stub_entry->stub_type = stub_type;
-		  if (stub_type != ppc_stub_plt_call
-		      && stub_type != ppc_stub_plt_call_r2save)
+		  if (stub_type != ppc_stub_plt_call)
 		    {
 		      stub_entry->target_value = code_value;
 		      stub_entry->target_section = code_sec;
@@ -11661,14 +11454,6 @@ ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
 	  htab->glink_eh_frame->size = size;
 	}
 
-      if (htab->plt_stub_align != 0)
-	for (stub_sec = htab->stub_bfd->sections;
-	     stub_sec != NULL;
-	     stub_sec = stub_sec->next)
-	  if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
-	    stub_sec->size = ((stub_sec->size + (1 << htab->plt_stub_align) - 1)
-			      & (-1 << htab->plt_stub_align));
-
       for (stub_sec = htab->stub_bfd->sections;
 	   stub_sec != NULL;
 	   stub_sec = stub_sec->next)
@@ -11994,14 +11779,6 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms,
   if (htab->relbrlt != NULL)
     htab->relbrlt->reloc_count = 0;
 
-  if (htab->plt_stub_align != 0)
-    for (stub_sec = htab->stub_bfd->sections;
-	 stub_sec != NULL;
-	 stub_sec = stub_sec->next)
-      if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
-	stub_sec->size = ((stub_sec->size + (1 << htab->plt_stub_align) - 1)
-			  & (-1 << htab->plt_stub_align));
-
   for (stub_sec = htab->stub_bfd->sections;
        stub_sec != NULL;
        stub_sec = stub_sec->next)
@@ -12035,16 +11812,14 @@ ppc64_elf_build_stubs (bfd_boolean emit_stub_syms,
 			 "  toc adjust   %lu\n"
 			 "  long branch  %lu\n"
 			 "  long toc adj %lu\n"
-			 "  plt call     %lu\n"
-			 "  plt call toc %lu"),
+			 "  plt call     %lu"),
 	       stub_sec_count,
 	       stub_sec_count == 1 ? "" : "s",
 	       htab->stub_count[ppc_stub_long_branch - 1],
 	       htab->stub_count[ppc_stub_long_branch_r2off - 1],
 	       htab->stub_count[ppc_stub_plt_branch - 1],
 	       htab->stub_count[ppc_stub_plt_branch_r2off - 1],
-	       htab->stub_count[ppc_stub_plt_call - 1],
-	       htab->stub_count[ppc_stub_plt_call_r2save - 1]);
+	       htab->stub_count[ppc_stub_plt_call - 1]);
     }
   return TRUE;
 }
@@ -12144,8 +11919,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
   bfd_vma TOCstart;
   bfd_boolean ret = TRUE;
   bfd_boolean is_opd;
-  /* Assume 'at' branch hints.  */
-  bfd_boolean is_isa_v2 = TRUE;
+  /* Disabled until we sort out how ld should choose 'y' vs 'at'.  */
+  bfd_boolean is_power4 = FALSE;
   bfd_vma d_offset = (bfd_big_endian (output_bfd) ? 2 : 0);
 
   /* Initialize howto table if needed.  */
@@ -12777,7 +12552,6 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 	  stub_entry = ppc_get_stub_entry (input_section, sec, fdh, rel, htab);
 	  if (stub_entry != NULL
 	      && (stub_entry->stub_type == ppc_stub_plt_call
-		  || stub_entry->stub_type == ppc_stub_plt_call_r2save
 		  || stub_entry->stub_type == ppc_stub_plt_branch_r2off
 		  || stub_entry->stub_type == ppc_stub_long_branch_r2off))
 	    {
@@ -12806,8 +12580,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 
 	      if (!can_plt_call)
 		{
-		  if (stub_entry->stub_type == ppc_stub_plt_call
-		      || stub_entry->stub_type == ppc_stub_plt_call_r2save)
+		  if (stub_entry->stub_type == ppc_stub_plt_call)
 		    {
 		      /* If this is a plain branch rather than a branch
 			 and link, don't require a nop.  However, don't
@@ -12854,8 +12627,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 		}
 
 	      if (can_plt_call
-		  && (stub_entry->stub_type == ppc_stub_plt_call
-		      || stub_entry->stub_type == ppc_stub_plt_call_r2save))
+		  && stub_entry->stub_type == ppc_stub_plt_call)
 		unresolved_reloc = FALSE;
 	    }
 
@@ -12901,10 +12673,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 			    + stub_entry->stub_sec->output_section->vma);
 	      addend = 0;
 
- 	      if ((stub_entry->stub_type == ppc_stub_plt_call
-		   || stub_entry->stub_type == ppc_stub_plt_call_r2save)
-		  && (ALWAYS_EMIT_R2SAVE
-		      || stub_entry->stub_type == ppc_stub_plt_call_r2save)
+ 	      if (stub_entry->stub_type == ppc_stub_plt_call
 		  && rel + 1 < relend
 		  && rel[1].r_offset == rel->r_offset + 4
 		  && ELF64_R_TYPE (rel[1].r_info) == R_PPC64_TOCSAVE)
@@ -12913,7 +12682,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 
 	  if (insn != 0)
 	    {
-	      if (is_isa_v2)
+	      if (is_power4)
 		{
 		  /* Set 'a' bit.  This is 0b00010 in BO field for branch
 		     on CR(BI) insns (BO == 001at or 011at), and 0b01000
@@ -13733,9 +13502,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->elf.def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->elf.def_dynamic))
 	{
 	  info->callbacks->einfo
 	    (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"),
@@ -14130,22 +13897,3 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
 }
 
 #include "elf64-target.h"
-
-/* FreeBSD support */
-
-#undef  TARGET_LITTLE_SYM
-#undef  TARGET_LITTLE_NAME
-
-#undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM	bfd_elf64_powerpc_freebsd_vec
-#undef  TARGET_BIG_NAME
-#define TARGET_BIG_NAME "elf64-powerpc-freebsd"
-
-#undef  ELF_OSABI
-#define	ELF_OSABI       ELFOSABI_FREEBSD
-
-#undef  elf64_bed
-#define elf64_bed	elf64_powerpc_fbsd_bed
-
-#include "elf64-target.h"
-
diff --git a/bfd/elf64-ppc.h b/bfd/elf64-ppc.h
index 2728b275b6..9026c56f82 100644
--- a/bfd/elf64-ppc.h
+++ b/bfd/elf64-ppc.h
@@ -1,5 +1,5 @@
 /* PowerPC64-specific support for 64-bit ELF.
-   Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2010, 2011, 2012
+   Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -49,7 +49,7 @@ bfd_boolean ppc64_elf_check_init_fini
 bfd_boolean ppc64_elf_next_input_section
   (struct bfd_link_info *, asection *);
 bfd_boolean ppc64_elf_size_stubs
-(struct bfd_link_info *, bfd_signed_vma, bfd_boolean, int, int);
+  (struct bfd_link_info *, bfd_signed_vma, bfd_boolean);
 bfd_boolean ppc64_elf_build_stubs
   (bfd_boolean, struct bfd_link_info *, char **);
 void ppc64_elf_restore_symbols
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 15e1f7eaaa..9884da03b6 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -1,6 +1,6 @@
 /* IBM S/390-specific support for 64-bit ELF
    Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012 Free Software Foundation, Inc.
+   2010, 2011 Free Software Foundation, Inc.
    Contributed Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -1630,6 +1630,13 @@ elf_s390_adjust_dynamic_symbol (struct bfd_link_info *info,
 	}
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -1647,7 +1654,7 @@ elf_s390_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* We must generate a R_390_COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the
      runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += sizeof (Elf64_External_Rela);
       h->needs_copy = 1;
@@ -2854,7 +2861,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	  continue;
 
 	case R_390_TLS_LDO64:
-	  if (info->shared || (input_section->flags & SEC_DEBUGGING))
+	  if (info->shared)
 	    relocation -= dtpoff_base (info);
 	  else
 	    /* When converting LDO to LE, we must negate.  */
@@ -2964,9 +2971,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	(*_bfd_error_handler)
 	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index d19bb07d5e..bbef2a216c 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1,6 +1,6 @@
 /* SuperH SH64-specific support for 64-bit ELF
    Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012 Free Software Foundation, Inc.
+   2010, 2011 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -1630,11 +1630,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 				 STT_DATALABEL on the way to it.  */
 			      | ((h->other & STO_SH5_ISA32) != 0
 				 && ! seen_stt_datalabel));
-	      else if (!info->relocatable
-		       && (_bfd_elf_section_offset (output_bfd, info,
-						    input_section,
-						    rel->r_offset)
-			   != (bfd_vma) -1))
+	      else if (!info->relocatable)
 		{
 		  (*_bfd_error_handler)
 		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
@@ -3376,6 +3372,13 @@ sh64_elf64_adjust_dynamic_symbol (struct bfd_link_info *info,
   if (!h->non_got_ref)
     return TRUE;
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -3393,7 +3396,7 @@ sh64_elf64_adjust_dynamic_symbol (struct bfd_link_info *info,
      copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       asection *srel;
 
diff --git a/bfd/elf64-tilegx.c b/bfd/elf64-tilegx.c
index bd5f653c0f..e30ca80948 100644
--- a/bfd/elf64-tilegx.c
+++ b/bfd/elf64-tilegx.c
@@ -87,11 +87,8 @@ tilegx_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 #define ELF_MAXPAGESIZE		0x10000
 #define ELF_COMMONPAGESIZE	0x10000
 
-
-#define TARGET_BIG_SYM          bfd_elf64_tilegx_be_vec
-#define TARGET_BIG_NAME         "elf64-tilegx-be"
-#define TARGET_LITTLE_SYM       bfd_elf64_tilegx_le_vec
-#define TARGET_LITTLE_NAME      "elf64-tilegx-le"
+#define TARGET_LITTLE_SYM       bfd_elf64_tilegx_vec
+#define TARGET_LITTLE_NAME	"elf64-tilegx"
 
 #define elf_backend_reloc_type_class	     tilegx_reloc_type_class
 
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index cc5ee42b81..3a2444b90c 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1,6 +1,6 @@
 /* X86-64 specific support for ELF
    Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012
+   2010, 2011
    Free Software Foundation, Inc.
    Contributed by Jan Hubicka <jh@suse.cz>.
 
@@ -420,6 +420,8 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 			    int note_type, ...)
 {
   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  const void *p;
+  int size;
   va_list ap;
   const char *fname, *psargs;
   long pid;
@@ -443,8 +445,8 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 	  memset (&data, 0, sizeof (data));
 	  strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
 	  strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
-	  return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type,
-				     &data, sizeof (data));
+	  p = (const void *) &data;
+	  size = sizeof (data);
 	}
       else
 	{
@@ -452,10 +454,10 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 	  memset (&data, 0, sizeof (data));
 	  strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
 	  strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
-	  return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type,
-				     &data, sizeof (data));
+	  p = (const void *) &data;
+	  size = sizeof (data);
 	}
-      /* NOTREACHED */
+      break;
 
     case NT_PRSTATUS:
       va_start (ap, note_type);
@@ -473,8 +475,8 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 	      prstat.pr_pid = pid;
 	      prstat.pr_cursig = cursig;
 	      memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
-	      return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type,
-					 &prstat, sizeof (prstat));
+	      p = (const void *) &prstat;
+	      size = sizeof (prstat);
 	    }
 	  else
 	    {
@@ -483,8 +485,8 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 	      prstat.pr_pid = pid;
 	      prstat.pr_cursig = cursig;
 	      memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
-	      return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type,
-					 &prstat, sizeof (prstat));
+	      p = (const void *) &prstat;
+	      size = sizeof (prstat);
 	    }
 	}
       else
@@ -494,11 +496,14 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 	  prstat.pr_pid = pid;
 	  prstat.pr_cursig = cursig;
 	  memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
-	  return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type,
-				     &prstat, sizeof (prstat));
+	  p = (const void *) &prstat;
+	  size = sizeof (prstat);
 	}
+      break;
     }
-  /* NOTREACHED */
+
+  return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type, p,
+			     size);
 }
 #endif
 
@@ -508,7 +513,7 @@ elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
    section.  */
 
 #define ELF64_DYNAMIC_INTERPRETER "/lib/ld64.so.1"
-#define ELF32_DYNAMIC_INTERPRETER "/lib/ldx32.so.1"
+#define ELF32_DYNAMIC_INTERPRETER "/lib/ld32.so.1"
 
 /* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
    copying dynamic variables from a shared lib into an app's dynbss
@@ -585,70 +590,6 @@ static const bfd_byte elf_x86_64_eh_frame_plt[] =
   DW_CFA_nop, DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
 };
 
-/* Architecture-specific backend data for x86-64.  */
-
-struct elf_x86_64_backend_data
-{
-  /* Templates for the initial PLT entry and for subsequent entries.  */
-  const bfd_byte *plt0_entry;
-  const bfd_byte *plt_entry;
-  unsigned int plt_entry_size;          /* Size of each PLT entry.  */
-
-  /* Offsets into plt0_entry that are to be replaced with GOT[1] and GOT[2].  */
-  unsigned int plt0_got1_offset;
-  unsigned int plt0_got2_offset;
-
-  /* Offset of the end of the PC-relative instruction containing
-     plt0_got2_offset.  */
-  unsigned int plt0_got2_insn_end;
-
-  /* Offsets into plt_entry that are to be replaced with...  */
-  unsigned int plt_got_offset;    /* ... address of this symbol in .got. */
-  unsigned int plt_reloc_offset;  /* ... offset into relocation table. */
-  unsigned int plt_plt_offset;    /* ... offset to start of .plt. */
-
-  /* Length of the PC-relative instruction containing plt_got_offset.  */
-  unsigned int plt_got_insn_size;
-
-  /* Offset of the end of the PC-relative jump to plt0_entry.  */
-  unsigned int plt_plt_insn_end;
-
-  /* Offset into plt_entry where the initial value of the GOT entry points.  */
-  unsigned int plt_lazy_offset;
-
-  /* .eh_frame covering the .plt section.  */
-  const bfd_byte *eh_frame_plt;
-  unsigned int eh_frame_plt_size;
-};
-
-#define get_elf_x86_64_backend_data(abfd) \
-  ((const struct elf_x86_64_backend_data *) \
-   get_elf_backend_data (abfd)->arch_data)
-
-#define GET_PLT_ENTRY_SIZE(abfd) \
-  get_elf_x86_64_backend_data (abfd)->plt_entry_size
-
-/* These are the standard parameters.  */
-static const struct elf_x86_64_backend_data elf_x86_64_arch_bed =
-  {
-    elf_x86_64_plt0_entry,              /* plt0_entry */
-    elf_x86_64_plt_entry,               /* plt_entry */
-    sizeof (elf_x86_64_plt_entry),      /* plt_entry_size */
-    2,                                  /* plt0_got1_offset */
-    8,                                  /* plt0_got2_offset */
-    12,                                 /* plt0_got2_insn_end */
-    2,                                  /* plt_got_offset */
-    7,                                  /* plt_reloc_offset */
-    12,                                 /* plt_plt_offset */
-    6,                                  /* plt_got_insn_size */
-    PLT_ENTRY_SIZE,                     /* plt_plt_insn_end */
-    6,                                  /* plt_lazy_offset */
-    elf_x86_64_eh_frame_plt,            /* eh_frame_plt */
-    sizeof (elf_x86_64_eh_frame_plt),   /* eh_frame_plt_size */
-  };
-
-#define	elf_backend_arch_data	&elf_x86_64_arch_bed
-
 /* x86-64 ELF linker hash entry.  */
 
 struct elf_x86_64_link_hash_entry
@@ -757,11 +698,6 @@ struct elf_x86_64_link_hash_table
   /* The offset into sgot of the GOT entry used by the PLT entry
      above.  */
   bfd_vma tlsdesc_got;
-
-  /* The index of the next R_X86_64_JUMP_SLOT entry in .rela.plt.  */
-  bfd_vma next_jump_slot_index;
-  /* The index of the next R_X86_64_IRELATIVE entry in .rela.plt.  */
-  bfd_vma next_irelative_index;
 };
 
 /* Get the x86-64 ELF linker hash table from a link_info structure.  */
@@ -785,8 +721,8 @@ elf_x86_64_link_hash_newfunc (struct bfd_hash_entry *entry,
   if (entry == NULL)
     {
       entry = (struct bfd_hash_entry *)
-	  bfd_hash_allocate (table,
-			     sizeof (struct elf_x86_64_link_hash_entry));
+          bfd_hash_allocate (table,
+                             sizeof (struct elf_x86_64_link_hash_entry));
       if (entry == NULL)
 	return entry;
     }
@@ -903,8 +839,6 @@ elf_x86_64_link_hash_table_create (bfd *abfd)
   ret->tls_ld_got.refcount = 0;
   ret->sgotplt_jump_table_size = 0;
   ret->tls_module_base = NULL;
-  ret->next_jump_slot_index = 0;
-  ret->next_irelative_index = 0;
 
   if (ABI_64_P (abfd))
     {
@@ -981,8 +915,6 @@ elf_x86_64_create_dynamic_sections (bfd *dynobj,
       && bfd_get_section_by_name (dynobj, ".eh_frame") == NULL
       && htab->elf.splt != NULL)
     {
-      const struct elf_x86_64_backend_data *const abed
-	= get_elf_x86_64_backend_data (dynobj);
       flagword flags = get_elf_backend_data (dynobj)->dynamic_sec_flags;
       htab->plt_eh_frame
 	= bfd_make_section_with_flags (dynobj, ".eh_frame",
@@ -991,11 +923,11 @@ elf_x86_64_create_dynamic_sections (bfd *dynobj,
 	  || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 3))
 	return FALSE;
 
-      htab->plt_eh_frame->size = abed->eh_frame_plt_size;
+      htab->plt_eh_frame->size = sizeof (elf_x86_64_eh_frame_plt);
       htab->plt_eh_frame->contents
 	= bfd_alloc (dynobj, htab->plt_eh_frame->size);
-      memcpy (htab->plt_eh_frame->contents,
-	      abed->eh_frame_plt, abed->eh_frame_plt_size);
+      memcpy (htab->plt_eh_frame->contents, elf_x86_64_eh_frame_plt,
+	      sizeof (elf_x86_64_eh_frame_plt));
     }
   return TRUE;
 }
@@ -1075,14 +1007,6 @@ elf64_x86_64_elf_object_p (bfd *abfd)
   return TRUE;
 }
 
-static bfd_boolean
-elf32_x86_64_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for an x86-64 elf32 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x64_32);
-  return TRUE;
-}
-
 /* Return TRUE if the TLS access code sequence support transition
    from R_TYPE.  */
 
@@ -1181,7 +1105,7 @@ elf_x86_64_check_tls_transition (bfd *abfd,
 
       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
       /* Use strncmp to check __tls_get_addr since __tls_get_addr
-	 may be versioned.  */
+	 may be versioned.  */ 
       return (h != NULL
 	      && h->root.root.string != NULL
 	      && (ELF32_R_TYPE (rel[1].r_info) == R_X86_64_PC32
@@ -2081,7 +2005,7 @@ elf_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
 	  if (h != NULL)
 	    {
 	      if (r_type == R_X86_64_GOTPLT64 && h->plt.refcount > 0)
-		h->plt.refcount -= 1;
+	        h->plt.refcount -= 1;
 	      if (h->got.refcount > 0)
 		h->got.refcount -= 1;
 	      if (h->type == STT_GNU_IFUNC)
@@ -2240,6 +2164,13 @@ elf_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
 	}
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.	 There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2257,7 +2188,7 @@ elf_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* We must generate a R_X86_64_COPY reloc to tell the dynamic linker
      to copy the initial value out of the dynamic object and into the
      runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       const struct elf_backend_data *bed;
       bed = get_elf_backend_data (info->output_bfd);
@@ -2281,7 +2212,6 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   struct elf_x86_64_link_hash_entry *eh;
   struct elf_dyn_relocs *p;
   const struct elf_backend_data *bed;
-  unsigned int plt_entry_size;
 
   if (h->root.type == bfd_link_hash_indirect)
     return TRUE;
@@ -2293,7 +2223,6 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   if (htab == NULL)
     return FALSE;
   bed = get_elf_backend_data (info->output_bfd);
-  plt_entry_size = GET_PLT_ENTRY_SIZE (info->output_bfd);
 
   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
      here if it is defined and referenced in a non-shared object.  */
@@ -2301,7 +2230,7 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
       && h->def_regular)
     return _bfd_elf_allocate_ifunc_dyn_relocs (info, h,
 					       &eh->dyn_relocs,
-					       plt_entry_size,
+					       PLT_ENTRY_SIZE,
 					       GOT_ENTRY_SIZE);
   else if (htab->elf.dynamic_sections_created
 	   && h->plt.refcount > 0)
@@ -2323,7 +2252,7 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
 	  /* If this is the first .plt entry, make room for the special
 	     first entry.  */
 	  if (s->size == 0)
-	    s->size += plt_entry_size;
+	    s->size += PLT_ENTRY_SIZE;
 
 	  h->plt.offset = s->size;
 
@@ -2340,7 +2269,7 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
 	    }
 
 	  /* Make room for this entry.  */
-	  s->size += plt_entry_size;
+	  s->size += PLT_ENTRY_SIZE;
 
 	  /* We also need to make an entry in the .got.plt section, which
 	     will be placed in the .got section by the linker script.  */
@@ -2738,18 +2667,10 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
      incremented.  However, when we reserve space for TLS descriptors,
      it's not incremented, so in order to compute the space reserved
      for them, it suffices to multiply the reloc count by the jump
-     slot size.
-
-     PR ld/13302: We start next_irelative_index at the end of .rela.plt
-     so that R_X86_64_IRELATIVE entries come last.  */
+     slot size.  */
   if (htab->elf.srelplt)
-    {
-      htab->sgotplt_jump_table_size
-	= elf_x86_64_compute_jump_table_size (htab);
-      htab->next_irelative_index = htab->elf.srelplt->reloc_count - 1;
-    }
-  else if (htab->elf.irelplt)
-    htab->next_irelative_index = htab->elf.irelplt->reloc_count - 1;
+    htab->sgotplt_jump_table_size
+      = elf_x86_64_compute_jump_table_size (htab);
 
   if (htab->tlsdesc_plt)
     {
@@ -2764,9 +2685,9 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
 	  /* Reserve room for the initial entry.
 	     FIXME: we could probably do away with it in this case.  */
 	  if (htab->elf.splt->size == 0)
-	    htab->elf.splt->size += GET_PLT_ENTRY_SIZE (output_bfd);
+	    htab->elf.splt->size += PLT_ENTRY_SIZE;
 	  htab->tlsdesc_plt = htab->elf.splt->size;
-	  htab->elf.splt->size += GET_PLT_ENTRY_SIZE (output_bfd);
+	  htab->elf.splt->size += PLT_ENTRY_SIZE;
 	}
     }
 
@@ -2778,7 +2699,7 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
 				  FALSE, FALSE, FALSE);
 
       /* Don't allocate .got.plt section if there are no GOT nor PLT
-	 entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
+         entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
       if ((got == NULL
 	   || !got->ref_regular_nonweak)
 	  && (htab->elf.sgotplt->size
@@ -2904,7 +2825,7 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
 	  /* If any dynamic relocs apply to a read-only section,
 	     then we need a DT_TEXTREL entry.  */
 	  if ((info->flags & DF_TEXTREL) == 0)
-	    elf_link_hash_traverse (&htab->elf,
+	    elf_link_hash_traverse (&htab->elf, 
 				    elf_x86_64_readonly_dynrelocs,
 				    info);
 
@@ -3057,7 +2978,6 @@ elf_x86_64_relocate_section (bfd *output_bfd,
   bfd_vma *local_tlsdesc_gotents;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
-  const unsigned int plt_entry_size = GET_PLT_ENTRY_SIZE (info->output_bfd);
 
   BFD_ASSERT (is_x86_64_elf (input_bfd));
 
@@ -3100,7 +3020,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	}
 
       if (r_type != (int) R_X86_64_32
-	  || ABI_64_P (output_bfd))
+	  || ABI_64_P (output_bfd)) 
 	howto = x86_64_elf_howto_table + r_type;
       else
 	howto = (x86_64_elf_howto_table
@@ -3127,7 +3047,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	      if (h == NULL)
 		abort ();
 
-	      /* Set STT_GNU_IFUNC symbol value.  */
+	      /* Set STT_GNU_IFUNC symbol value.  */ 
 	      h->root.u.def.value = sym->st_value;
 	      h->root.u.def.section = sec;
 	    }
@@ -3203,7 +3123,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	      if (ABI_64_P (output_bfd))
 		goto do_relocation;
 	      /* FALLTHROUGH */
-	    case R_X86_64_64:
+	    case R_X86_64_64: 
 	      if (rel->r_addend != 0)
 		{
 		  if (h->root.root.string)
@@ -3221,7 +3141,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 		}
 
 	      /* Generate dynamic relcoation only when there is a
-		 non-GOT reference in a shared object.  */
+		 non-GOF reference in a shared object.  */
 	      if (info->shared && h->non_got_ref)
 		{
 		  Elf_Internal_Rela outrel;
@@ -3288,13 +3208,13 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 
 		  if (htab->elf.splt != NULL)
 		    {
-		      plt_index = h->plt.offset / plt_entry_size - 1;
+		      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
 		      off = (plt_index + 3) * GOT_ENTRY_SIZE;
 		      base_got = htab->elf.sgotplt;
 		    }
 		  else
 		    {
-		      plt_index = h->plt.offset / plt_entry_size;
+		      plt_index = h->plt.offset / PLT_ENTRY_SIZE;
 		      off = plt_index * GOT_ENTRY_SIZE;
 		      base_got = htab->elf.igotplt;
 		    }
@@ -3303,9 +3223,9 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 		      || h->forced_local
 		      || info->symbolic)
 		    {
-		      /* This references the local defitionion.  We must
+		      /* This references the local defitionion.  We must 
 			 initialize this entry in the global offset table.
-			 Since the offset must always be a multiple of 8,
+			 Since the offset must always be a multiple of 8, 
 			 we use the least significant bit to record
 			 whether we have initialized it already.
 
@@ -3361,14 +3281,14 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 
 	      off = h->got.offset;
 	      if (h->needs_plt
-		  && h->plt.offset != (bfd_vma)-1
+	          && h->plt.offset != (bfd_vma)-1
 		  && off == (bfd_vma)-1)
 		{
 		  /* We can't use h->got.offset here to save
 		     state, or even just remember the offset, as
 		     finish_dynamic_symbol would use that as offset into
 		     .got.  */
-		  bfd_vma plt_index = h->plt.offset / plt_entry_size - 1;
+		  bfd_vma plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
 		  off = (plt_index + 3) * GOT_ENTRY_SIZE;
 		  base_got = htab->elf.sgotplt;
 		}
@@ -3399,7 +3319,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 		      bfd_put_64 (output_bfd, relocation,
 				  base_got->contents + off);
 		      /* Note that this is harmless for the GOTPLT64 case,
-			 as -1 | 1 still is -1.  */
+		         as -1 | 1 still is -1.  */
 		      h->got.offset |= 1;
 		    }
 		}
@@ -3464,9 +3384,8 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	  /* Check to make sure it isn't a protected function symbol
 	     for shared library since it may not be local when used
 	     as function address.  */
-	  if (!info->executable
+	  if (info->shared
 	      && h
-	      && !SYMBOLIC_BIND (info, h)
 	      && h->def_regular
 	      && h->type == STT_FUNC
 	      && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
@@ -3498,7 +3417,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	case R_X86_64_PLTOFF64:
 	  /* Relocation is PLT entry relative to GOT.  For local
 	     symbols it's the symbol itself relative to GOT.  */
-	  if (h != NULL
+          if (h != NULL
 	      /* See PLT32 handling.  */
 	      && h->plt.offset != (bfd_vma) -1
 	      && htab->elf.splt != NULL)
@@ -3541,6 +3460,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	case R_X86_64_PC16:
 	case R_X86_64_PC32:
 	  if (info->shared
+	      && ABI_64_P (output_bfd)
 	      && (input_section->flags & SEC_ALLOC) != 0
 	      && (input_section->flags & SEC_READONLY) != 0
 	      && h != NULL)
@@ -4166,9 +4086,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	(*_bfd_error_handler)
 	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
@@ -4232,8 +4150,6 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
 				  Elf_Internal_Sym *sym)
 {
   struct elf_x86_64_link_hash_table *htab;
-  const struct elf_x86_64_backend_data *const abed
-    = get_elf_x86_64_backend_data (output_bfd);
 
   htab = elf_x86_64_hash_table (info);
   if (htab == NULL)
@@ -4287,38 +4203,50 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
 
       if (plt == htab->elf.splt)
 	{
-	  got_offset = h->plt.offset / abed->plt_entry_size - 1;
-	  got_offset = (got_offset + 3) * GOT_ENTRY_SIZE;
+	  plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+	  got_offset = (plt_index + 3) * GOT_ENTRY_SIZE;
 	}
       else
 	{
-	  got_offset = h->plt.offset / abed->plt_entry_size;
-	  got_offset = got_offset * GOT_ENTRY_SIZE;
+	  plt_index = h->plt.offset / PLT_ENTRY_SIZE;
+	  got_offset = plt_index * GOT_ENTRY_SIZE;
 	}
 
       /* Fill in the entry in the procedure linkage table.  */
-      memcpy (plt->contents + h->plt.offset, abed->plt_entry,
-	      abed->plt_entry_size);
-
-      /* Insert the relocation positions of the plt section.  */
-
-      /* Put offset the PC-relative instruction referring to the GOT entry,
-	 subtracting the size of that instruction.  */
+      memcpy (plt->contents + h->plt.offset, elf_x86_64_plt_entry,
+	      PLT_ENTRY_SIZE);
+
+      /* Insert the relocation positions of the plt section.  The magic
+	 numbers at the end of the statements are the positions of the
+	 relocations in the plt section.  */
+      /* Put offset for jmp *name@GOTPCREL(%rip), since the
+	 instruction uses 6 bytes, subtract this value.  */
       bfd_put_32 (output_bfd,
-		  (gotplt->output_section->vma
-		   + gotplt->output_offset
-		   + got_offset
-		   - plt->output_section->vma
-		   - plt->output_offset
-		   - h->plt.offset
-		   - abed->plt_got_insn_size),
-		  plt->contents + h->plt.offset + abed->plt_got_offset);
+		      (gotplt->output_section->vma
+		       + gotplt->output_offset
+		       + got_offset
+		       - plt->output_section->vma
+		       - plt->output_offset
+		       - h->plt.offset
+		       - 6),
+		  plt->contents + h->plt.offset + 2);
+
+      /* Don't fill PLT entry for static executables.  */
+      if (plt == htab->elf.splt)
+	{
+	  /* Put relocation index.  */
+	  bfd_put_32 (output_bfd, plt_index,
+		      plt->contents + h->plt.offset + 7);
+	  /* Put offset for jmp .PLT0.  */
+	  bfd_put_32 (output_bfd, - (h->plt.offset + PLT_ENTRY_SIZE),
+		      plt->contents + h->plt.offset + 12);
+	}
 
       /* Fill in the entry in the global offset table, initially this
-	 points to the second part of the PLT entry.  */
+	 points to the pushq instruction in the PLT which is at offset 6.  */
       bfd_put_64 (output_bfd, (plt->output_section->vma
 			       + plt->output_offset
-			       + h->plt.offset + abed->plt_lazy_offset),
+			       + h->plt.offset + 6),
 		  gotplt->contents + got_offset);
 
       /* Fill in the entry in the .rela.plt section.  */
@@ -4337,25 +4265,11 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
 	  rela.r_addend = (h->root.u.def.value
 			   + h->root.u.def.section->output_section->vma
 			   + h->root.u.def.section->output_offset);
-	  /* R_X86_64_IRELATIVE comes last.  */
-	  plt_index = htab->next_irelative_index--;
 	}
       else
 	{
 	  rela.r_info = htab->r_info (h->dynindx, R_X86_64_JUMP_SLOT);
 	  rela.r_addend = 0;
-	  plt_index = htab->next_jump_slot_index++;
-	}
-
-      /* Don't fill PLT entry for static executables.  */
-      if (plt == htab->elf.splt)
-	{
-	  /* Put relocation index.  */
-	  bfd_put_32 (output_bfd, plt_index,
-		      plt->contents + h->plt.offset + abed->plt_reloc_offset);
-	  /* Put offset for jmp .PLT0.  */
-	  bfd_put_32 (output_bfd, - (h->plt.offset + abed->plt_plt_insn_end),
-		      plt->contents + h->plt.offset + abed->plt_plt_offset);
 	}
 
       bed = get_elf_backend_data (output_bfd);
@@ -4487,7 +4401,7 @@ elf_x86_64_finish_local_dynamic_symbol (void **slot, void *inf)
   struct elf_link_hash_entry *h
     = (struct elf_link_hash_entry *) *slot;
   struct bfd_link_info *info
-    = (struct bfd_link_info *) inf;
+    = (struct bfd_link_info *) inf; 
 
   return elf_x86_64_finish_dynamic_symbol (info->output_bfd,
 					     info, h, NULL);
@@ -4521,8 +4435,6 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
   struct elf_x86_64_link_hash_table *htab;
   bfd *dynobj;
   asection *sdyn;
-  const struct elf_x86_64_backend_data *const abed
-    = get_elf_x86_64_backend_data (output_bfd);
 
   htab = elf_x86_64_hash_table (info);
   if (htab == NULL)
@@ -4605,8 +4517,8 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
       if (htab->elf.splt && htab->elf.splt->size > 0)
 	{
 	  /* Fill in the first entry in the procedure linkage table.  */
-	  memcpy (htab->elf.splt->contents,
-		  abed->plt0_entry, abed->plt_entry_size);
+	  memcpy (htab->elf.splt->contents, elf_x86_64_plt0_entry,
+		  PLT_ENTRY_SIZE);
 	  /* Add offset for pushq GOT+8(%rip), since the instruction
 	     uses 6 bytes subtract this value.  */
 	  bfd_put_32 (output_bfd,
@@ -4616,20 +4528,20 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
 		       - htab->elf.splt->output_section->vma
 		       - htab->elf.splt->output_offset
 		       - 6),
-		      htab->elf.splt->contents + abed->plt0_got1_offset);
-	  /* Add offset for the PC-relative instruction accessing GOT+16,
-	     subtracting the offset to the end of that instruction.  */
+		      htab->elf.splt->contents + 2);
+	  /* Add offset for jmp *GOT+16(%rip). The 12 is the offset to
+	     the end of the instruction.  */
 	  bfd_put_32 (output_bfd,
 		      (htab->elf.sgotplt->output_section->vma
 		       + htab->elf.sgotplt->output_offset
 		       + 16
 		       - htab->elf.splt->output_section->vma
 		       - htab->elf.splt->output_offset
-		       - abed->plt0_got2_insn_end),
-		      htab->elf.splt->contents + abed->plt0_got2_offset);
+		       - 12),
+		      htab->elf.splt->contents + 8);
 
-	  elf_section_data (htab->elf.splt->output_section)
-	    ->this_hdr.sh_entsize = abed->plt_entry_size;
+	  elf_section_data (htab->elf.splt->output_section)->this_hdr.sh_entsize =
+	    PLT_ENTRY_SIZE;
 
 	  if (htab->tlsdesc_plt)
 	    {
@@ -4637,7 +4549,8 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
 			  htab->elf.sgot->contents + htab->tlsdesc_got);
 
 	      memcpy (htab->elf.splt->contents + htab->tlsdesc_plt,
-		      abed->plt0_entry, abed->plt_entry_size);
+		      elf_x86_64_plt0_entry,
+		      PLT_ENTRY_SIZE);
 
 	      /* Add offset for pushq GOT+8(%rip), since the
 		 instruction uses 6 bytes subtract this value.  */
@@ -4649,11 +4562,10 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
 			   - htab->elf.splt->output_offset
 			   - htab->tlsdesc_plt
 			   - 6),
-			  htab->elf.splt->contents
-			  + htab->tlsdesc_plt + abed->plt0_got1_offset);
-	  /* Add offset for the PC-relative instruction accessing GOT+TDG,
-	     where TGD stands for htab->tlsdesc_got, subtracting the offset
-	     to the end of that instruction.  */
+			  htab->elf.splt->contents + htab->tlsdesc_plt + 2);
+	      /* Add offset for jmp *GOT+TDG(%rip), where TGD stands for
+		 htab->tlsdesc_got. The 12 is the offset to the end of
+		 the instruction.  */
 	      bfd_put_32 (output_bfd,
 			  (htab->elf.sgot->output_section->vma
 			   + htab->elf.sgot->output_offset
@@ -4661,9 +4573,8 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
 			   - htab->elf.splt->output_section->vma
 			   - htab->elf.splt->output_offset
 			   - htab->tlsdesc_plt
-			   - abed->plt0_got2_insn_end),
-			  htab->elf.splt->contents
-			  + htab->tlsdesc_plt + abed->plt0_got2_offset);
+			   - 12),
+			  htab->elf.splt->contents + htab->tlsdesc_plt + 8);
 	    }
 	}
     }
@@ -4743,7 +4654,7 @@ static bfd_vma
 elf_x86_64_plt_sym_val (bfd_vma i, const asection *plt,
 			const arelent *rel ATTRIBUTE_UNUSED)
 {
-  return plt->vma + (i + 1) * GET_PLT_ENTRY_SIZE (plt->owner);
+  return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
 }
 
 /* Handle an x86-64 specific section when reading an object file.  This
@@ -5096,179 +5007,6 @@ static const struct bfd_elf_special_section
 
 #include "elf64-target.h"
 
-/* Native Client support.  */
-
-#undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf64_x86_64_nacl_vec
-#undef	TARGET_LITTLE_NAME
-#define	TARGET_LITTLE_NAME		"elf64-x86-64-nacl"
-#undef	elf64_bed
-#define	elf64_bed			elf64_x86_64_nacl_bed
-
-#undef	ELF_MAXPAGESIZE
-#undef	ELF_MINPAGESIZE
-#undef	ELF_COMMONPAGESIZE
-#define ELF_MAXPAGESIZE			0x10000
-#define ELF_MINPAGESIZE			0x10000
-#define ELF_COMMONPAGESIZE		0x10000
-
-/* Restore defaults.  */
-#undef	ELF_OSABI
-#undef	elf_backend_static_tls_alignment
-#undef	elf_backend_want_plt_sym
-#define elf_backend_want_plt_sym	0
-
-/* NaCl uses substantially different PLT entries for the same effects.  */
-
-#undef	elf_backend_plt_alignment
-#define elf_backend_plt_alignment	5
-#define NACL_PLT_ENTRY_SIZE		64
-#define	NACLMASK			0xe0 /* 32-byte alignment mask.  */
-
-static const bfd_byte elf_x86_64_nacl_plt0_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0xff, 0x35, 8, 0, 0, 0,             /* pushq GOT+8(%rip) 		*/
-    0x4c, 0x8b, 0x1d, 16, 0, 0, 0,	/* mov GOT+16(%rip), %r11	*/
-    0x41, 0x83, 0xe3, NACLMASK,         /* and $-32, %r11d		*/
-    0x4d, 0x01, 0xfb,             	/* add %r15, %r11		*/
-    0x41, 0xff, 0xe3,             	/* jmpq *%r11			*/
-
-    /* 41 bytes of nop to pad out to the standard size.  */
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data32 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data32 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-    0x66, 0x66,                            /* excess data32 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-  };
-
-static const bfd_byte elf_x86_64_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0x4c, 0x8b, 0x1d, 0, 0, 0, 0,	/* mov name@GOTPCREL(%rip),%r11	*/
-    0x41, 0x83, 0xe3, NACLMASK,         /* and $-32, %r11d		*/
-    0x4d, 0x01, 0xfb,             	/* add %r15, %r11		*/
-    0x41, 0xff, 0xe3,             	/* jmpq *%r11			*/
-
-    /* 15-byte nop sequence to pad out to the next 32-byte boundary.  */
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data32 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-
-    /* Lazy GOT entries point here (32-byte aligned).  */
-    0x68,                 /* pushq immediate */
-    0, 0, 0, 0,           /* replaced with index into relocation table.  */
-    0xe9,                 /* jmp relative */
-    0, 0, 0, 0,           /* replaced with offset to start of .plt0.  */
-
-    /* 22 bytes of nop to pad out to the standard size.  */
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data32 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-    0x0f, 0x1f, 0x80, 0, 0, 0, 0,          /* nopl 0x0(%rax)		*/
-  };
-
-/* .eh_frame covering the .plt section.  */
-
-static const bfd_byte elf_x86_64_nacl_eh_frame_plt[] =
-  {
-#if (PLT_CIE_LENGTH != 20                               \
-     || PLT_FDE_LENGTH != 36                            \
-     || PLT_FDE_START_OFFSET != 4 + PLT_CIE_LENGTH + 8  \
-     || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
-# error "Need elf_x86_64_backend_data parameters for eh_frame_plt offsets!"
-#endif
-    PLT_CIE_LENGTH, 0, 0, 0,	/* CIE length */
-    0, 0, 0, 0,			/* CIE ID */
-    1,				/* CIE version */
-    'z', 'R', 0,                /* Augmentation string */
-    1,				/* Code alignment factor */
-    0x78,                       /* Data alignment factor */
-    16,				/* Return address column */
-    1,				/* Augmentation size */
-    DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding */
-    DW_CFA_def_cfa, 7, 8,	/* DW_CFA_def_cfa: r7 (rsp) ofs 8 */
-    DW_CFA_offset + 16, 1,	/* DW_CFA_offset: r16 (rip) at cfa-8 */
-    DW_CFA_nop, DW_CFA_nop,
-
-    PLT_FDE_LENGTH, 0, 0, 0,	/* FDE length */
-    PLT_CIE_LENGTH + 8, 0, 0, 0,/* CIE pointer */
-    0, 0, 0, 0,			/* R_X86_64_PC32 .plt goes here */
-    0, 0, 0, 0,			/* .plt size goes here */
-    0,				/* Augmentation size */
-    DW_CFA_def_cfa_offset, 16,	/* DW_CFA_def_cfa_offset: 16 */
-    DW_CFA_advance_loc + 6,	/* DW_CFA_advance_loc: 6 to __PLT__+6 */
-    DW_CFA_def_cfa_offset, 24,	/* DW_CFA_def_cfa_offset: 24 */
-    DW_CFA_advance_loc + 58,	/* DW_CFA_advance_loc: 58 to __PLT__+64 */
-    DW_CFA_def_cfa_expression,	/* DW_CFA_def_cfa_expression */
-    13,				/* Block length */
-    DW_OP_breg7, 8,		/* DW_OP_breg7 (rsp): 8 */
-    DW_OP_breg16, 0,		/* DW_OP_breg16 (rip): 0 */
-    DW_OP_const1u, 63, DW_OP_and, DW_OP_const1u, 37, DW_OP_ge,
-    DW_OP_lit3, DW_OP_shl, DW_OP_plus,
-    DW_CFA_nop, DW_CFA_nop
-  };
-
-static const struct elf_x86_64_backend_data elf_x86_64_nacl_arch_bed =
-  {
-    elf_x86_64_nacl_plt0_entry,              /* plt0_entry */
-    elf_x86_64_nacl_plt_entry,               /* plt_entry */
-    NACL_PLT_ENTRY_SIZE,                     /* plt_entry_size */
-    2,                                       /* plt0_got1_offset */
-    9,                                       /* plt0_got2_offset */
-    13,                                      /* plt0_got2_insn_end */
-    3,                                       /* plt_got_offset */
-    33,                                      /* plt_reloc_offset */
-    38,                                      /* plt_plt_offset */
-    7,                                       /* plt_got_insn_size */
-    42,                                      /* plt_plt_insn_end */
-    32,                                      /* plt_lazy_offset */
-    elf_x86_64_nacl_eh_frame_plt,            /* eh_frame_plt */
-    sizeof (elf_x86_64_nacl_eh_frame_plt),   /* eh_frame_plt_size */
-  };
-
-#undef	elf_backend_arch_data
-#define	elf_backend_arch_data	&elf_x86_64_nacl_arch_bed
-
-#include "elf64-target.h"
-
-/* Native Client x32 support.  */
-
-#undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		bfd_elf32_x86_64_nacl_vec
-#undef  TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		"elf32-x86-64-nacl"
-#undef	elf32_bed
-#define	elf32_bed			elf32_x86_64_nacl_bed
-
-#define bfd_elf32_bfd_link_hash_table_create \
-  elf_x86_64_link_hash_table_create
-#define bfd_elf32_bfd_link_hash_table_free \
-  elf_x86_64_link_hash_table_free
-#define bfd_elf32_bfd_reloc_type_lookup	\
-  elf_x86_64_reloc_type_lookup
-#define bfd_elf32_bfd_reloc_name_lookup \
-  elf_x86_64_reloc_name_lookup
-#define bfd_elf32_mkobject \
-  elf_x86_64_mkobject
-
-#undef elf_backend_object_p
-#define elf_backend_object_p \
-  elf32_x86_64_elf_object_p
-
-#undef elf_backend_bfd_from_remote_memory
-#define elf_backend_bfd_from_remote_memory \
-  _bfd_elf32_bfd_from_remote_memory
-
-#undef elf_backend_size_info
-#define elf_backend_size_info \
-  _bfd_elf32_size_info
-
-#include "elf32-target.h"
-
-/* Restore defaults.  */
-#undef elf_backend_object_p
-#define elf_backend_object_p		    elf64_x86_64_elf_object_p
-#undef elf_backend_bfd_from_remote_memory
-#undef elf_backend_size_info
-
 /* Intel L1OM support.  */
 
 static bfd_boolean
@@ -5297,17 +5035,10 @@ elf64_l1om_elf_object_p (bfd *abfd)
 #undef elf_backend_object_p
 #define elf_backend_object_p		    elf64_l1om_elf_object_p
 
-/* Restore defaults.  */
-#undef	ELF_MAXPAGESIZE
-#undef	ELF_MINPAGESIZE
-#undef	ELF_COMMONPAGESIZE
-#define ELF_MAXPAGESIZE			0x200000
-#define ELF_MINPAGESIZE			0x1000
-#define ELF_COMMONPAGESIZE		0x1000
-#undef	elf_backend_plt_alignment
-#define elf_backend_plt_alignment	4
-#undef	elf_backend_arch_data
-#define	elf_backend_arch_data	&elf_x86_64_arch_bed
+#undef  elf_backend_static_tls_alignment
+
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	    0
 
 #include "elf64-target.h"
 
@@ -5378,11 +5109,18 @@ elf64_k1om_elf_object_p (bfd *abfd)
 
 /* 32bit x86-64 support.  */
 
+static bfd_boolean
+elf32_x86_64_elf_object_p (bfd *abfd)
+{
+  /* Set the right machine number for an x86-64 elf32 file.  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x64_32);
+  return TRUE;
+}
+
 #undef  TARGET_LITTLE_SYM
 #define TARGET_LITTLE_SYM		    bfd_elf32_x86_64_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf32-x86-64"
-#undef	elf32_bed
 
 #undef ELF_ARCH
 #define ELF_ARCH			    bfd_arch_i386
@@ -5390,6 +5128,17 @@ elf64_k1om_elf_object_p (bfd *abfd)
 #undef	ELF_MACHINE_CODE
 #define ELF_MACHINE_CODE		    EM_X86_64
 
+#define bfd_elf32_bfd_link_hash_table_create \
+  elf_x86_64_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+  elf_x86_64_link_hash_table_free
+#define bfd_elf32_bfd_reloc_type_lookup	\
+  elf_x86_64_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  elf_x86_64_reloc_name_lookup
+#define bfd_elf32_mkobject \
+  elf_x86_64_mkobject
+
 #undef	ELF_OSABI
 
 #undef elf_backend_object_p
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 22448744a8..b7e022614c 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1097,28 +1097,8 @@ elf_checksum_contents (bfd *abfd,
       elf_swap_shdr_out (abfd, &i_shdr, &x_shdr);
       (*process) (&x_shdr, sizeof x_shdr, arg);
 
-      /* PR ld/12451:
-	 Process the section's contents, if it has some.  Read them in if necessary.  */
       if (i_shdr.contents)
 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
-      else if (i_shdr.sh_type != SHT_NOBITS)
-	{
-	  asection *sec;
-
-	  sec = bfd_section_from_elf_index (abfd, count);
-	  if (sec != NULL)
-	    {
-	      if (sec->contents == NULL)
-		{
-		  /* Force rereading from file.  */
-		  sec->flags &= ~SEC_IN_MEMORY;
-		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
-		    continue;
-		}
-	      if (sec->contents != NULL)
-		(*process) (sec->contents, i_shdr.sh_size, arg);
-	    }
-	}
     }
 
   return TRUE;
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 3236911744..fc4266b36d 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -2510,21 +2510,23 @@ _bfd_elf_fix_symbol_flags (struct elf_link_hash_entry *h,
      over to the real definition.  */
   if (h->u.weakdef != NULL)
     {
+      struct elf_link_hash_entry *weakdef;
+
+      weakdef = h->u.weakdef;
+      while (h->root.type == bfd_link_hash_indirect)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      BFD_ASSERT (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak);
+      BFD_ASSERT (weakdef->def_dynamic);
+
       /* If the real definition is defined by a regular object file,
 	 don't do anything special.  See the longer description in
 	 _bfd_elf_adjust_dynamic_symbol, below.  */
-      if (h->u.weakdef->def_regular)
+      if (weakdef->def_regular)
 	h->u.weakdef = NULL;
       else
 	{
-	  struct elf_link_hash_entry *weakdef = h->u.weakdef;
-
-	  while (h->root.type == bfd_link_hash_indirect)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
-	  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak);
-	  BFD_ASSERT (weakdef->def_dynamic);
 	  BFD_ASSERT (weakdef->root.type == bfd_link_hash_defined
 		      || weakdef->root.type == bfd_link_hash_defweak);
 	  (*bed->elf_backend_copy_indirect_symbol) (eif->info, weakdef, h);
@@ -9747,12 +9749,23 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
 			      r_symndx = osec->target_index;
 			      if (r_symndx == STN_UNDEF)
 				{
-				  irela->r_addend += osec->vma;
-				  osec = _bfd_nearby_section (output_bfd, osec,
-							      osec->vma);
-				  irela->r_addend -= osec->vma;
-				  r_symndx = osec->target_index;
+				  struct elf_link_hash_table *htab;
+				  asection *oi;
+
+				  htab = elf_hash_table (finfo->info);
+				  oi = htab->text_index_section;
+				  if ((osec->flags & SEC_READONLY) == 0
+				      && htab->data_index_section != NULL)
+				    oi = htab->data_index_section;
+
+				  if (oi != NULL)
+				    {
+				      irela->r_addend += osec->vma - oi->vma;
+				      r_symndx = oi->target_index;
+				    }
 				}
+
+			      BFD_ASSERT (r_symndx != STN_UNDEF);
 			    }
 			}
 
@@ -11175,12 +11188,15 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
 	goto error_return;
 
       /* Check for DT_TEXTREL (late, in case the backend removes it).  */
-      if (((info->warn_shared_textrel && info->shared)
-	   || info->error_textrel)
-	  && (o = bfd_get_section_by_name (dynobj, ".dynamic")) != NULL)
+      if ((info->warn_shared_textrel && info->shared)
+	  || info->error_textrel)
 	{
 	  bfd_byte *dyncon, *dynconend;
 
+	  /* Fix up .dynamic entries.  */
+	  o = bfd_get_section_by_name (dynobj, ".dynamic");
+	  BFD_ASSERT (o != NULL);
+
 	  dyncon = o->contents;
 	  dynconend = o->contents + o->size;
 	  for (; dyncon < dynconend; dyncon += bed->s->sizeof_dyn)
@@ -11561,13 +11577,6 @@ _bfd_elf_gc_mark_rsec (struct bfd_link_info *info, asection *sec,
       while (h->root.type == bfd_link_hash_indirect
 	     || h->root.type == bfd_link_hash_warning)
 	h = (struct elf_link_hash_entry *) h->root.u.i.link;
-      h->mark = 1;
-      /* If this symbol is weak and there is a non-weak definition, we
-	 keep the non-weak definition because many backends put
-	 dynamic reloc info on the non-weak definition for code
-	 handling copy relocs.  */
-      if (h->u.weakdef != NULL)
-	h->u.weakdef->mark = 1;
       return (*gc_mark_hook) (sec, info, cookie->rel, h, NULL);
     }
 
@@ -11715,21 +11724,14 @@ struct elf_gc_sweep_symbol_info
 static bfd_boolean
 elf_gc_sweep_symbol (struct elf_link_hash_entry *h, void *data)
 {
-  if (!h->mark
-      && (((h->root.type == bfd_link_hash_defined
-	    || h->root.type == bfd_link_hash_defweak)
-	   && !(h->def_regular
-		&& h->root.u.def.section->gc_mark))
-	  || h->root.type == bfd_link_hash_undefined
-	  || h->root.type == bfd_link_hash_undefweak))
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && !h->root.u.def.section->gc_mark
+      && !(h->root.u.def.section->owner->flags & DYNAMIC))
     {
-      struct elf_gc_sweep_symbol_info *inf;
-
-      inf = (struct elf_gc_sweep_symbol_info *) data;
+      struct elf_gc_sweep_symbol_info *inf =
+          (struct elf_gc_sweep_symbol_info *) data;
       (*inf->hide_symbol) (inf->info, h, TRUE);
-      h->def_regular = 0;
-      h->ref_regular = 0;
-      h->ref_regular_nonweak = 0;
     }
 
   return TRUE;
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 6728371b4f..00ec8b0c9b 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -1302,7 +1302,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPMOD32",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1316,7 +1316,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPREL32",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1334,7 +1334,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_GD",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1349,7 +1349,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_LDM",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1364,7 +1364,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1379,7 +1379,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1394,7 +1394,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_GOTTPREL",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1409,7 +1409,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_TPREL32",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0xffffffff,		/* src_mask */
 	 0xffffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1426,7 +1426,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_TPREL_HI16", /* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1441,7 +1441,7 @@ static reloc_howto_type elf_mips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS_TLS_TPREL_LO16", /* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1555,111 +1555,6 @@ static reloc_howto_type elf_mips16_howto_table_rel[] =
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS general dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_GD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GD",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_LDM,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_LDM",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_HI16",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_LO16",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_GOTTPREL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GOTTPREL",	/* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_HI16", /* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_LO16", /* name */
-	 TRUE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
 };
 
 static reloc_howto_type elf_mips16_howto_table_rela[] =
@@ -1678,7 +1573,7 @@ static reloc_howto_type elf_mips16_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS16_26",		/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1693,7 +1588,7 @@ static reloc_howto_type elf_mips16_howto_table_rela[] =
 	 mips16_gprel_reloc,	/* special_function */
 	 "R_MIPS16_GPREL",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1708,7 +1603,7 @@ static reloc_howto_type elf_mips16_howto_table_rela[] =
 	 _bfd_mips_elf_got16_reloc, /* special_function */
 	 "R_MIPS16_GOT16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1723,7 +1618,7 @@ static reloc_howto_type elf_mips16_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MIPS16_CALL16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,	        /* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1738,7 +1633,7 @@ static reloc_howto_type elf_mips16_howto_table_rela[] =
 	 _bfd_mips_elf_hi16_reloc, /* special_function */
 	 "R_MIPS16_HI16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -1753,111 +1648,6 @@ static reloc_howto_type elf_mips16_howto_table_rela[] =
 	 _bfd_mips_elf_lo16_reloc, /* special_function */
 	 "R_MIPS16_LO16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS general dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_GD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GD",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic variable reference.  */
-  HOWTO (R_MIPS16_TLS_LDM,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_LDM",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_HI16",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS local dynamic offset.  */
-  HOWTO (R_MIPS16_TLS_DTPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_DTPREL_LO16",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_GOTTPREL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_GOTTPREL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_HI16", /* name */
-	 FALSE,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* MIPS16 TLS thread pointer offset.  */
-  HOWTO (R_MIPS16_TLS_TPREL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_generic_reloc, /* special_function */
-	 "R_MIPS16_TLS_TPREL_LO16", /* name */
-	 FALSE,			/* partial_inplace */
 	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
@@ -2171,7 +1961,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_26_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x3ffffff,		/* src_mask */
 	 0x3ffffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2186,7 +1976,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_hi16_reloc, /* special_function */
 	 "R_MICROMIPS_HI16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2201,7 +1991,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_lo16_reloc, /* special_function */
 	 "R_MICROMIPS_LO16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2216,7 +2006,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
 	 "R_MICROMIPS_GPREL16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2231,7 +2021,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
 	 "R_MICROMIPS_LITERAL",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2246,7 +2036,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_got16_reloc, /* special_function */
 	 "R_MICROMIPS_GOT16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2261,7 +2051,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_PC7_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000007f,		/* src_mask */
 	 0x0000007f,		/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
@@ -2275,7 +2065,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_PC10_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x000003ff,		/* src_mask */
 	 0x000003ff,		/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
@@ -2289,7 +2079,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_PC16_S1",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 TRUE),			/* pcrel_offset */
 
@@ -2304,7 +2094,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_CALL16",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2322,7 +2112,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_DISP",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2337,7 +2127,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_PAGE",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2352,7 +2142,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_OFST",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2367,7 +2157,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_HI16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2382,7 +2172,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_GOT_LO16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2397,7 +2187,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_SUB",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 MINUS_ONE,		/* src_mask */
 	 MINUS_ONE,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2412,7 +2202,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_HIGHER",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2427,7 +2217,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_HIGHEST",	/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2442,7 +2232,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_CALL_HI16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
@@ -2457,7 +2247,7 @@ static reloc_howto_type elf_micromips_howto_table_rela[] =
 	 _bfd_mips_elf_generic_reloc, /* special_function */
 	 "R_MICROMIPS_CALL_LO16",/* name */
 	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
+	 0x0000ffff,		/* src_mask */
 	 0x0000ffff,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 };
@@ -2934,15 +2724,6 @@ static const struct elf_reloc_map mips16_reloc_map[] =
   { BFD_RELOC_MIPS16_CALL16, R_MIPS16_CALL16 - R_MIPS16_min },
   { BFD_RELOC_MIPS16_HI16_S, R_MIPS16_HI16 - R_MIPS16_min },
   { BFD_RELOC_MIPS16_LO16, R_MIPS16_LO16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_GD, R_MIPS16_TLS_GD - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_LDM, R_MIPS16_TLS_LDM - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_DTPREL_HI16,
-    R_MIPS16_TLS_DTPREL_HI16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_DTPREL_LO16,
-    R_MIPS16_TLS_DTPREL_LO16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_GOTTPREL, R_MIPS16_TLS_GOTTPREL - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_TPREL_HI16, R_MIPS16_TLS_TPREL_HI16 - R_MIPS16_min },
-  { BFD_RELOC_MIPS16_TLS_TPREL_LO16, R_MIPS16_TLS_TPREL_LO16 - R_MIPS16_min }
 };
 
 static const struct elf_reloc_map micromips_reloc_map[] =
diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index d70b28e9d3..3e2ee0b030 100644
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -5036,27 +5036,18 @@ elfNN_vms_object_p (bfd *abfd)
 	  flagword flags;
 	  char *nname = NULL;
 
-	  /* Find a section covering [base_vma;limit_vma)  */
+	  /* Find a section covering base_vma.  */
 	  for (sec = abfd->sections; sec != NULL; sec = sec->next)
 	    {
-	      /* Skip uninteresting sections (either not in memory or
-		 below base_vma.  */
-	      if ((sec->flags & (SEC_ALLOC | SEC_LOAD)) == 0
-		  || sec->vma + sec->size <= base_vma)
+	      if ((sec->flags & (SEC_ALLOC | SEC_LOAD)) == 0)
 		continue;
-	      if (sec->vma <= base_vma)
+	      if (sec->vma <= base_vma && sec->vma + sec->size > base_vma)
 		{
-		  /* This section covers (maybe partially) the beginning
-		     of the range.  */
 		  base_vma = sec->vma + sec->size;
 		  goto again;
 		}
-	      if (sec->vma < next_vma)
-		{
-		  /* This section partially covers the end of the range.
-		     Used to compute the size of the hole.  */
-		  next_vma = sec->vma;
-		}
+	      if (sec->vma < next_vma && sec->vma + sec->size >= base_vma)
+		next_vma = sec->vma;
 	    }
 
 	  /* No section covering [base_vma; next_vma).  Create a fake one.  */
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 7401d1fd2a..33a454d949 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -436,8 +436,8 @@ struct mips_elf_link_hash_table
      entry is set to the address of __rld_obj_head as in IRIX5.  */
   bfd_boolean use_rld_obj_head;
 
-  /* The  __rld_map or __rld_obj_head symbol. */
-  struct elf_link_hash_entry *rld_symbol;
+  /* This is the value of the __rld_map or __rld_obj_head symbol.  */
+  bfd_vma rld_value;
 
   /* This is set if we see any mips16 stub sections.  */
   bfd_boolean mips16_stubs_seen;
@@ -529,13 +529,6 @@ struct mips_htab_traverse_info
    || r_type == R_MIPS_TLS_TPREL64		\
    || r_type == R_MIPS_TLS_TPREL_HI16		\
    || r_type == R_MIPS_TLS_TPREL_LO16		\
-   || r_type == R_MIPS16_TLS_GD			\
-   || r_type == R_MIPS16_TLS_LDM		\
-   || r_type == R_MIPS16_TLS_DTPREL_HI16	\
-   || r_type == R_MIPS16_TLS_DTPREL_LO16	\
-   || r_type == R_MIPS16_TLS_GOTTPREL		\
-   || r_type == R_MIPS16_TLS_TPREL_HI16		\
-   || r_type == R_MIPS16_TLS_TPREL_LO16		\
    || r_type == R_MICROMIPS_TLS_GD		\
    || r_type == R_MICROMIPS_TLS_LDM		\
    || r_type == R_MICROMIPS_TLS_DTPREL_HI16	\
@@ -775,10 +768,6 @@ static bfd *reldyn_sorting_bfd;
 #define MIPS_ELF_GOT_SIZE(abfd) \
   (get_elf_backend_data (abfd)->s->arch_size / 8)
 
-/* The size of the .rld_map section. */
-#define MIPS_ELF_RLD_MAP_SIZE(abfd) \
-  (get_elf_backend_data (abfd)->s->arch_size / 8)
-
 /* The size of a symbol-table entry.  */
 #define MIPS_ELF_SYM_SIZE(abfd) \
   (get_elf_backend_data (abfd)->s->sizeof_sym)
@@ -1582,10 +1571,9 @@ _bfd_mips_elf_init_stubs (struct bfd_link_info *info,
 }
 
 /* Return true if H is a locally-defined PIC function, in the sense
-   that it or its fn_stub might need $25 to be valid on entry.
-   Note that MIPS16 functions set up $gp using PC-relative instructions,
-   so they themselves never need $25 to be valid.  Only non-MIPS16
-   entry points are of interest here.  */
+   that it might need $25 to be valid on entry.  Note that MIPS16
+   functions never need $25 to be valid on entry; they set up $gp
+   using PC-relative instructions instead.  */
 
 static bfd_boolean
 mips_elf_local_pic_function_p (struct mips_elf_link_hash_entry *h)
@@ -1594,32 +1582,11 @@ mips_elf_local_pic_function_p (struct mips_elf_link_hash_entry *h)
 	   || h->root.root.type == bfd_link_hash_defweak)
 	  && h->root.def_regular
 	  && !bfd_is_abs_section (h->root.root.u.def.section)
-	  && (!ELF_ST_IS_MIPS16 (h->root.other)
-	      || (h->fn_stub && h->need_fn_stub))
+	  && !ELF_ST_IS_MIPS16 (h->root.other)
 	  && (PIC_OBJECT_P (h->root.root.u.def.section->owner)
 	      || ELF_ST_IS_MIPS_PIC (h->root.other)));
 }
 
-/* Set *SEC to the input section that contains the target of STUB.
-   Return the offset of the target from the start of that section.  */
-
-static bfd_vma
-mips_elf_get_la25_target (struct mips_elf_la25_stub *stub,
-			  asection **sec)
-{
-  if (ELF_ST_IS_MIPS16 (stub->h->root.other))
-    {
-      BFD_ASSERT (stub->h->need_fn_stub);
-      *sec = stub->h->fn_stub;
-      return 0;
-    }
-  else
-    {
-      *sec = stub->h->root.root.u.def.section;
-      return stub->h->root.root.u.def.value;
-    }
-}
-
 /* STUB describes an la25 stub that we have decided to implement
    by inserting an LUI/ADDIU pair before the target function.
    Create the section and redirect the function symbol to it.  */
@@ -1644,7 +1611,7 @@ mips_elf_add_la25_intro (struct mips_elf_la25_stub *stub,
   sprintf (name, ".text.stub.%d", (int) htab_elements (htab->la25_stubs));
 
   /* Create the section.  */
-  mips_elf_get_la25_target (stub, &input_section);
+  input_section = stub->h->root.root.u.def.section;
   s = htab->add_stub_section (name, input_section,
 			      input_section->output_section);
   if (s == NULL)
@@ -1718,6 +1685,12 @@ mips_elf_add_la25_stub (struct bfd_link_info *info,
   bfd_vma value;
   void **slot;
 
+  /* Prefer to use LUI/ADDIU stubs if the function is at the beginning
+     of the section and if we would need no more than 2 nops.  */
+  s = h->root.root.u.def.section;
+  value = h->root.root.u.def.value;
+  use_trampoline_p = (value != 0 || s->alignment_power > 4);
+
   /* Describe the stub we want.  */
   search.stub_section = NULL;
   search.offset = 0;
@@ -1747,11 +1720,6 @@ mips_elf_add_la25_stub (struct bfd_link_info *info,
   *stub = search;
   *slot = stub;
 
-  /* Prefer to use LUI/ADDIU stubs if the function is at the beginning
-     of the section and if we would need no more than 2 nops.  */
-  value = mips_elf_get_la25_target (stub, &s);
-  use_trampoline_p = (value != 0 || s->alignment_power > 4);
-
   h->la25_stub = stub;
   return (use_trampoline_p
 	  ? mips_elf_add_la25_trampoline (stub, info)
@@ -1892,13 +1860,6 @@ mips16_reloc_p (int r_type)
     case R_MIPS16_CALL16:
     case R_MIPS16_HI16:
     case R_MIPS16_LO16:
-    case R_MIPS16_TLS_GD:
-    case R_MIPS16_TLS_LDM:
-    case R_MIPS16_TLS_DTPREL_HI16:
-    case R_MIPS16_TLS_DTPREL_LO16:
-    case R_MIPS16_TLS_GOTTPREL:
-    case R_MIPS16_TLS_TPREL_HI16:
-    case R_MIPS16_TLS_TPREL_LO16:
       return TRUE;
 
     default:
@@ -2026,25 +1987,19 @@ micromips_branch_reloc_p (int r_type)
 static inline bfd_boolean
 tls_gd_reloc_p (unsigned int r_type)
 {
-  return (r_type == R_MIPS_TLS_GD
-	  || r_type == R_MIPS16_TLS_GD
-	  || r_type == R_MICROMIPS_TLS_GD);
+  return r_type == R_MIPS_TLS_GD || r_type == R_MICROMIPS_TLS_GD;
 }
 
 static inline bfd_boolean
 tls_ldm_reloc_p (unsigned int r_type)
 {
-  return (r_type == R_MIPS_TLS_LDM
-	  || r_type == R_MIPS16_TLS_LDM
-	  || r_type == R_MICROMIPS_TLS_LDM);
+  return r_type == R_MIPS_TLS_LDM || r_type == R_MICROMIPS_TLS_LDM;
 }
 
 static inline bfd_boolean
 tls_gottprel_reloc_p (unsigned int r_type)
 {
-  return (r_type == R_MIPS_TLS_GOTTPREL
-	  || r_type == R_MIPS16_TLS_GOTTPREL
-	  || r_type == R_MICROMIPS_TLS_GOTTPREL);
+  return r_type == R_MIPS_TLS_GOTTPREL || r_type == R_MICROMIPS_TLS_GOTTPREL;
 }
 
 void
@@ -4952,8 +4907,7 @@ is_gott_symbol (struct bfd_link_info *info, struct elf_link_hash_entry *h)
    stub.  */
 
 static bfd_boolean
-mips_elf_relocation_needs_la25_stub (bfd *input_bfd, int r_type,
-				     bfd_boolean target_is_16_bit_code_p)
+mips_elf_relocation_needs_la25_stub (bfd *input_bfd, int r_type)
 {
   /* We specifically ignore branches and jumps from EF_PIC objects,
      where the onus is on the compiler or programmer to perform any
@@ -4967,6 +4921,7 @@ mips_elf_relocation_needs_la25_stub (bfd *input_bfd, int r_type,
     {
     case R_MIPS_26:
     case R_MIPS_PC16:
+    case R_MIPS16_26:
     case R_MICROMIPS_26_S1:
     case R_MICROMIPS_PC7_S1:
     case R_MICROMIPS_PC10_S1:
@@ -4974,9 +4929,6 @@ mips_elf_relocation_needs_la25_stub (bfd *input_bfd, int r_type,
     case R_MICROMIPS_PC23_S2:
       return TRUE;
 
-    case R_MIPS16_26:
-      return !target_is_16_bit_code_p;
-
     default:
       return FALSE;
     }
@@ -5237,28 +5189,14 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
 	 have already noticed that we were going to need the
 	 stub.  */
       if (local_p)
-	{
-	  sec = elf_tdata (input_bfd)->local_stubs[r_symndx];
-	  value = 0;
-	}
+	sec = elf_tdata (input_bfd)->local_stubs[r_symndx];
       else
 	{
 	  BFD_ASSERT (h->need_fn_stub);
-	  if (h->la25_stub)
-	    {
-	      /* If a LA25 header for the stub itself exists, point to the
-		 prepended LUI/ADDIU sequence.  */
-	      sec = h->la25_stub->stub_section;
-	      value = h->la25_stub->offset;
-	    }
-	  else
-	    {
-	      sec = h->fn_stub;
-	      value = 0;
-	    }
+	  sec = h->fn_stub;
 	}
 
-      symbol = sec->output_section->vma + sec->output_offset + value;
+      symbol = sec->output_section->vma + sec->output_offset;
       /* The target is 16-bit, but the stub isn't.  */
       target_is_16_bit_code_p = FALSE;
     }
@@ -5308,8 +5246,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
   /* If this is a direct call to a PIC function, redirect to the
      non-PIC stub.  */
   else if (h != NULL && h->la25_stub
-	   && mips_elf_relocation_needs_la25_stub (input_bfd, r_type,
-						   target_is_16_bit_code_p))
+	   && mips_elf_relocation_needs_la25_stub (input_bfd, r_type))
     symbol = (h->la25_stub->stub_section->output_section->vma
 	      + h->la25_stub->stub_section->output_offset
 	      + h->la25_stub->offset);
@@ -5381,9 +5318,6 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
     case R_MIPS_TLS_GD:
     case R_MIPS_TLS_GOTTPREL:
     case R_MIPS_TLS_LDM:
-    case R_MIPS16_TLS_GD:
-    case R_MIPS16_TLS_GOTTPREL:
-    case R_MIPS16_TLS_LDM:
     case R_MICROMIPS_TLS_GD:
     case R_MICROMIPS_TLS_GOTTPREL:
     case R_MICROMIPS_TLS_LDM:
@@ -5553,7 +5487,6 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
       break;
 
     case R_MIPS_TLS_DTPREL_HI16:
-    case R_MIPS16_TLS_DTPREL_HI16:
     case R_MICROMIPS_TLS_DTPREL_HI16:
       value = (mips_elf_high (addend + symbol - dtprel_base (info))
 	       & howto->dst_mask);
@@ -5562,22 +5495,17 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
     case R_MIPS_TLS_DTPREL_LO16:
     case R_MIPS_TLS_DTPREL32:
     case R_MIPS_TLS_DTPREL64:
-    case R_MIPS16_TLS_DTPREL_LO16:
     case R_MICROMIPS_TLS_DTPREL_LO16:
       value = (symbol + addend - dtprel_base (info)) & howto->dst_mask;
       break;
 
     case R_MIPS_TLS_TPREL_HI16:
-    case R_MIPS16_TLS_TPREL_HI16:
     case R_MICROMIPS_TLS_TPREL_HI16:
       value = (mips_elf_high (addend + symbol - tprel_base (info))
 	       & howto->dst_mask);
       break;
 
     case R_MIPS_TLS_TPREL_LO16:
-    case R_MIPS_TLS_TPREL32:
-    case R_MIPS_TLS_TPREL64:
-    case R_MIPS16_TLS_TPREL_LO16:
     case R_MICROMIPS_TLS_TPREL_LO16:
       value = (symbol + addend - tprel_base (info)) & howto->dst_mask;
       break;
@@ -5599,11 +5527,10 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
 	       12: addu    $v0,$v1
 	       14: move    $gp,$v0
 	     So the offsets of hi and lo relocs are the same, but the
-	     base $pc is that used by the ADDIUPC instruction at $t9 + 4.
-	     ADDIUPC clears the low two bits of the instruction address,
-	     so the base is ($t9 + 4) & ~3.  */
+	     $pc is four higher than $t9 would be, so reduce
+	     both reloc addends by 4. */
 	  if (r_type == R_MIPS16_HI16)
-	    value = mips_elf_high (addend + gp - ((p + 4) & ~(bfd_vma) 0x3));
+	    value = mips_elf_high (addend + gp - p - 4);
 	  /* The microMIPS .cpload sequence uses the same assembly
 	     instructions as the traditional psABI version, but the
 	     incoming $t9 has the low bit set.  */
@@ -5626,7 +5553,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
 	  /* See the comment for R_MIPS16_HI16 above for the reason
 	     for this conditional.  */
 	  if (r_type == R_MIPS16_LO16)
-	    value = addend + gp - (p & ~(bfd_vma) 0x3);
+	    value = addend + gp - p;
 	  else if (r_type == R_MICROMIPS_LO16
 		   || r_type == R_MICROMIPS_HI0_LO16)
 	    value = addend + gp - p + 3;
@@ -5710,9 +5637,6 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
     case R_MIPS_TLS_GOTTPREL:
     case R_MIPS_TLS_LDM:
     case R_MIPS_GOT_DISP:
-    case R_MIPS16_TLS_GD:
-    case R_MIPS16_TLS_GOTTPREL:
-    case R_MIPS16_TLS_LDM:
     case R_MICROMIPS_TLS_GD:
     case R_MICROMIPS_TLS_GOTTPREL:
     case R_MICROMIPS_TLS_LDM:
@@ -6258,9 +6182,6 @@ _bfd_elf_mips_mach (flagword flags)
     case E_MIPS_MACH_LS3A:
       return bfd_mach_mips_loongson_3a;
 
-    case E_MIPS_MACH_OCTEON2:
-      return bfd_mach_mips_octeon2;
-
     case E_MIPS_MACH_OCTEON:
       return bfd_mach_mips_octeon;
 
@@ -6416,6 +6337,7 @@ _bfd_mips_elf_symbol_processing (bfd *abfd, asymbol *asym)
       {
 	asection *section = bfd_get_section_by_name (abfd, ".text");
 
+	BFD_ASSERT (SGI_COMPAT (abfd));
 	if (section != NULL)
 	  {
 	    asym->section = section;
@@ -6431,6 +6353,7 @@ _bfd_mips_elf_symbol_processing (bfd *abfd, asymbol *asym)
       {
 	asection *section = bfd_get_section_by_name (abfd, ".data");
 
+	BFD_ASSERT (SGI_COMPAT (abfd));
 	if (section != NULL)
 	  {
 	    asym->section = section;
@@ -7158,7 +7081,6 @@ _bfd_mips_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
 	return FALSE;
 
       mips_elf_hash_table (info)->use_rld_obj_head = TRUE;
-      mips_elf_hash_table (info)->rld_symbol = h;
     }
 
   /* If this is a mips16 text symbol, add 1 to the value to make it
@@ -7344,7 +7266,6 @@ _bfd_mips_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
 
 	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
 	    return FALSE;
-	  mips_elf_hash_table (info)->rld_symbol = h;
 	}
     }
 
@@ -7846,6 +7767,8 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
       can_make_dynamic_p = FALSE;
       switch (r_type)
 	{
+	case R_MIPS16_GOT16:
+	case R_MIPS16_CALL16:
 	case R_MIPS_GOT16:
 	case R_MIPS_CALL16:
 	case R_MIPS_CALL_HI16:
@@ -7858,11 +7781,6 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	case R_MIPS_TLS_GOTTPREL:
 	case R_MIPS_TLS_GD:
 	case R_MIPS_TLS_LDM:
-	case R_MIPS16_GOT16:
-	case R_MIPS16_CALL16:
-	case R_MIPS16_TLS_GOTTPREL:
-	case R_MIPS16_TLS_GD:
-	case R_MIPS16_TLS_LDM:
 	case R_MICROMIPS_GOT16:
 	case R_MICROMIPS_CALL16:
 	case R_MICROMIPS_CALL_HI16:
@@ -8000,9 +7918,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	    return FALSE;
 	}
 
-      if (h != NULL
-	  && mips_elf_relocation_needs_la25_stub (abfd, r_type,
-						  ELF_ST_IS_MIPS16 (h->other)))
+      if (h != NULL && mips_elf_relocation_needs_la25_stub (abfd, r_type))
 	((struct mips_elf_link_hash_entry *) h)->has_nonpic_branches = TRUE;
 
       switch (r_type)
@@ -8099,14 +8015,12 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	  break;
 
 	case R_MIPS_TLS_GOTTPREL:
-	case R_MIPS16_TLS_GOTTPREL:
 	case R_MICROMIPS_TLS_GOTTPREL:
 	  if (info->shared)
 	    info->flags |= DF_STATIC_TLS;
 	  /* Fall through */
 
 	case R_MIPS_TLS_LDM:
-	case R_MIPS16_TLS_LDM:
 	case R_MICROMIPS_TLS_LDM:
 	  if (tls_ldm_reloc_p (r_type))
 	    {
@@ -8116,7 +8030,6 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	  /* Fall through */
 
 	case R_MIPS_TLS_GD:
-	case R_MIPS16_TLS_GD:
 	case R_MICROMIPS_TLS_GD:
 	  /* This symbol requires a global offset table entry, or two
 	     for TLS GD relocations.  */
@@ -9114,7 +9027,7 @@ _bfd_mips_elf_size_dynamic_sections (bfd *output_bfd,
 	{
 	  /* We add a room for __rld_map.  It will be filled in by the
 	     rtld to contain a pointer to the _r_debug structure.  */
-	  s->size += MIPS_ELF_RLD_MAP_SIZE (output_bfd);
+	  s->size += 4;
 	}
       else if (SGI_COMPAT (output_bfd)
 	       && CONST_STRNEQ (name, ".compact_rel"))
@@ -9702,9 +9615,9 @@ mips_elf_create_la25_stub (void **slot, void *data)
   offset = stub->offset;
 
   /* Work out the target address.  */
-  target = mips_elf_get_la25_target (stub, &s);
-  target += s->output_section->vma + s->output_offset;
-
+  target = (stub->h->root.root.u.def.section->output_section->vma
+	    + stub->h->root.root.u.def.section->output_offset
+	    + stub->h->root.root.u.def.value);
   target_high = ((target + 0x8000) >> 16) & 0xffff;
   target_low = (target & 0xffff);
 
@@ -10117,6 +10030,31 @@ _bfd_mips_elf_finish_dynamic_symbol (bfd *output_bfd,
   if (IRIX_COMPAT (output_bfd) == ict_irix6)
     mips_elf_irix6_finish_dynamic_symbol (output_bfd, name, sym);
 
+  if (! info->shared)
+    {
+      if (! mips_elf_hash_table (info)->use_rld_obj_head
+	  && (strcmp (name, "__rld_map") == 0
+	      || strcmp (name, "__RLD_MAP") == 0))
+	{
+	  asection *s = bfd_get_section_by_name (dynobj, ".rld_map");
+	  BFD_ASSERT (s != NULL);
+	  sym->st_value = s->output_section->vma + s->output_offset;
+	  bfd_put_32 (output_bfd, 0, s->contents);
+	  if (mips_elf_hash_table (info)->rld_value == 0)
+	    mips_elf_hash_table (info)->rld_value = sym->st_value;
+	}
+      else if (mips_elf_hash_table (info)->use_rld_obj_head
+	       && strcmp (name, "__rld_obj_head") == 0)
+	{
+	  /* IRIX6 does not use a .rld_map section.  */
+	  if (IRIX_COMPAT (output_bfd) == ict_irix5
+              || IRIX_COMPAT (output_bfd) == ict_none)
+	    BFD_ASSERT (bfd_get_section_by_name (dynobj, ".rld_map")
+			!= NULL);
+	  mips_elf_hash_table (info)->rld_value = sym->st_value;
+	}
+    }
+
   /* Keep dynamic MIPS16 symbols odd.  This allows the dynamic linker to
      treat MIPS16 symbols like any other.  */
   if (ELF_ST_IS_MIPS16 (sym->st_other))
@@ -10579,19 +10517,7 @@ _bfd_mips_elf_finish_dynamic_sections (bfd *output_bfd,
 	      break;
 
 	    case DT_MIPS_RLD_MAP:
-	      {
-		struct elf_link_hash_entry *h;
-		h = mips_elf_hash_table (info)->rld_symbol;
-		if (!h)
-		  {
-		    dyn_to_skip = MIPS_ELF_DYN_SIZE (dynobj);
-		    swap_out_p = FALSE;
-		    break;
-		  }
-		s = h->root.u.def.section;
-		dyn.d_un.d_ptr = (s->output_section->vma + s->output_offset
-				  + h->root.u.def.value);
-	      }
+	      dyn.d_un.d_ptr = mips_elf_hash_table (info)->rld_value;
 	      break;
 
 	    case DT_MIPS_OPTIONS:
@@ -10961,7 +10887,6 @@ mips_set_isa_flags (bfd *abfd)
       break;
 
     case bfd_mach_mips_octeon:
-    case bfd_mach_mips_octeonp:
       val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON;
       break;
 
@@ -10969,10 +10894,6 @@ mips_set_isa_flags (bfd *abfd)
       val = E_MIPS_ARCH_64 | E_MIPS_MACH_XLR;
       break;
 
-    case bfd_mach_mips_octeon2:
-      val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2;
-      break;
-
     case bfd_mach_mipsisa32:
       val = E_MIPS_ARCH_32;
       break;
@@ -11646,8 +11567,7 @@ _bfd_mips_elf_find_nearest_line (bfd *abfd, asection *section,
 				     line_ptr))
     return TRUE;
 
-  if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections,
-                                     section, symbols, offset,
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr, ABI_64_P (abfd) ? 8 : 0,
 				     &elf_tdata (abfd)->dwarf2_find_line_info))
@@ -12874,7 +12794,7 @@ _bfd_mips_elf_link_hash_table_create (bfd *abfd)
   ret->procedure_count = 0;
   ret->compact_rel_size = 0;
   ret->use_rld_obj_head = FALSE;
-  ret->rld_symbol = NULL;
+  ret->rld_value = 0;
   ret->mips16_stubs_seen = FALSE;
   ret->use_plts_and_copy_relocs = FALSE;
   ret->is_vxworks = FALSE;
@@ -13572,8 +13492,6 @@ struct mips_mach_extension {
 
 static const struct mips_mach_extension mips_mach_extensions[] = {
   /* MIPS64r2 extensions.  */
-  { bfd_mach_mips_octeon2, bfd_mach_mips_octeonp },
-  { bfd_mach_mips_octeonp, bfd_mach_mips_octeon },
   { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
 
   /* MIPS64 extensions.  */
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 9155311c38..9a151247d1 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -1,5 +1,5 @@
 /* SPARC-specific support for ELF
-   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -2114,6 +2114,13 @@ _bfd_sparc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2128,7 +2135,7 @@ _bfd_sparc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      to copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += SPARC_ELF_RELA_BYTES (htab);
       h->needs_copy = 1;
@@ -3821,9 +3828,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	(*_bfd_error_handler)
 	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
@@ -4062,9 +4067,7 @@ do_relocation:
 		   We don't, but this breaks stabs debugging info, whose
 		   relocations are only 32-bits wide.  Ignore overflows in
 		   this case and also for discarded entries.  */
-		if ((r_type == R_SPARC_32
-		     || r_type == R_SPARC_UA32
-		     || r_type == R_SPARC_DISP32)
+		if ((r_type == R_SPARC_32 || r_type == R_SPARC_DISP32)
 		    && (((input_section->flags & SEC_DEBUGGING) != 0
 			 && strcmp (bfd_section_name (input_bfd,
 						      input_section),
diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h
index 5a6cae02ee..96ecce308d 100644
--- a/bfd/elfxx-target.h
+++ b/bfd/elfxx-target.h
@@ -1,6 +1,6 @@
 /* Target definitions for NN-bit ELF
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -655,10 +655,6 @@
 #define elf_backend_is_function_type _bfd_elf_is_function_type
 #endif
 
-#ifndef elf_backend_maybe_function_sym
-#define elf_backend_maybe_function_sym _bfd_elf_maybe_function_sym
-#endif
-
 #ifndef elf_match_priority
 #define elf_match_priority \
   (ELF_ARCH == bfd_arch_unknown ? 2 : ELF_OSABI == ELFOSABI_NONE ? 1 : 0)
@@ -754,7 +750,6 @@ static struct elf_backend_data elfNN_bed =
   elf_backend_merge_symbol,
   elf_backend_hash_symbol,
   elf_backend_is_function_type,
-  elf_backend_maybe_function_sym,
   elf_backend_link_order_error_handler,
   elf_backend_relplt_name,
   ELF_MACHINE_ALT1,
diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index 359b869b75..c484562da9 100644
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -1,5 +1,5 @@
 /* TILE-Gx-specific support for ELF.
-   Copyright 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2011 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -490,38 +490,35 @@ static reloc_howto_type tilegx_elf_howto_table [] =
 
   TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_GOT, 0),
   TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_GOT, 0),
-  /* These relocs are currently not defined.  */
-  EMPTY_HOWTO (66),
-  EMPTY_HOWTO (67),
-  EMPTY_HOWTO (68),
-  EMPTY_HOWTO (69),
-  EMPTY_HOWTO (70),
-  EMPTY_HOWTO (71),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1_GOT, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1_GOT, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2_GOT, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2_GOT, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3_GOT, 48),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3_GOT, 48),
 
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_GOT, 0),
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_GOT, 0),
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_GOT, 16),
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_GOT, 16),
-  /* These relocs are currently not defined.  */
-  EMPTY_HOWTO (76),
-  EMPTY_HOWTO (77),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST_GOT, 32),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST_GOT, 32),
 
   TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_TLS_GD, 0),
   TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_TLS_GD, 0),
-
-  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_TLS_LE, 0),
-  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_TLS_LE, 0),
-  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE, 0),
-  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE, 0),
-  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE, 16),
-  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1_TLS_GD, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1_TLS_GD, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2_TLS_GD, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2_TLS_GD, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3_TLS_GD, 48),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3_TLS_GD, 48),
 
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD, 0),
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD, 0),
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD, 16),
   TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD, 16),
-  EMPTY_HOWTO (90),
-  EMPTY_HOWTO (91),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD, 32),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD, 32),
 
 #define TILEGX_IMM16_HOWTO_TLS_IE(name, rshift) \
   HOWTO (name, rshift, 1, 16, FALSE, 0, \
@@ -530,12 +527,12 @@ static reloc_howto_type tilegx_elf_howto_table [] =
 
   TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW0_TLS_IE, 0),
   TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW0_TLS_IE, 0),
-  EMPTY_HOWTO (94),
-  EMPTY_HOWTO (95),
-  EMPTY_HOWTO (96),
-  EMPTY_HOWTO (97),
-  EMPTY_HOWTO (98),
-  EMPTY_HOWTO (99),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW1_TLS_IE, 16),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW1_TLS_IE, 16),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW2_TLS_IE, 32),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW2_TLS_IE, 32),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW3_TLS_IE, 48),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW3_TLS_IE, 48),
 
 #define TILEGX_IMM16_HOWTO_LAST_TLS_IE(name, rshift) \
   HOWTO (name, rshift, 1, 16, FALSE, 0, \
@@ -546,8 +543,8 @@ static reloc_howto_type tilegx_elf_howto_table [] =
   TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE, 0),
   TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE, 16),
   TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE, 16),
-  EMPTY_HOWTO (104),
-  EMPTY_HOWTO (105),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE, 32),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE, 32),
 
   HOWTO(R_TILEGX_TLS_DTPMOD64, 0, 0, 0, FALSE, 0, complain_overflow_dont,
         bfd_elf_generic_reloc, "R_TILEGX_TLS_DTPMOD64",
@@ -567,31 +564,7 @@ static reloc_howto_type tilegx_elf_howto_table [] =
         FALSE, 0, -1, TRUE),
   HOWTO(R_TILEGX_TLS_TPOFF32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
         bfd_elf_generic_reloc, "R_TILEGX_TLS_TPOFF32",
-        FALSE, 0, 0, TRUE),
-
-  HOWTO (R_TILEGX_TLS_GD_CALL, /* type */
-	 TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 27,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_TILEGX_TLS_GD_CALL", /* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 -1,			/* dst_mask */
-	 TRUE), 		/* pcrel_offset */
-
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X0_TLS_GD_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X1_TLS_GD_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y0_TLS_GD_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y1_TLS_GD_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_TLS_IE_LOAD, 0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X0_TLS_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X1_TLS_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y0_TLS_ADD,  0,  8),
-  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y1_TLS_ADD,  0,  8),
+        FALSE, 0, 0, TRUE)
 };
 
 static reloc_howto_type tilegx_elf_howto_table2 [] =
@@ -713,28 +686,46 @@ static const reloc_map tilegx_reloc_map [] =
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_PCREL)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_GOT)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_GOT)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_GOT)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_GOT)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_GOT)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_GOT)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_GD)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_GD)
-  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_LE)
-  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_LE)
-  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_LE)
-  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_LE)
-  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_LE)
-  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_LE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_TLS_GD)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_GD)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_GD)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_GD)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_TLS_GD)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_IE)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_TLS_IE)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_IE)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_IE)
   SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_IE)
   SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_TLS_IE)
 
   SIMPLE_REMAP (TILEGX_TLS_DTPMOD64)
   SIMPLE_REMAP (TILEGX_TLS_DTPOFF64)
@@ -744,17 +735,6 @@ static const reloc_map tilegx_reloc_map [] =
   SIMPLE_REMAP (TILEGX_TLS_DTPOFF32)
   SIMPLE_REMAP (TILEGX_TLS_TPOFF32)
 
-  SIMPLE_REMAP (TILEGX_TLS_GD_CALL)
-  SIMPLE_REMAP (TILEGX_IMM8_X0_TLS_GD_ADD)
-  SIMPLE_REMAP (TILEGX_IMM8_X1_TLS_GD_ADD)
-  SIMPLE_REMAP (TILEGX_IMM8_Y0_TLS_GD_ADD)
-  SIMPLE_REMAP (TILEGX_IMM8_Y1_TLS_GD_ADD)
-  SIMPLE_REMAP (TILEGX_TLS_IE_LOAD)
-  SIMPLE_REMAP (TILEGX_IMM8_X0_TLS_ADD)
-  SIMPLE_REMAP (TILEGX_IMM8_X1_TLS_ADD)
-  SIMPLE_REMAP (TILEGX_IMM8_Y0_TLS_ADD)
-  SIMPLE_REMAP (TILEGX_IMM8_Y1_TLS_ADD)
-
 #undef SIMPLE_REMAP
 #undef TH_REMAP
 
@@ -844,10 +824,6 @@ struct tilegx_elf_link_hash_table
   asection *sdynbss;
   asection *srelbss;
 
-  /* Whether LE transition has been disabled for some of the
-     sections.  */
-  bfd_boolean disable_le_transition;
-
   /* Small local sym to section mapping cache.  */
   struct sym_cache sym_cache;
 };
@@ -944,7 +920,7 @@ tilegx_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
 {
   unsigned int r_type = TILEGX_ELF_R_TYPE (dst->r_info);
 
-  if (r_type <= (unsigned int) R_TILEGX_IMM8_Y1_TLS_ADD)
+  if (r_type <= (unsigned int) R_TILEGX_TLS_TPOFF32)
     cache_ptr->howto = &tilegx_elf_howto_table [r_type];
   else if (r_type - R_TILEGX_GNU_VTINHERIT
 	   <= (unsigned int) R_TILEGX_GNU_VTENTRY)
@@ -1027,18 +1003,10 @@ static const tilegx_create_func reloc_to_create_func[] =
   create_Imm16_X1,
   create_Imm16_X0,
   create_Imm16_X1,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
   create_Imm16_X0,
   create_Imm16_X1,
   create_Imm16_X0,
   create_Imm16_X1,
-  NULL,
-  NULL,
   create_Imm16_X0,
   create_Imm16_X1,
   create_Imm16_X0,
@@ -1051,20 +1019,30 @@ static const tilegx_create_func reloc_to_create_func[] =
   create_Imm16_X1,
   create_Imm16_X0,
   create_Imm16_X1,
-  NULL,
-  NULL,
   create_Imm16_X0,
   create_Imm16_X1,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
   create_Imm16_X0,
   create_Imm16_X1,
   create_Imm16_X0,
   create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1
 };
 
 static void
@@ -1560,83 +1538,6 @@ tilegx_elf_copy_indirect_symbol (struct bfd_link_info *info,
   _bfd_elf_link_hash_copy_indirect (info, dir, ind);
 }
 
-static int
-tilegx_tls_translate_to_le (int r_type)
-{
-  switch (r_type)
-    {
-    case R_TILEGX_IMM16_X0_HW0_TLS_GD:
-    case R_TILEGX_IMM16_X0_HW0_TLS_IE:
-      return R_TILEGX_IMM16_X0_HW0_TLS_LE;
-
-    case R_TILEGX_IMM16_X1_HW0_TLS_GD:
-    case R_TILEGX_IMM16_X1_HW0_TLS_IE:
-      return R_TILEGX_IMM16_X1_HW0_TLS_LE;
-
-    case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE;
-
-    case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE;
-
-    case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE;
-
-    case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE;
-    }
-  return r_type;
-}
-
-static int
-tilegx_tls_translate_to_ie (int r_type)
-{
-  switch (r_type)
-    {
-    case R_TILEGX_IMM16_X0_HW0_TLS_GD:
-    case R_TILEGX_IMM16_X0_HW0_TLS_IE:
-      return R_TILEGX_IMM16_X0_HW0_TLS_IE;
-
-    case R_TILEGX_IMM16_X1_HW0_TLS_GD:
-    case R_TILEGX_IMM16_X1_HW0_TLS_IE:
-      return R_TILEGX_IMM16_X1_HW0_TLS_IE;
-
-    case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE;
-
-    case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE;
-
-    case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE;
-
-    case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
-    case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
-      return R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE;
-    }
-  return r_type;
-}
-
-static int
-tilegx_elf_tls_transition (struct bfd_link_info *info, int r_type,
-			   int is_local, bfd_boolean disable_le_transition)
-{
-  if (info->shared)
-    return r_type;
-
-  if (is_local && !disable_le_transition)
-    return tilegx_tls_translate_to_le (r_type);
-  else
-    return tilegx_tls_translate_to_ie (r_type);
-}
-
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
@@ -1652,7 +1553,6 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
   const Elf_Internal_Rela *rel_end;
   asection *sreloc;
   int num_relocs;
-  bfd_boolean has_tls_gd_or_ie = FALSE, has_tls_add = FALSE;
 
   if (info->relocatable)
     return TRUE;
@@ -1671,33 +1571,6 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
     htab->elf.dynobj = abfd;
 
   rel_end = relocs + num_relocs;
-
-  /* Check whether to do optimization to transform TLS GD/IE
-     referehces to TLS LE.  We disable it if we're linking with old
-     TLS code sequences that do not support such optimization.  Old
-     TLS code sequences have tls_gd_call/tls_ie_load relocations but
-     no tls_add relocations.  */
-  for (rel = relocs; rel < rel_end && !has_tls_add; rel++)
-    {
-      int r_type = TILEGX_ELF_R_TYPE (rel->r_info);
-      switch (r_type)
-	{
-	case R_TILEGX_TLS_GD_CALL:
-	case R_TILEGX_TLS_IE_LOAD:
-	  has_tls_gd_or_ie = TRUE;
-	  break;
-	case R_TILEGX_IMM8_X0_TLS_ADD:
-	case R_TILEGX_IMM8_Y0_TLS_ADD:
-	case R_TILEGX_IMM8_X1_TLS_ADD:
-	case R_TILEGX_IMM8_Y1_TLS_ADD:
-	  has_tls_add = TRUE;
-	  break;
-	}
-    }
-
-  sec->sec_flg0 = (has_tls_gd_or_ie && !has_tls_add);
-  htab->disable_le_transition |= sec->sec_flg0;
-
   for (rel = relocs; rel < rel_end; rel++)
     {
       unsigned int r_type;
@@ -1725,36 +1598,39 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
 	}
 
-      r_type = tilegx_elf_tls_transition (info, r_type, h == NULL,
-					  sec->sec_flg0);
       switch (r_type)
 	{
-	case R_TILEGX_IMM16_X0_HW0_TLS_LE:
-	case R_TILEGX_IMM16_X1_HW0_TLS_LE:
-	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE:
-	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE:
-	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE:
-	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE:
-	  if (info->shared)
-	    goto r_tilegx_plt32;
-	  break;
-
 	case R_TILEGX_IMM16_X0_HW0_TLS_GD:
 	case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW3_TLS_GD:
 	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
-	  BFD_ASSERT (info->shared);
-	  tls_type = GOT_TLS_GD;
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+          tls_type = GOT_TLS_GD;
           goto have_got_reference;
 
 	case R_TILEGX_IMM16_X0_HW0_TLS_IE:
 	case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW3_TLS_IE:
 	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
 	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
 	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
 	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
           tls_type = GOT_TLS_IE;
           if (info->shared)
             info->flags |= DF_STATIC_TLS;
@@ -1762,10 +1638,18 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 
 	case R_TILEGX_IMM16_X0_HW0_GOT:
 	case R_TILEGX_IMM16_X1_HW0_GOT:
+	case R_TILEGX_IMM16_X0_HW1_GOT:
+	case R_TILEGX_IMM16_X1_HW1_GOT:
+	case R_TILEGX_IMM16_X0_HW2_GOT:
+	case R_TILEGX_IMM16_X1_HW2_GOT:
+	case R_TILEGX_IMM16_X0_HW3_GOT:
+	case R_TILEGX_IMM16_X1_HW3_GOT:
 	case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
 	case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
 	case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
 	case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
           tls_type = GOT_NORMAL;
           /* Fall Through */
 
@@ -1836,24 +1720,6 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	    }
 	  break;
 
-	case R_TILEGX_TLS_GD_CALL:
-	  if (info->shared)
-	    {
-	      /* These are basically R_TILEGX_JUMPOFF_X1_PLT relocs
-		 against __tls_get_addr.  */
-	      struct bfd_link_hash_entry *bh = NULL;
-	      if (! _bfd_generic_link_add_one_symbol (info, abfd,
-						      "__tls_get_addr", 0,
-						      bfd_und_section_ptr, 0,
-						      NULL, FALSE, FALSE,
-						      &bh))
-		return FALSE;
-	      h = (struct elf_link_hash_entry *) bh;
-	    }
-	  else
-	    break;
-	  /* Fall through */
-
         case R_TILEGX_JUMPOFF_X1_PLT:
 	  /* This symbol requires a procedure linkage table entry.  We
 	     actually build the entry in adjust_dynamic_symbol,
@@ -1939,15 +1805,16 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	case R_TILEGX_IMM16_X0_HW2_LAST:
 	case R_TILEGX_IMM16_X1_HW2_LAST:
 	  if (h != NULL)
-	    h->non_got_ref = 1;
+            {
+              h->non_got_ref = 1;
 
-	r_tilegx_plt32:
-	  if (h != NULL && !info->shared)
-	    {
-	      /* We may need a .plt entry if the function this reloc
-		 refers to is in a shared lib.  */
-	      h->plt.refcount += 1;
-	    }
+              if (!info->shared)
+                {
+                  /* We may need a .plt entry if the function this reloc
+                     refers to is in a shared lib.  */
+                  h->plt.refcount += 1;
+                }
+            }
 
 	  /* If we are creating a shared library, and this is a reloc
 	     against a global symbol, or a non PC relative reloc
@@ -2141,28 +2008,51 @@ tilegx_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
 	}
 
       r_type = TILEGX_ELF_R_TYPE (rel->r_info);
-      r_type = tilegx_elf_tls_transition (info, r_type, h != NULL,
-					  sec->sec_flg0);
+
       switch (r_type)
 	{
 	case R_TILEGX_IMM16_X0_HW0_GOT:
 	case R_TILEGX_IMM16_X1_HW0_GOT:
+	case R_TILEGX_IMM16_X0_HW1_GOT:
+	case R_TILEGX_IMM16_X1_HW1_GOT:
+	case R_TILEGX_IMM16_X0_HW2_GOT:
+	case R_TILEGX_IMM16_X1_HW2_GOT:
+	case R_TILEGX_IMM16_X0_HW3_GOT:
+	case R_TILEGX_IMM16_X1_HW3_GOT:
 	case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
 	case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
 	case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
 	case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
 	case R_TILEGX_IMM16_X0_HW0_TLS_GD:
 	case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW3_TLS_GD:
 	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
 	case R_TILEGX_IMM16_X0_HW0_TLS_IE:
 	case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW3_TLS_IE:
 	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
 	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
 	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
 	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
 	  if (h != NULL)
 	    {
 	      if (h->got.refcount > 0)
@@ -2170,8 +2060,7 @@ tilegx_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
 	    }
 	  else
 	    {
-	      if (local_got_refcounts &&
-		  local_got_refcounts[r_symndx] > 0)
+	      if (local_got_refcounts[r_symndx] > 0)
 		local_got_refcounts[r_symndx]--;
 	    }
 	  break;
@@ -2367,6 +2256,13 @@ tilegx_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       return TRUE;
     }
 
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -2381,7 +2277,7 @@ tilegx_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
      to copy the initial value out of the dynamic object and into the
      runtime process image.  We need to remember the offset into the
      .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
       htab->srelbss->size += TILEGX_ELF_RELA_BYTES (htab);
       h->needs_copy = 1;
@@ -2465,15 +2361,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
       h->needs_plt = 0;
     }
 
-  /* If a TLS_IE symbol is now local to the binary, make it a TLS_LE
-     requiring no TLS entry.  */
-  if (h->got.refcount > 0
-      && !htab->disable_le_transition
-      && !info->shared
-      && h->dynindx == -1
-      && tilegx_elf_hash_entry(h)->tls_type == GOT_TLS_IE)
-    h->got.offset = (bfd_vma) -1;
-  else if (h->got.refcount > 0)
+  if (h->got.refcount > 0)
     {
       asection *s;
       bfd_boolean dyn;
@@ -2893,125 +2781,6 @@ tpoff (struct bfd_link_info *info, bfd_vma address)
   return (address - htab->tls_sec->vma);
 }
 
-/* Copy SIZE bits from FROM to TO at address ADDR.  */
-
-static void
-tilegx_copy_bits (bfd_byte *addr, int from, int to, int size)
-{
-  int i;
-  for (i = 0; i < size; i++)
-    {
-      int from_byte = (from + i) / 8;
-      int from_bit = (from + i) % 8;
-      int to_byte = (to + i) / 8;
-      int to_bit = (to + i) % 8;
-      bfd_byte to_mask = 1 << to_bit;
-      addr[to_byte] = (addr[to_byte] & ~to_mask)
-	| ((addr[from_byte] >> from_bit << to_bit) & to_mask);
-    }
-}
-
-/* Replace the MASK bits in ADDR with those in INSN, for the next
-   TILEGX_BUNDLE_SIZE_IN_BYTES bytes.  */
-
-static void
-tilegx_replace_insn (bfd_byte *addr, const bfd_byte *mask,
-		     const bfd_byte *insn)
-{
-  int i;
-  for (i = 0; i < TILEGX_BUNDLE_SIZE_IN_BYTES; i++)
-    {
-      addr[i] = (addr[i] & ~mask[i]) | (insn[i] & mask[i]);
-    }
-}
-
-/* Mask to extract the bits corresponding to an instruction in a
-   specific pipe of a bundle.  */
-static const bfd_byte insn_mask_X1[] = {
-  0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x3f
-};
-
-/* Mask to extract the bits corresponding to an instruction in a
-   specific pipe of a bundle, minus the destination operand and the
-   first source operand.  */
-static const bfd_byte insn_mask_X0_no_dest_no_srca[] = { 
-  0x00, 0xf0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00
-};
-
-static const bfd_byte insn_mask_X1_no_dest_no_srca[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x3f
-};
-
-static const bfd_byte insn_mask_Y0_no_dest_no_srca[] = {
-  0x00, 0xf0, 0x0f, 0x78, 0x00, 0x00, 0x00, 0x00
-};
-static const bfd_byte insn_mask_Y1_no_dest_no_srca[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x3c
-};
-
-/* Mask to extract the bits corresponding to an instruction in a
-   specific pipe of a bundle, minus the register operands.  */
-static const bfd_byte insn_mask_X0_no_operand[] = {
-  0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00
-};
-
-static const bfd_byte insn_mask_X1_no_operand[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f
-};
-
-static const bfd_byte insn_mask_Y0_no_operand[] = {
-  0x00, 0x00, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00
-};
-
-static const bfd_byte insn_mask_Y1_no_operand[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x3c
-};
-
-/* Various instructions synthesized to support tls references.  */
-
-/* ld r0, r0 in the X1 pipe, used for tls ie.  */
-static const bfd_byte insn_tls_ie_ld_X1[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x6a, 0x28
-};
-
-/* ld4s r0, r0 in the X1 pipe, used for tls ie.  */
-static const bfd_byte insn_tls_ie_ld4s_X1[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x6a, 0x28
-};
-
-/* add r0, r0, tp in various pipes, used for tls ie.  */
-static const bfd_byte insn_tls_ie_add_X0X1[] = {
-  0x00, 0x50, 0x0f, 0x50, 0x00, 0xa8, 0x07, 0x28
-};
-static const bfd_byte insn_tls_ie_add_Y0Y1[] = {
-  0x00, 0x50, 0x27, 0x2c, 0x00, 0xa8, 0x13, 0x9a
-};
-
-/* addx r0, r0, tp in various pipes, used for tls ie.  */
-static const bfd_byte insn_tls_ie_addx_X0X1[] = {
-  0x00, 0x50, 0x0b, 0x50, 0x00, 0xa8, 0x05, 0x28
-};
-static const bfd_byte insn_tls_ie_addx_Y0Y1[] = {
-  0x00, 0x50, 0x03, 0x2c, 0x00, 0xa8, 0x01, 0x9a
-};
-
-/* move r0, r0 in various pipes, used for tls gd.  */
-static const bfd_byte insn_tls_gd_add_X0X1[] = {
-  0x00, 0xf0, 0x07, 0x51, 0x00, 0xf8, 0x3b, 0x28
-};
-static const bfd_byte insn_tls_gd_add_Y0Y1[] = {
-  0x00, 0xf0, 0x0b, 0x54, 0x00, 0xf8, 0x05, 0xae
-};
-
-static const bfd_byte *insn_move_X0X1 = insn_tls_gd_add_X0X1;
-static const bfd_byte *insn_move_Y0Y1 = insn_tls_gd_add_Y0Y1;
-
-static const bfd_byte *insn_add_X0X1 = insn_tls_ie_add_X0X1;
-static const bfd_byte *insn_add_Y0Y1 = insn_tls_ie_add_Y0Y1;
-
-static const bfd_byte *insn_addx_X0X1 = insn_tls_ie_addx_X0X1;
-static const bfd_byte *insn_addx_Y0Y1 = insn_tls_ie_addx_Y0Y1;
-
 /* Relocate an TILEGX ELF section.
 
    The RELOCATE_SECTION function is called by the new ELF backend linker
@@ -3076,7 +2845,6 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   for (; rel < relend; rel++)
     {
       int r_type, tls_type;
-      bfd_boolean is_tls_iele, is_tls_le;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
@@ -3159,203 +2927,20 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 
       switch (r_type)
 	{
-	case R_TILEGX_TLS_GD_CALL:
-	case R_TILEGX_IMM8_X0_TLS_GD_ADD:
-	case R_TILEGX_IMM8_Y0_TLS_GD_ADD:
-	case R_TILEGX_IMM8_X1_TLS_GD_ADD:
-	case R_TILEGX_IMM8_Y1_TLS_GD_ADD:
-	case R_TILEGX_IMM8_X0_TLS_ADD:
-	case R_TILEGX_IMM8_Y0_TLS_ADD:
-	case R_TILEGX_IMM8_X1_TLS_ADD:
-	case R_TILEGX_IMM8_Y1_TLS_ADD:
-	  tls_type = GOT_UNKNOWN;
-	  if (h == NULL && local_got_offsets)
-	    tls_type =
-	      _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
-	  else if (h != NULL)
-	    tls_type = tilegx_elf_hash_entry(h)->tls_type;
-
-	  is_tls_iele = (! info->shared || tls_type == GOT_TLS_IE);
-	  is_tls_le = is_tls_iele && (!input_section->sec_flg0
-				      && !info->shared
-				      && (h == NULL || h->dynindx == -1));
-
-	  if (r_type == R_TILEGX_TLS_GD_CALL)
-	    {
-	      if (is_tls_le)
-		{
-		  /* GD -> LE */
-		  tilegx_replace_insn (contents + rel->r_offset,
-				       insn_mask_X1, insn_move_X0X1);
-		  continue;
-		}
-	      else if (is_tls_iele)
-		{
-		  /* GD -> IE */
-		  if (ABI_64_P (output_bfd))
-		    tilegx_replace_insn (contents + rel->r_offset,
-					 insn_mask_X1, insn_tls_ie_ld_X1);
-		  else
-		    tilegx_replace_insn (contents + rel->r_offset,
-					 insn_mask_X1, insn_tls_ie_ld4s_X1);
-		  continue;
-		}
-
-	      /* GD -> GD */
-	      h = (struct elf_link_hash_entry *)
-		bfd_link_hash_lookup (info->hash, "__tls_get_addr", FALSE,
-				      FALSE, TRUE);
-	      BFD_ASSERT (h != NULL);
-	      r_type = R_TILEGX_JUMPOFF_X1_PLT;
-	      howto = tilegx_elf_howto_table + r_type;
-	    }
-	  else if (r_type == R_TILEGX_IMM8_X0_TLS_ADD
-		   || r_type ==  R_TILEGX_IMM8_X1_TLS_ADD
-		   || r_type ==  R_TILEGX_IMM8_Y0_TLS_ADD
-		   || r_type ==  R_TILEGX_IMM8_Y1_TLS_ADD)
-	    {
-	      bfd_boolean is_pipe0 =
-		(r_type == R_TILEGX_IMM8_X0_TLS_ADD
-		 || r_type ==  R_TILEGX_IMM8_Y0_TLS_ADD);
-	      bfd_boolean is_X0X1 =
-		(r_type == R_TILEGX_IMM8_X0_TLS_ADD
-		 || r_type ==  R_TILEGX_IMM8_X1_TLS_ADD);
-	      int dest_begin = is_pipe0 ? 0 : 31;
-	      int src_begin;
-	      const bfd_byte *insn;
-	      const bfd_byte *mask = NULL;
-
-	      if (is_tls_le)
-		{
-		  /* 1. copy dest operand into the first source operand.
-		     2. change the opcode to "move".  */
-		  src_begin = is_pipe0 ? 6 : 37;
-		  insn = is_X0X1 ? insn_move_X0X1 : insn_move_Y0Y1;
-
-		  switch (r_type)
-		    {
-		    case R_TILEGX_IMM8_X0_TLS_ADD:
-		      mask = insn_mask_X0_no_dest_no_srca;
-		      break;
-		    case R_TILEGX_IMM8_X1_TLS_ADD:
-		      mask = insn_mask_X1_no_dest_no_srca;
-		      break;
-		    case R_TILEGX_IMM8_Y0_TLS_ADD:
-		      mask = insn_mask_Y0_no_dest_no_srca;
-		      break;
-		    case R_TILEGX_IMM8_Y1_TLS_ADD:
-		      mask = insn_mask_Y1_no_dest_no_srca;
-		      break;
-		    }
-		}
-	      else
-		{
-		  /* 1. copy dest operand into the second source operand.
-		     2. change the opcode to "add".  */
-		  src_begin = is_pipe0 ? 12 : 43;
-		  if (ABI_64_P (output_bfd))
-		    insn = is_X0X1 ? insn_add_X0X1 : insn_add_Y0Y1;
-		  else
-		    insn = is_X0X1 ? insn_addx_X0X1 : insn_addx_Y0Y1;
-
-		  switch (r_type)
-		    {
-		    case R_TILEGX_IMM8_X0_TLS_ADD:
-		      mask = insn_mask_X0_no_operand;
-		      break;
-		    case R_TILEGX_IMM8_X1_TLS_ADD:
-		      mask = insn_mask_X1_no_operand;
-		      break;
-		    case R_TILEGX_IMM8_Y0_TLS_ADD:
-		      mask = insn_mask_Y0_no_operand;
-		      break;
-		    case R_TILEGX_IMM8_Y1_TLS_ADD:
-		      mask = insn_mask_Y1_no_operand;
-		      break;
-		    }
-		}
-
-	      tilegx_copy_bits (contents + rel->r_offset, dest_begin,
-				src_begin, 6);
-	      tilegx_replace_insn (contents  + rel->r_offset, mask, insn);
-
-	      continue;
-	    }
-	  else
-	    {
-	      const bfd_byte *mask = NULL;
-	      const bfd_byte *add_insn = NULL;
-	      bfd_boolean is_64bit = ABI_64_P (output_bfd);
-
-	      switch (r_type)
-		{
-		case R_TILEGX_IMM8_X0_TLS_GD_ADD:
-		  add_insn = is_tls_iele
-		    ? (is_64bit ? insn_tls_ie_add_X0X1 : insn_tls_ie_addx_X0X1)
-		    : insn_tls_gd_add_X0X1;
-		  mask = insn_mask_X0_no_dest_no_srca;
-		  break;
-		case R_TILEGX_IMM8_X1_TLS_GD_ADD:
-		  add_insn = is_tls_iele
-		    ? (is_64bit ? insn_tls_ie_add_X0X1 : insn_tls_ie_addx_X0X1)
-		    : insn_tls_gd_add_X0X1;
-		  mask = insn_mask_X1_no_dest_no_srca;
-		  break;
-		case R_TILEGX_IMM8_Y0_TLS_GD_ADD:
-		  add_insn = is_tls_iele
-		    ? (is_64bit ? insn_tls_ie_add_Y0Y1 : insn_tls_ie_addx_Y0Y1)
-		    : insn_tls_gd_add_Y0Y1;
-		  mask = insn_mask_Y0_no_dest_no_srca;
-		  break;
-		case R_TILEGX_IMM8_Y1_TLS_GD_ADD:
-		  add_insn = is_tls_iele
-		    ? (is_64bit ? insn_tls_ie_add_Y0Y1 : insn_tls_ie_addx_Y0Y1)
-		    : insn_tls_gd_add_Y0Y1;
-		  mask = insn_mask_Y1_no_dest_no_srca;
-		  break;
-		}
-
-	      tilegx_replace_insn (contents + rel->r_offset, mask, add_insn);
-
-	      continue;
-	    }
-	  break;
-	case R_TILEGX_TLS_IE_LOAD:
-	  if (!input_section->sec_flg0
-	      && !info->shared
-	      && (h == NULL || h->dynindx == -1))
-	    {
-	      /* IE -> LE */
-	      tilegx_replace_insn (contents + rel->r_offset,
-				   insn_mask_X1_no_dest_no_srca,
-				   insn_move_X0X1);
-	    }
-	  else
-	    {
-	      /* IE -> IE */
-	      if (ABI_64_P (output_bfd))
-		tilegx_replace_insn (contents + rel->r_offset,
-				     insn_mask_X1_no_dest_no_srca,
-				     insn_tls_ie_ld_X1);
-	      else
-		tilegx_replace_insn (contents + rel->r_offset,
-				     insn_mask_X1_no_dest_no_srca,
-				     insn_tls_ie_ld4s_X1);
-	    }
-	  continue;
-	  break;
-	default:
-	  break;
-	}
-
-      switch (r_type)
-	{
 	case R_TILEGX_IMM16_X0_HW0_GOT:
 	case R_TILEGX_IMM16_X1_HW0_GOT:
+	case R_TILEGX_IMM16_X0_HW1_GOT:
+	case R_TILEGX_IMM16_X1_HW1_GOT:
+	case R_TILEGX_IMM16_X0_HW2_GOT:
+	case R_TILEGX_IMM16_X1_HW2_GOT:
+	case R_TILEGX_IMM16_X0_HW3_GOT:
+	case R_TILEGX_IMM16_X1_HW3_GOT:
 	case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
 	case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
 	case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
 	case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
 	  /* Relocation is to the entry for this symbol in the global
 	     offset table.  */
 	  if (htab->elf.sgot == NULL)
@@ -3663,83 +3248,92 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	    }
 	  break;
 
-        case R_TILEGX_IMM16_X0_HW0_TLS_LE:
-        case R_TILEGX_IMM16_X1_HW0_TLS_LE:
-        case R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE:
-        case R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE:
-        case R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE:
-        case R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE:
-	  if (info->shared)
-	    {
-	      Elf_Internal_Rela outrel;
-	      bfd_boolean skip;
-
-	      BFD_ASSERT (sreloc != NULL);
-	      skip = FALSE;
-	      outrel.r_offset =
-		_bfd_elf_section_offset (output_bfd, info, input_section,
-					 rel->r_offset);
-	      if (outrel.r_offset == (bfd_vma) -1)
-		skip = TRUE;
-	      else if (outrel.r_offset == (bfd_vma) -2)
-		skip = TRUE;
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-	      if (skip)
-		memset (&outrel, 0, sizeof outrel);
-	      else
-		{
-		  outrel.r_info = TILEGX_ELF_R_INFO (htab, NULL, 0, r_type);
-		  outrel.r_addend = relocation - dtpoff_base (info)
-				    + rel->r_addend;
-		}
-
-	      tilegx_elf_append_rela (output_bfd, sreloc, &outrel);
-	      continue;
-	    }
-	  relocation = tpoff (info, relocation);
-	  break;
-
         case R_TILEGX_IMM16_X0_HW0_TLS_GD:
         case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW3_TLS_GD:
         case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
         case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
         case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
         case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+          tls_type = GOT_TLS_GD;
+          goto have_tls_reference;
+
         case R_TILEGX_IMM16_X0_HW0_TLS_IE:
         case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW3_TLS_IE:
         case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
         case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
         case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
         case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
-	  r_type = tilegx_elf_tls_transition (info, r_type, h == NULL,
-					      input_section->sec_flg0);
-          tls_type = GOT_UNKNOWN;
+        case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
+          tls_type = GOT_TLS_IE;
+          /* Fall through. */
+
+        have_tls_reference:
 	  if (h == NULL && local_got_offsets)
-	    tls_type =
-	      _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
+	    tls_type = _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
 	  else if (h != NULL)
-	    {
-	      tls_type = tilegx_elf_hash_entry(h)->tls_type;
-	      if (!info->shared && h->dynindx == -1 && tls_type == GOT_TLS_IE)
-		r_type = (!input_section->sec_flg0
-			  ? tilegx_tls_translate_to_le (r_type)
-			  : tilegx_tls_translate_to_ie (r_type));
-	    }
+	    tls_type = tilegx_elf_hash_entry(h)->tls_type;
 
 	  if (tls_type == GOT_TLS_IE)
-	    r_type = tilegx_tls_translate_to_ie (r_type);
-
-	  if (r_type == R_TILEGX_IMM16_X0_HW0_TLS_LE
-	      || r_type == R_TILEGX_IMM16_X1_HW0_TLS_LE
-	      || r_type == R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE
-	      || r_type == R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE
-	      || r_type == R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE
-	      || r_type == R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE)
-	    {
-	      relocation = tpoff (info, relocation);
-	      break;
-	    }
+	    switch (r_type)
+	      {
+              case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW0_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW0_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW1_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW1_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW2_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW2_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW3_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW3_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW3_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE;
+                break;
+	      }
 
 	  if (h != NULL)
 	    {
@@ -3792,10 +3386,18 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                 {
 		  case R_TILEGX_IMM16_X0_HW0_TLS_IE:
 		  case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW3_TLS_IE:
 		  case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
 		  case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
 		  case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
 		  case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
 		    if (need_relocs) {
 		      TILEGX_ELF_PUT_WORD (htab, output_bfd, 0,
 					   htab->elf.sgot->contents + off);
@@ -3816,10 +3418,18 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 
 		  case R_TILEGX_IMM16_X0_HW0_TLS_GD:
 		  case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW3_TLS_GD:
 		  case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
 		  case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
 		  case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
 		  case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
 		    if (need_relocs) {
  	              outrel.r_offset = (htab->elf.sgot->output_section->vma
 				       + htab->elf.sgot->output_offset + off);
@@ -3883,9 +3493,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	 not process them.  */
       if (unresolved_reloc
 	  && !((input_section->flags & SEC_DEBUGGING) != 0
-	       && h->def_dynamic)
-	  && _bfd_elf_section_offset (output_bfd, info, input_section,
-				      rel->r_offset) != (bfd_vma) -1)
+	       && h->def_dynamic))
 	(*_bfd_error_handler)
 	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
 	   input_bfd,
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
index 640768ee88..b6c90d1fb1 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
@@ -3,7 +3,7 @@
 
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012
+   2010, 2011
    Free Software Foundation, Inc.
 
    Written by Cygnus Support.
@@ -64,17 +64,16 @@ struct section_hash_entry
 /* tdata for an archive.  For an input archive, cache
    needs to be free()'d.  For an output archive, symdefs do.  */
 
-struct artdata
-{
+struct artdata {
   file_ptr first_file_filepos;
   /* Speed up searching the armap */
   htab_t cache;
-  bfd *archive_head;		/* Only interesting in output routines.  */
-  carsym *symdefs;		/* The symdef entries.  */
-  symindex symdef_count;	/* How many there are.  */
-  char *extended_names;		/* Clever intel extension.  */
-  bfd_size_type extended_names_size; /* Size of extended names.  */
-  /* When more compilers are standard C, this can be a time_t.  */
+  bfd *archive_head;		/* Only interesting in output routines */
+  carsym *symdefs;		/* the symdef entries */
+  symindex symdef_count;	/* how many there are */
+  char *extended_names;		/* clever intel extension */
+  bfd_size_type extended_names_size; /* Size of extended names */
+  /* when more compilers are standard C, this can be a time_t */
   long  armap_timestamp;	/* Timestamp value written into armap.
 				   This is used for BSD archives to check
 				   that the timestamp is recent enough
@@ -89,13 +88,12 @@ struct artdata
 #define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
 
 /* Goes in bfd's arelt_data slot */
-struct areltdata
-{
-  char * arch_header;		/* It's actually a string.  */
-  bfd_size_type parsed_size;	/* Octets of filesize not including ar_hdr.  */
-  bfd_size_type extra_size;	/* BSD4.4: extra bytes after the header.  */
-  char *filename;		/* Null-terminated.  */
-  file_ptr origin;		/* For element of a thin archive.  */
+struct areltdata {
+  char * arch_header;		/* it's actually a string */
+  unsigned int parsed_size;	/* octets of filesize not including ar_hdr */
+  unsigned int extra_size;	/* BSD4.4: extra bytes after the header.  */
+  char *filename;		/* null-terminated */
+  file_ptr origin;		/* for element of a thin archive */
 };
 
 #define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
@@ -205,8 +203,6 @@ extern void *_bfd_generic_read_ar_hdr
   (bfd *);
 extern void _bfd_ar_spacepad
   (char *, size_t, const char *, long);
-extern bfd_boolean _bfd_ar_sizepad
-  (char *, size_t, bfd_size_type);
 
 extern void *_bfd_generic_read_ar_hdr_mag
   (bfd *, const char *);
@@ -525,21 +521,10 @@ extern bfd_boolean _bfd_dwarf1_find_nearest_line
   (bfd *, asection *, asymbol **, bfd_vma, const char **,
    const char **, unsigned int *);
 
-struct dwarf_debug_section
-{
-  const char *uncompressed_name;
-  const char *compressed_name;
-};
-
-/* Map of uncompressed DWARF debug section name to compressed one.  It
-   is terminated by NULL uncompressed_name.  */
-
-extern const struct dwarf_debug_section dwarf_debug_sections[];
-
 /* Find the nearest line using DWARF 2 debugging information.  */
 extern bfd_boolean _bfd_dwarf2_find_nearest_line
-  (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, bfd_vma,
-   const char **, const char **, unsigned int *, unsigned int, void **);
+  (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
+   unsigned int *, unsigned int, void **);
 
 /* Find the line using DWARF 2 debugging information.  */
 extern bfd_boolean _bfd_dwarf2_find_line
@@ -552,15 +537,7 @@ bfd_boolean _bfd_generic_find_line
 /* Find inliner info after calling bfd_find_nearest_line. */
 extern bfd_boolean _bfd_dwarf2_find_inliner_info
   (bfd *, const char **, const char **, unsigned int *, void **);
-
-/* Read DWARF 2 debugging information. */
-extern bfd_boolean _bfd_dwarf2_slurp_debug_info
-  (bfd *, bfd *, const struct dwarf_debug_section *, asymbol **, void **);
-
-/* Clean up the data used to handle DWARF 2 debugging information. */
-extern void _bfd_dwarf2_cleanup_debug_info
-  (bfd *, void **);
-
+  
 /* Create a new section entry.  */
 extern struct bfd_hash_entry *bfd_section_hash_newfunc
   (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
@@ -834,3 +811,14 @@ extern void bfd_section_already_linked_table_traverse
 
 extern bfd_vma read_unsigned_leb128 (bfd *, bfd_byte *, unsigned int *);
 extern bfd_signed_vma read_signed_leb128 (bfd *, bfd_byte *, unsigned int *);
+
+struct dwarf_debug_section
+{
+  const char *uncompressed_name;
+  const char *compressed_name;
+};
+
+/* Map of uncompressed DWARF debug section name to compressed one.  It
+   is terminated by NULL uncompressed_name.  */
+
+extern const struct dwarf_debug_section dwarf_debug_sections[];
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 844d3a73d9..200a6fad31 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -8,7 +8,7 @@
 
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012
+   2010, 2011
    Free Software Foundation, Inc.
 
    Written by Cygnus Support.
@@ -69,17 +69,16 @@ struct section_hash_entry
 /* tdata for an archive.  For an input archive, cache
    needs to be free()'d.  For an output archive, symdefs do.  */
 
-struct artdata
-{
+struct artdata {
   file_ptr first_file_filepos;
   /* Speed up searching the armap */
   htab_t cache;
-  bfd *archive_head;		/* Only interesting in output routines.  */
-  carsym *symdefs;		/* The symdef entries.  */
-  symindex symdef_count;	/* How many there are.  */
-  char *extended_names;		/* Clever intel extension.  */
-  bfd_size_type extended_names_size; /* Size of extended names.  */
-  /* When more compilers are standard C, this can be a time_t.  */
+  bfd *archive_head;		/* Only interesting in output routines */
+  carsym *symdefs;		/* the symdef entries */
+  symindex symdef_count;	/* how many there are */
+  char *extended_names;		/* clever intel extension */
+  bfd_size_type extended_names_size; /* Size of extended names */
+  /* when more compilers are standard C, this can be a time_t */
   long  armap_timestamp;	/* Timestamp value written into armap.
 				   This is used for BSD archives to check
 				   that the timestamp is recent enough
@@ -94,13 +93,12 @@ struct artdata
 #define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
 
 /* Goes in bfd's arelt_data slot */
-struct areltdata
-{
-  char * arch_header;		/* It's actually a string.  */
-  bfd_size_type parsed_size;	/* Octets of filesize not including ar_hdr.  */
-  bfd_size_type extra_size;	/* BSD4.4: extra bytes after the header.  */
-  char *filename;		/* Null-terminated.  */
-  file_ptr origin;		/* For element of a thin archive.  */
+struct areltdata {
+  char * arch_header;		/* it's actually a string */
+  unsigned int parsed_size;	/* octets of filesize not including ar_hdr */
+  unsigned int extra_size;	/* BSD4.4: extra bytes after the header.  */
+  char *filename;		/* null-terminated */
+  file_ptr origin;		/* for element of a thin archive */
 };
 
 #define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
@@ -210,8 +208,6 @@ extern void *_bfd_generic_read_ar_hdr
   (bfd *);
 extern void _bfd_ar_spacepad
   (char *, size_t, const char *, long);
-extern bfd_boolean _bfd_ar_sizepad
-  (char *, size_t, bfd_size_type);
 
 extern void *_bfd_generic_read_ar_hdr_mag
   (bfd *, const char *);
@@ -530,21 +526,10 @@ extern bfd_boolean _bfd_dwarf1_find_nearest_line
   (bfd *, asection *, asymbol **, bfd_vma, const char **,
    const char **, unsigned int *);
 
-struct dwarf_debug_section
-{
-  const char *uncompressed_name;
-  const char *compressed_name;
-};
-
-/* Map of uncompressed DWARF debug section name to compressed one.  It
-   is terminated by NULL uncompressed_name.  */
-
-extern const struct dwarf_debug_section dwarf_debug_sections[];
-
 /* Find the nearest line using DWARF 2 debugging information.  */
 extern bfd_boolean _bfd_dwarf2_find_nearest_line
-  (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, bfd_vma,
-   const char **, const char **, unsigned int *, unsigned int, void **);
+  (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
+   unsigned int *, unsigned int, void **);
 
 /* Find the line using DWARF 2 debugging information.  */
 extern bfd_boolean _bfd_dwarf2_find_line
@@ -557,15 +542,7 @@ bfd_boolean _bfd_generic_find_line
 /* Find inliner info after calling bfd_find_nearest_line. */
 extern bfd_boolean _bfd_dwarf2_find_inliner_info
   (bfd *, const char **, const char **, unsigned int *, void **);
-
-/* Read DWARF 2 debugging information. */
-extern bfd_boolean _bfd_dwarf2_slurp_debug_info
-  (bfd *, bfd *, const struct dwarf_debug_section *, asymbol **, void **);
-
-/* Clean up the data used to handle DWARF 2 debugging information. */
-extern void _bfd_dwarf2_cleanup_debug_info
-  (bfd *, void **);
-
+  
 /* Create a new section entry.  */
 extern struct bfd_hash_entry *bfd_section_hash_newfunc
   (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
@@ -839,6 +816,17 @@ extern void bfd_section_already_linked_table_traverse
 
 extern bfd_vma read_unsigned_leb128 (bfd *, bfd_byte *, unsigned int *);
 extern bfd_signed_vma read_signed_leb128 (bfd *, bfd_byte *, unsigned int *);
+
+struct dwarf_debug_section
+{
+  const char *uncompressed_name;
+  const char *compressed_name;
+};
+
+/* Map of uncompressed DWARF debug section name to compressed one.  It
+   is terminated by NULL uncompressed_name.  */
+
+extern const struct dwarf_debug_section dwarf_debug_sections[];
 /* Extracted from init.c.  */
 /* Extracted from libbfd.c.  */
 bfd_boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
@@ -1098,13 +1086,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MIPS16_HI16",
   "BFD_RELOC_MIPS16_HI16_S",
   "BFD_RELOC_MIPS16_LO16",
-  "BFD_RELOC_MIPS16_TLS_GD",
-  "BFD_RELOC_MIPS16_TLS_LDM",
-  "BFD_RELOC_MIPS16_TLS_DTPREL_HI16",
-  "BFD_RELOC_MIPS16_TLS_DTPREL_LO16",
-  "BFD_RELOC_MIPS16_TLS_GOTTPREL",
-  "BFD_RELOC_MIPS16_TLS_TPREL_HI16",
-  "BFD_RELOC_MIPS16_TLS_TPREL_LO16",
   "BFD_RELOC_MIPS_LITERAL",
   "BFD_RELOC_MICROMIPS_LITERAL",
   "BFD_RELOC_MICROMIPS_7_PCREL_S1",
@@ -1225,17 +1206,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MN10300_RELATIVE",
   "BFD_RELOC_MN10300_SYM_DIFF",
   "BFD_RELOC_MN10300_ALIGN",
-  "BFD_RELOC_MN10300_TLS_GD",
-  "BFD_RELOC_MN10300_TLS_LD",
-  "BFD_RELOC_MN10300_TLS_LDO",
-  "BFD_RELOC_MN10300_TLS_GOTIE",
-  "BFD_RELOC_MN10300_TLS_IE",
-  "BFD_RELOC_MN10300_TLS_LE",
-  "BFD_RELOC_MN10300_TLS_DTPMOD",
-  "BFD_RELOC_MN10300_TLS_DTPOFF",
-  "BFD_RELOC_MN10300_TLS_TPOFF",
-  "BFD_RELOC_MN10300_32_PCREL",
-  "BFD_RELOC_MN10300_16_PCREL",
 
   "BFD_RELOC_386_GOT32",
   "BFD_RELOC_386_PLT32",
@@ -1744,6 +1714,8 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_V850_32_GOTOFF",
   "BFD_RELOC_V850_CODE",
   "BFD_RELOC_V850_DATA",
+  "BFD_RELOC_MN10300_32_PCREL",
+  "BFD_RELOC_MN10300_16_PCREL",
   "BFD_RELOC_TIC30_LDP",
   "BFD_RELOC_TIC54X_PARTLS7",
   "BFD_RELOC_TIC54X_PARTMS9",
@@ -1862,38 +1834,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_AVR_LDI",
   "BFD_RELOC_AVR_6",
   "BFD_RELOC_AVR_6_ADIW",
-  "BFD_RELOC_RL78_NEG8",
-  "BFD_RELOC_RL78_NEG16",
-  "BFD_RELOC_RL78_NEG24",
-  "BFD_RELOC_RL78_NEG32",
-  "BFD_RELOC_RL78_16_OP",
-  "BFD_RELOC_RL78_24_OP",
-  "BFD_RELOC_RL78_32_OP",
-  "BFD_RELOC_RL78_8U",
-  "BFD_RELOC_RL78_16U",
-  "BFD_RELOC_RL78_24U",
-  "BFD_RELOC_RL78_DIR3U_PCREL",
-  "BFD_RELOC_RL78_DIFF",
-  "BFD_RELOC_RL78_GPRELB",
-  "BFD_RELOC_RL78_GPRELW",
-  "BFD_RELOC_RL78_GPRELL",
-  "BFD_RELOC_RL78_SYM",
-  "BFD_RELOC_RL78_OP_SUBTRACT",
-  "BFD_RELOC_RL78_OP_NEG",
-  "BFD_RELOC_RL78_OP_AND",
-  "BFD_RELOC_RL78_OP_SHRA",
-  "BFD_RELOC_RL78_ABS8",
-  "BFD_RELOC_RL78_ABS16",
-  "BFD_RELOC_RL78_ABS16_REV",
-  "BFD_RELOC_RL78_ABS32",
-  "BFD_RELOC_RL78_ABS32_REV",
-  "BFD_RELOC_RL78_ABS16U",
-  "BFD_RELOC_RL78_ABS16UW",
-  "BFD_RELOC_RL78_ABS16UL",
-  "BFD_RELOC_RL78_RELAX",
-  "BFD_RELOC_RL78_HI16",
-  "BFD_RELOC_RL78_HI8",
-  "BFD_RELOC_RL78_LO16",
   "BFD_RELOC_RX_NEG8",
   "BFD_RELOC_RX_NEG16",
   "BFD_RELOC_RX_NEG24",
@@ -2346,7 +2286,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_LM32_JMP_SLOT",
   "BFD_RELOC_LM32_RELATIVE",
   "BFD_RELOC_MACH_O_SECTDIFF",
-  "BFD_RELOC_MACH_O_LOCAL_SECTDIFF",
   "BFD_RELOC_MACH_O_PAIR",
   "BFD_RELOC_MACH_O_X86_64_BRANCH32",
   "BFD_RELOC_MACH_O_X86_64_BRANCH8",
@@ -2415,12 +2354,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_TILEPRO_SHAMT_X1",
   "BFD_RELOC_TILEPRO_SHAMT_Y0",
   "BFD_RELOC_TILEPRO_SHAMT_Y1",
-  "BFD_RELOC_TILEPRO_TLS_GD_CALL",
-  "BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD",
-  "BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD",
-  "BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD",
-  "BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD",
-  "BFD_RELOC_TILEPRO_TLS_IE_LOAD",
   "BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD",
   "BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD",
   "BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO",
@@ -2440,14 +2373,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_TILEPRO_TLS_DTPMOD32",
   "BFD_RELOC_TILEPRO_TLS_DTPOFF32",
   "BFD_RELOC_TILEPRO_TLS_TPOFF32",
-  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE",
-  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE",
-  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_LO",
-  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_LO",
-  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HI",
-  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HI",
-  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HA",
-  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HA",
   "BFD_RELOC_TILEGX_HW0",
   "BFD_RELOC_TILEGX_HW1",
   "BFD_RELOC_TILEGX_HW2",
@@ -2505,51 +2430,52 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_PCREL",
   "BFD_RELOC_TILEGX_IMM16_X0_HW0_GOT",
   "BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT",
   "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT",
   "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT",
   "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_GOT",
   "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT",
   "BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD",
   "BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD",
-  "BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_LE",
-  "BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_LE",
-  "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_LE",
-  "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_LE",
-  "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_LE",
-  "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_LE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD",
   "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD",
   "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD",
   "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD",
   "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD",
   "BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE",
   "BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE",
   "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE",
   "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE",
   "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE",
   "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE",
   "BFD_RELOC_TILEGX_TLS_DTPMOD64",
   "BFD_RELOC_TILEGX_TLS_DTPOFF64",
   "BFD_RELOC_TILEGX_TLS_TPOFF64",
   "BFD_RELOC_TILEGX_TLS_DTPMOD32",
   "BFD_RELOC_TILEGX_TLS_DTPOFF32",
   "BFD_RELOC_TILEGX_TLS_TPOFF32",
-  "BFD_RELOC_TILEGX_TLS_GD_CALL",
-  "BFD_RELOC_TILEGX_IMM8_X0_TLS_GD_ADD",
-  "BFD_RELOC_TILEGX_IMM8_X1_TLS_GD_ADD",
-  "BFD_RELOC_TILEGX_IMM8_Y0_TLS_GD_ADD",
-  "BFD_RELOC_TILEGX_IMM8_Y1_TLS_GD_ADD",
-  "BFD_RELOC_TILEGX_TLS_IE_LOAD",
-  "BFD_RELOC_TILEGX_IMM8_X0_TLS_ADD",
-  "BFD_RELOC_TILEGX_IMM8_X1_TLS_ADD",
-  "BFD_RELOC_TILEGX_IMM8_Y0_TLS_ADD",
-  "BFD_RELOC_TILEGX_IMM8_Y1_TLS_ADD",
-  "BFD_RELOC_EPIPHANY_SIMM8",
-  "BFD_RELOC_EPIPHANY_SIMM24",
-  "BFD_RELOC_EPIPHANY_HIGH",
-  "BFD_RELOC_EPIPHANY_LOW",
-  "BFD_RELOC_EPIPHANY_SIMM11",
-  "BFD_RELOC_EPIPHANY_IMM11",
-  "BFD_RELOC_EPIPHANY_IMM8",
  "@@overflow: BFD_RELOC_UNUSED@@",
 };
 #endif
@@ -2591,8 +2517,4 @@ const bfd_arch_info_type *bfd_default_compatible
 bfd_boolean bfd_default_scan
    (const struct bfd_arch_info *info, const char *string);
 
-void *bfd_arch_default_fill (bfd_size_type count,
-    bfd_boolean is_bigendian,
-    bfd_boolean code);
-
 /* Extracted from elf.c.  */
diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
index 0cd8de5d3b..00d9ab261b 100644
--- a/bfd/libcoff-in.h
+++ b/bfd/libcoff-in.h
@@ -318,9 +318,6 @@ extern void coff_mangle_symbols
   (bfd *);
 extern bfd_boolean coff_write_symbols
   (bfd *);
-extern bfd_boolean coff_write_alien_symbol
-  (bfd *, asymbol *, struct internal_syment *, bfd_vma *,
-   bfd_size_type *, asection **, bfd_size_type *);
 extern bfd_boolean coff_write_linenumbers
   (bfd *);
 extern alent *coff_get_lineno
@@ -350,10 +347,6 @@ extern asymbol *coff_bfd_make_debug_symbol
 extern bfd_boolean coff_find_nearest_line
   (bfd *, asection *, asymbol **, bfd_vma, const char **,
    const char **, unsigned int *);
-struct dwarf_debug_section;
-extern bfd_boolean coff_find_nearest_line_with_names
-  (bfd *, const struct dwarf_debug_section *, asection *, asymbol **,
-   bfd_vma, const char **, const char **, unsigned int *);
 extern bfd_boolean coff_find_inliner_info
   (bfd *, const char **, const char **, unsigned int *);
 extern int coff_sizeof_headers
diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index 8aef552701..bd58c82e47 100644
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -322,9 +322,6 @@ extern void coff_mangle_symbols
   (bfd *);
 extern bfd_boolean coff_write_symbols
   (bfd *);
-extern bfd_boolean coff_write_alien_symbol
-  (bfd *, asymbol *, struct internal_syment *, bfd_vma *,
-   bfd_size_type *, asection **, bfd_size_type *);
 extern bfd_boolean coff_write_linenumbers
   (bfd *);
 extern alent *coff_get_lineno
@@ -354,10 +351,6 @@ extern asymbol *coff_bfd_make_debug_symbol
 extern bfd_boolean coff_find_nearest_line
   (bfd *, asection *, asymbol **, bfd_vma, const char **,
    const char **, unsigned int *);
-struct dwarf_debug_section;
-extern bfd_boolean coff_find_nearest_line_with_names
-  (bfd *, const struct dwarf_debug_section *, asection *, asymbol **,
-   bfd_vma, const char **, const char **, unsigned int *);
 extern bfd_boolean coff_find_inliner_info
   (bfd *, const char **, const char **, unsigned int *);
 extern int coff_sizeof_headers
diff --git a/bfd/linker.c b/bfd/linker.c
index 2f8ecbb3da..7a01e114a2 100644
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -2664,14 +2664,7 @@ default_data_link_order (bfd *abfd,
 
   fill = link_order->u.data.contents;
   fill_size = link_order->u.data.size;
-  if (fill_size == 0)
-    {
-      fill = abfd->arch_info->fill (size, bfd_big_endian (abfd),
-				    (sec->flags & SEC_CODE) != 0);
-      if (fill == NULL)
-	return FALSE;
-    }
-  else if (fill_size < size)
+  if (fill_size != 0 && fill_size < size)
     {
       bfd_byte *p;
       fill = (bfd_byte *) bfd_malloc (size);
@@ -3130,81 +3123,6 @@ _bfd_generic_section_already_linked (bfd *abfd ATTRIBUTE_UNUSED,
   return FALSE;
 }
 
-/* Choose a neighbouring section to S in OBFD that will be output, or
-   the absolute section if ADDR is out of bounds of the neighbours.  */
-
-asection *
-_bfd_nearby_section (bfd *obfd, asection *s, bfd_vma addr)
-{
-  asection *next, *prev, *best;
-
-  /* Find preceding kept section.  */
-  for (prev = s->prev; prev != NULL; prev = prev->prev)
-    if ((prev->flags & SEC_EXCLUDE) == 0
-	&& !bfd_section_removed_from_list (obfd, prev))
-      break;
-
-  /* Find following kept section.  Start at prev->next because
-     other sections may have been added after S was removed.  */
-  if (s->prev != NULL)
-    next = s->prev->next;
-  else
-    next = s->owner->sections;
-  for (; next != NULL; next = next->next)
-    if ((next->flags & SEC_EXCLUDE) == 0
-	&& !bfd_section_removed_from_list (obfd, next))
-      break;
-
-  /* Choose better of two sections, based on flags.  The idea
-     is to choose a section that will be in the same segment
-     as S would have been if it was kept.  */
-  best = next;
-  if (prev == NULL)
-    {
-      if (next == NULL)
-	best = bfd_abs_section_ptr;
-    }
-  else if (next == NULL)
-    best = prev;
-  else if (((prev->flags ^ next->flags)
-	    & (SEC_ALLOC | SEC_THREAD_LOCAL | SEC_LOAD)) != 0)
-    {
-      if (((next->flags ^ s->flags)
-	   & (SEC_ALLOC | SEC_THREAD_LOCAL)) != 0
-	  /* We prefer to choose a loaded section.  Section S
-	     doesn't have SEC_LOAD set (it being excluded, that
-	     part of the flag processing didn't happen) so we
-	     can't compare that flag to those of NEXT and PREV.  */
-	  || ((prev->flags & SEC_LOAD) != 0
-	      && (next->flags & SEC_LOAD) == 0))
-	best = prev;
-    }
-  else if (((prev->flags ^ next->flags) & SEC_READONLY) != 0)
-    {
-      if (((next->flags ^ s->flags) & SEC_READONLY) != 0)
-	best = prev;
-    }
-  else if (((prev->flags ^ next->flags) & SEC_CODE) != 0)
-    {
-      if (((next->flags ^ s->flags) & SEC_CODE) != 0)
-	best = prev;
-    }
-  else
-    {
-      /* Flags we care about are the same.  Prefer the following
-	 section if that will result in a positive valued sym.  */
-      if (addr < next->vma)
-	best = prev;
-    }
-
-  /* Refuse to choose a section for which we are out of bounds.  */
-  /* ??? This may make most of the above moot.  */
-  if (addr < best->vma || addr > best->vma + best->size)
-    best = bfd_abs_section_ptr;
-
-  return best;
-}
-
 /* Convert symbols in excluded output sections to use a kept section.  */
 
 static bfd_boolean
@@ -3221,10 +3139,68 @@ fix_syms (struct bfd_link_hash_entry *h, void *data)
 	  && (s->output_section->flags & SEC_EXCLUDE) != 0
 	  && bfd_section_removed_from_list (obfd, s->output_section))
 	{
-	  asection *op;
+	  asection *op, *op1;
 
 	  h->u.def.value += s->output_offset + s->output_section->vma;
-	  op = _bfd_nearby_section (obfd, s->output_section, h->u.def.value);
+
+	  /* Find preceding kept section.  */
+	  for (op1 = s->output_section->prev; op1 != NULL; op1 = op1->prev)
+	    if ((op1->flags & SEC_EXCLUDE) == 0
+		&& !bfd_section_removed_from_list (obfd, op1))
+	      break;
+
+	  /* Find following kept section.  Start at prev->next because
+	     other sections may have been added after S was removed.  */
+	  if (s->output_section->prev != NULL)
+	    op = s->output_section->prev->next;
+	  else
+	    op = s->output_section->owner->sections;
+	  for (; op != NULL; op = op->next)
+	    if ((op->flags & SEC_EXCLUDE) == 0
+		&& !bfd_section_removed_from_list (obfd, op))
+	      break;
+
+	  /* Choose better of two sections, based on flags.  The idea
+	     is to choose a section that will be in the same segment
+	     as S would have been if it was kept.  */
+	  if (op1 == NULL)
+	    {
+	      if (op == NULL)
+		op = bfd_abs_section_ptr;
+	    }
+	  else if (op == NULL)
+	    op = op1;
+	  else if (((op1->flags ^ op->flags)
+		    & (SEC_ALLOC | SEC_THREAD_LOCAL | SEC_LOAD)) != 0)
+	    {
+	      if (((op->flags ^ s->flags)
+		   & (SEC_ALLOC | SEC_THREAD_LOCAL)) != 0
+		  /* We prefer to choose a loaded section.  Section S
+		     doesn't have SEC_LOAD set (it being excluded, that
+		     part of the flag processing didn't happen) so we
+		     can't compare that flag to those of OP and OP1.  */
+		  || ((op1->flags & SEC_LOAD) != 0
+		      && (op->flags & SEC_LOAD) == 0))
+		op = op1;
+	    }
+	  else if (((op1->flags ^ op->flags) & SEC_READONLY) != 0)
+	    {
+	      if (((op->flags ^ s->flags) & SEC_READONLY) != 0)
+		op = op1;
+	    }
+	  else if (((op1->flags ^ op->flags) & SEC_CODE) != 0)
+	    {
+	      if (((op->flags ^ s->flags) & SEC_CODE) != 0)
+		op = op1;
+	    }
+	  else
+	    {
+	      /* Flags we care about are the same.  Prefer the following
+		 section if that will result in a positive valued sym.  */
+	      if (h->u.def.value < op->vma)
+		op = op1;
+	    }
+
 	  h->u.def.value -= op->vma;
 	  h->u.def.section = op;
 	}
diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c
index e7688abfc7..11915604b3 100644
--- a/bfd/mach-o-i386.c
+++ b/bfd/mach-o-i386.c
@@ -63,7 +63,6 @@ bfd_mach_o_i386_mkobject (bfd *abfd)
 
 static reloc_howto_type i386_howto_table[]=
 {
-  /* 0 */
   HOWTO(BFD_RELOC_32, 0, 2, 32, FALSE, 0,
 	complain_overflow_bitfield,
 	NULL, "32",
@@ -80,7 +79,6 @@ static reloc_howto_type i386_howto_table[]=
 	complain_overflow_bitfield,
 	NULL, "DISP32",
 	FALSE, 0xffffffff, 0xffffffff, TRUE),
-  /* 4 */
   HOWTO(BFD_RELOC_16_PCREL, 0, 1, 16, TRUE, 0,
 	complain_overflow_bitfield,
 	NULL, "DISP16",
@@ -89,27 +87,10 @@ static reloc_howto_type i386_howto_table[]=
 	complain_overflow_bitfield,
 	NULL, "SECTDIFF_32",
 	FALSE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(BFD_RELOC_MACH_O_LOCAL_SECTDIFF, 0, 2, 32, FALSE, 0,
-	complain_overflow_bitfield,
-	NULL, "LSECTDIFF_32",
-	FALSE, 0xffffffff, 0xffffffff, FALSE),
   HOWTO(BFD_RELOC_MACH_O_PAIR, 0, 2, 32, FALSE, 0,
 	complain_overflow_bitfield,
 	NULL, "PAIR_32",
 	FALSE, 0xffffffff, 0xffffffff, FALSE),
-  /* 8 */
-  HOWTO(BFD_RELOC_MACH_O_SECTDIFF, 0, 1, 16, FALSE, 0,
-	complain_overflow_bitfield,
-	NULL, "SECTDIFF_16",
-	FALSE, 0xffff, 0xffff, FALSE),
-  HOWTO(BFD_RELOC_MACH_O_LOCAL_SECTDIFF, 0, 1, 16, FALSE, 0,
-	complain_overflow_bitfield,
-	NULL, "LSECTDIFF_16",
-	FALSE, 0xffff, 0xffff, FALSE),
-  HOWTO(BFD_RELOC_MACH_O_PAIR, 0, 1, 16, FALSE, 0,
-	complain_overflow_bitfield,
-	NULL, "PAIR_16",
-	FALSE, 0xffff, 0xffff, FALSE),
 };
 
 static bfd_boolean
@@ -120,43 +101,17 @@ bfd_mach_o_i386_swap_reloc_in (arelent *res, bfd_mach_o_reloc_info *reloc)
       switch (reloc->r_type)
         {
         case BFD_MACH_O_GENERIC_RELOC_PAIR:
-          if (reloc->r_length == 2)
-            {
-	      res->howto = &i386_howto_table[7];
-	      res->address = res[-1].address;
-	      return TRUE;
-            }
-          else if (reloc->r_length == 1)
-	    {
-	      res->howto = &i386_howto_table[10];
-	      res->address = res[-1].address;
-	      return TRUE;
-	    }
-          return FALSE;
+          if (reloc->r_length != 2)
+            return FALSE;
+          res->howto = &i386_howto_table[6];
+          res->address = res[-1].address;
+          return TRUE;
         case BFD_MACH_O_GENERIC_RELOC_SECTDIFF:
-          if (reloc->r_length == 2)
-            {
-	      res->howto = &i386_howto_table[5];
-	      return TRUE;
-            }
-          else if (reloc->r_length == 1)
-            {
-	      res->howto = &i386_howto_table[8];
-	      return TRUE;
-            }
-          return FALSE;
         case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF:
-          if (reloc->r_length == 2)
-            {
-	      res->howto = &i386_howto_table[6];
-	      return TRUE;
-            }
-          else if (reloc->r_length == 1)
-            {
-	      res->howto = &i386_howto_table[9];
-	      return TRUE;
-            }
-          return FALSE;
+          if (reloc->r_length != 2)
+            return FALSE;
+          res->howto = &i386_howto_table[5];
+          return TRUE;
         default:
           return FALSE;
         }
@@ -223,26 +178,20 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo)
       rinfo->r_scattered = 1;
       rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_SECTDIFF;
       rinfo->r_pcrel = 0;
-      rinfo->r_length = rel->howto->size;
+      rinfo->r_length = 2;
       rinfo->r_extern = 0;
-      rinfo->r_value = rel->addend;
-      break;
-    case BFD_RELOC_MACH_O_LOCAL_SECTDIFF:
-      rinfo->r_scattered = 1;
-      rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF;
-      rinfo->r_pcrel = 0;
-      rinfo->r_length = rel->howto->size;
-      rinfo->r_extern = 0;
-      rinfo->r_value = rel->addend;
+      rinfo->r_value = (*rel->sym_ptr_ptr)->value 
+        + (*rel->sym_ptr_ptr)->section->vma;
       break;
     case BFD_RELOC_MACH_O_PAIR:
       rinfo->r_address = 0;
       rinfo->r_scattered = 1;
       rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_PAIR;
       rinfo->r_pcrel = 0;
-      rinfo->r_length = rel->howto->size;
+      rinfo->r_length = 2;
       rinfo->r_extern = 0;
-      rinfo->r_value = rel->addend;
+      rinfo->r_value = (*rel->sym_ptr_ptr)->value 
+        + (*rel->sym_ptr_ptr)->section->vma;
       break;
     default:
       return FALSE;
@@ -331,66 +280,10 @@ bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread,
   return FALSE;
 }
 
-static const mach_o_section_name_xlat text_section_names_xlat[] =
-  {
-    {	".symbol_stub",			"__symbol_stub",
-	SEC_CODE | SEC_LOAD,		BFD_MACH_O_S_SYMBOL_STUBS,
-	BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS,
-					0},
-    {	".picsymbol_stub",		"__picsymbol_stub",
-	SEC_CODE | SEC_LOAD,		BFD_MACH_O_S_SYMBOL_STUBS,
-	BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS,
-					0},
-    { NULL, NULL, 0, 0, 0, 0}
-  };
-
-static const mach_o_section_name_xlat data_section_names_xlat[] =
-  {
-    /* The first two are recognized by i386, but not emitted for x86 by
-       modern GCC.  */
-    {	".non_lazy_symbol_pointer",	"__nl_symbol_ptr",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    {	".lazy_symbol_pointer",		"__la_symbol_ptr",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_LAZY_SYMBOL_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    {	".lazy_symbol_pointer2",	"__la_sym_ptr2",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_LAZY_SYMBOL_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    {	".lazy_symbol_pointer3",	"__la_sym_ptr3",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_LAZY_SYMBOL_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    { NULL, NULL, 0, 0, 0, 0}
-  };
-
-static const mach_o_section_name_xlat import_section_names_xlat[] =
-  {
-    {	".picsymbol_stub3",		"__jump_table",
-	SEC_CODE | SEC_LOAD,		BFD_MACH_O_S_SYMBOL_STUBS,
-	BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS 
-	| BFD_MACH_O_S_SELF_MODIFYING_CODE,
-					6},
-    {	".non_lazy_symbol_pointer_x86",	"__pointers",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    { NULL, NULL, 0, 0, 0, 0}
-  };
-
-const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] =
-  {
-    { "__TEXT", text_section_names_xlat },
-    { "__DATA", data_section_names_xlat },
-    { "__IMPORT", import_section_names_xlat },
-    { NULL, NULL }
-  };
-
 #define bfd_mach_o_swap_reloc_in bfd_mach_o_i386_swap_reloc_in
 #define bfd_mach_o_swap_reloc_out bfd_mach_o_i386_swap_reloc_out
 #define bfd_mach_o_print_thread bfd_mach_o_i386_print_thread
 
-#define bfd_mach_o_tgt_seg_table mach_o_i386_segsec_names_xlat
-#define bfd_mach_o_section_type_valid_for_tgt NULL
-
 #define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_i386_bfd_reloc_type_lookup 
 #define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_i386_bfd_reloc_name_lookup
 
@@ -399,5 +292,4 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] =
 #define TARGET_ARCHITECTURE	bfd_arch_i386
 #define TARGET_BIG_ENDIAN 	0
 #define TARGET_ARCHIVE 		0
-#define TARGET_PRIORITY		0
 #include "mach-o-target.c"
diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c
index a2aa573c4f..29682c9e45 100644
--- a/bfd/mach-o-target.c
+++ b/bfd/mach-o-target.c
@@ -25,12 +25,13 @@
 #ifndef MACH_O_TARGET_COMMON_DEFINED
 #define MACH_O_TARGET_COMMON_DEFINED
 
+#define bfd_mach_o_close_and_cleanup                  _bfd_generic_close_and_cleanup
 #define bfd_mach_o_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
 #define bfd_mach_o_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
-#define bfd_mach_o_bfd_print_private_bfd_data	      _bfd_generic_bfd_print_private_bfd_data
 #define bfd_mach_o_bfd_is_target_special_symbol       ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
 #define bfd_mach_o_bfd_is_local_label_name            bfd_generic_is_local_label_name
 #define bfd_mach_o_get_lineno                         _bfd_nosymbols_get_lineno
+#define bfd_mach_o_find_nearest_line                  _bfd_nosymbols_find_nearest_line
 #define bfd_mach_o_find_inliner_info                  _bfd_nosymbols_find_inliner_info
 #define bfd_mach_o_bfd_make_debug_symbol              _bfd_nosymbols_bfd_make_debug_symbol
 #define bfd_mach_o_read_minisymbols                   _bfd_generic_read_minisymbols
@@ -46,7 +47,7 @@
 #define bfd_mach_o_bfd_final_link                     _bfd_generic_final_link
 #define bfd_mach_o_bfd_link_split_section             _bfd_generic_link_split_section
 #define bfd_mach_o_bfd_merge_private_bfd_data         _bfd_generic_bfd_merge_private_bfd_data
-#define bfd_mach_o_bfd_set_private_flags              bfd_mach_o_bfd_set_private_flags
+#define bfd_mach_o_bfd_set_private_flags              _bfd_generic_bfd_set_private_flags
 #define bfd_mach_o_get_section_contents               _bfd_generic_get_section_contents
 #define bfd_mach_o_bfd_gc_sections                    bfd_generic_gc_sections
 #define bfd_mach_o_bfd_lookup_section_flags           bfd_generic_lookup_section_flags
@@ -95,9 +96,7 @@ static const bfd_mach_o_backend_data TARGET_NAME_BACKEND =
   TARGET_ARCHITECTURE,
   bfd_mach_o_swap_reloc_in,
   bfd_mach_o_swap_reloc_out,
-  bfd_mach_o_print_thread,
-  bfd_mach_o_tgt_seg_table,
-  bfd_mach_o_section_type_valid_for_tgt
+  bfd_mach_o_print_thread
 };
 
 const bfd_target TARGET_NAME =
@@ -119,7 +118,7 @@ const bfd_target TARGET_NAME =
   '_',				/* symbol_leading_char.  */
   ' ',				/* ar_pad_char.  */
   16,				/* ar_max_namelen.  */
-  TARGET_PRIORITY,	/* match priority.  */
+  0,				/* match priority.  */
 
 #if TARGET_BIG_ENDIAN
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
diff --git a/bfd/mach-o-x86-64.c b/bfd/mach-o-x86-64.c
index 232701e867..2248d976a7 100644
--- a/bfd/mach-o-x86-64.c
+++ b/bfd/mach-o-x86-64.c
@@ -224,56 +224,21 @@ bfd_mach_o_x86_64_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo)
   rinfo->r_scattered = 0;
   switch (rel->howto->type)
     {
-    case BFD_RELOC_32:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_UNSIGNED;
-      rinfo->r_pcrel = 0;
-      rinfo->r_length = 2;
-      break;
     case BFD_RELOC_64:
       rinfo->r_type = BFD_MACH_O_X86_64_RELOC_UNSIGNED;
       rinfo->r_pcrel = 0;
       rinfo->r_length = 3;
       break;
     case BFD_RELOC_32_PCREL:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SIGNED;
-      rinfo->r_pcrel = 1;
-      rinfo->r_length = 2;
-      break;
-    case BFD_RELOC_MACH_O_X86_64_PCREL32_1:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SIGNED_1;
-      rinfo->r_pcrel = 1;
-      rinfo->r_length = 2;
-      break;
-    case BFD_RELOC_MACH_O_X86_64_PCREL32_2:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SIGNED_2;
-      rinfo->r_pcrel = 1;
-      rinfo->r_length = 2;
-      break;
-    case BFD_RELOC_MACH_O_X86_64_PCREL32_4:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SIGNED_4;
-      rinfo->r_pcrel = 1;
-      rinfo->r_length = 2;
-      break;
-    case BFD_RELOC_MACH_O_X86_64_BRANCH32:
       rinfo->r_type = BFD_MACH_O_X86_64_RELOC_BRANCH;
       rinfo->r_pcrel = 1;
       rinfo->r_length = 2;
       break;
-    case BFD_RELOC_MACH_O_X86_64_SUBTRACTOR32:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SUBTRACTOR;
-      rinfo->r_pcrel = 0;
-      rinfo->r_length = 2;
-      break;
     case BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64:
       rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SUBTRACTOR;
       rinfo->r_pcrel = 0;
       rinfo->r_length = 3;
       break;
-    case BFD_RELOC_MACH_O_X86_64_GOT:
-      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_GOT;
-      rinfo->r_pcrel = 1;
-      rinfo->r_length = 2;
-      break;
     case BFD_RELOC_MACH_O_X86_64_GOT_LOAD:
       rinfo->r_type = BFD_MACH_O_X86_64_RELOC_GOT_LOAD;
       rinfo->r_pcrel = 1;
@@ -316,46 +281,16 @@ bfd_mach_o_x86_64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
   return NULL;
 }
 
-static bfd_boolean
-bfd_mach_o_section_type_valid_for_x86_64 (unsigned long val)
-{
-  if (val == BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS
-      || val == BFD_MACH_O_S_LAZY_SYMBOL_POINTERS
-      || val == BFD_MACH_O_S_SYMBOL_STUBS)
-    return FALSE;
-  return TRUE;
-}
-
-/* We want to bump the alignment of some sections.  */
-static const mach_o_section_name_xlat text_section_names_xlat[] =
-  {
-    {	".eh_frame",				"__eh_frame",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_COALESCED,
-	BFD_MACH_O_S_ATTR_LIVE_SUPPORT
-	| BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS
-	| BFD_MACH_O_S_ATTR_NO_TOC,		3},
-    { NULL, NULL, 0, 0, 0, 0}
-  };
-
-const mach_o_segment_name_xlat mach_o_x86_64_segsec_names_xlat[] =
-  {
-    { "__TEXT", text_section_names_xlat },
-    { NULL, NULL }
-  };
-
 #define bfd_mach_o_swap_reloc_in bfd_mach_o_x86_64_swap_reloc_in
 #define bfd_mach_o_swap_reloc_out bfd_mach_o_x86_64_swap_reloc_out
 
 #define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_x86_64_bfd_reloc_type_lookup
 #define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_x86_64_bfd_reloc_name_lookup
 #define bfd_mach_o_print_thread NULL
-#define bfd_mach_o_tgt_seg_table mach_o_x86_64_segsec_names_xlat
-#define bfd_mach_o_section_type_valid_for_tgt bfd_mach_o_section_type_valid_for_x86_64
 
 #define TARGET_NAME 		mach_o_x86_64_vec
 #define TARGET_STRING 		"mach-o-x86-64"
 #define TARGET_ARCHITECTURE	bfd_arch_i386
 #define TARGET_BIG_ENDIAN 	0
 #define TARGET_ARCHIVE 		0
-#define TARGET_PRIORITY		0
 #include "mach-o-target.c"
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 1f9fc17608..91f0306f5e 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -1,6 +1,6 @@
 /* Mach-O support for BFD.
    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009, 2010, 2011, 2012
+   2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -29,8 +29,6 @@
 #include "mach-o/reloc.h"
 #include "mach-o/external.h"
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define bfd_mach_o_object_p bfd_mach_o_gen_object_p
 #define bfd_mach_o_core_p bfd_mach_o_gen_core_p
@@ -39,6 +37,8 @@
 #define FILE_ALIGN(off, algn) \
   (((off) + ((file_ptr) 1 << (algn)) - 1) & ((file_ptr) -1 << (algn)))
 
+static int bfd_mach_o_read_symtab_symbols (bfd *);
+
 unsigned int
 bfd_mach_o_version (bfd *abfd)
 {
@@ -89,314 +89,118 @@ bfd_mach_o_wide_p (bfd *abfd)
    names.  Use of canonical names (such as .text or .debug_frame) is required
    by gdb.  */
 
-/* __TEXT Segment.  */
-static const mach_o_section_name_xlat text_section_names_xlat[] =
-  {
-    {	".text",				"__text",	
-	SEC_CODE | SEC_LOAD,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS,	0},
-    {	".const",				"__const",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,			0},
-    {	".static_const",			"__static_const",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,			0},
-    {	".cstring",				"__cstring",
-	SEC_READONLY | SEC_DATA | SEC_LOAD | SEC_MERGE | SEC_STRINGS,
-						BFD_MACH_O_S_CSTRING_LITERALS,
-	BFD_MACH_O_S_ATTR_NONE,			0},
-    {	".literal4",				"__literal4",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_4BYTE_LITERALS,
-	BFD_MACH_O_S_ATTR_NONE,			2},
-    {	".literal8",				"__literal8",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_8BYTE_LITERALS,
-	BFD_MACH_O_S_ATTR_NONE,			3},
-    {	".literal16",				"__literal16",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_16BYTE_LITERALS,
-	BFD_MACH_O_S_ATTR_NONE,			4},
-    {	".constructor",				"__constructor",
-	SEC_CODE | SEC_LOAD,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,			0},
-    {	".destructor",				"__destructor",
-	SEC_CODE | SEC_LOAD,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,			0},
-    {	".eh_frame",				"__eh_frame",
-	SEC_READONLY | SEC_DATA | SEC_LOAD,	BFD_MACH_O_S_COALESCED,
-	BFD_MACH_O_S_ATTR_LIVE_SUPPORT
-	| BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS
-	| BFD_MACH_O_S_ATTR_NO_TOC,		2},
-    { NULL, NULL, 0, 0, 0, 0}
-  };
+struct mach_o_section_name_xlat
+{
+  const char *bfd_name;
+  const char *mach_o_name;
+  flagword flags;
+};
 
-/* __DATA Segment.  */
-static const mach_o_section_name_xlat data_section_names_xlat[] =
+static const struct mach_o_section_name_xlat dwarf_section_names_xlat[] =
   {
-    {	".data",			"__data",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,		0},
-    {	".bss",				"__bss",
-	SEC_NO_FLAGS,			BFD_MACH_O_S_ZEROFILL,
-	BFD_MACH_O_S_ATTR_NONE,		0},
-    {	".const_data",			"__const",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,		0},
-    {	".static_data",			"__static_data",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,		0},
-    {	".mod_init_func",		"__mod_init_func",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_MOD_INIT_FUNC_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    {	".mod_term_func",		"__mod_term_func",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_MOD_FINI_FUNC_POINTERS,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    {	".dyld",			"__dyld",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,		0},
-    {	".cfstring",			"__cfstring",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NONE,		2},
-    { NULL, NULL, 0, 0, 0, 0}
+    { ".debug_frame",    "__debug_frame",    SEC_DEBUGGING },
+    { ".debug_info",     "__debug_info",     SEC_DEBUGGING },
+    { ".debug_abbrev",   "__debug_abbrev",   SEC_DEBUGGING },
+    { ".debug_aranges",  "__debug_aranges",  SEC_DEBUGGING },
+    { ".debug_macinfo",  "__debug_macinfo",  SEC_DEBUGGING },
+    { ".debug_line",     "__debug_line",     SEC_DEBUGGING },
+    { ".debug_loc",      "__debug_loc",      SEC_DEBUGGING },
+    { ".debug_pubnames", "__debug_pubnames", SEC_DEBUGGING },
+    { ".debug_pubtypes", "__debug_pubtypes", SEC_DEBUGGING },
+    { ".debug_str",      "__debug_str",      SEC_DEBUGGING },
+    { ".debug_ranges",   "__debug_ranges",   SEC_DEBUGGING },
+    { NULL, NULL, 0}
   };
 
-/* __DWARF Segment.  */
-static const mach_o_section_name_xlat dwarf_section_names_xlat[] =
+static const struct mach_o_section_name_xlat text_section_names_xlat[] =
   {
-    {	".debug_frame",			"__debug_frame",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_info",			"__debug_info",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_abbrev",		"__debug_abbrev",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_aranges",		"__debug_aranges",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_macinfo",		"__debug_macinfo",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_line",			"__debug_line",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_loc",			"__debug_loc",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_pubnames",		"__debug_pubnames",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_pubtypes",		"__debug_pubtypes",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_str",			"__debug_str",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_ranges",		"__debug_ranges",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    {	".debug_macro",			"__debug_macro",
-	SEC_DEBUGGING,			BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_DEBUG,	0},
-    { NULL, NULL, 0, 0, 0, 0}
+    { ".text",     "__text",      SEC_CODE | SEC_LOAD },
+    { ".const",    "__const",     SEC_READONLY | SEC_DATA | SEC_LOAD },
+    { ".cstring",  "__cstring",   SEC_READONLY | SEC_DATA | SEC_LOAD },
+    { ".eh_frame", "__eh_frame",  SEC_READONLY | SEC_LOAD },
+    { NULL, NULL, 0}
   };
 
-/* __OBJC Segment.  */
-static const mach_o_section_name_xlat objc_section_names_xlat[] =
+static const struct mach_o_section_name_xlat data_section_names_xlat[] =
   {
-    {	".objc_class",			"__class",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_meta_class",		"__meta_class",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_cat_cls_meth",		"__cat_cls_meth",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_cat_inst_meth",		"__cat_inst_meth",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_protocol",		"__protocol",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_string_object",		"__string_object",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_cls_meth",		"__cls_meth",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_inst_meth",		"__inst_meth",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_cls_refs",		"__cls_refs",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_LITERAL_POINTERS,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_message_refs",		"__message_refs",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_LITERAL_POINTERS,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_symbols",		"__symbols",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_category",		"__category",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_class_vars",		"__class_vars",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_instance_vars",		"__instance_vars",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_module_info",		"__module_info",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_selector_strs",		"__selector_strs",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_CSTRING_LITERALS,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_image_info",		"__image_info",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc_selector_fixup",		"__sel_fixup",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    /* Objc V1 */
-    {	".objc1_class_ext",		"__class_ext",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc1_property_list",		"__property",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    {	".objc1_protocol_ext",		"__protocol_ext",
-	SEC_DATA | SEC_LOAD,		BFD_MACH_O_S_REGULAR,
-	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0},
-    { NULL, NULL, 0, 0, 0, 0}
+    { ".data",                "__data",          SEC_DATA | SEC_LOAD },
+    { ".const_data",          "__const",         SEC_DATA | SEC_LOAD },
+    { ".dyld",                "__dyld",          SEC_DATA | SEC_LOAD },
+    { ".lazy_symbol_ptr",     "__la_symbol_ptr", SEC_DATA | SEC_LOAD },
+    { ".non_lazy_symbol_ptr", "__nl_symbol_ptr", SEC_DATA | SEC_LOAD },
+    { ".bss",                 "__bss",           SEC_NO_FLAGS },
+    { NULL, NULL, 0}
   };
 
-static const mach_o_segment_name_xlat segsec_names_xlat[] =
+struct mach_o_segment_name_xlat
+{
+  /* Segment name.  */
+  const char *segname;
+
+  /* List of known sections for the segment.  */
+  const struct mach_o_section_name_xlat *sections;
+};
+
+/* List of known segment names.  */
+
+static const struct mach_o_segment_name_xlat segsec_names_xlat[] =
   {
     { "__TEXT", text_section_names_xlat },
     { "__DATA", data_section_names_xlat },
     { "__DWARF", dwarf_section_names_xlat },
-    { "__OBJC", objc_section_names_xlat },
     { NULL, NULL }
   };
 
-static const char dsym_subdir[] = ".dSYM/Contents/Resources/DWARF";
-
-/* For both cases bfd-name => mach-o name and vice versa, the specific target
-   is checked before the generic.  This allows a target (e.g. ppc for cstring)
-   to override the generic definition with a more specific one.  */
-
-/* Fetch the translation from a Mach-O section designation (segment, section)
-   as a bfd short name, if one exists.  Otherwise return NULL.
-   
-   Allow the segment and section names to be unterminated 16 byte arrays.  */
-
-const mach_o_section_name_xlat *
-bfd_mach_o_section_data_for_mach_sect (bfd *abfd, const char *segname,
-				       const char *sectname)
-{
-  const struct mach_o_segment_name_xlat *seg;
-  const mach_o_section_name_xlat *sec;
-  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
-
-  /* First try any target-specific translations defined...  */
-  if (bed->segsec_names_xlat)
-    for (seg = bed->segsec_names_xlat; seg->segname; seg++)
-      if (strncmp (seg->segname, segname, BFD_MACH_O_SEGNAME_SIZE) == 0)
-	for (sec = seg->sections; sec->mach_o_name; sec++)
-	  if (strncmp (sec->mach_o_name, sectname,
-		       BFD_MACH_O_SECTNAME_SIZE) == 0)
-	    return sec;
-
-  /* ... and then the Mach-O generic ones.  */
-  for (seg = segsec_names_xlat; seg->segname; seg++)
-    if (strncmp (seg->segname, segname, BFD_MACH_O_SEGNAME_SIZE) == 0)
-      for (sec = seg->sections; sec->mach_o_name; sec++)
-        if (strncmp (sec->mach_o_name, sectname,
-		     BFD_MACH_O_SECTNAME_SIZE) == 0)
-          return sec;
-
-  return NULL;  
-}
-
-/* If the bfd_name for this section is a 'canonical' form for which we
-   know the Mach-O data, return the segment name and the data for the 
-   Mach-O equivalent.  Otherwise return NULL.  */
+/* Mach-O to bfd names.  */
 
-const mach_o_section_name_xlat *
-bfd_mach_o_section_data_for_bfd_name (bfd *abfd, const char *bfd_name,
-				      const char **segname)
+void
+bfd_mach_o_normalize_section_name (const char *segname, const char *sectname,
+                                   const char **name, flagword *flags)
 {
   const struct mach_o_segment_name_xlat *seg;
-  const mach_o_section_name_xlat *sec;
-  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
-  *segname = NULL;
-
-  if (bfd_name[0] != '.')
-    return NULL;
 
-  /* First try any target-specific translations defined...  */
-  if (bed->segsec_names_xlat)
-    for (seg = bed->segsec_names_xlat; seg->segname; seg++)
-      for (sec = seg->sections; sec->bfd_name; sec++)
-	if (strcmp (bfd_name, sec->bfd_name) == 0)
-	  {
-	    *segname = seg->segname;
-	    return sec;
-	  }
+  *name = NULL;
+  *flags = SEC_NO_FLAGS;
 
-  /* ... and then the Mach-O generic ones.  */
   for (seg = segsec_names_xlat; seg->segname; seg++)
-    for (sec = seg->sections; sec->bfd_name; sec++)
-      if (strcmp (bfd_name, sec->bfd_name) == 0)
-	{
-	  *segname = seg->segname;
-	  return sec;
-	}
+    {
+      if (strncmp (seg->segname, segname, BFD_MACH_O_SEGNAME_SIZE) == 0)
+        {
+          const struct mach_o_section_name_xlat *sec;
 
-  return NULL;  
+          for (sec = seg->sections; sec->mach_o_name; sec++)
+            {
+              if (strncmp (sec->mach_o_name, sectname,
+                           BFD_MACH_O_SECTNAME_SIZE) == 0)
+                {
+                  *name = sec->bfd_name;
+                  *flags = sec->flags;
+                  return;
+                }
+            }
+          return;
+        }
+    }
 }
 
-/* Convert Mach-O section name to BFD.
+/* Convert Mach-O section name to BFD.  Try to use standard names, otherwise
+   forge a new name.  SEGNAME and SECTNAME are 16 bytes strings.  */
 
-   Try to use standard/canonical names, for which we have tables including 
-   default flag settings - which are returned.  Otherwise forge a new name
-   in the form "<segmentname>.<sectionname>" this will be prefixed with
-   LC_SEGMENT. if the segment name does not begin with an underscore.
-
-   SEGNAME and SECTNAME are 16 byte arrays (they do not need to be NUL-
-   terminated if the name length is exactly 16 bytes - but must be if the name
-   length is less than 16 characters).  */
-
-void
-bfd_mach_o_convert_section_name_to_bfd (bfd *abfd, const char *segname,
-					const char *secname, const char **name,
-					flagword *flags)
+static void
+bfd_mach_o_convert_section_name_to_bfd
+  (bfd *abfd, const char *segname, const char *sectname,
+   const char **name, flagword *flags)
 {
-  const mach_o_section_name_xlat *xlat;
   char *res;
   unsigned int len;
   const char *pfx = "";
 
-  *name = NULL;
-  *flags = SEC_NO_FLAGS;
-
-  /* First search for a canonical name...  
-     xlat will be non-null if there is an entry for segname, secname.  */
-  xlat = bfd_mach_o_section_data_for_mach_sect (abfd, segname, secname);
-  if (xlat)
-    {
-      len = strlen (xlat->bfd_name);
-      res = bfd_alloc (abfd, len+1);
-      if (res == NULL)
-	return;
-      memcpy (res, xlat->bfd_name, len+1);
-      *name = res;
-      *flags = xlat->bfd_flags;
-      return;
-    }
+  /* First search for a canonical name.  */
+  bfd_mach_o_normalize_section_name (segname, sectname, name, flags);
 
-  /* ... else we make up a bfd name from the segment concatenated with the
-     section.  */
+  /* Return now if found.  */
+  if (*name)
+    return;
 
   len = 16 + 1 + 16 + 1;
 
@@ -413,46 +217,43 @@ bfd_mach_o_convert_section_name_to_bfd (bfd *abfd, const char *segname,
   res = bfd_alloc (abfd, len);
   if (res == NULL)
     return;
-  snprintf (res, len, "%s%.16s.%.16s", pfx, segname, secname);
+  snprintf (res, len, "%s%.16s.%.16s", pfx, segname, sectname);
   *name = res;
+  *flags = SEC_NO_FLAGS;
 }
 
-/* Convert a bfd section name to a Mach-O segment + section name.
-
-   If the name is a canonical one for which we have a Darwin match
-   return the translation table - which contains defaults for flags,
-   type, attribute and default alignment data.
+/* Convert a bfd section name to a Mach-O segment + section name.  */
 
-   Otherwise, expand the bfd_name (assumed to be in the form 
-   "[LC_SEGMENT.]<segmentname>.<sectionname>") and return NULL.  */
-
-static const mach_o_section_name_xlat *
+static void
 bfd_mach_o_convert_section_name_to_mach_o (bfd *abfd ATTRIBUTE_UNUSED,
                                            asection *sect,
                                            bfd_mach_o_section *section)
 {
-  const mach_o_section_name_xlat *xlat;
+  const struct mach_o_segment_name_xlat *seg;
   const char *name = bfd_get_section_name (abfd, sect);
-  const char *segname;
   const char *dot;
   unsigned int len;
   unsigned int seglen;
   unsigned int seclen;
 
-  memset (section->segname, 0, BFD_MACH_O_SEGNAME_SIZE + 1);
-  memset (section->sectname, 0, BFD_MACH_O_SECTNAME_SIZE + 1);
-
-  /* See if is a canonical name ... */
-  xlat = bfd_mach_o_section_data_for_bfd_name (abfd, name, &segname);
-  if (xlat)
-    {
-      strcpy (section->segname, segname);
-      strcpy (section->sectname, xlat->mach_o_name);
-      return xlat;
-    }
+  /* List of well known names.  They all start with a dot.  */
+  if (name[0] == '.')
+    for (seg = segsec_names_xlat; seg->segname; seg++)
+      {
+        const struct mach_o_section_name_xlat *sec;
+
+        for (sec = seg->sections; sec->mach_o_name; sec++)
+          {
+            if (strcmp (sec->bfd_name, name) == 0)
+              {
+                strcpy (section->segname, seg->segname);
+                strcpy (section->sectname, sec->mach_o_name);
+                return;
+              }
+          }
+      }
 
-  /* .. else we convert our constructed one back to Mach-O.
-     Strip LC_SEGMENT. prefix, if present.  */
+  /* Strip LC_SEGMENT. prefix.  */
   if (strncmp (name, "LC_SEGMENT.", 11) == 0)
     name += 11;
 
@@ -472,30 +273,23 @@ bfd_mach_o_convert_section_name_to_mach_o (bfd *abfd ATTRIBUTE_UNUSED,
           section->segname[seglen] = 0;
           memcpy (section->sectname, dot + 1, seclen);
           section->sectname[seclen] = 0;
-          return NULL;
+          return;
         }
     }
 
-  /* The segment and section names are both missing - don't make them
-     into dots.  */
-  if (dot && dot == name)
-    return NULL;
-
-  /* Just duplicate the name into both segment and section.  */
   if (len > 16)
     len = 16;
   memcpy (section->segname, name, len);
   section->segname[len] = 0;
   memcpy (section->sectname, name, len);
   section->sectname[len] = 0;
-  return NULL;
 }
 
 /* Return the size of an entry for section SEC.
    Must be called only for symbol pointer section and symbol stubs
    sections.  */
 
-unsigned int
+static unsigned int
 bfd_mach_o_section_get_entry_size (bfd *abfd, bfd_mach_o_section *sec)
 {
   switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
@@ -515,7 +309,7 @@ bfd_mach_o_section_get_entry_size (bfd *abfd, bfd_mach_o_section *sec)
    Must be called only for symbol pointer section and symbol stubs
    sections.  */
 
-unsigned int
+static unsigned int
 bfd_mach_o_section_get_nbr_indirect (bfd *abfd, bfd_mach_o_section *sec)
 {
   unsigned int elsz;
@@ -533,17 +327,10 @@ bfd_mach_o_section_get_nbr_indirect (bfd *abfd, bfd_mach_o_section *sec)
 
 bfd_boolean
 bfd_mach_o_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED,
-					 asymbol *isymbol,
+					 asymbol *isymbol ATTRIBUTE_UNUSED,
 					 bfd *obfd ATTRIBUTE_UNUSED,
-					 asymbol *osymbol)
+					 asymbol *osymbol ATTRIBUTE_UNUSED)
 {
-  bfd_mach_o_asymbol *os, *is;
-  os = (bfd_mach_o_asymbol *)osymbol;
-  is = (bfd_mach_o_asymbol *)isymbol;
-  os->n_type = is->n_type;
-  os->n_sect = is->n_sect;
-  os->n_desc = is->n_desc;
-  os->symbol.udata.i = is->symbol.udata.i;
   return TRUE;
 }
 
@@ -552,20 +339,10 @@ bfd_mach_o_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED,
 
 bfd_boolean
 bfd_mach_o_bfd_copy_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
-					  asection *isection,
+					  asection *isection ATTRIBUTE_UNUSED,
 					  bfd *obfd ATTRIBUTE_UNUSED,
-					  asection *osection)
+					  asection *osection ATTRIBUTE_UNUSED)
 {
-  if (osection->used_by_bfd == NULL)
-    osection->used_by_bfd = isection->used_by_bfd;
-  else 
-    if (isection->used_by_bfd != NULL)
-      memcpy (osection->used_by_bfd, isection->used_by_bfd, 
-	      sizeof (bfd_mach_o_section));
- 
-  if (osection->used_by_bfd != NULL)
-    ((bfd_mach_o_section *)osection->used_by_bfd)->bfdsection = osection;
-
   return TRUE;
 }
 
@@ -587,22 +364,6 @@ bfd_mach_o_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
   return TRUE;
 }
 
-/* This allows us to set up to 32 bits of flags (unless we invent some
-   fiendish scheme to subdivide).  For now, we'll just set the file flags
-   without error checking - just overwrite.  */
-   
-bfd_boolean
-bfd_mach_o_bfd_set_private_flags (bfd *abfd, flagword flags)
-{
-  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
-
-  if (!mdata)
-    return FALSE;
-
-  mdata->header.flags = flags;
-  return TRUE;
-}
-
 /* Count the total number of symbols.  */
 
 static long
@@ -641,10 +402,9 @@ bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation)
       return 0;
     }
 
-  if (!bfd_mach_o_read_symtab_symbols (abfd))
+  if (bfd_mach_o_read_symtab_symbols (abfd) != 0)
     {
-      (*_bfd_error_handler)
-        (_("bfd_mach_o_canonicalize_symtab: unable to load symbols"));
+      (*_bfd_error_handler) (_("bfd_mach_o_canonicalize_symtab: unable to load symbols"));
       return 0;
     }
 
@@ -658,8 +418,6 @@ bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation)
   return nsyms;
 }
 
-/* Create synthetic symbols for indirect symbols.  */
-
 long
 bfd_mach_o_get_synthetic_symtab (bfd *abfd,
                                  long symcount ATTRIBUTE_UNUSED,
@@ -679,23 +437,19 @@ bfd_mach_o_get_synthetic_symtab (bfd *abfd,
 
   *ret = NULL;
 
-  /* Stop now if no symbols or no indirect symbols.  */
   if (dysymtab == NULL || symtab == NULL || symtab->symbols == NULL)
     return 0;
 
   if (dysymtab->nindirectsyms == 0)
     return 0;
 
-  /* We need to allocate a bfd symbol for every indirect symbol and to
-     allocate the memory for its name.  */
   count = dysymtab->nindirectsyms;
   size = count * sizeof (asymbol) + 1;
 
   for (j = 0; j < count; j++)
     {
       unsigned int isym = dysymtab->indirect_syms[j];
-
-      /* Some indirect symbols are anonymous.  */
+              
       if (isym < symtab->nsyms && symtab->symbols[isym].symbol.name)
         size += strlen (symtab->symbols[isym].symbol.name) + sizeof ("$stub");
     }
@@ -720,7 +474,6 @@ bfd_mach_o_get_synthetic_symtab (bfd *abfd,
         case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
         case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
         case BFD_MACH_O_S_SYMBOL_STUBS:
-          /* Only these sections have indirect symbols.  */
           first = sec->reserved1;
           last = first + bfd_mach_o_section_get_nbr_indirect (abfd, sec);
           addr = sec->addr;
@@ -794,10 +547,7 @@ bfd_mach_o_print_symbol (bfd *abfd,
 	switch (asym->n_type & BFD_MACH_O_N_TYPE)
 	  {
 	  case BFD_MACH_O_N_UNDF:
-            if (symbol->value == 0)
-              name = "UND";
-            else
-              name = "COM";
+	    name = "UND";
 	    break;
 	  case BFD_MACH_O_N_ABS:
 	    name = "ABS";
@@ -821,14 +571,14 @@ bfd_mach_o_print_symbol (bfd *abfd,
                asym->n_type, name, asym->n_sect, asym->n_desc);
       if ((asym->n_type & BFD_MACH_O_N_STAB) == 0
 	  && (asym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT)
-	fprintf (file, " [%s]", symbol->section->name);
+	fprintf (file, " %-5s", symbol->section->name);
       fprintf (file, " %s", symbol->name);
     }
 }
 
 static void
 bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype,
-				 bfd_mach_o_cpu_subtype msubtype,
+				 bfd_mach_o_cpu_subtype msubtype ATTRIBUTE_UNUSED,
 				 enum bfd_architecture *type,
 				 unsigned long *subtype)
 {
@@ -836,12 +586,8 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype,
 
   switch (mtype)
     {
-    case BFD_MACH_O_CPU_TYPE_VAX:
-      *type = bfd_arch_vax;
-      break;
-    case BFD_MACH_O_CPU_TYPE_MC680x0:
-      *type = bfd_arch_m68k;
-      break;
+    case BFD_MACH_O_CPU_TYPE_VAX: *type = bfd_arch_vax; break;
+    case BFD_MACH_O_CPU_TYPE_MC680x0: *type = bfd_arch_m68k; break;
     case BFD_MACH_O_CPU_TYPE_I386:
       *type = bfd_arch_i386;
       *subtype = bfd_mach_i386_i386;
@@ -850,52 +596,17 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype,
       *type = bfd_arch_i386;
       *subtype = bfd_mach_x86_64;
       break;
-    case BFD_MACH_O_CPU_TYPE_MIPS:
-      *type = bfd_arch_mips;
-      break;
-    case BFD_MACH_O_CPU_TYPE_MC98000:
-      *type = bfd_arch_m98k;
-      break;
-    case BFD_MACH_O_CPU_TYPE_HPPA:
-      *type = bfd_arch_hppa;
-      break;
-    case BFD_MACH_O_CPU_TYPE_ARM:
-      *type = bfd_arch_arm;
-      switch (msubtype)
-        {
-        case BFD_MACH_O_CPU_SUBTYPE_ARM_V4T:
-          *subtype = bfd_mach_arm_4T;
-          break;
-        case BFD_MACH_O_CPU_SUBTYPE_ARM_V6:
-          *subtype = bfd_mach_arm_4T;	/* Best fit ?  */
-          break;
-        case BFD_MACH_O_CPU_SUBTYPE_ARM_V5TEJ:
-          *subtype = bfd_mach_arm_5TE;
-          break;
-        case BFD_MACH_O_CPU_SUBTYPE_ARM_XSCALE:
-          *subtype = bfd_mach_arm_XScale;
-          break;
-        case BFD_MACH_O_CPU_SUBTYPE_ARM_V7:
-          *subtype = bfd_mach_arm_5TE;	/* Best fit ?  */
-          break;
-        case BFD_MACH_O_CPU_SUBTYPE_ARM_ALL:
-        default:
-          break;
-        }
-      break;
-    case BFD_MACH_O_CPU_TYPE_MC88000:
-      *type = bfd_arch_m88k;
-      break;
+    case BFD_MACH_O_CPU_TYPE_MIPS: *type = bfd_arch_mips; break;
+    case BFD_MACH_O_CPU_TYPE_MC98000: *type = bfd_arch_m98k; break;
+    case BFD_MACH_O_CPU_TYPE_HPPA: *type = bfd_arch_hppa; break;
+    case BFD_MACH_O_CPU_TYPE_ARM: *type = bfd_arch_arm; break;
+    case BFD_MACH_O_CPU_TYPE_MC88000: *type = bfd_arch_m88k; break;
     case BFD_MACH_O_CPU_TYPE_SPARC:
       *type = bfd_arch_sparc;
       *subtype = bfd_mach_sparc;
       break;
-    case BFD_MACH_O_CPU_TYPE_I860:
-      *type = bfd_arch_i860;
-      break;
-    case BFD_MACH_O_CPU_TYPE_ALPHA:
-      *type = bfd_arch_alpha;
-      break;
+    case BFD_MACH_O_CPU_TYPE_I860: *type = bfd_arch_i860; break;
+    case BFD_MACH_O_CPU_TYPE_ALPHA: *type = bfd_arch_alpha; break;
     case BFD_MACH_O_CPU_TYPE_POWERPC:
       *type = bfd_arch_powerpc;
       *subtype = bfd_mach_ppc;
@@ -975,35 +686,6 @@ bfd_mach_o_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
   return (asect->reloc_count + 1) * sizeof (arelent *);
 }
 
-/* In addition to the need to byte-swap the symbol number, the bit positions
-   of the fields in the relocation information vary per target endian-ness.  */
-
-static void
-bfd_mach_o_swap_in_non_scattered_reloc (bfd *abfd, bfd_mach_o_reloc_info *rel,
-				       unsigned char *fields)
-{
-  unsigned char info = fields[3];
-
-  if (bfd_big_endian (abfd))
-    {
-      rel->r_value = (fields[0] << 16) | (fields[1] << 8) | fields[2];
-      rel->r_type = (info >> BFD_MACH_O_BE_TYPE_SHIFT) & BFD_MACH_O_TYPE_MASK;
-      rel->r_pcrel = (info & BFD_MACH_O_BE_PCREL) ? 1 : 0;
-      rel->r_length = (info >> BFD_MACH_O_BE_LENGTH_SHIFT) 
-		      & BFD_MACH_O_LENGTH_MASK;
-      rel->r_extern = (info & BFD_MACH_O_BE_EXTERN) ? 1 : 0;
-    }
-  else
-    {
-      rel->r_value = (fields[2] << 16) | (fields[1] << 8) | fields[0];
-      rel->r_type = (info >> BFD_MACH_O_LE_TYPE_SHIFT) & BFD_MACH_O_TYPE_MASK;
-      rel->r_pcrel = (info & BFD_MACH_O_LE_PCREL) ? 1 : 0;
-      rel->r_length = (info >> BFD_MACH_O_LE_LENGTH_SHIFT) 
-		      & BFD_MACH_O_LENGTH_MASK;
-      rel->r_extern = (info & BFD_MACH_O_LE_EXTERN) ? 1 : 0;
-    }
-}
-
 static int
 bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
                                    struct mach_o_reloc_info_external *raw,
@@ -1013,28 +695,20 @@ bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
   bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
   bfd_mach_o_reloc_info reloc;
   bfd_vma addr;
+  bfd_vma symnum;
   asymbol **sym;
 
   addr = bfd_get_32 (abfd, raw->r_address);
-  res->sym_ptr_ptr = NULL;
-  res->addend = 0;
+  symnum = bfd_get_32 (abfd, raw->r_symbolnum);
   
   if (addr & BFD_MACH_O_SR_SCATTERED)
     {
       unsigned int j;
-      bfd_vma symnum = bfd_get_32 (abfd, raw->r_symbolnum);
 
-      /* Scattered relocation, can't be extern. */
-      reloc.r_scattered = 1;
-      reloc.r_extern = 0;
-
-      /*   Extract section and offset from r_value (symnum).  */
-      reloc.r_value = symnum;
-      /* FIXME: This breaks when a symbol in a reloc exactly follows the
-	 end of the data for the section (e.g. in a calculation of section
-	 data length).  At present, the symbol will end up associated with
-	 the following section or, if it falls within alignment padding, as
-	 null - which will assert later.  */
+      /* Scattered relocation.
+         Extract section and offset from r_value.  */
+      res->sym_ptr_ptr = NULL;
+      res->addend = 0;
       for (j = 0; j < mdata->nsects; j++)
         {
           bfd_mach_o_section *sect = mdata->sections[j];
@@ -1045,62 +719,42 @@ bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
               break;
             }
         }
-
-      /* Extract the info and address fields from r_address.  */
+      res->address = BFD_MACH_O_GET_SR_ADDRESS (addr);
       reloc.r_type = BFD_MACH_O_GET_SR_TYPE (addr);
       reloc.r_length = BFD_MACH_O_GET_SR_LENGTH (addr);
       reloc.r_pcrel = addr & BFD_MACH_O_SR_PCREL;
-      reloc.r_address = BFD_MACH_O_GET_SR_TYPE (addr);
-      res->address = BFD_MACH_O_GET_SR_ADDRESS (addr);
+      reloc.r_scattered = 1;
     }
   else
     {
-      unsigned int num;
-      
-      /* Non-scattered relocation.  */
-      reloc.r_scattered = 0;
-      
-      /* The value and info fields have to be extracted dependent on target
-         endian-ness.  */
-      bfd_mach_o_swap_in_non_scattered_reloc (abfd, &reloc, raw->r_symbolnum);
-      num = reloc.r_value;
-
-      if (reloc.r_extern)
+      unsigned int num = BFD_MACH_O_GET_R_SYMBOLNUM (symnum);
+      res->addend = 0;
+      res->address = addr;
+      if (symnum & BFD_MACH_O_R_EXTERN)
+        {
           sym = syms + num;
-      else if (reloc.r_scattered
-	       || (reloc.r_type != BFD_MACH_O_GENERIC_RELOC_PAIR))
+          reloc.r_extern = 1;
+        }
+      else
         {
           BFD_ASSERT (num != 0);
           BFD_ASSERT (num <= mdata->nsects);
           sym = mdata->sections[num - 1]->bfdsection->symbol_ptr_ptr;
           /* For a symbol defined in section S, the addend (stored in the
              binary) contains the address of the section.  To comply with
-             bfd convention, subtract the section address.
+             bfd conventio, substract the section address.
              Use the address from the header, so that the user can modify
              the vma of the section.  */
           res->addend = -mdata->sections[num - 1]->addr;
-        }
-      else /* ... The 'symnum' in a non-scattered PAIR will be 0x00ffffff.  */
-        {
-          /* Pairs for PPC LO/HI/HA are not scattered, but contain the offset
-             in the lower 16bits of the address value.  So we have to find the
-             'symbol' from the preceding reloc.  We do this even thoough the
-             section symbol is probably not needed here, because NULL symbol
-             values cause an assert in generic BFD code.  */
-          sym = (res - 1)->sym_ptr_ptr;
+          reloc.r_extern = 0;
         }
       res->sym_ptr_ptr = sym;
-      
-      /* The 'address' is just r_address.
-         ??? maybe this should be masked with  0xffffff for safety.  */
-      res->address = addr;
-      reloc.r_address = addr;
+      reloc.r_type = BFD_MACH_O_GET_R_TYPE (symnum);
+      reloc.r_length = BFD_MACH_O_GET_R_LENGTH (symnum);
+      reloc.r_pcrel = (symnum & BFD_MACH_O_R_PCREL) ? 1 : 0;
+      reloc.r_scattered = 0;
     }
   
-  /* We have set up a reloc with all the information present, so the swapper can
-     modify address, value and addend fields, if necessary, to convey information
-     in the generic BFD reloc that is mach-o specific.  */
-
   if (!(*bed->_bfd_mach_o_swap_reloc_in)(res, &reloc))
     return -1;
   return 0;
@@ -1154,25 +808,21 @@ bfd_mach_o_canonicalize_reloc (bfd *abfd, asection *asect,
   if (bed->_bfd_mach_o_swap_reloc_in == NULL)
     return 0;
 
-  if (asect->relocation == NULL)
-    {
-      res = bfd_malloc (asect->reloc_count * sizeof (arelent));
-      if (res == NULL)
-        return -1;
+  res = bfd_malloc (asect->reloc_count * sizeof (arelent));
+  if (res == NULL)
+    return -1;
 
-      if (bfd_mach_o_canonicalize_relocs (abfd, asect->rel_filepos,
-                                          asect->reloc_count, res, syms) < 0)
-        {
-          free (res);
-          return -1;
-        }
-      asect->relocation = res;
+  if (bfd_mach_o_canonicalize_relocs (abfd, asect->rel_filepos,
+                                      asect->reloc_count, res, syms) < 0)
+    {
+      free (res);
+      return -1;
     }
 
-  res = asect->relocation;
   for (i = 0; i < asect->reloc_count; i++)
     rels[i] = &res[i];
   rels[i] = NULL;
+  asect->relocation = res;
 
   return i;
 }
@@ -1184,7 +834,7 @@ bfd_mach_o_get_dynamic_reloc_upper_bound (bfd *abfd)
 
   if (mdata->dysymtab == NULL)
     return 1;
-  return (mdata->dysymtab->nextrel + mdata->dysymtab->nlocrel + 1)
+  return (mdata->dysymtab->nextrel + mdata->dysymtab->nlocrel)
     * sizeof (arelent *);
 }
 
@@ -1207,76 +857,35 @@ bfd_mach_o_canonicalize_dynamic_reloc (bfd *abfd, arelent **rels,
   if (bed->_bfd_mach_o_swap_reloc_in == NULL)
     return 0;
 
-  if (mdata->dyn_reloc_cache == NULL)
-    {
-      res = bfd_malloc ((dysymtab->nextrel + dysymtab->nlocrel)
-                        * sizeof (arelent));
-      if (res == NULL)
-        return -1;
-
-      if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->extreloff,
-                                          dysymtab->nextrel, res, syms) < 0)
-        {
-          free (res);
-          return -1;
-        }
+  res = bfd_malloc ((dysymtab->nextrel + dysymtab->nlocrel) * sizeof (arelent));
+  if (res == NULL)
+    return -1;
 
-      if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->locreloff,
-                                          dysymtab->nlocrel,
-                                          res + dysymtab->nextrel, syms) < 0)
-        {
-          free (res);
-          return -1;
-        }
+  if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->extreloff,
+                                      dysymtab->nextrel, res, syms) < 0)
+    {
+      free (res);
+      return -1;
+    }
 
-      mdata->dyn_reloc_cache = res;
+  if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->locreloff,
+                                      dysymtab->nlocrel,
+                                      res + dysymtab->nextrel, syms) < 0)
+    {
+      free (res);
+      return -1;
     }
 
-  res = mdata->dyn_reloc_cache;
   for (i = 0; i < dysymtab->nextrel + dysymtab->nlocrel; i++)
     rels[i] = &res[i];
   rels[i] = NULL;
   return i;
 }
 
-/* In addition to the need to byte-swap the symbol number, the bit positions
-   of the fields in the relocation information vary per target endian-ness.  */
-
-static void
-bfd_mach_o_swap_out_non_scattered_reloc (bfd *abfd, unsigned char *fields,
-				       bfd_mach_o_reloc_info *rel)
-{
-  unsigned char info = 0;
-
-  BFD_ASSERT (rel->r_type <= 15);
-  BFD_ASSERT (rel->r_length <= 3);
-
-  if (bfd_big_endian (abfd))
-    {
-      fields[0] = (rel->r_value >> 16) & 0xff;
-      fields[1] = (rel->r_value >> 8) & 0xff;
-      fields[2] = rel->r_value & 0xff;
-      info |= rel->r_type << BFD_MACH_O_BE_TYPE_SHIFT;
-      info |= rel->r_pcrel ? BFD_MACH_O_BE_PCREL : 0;
-      info |= rel->r_length << BFD_MACH_O_BE_LENGTH_SHIFT;
-      info |= rel->r_extern ? BFD_MACH_O_BE_EXTERN : 0;
-    }
-  else
-    {
-      fields[2] = (rel->r_value >> 16) & 0xff;
-      fields[1] = (rel->r_value >> 8) & 0xff;
-      fields[0] = rel->r_value & 0xff;
-      info |= rel->r_type << BFD_MACH_O_LE_TYPE_SHIFT;
-      info |= rel->r_pcrel ? BFD_MACH_O_LE_PCREL : 0;
-      info |= rel->r_length << BFD_MACH_O_LE_LENGTH_SHIFT;
-      info |= rel->r_extern ? BFD_MACH_O_LE_EXTERN : 0;
-    }
-  fields[3] = info;
-}
-
 static bfd_boolean
 bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section)
 {
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
   unsigned int i;
   arelent **entries;
   asection *sec;
@@ -1289,6 +898,13 @@ bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section)
   if (bed->_bfd_mach_o_swap_reloc_out == NULL)
     return TRUE;
 
+  /* Allocate relocation room.  */
+  mdata->filelen = FILE_ALIGN(mdata->filelen, 2);
+  section->nreloc = sec->reloc_count;
+  sec->rel_filepos = mdata->filelen;
+  section->reloff = sec->rel_filepos;
+  mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE;
+
   if (bfd_seek (abfd, section->reloff, SEEK_SET) != 0)
     return FALSE;
 
@@ -1320,9 +936,15 @@ bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section)
         }
       else
         {
+          unsigned long v;
+
           bfd_put_32 (abfd, pinfo->r_address, raw.r_address);
-          bfd_mach_o_swap_out_non_scattered_reloc (abfd, raw.r_symbolnum,
-						   pinfo);
+          v = BFD_MACH_O_SET_R_SYMBOLNUM (pinfo->r_value)
+            | (pinfo->r_pcrel ? BFD_MACH_O_R_PCREL : 0)
+            | BFD_MACH_O_SET_R_LENGTH (pinfo->r_length)
+            | (pinfo->r_extern ? BFD_MACH_O_R_EXTERN : 0)
+            | BFD_MACH_O_SET_R_TYPE (pinfo->r_type);
+          bfd_put_32 (abfd, v, raw.r_symbolnum);
         }
 
       if (bfd_bwrite (&raw, BFD_MACH_O_RELENT_SIZE, abfd)
@@ -1475,24 +1097,18 @@ bfd_mach_o_write_symtab (bfd *abfd, bfd_mach_o_load_command *command)
   if (strtab == NULL)
     return FALSE;
 
-  if (sym->nsyms > 0)
-    /* Although we don't strictly need to do this, for compatibility with
-       Darwin system tools, actually output an empty string for the index
-       0 entry.  */
-    _bfd_stringtab_add (strtab, "", TRUE, FALSE);
-
   for (i = 0; i < sym->nsyms; i++)
     {
       bfd_size_type str_index;
       bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
-     
+
+      /* Compute name index.  */
+      /* An index of 0 always means the empty string.  */
       if (s->symbol.name == 0 || s->symbol.name[0] == '\0')
-	/* An index of 0 always means the empty string.  */
         str_index = 0;
       else
         {
           str_index = _bfd_stringtab_add (strtab, s->symbol.name, TRUE, FALSE);
-
           if (str_index == (bfd_size_type) -1)
             goto err;
         }
@@ -1555,258 +1171,8 @@ bfd_mach_o_write_symtab (bfd *abfd, bfd_mach_o_load_command *command)
   return FALSE;
 }
 
-/* Write a dysymtab command.
-   TODO: Possibly coalesce writes of smaller objects.  */
-
-static bfd_boolean
-bfd_mach_o_write_dysymtab (bfd *abfd, bfd_mach_o_load_command *command)
-{
-  bfd_mach_o_dysymtab_command *cmd = &command->command.dysymtab;
-
-  BFD_ASSERT (command->type == BFD_MACH_O_LC_DYSYMTAB);
-
-  if (cmd->nmodtab != 0)
-    {
-      unsigned int i;
-
-      if (bfd_seek (abfd, cmd->modtaboff, SEEK_SET) != 0)
-	return FALSE;
-
-      for (i = 0; i < cmd->nmodtab; i++)
-	{
-	  bfd_mach_o_dylib_module *module = &cmd->dylib_module[i];
-	  unsigned int iinit;
-	  unsigned int ninit;
-
-	  iinit = module->iinit & 0xffff;
-	  iinit |= ((module->iterm & 0xffff) << 16);
-
-	  ninit = module->ninit & 0xffff;
-	  ninit |= ((module->nterm & 0xffff) << 16);
-
-	  if (bfd_mach_o_wide_p (abfd))
-	    {
-	      struct mach_o_dylib_module_64_external w;
-
-	      bfd_h_put_32 (abfd, module->module_name_idx, &w.module_name);
-	      bfd_h_put_32 (abfd, module->iextdefsym, &w.iextdefsym);
-	      bfd_h_put_32 (abfd, module->nextdefsym, &w.nextdefsym);
-	      bfd_h_put_32 (abfd, module->irefsym, &w.irefsym);
-	      bfd_h_put_32 (abfd, module->nrefsym, &w.nrefsym);
-	      bfd_h_put_32 (abfd, module->ilocalsym, &w.ilocalsym);
-	      bfd_h_put_32 (abfd, module->nlocalsym, &w.nlocalsym);
-	      bfd_h_put_32 (abfd, module->iextrel, &w.iextrel);
-	      bfd_h_put_32 (abfd, module->nextrel, &w.nextrel);
-	      bfd_h_put_32 (abfd, iinit, &w.iinit_iterm);
-	      bfd_h_put_32 (abfd, ninit, &w.ninit_nterm);
-	      bfd_h_put_64 (abfd, module->objc_module_info_addr,
-			    &w.objc_module_info_addr);
-	      bfd_h_put_32 (abfd, module->objc_module_info_size,
-			    &w.objc_module_info_size);
-
-	      if (bfd_bwrite ((void *) &w, sizeof (w), abfd) != sizeof (w))
-		return FALSE;
-	    }
-	  else
-	    {
-	      struct mach_o_dylib_module_external n;
-
-	      bfd_h_put_32 (abfd, module->module_name_idx, &n.module_name);
-	      bfd_h_put_32 (abfd, module->iextdefsym, &n.iextdefsym);
-	      bfd_h_put_32 (abfd, module->nextdefsym, &n.nextdefsym);
-	      bfd_h_put_32 (abfd, module->irefsym, &n.irefsym);
-	      bfd_h_put_32 (abfd, module->nrefsym, &n.nrefsym);
-	      bfd_h_put_32 (abfd, module->ilocalsym, &n.ilocalsym);
-	      bfd_h_put_32 (abfd, module->nlocalsym, &n.nlocalsym);
-	      bfd_h_put_32 (abfd, module->iextrel, &n.iextrel);
-	      bfd_h_put_32 (abfd, module->nextrel, &n.nextrel);
-	      bfd_h_put_32 (abfd, iinit, &n.iinit_iterm);
-	      bfd_h_put_32 (abfd, ninit, &n.ninit_nterm);
-	      bfd_h_put_32 (abfd, module->objc_module_info_addr,
-			    &n.objc_module_info_addr);
-	      bfd_h_put_32 (abfd, module->objc_module_info_size,
-			    &n.objc_module_info_size);
-
-	      if (bfd_bwrite ((void *) &n, sizeof (n), abfd) != sizeof (n))
-		return FALSE;
-	    }
-	}
-    }
-
-  if (cmd->ntoc != 0)
-    {
-      unsigned int i;
-
-      if (bfd_seek (abfd, cmd->tocoff, SEEK_SET) != 0)
-	return FALSE;
-
-      for (i = 0; i < cmd->ntoc; i++)
-	{
-	  struct mach_o_dylib_table_of_contents_external raw;
-	  bfd_mach_o_dylib_table_of_content *toc = &cmd->dylib_toc[i];
-
-	  bfd_h_put_32 (abfd, toc->symbol_index, &raw.symbol_index);
-	  bfd_h_put_32 (abfd, toc->module_index, &raw.module_index);
-
-	  if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
-	    return FALSE;
-	}
-    }
-  
-  if (cmd->nindirectsyms > 0)
-    {
-      unsigned int i;
-
-      if (bfd_seek (abfd, cmd->indirectsymoff, SEEK_SET) != 0)
-	return FALSE;
-
-      for (i = 0; i < cmd->nindirectsyms; ++i)
-	{
-	  unsigned char raw[4];
-
-	  bfd_h_put_32 (abfd, cmd->indirect_syms[i], &raw);
-	  if (bfd_bwrite (raw, sizeof (raw), abfd) != sizeof (raw))
-	    return FALSE;
-	}    
-    }
-
-  if (cmd->nextrefsyms != 0)
-    {
-      unsigned int i;
-
-      if (bfd_seek (abfd, cmd->extrefsymoff, SEEK_SET) != 0)
-	return FALSE;
-
-      for (i = 0; i < cmd->nextrefsyms; i++)
-	{
-	  unsigned long v;
-	  unsigned char raw[4];
-	  bfd_mach_o_dylib_reference *ref = &cmd->ext_refs[i];
-
-	  /* Fields isym and flags are written as bit-fields, thus we need
-	     a specific processing for endianness.  */
-
-	  if (bfd_big_endian (abfd))
-	    {
-	      v = ((ref->isym & 0xffffff) << 8);
-	      v |= ref->flags & 0xff;
-	    }
-	  else
-	    {
-	      v = ref->isym  & 0xffffff;
-	      v |= ((ref->flags & 0xff) << 24);
-	    }
-
-	  bfd_h_put_32 (abfd, v, raw);
-	  if (bfd_bwrite (raw, sizeof (raw), abfd) != sizeof (raw))
-	    return FALSE;
-	}
-    }
-
-  /* The command.  */
-  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0)
-    return FALSE;
-  else
-    {
-      struct mach_o_dysymtab_command_external raw;
-
-      bfd_h_put_32 (abfd, cmd->ilocalsym, &raw.ilocalsym);
-      bfd_h_put_32 (abfd, cmd->nlocalsym, &raw.nlocalsym);
-      bfd_h_put_32 (abfd, cmd->iextdefsym, &raw.iextdefsym);
-      bfd_h_put_32 (abfd, cmd->nextdefsym, &raw.nextdefsym);
-      bfd_h_put_32 (abfd, cmd->iundefsym, &raw.iundefsym);
-      bfd_h_put_32 (abfd, cmd->nundefsym, &raw.nundefsym);
-      bfd_h_put_32 (abfd, cmd->tocoff, &raw.tocoff);
-      bfd_h_put_32 (abfd, cmd->ntoc, &raw.ntoc);
-      bfd_h_put_32 (abfd, cmd->modtaboff, &raw.modtaboff);
-      bfd_h_put_32 (abfd, cmd->nmodtab, &raw.nmodtab);
-      bfd_h_put_32 (abfd, cmd->extrefsymoff, &raw.extrefsymoff);
-      bfd_h_put_32 (abfd, cmd->nextrefsyms, &raw.nextrefsyms);
-      bfd_h_put_32 (abfd, cmd->indirectsymoff, &raw.indirectsymoff);
-      bfd_h_put_32 (abfd, cmd->nindirectsyms, &raw.nindirectsyms);
-      bfd_h_put_32 (abfd, cmd->extreloff, &raw.extreloff);
-      bfd_h_put_32 (abfd, cmd->nextrel, &raw.nextrel);
-      bfd_h_put_32 (abfd, cmd->locreloff, &raw.locreloff);
-      bfd_h_put_32 (abfd, cmd->nlocrel, &raw.nlocrel);
-
-      if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
-	return FALSE;
-    }
-
-  return TRUE;
-}
-
-static unsigned
-bfd_mach_o_primary_symbol_sort_key (bfd_mach_o_asymbol *s)
-{
-  unsigned mtyp = s->n_type & BFD_MACH_O_N_TYPE;
-
-  /* Just leave debug symbols where they are (pretend they are local, and
-     then they will just be sorted on position).  */
-  if (s->n_type & BFD_MACH_O_N_STAB)
-    return 0;
-
-  /* Local (we should never see an undefined local AFAICT).  */
-  if (! (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT)))
-    return 0;
-
-  /* Common symbols look like undefined externs.  */
-  if (mtyp == BFD_MACH_O_N_UNDF)
-    return 2;
-
-  /* A defined non-local, non-debug symbol.  */
-  return 1;
-}
-
-static int
-bfd_mach_o_cf_symbols (const void *a, const void *b)
-{
-  bfd_mach_o_asymbol *sa = *(bfd_mach_o_asymbol **) a;
-  bfd_mach_o_asymbol *sb = *(bfd_mach_o_asymbol **) b;
-  unsigned int soa, sob;
-
-  soa = bfd_mach_o_primary_symbol_sort_key (sa);
-  sob = bfd_mach_o_primary_symbol_sort_key (sb);
-  if (soa < sob)
-    return -1;
-
-  if (soa > sob)
-    return 1;
-
-  /* If it's local or stab, just preserve the input order.  */
-  if (soa == 0)
-    {
-      if (sa->symbol.udata.i < sb->symbol.udata.i)
-        return -1;
-      if (sa->symbol.udata.i > sb->symbol.udata.i)
-        return  1;
-
-      /* This is probably an error.  */
-      return 0;
-    }
-
-  /* The second sort key is name.  */
-  return strcmp (sa->symbol.name, sb->symbol.name);
-}
-
-/* Process the symbols.
-
-   This should be OK for single-module files - but it is not likely to work
-   for multi-module shared libraries.
-
-   (a) If the application has not filled in the relevant mach-o fields, make
-       an estimate.
-
-   (b) Order them, like this:
-	(  i) local.
-		(unsorted)
-	( ii) external defined
-		(by name)
-	(iii) external undefined/common
-		(by name)
-	( iv) common
-		(by name)
-*/
+/* Process the symbols and generate Mach-O specific fields.
+   Number them.  */
 
 static bfd_boolean
 bfd_mach_o_mangle_symbols (bfd *abfd)
@@ -1814,22 +1180,15 @@ bfd_mach_o_mangle_symbols (bfd *abfd)
   unsigned long i;
   asymbol **symbols = bfd_get_outsymbols (abfd);
 
-  if (symbols == NULL || bfd_get_symcount (abfd) == 0)
-    return TRUE;
-
   for (i = 0; i < bfd_get_symcount (abfd); i++)
     {
       bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
 
-      /* We use this value, which is out-of-range as a symbol index, to signal
-	 that the mach-o-specific data are not filled in and need to be created
-	 from the bfd values.  It is much preferable for the application to do
-	 this, since more meaningful diagnostics can be made that way.  */
-
-      if (s->symbol.udata.i == SYM_MACHO_FIELDS_UNSET)
+      if (s->n_type == BFD_MACH_O_N_UNDF && !(s->symbol.flags & BSF_DEBUGGING))
         {
-          /* No symbol information has been set - therefore determine
-             it from the bfd symbol flags/info.  */
+          /* As genuine Mach-O symbols type shouldn't be N_UNDF (undefined
+             symbols should be N_UNDEF | N_EXT), we suppose the back-end
+             values haven't been set.  */
           if (s->symbol.section == bfd_abs_section_ptr)
             s->n_type = BFD_MACH_O_N_ABS;
           else if (s->symbol.section == bfd_und_section_ptr)
@@ -1837,15 +1196,9 @@ bfd_mach_o_mangle_symbols (bfd *abfd)
               s->n_type = BFD_MACH_O_N_UNDF;
               if (s->symbol.flags & BSF_WEAK)
                 s->n_desc |= BFD_MACH_O_N_WEAK_REF;
-              /* mach-o automatically makes undefined symbols extern.  */
-	      s->n_type |= BFD_MACH_O_N_EXT;
-	      s->symbol.flags |= BSF_GLOBAL;
             }
           else if (s->symbol.section == bfd_com_section_ptr)
-	    {
-              s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT;
-              s->symbol.flags |= BSF_GLOBAL;
-            }
+            s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT;
           else
             s->n_type = BFD_MACH_O_N_SECT;
           
@@ -1853,82 +1206,15 @@ bfd_mach_o_mangle_symbols (bfd *abfd)
             s->n_type |= BFD_MACH_O_N_EXT;
         }
 
-      /* Put the section index in, where required.  */
-      if ((s->symbol.section != bfd_abs_section_ptr
+      /* Compute section index.  */
+      if (s->symbol.section != bfd_abs_section_ptr
           && s->symbol.section != bfd_und_section_ptr
           && s->symbol.section != bfd_com_section_ptr)
-          || ((s->n_type & BFD_MACH_O_N_STAB) != 0
-               && s->symbol.name == NULL))
-	s->n_sect = s->symbol.section->target_index;
+        s->n_sect = s->symbol.section->target_index;
 
-      /* Number to preserve order for local and debug syms.  */
+      /* Number symbols.  */
       s->symbol.udata.i = i;
     }
-
-  /* Sort the symbols.  */
-  qsort ((void *) symbols, (size_t) bfd_get_symcount (abfd),
-	 sizeof (asymbol *), bfd_mach_o_cf_symbols);
-
-  for (i = 0; i < bfd_get_symcount (abfd); ++i)
-    {
-      bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
-      s->symbol.udata.i = i;  /* renumber.  */
-    }
-
-  return TRUE;
-}
-
-/* We build a flat table of sections, which can be re-ordered if necessary.
-   Fill in the section number and other mach-o-specific data.  */
-
-static bfd_boolean
-bfd_mach_o_mangle_sections (bfd *abfd, bfd_mach_o_data_struct *mdata)
-{
-  asection *sec;
-  unsigned target_index;
-  unsigned nsect;
-
-  nsect = bfd_count_sections (abfd);
-  
-  /* Don't do it if it's already set - assume the application knows what it's
-     doing.  */
-  if (mdata->nsects == nsect
-      && (mdata->nsects == 0 || mdata->sections != NULL))
-    return TRUE;
-
-  mdata->nsects = nsect;
-  mdata->sections = bfd_alloc (abfd, 
-			       mdata->nsects * sizeof (bfd_mach_o_section *));
-  if (mdata->sections == NULL)
-    return FALSE;
-
-  /* We need to check that this can be done...  */
-  if (nsect > 255)
-    (*_bfd_error_handler) (_("mach-o: there are too many sections (%d)"
-			     " maximum is 255,\n"), nsect);
-
-  /* Create Mach-O sections.
-     Section type, attribute and align should have been set when the 
-     section was created - either read in or specified.  */
-  target_index = 0;
-  for (sec = abfd->sections; sec; sec = sec->next)
-    {
-      unsigned bfd_align = bfd_get_section_alignment (abfd, sec);
-      bfd_mach_o_section *msect = bfd_mach_o_get_mach_o_section (sec);
-
-      mdata->sections[target_index] = msect;
-
-      msect->addr = bfd_get_section_vma (abfd, sec);
-      msect->size = bfd_get_section_size (sec);
-
-      /* Use the largest alignment set, in case it was bumped after the 
-	 section was created.  */
-      msect->align = msect->align > bfd_align ? msect->align : bfd_align;
-
-      msect->offset = 0;
-      sec->target_index = ++target_index;
-    }
-
   return TRUE;
 }
 
@@ -1938,14 +1224,27 @@ bfd_mach_o_write_contents (bfd *abfd)
   unsigned int i;
   bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
 
-  /* Make the commands, if not already present.  */
   if (mdata->header.ncmds == 0)
     if (!bfd_mach_o_build_commands (abfd))
       return FALSE;
 
+  /* Now write header information.  */
+  if (mdata->header.filetype == 0)
+    {
+      if (abfd->flags & EXEC_P)
+        mdata->header.filetype = BFD_MACH_O_MH_EXECUTE;
+      else if (abfd->flags & DYNAMIC)
+        mdata->header.filetype = BFD_MACH_O_MH_DYLIB;
+      else
+        mdata->header.filetype = BFD_MACH_O_MH_OBJECT;
+    }
   if (!bfd_mach_o_write_header (abfd, &mdata->header))
     return FALSE;
 
+  /* Assign a number to each symbols.  */
+  if (!bfd_mach_o_mangle_symbols (abfd))
+    return FALSE;
+
   for (i = 0; i < mdata->header.ncmds; i++)
     {
       struct mach_o_load_command_external raw;
@@ -1975,10 +1274,6 @@ bfd_mach_o_write_contents (bfd *abfd)
 	  if (!bfd_mach_o_write_symtab (abfd, cur))
 	    return FALSE;
 	  break;
-	case BFD_MACH_O_LC_DYSYMTAB:
-	  if (!bfd_mach_o_write_dysymtab (abfd, cur))
-	    return FALSE;
-	  break;
 	case BFD_MACH_O_LC_SYMSEG:
 	  break;
 	case BFD_MACH_O_LC_THREAD:
@@ -1991,11 +1286,11 @@ bfd_mach_o_write_contents (bfd *abfd)
 	case BFD_MACH_O_LC_IDENT:
 	case BFD_MACH_O_LC_FVMFILE:
 	case BFD_MACH_O_LC_PREPAGE:
+	case BFD_MACH_O_LC_DYSYMTAB:
 	case BFD_MACH_O_LC_LOAD_DYLIB:
 	case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
 	case BFD_MACH_O_LC_ID_DYLIB:
 	case BFD_MACH_O_LC_REEXPORT_DYLIB:
-        case BFD_MACH_O_LC_LOAD_UPWARD_DYLIB:
 	case BFD_MACH_O_LC_LOAD_DYLINKER:
 	case BFD_MACH_O_LC_ID_DYLINKER:
 	case BFD_MACH_O_LC_PREBOUND_DYLIB:
@@ -2046,493 +1341,110 @@ bfd_mach_o_set_section_flags_from_bfd (bfd *abfd ATTRIBUTE_UNUSED, asection *sec
     s->flags = BFD_MACH_O_S_REGULAR;
 }
 
-/* Count the number of sections in the list for the segment named.
+/* Build Mach-O load commands from the sections.  */
 
-   The special case of NULL or "" for the segment name is valid for
-   an MH_OBJECT file and means 'all sections available'.  
-   
-   Requires that the sections table in mdata be filled in.  
+bfd_boolean
+bfd_mach_o_build_commands (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int wide = mach_o_wide_p (&mdata->header);
+  bfd_mach_o_segment_command *seg;
+  asection *sec;
+  bfd_mach_o_load_command *cmd;
+  bfd_mach_o_load_command *symtab_cmd;
+  int target_index;
 
-   Returns the number of sections (0 is valid).
-   Any number > 255 signals an invalid section count, although we will,
-   perhaps, allow the file to be written (in line with Darwin tools up
-   to XCode 4). 
-   
-   A section count of (unsigned long) -1 signals a definite error.  */
+  /* Return now if commands are already built.  */
+  if (mdata->header.ncmds)
+    return FALSE;
 
-static unsigned long
-bfd_mach_o_count_sections_for_seg (const char *segment,
-				   bfd_mach_o_data_struct *mdata)
-{
-  unsigned i,j;
-  if (mdata == NULL || mdata->sections == NULL)
-    return (unsigned long) -1;
-
-  /* The MH_OBJECT case, all sections are considered; Although nsects is
-     is an unsigned long, the maximum valid section count is 255 and this
-     will have been checked already by mangle_sections.  */
-  if (segment == NULL || segment[0] == '\0')
-    return mdata->nsects;
-
-  /* Count the number of sections we see in this segment.  */
-  j = 0;
-  for (i = 0; i < mdata->nsects; ++i)
+  /* Very simple version: a command (segment) to contain all the sections and
+     a command for the symbol table.  */
+  mdata->header.ncmds = 2;
+  mdata->commands = bfd_alloc (abfd, mdata->header.ncmds
+                               * sizeof (bfd_mach_o_load_command));
+  if (mdata->commands == NULL)
+    return FALSE;
+  cmd = &mdata->commands[0];
+  seg = &cmd->command.segment;
+
+  seg->nsects = bfd_count_sections (abfd);
+
+  /* Set segment command.  */
+  if (wide)
     {
-      bfd_mach_o_section *s = mdata->sections[i];
-      if (strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) == 0)
-        j++;
+      cmd->type = BFD_MACH_O_LC_SEGMENT_64;
+      cmd->offset = BFD_MACH_O_HEADER_64_SIZE;
+      cmd->len = BFD_MACH_O_LC_SEGMENT_64_SIZE
+        + BFD_MACH_O_SECTION_64_SIZE * seg->nsects;
     }
-  return j;
-}
+  else
+    {
+      cmd->type = BFD_MACH_O_LC_SEGMENT;
+      cmd->offset = BFD_MACH_O_HEADER_SIZE;
+      cmd->len = BFD_MACH_O_LC_SEGMENT_SIZE
+        + BFD_MACH_O_SECTION_SIZE * seg->nsects;
+    }
+  cmd->type_required = FALSE;
+  mdata->header.sizeofcmds = cmd->len;
+  mdata->filelen = cmd->offset + cmd->len;
 
-static bfd_boolean
-bfd_mach_o_build_seg_command (const char *segment,
-			      bfd_mach_o_data_struct *mdata,
-			      bfd_mach_o_segment_command *seg)
-{
-  unsigned i;
-  int is_mho = (segment == NULL || segment[0] == '\0');
+  /* Set symtab command.  */
+  symtab_cmd = &mdata->commands[1];
+  
+  symtab_cmd->type = BFD_MACH_O_LC_SYMTAB;
+  symtab_cmd->offset = cmd->offset + cmd->len;
+  symtab_cmd->len = 6 * 4;
+  symtab_cmd->type_required = FALSE;
+  
+  mdata->header.sizeofcmds += symtab_cmd->len;
+  mdata->filelen += symtab_cmd->len;
 
   /* Fill segment command.  */
-  if (is_mho)
-    memset (seg->segname, 0, sizeof (seg->segname));
-  else
-    strncpy (seg->segname, segment, sizeof (seg->segname));
-
-  /* TODO: fix this up for non-MH_OBJECT cases.  */
+  memset (seg->segname, 0, sizeof (seg->segname));
   seg->vmaddr = 0;
-  seg->vmsize = 0;
-
   seg->fileoff = mdata->filelen;
   seg->filesize = 0;
   seg->maxprot = BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_WRITE
-		 | BFD_MACH_O_PROT_EXECUTE;
+    | BFD_MACH_O_PROT_EXECUTE;
   seg->initprot = seg->maxprot;
   seg->flags = 0;
   seg->sect_head = NULL;
   seg->sect_tail = NULL;
 
-  /*  Append sections to the segment.  
-
-      This is a little tedious, we have to honor the need to account zerofill
-      sections after all the rest.  This forces us to do the calculation of
-      total vmsize in three passes so that any alignment increments are 
-      properly accounted.  */
-
-  for (i = 0; i < mdata->nsects; ++i)
+  /* Create Mach-O sections.  */
+  target_index = 0;
+  for (sec = abfd->sections; sec; sec = sec->next)
     {
-      bfd_mach_o_section *s = mdata->sections[i];
-      asection *sec = s->bfdsection;
-
-      /* If we're not making an MH_OBJECT, check whether this section is from
-	 our segment, and skip if not.  Otherwise, just add all sections.  */
-      if (! is_mho 
-	  && strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) != 0)
-	continue;
+      bfd_mach_o_section *msect = bfd_mach_o_get_mach_o_section (sec);
 
-      /* Although we account for zerofill section sizes in vm order, they are
-	 placed in the file in source sequence.  */
       bfd_mach_o_append_section_to_segment (seg, sec);
-      s->offset = 0;
-      
-      /* Zerofill sections have zero file size & offset, 
-	 and are not written.  */
-      if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) == BFD_MACH_O_S_ZEROFILL
-          || (s->flags & BFD_MACH_O_SECTION_TYPE_MASK) 
-	      == BFD_MACH_O_S_GB_ZEROFILL)
-        continue;
-
-      if (s->size > 0)
-       {
-	  seg->vmsize = FILE_ALIGN (seg->vmsize, s->align);
-	  seg->vmsize += s->size;
-
-	  seg->filesize = FILE_ALIGN (seg->filesize, s->align);
-	  seg->filesize += s->size;
-
-          mdata->filelen = FILE_ALIGN (mdata->filelen, s->align);
-          s->offset = mdata->filelen;
-        }
-
-      sec->filepos = s->offset;
-      mdata->filelen += s->size;
-    }
-
-  /* Now pass through again, for zerofill, only now we just update the vmsize.  */
-  for (i = 0; i < mdata->nsects; ++i)
-    {
-      bfd_mach_o_section *s = mdata->sections[i];
-
-      if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) != BFD_MACH_O_S_ZEROFILL)
-        continue;
-
-      if (! is_mho 
-	  && strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) != 0)
-	continue;
-
-      if (s->size > 0)
-	{
-	  seg->vmsize = FILE_ALIGN (seg->vmsize, s->align);
-	  seg->vmsize += s->size;
-	}
-    }
-
-  /* Now pass through again, for zerofill_GB.  */
-  for (i = 0; i < mdata->nsects; ++i)
-    {
-      bfd_mach_o_section *s = mdata->sections[i];
- 
-      if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) != BFD_MACH_O_S_GB_ZEROFILL)
-        continue;
-
-      if (! is_mho 
-	  && strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) != 0)
-	continue;
-
-      if (s->size > 0)
-	{
-	  seg->vmsize = FILE_ALIGN (seg->vmsize, s->align);
-	  seg->vmsize += s->size;
-	}
-    }
-
-  /* Allocate space for the relocations.  */
-  mdata->filelen = FILE_ALIGN(mdata->filelen, 2);
 
-  for (i = 0; i < mdata->nsects; ++i)
-    {
-      bfd_mach_o_section *ms = mdata->sections[i];
-      asection *sec = ms->bfdsection;
-        
-      if ((ms->nreloc = sec->reloc_count) == 0)
+      if (msect->flags == 0)
         {
-	  ms->reloff = 0;
-	  continue;
+          /* We suppose it hasn't been set.  Convert from BFD flags.  */
+          bfd_mach_o_set_section_flags_from_bfd (abfd, sec);
         }
-      sec->rel_filepos = mdata->filelen;
-      ms->reloff = sec->rel_filepos;
-      mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE;
-    }
-
-  return TRUE;
-}
-
-/* Count the number of indirect symbols in the image.
-   Requires that the sections are in their final order.  */
-
-static unsigned int
-bfd_mach_o_count_indirect_symbols (bfd *abfd, bfd_mach_o_data_struct *mdata)
-{
-  unsigned int i;
-  unsigned int nisyms = 0;
-
-  for (i = 0; i < mdata->nsects; ++i)
-    {
-      bfd_mach_o_section *sec = mdata->sections[i];
-
-      switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
-	{
-	  case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
-	  case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
-	  case BFD_MACH_O_S_SYMBOL_STUBS:
-	    nisyms += bfd_mach_o_section_get_nbr_indirect (abfd, sec);
-	    break;
-	  default:
-	    break;
-	}
-    }
-  return nisyms;
-}
-
-static bfd_boolean
-bfd_mach_o_build_dysymtab_command (bfd *abfd,
-				   bfd_mach_o_data_struct *mdata,
-				   bfd_mach_o_load_command *cmd)
-{
-  bfd_mach_o_dysymtab_command *dsym = &cmd->command.dysymtab;
-
-  /* TODO:
-     We are not going to try and fill these in yet and, moreover, we are
-     going to bail if they are already set.  */
-  if (dsym->nmodtab != 0
-      || dsym->ntoc != 0
-      || dsym->nextrefsyms != 0)
-    {
-      (*_bfd_error_handler) (_("sorry: modtab, toc and extrefsyms are not yet"
-				" implemented for dysymtab commands."));
-      return FALSE;
-    }
-
-  dsym->ilocalsym = 0;
-
-  if (bfd_get_symcount (abfd) > 0)
-    {
-      asymbol **symbols = bfd_get_outsymbols (abfd);
-      unsigned long i;
-
-       /* Count the number of each kind of symbol.  */
-      for (i = 0; i < bfd_get_symcount (abfd); ++i)
-	{
-	  bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
-	  if (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT))
-	    break;
-	}
-      dsym->nlocalsym = i;
-      dsym->iextdefsym = i;
-      for (; i < bfd_get_symcount (abfd); ++i)
-	{
-	  bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
-	  if ((s->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF)
-	    break;
-	}
-      dsym->nextdefsym = i - dsym->nlocalsym;
-      dsym->iundefsym = dsym->nextdefsym + dsym->iextdefsym;
-      dsym->nundefsym = bfd_get_symcount (abfd) 
-			- dsym->nlocalsym 
-			- dsym->nextdefsym;
-    }
-  else
-    {
-      dsym->nlocalsym = 0;
-      dsym->iextdefsym = 0;
-      dsym->nextdefsym = 0;
-      dsym->iundefsym = 0;
-      dsym->nundefsym = 0;
-    }
-
-  dsym->nindirectsyms = bfd_mach_o_count_indirect_symbols (abfd, mdata);
-  if (dsym->nindirectsyms > 0)
-    {
-      unsigned i;
-      unsigned n;
-
-      mdata->filelen = FILE_ALIGN (mdata->filelen, 2);
-      dsym->indirectsymoff = mdata->filelen;
-      mdata->filelen += dsym->nindirectsyms * 4;
-      
-      dsym->indirect_syms = bfd_zalloc (abfd, dsym->nindirectsyms * 4);
-      if (dsym->indirect_syms == NULL)
-        return FALSE;
-		  
-      n = 0;
-      for (i = 0; i < mdata->nsects; ++i)
-	{
-	  bfd_mach_o_section *sec = mdata->sections[i];
-
-	  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
-	    {
-	      case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
-	      case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
-	      case BFD_MACH_O_S_SYMBOL_STUBS:
-		{
-		  unsigned j, num;
-		  bfd_mach_o_asymbol **isyms = sec->indirect_syms;
-		  
-		  num = bfd_mach_o_section_get_nbr_indirect (abfd, sec);
-		  if (isyms == NULL || num == 0)
-		    break;
-		  /* Record the starting index in the reserved1 field.  */
-		  sec->reserved1 = n;
-		  for (j = 0; j < num; j++, n++)
-		    {
-		      if (isyms[j] == NULL)
-		        dsym->indirect_syms[n] = BFD_MACH_O_INDIRECT_SYM_LOCAL;
-		      else if (isyms[j]->symbol.section == bfd_abs_section_ptr
-			       && ! (isyms[j]->n_type & BFD_MACH_O_N_EXT))
-		        dsym->indirect_syms[n] = BFD_MACH_O_INDIRECT_SYM_LOCAL
-						 | BFD_MACH_O_INDIRECT_SYM_ABS;
-		      else
-		        dsym->indirect_syms[n] = isyms[j]->symbol.udata.i;
-		    }
-		}
-		break;
-	      default:
-		break;
-	    }
-	}
-    }
-
-  return TRUE;
-}
-
-/* Build Mach-O load commands (currently assuming an MH_OBJECT file).
-   TODO: Other file formats, rebuilding symtab/dysymtab commands for strip
-   and copy functionality.  */
-
-bfd_boolean
-bfd_mach_o_build_commands (bfd *abfd)
-{
-  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
-  unsigned wide = mach_o_wide_p (&mdata->header);
-  int segcmd_idx = -1;
-  int symtab_idx = -1;
-  int dysymtab_idx = -1;
-  unsigned long base_offset = 0;
-
-  /* Return now if commands are already present.  */
-  if (mdata->header.ncmds)
-    return FALSE;
-
-  /* Fill in the file type, if not already set.  */
-
-  if (mdata->header.filetype == 0)
-    {
-      if (abfd->flags & EXEC_P)
-        mdata->header.filetype = BFD_MACH_O_MH_EXECUTE;
-      else if (abfd->flags & DYNAMIC)
-        mdata->header.filetype = BFD_MACH_O_MH_DYLIB;
-      else
-        mdata->header.filetype = BFD_MACH_O_MH_OBJECT;
-    }
-
-  /* If hasn't already been done, flatten sections list, and sort
-     if/when required.  Must be done before the symbol table is adjusted,
-     since that depends on properly numbered sections.  */
-  if (mdata->nsects == 0 || mdata->sections == NULL)
-    if (! bfd_mach_o_mangle_sections (abfd, mdata))
-      return FALSE;
-
-  /* Order the symbol table, fill-in/check mach-o specific fields and
-     partition out any indirect symbols.  */
-  if (!bfd_mach_o_mangle_symbols (abfd))
-    return FALSE;
-
-  /* Very simple command set (only really applicable to MH_OBJECTs):
-     All the commands are optional - present only when there is suitable data.
-     (i.e. it is valid to have an empty file)
-
-	a command (segment) to contain all the sections,
-	command for the symbol table,
-	a command for the dysymtab.  
-
-     ??? maybe we should assert that this is an MH_OBJECT?  */
-
-  if (mdata->nsects > 0)
-    {
-      segcmd_idx = 0;
-      mdata->header.ncmds = 1;
-    }
-
-  if (bfd_get_symcount (abfd) > 0)
-    {
-      mdata->header.ncmds++;
-      symtab_idx = segcmd_idx + 1; /* 0 if the seg command is absent.  */
-    }
-
-  /* FIXME:
-     This is a rather crude test for whether we should build a dysymtab.  */
-  if (bfd_mach_o_should_emit_dysymtab ()
-      && bfd_get_symcount (abfd))
-    {
-      mdata->header.ncmds++;
-      /* If there should be a case where a dysymtab could be emitted without
-	 a symtab (seems improbable), this would need amending.  */
-      dysymtab_idx = symtab_idx + 1;
-    }
-
-  if (wide)
-    base_offset = BFD_MACH_O_HEADER_64_SIZE;
-  else
-    base_offset = BFD_MACH_O_HEADER_SIZE;
-
-  /* Well, we must have a header, at least.  */
-  mdata->filelen = base_offset;
-
-  /* A bit unusual, but no content is valid;
-     as -n empty.s -o empty.o  */
-  if (mdata->header.ncmds == 0)
-    return TRUE;
-
-  mdata->commands = bfd_zalloc (abfd, mdata->header.ncmds
-                                * sizeof (bfd_mach_o_load_command));
-  if (mdata->commands == NULL)
-    return FALSE;
-
-  if (segcmd_idx >= 0)
-    {  
-      bfd_mach_o_load_command *cmd = &mdata->commands[segcmd_idx];
-      bfd_mach_o_segment_command *seg = &cmd->command.segment;
-
-      /* Count the segctions in the special blank segment used for MH_OBJECT.  */
-      seg->nsects = bfd_mach_o_count_sections_for_seg (NULL, mdata);
-      if (seg->nsects == (unsigned long) -1)
-	return FALSE;
-
-      /* Init segment command.  */
-      cmd->offset = base_offset;
-      if (wide)
-	{
-	  cmd->type = BFD_MACH_O_LC_SEGMENT_64;
-	  cmd->len = BFD_MACH_O_LC_SEGMENT_64_SIZE
-			+ BFD_MACH_O_SECTION_64_SIZE * seg->nsects;
-	}
-      else
-	{
-	  cmd->type = BFD_MACH_O_LC_SEGMENT;
-	  cmd->len = BFD_MACH_O_LC_SEGMENT_SIZE
-			+ BFD_MACH_O_SECTION_SIZE * seg->nsects;
-	}
-
-      cmd->type_required = FALSE;
-      mdata->header.sizeofcmds = cmd->len;
-      mdata->filelen += cmd->len;
-    }
-
-  if (symtab_idx >= 0)
-    {
-      /* Init symtab command.  */
-      bfd_mach_o_load_command *cmd = &mdata->commands[symtab_idx];
-  
-      cmd->type = BFD_MACH_O_LC_SYMTAB;
-      cmd->offset = base_offset;
-      if (segcmd_idx >= 0)
-        cmd->offset += mdata->commands[segcmd_idx].len;
-
-      cmd->len = sizeof (struct mach_o_symtab_command_external)
-		 + BFD_MACH_O_LC_SIZE;
-      cmd->type_required = FALSE;
-      mdata->header.sizeofcmds += cmd->len;
-      mdata->filelen += cmd->len;
-    }
+      msect->addr = bfd_get_section_vma (abfd, sec);
+      msect->size = bfd_get_section_size (sec);
+      msect->align = bfd_get_section_alignment (abfd, sec);
 
-  /* If required, setup symtab command, see comment above about the quality
-     of this test.  */
-  if (dysymtab_idx >= 0)
-    {
-      bfd_mach_o_load_command *cmd = &mdata->commands[dysymtab_idx];
-
-      cmd->type = BFD_MACH_O_LC_DYSYMTAB;
-      if (symtab_idx >= 0)
-        cmd->offset = mdata->commands[symtab_idx].offset 
-		    + mdata->commands[symtab_idx].len;
-      else if (segcmd_idx >= 0)
-        cmd->offset = mdata->commands[segcmd_idx].offset 
-		    + mdata->commands[segcmd_idx].len;
+      if (msect->size != 0)
+        {
+          mdata->filelen = FILE_ALIGN (mdata->filelen, msect->align);
+          msect->offset = mdata->filelen;
+        }
       else
-	cmd->offset = base_offset;
+        msect->offset = 0;
 
-      cmd->type_required = FALSE;
-      cmd->len = sizeof (struct mach_o_dysymtab_command_external)
-		 + BFD_MACH_O_LC_SIZE;
+      sec->filepos = msect->offset;
+      sec->target_index = ++target_index;
 
-      mdata->header.sizeofcmds += cmd->len;
-      mdata->filelen += cmd->len;
+      mdata->filelen += msect->size;
     }
+  seg->filesize = mdata->filelen - seg->fileoff;
+  seg->vmsize = seg->filesize;
 
-  /* So, now we have sized the commands and the filelen set to that.
-     Now we can build the segment command and set the section file offsets.  */
-  if (segcmd_idx >= 0
-      && ! bfd_mach_o_build_seg_command 
-		(NULL, mdata, &mdata->commands[segcmd_idx].command.segment))
-    return FALSE;
-
-  /* If we're doing a dysymtab, cmd points to its load command.  */
-  if (dysymtab_idx >= 0
-      && ! bfd_mach_o_build_dysymtab_command (abfd, mdata, 
-					      &mdata->commands[dysymtab_idx]))
-    return FALSE;
-
-  /* The symtab command is filled in when the symtab is written.  */
   return TRUE;
 }
 
@@ -2547,8 +1459,8 @@ bfd_mach_o_set_section_contents (bfd *abfd,
 {
   file_ptr pos;
 
-  /* Trying to write the first section contents will trigger the creation of
-     the load commands if they are not already present.  */
+  /* This must be done first, because bfd_set_section_contents is
+     going to set output_has_begun to TRUE.  */
   if (! abfd->output_has_begun && ! bfd_mach_o_build_commands (abfd))
     return FALSE;
 
@@ -2582,7 +1494,7 @@ bfd_mach_o_make_empty_symbol (bfd *abfd)
   if (new_symbol == NULL)
     return new_symbol;
   new_symbol->the_bfd = abfd;
-  new_symbol->udata.i = SYM_MACHO_FIELDS_UNSET;
+  new_symbol->udata.i = 0;
   return new_symbol;
 }
 
@@ -2649,8 +1561,6 @@ bfd_mach_o_read_header (bfd *abfd, bfd_mach_o_header *header)
 
   if (mach_o_wide_p (header))
     header->reserved = (*get32) (raw.reserved);
-  else
-    header->reserved = 0;
 
   return TRUE;
 }
@@ -2659,13 +1569,11 @@ bfd_boolean
 bfd_mach_o_new_section_hook (bfd *abfd, asection *sec)
 {
   bfd_mach_o_section *s;
-  unsigned bfdalign = bfd_get_section_alignment (abfd, sec);
 
   s = bfd_mach_o_get_mach_o_section (sec);
   if (s == NULL)
     {
       flagword bfd_flags;
-      static const mach_o_section_name_xlat * xlat;
 
       s = (bfd_mach_o_section *) bfd_zalloc (abfd, sizeof (*s));
       if (s == NULL)
@@ -2673,24 +1581,21 @@ bfd_mach_o_new_section_hook (bfd *abfd, asection *sec)
       sec->used_by_bfd = s;
       s->bfdsection = sec;
 
-      /* Create the Darwin seg/sect name pair from the bfd name.
-	 If this is a canonical name for which a specific paiting exists
-	 there will also be defined flags, type, attribute and alignment
-	 values.  */
-      xlat = bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, s);
-      if (xlat != NULL)
-	{
-	  s->flags = xlat->macho_sectype | xlat->macho_secattr;
-	  s->align = xlat->sectalign > bfdalign ? xlat->sectalign 
-						: bfdalign;
-	  bfd_set_section_alignment (abfd, sec, s->align);
-	  bfd_flags = bfd_get_section_flags (abfd, sec);
-	  if (bfd_flags == SEC_NO_FLAGS)
-	    bfd_set_section_flags (abfd, sec, xlat->bfd_flags);
-	}
+      /* Create default name.  */
+      bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, s);
+
+      /* Create default flags.  */
+      bfd_flags = bfd_get_section_flags (abfd, sec);
+      if ((bfd_flags & SEC_CODE) == SEC_CODE)
+        s->flags = BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS
+          | BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS
+          | BFD_MACH_O_S_REGULAR;
+      else if ((bfd_flags & (SEC_ALLOC | SEC_LOAD)) == SEC_ALLOC)
+        s->flags = BFD_MACH_O_S_ZEROFILL;
+      else if (bfd_flags & SEC_DEBUGGING)
+        s->flags = BFD_MACH_O_S_REGULAR |  BFD_MACH_O_S_ATTR_DEBUG;
       else
-	/* Create default flags.  */
-	bfd_mach_o_set_section_flags_from_bfd (abfd, sec);
+        s->flags = BFD_MACH_O_S_REGULAR;
     }
 
   return _bfd_generic_new_section_hook (abfd, sec);
@@ -2706,9 +1611,6 @@ bfd_mach_o_init_section_from_mach_o (bfd *abfd, asection *sec,
   flags = bfd_get_section_flags (abfd, sec);
   section = bfd_mach_o_get_mach_o_section (sec);
 
-  /* TODO: see if we should use the xlat system for doing this by
-     preference and fall back to this for unknown sections.  */
-
   if (flags == SEC_NO_FLAGS)
     {
       /* Try to guess flags.  */
@@ -2791,7 +1693,7 @@ bfd_mach_o_read_section_32 (bfd *abfd,
   memcpy (section->segname, raw.segname, sizeof (raw.segname));
   section->segname[BFD_MACH_O_SEGNAME_SIZE] = 0;
   memcpy (section->sectname, raw.sectname, sizeof (raw.sectname));
-  section->sectname[BFD_MACH_O_SECTNAME_SIZE] = 0;
+  section->segname[BFD_MACH_O_SECTNAME_SIZE] = 0;
   section->addr = bfd_h_get_32 (abfd, raw.addr);
   section->size = bfd_h_get_32 (abfd, raw.size);
   section->offset = bfd_h_get_32 (abfd, raw.offset);
@@ -2830,7 +1732,7 @@ bfd_mach_o_read_section_64 (bfd *abfd,
   memcpy (section->segname, raw.segname, sizeof (raw.segname));
   section->segname[BFD_MACH_O_SEGNAME_SIZE] = 0;
   memcpy (section->sectname, raw.sectname, sizeof (raw.sectname));
-  section->sectname[BFD_MACH_O_SECTNAME_SIZE] = 0;
+  section->segname[BFD_MACH_O_SECTNAME_SIZE] = 0;
   section->addr = bfd_h_get_64 (abfd, raw.addr);
   section->size = bfd_h_get_64 (abfd, raw.size);
   section->offset = bfd_h_get_32 (abfd, raw.offset);
@@ -2859,7 +1761,7 @@ bfd_mach_o_read_section (bfd *abfd,
     return bfd_mach_o_read_section_32 (abfd, offset, prot);
 }
 
-static bfd_boolean
+static int
 bfd_mach_o_read_symtab_symbol (bfd *abfd,
                                bfd_mach_o_symtab_command *sym,
                                bfd_mach_o_asymbol *s,
@@ -2886,7 +1788,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
       (*_bfd_error_handler)
         (_("bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"),
          symwidth, (unsigned long) symoff);
-      return FALSE;
+      return -1;
     }
 
   stroff = bfd_h_get_32 (abfd, raw.n_strx);
@@ -2905,14 +1807,14 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
         (_("bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %lu)"),
          (unsigned long) stroff,
          (unsigned long) sym->strsize);
-      return FALSE;
+      return -1;
     }
 
   s->symbol.the_bfd = abfd;
   s->symbol.name = sym->strtab + stroff;
   s->symbol.value = value;
   s->symbol.flags = 0x0;
-  s->symbol.udata.i = i;
+  s->symbol.udata.i = 0;
   s->n_type = type;
   s->n_sect = section;
   s->n_desc = desc;
@@ -2943,9 +1845,13 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
     }
   else
     {
-      if (type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT))
+      if (type & BFD_MACH_O_N_PEXT)
 	s->symbol.flags |= BSF_GLOBAL;
-      else
+
+      if (type & BFD_MACH_O_N_EXT)
+	s->symbol.flags |= BSF_GLOBAL;
+
+      if (!(type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT)))
 	s->symbol.flags |= BSF_LOCAL;
 
       switch (symtype)
@@ -2991,12 +1897,10 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
 	    }
 	  break;
 	case BFD_MACH_O_N_INDR:
-	  /* FIXME: we don't follow the BFD convention as this indirect symbol
-	     won't be followed by the referenced one.  This looks harmless
-	     unless we start using the linker.	*/
-	  s->symbol.flags |= BSF_INDIRECT;
-	  s->symbol.section = bfd_ind_section_ptr;
-	  s->symbol.value = 0;
+	  (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
+				   "symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"),
+				 s->symbol.name);
+	  s->symbol.section = bfd_und_section_ptr;
 	  break;
 	default:
 	  (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
@@ -3007,10 +1911,10 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd,
 	}
     }
 
-  return TRUE;
+  return 0;
 }
 
-bfd_boolean
+static int
 bfd_mach_o_read_symtab_strtab (bfd *abfd)
 {
   bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
@@ -3018,11 +1922,11 @@ bfd_mach_o_read_symtab_strtab (bfd *abfd)
 
   /* Fail if there is no symtab.  */
   if (sym == NULL)
-    return FALSE;
+    return -1;
 
   /* Success if already loaded.  */
   if (sym->strtab)
-    return TRUE;
+    return 0;
 
   if (abfd->flags & BFD_IN_MEMORY)
     {
@@ -3033,7 +1937,7 @@ bfd_mach_o_read_symtab_strtab (bfd *abfd)
       if ((sym->stroff + sym->strsize) > b->size)
 	{
 	  bfd_set_error (bfd_error_file_truncated);
-	  return FALSE;
+	  return -1;
 	}
       sym->strtab = (char *) b->buffer + sym->stroff;
     }
@@ -3041,30 +1945,31 @@ bfd_mach_o_read_symtab_strtab (bfd *abfd)
     {
       sym->strtab = bfd_alloc (abfd, sym->strsize);
       if (sym->strtab == NULL)
-        return FALSE;
+        return -1;
 
       if (bfd_seek (abfd, sym->stroff, SEEK_SET) != 0
-          || bfd_bread (sym->strtab, sym->strsize, abfd) != sym->strsize)
+          || bfd_bread ((void *) sym->strtab, sym->strsize, abfd) != sym->strsize)
         {
           bfd_set_error (bfd_error_file_truncated);
-          return FALSE;
+          return -1;
         }
     }
 
-  return TRUE;
+  return 0;
 }
 
-bfd_boolean
+static int
 bfd_mach_o_read_symtab_symbols (bfd *abfd)
 {
   bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
   bfd_mach_o_symtab_command *sym = mdata->symtab;
   unsigned long i;
+  int ret;
 
   if (sym == NULL || sym->symbols)
     {
       /* Return now if there are no symbols or if already loaded.  */
-      return TRUE;
+      return 0;
     }
 
   sym->symbols = bfd_alloc (abfd, sym->nsyms * sizeof (bfd_mach_o_asymbol));
@@ -3072,19 +1977,47 @@ bfd_mach_o_read_symtab_symbols (bfd *abfd)
   if (sym->symbols == NULL)
     {
       (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"));
-      return FALSE;
+      return -1;
     }
 
-  if (!bfd_mach_o_read_symtab_strtab (abfd))
-    return FALSE;
+  ret = bfd_mach_o_read_symtab_strtab (abfd);
+  if (ret != 0)
+    return ret;
 
   for (i = 0; i < sym->nsyms; i++)
     {
-      if (!bfd_mach_o_read_symtab_symbol (abfd, sym, &sym->symbols[i], i))
-	return FALSE;
+      ret = bfd_mach_o_read_symtab_symbol (abfd, sym, &sym->symbols[i], i);
+      if (ret != 0)
+	return ret;
     }
 
-  return TRUE;
+  return 0;
+}
+
+int
+bfd_mach_o_read_dysymtab_symbol (bfd *abfd,
+                                 bfd_mach_o_dysymtab_command *dysym,
+                                 bfd_mach_o_symtab_command *sym,
+                                 bfd_mach_o_asymbol *s,
+                                 unsigned long i)
+{
+  unsigned long isymoff = dysym->indirectsymoff + (i * 4);
+  unsigned long sym_index;
+  unsigned char raw[4];
+
+  BFD_ASSERT (i < dysym->nindirectsyms);
+
+  if (bfd_seek (abfd, isymoff, SEEK_SET) != 0
+      || bfd_bread (raw, sizeof (raw), abfd) != sizeof (raw))
+    {
+      (*_bfd_error_handler)
+        (_("bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"),
+         (unsigned long) sizeof (raw), isymoff);
+      return -1;
+    }
+  sym_index = bfd_h_get_32 (abfd, raw);
+
+  return bfd_mach_o_read_symtab_symbol (abfd, sym, s, sym_index);
 }
 
 static const char *
@@ -3164,7 +2097,6 @@ bfd_mach_o_read_dylib (bfd *abfd, bfd_mach_o_load_command *command)
     case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
     case BFD_MACH_O_LC_ID_DYLIB:
     case BFD_MACH_O_LC_REEXPORT_DYLIB:
-    case BFD_MACH_O_LC_LOAD_UPWARD_DYLIB:
       break;
     default:
       BFD_FAIL ();
@@ -3202,32 +2134,6 @@ bfd_mach_o_read_prebound_dylib (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 static int
-bfd_mach_o_read_fvmlib (bfd *abfd, bfd_mach_o_load_command *command)
-{
-  bfd_mach_o_fvmlib_command *fvm = &command->command.fvmlib;
-  struct mach_o_fvmlib_command_external raw;
-  unsigned int nameoff;
-
-  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
-      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
-    return -1;
-
-  nameoff = bfd_h_get_32 (abfd, raw.name);
-  fvm->minor_version = bfd_h_get_32 (abfd, raw.minor_version);
-  fvm->header_addr = bfd_h_get_32 (abfd, raw.header_addr);
-
-  fvm->name_offset = command->offset + nameoff;
-  fvm->name_len = command->len - nameoff;
-  fvm->name_str = bfd_alloc (abfd, fvm->name_len);
-  if (fvm->name_str == NULL)
-    return -1;
-  if (bfd_seek (abfd, fvm->name_offset, SEEK_SET) != 0
-      || bfd_bread (fvm->name_str, fvm->name_len, abfd) != fvm->name_len)
-    return -1;
-  return 0;
-}
-
-static int
 bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command)
 {
   bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
@@ -3423,7 +2329,7 @@ bfd_mach_o_read_dysymtab (bfd *abfd, bfd_mach_o_load_command *command)
             }
         }
     }
-
+  
   if (cmd->ntoc != 0)
     {
       unsigned int i;
@@ -3640,22 +2546,6 @@ bfd_mach_o_read_version_min (bfd *abfd, bfd_mach_o_load_command *command)
   return TRUE;
 }
 
-static bfd_boolean
-bfd_mach_o_read_encryption_info (bfd *abfd, bfd_mach_o_load_command *command)
-{
-  bfd_mach_o_encryption_info_command *cmd = &command->command.encryption_info;
-  struct mach_o_encryption_info_command_external raw;
-
-  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
-      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
-    return FALSE;
-
-  cmd->cryptoff = bfd_get_32 (abfd, raw.cryptoff);
-  cmd->cryptsize = bfd_get_32 (abfd, raw.cryptsize);
-  cmd->cryptid = bfd_get_32 (abfd, raw.cryptid);
-  return TRUE;
-}
-
 static int
 bfd_mach_o_read_segment (bfd *abfd,
                          bfd_mach_o_load_command *command,
@@ -3791,7 +2681,6 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
     case BFD_MACH_O_LC_ID_DYLIB:
     case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
     case BFD_MACH_O_LC_REEXPORT_DYLIB:
-    case BFD_MACH_O_LC_LOAD_UPWARD_DYLIB:
       if (bfd_mach_o_read_dylib (abfd, command) != 0)
 	return -1;
       break;
@@ -3801,9 +2690,6 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
       break;
     case BFD_MACH_O_LC_LOADFVMLIB:
     case BFD_MACH_O_LC_IDFVMLIB:
-      if (bfd_mach_o_read_fvmlib (abfd, command) != 0)
-	return -1;
-      break;
     case BFD_MACH_O_LC_IDENT:
     case BFD_MACH_O_LC_FVMFILE:
     case BFD_MACH_O_LC_PREPAGE:
@@ -3835,10 +2721,6 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
       if (bfd_mach_o_read_linkedit (abfd, command) != 0)
 	return -1;
       break;
-    case BFD_MACH_O_LC_ENCRYPTION_INFO:
-      if (!bfd_mach_o_read_encryption_info (abfd, command))
-	return -1;
-      break;
     case BFD_MACH_O_LC_DYLD_INFO:
       if (bfd_mach_o_read_dyld_info (abfd, command) != 0)
 	return -1;
@@ -3849,8 +2731,8 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
 	return -1;
       break;
     default:
-      (*_bfd_error_handler)(_("%B: unknown load command 0x%lx"),
-         abfd, (unsigned long) command->type);
+      (*_bfd_error_handler) (_("unable to read unknown load command 0x%lx"),
+			     (unsigned long) command->type);
       break;
     }
 
@@ -3903,7 +2785,7 @@ bfd_mach_o_flatten_sections (bfd *abfd)
     }
 }
 
-static bfd_boolean
+int
 bfd_mach_o_scan_start_address (bfd *abfd)
 {
   bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
@@ -3911,17 +2793,20 @@ bfd_mach_o_scan_start_address (bfd *abfd)
   unsigned long i;
 
   for (i = 0; i < mdata->header.ncmds; i++)
-    if ((mdata->commands[i].type == BFD_MACH_O_LC_THREAD) ||
-        (mdata->commands[i].type == BFD_MACH_O_LC_UNIXTHREAD))
-      {
-        cmd = &mdata->commands[i].command.thread;
-        break;
-      }
+    {
+      if ((mdata->commands[i].type == BFD_MACH_O_LC_THREAD) ||
+	  (mdata->commands[i].type == BFD_MACH_O_LC_UNIXTHREAD))
+	{
+	  if (cmd == NULL)
+	    cmd = &mdata->commands[i].command.thread;
+	  else
+	    return 0;
+	}
+    }
 
   if (cmd == NULL)
-    return FALSE;
+    return 0;
 
-  /* FIXME: create a subtarget hook ?  */
   for (i = 0; i < cmd->nflavours; i++)
     {
       if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_I386)
@@ -3932,7 +2817,7 @@ bfd_mach_o_scan_start_address (bfd *abfd)
 
 	  if (bfd_seek (abfd, cmd->flavours[i].offset + 40, SEEK_SET) != 0
               || bfd_bread (buf, 4, abfd) != 4)
-	    return FALSE;
+	    return -1;
 
 	  abfd->start_address = bfd_h_get_32 (abfd, buf);
 	}
@@ -3943,7 +2828,7 @@ bfd_mach_o_scan_start_address (bfd *abfd)
 
 	  if (bfd_seek (abfd, cmd->flavours[i].offset + 0, SEEK_SET) != 0
               || bfd_bread (buf, 4, abfd) != 4)
-	    return FALSE;
+	    return -1;
 
 	  abfd->start_address = bfd_h_get_32 (abfd, buf);
 	}
@@ -3954,7 +2839,7 @@ bfd_mach_o_scan_start_address (bfd *abfd)
 
           if (bfd_seek (abfd, cmd->flavours[i].offset + 0, SEEK_SET) != 0
               || bfd_bread (buf, 8, abfd) != 8)
-            return FALSE;
+            return -1;
 
           abfd->start_address = bfd_h_get_64 (abfd, buf);
         }
@@ -3965,13 +2850,13 @@ bfd_mach_o_scan_start_address (bfd *abfd)
 
           if (bfd_seek (abfd, cmd->flavours[i].offset + (16 * 8), SEEK_SET) != 0
               || bfd_bread (buf, 8, abfd) != 8)
-            return FALSE;
+            return -1;
 
           abfd->start_address = bfd_h_get_64 (abfd, buf);
         }
     }
 
-  return TRUE;
+  return 0;
 }
 
 bfd_boolean
@@ -3991,7 +2876,7 @@ bfd_mach_o_set_arch_mach (bfd *abfd,
   return bfd_default_set_arch_mach (abfd, arch, machine);
 }
 
-static bfd_boolean
+int
 bfd_mach_o_scan (bfd *abfd,
 		 bfd_mach_o_header *header,
 		 bfd_mach_o_data_struct *mdata)
@@ -4027,10 +2912,9 @@ bfd_mach_o_scan (bfd *abfd,
 				   &cputype, &cpusubtype);
   if (cputype == bfd_arch_unknown)
     {
-      (*_bfd_error_handler)
-        (_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"),
-         header->cputype, header->cpusubtype);
-      return FALSE;
+      (*_bfd_error_handler) (_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"),
+			     header->cputype, header->cpusubtype);
+      return -1;
     }
 
   bfd_set_arch_mach (abfd, cputype, cpusubtype);
@@ -4040,7 +2924,7 @@ bfd_mach_o_scan (bfd *abfd,
       mdata->commands = bfd_alloc
         (abfd, header->ncmds * sizeof (bfd_mach_o_load_command));
       if (mdata->commands == NULL)
-	return FALSE;
+	return -1;
 
       for (i = 0; i < header->ncmds; i++)
 	{
@@ -4055,15 +2939,15 @@ bfd_mach_o_scan (bfd *abfd,
 	    }
 
 	  if (bfd_mach_o_read_command (abfd, cur) < 0)
-	    return FALSE;
+	    return -1;
 	}
     }
 
   if (bfd_mach_o_scan_start_address (abfd) < 0)
-    return FALSE;
+    return -1;
 
   bfd_mach_o_flatten_sections (abfd);
-  return TRUE;
+  return 0;
 }
 
 bfd_boolean
@@ -4087,7 +2971,6 @@ bfd_mach_o_mkobject_init (bfd *abfd)
   mdata->commands = NULL;
   mdata->nsects = 0;
   mdata->sections = NULL;
-  mdata->dyn_reloc_cache = NULL;
 
   return TRUE;
 }
@@ -4146,7 +3029,17 @@ bfd_mach_o_header_p (bfd *abfd,
       if (header.cputype != cputype)
         goto wrong;
     }
-
+  else
+    {
+      switch (header.cputype)
+        {
+        case BFD_MACH_O_CPU_TYPE_I386:
+          /* Handled by mach-o-i386 */
+          goto wrong;
+        default:
+          break;
+        }
+    }
   if (filetype)
     {
       if (header.filetype != filetype)
@@ -4169,8 +3062,8 @@ bfd_mach_o_header_p (bfd *abfd,
       || !bfd_preserve_save (abfd, &preserve))
     goto fail;
 
-  if (!bfd_mach_o_scan (abfd, &header,
-                        (bfd_mach_o_data_struct *) preserve.marker))
+  if (bfd_mach_o_scan (abfd, &header,
+		       (bfd_mach_o_data_struct *) preserve.marker) != 0)
     goto wrong;
 
   bfd_preserve_finish (abfd, &preserve);
@@ -4265,42 +3158,6 @@ bfd_mach_o_archive_p (bfd *abfd)
   return NULL;
 }
 
-/* Set the filename for a fat binary member ABFD, whose bfd architecture is
-   ARCH_TYPE/ARCH_SUBTYPE and corresponding entry in header is ENTRY.
-   Set arelt_data and origin fields too.  */
-
-static void
-bfd_mach_o_fat_member_init (bfd *abfd,
-                            enum bfd_architecture arch_type,
-                            unsigned long arch_subtype,
-                            mach_o_fat_archentry *entry)
-{
-  struct areltdata *areltdata;
-  /* Create the member filename. Use ARCH_NAME.  */
-  const bfd_arch_info_type *ap = bfd_lookup_arch (arch_type, arch_subtype);
-
-  if (ap)
-    {
-      /* Use the architecture name if known.  */
-      abfd->filename = ap->printable_name;
-    }
-  else
-    {
-      /* Forge a uniq id.  */
-      const size_t namelen = 2 + 8 + 1 + 2 + 8 + 1;
-      char *name = bfd_alloc (abfd, namelen);
-      snprintf (name, namelen, "0x%lx-0x%lx",
-                entry->cputype, entry->cpusubtype);
-      abfd->filename = name;
-    }
-
-  areltdata = bfd_zalloc (abfd, sizeof (struct areltdata));
-  areltdata->parsed_size = entry->size;
-  abfd->arelt_data = areltdata;
-  abfd->iostream = NULL;
-  abfd->origin = entry->offset;
-}
-
 bfd *
 bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
 {
@@ -4316,13 +3173,9 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
 
   /* Find index of previous entry.  */
   if (prev == NULL)
-    {
-      /* Start at first one.  */
-      i = 0;
-    }
+    i = 0;	/* Start at first one.  */
   else
     {
-      /* Find index of PREV.  */
       for (i = 0; i < adata->nfat_arch; i++)
 	{
 	  if (adata->archentries[i].offset == prev->origin)
@@ -4335,10 +3188,8 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
 	  bfd_set_error (bfd_error_bad_value);
 	  return NULL;
 	}
-
-      /* Get next entry.  */
-      i++;
-    }
+    i++;	/* Get next entry.  */
+  }
 
   if (i >= adata->nfat_arch)
     {
@@ -4351,42 +3202,37 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
   if (nbfd == NULL)
     return NULL;
 
+  nbfd->origin = entry->offset;
+
   bfd_mach_o_convert_architecture (entry->cputype, entry->cpusubtype,
 				   &arch_type, &arch_subtype);
+  /* Create the member filename.
+     Use FILENAME:ARCH_NAME.  */
+  {
+    char *s = NULL;
+    const char *arch_name;
+    size_t arch_file_len = strlen (bfd_get_filename (archive));
 
-  bfd_mach_o_fat_member_init (nbfd, arch_type, arch_subtype, entry);
-
+    arch_name = bfd_printable_arch_mach (arch_type, arch_subtype);
+    s = bfd_malloc (arch_file_len + 1 + strlen (arch_name) + 1);
+    if (s == NULL)
+      return NULL;
+    memcpy (s, bfd_get_filename (archive), arch_file_len);
+    s[arch_file_len] = ':';
+    strcpy (s + arch_file_len + 1, arch_name);
+    nbfd->filename = s;
+  }
+  nbfd->iostream = NULL;
   bfd_set_arch_mach (nbfd, arch_type, arch_subtype);
 
   return nbfd;
 }
 
-/* Analogous to stat call.  */
-
-static int
-bfd_mach_o_fat_stat_arch_elt (bfd *abfd, struct stat *buf)
-{
-  if (abfd->arelt_data == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  buf->st_mtime = 0;
-  buf->st_uid = 0;
-  buf->st_gid = 0;
-  buf->st_mode = 0644;
-  buf->st_size = arelt_size (abfd);
-
-  return 0;
-}
-
 /* If ABFD format is FORMAT and architecture is ARCH, return it.
    If ABFD is a fat image containing a member that corresponds to FORMAT
    and ARCH, returns it.
    In other case, returns NULL.
    This function allows transparent uses of fat images.  */
-
 bfd *
 bfd_mach_o_fat_extract (bfd *abfd,
 			bfd_format format,
@@ -4426,7 +3272,10 @@ bfd_mach_o_fat_extract (bfd *abfd,
       if (res == NULL)
 	return NULL;
 
-      bfd_mach_o_fat_member_init (res, cpu_type, cpu_subtype, e);
+      res->origin = e->offset;
+
+      res->filename = strdup (abfd->filename);
+      res->iostream = NULL;
 
       if (bfd_check_format (res, format))
 	{
@@ -4493,67 +3342,217 @@ bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type type)
     }
 }
 
-/* The following two tables should be kept, as far as possible, in order of
-   most frequently used entries to optimize their use from gas.  */
+typedef struct bfd_mach_o_xlat_name
+{
+  const char *name;
+  unsigned long val;
+}
+bfd_mach_o_xlat_name;
+
+static void
+bfd_mach_o_print_flags (const bfd_mach_o_xlat_name *table,
+                        unsigned long val,
+                        FILE *file)
+{
+  int first = 1;
+
+  for (; table->name; table++)
+    {
+      if (table->val & val)
+        {
+          if (!first)
+            fprintf (file, "+");
+          fprintf (file, "%s", table->name);
+          val &= ~table->val;
+          first = 0;
+        }
+    }
+  if (val)
+    {
+      if (!first)
+        fprintf (file, "+");
+      fprintf (file, "0x%lx", val);
+      return;
+    }
+  if (first)
+    fprintf (file, "-");
+}
+
+static const char *
+bfd_mach_o_get_name_or_null (const bfd_mach_o_xlat_name *table,
+                             unsigned long val)
+{
+  for (; table->name; table++)
+    if (table->val == val)
+      return table->name;
+  return NULL;
+}
+
+static const char *
+bfd_mach_o_get_name (const bfd_mach_o_xlat_name *table, unsigned long val)
+{
+  const char *res = bfd_mach_o_get_name_or_null (table, val);
+
+  if (res == NULL)
+    return "*UNKNOWN*";
+  else
+    return res;
+}
+
+static bfd_mach_o_xlat_name bfd_mach_o_cpu_name[] =
+{
+  { "vax", BFD_MACH_O_CPU_TYPE_VAX },
+  { "mc680x0", BFD_MACH_O_CPU_TYPE_MC680x0 },
+  { "i386", BFD_MACH_O_CPU_TYPE_I386 },
+  { "mips", BFD_MACH_O_CPU_TYPE_MIPS },
+  { "mc98000", BFD_MACH_O_CPU_TYPE_MC98000 },
+  { "hppa", BFD_MACH_O_CPU_TYPE_HPPA },
+  { "arm", BFD_MACH_O_CPU_TYPE_ARM },
+  { "mc88000", BFD_MACH_O_CPU_TYPE_MC88000 },
+  { "sparc", BFD_MACH_O_CPU_TYPE_SPARC },
+  { "i860", BFD_MACH_O_CPU_TYPE_I860 },
+  { "alpha", BFD_MACH_O_CPU_TYPE_ALPHA },
+  { "powerpc", BFD_MACH_O_CPU_TYPE_POWERPC },
+  { "powerpc_64", BFD_MACH_O_CPU_TYPE_POWERPC_64 },
+  { "x86_64", BFD_MACH_O_CPU_TYPE_X86_64 },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_filetype_name[] = 
+{
+  { "object", BFD_MACH_O_MH_OBJECT },
+  { "execute", BFD_MACH_O_MH_EXECUTE },
+  { "fvmlib", BFD_MACH_O_MH_FVMLIB },
+  { "core", BFD_MACH_O_MH_CORE },
+  { "preload", BFD_MACH_O_MH_PRELOAD },
+  { "dylib", BFD_MACH_O_MH_DYLIB },
+  { "dylinker", BFD_MACH_O_MH_DYLINKER },
+  { "bundle", BFD_MACH_O_MH_BUNDLE },
+  { "dylib_stub", BFD_MACH_O_MH_DYLIB_STUB },
+  { "dym", BFD_MACH_O_MH_DSYM },
+  { "kext_bundle", BFD_MACH_O_MH_KEXT_BUNDLE },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_header_flags_name[] = 
+{
+  { "noundefs", BFD_MACH_O_MH_NOUNDEFS },
+  { "incrlink", BFD_MACH_O_MH_INCRLINK },
+  { "dyldlink", BFD_MACH_O_MH_DYLDLINK },
+  { "bindatload", BFD_MACH_O_MH_BINDATLOAD },
+  { "prebound", BFD_MACH_O_MH_PREBOUND },
+  { "split_segs", BFD_MACH_O_MH_SPLIT_SEGS },
+  { "lazy_init", BFD_MACH_O_MH_LAZY_INIT },
+  { "twolevel", BFD_MACH_O_MH_TWOLEVEL },
+  { "force_flat", BFD_MACH_O_MH_FORCE_FLAT },
+  { "nomultidefs", BFD_MACH_O_MH_NOMULTIDEFS },
+  { "nofixprebinding", BFD_MACH_O_MH_NOFIXPREBINDING },
+  { "prebindable", BFD_MACH_O_MH_PREBINDABLE },
+  { "allmodsbound", BFD_MACH_O_MH_ALLMODSBOUND },
+  { "subsections_via_symbols", BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS },
+  { "canonical", BFD_MACH_O_MH_CANONICAL },
+  { "weak_defines", BFD_MACH_O_MH_WEAK_DEFINES },
+  { "binds_to_weak", BFD_MACH_O_MH_BINDS_TO_WEAK },
+  { "allow_stack_execution", BFD_MACH_O_MH_ALLOW_STACK_EXECUTION },
+  { "root_safe", BFD_MACH_O_MH_ROOT_SAFE },
+  { "setuid_safe", BFD_MACH_O_MH_SETUID_SAFE },
+  { "no_reexported_dylibs", BFD_MACH_O_MH_NO_REEXPORTED_DYLIBS },
+  { "pie", BFD_MACH_O_MH_PIE },
+  { NULL, 0}
+};
 
-const bfd_mach_o_xlat_name bfd_mach_o_section_type_name[] =
+static bfd_mach_o_xlat_name bfd_mach_o_section_type_name[] = 
 {
   { "regular", BFD_MACH_O_S_REGULAR},
-  { "coalesced", BFD_MACH_O_S_COALESCED},
   { "zerofill", BFD_MACH_O_S_ZEROFILL},
   { "cstring_literals", BFD_MACH_O_S_CSTRING_LITERALS},
   { "4byte_literals", BFD_MACH_O_S_4BYTE_LITERALS},
   { "8byte_literals", BFD_MACH_O_S_8BYTE_LITERALS},
-  { "16byte_literals", BFD_MACH_O_S_16BYTE_LITERALS},
   { "literal_pointers", BFD_MACH_O_S_LITERAL_POINTERS},
+  { "non_lazy_symbol_pointers", BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS},
+  { "lazy_symbol_pointers", BFD_MACH_O_S_LAZY_SYMBOL_POINTERS},
+  { "symbol_stubs", BFD_MACH_O_S_SYMBOL_STUBS},
   { "mod_init_func_pointers", BFD_MACH_O_S_MOD_INIT_FUNC_POINTERS},
   { "mod_fini_func_pointers", BFD_MACH_O_S_MOD_FINI_FUNC_POINTERS},
+  { "coalesced", BFD_MACH_O_S_COALESCED},
   { "gb_zerofill", BFD_MACH_O_S_GB_ZEROFILL},
   { "interposing", BFD_MACH_O_S_INTERPOSING},
+  { "16byte_literals", BFD_MACH_O_S_16BYTE_LITERALS},
   { "dtrace_dof", BFD_MACH_O_S_DTRACE_DOF},
-  { "non_lazy_symbol_pointers", BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS},
-  { "lazy_symbol_pointers", BFD_MACH_O_S_LAZY_SYMBOL_POINTERS},
-  { "symbol_stubs", BFD_MACH_O_S_SYMBOL_STUBS},
   { "lazy_dylib_symbol_pointers", BFD_MACH_O_S_LAZY_DYLIB_SYMBOL_POINTERS},
   { NULL, 0}
 };
 
-const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] =
+static bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = 
 {
-  { "pure_instructions", BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS },
-  { "some_instructions", BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS },
   { "loc_reloc", BFD_MACH_O_S_ATTR_LOC_RELOC },
   { "ext_reloc", BFD_MACH_O_S_ATTR_EXT_RELOC },
+  { "some_instructions", BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS },
   { "debug", BFD_MACH_O_S_ATTR_DEBUG },
+  { "modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE },
   { "live_support", BFD_MACH_O_S_ATTR_LIVE_SUPPORT },
   { "no_dead_strip", BFD_MACH_O_S_ATTR_NO_DEAD_STRIP },
   { "strip_static_syms", BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS },
   { "no_toc", BFD_MACH_O_S_ATTR_NO_TOC },
-  { "self_modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE },
-  { "modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE },
+  { "pure_instructions", BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_load_command_name[] = 
+{
+  { "segment", BFD_MACH_O_LC_SEGMENT},
+  { "symtab", BFD_MACH_O_LC_SYMTAB},
+  { "symseg", BFD_MACH_O_LC_SYMSEG},
+  { "thread", BFD_MACH_O_LC_THREAD},
+  { "unixthread", BFD_MACH_O_LC_UNIXTHREAD},
+  { "loadfvmlib", BFD_MACH_O_LC_LOADFVMLIB},
+  { "idfvmlib", BFD_MACH_O_LC_IDFVMLIB},
+  { "ident", BFD_MACH_O_LC_IDENT},
+  { "fvmfile", BFD_MACH_O_LC_FVMFILE},
+  { "prepage", BFD_MACH_O_LC_PREPAGE},
+  { "dysymtab", BFD_MACH_O_LC_DYSYMTAB},
+  { "load_dylib", BFD_MACH_O_LC_LOAD_DYLIB},
+  { "id_dylib", BFD_MACH_O_LC_ID_DYLIB},
+  { "load_dylinker", BFD_MACH_O_LC_LOAD_DYLINKER},
+  { "id_dylinker", BFD_MACH_O_LC_ID_DYLINKER},
+  { "prebound_dylib", BFD_MACH_O_LC_PREBOUND_DYLIB},
+  { "routines", BFD_MACH_O_LC_ROUTINES},
+  { "sub_framework", BFD_MACH_O_LC_SUB_FRAMEWORK},
+  { "sub_umbrella", BFD_MACH_O_LC_SUB_UMBRELLA},
+  { "sub_client", BFD_MACH_O_LC_SUB_CLIENT},
+  { "sub_library", BFD_MACH_O_LC_SUB_LIBRARY},
+  { "twolevel_hints", BFD_MACH_O_LC_TWOLEVEL_HINTS},
+  { "prebind_cksum", BFD_MACH_O_LC_PREBIND_CKSUM},
+  { "load_weak_dylib", BFD_MACH_O_LC_LOAD_WEAK_DYLIB},
+  { "segment_64", BFD_MACH_O_LC_SEGMENT_64},
+  { "routines_64", BFD_MACH_O_LC_ROUTINES_64},
+  { "uuid", BFD_MACH_O_LC_UUID},
+  { "rpath", BFD_MACH_O_LC_RPATH},
+  { "code_signature", BFD_MACH_O_LC_CODE_SIGNATURE},
+  { "segment_split_info", BFD_MACH_O_LC_SEGMENT_SPLIT_INFO},
+  { "reexport_dylib", BFD_MACH_O_LC_REEXPORT_DYLIB},
+  { "lazy_load_dylib", BFD_MACH_O_LC_LAZY_LOAD_DYLIB},
+  { "encryption_info", BFD_MACH_O_LC_ENCRYPTION_INFO},
+  { "dyld_info", BFD_MACH_O_LC_DYLD_INFO},
+  { "load_upward_lib", BFD_MACH_O_LC_LOAD_UPWARD_DYLIB},
+  { "version_min_macosx", BFD_MACH_O_LC_VERSION_MIN_MACOSX},
+  { "version_min_iphoneos", BFD_MACH_O_LC_VERSION_MIN_IPHONEOS},
+  { "function_starts", BFD_MACH_O_LC_FUNCTION_STARTS},
+  { "dyld_environment", BFD_MACH_O_LC_DYLD_ENVIRONMENT},
   { NULL, 0}
 };
 
-/* Get the section type from NAME.  Return 256 if NAME is unknown.  */
+/* Get the section type from NAME.  Return -1 if NAME is unknown.  */
 
 unsigned int
-bfd_mach_o_get_section_type_from_name (bfd *abfd, const char *name)
+bfd_mach_o_get_section_type_from_name (const char *name)
 {
-  const bfd_mach_o_xlat_name *x;
-  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+  bfd_mach_o_xlat_name *x;
 
   for (x = bfd_mach_o_section_type_name; x->name; x++)
     if (strcmp (x->name, name) == 0)
-      {
-	/* We found it... does the target support it?  */
-	if (bed->bfd_mach_o_section_type_valid_for_target == NULL
-	    || bed->bfd_mach_o_section_type_valid_for_target (x->val))
-	  return x->val; /* OK.  */
-	else
-	  break; /* Not supported.  */
-      }
-  /* Maximum section ID = 0xff.  */
-  return 256;
+      return x->val;
+  return (unsigned int)-1;
 }
 
 /* Get the section attribute from NAME.  Return -1 if NAME is unknown.  */
@@ -4561,7 +3560,7 @@ bfd_mach_o_get_section_type_from_name (bfd *abfd, const char *name)
 unsigned int
 bfd_mach_o_get_section_attribute_from_name (const char *name)
 {
-  const bfd_mach_o_xlat_name *x;
+  bfd_mach_o_xlat_name *x;
 
   for (x = bfd_mach_o_section_attribute_name; x->name; x++)
     if (strcmp (x->name, name) == 0)
@@ -4569,6 +3568,514 @@ bfd_mach_o_get_section_attribute_from_name (const char *name)
   return (unsigned int)-1;
 }
 
+static void
+bfd_mach_o_print_private_header (bfd *abfd, FILE *file)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_header *h = &mdata->header;
+
+  fputs (_("Mach-O header:\n"), file);
+  fprintf (file, _(" magic     : %08lx\n"), h->magic);
+  fprintf (file, _(" cputype   : %08lx (%s)\n"), h->cputype,
+           bfd_mach_o_get_name (bfd_mach_o_cpu_name, h->cputype));
+  fprintf (file, _(" cpusubtype: %08lx\n"), h->cpusubtype);
+  fprintf (file, _(" filetype  : %08lx (%s)\n"),
+           h->filetype,
+           bfd_mach_o_get_name (bfd_mach_o_filetype_name, h->filetype));
+  fprintf (file, _(" ncmds     : %08lx (%lu)\n"), h->ncmds, h->ncmds);
+  fprintf (file, _(" sizeofcmds: %08lx\n"), h->sizeofcmds);
+  fprintf (file, _(" flags     : %08lx ("), h->flags);
+  bfd_mach_o_print_flags (bfd_mach_o_header_flags_name, h->flags, file);
+  fputs (_(")\n"), file);
+  fprintf (file, _(" reserved  : %08x\n"), h->reserved);
+}
+
+static void
+bfd_mach_o_print_section_map (bfd *abfd, FILE *file)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int i;
+  unsigned int sec_nbr = 0;
+
+  fputs (_("Segments and Sections:\n"), file);
+  fputs (_(" #: Segment name     Section name     Address\n"), file);
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      bfd_mach_o_segment_command *seg;
+      bfd_mach_o_section *sec;
+
+      if (mdata->commands[i].type != BFD_MACH_O_LC_SEGMENT
+	  && mdata->commands[i].type != BFD_MACH_O_LC_SEGMENT_64)
+	continue;
+
+      seg = &mdata->commands[i].command.segment;
+
+      fprintf (file, "[Segment %-16s ", seg->segname);
+      fprintf_vma (file, seg->vmaddr);
+      fprintf (file, "-");
+      fprintf_vma  (file, seg->vmaddr + seg->vmsize - 1);
+      fputc (' ', file);
+      fputc (seg->initprot & BFD_MACH_O_PROT_READ ? 'r' : '-', file);
+      fputc (seg->initprot & BFD_MACH_O_PROT_WRITE ? 'w' : '-', file);
+      fputc (seg->initprot & BFD_MACH_O_PROT_EXECUTE ? 'x' : '-', file);
+      fprintf (file, "]\n");
+
+      for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+	{
+	  fprintf (file, "%02u: %-16s %-16s ", ++sec_nbr,
+		   sec->segname, sec->sectname);
+	  fprintf_vma (file, sec->addr);
+	  fprintf (file, " ");
+	  fprintf_vma  (file, sec->size);
+	  fprintf (file, " %08lx\n", sec->flags);
+	}
+    }
+}
+
+static void
+bfd_mach_o_print_section (bfd *abfd ATTRIBUTE_UNUSED,
+                          bfd_mach_o_section *sec, FILE *file)
+{
+  fprintf (file, " Section: %-16s %-16s (bfdname: %s)\n",
+           sec->sectname, sec->segname, sec->bfdsection->name);
+  fprintf (file, "  addr: ");
+  fprintf_vma (file, sec->addr);
+  fprintf (file, " size: ");
+  fprintf_vma  (file, sec->size);
+  fprintf (file, " offset: ");
+  fprintf_vma (file, sec->offset);
+  fprintf (file, "\n");
+  fprintf (file, "  align: %ld", sec->align);
+  fprintf (file, "  nreloc: %lu  reloff: ", sec->nreloc);
+  fprintf_vma (file, sec->reloff);
+  fprintf (file, "\n");
+  fprintf (file, "  flags: %08lx (type: %s", sec->flags,
+           bfd_mach_o_get_name (bfd_mach_o_section_type_name,
+                                sec->flags & BFD_MACH_O_SECTION_TYPE_MASK));
+  fprintf (file, " attr: ");
+  bfd_mach_o_print_flags (bfd_mach_o_section_attribute_name,
+                          sec->flags & BFD_MACH_O_SECTION_ATTRIBUTES_MASK,
+                          file);
+  fprintf (file, ")\n");
+  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+    {
+    case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+    case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+    case BFD_MACH_O_S_SYMBOL_STUBS:
+      fprintf (file, "  first indirect sym: %lu", sec->reserved1);
+      fprintf (file, " (%u entries)",
+               bfd_mach_o_section_get_nbr_indirect (abfd, sec));
+      break;
+    default:
+      fprintf (file, "  reserved1: 0x%lx", sec->reserved1);
+      break;
+    }
+  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+    {
+    case BFD_MACH_O_S_SYMBOL_STUBS:
+      fprintf (file, "  stub size: %lu", sec->reserved2);
+      break;
+    default:
+      fprintf (file, "  reserved2: 0x%lx", sec->reserved2);
+      break;
+    }
+  fprintf (file, "  reserved3: 0x%lx\n", sec->reserved3);
+}
+
+static void
+bfd_mach_o_print_segment (bfd *abfd ATTRIBUTE_UNUSED,
+                          bfd_mach_o_load_command *cmd, FILE *file)
+{
+  bfd_mach_o_segment_command *seg = &cmd->command.segment;
+  bfd_mach_o_section *sec;
+
+  fprintf (file, " name: %s\n", *seg->segname ? seg->segname : "*none*");
+  fprintf (file, "    vmaddr: ");
+  fprintf_vma (file, seg->vmaddr);
+  fprintf (file, "   vmsize: ");
+  fprintf_vma  (file, seg->vmsize);
+  fprintf (file, "\n");
+  fprintf (file, "   fileoff: ");
+  fprintf_vma (file, seg->fileoff);
+  fprintf (file, " filesize: ");
+  fprintf_vma (file, (bfd_vma)seg->filesize);
+  fprintf (file, " endoff: ");
+  fprintf_vma (file, (bfd_vma)(seg->fileoff + seg->filesize));
+  fprintf (file, "\n");
+  fprintf (file, "   nsects: %lu  ", seg->nsects);
+  fprintf (file, " flags: %lx\n", seg->flags);
+  for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+    bfd_mach_o_print_section (abfd, sec, file);
+}
+
+static void
+bfd_mach_o_print_dysymtab (bfd *abfd ATTRIBUTE_UNUSED,
+                           bfd_mach_o_load_command *cmd, FILE *file)
+{
+  bfd_mach_o_dysymtab_command *dysymtab = &cmd->command.dysymtab;
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int i;
+
+  fprintf (file, "              local symbols: idx: %10lu  num: %-8lu",
+           dysymtab->ilocalsym, dysymtab->nlocalsym);
+  fprintf (file, " (nxtidx: %lu)\n",
+           dysymtab->ilocalsym + dysymtab->nlocalsym);
+  fprintf (file, "           external symbols: idx: %10lu  num: %-8lu",
+           dysymtab->iextdefsym, dysymtab->nextdefsym);
+  fprintf (file, " (nxtidx: %lu)\n",
+           dysymtab->iextdefsym + dysymtab->nextdefsym);
+  fprintf (file, "          undefined symbols: idx: %10lu  num: %-8lu",
+           dysymtab->iundefsym, dysymtab->nundefsym);
+  fprintf (file, " (nxtidx: %lu)\n",
+           dysymtab->iundefsym + dysymtab->nundefsym);
+  fprintf (file, "           table of content: off: 0x%08lx  num: %-8lu",
+           dysymtab->tocoff, dysymtab->ntoc);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->tocoff 
+           + dysymtab->ntoc * BFD_MACH_O_TABLE_OF_CONTENT_SIZE); 
+  fprintf (file, "               module table: off: 0x%08lx  num: %-8lu",
+           dysymtab->modtaboff, dysymtab->nmodtab);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->modtaboff + dysymtab->nmodtab 
+           * (mach_o_wide_p (&mdata->header) ? 
+              BFD_MACH_O_DYLIB_MODULE_64_SIZE : BFD_MACH_O_DYLIB_MODULE_SIZE));
+  fprintf (file, "   external reference table: off: 0x%08lx  num: %-8lu",
+           dysymtab->extrefsymoff, dysymtab->nextrefsyms);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->extrefsymoff 
+           + dysymtab->nextrefsyms * BFD_MACH_O_REFERENCE_SIZE);
+  fprintf (file, "      indirect symbol table: off: 0x%08lx  num: %-8lu",
+           dysymtab->indirectsymoff, dysymtab->nindirectsyms);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->indirectsymoff 
+           + dysymtab->nindirectsyms * BFD_MACH_O_INDIRECT_SYMBOL_SIZE);
+  fprintf (file, "  external relocation table: off: 0x%08lx  num: %-8lu",
+           dysymtab->extreloff, dysymtab->nextrel);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->extreloff + dysymtab->nextrel * BFD_MACH_O_RELENT_SIZE);
+  fprintf (file, "     local relocation table: off: 0x%08lx  num: %-8lu",
+           dysymtab->locreloff, dysymtab->nlocrel);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->locreloff + dysymtab->nlocrel * BFD_MACH_O_RELENT_SIZE);
+  
+  if (dysymtab->ntoc > 0
+      || dysymtab->nindirectsyms > 0
+      || dysymtab->nextrefsyms > 0)
+    {
+      /* Try to read the symbols to display the toc or indirect symbols.  */
+      bfd_mach_o_read_symtab_symbols (abfd);
+    }
+  else if (dysymtab->nmodtab > 0)
+    {
+      /* Try to read the strtab to display modules name.  */
+      bfd_mach_o_read_symtab_strtab (abfd);
+    }
+  
+  for (i = 0; i < dysymtab->nmodtab; i++)
+    {
+      bfd_mach_o_dylib_module *module = &dysymtab->dylib_module[i];
+      fprintf (file, "  module %u:\n", i);
+      fprintf (file, "   name: %lu", module->module_name_idx);
+      if (mdata->symtab && mdata->symtab->strtab)
+        fprintf (file, ": %s",
+                 mdata->symtab->strtab + module->module_name_idx);
+      fprintf (file, "\n");
+      fprintf (file, "   extdefsym: idx: %8lu  num: %lu\n",
+               module->iextdefsym, module->nextdefsym);
+      fprintf (file, "      refsym: idx: %8lu  num: %lu\n",
+               module->irefsym, module->nrefsym);
+      fprintf (file, "    localsym: idx: %8lu  num: %lu\n",
+               module->ilocalsym, module->nlocalsym);
+      fprintf (file, "      extrel: idx: %8lu  num: %lu\n",
+               module->iextrel, module->nextrel);
+      fprintf (file, "        init: idx: %8u  num: %u\n",
+               module->iinit, module->ninit);
+      fprintf (file, "        term: idx: %8u  num: %u\n",
+               module->iterm, module->nterm);
+      fprintf (file, "   objc_module_info: addr: ");
+      fprintf_vma (file, module->objc_module_info_addr);
+      fprintf (file, "  size: %lu\n", module->objc_module_info_size);
+    }
+
+  if (dysymtab->ntoc > 0)
+    {
+      bfd_mach_o_symtab_command *symtab = mdata->symtab;
+      
+      fprintf (file, "  table of content: (symbol/module)\n");
+      for (i = 0; i < dysymtab->ntoc; i++)
+        {
+          bfd_mach_o_dylib_table_of_content *toc = &dysymtab->dylib_toc[i];
+          
+          fprintf (file, "   %4u: ", i);
+          if (symtab && symtab->symbols && toc->symbol_index < symtab->nsyms)
+            {
+              const char *name = symtab->symbols[toc->symbol_index].symbol.name;
+              fprintf (file, "%s (%lu)", name ? name : "*invalid*",
+                       toc->symbol_index);
+            }
+          else
+            fprintf (file, "%lu", toc->symbol_index);
+          
+          fprintf (file, " / ");
+          if (symtab && symtab->strtab
+              && toc->module_index < dysymtab->nmodtab)
+            {
+              bfd_mach_o_dylib_module *mod;
+              mod = &dysymtab->dylib_module[toc->module_index];
+              fprintf (file, "%s (%lu)",
+                       symtab->strtab + mod->module_name_idx,
+                       toc->module_index);
+            }
+          else
+            fprintf (file, "%lu", toc->module_index);
+          
+          fprintf (file, "\n");
+        }
+    }
+
+  if (dysymtab->nindirectsyms != 0)
+    {
+      fprintf (file, "  indirect symbols:\n");
+
+      for (i = 0; i < mdata->nsects; i++)
+        {
+          bfd_mach_o_section *sec = mdata->sections[i];
+          unsigned int j, first, last;
+          bfd_mach_o_symtab_command *symtab = mdata->symtab;
+          bfd_vma addr;
+          bfd_vma entry_size;
+      
+          switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+            {
+            case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+            case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+            case BFD_MACH_O_S_SYMBOL_STUBS:
+              first = sec->reserved1;
+              last = first + bfd_mach_o_section_get_nbr_indirect (abfd, sec);
+              addr = sec->addr;
+              entry_size = bfd_mach_o_section_get_entry_size (abfd, sec);
+              fprintf (file, "  for section %s.%s:\n",
+                       sec->segname, sec->sectname);
+              for (j = first; j < last; j++)
+                {
+                  unsigned int isym = dysymtab->indirect_syms[j];
+                  
+                  fprintf (file, "   ");
+                  fprintf_vma (file, addr);
+                  fprintf (file, " %5u: 0x%08x", j, isym);
+                  if (isym & BFD_MACH_O_INDIRECT_SYMBOL_LOCAL)
+                    fprintf (file, " LOCAL");
+                  if (isym & BFD_MACH_O_INDIRECT_SYMBOL_ABS)
+                    fprintf (file, " ABSOLUTE");
+                  if (symtab && symtab->symbols
+                      && isym < symtab->nsyms
+                      && symtab->symbols[isym].symbol.name)
+                    fprintf (file, " %s", symtab->symbols[isym].symbol.name);
+                  fprintf (file, "\n");
+                  addr += entry_size;
+                }
+              break;
+            default:
+              break;
+            }
+        }
+    }
+  if (dysymtab->nextrefsyms > 0)
+    {
+      bfd_mach_o_symtab_command *symtab = mdata->symtab;
+      
+      fprintf (file, "  external reference table: (symbol flags)\n");
+      for (i = 0; i < dysymtab->nextrefsyms; i++)
+        {
+          bfd_mach_o_dylib_reference *ref = &dysymtab->ext_refs[i];
+          
+          fprintf (file, "   %4u: %5lu 0x%02lx", i, ref->isym, ref->flags);
+          if (symtab && symtab->symbols
+              && ref->isym < symtab->nsyms
+              && symtab->symbols[ref->isym].symbol.name)
+            fprintf (file, " %s", symtab->symbols[ref->isym].symbol.name);
+          fprintf (file, "\n");
+        }
+    }
+
+}
+
+static void
+bfd_mach_o_print_dyld_info (bfd *abfd ATTRIBUTE_UNUSED,
+                            bfd_mach_o_load_command *cmd, FILE *file)
+{
+  bfd_mach_o_dyld_info_command *info = &cmd->command.dyld_info;
+
+  fprintf (file, "       rebase: off: 0x%08x  size: %-8u\n",
+           info->rebase_off, info->rebase_size);
+  fprintf (file, "         bind: off: 0x%08x  size: %-8u\n",
+           info->bind_off, info->bind_size);
+  fprintf (file, "    weak bind: off: 0x%08x  size: %-8u\n",
+           info->weak_bind_off, info->weak_bind_size);
+  fprintf (file, "    lazy bind: off: 0x%08x  size: %-8u\n",
+           info->lazy_bind_off, info->lazy_bind_size);
+  fprintf (file, "       export: off: 0x%08x  size: %-8u\n",
+           info->export_off, info->export_size);
+}
+
+bfd_boolean
+bfd_mach_o_bfd_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  FILE *file = (FILE *) ptr;
+  unsigned int i;
+
+  bfd_mach_o_print_private_header (abfd, file);
+  fputc ('\n', file);
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      bfd_mach_o_load_command *cmd = &mdata->commands[i];
+      const char *cmd_name;
+      
+      cmd_name = bfd_mach_o_get_name_or_null
+        (bfd_mach_o_load_command_name, cmd->type);
+      fprintf (file, "Load command ");
+      if (cmd_name == NULL)
+        fprintf (file, "0x%02x:", cmd->type);
+      else
+        fprintf (file, "%s:", cmd_name);
+
+      switch (cmd->type)
+	{
+	case BFD_MACH_O_LC_SEGMENT:
+	case BFD_MACH_O_LC_SEGMENT_64:
+          bfd_mach_o_print_segment (abfd, cmd, file);
+	  break;
+	case BFD_MACH_O_LC_UUID:
+	  {
+	    bfd_mach_o_uuid_command *uuid = &cmd->command.uuid;
+	    unsigned int j;
+
+	    for (j = 0; j < sizeof (uuid->uuid); j ++)
+	      fprintf (file, " %02x", uuid->uuid[j]);
+	    fputc ('\n', file);
+	  }
+	  break;
+	case BFD_MACH_O_LC_LOAD_DYLIB:
+	case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
+	case BFD_MACH_O_LC_REEXPORT_DYLIB:
+	case BFD_MACH_O_LC_ID_DYLIB:
+	  {
+	    bfd_mach_o_dylib_command *dylib = &cmd->command.dylib;
+	    fprintf (file, " %s\n", dylib->name_str);
+	    fprintf (file, "            time stamp: 0x%08lx\n",
+		     dylib->timestamp);
+	    fprintf (file, "       current version: 0x%08lx\n",
+		     dylib->current_version);
+	    fprintf (file, "  comptibility version: 0x%08lx\n",
+		     dylib->compatibility_version);
+	    break;
+	  }
+	case BFD_MACH_O_LC_LOAD_DYLINKER:
+	case BFD_MACH_O_LC_ID_DYLINKER:
+          fprintf (file, " %s\n", cmd->command.dylinker.name_str);
+          break;
+	case BFD_MACH_O_LC_SYMTAB:
+	  {
+	    bfd_mach_o_symtab_command *symtab = &cmd->command.symtab;
+	    fprintf (file,
+                     "\n"
+		     "   symoff: 0x%08x    nsyms: %8u  (endoff: 0x%08x)\n",
+                     symtab->symoff, symtab->nsyms,
+                     symtab->symoff + symtab->nsyms 
+                     * (mach_o_wide_p (&mdata->header) 
+                        ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE));
+	    fprintf (file,
+		     "   stroff: 0x%08x  strsize: %8u  (endoff: 0x%08x)\n",
+		     symtab->stroff, symtab->strsize,
+                     symtab->stroff + symtab->strsize);
+	    break;
+	  }
+	case BFD_MACH_O_LC_DYSYMTAB:
+          fprintf (file, "\n");
+          bfd_mach_o_print_dysymtab (abfd, cmd, file);
+          break;
+        case BFD_MACH_O_LC_CODE_SIGNATURE:
+        case BFD_MACH_O_LC_SEGMENT_SPLIT_INFO:
+        case BFD_MACH_O_LC_FUNCTION_STARTS:
+	  {
+	    bfd_mach_o_linkedit_command *linkedit = &cmd->command.linkedit;
+	    fprintf
+              (file, "\n"
+               "  dataoff: 0x%08lx  datasize: 0x%08lx  (endoff: 0x%08lx)\n",
+               linkedit->dataoff, linkedit->datasize,
+               linkedit->dataoff + linkedit->datasize);
+            break;
+          }
+        case BFD_MACH_O_LC_SUB_FRAMEWORK:
+        case BFD_MACH_O_LC_SUB_UMBRELLA:
+        case BFD_MACH_O_LC_SUB_LIBRARY:
+        case BFD_MACH_O_LC_SUB_CLIENT:
+        case BFD_MACH_O_LC_RPATH:
+	  {
+	    bfd_mach_o_str_command *str = &cmd->command.str;
+	    fprintf (file, " %s\n", str->str);
+            break;
+          }
+        case BFD_MACH_O_LC_THREAD:
+        case BFD_MACH_O_LC_UNIXTHREAD:
+          {
+            bfd_mach_o_thread_command *thread = &cmd->command.thread;
+            unsigned int j;
+            bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+
+            fprintf (file, " nflavours: %lu\n", thread->nflavours);
+            for (j = 0; j < thread->nflavours; j++)
+              {
+                bfd_mach_o_thread_flavour *flavour = &thread->flavours[j];
+
+                fprintf (file, "  %2u: flavour: 0x%08lx  offset: 0x%08lx"
+                         "  size: 0x%08lx\n",
+                         j, flavour->flavour, flavour->offset,
+                         flavour->size);
+                if (bed->_bfd_mach_o_print_thread)
+                  {
+                    char *buf = bfd_malloc (flavour->size);
+
+                    if (buf
+                        && bfd_seek (abfd, flavour->offset, SEEK_SET) == 0
+                        && (bfd_bread (buf, flavour->size, abfd) 
+                            == flavour->size))
+                      (*bed->_bfd_mach_o_print_thread)(abfd, flavour,
+                                                       file, buf);
+                    free (buf);
+                  }
+              }
+            break;
+          }
+	case BFD_MACH_O_LC_DYLD_INFO:
+          fprintf (file, "\n");
+          bfd_mach_o_print_dyld_info (abfd, cmd, file);
+          break;
+	case BFD_MACH_O_LC_VERSION_MIN_MACOSX:
+	case BFD_MACH_O_LC_VERSION_MIN_IPHONEOS:
+          {
+            bfd_mach_o_version_min_command *ver = &cmd->command.version_min;
+
+            fprintf (file, " %u.%u.%u\n", ver->rel, ver->maj, ver->min);
+          }
+          break;
+	default:
+	  fprintf (file, "\n");
+          fprintf (file, "  offset: 0x%08lx\n", (unsigned long)cmd->offset);
+          fprintf (file, "    size: 0x%08lx\n", (unsigned long)cmd->len);
+	  break;
+	}
+      fputc ('\n', file);
+    }
+
+  bfd_mach_o_print_section_map (abfd, file);
+
+  return TRUE;
+}
+
 int
 bfd_mach_o_core_fetch_environment (bfd *abfd,
 				   unsigned char **rbuf,
@@ -4681,222 +4188,18 @@ bfd_mach_o_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED)
   return 0;
 }
 
-static bfd_mach_o_uuid_command *
-bfd_mach_o_lookup_uuid_command (bfd *abfd)
-{
-  bfd_mach_o_load_command *uuid_cmd;
-  int ncmd = bfd_mach_o_lookup_command (abfd, BFD_MACH_O_LC_UUID, &uuid_cmd);
-  if (ncmd != 1)
-    return FALSE;
-  return &uuid_cmd->command.uuid;
-}
-
-/* Return true if ABFD is a dSYM file and its UUID matches UUID_CMD. */
-
-static bfd_boolean
-bfd_mach_o_dsym_for_uuid_p (bfd *abfd, const bfd_mach_o_uuid_command *uuid_cmd)
-{
-  bfd_mach_o_uuid_command *dsym_uuid_cmd;
-
-  BFD_ASSERT (abfd);
-  BFD_ASSERT (uuid_cmd);
-
-  if (!bfd_check_format (abfd, bfd_object))
-    return FALSE;
-
-  if (bfd_get_flavour (abfd) != bfd_target_mach_o_flavour
-      || bfd_mach_o_get_data (abfd) == NULL
-      || bfd_mach_o_get_data (abfd)->header.filetype != BFD_MACH_O_MH_DSYM)
-    return FALSE;
-
-  dsym_uuid_cmd = bfd_mach_o_lookup_uuid_command (abfd);
-  if (dsym_uuid_cmd == NULL)
-    return FALSE;
-
-  if (memcmp (uuid_cmd->uuid, dsym_uuid_cmd->uuid,
-              sizeof (uuid_cmd->uuid)) != 0)
-    return FALSE;
-
-  return TRUE;
-}
-
-/* Find a BFD in DSYM_FILENAME which matches ARCH and UUID_CMD.
-   The caller is responsible for closing the returned BFD object and
-   its my_archive if the returned BFD is in a fat dSYM. */
-
-static bfd *
-bfd_mach_o_find_dsym (const char *dsym_filename,
-                      const bfd_mach_o_uuid_command *uuid_cmd,
-                      const bfd_arch_info_type *arch)
-{
-  bfd *base_dsym_bfd, *dsym_bfd;
-
-  BFD_ASSERT (uuid_cmd);
-
-  base_dsym_bfd = bfd_openr (dsym_filename, NULL);
-  if (base_dsym_bfd == NULL)
-    return NULL;
-
-  dsym_bfd = bfd_mach_o_fat_extract (base_dsym_bfd, bfd_object, arch);
-  if (bfd_mach_o_dsym_for_uuid_p (dsym_bfd, uuid_cmd))
-    return dsym_bfd;
-
-  bfd_close (dsym_bfd);
-  if (base_dsym_bfd != dsym_bfd)
-    bfd_close (base_dsym_bfd);
-
-  return NULL;
-}
-
-/* Return a BFD created from a dSYM file for ABFD.
-   The caller is responsible for closing the returned BFD object, its
-   filename, and its my_archive if the returned BFD is in a fat dSYM. */
-
-static bfd *
-bfd_mach_o_follow_dsym (bfd *abfd)
-{
-  char *dsym_filename;
-  bfd_mach_o_uuid_command *uuid_cmd;
-  bfd *dsym_bfd, *base_bfd = abfd;
-  const char *base_basename;
-
-  if (abfd == NULL || bfd_get_flavour (abfd) != bfd_target_mach_o_flavour)
-    return NULL;
-
-  if (abfd->my_archive)
-    base_bfd = abfd->my_archive;
-  /* BFD may have been opened from a stream. */
-  if (base_bfd->filename == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return NULL;
-    }
-  base_basename = lbasename (base_bfd->filename);
-
-  uuid_cmd = bfd_mach_o_lookup_uuid_command (abfd);
-  if (uuid_cmd == NULL)
-    return NULL;
-
-  /* TODO: We assume the DWARF file has the same as the binary's.
-     It seems apple's GDB checks all files in the dSYM bundle directory.
-     http://opensource.apple.com/source/gdb/gdb-1708/src/gdb/macosx/macosx-tdep.c
-  */
-  dsym_filename = (char *)bfd_malloc (strlen (base_bfd->filename)
-                                       + strlen (dsym_subdir) + 1
-                                       + strlen (base_basename) + 1);
-  sprintf (dsym_filename, "%s%s/%s",
-           base_bfd->filename, dsym_subdir, base_basename);
-
-  dsym_bfd = bfd_mach_o_find_dsym (dsym_filename, uuid_cmd,
-                                   bfd_get_arch_info (abfd));
-  if (dsym_bfd == NULL)
-    free (dsym_filename);
-
-  return dsym_bfd;
-}
-
-bfd_boolean
-bfd_mach_o_find_nearest_line (bfd *abfd,
-			      asection *section,
-			      asymbol **symbols,
-			      bfd_vma offset,
-			      const char **filename_ptr,
-			      const char **functionname_ptr,
-			      unsigned int *line_ptr)
-{
-  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
-  if (mdata == NULL)
-    return FALSE;
-  switch (mdata->header.filetype)
-    {
-    case BFD_MACH_O_MH_OBJECT:
-      break;
-    case BFD_MACH_O_MH_EXECUTE:
-    case BFD_MACH_O_MH_DYLIB:
-    case BFD_MACH_O_MH_BUNDLE:
-    case BFD_MACH_O_MH_KEXT_BUNDLE:
-      if (mdata->dwarf2_find_line_info == NULL)
-        {
-          mdata->dsym_bfd = bfd_mach_o_follow_dsym (abfd);
-          /* When we couldn't find dSYM for this binary, we look for
-             the debug information in the binary itself. In this way,
-             we won't try finding separated dSYM again because
-             mdata->dwarf2_find_line_info will be filled. */
-          if (! mdata->dsym_bfd)
-            break;
-          if (! _bfd_dwarf2_slurp_debug_info (abfd, mdata->dsym_bfd,
-                                              dwarf_debug_sections, symbols,
-                                              &mdata->dwarf2_find_line_info))
-            return FALSE;
-        }
-      break;
-    default:
-      return FALSE;
-    }
-  if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections,
-				     section, symbols, offset,
-				     filename_ptr, functionname_ptr,
-				     line_ptr, 0,
-				     &mdata->dwarf2_find_line_info))
-    return TRUE;
-  return FALSE;
-}
-
-bfd_boolean
-bfd_mach_o_close_and_cleanup (bfd *abfd)
-{
-  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
-  if (bfd_get_format (abfd) == bfd_object && mdata != NULL)
-    {
-      _bfd_dwarf2_cleanup_debug_info (abfd, &mdata->dwarf2_find_line_info);
-      bfd_mach_o_free_cached_info (abfd);
-      if (mdata->dsym_bfd != NULL)
-        {
-          bfd *fat_bfd = mdata->dsym_bfd->my_archive;
-          char *dsym_filename = (char *)(fat_bfd
-                                         ? fat_bfd->filename
-                                         : mdata->dsym_bfd->filename);
-          bfd_close (mdata->dsym_bfd);
-          mdata->dsym_bfd = NULL;
-          if (fat_bfd)
-            bfd_close (fat_bfd);
-          free (dsym_filename);
-        }
-    }
-
-  return _bfd_generic_close_and_cleanup (abfd);
-}
-
-bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd)
-{
-  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
-  asection *asect;
-  free (mdata->dyn_reloc_cache);
-  mdata->dyn_reloc_cache = NULL;
-  for (asect = abfd->sections; asect != NULL; asect = asect->next)
-    {
-      free (asect->relocation);
-      asect->relocation = NULL;
-    }
-
-  return TRUE;
-}
-
 #define bfd_mach_o_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup 
 #define bfd_mach_o_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
 
 #define bfd_mach_o_swap_reloc_in NULL
 #define bfd_mach_o_swap_reloc_out NULL
 #define bfd_mach_o_print_thread NULL
-#define bfd_mach_o_tgt_seg_table NULL
-#define bfd_mach_o_section_type_valid_for_tgt NULL
 
 #define TARGET_NAME 		mach_o_be_vec
 #define TARGET_STRING     	"mach-o-be"
 #define TARGET_ARCHITECTURE	bfd_arch_unknown
 #define TARGET_BIG_ENDIAN 	1
 #define TARGET_ARCHIVE 		0
-#define TARGET_PRIORITY		1
 #include "mach-o-target.c"
 
 #undef TARGET_NAME
@@ -4904,14 +4207,12 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd)
 #undef TARGET_ARCHITECTURE
 #undef TARGET_BIG_ENDIAN
 #undef TARGET_ARCHIVE
-#undef TARGET_PRIORITY
 
 #define TARGET_NAME 		mach_o_le_vec
 #define TARGET_STRING 		"mach-o-le"
 #define TARGET_ARCHITECTURE	bfd_arch_unknown
 #define TARGET_BIG_ENDIAN 	0
 #define TARGET_ARCHIVE 		0
-#define TARGET_PRIORITY		1
 
 #include "mach-o-target.c"
 
@@ -4920,7 +4221,6 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd)
 #undef TARGET_ARCHITECTURE
 #undef TARGET_BIG_ENDIAN
 #undef TARGET_ARCHIVE
-#undef TARGET_PRIORITY
 
 /* Not yet handled: creating an archive.  */
 #define bfd_mach_o_mkarchive                      _bfd_noarchive_mkarchive
@@ -4934,7 +4234,7 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd)
 #define bfd_mach_o_truncate_arname                _bfd_noarchive_truncate_arname
 #define bfd_mach_o_write_armap                    _bfd_noarchive_write_armap
 #define bfd_mach_o_get_elt_at_index               _bfd_noarchive_get_elt_at_index
-#define bfd_mach_o_generic_stat_arch_elt          bfd_mach_o_fat_stat_arch_elt
+#define bfd_mach_o_generic_stat_arch_elt          _bfd_noarchive_generic_stat_arch_elt
 #define bfd_mach_o_update_armap_timestamp         _bfd_noarchive_update_armap_timestamp
 
 #define TARGET_NAME 		mach_o_fat_vec
@@ -4942,7 +4242,6 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd)
 #define TARGET_ARCHITECTURE	bfd_arch_unknown
 #define TARGET_BIG_ENDIAN 	1
 #define TARGET_ARCHIVE 		1
-#define TARGET_PRIORITY		0
 
 #include "mach-o-target.c"
 
@@ -4951,4 +4250,3 @@ bfd_boolean bfd_mach_o_free_cached_info (bfd *abfd)
 #undef TARGET_ARCHITECTURE
 #undef TARGET_BIG_ENDIAN
 #undef TARGET_ARCHIVE
-#undef TARGET_PRIORITY
diff --git a/bfd/mach-o.h b/bfd/mach-o.h
index 7f54961c7f..53d97dab3a 100644
--- a/bfd/mach-o.h
+++ b/bfd/mach-o.h
@@ -1,6 +1,5 @@
 /* Mach-O support for BFD.
-   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2011,
-   2012
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -42,18 +41,6 @@ typedef struct bfd_mach_o_header
 }
 bfd_mach_o_header;
 
-typedef struct bfd_mach_o_asymbol
-{
-  /* The actual symbol which the rest of BFD works with.  */
-  asymbol symbol;
-
-  /* Mach-O symbol fields.  */
-  unsigned char n_type;
-  unsigned char n_sect;
-  unsigned short n_desc;
-}
-bfd_mach_o_asymbol;
-
 #define BFD_MACH_O_SEGNAME_SIZE 16
 #define BFD_MACH_O_SECTNAME_SIZE 16
 
@@ -76,12 +63,6 @@ typedef struct bfd_mach_o_section
   /* Corresponding bfd section.  */
   asection *bfdsection;
 
-  /* An array holding the indirect symbols for this section.
-     NULL values indicate local symbols.
-     The number of symbols is determined from the section size and type.  */
-
-  bfd_mach_o_asymbol **indirect_syms;
-
   /* Simply linked list.  */
   struct bfd_mach_o_section *next;
 }
@@ -89,7 +70,7 @@ bfd_mach_o_section;
 
 typedef struct bfd_mach_o_segment_command
 {
-  char segname[BFD_MACH_O_SEGNAME_SIZE + 1];
+  char segname[16 + 1];
   bfd_vma vmaddr;
   bfd_vma vmsize;
   bfd_vma fileoff;
@@ -123,14 +104,17 @@ typedef struct bfd_mach_o_reloc_info
 }
 bfd_mach_o_reloc_info;
 
-/* The symbol table is sorted like this:
- (1) local.
-	(otherwise in order of generation)
- (2) external defined
-	(sorted by name)
- (3) external undefined / common
-	(sorted by name)
-*/
+typedef struct bfd_mach_o_asymbol
+{
+  /* The actual symbol which the rest of BFD works with.  */
+  asymbol symbol;
+
+  /* Fields from Mach-O symbol.  */
+  unsigned char n_type;
+  unsigned char n_sect;
+  unsigned short n_desc;
+}
+bfd_mach_o_asymbol;
 
 typedef struct bfd_mach_o_symtab_command
 {
@@ -454,16 +438,6 @@ typedef struct bfd_mach_o_str_command
 }
 bfd_mach_o_str_command;
 
-typedef struct bfd_mach_o_fvmlib_command
-{
-  unsigned int name_offset;
-  unsigned int name_len;
-  char *name_str;
-  unsigned int minor_version;
-  unsigned int header_addr;
-}
-bfd_mach_o_fvmlib_command;
-
 typedef struct bfd_mach_o_dyld_info_command
 {
   /* File offset and size to rebase info.  */
@@ -497,14 +471,6 @@ typedef struct bfd_mach_o_version_min_command
 }
 bfd_mach_o_version_min_command;
 
-typedef struct bfd_mach_o_encryption_info_command
-{
-  unsigned int cryptoff;
-  unsigned int cryptsize;
-  unsigned int cryptid;
-}
-bfd_mach_o_encryption_info_command;
-
 typedef struct bfd_mach_o_load_command
 {
   bfd_mach_o_load_command_type type;
@@ -525,8 +491,6 @@ typedef struct bfd_mach_o_load_command
     bfd_mach_o_str_command str;
     bfd_mach_o_dyld_info_command dyld_info;
     bfd_mach_o_version_min_command version_min;
-    bfd_mach_o_encryption_info_command encryption_info;
-    bfd_mach_o_fvmlib_command fvmlib;
   }
   command;
 }
@@ -543,7 +507,7 @@ typedef struct mach_o_data_struct
   unsigned long nsects;
   bfd_mach_o_section **sections;
 
-  /* Used while writing: current length of the output file.  This is used
+  /* Used while writting: current length of the output file.  This is used
      to allocate space in the file.  */
   ufile_ptr filelen;
 
@@ -552,26 +516,19 @@ typedef struct mach_o_data_struct
      is expected.  */
   bfd_mach_o_symtab_command *symtab;
   bfd_mach_o_dysymtab_command *dysymtab;
-
-  /* A place to stash dwarf2 info for this bfd.  */
-  void *dwarf2_find_line_info;
-
-  /* BFD of .dSYM file. */
-  bfd *dsym_bfd;
-
-  /* Cache of dynamic relocs. */
-  arelent *dyn_reloc_cache;
 }
 bfd_mach_o_data_struct;
 
-typedef struct bfd_mach_o_xlat_name
+/* Target specific routines.  */
+typedef struct bfd_mach_o_backend_data
 {
-  const char *name;
-  unsigned long val;
+  enum bfd_architecture arch;
+  bfd_boolean (*_bfd_mach_o_swap_reloc_in)(arelent *, bfd_mach_o_reloc_info *);
+  bfd_boolean (*_bfd_mach_o_swap_reloc_out)(arelent *, bfd_mach_o_reloc_info *);
+  bfd_boolean (*_bfd_mach_o_print_thread)(bfd *, bfd_mach_o_thread_flavour *,
+                                          void *, char *);
 }
-bfd_mach_o_xlat_name;
-
-/* Target specific routines.  */
+bfd_mach_o_backend_data;
 
 #define bfd_mach_o_get_data(abfd) ((abfd)->tdata.mach_o_data)
 #define bfd_mach_o_get_backend_data(abfd) \
@@ -582,6 +539,9 @@ bfd_mach_o_xlat_name;
   ((bfd_mach_o_section *)(sec)->used_by_bfd)
 
 bfd_boolean bfd_mach_o_valid (bfd *);
+int bfd_mach_o_read_dysymtab_symbol (bfd *, bfd_mach_o_dysymtab_command *, bfd_mach_o_symtab_command *, bfd_mach_o_asymbol *, unsigned long);
+int bfd_mach_o_scan_start_address (bfd *);
+int bfd_mach_o_scan (bfd *, bfd_mach_o_header *, bfd_mach_o_data_struct *);
 bfd_boolean bfd_mach_o_mkobject_init (bfd *);
 const bfd_target *bfd_mach_o_object_p (bfd *);
 const bfd_target *bfd_mach_o_core_p (bfd *);
@@ -597,7 +557,6 @@ bfd_boolean bfd_mach_o_bfd_copy_private_symbol_data (bfd *, asymbol *,
 bfd_boolean bfd_mach_o_bfd_copy_private_section_data (bfd *, asection *,
                                                       bfd *, asection *);
 bfd_boolean bfd_mach_o_bfd_copy_private_bfd_data (bfd *, bfd *);
-bfd_boolean bfd_mach_o_bfd_set_private_flags (bfd *, flagword);
 long bfd_mach_o_get_symtab_upper_bound (bfd *);
 long bfd_mach_o_canonicalize_symtab (bfd *, asymbol **);
 long bfd_mach_o_get_synthetic_symtab (bfd *, long, asymbol **, long, 
@@ -609,6 +568,7 @@ long bfd_mach_o_canonicalize_dynamic_reloc (bfd *, arelent **, asymbol **);
 asymbol *bfd_mach_o_make_empty_symbol (bfd *);
 void bfd_mach_o_get_symbol_info (bfd *, asymbol *, symbol_info *);
 void bfd_mach_o_print_symbol (bfd *, PTR, asymbol *, bfd_print_symbol_type);
+bfd_boolean bfd_mach_o_bfd_print_private_bfd_data (bfd *, PTR);
 int bfd_mach_o_sizeof_headers (bfd *, struct bfd_link_info *);
 unsigned long bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type);
 int bfd_mach_o_core_fetch_environment (bfd *, unsigned char **, unsigned int *);
@@ -623,70 +583,11 @@ bfd_boolean bfd_mach_o_set_section_contents (bfd *, asection *, const void *,
                                              file_ptr, bfd_size_type);
 unsigned int bfd_mach_o_version (bfd *);
 
-unsigned int bfd_mach_o_get_section_type_from_name (bfd *, const char *);
+unsigned int bfd_mach_o_get_section_type_from_name (const char *);
 unsigned int bfd_mach_o_get_section_attribute_from_name (const char *);
-
-void bfd_mach_o_convert_section_name_to_bfd (bfd *, const char *, const char *,
-					     const char **, flagword *);
-bfd_boolean bfd_mach_o_find_nearest_line (bfd *, asection *, asymbol **,
-                                          bfd_vma, const char **,
-                                          const char **, unsigned int *);
-bfd_boolean bfd_mach_o_close_and_cleanup (bfd *);
-bfd_boolean bfd_mach_o_free_cached_info (bfd *);
-
-unsigned int bfd_mach_o_section_get_nbr_indirect (bfd *, bfd_mach_o_section *);
-unsigned int bfd_mach_o_section_get_entry_size (bfd *, bfd_mach_o_section *);
-bfd_boolean bfd_mach_o_read_symtab_symbols (bfd *);
-bfd_boolean bfd_mach_o_read_symtab_strtab (bfd *abfd);
-
-/* A placeholder in case we need to suppress emitting the dysymtab for some
-   reason (e.g. compatibility with older system versions).  */
-#define bfd_mach_o_should_emit_dysymtab(x) TRUE
-
-extern const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[];
-extern const bfd_mach_o_xlat_name bfd_mach_o_section_type_name[];
+void bfd_mach_o_normalize_section_name (const char *, const char *,
+                                        const char **, flagword *);
 
 extern const bfd_target mach_o_fat_vec;
 
-/* Interfaces between BFD names and Mach-O names.  */
-
-typedef struct mach_o_section_name_xlat
-{
-  const char *bfd_name;
-  const char *mach_o_name;
-  flagword bfd_flags;
-  unsigned int macho_sectype;
-  unsigned int macho_secattr;
-  unsigned int sectalign;
-} mach_o_section_name_xlat;
-
-typedef struct mach_o_segment_name_xlat
-{
-  const char *segname;
-  const mach_o_section_name_xlat *sections;
-} mach_o_segment_name_xlat;
-
-const mach_o_section_name_xlat *
-bfd_mach_o_section_data_for_mach_sect (bfd *, const char *, const char *);
-const mach_o_section_name_xlat *
-bfd_mach_o_section_data_for_bfd_name (bfd *, const char *, const char **);
-
-typedef struct bfd_mach_o_backend_data
-{
-  enum bfd_architecture arch;
-  bfd_boolean (*_bfd_mach_o_swap_reloc_in)(arelent *, bfd_mach_o_reloc_info *);
-  bfd_boolean (*_bfd_mach_o_swap_reloc_out)(arelent *, bfd_mach_o_reloc_info *);
-  bfd_boolean (*_bfd_mach_o_print_thread)(bfd *, bfd_mach_o_thread_flavour *,
-                                          void *, char *);
-  const mach_o_segment_name_xlat *segsec_names_xlat;
-  bfd_boolean (*bfd_mach_o_section_type_valid_for_target) (unsigned long);
-}
-bfd_mach_o_backend_data;
-
-/* Values used in symbol.udata.i, to signal that the mach-o-specific data in the
-   symbol are not yet set, or need validation (where this is possible).  */
-
-#define SYM_MACHO_FIELDS_UNSET ((bfd_vma) -1)
-#define SYM_MACHO_FIELDS_NOT_VALIDATED ((bfd_vma) -2)
-
 #endif /* _BFD_MACH_O_H_ */
diff --git a/bfd/oasys.c b/bfd/oasys.c
index ebb12e844e..11d24401fe 100644
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -906,11 +906,9 @@ oasys_write_header (bfd *abfd)
 
   if (length > (size_t) sizeof (r.module_name))
     length = sizeof (r.module_name);
-  else if (length < (size_t) sizeof (r.module_name))
-    (void) memset (r.module_name + length, ' ',
-		   sizeof (r.module_name) - length);
 
   (void) memcpy (r.module_name, abfd->filename, length);
+  (void) memset (r.module_name + length, ' ', sizeof (r.module_name) - length);
 
   r.version_number = OASYS_VERSION_NUMBER;
   r.rev_number = OASYS_REV_NUMBER;
diff --git a/bfd/pef.c b/bfd/pef.c
index e73f2fc0b1..d4ad33ad37 100644
--- a/bfd/pef.c
+++ b/bfd/pef.c
@@ -19,10 +19,6 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-/* PEF (Preferred Executable Format) is the binary file format for late
-   classic Mac OS versions (before Darwin).  It is supported by both m68k
-   and PowerPc.  It is also called CFM (Code Fragment Manager).  */
-
 #include "sysdep.h"
 #include "safe-ctype.h"
 #include "pef.h"
diff --git a/bfd/plugin.c b/bfd/plugin.c
index 0a29e378d5..064e273128 100644
--- a/bfd/plugin.c
+++ b/bfd/plugin.c
@@ -25,13 +25,7 @@
 #if BFD_SUPPORTS_PLUGINS
 
 #include <assert.h>
-#ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
-#elif defined (HAVE_WINDOWS_H)
-#include <windows.h>
-#else
-#error Unknown how to handle dynamic-load-libraries.
-#endif
 #include <stdarg.h>
 #include "plugin-api.h"
 #include "sysdep.h"
@@ -40,37 +34,6 @@
 #include "libiberty.h"
 #include <dirent.h>
 
-#if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)
-
-#define RTLD_NOW 0      /* Dummy value.  */
-
-static void *
-dlopen (const char *file, int mode ATTRIBUTE_UNUSED)
-{
-  return LoadLibrary (file);
-}
-
-static void *
-dlsym (void *handle, const char *name)
-{
-  return GetProcAddress (handle, name);
-}
-
-static int ATTRIBUTE_UNUSED
-dlclose (void *handle)
-{
-  FreeLibrary (handle);
-  return 0;
-}
-
-static const char *
-dlerror (void)
-{
-  return "Unable to load DLL.";
-}
-
-#endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)  */
-
 #define bfd_plugin_close_and_cleanup                  _bfd_generic_close_and_cleanup
 #define bfd_plugin_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
 #define bfd_plugin_new_section_hook                   _bfd_generic_new_section_hook
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index ccdb207d3a..a30fa3caea 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -73,7 +73,6 @@ cpu-crx.c
 cpu-d10v.c
 cpu-d30v.c
 cpu-dlx.c
-cpu-epiphany.c
 cpu-fr30.c
 cpu-frv.c
 cpu-h8300.c
@@ -86,7 +85,6 @@ cpu-i960.c
 cpu-ia64.c
 cpu-ip2k.c
 cpu-iq2000.c
-cpu-k1om.c
 cpu-l1om.c
 cpu-lm32.c
 cpu-m10200.c
@@ -112,7 +110,6 @@ cpu-pdp11.c
 cpu-pj.c
 cpu-plugin.c
 cpu-powerpc.c
-cpu-rl78.c
 cpu-rs6000.c
 cpu-rx.c
 cpu-s390.c
@@ -164,7 +161,6 @@ elf32-crx.c
 elf32-d10v.c
 elf32-d30v.c
 elf32-dlx.c
-elf32-epiphany.c
 elf32-fr30.c
 elf32-frv.c
 elf32-gen.c
@@ -196,7 +192,6 @@ elf32-openrisc.c
 elf32-or32.c
 elf32-pj.c
 elf32-ppc.c
-elf32-rl78.c
 elf32-rx.c
 elf32-s390.c
 elf32-score.c
diff --git a/bfd/po/bfd.pot b/bfd/po/bfd.pot
index b7d5a1eca6..38ce82fb1a 100644
--- a/bfd/po/bfd.pot
+++ b/bfd/po/bfd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-10-25 11:58+0100\n"
+"POT-Creation-Date: 2011-06-02 14:25+0100\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"
@@ -45,28 +45,28 @@ msgid ""
 "%s: can not represent section for symbol `%s' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1579 vms-alpha.c:7671
+#: aoutx.h:1579 vms-alpha.c:7668
 msgid "*unknown*"
 msgstr ""
 
-#: aoutx.h:4018 aoutx.h:4344
+#: aoutx.h:4017 aoutx.h:4343
 msgid "%P: %B: unexpected relocation type\n"
 msgstr ""
 
-#: aoutx.h:5375
+#: aoutx.h:5374
 #, c-format
 msgid "%s: relocatable link from %s to %s not supported"
 msgstr ""
 
-#: archive.c:2203
+#: archive.c:2194
 msgid "Warning: writing archive was slow: rewriting timestamp\n"
 msgstr ""
 
-#: archive.c:2491
+#: archive.c:2482
 msgid "Reading archive file mod timestamp"
 msgstr ""
 
-#: archive.c:2515
+#: archive.c:2506
 msgid "Writing updated armap timestamp"
 msgstr ""
 
@@ -189,13 +189,13 @@ msgstr ""
 msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
 msgstr ""
 
-#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1654 elf32-frv.c:5734
-#: elfxx-sparc.c:2802 reloc.c:6115 reloc16.c:162 elf32-ia64.c:360
+#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731
+#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360
 #: elf64-ia64.c:360
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr ""
 
-#: cache.c:227
+#: cache.c:226
 msgid "reopening %B: %s\n"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
 msgstr ""
 
-#: coff-alpha.c:1575 elf32-m32r.c:2484 elf64-alpha.c:4074 elf64-alpha.c:4224
-#: elf32-ia64.c:3839 elf64-ia64.c:3839
+#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228
+#: elf32-ia64.c:3845 elf64-ia64.c:3845
 msgid "%B: unknown relocation type %d"
 msgstr ""
 
@@ -240,7 +240,7 @@ msgstr ""
 msgid "%B: unable to find ARM glue '%s' for `%s'"
 msgstr ""
 
-#: coff-arm.c:1369 elf32-arm.c:7023
+#: coff-arm.c:1369 elf32-arm.c:6980
 #, c-format
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
@@ -268,14 +268,14 @@ msgstr ""
 msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
 msgstr ""
 
-#: coff-arm.c:2226 elf32-arm.c:15621
+#: coff-arm.c:2226 elf32-arm.c:15580
 #, c-format
 msgid ""
 "error: %B passes floats in float registers, whereas %B passes them in "
 "integer registers"
 msgstr ""
 
-#: coff-arm.c:2229 elf32-arm.c:15625
+#: coff-arm.c:2229 elf32-arm.c:15584
 #, c-format
 msgid ""
 "error: %B passes floats in integer registers, whereas %B passes them in "
@@ -296,12 +296,12 @@ msgid ""
 "position independent"
 msgstr ""
 
-#: coff-arm.c:2274 elf32-arm.c:15690
+#: coff-arm.c:2274 elf32-arm.c:15649
 #, c-format
 msgid "Warning: %B supports interworking, whereas %B does not"
 msgstr ""
 
-#: coff-arm.c:2277 elf32-arm.c:15696
+#: coff-arm.c:2277 elf32-arm.c:15655
 #, c-format
 msgid "Warning: %B does not support interworking, whereas %B does"
 msgstr ""
@@ -311,7 +311,7 @@ msgstr ""
 msgid "private flags = %x:"
 msgstr ""
 
-#: coff-arm.c:2309 elf32-arm.c:11806
+#: coff-arm.c:2309 elf32-arm.c:11752
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr ""
@@ -321,7 +321,7 @@ msgstr ""
 msgid " [floats passed in integer registers]"
 msgstr ""
 
-#: coff-arm.c:2314 elf32-arm.c:11809
+#: coff-arm.c:2314 elf32-arm.c:11755
 #, c-format
 msgid " [position independent]"
 msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
 msgid " [interworking not supported]"
 msgstr ""
 
-#: coff-arm.c:2370 elf32-arm.c:10841
+#: coff-arm.c:2370 elf32-arm.c:10787
 #, c-format
 msgid ""
 "Warning: Not setting interworking flag of %B since it has already been "
 "specified as non-interworking"
 msgstr ""
 
-#: coff-arm.c:2374 elf32-arm.c:10845
+#: coff-arm.c:2374 elf32-arm.c:10791
 #, c-format
 msgid "Warning: Clearing the interworking flag of %B due to outside request"
 msgstr ""
@@ -368,20 +368,20 @@ msgstr ""
 msgid "relocation `%s' not yet implemented"
 msgstr ""
 
-#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5198
+#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192
 msgid "%B: warning: illegal symbol index %ld in relocs"
 msgstr ""
 
-#: coff-i960.c:144 coff-i960.c:507
+#: coff-i960.c:143 coff-i960.c:506
 msgid "uncertain calling convention for non-COFF symbol"
 msgstr ""
 
-#: coff-m68k.c:506 elf32-bfin.c:5690 elf32-cr16.c:2897 elf32-m68k.c:4677
+#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677
 msgid "unsupported reloc type"
 msgstr ""
 
-#: coff-mips.c:688 elf32-mips.c:1516 elf32-score.c:431 elf32-score7.c:330
-#: elf64-mips.c:2618 elfn32-mips.c:2431
+#: coff-mips.c:688 elf32-mips.c:1014 elf32-score.c:430 elf32-score7.c:330
+#: elf64-mips.c:2019 elfn32-mips.c:1832
 msgid "GP relative relocation when _gp not defined"
 msgstr ""
 
@@ -389,17 +389,17 @@ msgstr ""
 msgid "Unrecognized reloc"
 msgstr ""
 
-#: coff-rs6000.c:2720
+#: coff-rs6000.c:2676
 #, c-format
 msgid "%s: unsupported relocation type 0x%02x"
 msgstr ""
 
-#: coff-rs6000.c:2805
+#: coff-rs6000.c:2761
 #, c-format
 msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"
 msgstr ""
 
-#: coff-rs6000.c:3556 coff64-rs6000.c:2111
+#: coff-rs6000.c:3512 coff64-rs6000.c:2111
 msgid "%B: symbol `%s' has unrecognized smclas %d"
 msgstr ""
 
@@ -423,80 +423,76 @@ msgstr ""
 msgid "ignoring reloc %s\n"
 msgstr ""
 
-#: coffcode.h:997
+#: coffcode.h:991
 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr ""
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1221
+#: coffcode.h:1215
 msgid ""
 "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
 msgstr ""
 
-#: coffcode.h:1288
+#: coffcode.h:1282
 msgid "%B (%s): Section flag %s (0x%x) ignored"
 msgstr ""
 
-#: coffcode.h:2430
+#: coffcode.h:2424
 #, c-format
 msgid "Unrecognized TI COFF target id '0x%x'"
 msgstr ""
 
-#: coffcode.h:2744
+#: coffcode.h:2738
 msgid "%B: reloc against a non-existant symbol index: %ld"
 msgstr ""
 
-#: coffcode.h:3302
+#: coffcode.h:3296
 msgid "%B: too many sections (%d)"
 msgstr ""
 
-#: coffcode.h:3718
+#: coffcode.h:3712
 msgid "%B: section %s: string table overflow at offset %ld"
 msgstr ""
 
-#: coffcode.h:4523
+#: coffcode.h:4517
 msgid "%B: warning: line number table read failed"
 msgstr ""
 
-#: coffcode.h:4553
+#: coffcode.h:4547
 msgid "%B: warning: illegal symbol index %ld in line numbers"
 msgstr ""
 
-#: coffcode.h:4567
+#: coffcode.h:4561
 msgid "%B: warning: duplicate line number information for `%s'"
 msgstr ""
 
-#: coffcode.h:4967
+#: coffcode.h:4961
 msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
 msgstr ""
 
-#: coffcode.h:5093
+#: coffcode.h:5087
 msgid "warning: %B: local symbol `%s' has no section"
 msgstr ""
 
-#: coffcode.h:5237
+#: coffcode.h:5231
 msgid "%B: illegal relocation type %d at address 0x%lx"
 msgstr ""
 
-#: coffgen.c:1595
+#: coffgen.c:1578
 msgid "%B: bad string table size %lu"
 msgstr ""
 
-#: coffgen.c:2500 elflink.c:12689 linker.c:3122
-msgid "%F%P: already_linked_table: %E\n"
-msgstr ""
-
-#: cofflink.c:533 elflink.c:4323
+#: cofflink.c:533 elflink.c:4353
 msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
 msgstr ""
 
-#: cofflink.c:2329
+#: cofflink.c:2330
 msgid "%B: relocs in section `%A', but it has no contents"
 msgstr ""
 
-#: cofflink.c:2391 elflink.c:9545
+#: cofflink.c:2392 elflink.c:9554
 msgid ""
 "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' "
 "of %B\n"
@@ -521,117 +517,117 @@ msgstr ""
 msgid "warning: unable to update contents of %s section in %s"
 msgstr ""
 
-#: dwarf2.c:496
+#: dwarf2.c:490
 #, c-format
 msgid "Dwarf Error: Can't find %s section."
 msgstr ""
 
-#: dwarf2.c:525
+#: dwarf2.c:518
 #, c-format
 msgid "Dwarf Error: Offset (%lu) greater than or equal to %s size (%lu)."
 msgstr ""
 
-#: dwarf2.c:949
+#: dwarf2.c:940
 #, c-format
 msgid "Dwarf Error: Invalid or unhandled FORM value: %u."
 msgstr ""
 
-#: dwarf2.c:1200
+#: dwarf2.c:1191
 msgid "Dwarf Error: mangled line number section (bad file number)."
 msgstr ""
 
-#: dwarf2.c:1453
+#: dwarf2.c:1443
 #, c-format
 msgid "Dwarf Error: Unhandled .debug_line version %d."
 msgstr ""
 
-#: dwarf2.c:1475
+#: dwarf2.c:1465
 msgid "Dwarf Error: Invalid maximum operations per instruction."
 msgstr ""
 
-#: dwarf2.c:1662
+#: dwarf2.c:1652
 msgid "Dwarf Error: mangled line number section."
 msgstr ""
 
-#: dwarf2.c:1989 dwarf2.c:2109 dwarf2.c:2394
+#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383
 #, c-format
 msgid "Dwarf Error: Could not find abbrev number %u."
 msgstr ""
 
-#: dwarf2.c:2355
+#: dwarf2.c:2344
 #, c-format
 msgid ""
 "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 "
 "and 4 information."
 msgstr ""
 
-#: dwarf2.c:2362
+#: dwarf2.c:2351
 #, c-format
 msgid ""
 "Dwarf Error: found address size '%u', this reader can not handle sizes "
 "greater than '%u'."
 msgstr ""
 
-#: dwarf2.c:2385
+#: dwarf2.c:2374
 #, c-format
 msgid "Dwarf Error: Bad abbrev number: %u."
 msgstr ""
 
-#: ecoff.c:1239
+#: ecoff.c:1237
 #, c-format
 msgid "Unknown basic type %d"
 msgstr ""
 
-#: ecoff.c:1496
+#: ecoff.c:1494
 #, c-format
 msgid ""
 "\n"
 "      End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1503 ecoff.c:1506
+#: ecoff.c:1501 ecoff.c:1504
 #, c-format
 msgid ""
 "\n"
 "      First symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1518
+#: ecoff.c:1516
 #, c-format
 msgid ""
 "\n"
 "      End+1 symbol: %-7ld   Type:  %s"
 msgstr ""
 
-#: ecoff.c:1525
+#: ecoff.c:1523
 #, c-format
 msgid ""
 "\n"
 "      Local symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1533
+#: ecoff.c:1531
 #, c-format
 msgid ""
 "\n"
 "      struct; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1538
+#: ecoff.c:1536
 #, c-format
 msgid ""
 "\n"
 "      union; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1543
+#: ecoff.c:1541
 #, c-format
 msgid ""
 "\n"
 "      enum; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1549
+#: ecoff.c:1547
 #, c-format
 msgid ""
 "\n"
@@ -648,16 +644,16 @@ msgstr ""
 msgid "error: %B: Object tag '%d, %s' is incompatible with tag '%d, %s'"
 msgstr ""
 
-#: elf-eh-frame.c:917
+#: elf-eh-frame.c:913
 msgid "%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"
 msgstr ""
 
-#: elf-eh-frame.c:1189
+#: elf-eh-frame.c:1165
 msgid ""
 "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
 msgstr ""
 
-#: elf-eh-frame.c:1605
+#: elf-eh-frame.c:1583
 msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
 msgstr ""
 
@@ -668,73 +664,74 @@ msgid ""
 "pie\n"
 msgstr ""
 
-#: elf-m10200.c:450 elf-m10300.c:1563 elf32-avr.c:1221 elf32-bfin.c:3213
-#: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2081 elf32-crx.c:922
-#: elf32-d10v.c:509 elf32-epiphany.c:556 elf32-fr30.c:609 elf32-frv.c:4105
-#: elf32-h8300.c:509 elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684
-#: elf32-lm32.c:1168 elf32-m32c.c:553 elf32-m32r.c:3106 elf32-m68hc1x.c:1138
-#: elf32-mep.c:535 elf32-microblaze.c:1231 elf32-moxie.c:282
-#: elf32-msp430.c:486 elf32-mt.c:395 elf32-openrisc.c:404 elf32-score.c:2729
-#: elf32-score7.c:2537 elf32-spu.c:5044 elf32-tilepro.c:3214 elf32-v850.c:2143
-#: elf32-xstormy16.c:935 elf64-mmix.c:1590 elfxx-tilegx.c:3577
+#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209
+#: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922
+#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509
+#: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168
+#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535
+#: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395
+#: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540
+#: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522
 msgid "internal error: out of range error"
 msgstr ""
 
-#: elf-m10200.c:454 elf-m10300.c:1567 elf32-avr.c:1225 elf32-bfin.c:3217
-#: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2085 elf32-crx.c:926
-#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4109 elf32-h8300.c:513
+#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213
+#: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926
+#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513
 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557
-#: elf32-m32r.c:3110 elf32-m68hc1x.c:1142 elf32-mep.c:539
+#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539
 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490
-#: elf32-openrisc.c:408 elf32-score.c:2733 elf32-score7.c:2541
-#: elf32-spu.c:5048 elf32-tilepro.c:3218 elf32-v850.c:2147
-#: elf32-xstormy16.c:939 elf64-mmix.c:1594 elfxx-mips.c:9465
-#: elfxx-tilegx.c:3581
+#: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544
+#: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526
+#: elfxx-mips.c:9193
 msgid "internal error: unsupported relocation error"
 msgstr ""
 
 #: elf-m10200.c:458 elf32-cr16.c:1490 elf32-cr16c.c:788 elf32-crx.c:930
-#: elf32-d10v.c:517 elf32-h8300.c:517 elf32-lm32.c:1176 elf32-m32r.c:3114
-#: elf32-m68hc1x.c:1146 elf32-microblaze.c:1239 elf32-score.c:2737
-#: elf32-score7.c:2545 elf32-spu.c:5052
+#: elf32-d10v.c:517 elf32-h8300.c:517 elf32-lm32.c:1176 elf32-m32r.c:3119
+#: elf32-m68hc1x.c:1146 elf32-microblaze.c:1239 elf32-score.c:2739
+#: elf32-score7.c:2548 elf32-spu.c:5050
 msgid "internal error: dangerous error"
 msgstr ""
 
-#: elf-m10200.c:462 elf-m10300.c:1580 elf32-avr.c:1233 elf32-bfin.c:3225
-#: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2093 elf32-crx.c:934
-#: elf32-d10v.c:521 elf32-epiphany.c:571 elf32-fr30.c:621 elf32-frv.c:4117
-#: elf32-h8300.c:521 elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696
-#: elf32-lm32.c:1180 elf32-m32c.c:565 elf32-m32r.c:3118 elf32-m68hc1x.c:1150
-#: elf32-mep.c:547 elf32-microblaze.c:1243 elf32-moxie.c:294
-#: elf32-msp430.c:498 elf32-mt.c:403 elf32-openrisc.c:416 elf32-score.c:2746
-#: elf32-score7.c:2549 elf32-spu.c:5056 elf32-tilepro.c:3226 elf32-v850.c:2167
-#: elf32-xstormy16.c:947 elf64-mmix.c:1602 elfxx-tilegx.c:3589
+#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221
+#: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934
+#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521
+#: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180
+#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547
+#: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403
+#: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552
+#: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534
 msgid "internal error: unknown error"
 msgstr ""
 
-#: elf-m10300.c:1507 elf32-arm.c:10419 elf32-i386.c:4264 elf32-m32r.c:2599
-#: elf32-m68k.c:4156 elf32-s390.c:3003 elf32-sh.c:4218 elf32-tilepro.c:3117
-#: elf32-xtensa.c:3066 elf64-s390.c:2978 elf64-sh64.c:1640 elf64-x86-64.c:4110
-#: elfxx-sparc.c:3835 elfxx-tilegx.c:3500
+#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604
+#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067
+#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807
 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"
 msgstr ""
 
-#: elf-m10300.c:1572
+#: elf-m10300.c:1580
 msgid ""
 "error: inappropriate relocation type for shared library (did you forget -"
 "fpic?)"
 msgstr ""
 
-#: elf-m10300.c:1575
+#: elf-m10300.c:1583
+msgid ""
+"%B: error: taking the address of protected function '%s' cannot be done when "
+"making a shared library"
+msgstr ""
+
+#: elf-m10300.c:1586
 msgid "internal error: suspicious relocation type used in shared library"
 msgstr ""
 
-#: elf-m10300.c:4372 elf32-arm.c:12800 elf32-cr16.c:2451 elf32-cris.c:3057
-#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2182 elf32-lm32.c:1868
-#: elf32-m32r.c:1927 elf32-m68k.c:3253 elf32-s390.c:1652 elf32-sh.c:2931
-#: elf32-tic6x.c:2162 elf32-tilepro.c:1940 elf32-vax.c:1041 elf64-s390.c:1635
-#: elf64-sh64.c:3381 elf64-x86-64.c:2176 elfxx-sparc.c:2119
-#: elfxx-tilegx.c:2261
+#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044
+#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868
+#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931
+#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377
+#: elf64-x86-64.c:1985 elfxx-sparc.c:2104
 #, c-format
 msgid "dynamic variable `%s' is zero size"
 msgstr ""
@@ -759,7 +756,7 @@ msgstr ""
 msgid "%B: no group info for section %A"
 msgstr ""
 
-#: elf.c:737 elf.c:3121 elflink.c:10135
+#: elf.c:737 elf.c:3121 elflink.c:10144
 msgid "%B: warning: sh_link not set for section `%A'"
 msgstr ""
 
@@ -860,423 +857,421 @@ msgstr ""
 msgid "%B: section %A lma %#lx adjusted to %#lx"
 msgstr ""
 
-#: elf.c:4776
+#: elf.c:4774
 msgid "%B: section `%A' can't be allocated in segment %d"
 msgstr ""
 
-#: elf.c:4824
+#: elf.c:4822
 msgid "%B: warning: allocated section `%s' not in segment"
 msgstr ""
 
-#: elf.c:5324
+#: elf.c:5322
 msgid "%B: symbol `%s' required but not present"
 msgstr ""
 
-#: elf.c:5662
+#: elf.c:5660
 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n"
 msgstr ""
 
-#: elf.c:6692
+#: elf.c:6688
 #, c-format
 msgid ""
 "Unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr ""
 
-#: elf.c:7692
+#: elf.c:7684
 msgid "%B: unsupported relocation type %s"
 msgstr ""
 
-#: elf32-arm.c:3617
+#: elf32-arm.c:3590
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: Thumb call to ARM"
 msgstr ""
 
-#: elf32-arm.c:3664
+#: elf32-arm.c:3637
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: ARM call to Thumb"
 msgstr ""
 
-#: elf32-arm.c:3878 elf32-arm.c:5315
+#: elf32-arm.c:3849 elf32-arm.c:5286
 #, c-format
 msgid "%s: cannot create stub entry %s"
 msgstr ""
 
-#: elf32-arm.c:5431
+#: elf32-arm.c:5402
 #, c-format
 msgid "unable to find THUMB glue '%s' for '%s'"
 msgstr ""
 
-#: elf32-arm.c:5467
+#: elf32-arm.c:5438
 #, c-format
 msgid "unable to find ARM glue '%s' for '%s'"
 msgstr ""
 
-#: elf32-arm.c:6005
+#: elf32-arm.c:5964
 msgid "%B: BE8 images only valid in big-endian mode."
 msgstr ""
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:6235
+#: elf32-arm.c:6194
 msgid ""
 "%B: warning: selected VFP11 erratum workaround is not necessary for target "
 "architecture"
 msgstr ""
 
-#: elf32-arm.c:6779 elf32-arm.c:6799
+#: elf32-arm.c:6738 elf32-arm.c:6758
 msgid "%B: unable to find VFP11 veneer `%s'"
 msgstr ""
 
-#: elf32-arm.c:6848
+#: elf32-arm.c:6806
 #, c-format
 msgid "Invalid TARGET2 relocation type '%s'."
 msgstr ""
 
-#: elf32-arm.c:6933
+#: elf32-arm.c:6890
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: thumb call to arm"
 msgstr ""
 
-#: elf32-arm.c:7717
+#: elf32-arm.c:7674
 msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"
 msgstr ""
 
-#: elf32-arm.c:7756
+#: elf32-arm.c:7713
 msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"
 msgstr ""
 
-#: elf32-arm.c:8209
+#: elf32-arm.c:8166
 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'."
 msgstr ""
 
-#: elf32-arm.c:8622
+#: elf32-arm.c:8575
 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
 msgstr ""
 
-#: elf32-arm.c:9460
+#: elf32-arm.c:9408
 msgid ""
 "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"
 msgstr ""
 
-#: elf32-arm.c:9483
+#: elf32-arm.c:9431
 msgid ""
 "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"
 msgstr ""
 
-#: elf32-arm.c:9512
+#: elf32-arm.c:9460
 msgid "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"
 msgstr ""
 
-#: elf32-arm.c:9727
+#: elf32-arm.c:9675
 msgid ""
 "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group "
 "relocations"
 msgstr ""
 
-#: elf32-arm.c:9767 elf32-arm.c:9854 elf32-arm.c:9937 elf32-arm.c:10022
+#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970
 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"
 msgstr ""
 
-#: elf32-arm.c:10261 elf32-sh.c:4103 elf64-sh64.c:1544
+#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544
 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section"
 msgstr ""
 
-#: elf32-arm.c:10372 elf32-m68k.c:4191 elf32-xtensa.c:2802
+#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805
 msgid "%B(%A+0x%lx): %s used with TLS symbol %s"
 msgstr ""
 
-#: elf32-arm.c:10373 elf32-m68k.c:4192 elf32-xtensa.c:2803
+#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806
 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s"
 msgstr ""
 
-#: elf32-arm.c:10453 elf32-tic6x.c:2753
+#: elf32-arm.c:10399 elf32-tic6x.c:2751
 msgid "out of range"
 msgstr ""
 
-#: elf32-arm.c:10457 elf32-tic6x.c:2757
+#: elf32-arm.c:10403 elf32-tic6x.c:2755
 msgid "unsupported relocation"
 msgstr ""
 
-#: elf32-arm.c:10465 elf32-tic6x.c:2765
+#: elf32-arm.c:10411 elf32-tic6x.c:2763
 msgid "unknown error"
 msgstr ""
 
-#: elf32-arm.c:10890
+#: elf32-arm.c:10836
 msgid ""
 "Warning: Clearing the interworking flag of %B because non-interworking code "
 "in %B has been linked with it"
 msgstr ""
 
-#: elf32-arm.c:10984
+#: elf32-arm.c:10930
 msgid "%B: Unknown mandatory EABI object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:10992
+#: elf32-arm.c:10938
 msgid "Warning: %B: Unknown EABI object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:11173
+#: elf32-arm.c:11119
 msgid "error: %B: Unknown CPU architecture"
 msgstr ""
 
-#: elf32-arm.c:11211
+#: elf32-arm.c:11157
 msgid "error: %B: Conflicting CPU architectures %d/%d"
 msgstr ""
 
-#: elf32-arm.c:11260
+#: elf32-arm.c:11206
 msgid ""
 "Error: %B has both the current and legacy Tag_MPextension_use attributes"
 msgstr ""
 
-#: elf32-arm.c:11285
+#: elf32-arm.c:11231
 msgid "error: %B uses VFP register arguments, %B does not"
 msgstr ""
 
-#: elf32-arm.c:11430
+#: elf32-arm.c:11376
 msgid "error: %B: unable to merge virtualization attributes with %B"
 msgstr ""
 
-#: elf32-arm.c:11456
+#: elf32-arm.c:11402
 msgid "error: %B: Conflicting architecture profiles %c/%c"
 msgstr ""
 
-#: elf32-arm.c:11557
+#: elf32-arm.c:11503
 msgid "Warning: %B: Conflicting platform configuration"
 msgstr ""
 
-#: elf32-arm.c:11566
+#: elf32-arm.c:11512
 msgid "error: %B: Conflicting use of R9"
 msgstr ""
 
-#: elf32-arm.c:11578
+#: elf32-arm.c:11524
 msgid "error: %B: SB relative addressing conflicts with use of R9"
 msgstr ""
 
-#: elf32-arm.c:11591
+#: elf32-arm.c:11537
 msgid ""
 "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; "
 "use of wchar_t values across objects may fail"
 msgstr ""
 
-#: elf32-arm.c:11622
+#: elf32-arm.c:11568
 msgid ""
 "warning: %B uses %s enums yet the output is to use %s enums; use of enum "
 "values across objects may fail"
 msgstr ""
 
-#: elf32-arm.c:11634
+#: elf32-arm.c:11580
 msgid "error: %B uses iWMMXt register arguments, %B does not"
 msgstr ""
 
-#: elf32-arm.c:11651
+#: elf32-arm.c:11597
 msgid "error: fp16 format mismatch between %B and %B"
 msgstr ""
 
-#: elf32-arm.c:11675
+#: elf32-arm.c:11621
 msgid "DIV usage mismatch between %B and %B"
 msgstr ""
 
-#: elf32-arm.c:11694
+#: elf32-arm.c:11640
 msgid "%B has has both the current and legacy Tag_MPextension_use attributes"
 msgstr ""
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
-#: elf32-arm.c:11782 elf32-bfin.c:5079 elf32-cris.c:4169 elf32-m68hc1x.c:1282
-#: elf32-m68k.c:1236 elf32-score.c:3994 elf32-score7.c:3800 elf32-vax.c:529
-#: elfxx-mips.c:14103
+#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282
+#: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528
+#: elfxx-mips.c:12857
 #, c-format
 msgid "private flags = %lx:"
 msgstr ""
 
-#: elf32-arm.c:11791
+#: elf32-arm.c:11737
 #, c-format
 msgid " [interworking enabled]"
 msgstr ""
 
-#: elf32-arm.c:11799
+#: elf32-arm.c:11745
 #, c-format
 msgid " [VFP float format]"
 msgstr ""
 
-#: elf32-arm.c:11801
+#: elf32-arm.c:11747
 #, c-format
 msgid " [Maverick float format]"
 msgstr ""
 
-#: elf32-arm.c:11803
+#: elf32-arm.c:11749
 #, c-format
 msgid " [FPA float format]"
 msgstr ""
 
-#: elf32-arm.c:11812
+#: elf32-arm.c:11758
 #, c-format
 msgid " [new ABI]"
 msgstr ""
 
-#: elf32-arm.c:11815
+#: elf32-arm.c:11761
 #, c-format
 msgid " [old ABI]"
 msgstr ""
 
-#: elf32-arm.c:11818
+#: elf32-arm.c:11764
 #, c-format
 msgid " [software FP]"
 msgstr ""
 
-#: elf32-arm.c:11827
+#: elf32-arm.c:11773
 #, c-format
 msgid " [Version1 EABI]"
 msgstr ""
 
-#: elf32-arm.c:11830 elf32-arm.c:11841
+#: elf32-arm.c:11776 elf32-arm.c:11787
 #, c-format
 msgid " [sorted symbol table]"
 msgstr ""
 
-#: elf32-arm.c:11832 elf32-arm.c:11843
+#: elf32-arm.c:11778 elf32-arm.c:11789
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr ""
 
-#: elf32-arm.c:11838
+#: elf32-arm.c:11784
 #, c-format
 msgid " [Version2 EABI]"
 msgstr ""
 
-#: elf32-arm.c:11846
+#: elf32-arm.c:11792
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr ""
 
-#: elf32-arm.c:11849
+#: elf32-arm.c:11795
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr ""
 
-#: elf32-arm.c:11856
+#: elf32-arm.c:11802
 #, c-format
 msgid " [Version3 EABI]"
 msgstr ""
 
-#: elf32-arm.c:11860
+#: elf32-arm.c:11806
 #, c-format
 msgid " [Version4 EABI]"
 msgstr ""
 
-#: elf32-arm.c:11864
+#: elf32-arm.c:11810
 #, c-format
 msgid " [Version5 EABI]"
 msgstr ""
 
-#: elf32-arm.c:11867
+#: elf32-arm.c:11813
 #, c-format
 msgid " [BE8]"
 msgstr ""
 
-#: elf32-arm.c:11870
+#: elf32-arm.c:11816
 #, c-format
 msgid " [LE8]"
 msgstr ""
 
-#: elf32-arm.c:11876
+#: elf32-arm.c:11822
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr ""
 
-#: elf32-arm.c:11883
+#: elf32-arm.c:11829
 #, c-format
 msgid " [relocatable executable]"
 msgstr ""
 
-#: elf32-arm.c:11886
+#: elf32-arm.c:11832
 #, c-format
 msgid " [has entry point]"
 msgstr ""
 
-#: elf32-arm.c:11891
+#: elf32-arm.c:11837
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr ""
 
-#: elf32-arm.c:12189 elf32-i386.c:1461 elf32-s390.c:1000 elf32-tic6x.c:2829
-#: elf32-tilepro.c:1336 elf32-xtensa.c:1009 elf64-s390.c:960
-#: elf64-x86-64.c:1364 elfxx-sparc.c:1371 elfxx-tilegx.c:1586
+#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827
+#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370
 msgid "%B: bad symbol index: %d"
 msgstr ""
 
-#: elf32-arm.c:12337 elf64-x86-64.c:1561 elf64-x86-64.c:1732 elfxx-mips.c:8223
+#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949
 msgid ""
 "%B: relocation %s against `%s' can not be used when making a shared object; "
 "recompile with -fPIC"
 msgstr ""
 
-#: elf32-arm.c:13460
+#: elf32-arm.c:13412
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr ""
 
-#: elf32-arm.c:14837
+#: elf32-arm.c:14795
 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr ""
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:14864
+#: elf32-arm.c:14822
 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr ""
 
-#: elf32-arm.c:14958 elf32-arm.c:14980
+#: elf32-arm.c:14916 elf32-arm.c:14938
 msgid "%B: error: VFP11 veneer out of range"
 msgstr ""
 
-#: elf32-arm.c:15518
+#: elf32-arm.c:15477
 msgid "error: %B is already in final BE8 format"
 msgstr ""
 
-#: elf32-arm.c:15594
+#: elf32-arm.c:15553
 msgid ""
 "error: Source object %B has EABI version %d, but target %B has EABI version "
 "%d"
 msgstr ""
 
-#: elf32-arm.c:15610
+#: elf32-arm.c:15569
 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
 msgstr ""
 
-#: elf32-arm.c:15635
+#: elf32-arm.c:15594
 msgid "error: %B uses VFP instructions, whereas %B does not"
 msgstr ""
 
-#: elf32-arm.c:15639
+#: elf32-arm.c:15598
 msgid "error: %B uses FPA instructions, whereas %B does not"
 msgstr ""
 
-#: elf32-arm.c:15649
+#: elf32-arm.c:15608
 msgid "error: %B uses Maverick instructions, whereas %B does not"
 msgstr ""
 
-#: elf32-arm.c:15653
+#: elf32-arm.c:15612
 msgid "error: %B does not use Maverick instructions, whereas %B does"
 msgstr ""
 
-#: elf32-arm.c:15672
+#: elf32-arm.c:15631
 msgid "error: %B uses software FP, whereas %B uses hardware FP"
 msgstr ""
 
-#: elf32-arm.c:15676
+#: elf32-arm.c:15635
 msgid "error: %B uses hardware FP, whereas %B uses software FP"
 msgstr ""
 
-#: elf32-avr.c:1229 elf32-bfin.c:3221 elf32-cris.c:2089 elf32-epiphany.c:567
-#: elf32-fr30.c:617 elf32-frv.c:4113 elf32-i860.c:1219 elf32-ip2k.c:1479
-#: elf32-iq2000.c:692 elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290
-#: elf32-msp430.c:494 elf32-mt.c:399 elf32-openrisc.c:412 elf32-tilepro.c:3222
-#: elf32-v850.c:2151 elf32-xstormy16.c:943 elf64-mmix.c:1598
-#: elfxx-tilegx.c:3585
+#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617
+#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
+#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494
+#: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949
+#: elf64-mmix.c:1530
 msgid "internal error: dangerous relocation"
 msgstr ""
 
@@ -1288,181 +1283,181 @@ msgstr ""
 msgid "relocation should be even number"
 msgstr ""
 
-#: elf32-bfin.c:1593
+#: elf32-bfin.c:1591
 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'"
 msgstr ""
 
-#: elf32-bfin.c:1626 elf32-i386.c:4307 elf32-m68k.c:4233 elf32-s390.c:3055
-#: elf64-s390.c:3030 elf64-x86-64.c:4151
+#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062
+#: elf64-s390.c:3037 elf64-x86-64.c:3923
 msgid "%B(%A+0x%lx): reloc against `%s': error %d"
 msgstr ""
 
-#: elf32-bfin.c:2725
+#: elf32-bfin.c:2723
 msgid "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:2741
+#: elf32-bfin.c:2737
 msgid "relocation references symbol not defined in the module"
 msgstr ""
 
-#: elf32-bfin.c:2838
+#: elf32-bfin.c:2834
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:2879 elf32-bfin.c:3002
+#: elf32-bfin.c:2875 elf32-bfin.c:2998
 msgid "cannot emit fixups in read-only section"
 msgstr ""
 
-#: elf32-bfin.c:2910 elf32-bfin.c:3040 elf32-lm32.c:1103 elf32-sh.c:5016
+#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr ""
 
-#: elf32-bfin.c:2960
+#: elf32-bfin.c:2956
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:3125
+#: elf32-bfin.c:3121
 msgid "relocations between different segments are not supported"
 msgstr ""
 
-#: elf32-bfin.c:3126
+#: elf32-bfin.c:3122
 msgid "warning: relocation references a different segment"
 msgstr ""
 
-#: elf32-bfin.c:4971
+#: elf32-bfin.c:4967
 msgid "%B: unsupported relocation type %i"
 msgstr ""
 
-#: elf32-bfin.c:5125 elf32-frv.c:6808
+#: elf32-bfin.c:5121 elf32-frv.c:6805
 #, c-format
 msgid "%s: cannot link non-fdpic object file into fdpic executable"
 msgstr ""
 
-#: elf32-bfin.c:5129 elf32-frv.c:6812
+#: elf32-bfin.c:5125 elf32-frv.c:6809
 #, c-format
 msgid "%s: cannot link fdpic object file into non-fdpic executable"
 msgstr ""
 
-#: elf32-bfin.c:5283
+#: elf32-bfin.c:5279
 #, c-format
 msgid "*** check this relocation %s"
 msgstr ""
 
-#: elf32-cris.c:1176
+#: elf32-cris.c:1172
 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1238
+#: elf32-cris.c:1234
 msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1240
+#: elf32-cris.c:1236
 msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1246 elf32-cris.c:1379 elf32-cris.c:1639 elf32-cris.c:1722
-#: elf32-cris.c:1875 elf32-tic6x.c:2662
+#: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718
+#: elf32-cris.c:1871 elf32-tic6x.c:2660
 msgid "[whose name is lost]"
 msgstr ""
 
-#: elf32-cris.c:1365 elf32-tic6x.c:2647
+#: elf32-cris.c:1361 elf32-tic6x.c:2645
 msgid ""
 "%B, section %A: relocation %s with non-zero addend %d against local symbol"
 msgstr ""
 
-#: elf32-cris.c:1373 elf32-cris.c:1716 elf32-cris.c:1869 elf32-tic6x.c:2655
+#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653
 msgid ""
 "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1399
+#: elf32-cris.c:1395
 msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'"
 msgstr ""
 
-#: elf32-cris.c:1415
+#: elf32-cris.c:1411
 msgid "%B, section %A: relocation %s with no GOT created"
 msgstr ""
 
 #. We shouldn't get here for GCC-emitted code.
-#: elf32-cris.c:1630
+#: elf32-cris.c:1626
 msgid ""
 "%B, section %A: relocation %s has an undefined reference to `%s', perhaps a "
 "declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:2002
+#: elf32-cris.c:1998
 msgid ""
 "%B, section %A: relocation %s is not allowed for symbol: `%s' which is "
 "defined outside the program, perhaps a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:2055
+#: elf32-cris.c:2051
 msgid "(too many global variables for -fpic: recompile with -fPIC)"
 msgstr ""
 
-#: elf32-cris.c:2062
+#: elf32-cris.c:2058
 msgid ""
 "(thread-local data too big for -fpic or -msmall-tls: recompile with -fPIC or "
 "-mno-small-tls)"
 msgstr ""
 
-#: elf32-cris.c:3261
+#: elf32-cris.c:3248
 msgid ""
 "%B, section %A:\n"
 "  v10/v32 compatible object %s must not contain a PIC relocation"
 msgstr ""
 
-#: elf32-cris.c:3366
+#: elf32-cris.c:3353
 msgid ""
 "%B, section %A:\n"
 "  relocation %s not valid in a shared object; typically an option mixup, "
 "recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3580
+#: elf32-cris.c:3567
 msgid ""
 "%B, section %A:\n"
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:4002
+#: elf32-cris.c:3992
 msgid ""
 "%B, section `%A', to symbol `%s':\n"
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:4118
+#: elf32-cris.c:4111
 msgid "Unexpected machine number"
 msgstr ""
 
-#: elf32-cris.c:4172
+#: elf32-cris.c:4165
 #, c-format
 msgid " [symbols have a _ prefix]"
 msgstr ""
 
-#: elf32-cris.c:4175
+#: elf32-cris.c:4168
 #, c-format
 msgid " [v10 and v32]"
 msgstr ""
 
-#: elf32-cris.c:4178
+#: elf32-cris.c:4171
 #, c-format
 msgid " [v32]"
 msgstr ""
 
-#: elf32-cris.c:4223
+#: elf32-cris.c:4216
 msgid "%B: uses _-prefixed symbols, but writing file with non-prefixed symbols"
 msgstr ""
 
-#: elf32-cris.c:4224
+#: elf32-cris.c:4217
 msgid "%B: uses non-prefixed symbols, but writing file with _-prefixed symbols"
 msgstr ""
 
-#: elf32-cris.c:4243
+#: elf32-cris.c:4236
 msgid "%B contains CRIS v32 code, incompatible with previous objects"
 msgstr ""
 
-#: elf32-cris.c:4245
+#: elf32-cris.c:4238
 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr ""
 
@@ -1476,11 +1471,6 @@ msgstr ""
 msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
 msgstr ""
 
-#. Only if it's not an unresolved symbol.
-#: elf32-epiphany.c:563 elf32-ip2k.c:1475
-msgid "unsupported relocation between data/insn address spaces"
-msgstr ""
-
 #: elf32-frv.c:1509 elf32-frv.c:1658
 msgid "relocation requires zero addend"
 msgstr ""
@@ -1489,107 +1479,107 @@ msgstr ""
 msgid "%H: relocation to `%s+%v' may have caused the error above\n"
 msgstr ""
 
-#: elf32-frv.c:2905
+#: elf32-frv.c:2902
 msgid "%H: relocation references symbol not defined in the module\n"
 msgstr ""
 
-#: elf32-frv.c:2981
+#: elf32-frv.c:2978
 msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3022
+#: elf32-frv.c:3019
 msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3093
+#: elf32-frv.c:3090
 msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3130
+#: elf32-frv.c:3127
 msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3177
+#: elf32-frv.c:3174
 msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3261
+#: elf32-frv.c:3258
 msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3315
+#: elf32-frv.c:3312
 msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3345
+#: elf32-frv.c:3342
 msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3374
+#: elf32-frv.c:3371
 msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3404
+#: elf32-frv.c:3401
 msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3449
+#: elf32-frv.c:3446
 msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3476
+#: elf32-frv.c:3473
 msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3597
+#: elf32-frv.c:3594
 msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
 msgstr ""
 
-#: elf32-frv.c:3638 elf32-frv.c:3760
+#: elf32-frv.c:3635 elf32-frv.c:3757
 msgid "%H: cannot emit fixups in read-only section\n"
 msgstr ""
 
-#: elf32-frv.c:3669 elf32-frv.c:3803
+#: elf32-frv.c:3666 elf32-frv.c:3800
 msgid "%H: cannot emit dynamic relocations in read-only section\n"
 msgstr ""
 
-#: elf32-frv.c:3718
+#: elf32-frv.c:3715
 msgid ""
 "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
 msgstr ""
 
-#: elf32-frv.c:3974
+#: elf32-frv.c:3971
 msgid "%H: reloc against `%s' references a different segment\n"
 msgstr ""
 
-#: elf32-frv.c:4124
+#: elf32-frv.c:4121
 msgid "%H: reloc against `%s': %s\n"
 msgstr ""
 
-#: elf32-frv.c:6400
+#: elf32-frv.c:6397
 msgid "%B: unsupported relocation type %i\n"
 msgstr ""
 
-#: elf32-frv.c:6722
+#: elf32-frv.c:6719
 #, c-format
 msgid ""
 "%s: compiled with %s and linked with modules that use non-pic relocations"
 msgstr ""
 
-#: elf32-frv.c:6775 elf32-iq2000.c:845 elf32-m32c.c:807
+#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807
 #, c-format
 msgid "%s: compiled with %s and linked with modules compiled with %s"
 msgstr ""
 
-#: elf32-frv.c:6787
+#: elf32-frv.c:6784
 #, c-format
 msgid ""
 "%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x"
 "%lx)"
 msgstr ""
 
-#: elf32-frv.c:6837 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
-#: elf32-rx.c:3001
+#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
+#: elf32-rx.c:2937
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr ""
@@ -1598,7 +1588,7 @@ msgstr ""
 msgid "%B: Relocations in generic ELF (EM: %d)"
 msgstr ""
 
-#: elf32-hppa.c:850 elf32-hppa.c:3598
+#: elf32-hppa.c:850 elf32-hppa.c:3610
 msgid "%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"
 msgstr ""
 
@@ -1608,87 +1598,85 @@ msgid ""
 "with -fPIC"
 msgstr ""
 
-#: elf32-hppa.c:2791
+#: elf32-hppa.c:2803
 msgid "%B: duplicate export stub %s"
 msgstr ""
 
-#: elf32-hppa.c:3437
+#: elf32-hppa.c:3449
 msgid ""
 "%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"
 msgstr ""
 
-#: elf32-hppa.c:4284
+#: elf32-hppa.c:4296
 msgid "%B(%A+0x%lx): cannot handle %s for %s"
 msgstr ""
 
-#: elf32-hppa.c:4603
+#: elf32-hppa.c:4608
 msgid ".got section not immediately after .plt section"
 msgstr ""
 
 #. Unknown relocation.
-#: elf32-i386.c:373 elf32-m68k.c:384 elf32-ppc.c:1676 elf32-s390.c:379
-#: elf32-tic6x.c:2684 elf64-ppc.c:2300 elf64-s390.c:403 elf64-x86-64.c:265
+#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379
+#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243
 msgid "%B: invalid relocation type %d"
 msgstr ""
 
-#: elf32-i386.c:1404 elf64-x86-64.c:1308
+#: elf32-i386.c:1266 elf64-x86-64.c:1116
 msgid ""
 "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed"
 msgstr ""
 
-#: elf32-i386.c:1549 elf32-i386.c:3244 elf64-x86-64.c:1487 elf64-x86-64.c:3125
-#: elfxx-sparc.c:3083
+#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909
+#: elfxx-sparc.c:3077
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
 msgstr ""
 
-#: elf32-i386.c:1711 elf32-s390.c:1182 elf32-sh.c:6362 elf32-tilepro.c:1434
-#: elf32-xtensa.c:1182 elf64-s390.c:1151 elfxx-sparc.c:1548
-#: elfxx-tilegx.c:1701
+#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
+#: elf64-s390.c:1151 elfxx-sparc.c:1547
 msgid "%B: `%s' accessed both as normal and thread local symbol"
 msgstr ""
 
-#: elf32-i386.c:2539 elf64-x86-64.c:2506
+#: elf32-i386.c:2405 elf64-x86-64.c:2320
 msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"
 msgstr ""
 
-#: elf32-i386.c:2629 elf64-x86-64.c:2593
+#: elf32-i386.c:2496 elf64-x86-64.c:2407
 msgid "%P: %B: warning: relocation in readonly section `%A'.\n"
 msgstr ""
 
-#: elf32-i386.c:3086 elf32-tilepro.c:2557 elfxx-tilegx.c:2871
+#: elf32-i386.c:2932
 msgid "%B: unrecognized relocation (0x%x) in section `%A'"
 msgstr ""
 
-#: elf32-i386.c:3494 elf64-x86-64.c:3513
+#: elf32-i386.c:3339 elf64-x86-64.c:3295
 msgid "hidden symbol"
 msgstr ""
 
-#: elf32-i386.c:3497 elf64-x86-64.c:3516
+#: elf32-i386.c:3342 elf64-x86-64.c:3298
 msgid "internal symbol"
 msgstr ""
 
-#: elf32-i386.c:3500 elf64-x86-64.c:3519
+#: elf32-i386.c:3345 elf64-x86-64.c:3301
 msgid "protected symbol"
 msgstr ""
 
-#: elf32-i386.c:3503 elf64-x86-64.c:3522
+#: elf32-i386.c:3348 elf64-x86-64.c:3304
 msgid "symbol"
 msgstr ""
 
-#: elf32-i386.c:3508
+#: elf32-i386.c:3353
 msgid ""
 "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when "
 "making a shared object"
 msgstr ""
 
-#: elf32-i386.c:3518
+#: elf32-i386.c:3363
 msgid ""
 "%B: relocation R_386_GOTOFF against protected function `%s' can not be used "
 "when making a shared object"
 msgstr ""
 
-#: elf32-i386.c:4839 elf32-tilepro.c:3467 elf64-x86-64.c:4609
-#: elfxx-tilegx.c:3847
+#: elf32-i386.c:4660 elf64-x86-64.c:4378
 #, c-format
 msgid "discarded output section: `%A'"
 msgstr ""
@@ -1712,6 +1700,11 @@ msgstr ""
 msgid "ip2k linker: redundant page instruction at 0x%08lx (dest = 0x%08lx)."
 msgstr ""
 
+#. Only if it's not an unresolved symbol.
+#: elf32-ip2k.c:1475
+msgid "unsupported relocation between data/insn address spaces"
+msgstr ""
+
 #: elf32-iq2000.c:858 elf32-m32c.c:819
 #, c-format
 msgid "%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
@@ -1733,30 +1726,30 @@ msgstr ""
 msgid "SDA relocation when _SDA_BASE_ not defined"
 msgstr ""
 
-#: elf32-m32r.c:3043
+#: elf32-m32r.c:3048
 msgid "%B: The target (%s) of an %s relocation is in the wrong section (%A)"
 msgstr ""
 
-#: elf32-m32r.c:3571
+#: elf32-m32r.c:3576
 msgid "%B: Instruction set mismatch with previous modules"
 msgstr ""
 
-#: elf32-m32r.c:3592
+#: elf32-m32r.c:3597
 #, c-format
 msgid "private flags = %lx"
 msgstr ""
 
-#: elf32-m32r.c:3597
+#: elf32-m32r.c:3602
 #, c-format
 msgid ": m32r instructions"
 msgstr ""
 
-#: elf32-m32r.c:3598
+#: elf32-m32r.c:3603
 #, c-format
 msgid ": m32rx instructions"
 msgstr ""
 
-#: elf32-m32r.c:3599
+#: elf32-m32r.c:3604
 #, c-format
 msgid ": m32r2 instructions"
 msgstr ""
@@ -1798,7 +1791,7 @@ msgstr ""
 msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
 msgstr ""
 
-#: elf32-m68hc1x.c:1257 elf32-ppc.c:4227 elf64-sparc.c:706 elfxx-mips.c:13965
+#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719
 msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr ""
 
@@ -1847,19 +1840,19 @@ msgstr ""
 msgid " [memory=flat]"
 msgstr ""
 
-#: elf32-m68k.c:1251 elf32-m68k.c:1252 vms-alpha.c:7314 vms-alpha.c:7329
+#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326
 msgid "unknown"
 msgstr ""
 
-#: elf32-m68k.c:1715
+#: elf32-m68k.c:1714
 msgid "%B: GOT overflow: Number of relocations with 8-bit offset > %d"
 msgstr ""
 
-#: elf32-m68k.c:1721
+#: elf32-m68k.c:1720
 msgid "%B: GOT overflow: Number of relocations with 8- or 16-bit offset > %d"
 msgstr ""
 
-#: elf32-m68k.c:3957
+#: elf32-m68k.c:3959
 msgid "%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted in shared object"
 msgstr ""
 
@@ -1905,8 +1898,7 @@ msgstr ""
 msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
 msgstr ""
 
-#: elf32-microblaze.c:1155 elf32-tilepro.c:2891 elfxx-sparc.c:3457
-#: elfxx-tilegx.c:3230
+#: elf32-microblaze.c:1155 elfxx-sparc.c:3451
 msgid "%B: probably compiled without -fPIC?"
 msgstr ""
 
@@ -1914,235 +1906,224 @@ msgstr ""
 msgid "%B: bad relocation section name `%s'"
 msgstr ""
 
-#: elf32-mips.c:1549 elf64-mips.c:2683 elfn32-mips.c:2487
+#: elf32-mips.c:1045 elf64-mips.c:2084 elfn32-mips.c:1888
 msgid "literal relocation occurs for an external symbol"
 msgstr ""
 
-#: elf32-mips.c:1596 elf32-score.c:570 elf32-score7.c:469 elf64-mips.c:2726
-#: elfn32-mips.c:2528
+#: elf32-mips.c:1085 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:2127
+#: elfn32-mips.c:1929
 msgid "32bits gp relative relocation occurs for an external symbol"
 msgstr ""
 
-#: elf32-ppc.c:1741
+#: elf32-ppc.c:1740
 #, c-format
 msgid "generic linker can't handle %s"
 msgstr ""
 
-#: elf32-ppc.c:2184
+#: elf32-ppc.c:2183
 msgid "corrupt %s section in %B"
 msgstr ""
 
-#: elf32-ppc.c:2203
+#: elf32-ppc.c:2202
 msgid "unable to read in %s section from %B"
 msgstr ""
 
-#: elf32-ppc.c:2244
+#: elf32-ppc.c:2243
 msgid "warning: unable to set size of %s section in %B"
 msgstr ""
 
-#: elf32-ppc.c:2294
+#: elf32-ppc.c:2293
 msgid "failed to allocate space for new APUinfo section."
 msgstr ""
 
-#: elf32-ppc.c:2313
+#: elf32-ppc.c:2312
 msgid "failed to compute new APUinfo section."
 msgstr ""
 
-#: elf32-ppc.c:2316
+#: elf32-ppc.c:2315
 msgid "failed to install new APUinfo section."
 msgstr ""
 
-#: elf32-ppc.c:3356
+#: elf32-ppc.c:3343
 msgid "%B: relocation %s cannot be used when making a shared object"
 msgstr ""
 
 #. It does not make sense to have a procedure linkage
 #. table entry for a local symbol.
-#: elf32-ppc.c:3700
-msgid "%P: %H: %s reloc against local symbol\n"
+#: elf32-ppc.c:3687
+msgid "%H: %s reloc against local symbol\n"
 msgstr ""
 
-#: elf32-ppc.c:4039 elf32-ppc.c:4054 elfxx-mips.c:13651 elfxx-mips.c:13677
-#: elfxx-mips.c:13699 elfxx-mips.c:13725
+#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449
+#: elfxx-mips.c:12471 elfxx-mips.c:12497
 msgid "Warning: %B uses hard float, %B uses soft float"
 msgstr ""
 
-#: elf32-ppc.c:4042 elf32-ppc.c:4046
+#: elf32-ppc.c:4029 elf32-ppc.c:4033
 msgid ""
 "Warning: %B uses double-precision hard float, %B uses single-precision hard "
 "float"
 msgstr ""
 
-#: elf32-ppc.c:4050
+#: elf32-ppc.c:4037
 msgid "Warning: %B uses soft float, %B uses single-precision hard float"
 msgstr ""
 
-#: elf32-ppc.c:4057 elf32-ppc.c:4061 elfxx-mips.c:13631 elfxx-mips.c:13635
+#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407
 msgid "Warning: %B uses unknown floating point ABI %d"
 msgstr ""
 
-#: elf32-ppc.c:4103 elf32-ppc.c:4107
+#: elf32-ppc.c:4090 elf32-ppc.c:4094
 msgid "Warning: %B uses unknown vector ABI %d"
 msgstr ""
 
-#: elf32-ppc.c:4111
+#: elf32-ppc.c:4098
 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\""
 msgstr ""
 
-#: elf32-ppc.c:4128 elf32-ppc.c:4131
+#: elf32-ppc.c:4115 elf32-ppc.c:4118
 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
 msgstr ""
 
-#: elf32-ppc.c:4134 elf32-ppc.c:4138
+#: elf32-ppc.c:4121 elf32-ppc.c:4125
 msgid "Warning: %B uses unknown small structure return convention %d"
 msgstr ""
 
-#: elf32-ppc.c:4192
+#: elf32-ppc.c:4179
 msgid ""
 "%B: compiled with -mrelocatable and linked with modules compiled normally"
 msgstr ""
 
-#: elf32-ppc.c:4200
+#: elf32-ppc.c:4187
 msgid ""
 "%B: compiled normally and linked with modules compiled with -mrelocatable"
 msgstr ""
 
-#: elf32-ppc.c:4309
-msgid "%P: bss-plt forced due to %B\n"
-msgstr ""
-
-#: elf32-ppc.c:4312
-msgid "%P: bss-plt forced by profiling\n"
+#: elf32-ppc.c:4275
+msgid "Using bss-plt due to %B"
 msgstr ""
 
 #. Uh oh, we didn't find the expected call.  We
 #. could just mark this symbol to exclude it
 #. from tls optimization but it's safer to skip
 #. the entire optimization.
-#: elf32-ppc.c:4809 elf64-ppc.c:7858
+#: elf32-ppc.c:4771 elf64-ppc.c:7778
 msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
 msgstr ""
 
-#: elf32-ppc.c:5044 elf64-ppc.c:6528
-msgid "%P: dynamic variable `%s' is zero size\n"
+#: elf32-ppc.c:5006 elf64-ppc.c:6494
+#, c-format
+msgid "dynamic variable `%s' is zero size\n"
 msgstr ""
 
-#: elf32-ppc.c:7263 elf64-ppc.c:12675
-msgid "%P: %B: unknown relocation type %d for symbol %s\n"
+#: elf32-ppc.c:7204 elf64-ppc.c:12431
+msgid "%B: unknown relocation type %d for symbol %s\n"
 msgstr ""
 
-#: elf32-ppc.c:7524
-msgid "%P: %H: non-zero addend on %s reloc against `%s'\n"
+#: elf32-ppc.c:7465
+msgid "%H: non-zero addend on %s reloc against `%s'\n"
 msgstr ""
 
-#: elf32-ppc.c:7720 elf64-ppc.c:13181
-msgid "%P: %H: relocation %s for indirect function %s unsupported\n"
+#: elf32-ppc.c:7661 elf64-ppc.c:12936
+msgid "%H: relocation %s for indirect function %s unsupported\n"
 msgstr ""
 
-#: elf32-ppc.c:7948 elf32-ppc.c:7978 elf32-ppc.c:8025
+#: elf32-ppc.c:7889 elf32-ppc.c:7919 elf32-ppc.c:7966
 msgid ""
-"%P: %B: the target (%s) of a %s relocation is in the wrong output section "
-"(%s)\n"
+"%B: the target (%s) of a %s relocation is in the wrong output section (%s)\n"
 msgstr ""
 
-#: elf32-ppc.c:8097
-msgid "%P: %B: relocation %s is not yet supported for symbol %s\n"
+#: elf32-ppc.c:8038
+msgid "%B: relocation %s is not yet supported for symbol %s\n"
 msgstr ""
 
-#: elf32-ppc.c:8158 elf64-ppc.c:13467
-msgid "%P: %H: unresolvable %s relocation against symbol `%s'\n"
+#: elf32-ppc.c:8097 elf64-ppc.c:13237
+msgid "%H: unresolvable %s relocation against symbol `%s'\n"
 msgstr ""
 
-#: elf32-ppc.c:8205 elf64-ppc.c:13512
-msgid "%P: %H: %s reloc against `%s': error %d\n"
+#: elf32-ppc.c:8144 elf64-ppc.c:13282
+msgid "%H: %s reloc against `%s': error %d\n"
 msgstr ""
 
-#: elf32-ppc.c:8696
-msgid "%P: %s not defined in linker created %s\n"
+#: elf32-ppc.c:8635
+#, c-format
+msgid "%s not defined in linker created %s\n"
 msgstr ""
 
-#: elf32-rx.c:563
+#: elf32-rx.c:553
 msgid "%B:%A: Warning: deprecated Red Hat reloc "
 msgstr ""
 
-#. Check for unsafe relocs in PID mode.  These are any relocs where
-#. an absolute address is being computed.  There are special cases
-#. for relocs against symbols that are known to be referenced in
-#. crt0.o before the PID base address register has been initialised.
-#: elf32-rx.c:581
-msgid "%B(%A): unsafe PID relocation %s at 0x%08lx (against %s in %s)"
-msgstr ""
-
-#: elf32-rx.c:1157
+#: elf32-rx.c:1095
 msgid "Warning: RX_SYM reloc with an unknown symbol"
 msgstr ""
 
-#: elf32-rx.c:1324
+#: elf32-rx.c:1260
 msgid "%B(%A): error: call to undefined function '%s'"
 msgstr ""
 
-#: elf32-rx.c:1338
+#: elf32-rx.c:1274
 msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
 msgstr ""
 
-#: elf32-rx.c:1342
+#: elf32-rx.c:1278
 msgid "%B(%A): internal error: out of range error"
 msgstr ""
 
-#: elf32-rx.c:1346
+#: elf32-rx.c:1282
 msgid "%B(%A): internal error: unsupported relocation error"
 msgstr ""
 
-#: elf32-rx.c:1350
+#: elf32-rx.c:1286
 msgid "%B(%A): internal error: dangerous relocation"
 msgstr ""
 
-#: elf32-rx.c:1354
+#: elf32-rx.c:1290
 msgid "%B(%A): internal error: unknown error"
 msgstr ""
 
-#: elf32-rx.c:3004
+#: elf32-rx.c:2940
 #, c-format
 msgid " [64-bit doubles]"
 msgstr ""
 
-#: elf32-rx.c:3006
+#: elf32-rx.c:2942
 #, c-format
 msgid " [dsp]"
 msgstr ""
 
-#: elf32-s390.c:2200 elf64-s390.c:2187
+#: elf32-s390.c:2209 elf64-s390.c:2196
 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s"
 msgstr ""
 
-#: elf32-score.c:1520 elf32-score7.c:1379 elfxx-mips.c:3435
+#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324
 msgid "not enough GOT space for local GOT entries"
 msgstr ""
 
-#: elf32-score.c:2742
+#: elf32-score.c:2744
 msgid "address not word align"
 msgstr ""
 
-#: elf32-score.c:2827 elf32-score7.c:2631
+#: elf32-score.c:2829 elf32-score7.c:2634
 #, c-format
 msgid "%s: Malformed reloc detected for section %s"
 msgstr ""
 
-#: elf32-score.c:2878 elf32-score7.c:2682
+#: elf32-score.c:2880 elf32-score7.c:2685
 msgid "%B: CALL15 reloc at 0x%lx not against global symbol"
 msgstr ""
 
-#: elf32-score.c:3997 elf32-score7.c:3803
+#: elf32-score.c:3999 elf32-score7.c:3806
 #, c-format
 msgid " [pic]"
 msgstr ""
 
-#: elf32-score.c:4001 elf32-score7.c:3807
+#: elf32-score.c:4003 elf32-score7.c:3810
 #, c-format
 msgid " [fix dep]"
 msgstr ""
 
-#: elf32-score.c:4043 elf32-score7.c:3849
+#: elf32-score.c:4045 elf32-score7.c:3852
 msgid "%B: warning: linking PIC files with non-PIC files"
 msgstr ""
 
@@ -2190,76 +2171,76 @@ msgstr ""
 msgid "%B: 0x%lx: fatal: reloc overflow while relaxing"
 msgstr ""
 
-#: elf32-sh.c:4048 elf64-sh64.c:1514
+#: elf32-sh.c:4057 elf64-sh64.c:1514
 msgid "Unexpected STO_SH5_ISA32 on local symbol is not handled"
 msgstr ""
 
-#: elf32-sh.c:4299
+#: elf32-sh.c:4304
 msgid "%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"
 msgstr ""
 
-#: elf32-sh.c:4332 elf32-sh.c:4347
+#: elf32-sh.c:4337 elf32-sh.c:4352
 msgid "%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"
 msgstr ""
 
-#: elf32-sh.c:4361
+#: elf32-sh.c:4366
 msgid "%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"
 msgstr ""
 
-#: elf32-sh.c:4375
+#: elf32-sh.c:4380
 msgid "%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"
 msgstr ""
 
-#: elf32-sh.c:4519 elf32-sh.c:4989
+#: elf32-sh.c:4524 elf32-sh.c:4994
 msgid "%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"
 msgstr ""
 
-#: elf32-sh.c:5096
+#: elf32-sh.c:5101
 msgid "%B(%A+0x%lx): %s relocation against external symbol \"%s\""
 msgstr ""
 
-#: elf32-sh.c:5569
+#: elf32-sh.c:5574
 #, c-format
 msgid "%X%C: relocation to \"%s\" references a different segment\n"
 msgstr ""
 
-#: elf32-sh.c:5575
+#: elf32-sh.c:5580
 #, c-format
 msgid "%C: warning: relocation to \"%s\" references a different segment\n"
 msgstr ""
 
-#: elf32-sh.c:6353 elf32-sh.c:6436
+#: elf32-sh.c:6358 elf32-sh.c:6441
 msgid "%B: `%s' accessed both as normal and FDPIC symbol"
 msgstr ""
 
-#: elf32-sh.c:6358 elf32-sh.c:6440
+#: elf32-sh.c:6363 elf32-sh.c:6445
 msgid "%B: `%s' accessed both as FDPIC and thread local symbol"
 msgstr ""
 
-#: elf32-sh.c:6388
+#: elf32-sh.c:6393
 msgid "%B: Function descriptor relocation with non-zero addend"
 msgstr ""
 
-#: elf32-sh.c:6624 elf64-alpha.c:4652
+#: elf32-sh.c:6629 elf64-alpha.c:4648
 msgid "%B: TLS local exec code cannot be linked into shared objects"
 msgstr ""
 
-#: elf32-sh64.c:223 elf64-sh64.c:2318
+#: elf32-sh64.c:223 elf64-sh64.c:2314
 #, c-format
 msgid "%s: compiled as 32-bit object and %s is 64-bit"
 msgstr ""
 
-#: elf32-sh64.c:226 elf64-sh64.c:2321
+#: elf32-sh64.c:226 elf64-sh64.c:2317
 #, c-format
 msgid "%s: compiled as 64-bit object and %s is 32-bit"
 msgstr ""
 
-#: elf32-sh64.c:228 elf64-sh64.c:2323
+#: elf32-sh64.c:228 elf64-sh64.c:2319
 #, c-format
 msgid "%s: object size does not match that of target %s"
 msgstr ""
 
-#: elf32-sh64.c:451 elf64-sh64.c:2837
+#: elf32-sh64.c:451 elf64-sh64.c:2833
 #, c-format
 msgid "%s: encountered datalabel symbol in input"
 msgstr ""
@@ -2291,11 +2272,11 @@ msgstr ""
 msgid "%s: could not write out sorted .cranges entries"
 msgstr ""
 
-#: elf32-sparc.c:90
+#: elf32-sparc.c:89
 msgid "%B: compiled for a 64 bit system and target is 32 bit"
 msgstr ""
 
-#: elf32-sparc.c:103
+#: elf32-sparc.c:102
 msgid "%B: linking little endian files with big endian files"
 msgstr ""
 
@@ -2427,7 +2408,7 @@ msgstr ""
 msgid "fatal error while creating .fixup"
 msgstr ""
 
-#: elf32-spu.c:5008
+#: elf32-spu.c:5006
 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"
 msgstr ""
 
@@ -2439,43 +2420,43 @@ msgstr ""
 msgid "warning: generating a shared library containing non-PID code"
 msgstr ""
 
-#: elf32-tic6x.c:2541
+#: elf32-tic6x.c:2539
 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
 msgstr ""
 
-#: elf32-tic6x.c:2761
+#: elf32-tic6x.c:2759
 msgid "dangerous relocation"
 msgstr ""
 
-#: elf32-tic6x.c:3733
+#: elf32-tic6x.c:3740
 msgid "%B: error: unknown mandatory EABI object attribute %d"
 msgstr ""
 
-#: elf32-tic6x.c:3741
+#: elf32-tic6x.c:3748
 msgid "%B: warning: unknown EABI object attribute %d"
 msgstr ""
 
-#: elf32-tic6x.c:3853 elf32-tic6x.c:3861
+#: elf32-tic6x.c:3860 elf32-tic6x.c:3868
 msgid "error: %B requires more stack alignment than %B preserves"
 msgstr ""
 
-#: elf32-tic6x.c:3871 elf32-tic6x.c:3880
+#: elf32-tic6x.c:3878 elf32-tic6x.c:3887
 msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
 msgstr ""
 
-#: elf32-tic6x.c:3889 elf32-tic6x.c:3898
+#: elf32-tic6x.c:3896 elf32-tic6x.c:3905
 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
 msgstr ""
 
-#: elf32-tic6x.c:3906 elf32-tic6x.c:3913
+#: elf32-tic6x.c:3913 elf32-tic6x.c:3920
 msgid "error: %B requires more array alignment than %B preserves"
 msgstr ""
 
-#: elf32-tic6x.c:3935
+#: elf32-tic6x.c:3942
 msgid "warning: %B and %B differ in wchar_t size"
 msgstr ""
 
-#: elf32-tic6x.c:3953
+#: elf32-tic6x.c:3960
 msgid "warning: %B and %B differ in whether code is compiled for DSBT"
 msgstr ""
 
@@ -2559,44 +2540,44 @@ msgstr ""
 msgid "v850e2v3 architecture"
 msgstr ""
 
-#: elf32-vax.c:532
+#: elf32-vax.c:531
 #, c-format
 msgid " [nonpic]"
 msgstr ""
 
-#: elf32-vax.c:535
+#: elf32-vax.c:534
 #, c-format
 msgid " [d-float]"
 msgstr ""
 
-#: elf32-vax.c:538
+#: elf32-vax.c:537
 #, c-format
 msgid " [g-float]"
 msgstr ""
 
-#: elf32-vax.c:655
+#: elf32-vax.c:654
 #, c-format
 msgid ""
 "%s: warning: GOT addend of %ld to `%s' does not match previous GOT addend of "
 "%ld"
 msgstr ""
 
-#: elf32-vax.c:1585
+#: elf32-vax.c:1587
 #, c-format
 msgid "%s: warning: PLT addend of %d to `%s' from %s section ignored"
 msgstr ""
 
-#: elf32-vax.c:1712
+#: elf32-vax.c:1714
 #, c-format
 msgid "%s: warning: %s relocation against symbol `%s' from %s section"
 msgstr ""
 
-#: elf32-vax.c:1718
+#: elf32-vax.c:1720
 #, c-format
 msgid "%s: warning: %s relocation to 0x%x from %s section"
 msgstr ""
 
-#: elf32-xstormy16.c:451 elf32-ia64.c:2336 elf64-ia64.c:2336
+#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342
 msgid "non-zero addend in @fptr reloc"
 msgstr ""
 
@@ -2604,50 +2585,50 @@ msgstr ""
 msgid "%B(%A): invalid property table"
 msgstr ""
 
-#: elf32-xtensa.c:2777
+#: elf32-xtensa.c:2780
 msgid "%B(%A+0x%lx): relocation offset out of range (size=0x%x)"
 msgstr ""
 
-#: elf32-xtensa.c:2856 elf32-xtensa.c:2977
+#: elf32-xtensa.c:2859 elf32-xtensa.c:2980
 msgid "dynamic relocation in read-only section"
 msgstr ""
 
-#: elf32-xtensa.c:2953
+#: elf32-xtensa.c:2956
 msgid "TLS relocation invalid without dynamic sections"
 msgstr ""
 
-#: elf32-xtensa.c:3172
+#: elf32-xtensa.c:3173
 msgid "internal inconsistency in size of .got.loc section"
 msgstr ""
 
-#: elf32-xtensa.c:3485
+#: elf32-xtensa.c:3486
 msgid "%B: incompatible machine type. Output is 0x%x. Input is 0x%x"
 msgstr ""
 
-#: elf32-xtensa.c:4714 elf32-xtensa.c:4722
+#: elf32-xtensa.c:4715 elf32-xtensa.c:4723
 msgid "Attempt to convert L32R/CALLX to CALL failed"
 msgstr ""
 
-#: elf32-xtensa.c:6332 elf32-xtensa.c:6408 elf32-xtensa.c:7524
+#: elf32-xtensa.c:6333 elf32-xtensa.c:6409 elf32-xtensa.c:7525
 msgid ""
 "%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"
 msgstr ""
 
-#: elf32-xtensa.c:7264
+#: elf32-xtensa.c:7265
 msgid ""
 "%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY "
 "relocation; possible configuration mismatch"
 msgstr ""
 
-#: elf32-xtensa.c:9023
+#: elf32-xtensa.c:9024
 msgid "invalid relocation address"
 msgstr ""
 
-#: elf32-xtensa.c:9072
+#: elf32-xtensa.c:9073
 msgid "overflow after relaxation"
 msgstr ""
 
-#: elf32-xtensa.c:10204
+#: elf32-xtensa.c:10205
 msgid "%B(%A+0x%lx): unexpected fix for %s relocation"
 msgstr ""
 
@@ -2655,27 +2636,27 @@ msgstr ""
 msgid "GPDISP relocation did not find ldah and lda instructions"
 msgstr ""
 
-#: elf64-alpha.c:2497
+#: elf64-alpha.c:2495
 msgid "%B: .got subsegment exceeds 64K (size %d)"
 msgstr ""
 
-#: elf64-alpha.c:4387 elf64-alpha.c:4399
+#: elf64-alpha.c:4392 elf64-alpha.c:4404
 msgid "%B: gp-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4425 elf64-alpha.c:4565
+#: elf64-alpha.c:4430 elf64-alpha.c:4565
 msgid "%B: pc-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4453
+#: elf64-alpha.c:4458
 msgid "%B: change in gp: BRSGP %s"
 msgstr ""
 
-#: elf64-alpha.c:4478
+#: elf64-alpha.c:4483
 msgid "<unknown>"
 msgstr ""
 
-#: elf64-alpha.c:4483
+#: elf64-alpha.c:4488
 msgid "%B: !samegp reloc against symbol without .prologue: %s"
 msgstr ""
 
@@ -2687,38 +2668,24 @@ msgstr ""
 msgid "%B: pc-relative relocation against undefined weak symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4636
+#: elf64-alpha.c:4632
 msgid "%B: dtp-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-alpha.c:4659
+#: elf64-alpha.c:4655
 msgid "%B: tp-relative relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf64-hppa.c:2083
+#: elf64-hppa.c:2094
 #, c-format
 msgid "stub entry for %s cannot load .plt, dp offset = %ld"
 msgstr ""
 
-#: elf64-hppa.c:3275
-msgid "%B(%A+0x"
-msgstr ""
-
-#: elf64-mmix.c:1034
-msgid ""
-"invalid input relocation when producing non-ELF, non-mmo format output.\n"
-" Please use the objcopy program to convert from ELF or mmo,\n"
-" or assemble using \"-no-expand\" (for gcc, \"-Wa,-no-expand\""
-msgstr ""
-
-#: elf64-mmix.c:1218
-msgid ""
-"invalid input relocation when producing non-ELF, non-mmo format output.\n"
-" Please use the objcopy program to convert from ELF or mmo,\n"
-" or compile using the gcc-option \"-mno-base-addresses\"."
+#: elf64-hppa.c:3292
+msgid "%B(%A+0x%lx): cannot reach %s"
 msgstr ""
 
-#: elf64-mmix.c:1244
+#: elf64-mmix.c:1177
 #, c-format
 msgid ""
 "%s: Internal inconsistency error for value for\n"
@@ -2726,133 +2693,135 @@ msgid ""
 "%08lx\n"
 msgstr ""
 
-#: elf64-mmix.c:1670
+#: elf64-mmix.c:1607
 #, c-format
 msgid ""
 "%s: base-plus-offset relocation against register symbol: (unknown) in %s"
 msgstr ""
 
-#: elf64-mmix.c:1675
+#: elf64-mmix.c:1612
 #, c-format
 msgid "%s: base-plus-offset relocation against register symbol: %s in %s"
 msgstr ""
 
-#: elf64-mmix.c:1719
+#: elf64-mmix.c:1656
 #, c-format
 msgid "%s: register relocation against non-register symbol: (unknown) in %s"
 msgstr ""
 
-#: elf64-mmix.c:1724
+#: elf64-mmix.c:1661
 #, c-format
 msgid "%s: register relocation against non-register symbol: %s in %s"
 msgstr ""
 
-#: elf64-mmix.c:1761
+#: elf64-mmix.c:1698
 #, c-format
 msgid "%s: directive LOCAL valid only with a register or absolute value"
 msgstr ""
 
-#: elf64-mmix.c:1789
+#: elf64-mmix.c:1726
 #, c-format
 msgid ""
 "%s: LOCAL directive: Register $%ld is not a local register.  First global "
 "register is $%ld."
 msgstr ""
 
-#: elf64-mmix.c:2253
+#: elf64-mmix.c:2190
 #, c-format
 msgid ""
 "%s: Error: multiple definition of `%s'; start of %s is set in a earlier "
 "linked file\n"
 msgstr ""
 
-#: elf64-mmix.c:2311
+#: elf64-mmix.c:2248
 msgid "Register section has contents\n"
 msgstr ""
 
-#: elf64-mmix.c:2503
+#: elf64-mmix.c:2440
 #, c-format
 msgid ""
 "Internal inconsistency: remaining %u != max %u.\n"
 "  Please report this bug."
 msgstr ""
 
-#: elf64-ppc.c:4185
-msgid "%P: %B: cannot create stub entry %s\n"
+#: elf64-ppc.c:2744 libbfd.c:1012
+msgid "%B: compiled for a big endian system and target is little endian"
 msgstr ""
 
-#: elf64-ppc.c:6518
-msgid ""
-"%P: copy reloc against `%s' requires lazy plt linking; avoid setting "
-"LD_BIND_NOW=1 or upgrade gcc\n"
+#: elf64-ppc.c:2747 libbfd.c:1014
+msgid "%B: compiled for a little endian system and target is big endian"
 msgstr ""
 
-#: elf64-ppc.c:6788
-msgid "%B: undefined symbol on R_PPC64_TOCSAVE relocation"
+#: elf64-ppc.c:4160
+msgid "%B: cannot create stub entry %s\n"
+msgstr ""
+
+#: elf64-ppc.c:6484
+#, c-format
+msgid ""
+"copy reloc against `%s' requires lazy plt linking; avoid setting "
+"LD_BIND_NOW=1 or upgrade gcc\n"
 msgstr ""
 
-#: elf64-ppc.c:6992
-msgid "%P: dynreloc miscount for %B, section %A\n"
+#: elf64-ppc.c:6912
+msgid "dynreloc miscount for %B, section %A\n"
 msgstr ""
 
-#: elf64-ppc.c:7076
+#: elf64-ppc.c:6996
 msgid "%B: .opd is not a regular array of opd entries"
 msgstr ""
 
-#: elf64-ppc.c:7085
+#: elf64-ppc.c:7005
 msgid "%B: unexpected reloc type %u in .opd section"
 msgstr ""
 
-#: elf64-ppc.c:7106
+#: elf64-ppc.c:7026
 msgid "%B: undefined sym `%s' in .opd section"
 msgstr ""
 
-#: elf64-ppc.c:7664
+#: elf64-ppc.c:7584
 msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
 msgstr ""
 
-#: elf64-ppc.c:8003 elf64-ppc.c:8564
+#: elf64-ppc.c:7929 elf64-ppc.c:8450
 #, c-format
 msgid "%s defined on removed toc entry"
 msgstr ""
 
-#: elf64-ppc.c:8521
-msgid "%P: %H: %s relocation references optimized away TOC entry\n"
-msgstr ""
-
-#: elf64-ppc.c:9598
-msgid "%P: cannot find opd entry toc for %s\n"
+#: elf64-ppc.c:9474
+#, c-format
+msgid "cannot find opd entry toc for %s\n"
 msgstr ""
 
-#: elf64-ppc.c:9680
-msgid "%P: long branch stub `%s' offset overflow\n"
+#: elf64-ppc.c:9556
+#, c-format
+msgid "long branch stub `%s' offset overflow\n"
 msgstr ""
 
-#: elf64-ppc.c:9739
-msgid "%P: can't find branch stub `%s'\n"
+#: elf64-ppc.c:9615
+#, c-format
+msgid "can't find branch stub `%s'\n"
 msgstr ""
 
-#: elf64-ppc.c:9801 elf64-ppc.c:9943
-msgid "%P: linkage table error against `%s'\n"
+#: elf64-ppc.c:9677 elf64-ppc.c:9819
+#, c-format
+msgid "linkage table error against `%s'\n"
 msgstr ""
 
-#: elf64-ppc.c:10126
-msgid "%P: can't build branch stub `%s'\n"
+#: elf64-ppc.c:9993
+#, c-format
+msgid "can't build branch stub `%s'\n"
 msgstr ""
 
-#: elf64-ppc.c:10941
+#: elf64-ppc.c:10814
 msgid "%B section %A exceeds stub group size"
 msgstr ""
 
-#: elf64-ppc.c:11666 elf64-ppc.c:11699
-msgid "%P: %s offset too large for .eh_frame sdata4 encoding"
+#: elf64-ppc.c:11457
+msgid "stubs don't match calculated size\n"
 msgstr ""
 
-#: elf64-ppc.c:11744
-msgid "%P: stubs don't match calculated size\n"
-msgstr ""
-
-#: elf64-ppc.c:11756
+#: elf64-ppc.c:11469
 #, c-format
 msgid ""
 "linker stubs in %u group%s\n"
@@ -2863,106 +2832,106 @@ msgid ""
 "  plt call     %lu"
 msgstr ""
 
-#: elf64-ppc.c:12042
-msgid "%P: %H: %s used with TLS symbol %s\n"
+#: elf64-ppc.c:11819
+msgid "%H: %s used with TLS symbol %s\n"
 msgstr ""
 
-#: elf64-ppc.c:12043
-msgid "%P: %H: %s used with non-TLS symbol %s\n"
+#: elf64-ppc.c:11820
+msgid "%H: %s used with non-TLS symbol %s\n"
 msgstr ""
 
-#: elf64-ppc.c:12556
+#: elf64-ppc.c:12318
 msgid ""
-"%P: %H: automatic multiple TOCs not supported using your crt files; "
-"recompile with -mminimal-toc or upgrade gcc\n"
+"%H: automatic multiple TOCs not supported using your crt files; recompile "
+"with -mminimal-toc or upgrade gcc\n"
 msgstr ""
 
-#: elf64-ppc.c:12562
+#: elf64-ppc.c:12324
 msgid ""
-"%P: %H: sibling call optimization to `%s' does not allow automatic multiple "
+"%H: sibling call optimization to `%s' does not allow automatic multiple "
 "TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `"
 "%s' extern\n"
 msgstr ""
 
-#: elf64-ppc.c:13286
-msgid "%P: %B: relocation %s is not supported for symbol %s\n"
+#: elf64-ppc.c:13041
+msgid "%B: relocation %s is not supported for symbol %s\n"
 msgstr ""
 
-#: elf64-ppc.c:13446
-msgid "%P: %H: error: %s not a multiple of %u\n"
+#: elf64-ppc.c:13218
+msgid "%H: error: %s not a multiple of %u\n"
 msgstr ""
 
-#: elf64-sh64.c:1686
+#: elf64-sh64.c:1682
 #, c-format
 msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n"
 msgstr ""
 
-#: elf64-sparc.c:446
+#: elf64-sparc.c:445
 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
 msgstr ""
 
-#: elf64-sparc.c:466
+#: elf64-sparc.c:465
 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
 msgstr ""
 
-#: elf64-sparc.c:489
+#: elf64-sparc.c:488
 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
 msgstr ""
 
-#: elf64-sparc.c:534
+#: elf64-sparc.c:533
 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
 msgstr ""
 
-#: elf64-sparc.c:687
+#: elf64-sparc.c:686
 msgid "%B: linking UltraSPARC specific with HAL specific code"
 msgstr ""
 
-#: elf64-x86-64.c:1427
+#: elf64-x86-64.c:1236
 msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
 msgstr ""
 
-#: elf64-x86-64.c:1656
+#: elf64-x86-64.c:1465
 msgid "%B: '%s' accessed both as normal and thread local symbol"
 msgstr ""
 
-#: elf64-x86-64.c:3150
+#: elf64-x86-64.c:2934
 msgid ""
 "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d"
 msgstr ""
 
-#: elf64-x86-64.c:3411
+#: elf64-x86-64.c:3193
 msgid ""
 "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be "
 "used when making a shared object"
 msgstr ""
 
-#: elf64-x86-64.c:3523
+#: elf64-x86-64.c:3305
 msgid "; recompile with -fPIC"
 msgstr ""
 
-#: elf64-x86-64.c:3528
+#: elf64-x86-64.c:3310
 msgid ""
 "%B: relocation %s against %s `%s' can not be used when making a shared object"
 "%s"
 msgstr ""
 
-#: elf64-x86-64.c:3530
+#: elf64-x86-64.c:3312
 msgid ""
 "%B: relocation %s against undefined %s `%s' can not be used when making a "
 "shared object%s"
 msgstr ""
 
-#: elfcode.h:767
+#: elfcode.h:827
 #, c-format
 msgid "warning: %s has a corrupt string table index - ignoring"
 msgstr ""
 
-#: elfcode.h:1177
+#: elfcode.h:1237
 #, c-format
 msgid "%s: version count (%ld) does not match symbol count (%ld)"
 msgstr ""
 
-#: elfcode.h:1431
+#: elfcode.h:1491
 #, c-format
 msgid "%s(%s): relocation %d has invalid symbol index %ld"
 msgstr ""
@@ -2971,387 +2940,377 @@ msgstr ""
 msgid "Warning: %B is truncated: expected core file size >= %lu, found: %lu."
 msgstr ""
 
-#: elflink.c:1117
+#: elflink.c:1119
 msgid ""
 "%s: TLS definition in %B section %A mismatches non-TLS definition in %B "
 "section %A"
 msgstr ""
 
-#: elflink.c:1121
+#: elflink.c:1123
 msgid "%s: TLS reference in %B mismatches non-TLS reference in %B"
 msgstr ""
 
-#: elflink.c:1125
+#: elflink.c:1127
 msgid "%s: TLS definition in %B section %A mismatches non-TLS reference in %B"
 msgstr ""
 
-#: elflink.c:1129
+#: elflink.c:1131
 msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
 msgstr ""
 
-#: elflink.c:1762
+#: elflink.c:1764
 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
 msgstr ""
 
-#: elflink.c:2063
+#: elflink.c:2077
 msgid "%B: version node not found for symbol %s"
 msgstr ""
 
-#: elflink.c:2154
+#: elflink.c:2167
 msgid ""
 "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'"
 msgstr ""
 
-#: elflink.c:2165
+#: elflink.c:2178
 msgid ""
 "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the "
 "object file has no symbol table"
 msgstr ""
 
-#: elflink.c:2355
+#: elflink.c:2368
 msgid "%B: relocation size mismatch in %B section %A"
 msgstr ""
 
-#: elflink.c:2639
+#: elflink.c:2663
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
 msgstr ""
 
-#: elflink.c:3391
+#: elflink.c:3421
 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
 msgstr ""
 
-#: elflink.c:4037
+#: elflink.c:4067
 msgid "%B: %s: invalid version %u (max %d)"
 msgstr ""
 
-#: elflink.c:4073
+#: elflink.c:4103
 msgid "%B: %s: invalid needed version %d"
 msgstr ""
 
-#: elflink.c:4269
+#: elflink.c:4299
 msgid ""
 "Warning: alignment %u of common symbol `%s' in %B is greater than the "
 "alignment (%u) of its section %A"
 msgstr ""
 
-#: elflink.c:4275
+#: elflink.c:4305
 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
 msgstr ""
 
-#: elflink.c:4290
+#: elflink.c:4320
 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B"
 msgstr ""
 
-#: elflink.c:4463
+#: elflink.c:4489
 msgid "%B: undefined reference to symbol '%s'"
 msgstr ""
 
-#: elflink.c:4466
+#: elflink.c:4492
 msgid ""
 "note: '%s' is defined in DSO %B so try adding it to the linker command line"
 msgstr ""
 
-#: elflink.c:5781
+#: elflink.c:5795
 #, c-format
 msgid "%s: undefined version: %s"
 msgstr ""
 
-#: elflink.c:5849
+#: elflink.c:5863
 msgid "%B: .preinit_array section is not allowed in DSO"
 msgstr ""
 
-#: elflink.c:7604
+#: elflink.c:7617
 #, c-format
 msgid "undefined %s reference in complex symbol: %s"
 msgstr ""
 
-#: elflink.c:7758
+#: elflink.c:7771
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr ""
 
-#: elflink.c:8097 elflink.c:8114 elflink.c:8151 elflink.c:8168
+#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181
 msgid "%B: Unable to sort relocs - they are in more than one size"
 msgstr ""
 
-#: elflink.c:8128 elflink.c:8182
+#: elflink.c:8141 elflink.c:8195
 msgid "%B: Unable to sort relocs - they are of an unknown size"
 msgstr ""
 
-#: elflink.c:8233
+#: elflink.c:8246
 msgid "Not enough memory to sort relocations"
 msgstr ""
 
-#: elflink.c:8426
+#: elflink.c:8439
 msgid "%B: Too many sections: %d (>= %d)"
 msgstr ""
 
-#: elflink.c:8675
+#: elflink.c:8686
 msgid "%B: internal symbol `%s' in %B is referenced by DSO"
 msgstr ""
 
-#: elflink.c:8677
+#: elflink.c:8688
 msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
 msgstr ""
 
-#: elflink.c:8679
+#: elflink.c:8690
 msgid "%B: local symbol `%s' in %B is referenced by DSO"
 msgstr ""
 
-#: elflink.c:8776
+#: elflink.c:8785
 msgid "%B: could not find output section %A for input section %A"
 msgstr ""
 
-#: elflink.c:8899
+#: elflink.c:8908
 msgid "%B: protected symbol `%s' isn't defined"
 msgstr ""
 
-#: elflink.c:8901
+#: elflink.c:8910
 msgid "%B: internal symbol `%s' isn't defined"
 msgstr ""
 
-#: elflink.c:8903
+#: elflink.c:8912
 msgid "%B: hidden symbol `%s' isn't defined"
 msgstr ""
 
-#: elflink.c:9432
+#: elflink.c:9441
 msgid "error: %B: size of section %A is not multiple of address size"
 msgstr ""
 
-#: elflink.c:9479
+#: elflink.c:9488
 msgid ""
 "error: %B contains a reloc (0x%s) for section %A that references a non-"
 "existent global symbol"
 msgstr ""
 
-#: elflink.c:10214
+#: elflink.c:10223
 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
 msgstr ""
 
-#: elflink.c:10219
+#: elflink.c:10228
 #, c-format
 msgid "%A has both ordered and unordered sections"
 msgstr ""
 
-#: elflink.c:10784
+#: elflink.c:10793
 msgid "%B: file class %s incompatible with %s"
 msgstr ""
 
-#: elflink.c:11093 elflink.c:11137
+#: elflink.c:11104 elflink.c:11148
 msgid "%B: could not find output section %s"
 msgstr ""
 
-#: elflink.c:11098
+#: elflink.c:11109
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr ""
 
-#: elflink.c:11143
-#, c-format
-msgid "warning: section '%s' is being made into a note"
-msgstr ""
-
-#: elflink.c:11212
-msgid "%P%X: read-only segment has dynamic relocations.\n"
-msgstr ""
-
-#: elflink.c:11215
+#: elflink.c:11214
 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
 msgstr ""
 
-#: elflink.c:11402
+#: elflink.c:11401
 msgid "%P%X: can not read symbols: %E\n"
 msgstr ""
 
-#: elflink.c:11792
+#: elflink.c:11750
 msgid "Removing unused section '%s' in file '%B'"
 msgstr ""
 
-#: elflink.c:11998
+#: elflink.c:11962
 msgid "Warning: gc-sections option ignored"
 msgstr ""
 
-#: elflink.c:12277
-#, c-format
-msgid "Unrecognized INPUT_SECTION_FLAG %s\n"
+#: elflink.c:12511
+msgid "%B: ignoring duplicate section `%A'"
 msgstr ""
 
-#: elfxx-mips.c:1234
-msgid "static procedure (no name)"
+#: elflink.c:12518 elflink.c:12525
+msgid "%B: duplicate section `%A' has different size"
 msgstr ""
 
-#: elfxx-mips.c:5259
-msgid "MIPS16 and microMIPS functions cannot call each other"
+#: elflink.c:12533 elflink.c:12538
+msgid "%B: warning: could not read contents of section `%A'"
 msgstr ""
 
-#: elfxx-mips.c:5856
+#: elflink.c:12542
+msgid "%B: warning: duplicate section `%A' has different contents"
+msgstr ""
+
+#: elflink.c:12643 linker.c:3086
+msgid "%F%P: already_linked_table: %E\n"
+msgstr ""
+
+#: elfxx-mips.c:1221
+msgid "static procedure (no name)"
+msgstr ""
+
+#: elfxx-mips.c:5628
 msgid ""
 "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider "
 "recompiling with interlinking enabled."
 msgstr ""
 
-#: elfxx-mips.c:6519 elfxx-mips.c:6742
+#: elfxx-mips.c:6288 elfxx-mips.c:6511
 msgid "%B: Warning: bad `%s' option size %u smaller than its header"
 msgstr ""
 
-#: elfxx-mips.c:7495 elfxx-mips.c:7620
+#: elfxx-mips.c:7262 elfxx-mips.c:7387
 msgid "%B: Warning: cannot determine the target function for stub section `%s'"
 msgstr ""
 
-#: elfxx-mips.c:7749
+#: elfxx-mips.c:7516
 msgid "%B: Malformed reloc detected for section %s"
 msgstr ""
 
-#: elfxx-mips.c:7801
+#: elfxx-mips.c:7556
 msgid "%B: GOT reloc at 0x%lx not expected in executables"
 msgstr ""
 
-#: elfxx-mips.c:7930
+#: elfxx-mips.c:7678
 msgid "%B: CALL16 reloc at 0x%lx not against global symbol"
 msgstr ""
 
-#: elfxx-mips.c:8645
+#: elfxx-mips.c:8372
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
 msgstr ""
 
-#: elfxx-mips.c:9347
+#: elfxx-mips.c:9075
 msgid ""
 "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `"
 "%A'"
 msgstr ""
 
-#: elfxx-mips.c:9486
+#: elfxx-mips.c:9214
 msgid ""
 "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
 msgstr ""
 
-#: elfxx-mips.c:9505
-msgid "JALX to a non-word-aligned address"
-msgstr ""
-
-#: elfxx-mips.c:13266
+#: elfxx-mips.c:12038
 #, c-format
 msgid "%s: illegal section name `%s'"
 msgstr ""
 
-#: elfxx-mips.c:13645 elfxx-mips.c:13671
+#: elfxx-mips.c:12417 elfxx-mips.c:12443
 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float"
 msgstr ""
 
-#: elfxx-mips.c:13657 elfxx-mips.c:13713
+#: elfxx-mips.c:12429 elfxx-mips.c:12485
 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"
 msgstr ""
 
-#: elfxx-mips.c:13683 elfxx-mips.c:13719
+#: elfxx-mips.c:12455 elfxx-mips.c:12491
 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"
 msgstr ""
 
-#: elfxx-mips.c:13761
+#: elfxx-mips.c:12533
 msgid "%B: endianness incompatible with that of the selected emulation"
 msgstr ""
 
-#: elfxx-mips.c:13772
+#: elfxx-mips.c:12544
 msgid "%B: ABI is incompatible with that of the selected emulation"
 msgstr ""
 
-#: elfxx-mips.c:13856
+#: elfxx-mips.c:12628
 msgid "%B: warning: linking abicalls files with non-abicalls files"
 msgstr ""
 
-#: elfxx-mips.c:13873
+#: elfxx-mips.c:12645
 msgid "%B: linking 32-bit code with 64-bit code"
 msgstr ""
 
-#: elfxx-mips.c:13901
+#: elfxx-mips.c:12673
 msgid "%B: linking %s module with previous %s modules"
 msgstr ""
 
-#: elfxx-mips.c:13924
+#: elfxx-mips.c:12696
 msgid "%B: ABI mismatch: linking %s module with previous %s modules"
 msgstr ""
 
-#: elfxx-mips.c:13948
-msgid "%B: ASE mismatch: linking %s module with previous %s modules"
-msgstr ""
-
-#: elfxx-mips.c:14106
+#: elfxx-mips.c:12860
 #, c-format
 msgid " [abi=O32]"
 msgstr ""
 
-#: elfxx-mips.c:14108
+#: elfxx-mips.c:12862
 #, c-format
 msgid " [abi=O64]"
 msgstr ""
 
-#: elfxx-mips.c:14110
+#: elfxx-mips.c:12864
 #, c-format
 msgid " [abi=EABI32]"
 msgstr ""
 
-#: elfxx-mips.c:14112
+#: elfxx-mips.c:12866
 #, c-format
 msgid " [abi=EABI64]"
 msgstr ""
 
-#: elfxx-mips.c:14114
+#: elfxx-mips.c:12868
 #, c-format
 msgid " [abi unknown]"
 msgstr ""
 
-#: elfxx-mips.c:14116
+#: elfxx-mips.c:12870
 #, c-format
 msgid " [abi=N32]"
 msgstr ""
 
-#: elfxx-mips.c:14118
+#: elfxx-mips.c:12872
 #, c-format
 msgid " [abi=64]"
 msgstr ""
 
-#: elfxx-mips.c:14120
+#: elfxx-mips.c:12874
 #, c-format
 msgid " [no abi set]"
 msgstr ""
 
-#: elfxx-mips.c:14141
+#: elfxx-mips.c:12895
 #, c-format
 msgid " [unknown ISA]"
 msgstr ""
 
-#: elfxx-mips.c:14155
+#: elfxx-mips.c:12906
 #, c-format
 msgid " [not 32bitmode]"
 msgstr ""
 
-#: elfxx-sparc.c:596
+#: elfxx-sparc.c:595
 #, c-format
 msgid "invalid relocation type %d"
 msgstr ""
 
-#: elfxx-tilegx.c:3952
-msgid "%B: Cannot link together %s and %s objects."
-msgstr ""
-
-#: i386linux.c:451 m68klinux.c:456 sparclinux.c:450
+#: i386linux.c:454 m68klinux.c:458 sparclinux.c:452
 #, c-format
 msgid "Output file requires shared library `%s'\n"
 msgstr ""
 
-#: i386linux.c:459 m68klinux.c:464 sparclinux.c:458
+#: i386linux.c:462 m68klinux.c:466 sparclinux.c:460
 #, c-format
 msgid "Output file requires shared library `%s.so.%s'\n"
 msgstr ""
 
-#: i386linux.c:648 i386linux.c:698 m68klinux.c:656 m68klinux.c:704
-#: sparclinux.c:648 sparclinux.c:698
+#: i386linux.c:651 i386linux.c:701 m68klinux.c:658 m68klinux.c:706
+#: sparclinux.c:650 sparclinux.c:700
 #, c-format
 msgid "Symbol %s not defined for fixups\n"
 msgstr ""
 
-#: i386linux.c:722 m68klinux.c:728 sparclinux.c:722
+#: i386linux.c:725 m68klinux.c:730 sparclinux.c:724
 msgid "Warning: fixup count mismatch\n"
 msgstr ""
 
@@ -3422,14 +3381,6 @@ msgstr ""
 msgid "%B: unable to get decompressed section %A"
 msgstr ""
 
-#: libbfd.c:1012
-msgid "%B: compiled for a big endian system and target is little endian"
-msgstr ""
-
-#: libbfd.c:1014
-msgid "%B: compiled for a little endian system and target is big endian"
-msgstr ""
-
 #: libbfd.c:1043
 #, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
@@ -3440,148 +3391,140 @@ msgstr ""
 msgid "Deprecated %s called\n"
 msgstr ""
 
-#: linker.c:1872
+#: linker.c:1859
 msgid "%B: indirect symbol `%s' to `%s' is a loop"
 msgstr ""
 
-#: linker.c:2736
+#: linker.c:2726
 #, c-format
 msgid "Attempt to do relocatable link with %s input and %s output"
 msgstr ""
 
-#: linker.c:3021
-msgid "%B: ignoring duplicate section `%A'\n"
+#: linker.c:3053
+msgid "%B: warning: ignoring duplicate section `%A'\n"
 msgstr ""
 
-#: linker.c:3030 linker.c:3039
-msgid "%B: duplicate section `%A' has different size\n"
+#: linker.c:3067
+msgid "%B: warning: duplicate section `%A' has different size\n"
 msgstr ""
 
-#: linker.c:3047 linker.c:3052
-msgid "%B: could not read contents of section `%A'\n"
-msgstr ""
-
-#: linker.c:3056
-msgid "%B: duplicate section `%A' has different contents\n"
-msgstr ""
-
-#: mach-o.c:407
+#: mach-o.c:381
 msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
 msgstr ""
 
-#: mach-o.c:1301
+#: mach-o.c:1253
 #, c-format
 msgid "unable to write unknown load command 0x%lx"
 msgstr ""
 
-#: mach-o.c:1789
+#: mach-o.c:1654
 #, c-format
 msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"
 msgstr ""
 
-#: mach-o.c:1807
+#: mach-o.c:1671
 #, c-format
-msgid "bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %lu)"
+msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"
 msgstr ""
 
-#: mach-o.c:1892
+#: mach-o.c:1756
 #, c-format
 msgid ""
 "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d "
 "(max %lu): setting to undefined"
 msgstr ""
 
-#: mach-o.c:1900
+#: mach-o.c:1764
 #, c-format
 msgid ""
 "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' "
 "reference: setting to undefined"
 msgstr ""
 
-#: mach-o.c:1906
+#: mach-o.c:1770
 #, c-format
 msgid ""
 "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x"
 "%x: setting to undefined"
 msgstr ""
 
-#: mach-o.c:1979
+#: mach-o.c:1840
 msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
 msgstr ""
 
-#: mach-o.c:2014
+#: mach-o.c:1874
 #, c-format
 msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"
 msgstr ""
 
-#: mach-o.c:2734
+#: mach-o.c:2556
 #, c-format
 msgid "unable to read unknown load command 0x%lx"
 msgstr ""
 
-#: mach-o.c:2915
+#: mach-o.c:2736
 #, c-format
 msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
 msgstr ""
 
-#: mach-o.c:3011
+#: mach-o.c:2832
 #, c-format
 msgid "unknown header byte-order value 0x%lx"
 msgstr ""
 
-#: mach-o.c:3577
+#: mach-o.c:3402
 msgid "Mach-O header:\n"
 msgstr ""
 
-#: mach-o.c:3578
+#: mach-o.c:3403
 #, c-format
 msgid " magic     : %08lx\n"
 msgstr ""
 
-#: mach-o.c:3579
+#: mach-o.c:3404
 #, c-format
 msgid " cputype   : %08lx (%s)\n"
 msgstr ""
 
-#: mach-o.c:3581
+#: mach-o.c:3406
 #, c-format
 msgid " cpusubtype: %08lx\n"
 msgstr ""
 
-#: mach-o.c:3582
+#: mach-o.c:3407
 #, c-format
 msgid " filetype  : %08lx (%s)\n"
 msgstr ""
 
-#: mach-o.c:3585
+#: mach-o.c:3410
 #, c-format
 msgid " ncmds     : %08lx (%lu)\n"
 msgstr ""
 
-#: mach-o.c:3586
+#: mach-o.c:3411
 #, c-format
 msgid " sizeofcmds: %08lx\n"
 msgstr ""
 
-#: mach-o.c:3587
+#: mach-o.c:3412
 #, c-format
 msgid " flags     : %08lx ("
 msgstr ""
 
-#: mach-o.c:3589 vms-alpha.c:7674
+#: mach-o.c:3414 vms-alpha.c:7671
 msgid ")\n"
 msgstr ""
 
-#: mach-o.c:3590
+#: mach-o.c:3415
 #, c-format
 msgid " reserved  : %08x\n"
 msgstr ""
 
-#: mach-o.c:3600
+#: mach-o.c:3425
 msgid "Segments and Sections:\n"
 msgstr ""
 
-#: mach-o.c:3601
+#: mach-o.c:3426
 msgid " #: Segment name     Section name     Address\n"
 msgstr ""
 
@@ -3762,7 +3705,7 @@ msgstr ""
 msgid "%B: bad pair/reflo after refhi\n"
 msgstr ""
 
-#: pef.c:520
+#: pef.c:519
 #, c-format
 msgid "bfd_pef_scan: unknown architecture 0x%lx"
 msgstr ""
@@ -3798,21 +3741,21 @@ msgstr ""
 msgid "%B: Unrecognised import name type; %x"
 msgstr ""
 
-#: peicode.h:1166
+#: peicode.h:1162
 msgid "%B: Unrecognised machine type (0x%x) in Import Library Format archive"
 msgstr ""
 
-#: peicode.h:1178
+#: peicode.h:1174
 msgid ""
 "%B: Recognised but unhandled machine type (0x%x) in Import Library Format "
 "archive"
 msgstr ""
 
-#: peicode.h:1196
+#: peicode.h:1192
 msgid "%B: size field is zero in Import Library Format header"
 msgstr ""
 
-#: peicode.h:1227
+#: peicode.h:1223
 msgid "%B: string not null terminated in ILF object file."
 msgstr ""
 
@@ -3865,10 +3808,6 @@ msgstr ""
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr ""
 
-#: reloc.c:6160
-msgid "INPUT_SECTION_FLAGS are not supported.\n"
-msgstr ""
-
 #: rs6000-core.c:448
 #, c-format
 msgid "%s: warning core file truncated"
@@ -3970,1825 +3909,1821 @@ msgstr ""
 msgid "SEC_RELOC with no relocs in section %s"
 msgstr ""
 
-#: vms-alpha.c:3822 vms-alpha.c:4049
+#: vms-alpha.c:3822 vms-alpha.c:4053
 #, c-format
 msgid "Size error in section %s"
 msgstr ""
 
-#: vms-alpha.c:3991
+#: vms-alpha.c:3992
 msgid "Spurious ALPHA_R_BSR reloc"
 msgstr ""
 
-#: vms-alpha.c:4036
+#: vms-alpha.c:4040
 #, c-format
 msgid "Unhandled relocation %s"
 msgstr ""
 
-#: vms-alpha.c:4326
+#: vms-alpha.c:4330
 #, c-format
 msgid "unknown source command %d"
 msgstr ""
 
-#: vms-alpha.c:4387
+#: vms-alpha.c:4391
 msgid "DST__K_SET_LINUM_INCR not implemented"
 msgstr ""
 
-#: vms-alpha.c:4393
+#: vms-alpha.c:4397
 msgid "DST__K_SET_LINUM_INCR_W not implemented"
 msgstr ""
 
-#: vms-alpha.c:4399
+#: vms-alpha.c:4403
 msgid "DST__K_RESET_LINUM_INCR not implemented"
 msgstr ""
 
-#: vms-alpha.c:4405
+#: vms-alpha.c:4409
 msgid "DST__K_BEG_STMT_MODE not implemented"
 msgstr ""
 
-#: vms-alpha.c:4411
+#: vms-alpha.c:4415
 msgid "DST__K_END_STMT_MODE not implemented"
 msgstr ""
 
-#: vms-alpha.c:4438
+#: vms-alpha.c:4442
 msgid "DST__K_SET_PC not implemented"
 msgstr ""
 
-#: vms-alpha.c:4444
+#: vms-alpha.c:4448
 msgid "DST__K_SET_PC_W not implemented"
 msgstr ""
 
-#: vms-alpha.c:4450
+#: vms-alpha.c:4454
 msgid "DST__K_SET_PC_L not implemented"
 msgstr ""
 
-#: vms-alpha.c:4456
+#: vms-alpha.c:4460
 msgid "DST__K_SET_STMTNUM not implemented"
 msgstr ""
 
-#: vms-alpha.c:4499
+#: vms-alpha.c:4503
 #, c-format
 msgid "unknown line command %d"
 msgstr ""
 
-#: vms-alpha.c:4953 vms-alpha.c:4970 vms-alpha.c:4984 vms-alpha.c:4999
-#: vms-alpha.c:5011 vms-alpha.c:5022 vms-alpha.c:5034
+#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003
+#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038
 #, c-format
 msgid "Unknown reloc %s + %s"
 msgstr ""
 
-#: vms-alpha.c:5089
+#: vms-alpha.c:5093
 #, c-format
 msgid "Unknown reloc %s"
 msgstr ""
 
-#: vms-alpha.c:5102
+#: vms-alpha.c:5106
 msgid "Invalid section index in ETIR"
 msgstr ""
 
-#: vms-alpha.c:5109
-msgid "Relocation for non-REL psect"
-msgstr ""
-
-#: vms-alpha.c:5156
+#: vms-alpha.c:5153
 #, c-format
 msgid "Unknown symbol in command %s"
 msgstr ""
 
-#: vms-alpha.c:5671
+#: vms-alpha.c:5668
 #, c-format
 msgid "  EMH %u (len=%u): "
 msgstr ""
 
-#: vms-alpha.c:5680
+#: vms-alpha.c:5677
 #, c-format
 msgid "Module header\n"
 msgstr ""
 
-#: vms-alpha.c:5681
+#: vms-alpha.c:5678
 #, c-format
 msgid "   structure level: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5682
+#: vms-alpha.c:5679
 #, c-format
 msgid "   max record size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5685
+#: vms-alpha.c:5682
 #, c-format
 msgid "   module name    : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5687
+#: vms-alpha.c:5684
 #, c-format
 msgid "   module version : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5689
+#: vms-alpha.c:5686
 #, c-format
 msgid "   compile date   : %.17s\n"
 msgstr ""
 
-#: vms-alpha.c:5694
+#: vms-alpha.c:5691
 #, c-format
 msgid "Language Processor Name\n"
 msgstr ""
 
-#: vms-alpha.c:5695
+#: vms-alpha.c:5692
 #, c-format
 msgid "   language name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5702
+#: vms-alpha.c:5699
 #, c-format
 msgid "Source Files Header\n"
 msgstr ""
 
-#: vms-alpha.c:5703
+#: vms-alpha.c:5700
 #, c-format
 msgid "   file: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5710
+#: vms-alpha.c:5707
 #, c-format
 msgid "Title Text Header\n"
 msgstr ""
 
-#: vms-alpha.c:5711
+#: vms-alpha.c:5708
 #, c-format
 msgid "   title: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5718
+#: vms-alpha.c:5715
 #, c-format
 msgid "Copyright Header\n"
 msgstr ""
 
-#: vms-alpha.c:5719
+#: vms-alpha.c:5716
 #, c-format
 msgid "   copyright: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5725
+#: vms-alpha.c:5722
 #, c-format
 msgid "unhandled emh subtype %u\n"
 msgstr ""
 
-#: vms-alpha.c:5735
+#: vms-alpha.c:5732
 #, c-format
 msgid "  EEOM (len=%u):\n"
 msgstr ""
 
-#: vms-alpha.c:5736
+#: vms-alpha.c:5733
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5738
+#: vms-alpha.c:5735
 #, c-format
 msgid "   completion code: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5742
+#: vms-alpha.c:5739
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr ""
 
-#: vms-alpha.c:5743
+#: vms-alpha.c:5740
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5745
+#: vms-alpha.c:5742
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5754
+#: vms-alpha.c:5751
 msgid " WEAK"
 msgstr ""
 
-#: vms-alpha.c:5756
+#: vms-alpha.c:5753
 msgid " DEF"
 msgstr ""
 
-#: vms-alpha.c:5758
+#: vms-alpha.c:5755
 msgid " UNI"
 msgstr ""
 
-#: vms-alpha.c:5760 vms-alpha.c:5781
+#: vms-alpha.c:5757 vms-alpha.c:5778
 msgid " REL"
 msgstr ""
 
-#: vms-alpha.c:5762
+#: vms-alpha.c:5759
 msgid " COMM"
 msgstr ""
 
-#: vms-alpha.c:5764
+#: vms-alpha.c:5761
 msgid " VECEP"
 msgstr ""
 
-#: vms-alpha.c:5766
+#: vms-alpha.c:5763
 msgid " NORM"
 msgstr ""
 
-#: vms-alpha.c:5768
+#: vms-alpha.c:5765
 msgid " QVAL"
 msgstr ""
 
-#: vms-alpha.c:5775
+#: vms-alpha.c:5772
 msgid " PIC"
 msgstr ""
 
-#: vms-alpha.c:5777
+#: vms-alpha.c:5774
 msgid " LIB"
 msgstr ""
 
-#: vms-alpha.c:5779
+#: vms-alpha.c:5776
 msgid " OVR"
 msgstr ""
 
-#: vms-alpha.c:5783
+#: vms-alpha.c:5780
 msgid " GBL"
 msgstr ""
 
-#: vms-alpha.c:5785
+#: vms-alpha.c:5782
 msgid " SHR"
 msgstr ""
 
-#: vms-alpha.c:5787
+#: vms-alpha.c:5784
 msgid " EXE"
 msgstr ""
 
-#: vms-alpha.c:5789
+#: vms-alpha.c:5786
 msgid " RD"
 msgstr ""
 
-#: vms-alpha.c:5791
+#: vms-alpha.c:5788
 msgid " WRT"
 msgstr ""
 
-#: vms-alpha.c:5793
+#: vms-alpha.c:5790
 msgid " VEC"
 msgstr ""
 
-#: vms-alpha.c:5795
+#: vms-alpha.c:5792
 msgid " NOMOD"
 msgstr ""
 
-#: vms-alpha.c:5797
+#: vms-alpha.c:5794
 msgid " COM"
 msgstr ""
 
-#: vms-alpha.c:5799
+#: vms-alpha.c:5796
 msgid " 64B"
 msgstr ""
 
-#: vms-alpha.c:5808
+#: vms-alpha.c:5805
 #, c-format
 msgid "  EGSD (len=%u):\n"
 msgstr ""
 
-#: vms-alpha.c:5820
+#: vms-alpha.c:5817
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
 msgstr ""
 
-#: vms-alpha.c:5832
+#: vms-alpha.c:5829
 #, c-format
 msgid "PSC - Program section definition\n"
 msgstr ""
 
-#: vms-alpha.c:5833 vms-alpha.c:5850
+#: vms-alpha.c:5830 vms-alpha.c:5847
 #, c-format
 msgid "   alignment  : 2**%u\n"
 msgstr ""
 
-#: vms-alpha.c:5834 vms-alpha.c:5851
+#: vms-alpha.c:5831 vms-alpha.c:5848
 #, c-format
 msgid "   flags      : 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:5838
+#: vms-alpha.c:5835
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr ""
 
-#: vms-alpha.c:5839 vms-alpha.c:5896 vms-alpha.c:5945
+#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942
 #, c-format
 msgid "   name       : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5849
+#: vms-alpha.c:5846
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
 msgstr ""
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5852
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr ""
 
-#: vms-alpha.c:5856
+#: vms-alpha.c:5853
 #, c-format
 msgid "   image offset  : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5858
+#: vms-alpha.c:5855
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5860
+#: vms-alpha.c:5857
 #, c-format
 msgid "   name          : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5873
+#: vms-alpha.c:5870
 #, c-format
 msgid "SYM - Global symbol definition\n"
 msgstr ""
 
-#: vms-alpha.c:5874 vms-alpha.c:5934 vms-alpha.c:5955 vms-alpha.c:5974
+#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971
 #, c-format
 msgid "   flags: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:5877
+#: vms-alpha.c:5874
 #, c-format
 msgid "   psect offset: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5881
+#: vms-alpha.c:5878
 #, c-format
 msgid "   code address: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5883
+#: vms-alpha.c:5880
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr ""
 
-#: vms-alpha.c:5886 vms-alpha.c:5962 vms-alpha.c:5981
+#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978
 #, c-format
 msgid "   psect index : %u\n"
 msgstr ""
 
-#: vms-alpha.c:5888 vms-alpha.c:5964 vms-alpha.c:5983
+#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980
 #, c-format
 msgid "   name        : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5895
+#: vms-alpha.c:5892
 #, c-format
 msgid "SYM - Global symbol reference\n"
 msgstr ""
 
-#: vms-alpha.c:5907
+#: vms-alpha.c:5904
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr ""
 
-#: vms-alpha.c:5908
+#: vms-alpha.c:5905
 #, c-format
 msgid "   flags         : 0x%08x"
 msgstr ""
 
-#: vms-alpha.c:5912
+#: vms-alpha.c:5909
 #, c-format
 msgid "   id match      : %x\n"
 msgstr ""
 
-#: vms-alpha.c:5914
+#: vms-alpha.c:5911
 #, c-format
 msgid "   error severity: %x\n"
 msgstr ""
 
-#: vms-alpha.c:5917
+#: vms-alpha.c:5914
 #, c-format
 msgid "   entity name   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5919
+#: vms-alpha.c:5916
 #, c-format
 msgid "   object name   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5922
+#: vms-alpha.c:5919
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5925
+#: vms-alpha.c:5922
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5933
+#: vms-alpha.c:5930
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
 msgstr ""
 
-#: vms-alpha.c:5937
+#: vms-alpha.c:5934
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5939
+#: vms-alpha.c:5936
 #, c-format
 msgid "   entry point: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5941
+#: vms-alpha.c:5938
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5943
+#: vms-alpha.c:5940
 #, c-format
 msgid "   psect index: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5954
+#: vms-alpha.c:5951
 #, c-format
 msgid "SYMV - Vectored symbol definition\n"
 msgstr ""
 
-#: vms-alpha.c:5958
+#: vms-alpha.c:5955
 #, c-format
 msgid "   vector      : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5960 vms-alpha.c:5979
+#: vms-alpha.c:5957 vms-alpha.c:5976
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5973
+#: vms-alpha.c:5970
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
 msgstr ""
 
-#: vms-alpha.c:5977
+#: vms-alpha.c:5974
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5988
+#: vms-alpha.c:5985
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr ""
 
-#: vms-alpha.c:6022
+#: vms-alpha.c:6019
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6025
+#: vms-alpha.c:6022
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6029
+#: vms-alpha.c:6026
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6034
+#: vms-alpha.c:6031
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6039
+#: vms-alpha.c:6036
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6049
+#: vms-alpha.c:6046
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr ""
 
-#: vms-alpha.c:6064
+#: vms-alpha.c:6061
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr ""
 
-#: vms-alpha.c:6068
+#: vms-alpha.c:6065
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6072
+#: vms-alpha.c:6069
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6076
+#: vms-alpha.c:6073
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6081
+#: vms-alpha.c:6078
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6082
+#: vms-alpha.c:6079
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6088
+#: vms-alpha.c:6085
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr ""
 
-#: vms-alpha.c:6091
+#: vms-alpha.c:6088
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr ""
 
-#: vms-alpha.c:6094
+#: vms-alpha.c:6091
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr ""
 
-#: vms-alpha.c:6098
+#: vms-alpha.c:6095
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr ""
 
-#: vms-alpha.c:6101
+#: vms-alpha.c:6098
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr ""
 
-#: vms-alpha.c:6104
+#: vms-alpha.c:6101
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr ""
 
-#: vms-alpha.c:6107
+#: vms-alpha.c:6104
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr ""
 
-#: vms-alpha.c:6113
+#: vms-alpha.c:6110
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr ""
 
-#: vms-alpha.c:6120
+#: vms-alpha.c:6117
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6124
+#: vms-alpha.c:6121
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6128
+#: vms-alpha.c:6125
 #, c-format
 msgid "STO_RB (store relative branch)\n"
 msgstr ""
 
-#: vms-alpha.c:6131
+#: vms-alpha.c:6128
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
 msgstr ""
 
-#: vms-alpha.c:6134
+#: vms-alpha.c:6131
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr ""
 
-#: vms-alpha.c:6140
+#: vms-alpha.c:6137
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr ""
 
-#: vms-alpha.c:6147
+#: vms-alpha.c:6144
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6151
+#: vms-alpha.c:6148
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr ""
 
-#: vms-alpha.c:6154
+#: vms-alpha.c:6151
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
 msgstr ""
 
-#: vms-alpha.c:6157
+#: vms-alpha.c:6154
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
 msgstr ""
 
-#: vms-alpha.c:6161
+#: vms-alpha.c:6158
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr ""
 
-#: vms-alpha.c:6164
+#: vms-alpha.c:6161
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr ""
 
-#: vms-alpha.c:6167
+#: vms-alpha.c:6164
 #, c-format
 msgid "OPR_SUB (substract)\n"
 msgstr ""
 
-#: vms-alpha.c:6170
+#: vms-alpha.c:6167
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr ""
 
-#: vms-alpha.c:6173
+#: vms-alpha.c:6170
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr ""
 
-#: vms-alpha.c:6176
+#: vms-alpha.c:6173
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr ""
 
-#: vms-alpha.c:6179
+#: vms-alpha.c:6176
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr ""
 
-#: vms-alpha.c:6182
+#: vms-alpha.c:6179
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr ""
 
-#: vms-alpha.c:6185
+#: vms-alpha.c:6182
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr ""
 
-#: vms-alpha.c:6188
+#: vms-alpha.c:6185
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr ""
 
-#: vms-alpha.c:6191
+#: vms-alpha.c:6188
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr ""
 
-#: vms-alpha.c:6194
+#: vms-alpha.c:6191
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr ""
 
-#: vms-alpha.c:6197
+#: vms-alpha.c:6194
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr ""
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6197
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr ""
 
-#: vms-alpha.c:6203
+#: vms-alpha.c:6200
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr ""
 
-#: vms-alpha.c:6206
+#: vms-alpha.c:6203
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr ""
 
-#: vms-alpha.c:6209
+#: vms-alpha.c:6206
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr ""
 
-#: vms-alpha.c:6213
+#: vms-alpha.c:6210
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr ""
 
-#: vms-alpha.c:6217
+#: vms-alpha.c:6214
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr ""
 
-#: vms-alpha.c:6218
+#: vms-alpha.c:6215
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6218
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6224
+#: vms-alpha.c:6221
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr ""
 
-#: vms-alpha.c:6225
+#: vms-alpha.c:6222
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6229
+#: vms-alpha.c:6226
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr ""
 
-#: vms-alpha.c:6230
+#: vms-alpha.c:6227
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6234
+#: vms-alpha.c:6231
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6236
+#: vms-alpha.c:6233
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6243
+#: vms-alpha.c:6240
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6247
+#: vms-alpha.c:6244
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6251
+#: vms-alpha.c:6248
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6255
+#: vms-alpha.c:6252
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6259
+#: vms-alpha.c:6256
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6263
+#: vms-alpha.c:6260
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6267
+#: vms-alpha.c:6264
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6271
+#: vms-alpha.c:6268
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6276
+#: vms-alpha.c:6273
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6280
+#: vms-alpha.c:6277
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6284
+#: vms-alpha.c:6281
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
 msgstr ""
 
-#: vms-alpha.c:6290
+#: vms-alpha.c:6287
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
 msgstr ""
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6291
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
 msgstr ""
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6294
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr ""
 
-#: vms-alpha.c:6300
+#: vms-alpha.c:6297
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
 msgstr ""
 
-#: vms-alpha.c:6303 vms-alpha.c:6717
+#: vms-alpha.c:6300 vms-alpha.c:6714
 #, c-format
 msgid "*unhandled*\n"
 msgstr ""
 
-#: vms-alpha.c:6333 vms-alpha.c:6372
+#: vms-alpha.c:6330 vms-alpha.c:6369
 #, c-format
 msgid "cannot read GST record length\n"
 msgstr ""
 
 #. Ill-formed.
-#: vms-alpha.c:6354
+#: vms-alpha.c:6351
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr ""
 
-#: vms-alpha.c:6380
+#: vms-alpha.c:6377
 #, c-format
 msgid "cannot read GST record header\n"
 msgstr ""
 
-#: vms-alpha.c:6393
+#: vms-alpha.c:6390
 #, c-format
 msgid " corrupted GST\n"
 msgstr ""
 
-#: vms-alpha.c:6401
+#: vms-alpha.c:6398
 #, c-format
 msgid "cannot read GST record\n"
 msgstr ""
 
-#: vms-alpha.c:6430
+#: vms-alpha.c:6427
 #, c-format
 msgid " unhandled EOBJ record type %u\n"
 msgstr ""
 
-#: vms-alpha.c:6453
+#: vms-alpha.c:6450
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6466
+#: vms-alpha.c:6463
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
 msgstr ""
 
-#: vms-alpha.c:6473
+#: vms-alpha.c:6470
 #, c-format
 msgid " %08x"
 msgstr ""
 
-#: vms-alpha.c:6498
+#: vms-alpha.c:6495
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr ""
 
-#: vms-alpha.c:6503
+#: vms-alpha.c:6500
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6524
+#: vms-alpha.c:6521
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr ""
 
-#: vms-alpha.c:6531
+#: vms-alpha.c:6528
 #, c-format
 msgid " 0x%08x"
 msgstr ""
 
 #. 64 bits.
-#: vms-alpha.c:6653
+#: vms-alpha.c:6650
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr ""
 
-#: vms-alpha.c:6657
+#: vms-alpha.c:6654
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6668
+#: vms-alpha.c:6665
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr ""
 
-#: vms-alpha.c:6672
+#: vms-alpha.c:6669
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6676
+#: vms-alpha.c:6673
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6680
+#: vms-alpha.c:6677
 #, c-format
 msgid "Strides:\n"
 msgstr ""
 
-#: vms-alpha.c:6685
+#: vms-alpha.c:6682
 #, c-format
 msgid "[%u]: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6690
+#: vms-alpha.c:6687
 #, c-format
 msgid "Bounds:\n"
 msgstr ""
 
-#: vms-alpha.c:6695
+#: vms-alpha.c:6692
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6707
+#: vms-alpha.c:6704
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr ""
 
-#: vms-alpha.c:6711
+#: vms-alpha.c:6708
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6731
+#: vms-alpha.c:6728
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr ""
 
-#: vms-alpha.c:6737
+#: vms-alpha.c:6734
 #, c-format
 msgid "(no value)\n"
 msgstr ""
 
-#: vms-alpha.c:6740
+#: vms-alpha.c:6737
 #, c-format
 msgid "(not active)\n"
 msgstr ""
 
-#: vms-alpha.c:6743
+#: vms-alpha.c:6740
 #, c-format
 msgid "(not allocated)\n"
 msgstr ""
 
-#: vms-alpha.c:6746
+#: vms-alpha.c:6743
 #, c-format
 msgid "(descriptor)\n"
 msgstr ""
 
-#: vms-alpha.c:6750
+#: vms-alpha.c:6747
 #, c-format
 msgid "(trailing value)\n"
 msgstr ""
 
-#: vms-alpha.c:6753
+#: vms-alpha.c:6750
 #, c-format
 msgid "(value spec follows)\n"
 msgstr ""
 
-#: vms-alpha.c:6756
+#: vms-alpha.c:6753
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr ""
 
-#: vms-alpha.c:6759
+#: vms-alpha.c:6756
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr ""
 
-#: vms-alpha.c:6766
+#: vms-alpha.c:6763
 msgid "literal"
 msgstr ""
 
-#: vms-alpha.c:6769
+#: vms-alpha.c:6766
 msgid "address"
 msgstr ""
 
-#: vms-alpha.c:6772
+#: vms-alpha.c:6769
 msgid "desc"
 msgstr ""
 
-#: vms-alpha.c:6775
+#: vms-alpha.c:6772
 msgid "reg"
 msgstr ""
 
-#: vms-alpha.c:6850
+#: vms-alpha.c:6847
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr ""
 
-#: vms-alpha.c:6861
+#: vms-alpha.c:6858
 #, c-format
 msgid "cannot read DST header\n"
 msgstr ""
 
-#: vms-alpha.c:6866
+#: vms-alpha.c:6863
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr ""
 
-#: vms-alpha.c:6880
+#: vms-alpha.c:6877
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr ""
 
-#: vms-alpha.c:6923
+#: vms-alpha.c:6920
 #, c-format
 msgid "standard data: %s\n"
 msgstr ""
 
-#: vms-alpha.c:6926 vms-alpha.c:7010
+#: vms-alpha.c:6923 vms-alpha.c:7007
 #, c-format
 msgid "    name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6933
+#: vms-alpha.c:6930
 #, c-format
 msgid "modbeg\n"
 msgstr ""
 
-#: vms-alpha.c:6934
+#: vms-alpha.c:6931
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6940 vms-alpha.c:7206
+#: vms-alpha.c:6937 vms-alpha.c:7203
 #, c-format
 msgid "   module name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6943
+#: vms-alpha.c:6940
 #, c-format
 msgid "   compiler   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6948
+#: vms-alpha.c:6945
 #, c-format
 msgid "modend\n"
 msgstr ""
 
-#: vms-alpha.c:6955
+#: vms-alpha.c:6952
 msgid "rtnbeg\n"
 msgstr ""
 
-#: vms-alpha.c:6956
+#: vms-alpha.c:6953
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6961
+#: vms-alpha.c:6958
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6969
+#: vms-alpha.c:6966
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6977
+#: vms-alpha.c:6974
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6985
+#: vms-alpha.c:6982
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6994
+#: vms-alpha.c:6991
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7003
+#: vms-alpha.c:7000
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7009
+#: vms-alpha.c:7006
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7016
+#: vms-alpha.c:7013
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7025
+#: vms-alpha.c:7022
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7029
 #, c-format
 msgid "recend\n"
 msgstr ""
 
-#: vms-alpha.c:7035
+#: vms-alpha.c:7032
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7039
+#: vms-alpha.c:7036
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7043
+#: vms-alpha.c:7040
 #, c-format
 msgid "enumend\n"
 msgstr ""
 
-#: vms-alpha.c:7060
+#: vms-alpha.c:7057
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7062
+#: vms-alpha.c:7059
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7072
+#: vms-alpha.c:7069
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7089
+#: vms-alpha.c:7086
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr ""
 
-#: vms-alpha.c:7096
+#: vms-alpha.c:7093
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7102
+#: vms-alpha.c:7099
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7108
+#: vms-alpha.c:7105
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7114
+#: vms-alpha.c:7111
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr ""
 
-#: vms-alpha.c:7119
+#: vms-alpha.c:7116
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr ""
 
-#: vms-alpha.c:7124
+#: vms-alpha.c:7121
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr ""
 
-#: vms-alpha.c:7129
+#: vms-alpha.c:7126
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7133
+#: vms-alpha.c:7130
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7138
+#: vms-alpha.c:7135
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr ""
 
-#: vms-alpha.c:7140
+#: vms-alpha.c:7137
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7145
+#: vms-alpha.c:7142
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:7147
+#: vms-alpha.c:7144
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7153
+#: vms-alpha.c:7150
 #, c-format
 msgid "delta pc +%-4d"
 msgstr ""
 
-#: vms-alpha.c:7156
+#: vms-alpha.c:7153
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7161
+#: vms-alpha.c:7158
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr ""
 
-#: vms-alpha.c:7176
+#: vms-alpha.c:7173
 #, c-format
 msgid "source (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7190
+#: vms-alpha.c:7187
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7194
+#: vms-alpha.c:7191
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7203
+#: vms-alpha.c:7200
 #, c-format
 msgid "   filename   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7212
+#: vms-alpha.c:7209
 #, c-format
 msgid "   setfile %u\n"
 msgstr ""
 
-#: vms-alpha.c:7217 vms-alpha.c:7222
+#: vms-alpha.c:7214 vms-alpha.c:7219
 #, c-format
 msgid "   setrec %u\n"
 msgstr ""
 
-#: vms-alpha.c:7227 vms-alpha.c:7232
+#: vms-alpha.c:7224 vms-alpha.c:7229
 #, c-format
 msgid "   setlnum %u\n"
 msgstr ""
 
-#: vms-alpha.c:7237 vms-alpha.c:7242
+#: vms-alpha.c:7234 vms-alpha.c:7239
 #, c-format
 msgid "   deflines %u\n"
 msgstr ""
 
-#: vms-alpha.c:7246
+#: vms-alpha.c:7243
 #, c-format
 msgid "   formfeed\n"
 msgstr ""
 
-#: vms-alpha.c:7250
+#: vms-alpha.c:7247
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr ""
 
-#: vms-alpha.c:7262
+#: vms-alpha.c:7259
 #, c-format
 msgid "*unhandled* dst type %u\n"
 msgstr ""
 
-#: vms-alpha.c:7294
+#: vms-alpha.c:7291
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr ""
 
-#: vms-alpha.c:7297
+#: vms-alpha.c:7294
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7300
+#: vms-alpha.c:7297
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7308
+#: vms-alpha.c:7305
 msgid "executable"
 msgstr ""
 
-#: vms-alpha.c:7311
+#: vms-alpha.c:7308
 msgid "linkable image"
 msgstr ""
 
-#: vms-alpha.c:7317
+#: vms-alpha.c:7314
 #, c-format
 msgid " image type: %u (%s)"
 msgstr ""
 
-#: vms-alpha.c:7323
+#: vms-alpha.c:7320
 msgid "native"
 msgstr ""
 
-#: vms-alpha.c:7326
+#: vms-alpha.c:7323
 msgid "CLI"
 msgstr ""
 
-#: vms-alpha.c:7332
+#: vms-alpha.c:7329
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ""
 
-#: vms-alpha.c:7338
+#: vms-alpha.c:7335
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7342
+#: vms-alpha.c:7339
 #, c-format
 msgid " fixup info rva: "
 msgstr ""
 
-#: vms-alpha.c:7344
+#: vms-alpha.c:7341
 #, c-format
 msgid ", symbol vector rva: "
 msgstr ""
 
-#: vms-alpha.c:7347
+#: vms-alpha.c:7344
 #, c-format
 msgid ""
 "\n"
 " version array off: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7351
+#: vms-alpha.c:7348
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7357
+#: vms-alpha.c:7354
 #, c-format
 msgid " linker flags: %08x:"
 msgstr ""
 
-#: vms-alpha.c:7387
+#: vms-alpha.c:7384
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7393
+#: vms-alpha.c:7390
 #, c-format
 msgid " BPAGE: %u"
 msgstr ""
 
-#: vms-alpha.c:7399
+#: vms-alpha.c:7396
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ""
 
-#: vms-alpha.c:7402
+#: vms-alpha.c:7399
 #, c-format
 msgid ", alias: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7410
+#: vms-alpha.c:7407
 #, c-format
 msgid "system version array information:\n"
 msgstr ""
 
-#: vms-alpha.c:7414
+#: vms-alpha.c:7411
 #, c-format
 msgid "cannot read EIHVN header\n"
 msgstr ""
 
-#: vms-alpha.c:7424
+#: vms-alpha.c:7421
 #, c-format
 msgid "cannot read EIHVN version\n"
 msgstr ""
 
-#: vms-alpha.c:7427
+#: vms-alpha.c:7424
 #, c-format
 msgid "   %02u "
 msgstr ""
 
-#: vms-alpha.c:7431
+#: vms-alpha.c:7428
 msgid "BASE_IMAGE       "
 msgstr ""
 
-#: vms-alpha.c:7434
+#: vms-alpha.c:7431
 msgid "MEMORY_MANAGEMENT"
 msgstr ""
 
-#: vms-alpha.c:7437
+#: vms-alpha.c:7434
 msgid "IO               "
 msgstr ""
 
-#: vms-alpha.c:7440
+#: vms-alpha.c:7437
 msgid "FILES_VOLUMES    "
 msgstr ""
 
-#: vms-alpha.c:7443
+#: vms-alpha.c:7440
 msgid "PROCESS_SCHED    "
 msgstr ""
 
-#: vms-alpha.c:7446
+#: vms-alpha.c:7443
 msgid "SYSGEN           "
 msgstr ""
 
-#: vms-alpha.c:7449
+#: vms-alpha.c:7446
 msgid "CLUSTERS_LOCKMGR "
 msgstr ""
 
-#: vms-alpha.c:7452
+#: vms-alpha.c:7449
 msgid "LOGICAL_NAMES    "
 msgstr ""
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7452
 msgid "SECURITY         "
 msgstr ""
 
-#: vms-alpha.c:7458
+#: vms-alpha.c:7455
 msgid "IMAGE_ACTIVATOR  "
 msgstr ""
 
-#: vms-alpha.c:7461
+#: vms-alpha.c:7458
 msgid "NETWORKS         "
 msgstr ""
 
-#: vms-alpha.c:7464
+#: vms-alpha.c:7461
 msgid "COUNTERS         "
 msgstr ""
 
-#: vms-alpha.c:7467
+#: vms-alpha.c:7464
 msgid "STABLE           "
 msgstr ""
 
-#: vms-alpha.c:7470
+#: vms-alpha.c:7467
 msgid "MISC             "
 msgstr ""
 
-#: vms-alpha.c:7473
+#: vms-alpha.c:7470
 msgid "CPU              "
 msgstr ""
 
-#: vms-alpha.c:7476
+#: vms-alpha.c:7473
 msgid "VOLATILE         "
 msgstr ""
 
-#: vms-alpha.c:7479
+#: vms-alpha.c:7476
 msgid "SHELL            "
 msgstr ""
 
-#: vms-alpha.c:7482
+#: vms-alpha.c:7479
 msgid "POSIX            "
 msgstr ""
 
-#: vms-alpha.c:7485
+#: vms-alpha.c:7482
 msgid "MULTI_PROCESSING "
 msgstr ""
 
-#: vms-alpha.c:7488
+#: vms-alpha.c:7485
 msgid "GALAXY           "
 msgstr ""
 
-#: vms-alpha.c:7491
+#: vms-alpha.c:7488
 msgid "*unknown*        "
 msgstr ""
 
-#: vms-alpha.c:7494
+#: vms-alpha.c:7491
 #, c-format
 msgid ": %u.%u\n"
 msgstr ""
 
-#: vms-alpha.c:7507 vms-alpha.c:7766
+#: vms-alpha.c:7504 vms-alpha.c:7763
 #, c-format
 msgid "cannot read EIHA\n"
 msgstr ""
 
-#: vms-alpha.c:7510
+#: vms-alpha.c:7507
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr ""
 
-#: vms-alpha.c:7512
+#: vms-alpha.c:7509
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7515
+#: vms-alpha.c:7512
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7515
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7521
+#: vms-alpha.c:7518
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7524
+#: vms-alpha.c:7521
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7535
+#: vms-alpha.c:7532
 #, c-format
 msgid "cannot read EIHI\n"
 msgstr ""
 
-#: vms-alpha.c:7538
+#: vms-alpha.c:7535
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7541
+#: vms-alpha.c:7538
 #, c-format
 msgid " image name       : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7543
+#: vms-alpha.c:7540
 #, c-format
 msgid " link time        : %s\n"
 msgstr ""
 
-#: vms-alpha.c:7545
+#: vms-alpha.c:7542
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7547
+#: vms-alpha.c:7544
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7549
+#: vms-alpha.c:7546
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7559
+#: vms-alpha.c:7556
 #, c-format
 msgid "cannot read EIHS\n"
 msgstr ""
 
-#: vms-alpha.c:7562
+#: vms-alpha.c:7559
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7567
+#: vms-alpha.c:7564
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
 msgstr ""
 
-#: vms-alpha.c:7571
+#: vms-alpha.c:7568
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7575
+#: vms-alpha.c:7572
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7588
+#: vms-alpha.c:7585
 #, c-format
 msgid "cannot read EISD\n"
 msgstr ""
 
-#: vms-alpha.c:7598
+#: vms-alpha.c:7595
 #, c-format
 msgid ""
 "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7605
+#: vms-alpha.c:7602
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7610
+#: vms-alpha.c:7607
 #, c-format
 msgid " flags: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:7647
+#: vms-alpha.c:7644
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr ""
 
-#: vms-alpha.c:7653
+#: vms-alpha.c:7650
 msgid "NORMAL"
 msgstr ""
 
-#: vms-alpha.c:7656
+#: vms-alpha.c:7653
 msgid "SHRFXD"
 msgstr ""
 
-#: vms-alpha.c:7659
+#: vms-alpha.c:7656
 msgid "PRVFXD"
 msgstr ""
 
-#: vms-alpha.c:7662
+#: vms-alpha.c:7659
 msgid "SHRPIC"
 msgstr ""
 
-#: vms-alpha.c:7665
+#: vms-alpha.c:7662
 msgid "PRVPIC"
 msgstr ""
 
-#: vms-alpha.c:7668
+#: vms-alpha.c:7665
 msgid "USRSTACK"
 msgstr ""
 
-#: vms-alpha.c:7676
+#: vms-alpha.c:7673
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7686
+#: vms-alpha.c:7683
 #, c-format
 msgid "cannot read DMT\n"
 msgstr ""
 
-#: vms-alpha.c:7690
+#: vms-alpha.c:7687
 #, c-format
 msgid "Debug module table:\n"
 msgstr ""
 
-#: vms-alpha.c:7699
+#: vms-alpha.c:7696
 #, c-format
 msgid "cannot read DMT header\n"
 msgstr ""
 
-#: vms-alpha.c:7704
+#: vms-alpha.c:7701
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
 msgstr ""
 
-#: vms-alpha.c:7714
+#: vms-alpha.c:7711
 #, c-format
 msgid "cannot read DMT psect\n"
 msgstr ""
 
-#: vms-alpha.c:7717
+#: vms-alpha.c:7714
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7730
+#: vms-alpha.c:7727
 #, c-format
 msgid "cannot read DST\n"
 msgstr ""
 
-#: vms-alpha.c:7740
+#: vms-alpha.c:7737
 #, c-format
 msgid "cannot read GST\n"
 msgstr ""
 
-#: vms-alpha.c:7744
+#: vms-alpha.c:7741
 #, c-format
 msgid "Global symbol table:\n"
 msgstr ""
 
-#: vms-alpha.c:7772
+#: vms-alpha.c:7769
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7775
+#: vms-alpha.c:7772
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7775
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:7781
+#: vms-alpha.c:7778
 #, c-format
 msgid "  size : %u\n"
 msgstr ""
 
-#: vms-alpha.c:7783
+#: vms-alpha.c:7780
 #, c-format
 msgid "  flags: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7787
+#: vms-alpha.c:7784
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7791
+#: vms-alpha.c:7788
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7795
+#: vms-alpha.c:7792
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7798
+#: vms-alpha.c:7795
 #, c-format
 msgid "  chgprtoff : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7801
+#: vms-alpha.c:7798
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7803
+#: vms-alpha.c:7800
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7806
+#: vms-alpha.c:7803
 #, c-format
 msgid "  base_va : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7808
+#: vms-alpha.c:7805
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
 msgstr ""
 
-#: vms-alpha.c:7816
+#: vms-alpha.c:7813
 #, c-format
 msgid " Shareable images:\n"
 msgstr ""
 
-#: vms-alpha.c:7820
+#: vms-alpha.c:7817
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7827
+#: vms-alpha.c:7824
 #, c-format
 msgid " quad-word relocation fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7832
+#: vms-alpha.c:7829
 #, c-format
 msgid " long-word relocation fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7837
+#: vms-alpha.c:7834
 #, c-format
 msgid " quad-word .address reference fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7842
+#: vms-alpha.c:7839
 #, c-format
 msgid " long-word .address reference fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7847
+#: vms-alpha.c:7844
 #, c-format
 msgid " Code Address Reference Fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7852
+#: vms-alpha.c:7849
 #, c-format
 msgid " Linkage Pairs Referece Fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7861
+#: vms-alpha.c:7858
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr ""
 
-#: vms-alpha.c:7866
+#: vms-alpha.c:7863
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
 msgstr ""
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8706
+#: vms-alpha.c:8694
 msgid "%P: relocatable link is not supported\n"
 msgstr ""
 
-#: vms-alpha.c:8776
+#: vms-alpha.c:8764
 msgid "%P: multiple entry points: in modules %B and %B\n"
 msgstr ""
 
-#: vms-lib.c:1423
+#: vms-lib.c:1421
 #, c-format
 msgid "could not open shared image '%s' from '%s'"
 msgstr ""
@@ -5853,23 +5788,23 @@ msgstr ""
 msgid "warning: attempt to export undefined symbol `%s'"
 msgstr ""
 
-#: xcofflink.c:3678
+#: xcofflink.c:3681
 msgid "error: undefined symbol __rtinit"
 msgstr ""
 
-#: xcofflink.c:4057
+#: xcofflink.c:4060
 msgid "%B: loader reloc in unrecognized section `%s'"
 msgstr ""
 
-#: xcofflink.c:4068
+#: xcofflink.c:4071
 msgid "%B: `%s' in loader reloc but not loader sym"
 msgstr ""
 
-#: xcofflink.c:4084
+#: xcofflink.c:4087
 msgid "%B: loader reloc in read-only section %A"
 msgstr ""
 
-#: xcofflink.c:5106
+#: xcofflink.c:5109
 #, c-format
 msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"
 msgstr ""
@@ -5880,77 +5815,77 @@ msgid ""
 "branch."
 msgstr ""
 
-#: elf32-ia64.c:2284 elf64-ia64.c:2284
+#: elf32-ia64.c:2290 elf64-ia64.c:2290
 msgid "@pltoff reloc against local symbol"
 msgstr ""
 
-#: elf32-ia64.c:3687 elf64-ia64.c:3687
+#: elf32-ia64.c:3693 elf64-ia64.c:3693
 #, c-format
 msgid "%s: short data segment overflowed (0x%lx >= 0x400000)"
 msgstr ""
 
-#: elf32-ia64.c:3698 elf64-ia64.c:3698
+#: elf32-ia64.c:3704 elf64-ia64.c:3704
 #, c-format
 msgid "%s: __gp does not cover short data segment"
 msgstr ""
 
-#: elf32-ia64.c:3965 elf64-ia64.c:3965
+#: elf32-ia64.c:3971 elf64-ia64.c:3971
 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
 msgstr ""
 
-#: elf32-ia64.c:4032 elf64-ia64.c:4032
+#: elf32-ia64.c:4038 elf64-ia64.c:4038
 msgid "%B: @gprel relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf32-ia64.c:4095 elf64-ia64.c:4095
+#: elf32-ia64.c:4101 elf64-ia64.c:4101
 msgid "%B: linking non-pic code in a position independent executable"
 msgstr ""
 
-#: elf32-ia64.c:4232 elf64-ia64.c:4232
+#: elf32-ia64.c:4238 elf64-ia64.c:4238
 msgid "%B: @internal branch to dynamic symbol %s"
 msgstr ""
 
-#: elf32-ia64.c:4234 elf64-ia64.c:4234
+#: elf32-ia64.c:4240 elf64-ia64.c:4240
 msgid "%B: speculation fixup to dynamic symbol %s"
 msgstr ""
 
-#: elf32-ia64.c:4236 elf64-ia64.c:4236
+#: elf32-ia64.c:4242 elf64-ia64.c:4242
 msgid "%B: @pcrel relocation against dynamic symbol %s"
 msgstr ""
 
-#: elf32-ia64.c:4433 elf64-ia64.c:4433
+#: elf32-ia64.c:4439 elf64-ia64.c:4439
 msgid "unsupported reloc"
 msgstr ""
 
-#: elf32-ia64.c:4471 elf64-ia64.c:4471
+#: elf32-ia64.c:4477 elf64-ia64.c:4477
 msgid ""
 "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `"
 "%A'."
 msgstr ""
 
-#: elf32-ia64.c:4486 elf64-ia64.c:4486
+#: elf32-ia64.c:4492 elf64-ia64.c:4492
 msgid ""
 "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> "
 "0x1000000)."
 msgstr ""
 
-#: elf32-ia64.c:4748 elf64-ia64.c:4748
+#: elf32-ia64.c:4754 elf64-ia64.c:4754
 msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
 msgstr ""
 
-#: elf32-ia64.c:4757 elf64-ia64.c:4757
+#: elf32-ia64.c:4763 elf64-ia64.c:4763
 msgid "%B: linking big-endian files with little-endian files"
 msgstr ""
 
-#: elf32-ia64.c:4766 elf64-ia64.c:4766
+#: elf32-ia64.c:4772 elf64-ia64.c:4772
 msgid "%B: linking 64-bit files with 32-bit files"
 msgstr ""
 
-#: elf32-ia64.c:4775 elf64-ia64.c:4775
+#: elf32-ia64.c:4781 elf64-ia64.c:4781
 msgid "%B: linking constant-gp files with non-constant-gp files"
 msgstr ""
 
-#: elf32-ia64.c:4785 elf64-ia64.c:4785
+#: elf32-ia64.c:4791 elf64-ia64.c:4791
 msgid "%B: linking auto-pic files with non-auto-pic files"
 msgstr ""
 
diff --git a/bfd/po/es.po b/bfd/po/es.po
index 5ec9f78a11..a1663386e7 100644
--- a/bfd/po/es.po
+++ b/bfd/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para bfd 2.21.53.
+# Mensajes en español para bfd 2.20.90.
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bfd 2.21.53\n"
+"Project-Id-Version: bfd 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:25+0100\n"
-"PO-Revision-Date: 2011-09-23 17:21-0500\n"
+"POT-Creation-Date: 2010-11-05 11:31+0100\n"
+"PO-Revision-Date: 2011-08-24 11:47-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -43,133 +43,133 @@ msgstr "%s: no se puede representar la sección `%s' en el formato de fichero ob
 msgid "%s: can not represent section for symbol `%s' in a.out object file format"
 msgstr "%s: no se puede representar la sección para el símbolo `%s' en el formato de fichero objeto a.out"
 
-#: aoutx.h:1579 vms-alpha.c:7668
+#: aoutx.h:1579 vms-alpha.c:7649
 msgid "*unknown*"
 msgstr "*desconocido*"
 
-#: aoutx.h:4017 aoutx.h:4343
+#: aoutx.h:4007 aoutx.h:4333
 msgid "%P: %B: unexpected relocation type\n"
 msgstr "%P: %B: tipo de reubicación inesperado\n"
 
-#: aoutx.h:5374
+#: aoutx.h:5364
 #, c-format
 msgid "%s: relocatable link from %s to %s not supported"
 msgstr "%s: no se admite el enlace reubicable de %s a %s"
 
-#: archive.c:2194
+#: archive.c:2125
 msgid "Warning: writing archive was slow: rewriting timestamp\n"
 msgstr "Aviso: la escritura del fichero fue lenta: se reescribe la marca de tiempo\n"
 
 # ¡Uff! Si utilizáramos file=archivo, esta traducción sería imposible. cfuga
-#: archive.c:2482
+#: archive.c:2416
 msgid "Reading archive file mod timestamp"
 msgstr "Se lee la marca de tiempo modificada del fichero en el archivo"
 
-#: archive.c:2506
+#: archive.c:2440
 msgid "Writing updated armap timestamp"
 msgstr "Se escribe la marca de tiempo actualizada de armap"
 
-#: bfd.c:398
+#: bfd.c:395
 msgid "No error"
 msgstr "No hay error"
 
-#: bfd.c:399
+#: bfd.c:396
 msgid "System call error"
 msgstr "Error en la llamada al sistema"
 
-#: bfd.c:400
+#: bfd.c:397
 msgid "Invalid bfd target"
 msgstr "Objetivo bfd inválido"
 
-#: bfd.c:401
+#: bfd.c:398
 msgid "File in wrong format"
 msgstr "Fichero en formato erróneo"
 
-#: bfd.c:402
+#: bfd.c:399
 msgid "Archive object file in wrong format"
 msgstr "Archivo de ficheros objeto en formato erróneo"
 
-#: bfd.c:403
+#: bfd.c:400
 msgid "Invalid operation"
 msgstr "Operación inválida"
 
-#: bfd.c:404
+#: bfd.c:401
 msgid "Memory exhausted"
 msgstr "Memoria agotada"
 
-#: bfd.c:405
+#: bfd.c:402
 msgid "No symbols"
 msgstr "No hay símbolos"
 
-#: bfd.c:406
+#: bfd.c:403
 msgid "Archive has no index; run ranlib to add one"
 msgstr "El archivo no tiene índice; ejecute ranlib para agregar uno"
 
-#: bfd.c:407
+#: bfd.c:404
 msgid "No more archived files"
 msgstr "No hay más ficheros archivados"
 
-#: bfd.c:408
+#: bfd.c:405
 msgid "Malformed archive"
 msgstr "Archivo malformado"
 
-#: bfd.c:409
+#: bfd.c:406
 msgid "File format not recognized"
 msgstr "No se reconoce el formato del fichero"
 
-#: bfd.c:410
+#: bfd.c:407
 msgid "File format is ambiguous"
 msgstr "El formato del fichero es ambiguo"
 
-#: bfd.c:411
+#: bfd.c:408
 msgid "Section has no contents"
 msgstr "La sección no tiene contenido"
 
-#: bfd.c:412
+#: bfd.c:409
 msgid "Nonrepresentable section on output"
 msgstr "Sección no representable en la salida"
 
-#: bfd.c:413
+#: bfd.c:410
 msgid "Symbol needs debug section which does not exist"
 msgstr "Un símbolo requiere de una sección de depuración, la cual no existe"
 
-#: bfd.c:414
+#: bfd.c:411
 msgid "Bad value"
 msgstr "Valor erróneo"
 
-#: bfd.c:415
+#: bfd.c:412
 msgid "File truncated"
 msgstr "Fichero truncado"
 
-#: bfd.c:416
+#: bfd.c:413
 msgid "File too big"
 msgstr "El fichero es demasiado grande"
 
-#: bfd.c:417
+#: bfd.c:414
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Error al leer %s: %s"
 
-#: bfd.c:418
+#: bfd.c:415
 msgid "#<Invalid error code>"
 msgstr "#<Código de error inválido>"
 
-#: bfd.c:945
+#: bfd.c:939
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr "falló la aseveración BFD %s %s:%d"
 
-#: bfd.c:957
+#: bfd.c:951
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d in %s\n"
 msgstr "error interno de BFD %s, se aborta en %s línea %d en %s\n"
 
-#: bfd.c:961
+#: bfd.c:955
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d\n"
 msgstr "error interno de BFD %s, se aborta en %s línea %d\n"
 
-#: bfd.c:963
+#: bfd.c:957
 msgid "Please report this bug.\n"
 msgstr "Por favor reporte este bicho.\n"
 
@@ -188,9 +188,9 @@ msgstr "no se mapea: no se estableció la variable de ambiente\n"
 msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
 msgstr "Aviso: Se escribe la sección `%s' a un desplazamiento de fichero grande (pe negativo) 0x%lx."
 
-#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731
-#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360
-#: elf64-ia64.c:360
+#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1640 elf32-frv.c:5740
+#: elfxx-sparc.c:2795 reloc.c:5646 reloc16.c:162 elf32-ia64.c:842
+#: elf64-ia64.c:842
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr "%P%F: --relax y -r no se pueden usar juntos\n"
 
@@ -226,8 +226,8 @@ msgstr "%B: tipo de reubicación no admitida: ALPHA_R_GPRELHIGH"
 msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
 msgstr "%B: tipo de reubicación no admitida: ALPHA_R_GPRELLOW"
 
-#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228
-#: elf32-ia64.c:3845 elf64-ia64.c:3845
+#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:3991 elf64-alpha.c:4140
+#: elf32-ia64.c:4582 elf64-ia64.c:4582
 msgid "%B: unknown relocation type %d"
 msgstr "%B: tipo de reubicación %d desconocido"
 
@@ -241,7 +241,7 @@ msgstr "%B: no se puede encontrar el pegamento THUMB '%s' para `%s'"
 msgid "%B: unable to find ARM glue '%s' for `%s'"
 msgstr "%B: no se puede encontrar el pegamento ARM '%s' para `%s'"
 
-#: coff-arm.c:1369 elf32-arm.c:6980
+#: coff-arm.c:1369 elf32-arm.c:6501
 #, c-format
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
@@ -261,7 +261,7 @@ msgstr ""
 "  primer suceso: %B: llamada thumb a arm\n"
 "  considere reenlazar con --support-old-code activado"
 
-#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3081
+#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3043
 msgid "%B: bad reloc address 0x%lx in section `%A'"
 msgstr "%B: dirección de reubicación 0x%lx errónea en la sección `%A'"
 
@@ -274,12 +274,12 @@ msgstr "%B: índice de símbolos ilegal en la reubicación: %d"
 msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
 msgstr "error: %B está compilado para APCS-%d, mientras que %B está compilado para APCS-%d"
 
-#: coff-arm.c:2226 elf32-arm.c:15580
+#: coff-arm.c:2226 elf32-arm.c:14105
 #, c-format
 msgid "error: %B passes floats in float registers, whereas %B passes them in integer registers"
 msgstr "error: %B pasa números de coma flotante en registros de coma flotante, mientras que %B los pasa en registros enteros"
 
-#: coff-arm.c:2229 elf32-arm.c:15584
+#: coff-arm.c:2229 elf32-arm.c:14109
 #, c-format
 msgid "error: %B passes floats in integer registers, whereas %B passes them in float registers"
 msgstr "error: %B pasa números de coma flotante en registros enteros, mientras que %B los pasa en registros de coma flotante"
@@ -294,12 +294,12 @@ msgstr "error: %B está compilado como código independiente de posición, mient
 msgid "error: %B is compiled as absolute position code, whereas target %B is position independent"
 msgstr "error: %B está compilado como código de posición absoluta, mientras que el objetivo %B es independiente de posición"
 
-#: coff-arm.c:2274 elf32-arm.c:15649
+#: coff-arm.c:2274 elf32-arm.c:14174
 #, c-format
 msgid "Warning: %B supports interworking, whereas %B does not"
 msgstr "Aviso: %B admite interoperabilidad, mientras que %B no"
 
-#: coff-arm.c:2277 elf32-arm.c:15655
+#: coff-arm.c:2277 elf32-arm.c:14180
 #, c-format
 msgid "Warning: %B does not support interworking, whereas %B does"
 msgstr "Aviso: %B no admite interoperabilidad, mientras que %B sí"
@@ -309,7 +309,7 @@ msgstr "Aviso: %B no admite interoperabilidad, mientras que %B sí"
 msgid "private flags = %x:"
 msgstr "opciones privadas = %x:"
 
-#: coff-arm.c:2309 elf32-arm.c:11752
+#: coff-arm.c:2309 elf32-arm.c:10492
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr "[números de coma flotante pasados en registros de coma flotante]"
@@ -319,7 +319,7 @@ msgstr "[números de coma flotante pasados en registros de coma flotante]"
 msgid " [floats passed in integer registers]"
 msgstr "[números de coma flotante pasados en registros enteros]"
 
-#: coff-arm.c:2314 elf32-arm.c:11755
+#: coff-arm.c:2314 elf32-arm.c:10495
 #, c-format
 msgid " [position independent]"
 msgstr "[independiente de posición]"
@@ -344,12 +344,12 @@ msgstr "[admite interoperabilidad]"
 msgid " [interworking not supported]"
 msgstr "[no admite interoperabilidad]"
 
-#: coff-arm.c:2370 elf32-arm.c:10787
+#: coff-arm.c:2370 elf32-arm.c:9520
 #, c-format
 msgid "Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"
 msgstr "Aviso: No se establece la opción de interoperabilidad de %B ya que se había especificado con anterioridad como no interoperable"
 
-#: coff-arm.c:2374 elf32-arm.c:10791
+#: coff-arm.c:2374 elf32-arm.c:9524
 #, c-format
 msgid "Warning: Clearing the interworking flag of %B due to outside request"
 msgstr "Aviso: Se limpia la opción de interoperabilidad de %B debido a una petición externa"
@@ -361,10 +361,10 @@ msgstr "no se puede manejar la reubicación R_MEM_INDIRECT cuando se utiliza la
 
 #: coff-i860.c:147
 #, c-format
-msgid "relocation `%s' not yet implemented"
-msgstr "la reubicación `%s' aún no se implementa"
+msgid "Relocation `%s' not yet implemented\n"
+msgstr "La reubicación `%s' aún no está implementada\n"
 
-#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192
+#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5147
 msgid "%B: warning: illegal symbol index %ld in relocs"
 msgstr "%B: aviso: índice de símbolos %ld ilegal en reubicaciones"
 
@@ -372,7 +372,7 @@ msgstr "%B: aviso: índice de símbolos %ld ilegal en reubicaciones"
 msgid "uncertain calling convention for non-COFF symbol"
 msgstr "convención de llamada incierta para un símbolo que no es COFF"
 
-#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677
+#: coff-m68k.c:506 elf32-bfin.c:5678 elf32-cr16.c:2897 elf32-m68k.c:4672
 msgid "unsupported reloc type"
 msgstr "no se admite el tipo de reubicación"
 
@@ -385,25 +385,20 @@ msgstr "reubicación relativa a GP cuando _gp no está definido"
 msgid "Unrecognized reloc"
 msgstr "No se reconoce la reubicación"
 
-#: coff-rs6000.c:2676
+#: coff-rs6000.c:2794
 #, c-format
 msgid "%s: unsupported relocation type 0x%02x"
 msgstr "%s: no se admite el tipo de reubicación 0x%02x"
 
-#: coff-rs6000.c:2761
+#: coff-rs6000.c:2887
 #, c-format
 msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"
 msgstr "%s: reubicación de TOC en 0x%x al símbolo `%s' sin entrada TOC"
 
-#: coff-rs6000.c:3512 coff64-rs6000.c:2111
+#: coff-rs6000.c:3652 coff64-rs6000.c:2175
 msgid "%B: symbol `%s' has unrecognized smclas %d"
 msgstr "%B: el símbolo `%s' tiene smclas %d que no se reconoce"
 
-#: coff-sh.c:521
-#, c-format
-msgid "SH Error: unknown reloc type %d"
-msgstr "Error SH: tipo de reubicación %d desconocido"
-
 #: coff-tic4x.c:195 coff-tic54x.c:299 coff-tic80.c:458
 #, c-format
 msgid "Unrecognized reloc type 0x%x"
@@ -419,84 +414,80 @@ msgstr "%s: aviso: índice de símbolos %ld ilegal en reubicaciones"
 msgid "ignoring reloc %s\n"
 msgstr "se descarta la reubicación %s\n"
 
-#: coffcode.h:991
+#: coffcode.h:973
 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr "%B: aviso: el símbolo COMDAT '%s' no coincide con el nombre de sección '%s'"
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1215
+#: coffcode.h:1197
 msgid "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
 msgstr "%B: Aviso: Se descarta la opción de sección IMAGE_SCN_MEM_NOT_PAGED en la sección %s"
 
-#: coffcode.h:1282
+#: coffcode.h:1264
 msgid "%B (%s): Section flag %s (0x%x) ignored"
 msgstr "%B (%s): Se descarta la opción de sección %s (0x%x)"
 
-#: coffcode.h:2424
+#: coffcode.h:2390
 #, c-format
 msgid "Unrecognized TI COFF target id '0x%x'"
 msgstr "No se reconoce el id de objetivo COFF TI '0x%x'"
 
-#: coffcode.h:2738
+#: coffcode.h:2704
 msgid "%B: reloc against a non-existant symbol index: %ld"
 msgstr "%B: reubicación contra un índice de símbolo que no existe: %ld"
 
-#: coffcode.h:3296
+#: coffcode.h:3262
 msgid "%B: too many sections (%d)"
 msgstr "%B: Demasiadas secciones (%d)"
 
-#: coffcode.h:3712
+#: coffcode.h:3676
 msgid "%B: section %s: string table overflow at offset %ld"
 msgstr "%B: sección %s: desbordamiento de tabla de cadenas en el desplazamiento %ld"
 
-#: coffcode.h:4517
+#: coffcode.h:4481
 msgid "%B: warning: line number table read failed"
 msgstr "%B: aviso: falló la lectura de tabla de números de línea"
 
-#: coffcode.h:4547
+#: coffcode.h:4511
 msgid "%B: warning: illegal symbol index %ld in line numbers"
 msgstr "%B: aviso: índice de símbolos %ld ilegal en los números de línea"
 
-#: coffcode.h:4561
+#: coffcode.h:4525
 msgid "%B: warning: duplicate line number information for `%s'"
 msgstr "%B: aviso: información de números de línea duplicada para `%s'"
 
-#: coffcode.h:4961
+#: coffcode.h:4916
 msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
 msgstr "%B: No se reconoce la clase de almacenamiento %d para %s símbolo `%s'"
 
-#: coffcode.h:5087
+#: coffcode.h:5042
 msgid "warning: %B: local symbol `%s' has no section"
 msgstr "aviso: %B: el símbolo local `%s' no tiene sección"
 
-#: coffcode.h:5231
+#: coffcode.h:5186
 msgid "%B: illegal relocation type %d at address 0x%lx"
 msgstr "%B: tipo de reubicación %d ilegal en la dirección 0x%lx"
 
-#: coffgen.c:1578
+#: coffgen.c:1573
 msgid "%B: bad string table size %lu"
 msgstr "%B: tamaño de tabla de cadenas %lu erróneo"
 
-#: cofflink.c:533 elflink.c:4353
+#: cofflink.c:524 elflink.c:4339
 msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
 msgstr "Aviso: el tipo del símbolo `%s' cambió de %d a %d en %B"
 
-#: cofflink.c:2330
+#: cofflink.c:2321
 msgid "%B: relocs in section `%A', but it has no contents"
 msgstr "%B: reubicaciones en la sección `%A', pero no tiene contenido"
 
-#: cofflink.c:2392 elflink.c:9554
-msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
-msgstr "%X`%s' referido en la sección `%A' de %B: se definió en la sección descartada `%A' de %B\n"
-
-#: cofflink.c:2690 coffswap.h:826
+#: cofflink.c:2652 coffswap.h:826
 #, c-format
 msgid "%s: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr "%s: %s: desbordamiento de reubicación: 0x%lx > 0xffff"
 
-#: cofflink.c:2699 coffswap.h:812
+#: cofflink.c:2661 coffswap.h:812
 #, c-format
 msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr "%s: aviso: %s: desbordamiento de número de línea: 0x%lx > 0xffff"
@@ -542,22 +533,22 @@ msgstr "Error de Dwarf: Máximo de operaciones por instrucción inválido."
 msgid "Dwarf Error: mangled line number section."
 msgstr "Error de Dwarf: sección de números de línea revuelta."
 
-#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383
+#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2382
 #, c-format
 msgid "Dwarf Error: Could not find abbrev number %u."
 msgstr "Error de Dwarf: No se puede encontrar el número de abreviatura %u."
 
-#: dwarf2.c:2344
+#: dwarf2.c:2343
 #, c-format
 msgid "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 and 4 information."
 msgstr "Error de Dwarf: se encontró la versión de dwarf '%u', este lector solamente maneja información de las versiones 2, 3 y 4."
 
-#: dwarf2.c:2351
+#: dwarf2.c:2350
 #, c-format
 msgid "Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."
 msgstr "Error de Dwarf: se encontró el tamaño de dirección '%u', este lector no puede manejar tamaños más grandes que '%u'."
 
-#: dwarf2.c:2374
+#: dwarf2.c:2373
 #, c-format
 msgid "Dwarf Error: Bad abbrev number: %u."
 msgstr "Error de Dwarf: Número de abreviación erróneo: %u."
@@ -655,34 +646,30 @@ msgstr "%P: error en %B(%A); no se creará la tabla .eh_frame_hdr.\n"
 msgid "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
 msgstr "%P: la codificación fde en %B(%A) previene la creación de la tabla .eh_frame_hdr.\n"
 
-#: elf-eh-frame.c:1583
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
-msgstr "%P: DW_EH_PE_datarel sin especificar para esta arquitectura.\n"
-
 #: elf-ifunc.c:179
 msgid "%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can not be used when making an executable; recompile with -fPIE and relink with -pie\n"
 msgstr "%F%P: el símbolo STT_GNU_IFUNC dinámico `%s' con igualdad de puntero en `%B' no se puede usar al hacer un ejecutable; recompile con -fPIE y reenlace con -pie\n"
 
-#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209
+#: elf-m10200.c:450 elf-m10300.c:1560 elf32-avr.c:1263 elf32-bfin.c:3193
 #: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922
-#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509
+#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4111 elf32-h8300.c:509
 #: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168
-#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535
+#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:534
 #: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395
 #: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540
 #: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522
 msgid "internal error: out of range error"
 msgstr "error interno: error fuera de rango"
 
-#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213
+#: elf-m10200.c:454 elf-m10300.c:1564 elf32-avr.c:1267 elf32-bfin.c:3197
 #: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926
-#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513
+#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4115 elf32-h8300.c:513
 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557
-#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539
+#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:538
 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490
 #: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544
 #: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526
-#: elfxx-mips.c:9193
+#: elfxx-mips.c:9186
 msgid "internal error: unsupported relocation error"
 msgstr "error interno: no se admite el error de reubicación"
 
@@ -693,40 +680,37 @@ msgstr "error interno: no se admite el error de reubicación"
 msgid "internal error: dangerous error"
 msgstr "error interno: error peligroso"
 
-#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221
+#: elf-m10200.c:462 elf-m10300.c:1577 elf32-avr.c:1275 elf32-bfin.c:3205
 #: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934
-#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521
+#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4123 elf32-h8300.c:521
 #: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180
-#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547
+#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:546
 #: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403
 #: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552
 #: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534
 msgid "internal error: unknown error"
 msgstr "error interno: error desconocido"
 
-#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604
-#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067
-#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807
+#: elf-m10300.c:1504 elf32-arm.c:9098 elf32-i386.c:4081 elf32-m32r.c:2604
+#: elf32-m68k.c:4156 elf32-ppc.c:8089 elf32-s390.c:3010 elf32-sh.c:4223
+#: elf32-xtensa.c:3067 elf64-ppc.c:13115 elf64-s390.c:2985 elf64-sh64.c:1636
+#: elf64-x86-64.c:3719 elfxx-sparc.c:3806
 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"
 msgstr "%B(%A+0x%lx): reubicación %s sin resolución contra el símbolo `%s'"
 
-#: elf-m10300.c:1580
+#: elf-m10300.c:1569
 msgid "error: inappropriate relocation type for shared library (did you forget -fpic?)"
 msgstr "error: tipo de reubicación inapropiada para la biblioteca compartida (¿olvidó -fpic?)"
 
-#: elf-m10300.c:1583
-msgid "%B: error: taking the address of protected function '%s' cannot be done when making a shared library"
-msgstr "%B: error: no se puede tomar la dirección de la función protegida '%s' cuando se hace una biblioteca compartida"
-
-#: elf-m10300.c:1586
+#: elf-m10300.c:1572
 msgid "internal error: suspicious relocation type used in shared library"
 msgstr "error interno: se usó un tipo de reubicación sospechosa en la biblioteca compartida"
 
-#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044
-#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868
-#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931
-#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377
-#: elf64-x86-64.c:1985 elfxx-sparc.c:2104
+#: elf-m10300.c:4372 elf32-arm.c:11392 elf32-cr16.c:2451 elf32-cris.c:3044
+#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2036 elf32-lm32.c:1868
+#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-ppc.c:4994 elf32-s390.c:1652
+#: elf32-sh.c:2931 elf32-vax.c:1040 elf64-ppc.c:6483 elf64-s390.c:1635
+#: elf64-sh64.c:3377 elf64-x86-64.c:1871 elfxx-sparc.c:2104
 #, c-format
 msgid "dynamic variable `%s' is zero size"
 msgstr "la variable dinámica `%s' es de tamaño cero"
@@ -751,7 +735,7 @@ msgstr "%B: entrada SHT_GROUP inválida"
 msgid "%B: no group info for section %A"
 msgstr "%B: no hay información de grupo para la sección %A"
 
-#: elf.c:737 elf.c:3121 elflink.c:10144
+#: elf.c:737 elf.c:3090 elflink.c:10062
 msgid "%B: warning: sh_link not set for section `%A'"
 msgstr "%B: aviso: no se estableció sh_link para la sección `%A'"
 
@@ -767,11 +751,11 @@ msgstr "%B: sección [%d] desconocida `%s' en el grupo [%s]"
 msgid "%B: unable to initialize commpress status for section %s"
 msgstr "%B: no se puede inicializar el estado comprimido de la sección %s"
 
-#: elf.c:1061
+#: elf.c:1050
 msgid "%B: unable to initialize decommpress status for section %s"
 msgstr "%B: no se puede inicializar el estado descomprimido de la sección %s"
 
-#: elf.c:1181
+#: elf.c:1158
 #, c-format
 msgid ""
 "\n"
@@ -780,7 +764,7 @@ msgstr ""
 "\n"
 "Encabezado del Programa:\n"
 
-#: elf.c:1223
+#: elf.c:1200
 #, c-format
 msgid ""
 "\n"
@@ -789,7 +773,7 @@ msgstr ""
 "\n"
 "Sección Dinámica:\n"
 
-#: elf.c:1359
+#: elf.c:1336
 #, c-format
 msgid ""
 "\n"
@@ -798,7 +782,7 @@ msgstr ""
 "\n"
 "Definiciones de versión:\n"
 
-#: elf.c:1384
+#: elf.c:1361
 #, c-format
 msgid ""
 "\n"
@@ -807,82 +791,82 @@ msgstr ""
 "\n"
 "Referencias de versión:\n"
 
-#: elf.c:1389
+#: elf.c:1366
 #, c-format
 msgid "  required from %s:\n"
 msgstr "  se requere desde %s:\n"
 
-#: elf.c:1796
+#: elf.c:1773
 msgid "%B: invalid link %lu for reloc section %s (index %u)"
 msgstr "%B: enlace %lu inválido para la sección de reubicación %s (índice %u)"
 
-#: elf.c:1966
+#: elf.c:1943
 msgid "%B: don't know how to handle allocated, application specific section `%s' [0x%8x]"
 msgstr "%B: no se sabe cómo manejar la sección específica alojada de la aplicación `%s' [0x%8x]"
 
-#: elf.c:1978
+#: elf.c:1955
 msgid "%B: don't know how to handle processor specific section `%s' [0x%8x]"
 msgstr "%B: no se sabe cómo manejar la sección específica de procesador `%s' [0x%8x]"
 
-#: elf.c:1989
+#: elf.c:1966
 msgid "%B: don't know how to handle OS specific section `%s' [0x%8x]"
 msgstr "%B: no se sabe cómo manejar la sección específica de SO `%s' [0x%8x]"
 
-#: elf.c:1999
+#: elf.c:1976
 msgid "%B: don't know how to handle section `%s' [0x%8x]"
 msgstr "%B: no se sabe cómo manejar la sección `%s' [0x%8x]"
 
-#: elf.c:2634
+#: elf.c:2603
 #, c-format
 msgid "warning: section `%A' type changed to PROGBITS"
 msgstr "aviso: el tipo de la sección `%A' cambió a PROGBITS"
 
-#: elf.c:3078
+#: elf.c:3047
 msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
 msgstr "%B: sh_link de la sección `%A' apunta a la sección descartada `%A' de `%B'"
 
-#: elf.c:3101
+#: elf.c:3070
 msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
 msgstr "%B: sh_link de la sección `%A' apunta a la sección eliminada `%A' de `%B'"
 
-#: elf.c:4527
+#: elf.c:4480
 msgid "%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr "%B: La primera sección en el segmento PT_DYNAMIC no es la sección .dynamic"
 
-#: elf.c:4554
+#: elf.c:4507
 msgid "%B: Not enough room for program headers, try linking with -N"
 msgstr "%B: No hay suficiente espacio para los encabezados del programa, pruebe enlazar con -N"
 
-#: elf.c:4641
+#: elf.c:4594
 msgid "%B: section %A lma %#lx adjusted to %#lx"
 msgstr "%B: la sección %A lma %#lx se ajusta a %#lx"
 
-#: elf.c:4774
+#: elf.c:4713
 msgid "%B: section `%A' can't be allocated in segment %d"
 msgstr "%B: la sección `%A' no se puede asignar en el segmento %d"
 
-#: elf.c:4822
+#: elf.c:4761
 msgid "%B: warning: allocated section `%s' not in segment"
 msgstr "%B: aviso: la sección asignada `%s' no está en el segmento"
 
-#: elf.c:5322
+#: elf.c:5257
 msgid "%B: symbol `%s' required but not present"
 msgstr "%B: se requiere el símbolo `%s' pero no está presente"
 
-#: elf.c:5660
+#: elf.c:5595
 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n"
 msgstr "%B: aviso: Se detectó un segmento cargable vacío, ¿ esto es intencional ?\n"
 
-#: elf.c:6688
+#: elf.c:6622
 #, c-format
 msgid "Unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr "No se puede encontrar la sección de salida equivalente para el símbolo '%s' de la sección '%s'"
 
-#: elf.c:7684
+#: elf.c:7611
 msgid "%B: unsupported relocation type %s"
 msgstr "%B: no se admite el tipo de reubicación %s"
 
-#: elf32-arm.c:3590
+#: elf32-arm.c:3183
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: Thumb call to ARM"
@@ -890,7 +874,7 @@ msgstr ""
 "%B(%s): aviso: no se activó la interoperabilidad.\n"
 "  primer suceso: %B: llamada Thumb a ARM"
 
-#: elf32-arm.c:3637
+#: elf32-arm.c:3226
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: ARM call to Thumb"
@@ -898,40 +882,40 @@ msgstr ""
 "%B(%s): aviso: no se activó la interoperabilidad.\n"
 "  primer suceso: %B: llamada ARM a Thumb"
 
-#: elf32-arm.c:3849 elf32-arm.c:5286
+#: elf32-arm.c:3432 elf32-arm.c:4807
 #, c-format
 msgid "%s: cannot create stub entry %s"
 msgstr "%s: no se puede crear la entrada de cabo %s"
 
-#: elf32-arm.c:5402
+#: elf32-arm.c:4923
 #, c-format
 msgid "unable to find THUMB glue '%s' for '%s'"
 msgstr "no se puede encontrar el pegamento THUMB '%s' para `%s'"
 
-#: elf32-arm.c:5438
+#: elf32-arm.c:4959
 #, c-format
 msgid "unable to find ARM glue '%s' for '%s'"
 msgstr "no se puede encontrar el pegamento ARM '%s' para `%s'"
 
-#: elf32-arm.c:5964
+#: elf32-arm.c:5485
 msgid "%B: BE8 images only valid in big-endian mode."
 msgstr "%B: las imágenes BE8 sólo son válidas en modo big-endian."
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:6194
+#: elf32-arm.c:5715
 msgid "%B: warning: selected VFP11 erratum workaround is not necessary for target architecture"
 msgstr "%B: aviso: no se necesita la alternativa para evitar la errata del VFP11 seleccionado para la arquitectura objetivo"
 
-#: elf32-arm.c:6738 elf32-arm.c:6758
+#: elf32-arm.c:6259 elf32-arm.c:6279
 msgid "%B: unable to find VFP11 veneer `%s'"
 msgstr "%B: no se puede encontrar la chapa de VFP11 `%s'"
 
-#: elf32-arm.c:6806
+#: elf32-arm.c:6327
 #, c-format
 msgid "Invalid TARGET2 relocation type '%s'."
 msgstr "Tipo de reubicación TARGET2 '%s' inválido."
 
-#: elf32-arm.c:6890
+#: elf32-arm.c:6411
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: thumb call to arm"
@@ -939,398 +923,374 @@ msgstr ""
 "%s(%s): aviso: no se activó la interoperabilidad.\n"
 "  primer suceso: %B: llamada thumb a arm"
 
-#: elf32-arm.c:7674
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx):instrucción Thumb '0x%x' inesperada en el trampolín TLS"
-
-#: elf32-arm.c:7713
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx):instrucción ARM '0x%x' inesperada en el trampolín TLS"
-
-#: elf32-arm.c:8166
+#: elf32-arm.c:7130
 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'."
 msgstr "\\%B: Aviso: La instrucción Arm BLX apunta a la función Arm '%s'."
 
-#: elf32-arm.c:8575
+#: elf32-arm.c:7541
 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
 msgstr "%B: Aviso: La instrucción Thumb BLX apunta a la función thumb '%s'."
 
-#: elf32-arm.c:9408
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx):instrucción Thumb '0x%x' inesperada referenciada por TLS_GOTDESC"
-
-#: elf32-arm.c:9431
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx):instrucción ARM '0x%x' inesperada referenciada por TLS_GOTDESC"
-
-#: elf32-arm.c:9460
+#: elf32-arm.c:8223
 msgid "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"
 msgstr "%B(%A+0x%lx): la reubicación R_ARM_TLS_LE32 no se permite en objetos compartidos"
 
-#: elf32-arm.c:9675
+#: elf32-arm.c:8438
 msgid "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"
 msgstr "%B(%A+0x%lx): Sólo se permiten las instrucciones ADD o SUB en las reubicaciones de grupo ALU"
 
-#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970
+#: elf32-arm.c:8478 elf32-arm.c:8565 elf32-arm.c:8648 elf32-arm.c:8733
 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"
 msgstr "%B(%A+0x%lx): Desborde al dividirse 0x%lx para la reubicación de grupo %s"
 
-#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544
+#: elf32-arm.c:8963 elf32-sh.c:4112 elf64-sh64.c:1544
 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section"
 msgstr "%B(%A+0x%lx): reubicación %s contra la sección SEC_MERGE"
 
-#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805
+#: elf32-arm.c:9074 elf32-m68k.c:4191 elf32-xtensa.c:2805 elf64-ppc.c:11689
 msgid "%B(%A+0x%lx): %s used with TLS symbol %s"
 msgstr "%B(%A+0x%lx): se usó %s con el símbolo TLS %s"
 
-#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806
+#: elf32-arm.c:9075 elf32-m68k.c:4192 elf32-xtensa.c:2806 elf64-ppc.c:11690
 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s"
 msgstr "%B(%A+0x%lx): se usó %s con el símbolo %s que no es TLS"
 
-#: elf32-arm.c:10399 elf32-tic6x.c:2751
+#: elf32-arm.c:9132 elf32-tic6x.c:1632
 msgid "out of range"
 msgstr "fuera de rango"
 
-#: elf32-arm.c:10403 elf32-tic6x.c:2755
+#: elf32-arm.c:9136 elf32-tic6x.c:1636
 msgid "unsupported relocation"
 msgstr "no se admite la reubicación"
 
-#: elf32-arm.c:10411 elf32-tic6x.c:2763
+#: elf32-arm.c:9144 elf32-tic6x.c:1644
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: elf32-arm.c:10836
+#: elf32-arm.c:9569
 msgid "Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"
 msgstr "Aviso: Se limpia la opción de interoperación en %B porque se ha enlazado con él código no interoperable en %B"
 
-#: elf32-arm.c:10930
+#: elf32-arm.c:9663
 msgid "%B: Unknown mandatory EABI object attribute %d"
 msgstr "%B: Atributo de objeto EABI obligatorio %d desconocido"
 
-#: elf32-arm.c:10938
+#: elf32-arm.c:9671
 msgid "Warning: %B: Unknown EABI object attribute %d"
 msgstr "Aviso: %B: Atributo de objeto EABI %d desconocido"
 
-#: elf32-arm.c:11119
+#: elf32-arm.c:9852
 msgid "error: %B: Unknown CPU architecture"
 msgstr "error: %B: Arquitectura de CPU desconocida"
 
-#: elf32-arm.c:11157
+#: elf32-arm.c:9890
 msgid "error: %B: Conflicting CPU architectures %d/%d"
 msgstr "error: %B: Arquitecturas de CPU en conflicto %d/%d"
 
-#: elf32-arm.c:11206
+#: elf32-arm.c:9942
 msgid "Error: %B has both the current and legacy Tag_MPextension_use attributes"
 msgstr "Error: %B tiene al mismo tiempo los atributos Tag_MPextension_use actuales y antiguos"
 
-#: elf32-arm.c:11231
+#: elf32-arm.c:9967
 msgid "error: %B uses VFP register arguments, %B does not"
 msgstr "error: %B utiliza argumentos de registro VFP, mientras que %B no"
 
-#: elf32-arm.c:11376
+#: elf32-arm.c:10112
 msgid "error: %B: unable to merge virtualization attributes with %B"
 msgstr "error: %B: no se pueden mezclar los atributos de virtualización con %B"
 
-#: elf32-arm.c:11402
+#: elf32-arm.c:10138
 msgid "error: %B: Conflicting architecture profiles %c/%c"
 msgstr "error: %B: Perfiles de arquitecturas en conflicto %c/%c"
 
-#: elf32-arm.c:11503
+#: elf32-arm.c:10239
 msgid "Warning: %B: Conflicting platform configuration"
 msgstr "Aviso: %B: Configuración de plataformas en conflicto"
 
-#: elf32-arm.c:11512
+#: elf32-arm.c:10248
 msgid "error: %B: Conflicting use of R9"
 msgstr "error: %B: Uso en conflicto de R9"
 
-#: elf32-arm.c:11524
+#: elf32-arm.c:10260
 msgid "error: %B: SB relative addressing conflicts with use of R9"
 msgstr "error: %B: El direccionamiento relativo a SB tiene conflictos con el uso de R9"
 
-#: elf32-arm.c:11537
+#: elf32-arm.c:10273
 msgid "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"
 msgstr "aviso: %B usa wchar_t de %u bytes aunque la salida usa wchar_t de %u bytes; el uso de valores wchar_t entre objetos puede fallar"
 
-#: elf32-arm.c:11568
+#: elf32-arm.c:10304
 msgid "warning: %B uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"
 msgstr "aviso: %B usa enums %s aunque la salida usa enums %s; el uso de valores enum entre objetos puede fallar"
 
-#: elf32-arm.c:11580
+#: elf32-arm.c:10316
 msgid "error: %B uses iWMMXt register arguments, %B does not"
 msgstr "error: %B utiliza argumentos de registro iWMMXt, mientras que %B no"
 
-#: elf32-arm.c:11597
+#: elf32-arm.c:10333
 msgid "error: fp16 format mismatch between %B and %B"
 msgstr "error: no coincide el formato fp16 entre %B y %B"
 
-#: elf32-arm.c:11621
+#: elf32-arm.c:10357
 msgid "DIV usage mismatch between %B and %B"
 msgstr "no coincide el uso de DIV entre %B y %B"
 
-#: elf32-arm.c:11640
+#: elf32-arm.c:10376
 msgid "%B has has both the current and legacy Tag_MPextension_use attributes"
 msgstr "%B tiene al mismo tiempo los atributos actuales y antiguos de Tag_MPextension"
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
-#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282
+#: elf32-arm.c:10468 elf32-bfin.c:5065 elf32-cris.c:4162 elf32-m68hc1x.c:1282
 #: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528
-#: elfxx-mips.c:12857
+#: elfxx-mips.c:12842
 #, c-format
 msgid "private flags = %lx:"
 msgstr "opciones privadas = %lx:"
 
-#: elf32-arm.c:11737
+#: elf32-arm.c:10477
 #, c-format
 msgid " [interworking enabled]"
 msgstr " [interoperabilidad activada]"
 
-#: elf32-arm.c:11745
+#: elf32-arm.c:10485
 #, c-format
 msgid " [VFP float format]"
 msgstr " [formato de coma flotante VFP]"
 
-#: elf32-arm.c:11747
+#: elf32-arm.c:10487
 #, c-format
 msgid " [Maverick float format]"
 msgstr " [formato de coma flotante Maverick]"
 
-#: elf32-arm.c:11749
+#: elf32-arm.c:10489
 #, c-format
 msgid " [FPA float format]"
 msgstr " [formato de coma flotante FPA]"
 
-#: elf32-arm.c:11758
+#: elf32-arm.c:10498
 #, c-format
 msgid " [new ABI]"
 msgstr " [ABI nuevo]"
 
-#: elf32-arm.c:11761
+#: elf32-arm.c:10501
 #, c-format
 msgid " [old ABI]"
 msgstr " [ABI antiguo]"
 
-#: elf32-arm.c:11764
+#: elf32-arm.c:10504
 #, c-format
 msgid " [software FP]"
 msgstr " [FP por software]"
 
-#: elf32-arm.c:11773
+#: elf32-arm.c:10513
 #, c-format
 msgid " [Version1 EABI]"
 msgstr " [EABI Version1]"
 
-#: elf32-arm.c:11776 elf32-arm.c:11787
+#: elf32-arm.c:10516 elf32-arm.c:10527
 #, c-format
 msgid " [sorted symbol table]"
 msgstr " [tabla de símbolos ordenados]"
 
-#: elf32-arm.c:11778 elf32-arm.c:11789
+#: elf32-arm.c:10518 elf32-arm.c:10529
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr " [tabla de símbolos sin ordenar]"
 
-#: elf32-arm.c:11784
+#: elf32-arm.c:10524
 #, c-format
 msgid " [Version2 EABI]"
 msgstr " [EABI Version2]"
 
-#: elf32-arm.c:11792
+#: elf32-arm.c:10532
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr " [los símbolos dinámicos utilizan índices de segmento]"
 
-#: elf32-arm.c:11795
+#: elf32-arm.c:10535
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr " [el mapeo de símbolos precede a otros]"
 
-#: elf32-arm.c:11802
+#: elf32-arm.c:10542
 #, c-format
 msgid " [Version3 EABI]"
 msgstr " [EABI Version3]"
 
-#: elf32-arm.c:11806
+#: elf32-arm.c:10546
 #, c-format
 msgid " [Version4 EABI]"
 msgstr " [EABI Version4]"
 
-#: elf32-arm.c:11810
+#: elf32-arm.c:10550
 #, c-format
 msgid " [Version5 EABI]"
 msgstr " [EABI Version5]"
 
-#: elf32-arm.c:11813
+#: elf32-arm.c:10553
 #, c-format
 msgid " [BE8]"
 msgstr " [BE8]"
 
-#: elf32-arm.c:11816
+#: elf32-arm.c:10556
 #, c-format
 msgid " [LE8]"
 msgstr " [LE8]"
 
-#: elf32-arm.c:11822
+#: elf32-arm.c:10562
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr " <no se reconoce la versión de EABI>"
 
-#: elf32-arm.c:11829
+#: elf32-arm.c:10569
 #, c-format
 msgid " [relocatable executable]"
 msgstr " [ejecutable reubicable]"
 
-#: elf32-arm.c:11832
+#: elf32-arm.c:10572
 #, c-format
 msgid " [has entry point]"
 msgstr " [tiene punto de entrada]"
 
-#: elf32-arm.c:11837
+#: elf32-arm.c:10577
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr "<No se reconoce el conjunto de bits de opción>"
 
-#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827
-#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370
+#: elf32-arm.c:10824 elf32-i386.c:1322 elf32-s390.c:1000 elf32-xtensa.c:1009
+#: elf64-s390.c:960 elf64-x86-64.c:1105 elfxx-sparc.c:1370
 msgid "%B: bad symbol index: %d"
 msgstr "%B: índice de símbolos erróneo: %d"
 
-#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949
+#: elf32-arm.c:10946 elf64-x86-64.c:1265 elf64-x86-64.c:1434 elfxx-mips.c:7942
 msgid "%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"
 msgstr "%B: no se puede usar la reubicación %s contra `%s' cuando se hace un objeto compartido; recompile con -fPIC"
 
-#: elf32-arm.c:13412
+#: elf32-arm.c:11948
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr "Se encontraron errores al procesar el fichero %s"
 
-#: elf32-arm.c:14795
+#: elf32-arm.c:13334
 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr "%B: error: el cabo de errores Cortex-A8 se aloja en una ubicación insegura"
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:14822
+#: elf32-arm.c:13361
 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr "%B: error: el cabo de errores Cortex-A8 está fuera de rango (el fichero de entrada es demasiado grande)"
 
-#: elf32-arm.c:14916 elf32-arm.c:14938
+#: elf32-arm.c:13455 elf32-arm.c:13477
 msgid "%B: error: VFP11 veneer out of range"
 msgstr "%B: error: la chapa VFP11 está fuera de rango"
 
-#: elf32-arm.c:15477
+#: elf32-arm.c:14002
 msgid "error: %B is already in final BE8 format"
 msgstr "error: %B ya está en el formato BE8 final"
 
-#: elf32-arm.c:15553
+#: elf32-arm.c:14078
 msgid "error: Source object %B has EABI version %d, but target %B has EABI version %d"
 msgstr "error: El objeto fuente %B tiene EABI versión %d, pero el objetivo %B tiene EABI versión %d"
 
-#: elf32-arm.c:15569
+#: elf32-arm.c:14094
 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
 msgstr "error: %B está compilado para APCS-%d mientras que el objetivo %B usa APCS-%d"
 
-#: elf32-arm.c:15594
+#: elf32-arm.c:14119
 msgid "error: %B uses VFP instructions, whereas %B does not"
 msgstr "error: %B utiliza instrucciones VFP, mientras que %B no"
 
-#: elf32-arm.c:15598
+#: elf32-arm.c:14123
 msgid "error: %B uses FPA instructions, whereas %B does not"
 msgstr "error: %B utiliza instrucciones FPA, mientras que %B no"
 
-#: elf32-arm.c:15608
+#: elf32-arm.c:14133
 msgid "error: %B uses Maverick instructions, whereas %B does not"
 msgstr "error: %B utiliza instrucciones Maverick, mientras que %B no"
 
-#: elf32-arm.c:15612
+#: elf32-arm.c:14137
 msgid "error: %B does not use Maverick instructions, whereas %B does"
 msgstr "error: %B no utiliza instrucciones Maverick, mientras que %B sí"
 
-#: elf32-arm.c:15631
+#: elf32-arm.c:14156
 msgid "error: %B uses software FP, whereas %B uses hardware FP"
 msgstr "error: %B utiliza FP de software, mientras que %B utiliza FP de hardware"
 
-#: elf32-arm.c:15635
+#: elf32-arm.c:14160
 msgid "error: %B uses hardware FP, whereas %B uses software FP"
 msgstr "error: %B utiliza FP de hardware, mientras que %B utiliza FP de software"
 
-#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617
-#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
-#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494
+#: elf32-avr.c:1271 elf32-bfin.c:3201 elf32-cris.c:2085 elf32-fr30.c:617
+#: elf32-frv.c:4119 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
+#: elf32-m32c.c:561 elf32-mep.c:542 elf32-moxie.c:290 elf32-msp430.c:494
 #: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949
 #: elf64-mmix.c:1530
 msgid "internal error: dangerous relocation"
 msgstr "error interno: reubicación peligrosa"
 
-#: elf32-avr.c:2415 elf32-hppa.c:598 elf32-m68hc1x.c:166
+#: elf32-avr.c:2400 elf32-hppa.c:598 elf32-m68hc1x.c:166 elf64-ppc.c:4175
 msgid "%B: cannot create stub entry %s"
 msgstr "%B: no se puede crear la entrada de cabo %s"
 
-#: elf32-bfin.c:107 elf32-bfin.c:363
-msgid "relocation should be even number"
-msgstr "la reubicación debe ser un número non"
-
-#: elf32-bfin.c:1591
+#: elf32-bfin.c:1575
 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'"
 msgstr "%B(%A+0x%lx): reubicación sin resolución contra el símbolo `%s'"
 
-#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062
-#: elf64-s390.c:3037 elf64-x86-64.c:3923
+#: elf32-bfin.c:1608 elf32-i386.c:4123 elf32-m68k.c:4233 elf32-s390.c:3062
+#: elf64-s390.c:3037 elf64-x86-64.c:3759
 msgid "%B(%A+0x%lx): reloc against `%s': error %d"
 msgstr "%B(%A+0x%lx): reubicación contra `%s': error %d"
 
-#: elf32-bfin.c:2723
+#: elf32-bfin.c:2707
 msgid "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"
 msgstr "%B: la reubicación en `%A+0x%x' referencía al símbolo `%s' con adición que no es cero"
 
-#: elf32-bfin.c:2737
+#: elf32-bfin.c:2721 elf32-frv.c:2901
 msgid "relocation references symbol not defined in the module"
 msgstr "la reubicación referencía un símbolo que no está definido en el módulo"
 
-#: elf32-bfin.c:2834
+#: elf32-bfin.c:2818
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC referencía un símbolo dinámico con adición que no es cero"
 
-#: elf32-bfin.c:2875 elf32-bfin.c:2998
+#: elf32-bfin.c:2859 elf32-bfin.c:2982 elf32-frv.c:3638 elf32-frv.c:3759
 msgid "cannot emit fixups in read-only section"
 msgstr "no se pueden emitir composturas en la sección de sólo lectura"
 
-#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021
+#: elf32-bfin.c:2890 elf32-bfin.c:3020 elf32-frv.c:3669 elf32-frv.c:3803
+#: elf32-lm32.c:1103 elf32-sh.c:5021
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr "no se pueden emitir reubicaciones dinámicas en la sección de sólo lectura"
 
-#: elf32-bfin.c:2956
+#: elf32-bfin.c:2940
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC_VALUE referencía un símbolo dinámico con adición que no es cero"
 
-#: elf32-bfin.c:3121
+#: elf32-bfin.c:3105
 msgid "relocations between different segments are not supported"
 msgstr "no se admiten las reubicaciones entre segmentos diferentes"
 
-#: elf32-bfin.c:3122
+#: elf32-bfin.c:3106
 msgid "warning: relocation references a different segment"
 msgstr "aviso: la reubicación referencía un segmento diferente"
 
-#: elf32-bfin.c:4967
+#: elf32-bfin.c:4957 elf32-frv.c:6406
 msgid "%B: unsupported relocation type %i"
 msgstr "%B: no se admite el tipo de reubicación %i"
 
-#: elf32-bfin.c:5121 elf32-frv.c:6805
+#: elf32-bfin.c:5111 elf32-frv.c:6814
 #, c-format
 msgid "%s: cannot link non-fdpic object file into fdpic executable"
 msgstr "%s: no se puede enlazar el fichero objeto que no es fdpic en un ejecutable fdpic"
 
-#: elf32-bfin.c:5125 elf32-frv.c:6809
+#: elf32-bfin.c:5115 elf32-frv.c:6818
 #, c-format
 msgid "%s: cannot link fdpic object file into non-fdpic executable"
 msgstr "%s: no se puede enlazar el fichero objeto fdpic en un ejecutable que no es fdpic"
 
-#: elf32-bfin.c:5279
-#, c-format
-msgid "*** check this relocation %s"
-msgstr "*** revisar esta reubicación %s"
-
 #: elf32-cris.c:1172
 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
 msgstr "%B, sección %A: reubicación %s sin resolución contra el símbolo `%s'"
@@ -1344,15 +1304,15 @@ msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
 msgstr "%B, sección %A: No hay PLT para la reubicación %s contra el símbolo `%s'"
 
 #: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718
-#: elf32-cris.c:1871 elf32-tic6x.c:2660
+#: elf32-cris.c:1871
 msgid "[whose name is lost]"
 msgstr "[cuyo nombre está perdido]"
 
-#: elf32-cris.c:1361 elf32-tic6x.c:2645
+#: elf32-cris.c:1361
 msgid "%B, section %A: relocation %s with non-zero addend %d against local symbol"
 msgstr "%B, sección %A: reubicación %s con adición %d que no es cero contra el símbolo local"
 
-#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653
+#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865
 msgid "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'"
 msgstr "%B, sección %A: reubicación %s con adición %d que no es cero contra el símbolo `%s'"
 
@@ -1448,121 +1408,95 @@ msgstr "%B contiene código CRIS v32, incompatible con objetos previos"
 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr "%B contiene código que no es CRIS v32, incompatible con objetos previos"
 
-#: elf32-dlx.c:142
-#, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
-msgstr "Error de Enlazado BFD: no se admite la ramificación (PC rel16) a la sección (%s)"
-
-#: elf32-dlx.c:204
-#, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr "Error de Enlazado BFD: no se admite el salto (PC rel26) a la sección (%s)"
-
 #: elf32-frv.c:1509 elf32-frv.c:1658
 msgid "relocation requires zero addend"
 msgstr "la reubicación requiere una adición cero"
 
 #: elf32-frv.c:2888
-msgid "%H: relocation to `%s+%v' may have caused the error above\n"
-msgstr "%H: la reubicación a `%s+%v' tal vez causó el error anterior\n"
-
-#: elf32-frv.c:2902
-msgid "%H: relocation references symbol not defined in the module\n"
-msgstr "%H: la reubicación referencía un símbolo que no está definido en el módulo\n"
+msgid "%B(%A+0x%x): relocation to `%s+%x' may have caused the error above"
+msgstr "%B(%A+0x%x): la reubicación a `%s+%x' tal vez causó el error anterior"
 
-#: elf32-frv.c:2978
-msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
-msgstr "%H: no se aplicó R_FRV_GETTLSOFF a una instrucción call\n"
+#: elf32-frv.c:2977
+msgid "R_FRV_GETTLSOFF not applied to a call instruction"
+msgstr "no se aplicó R_FRV_GETTLSOFF a una instrucción call"
 
 #: elf32-frv.c:3019
-msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSDESC12 a una instrucción lddi\n"
+msgid "R_FRV_GOTTLSDESC12 not applied to an lddi instruction"
+msgstr "no se aplicó R_FRV_GOTTLSDESC12 a una instrucción lddi"
 
 #: elf32-frv.c:3090
-msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSDESCHI a una instrucción sethi\n"
+msgid "R_FRV_GOTTLSDESCHI not applied to a sethi instruction"
+msgstr "no se aplicó R_FRV_GOTTLSDESCHI a una instrucción sethi"
 
 #: elf32-frv.c:3127
-msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSDESCLO a una instrucción setlo o setlos\n"
-
-#: elf32-frv.c:3174
-msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSDESC_RELAX a una instrucción ldd\n"
-
-#: elf32-frv.c:3258
-msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
-msgstr "%H: no se aplicó R_FRV_GETTLSOFF_RELAX a una instrucción calll\n"
+msgid "R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction"
+msgstr "no se aplicó R_FRV_GOTTLSDESCLO a una instrucción setlo o setlos"
 
-#: elf32-frv.c:3312
-msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSOFF12 a una instrucción ldi\n"
+#: elf32-frv.c:3175
+msgid "R_FRV_TLSDESC_RELAX not applied to an ldd instruction"
+msgstr "no se aplicó R_FRV_GOTTLSDESC_RELAX a una instrucción ldd"
 
-#: elf32-frv.c:3342
-msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSOFFHI a una instrucción sethi\n"
+#: elf32-frv.c:3259
+msgid "R_FRV_GETTLSOFF_RELAX not applied to a calll instruction"
+msgstr "no se aplicó R_FRV_GETTLSOFF_RELAX a una instrucción calll"
 
-#: elf32-frv.c:3371
-msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: no se aplicó R_FRV_GOTTLSOFFLO a una instrucción setlo o setlos\n"
+#: elf32-frv.c:3314
+msgid "R_FRV_GOTTLSOFF12 not applied to an ldi instruction"
+msgstr "no se aplicó R_FRV_GOTTLSOFF12 a una instrucción ldi"
 
-#: elf32-frv.c:3401
-msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
-msgstr "%H: no se aplicó R_FRV_TLSOFF_RELAX a una instrucción ld\n"
+#: elf32-frv.c:3344
+msgid "R_FRV_GOTTLSOFFHI not applied to a sethi instruction"
+msgstr "no se aplicó R_FRV_GOTTLSOFFHI a una instrucción sethi"
 
-#: elf32-frv.c:3446
-msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
-msgstr "%H: no se aplicó R_FRV_TLSMOFFHI a una instrucción sethi\n"
+#: elf32-frv.c:3373
+msgid "R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction"
+msgstr "no se aplicó R_FRV_GOTTLSOFFLO a una instrucción setlo o setlos"
 
-#: elf32-frv.c:3473
-msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "no se aplicó R_FRV_TLSMOFFLO a una instrucción setlo o setlos\n"
+#: elf32-frv.c:3404
+msgid "R_FRV_TLSOFF_RELAX not applied to an ld instruction"
+msgstr "no se aplicó R_FRV_TLSOFF_RELAX a una instrucción ld"
 
-#: elf32-frv.c:3594
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC referencía un símbolo dinámico con adición que no es cero\n"
+#: elf32-frv.c:3449
+msgid "R_FRV_TLSMOFFHI not applied to a sethi instruction"
+msgstr "no se aplicó R_FRV_TLSMOFFHI a una instrucción sethi"
 
-#: elf32-frv.c:3635 elf32-frv.c:3757
-msgid "%H: cannot emit fixups in read-only section\n"
-msgstr "%H: no se pueden emitir composturas en la sección de sólo lectura\n"
+#: elf32-frv.c:3476
+msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction"
+msgstr "no se aplicó R_FRV_TLSMOFFLO a una instrucción setlo o setlos"
 
-#: elf32-frv.c:3666 elf32-frv.c:3800
-msgid "%H: cannot emit dynamic relocations in read-only section\n"
-msgstr "%H: no se pueden emitir reubicaciones dinámicas en la sección de sólo lectura\n"
+#: elf32-frv.c:3597
+msgid "R_FRV_FUNCDESC references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC referencía un símbolo dinámico con adición que no es cero"
 
-#: elf32-frv.c:3715
-msgid "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC_VALUE referencía un símbolo dinámico con adición que no es cero\n"
+#: elf32-frv.c:3717
+msgid "R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC_VALUE referencía un símbolo dinámico con adición que no es cero"
 
-#: elf32-frv.c:3971
-msgid "%H: reloc against `%s' references a different segment\n"
-msgstr "%H: la reubicación contra `%s' referencía un segmento diferente\n"
+#: elf32-frv.c:3974 elf32-frv.c:4130
+msgid "%B(%A+0x%lx): reloc against `%s': %s"
+msgstr "%B(%A+0x%lx): reubicación contra `%s': %s"
 
-#: elf32-frv.c:4121
-msgid "%H: reloc against `%s': %s\n"
-msgstr "%H: reubicación contra `%s': %s\n"
+#: elf32-frv.c:3976 elf32-frv.c:3980
+msgid "relocation references a different segment"
+msgstr "la reubicación referencía un segmento diferente"
 
-#: elf32-frv.c:6397
-msgid "%B: unsupported relocation type %i\n"
-msgstr "%B: no se admite el tipo de reubicación %i\n"
-
-#: elf32-frv.c:6719
+#: elf32-frv.c:6728
 #, c-format
 msgid "%s: compiled with %s and linked with modules that use non-pic relocations"
 msgstr "%s: compilado con %s y enlazado con módulos que usan reubicaciones que no son pic"
 
-#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807
+#: elf32-frv.c:6781 elf32-iq2000.c:845 elf32-m32c.c:807
 #, c-format
 msgid "%s: compiled with %s and linked with modules compiled with %s"
 msgstr "%s: compilado con %s y enlazado con módulos compilados con %s"
 
-#: elf32-frv.c:6784
+#: elf32-frv.c:6793
 #, c-format
 msgid "%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%s: usa campos e_flags desconocidos (0x%lx) diferentes a aquéllos de los módulos previos (0x%lx)"
 
-#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
-#: elf32-rx.c:2937
+#: elf32-frv.c:6843 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
+#: elf32-rx.c:2925
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr "opciones privadas = 0x%lx:"
@@ -1596,62 +1530,54 @@ msgid ".got section not immediately after .plt section"
 msgstr "la sección .got no está inmediatamente después de la sección .plt"
 
 #. Unknown relocation.
-#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379
-#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243
+#: elf32-i386.c:371 elf32-m68k.c:383 elf32-ppc.c:1674 elf32-s390.c:379
+#: elf32-tic6x.c:1563 elf64-ppc.c:2284 elf64-s390.c:403 elf64-x86-64.c:234
 msgid "%B: invalid relocation type %d"
 msgstr "%B: tipo de reubicación %d inválido"
 
-#: elf32-i386.c:1266 elf64-x86-64.c:1116
+#: elf32-i386.c:1265 elf64-x86-64.c:1049
 msgid "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed"
 msgstr "%B: falló la transición TLS de %s para %s contra `%s' en 0x%lx en la sección `%A'"
 
-#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909
-#: elfxx-sparc.c:3077
+#: elf32-i386.c:1408 elf32-i386.c:3068 elf64-x86-64.c:1194 elf64-x86-64.c:2780
+#: elfxx-sparc.c:3076
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
 msgstr "%B: la reubicación %s contra el símbolo STT_GNU_IFUNC `%s' no es manejada por %s"
 
-#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
+#: elf32-i386.c:1570 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
 #: elf64-s390.c:1151 elfxx-sparc.c:1547
 msgid "%B: `%s' accessed both as normal and thread local symbol"
 msgstr "%B: se accedió `%s' como un símbolo normal y un símbolo local de hilo"
 
-#: elf32-i386.c:2405 elf64-x86-64.c:2320
-msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"
-msgstr "%P: %B: aviso: reubicación contra `%s' en la sección de sólo lectura `%A'.\n"
-
-#: elf32-i386.c:2496 elf64-x86-64.c:2407
-msgid "%P: %B: warning: relocation in readonly section `%A'.\n"
-msgstr "%P: %B: aviso: reubicación en la sección de sólo lectura `%A'.\n"
-
-#: elf32-i386.c:2932
+#: elf32-i386.c:2910
 msgid "%B: unrecognized relocation (0x%x) in section `%A'"
 msgstr "%B: no se reconoce la dirección de reubicación (0x%lx) en la sección `%A'"
 
-#: elf32-i386.c:3339 elf64-x86-64.c:3295
+#: elf32-i386.c:3317 elf64-x86-64.c:3174
 msgid "hidden symbol"
 msgstr "símbolo oculto"
 
-#: elf32-i386.c:3342 elf64-x86-64.c:3298
+#: elf32-i386.c:3320 elf64-x86-64.c:3177
 msgid "internal symbol"
 msgstr "símbolo interno"
 
-#: elf32-i386.c:3345 elf64-x86-64.c:3301
+#: elf32-i386.c:3323 elf64-x86-64.c:3180
 msgid "protected symbol"
 msgstr "símbolo protegido"
 
-#: elf32-i386.c:3348 elf64-x86-64.c:3304
+#: elf32-i386.c:3326 elf64-x86-64.c:3183
 msgid "symbol"
 msgstr "símbolo"
 
-#: elf32-i386.c:3353
+#: elf32-i386.c:3331
 msgid "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"
 msgstr "%B: no se puede usar la reubicación R_386_GOTOFF contra %s indefinida `%s' cuando se hace un objeto compartido"
 
-#: elf32-i386.c:3363
+#: elf32-i386.c:3341
 msgid "%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"
 msgstr "%B: no se puede usar la reubicación R_386_GOTOFF contra la función protegida `%s' cuando se hace un objeto compartido"
 
-#: elf32-i386.c:4660 elf64-x86-64.c:4378
+#: elf32-i386.c:4633 elf64-x86-64.c:4206
 #, c-format
 msgid "discarded output section: `%A'"
 msgstr "se descarta la sección de salida: `%A'"
@@ -1755,7 +1681,7 @@ msgstr "%B: se enlazan ficheros compilados con dobles de 32-bit (-fshort-double)
 msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
 msgstr "%B: se enlazan ficheros compilados para HCS12, con otros compilados para HC12"
 
-#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719
+#: elf32-m68hc1x.c:1257 elf32-ppc.c:4232 elf64-sparc.c:703 elfxx-mips.c:12704
 msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%B: usa campos de e_flags diferentes (0x%lx) que los módulos previos (0x%lx)"
 
@@ -1804,7 +1730,7 @@ msgstr " [memoria=modelo de bancos]"
 msgid " [memory=flat]"
 msgstr " [memoria=plana]"
 
-#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326
+#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7292 vms-alpha.c:7307
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1828,26 +1754,15 @@ msgstr "%B: Actualmente no se admite la reubicación %s (%d).\n"
 msgid "%B: Unknown relocation type %d\n"
 msgstr "%B: Tipo de reubicación %d desconocido\n"
 
-#. Pacify gcc -Wall.
-#: elf32-mep.c:157
-#, c-format
-msgid "mep: no reloc for code %d"
-msgstr "mep: no hay reubicación para el código %d"
-
-#: elf32-mep.c:163
-#, c-format
-msgid "MeP: howto %d has type %d"
-msgstr "MeP: howto %d tiene el tipo %d"
-
-#: elf32-mep.c:648
+#: elf32-mep.c:647
 msgid "%B and %B are for different cores"
 msgstr "%B y %B son para núcleos diferentes"
 
-#: elf32-mep.c:665
+#: elf32-mep.c:664
 msgid "%B and %B are for different configurations"
 msgstr "%B y %B son para configuraciones diferentes"
 
-#: elf32-mep.c:702
+#: elf32-mep.c:701
 #, c-format
 msgid "private flags = 0x%lx"
 msgstr "opciones privadas = 0x%lx"
@@ -1862,11 +1777,11 @@ msgstr "%s: tipo de reubicación %d desconocido"
 msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
 msgstr "%s: El objetivo (%s) de una reubicación %s está en la sección errónea (%s)"
 
-#: elf32-microblaze.c:1155 elfxx-sparc.c:3451
+#: elf32-microblaze.c:1155 elfxx-sparc.c:3450
 msgid "%B: probably compiled without -fPIC?"
 msgstr "%B: ¿Compilado probablemente sin -fPIC?"
 
-#: elf32-microblaze.c:2074
+#: elf32-microblaze.c:2074 elflink.c:12601
 msgid "%B: bad relocation section name `%s'"
 msgstr "%B: nombre de sección de reubicación `%s' erróneo"
 
@@ -1879,174 +1794,157 @@ msgstr "la reubicación literal sucede para un símbolo externo"
 msgid "32bits gp relative relocation occurs for an external symbol"
 msgstr "la reubicación relativa a gp de 32bits sucede para un símbolo externo"
 
-#: elf32-ppc.c:1740
+#: elf32-ppc.c:1739
 #, c-format
 msgid "generic linker can't handle %s"
 msgstr "el enlazador genérico no puede manejar %s"
 
-#: elf32-ppc.c:2183
+#: elf32-ppc.c:2180
 msgid "corrupt %s section in %B"
 msgstr "sección %s corrupta en %B"
 
-#: elf32-ppc.c:2202
+#: elf32-ppc.c:2199
 msgid "unable to read in %s section from %B"
 msgstr "no se puede leer en la sección %s desde %B"
 
-#: elf32-ppc.c:2243
+#: elf32-ppc.c:2240
 msgid "warning: unable to set size of %s section in %B"
 msgstr "aviso: no se puede establecer el tamaño de la sección %s en %B"
 
-#: elf32-ppc.c:2293
+#: elf32-ppc.c:2290
 msgid "failed to allocate space for new APUinfo section."
 msgstr "no se puede reservar espacio para la nueva sección APUinfo."
 
-#: elf32-ppc.c:2312
+#: elf32-ppc.c:2309
 msgid "failed to compute new APUinfo section."
 msgstr "no se puede calcular la nueva sección APUinfo."
 
-#: elf32-ppc.c:2315
+#: elf32-ppc.c:2312
 msgid "failed to install new APUinfo section."
 msgstr "no se puede instalar la nueva sección APUinfo."
 
-#: elf32-ppc.c:3343
+#: elf32-ppc.c:3358
 msgid "%B: relocation %s cannot be used when making a shared object"
 msgstr "%B: no se puede usar la reubicación %s cuando se hace un objeto compartido"
 
 #. It does not make sense to have a procedure linkage
 #. table entry for a local symbol.
-#: elf32-ppc.c:3687
-msgid "%H: %s reloc against local symbol\n"
-msgstr "%H: reubicación %s contra un símbolo local\n"
+#: elf32-ppc.c:3702
+msgid "%B(%A+0x%lx): %s reloc against local symbol"
+msgstr "%B(%A+0x%lx): reubicación %s contra un símbolo local"
 
-#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449
-#: elfxx-mips.c:12471 elfxx-mips.c:12497
+#: elf32-ppc.c:4044 elf32-ppc.c:4059 elfxx-mips.c:12411 elfxx-mips.c:12437
+#: elfxx-mips.c:12459 elfxx-mips.c:12485
 msgid "Warning: %B uses hard float, %B uses soft float"
 msgstr "Aviso: %B usa coma flotante hard, %B usa coma flotante soft"
 
-#: elf32-ppc.c:4029 elf32-ppc.c:4033
+#: elf32-ppc.c:4047 elf32-ppc.c:4051
 msgid "Warning: %B uses double-precision hard float, %B uses single-precision hard float"
 msgstr "Aviso: %B usa coma flotante hard de doble precisión, %B usa coma flotante hard de precisión simple"
 
-#: elf32-ppc.c:4037
+#: elf32-ppc.c:4055
 msgid "Warning: %B uses soft float, %B uses single-precision hard float"
 msgstr "Aviso: %B usa coma flotante soft, %B usa coma flotante hard de precisión simple"
 
-#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407
+#: elf32-ppc.c:4062 elf32-ppc.c:4066 elfxx-mips.c:12391 elfxx-mips.c:12395
 msgid "Warning: %B uses unknown floating point ABI %d"
 msgstr "Aviso: %B usa la ABI de coma flotante desconocida %d"
 
-#: elf32-ppc.c:4090 elf32-ppc.c:4094
+#: elf32-ppc.c:4108 elf32-ppc.c:4112
 msgid "Warning: %B uses unknown vector ABI %d"
 msgstr "Aviso: %B usa la ABI de vector desconocida %d"
 
-#: elf32-ppc.c:4098
+#: elf32-ppc.c:4116
 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\""
 msgstr "Aviso: %B usa la ABI de vector \"%s\", %B usa \"%s\""
 
-#: elf32-ppc.c:4115 elf32-ppc.c:4118
+#: elf32-ppc.c:4133 elf32-ppc.c:4136
 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
 msgstr "Aviso: %B usa r3/r4 para devoluciones de estructura small, %B usa memoria"
 
-#: elf32-ppc.c:4121 elf32-ppc.c:4125
+#: elf32-ppc.c:4139 elf32-ppc.c:4143
 msgid "Warning: %B uses unknown small structure return convention %d"
 msgstr "Aviso: %B usa la convención de devolución de estructura small %d"
 
-#: elf32-ppc.c:4179
+#: elf32-ppc.c:4197
 msgid "%B: compiled with -mrelocatable and linked with modules compiled normally"
 msgstr "%B: compilado con -mrelocatable y enlazado con módulos compilados de forma normal"
 
-#: elf32-ppc.c:4187
+#: elf32-ppc.c:4205
 msgid "%B: compiled normally and linked with modules compiled with -mrelocatable"
 msgstr "%B: compilado de forma normal y enlazado con módulos compilados con -mrelocatable"
 
-#: elf32-ppc.c:4275
+#: elf32-ppc.c:4293
 msgid "Using bss-plt due to %B"
 msgstr "Se usa bss-plt debido a %B"
 
-#. Uh oh, we didn't find the expected call.  We
-#. could just mark this symbol to exclude it
-#. from tls optimization but it's safer to skip
-#. the entire optimization.
-#: elf32-ppc.c:4771 elf64-ppc.c:7778
-msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
-msgstr "%H el argumento perdió __tls_get_addr, se desactiva la optimización TLS\n"
-
-#: elf32-ppc.c:5006 elf64-ppc.c:6494
-#, c-format
-msgid "dynamic variable `%s' is zero size\n"
-msgstr "la variable dinámica `%s' es de tamaño cero\n"
-
-#: elf32-ppc.c:7204 elf64-ppc.c:12431
-msgid "%B: unknown relocation type %d for symbol %s\n"
-msgstr "%B: tipo de reubicación %d desconocida para el símbolo %s\n"
-
-#: elf32-ppc.c:7465
-msgid "%H: non-zero addend on %s reloc against `%s'\n"
-msgstr "%H: adición que no es cero en la reubicación %s contra `%s'\n"
+#: elf32-ppc.c:7192 elf64-ppc.c:12307
+msgid "%B: unknown relocation type %d for symbol %s"
+msgstr "%B: tipo de reubicación %d desconocido para el símbolo %s"
 
-#: elf32-ppc.c:7661 elf64-ppc.c:12936
-msgid "%H: relocation %s for indirect function %s unsupported\n"
-msgstr "%H: no se admite la reubicación %s para la función indirecta %s\n"
+#: elf32-ppc.c:7453
+msgid "%B(%A+0x%lx): non-zero addend on %s reloc against `%s'"
+msgstr "%B(%A+0x%lx): adición que no es cero en la reubicación %s contra `%s'"
 
-#: elf32-ppc.c:7889 elf32-ppc.c:7919 elf32-ppc.c:7966
-msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)\n"
-msgstr "%B: el objetivo (%s) de una reubicación %s está en la sección de salida errónea (%s)\n"
+#: elf32-ppc.c:7651 elf64-ppc.c:12812
+msgid "%B(%A+0x%lx): relocation %s for indirect function %s unsupported"
+msgstr "%B(%A+0x%lx): no se admite la reubicación %s para la función indirecta %s"
 
-#: elf32-ppc.c:8038
-msgid "%B: relocation %s is not yet supported for symbol %s\n"
-msgstr "%B: la reubicación %s aún no se admite para el símbolo %s\n"
+#: elf32-ppc.c:7881 elf32-ppc.c:7911 elf32-ppc.c:7958
+msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)"
+msgstr "%B: el objetivo (%s) de una reubicación %s está en la sección de salida errónea (%s)"
 
-#: elf32-ppc.c:8097 elf64-ppc.c:13237
-msgid "%H: unresolvable %s relocation against symbol `%s'\n"
-msgstr "%H: reubicación %s sin resolución contra el símbolo `%s'\n"
+#: elf32-ppc.c:8030
+msgid "%B: relocation %s is not yet supported for symbol %s."
+msgstr "%B: la reubicación %s aún no se admite para el símbolo %s."
 
-#: elf32-ppc.c:8144 elf64-ppc.c:13282
-msgid "%H: %s reloc against `%s': error %d\n"
-msgstr "%H: reubicación %s contra `%s': error %d\n"
+#: elf32-ppc.c:8138 elf64-ppc.c:13162
+msgid "%B(%A+0x%lx): %s reloc against `%s': error %d"
+msgstr "%B(%A+0x%lx): reubicación %s contra `%s': error %d"
 
-#: elf32-ppc.c:8635
+#: elf32-ppc.c:8629
 #, c-format
-msgid "%s not defined in linker created %s\n"
-msgstr "no se definió %s en el %s creado por el enlazador\n"
+msgid "%s not defined in linker created %s"
+msgstr "no se definió %s en el %s creado por el enlazador"
 
-#: elf32-rx.c:553
+#: elf32-rx.c:544
 msgid "%B:%A: Warning: deprecated Red Hat reloc "
 msgstr "%B:%A: Aviso: reubicación Red Hat obsoleta"
 
-#: elf32-rx.c:1095
+#: elf32-rx.c:1086
 msgid "Warning: RX_SYM reloc with an unknown symbol"
 msgstr "Aviso: reubicación RX_SYM con un símbolo desconocido"
 
-#: elf32-rx.c:1260
+#: elf32-rx.c:1251
 msgid "%B(%A): error: call to undefined function '%s'"
 msgstr "%B(%A): error: llamada a la función sin definir '%s'"
 
-#: elf32-rx.c:1274
+#: elf32-rx.c:1265
 msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
 msgstr "%B(%A): aviso: acceso sin alinear al símbolo '%s' en el área de datos small"
 
-#: elf32-rx.c:1278
+#: elf32-rx.c:1269
 msgid "%B(%A): internal error: out of range error"
 msgstr "%B(%A): error interno: error fuera de rango"
 
-#: elf32-rx.c:1282
+#: elf32-rx.c:1273
 msgid "%B(%A): internal error: unsupported relocation error"
 msgstr "%B(%A): error interno: no se admite el error de reubicación"
 
-#: elf32-rx.c:1286
+#: elf32-rx.c:1277
 msgid "%B(%A): internal error: dangerous relocation"
 msgstr "%B(%A): error interno: reubicación peligrosa"
 
-#: elf32-rx.c:1290
+#: elf32-rx.c:1281
 msgid "%B(%A): internal error: unknown error"
 msgstr "%B(%A): error interno: error desconocido"
 
-#: elf32-rx.c:2940
+#: elf32-rx.c:2928
 #, c-format
 msgid " [64-bit doubles]"
 msgstr " [dobles de 64-bit]"
 
-#: elf32-rx.c:2942
+#: elf32-rx.c:2930
 #, c-format
 msgid " [dsp]"
 msgstr " [dsp]"
@@ -2055,7 +1953,7 @@ msgstr " [dsp]"
 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s"
 msgstr "%B(%A+0x%lx): instrucción inválida para la reubicación TLS %s"
 
-#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324
+#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3323
 msgid "not enough GOT space for local GOT entries"
 msgstr "no hay suficiente espacio GOT para entradas GOT locales"
 
@@ -2094,7 +1992,7 @@ msgstr "%B: la directiva IMPORT AS para %s oculta un IMPORT AS previo"
 msgid "%B: Unrecognised .directive command: %s"
 msgstr "%B: No se reconoce la orden .directive: %s"
 
-#: elf32-sh-symbian.c:504
+#: elf32-sh-symbian.c:503
 msgid "%B: Failed to add renamed symbol %s"
 msgstr "%B: Falló al agregar el símbolo renombrado %s"
 
@@ -2180,7 +2078,7 @@ msgstr "%B: se accedió `%s' como un símbolo FDPIC y un símbolo local de hilo"
 msgid "%B: Function descriptor relocation with non-zero addend"
 msgstr "%B: Reubicación de descriptor de función con adición que no es cero"
 
-#: elf32-sh.c:6629 elf64-alpha.c:4648
+#: elf32-sh.c:6629 elf64-alpha.c:4560
 msgid "%B: TLS local exec code cannot be linked into shared objects"
 msgstr "%B: el código de ejecución local TLS no se puede enlazar en objetos compartidos"
 
@@ -2281,7 +2179,7 @@ msgstr "%s en la sección de sobreescritura"
 msgid "overlay stub relocation overflow"
 msgstr "desbordamiento de la reubicación de cabo de sobreescritura"
 
-#: elf32-spu.c:1960
+#: elf32-spu.c:1960 elf64-ppc.c:11327
 msgid "stubs don't match calculated size"
 msgstr "los cabos no coinciden con el tamaño calculado"
 
@@ -2371,54 +2269,52 @@ msgstr "error fatal al crear .fixup"
 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"
 msgstr "%B(%s+0x%lx): reubicación %s sin resolución contra el símbolo `%s'"
 
-#: elf32-tic6x.c:1602
-msgid "warning: generating a shared library containing non-PIC code"
-msgstr "aviso: se genera una biblioteca compartida que contiene código que no esPIC"
-
-#: elf32-tic6x.c:1607
-msgid "warning: generating a shared library containing non-PID code"
-msgstr "aviso: se genera una biblioteca compartida que contiene código que no es PID"
-
-#: elf32-tic6x.c:2539
+#: elf32-tic6x.c:1539
 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
 msgstr "%B: reubicación relativa a SB pero _c6xabi_DSBT_BASE no está definido"
 
-#: elf32-tic6x.c:2759
+#. Shared libraries and exception handling support not
+#. implemented.
+#: elf32-tic6x.c:1554
+msgid "%B: relocation type %d not implemented"
+msgstr "%B: el tipo de reubicación %d aún no está implementado"
+
+#: elf32-tic6x.c:1640
 msgid "dangerous relocation"
 msgstr "reubicación peligrosa"
 
-#: elf32-tic6x.c:3740
-msgid "%B: error: unknown mandatory EABI object attribute %d"
-msgstr "%B: error: atributo de objeto EABI obligatorio %d desconocido"
-
-#: elf32-tic6x.c:3748
-msgid "%B: warning: unknown EABI object attribute %d"
-msgstr "%B: aviso: atributo de objeto EABI %d desconocido"
-
-#: elf32-tic6x.c:3860 elf32-tic6x.c:3868
+#: elf32-tic6x.c:1788 elf32-tic6x.c:1796
 msgid "error: %B requires more stack alignment than %B preserves"
 msgstr "error: %B requiere más alineación de pila que la que %B preserva"
 
-#: elf32-tic6x.c:3878 elf32-tic6x.c:3887
+#: elf32-tic6x.c:1806 elf32-tic6x.c:1815
 msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
 msgstr "error: valor de Tag_ABI_array_object_alignment desconocido en %B"
 
-#: elf32-tic6x.c:3896 elf32-tic6x.c:3905
+#: elf32-tic6x.c:1824 elf32-tic6x.c:1833
 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
 msgstr "error: valor de Tag_ABI_array_object_align_expected desconocido en %B"
 
-#: elf32-tic6x.c:3913 elf32-tic6x.c:3920
+#: elf32-tic6x.c:1841 elf32-tic6x.c:1848
 msgid "error: %B requires more array alignment than %B preserves"
 msgstr "error: %B requiere más alineación de matriz que la que %B preserva"
 
-#: elf32-tic6x.c:3942
+#: elf32-tic6x.c:1870
 msgid "warning: %B and %B differ in wchar_t size"
 msgstr "aviso: %B y %B difieren en tamaño wchar_t"
 
-#: elf32-tic6x.c:3960
+#: elf32-tic6x.c:1888
 msgid "warning: %B and %B differ in whether code is compiled for DSBT"
 msgstr "aviso: %B y %B difieren en si el código está compilado para DSBT"
 
+#: elf32-tic6x.c:1898
+msgid "warning: %B and %B differ in position-dependence of data addressing"
+msgstr "aviso: %B y %B difieren en el direccionamiento de datos dependiente de posición"
+
+#: elf32-tic6x.c:1908
+msgid "warning: %B and %B differ in position-dependence of code addressing"
+msgstr "aviso: %B y %B difieren en el direccionamiento de código dependiente de posición"
+
 #: elf32-v850.c:173
 #, c-format
 msgid "Variable `%s' cannot occupy in multiple small data regions"
@@ -2445,8 +2341,9 @@ msgid "Variable `%s' cannot be in both zero and tiny data regions simultaneously
 msgstr "La variable `%s' no puede estar simultáneamente en las regiones de datos zero y tiny"
 
 #: elf32-v850.c:483
-msgid "FAILED to find previous HI16 reloc"
-msgstr "FALLO para encontrar la reubicación HI16 previa"
+#, c-format
+msgid "FAILED to find previous HI16 reloc\n"
+msgstr "FALLO para encontrar la reubicación HI16 previa\n"
 
 #: elf32-v850.c:2155
 msgid "could not locate special linker symbol __gp"
@@ -2530,7 +2427,7 @@ msgstr "%s: aviso: reubicación %s contra el símbolo `%s' de la sección %s"
 msgid "%s: warning: %s relocation to 0x%x from %s section"
 msgstr "%s: aviso: reubicación %s a 0x%x de la sección %s"
 
-#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342
+#: elf32-xstormy16.c:451 elf32-ia64.c:2861 elf64-ia64.c:2861
 msgid "non-zero addend in @fptr reloc"
 msgstr "adición que no es cero en la reubicación @fptr"
 
@@ -2586,52 +2483,52 @@ msgstr "%B(%A+0x%lx): compostura inesperada para la reubicación %s"
 msgid "GPDISP relocation did not find ldah and lda instructions"
 msgstr "la reubicación GPDISP no encontró las instrucciones ldah y lda"
 
-#: elf64-alpha.c:2495
+#: elf64-alpha.c:2408
 msgid "%B: .got subsegment exceeds 64K (size %d)"
 msgstr "%B: el subsegmento .got excede los 64K (tamaño %d)"
 
-#: elf64-alpha.c:4392 elf64-alpha.c:4404
+#: elf64-alpha.c:4304 elf64-alpha.c:4316
 msgid "%B: gp-relative relocation against dynamic symbol %s"
 msgstr "%B: reubicación relativa a gp contra el símbolo dinámico %s"
 
-#: elf64-alpha.c:4430 elf64-alpha.c:4565
+#: elf64-alpha.c:4342 elf64-alpha.c:4477
 msgid "%B: pc-relative relocation against dynamic symbol %s"
 msgstr "%B: reubicación relativa a pc contra el símbolo dinámico %s"
 
-#: elf64-alpha.c:4458
+#: elf64-alpha.c:4370
 msgid "%B: change in gp: BRSGP %s"
 msgstr "%B: cambio en gp: BRSGP %s"
 
-#: elf64-alpha.c:4483
+#: elf64-alpha.c:4395
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: elf64-alpha.c:4488
+#: elf64-alpha.c:4400
 msgid "%B: !samegp reloc against symbol without .prologue: %s"
 msgstr "%B: reubicación !samegp contra un símbolo sin .prologue: %s"
 
-#: elf64-alpha.c:4540
+#: elf64-alpha.c:4452
 msgid "%B: unhandled dynamic relocation against %s"
 msgstr "%B: reubicación dinámica sin manejar contra %s"
 
-#: elf64-alpha.c:4572
+#: elf64-alpha.c:4484
 msgid "%B: pc-relative relocation against undefined weak symbol %s"
 msgstr "%B: reubicación relativa a pc contra el símbolo débil sin definir %s"
 
-#: elf64-alpha.c:4632
+#: elf64-alpha.c:4544
 msgid "%B: dtp-relative relocation against dynamic symbol %s"
 msgstr "%B: reubicación relativa a dtp contra el símbolo dinámico %s"
 
-#: elf64-alpha.c:4655
+#: elf64-alpha.c:4567
 msgid "%B: tp-relative relocation against dynamic symbol %s"
 msgstr "%B: reubicación relativa a tp contra el símbolo dinámico %s"
 
-#: elf64-hppa.c:2094
+#: elf64-hppa.c:2101
 #, c-format
 msgid "stub entry for %s cannot load .plt, dp offset = %ld"
 msgstr "la entrada de cabo para %s no puede cargar .plt, desplazamiento dp = %ld"
 
-#: elf64-hppa.c:3292
+#: elf64-hppa.c:3299
 msgid "%B(%A+0x%lx): cannot reach %s"
 msgstr "%B(%A+0x%lx): no se puede alcanzar %s"
 
@@ -2692,82 +2589,65 @@ msgstr ""
 "Inconsistencia interna: %u restante != %u máximo.\n"
 "  Por favor reporte este bicho."
 
-#: elf64-ppc.c:2744 libbfd.c:1012
+#: elf64-ppc.c:2741 libbfd.c:997
 msgid "%B: compiled for a big endian system and target is little endian"
 msgstr "%B: compilado para un sistema big endian y el objetivo es little endian"
 
-#: elf64-ppc.c:2747 libbfd.c:1014
+#: elf64-ppc.c:2744 libbfd.c:999
 msgid "%B: compiled for a little endian system and target is big endian"
 msgstr "%B: compilado para un sistema little endian y el objetivo es big endian"
 
-#: elf64-ppc.c:4160
-msgid "%B: cannot create stub entry %s\n"
-msgstr "%B: no se puede crear la entrada de cabo %s\n"
-
-#: elf64-ppc.c:6484
+#: elf64-ppc.c:6473
 #, c-format
-msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc\n"
-msgstr "la reubicación de copia contra `%s' requiere de enlazado plt flojo; evite establecer LD_BIND_NOW=1 o actualice gcc\n"
+msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc"
+msgstr "la reubicación de copia contra `%s' requiere de enlazado plt flojo; evite establecer LD_BIND_NOW=1 o actualice gcc"
 
-#: elf64-ppc.c:6912
-msgid "dynreloc miscount for %B, section %A\n"
-msgstr "cuenta errónea de la reubicación dinámica de %B, sección %A\n"
+#: elf64-ppc.c:6901
+msgid "dynreloc miscount for %B, section %A"
+msgstr "cuenta errónea de la reubicación dinámica de %B, sección %A"
 
-#: elf64-ppc.c:6996
+#: elf64-ppc.c:6985
 msgid "%B: .opd is not a regular array of opd entries"
 msgstr "%B: .opd no es una matriz regular de entradas opd"
 
-#: elf64-ppc.c:7005
+#: elf64-ppc.c:6994
 msgid "%B: unexpected reloc type %u in .opd section"
 msgstr "%B: tipo de reubicación %u inesperado en la sección .opd"
 
-#: elf64-ppc.c:7026
+#: elf64-ppc.c:7015
 msgid "%B: undefined sym `%s' in .opd section"
 msgstr "%B: símbolo `%s' sin definir en la sección .opd"
 
-#: elf64-ppc.c:7584
-msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
-msgstr "%H se perdió el argumento __tls_get_addr, se desactiva la optimización TLS\n"
-
-#: elf64-ppc.c:7929 elf64-ppc.c:8450
+#: elf64-ppc.c:7877 elf64-ppc.c:8392
 #, c-format
 msgid "%s defined on removed toc entry"
 msgstr "se definió %s en la entrada toc eliminada"
 
-#: elf64-ppc.c:9474
-#, c-format
-msgid "cannot find opd entry toc for %s\n"
-msgstr "no se puede encontrar la tabla de contenidos de la entrada opd para %s\n"
-
-#: elf64-ppc.c:9556
+#: elf64-ppc.c:9459
 #, c-format
-msgid "long branch stub `%s' offset overflow\n"
-msgstr "desbordamiento del desplazamiento de stub de ramificación long `%s'\n"
+msgid "long branch stub `%s' offset overflow"
+msgstr "desbordamiento del desplazamiento de stub de ramificación long `%s'"
 
-#: elf64-ppc.c:9615
+#: elf64-ppc.c:9518
 #, c-format
-msgid "can't find branch stub `%s'\n"
-msgstr "no se puede encontrar la ramificación de cabo `%s'\n"
+msgid "can't find branch stub `%s'"
+msgstr "no se puede encontrar la ramificación de cabo `%s'"
 
-#: elf64-ppc.c:9677 elf64-ppc.c:9819
+#: elf64-ppc.c:9580 elf64-ppc.c:9716
 #, c-format
-msgid "linkage table error against `%s'\n"
-msgstr "error de la tabla de enlazado contra `%s'\n"
+msgid "linkage table error against `%s'"
+msgstr "error de la tabla de enlazado contra `%s'"
 
-#: elf64-ppc.c:9993
+#: elf64-ppc.c:9886
 #, c-format
-msgid "can't build branch stub `%s'\n"
-msgstr "no se puede construir la ramificación de cabos `%s'\n"
+msgid "can't build branch stub `%s'"
+msgstr "no se puede construir la ramificación de cabos `%s'"
 
-#: elf64-ppc.c:10814
+#: elf64-ppc.c:10684
 msgid "%B section %A exceeds stub group size"
 msgstr "%B sección %A excede el tamaño de grupo de cabos"
 
-#: elf64-ppc.c:11457
-msgid "stubs don't match calculated size\n"
-msgstr "los cabos no coinciden con el tamaño calculado\n"
-
-#: elf64-ppc.c:11469
+#: elf64-ppc.c:11339
 #, c-format
 msgid ""
 "linker stubs in %u group%s\n"
@@ -2784,94 +2664,82 @@ msgstr ""
 "  ajuste toc long %lu\n"
 "  llamada plt     %lu"
 
-#: elf64-ppc.c:11819
-msgid "%H: %s used with TLS symbol %s\n"
-msgstr "%H: se usó %s con el símbolo TLS %s\n"
+#: elf64-ppc.c:12190
+msgid "%B(%A+0x%lx): automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc"
+msgstr "%B(%A+0x%lx): no se admiten los TOCs múltiples automáticos, utilizando sus ficheros crt; recompile con -mminimal-toc o actualice gcc"
 
-#: elf64-ppc.c:11820
-msgid "%H: %s used with non-TLS symbol %s\n"
-msgstr "%H: se usó %s con el símbolo %s que no es TLS\n"
+#: elf64-ppc.c:12198
+msgid "%B(%A+0x%lx): sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern"
+msgstr "%B(%A+0x%lx): la optimización de llamada hermana a `%s' no permite TOCs múltiples automáticos; recompile con -mminimal-toc ó -fno-optimize-sibling-calls, o vuelva `%s' externa"
 
-#: elf64-ppc.c:12318
-msgid "%H: automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc\n"
-msgstr "%H: no se admiten los TOCs múltiples automáticos, utilizando sus ficheros crt; recompile con -mminimal-toc o actualice gcc\n"
+#: elf64-ppc.c:12919
+msgid "%B: relocation %s is not supported for symbol %s."
+msgstr "%B: no se admite la reubicación %s para el símbolo %s."
 
-#: elf64-ppc.c:12324
-msgid "%H: sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern\n"
-msgstr "%H: la optimización de llamada hermana a `%s' no permite TOCs múltiples automáticos; recompile con -mminimal-toc ó -fno-optimize-sibling-calls, o vuelva `%s' externa\n"
-
-#: elf64-ppc.c:13041
-msgid "%B: relocation %s is not supported for symbol %s\n"
-msgstr "%B: no se admite la reubicación %s para el símbolo %s\n"
-
-#: elf64-ppc.c:13218
-msgid "%H: error: %s not a multiple of %u\n"
-msgstr "%H: error: la reubicación %s no es un múltiplo de %u\n"
+#: elf64-ppc.c:13096
+msgid "%B: error: relocation %s not a multiple of %d"
+msgstr "%B: error: la reubicación %s no es un múltiplo de %d"
 
 #: elf64-sh64.c:1682
 #, c-format
 msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n"
 msgstr "%s: error: tipo de reubicación %d sin alinear en %08x reubicación %08x\n"
 
-#: elf64-sparc.c:445
+#: elf64-sparc.c:444
 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
 msgstr "%B: Solamente los registros %%g[2367] se pueden declarar utilizando STT_REGISTER"
 
-#: elf64-sparc.c:465
+#: elf64-sparc.c:464
 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
 msgstr "El registro %%g%d se usó de forma incompatible: %s en %B, previamente %s en %B"
 
-#: elf64-sparc.c:488
+#: elf64-sparc.c:487
 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
 msgstr "El símbolo `%s' tiene tipos divergentes: REGISTER en %B, previamente %s en %B"
 
-#: elf64-sparc.c:533
+#: elf64-sparc.c:532
 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
 msgstr "El símbolo `%s' tiene tipos divergentes: %s en %B, previamente REGISTER en %B"
 
-#: elf64-sparc.c:686
+#: elf64-sparc.c:684
 msgid "%B: linking UltraSPARC specific with HAL specific code"
 msgstr "%B: se enlaza código específico de UltraSPARC con código específico de HAL"
 
-#: elf64-x86-64.c:1236
-msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
-msgstr "%B: la reubicación %s contra el símbolo `%s' no se admite en modo x32"
-
-#: elf64-x86-64.c:1465
+#: elf64-x86-64.c:1360
 msgid "%B: '%s' accessed both as normal and thread local symbol"
 msgstr "%B: se accedió a '%s' como un símbolo normal y como un símbolo local de hilo"
 
-#: elf64-x86-64.c:2934
+#: elf64-x86-64.c:2801
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d"
 msgstr "%B: la reubicación %s contra el símbolo STT_GNU_IFUNC `%s' con adición que no es cero: %d"
 
-#: elf64-x86-64.c:3193
+#: elf64-x86-64.c:3073
 msgid "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"
 msgstr "%B: no se puede usar la reubicación R_X86_64_GOTOFF contra la función protegida `%s' cuando se hace un objeto compartido"
 
-#: elf64-x86-64.c:3305
+#: elf64-x86-64.c:3184
 msgid "; recompile with -fPIC"
 msgstr "; recompile con -fPIC"
 
-#: elf64-x86-64.c:3310
+#: elf64-x86-64.c:3189
 msgid "%B: relocation %s against %s `%s' can not be used when making a shared object%s"
 msgstr "%B: no se puede usar la reubicación %s contra %s `%s' cuando se hace un objeto compartido%s"
 
-#: elf64-x86-64.c:3312
+#: elf64-x86-64.c:3191
 msgid "%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s"
 msgstr "%B: no se puede usar la reubicación %s contra %s sin definir `%s' cuando se hace un objeto compartido%s"
 
-#: elfcode.h:827
+#: elfcode.h:826
 #, c-format
 msgid "warning: %s has a corrupt string table index - ignoring"
 msgstr "aviso: %s tiene un índice de tablas de cadenas corrupto - se descarta"
 
-#: elfcode.h:1237
+#: elfcode.h:1236
 #, c-format
 msgid "%s: version count (%ld) does not match symbol count (%ld)"
 msgstr "%s: la cuenta de versión (%ld) no coincide con la cuenta de símbolos (%ld)"
 
-#: elfcode.h:1491
+#: elfcode.h:1476
 #, c-format
 msgid "%s(%s): relocation %d has invalid symbol index %ld"
 msgstr "%s(%s): la reubicación %d tiene un índice de símbolo %ld inválido"
@@ -2896,320 +2764,300 @@ msgstr "%s: la definición TLS en %B sección %A no coincide con la referencia q
 msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
 msgstr "%s: la referencia TLS en %B no coincide con la definición que no es TLS en %B sección %A"
 
-#: elflink.c:1764
+#: elflink.c:1763
 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
 msgstr "%B: redefinición inesperada del símbolo con versión indirecta `%s'"
 
-#: elflink.c:2077
+#: elflink.c:2076
 msgid "%B: version node not found for symbol %s"
 msgstr "%B: no se encuentra la versión del nodo para el símbolo %s"
 
-#: elflink.c:2167
+#: elflink.c:2166
 msgid "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'"
 msgstr "%B: índice de símbolos de reubicación inválido (0x%lx >= 0x%lx) erróneo para el desplazamiento 0x%lx en la sección `%A'"
 
-#: elflink.c:2178
+#: elflink.c:2177
 msgid "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the object file has no symbol table"
 msgstr "%B: índice de símbolos que no es cero (0x%lx) para el desplazamiento 0x%lx) en la sección `%A' cuando el fichero objeto no tiene tabla de símbolos"
 
-#: elflink.c:2368
+#: elflink.c:2367
 msgid "%B: relocation size mismatch in %B section %A"
 msgstr "%B: el tamaño de reubicación no coincide en %B sección %A"
 
-#: elflink.c:2663
+#: elflink.c:2662
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
 msgstr "aviso: el tipo y tamaño del símbolo dinámico `%s' no están definidos"
 
-#: elflink.c:3421
+#: elflink.c:3418
 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
 msgstr "%P: se encontró código máquina ELF alternativo (%d) en %B, se espera %d\n"
 
-#: elflink.c:4067
+#: elflink.c:4050
 msgid "%B: %s: invalid version %u (max %d)"
 msgstr "%B: %s: versión %u inválida (máximo %d)"
 
-#: elflink.c:4103
+#: elflink.c:4086
 msgid "%B: %s: invalid needed version %d"
 msgstr "%B: %s: versión requerida %d inválida"
 
-#: elflink.c:4299
+#: elflink.c:4285
 msgid "Warning: alignment %u of common symbol `%s' in %B is greater than the alignment (%u) of its section %A"
 msgstr "Aviso: la alineación %u del símbolo común `%s' en %B es más grande que la alineación (%u) de su sección %A"
 
-#: elflink.c:4305
+#: elflink.c:4291
 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
 msgstr "Aviso: la alineación %u del símbolo `%s' en %B es más pequeña que %u en %B"
 
-#: elflink.c:4320
+#: elflink.c:4306
 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B"
 msgstr "Aviso: el tamaño del símbolo `%s' cambió de %lu en %B a %lu en %B"
 
-#: elflink.c:4489
+#: elflink.c:4472
 msgid "%B: undefined reference to symbol '%s'"
 msgstr "%B: referencia sin definir al símbolo '%s'"
 
-#: elflink.c:4492
+#: elflink.c:4475
 msgid "note: '%s' is defined in DSO %B so try adding it to the linker command line"
 msgstr "nota: se define '%s' en DSO %B así que se tratará de agregarlo a la línea de órdenes del enlazador"
 
-#: elflink.c:5795
+#: elflink.c:5779
 #, c-format
 msgid "%s: undefined version: %s"
 msgstr "%s: versión sin definir: %s"
 
-#: elflink.c:5863
+#: elflink.c:5847
 msgid "%B: .preinit_array section is not allowed in DSO"
 msgstr "%B: no se permite la sección .preinit_array en DSO"
 
-#: elflink.c:7617
+#: elflink.c:7598
 #, c-format
 msgid "undefined %s reference in complex symbol: %s"
 msgstr "referencia %s sin definir en el símbolo complejo: %s"
 
-#: elflink.c:7771
+#: elflink.c:7752
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr "operador desconocido '%c' en el símbolo complejo"
 
-#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181
+#: elflink.c:8091 elflink.c:8108 elflink.c:8145 elflink.c:8162
 msgid "%B: Unable to sort relocs - they are in more than one size"
 msgstr "%B: No se pueden ordenar las reubicaciones - son de tamaños diferentes"
 
-#: elflink.c:8141 elflink.c:8195
+#: elflink.c:8122 elflink.c:8176
 msgid "%B: Unable to sort relocs - they are of an unknown size"
 msgstr "%B: No se pueden ordenar las reubicaciones - son de tamaño desconocido"
 
-#: elflink.c:8246
+#: elflink.c:8227
 msgid "Not enough memory to sort relocations"
 msgstr "No hay suficiente memoria para ordenar las reubicaciones"
 
-#: elflink.c:8439
+#: elflink.c:8420
 msgid "%B: Too many sections: %d (>= %d)"
 msgstr "%B: Demasiadas secciones:  %d (>= %d)"
 
-#: elflink.c:8686
-msgid "%B: internal symbol `%s' in %B is referenced by DSO"
-msgstr "%B: el símbolo interno `%s' en %B está referenciado por DSO"
-
-#: elflink.c:8688
-msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
-msgstr "%B: el símbolo oculto `%s' en %B está referenciado por DSO"
-
-#: elflink.c:8690
-msgid "%B: local symbol `%s' in %B is referenced by DSO"
-msgstr "%B: el símbolo local `%s' en %B está referenciado por DSO"
+#: elflink.c:8663
+msgid "%B: %s symbol `%s' in %B is referenced by DSO"
+msgstr "%B: el símbolo %s `%s' en %B está referenciado por DSO"
 
-#: elflink.c:8785
+#: elflink.c:8754
 msgid "%B: could not find output section %A for input section %A"
 msgstr "%B: no se puede encontrar la sección de salida %A para la sección de entrada %A"
 
-#: elflink.c:8908
-msgid "%B: protected symbol `%s' isn't defined"
-msgstr "%B: el símbolo protegido `%s' no está definido"
+#: elflink.c:8874
+msgid "%B: %s symbol `%s' isn't defined"
+msgstr "%B: el símbolo %s `%s' no está definido"
 
-#: elflink.c:8910
-msgid "%B: internal symbol `%s' isn't defined"
-msgstr "%B: el símbolo interno `%s' no está definido"
-
-#: elflink.c:8912
-msgid "%B: hidden symbol `%s' isn't defined"
-msgstr "%B: el símbolo oculto `%s' no está definido"
-
-#: elflink.c:9441
-msgid "error: %B: size of section %A is not multiple of address size"
-msgstr "error: %B: el tamaño de la sección %A no es un múltiplo del tamaño de la dirección"
-
-#: elflink.c:9488
+#: elflink.c:9428
 msgid "error: %B contains a reloc (0x%s) for section %A that references a non-existent global symbol"
 msgstr "error: %B contiene una reubicación (0x%s) para la sección %A que refiere a un símbolo global que no existe"
 
-#: elflink.c:10223
+#: elflink.c:9494
+msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
+msgstr "%X`%s' referido en la sección `%A' de %B: se definió en la sección descartada `%A' de %B\n"
+
+#: elflink.c:10141
 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
 msgstr "%A tiene tanto secciones ordenadas [`%A' en %B] como desordenadas [`%A' en %B]"
 
-#: elflink.c:10228
+#: elflink.c:10146
 #, c-format
 msgid "%A has both ordered and unordered sections"
 msgstr "%A tiene secciones tanto ordenadas como desordenadas"
 
-#: elflink.c:10793
-msgid "%B: file class %s incompatible with %s"
-msgstr "%B: el fichero de clase %s es incompatible con %s"
-
-#: elflink.c:11104 elflink.c:11148
+#: elflink.c:10992 elflink.c:11036
 msgid "%B: could not find output section %s"
 msgstr "%B: no se puede encontrar la sección de salida %s"
 
-#: elflink.c:11109
+#: elflink.c:10997
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr "aviso: la sección %s es de tamaño cero"
 
-#: elflink.c:11214
+#: elflink.c:11102
 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
 msgstr "%P: aviso: se crea un DT_TEXTREL en un objeto compartido.\n"
 
-#: elflink.c:11401
+#: elflink.c:11289
 msgid "%P%X: can not read symbols: %E\n"
 msgstr "%P%X: no se pueden leer símbolos: %E\n"
 
-#: elflink.c:11750
+#: elflink.c:11638
 msgid "Removing unused section '%s' in file '%B'"
 msgstr "Se elimina la sección sin uso '%s' en el fichero '%B'"
 
-#: elflink.c:11962
+#: elflink.c:11850
 msgid "Warning: gc-sections option ignored"
 msgstr "Aviso: se descarta la opción gc-sections"
 
-#: elflink.c:12511
+#: elflink.c:12399
 msgid "%B: ignoring duplicate section `%A'"
 msgstr "%B: se descarta la sección duplicada `%A'"
 
-#: elflink.c:12518 elflink.c:12525
+#: elflink.c:12406 elflink.c:12413
 msgid "%B: duplicate section `%A' has different size"
 msgstr "%B: la sección duplicada `%A' tiene tamaño diferente"
 
-#: elflink.c:12533 elflink.c:12538
+#: elflink.c:12421 elflink.c:12426
 msgid "%B: warning: could not read contents of section `%A'"
 msgstr "%B: aviso: no se puede leer el contenido de la sección `%A'"
 
-#: elflink.c:12542
+#: elflink.c:12430
 msgid "%B: warning: duplicate section `%A' has different contents"
 msgstr "%B: aviso: la sección duplicada `%A' tiene contenido diferente"
 
-#: elflink.c:12643 linker.c:3086
+#: elflink.c:12531 linker.c:3138
 msgid "%F%P: already_linked_table: %E\n"
 msgstr "%F%P: already_linked_table: %E\n"
 
-#: elfxx-mips.c:1221
+#: elfxx-mips.c:1220
 msgid "static procedure (no name)"
 msgstr "procedimiento estático (sin nombre)"
 
-#: elfxx-mips.c:5628
+#: elfxx-mips.c:5623
 msgid "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."
 msgstr "%B: %A+0x%lx: No se permiten los saltos directos entre modos ISA; considere recompilar con el entrelazado activado."
 
-#: elfxx-mips.c:6288 elfxx-mips.c:6511
+#: elfxx-mips.c:6280 elfxx-mips.c:6503
 msgid "%B: Warning: bad `%s' option size %u smaller than its header"
 msgstr "%B: Aviso: el tamaño de opción `%s' %u erróneo es más pequeño que su encabezado"
 
-#: elfxx-mips.c:7262 elfxx-mips.c:7387
+#: elfxx-mips.c:7254 elfxx-mips.c:7379
 msgid "%B: Warning: cannot determine the target function for stub section `%s'"
 msgstr "%B: Aviso: no se puede determinar la función objetivo para la sección de cabo `%s'"
 
-#: elfxx-mips.c:7516
+#: elfxx-mips.c:7508
 msgid "%B: Malformed reloc detected for section %s"
 msgstr "%B: Se detectó una reubicación malformada para la sección %s"
 
-#: elfxx-mips.c:7556
+#: elfxx-mips.c:7548
 msgid "%B: GOT reloc at 0x%lx not expected in executables"
 msgstr "%B: no se esperaba la reubicación GOT en 0x%lx en ejecutables"
 
-#: elfxx-mips.c:7678
+#: elfxx-mips.c:7670
 msgid "%B: CALL16 reloc at 0x%lx not against global symbol"
 msgstr "%B: la reubicación CALL16 en 0x%lx no es contra un símbolo global"
 
-#: elfxx-mips.c:8372
+#: elfxx-mips.c:8365
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
 msgstr "reubicaciones que no son dinámicas se refieren al símbolo dinámico %s"
 
-#: elfxx-mips.c:9075
+#: elfxx-mips.c:9068
 msgid "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"
 msgstr "%B: No se puede encontrar una reubicación LO16 coincidente contra `%s' para %s en 0x%lx en la sección `%A'"
 
-#: elfxx-mips.c:9214
+#: elfxx-mips.c:9207
 msgid "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
 msgstr "la sección small-data excede los 64KB; disminuya el límite de tamaño de small-data (vea la opción -G)"
 
-#: elfxx-mips.c:12038
+#: elfxx-mips.c:12027
 #, c-format
 msgid "%s: illegal section name `%s'"
 msgstr "%s: nombre de sección `%s' ilegal"
 
-#: elfxx-mips.c:12417 elfxx-mips.c:12443
+#: elfxx-mips.c:12405 elfxx-mips.c:12431
 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float"
 msgstr "Aviso: %B usa -msingle-float, %B usa -mdouble-float"
 
-#: elfxx-mips.c:12429 elfxx-mips.c:12485
+#: elfxx-mips.c:12417 elfxx-mips.c:12473
 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"
 msgstr "Aviso: %B usa -msingle-float, %B usa -mips32r2 -mfp64"
 
-#: elfxx-mips.c:12455 elfxx-mips.c:12491
+#: elfxx-mips.c:12443 elfxx-mips.c:12479
 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"
 msgstr "Aviso: %B usa -mdouble-float, %B usa -mips32r2 -mfp64"
 
-#: elfxx-mips.c:12533
+#: elfxx-mips.c:12521
 msgid "%B: endianness incompatible with that of the selected emulation"
 msgstr "%B: la endianez es incompatible con aquella de la emulación seleccionada"
 
-#: elfxx-mips.c:12544
+#: elfxx-mips.c:12532
 msgid "%B: ABI is incompatible with that of the selected emulation"
 msgstr "%B: la ABI es incompatible con aquella de la emulación seleccionada"
 
-#: elfxx-mips.c:12628
+#: elfxx-mips.c:12613
 msgid "%B: warning: linking abicalls files with non-abicalls files"
 msgstr "%B: aviso: se enlazan ficheros de llamadas abi con ficheros que no son de llamadas abi"
 
-#: elfxx-mips.c:12645
+#: elfxx-mips.c:12630
 msgid "%B: linking 32-bit code with 64-bit code"
 msgstr "%B: se enlaza código de 32-bit con código de 64-bit"
 
-#: elfxx-mips.c:12673
+#: elfxx-mips.c:12658
 msgid "%B: linking %s module with previous %s modules"
 msgstr "%B: se enlaza el módulo %s con módulos %s previos"
 
-#: elfxx-mips.c:12696
+#: elfxx-mips.c:12681
 msgid "%B: ABI mismatch: linking %s module with previous %s modules"
 msgstr "%B: no coincide ABI: se enlaza el módulo %s con módulos %s previos"
 
-#: elfxx-mips.c:12860
+#: elfxx-mips.c:12845
 #, c-format
 msgid " [abi=O32]"
 msgstr " [abi=O32]"
 
-#: elfxx-mips.c:12862
+#: elfxx-mips.c:12847
 #, c-format
 msgid " [abi=O64]"
 msgstr " [abi=O64]"
 
-#: elfxx-mips.c:12864
+#: elfxx-mips.c:12849
 #, c-format
 msgid " [abi=EABI32]"
 msgstr " [abi=EABI32]"
 
-#: elfxx-mips.c:12866
+#: elfxx-mips.c:12851
 #, c-format
 msgid " [abi=EABI64]"
 msgstr " [abi=EABI64]"
 
-#: elfxx-mips.c:12868
+#: elfxx-mips.c:12853
 #, c-format
 msgid " [abi unknown]"
 msgstr " [abi desconocido]"
 
-#: elfxx-mips.c:12870
+#: elfxx-mips.c:12855
 #, c-format
 msgid " [abi=N32]"
 msgstr " [abi=N32]"
 
-#: elfxx-mips.c:12872
+#: elfxx-mips.c:12857
 #, c-format
 msgid " [abi=64]"
 msgstr " [abi=64]"
 
-#: elfxx-mips.c:12874
+#: elfxx-mips.c:12859
 #, c-format
 msgid " [no abi set]"
 msgstr " [no hay conjunto abi]"
 
-#: elfxx-mips.c:12895
+#: elfxx-mips.c:12880
 #, c-format
 msgid " [unknown ISA]"
 msgstr " [ISA desconocido]"
 
-#: elfxx-mips.c:12906
+#: elfxx-mips.c:12891
 #, c-format
 msgid " [not 32bitmode]"
 msgstr " [no es modo 32bit]"
@@ -3306,144 +3154,86 @@ msgstr "%s: la dirección 0x%s está fuera de rango en el fichero Hexadecimal de
 msgid "%B: unable to get decompressed section %A"
 msgstr "%B: no se puede obtener la sección %A descomprimida"
 
-#: libbfd.c:1043
+#: libbfd.c:1027
 #, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
 msgstr "Se llamó a %s que es obsoleto en %s línea %d en %s\n"
 
-#: libbfd.c:1046
+#: libbfd.c:1030
 #, c-format
 msgid "Deprecated %s called\n"
 msgstr "Se llamó a %s que es obsoleto\n"
 
-#: linker.c:1859
+#: linker.c:1911
 msgid "%B: indirect symbol `%s' to `%s' is a loop"
 msgstr "%B: el símbolo indirecto `%s' para `%s' es un ciclo"
 
-#: linker.c:2726
+#: linker.c:2778
 #, c-format
 msgid "Attempt to do relocatable link with %s input and %s output"
 msgstr "Se intentó hacer un enlace reubicable con entrada %s y salida %s"
 
-#: linker.c:3053
+#: linker.c:3105
 msgid "%B: warning: ignoring duplicate section `%A'\n"
 msgstr "%B: aviso: se descarta la sección duplicada `%A'\n"
 
-#: linker.c:3067
+#: linker.c:3119
 msgid "%B: warning: duplicate section `%A' has different size\n"
 msgstr "%B: aviso: la sección duplicada `%A' es de tamaño diferente\n"
 
-#: mach-o.c:381
-msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
-msgstr "bfd_mach_o_canonicalize_symtab: no se pueden cargar símbolos"
-
-#: mach-o.c:1253
-#, c-format
-msgid "unable to write unknown load command 0x%lx"
-msgstr "no se puede escribir la orden load 0x%lx desconocida"
-
-#: mach-o.c:1654
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"
-msgstr "bfd_mach_o_read_symtab_symbol: no se pueden leer %d bytes en %lu"
-
-#: mach-o.c:1671
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"
-msgstr "bfd_mach_o_read_symtab_symbol: nombre de símbolo fuera de rango (%lu >= %lu)"
-
-#: mach-o.c:1756
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: el símbolo \"%s\" especificó la sección inválida %d (máximo %lu): se cambia a indefinido"
-
-#: mach-o.c:1764
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: el símbolo \"%s\" no admite la referencia 'indirect': se cambia a indefinido"
-
-#: mach-o.c:1770
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x%x: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: el símbolo \"%s\" especificó el campo de tipo 0x%x inválido: se cambia a indefinido"
-
-#: mach-o.c:1840
-msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
-msgstr "bfd_mach_o_read_symtab_symbols: no se puede reservar memoria para símbolos"
-
-#: mach-o.c:1874
-#, c-format
-msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"
-msgstr "bfd_mach_o_read_dysymtab_symbol: no se pueden leer %lu bytes en %lu"
-
-#: mach-o.c:2556
-#, c-format
-msgid "unable to read unknown load command 0x%lx"
-msgstr "no se puede leer la orden load 0x%lx desconocida"
-
-#: mach-o.c:2736
-#, c-format
-msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
-msgstr "bfd_mach_o_scan: arquitectura 0x%lx/0x%lx desconocida"
-
-#: mach-o.c:2832
-#, c-format
-msgid "unknown header byte-order value 0x%lx"
-msgstr "valor de encabezado de orden de byte 0x%lx desconocido"
-
-#: mach-o.c:3402
+#: mach-o.c:3403
 msgid "Mach-O header:\n"
 msgstr "encabezado de Mach-O:\n"
 
-#: mach-o.c:3403
+#: mach-o.c:3404
 #, c-format
 msgid " magic     : %08lx\n"
 msgstr " magic     : %08lx\n"
 
-#: mach-o.c:3404
+#: mach-o.c:3405
 #, c-format
 msgid " cputype   : %08lx (%s)\n"
 msgstr " tipocpu   : %08lx (%s)\n"
 
-#: mach-o.c:3406
+#: mach-o.c:3407
 #, c-format
 msgid " cpusubtype: %08lx\n"
 msgstr " subtipocpu: %08lx\n"
 
-#: mach-o.c:3407
+#: mach-o.c:3408
 #, c-format
 msgid " filetype  : %08lx (%s)\n"
 msgstr " tipofich  : %08lx (%s)\n"
 
-#: mach-o.c:3410
+#: mach-o.c:3411
 #, c-format
 msgid " ncmds     : %08lx (%lu)\n"
 msgstr " nordenes  : %08lx (%lu)\n"
 
-#: mach-o.c:3411
+#: mach-o.c:3412
 #, c-format
 msgid " sizeofcmds: %08lx\n"
 msgstr " tamordenes: %08lx\n"
 
-#: mach-o.c:3412
+#: mach-o.c:3413
 #, c-format
 msgid " flags     : %08lx ("
 msgstr " opciones  : %08lx ("
 
-#: mach-o.c:3414 vms-alpha.c:7671
+#: mach-o.c:3415 vms-alpha.c:7652
 msgid ")\n"
 msgstr ")\n"
 
-#: mach-o.c:3415
+#: mach-o.c:3416
 #, c-format
 msgid " reserved  : %08x\n"
 msgstr " reservado : %08x\n"
 
-#: mach-o.c:3425
+#: mach-o.c:3426
 msgid "Segments and Sections:\n"
 msgstr "Segmentos y Secciones:\n"
 
-#: mach-o.c:3426
+#: mach-o.c:3427
 msgid " #: Segment name     Section name     Address\n"
 msgstr " #: Nombre segmento  Nombre sección   Dirección\n"
 
@@ -3607,11 +3397,6 @@ msgstr "%B: salto demasiado lejos\n"
 msgid "%B: bad pair/reflo after refhi\n"
 msgstr "%B: pair/reflo erróneo después de refhi\n"
 
-#: pef.c:519
-#, c-format
-msgid "bfd_pef_scan: unknown architecture 0x%lx"
-msgstr "bfd_pef_scan: arquitectura 0x%lx desconocida"
-
 #: pei-x86_64.c:444
 #, c-format
 msgid "warning: .pdata section size (%ld) is not a multiple of %d\n"
@@ -3714,11 +3499,6 @@ msgstr "Partición[%d] sector = 0x%.8lx (%ld)\n"
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr "Partición[%d] longitud = 0x%.8lx (%ld)\n"
 
-#: rs6000-core.c:448
-#, c-format
-msgid "%s: warning core file truncated"
-msgstr "%s: aviso de fichero core trunco"
-
 #: som.c:5471
 #, c-format
 msgid ""
@@ -3748,32 +3528,32 @@ msgstr "%B(%A+0x%lx): La entrada de cabos tiene una cadena índice inválida."
 msgid "Unsupported .stab relocation"
 msgstr "No se admite la reubicación .stab"
 
-#: vms-alpha.c:1299
+#: vms-alpha.c:1287
 #, c-format
 msgid "Unknown EGSD subtype %d"
 msgstr "Subtipo de EGSD %d desconocido"
 
-#: vms-alpha.c:1330
+#: vms-alpha.c:1318
 #, c-format
 msgid "Stack overflow (%d) in _bfd_vms_push"
 msgstr "Desbordamiento de la pila (%d) en _bfd_vms_push"
 
-#: vms-alpha.c:1343
+#: vms-alpha.c:1331
 msgid "Stack underflow in _bfd_vms_pop"
 msgstr "Desbordamiento por debajo de la pila en _bfd_vms_pop"
 
 #. These names have not yet been added to this switch statement.
-#: vms-alpha.c:1580
+#: vms-alpha.c:1568
 #, c-format
 msgid "unknown ETIR command %d"
 msgstr "orden ETIR %d desconocida"
 
-#: vms-alpha.c:1767
+#: vms-alpha.c:1755
 #, c-format
 msgid "bad section index in %s"
 msgstr "índice de sección erróneo en %s"
 
-#: vms-alpha.c:1780
+#: vms-alpha.c:1768
 #, c-format
 msgid "unsupported STA cmd %s"
 msgstr "no se admite la orden STA %s"
@@ -3783,1389 +3563,1389 @@ msgstr "no se admite la orden STA %s"
 #. Rotate.
 #. Redefine symbol to current location.
 #. Define a literal.
-#: vms-alpha.c:1956 vms-alpha.c:1987 vms-alpha.c:2234
+#: vms-alpha.c:1944 vms-alpha.c:1975 vms-alpha.c:2222
 #, c-format
 msgid "%s: not supported"
 msgstr "%s: no se admite"
 
-#: vms-alpha.c:1962
+#: vms-alpha.c:1950
 #, c-format
 msgid "%s: not implemented"
 msgstr "%s: sin implementar"
 
-#: vms-alpha.c:2218
+#: vms-alpha.c:2206
 #, c-format
 msgid "invalid use of %s with contexts"
 msgstr "uso inválido de %s en contextos"
 
-#: vms-alpha.c:2252
+#: vms-alpha.c:2240
 #, c-format
 msgid "reserved cmd %d"
 msgstr "orden %d reservada"
 
-#: vms-alpha.c:2337
+#: vms-alpha.c:2325
 msgid "Object module NOT error-free !\n"
 msgstr "¡ El módulo objeto NO está libre de errores !\n"
 
-#: vms-alpha.c:2766
+#: vms-alpha.c:2754
 #, c-format
 msgid "Symbol %s replaced by %s\n"
 msgstr "Se reemplazó el símbolo %s por %s\n"
 
-#: vms-alpha.c:3769
+#: vms-alpha.c:3757
 #, c-format
 msgid "SEC_RELOC with no relocs in section %s"
 msgstr "SEC_RELOC sin reubicaciones en la sección %s"
 
-#: vms-alpha.c:3822 vms-alpha.c:4053
+#: vms-alpha.c:3810 vms-alpha.c:4041
 #, c-format
 msgid "Size error in section %s"
 msgstr "Error de tamaño en la sección %s"
 
-#: vms-alpha.c:3992
+#: vms-alpha.c:3980
 msgid "Spurious ALPHA_R_BSR reloc"
 msgstr "Reubicación ALPHA_R_BSR espuria"
 
-#: vms-alpha.c:4040
+#: vms-alpha.c:4028
 #, c-format
 msgid "Unhandled relocation %s"
 msgstr "Reubicación %s sin manejar"
 
-#: vms-alpha.c:4330
+#: vms-alpha.c:4318
 #, c-format
 msgid "unknown source command %d"
 msgstr "orden fuente %d desconocida"
 
-#: vms-alpha.c:4391
+#: vms-alpha.c:4379
 msgid "DST__K_SET_LINUM_INCR not implemented"
 msgstr "DST__K_SET_LINUM_INCR sin implementar"
 
-#: vms-alpha.c:4397
+#: vms-alpha.c:4385
 msgid "DST__K_SET_LINUM_INCR_W not implemented"
 msgstr "DST__K_SET_LINUM_INCR_W sin implementar"
 
-#: vms-alpha.c:4403
+#: vms-alpha.c:4391
 msgid "DST__K_RESET_LINUM_INCR not implemented"
 msgstr "DST__K_RESET_LINUM_INCR sin implementar"
 
-#: vms-alpha.c:4409
+#: vms-alpha.c:4397
 msgid "DST__K_BEG_STMT_MODE not implemented"
 msgstr "DST__K_BEG_STMT_MODE sin implementar"
 
-#: vms-alpha.c:4415
+#: vms-alpha.c:4403
 msgid "DST__K_END_STMT_MODE not implemented"
 msgstr "DST__K_END_STMT_MODE sin implementar"
 
-#: vms-alpha.c:4442
+#: vms-alpha.c:4430
 msgid "DST__K_SET_PC not implemented"
 msgstr "DST__K_SET_PC sin implementar"
 
-#: vms-alpha.c:4448
+#: vms-alpha.c:4436
 msgid "DST__K_SET_PC_W not implemented"
 msgstr "DST__K_SET_PC_W sin implementar"
 
-#: vms-alpha.c:4454
+#: vms-alpha.c:4442
 msgid "DST__K_SET_PC_L not implemented"
 msgstr "DST__K_SET_PC_L sin implementar"
 
-#: vms-alpha.c:4460
+#: vms-alpha.c:4448
 msgid "DST__K_SET_STMTNUM not implemented"
 msgstr "DST__K_SET_STMTNUM sin implementar"
 
-#: vms-alpha.c:4503
+#: vms-alpha.c:4491
 #, c-format
 msgid "unknown line command %d"
 msgstr "orden de línea %d desconocida"
 
-#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003
-#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038
+#: vms-alpha.c:4938 vms-alpha.c:4955 vms-alpha.c:4969 vms-alpha.c:4984
+#: vms-alpha.c:4996 vms-alpha.c:5007 vms-alpha.c:5019
 #, c-format
 msgid "Unknown reloc %s + %s"
 msgstr "Reubicación %s + %s desconocida"
 
-#: vms-alpha.c:5093
+#: vms-alpha.c:5074
 #, c-format
 msgid "Unknown reloc %s"
 msgstr "Reubicación %s desconocida"
 
-#: vms-alpha.c:5106
+#: vms-alpha.c:5087
 msgid "Invalid section index in ETIR"
 msgstr "�ndice de sección inválido en ETIR"
 
-#: vms-alpha.c:5153
+#: vms-alpha.c:5134
 #, c-format
 msgid "Unknown symbol in command %s"
 msgstr "Símbolo desconocido en la orden %s"
 
-#: vms-alpha.c:5668
+#: vms-alpha.c:5649
 #, c-format
 msgid "  EMH %u (len=%u): "
 msgstr "  EMH %u (lon=%u): "
 
-#: vms-alpha.c:5677
+#: vms-alpha.c:5658
 #, c-format
 msgid "Module header\n"
 msgstr "Encabezado de módulo\n"
 
-#: vms-alpha.c:5678
+#: vms-alpha.c:5659
 #, c-format
 msgid "   structure level: %u\n"
 msgstr "   nivel estruct  : %u\n"
 
-#: vms-alpha.c:5679
+#: vms-alpha.c:5660
 #, c-format
 msgid "   max record size: %u\n"
 msgstr "   tam reg máximo : %u\n"
 
-#: vms-alpha.c:5682
+#: vms-alpha.c:5663
 #, c-format
 msgid "   module name    : %.*s\n"
 msgstr "   nombre módulo  : %.*s\n"
 
-#: vms-alpha.c:5684
+#: vms-alpha.c:5665
 #, c-format
 msgid "   module version : %.*s\n"
 msgstr "   versión módulo : %.*s\n"
 
-#: vms-alpha.c:5686
+#: vms-alpha.c:5667
 #, c-format
 msgid "   compile date   : %.17s\n"
 msgstr "   fecha compil   : %.17s\n"
 
-#: vms-alpha.c:5691
+#: vms-alpha.c:5672
 #, c-format
 msgid "Language Processor Name\n"
 msgstr "Nombre de Procesador de Lenguaje\n"
 
-#: vms-alpha.c:5692
+#: vms-alpha.c:5673
 #, c-format
 msgid "   language name: %.*s\n"
 msgstr "   nombre lenguaje: %.*s\n"
 
-#: vms-alpha.c:5699
+#: vms-alpha.c:5680
 #, c-format
 msgid "Source Files Header\n"
 msgstr "Encabezado de Ficheros Fuente\n"
 
-#: vms-alpha.c:5700
+#: vms-alpha.c:5681
 #, c-format
 msgid "   file: %.*s\n"
 msgstr "   fichero: %.*s\n"
 
-#: vms-alpha.c:5707
+#: vms-alpha.c:5688
 #, c-format
 msgid "Title Text Header\n"
 msgstr "Encabezado de Texto de Título\n"
 
-#: vms-alpha.c:5708
+#: vms-alpha.c:5689
 #, c-format
 msgid "   title: %.*s\n"
 msgstr "   título: %.*s\n"
 
-#: vms-alpha.c:5715
+#: vms-alpha.c:5696
 #, c-format
 msgid "Copyright Header\n"
 msgstr "Encabezado de Copyright\n"
 
-#: vms-alpha.c:5716
+#: vms-alpha.c:5697
 #, c-format
 msgid "   copyright: %.*s\n"
 msgstr "   copyright: %.*s\n"
 
-#: vms-alpha.c:5722
+#: vms-alpha.c:5703
 #, c-format
 msgid "unhandled emh subtype %u\n"
 msgstr "subtipo emh %u sin manejar\n"
 
-#: vms-alpha.c:5732
+#: vms-alpha.c:5713
 #, c-format
 msgid "  EEOM (len=%u):\n"
 msgstr "  EEOM (lon=%u):\n"
 
-#: vms-alpha.c:5733
+#: vms-alpha.c:5714
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr "   número de pares de enlace cond: %u\n"
 
-#: vms-alpha.c:5735
+#: vms-alpha.c:5716
 #, c-format
 msgid "   completion code: %u\n"
 msgstr "   código de completado: %u\n"
 
-#: vms-alpha.c:5739
+#: vms-alpha.c:5720
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr "   ops dirección transf: 0x%02x\n"
 
-#: vms-alpha.c:5740
+#: vms-alpha.c:5721
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr "   psect dirección transf: %u\n"
 
-#: vms-alpha.c:5742
+#: vms-alpha.c:5723
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr "   dirección transf   : 0x%08x\n"
 
-#: vms-alpha.c:5751
+#: vms-alpha.c:5732
 msgid " WEAK"
 msgstr " WEAK"
 
-#: vms-alpha.c:5753
+#: vms-alpha.c:5734
 msgid " DEF"
 msgstr " DEF"
 
-#: vms-alpha.c:5755
+#: vms-alpha.c:5736
 msgid " UNI"
 msgstr " UNI"
 
-#: vms-alpha.c:5757 vms-alpha.c:5778
+#: vms-alpha.c:5738 vms-alpha.c:5759
 msgid " REL"
 msgstr " REL"
 
-#: vms-alpha.c:5759
+#: vms-alpha.c:5740
 msgid " COMM"
 msgstr " COMM"
 
-#: vms-alpha.c:5761
+#: vms-alpha.c:5742
 msgid " VECEP"
 msgstr " VECEP"
 
-#: vms-alpha.c:5763
+#: vms-alpha.c:5744
 msgid " NORM"
 msgstr " NORM"
 
-#: vms-alpha.c:5765
+#: vms-alpha.c:5746
 msgid " QVAL"
 msgstr " QVAL"
 
-#: vms-alpha.c:5772
+#: vms-alpha.c:5753
 msgid " PIC"
 msgstr " PIC"
 
-#: vms-alpha.c:5774
+#: vms-alpha.c:5755
 msgid " LIB"
 msgstr " LIB"
 
-#: vms-alpha.c:5776
+#: vms-alpha.c:5757
 msgid " OVR"
 msgstr " OVR"
 
-#: vms-alpha.c:5780
+#: vms-alpha.c:5761
 msgid " GBL"
 msgstr " GBL"
 
-#: vms-alpha.c:5782
+#: vms-alpha.c:5763
 msgid " SHR"
 msgstr " SHR"
 
-#: vms-alpha.c:5784
+#: vms-alpha.c:5765
 msgid " EXE"
 msgstr " EXE"
 
-#: vms-alpha.c:5786
+#: vms-alpha.c:5767
 msgid " RD"
 msgstr " RD"
 
-#: vms-alpha.c:5788
+#: vms-alpha.c:5769
 msgid " WRT"
 msgstr " WRT"
 
-#: vms-alpha.c:5790
+#: vms-alpha.c:5771
 msgid " VEC"
 msgstr " VEC"
 
-#: vms-alpha.c:5792
+#: vms-alpha.c:5773
 msgid " NOMOD"
 msgstr " NOMOD"
 
-#: vms-alpha.c:5794
+#: vms-alpha.c:5775
 msgid " COM"
 msgstr " COM"
 
-#: vms-alpha.c:5796
+#: vms-alpha.c:5777
 msgid " 64B"
 msgstr " 64B"
 
-#: vms-alpha.c:5805
+#: vms-alpha.c:5786
 #, c-format
 msgid "  EGSD (len=%u):\n"
 msgstr "  EGSD (lon=%u):\n"
 
-#: vms-alpha.c:5817
+#: vms-alpha.c:5798
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
 msgstr " entrada EGSD %2u (tipo: %u, lon: %u): "
 
-#: vms-alpha.c:5829
+#: vms-alpha.c:5810
 #, c-format
 msgid "PSC - Program section definition\n"
 msgstr "PSC - Definición de sección de programa\n"
 
-#: vms-alpha.c:5830 vms-alpha.c:5847
+#: vms-alpha.c:5811 vms-alpha.c:5828
 #, c-format
 msgid "   alignment  : 2**%u\n"
 msgstr "   alineación : 2**%u\n"
 
-#: vms-alpha.c:5831 vms-alpha.c:5848
+#: vms-alpha.c:5812 vms-alpha.c:5829
 #, c-format
 msgid "   flags      : 0x%04x"
 msgstr "   opciones   : 0x%04x"
 
-#: vms-alpha.c:5835
+#: vms-alpha.c:5816
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr "   aloj (lon) : %u (0x%08x)\n"
 
-#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942
+#: vms-alpha.c:5817 vms-alpha.c:5874 vms-alpha.c:5923
 #, c-format
 msgid "   name       : %.*s\n"
 msgstr "   nombre     : %.*s\n"
 
-#: vms-alpha.c:5846
+#: vms-alpha.c:5827
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
 msgstr "SPSC - def sección Programa de Imagen Compartida\n"
 
-#: vms-alpha.c:5852
+#: vms-alpha.c:5833
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr "   aloj (lon)    : %u (0x%08x)\n"
 
-#: vms-alpha.c:5853
+#: vms-alpha.c:5834
 #, c-format
 msgid "   image offset  : 0x%08x\n"
 msgstr "   despl imagen  : 0x%08x\n"
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5836
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr "   despl symvec  : 0x%08x\n"
 
-#: vms-alpha.c:5857
+#: vms-alpha.c:5838
 #, c-format
 msgid "   name          : %.*s\n"
 msgstr "   name          : %.*s\n"
 
-#: vms-alpha.c:5870
+#: vms-alpha.c:5851
 #, c-format
 msgid "SYM - Global symbol definition\n"
 msgstr "SYM - Definición de símbolo global\n"
 
-#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971
+#: vms-alpha.c:5852 vms-alpha.c:5912 vms-alpha.c:5933 vms-alpha.c:5952
 #, c-format
 msgid "   flags: 0x%04x"
 msgstr "   opciones: 0x%04x"
 
-#: vms-alpha.c:5874
+#: vms-alpha.c:5855
 #, c-format
 msgid "   psect offset: 0x%08x\n"
 msgstr "   despl psect: 0x%08x\n"
 
-#: vms-alpha.c:5878
+#: vms-alpha.c:5859
 #, c-format
 msgid "   code address: 0x%08x\n"
 msgstr "   dirección código: 0x%08x\n"
 
-#: vms-alpha.c:5880
+#: vms-alpha.c:5861
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr "   índice psect para punto de entrada : %u\n"
 
-#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978
+#: vms-alpha.c:5864 vms-alpha.c:5940 vms-alpha.c:5959
 #, c-format
 msgid "   psect index : %u\n"
 msgstr "   índice psect : %u\n"
 
-#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980
+#: vms-alpha.c:5866 vms-alpha.c:5942 vms-alpha.c:5961
 #, c-format
 msgid "   name        : %.*s\n"
 msgstr "   nombre      : %.*s\n"
 
-#: vms-alpha.c:5892
+#: vms-alpha.c:5873
 #, c-format
 msgid "SYM - Global symbol reference\n"
 msgstr "SYM - Referencia de símbolo global\n"
 
-#: vms-alpha.c:5904
+#: vms-alpha.c:5885
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr "IDC - Revisor de Consistencia de Identación\n"
 
-#: vms-alpha.c:5905
+#: vms-alpha.c:5886
 #, c-format
 msgid "   flags         : 0x%08x"
 msgstr "   opciones      : 0x%08x"
 
-#: vms-alpha.c:5909
+#: vms-alpha.c:5890
 #, c-format
 msgid "   id match      : %x\n"
 msgstr "   coinc id      : %x\n"
 
-#: vms-alpha.c:5911
+#: vms-alpha.c:5892
 #, c-format
 msgid "   error severity: %x\n"
 msgstr "   severidad err : %x\n"
 
-#: vms-alpha.c:5914
+#: vms-alpha.c:5895
 #, c-format
 msgid "   entity name   : %.*s\n"
 msgstr "   nombre entidad: %.*s\n"
 
-#: vms-alpha.c:5916
+#: vms-alpha.c:5897
 #, c-format
 msgid "   object name   : %.*s\n"
 msgstr "   nombre objeto : %.*s\n"
 
-#: vms-alpha.c:5919
+#: vms-alpha.c:5900
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr "   ident binaria : 0x%08x\n"
 
-#: vms-alpha.c:5922
+#: vms-alpha.c:5903
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr "   ident ascii   : %.*s\n"
 
-#: vms-alpha.c:5930
+#: vms-alpha.c:5911
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
 msgstr "SYMG - Definición de símbolo universal\n"
 
-#: vms-alpha.c:5934
+#: vms-alpha.c:5915
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
 msgstr "   despl vector símbolo: 0x%08x\n"
 
-#: vms-alpha.c:5936
+#: vms-alpha.c:5917
 #, c-format
 msgid "   entry point: 0x%08x\n"
 msgstr "   punto de entrada: 0x%08x\n"
 
-#: vms-alpha.c:5938
+#: vms-alpha.c:5919
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr "   descr proc : 0x%08x\n"
 
-#: vms-alpha.c:5940
+#: vms-alpha.c:5921
 #, c-format
 msgid "   psect index: %u\n"
 msgstr "   índice psect: %u\n"
 
-#: vms-alpha.c:5951
+#: vms-alpha.c:5932
 #, c-format
 msgid "SYMV - Vectored symbol definition\n"
 msgstr "SYMV - Definición de símbolo vectorizado\n"
 
-#: vms-alpha.c:5955
+#: vms-alpha.c:5936
 #, c-format
 msgid "   vector      : 0x%08x\n"
 msgstr "   vector      : 0x%08x\n"
 
-#: vms-alpha.c:5957 vms-alpha.c:5976
+#: vms-alpha.c:5938 vms-alpha.c:5957
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr "   despl psect : %u\n"
 
-#: vms-alpha.c:5970
+#: vms-alpha.c:5951
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
 msgstr "SYMM - Definición de símbolo global con versión\n"
 
-#: vms-alpha.c:5974
+#: vms-alpha.c:5955
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr "   máscara versión: 0x%08x\n"
 
-#: vms-alpha.c:5985
+#: vms-alpha.c:5966
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr "tipo de entrada egsd %u sin manejar\n"
 
-#: vms-alpha.c:6019
+#: vms-alpha.c:6000
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr "    índice enlace: %u, insn reemplazo: 0x%08x\n"
 
-#: vms-alpha.c:6022
+#: vms-alpha.c:6003
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr "    ind psect 1: %u, despl 1: 0x%08x %08x\n"
 
-#: vms-alpha.c:6026
+#: vms-alpha.c:6007
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr "    ind psect 2: %u, despl 2: 0x%08x %08x\n"
 
-#: vms-alpha.c:6031
+#: vms-alpha.c:6012
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr "    ind psect 3: %u, despl 3: 0x%08x %08x\n"
 
-#: vms-alpha.c:6036
+#: vms-alpha.c:6017
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr "    nombre global: %.*s\n"
 
-#: vms-alpha.c:6046
+#: vms-alpha.c:6027
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr "  %s (lon=%u+%u):\n"
 
-#: vms-alpha.c:6061
+#: vms-alpha.c:6042
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr "   (tipo: %3u, tam: 4+%3u): "
 
-#: vms-alpha.c:6065
+#: vms-alpha.c:6046
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr "STA_GBL (pila global) %.*s\n"
 
-#: vms-alpha.c:6069
+#: vms-alpha.c:6050
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr "STA_LW (pila longword) 0x%08x\n"
 
-#: vms-alpha.c:6073
+#: vms-alpha.c:6054
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr "STA_QW (pila quadword) 0x%08x %08x\n"
 
-#: vms-alpha.c:6078
+#: vms-alpha.c:6059
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr "STA_PQ (pila psect base + despl)\n"
 
-#: vms-alpha.c:6079
+#: vms-alpha.c:6060
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr "    psect: %u, despl: 0x%08x %08x\n"
 
-#: vms-alpha.c:6085
+#: vms-alpha.c:6066
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr "STA_LI (pila literal)\n"
 
-#: vms-alpha.c:6088
+#: vms-alpha.c:6069
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr "STA_MOD (pila módulo)\n"
 
-#: vms-alpha.c:6091
+#: vms-alpha.c:6072
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr "STA_CKARG (compara argumentos de procedimientos)\n"
 
-#: vms-alpha.c:6095
+#: vms-alpha.c:6076
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr "STO_B (almacena byte)\n"
 
-#: vms-alpha.c:6098
+#: vms-alpha.c:6079
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr "STO_W (almacena word)\n"
 
-#: vms-alpha.c:6101
+#: vms-alpha.c:6082
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr "STO_LW (almacena longword)\n"
 
-#: vms-alpha.c:6104
+#: vms-alpha.c:6085
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr "STO_QW (almacena quadword)\n"
 
-#: vms-alpha.c:6110
+#: vms-alpha.c:6091
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr "STO_IMMR (almacena inmediato repetido) %u bytes\n"
 
-#: vms-alpha.c:6117
+#: vms-alpha.c:6098
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr "STO_GBL (almacena global) %.*s\n"
 
-#: vms-alpha.c:6121
+#: vms-alpha.c:6102
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr "STO_CA (almacena direcc código) %.*s\n"
 
-#: vms-alpha.c:6125
+#: vms-alpha.c:6106
 #, c-format
 msgid "STO_RB (store relative branch)\n"
 msgstr "STO_RB (almacena ramif relativa)\n"
 
-#: vms-alpha.c:6128
+#: vms-alpha.c:6109
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
 msgstr "STO_AB (almacena ramif absoluta)\n"
 
-#: vms-alpha.c:6131
+#: vms-alpha.c:6112
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr "STO_OFF (almacena despl para psect)\n"
 
-#: vms-alpha.c:6137
+#: vms-alpha.c:6118
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr "STO_IMM (almacena inmediato) %u bytes\n"
 
-#: vms-alpha.c:6144
+#: vms-alpha.c:6125
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr "STO_GBL_LW (almacena global longword) %.*s\n"
 
-#: vms-alpha.c:6148
+#: vms-alpha.c:6129
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr "STO_OFF (almacena LP con firma de procedimiento)\n"
 
-#: vms-alpha.c:6151
+#: vms-alpha.c:6132
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
 msgstr "STO_BR_GBL (almacena ramif global) *pend*\n"
 
-#: vms-alpha.c:6154
+#: vms-alpha.c:6135
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
 msgstr "STO_BR_PS (almacena ramif psect + despl) *pend*\n"
 
-#: vms-alpha.c:6158
+#: vms-alpha.c:6139
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr "OPR_NOP (no operación)\n"
 
-#: vms-alpha.c:6161
+#: vms-alpha.c:6142
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr "OPR_ADD (adición)\n"
 
-#: vms-alpha.c:6164
+#: vms-alpha.c:6145
 #, c-format
 msgid "OPR_SUB (substract)\n"
 msgstr "OPR_SUB (sustracción)\n"
 
-#: vms-alpha.c:6167
+#: vms-alpha.c:6148
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr "OPR_MUL (multiplicación)\n"
 
-#: vms-alpha.c:6170
+#: vms-alpha.c:6151
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr "OPR_DIV (división)\n"
 
-#: vms-alpha.c:6173
+#: vms-alpha.c:6154
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr "OPR_AND (and lógico)\n"
 
-#: vms-alpha.c:6176
+#: vms-alpha.c:6157
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr "OPR_IOR (or lógico inclusivo)\n"
 
-#: vms-alpha.c:6179
+#: vms-alpha.c:6160
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr "OPR_EOR (or lógico exclusivo)\n"
 
-#: vms-alpha.c:6182
+#: vms-alpha.c:6163
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr "OPR_NEG (negación)\n"
 
-#: vms-alpha.c:6185
+#: vms-alpha.c:6166
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr "OPR_COM (complemento)\n"
 
-#: vms-alpha.c:6188
+#: vms-alpha.c:6169
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr "OPR_INSV (insertar campo)\n"
 
-#: vms-alpha.c:6191
+#: vms-alpha.c:6172
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr "OPR_ASH (despl aritmético)\n"
 
-#: vms-alpha.c:6194
+#: vms-alpha.c:6175
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr "OPR_USH (despl sin signo)\n"
 
-#: vms-alpha.c:6197
+#: vms-alpha.c:6178
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr "OPR_ROT (rotación)\n"
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6181
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr "OPR_SEL (selección)\n"
 
-#: vms-alpha.c:6203
+#: vms-alpha.c:6184
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr "OPR_REDEF (redefine símbolo a la ubicación actual)\n"
 
-#: vms-alpha.c:6206
+#: vms-alpha.c:6187
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr "OPR_REDEF (define una literal)\n"
 
-#: vms-alpha.c:6210
+#: vms-alpha.c:6191
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr "STC_LP (almacena par de enlace cond)\n"
 
-#: vms-alpha.c:6214
+#: vms-alpha.c:6195
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr "STC_LP_PSB (almacena par de enlace cond + firma)\n"
 
-#: vms-alpha.c:6215
+#: vms-alpha.c:6196
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr "   índice enlace: %u, procedimiento: %.*s\n"
 
-#: vms-alpha.c:6218
+#: vms-alpha.c:6199
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr "   firma: %.*s\n"
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6202
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr "STC_GBL (almacena cond global)\n"
 
-#: vms-alpha.c:6222
+#: vms-alpha.c:6203
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr "   índice enlace: %u, global: %.*s\n"
 
-#: vms-alpha.c:6226
+#: vms-alpha.c:6207
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr "STC_GCA (almacena dirección de código cond)\n"
 
-#: vms-alpha.c:6227
+#: vms-alpha.c:6208
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr "   índice enlace: %u, nombre procedimiento: %.*s\n"
 
-#: vms-alpha.c:6231
+#: vms-alpha.c:6212
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr "STC_PS (almacena psect cond + despl)\n"
 
-#: vms-alpha.c:6233
+#: vms-alpha.c:6214
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr "   índice enlace: %u, psect: %u, despl: 0x%08x %08x\n"
 
-#: vms-alpha.c:6240
+#: vms-alpha.c:6221
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr "STC_NOP_GBL (almacena NOP cond en dirección global)\n"
 
-#: vms-alpha.c:6244
+#: vms-alpha.c:6225
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr "STC_NOP_PS (almacena NOP cond en psect + despl)\n"
 
-#: vms-alpha.c:6248
+#: vms-alpha.c:6229
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr "STC_BSR_GBL (almacena BSR cond en dirección global)\n"
 
-#: vms-alpha.c:6252
+#: vms-alpha.c:6233
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr "STC_BSR_PS (almacena BSR cond en psect + despl)\n"
 
-#: vms-alpha.c:6256
+#: vms-alpha.c:6237
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr "STC_LDA_GBL (almacena LDA cond en dirección global)\n"
 
-#: vms-alpha.c:6260
+#: vms-alpha.c:6241
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr "STC_LDA_PS (almacena LDA cond en psect + despl)\n"
 
-#: vms-alpha.c:6264
+#: vms-alpha.c:6245
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr "STC_BOH_GBL (almacena BOH cond en dirección global)\n"
 
-#: vms-alpha.c:6268
+#: vms-alpha.c:6249
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr "STC_BOH_PS (almacena BOH cond en psect + despl)\n"
 
-#: vms-alpha.c:6273
+#: vms-alpha.c:6254
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr "STC_NBH_GBL (almacena cond o pista en dirección global)\n"
 
-#: vms-alpha.c:6277
+#: vms-alpha.c:6258
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr "STC_NBH_PS (almacena cond o pista en psect + despl)\n"
 
-#: vms-alpha.c:6281
+#: vms-alpha.c:6262
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
 msgstr "CTL_SETRB (define base de reubicación)\n"
 
-#: vms-alpha.c:6287
+#: vms-alpha.c:6268
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
 msgstr "CTL_AUGRB (aumenta base de reubicación) %u\n"
 
-#: vms-alpha.c:6291
+#: vms-alpha.c:6272
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
 msgstr "CTL_DFLOC (define ubicación)\n"
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6275
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr "CTL_STLOC (establece ubicación)\n"
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6278
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
 msgstr "CTL_STKDL (ubicación definida de pila)\n"
 
-#: vms-alpha.c:6300 vms-alpha.c:6714
+#: vms-alpha.c:6281 vms-alpha.c:6695
 #, c-format
 msgid "*unhandled*\n"
 msgstr "*sin manejar*\n"
 
-#: vms-alpha.c:6330 vms-alpha.c:6369
+#: vms-alpha.c:6311 vms-alpha.c:6350
 #, c-format
 msgid "cannot read GST record length\n"
 msgstr "no se puede leer la longitud del registro GST\n"
 
 #. Ill-formed.
-#: vms-alpha.c:6351
+#: vms-alpha.c:6332
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr "no se puede encontrar EMH en el primer registro GST\n"
 
-#: vms-alpha.c:6377
+#: vms-alpha.c:6358
 #, c-format
 msgid "cannot read GST record header\n"
 msgstr "no se puede leer el encabezado del registro GST\n"
 
-#: vms-alpha.c:6390
+#: vms-alpha.c:6371
 #, c-format
 msgid " corrupted GST\n"
 msgstr " GST corrupto\n"
 
-#: vms-alpha.c:6398
+#: vms-alpha.c:6379
 #, c-format
 msgid "cannot read GST record\n"
 msgstr "no se puede leer el registro GST\n"
 
-#: vms-alpha.c:6427
+#: vms-alpha.c:6408
 #, c-format
 msgid " unhandled EOBJ record type %u\n"
 msgstr " tipo de registro EOBJ %u sin manejar\n"
 
-#: vms-alpha.c:6450
+#: vms-alpha.c:6431
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr "  cuenta bit: %u, direcc base: 0x%08x\n"
 
-#: vms-alpha.c:6463
+#: vms-alpha.c:6444
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
 msgstr "   mapa bit: 0x%08x (cuenta: %u):\n"
 
-#: vms-alpha.c:6470
+#: vms-alpha.c:6451
 #, c-format
 msgid " %08x"
 msgstr " %08x"
 
-#: vms-alpha.c:6495
+#: vms-alpha.c:6476
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr "  imagen %u (%u entradas)\n"
 
-#: vms-alpha.c:6500
+#: vms-alpha.c:6481
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr "   despl: 0x%08x, val: 0x%08x\n"
 
-#: vms-alpha.c:6521
+#: vms-alpha.c:6502
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr " imagen %u (%u entradas), desplazamientos:\n"
 
-#: vms-alpha.c:6528
+#: vms-alpha.c:6509
 #, c-format
 msgid " 0x%08x"
 msgstr " 0x%08x"
 
 #. 64 bits.
-#: vms-alpha.c:6650
+#: vms-alpha.c:6631
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr "64 bits *sin manejar*\n"
 
-#: vms-alpha.c:6654
+#: vms-alpha.c:6635
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr "clase: %u, tipod: %u, long: %u, puntero: 0x%08x\n"
 
-#: vms-alpha.c:6665
+#: vms-alpha.c:6646
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr "matriz no contigua de %s\n"
 
-#: vms-alpha.c:6669
+#: vms-alpha.c:6650
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr "dimct: %u, aops: 0x%02x, dígitos: %u, escala: %u\n"
 
-#: vms-alpha.c:6673
+#: vms-alpha.c:6654
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr "artam: %u, a0: 0x%08x\n"
 
-#: vms-alpha.c:6677
+#: vms-alpha.c:6658
 #, c-format
 msgid "Strides:\n"
 msgstr "Estribos:\n"
 
-#: vms-alpha.c:6682
+#: vms-alpha.c:6663
 #, c-format
 msgid "[%u]: %u\n"
 msgstr "[%u]: %u\n"
 
-#: vms-alpha.c:6687
+#: vms-alpha.c:6668
 #, c-format
 msgid "Bounds:\n"
 msgstr "Límites:\n"
 
-#: vms-alpha.c:6692
+#: vms-alpha.c:6673
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr "[%u]: Inferior: %u, superior: %u\n"
 
-#: vms-alpha.c:6704
+#: vms-alpha.c:6685
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr "cadena de bit sin alinear de %s\n"
 
-#: vms-alpha.c:6708
+#: vms-alpha.c:6689
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr "base: %u, pos: %u\n"
 
-#: vms-alpha.c:6728
+#: vms-alpha.c:6709
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr "vops: 0x%02x, valor: 0x%08x "
 
-#: vms-alpha.c:6734
+#: vms-alpha.c:6715
 #, c-format
 msgid "(no value)\n"
 msgstr "(sin valor)\n"
 
-#: vms-alpha.c:6737
+#: vms-alpha.c:6718
 #, c-format
 msgid "(not active)\n"
 msgstr "(no activo)\n"
 
-#: vms-alpha.c:6740
+#: vms-alpha.c:6721
 #, c-format
 msgid "(not allocated)\n"
 msgstr "(sin ubicar)\n"
 
-#: vms-alpha.c:6743
+#: vms-alpha.c:6724
 #, c-format
 msgid "(descriptor)\n"
 msgstr "(descriptor)\n"
 
-#: vms-alpha.c:6747
+#: vms-alpha.c:6728
 #, c-format
 msgid "(trailing value)\n"
 msgstr "(valor restante)\n"
 
-#: vms-alpha.c:6750
+#: vms-alpha.c:6731
 #, c-format
 msgid "(value spec follows)\n"
 msgstr "(valor spec a continuación)\n"
 
-#: vms-alpha.c:6753
+#: vms-alpha.c:6734
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr "(en el despl de bit %u)\n"
 
-#: vms-alpha.c:6756
+#: vms-alpha.c:6737
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr "(reg: %u, disp: %u, indir: %u, género: "
 
-#: vms-alpha.c:6763
+#: vms-alpha.c:6744
 msgid "literal"
 msgstr "literal"
 
-#: vms-alpha.c:6766
+#: vms-alpha.c:6747
 msgid "address"
 msgstr "dirección"
 
-#: vms-alpha.c:6769
+#: vms-alpha.c:6750
 msgid "desc"
 msgstr "desc"
 
-#: vms-alpha.c:6772
+#: vms-alpha.c:6753
 msgid "reg"
 msgstr "reg"
 
-#: vms-alpha.c:6847
+#: vms-alpha.c:6828
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr "Tabla de símbolos de depuración:\n"
 
-#: vms-alpha.c:6858
+#: vms-alpha.c:6839
 #, c-format
 msgid "cannot read DST header\n"
 msgstr "no se puede leer el encabezado DST\n"
 
-#: vms-alpha.c:6863
+#: vms-alpha.c:6844
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr " tipo: %3u, lon: %3u (en 0x%08x): "
 
-#: vms-alpha.c:6877
+#: vms-alpha.c:6858
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr "no se puede leer el símbolo DST\n"
 
-#: vms-alpha.c:6920
+#: vms-alpha.c:6901
 #, c-format
 msgid "standard data: %s\n"
 msgstr "datos estándar: %s\n"
 
-#: vms-alpha.c:6923 vms-alpha.c:7007
+#: vms-alpha.c:6904 vms-alpha.c:6988
 #, c-format
 msgid "    name: %.*s\n"
 msgstr "    nombre: %.*s\n"
 
-#: vms-alpha.c:6930
+#: vms-alpha.c:6911
 #, c-format
 msgid "modbeg\n"
 msgstr "modini\n"
 
-#: vms-alpha.c:6931
+#: vms-alpha.c:6912
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr "   ops: %d, lenguaje: %u, mayor: %u, menor: %u\n"
 
-#: vms-alpha.c:6937 vms-alpha.c:7203
+#: vms-alpha.c:6918 vms-alpha.c:7184
 #, c-format
 msgid "   module name: %.*s\n"
 msgstr "   nom módulo : %.*s\n"
 
-#: vms-alpha.c:6940
+#: vms-alpha.c:6921
 #, c-format
 msgid "   compiler   : %.*s\n"
 msgstr "   compilador : %.*s\n"
 
-#: vms-alpha.c:6945
+#: vms-alpha.c:6926
 #, c-format
 msgid "modend\n"
 msgstr "modfin\n"
 
-#: vms-alpha.c:6952
+#: vms-alpha.c:6933
 msgid "rtnbeg\n"
 msgstr "rtnini\n"
 
-#: vms-alpha.c:6953
+#: vms-alpha.c:6934
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr "    ops: %u, dirección: 0x%08x, direcc-pd: 0x%08x\n"
 
-#: vms-alpha.c:6958
+#: vms-alpha.c:6939
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr "    nom rutina  : %.*s\n"
 
-#: vms-alpha.c:6966
+#: vms-alpha.c:6947
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr "rtnfin: tam 0x%08x\n"
 
-#: vms-alpha.c:6974
+#: vms-alpha.c:6955
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr "prolog: dirección bkpt 0x%08x\n"
 
-#: vms-alpha.c:6982
+#: vms-alpha.c:6963
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr "epilog: ops: %u, cuenta: %u\n"
 
-#: vms-alpha.c:6991
+#: vms-alpha.c:6972
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr "blkini: dirección: 0x%08x, nombre: %.*s\n"
 
-#: vms-alpha.c:7000
+#: vms-alpha.c:6981
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr "blkfin: tam: 0x%08x\n"
 
-#: vms-alpha.c:7006
+#: vms-alpha.c:6987
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr "espectip (lon: %u)\n"
 
-#: vms-alpha.c:7013
+#: vms-alpha.c:6994
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr "septip, nombre: %.*s\n"
 
-#: vms-alpha.c:7022
+#: vms-alpha.c:7003
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr "recini: nombre: %.*s\n"
 
-#: vms-alpha.c:7029
+#: vms-alpha.c:7010
 #, c-format
 msgid "recend\n"
 msgstr "recfin\n"
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7013
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr "enuini, lon: %u, nombre: %.*s\n"
 
-#: vms-alpha.c:7036
+#: vms-alpha.c:7017
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr "enufin, nombre: %.*s\n"
 
-#: vms-alpha.c:7040
+#: vms-alpha.c:7021
 #, c-format
 msgid "enumend\n"
 msgstr "enufin\n"
 
-#: vms-alpha.c:7057
+#: vms-alpha.c:7038
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr "rango discontinuo (nbr: %u)\n"
 
-#: vms-alpha.c:7059
+#: vms-alpha.c:7040
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr "    dirección: 0x%08x, tamaño: %u\n"
 
-#: vms-alpha.c:7069
+#: vms-alpha.c:7050
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr "num línea (lon: %u)\n"
 
-#: vms-alpha.c:7086
+#: vms-alpha.c:7067
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr "delta_pc_w %u\n"
 
-#: vms-alpha.c:7093
+#: vms-alpha.c:7074
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr "incr_linum(b): +%u\n"
 
-#: vms-alpha.c:7099
+#: vms-alpha.c:7080
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr "incr_linum_w: +%u\n"
 
-#: vms-alpha.c:7105
+#: vms-alpha.c:7086
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr "incr_linum_l: +%u\n"
 
-#: vms-alpha.c:7111
+#: vms-alpha.c:7092
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr "set_line_num(w) %u\n"
 
-#: vms-alpha.c:7116
+#: vms-alpha.c:7097
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr "set_line_num_b %u\n"
 
-#: vms-alpha.c:7121
+#: vms-alpha.c:7102
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr "set_line_num_l %u\n"
 
-#: vms-alpha.c:7126
+#: vms-alpha.c:7107
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr "set_abs_pc: 0x%08x\n"
 
-#: vms-alpha.c:7130
+#: vms-alpha.c:7111
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr "delta_pc_l: +0x%08x\n"
 
-#: vms-alpha.c:7135
+#: vms-alpha.c:7116
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr "term(b): 0x%02x"
 
-#: vms-alpha.c:7137
+#: vms-alpha.c:7118
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr "        pc: 0x%08x\n"
 
-#: vms-alpha.c:7142
+#: vms-alpha.c:7123
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr "term_w: 0x%04x"
 
-#: vms-alpha.c:7144
+#: vms-alpha.c:7125
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr "    pc: 0x%08x\n"
 
-#: vms-alpha.c:7150
+#: vms-alpha.c:7131
 #, c-format
 msgid "delta pc +%-4d"
 msgstr "delta pc +%-4d"
 
-#: vms-alpha.c:7153
+#: vms-alpha.c:7134
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
 msgstr "    pc: 0x%08x línea: %5u\n"
 
-#: vms-alpha.c:7158
+#: vms-alpha.c:7139
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr "    *sin manejar* ord %u\n"
 
-#: vms-alpha.c:7173
+#: vms-alpha.c:7154
 #, c-format
 msgid "source (len: %u)\n"
 msgstr "fuente (lon: %u)\n"
 
-#: vms-alpha.c:7187
+#: vms-alpha.c:7168
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr "   declfich: lon: %u, ops: %u, fichid: %u\n"
 
-#: vms-alpha.c:7191
+#: vms-alpha.c:7172
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 
-#: vms-alpha.c:7200
+#: vms-alpha.c:7181
 #, c-format
 msgid "   filename   : %.*s\n"
 msgstr "   nomfichero : %.*s\n"
 
-#: vms-alpha.c:7209
+#: vms-alpha.c:7190
 #, c-format
 msgid "   setfile %u\n"
 msgstr "   setfile %u\n"
 
-#: vms-alpha.c:7214 vms-alpha.c:7219
+#: vms-alpha.c:7195 vms-alpha.c:7200
 #, c-format
 msgid "   setrec %u\n"
 msgstr "   setrect %u\n"
 
-#: vms-alpha.c:7224 vms-alpha.c:7229
+#: vms-alpha.c:7205 vms-alpha.c:7210
 #, c-format
 msgid "   setlnum %u\n"
 msgstr "   setlnum %u\n"
 
-#: vms-alpha.c:7234 vms-alpha.c:7239
+#: vms-alpha.c:7215 vms-alpha.c:7220
 #, c-format
 msgid "   deflines %u\n"
 msgstr "   deflines %u\n"
 
-#: vms-alpha.c:7243
+#: vms-alpha.c:7224
 #, c-format
 msgid "   formfeed\n"
 msgstr "   alimforma\n"
 
-#: vms-alpha.c:7247
+#: vms-alpha.c:7228
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr "   *sin manejar* ord %u\n"
 
-#: vms-alpha.c:7259
+#: vms-alpha.c:7240
 #, c-format
 msgid "*unhandled* dst type %u\n"
 msgstr "tipo dst %u *sin manejar*\n"
 
-#: vms-alpha.c:7291
+#: vms-alpha.c:7272
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr "no se puede leer EIHD\n"
 
-#: vms-alpha.c:7294
+#: vms-alpha.c:7275
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr "EIHD: (tamaño: %u, bloques nbr: %u)\n"
 
-#: vms-alpha.c:7297
+#: vms-alpha.c:7278
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr " idmayor: %u, idmenor: %u\n"
 
-#: vms-alpha.c:7305
+#: vms-alpha.c:7286
 msgid "executable"
 msgstr "ejecutable"
 
-#: vms-alpha.c:7308
+#: vms-alpha.c:7289
 msgid "linkable image"
 msgstr "imagen enlazable"
 
-#: vms-alpha.c:7314
+#: vms-alpha.c:7295
 #, c-format
 msgid " image type: %u (%s)"
 msgstr " tipo imagen: %u (%s)"
 
-#: vms-alpha.c:7320
+#: vms-alpha.c:7301
 msgid "native"
 msgstr "nativa"
 
-#: vms-alpha.c:7323
+#: vms-alpha.c:7304
 msgid "CLI"
 msgstr "CLI"
 
-#: vms-alpha.c:7329
+#: vms-alpha.c:7310
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ", subtipo: %u (%s)\n"
 
-#: vms-alpha.c:7335
+#: vms-alpha.c:7316
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr " despls: isd: %u, activ: %u, simdep: %u, idimg: %u, parche: %u\n"
 
-#: vms-alpha.c:7339
+#: vms-alpha.c:7320
 #, c-format
 msgid " fixup info rva: "
 msgstr " info compos rva: "
 
-#: vms-alpha.c:7341
+#: vms-alpha.c:7322
 #, c-format
 msgid ", symbol vector rva: "
 msgstr "  vector símbolo rva: "
 
-#: vms-alpha.c:7344
+#: vms-alpha.c:7325
 #, c-format
 msgid ""
 "\n"
@@ -5174,461 +4954,461 @@ msgstr ""
 "\n"
 " matriz versión despl: %u\n"
 
-#: vms-alpha.c:7348
+#: vms-alpha.c:7329
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr " cuenta I/O img: %u, canales nbr: %u, pri req: %08x%08x\n"
 
-#: vms-alpha.c:7354
+#: vms-alpha.c:7335
 #, c-format
 msgid " linker flags: %08x:"
 msgstr " opciones de enlazador: %08x:"
 
-#: vms-alpha.c:7384
+#: vms-alpha.c:7365
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr " ident: 0x%08x, versis: 0x%08x, ctrl coinc: %u, tam_vectsim: %u\n"
 
-#: vms-alpha.c:7390
+#: vms-alpha.c:7371
 #, c-format
 msgid " BPAGE: %u"
 msgstr " BPAGE: %u"
 
-#: vms-alpha.c:7396
+#: vms-alpha.c:7377
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ", ext comp despl: %u, no_opt desp psect: %u"
 
-#: vms-alpha.c:7399
+#: vms-alpha.c:7380
 #, c-format
 msgid ", alias: %u\n"
 msgstr ", alias: %u\n"
 
-#: vms-alpha.c:7407
+#: vms-alpha.c:7388
 #, c-format
 msgid "system version array information:\n"
 msgstr "información de matriz de versión de sistema:\n"
 
-#: vms-alpha.c:7411
+#: vms-alpha.c:7392
 #, c-format
 msgid "cannot read EIHVN header\n"
 msgstr "no se puede leer el encabezado EIHVN\n"
 
-#: vms-alpha.c:7421
+#: vms-alpha.c:7402
 #, c-format
 msgid "cannot read EIHVN version\n"
 msgstr "no se puede leer la versión EIHVN\n"
 
-#: vms-alpha.c:7424
+#: vms-alpha.c:7405
 #, c-format
 msgid "   %02u "
 msgstr "   %02u "
 
-#: vms-alpha.c:7428
+#: vms-alpha.c:7409
 msgid "BASE_IMAGE       "
 msgstr "IMAGEN_BASE      "
 
-#: vms-alpha.c:7431
+#: vms-alpha.c:7412
 msgid "MEMORY_MANAGEMENT"
 msgstr "ADMIN_MEMORIA"
 
-#: vms-alpha.c:7434
+#: vms-alpha.c:7415
 msgid "IO               "
 msgstr "ES               "
 
-#: vms-alpha.c:7437
+#: vms-alpha.c:7418
 msgid "FILES_VOLUMES    "
 msgstr "VOL_FICHEROS     "
 
-#: vms-alpha.c:7440
+#: vms-alpha.c:7421
 msgid "PROCESS_SCHED    "
 msgstr "CALEND_PROCESOS  "
 
-#: vms-alpha.c:7443
+#: vms-alpha.c:7424
 msgid "SYSGEN           "
 msgstr "GENSIS           "
 
-#: vms-alpha.c:7446
+#: vms-alpha.c:7427
 msgid "CLUSTERS_LOCKMGR "
 msgstr "ADMBLOQ_CLUSTERS "
 
-#: vms-alpha.c:7449
+#: vms-alpha.c:7430
 msgid "LOGICAL_NAMES    "
 msgstr "NOMBRES_LOGICOS  "
 
-#: vms-alpha.c:7452
+#: vms-alpha.c:7433
 msgid "SECURITY         "
 msgstr "SEGURIDAD        "
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7436
 msgid "IMAGE_ACTIVATOR  "
 msgstr "ACTIVADOR_IMAGEN "
 
-#: vms-alpha.c:7458
+#: vms-alpha.c:7439
 msgid "NETWORKS         "
 msgstr "REDES            "
 
-#: vms-alpha.c:7461
+#: vms-alpha.c:7442
 msgid "COUNTERS         "
 msgstr "CONTADORES       "
 
-#: vms-alpha.c:7464
+#: vms-alpha.c:7445
 msgid "STABLE           "
 msgstr "ESTABLE          "
 
-#: vms-alpha.c:7467
+#: vms-alpha.c:7448
 msgid "MISC             "
 msgstr "MISC             "
 
-#: vms-alpha.c:7470
+#: vms-alpha.c:7451
 msgid "CPU              "
 msgstr "CPU              "
 
-#: vms-alpha.c:7473
+#: vms-alpha.c:7454
 msgid "VOLATILE         "
 msgstr "VOL�TIL          "
 
-#: vms-alpha.c:7476
+#: vms-alpha.c:7457
 msgid "SHELL            "
 msgstr "SHELL            "
 
-#: vms-alpha.c:7479
+#: vms-alpha.c:7460
 msgid "POSIX            "
 msgstr "POSIX            "
 
-#: vms-alpha.c:7482
+#: vms-alpha.c:7463
 msgid "MULTI_PROCESSING "
 msgstr "MULTI_PROCESAM   "
 
-#: vms-alpha.c:7485
+#: vms-alpha.c:7466
 msgid "GALAXY           "
 msgstr "GALAXIA          "
 
-#: vms-alpha.c:7488
+#: vms-alpha.c:7469
 msgid "*unknown*        "
 msgstr "*desconocido*    "
 
-#: vms-alpha.c:7491
+#: vms-alpha.c:7472
 #, c-format
 msgid ": %u.%u\n"
 msgstr ": %u.%u\n"
 
-#: vms-alpha.c:7504 vms-alpha.c:7763
+#: vms-alpha.c:7485 vms-alpha.c:7744
 #, c-format
 msgid "cannot read EIHA\n"
 msgstr "no se puede leer EIHA\n"
 
-#: vms-alpha.c:7507
+#: vms-alpha.c:7488
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr "Activa imagen   : (tamaño=%u)\n"
 
-#: vms-alpha.c:7509
+#: vms-alpha.c:7490
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
 msgstr " Primera direcc: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7512
+#: vms-alpha.c:7493
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
 msgstr " Segunda direcc: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7515
+#: vms-alpha.c:7496
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
 msgstr " Tercera direcc: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7499
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
 msgstr " Cuarta direcc : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7521
+#: vms-alpha.c:7502
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
 msgstr " Imagen compar : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7532
+#: vms-alpha.c:7513
 #, c-format
 msgid "cannot read EIHI\n"
 msgstr "no se puede leer EIHI\n"
 
-#: vms-alpha.c:7535
+#: vms-alpha.c:7516
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr "Identificación de imagen: (mayor: %u, menor: %u)\n"
 
-#: vms-alpha.c:7538
+#: vms-alpha.c:7519
 #, c-format
 msgid " image name       : %.*s\n"
 msgstr " nombre de imagen : %.*s\n"
 
-#: vms-alpha.c:7540
+#: vms-alpha.c:7521
 #, c-format
 msgid " link time        : %s\n"
 msgstr " hora enlazado    : %s\n"
 
-#: vms-alpha.c:7542
+#: vms-alpha.c:7523
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr " ident imagen     : %.*s\n"
 
-#: vms-alpha.c:7544
+#: vms-alpha.c:7525
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr " ident enlazador  : %.*s\n"
 
-#: vms-alpha.c:7546
+#: vms-alpha.c:7527
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr " ident const imagen: %.*s\n"
 
-#: vms-alpha.c:7556
+#: vms-alpha.c:7537
 #, c-format
 msgid "cannot read EIHS\n"
 msgstr "no se puede leer EIHS\n"
 
-#: vms-alpha.c:7559
+#: vms-alpha.c:7540
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
 msgstr "Símbolo de imagen y tabla de depuración: (mayor: %u, menor %u)\n"
 
-#: vms-alpha.c:7564
+#: vms-alpha.c:7545
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
 msgstr " tabla de símbolos de depuración : vbn: %u, tam: %u (0x%x)\n"
 
-#: vms-alpha.c:7568
+#: vms-alpha.c:7549
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
 msgstr " tabla de símbolos globales      : vbn: %u, registros: %u\n"
 
-#: vms-alpha.c:7572
+#: vms-alpha.c:7553
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
 msgstr " tabla de módulo de depuración   : vbn: %u, tam: %u\n"
 
-#: vms-alpha.c:7585
+#: vms-alpha.c:7566
 #, c-format
 msgid "cannot read EISD\n"
 msgstr "no se puede leer EISD\n"
 
-#: vms-alpha.c:7595
+#: vms-alpha.c:7576
 #, c-format
 msgid "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
 msgstr "Descriptor de sección de imagen: (mayor: %u, menor: %u, tam: %u, despl: %u)\n"
 
-#: vms-alpha.c:7602
+#: vms-alpha.c:7583
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr " sección: base: 0x%08x%08x tam: 0x%08x\n"
 
-#: vms-alpha.c:7607
+#: vms-alpha.c:7588
 #, c-format
 msgid " flags: 0x%04x"
 msgstr " opciones: %04x"
 
-#: vms-alpha.c:7644
+#: vms-alpha.c:7625
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr " vbn: %u, pfc: %u, coincctl: %u tipo: %u ("
 
-#: vms-alpha.c:7650
+#: vms-alpha.c:7631
 msgid "NORMAL"
 msgstr "NORMAL"
 
-#: vms-alpha.c:7653
+#: vms-alpha.c:7634
 msgid "SHRFXD"
 msgstr "SHRFXD"
 
-#: vms-alpha.c:7656
+#: vms-alpha.c:7637
 msgid "PRVFXD"
 msgstr "PRVFXD"
 
-#: vms-alpha.c:7659
+#: vms-alpha.c:7640
 msgid "SHRPIC"
 msgstr "SHRPIC"
 
-#: vms-alpha.c:7662
+#: vms-alpha.c:7643
 msgid "PRVPIC"
 msgstr "PRVPIC"
 
-#: vms-alpha.c:7665
+#: vms-alpha.c:7646
 msgid "USRSTACK"
 msgstr "USRSTACK"
 
-#: vms-alpha.c:7673
+#: vms-alpha.c:7654
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr " ident: 0x%08x, nombre: %.*s\n"
 
-#: vms-alpha.c:7683
+#: vms-alpha.c:7664
 #, c-format
 msgid "cannot read DMT\n"
 msgstr "no se puede leer DMT\n"
 
-#: vms-alpha.c:7687
+#: vms-alpha.c:7668
 #, c-format
 msgid "Debug module table:\n"
 msgstr "Tabla de módulos de depuración\n"
 
-#: vms-alpha.c:7696
+#: vms-alpha.c:7677
 #, c-format
 msgid "cannot read DMT header\n"
 msgstr "no se puede leer el encabezado DMT\n"
 
-#: vms-alpha.c:7701
+#: vms-alpha.c:7682
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
 msgstr " despl módulo: 0x%08x, tam: 0x%08x, (%u psects)\n"
 
-#: vms-alpha.c:7711
+#: vms-alpha.c:7692
 #, c-format
 msgid "cannot read DMT psect\n"
 msgstr "no se puede leer el psect DMT\n"
 
-#: vms-alpha.c:7714
+#: vms-alpha.c:7695
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
 msgstr "  psect inicio: 0x%08x, long: %u\n"
 
-#: vms-alpha.c:7727
+#: vms-alpha.c:7708
 #, c-format
 msgid "cannot read DST\n"
 msgstr "no se puede leer DST\n"
 
-#: vms-alpha.c:7737
+#: vms-alpha.c:7718
 #, c-format
 msgid "cannot read GST\n"
 msgstr "no se puede leer GST\n"
 
-#: vms-alpha.c:7741
+#: vms-alpha.c:7722
 #, c-format
 msgid "Global symbol table:\n"
 msgstr "Tabla de símbolos global:\n"
 
-#: vms-alpha.c:7769
+#: vms-alpha.c:7750
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr "Compostura de activador de imagen: (mayor: %u, menor: %u)\n"
 
-#: vms-alpha.c:7772
+#: vms-alpha.c:7753
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
 msgstr "  iafenl  : 0x%08x %08x\n"
 
-#: vms-alpha.c:7775
+#: vms-alpha.c:7756
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
 msgstr "  compenl : 0x%08x %08x\n"
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7759
 #, c-format
 msgid "  size : %u\n"
 msgstr "  tam  : %u\n"
 
-#: vms-alpha.c:7780
+#: vms-alpha.c:7761
 #, c-format
 msgid "  flags: 0x%08x\n"
 msgstr "  ops  : 0x%08x\n"
 
-#: vms-alpha.c:7784
+#: vms-alpha.c:7765
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 msgstr "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 
-#: vms-alpha.c:7788
+#: vms-alpha.c:7769
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
 msgstr "  qdotadroff: %5u, ldotadroff: %5u\n"
 
-#: vms-alpha.c:7792
+#: vms-alpha.c:7773
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
 msgstr "  codeadroff: %5u, lpfixoff  : %5u\n"
 
-#: vms-alpha.c:7795
+#: vms-alpha.c:7776
 #, c-format
 msgid "  chgprtoff : %5u\n"
 msgstr "  chgprtoff : %5u\n"
 
-#: vms-alpha.c:7798
+#: vms-alpha.c:7779
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
 msgstr "  shlstoff  : %5u, shrimgcnt : %5u\n"
 
-#: vms-alpha.c:7800
+#: vms-alpha.c:7781
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
 msgstr "  shlextra  : %5u, permctx   : %5u\n"
 
-#: vms-alpha.c:7803
+#: vms-alpha.c:7784
 #, c-format
 msgid "  base_va : 0x%08x\n"
 msgstr "  base_va : 0x%08x\n"
 
-#: vms-alpha.c:7805
+#: vms-alpha.c:7786
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
 msgstr "  lppsbfixoff: %5u\n"
 
-#: vms-alpha.c:7813
+#: vms-alpha.c:7794
 #, c-format
 msgid " Shareable images:\n"
 msgstr " Imágenes compartibles:\n"
 
-#: vms-alpha.c:7817
+#: vms-alpha.c:7798
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
 msgstr "  %u: tam: %u, opts: 0x%02x, nombre: %.*s\n"
 
-#: vms-alpha.c:7824
+#: vms-alpha.c:7805
 #, c-format
 msgid " quad-word relocation fixups:\n"
 msgstr " composturas de reubicación quad-word:\n"
 
-#: vms-alpha.c:7829
+#: vms-alpha.c:7810
 #, c-format
 msgid " long-word relocation fixups:\n"
 msgstr " composturas de reubicación long-word:\n"
 
-#: vms-alpha.c:7834
+#: vms-alpha.c:7815
 #, c-format
 msgid " quad-word .address reference fixups:\n"
 msgstr " composturas de referencia .address quad-word:\n"
 
-#: vms-alpha.c:7839
+#: vms-alpha.c:7820
 #, c-format
 msgid " long-word .address reference fixups:\n"
 msgstr " composturas de referencia .address long-word:\n"
 
-#: vms-alpha.c:7844
+#: vms-alpha.c:7825
 #, c-format
 msgid " Code Address Reference Fixups:\n"
 msgstr " Composturas de Referencias de Dirección de Código:\n"
 
-#: vms-alpha.c:7849
+#: vms-alpha.c:7830
 #, c-format
 msgid " Linkage Pairs Referece Fixups:\n"
 msgstr " Composturas de Referencias de Pares de Enlazado\n"
 
-#: vms-alpha.c:7858
+#: vms-alpha.c:7839
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr " Cambiar Protección (%u entradas):\n"
 
-#: vms-alpha.c:7863
+#: vms-alpha.c:7844
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
 msgstr "  base: 0x%08x %08x, tam: 0x%08x, prot: 0x%08x "
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8694
+#: vms-alpha.c:8676
 msgid "%P: relocatable link is not supported\n"
 msgstr "%P: no se admite el enlace reubicable\n"
 
-#: vms-alpha.c:8764
+#: vms-alpha.c:8746
 msgid "%P: multiple entry points: in modules %B and %B\n"
 msgstr "%P: puntos de entrada múltiples: en los módulos %B y %B\n"
 
@@ -5655,140 +5435,140 @@ msgstr "%s: objeto compartido XCOFF cuando no se produce salida XCOFF"
 msgid "%s: dynamic object with no .loader section"
 msgstr "%s: objeto dinámico sin sección .loader"
 
-#: xcofflink.c:1416
+#: xcofflink.c:1415
 msgid "%B: `%s' has line numbers but no enclosing section"
 msgstr "%B: `%s' tiene números de línea pero no una sección contenedora"
 
-#: xcofflink.c:1468
+#: xcofflink.c:1467
 msgid "%B: class %d symbol `%s' has no aux entries"
 msgstr "%B: clase %d símbolo `%s' no tiene entradas auxiliares"
 
-#: xcofflink.c:1490
+#: xcofflink.c:1489
 msgid "%B: symbol `%s' has unrecognized csect type %d"
 msgstr "%B: el símbolo `%s' tiene un tipo csect %d que no se reconoce"
 
-#: xcofflink.c:1502
+#: xcofflink.c:1501
 msgid "%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"
 msgstr "%B: símbolo XTY_ER `%s' erróneo: clase %d scnum %d scnlen %d"
 
-#: xcofflink.c:1531
+#: xcofflink.c:1530
 msgid "%B: XMC_TC0 symbol `%s' is class %d scnlen %d"
 msgstr "%B: símbolo XMC_TCO `%s' es clase %d scnlen %d"
 
-#: xcofflink.c:1677
+#: xcofflink.c:1676
 msgid "%B: csect `%s' not in enclosing section"
 msgstr "%B: csect `%s' no está contenido en una sección"
 
-#: xcofflink.c:1784
+#: xcofflink.c:1783
 msgid "%B: misplaced XTY_LD `%s'"
 msgstr "%B: XTY_LD `%s' mal ubicado"
 
-#: xcofflink.c:2103
+#: xcofflink.c:2102
 msgid "%B: reloc %s:%d not in csect"
 msgstr "%B: la reubicación %s:%d no está en csect"
 
-#: xcofflink.c:3194
+#: xcofflink.c:3186
 #, c-format
 msgid "%s: no such symbol"
 msgstr "%s: no hay tal símbolo"
 
-#: xcofflink.c:3299
+#: xcofflink.c:3291
 #, c-format
 msgid "warning: attempt to export undefined symbol `%s'"
 msgstr "aviso: se intenta exportar el símbolo sin definir `%s'"
 
-#: xcofflink.c:3681
+#: xcofflink.c:3673
 msgid "error: undefined symbol __rtinit"
 msgstr "error: símbolo __rtinit sin definir"
 
-#: xcofflink.c:4060
+#: xcofflink.c:4052
 msgid "%B: loader reloc in unrecognized section `%s'"
 msgstr "%B: reubicación del cargador en la sección `%s' que no se reconoce"
 
-#: xcofflink.c:4071
+#: xcofflink.c:4063
 msgid "%B: `%s' in loader reloc but not loader sym"
 msgstr "%B: `%s' en la reubicación del cargador pero no es un símbolo del cargador"
 
-#: xcofflink.c:4087
+#: xcofflink.c:4079
 msgid "%B: loader reloc in read-only section %A"
 msgstr "%B: reubicación del cargador en la sección de sólo lectura %A"
 
-#: xcofflink.c:5109
+#: xcofflink.c:5097
 #, c-format
 msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"
 msgstr "Desbordamiento de TOC: 0x%lx > 0x10000; pruebe -mminimal-toc al compilar"
 
-#: elf32-ia64.c:628 elf64-ia64.c:628
+#: elf32-ia64.c:1110 elf64-ia64.c:1110
 msgid "%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."
 msgstr "%B: No se puede relajar br en 0x%lx en la sección `%A'. Por favor use brl o ramificación indirecta."
 
-#: elf32-ia64.c:2290 elf64-ia64.c:2290
+#: elf32-ia64.c:2809 elf64-ia64.c:2809
 msgid "@pltoff reloc against local symbol"
 msgstr "reubicación @pltoff contra un símbolo local"
 
-#: elf32-ia64.c:3693 elf64-ia64.c:3693
+#: elf32-ia64.c:4430 elf64-ia64.c:4430
 #, c-format
 msgid "%s: short data segment overflowed (0x%lx >= 0x400000)"
 msgstr "%s: segmento de datos short desbordado (0x%lx >= 0x400000)"
 
-#: elf32-ia64.c:3704 elf64-ia64.c:3704
+#: elf32-ia64.c:4441 elf64-ia64.c:4441
 #, c-format
 msgid "%s: __gp does not cover short data segment"
 msgstr "%s: __gp no cubre el segmento de datos short"
 
-#: elf32-ia64.c:3971 elf64-ia64.c:3971
+#: elf32-ia64.c:4708 elf64-ia64.c:4708
 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
 msgstr "%B: código que no es pic con reubicación imm contra el símbolo dinámico %s"
 
-#: elf32-ia64.c:4038 elf64-ia64.c:4038
+#: elf32-ia64.c:4775 elf64-ia64.c:4775
 msgid "%B: @gprel relocation against dynamic symbol %s"
 msgstr "%B: reubicación @gprel contra el símbolo dinámico %s"
 
-#: elf32-ia64.c:4101 elf64-ia64.c:4101
+#: elf32-ia64.c:4838 elf64-ia64.c:4838
 msgid "%B: linking non-pic code in a position independent executable"
 msgstr "%B: se enlaza código que no es pic en un ejecutable independiente de posición"
 
-#: elf32-ia64.c:4238 elf64-ia64.c:4238
+#: elf32-ia64.c:4975 elf64-ia64.c:4975
 msgid "%B: @internal branch to dynamic symbol %s"
 msgstr "%B: ramificación @internal al símbolo dinámico %s"
 
-#: elf32-ia64.c:4240 elf64-ia64.c:4240
+#: elf32-ia64.c:4977 elf64-ia64.c:4977
 msgid "%B: speculation fixup to dynamic symbol %s"
 msgstr "%B: compostura de especulación al símbolo dinámico %s"
 
-#: elf32-ia64.c:4242 elf64-ia64.c:4242
+#: elf32-ia64.c:4979 elf64-ia64.c:4979
 msgid "%B: @pcrel relocation against dynamic symbol %s"
 msgstr "%B: reubicación @pcrel contra el símbolo dinámico %s"
 
-#: elf32-ia64.c:4439 elf64-ia64.c:4439
+#: elf32-ia64.c:5176 elf64-ia64.c:5176
 msgid "unsupported reloc"
 msgstr "no se admite la reubicación"
 
-#: elf32-ia64.c:4477 elf64-ia64.c:4477
+#: elf32-ia64.c:5214 elf64-ia64.c:5214
 msgid "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."
 msgstr "%B: falta la sección TLS para la reubicación %s contra `%s' en 0x%lx en la sección `%A'."
 
-#: elf32-ia64.c:4492 elf64-ia64.c:4492
+#: elf32-ia64.c:5229 elf64-ia64.c:5229
 msgid "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."
 msgstr "%B: No se puede relajar br (%s) a `%s' en 0x%lx en la sección `%A' con tamaño 0x%lx (> 0x1000000)."
 
-#: elf32-ia64.c:4754 elf64-ia64.c:4754
+#: elf32-ia64.c:5491 elf64-ia64.c:5491
 msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
 msgstr "%B: se enlaza deferencias-captura-en-NULL con ficheros que no son de captura"
 
-#: elf32-ia64.c:4763 elf64-ia64.c:4763
+#: elf32-ia64.c:5500 elf64-ia64.c:5500
 msgid "%B: linking big-endian files with little-endian files"
 msgstr "%B: se enlazan ficheros big-endian con ficheros little-endian"
 
-#: elf32-ia64.c:4772 elf64-ia64.c:4772
+#: elf32-ia64.c:5509 elf64-ia64.c:5509
 msgid "%B: linking 64-bit files with 32-bit files"
 msgstr "%B: se enlazan ficheros de 64-bit con ficheros de 32-bit"
 
-#: elf32-ia64.c:4781 elf64-ia64.c:4781
+#: elf32-ia64.c:5518 elf64-ia64.c:5518
 msgid "%B: linking constant-gp files with non-constant-gp files"
 msgstr "%B: se enlazan ficheros de gp constante con ficheros con gp no constante"
 
-#: elf32-ia64.c:4791 elf64-ia64.c:4791
+#: elf32-ia64.c:5528 elf64-ia64.c:5528
 msgid "%B: linking auto-pic files with non-auto-pic files"
 msgstr "%B: se enlazan ficheros de pic automático con ficheros sin pic automático"
 
@@ -6169,22 +5949,10 @@ msgstr "%B: no se puede llenar DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] porq
 msgid "%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because .idata$6 is missing"
 msgstr "%B: no se puede llenar DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] porque falta .idata$6"
 
-#: peigen.c:2438 pepigen.c:2438 pex64igen.c:2438
+#: peigen.c:2436 pepigen.c:2436 pex64igen.c:2436
 msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing"
 msgstr "%B: no se puede llenar DataDictionary[9] porque falta __tls_used"
 
-#~ msgid "relocation references a different segment"
-#~ msgstr "la reubicación referencía un segmento diferente"
-
-#~ msgid "%B: relocation type %d not implemented"
-#~ msgstr "%B: el tipo de reubicación %d aún no está implementado"
-
-#~ msgid "warning: %B and %B differ in position-dependence of data addressing"
-#~ msgstr "aviso: %B y %B difieren en el direccionamiento de datos dependiente de posición"
-
-#~ msgid "warning: %B and %B differ in position-dependence of code addressing"
-#~ msgstr "aviso: %B y %B difieren en el direccionamiento de código dependiente de posición"
-
 #~ msgid "Can't Make it a Short Jump"
 #~ msgstr "No se Puede Convertir en un Salto Corto"
 
@@ -6383,6 +6151,9 @@ msgstr "%B: no se puede llenar DataDictionary[9] porque falta __tls_used"
 #~ msgid "%s: warning: unresolvable relocation against symbol `%s' from %s section"
 #~ msgstr "%s: aviso: reubicación sin resolución contra el símbolo `%s' de la sección %s"
 
+#~ msgid "%B(%A): unresolvable relocation against symbol `%s'"
+#~ msgstr "%B(%A+0x%lx): reubicación sin resolución contra el símbolo `%s'"
+
 #~ msgid "Symbol %s has no GOT subsection for offset 0x%x"
 #~ msgstr "El símbolo %s no tiene subsección GOT para el desplazamiento 0x%x"
 
diff --git a/bfd/po/fi.po b/bfd/po/fi.po
index 2aa730e0e9..341ca76f77 100644
--- a/bfd/po/fi.po
+++ b/bfd/po/fi.po
@@ -1,17 +1,16 @@
-# Finnish messages for bfd.
-# Copyright © 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Finnish messages for bfd
+# Copyright © 2007, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2007, 2009-2011.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2007, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bfd 2.21.53\n"
+"Project-Id-Version: bfd 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:25+0100\n"
-"PO-Revision-Date: 2011-09-23 18:45+0200\n"
+"POT-Creation-Date: 2010-11-05 11:31+0100\n"
+"PO-Revision-Date: 2010-11-10 18:55+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,133 +44,133 @@ msgstr "%s: ei voi edustaa lohkoa ’%s’ �a.out�-objektitiedostomuodossa"
 msgid "%s: can not represent section for symbol `%s' in a.out object file format"
 msgstr "%s: ei voi edustaa lohkoa symbolille ’%s’ �a.out�-objektitiedostomuodossa"
 
-#: aoutx.h:1579 vms-alpha.c:7668
+#: aoutx.h:1579 vms-alpha.c:7649
 msgid "*unknown*"
 msgstr "*tuntematon*"
 
-#: aoutx.h:4017 aoutx.h:4343
+#: aoutx.h:4007 aoutx.h:4333
 msgid "%P: %B: unexpected relocation type\n"
 msgstr "%P: %B: odottamaton sijoitustyyppi\n"
 
-#: aoutx.h:5374
+#: aoutx.h:5364
 #, c-format
 msgid "%s: relocatable link from %s to %s not supported"
 msgstr "%s: sijoitettava linkki kohteesta %s kohteeseen %s ei ole tuettu"
 
-#: archive.c:2194
+#: archive.c:2125
 msgid "Warning: writing archive was slow: rewriting timestamp\n"
 msgstr "Varoitus: arkiston kirjoitus oli hidasta: aikaleiman uudelleenkirjoitus\n"
 
-#: archive.c:2482
+#: archive.c:2416
 msgid "Reading archive file mod timestamp"
 msgstr "Luetaan arkistotiedoston muokkausaikaleima"
 
 #  Intel coff armap
-#: archive.c:2506
+#: archive.c:2440
 msgid "Writing updated armap timestamp"
 msgstr "Kirjoitetaan päivitetty �armap�-aikaleima"
 
-#: bfd.c:398
+#: bfd.c:395
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: bfd.c:399
+#: bfd.c:396
 msgid "System call error"
 msgstr "Järjestelmäkutsuvirhe"
 
-#: bfd.c:400
+#: bfd.c:397
 msgid "Invalid bfd target"
 msgstr "Virheellinen bfd-kohde"
 
-#: bfd.c:401
+#: bfd.c:398
 msgid "File in wrong format"
 msgstr "Tiedosto väärässä muodossa"
 
-#: bfd.c:402
+#: bfd.c:399
 msgid "Archive object file in wrong format"
 msgstr "Arkisto-objektitiedosto väärässä muodossa"
 
-#: bfd.c:403
+#: bfd.c:400
 msgid "Invalid operation"
 msgstr "Virheellinen toiminta"
 
-#: bfd.c:404
+#: bfd.c:401
 msgid "Memory exhausted"
 msgstr "Muisti loppunut"
 
-#: bfd.c:405
+#: bfd.c:402
 msgid "No symbols"
 msgstr "Ei symboleja"
 
-#: bfd.c:406
+#: bfd.c:403
 msgid "Archive has no index; run ranlib to add one"
 msgstr "Arkistossa ei ole hakemistoa; lisää sellainen suorittamalla ranlib"
 
-#: bfd.c:407
+#: bfd.c:404
 msgid "No more archived files"
 msgstr "Ei enää arkistoituja tiedostoja"
 
-#: bfd.c:408
+#: bfd.c:405
 msgid "Malformed archive"
 msgstr "Muodoltaan virheellinen arkisto"
 
-#: bfd.c:409
+#: bfd.c:406
 msgid "File format not recognized"
 msgstr "Tiedostomuotoa ei tunnistettu"
 
-#: bfd.c:410
+#: bfd.c:407
 msgid "File format is ambiguous"
 msgstr "Tiedostomuoto ei ole yksiselitteinen"
 
-#: bfd.c:411
+#: bfd.c:408
 msgid "Section has no contents"
 msgstr "Lohkossa ei ole sisältöä"
 
-#: bfd.c:412
+#: bfd.c:409
 msgid "Nonrepresentable section on output"
 msgstr "Ei-edustava lohko tulosteessa"
 
-#: bfd.c:413
+#: bfd.c:410
 msgid "Symbol needs debug section which does not exist"
 msgstr "Symboli tarvitsee vianjäljityslohkon, jota ei ole"
 
-#: bfd.c:414
+#: bfd.c:411
 msgid "Bad value"
 msgstr "Väärä arvo"
 
-#: bfd.c:415
+#: bfd.c:412
 msgid "File truncated"
 msgstr "Tiedosto typistetty"
 
-#: bfd.c:416
+#: bfd.c:413
 msgid "File too big"
 msgstr "Tiedosto on liian iso"
 
-#: bfd.c:417
+#: bfd.c:414
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Virhe luettaessa %s: %s"
 
-#: bfd.c:418
+#: bfd.c:415
 msgid "#<Invalid error code>"
 msgstr "#<Virheellinen virhekoodi>"
 
-#: bfd.c:945
+#: bfd.c:939
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr "BFD %s suoritusehto epäonnistui %s:%d"
 
-#: bfd.c:957
+#: bfd.c:951
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d in %s\n"
 msgstr "BFD %s sisäinen virhe, keskeytetään tiedostossa %s rivillä %d funktiossa %s\n"
 
-#: bfd.c:961
+#: bfd.c:955
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d\n"
 msgstr "BFD %s sisäinen virhe, keskeytetään tiedostossa %s rivillä %d\n"
 
-#: bfd.c:963
+#: bfd.c:957
 msgid "Please report this bug.\n"
 msgstr "Ilmoita tästä virheestä.\n"
 
@@ -191,9 +190,9 @@ msgstr "ei kuvausta: ympäristömuuttuja ei ole asetettu\n"
 msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
 msgstr "Varoitus: Kirjoitetaan lohko �%s� valtavaan (ts. negatiiviseen) tiedostosiirrososoitteeseen 0x%lx."
 
-#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731
-#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360
-#: elf64-ia64.c:360
+#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1640 elf32-frv.c:5740
+#: elfxx-sparc.c:2795 reloc.c:5646 reloc16.c:162 elf32-ia64.c:842
+#: elf64-ia64.c:842
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr "%P%F: valitsimia --relax ja -r ei saa käyttää yhdessä\n"
 
@@ -207,7 +206,7 @@ msgid ""
 "   Use compiler flags, or objZ, to generate uncompressed binaries."
 msgstr ""
 "%B: Ei voi käsitellä tiivistettyjä Alpha-binaareja.\n"
-"   Käytä kääntäjälippuja, tai objZ:aa, tiivistämättömien binaarien tuottamiseksi."
+"   Käytä kääntäjälippuja, tai objZ:aa, tiivistämättömien binaarien luomiseksi."
 
 #: coff-alpha.c:648
 msgid "%B: unknown/unsupported relocation type %d"
@@ -229,8 +228,8 @@ msgstr "%B: ei-tuettu sijoitus: ALPHA_R_GPRELHIGH"
 msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
 msgstr "%B: ei-tuettu sijoitus: ALPHA_R_GPRELLOW"
 
-#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228
-#: elf32-ia64.c:3845 elf64-ia64.c:3845
+#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:3991 elf64-alpha.c:4140
+#: elf32-ia64.c:4582 elf64-ia64.c:4582
 msgid "%B: unknown relocation type %d"
 msgstr "%B: tuntematon sijoitustyyppi %d"
 
@@ -244,7 +243,7 @@ msgstr "%B: ei löydetty THUMB-vihjettä �%s� nimelle �%s�"
 msgid "%B: unable to find ARM glue '%s' for `%s'"
 msgstr "%B: ei löydetty ARM-vihjettä �%s� nimelle �%s�"
 
-#: coff-arm.c:1369 elf32-arm.c:6980
+#: coff-arm.c:1369 elf32-arm.c:6501
 #, c-format
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
@@ -264,7 +263,7 @@ msgstr ""
 "  ensimmäinen esiintymä: %B: thumb-kutsu arm-koodiin\n"
 "  harkitse uudelleenlinkitystä --support-old-code aktivoituna"
 
-#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3081
+#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3043
 msgid "%B: bad reloc address 0x%lx in section `%A'"
 msgstr "%B: virheellinen reloc-tietueosoite 0x%lx lohkossa �%A�"
 
@@ -277,12 +276,12 @@ msgstr "%B: virheellinen symboli-indeksi reloc-tietueessa: %d"
 msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
 msgstr "virhe: %B on käännetty APCS-%d:lle, kun taas %B on käännetty APCS-%d:lle"
 
-#: coff-arm.c:2226 elf32-arm.c:15580
+#: coff-arm.c:2226 elf32-arm.c:14105
 #, c-format
 msgid "error: %B passes floats in float registers, whereas %B passes them in integer registers"
 msgstr "virhe: %B välittää float-liukuluvut liukulukurekistereissa, kun taas %B välittää ne kokonaislukurekistereissa"
 
-#: coff-arm.c:2229 elf32-arm.c:15584
+#: coff-arm.c:2229 elf32-arm.c:14109
 #, c-format
 msgid "error: %B passes floats in integer registers, whereas %B passes them in float registers"
 msgstr "virhe: %B välittää float-liukuluvut kokonaislukurekistereissa, kun taas %B välittää ne float-liukulukurekistereissa"
@@ -297,12 +296,12 @@ msgstr "virhe: %B käännetään paikkariippumattomana koodina, kun taas kohde %
 msgid "error: %B is compiled as absolute position code, whereas target %B is position independent"
 msgstr "virhe: %B käännetään absoluuttisella paikkakoodilla, kun taas kohde %B on paikkariippumaton"
 
-#: coff-arm.c:2274 elf32-arm.c:15649
+#: coff-arm.c:2274 elf32-arm.c:14174
 #, c-format
 msgid "Warning: %B supports interworking, whereas %B does not"
 msgstr "Varoitus: %B tukee yhteistoimivuutta vanhan koodin kanssa, kun taas %B ei tue"
 
-#: coff-arm.c:2277 elf32-arm.c:15655
+#: coff-arm.c:2277 elf32-arm.c:14180
 #, c-format
 msgid "Warning: %B does not support interworking, whereas %B does"
 msgstr "Varoitus: %B ei tue yhteistoimivuutta vanhan koodin kanssa, kun taas %B tukee"
@@ -312,7 +311,7 @@ msgstr "Varoitus: %B ei tue yhteistoimivuutta vanhan koodin kanssa, kun taas %B
 msgid "private flags = %x:"
 msgstr "yksityiset liput = %x:"
 
-#: coff-arm.c:2309 elf32-arm.c:11752
+#: coff-arm.c:2309 elf32-arm.c:10492
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr " [liukuluvut välitetty liukulukurekistereissä]"
@@ -322,7 +321,7 @@ msgstr " [liukuluvut välitetty liukulukurekistereissä]"
 msgid " [floats passed in integer registers]"
 msgstr " [liukuluvut välitetty kokonaislukurekistereissä]"
 
-#: coff-arm.c:2314 elf32-arm.c:11755
+#: coff-arm.c:2314 elf32-arm.c:10495
 #, c-format
 msgid " [position independent]"
 msgstr " [paikkariippumaton]"
@@ -347,12 +346,12 @@ msgstr " [yhteistoimivuutta vanhan koodin kanssa tuettu]"
 msgid " [interworking not supported]"
 msgstr " [yhteistoimivuutta vanhan koodin kanssa ei tueta]"
 
-#: coff-arm.c:2370 elf32-arm.c:10787
+#: coff-arm.c:2370 elf32-arm.c:9520
 #, c-format
 msgid "Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"
 msgstr "Varoitus: Ei aseteta %B:n lippua yhteistoimivuudesta vanhan koodin kanssa koska se on jo määritelty ei-yhteistoimivuuskohteena"
 
-#: coff-arm.c:2374 elf32-arm.c:10791
+#: coff-arm.c:2374 elf32-arm.c:9524
 #, c-format
 msgid "Warning: Clearing the interworking flag of %B due to outside request"
 msgstr "Varoitus: %B:n yhteistoimivuuslipun nollaus johtuu ulkopuolisesta pyynnöstä"
@@ -364,10 +363,10 @@ msgstr "ei voi käsitellä �R_MEM_INDIRECT reloc�-tietuetta kun käytetään
 
 #: coff-i860.c:147
 #, c-format
-msgid "relocation `%s' not yet implemented"
-msgstr "sijoitusta �%s� ei ole vielä toteutettu"
+msgid "Relocation `%s' not yet implemented\n"
+msgstr "Sijoitusta �%s� ei ole vielä toteutettu\n"
 
-#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192
+#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5147
 msgid "%B: warning: illegal symbol index %ld in relocs"
 msgstr "%B: varoitus: virheellinen symboli-indeksi %ld relocs-tietueissa"
 
@@ -375,7 +374,7 @@ msgstr "%B: varoitus: virheellinen symboli-indeksi %ld relocs-tietueissa"
 msgid "uncertain calling convention for non-COFF symbol"
 msgstr "epävarma kutsukäytäntö ei-COFF-symbolille"
 
-#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677
+#: coff-m68k.c:506 elf32-bfin.c:5678 elf32-cr16.c:2897 elf32-m68k.c:4672
 msgid "unsupported reloc type"
 msgstr "ei-tuettu reloc-tyyppi"
 
@@ -388,25 +387,20 @@ msgstr "Yleisosoitinsuhteellinen sijoitus kun �_gp� ei ole määritelty"
 msgid "Unrecognized reloc"
 msgstr "Tunnistamaton reloc-tietue"
 
-#: coff-rs6000.c:2676
+#: coff-rs6000.c:2794
 #, c-format
 msgid "%s: unsupported relocation type 0x%02x"
 msgstr "%s: ei-tuettu sijoitustyyppi 0x%02x"
 
-#: coff-rs6000.c:2761
+#: coff-rs6000.c:2887
 #, c-format
 msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"
 msgstr "%s: �Sisältöluettelo-reloc�-tietue osoitteessa 0x%x symboliin �%s� ilman sisältöluettelotulokohtaa"
 
-#: coff-rs6000.c:3512 coff64-rs6000.c:2111
+#: coff-rs6000.c:3652 coff64-rs6000.c:2175
 msgid "%B: symbol `%s' has unrecognized smclas %d"
 msgstr "%B: symbolissa �%s� on tunnistamaton �smclas�-arvo %d"
 
-#: coff-sh.c:521
-#, c-format
-msgid "SH Error: unknown reloc type %d"
-msgstr "SH-virhe: tuntematon sijoitustyyppi %d"
-
 #: coff-tic4x.c:195 coff-tic54x.c:299 coff-tic80.c:458
 #, c-format
 msgid "Unrecognized reloc type 0x%x"
@@ -427,86 +421,82 @@ msgstr "ei oteta huomioon reloc-tietuetta %s\n"
 #  C++ ABI-ryhmä on pyrkinyt ratkaisemaan tämän pulman sallimalla kääntäjän lähettää vaaditut
 #  tiedot useisiin käännösyksiköihin, mikä sallii linkkerin poistaa kaikki muuta paitsi yhden
 #  kopion. Tätä ominaisuutta kutsutaan useissa olemassa olevissa toteutuksissa nimellä COMDAT.
-#: coffcode.h:991
+#: coffcode.h:973
 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr "%B: varoitus: COMDAT-symboli �%s� ei täsmää lohkonimen �%s� kanssa"
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1215
+#: coffcode.h:1197
 msgid "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
 msgstr "%B: Varoitus: Ei oteta huomioon lohkolippua IMAGE_SCN_MEM_NOT_PAGED lohkossa %s"
 
-#: coffcode.h:1282
+#: coffcode.h:1264
 msgid "%B (%s): Section flag %s (0x%x) ignored"
 msgstr "%B (%s): Lohkolippua %s (0x%x) ei oteta huomioon"
 
 #  TI tarkoittaa luultavasti Texas Instruments
-#: coffcode.h:2424
+#: coffcode.h:2390
 #, c-format
 msgid "Unrecognized TI COFF target id '0x%x'"
 msgstr "Tunnistamaton �TI COFF�-kohdetunniste �0x%x�"
 
-#: coffcode.h:2738
+#: coffcode.h:2704
 msgid "%B: reloc against a non-existant symbol index: %ld"
 msgstr "%B: reloc-tietue käyttäen ei-olemassaolevaa symboli-indeksiä: %ld"
 
-#: coffcode.h:3296
+#: coffcode.h:3262
 msgid "%B: too many sections (%d)"
 msgstr "%B: liian monia lohkoja (%d)"
 
-#: coffcode.h:3712
+#: coffcode.h:3676
 msgid "%B: section %s: string table overflow at offset %ld"
 msgstr "%B: lohko %s: merkkijonotaulun ylitys siirrososoitteessa %ld"
 
-#: coffcode.h:4517
+#: coffcode.h:4481
 msgid "%B: warning: line number table read failed"
 msgstr "%B: varoitus: rivinumerotaulun lukeminen ei onnistunut"
 
-#: coffcode.h:4547
+#: coffcode.h:4511
 msgid "%B: warning: illegal symbol index %ld in line numbers"
 msgstr "%B: varoitus: virheellinen symboli-indeksi %ld rivinumeroissa"
 
-#: coffcode.h:4561
+#: coffcode.h:4525
 msgid "%B: warning: duplicate line number information for `%s'"
 msgstr "%B: varoitus: rivinumerojen kaksoiskappaleita symbolille �%s�"
 
-#: coffcode.h:4961
+#: coffcode.h:4916
 msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
 msgstr "%B: Tunnistamaton tallennusluokka: %d lohkonimi: %s symbolinimi: �%s�"
 
-#: coffcode.h:5087
+#: coffcode.h:5042
 msgid "warning: %B: local symbol `%s' has no section"
 msgstr "varoitus: %B: paikallisessa symbolissa �%s� ei ole lohkoa"
 
-#: coffcode.h:5231
+#: coffcode.h:5186
 msgid "%B: illegal relocation type %d at address 0x%lx"
 msgstr "%B: virheellinen sijoitustyyppi %d osoitteessa 0x%lx"
 
-#: coffgen.c:1578
+#: coffgen.c:1573
 msgid "%B: bad string table size %lu"
 msgstr "%B: virheellinen merkkijonotaulukoko %lu"
 
 #  Epäilen, että lähdekoodissa on virhe: tyypit ovat kaksi viimeistä parametriä.
-#: cofflink.c:533 elflink.c:4353
+#: cofflink.c:524 elflink.c:4339
 msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
 msgstr "Varoitus: symbolityyppi �%s� vaihtui tyypistä %d tyyppiin %d kohteessa %B"
 
-#: cofflink.c:2330
+#: cofflink.c:2321
 msgid "%B: relocs in section `%A', but it has no contents"
 msgstr "%B: relocs-tietueet lohkossa �%A�, mutta ilman sisältöä"
 
-#: cofflink.c:2392 elflink.c:9554
-msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
-msgstr "%X�%s� viitattu lohkossa �%A� kohteessa %B: määritelty hylätyssä lohkossa �%A� / %B\n"
-
-#: cofflink.c:2690 coffswap.h:826
+#: cofflink.c:2652 coffswap.h:826
 #, c-format
 msgid "%s: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr "%s: %s: reloc-tietueylivuoto: 0x%lx > 0xffff"
 
-#: cofflink.c:2699 coffswap.h:812
+#: cofflink.c:2661 coffswap.h:812
 #, c-format
 msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr "%s: varoitus: %s: rivinumeroylivuoto: 0x%lx > 0xffff"
@@ -552,22 +542,22 @@ msgstr "Dwarf-virhe: Virheellinen toimintojen enimmäismäärä per käsky."
 msgid "Dwarf Error: mangled line number section."
 msgstr "Dwarf-virhe: runneltu rivinumerolohko."
 
-#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383
+#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2382
 #, c-format
 msgid "Dwarf Error: Could not find abbrev number %u."
 msgstr "Dwarf-virhe: Ei löytynyt lyhennenumeroa %u."
 
-#: dwarf2.c:2344
+#: dwarf2.c:2343
 #, c-format
 msgid "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 and 4 information."
 msgstr "Dwarf-virhe: löytyi dwarf-versio ’%u’, tämä lukija käsittelee vain version 2, 3 ja 4 tietoja."
 
-#: dwarf2.c:2351
+#: dwarf2.c:2350
 #, c-format
 msgid "Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."
 msgstr "Dwarf-virhe: löytyi osoitekoko ’%u’, tämä lukija ei voi käsitellä kokoja, jotka ovat suurempia kuin ’%u’."
 
-#: dwarf2.c:2374
+#: dwarf2.c:2373
 #, c-format
 msgid "Dwarf Error: Bad abbrev number: %u."
 msgstr "Dwarf-virhe: Väärä lyhennenumero: %u."
@@ -665,34 +655,30 @@ msgstr "%P: virhe kohteessa %B(%A); �.eh_frame_hdr�-taulua ei luotu.\n"
 msgid "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
 msgstr "%P: fde-koodaus kohteessa %B(%A) estää �.eh_frame_hdr�-taulun luomisen.\n"
 
-#: elf-eh-frame.c:1583
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
-msgstr "%P: DW_EH_PE_datarel määrittelemätön tälle arkkitehtuurille.\n"
-
 #: elf-ifunc.c:179
 msgid "%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can not be used when making an executable; recompile with -fPIE and relink with -pie\n"
 msgstr "%F%P: dynaamista STT_GNU_IFUNC symbolia �%s� osoitinyhtäläisyydellä kohteessa �%B� ei voida käyttää tekemään suoritettavaa tiedostoa; käännä uudelleen valitsimella -fPIE ja linkitä uudelleen valitsemella -pie\n"
 
-#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209
+#: elf-m10200.c:450 elf-m10300.c:1560 elf32-avr.c:1263 elf32-bfin.c:3193
 #: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922
-#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509
+#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4111 elf32-h8300.c:509
 #: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168
-#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535
+#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:534
 #: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395
 #: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540
 #: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522
 msgid "internal error: out of range error"
 msgstr "sisäinen virhe: �lukualueen ulkopuolella�-virhe"
 
-#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213
+#: elf-m10200.c:454 elf-m10300.c:1564 elf32-avr.c:1267 elf32-bfin.c:3197
 #: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926
-#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513
+#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4115 elf32-h8300.c:513
 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557
-#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539
+#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:538
 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490
 #: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544
 #: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526
-#: elfxx-mips.c:9193
+#: elfxx-mips.c:9186
 msgid "internal error: unsupported relocation error"
 msgstr "sisäinen virhe: ei-tuettu sijoitusvirhe"
 
@@ -703,40 +689,37 @@ msgstr "sisäinen virhe: ei-tuettu sijoitusvirhe"
 msgid "internal error: dangerous error"
 msgstr "sisäinen virhe: vaarallinen virhe"
 
-#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221
+#: elf-m10200.c:462 elf-m10300.c:1577 elf32-avr.c:1275 elf32-bfin.c:3205
 #: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934
-#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521
+#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4123 elf32-h8300.c:521
 #: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180
-#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547
+#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:546
 #: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403
 #: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552
 #: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534
 msgid "internal error: unknown error"
 msgstr "sisäinen virhe: tuntematon virhe"
 
-#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604
-#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067
-#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807
+#: elf-m10300.c:1504 elf32-arm.c:9098 elf32-i386.c:4081 elf32-m32r.c:2604
+#: elf32-m68k.c:4156 elf32-ppc.c:8089 elf32-s390.c:3010 elf32-sh.c:4223
+#: elf32-xtensa.c:3067 elf64-ppc.c:13115 elf64-s390.c:2985 elf64-sh64.c:1636
+#: elf64-x86-64.c:3719 elfxx-sparc.c:3806
 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"
 msgstr "%B(%A+0x%lx): ratkaisematon %s sijoitus symbolia �%s� varten"
 
-#: elf-m10300.c:1580
+#: elf-m10300.c:1569
 msgid "error: inappropriate relocation type for shared library (did you forget -fpic?)"
 msgstr "virhe: sopimaton sijoitustyyppi jaetulle kirjastolle (unohtuiko -fpic?)"
 
-#: elf-m10300.c:1583
-msgid "%B: error: taking the address of protected function '%s' cannot be done when making a shared library"
-msgstr "%B: virhe: suojatun funktion ’%s’ osoitteen ottamista ei voida tehdä, kun tehdään jaettua kirjastoa"
-
-#: elf-m10300.c:1586
+#: elf-m10300.c:1572
 msgid "internal error: suspicious relocation type used in shared library"
 msgstr "sisäinen virhe: epäilyttävää sijoitustyyppiä käytetään jaetussa kirjastossa"
 
-#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044
-#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868
-#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931
-#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377
-#: elf64-x86-64.c:1985 elfxx-sparc.c:2104
+#: elf-m10300.c:4372 elf32-arm.c:11392 elf32-cr16.c:2451 elf32-cris.c:3044
+#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2036 elf32-lm32.c:1868
+#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-ppc.c:4994 elf32-s390.c:1652
+#: elf32-sh.c:2931 elf32-vax.c:1040 elf64-ppc.c:6483 elf64-s390.c:1635
+#: elf64-sh64.c:3377 elf64-x86-64.c:1871 elfxx-sparc.c:2104
 #, c-format
 msgid "dynamic variable `%s' is zero size"
 msgstr "dynaaminen muuttuja �%s� on nollakokoinen"
@@ -761,7 +744,7 @@ msgstr "%B: virheellinen SHT_GROUP-tulokohta"
 msgid "%B: no group info for section %A"
 msgstr "%B: ei ryhmätietoja lohkolle %A"
 
-#: elf.c:737 elf.c:3121 elflink.c:10144
+#: elf.c:737 elf.c:3090 elflink.c:10062
 msgid "%B: warning: sh_link not set for section `%A'"
 msgstr "%B: varoitus: sh_link-kenttää ei aseteta lohkolle �%A�"
 
@@ -777,11 +760,11 @@ msgstr "%B: tuntematon [%d] lohko �%s� ryhmässä [%s]"
 msgid "%B: unable to initialize commpress status for section %s"
 msgstr "%B: ei kyetä alustamaan tiivistystilaa lohkolle %s"
 
-#: elf.c:1061
+#: elf.c:1050
 msgid "%B: unable to initialize decommpress status for section %s"
 msgstr "%B: ei kyetä alustamaan tiivistyksenpurkutilaa lohkolle %s"
 
-#: elf.c:1181
+#: elf.c:1158
 #, c-format
 msgid ""
 "\n"
@@ -790,7 +773,7 @@ msgstr ""
 "\n"
 "Ohjelmaotsake:\n"
 
-#: elf.c:1223
+#: elf.c:1200
 #, c-format
 msgid ""
 "\n"
@@ -799,7 +782,7 @@ msgstr ""
 "\n"
 "Dynaaminen lohko:\n"
 
-#: elf.c:1359
+#: elf.c:1336
 #, c-format
 msgid ""
 "\n"
@@ -808,7 +791,7 @@ msgstr ""
 "\n"
 "Versiomäärittelyt:\n"
 
-#: elf.c:1384
+#: elf.c:1361
 #, c-format
 msgid ""
 "\n"
@@ -817,82 +800,82 @@ msgstr ""
 "\n"
 "Versioviitteet:\n"
 
-#: elf.c:1389
+#: elf.c:1366
 #, c-format
 msgid "  required from %s:\n"
 msgstr "  kysytty kohteesta %s:\n"
 
-#: elf.c:1796
+#: elf.c:1773
 msgid "%B: invalid link %lu for reloc section %s (index %u)"
 msgstr "%B: virheellinen linkki %lu reloc-tietueelle %s (indeksi %u)"
 
-#: elf.c:1966
+#: elf.c:1943
 msgid "%B: don't know how to handle allocated, application specific section `%s' [0x%8x]"
 msgstr "%B: ei tiedä kuinka käsitellä varattua, sovelluskohtaista lohkoa �%s� [0x%8x]"
 
-#: elf.c:1978
+#: elf.c:1955
 msgid "%B: don't know how to handle processor specific section `%s' [0x%8x]"
 msgstr "%B: ei tiedä, kuinka käsitellä prosessorikohtaista lohkoa �%s� [0x%8x]"
 
-#: elf.c:1989
+#: elf.c:1966
 msgid "%B: don't know how to handle OS specific section `%s' [0x%8x]"
 msgstr "%B: ei tiedä, kuinka käsitellä käyttöjärjestelmäkohtaista lohkoa �%s� [0x%8x]"
 
-#: elf.c:1999
+#: elf.c:1976
 msgid "%B: don't know how to handle section `%s' [0x%8x]"
 msgstr "%B: ei tiedä kuinka käsitellä lohkoa �%s� [0x%8x]"
 
-#: elf.c:2634
+#: elf.c:2603
 #, c-format
 msgid "warning: section `%A' type changed to PROGBITS"
 msgstr "varoitus: lohkon �%A� tyyppi vaihtunut tyypiksi PROGBITS"
 
-#: elf.c:3078
+#: elf.c:3047
 msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
 msgstr "%B: sh_link-lohko �%A� osoittaa hylättyyn lohkoon �%A� kohteessa �%B�"
 
-#: elf.c:3101
+#: elf.c:3070
 msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
 msgstr "%B: sh_link-lohko �%A� osoittaa poistettuun lohkoon �%A� kohteessa �%B�"
 
-#: elf.c:4527
+#: elf.c:4480
 msgid "%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr "%B: Ensimmäinen lohko PT_DYNAMIC-segmentissä ei ole �.dynamic�-lohko"
 
-#: elf.c:4554
+#: elf.c:4507
 msgid "%B: Not enough room for program headers, try linking with -N"
 msgstr "%B: Ei tarpeeksi tilaa ohjelmaotsakkeille, yritä linkittää �-N�-argumentilla"
 
-#: elf.c:4641
+#: elf.c:4594
 msgid "%B: section %A lma %#lx adjusted to %#lx"
 msgstr "%B: lohko %A vma %#lx säädetty kohteeseen %#lx"
 
-#: elf.c:4774
+#: elf.c:4713
 msgid "%B: section `%A' can't be allocated in segment %d"
 msgstr "%B: lohkoa �%A� ei voida varata segmentissä %d"
 
-#: elf.c:4822
+#: elf.c:4761
 msgid "%B: warning: allocated section `%s' not in segment"
 msgstr "%B: varoitus: varattu lohko �%s� ei ole segmentissä"
 
-#: elf.c:5322
+#: elf.c:5257
 msgid "%B: symbol `%s' required but not present"
 msgstr "%B: symboli �%s� vaadittu, mutta ei ole annettu"
 
-#: elf.c:5660
+#: elf.c:5595
 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n"
 msgstr "%B: varoitus: Tyhjä ladattava segmentti havaittu, onko tämä tarkoituksellinen ?\n"
 
-#: elf.c:6688
+#: elf.c:6622
 #, c-format
 msgid "Unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr "Ei löydy samanlaista tulostelohkoa symbolille �%s� lohkosta �%s�"
 
-#: elf.c:7684
+#: elf.c:7611
 msgid "%B: unsupported relocation type %s"
 msgstr "%B: ei-tuettu sijoitustyyppi %s"
 
-#: elf32-arm.c:3590
+#: elf32-arm.c:3183
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: Thumb call to ARM"
@@ -900,7 +883,7 @@ msgstr ""
 "%B(%s): varoitus: yhteistoimivuus vanhan koodin kanssa ei ole käytössä.\n"
 "  ensimmäinen esiintymä: %B: Thumb-kutsu ARM-koodiin"
 
-#: elf32-arm.c:3637
+#: elf32-arm.c:3226
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: ARM call to Thumb"
@@ -908,41 +891,41 @@ msgstr ""
 "%B(%s): varoitus: yhteistoimivuus vanhan koodin kanssa ei ole käytössä.\n"
 "  ensimmäinen esiintymä: %B: ARM-kutsu Thumb-koodiin"
 
-#: elf32-arm.c:3849 elf32-arm.c:5286
+#: elf32-arm.c:3432 elf32-arm.c:4807
 #, c-format
 msgid "%s: cannot create stub entry %s"
 msgstr "%s: ei voi luoda stub-tulokohtaa %s"
 
-#: elf32-arm.c:5402
+#: elf32-arm.c:4923
 #, c-format
 msgid "unable to find THUMB glue '%s' for '%s'"
 msgstr "ei löydy THUMB-vihjettä �%s� kohteelle �%s�"
 
-#: elf32-arm.c:5438
+#: elf32-arm.c:4959
 #, c-format
 msgid "unable to find ARM glue '%s' for '%s'"
 msgstr "ei löydy ARM-vihjettä �%s� kohteelle �%s�"
 
-#: elf32-arm.c:5964
+#: elf32-arm.c:5485
 msgid "%B: BE8 images only valid in big-endian mode."
 msgstr "%B: BE8-vedokset ovat oikeita vain big-endian-tavujärjestyksessä."
 
 #  Vector Floating Point (VFP)
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:6194
+#: elf32-arm.c:5715
 msgid "%B: warning: selected VFP11 erratum workaround is not necessary for target architecture"
 msgstr "%B: varoitus: valittu VFP11-virheenkiertotapa ei ole välttämätön kohdearkkitehtuurille"
 
-#: elf32-arm.c:6738 elf32-arm.c:6758
+#: elf32-arm.c:6259 elf32-arm.c:6279
 msgid "%B: unable to find VFP11 veneer `%s'"
 msgstr "%B: ei löydy VFP11-julkisivua �%s�"
 
-#: elf32-arm.c:6806
+#: elf32-arm.c:6327
 #, c-format
 msgid "Invalid TARGET2 relocation type '%s'."
 msgstr "Virheellinen TARGET2-sijoitustyyppi �%s�."
 
-#: elf32-arm.c:6890
+#: elf32-arm.c:6411
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: thumb call to arm"
@@ -950,403 +933,379 @@ msgstr ""
 "%B(%s): varoitus: yhteistoimivuus vanhan koodin kanssa ei ole käytössä.\n"
 "  ensimmäinen esiintymä: %B: thumb-kutsu arm-koodiin"
 
-#: elf32-arm.c:7674
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx):odottamaton Thumb-käsky ’0x%x’ TLS-trampoliinissa"
-
-#: elf32-arm.c:7713
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx):odottamaton ARM-käsky ’0x%x’ TLS-trampoliinissa"
-
-#: elf32-arm.c:8166
+#: elf32-arm.c:7130
 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'."
 msgstr "\\%B: Varoitus: �Arm BLX�-käskykohteet Arm-funktiossa �%s�."
 
-#: elf32-arm.c:8575
+#: elf32-arm.c:7541
 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
 msgstr "%B: Varoitus: �Thumb BLX�-käskykohteet thumb-funktiossa �%s�."
 
-#: elf32-arm.c:9408
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx):TLS_GOTDESC viittasi odottamattomaann Thumb-käskyyn ’0x%x’"
-
-#: elf32-arm.c:9431
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx):TLS_GOTDESC viittasi odottamattomaan ARM-käskyyn ’0x%x’"
-
-#: elf32-arm.c:9460
+#: elf32-arm.c:8223
 msgid "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"
 msgstr "%B(%A+0x%lx): R_ARM_TLS_LE32-sijoitukset eivät ole sallittuja jaetuissa objekteissa"
 
-#: elf32-arm.c:9675
+#: elf32-arm.c:8438
 msgid "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"
 msgstr "%B(%A+0x%lx): Vain ADD- tai SUB-käskyt ovat sallittuja ALU-ryhmän sijoituksille"
 
-#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970
+#: elf32-arm.c:8478 elf32-arm.c:8565 elf32-arm.c:8648 elf32-arm.c:8733
 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"
 msgstr "%B(%A+0x%lx): Ylivuoto, kun halkaistaan 0x%lx ryhmäsijoitukselle %s"
 
-#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544
+#: elf32-arm.c:8963 elf32-sh.c:4112 elf64-sh64.c:1544
 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section"
 msgstr "%B(%A+0x%lx): %s sijoitus SEC_MERGE-lohkoa varten"
 
 #  TLS: transport layer security
-#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805
+#: elf32-arm.c:9074 elf32-m68k.c:4191 elf32-xtensa.c:2805 elf64-ppc.c:11689
 msgid "%B(%A+0x%lx): %s used with TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s käytetään TLS-symbolin %s kanssa"
 
-#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806
+#: elf32-arm.c:9075 elf32-m68k.c:4192 elf32-xtensa.c:2806 elf64-ppc.c:11690
 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s käytetään ei-TLS-symbolin %s kanssa"
 
-#: elf32-arm.c:10399 elf32-tic6x.c:2751
+#: elf32-arm.c:9132 elf32-tic6x.c:1632
 msgid "out of range"
 msgstr "lukualueen ulkopuolella"
 
-#: elf32-arm.c:10403 elf32-tic6x.c:2755
+#: elf32-arm.c:9136 elf32-tic6x.c:1636
 msgid "unsupported relocation"
 msgstr "ei-tuettu sijoitus"
 
-#: elf32-arm.c:10411 elf32-tic6x.c:2763
+#: elf32-arm.c:9144 elf32-tic6x.c:1644
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: elf32-arm.c:10836
+#: elf32-arm.c:9569
 msgid "Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"
 msgstr "Varoitus: Nollataan %B:n vanhan koodin kanssa toimimisen yhteistoimivuuslippu, koska se on linkitetty ei-yhteistoimivuuskoodiin %B:ssa"
 
-#: elf32-arm.c:10930
+#: elf32-arm.c:9663
 msgid "%B: Unknown mandatory EABI object attribute %d"
 msgstr "%B: Tuntematon pakollinen EABI-objektiattribuutti %d"
 
-#: elf32-arm.c:10938
+#: elf32-arm.c:9671
 msgid "Warning: %B: Unknown EABI object attribute %d"
 msgstr "Varoitus: %B: Tuntematon EABI-objektiattribuutti %d"
 
-#: elf32-arm.c:11119
+#: elf32-arm.c:9852
 msgid "error: %B: Unknown CPU architecture"
 msgstr "virhe: %B: Tuntematon prosessoriarkkitehtuuri"
 
-#: elf32-arm.c:11157
+#: elf32-arm.c:9890
 msgid "error: %B: Conflicting CPU architectures %d/%d"
 msgstr "virhe: %B: Ristiriitaisia prosessoriarkkitehtuureja %d/%d"
 
-#: elf32-arm.c:11206
+#: elf32-arm.c:9942
 msgid "Error: %B has both the current and legacy Tag_MPextension_use attributes"
 msgstr "Virhe: kohteessa %B on sekä nykyisiä että perinne-Tag_MPextension_use-attribuutteja"
 
-#: elf32-arm.c:11231
+#: elf32-arm.c:9967
 msgid "error: %B uses VFP register arguments, %B does not"
 msgstr "virhe: %B käyttää VFP-rekisteriargumentteja, %B ei käytä"
 
-#: elf32-arm.c:11376
+#: elf32-arm.c:10112
 msgid "error: %B: unable to merge virtualization attributes with %B"
 msgstr "virhe: %B: ei kyetä yhdistämään virtualisointiattribuutteja kohteen %B kanssa"
 
-#: elf32-arm.c:11402
+#: elf32-arm.c:10138
 msgid "error: %B: Conflicting architecture profiles %c/%c"
 msgstr "virhe: %B: Ristiriitaisia arkkitehtuuriprofiileja %c/%c"
 
-#: elf32-arm.c:11503
+#: elf32-arm.c:10239
 msgid "Warning: %B: Conflicting platform configuration"
 msgstr "Varoitus: %B: Ristiriitainen käyttöjärjestemäkonfiguraatio"
 
-#: elf32-arm.c:11512
+#: elf32-arm.c:10248
 msgid "error: %B: Conflicting use of R9"
 msgstr "virhe: %B: Ristiriitainen R9:n käyttö"
 
-#: elf32-arm.c:11524
+#: elf32-arm.c:10260
 msgid "error: %B: SB relative addressing conflicts with use of R9"
 msgstr "virhe: %B: SB-suhteellinen osoitteitus on ristiriidassa R9:n käytön kanssa"
 
-#: elf32-arm.c:11537
+#: elf32-arm.c:10273
 msgid "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"
 msgstr "varoitus: %B käyttää %u-tavuista wchar_t-merkkiä vaikka tuloste käyttää %u-tavuista wchar_t-merkkiä; wchart_t-käyttöarvot objekteissa saattavat olla virheellisiä"
 
-#: elf32-arm.c:11568
+#: elf32-arm.c:10304
 msgid "warning: %B uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"
 msgstr "varoitus: %B käyttää %s enums-alkioita vaikka tuloste käyttää %s enums-alkioita; enum-arvojen käyttö objekteissa saattaa olla virheellinen"
 
-#: elf32-arm.c:11580
+#: elf32-arm.c:10316
 msgid "error: %B uses iWMMXt register arguments, %B does not"
 msgstr "virhe: %B käyttää iWMMXt-rekisteriargumentteja, %B ei käytä"
 
-#: elf32-arm.c:11597
+#: elf32-arm.c:10333
 msgid "error: fp16 format mismatch between %B and %B"
 msgstr "virhe: fp16-muototäsmäämättömyys kohteiden %B ja %B välillä"
 
-#: elf32-arm.c:11621
+#: elf32-arm.c:10357
 msgid "DIV usage mismatch between %B and %B"
 msgstr "DIV-käyttötäsmäämättömyys kohteiden %B ja %B välillä"
 
-#: elf32-arm.c:11640
+#: elf32-arm.c:10376
 msgid "%B has has both the current and legacy Tag_MPextension_use attributes"
 msgstr "kohteella %B on sekä nykyisiä että perinne-Tag_MPextension_use-attribuutteja"
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
-#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282
+#: elf32-arm.c:10468 elf32-bfin.c:5065 elf32-cris.c:4162 elf32-m68hc1x.c:1282
 #: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528
-#: elfxx-mips.c:12857
+#: elfxx-mips.c:12842
 #, c-format
 msgid "private flags = %lx:"
 msgstr "yksityiset liput = %lx:"
 
-#: elf32-arm.c:11737
+#: elf32-arm.c:10477
 #, c-format
 msgid " [interworking enabled]"
 msgstr " [yhteistoimivuus vanhan koodin kanssa on käytössä]"
 
-#: elf32-arm.c:11745
+#: elf32-arm.c:10485
 #, c-format
 msgid " [VFP float format]"
 msgstr " [vektoriliukulukumuoto]"
 
-#: elf32-arm.c:11747
+#: elf32-arm.c:10487
 #, c-format
 msgid " [Maverick float format]"
 msgstr " [Maverick-liukulukumuoto]"
 
-#: elf32-arm.c:11749
+#: elf32-arm.c:10489
 #, c-format
 msgid " [FPA float format]"
 msgstr " [Liukulukukiihdytin-liukulukumuoto]"
 
-#: elf32-arm.c:11758
+#: elf32-arm.c:10498
 #, c-format
 msgid " [new ABI]"
 msgstr " [uusi ABI]"
 
-#: elf32-arm.c:11761
+#: elf32-arm.c:10501
 #, c-format
 msgid " [old ABI]"
 msgstr " [vanha ABI]"
 
-#: elf32-arm.c:11764
+#: elf32-arm.c:10504
 #, c-format
 msgid " [software FP]"
 msgstr " [ohjelmistoliukuluku]"
 
-#: elf32-arm.c:11773
+#: elf32-arm.c:10513
 #, c-format
 msgid " [Version1 EABI]"
 msgstr " [Versio 1 EABI]"
 
-#: elf32-arm.c:11776 elf32-arm.c:11787
+#: elf32-arm.c:10516 elf32-arm.c:10527
 #, c-format
 msgid " [sorted symbol table]"
 msgstr " [lajiteltu symbolitaulu]"
 
-#: elf32-arm.c:11778 elf32-arm.c:11789
+#: elf32-arm.c:10518 elf32-arm.c:10529
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr " [lajittelematon symbolitaulu]"
 
-#: elf32-arm.c:11784
+#: elf32-arm.c:10524
 #, c-format
 msgid " [Version2 EABI]"
 msgstr " [Versio 2 EABI]"
 
-#: elf32-arm.c:11792
+#: elf32-arm.c:10532
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr " [dynaamiset symbolit käyttävät segmentti-indeksiä]"
 
-#: elf32-arm.c:11795
+#: elf32-arm.c:10535
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr " [kuvaussymbolit ylittävät tärkeydessä muut]"
 
-#: elf32-arm.c:11802
+#: elf32-arm.c:10542
 #, c-format
 msgid " [Version3 EABI]"
 msgstr " [Versio 3 EABI]"
 
-#: elf32-arm.c:11806
+#: elf32-arm.c:10546
 #, c-format
 msgid " [Version4 EABI]"
 msgstr " [Versio 4 EABI]"
 
-#: elf32-arm.c:11810
+#: elf32-arm.c:10550
 #, c-format
 msgid " [Version5 EABI]"
 msgstr " [Versio 5 EABI]"
 
-#: elf32-arm.c:11813
+#: elf32-arm.c:10553
 #, c-format
 msgid " [BE8]"
 msgstr " [BE8]"
 
-#: elf32-arm.c:11816
+#: elf32-arm.c:10556
 #, c-format
 msgid " [LE8]"
 msgstr " [LE8]"
 
-#: elf32-arm.c:11822
+#: elf32-arm.c:10562
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr " <EABI-versio tunnistamaton>"
 
-#: elf32-arm.c:11829
+#: elf32-arm.c:10569
 #, c-format
 msgid " [relocatable executable]"
 msgstr " [sijoitettava suoritettava tiedosto]"
 
-#: elf32-arm.c:11832
+#: elf32-arm.c:10572
 #, c-format
 msgid " [has entry point]"
 msgstr " [on tulokohta]"
 
-#: elf32-arm.c:11837
+#: elf32-arm.c:10577
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr "<Tunnistamaton lippubittijoukko>"
 
-#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827
-#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370
+#: elf32-arm.c:10824 elf32-i386.c:1322 elf32-s390.c:1000 elf32-xtensa.c:1009
+#: elf64-s390.c:960 elf64-x86-64.c:1105 elfxx-sparc.c:1370
 msgid "%B: bad symbol index: %d"
 msgstr "%B: virheellinen symboli-indeksi: %d"
 
-#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949
+#: elf32-arm.c:10946 elf64-x86-64.c:1265 elf64-x86-64.c:1434 elfxx-mips.c:7942
 msgid "%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"
 msgstr "%B: sijoitusta %s kohdetta �%s� varten ei voida käyttää kun tehdään jaettua objektia; käännä uudelleen -fPIC-argumentilla"
 
-#: elf32-arm.c:13412
+#: elf32-arm.c:11948
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr "Kohdattiin virheitä prosessoitaessa tiedostoa %s"
 
-#: elf32-arm.c:14795
+#: elf32-arm.c:13334
 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr "%B: virhe: Cortex-A8 virhe-stub on varattu turvattomaan paikkaan"
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:14822
+#: elf32-arm.c:13361
 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr "%B: virhe: Cortex-A8 virhe-stub lukualueen ulkopuolella (syötetiedoston on liian iso)"
 
-#: elf32-arm.c:14916 elf32-arm.c:14938
+#: elf32-arm.c:13455 elf32-arm.c:13477
 msgid "%B: error: VFP11 veneer out of range"
 msgstr "%B: virhe: VFP11-julkisivu lukualueen ulkopuolella"
 
-#: elf32-arm.c:15477
+#: elf32-arm.c:14002
 msgid "error: %B is already in final BE8 format"
 msgstr "virhe: %B on jo lopullisessa BE8-muodossa"
 
-#: elf32-arm.c:15553
+#: elf32-arm.c:14078
 msgid "error: Source object %B has EABI version %d, but target %B has EABI version %d"
 msgstr "virhe: Lähdeobjektissa %B on EABI-versio %d, mutta kohteessa %B on EABI-versio %d"
 
-#: elf32-arm.c:15569
+#: elf32-arm.c:14094
 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
 msgstr "virhe: %B on käännetty APCS-%d:lle, kun taas kohde %B käyttää APCS-%d:ta"
 
 #  Vector floating point (coprosessor)
-#: elf32-arm.c:15594
+#: elf32-arm.c:14119
 msgid "error: %B uses VFP instructions, whereas %B does not"
 msgstr "virhe: %B käyttää vektoriliukulukukäskyjä, kun taas %B ei käytä"
 
 #  Floating Point Accelerator (chip)
-#: elf32-arm.c:15598
+#: elf32-arm.c:14123
 msgid "error: %B uses FPA instructions, whereas %B does not"
 msgstr "virhe: %B käyttää liukulukukiihdytinkäskyjä, kun taas %B ei käytä"
 
-#: elf32-arm.c:15608
+#: elf32-arm.c:14133
 msgid "error: %B uses Maverick instructions, whereas %B does not"
 msgstr "virhe: %B käyttää Maverick-käskyjä, kun taas %B ei käytä"
 
-#: elf32-arm.c:15612
+#: elf32-arm.c:14137
 msgid "error: %B does not use Maverick instructions, whereas %B does"
 msgstr "virhe: %B ei käytä Maverick-käskyjä, kun taas %B käyttää"
 
-#: elf32-arm.c:15631
+#: elf32-arm.c:14156
 msgid "error: %B uses software FP, whereas %B uses hardware FP"
 msgstr "virhe: %B käyttää ohjelmistoliukulukuja, kun taas %B käyttää laitteistoliukulukuja"
 
-#: elf32-arm.c:15635
+#: elf32-arm.c:14160
 msgid "error: %B uses hardware FP, whereas %B uses software FP"
 msgstr "virhe: %B käyttää laitteistoliukulukuja, kun taas %B käyttää ohjelmistoliukulukuja"
 
-#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617
-#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
-#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494
+#: elf32-avr.c:1271 elf32-bfin.c:3201 elf32-cris.c:2085 elf32-fr30.c:617
+#: elf32-frv.c:4119 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
+#: elf32-m32c.c:561 elf32-mep.c:542 elf32-moxie.c:290 elf32-msp430.c:494
 #: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949
 #: elf64-mmix.c:1530
 msgid "internal error: dangerous relocation"
 msgstr "sisäinen virhe: vaarallinen sijoitus"
 
-#: elf32-avr.c:2415 elf32-hppa.c:598 elf32-m68hc1x.c:166
+#: elf32-avr.c:2400 elf32-hppa.c:598 elf32-m68hc1x.c:166 elf64-ppc.c:4175
 msgid "%B: cannot create stub entry %s"
 msgstr "%B: ei voi luoda stub-tulokohtaa %s"
 
-#: elf32-bfin.c:107 elf32-bfin.c:363
-msgid "relocation should be even number"
-msgstr "sijoituksen pitäisi olla parillinen numero"
-
-#: elf32-bfin.c:1591
+#: elf32-bfin.c:1575
 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'"
 msgstr "%B(%A+0x%lx): ratkaisematon sijoitus symboliin �%s�"
 
-#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062
-#: elf64-s390.c:3037 elf64-x86-64.c:3923
+#: elf32-bfin.c:1608 elf32-i386.c:4123 elf32-m68k.c:4233 elf32-s390.c:3062
+#: elf64-s390.c:3037 elf64-x86-64.c:3759
 msgid "%B(%A+0x%lx): reloc against `%s': error %d"
 msgstr "%B(%A+0x%lx): reloc-tietue kohdetta �%s� varten: virhe %d"
 
-#: elf32-bfin.c:2723
+#: elf32-bfin.c:2707
 msgid "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"
 msgstr "%B: sijoitus kohteessa �%A+0x%x� viittaa symboliin �%s�, jossa on ei-nolla-yhteenlaskettava"
 
-#: elf32-bfin.c:2737
+#: elf32-bfin.c:2721 elf32-frv.c:2901
 msgid "relocation references symbol not defined in the module"
 msgstr "sijoitusviitteet-symboli ei ole määritelty modulissa"
 
-#: elf32-bfin.c:2834
+#: elf32-bfin.c:2818
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC viittaa dynaamiseen symboliin, jossa on ei-nolla-yhteenlaskettava"
 
-#: elf32-bfin.c:2875 elf32-bfin.c:2998
+#: elf32-bfin.c:2859 elf32-bfin.c:2982 elf32-frv.c:3638 elf32-frv.c:3759
 msgid "cannot emit fixups in read-only section"
 msgstr "ei voi lähettää korjauksia kirjoitussuojattuun lohkoon"
 
-#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021
+#: elf32-bfin.c:2890 elf32-bfin.c:3020 elf32-frv.c:3669 elf32-frv.c:3803
+#: elf32-lm32.c:1103 elf32-sh.c:5021
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr "ei voi lähettää dynaamisia sijoituksia kirjoitussuojattussa lohkossa"
 
-#: elf32-bfin.c:2956
+#: elf32-bfin.c:2940
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC_VALUE viittaa dynaamiseen symboliin, jossa on ei-nolla-yhteenlaskettava"
 
-#: elf32-bfin.c:3121
+#: elf32-bfin.c:3105
 msgid "relocations between different segments are not supported"
 msgstr "sijoituksia eri segmenttien välillä ei tueta"
 
-#: elf32-bfin.c:3122
+#: elf32-bfin.c:3106
 msgid "warning: relocation references a different segment"
 msgstr "varoitus: sijoitus viittaa eri segmenttiin"
 
-#: elf32-bfin.c:4967
+#: elf32-bfin.c:4957 elf32-frv.c:6406
 msgid "%B: unsupported relocation type %i"
 msgstr "%B: ei-tuettu sijoitustyyppi %i"
 
 #  The FR-V FDPIC ABI: The FDPIC register is used as a base register for accessing the global offset table (GOT) and function descriptors.
 #  Yksi prosessorin rekistereistä on nimetty fdpic-rekisteriksi milloin data- ja tekstilohkot ovat sijoitettavia (eli niiden siirros ei ole vakio).
-#: elf32-bfin.c:5121 elf32-frv.c:6805
+#: elf32-bfin.c:5111 elf32-frv.c:6814
 #, c-format
 msgid "%s: cannot link non-fdpic object file into fdpic executable"
 msgstr "%s: ei voi linkittää objektitiedostoa ilman fdpic-rekisteriä suoritettavaan tiedostoon, joka käyttää fdpic-rekisteriä"
 
-#: elf32-bfin.c:5125 elf32-frv.c:6809
+#: elf32-bfin.c:5115 elf32-frv.c:6818
 #, c-format
 msgid "%s: cannot link fdpic object file into non-fdpic executable"
 msgstr "%s: ei voi linkittää fdpic-rekisteriä käyttävää objektitiedostoa suoritettavaan tiedostoon, joka ei käytä fdpic-rekisteriä"
 
-#: elf32-bfin.c:5279
-#, c-format
-msgid "*** check this relocation %s"
-msgstr "*** tarkista tämä sijoitus %s"
-
 #: elf32-cris.c:1172
 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
 msgstr "%B, lohko %A: ratkaisematon sijoitus %s symbolia �%s� varten"
@@ -1361,15 +1320,15 @@ msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
 msgstr "%B, lohko %A: Ei proseduurilinkitystaulua sijoituksille %s symbolia �%s� varten"
 
 #: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718
-#: elf32-cris.c:1871 elf32-tic6x.c:2660
+#: elf32-cris.c:1871
 msgid "[whose name is lost]"
 msgstr "[jonka nimi on kadonnut]"
 
-#: elf32-cris.c:1361 elf32-tic6x.c:2645
+#: elf32-cris.c:1361
 msgid "%B, section %A: relocation %s with non-zero addend %d against local symbol"
 msgstr "%B, lohko %A: sijoitus %s ei-nolla-yhteenlaskettavalla %d paikallista symbolia varten"
 
-#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653
+#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865
 msgid "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'"
 msgstr "%B, lohko %A: sijoitus %s ei-nolla-yhteenlaskettavalla %d symbolia �%s� varten"
 
@@ -1467,122 +1426,96 @@ msgstr "%B sisältää �CRIS v32�-koodia, ei ole yhteensopiva aiempien objek
 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr "%B ei sisällä �CRIS-v32�-koodia, yhteensopimaton aiempien objektien kanssa"
 
-#: elf32-dlx.c:142
-#, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
-msgstr "BFD-linkitysvirhe: haaralinja (PC rel16) lohkoon (%s) ei ole tuettu"
-
-#: elf32-dlx.c:204
-#, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr "BFD-linkitysvirhe: hyppy (PC rel26) lohkoon (%s) ei ole tuettu"
-
 #: elf32-frv.c:1509 elf32-frv.c:1658
 msgid "relocation requires zero addend"
 msgstr "sijoitus vaatii nolla-yhteenlaskettavan"
 
 #: elf32-frv.c:2888
-msgid "%H: relocation to `%s+%v' may have caused the error above\n"
-msgstr "%H: sijoitus kohteeseen �%s+%v� saattaa olla yläpuolella olevan virheen aiheuttama\n"
-
-#: elf32-frv.c:2902
-msgid "%H: relocation references symbol not defined in the module\n"
-msgstr "%H: sijoitusviitteet-symboli ei ole määritelty modulissa\n"
+msgid "%B(%A+0x%x): relocation to `%s+%x' may have caused the error above"
+msgstr "%B(%A+0x%x): sijoitus kohteeseen �%s+%x� saatta olla yläpuolella olevan virheen aiheuttama"
 
-#: elf32-frv.c:2978
-msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF ei sovelleta kutsukäskyyn\n"
+#: elf32-frv.c:2977
+msgid "R_FRV_GETTLSOFF not applied to a call instruction"
+msgstr "R_FRV_GETTLSOFF ei sovelleta kutsukäskyyn"
 
 #: elf32-frv.c:3019
-msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESC12 ei sovelleta �lddi�-käskyyn\n"
+msgid "R_FRV_GOTTLSDESC12 not applied to an lddi instruction"
+msgstr "R_FRV_GOTTLSDESC12 ei sovelleta �lddi�-käskyyn"
 
 #: elf32-frv.c:3090
-msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCHI ei sovelleta �sethi�-käskyyn\n"
+msgid "R_FRV_GOTTLSDESCHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSDESCHI ei sovelleta �sethi�-käskyyn"
 
 #: elf32-frv.c:3127
-msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCLO ei sovelleta �setlo�- tai �setlos�-käskyyn\n"
+msgid "R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSDESCLO ei sovelleta �setlo�- tai �setlos�-käskyyn"
 
-#: elf32-frv.c:3174
-msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
-msgstr "%H: R_FRV_TLSDESC_RELAX ei sovelleta �ldd�-käskyyn\n"
+#: elf32-frv.c:3175
+msgid "R_FRV_TLSDESC_RELAX not applied to an ldd instruction"
+msgstr "R_FRV_TLSDESC_RELAX ei sovelleta �ldd�-käskyyn"
 
 #  msgid-virhe: calll, eli yksi ällä liikaa
-#: elf32-frv.c:3258
-msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF_RELAX ei sovelleta kutsukäskyyn\n"
-
-#: elf32-frv.c:3312
-msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFF12 ei sovelleta �ldi�-käskyyn\n"
-
-#: elf32-frv.c:3342
-msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFHI ei sovelleta �sethi�-käskyyn\n"
+#: elf32-frv.c:3259
+msgid "R_FRV_GETTLSOFF_RELAX not applied to a calll instruction"
+msgstr "R_FRV_GETTLSOFF_RELAX ei sovelleta kutsukäskyyn"
 
-#: elf32-frv.c:3371
-msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFLO ei sovelleta �setlo�- tai �setlos�-käskyyn\n"
+#: elf32-frv.c:3314
+msgid "R_FRV_GOTTLSOFF12 not applied to an ldi instruction"
+msgstr "R_FRV_GOTTLSOFF12 ei sovelleta �ldi�-käskyyn"
 
-#: elf32-frv.c:3401
-msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
-msgstr "%H: R_FRV_TLSOFF_RELAX ei sovelleta �ld�-käskyyn\n"
+#: elf32-frv.c:3344
+msgid "R_FRV_GOTTLSOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSOFFHI ei sovelleta �sethi�-käskyyn"
 
-#: elf32-frv.c:3446
-msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_TLSMOFFHI ei sovelleta �sethi�-käskyyn\n"
+#: elf32-frv.c:3373
+msgid "R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSOFFLO ei sovelleta �setlo�- tai �setlos�-käskyyn"
 
-#: elf32-frv.c:3473
-msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "R_FRV_TLSMOFFLO ei sovelleta �setlo�- tai �setlos�-käskyyn\n"
+#: elf32-frv.c:3404
+msgid "R_FRV_TLSOFF_RELAX not applied to an ld instruction"
+msgstr "R_FRV_TLSOFF_RELAX ei sovelleta �ld�-käskyyn"
 
-#: elf32-frv.c:3594
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC viittaa dynaamiseen symboliin ei-nolla-yhteenlaskettavalla\n"
+#: elf32-frv.c:3449
+msgid "R_FRV_TLSMOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_TLSMOFFHI ei sovelleta �sethi�-käskyyn"
 
-#: elf32-frv.c:3635 elf32-frv.c:3757
-msgid "%H: cannot emit fixups in read-only section\n"
-msgstr "%H: ei voi lähettää korjauksia kirjoitussuojattuun lohkoon\n"
+#: elf32-frv.c:3476
+msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_TLSMOFFLO ei sovelleta �setlo�- tai �setlos�-käskyyn"
 
-#: elf32-frv.c:3666 elf32-frv.c:3800
-msgid "%H: cannot emit dynamic relocations in read-only section\n"
-msgstr "%H: ei voi lähettää dynaamisia sijoituksia kirjoitussuojattussa lohkossa\n"
+#: elf32-frv.c:3597
+msgid "R_FRV_FUNCDESC references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC viittaa dynaamiseen symboliin ei-nolla-yhteenlaskettavalla"
 
-#: elf32-frv.c:3715
-msgid "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC_VALUE viittaa dynaamiseen symboliin ei-nolla-yhteenlaskettavalla\n"
+#: elf32-frv.c:3717
+msgid "R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC_VALUE viittaa dynaamiseen symboliin ei-nolla-yhteenlaskettavalla"
 
-#: elf32-frv.c:3971
-msgid "%H: reloc against `%s' references a different segment\n"
-msgstr "%H: sijoitus kohteeseen �%s� viittaa eri segmenttiin\n"
+#: elf32-frv.c:3974 elf32-frv.c:4130
+msgid "%B(%A+0x%lx): reloc against `%s': %s"
+msgstr "%B(%A+0x%lx): reloc-tietue �%s�: %s varten"
 
-#: elf32-frv.c:4121
-msgid "%H: reloc against `%s': %s\n"
-msgstr "%H: reloc-tietue �%s�: %s varten\n"
+#: elf32-frv.c:3976 elf32-frv.c:3980
+msgid "relocation references a different segment"
+msgstr "sijoitus viittaa eri segmenttiin"
 
-#: elf32-frv.c:6397
-msgid "%B: unsupported relocation type %i\n"
-msgstr "%B: ei-tuettu sijoitustyyppi %i\n"
-
-#: elf32-frv.c:6719
+#: elf32-frv.c:6728
 #, c-format
 msgid "%s: compiled with %s and linked with modules that use non-pic relocations"
 msgstr "%s: käännetty %s:n kanssa ja linkitetty paikkariippuvaisia koodisijoituksia käyttävien modulien kanssa"
 
-#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807
+#: elf32-frv.c:6781 elf32-iq2000.c:845 elf32-m32c.c:807
 #, c-format
 msgid "%s: compiled with %s and linked with modules compiled with %s"
 msgstr "%s: käännetty %s:n kanssa ja linkitetty moduleihin, jotka on käännetty %s:n kanssa"
 
-#: elf32-frv.c:6784
+#: elf32-frv.c:6793
 #, c-format
 msgid "%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%s: käyttää erilaisia tuntemattomia �e_flags (0x%lx)�-kenttiä kuin edelliset modulit (0x%lx)"
 
-#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
-#: elf32-rx.c:2937
+#: elf32-frv.c:6843 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
+#: elf32-rx.c:2925
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr "yksityiset liput = 0x%lx:"
@@ -1616,72 +1549,72 @@ msgid ".got section not immediately after .plt section"
 msgstr "�.got�-alilohko ei ole välittömästi �.plt�-lohkon jälkeen"
 
 #. Unknown relocation.
-#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379
-#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243
+#: elf32-i386.c:371 elf32-m68k.c:383 elf32-ppc.c:1674 elf32-s390.c:379
+#: elf32-tic6x.c:1563 elf64-ppc.c:2284 elf64-s390.c:403 elf64-x86-64.c:234
 msgid "%B: invalid relocation type %d"
 msgstr "%B: virheellinen sijoitustyyppi %d"
 
-#: elf32-i386.c:1266 elf64-x86-64.c:1116
+#: elf32-i386.c:1265 elf64-x86-64.c:1049
 msgid "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed"
 msgstr "%B: TLS-siirros kohteesta %s kohteeseen %s kohdetta �%s� varten osoitteessa 0x%lx lohkossa �%A� epäonnistui"
 
-#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909
-#: elfxx-sparc.c:3077
+#: elf32-i386.c:1408 elf32-i386.c:3068 elf64-x86-64.c:1194 elf64-x86-64.c:2780
+#: elfxx-sparc.c:3076
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
-msgstr "%B: sijoitusta %s kohteen STT_GNU_IFUNC-symbolia �%s� varten ei käsittele %s"
+msgstr "%B: sijoitusta %s kohteen STT_GNU_IFUNC-symbolia `%s' varten ei käsittele %s"
 
-#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
+#: elf32-i386.c:1570 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
 #: elf64-s390.c:1151 elfxx-sparc.c:1547
 msgid "%B: `%s' accessed both as normal and thread local symbol"
 msgstr "%B: �%s� haettu sekä normaalina että säikeisenä paikallissymbolina"
 
-#: elf32-i386.c:2405 elf64-x86-64.c:2320
-msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"
-msgstr "%P: %B: varoitus: sijoitus �%s� varten kirjoitussuojatussa lohkossa �%A�.\n"
-
-#: elf32-i386.c:2496 elf64-x86-64.c:2407
-msgid "%P: %B: warning: relocation in readonly section `%A'.\n"
-msgstr "%P: %B: varoitus: sijoitus kirjoitussuojatussa lohkossa �%A�.\n"
-
-#: elf32-i386.c:2932
+#: elf32-i386.c:2910
 msgid "%B: unrecognized relocation (0x%x) in section `%A'"
 msgstr "%B: tunnistamaton sijoitus (0x%x) lohkossa �%A�"
 
-#: elf32-i386.c:3339 elf64-x86-64.c:3295
+#: elf32-i386.c:3317 elf64-x86-64.c:3174
 msgid "hidden symbol"
 msgstr "piilotettu symboli"
 
-#: elf32-i386.c:3342 elf64-x86-64.c:3298
+#: elf32-i386.c:3320 elf64-x86-64.c:3177
 msgid "internal symbol"
 msgstr "sisäinen symboli"
 
-#: elf32-i386.c:3345 elf64-x86-64.c:3301
+#: elf32-i386.c:3323 elf64-x86-64.c:3180
 msgid "protected symbol"
 msgstr "suojattu symboli"
 
-#: elf32-i386.c:3348 elf64-x86-64.c:3304
+#: elf32-i386.c:3326 elf64-x86-64.c:3183
 msgid "symbol"
 msgstr "symboli"
 
-#: elf32-i386.c:3353
+#: elf32-i386.c:3331
 msgid "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"
 msgstr "%B: R_386_GOTOFF-sijoitusta määrittelemätöntä %s �%s� varten ei voida käyttää kun tehdään jaettua objektia"
 
-#: elf32-i386.c:3363
+#: elf32-i386.c:3341
 msgid "%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"
 msgstr "%B: R_386_GOTOFF-sijoitusta suojattua funktiota �%s� varten ei voida käyttää kun tehdään jaettua objektia"
 
-#: elf32-i386.c:4660 elf64-x86-64.c:4378
+#: elf32-i386.c:4633 elf64-x86-64.c:4206
 #, c-format
 msgid "discarded output section: `%A'"
 msgstr "hylätty tulostelohko: �%A�"
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
 #: elf32-ip2k.c:857 elf32-ip2k.c:863 elf32-ip2k.c:930 elf32-ip2k.c:936
 msgid "ip2k relaxer: switch table without complete matching relocation information."
 msgstr "ip2k-avartaja: kytkintaulu ilman täydellisesti täsmääviä sijoitustietoja."
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
 #: elf32-ip2k.c:880 elf32-ip2k.c:963
 msgid "ip2k relaxer: switch table header corrupt."
 msgstr "ip2k-avartaja: kytkintauluotsake rikkinäinen."
@@ -1778,7 +1711,7 @@ msgstr "%B: linkitystiedostot käännetty 32-bittiselle double-liukuluvulle (-fs
 msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
 msgstr "%B: linkitystiedostot käännetty HCS12:lle, muut käännetty HC12:lle"
 
-#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719
+#: elf32-m68hc1x.c:1257 elf32-ppc.c:4232 elf64-sparc.c:703 elfxx-mips.c:12704
 msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%B: käyttää eri �e_flags (0x%lx)�-kenttiä kuin edelliset modulit (0x%lx)"
 
@@ -1827,7 +1760,7 @@ msgstr " [muisti=muistilohkomalli]"
 msgid " [memory=flat]"
 msgstr " [muisti=litteä]"
 
-#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326
+#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7292 vms-alpha.c:7307
 msgid "unknown"
 msgstr "tuntematon"
 
@@ -1851,26 +1784,15 @@ msgstr "%B: Sijoitusta %s (%d) ei tällä hetkellä tueta.\n"
 msgid "%B: Unknown relocation type %d\n"
 msgstr "%B: Tuntematon sijoitustyyppi %d\n"
 
-#. Pacify gcc -Wall.
-#: elf32-mep.c:157
-#, c-format
-msgid "mep: no reloc for code %d"
-msgstr "mep: ei reloc-tietuetta koodille %d"
-
-#: elf32-mep.c:163
-#, c-format
-msgid "MeP: howto %d has type %d"
-msgstr "MeP: kuinka tehdä -kohteella %d on tyyppi %d"
-
-#: elf32-mep.c:648
+#: elf32-mep.c:647
 msgid "%B and %B are for different cores"
 msgstr "%B ja %B ovat eri käyttöjärjestelmäytimille"
 
-#: elf32-mep.c:665
+#: elf32-mep.c:664
 msgid "%B and %B are for different configurations"
 msgstr "%B ja %B ovat eri konfiguraatioille"
 
-#: elf32-mep.c:702
+#: elf32-mep.c:701
 #, c-format
 msgid "private flags = 0x%lx"
 msgstr "yksityiset liput = 0x%lx"
@@ -1885,11 +1807,11 @@ msgstr "%s: tuntematon sijoitustyyppi %d"
 msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
 msgstr "%s: Kohteen (%s) sijoitus %s on väärässä lohkossa (%s)"
 
-#: elf32-microblaze.c:1155 elfxx-sparc.c:3451
+#: elf32-microblaze.c:1155 elfxx-sparc.c:3450
 msgid "%B: probably compiled without -fPIC?"
 msgstr "%B: luultavasti käännetty ilman -fPIC-argumenttia?"
 
-#: elf32-microblaze.c:2074
+#: elf32-microblaze.c:2074 elflink.c:12601
 msgid "%B: bad relocation section name `%s'"
 msgstr "%B: virheellinen sijoituslohkonimi �%s�"
 
@@ -1902,177 +1824,160 @@ msgstr "literaali sijoitus tapahtuu ulkoiselle symbolille"
 msgid "32bits gp relative relocation occurs for an external symbol"
 msgstr "32-bittinen yleisosoitinsuhteellinen sijoitus tapahtuu ulkoiselle symbolille"
 
-#: elf32-ppc.c:1740
+#: elf32-ppc.c:1739
 #, c-format
 msgid "generic linker can't handle %s"
 msgstr "geneerinen linkkeri ei voi käsitellä kohdetta %s"
 
-#: elf32-ppc.c:2183
+#: elf32-ppc.c:2180
 msgid "corrupt %s section in %B"
 msgstr "rikkinäinen %s-lohko kohteessa %B"
 
-#: elf32-ppc.c:2202
+#: elf32-ppc.c:2199
 msgid "unable to read in %s section from %B"
 msgstr "ei voi lukea %s-lohkoon kohteesta %B"
 
-#: elf32-ppc.c:2243
+#: elf32-ppc.c:2240
 msgid "warning: unable to set size of %s section in %B"
 msgstr "varoitus: ei voi asettaa %s-lohkon kokoa kohteessa %B"
 
-#: elf32-ppc.c:2293
+#: elf32-ppc.c:2290
 msgid "failed to allocate space for new APUinfo section."
 msgstr "ei onnistuttu varaamaan muistitilaa uudelle APUinfo-lohkolle."
 
-#: elf32-ppc.c:2312
+#: elf32-ppc.c:2309
 msgid "failed to compute new APUinfo section."
 msgstr "ei onnistuttu laskemaan uutta APUinfo-lohkoa"
 
-#: elf32-ppc.c:2315
+#: elf32-ppc.c:2312
 msgid "failed to install new APUinfo section."
 msgstr "ei onnistuttu asentamaan uutta APUinfo-lohkoa"
 
-#: elf32-ppc.c:3343
+#: elf32-ppc.c:3358
 msgid "%B: relocation %s cannot be used when making a shared object"
 msgstr "%B: sijoitusta %s ei voi käyttää kun tehdään jaettua objektia"
 
 #. It does not make sense to have a procedure linkage
 #. table entry for a local symbol.
-#: elf32-ppc.c:3687
-msgid "%H: %s reloc against local symbol\n"
-msgstr "%H: %s reloc-tietue paikallista symbolia varten\n"
+#: elf32-ppc.c:3702
+msgid "%B(%A+0x%lx): %s reloc against local symbol"
+msgstr "%B(%A+0x%lx): %s reloc-tietue paikallista symbolia varten"
 
 #  Otaksun tässä että hard float tarkoittaa tässä muistipaikkaa (esim. rekisteriä), joka on varattu float-tyyppisille liukuluvuille
-#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449
-#: elfxx-mips.c:12471 elfxx-mips.c:12497
+#: elf32-ppc.c:4044 elf32-ppc.c:4059 elfxx-mips.c:12411 elfxx-mips.c:12437
+#: elfxx-mips.c:12459 elfxx-mips.c:12485
 msgid "Warning: %B uses hard float, %B uses soft float"
 msgstr "Varoitus: %B käyttää laitteistoliukulukua, %B käyttää ohjelmistoliukulukua"
 
 #  Otaksun tässä että hard float tarkoittaa tässä muistipaikkaa (esim. rekisteriä), joka on varattu float-tyyppisille liukuluvuille
-#: elf32-ppc.c:4029 elf32-ppc.c:4033
+#: elf32-ppc.c:4047 elf32-ppc.c:4051
 msgid "Warning: %B uses double-precision hard float, %B uses single-precision hard float"
 msgstr "Varoitus: %B käyttää kaksoistarkkuuden laitteistoliukulukua, %B käyttää yksittäistarkkuuden laitteistoliukulukua"
 
 #  Otaksun tässä että hard float tarkoittaa tässä muistipaikkaa (esim. rekisteriä), joka on varattu float-tyyppisille liukuluvuille
-#: elf32-ppc.c:4037
+#: elf32-ppc.c:4055
 msgid "Warning: %B uses soft float, %B uses single-precision hard float"
 msgstr "Varoitus: %B käyttää ohjelmistoliukulukua, %B käyttää yksittäistarkkuuden laitteistoliukulukua"
 
-#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407
+#: elf32-ppc.c:4062 elf32-ppc.c:4066 elfxx-mips.c:12391 elfxx-mips.c:12395
 msgid "Warning: %B uses unknown floating point ABI %d"
 msgstr "Varoitus: %B käyttää tuntematonta liukuluku-ABI:a %d"
 
-#: elf32-ppc.c:4090 elf32-ppc.c:4094
+#: elf32-ppc.c:4108 elf32-ppc.c:4112
 msgid "Warning: %B uses unknown vector ABI %d"
 msgstr "Varoitus: %B käyttää tuntematonta vektori-ABI:a %d"
 
-#: elf32-ppc.c:4098
+#: elf32-ppc.c:4116
 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\""
 msgstr "Varoitus: %B käyttää vektori-ABI:a �%s�, %B käyttää �%s�"
 
-#: elf32-ppc.c:4115 elf32-ppc.c:4118
+#: elf32-ppc.c:4133 elf32-ppc.c:4136
 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
 msgstr "Varoitus: %B käyttää r3/r4 pienille rakennepaluille, %B käyttää muistia"
 
-#: elf32-ppc.c:4121 elf32-ppc.c:4125
+#: elf32-ppc.c:4139 elf32-ppc.c:4143
 msgid "Warning: %B uses unknown small structure return convention %d"
 msgstr "Varoitus: %B käyttää tuntematonta pientä rakennepaluusopimusta  %d"
 
-#: elf32-ppc.c:4179
+#: elf32-ppc.c:4197
 msgid "%B: compiled with -mrelocatable and linked with modules compiled normally"
 msgstr "%B: käännetty �-mrelocatable�-argumentilla ja linkitetty tavallisesti käännetyillä moduleilla"
 
-#: elf32-ppc.c:4187
+#: elf32-ppc.c:4205
 msgid "%B: compiled normally and linked with modules compiled with -mrelocatable"
 msgstr "%B: käännetty tavallisesti ja linkitetty moduleilla, jotka on käännetty �-mrelocatable�-argumentilla"
 
-#: elf32-ppc.c:4275
+#: elf32-ppc.c:4293
 msgid "Using bss-plt due to %B"
 msgstr "Käytetään bss-plt-argumenttia %B:n vuoksi"
 
-#. Uh oh, we didn't find the expected call.  We
-#. could just mark this symbol to exclude it
-#. from tls optimization but it's safer to skip
-#. the entire optimization.
-#: elf32-ppc.c:4771 elf64-ppc.c:7778
-msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
-msgstr "%H argumentti lost __tls_get_addr, TLS otimointi otettu pois käytöstä\n"
-
-#: elf32-ppc.c:5006 elf64-ppc.c:6494
-#, c-format
-msgid "dynamic variable `%s' is zero size\n"
-msgstr "dynaaminen muuttuja �%s� on nollakokoinen\n"
-
-#: elf32-ppc.c:7204 elf64-ppc.c:12431
-msgid "%B: unknown relocation type %d for symbol %s\n"
-msgstr "%B: tuntematon sijoitustyyppi %d symbolille %s\n"
-
-#: elf32-ppc.c:7465
-msgid "%H: non-zero addend on %s reloc against `%s'\n"
-msgstr "%H: ei-nolla-yhteenlaskettava %s reloc-tietueessa symbolia �%s� varten\n"
+#: elf32-ppc.c:7192 elf64-ppc.c:12307
+msgid "%B: unknown relocation type %d for symbol %s"
+msgstr "%B: tuntematon sijoitustyyppi %d symbolille %s"
 
-#: elf32-ppc.c:7661 elf64-ppc.c:12936
-msgid "%H: relocation %s for indirect function %s unsupported\n"
-msgstr "%H: sijoitusta %s epäsuoralle funktiolle %s ei tueta\n"
+#: elf32-ppc.c:7453
+msgid "%B(%A+0x%lx): non-zero addend on %s reloc against `%s'"
+msgstr "%B(%A+0x%lx): ei-nolla-yhteenlaskettava %s reloc-tietueessa symbolia �%s� varten"
 
-#: elf32-ppc.c:7889 elf32-ppc.c:7919 elf32-ppc.c:7966
-msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)\n"
-msgstr "%B: kohde (%s) sijoituksessa %s on väärässä tulostelohkossa (%s)\n"
+#: elf32-ppc.c:7651 elf64-ppc.c:12812
+msgid "%B(%A+0x%lx): relocation %s for indirect function %s unsupported"
+msgstr "%B(%A+0x%lx): sijoitusta %s epäsuoralle funktiolle %s ei tueta"
 
-#: elf32-ppc.c:8038
-msgid "%B: relocation %s is not yet supported for symbol %s\n"
-msgstr "%B: sijoitus %s ei ole vielä tuettu symbolille %s.\n"
+#: elf32-ppc.c:7881 elf32-ppc.c:7911 elf32-ppc.c:7958
+msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)"
+msgstr "%B: kohde (%s) sijoituksessa %s on väärässä tulostelohkossa (%s)"
 
-#: elf32-ppc.c:8097 elf64-ppc.c:13237
-msgid "%H: unresolvable %s relocation against symbol `%s'\n"
-msgstr "%H: ratkaisematon %s sijoitus symbolia �%s� varten\n"
+#: elf32-ppc.c:8030
+msgid "%B: relocation %s is not yet supported for symbol %s."
+msgstr "%B: sijoitus %s ei ole vielä tuettu symbolille %s."
 
-#: elf32-ppc.c:8144 elf64-ppc.c:13282
-msgid "%H: %s reloc against `%s': error %d\n"
-msgstr "%H: %s reloc-tietuetta �%s� varten: virhe %d\n"
+#: elf32-ppc.c:8138 elf64-ppc.c:13162
+msgid "%B(%A+0x%lx): %s reloc against `%s': error %d"
+msgstr "%B(%A+0x%lx): %s reloc-tietuetta �%s� varten: virhe %d"
 
-#: elf32-ppc.c:8635
+#: elf32-ppc.c:8629
 #, c-format
-msgid "%s not defined in linker created %s\n"
-msgstr "%s ei ole määritelty linkkerissä luodussa %s\n"
+msgid "%s not defined in linker created %s"
+msgstr "%s ei ole määritelty linkkerissä luodussa %s"
 
-#: elf32-rx.c:553
+#: elf32-rx.c:544
 msgid "%B:%A: Warning: deprecated Red Hat reloc "
 msgstr "%B:%A: Varoitus: vanhentunut Red Hat reloc -tietue "
 
-#: elf32-rx.c:1095
+#: elf32-rx.c:1086
 msgid "Warning: RX_SYM reloc with an unknown symbol"
 msgstr "Varoitus: RX_SYM-reloc tuntemattomalla symbolilla"
 
-#: elf32-rx.c:1260
+#: elf32-rx.c:1251
 msgid "%B(%A): error: call to undefined function '%s'"
-msgstr "%B(%A): virhe: kutsu määrittelemättömään funktioon ’%s’"
+msgstr "%B(%A): virhe: kutsu määrittelemättömään funktioon '%s'"
 
-#: elf32-rx.c:1274
+#: elf32-rx.c:1265
 msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
 msgstr "%B(%A): varoitus: tasaamaton pääsy symboliin ’%s’ pienellä data-alueella"
 
-#: elf32-rx.c:1278
+#: elf32-rx.c:1269
 msgid "%B(%A): internal error: out of range error"
 msgstr "%B(%A): sisäinen virhe: �lukualueen ulkopuolella�-virhe"
 
-#: elf32-rx.c:1282
+#: elf32-rx.c:1273
 msgid "%B(%A): internal error: unsupported relocation error"
 msgstr "%B(%A): sisäinen virhe: ei-tuettu sijoitusvirhe"
 
-#: elf32-rx.c:1286
+#: elf32-rx.c:1277
 msgid "%B(%A): internal error: dangerous relocation"
 msgstr "%B(%A): sisäinen virhe: vaarallinen sijoitus"
 
-#: elf32-rx.c:1290
+#: elf32-rx.c:1281
 msgid "%B(%A): internal error: unknown error"
 msgstr "%B(%A): sisäinen virhe: tuntematon virhe"
 
-#: elf32-rx.c:2940
+#: elf32-rx.c:2928
 #, c-format
 msgid " [64-bit doubles]"
 msgstr " [64-bittiset double-liukuluvut]"
 
-#: elf32-rx.c:2942
+#: elf32-rx.c:2930
 #, c-format
 msgid " [dsp]"
 msgstr " [paikkariippumaton koodi]"
@@ -2081,7 +1986,7 @@ msgstr " [paikkariippumaton koodi]"
 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s"
 msgstr "%B(%A+0x%lx): virheellinen käsky TLS-sijoitukselle %s"
 
-#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324
+#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3323
 msgid "not enough GOT space for local GOT entries"
 msgstr "ei tarpeeksi yleissiirrostaulutilaa paikallisille yleissiirrostaulutulokohdille"
 
@@ -2120,7 +2025,7 @@ msgstr "%B: �IMPORT AS�-direktiivi kohteelle %s kätkee edellisen �IMPORT
 msgid "%B: Unrecognised .directive command: %s"
 msgstr "%B: Tunnistamaton �.directive�-komento: %s"
 
-#: elf32-sh-symbian.c:504
+#: elf32-sh-symbian.c:503
 msgid "%B: Failed to add renamed symbol %s"
 msgstr "%B: Ei onnistuttu lisäämään uudelleennimettyä symbolia %s"
 
@@ -2152,7 +2057,11 @@ msgstr "%B: 0x%lx: varoitus: ei voitu löytää odotettua �COUNT reloc�-tiet
 msgid "%B: 0x%lx: warning: bad count"
 msgstr "%B: 0x%lx: varoitus: virheellinen lukumäärä"
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
 #: elf32-sh.c:1179 elf32-sh.c:1549
 msgid "%B: 0x%lx: fatal: reloc overflow while relaxing"
 msgstr "%B: 0x%lx: vakava: reloc-tietue ylivuoto avartamisen aikana"
@@ -2161,7 +2070,11 @@ msgstr "%B: 0x%lx: vakava: reloc-tietue ylivuoto avartamisen aikana"
 msgid "Unexpected STO_SH5_ISA32 on local symbol is not handled"
 msgstr "Odottamatonta STO_SH5_ISA32 paikallisessa symbolissa ei käsitellä"
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
 #: elf32-sh.c:4304
 msgid "%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"
 msgstr "%B: 0x%lx: vakava: tasaamaton haarautumiskohde avarrustuetulle sijoitukselle"
@@ -2208,7 +2121,7 @@ msgstr "%B: �%s� haettu sekä FDPIC-symbolina että säikeisenä paikallissy
 msgid "%B: Function descriptor relocation with non-zero addend"
 msgstr "%B: Funktiokuvaajasijoitus nollasta poikeavalla yhteenlaskettavalla"
 
-#: elf32-sh.c:6629 elf64-alpha.c:4648
+#: elf32-sh.c:6629 elf64-alpha.c:4560
 msgid "%B: TLS local exec code cannot be linked into shared objects"
 msgstr "%B: TLS-tyyppistä paikallista suoritettavaa koodia ei voida linkittää jaettuihin objekteihin"
 
@@ -2310,7 +2223,7 @@ msgstr "%s päällyslohkossa"
 msgid "overlay stub relocation overflow"
 msgstr "päällys-stub-sijoitusylivuoto"
 
-#: elf32-spu.c:1960
+#: elf32-spu.c:1960 elf64-ppc.c:11327
 msgid "stubs don't match calculated size"
 msgstr "stubit ei täsmää lasketun koon kanssa"
 
@@ -2401,54 +2314,52 @@ msgstr "vakava virhe kun luodaan .fixup"
 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"
 msgstr "%B(%s+0x%lx): ratkaisematon %s sijoitus symbolia �%s� varten"
 
-#: elf32-tic6x.c:1602
-msgid "warning: generating a shared library containing non-PIC code"
-msgstr "varoitus: tuotetaan jaettu kirjasto, joka sisältää ei-PIC-koodia"
-
-#: elf32-tic6x.c:1607
-msgid "warning: generating a shared library containing non-PID code"
-msgstr "varoitus: tuotetaan jaettu kirjasto, joka sisältää ei-PID-koodia"
-
-#: elf32-tic6x.c:2539
+#: elf32-tic6x.c:1539
 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
 msgstr "%B: SB-suhteellinen sijoitus, mutta __c6xabi_DSBT_BASE ei ole määritelty"
 
-#: elf32-tic6x.c:2759
+#. Shared libraries and exception handling support not
+#. implemented.
+#: elf32-tic6x.c:1554
+msgid "%B: relocation type %d not implemented"
+msgstr "%B: sijoitustyyppiä %d ei ole toteutettu"
+
+#: elf32-tic6x.c:1640
 msgid "dangerous relocation"
 msgstr "vaarallinen sijoitus"
 
-#: elf32-tic6x.c:3740
-msgid "%B: error: unknown mandatory EABI object attribute %d"
-msgstr "%B: virhe: tuntematon pakollinen EABI-objektiattribuutti %d"
-
-#: elf32-tic6x.c:3748
-msgid "%B: warning: unknown EABI object attribute %d"
-msgstr "%B: varoitus: tuntematon EABI-objektiattribuutti %d"
-
-#: elf32-tic6x.c:3860 elf32-tic6x.c:3868
+#: elf32-tic6x.c:1788 elf32-tic6x.c:1796
 msgid "error: %B requires more stack alignment than %B preserves"
 msgstr "virhe: %B vaatii enemmän pinotasausta kuin %B säilyttää"
 
-#: elf32-tic6x.c:3878 elf32-tic6x.c:3887
+#: elf32-tic6x.c:1806 elf32-tic6x.c:1815
 msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
 msgstr "virhe: tuntematon Tag_ABI_array_object_alignment-arvo kohteessa %B"
 
-#: elf32-tic6x.c:3896 elf32-tic6x.c:3905
+#: elf32-tic6x.c:1824 elf32-tic6x.c:1833
 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
 msgstr "virhe: tuntematon Tag_ABI_array_object_align_expected-arvo kohteessa %B"
 
-#: elf32-tic6x.c:3913 elf32-tic6x.c:3920
+#: elf32-tic6x.c:1841 elf32-tic6x.c:1848
 msgid "error: %B requires more array alignment than %B preserves"
 msgstr "virhe: %B vaatii enemmän taulukkotasausta kuin %B säilyttää"
 
-#: elf32-tic6x.c:3942
+#: elf32-tic6x.c:1870
 msgid "warning: %B and %B differ in wchar_t size"
 msgstr "varoitus: %B ja %B eroavat wchar_t size-koossa"
 
-#: elf32-tic6x.c:3960
+#: elf32-tic6x.c:1888
 msgid "warning: %B and %B differ in whether code is compiled for DSBT"
 msgstr "varoitus: %B ja %B eroavat siinä, että koodi on käännetty kohteelle DSBT"
 
+#: elf32-tic6x.c:1898
+msgid "warning: %B and %B differ in position-dependence of data addressing"
+msgstr "varoitus: %B ja %B eroavat siinä, että datan osoitteet ovat paikkariippuvaisia"
+
+#: elf32-tic6x.c:1908
+msgid "warning: %B and %B differ in position-dependence of code addressing"
+msgstr "varoitus: %B ja %B eroavat siinä, että koodin osoitteet ovat paikkariippuvaisia"
+
 #  small data region on sama kuin .scommon data region
 #: elf32-v850.c:173
 #, c-format
@@ -2477,8 +2388,9 @@ msgid "Variable `%s' cannot be in both zero and tiny data regions simultaneously
 msgstr "Muuttuja �%s� ei voi olla sekä �zero�- että �tiny�-data-alueissa samanaikaisesti"
 
 #: elf32-v850.c:483
-msgid "FAILED to find previous HI16 reloc"
-msgstr "EI ONNISTUTTU löytämään edellistä HI16 reloc-tietuetta"
+#, c-format
+msgid "FAILED to find previous HI16 reloc\n"
+msgstr "EI ONNISTUTTU löytämään edellistä HI16 reloc-tietuetta\n"
 
 #: elf32-v850.c:2155
 msgid "could not locate special linker symbol __gp"
@@ -2562,7 +2474,7 @@ msgstr "%s: varoitus: %s sijoitus symbolia �%s� varten %s-lohkosta"
 msgid "%s: warning: %s relocation to 0x%x from %s section"
 msgstr "%s: varoitus: %s sijoitus kohteeseen 0x%x �%s�-lohkosta"
 
-#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342
+#: elf32-xstormy16.c:451 elf32-ia64.c:2861 elf64-ia64.c:2861
 msgid "non-zero addend in @fptr reloc"
 msgstr "ei-nolla-yhteenlaskettava �@fptr reloc�-tietueessa"
 
@@ -2606,7 +2518,11 @@ msgstr "%B(%A+0x%lx): ei voitu avata käskyä XTENSA_ASM_SIMPLIFY-sijoitukselle;
 msgid "invalid relocation address"
 msgstr "virheellinen sijoitusosoite"
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
 #: elf32-xtensa.c:9073
 msgid "overflow after relaxation"
 msgstr "ylivuoto avartamisen jälkeen"
@@ -2619,56 +2535,60 @@ msgstr "%B(%A+0x%lx): odottamaton korjaus %s-sijoitukselle"
 msgid "GPDISP relocation did not find ldah and lda instructions"
 msgstr "GPDISP-sijoitus ei löytänyt �ldah�- ja �lda�-käskyjä"
 
-#: elf64-alpha.c:2495
+#: elf64-alpha.c:2408
 msgid "%B: .got subsegment exceeds 64K (size %d)"
 msgstr "%B: �.got�-alisegmentti ylittää 64 kilotavun rajan (koko %d)"
 
-#: elf64-alpha.c:4392 elf64-alpha.c:4404
+#: elf64-alpha.c:4304 elf64-alpha.c:4316
 msgid "%B: gp-relative relocation against dynamic symbol %s"
 msgstr "%B: yleisosoitinsuhteellinen sijoitus dynaamista symbolia %s varten"
 
-#: elf64-alpha.c:4430 elf64-alpha.c:4565
+#: elf64-alpha.c:4342 elf64-alpha.c:4477
 msgid "%B: pc-relative relocation against dynamic symbol %s"
 msgstr "%B: ohjelmalaskurisuhteellinen sijoitus dynaamista symbolia %s varten"
 
-#: elf64-alpha.c:4458
+#: elf64-alpha.c:4370
 msgid "%B: change in gp: BRSGP %s"
 msgstr "%B: vaihto yleisosoittimessa: BRSGP %s"
 
-#: elf64-alpha.c:4483
+#: elf64-alpha.c:4395
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: elf64-alpha.c:4488
+#: elf64-alpha.c:4400
 msgid "%B: !samegp reloc against symbol without .prologue: %s"
 msgstr "%B: �!samegp reloc�-tietue symbolia varten ilman �.prologue�-lohkoa: %s"
 
-#: elf64-alpha.c:4540
+#: elf64-alpha.c:4452
 msgid "%B: unhandled dynamic relocation against %s"
 msgstr "%B: käsittelemätön dynaaminen sijoitus %s:ta varten"
 
-#: elf64-alpha.c:4572
+#: elf64-alpha.c:4484
 msgid "%B: pc-relative relocation against undefined weak symbol %s"
 msgstr "%B: ohjelmalaskurisuhteellinen sijoitus määrittelemätöntä heikkoa symbolia %s varten"
 
-#: elf64-alpha.c:4632
+#: elf64-alpha.c:4544
 msgid "%B: dtp-relative relocation against dynamic symbol %s"
 msgstr "%B: dtp-suhteellinen sijoitus dynaamista symbolia %s varten"
 
-#: elf64-alpha.c:4655
+#: elf64-alpha.c:4567
 msgid "%B: tp-relative relocation against dynamic symbol %s"
 msgstr "%B: tp-suhteellinen sijoitus dynaamista symbolia %s varten"
 
-#: elf64-hppa.c:2094
+#: elf64-hppa.c:2101
 #, c-format
 msgid "stub entry for %s cannot load .plt, dp offset = %ld"
 msgstr "stub-tulokohta kohteelle %s ei voi ladata �.plt�, dp-siirrososoite = %ld"
 
-#: elf64-hppa.c:3292
+#: elf64-hppa.c:3299
 msgid "%B(%A+0x%lx): cannot reach %s"
 msgstr "%B(%A+0x%lx): kohdetta %s ei voi tavoittaa"
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
 #: elf64-mmix.c:1177
 #, c-format
 msgid ""
@@ -2724,84 +2644,67 @@ msgid ""
 "  Please report this bug."
 msgstr ""
 "Sisäinen yhteensopimattomuus: jäljelle jäävä %u != maksimi %u.\n"
-"  Ilmoita ohjelmistovioista (englanniksi) osoitteeseen http://sourceware.org/bugzilla/."
+"  Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen http://sourceware.org/bugzilla/."
 
-#: elf64-ppc.c:2744 libbfd.c:1012
+#: elf64-ppc.c:2741 libbfd.c:997
 msgid "%B: compiled for a big endian system and target is little endian"
 msgstr "%B: käännetty �big endian�-järjestelmälle ja kohde on �little endian�"
 
-#: elf64-ppc.c:2747 libbfd.c:1014
+#: elf64-ppc.c:2744 libbfd.c:999
 msgid "%B: compiled for a little endian system and target is big endian"
 msgstr "%B: käännetty �little endian�-järjestelmälle ja kohde on �big endian�"
 
-#: elf64-ppc.c:4160
-msgid "%B: cannot create stub entry %s\n"
-msgstr "%B: ei voi luoda stub-tulokohtaa %s\n"
-
-#: elf64-ppc.c:6484
+#: elf64-ppc.c:6473
 #, c-format
-msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc\n"
-msgstr "kopio-reloc-tietue �%s�:ta varten vaatii laiskan plt-linkityksen; vältä asettamasta LD_BIND_NOW=1 tai päivitä gcc\n"
+msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc"
+msgstr "kopio-reloc-tietue �%s�:ta varten vaatii laiskan plt-linkityksen; vältä asettamasta LD_BIND_NOW=1 tai päivitä gcc"
 
-#: elf64-ppc.c:6912
-msgid "dynreloc miscount for %B, section %A\n"
-msgstr "dynreloc-väärinlaskenta kohteelle %B, lohko %A\n"
+#: elf64-ppc.c:6901
+msgid "dynreloc miscount for %B, section %A"
+msgstr "dynreloc-väärinlaskenta kohteelle %B, lohko %A"
 
-#: elf64-ppc.c:6996
+#: elf64-ppc.c:6985
 msgid "%B: .opd is not a regular array of opd entries"
 msgstr "%B: �.opd� ei ole säännönmukainen opd-tulokohtien taulukko"
 
-#: elf64-ppc.c:7005
+#: elf64-ppc.c:6994
 msgid "%B: unexpected reloc type %u in .opd section"
 msgstr "%B: odottamaton reloc-tyyppi %u �.opd�-lohkossa"
 
-#: elf64-ppc.c:7026
+#: elf64-ppc.c:7015
 msgid "%B: undefined sym `%s' in .opd section"
 msgstr "%B: määrittelemätön symboli �%s� �.opd�-lohkossa"
 
-#: elf64-ppc.c:7584
-msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
-msgstr "%H __tls_get_addr kadotti argumentin, TLS-optimointi otettu pois käytöstä\n"
-
-#: elf64-ppc.c:7929 elf64-ppc.c:8450
+#: elf64-ppc.c:7877 elf64-ppc.c:8392
 #, c-format
 msgid "%s defined on removed toc entry"
 msgstr "%s määritelty poistetussa sisällysluettelotulokohdassa"
 
-#: elf64-ppc.c:9474
-#, c-format
-msgid "cannot find opd entry toc for %s\n"
-msgstr "ei kyetä löytämään opd-tulokohtasisällysluetteloa kohteelle %s\n"
-
-#: elf64-ppc.c:9556
+#: elf64-ppc.c:9459
 #, c-format
-msgid "long branch stub `%s' offset overflow\n"
-msgstr "pitkä haarautumis-stub �%s� siirrososoitteen ylivuoto\n"
+msgid "long branch stub `%s' offset overflow"
+msgstr "pitkä haarautumis-stub �%s� siirrososoitteen ylivuoto"
 
-#: elf64-ppc.c:9615
+#: elf64-ppc.c:9518
 #, c-format
-msgid "can't find branch stub `%s'\n"
-msgstr "ei löydy haarautumis-stub-kohdetta �%s�\n"
+msgid "can't find branch stub `%s'"
+msgstr "ei löydy haarautumis-stub-kohdetta �%s�"
 
-#: elf64-ppc.c:9677 elf64-ppc.c:9819
+#: elf64-ppc.c:9580 elf64-ppc.c:9716
 #, c-format
-msgid "linkage table error against `%s'\n"
-msgstr "linkitystauluvirhe �%s�:ta varten\n"
+msgid "linkage table error against `%s'"
+msgstr "linkitystauluvirhe �%s�:ta varten"
 
-#: elf64-ppc.c:9993
+#: elf64-ppc.c:9886
 #, c-format
-msgid "can't build branch stub `%s'\n"
-msgstr "ei voi muodostaa haaroitus-stub-kohdetta �%s�\n"
+msgid "can't build branch stub `%s'"
+msgstr "ei voi muodostaa haaroitus-stub-kohdetta �%s�"
 
-#: elf64-ppc.c:10814
+#: elf64-ppc.c:10684
 msgid "%B section %A exceeds stub group size"
 msgstr "%B lohko %A ylittää stub-ryhmäkoon"
 
-#: elf64-ppc.c:11457
-msgid "stubs don't match calculated size\n"
-msgstr "stubit ei täsmää lasketun koon kanssa\n"
-
-#: elf64-ppc.c:11469
+#: elf64-ppc.c:11339
 #, c-format
 msgid ""
 "linker stubs in %u group%s\n"
@@ -2818,95 +2721,82 @@ msgstr ""
 "  pitkä sisältöluettelosäätö %lu\n"
 "  plt-kutsu                  %lu"
 
-#  TLS: transport layer security
-#: elf64-ppc.c:11819
-msgid "%H: %s used with TLS symbol %s\n"
-msgstr "%H: %s käytetään TLS-symbolin %s kanssa\n"
-
-#: elf64-ppc.c:11820
-msgid "%H: %s used with non-TLS symbol %s\n"
-msgstr "%H: %s käytetään ei-TLS-symbolin %s kanssa\n"
-
-#: elf64-ppc.c:12318
-msgid "%H: automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc\n"
-msgstr "%H: automaattisia useita sisältöluettelotauluja ei ole tuettu crt-tiedostoissasi; käännä uudelleen �-mminimal-toc�-argumentilla tai päivitä gcc\n"
+#: elf64-ppc.c:12190
+msgid "%B(%A+0x%lx): automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc"
+msgstr "%B(%A+0x%lx): automaattisia useita sisältöluettelotauluja ei ole tuettu crt-tiedostoissasi; käännä uudelleen �-mminimal-toc�-argumentilla tai päivitä gcc"
 
-#: elf64-ppc.c:12324
-msgid "%H: sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern\n"
-msgstr "%H: sisarruskutsuoptimointi kohteeseen �%s� ei salli automaattisia useita sisällysluettelotauluja; käännä uudelleen �-mminimal-toc�-argumentilla tai �-fno-optimize-sibling-calls�-argumentilla, tai tee kohteesta �%s� ulkoinen\n"
+#: elf64-ppc.c:12198
+msgid "%B(%A+0x%lx): sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern"
+msgstr "%B(%A+0x%lx): sisarruskutsuoptimointi kohteeseen �%s� ei salli automaattisia useita sisällysluettelotauluja; käännä uudelleen �-mminimal-toc�-argumentilla tai �-fno-optimize-sibling-calls�-argumentilla, tai tee kohteesta �%s� ulkoinen"
 
-#: elf64-ppc.c:13041
-msgid "%B: relocation %s is not supported for symbol %s\n"
-msgstr "%B: sijoitus %s ei ole tuettu symbolille %s.\n"
+#: elf64-ppc.c:12919
+msgid "%B: relocation %s is not supported for symbol %s."
+msgstr "%B: sijoitus %s ei ole tuettu symbolille %s."
 
-#: elf64-ppc.c:13218
-msgid "%H: error: %s not a multiple of %u\n"
-msgstr "%H: virhe: sijoitus %s ei ole %u:n kerrannainen\n"
+#: elf64-ppc.c:13096
+msgid "%B: error: relocation %s not a multiple of %d"
+msgstr "%B: virhe: sijoitus %s ei ole %d:n kerrannainen"
 
 #: elf64-sh64.c:1682
 #, c-format
 msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n"
 msgstr "%s: virhe: tasaamaton sijoitustyyppi %d kohteessa %08x reloc-tietue %08x\n"
 
-#: elf64-sparc.c:445
+#: elf64-sparc.c:444
 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
 msgstr "%B: Vain rekisterit %%g[2367] voidaan esitellä käyttäen STT_REGISTER-symbolia"
 
-#: elf64-sparc.c:465
+#: elf64-sparc.c:464
 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
 msgstr "Rekisteriä %%g%d käytetty yhteensopimattomasti: %s kohteessa %B, aikaisemmin %s kohteessa %B"
 
-#: elf64-sparc.c:488
+#: elf64-sparc.c:487
 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
 msgstr "Symbolissa �%s� on eri tyyppejä: REGISTER kohteessa %B, aiemmin %s kohteessa %B"
 
-#: elf64-sparc.c:533
+#: elf64-sparc.c:532
 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
 msgstr "Symbolissa �%s� on eri tyyppejä: %s kohteessa %B, aiemmin REGISTER kohteessa %B"
 
-#: elf64-sparc.c:686
+#: elf64-sparc.c:684
 msgid "%B: linking UltraSPARC specific with HAL specific code"
 msgstr "%B: linkitetään UltraSPARC-kohtainen HAL-kohtaisella koodilla"
 
-#: elf64-x86-64.c:1236
-msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
-msgstr "%B: sijoitusta %s symbolia `%s' varten ei tueta x32-tilassa"
-
-#: elf64-x86-64.c:1465
+#: elf64-x86-64.c:1360
 msgid "%B: '%s' accessed both as normal and thread local symbol"
 msgstr "%B: �%s� kutsuttu sekä normaalina että säikeisenä paikallissymbolina"
 
-#: elf64-x86-64.c:2934
+#: elf64-x86-64.c:2801
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d"
 msgstr "%B: sijoituksella %s kohteen STT_GNU_IFUNC-symbolia �%s� varten on ei-nolla-yhteenlaskettava: %d"
 
-#: elf64-x86-64.c:3193
+#: elf64-x86-64.c:3073
 msgid "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"
 msgstr "%B: sijoitusta R_X86_64_GOTOFF64 suojattua funktiota �%s� varten ei voida käyttää kun tehdään jaettua objektia"
 
-#: elf64-x86-64.c:3305
+#: elf64-x86-64.c:3184
 msgid "; recompile with -fPIC"
 msgstr "; käännetty uudelleen -fPIC-parametrillä"
 
-#: elf64-x86-64.c:3310
+#: elf64-x86-64.c:3189
 msgid "%B: relocation %s against %s `%s' can not be used when making a shared object%s"
 msgstr "%B: sijoitusta %s kohteeseen %s �%s� ei voi käyttää kun tehdään jaettua objektia %s"
 
-#: elf64-x86-64.c:3312
+#: elf64-x86-64.c:3191
 msgid "%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s"
 msgstr "%B: sijoitusta %s kohteeseen %s �%s� ei voi käyttää kun tehdään jaettua objektia %s"
 
-#: elfcode.h:827
+#: elfcode.h:826
 #, c-format
 msgid "warning: %s has a corrupt string table index - ignoring"
 msgstr "varoitus: %s:ssa on rikkinäinen merkkijonotauluindeksi - ei oteta huomioon"
 
-#: elfcode.h:1237
+#: elfcode.h:1236
 #, c-format
 msgid "%s: version count (%ld) does not match symbol count (%ld)"
 msgstr "%s: versiolukumäärä (%ld) ei täsmää symbolilukumäärän (%ld) kanssa"
 
-#: elfcode.h:1491
+#: elfcode.h:1476
 #, c-format
 msgid "%s(%s): relocation %d has invalid symbol index %ld"
 msgstr "%s(%s): sijoituksessa %d on virheellinen symboli-indeksi %ld"
@@ -2931,321 +2821,301 @@ msgstr "%s: TLS-määrittely kohteessa %B lohko %A ei täsmää ei-TLS-viitteen
 msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
 msgstr "%s: TLS-viite kohteessa %B ei täsmää ei-TLS-määrittelyn kanssa kohteessa %B lohko %A"
 
-#: elflink.c:1764
+#: elflink.c:1763
 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
 msgstr "%B: epäsuoran versioidun symbolin �%s� odottamaton uudelleenmäärittely"
 
-#: elflink.c:2077
+#: elflink.c:2076
 msgid "%B: version node not found for symbol %s"
 msgstr "%B: versiosolmua ei löydetty symbolille %s"
 
-#: elflink.c:2167
+#: elflink.c:2166
 msgid "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'"
 msgstr "%B: virheellinen reloc-tietuesymboli-indeksi (0x%lx >= 0x%lx) siirrososoitteelle 0x%lx lohkossa �%A�"
 
-#: elflink.c:2178
+#: elflink.c:2177
 msgid "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the object file has no symbol table"
 msgstr "%B: ei-nolla symboli-indeksi (0x%lx) siirrososoitetta 0x%lx varten lohkossa �%A� kun objektitiedostolla ei ole symbolitaulua"
 
-#: elflink.c:2368
+#: elflink.c:2367
 msgid "%B: relocation size mismatch in %B section %A"
 msgstr "%B: sijoituskokotäsmäämättömyys %B:n tulolohkossa %A"
 
-#: elflink.c:2663
+#: elflink.c:2662
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
 msgstr "varoitus: dynaamisen symbolin �%s� tyyppi ja koko ei ole määritelty"
 
 #  USA:ssa alternate-sanaa käytetään yleisesti, kun tarkoitetaan alternative.
-#: elflink.c:3421
+#: elflink.c:3418
 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
 msgstr "%P: vaihtoehtoinen ELF-konekoodi löydetty (%d) kohteessa %B, otetaan %d\n"
 
-#: elflink.c:4067
+#: elflink.c:4050
 msgid "%B: %s: invalid version %u (max %d)"
 msgstr "%B: %s: virheellinen versio %u (maksimi %d)"
 
-#: elflink.c:4103
+#: elflink.c:4086
 msgid "%B: %s: invalid needed version %d"
 msgstr "%B: %s: virheellinen tarvittu versio %d"
 
-#: elflink.c:4299
+#: elflink.c:4285
 msgid "Warning: alignment %u of common symbol `%s' in %B is greater than the alignment (%u) of its section %A"
 msgstr "Varoitus: tasaus %u yhteissymbolissa �%s� kohteessa %B on suurempi kuin tasaus (%u) sen lohkossa %A"
 
-#: elflink.c:4305
+#: elflink.c:4291
 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
 msgstr "Varoitus: tasaus %u symbolissa �%s� kohteessa %B on pienempi kuin %u kohteessa %B"
 
-#: elflink.c:4320
+#: elflink.c:4306
 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B"
 msgstr "Varoitus: symbolin �%s� koko vaihtui koosta %lu kohteessa %B kokoon %lu kohteessa %B"
 
-#: elflink.c:4489
+#: elflink.c:4472
 msgid "%B: undefined reference to symbol '%s'"
 msgstr "%B: määrittelemätön viite symboliin ’%s’"
 
-#: elflink.c:4492
+#: elflink.c:4475
 msgid "note: '%s' is defined in DSO %B so try adding it to the linker command line"
 msgstr "huomatus: ’%s’ on määritelty kohteessa DSO %B, joten yritä lisätä se linkkittäjän komentoriville"
 
-#: elflink.c:5795
+#: elflink.c:5779
 #, c-format
 msgid "%s: undefined version: %s"
 msgstr "%s: määrittelemätön versio: %s"
 
-#: elflink.c:5863
+#: elflink.c:5847
 msgid "%B: .preinit_array section is not allowed in DSO"
 msgstr "%B: �.preinit_array�-lohkoa ei sallita kohteessa DSO"
 
-#: elflink.c:7617
+#: elflink.c:7598
 #, c-format
 msgid "undefined %s reference in complex symbol: %s"
 msgstr "määrittelemätön %s-viite kompleksisymbolissa: %s"
 
-#: elflink.c:7771
+#: elflink.c:7752
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr "tuntematon operaattori �%c� kompleksisymbolissa"
 
-#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181
+#: elflink.c:8091 elflink.c:8108 elflink.c:8145 elflink.c:8162
 msgid "%B: Unable to sort relocs - they are in more than one size"
 msgstr "%B: Ei voi lajitella relocs-tietueita - niitä on useampia kuin yhtä kokoa"
 
-#: elflink.c:8141 elflink.c:8195
+#: elflink.c:8122 elflink.c:8176
 msgid "%B: Unable to sort relocs - they are of an unknown size"
 msgstr "%B: Ei voi lajitella relocs-tietueita - niiden koko on tuntematon"
 
-#: elflink.c:8246
+#: elflink.c:8227
 msgid "Not enough memory to sort relocations"
 msgstr "Ei tarpeeksi muistia sijoitusten lajittelemiseen"
 
-#: elflink.c:8439
+#: elflink.c:8420
 msgid "%B: Too many sections: %d (>= %d)"
 msgstr "%B: Liian monia lohkoja: %d (>= %d)"
 
-#: elflink.c:8686
-msgid "%B: internal symbol `%s' in %B is referenced by DSO"
-msgstr "%B: sisäinen symboli �%s� kohteessa %B on DSO:n viitteenä"
-
-#: elflink.c:8688
-msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
-msgstr "%B: piilotettu symboli �%s� kohteessa %B on DSO:n viitteenä"
+#: elflink.c:8663
+msgid "%B: %s symbol `%s' in %B is referenced by DSO"
+msgstr "%B: %s symboli �%s� kohteessa %B on DSO:n viitteenä"
 
-#: elflink.c:8690
-msgid "%B: local symbol `%s' in %B is referenced by DSO"
-msgstr "%B: paikallinen symboli �%s� kohteessa %B on DSO:n viitteenä"
-
-#: elflink.c:8785
+#: elflink.c:8754
 msgid "%B: could not find output section %A for input section %A"
 msgstr "%B: ei löytynyt tulostelohkoa %A syötelohkolle %A"
 
-#: elflink.c:8908
-msgid "%B: protected symbol `%s' isn't defined"
-msgstr "%B: suojattua symbolia �%s� ei ole määritelty"
-
-#: elflink.c:8910
-msgid "%B: internal symbol `%s' isn't defined"
-msgstr "%B: sisäistä symbolia �%s� ei ole määritelty"
-
-#: elflink.c:8912
-msgid "%B: hidden symbol `%s' isn't defined"
-msgstr "%B: piilotettua symbolia �%s� ei ole määritelty"
-
-#: elflink.c:9441
-msgid "error: %B: size of section %A is not multiple of address size"
-msgstr "virhe: %B: lohkon %A koko ei ole osoitekoon kerrannainen"
+#: elflink.c:8874
+msgid "%B: %s symbol `%s' isn't defined"
+msgstr "%B: %s symbolia �%s� ei ole määritelty"
 
-#: elflink.c:9488
+#: elflink.c:9428
 msgid "error: %B contains a reloc (0x%s) for section %A that references a non-existent global symbol"
 msgstr "virhe: %B sisältää reloc-tietueen (0x%s) lohkolle %A, joka viittaa puuttuvaan yleissymboliin"
 
-#: elflink.c:10223
+#: elflink.c:9494
+msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
+msgstr "%X�%s� viitattu lohkossa �%A� kohteessa %B: määritelty hylätyssä lohkossa �%A� / %B\n"
+
+#: elflink.c:10141
 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
 msgstr "%A:ssa on sekä järjestettyjä [�%A� kohteessa %B] että järjestämättömiä [�%A� kohteessa %B] lohkoja"
 
-#: elflink.c:10228
+#: elflink.c:10146
 #, c-format
 msgid "%A has both ordered and unordered sections"
 msgstr "%A:ssa on sekä järjestettyjä että järjestämättömiä lohkoja"
 
-#: elflink.c:10793
-msgid "%B: file class %s incompatible with %s"
-msgstr "%B: tiedostoluokka %s on yhteensopimaton kohteen %s kanssa"
-
-#: elflink.c:11104 elflink.c:11148
+#: elflink.c:10992 elflink.c:11036
 msgid "%B: could not find output section %s"
 msgstr "%B: ei löytynyt tulostelohkoa %s"
 
-#: elflink.c:11109
+#: elflink.c:10997
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr "varoitus: %s-lohkossa on nollakoko"
 
-#: elflink.c:11214
+#: elflink.c:11102
 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
 msgstr "%P: varoitus: luodaan DT_TEXTREL-tunniste jaetussa objektissa.\n"
 
-#: elflink.c:11401
+#: elflink.c:11289
 msgid "%P%X: can not read symbols: %E\n"
 msgstr "%P%X: ei voi lukea symboleja: %E\n"
 
-#: elflink.c:11750
+#: elflink.c:11638
 msgid "Removing unused section '%s' in file '%B'"
 msgstr "Poistetaan käyttämätön lohko �%s� tiedostossa �%B�"
 
-#: elflink.c:11962
+#: elflink.c:11850
 msgid "Warning: gc-sections option ignored"
 msgstr "Varoitus: �gc-sections�-valitsinta ei oteta huomioon"
 
-#: elflink.c:12511
+#: elflink.c:12399
 msgid "%B: ignoring duplicate section `%A'"
 msgstr "%B: ei oteta huomioon lohkon �%A� kaksoiskappaletta"
 
-#: elflink.c:12518 elflink.c:12525
+#: elflink.c:12406 elflink.c:12413
 msgid "%B: duplicate section `%A' has different size"
 msgstr "%B: lohkon �%A� kaksoiskappaleessa on eri koko"
 
-#: elflink.c:12533 elflink.c:12538
+#: elflink.c:12421 elflink.c:12426
 msgid "%B: warning: could not read contents of section `%A'"
 msgstr "%B: varoitus: ei voitu lukea lohkon �%A� sisältöä"
 
-#: elflink.c:12542
+#: elflink.c:12430
 msgid "%B: warning: duplicate section `%A' has different contents"
 msgstr "%B: varoitus: lohkon �%A� kaksoiskappaleella on erilainen sisältö"
 
-#: elflink.c:12643 linker.c:3086
+#: elflink.c:12531 linker.c:3138
 msgid "%F%P: already_linked_table: %E\n"
 msgstr "%F%P: already_linked_table: %E\n"
 
-#: elfxx-mips.c:1221
+#: elfxx-mips.c:1220
 msgid "static procedure (no name)"
 msgstr "staattinen proseduuri (ei nimeä)"
 
-#: elfxx-mips.c:5628
+#: elfxx-mips.c:5623
 msgid "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."
 msgstr "%B: %A+0x%lx: Suorat hypyt ISA-tilojen välillä eivät ole sallittuja; harkitse uudelleenkääntämistä käyttäen yhteislinkitystä."
 
-#: elfxx-mips.c:6288 elfxx-mips.c:6511
+#: elfxx-mips.c:6280 elfxx-mips.c:6503
 msgid "%B: Warning: bad `%s' option size %u smaller than its header"
 msgstr "%B: Varoitus: virheellinen �%s�-valitsinkoko %u pienempi kuin sen otsake"
 
-#: elfxx-mips.c:7262 elfxx-mips.c:7387
+#: elfxx-mips.c:7254 elfxx-mips.c:7379
 msgid "%B: Warning: cannot determine the target function for stub section `%s'"
 msgstr "%B: Varoitus: ei voi määritellä stub-lohkon �%s� kohdefunktiota"
 
-#: elfxx-mips.c:7516
+#: elfxx-mips.c:7508
 msgid "%B: Malformed reloc detected for section %s"
 msgstr "%B: Muodoltaan virheellinen reloc-tietue havaittu lohkossa %s"
 
-#: elfxx-mips.c:7556
+#: elfxx-mips.c:7548
 msgid "%B: GOT reloc at 0x%lx not expected in executables"
 msgstr "%B: Yleissiirrostaulu-reloc-tietue siirroksessa 0x%lx ei ole odotettu suoritettavissa tiedostoissa"
 
-#: elfxx-mips.c:7678
+#: elfxx-mips.c:7670
 msgid "%B: CALL16 reloc at 0x%lx not against global symbol"
 msgstr "%B: �CALL16 reloc�-tietue siirroksessa 0x%lx ei ole yleissymbolia varten"
 
-#: elfxx-mips.c:8372
+#: elfxx-mips.c:8365
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
 msgstr "ei-dynaaminen sijoitus viittaa dynaamiseen symboliin %s"
 
-#: elfxx-mips.c:9075
+#: elfxx-mips.c:9068
 msgid "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"
 msgstr "%B: Ei löydy täsmäävää �LO16 reloc�-tietuetta tulolohkoa �%s� varten symbolinimelle %s kohteessa 0x%lx lohkossa �%A�"
 
-#: elfxx-mips.c:9214
+#: elfxx-mips.c:9207
 msgid "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
 msgstr "�small�-datalohko ylittää 64 kilotavua; alenna �small�-datalohkon kokorajaa (katso valitsin -G)"
 
-#: elfxx-mips.c:12038
+#: elfxx-mips.c:12027
 #, c-format
 msgid "%s: illegal section name `%s'"
 msgstr "%s: virheellinen lohkonimi �%s�"
 
-#: elfxx-mips.c:12417 elfxx-mips.c:12443
+#: elfxx-mips.c:12405 elfxx-mips.c:12431
 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float"
 msgstr "Varoitus: %B käyttää �-msingle-float�-valitsinta, %B käyttää �-mdouble-float�-valitsinta"
 
-#: elfxx-mips.c:12429 elfxx-mips.c:12485
+#: elfxx-mips.c:12417 elfxx-mips.c:12473
 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"
 msgstr "Varoitus: %B käyttää �-msingle-float�-valitsinta, %B käyttää �-mips32r2 -mfp64�-valitsimia"
 
-#: elfxx-mips.c:12455 elfxx-mips.c:12491
+#: elfxx-mips.c:12443 elfxx-mips.c:12479
 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"
 msgstr "Varoitus: %B käyttää �-mdouble-float�-valitsinta, %B käyttää �-mips32r2 -mfp64�-valitsimia"
 
-#: elfxx-mips.c:12533
+#: elfxx-mips.c:12521
 msgid "%B: endianness incompatible with that of the selected emulation"
 msgstr "%B: tavujärjestys tyypiltään sopimaton valitun emuloinnin tavujärjestystyypin kanssa"
 
-#: elfxx-mips.c:12544
+#: elfxx-mips.c:12532
 msgid "%B: ABI is incompatible with that of the selected emulation"
 msgstr "%B: ABI ei ole yhteensopiva valitun emuloinnin ABIn kanssa"
 
-#: elfxx-mips.c:12628
+#: elfxx-mips.c:12613
 msgid "%B: warning: linking abicalls files with non-abicalls files"
 msgstr "%B: varoitus: linkitetään abi-kutsutiedostoja ei-abi-kutsutiedostoihin"
 
-#: elfxx-mips.c:12645
+#: elfxx-mips.c:12630
 msgid "%B: linking 32-bit code with 64-bit code"
 msgstr "%B: linkitetään 32-bittinen koodi 64-bittisen koodin kanssa"
 
-#: elfxx-mips.c:12673
+#: elfxx-mips.c:12658
 msgid "%B: linking %s module with previous %s modules"
 msgstr "%B: linkitetään %s-moduli edellisten %s-modulien kanssa"
 
-#: elfxx-mips.c:12696
+#: elfxx-mips.c:12681
 msgid "%B: ABI mismatch: linking %s module with previous %s modules"
 msgstr "%B: ABI-täsmäämättömyys: linkitetään %s-moduli edellisten %s-modulien kanssa"
 
-#: elfxx-mips.c:12860
+#: elfxx-mips.c:12845
 #, c-format
 msgid " [abi=O32]"
 msgstr " [abi=O32]"
 
-#: elfxx-mips.c:12862
+#: elfxx-mips.c:12847
 #, c-format
 msgid " [abi=O64]"
 msgstr " [abi=O64]"
 
-#: elfxx-mips.c:12864
+#: elfxx-mips.c:12849
 #, c-format
 msgid " [abi=EABI32]"
 msgstr " [abi=EABI32]"
 
-#: elfxx-mips.c:12866
+#: elfxx-mips.c:12851
 #, c-format
 msgid " [abi=EABI64]"
 msgstr " [abi=EABI64]"
 
-#: elfxx-mips.c:12868
+#: elfxx-mips.c:12853
 #, c-format
 msgid " [abi unknown]"
 msgstr " [abi tuntematon]"
 
-#: elfxx-mips.c:12870
+#: elfxx-mips.c:12855
 #, c-format
 msgid " [abi=N32]"
 msgstr " [abi=N32]"
 
-#: elfxx-mips.c:12872
+#: elfxx-mips.c:12857
 #, c-format
 msgid " [abi=64]"
 msgstr " [abi=64]"
 
-#: elfxx-mips.c:12874
+#: elfxx-mips.c:12859
 #, c-format
 msgid " [no abi set]"
 msgstr " [ei abia asetettu]"
 
-#: elfxx-mips.c:12895
+#: elfxx-mips.c:12880
 #, c-format
 msgid " [unknown ISA]"
 msgstr " [tuntematon ISA]"
 
-#: elfxx-mips.c:12906
+#: elfxx-mips.c:12891
 #, c-format
 msgid " [not 32bitmode]"
 msgstr " [ei 32-bittitila]"
@@ -3342,144 +3212,86 @@ msgstr "%s: osoite 0x%s lukualueen ulkopuolella Intel-heksatiedostolle"
 msgid "%B: unable to get decompressed section %A"
 msgstr "%B: ei kyetä hakemaan tiivistyksestä purettua lohkoa %A"
 
-#: libbfd.c:1043
+#: libbfd.c:1027
 #, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
 msgstr "Käytöstä poistettu %s kutsuttiin tiedostossa %s rivillä %d funktiossa %s\n"
 
-#: libbfd.c:1046
+#: libbfd.c:1030
 #, c-format
 msgid "Deprecated %s called\n"
 msgstr "Käytöstä poistettu %s kutsuttu\n"
 
-#: linker.c:1859
+#: linker.c:1911
 msgid "%B: indirect symbol `%s' to `%s' is a loop"
 msgstr "%B: epäsuora symboli �%s� kohteeseen �%s� on silmukka"
 
-#: linker.c:2726
+#: linker.c:2778
 #, c-format
 msgid "Attempt to do relocatable link with %s input and %s output"
 msgstr "Yritettiin tehdä sijoitettava linkki %s-syötteellä ja %s-tulosteella"
 
-#: linker.c:3053
+#: linker.c:3105
 msgid "%B: warning: ignoring duplicate section `%A'\n"
 msgstr "%B: varoitus: ei oteta huomioon lohkon �%A� kaksoiskappaletta\n"
 
-#: linker.c:3067
+#: linker.c:3119
 msgid "%B: warning: duplicate section `%A' has different size\n"
 msgstr "%B: varoitus: lohkon �%A� kaksoiskappaleessa on eri koko\n"
 
-#: mach-o.c:381
-msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
-msgstr "bfd_mach_o_canonicalize_symtab: ei kyetä lataamaan symboleja"
-
-#: mach-o.c:1253
-#, c-format
-msgid "unable to write unknown load command 0x%lx"
-msgstr "ei kyetä kirjoittamaan tuntematonta lataa-komentoa 0x%lx"
-
-#: mach-o.c:1654
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"
-msgstr "bfd_mach_o_read_symtab_symbol: ei kyetä lukemaan %d tavua osoitteesta %lu"
-
-#: mach-o.c:1671
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"
-msgstr "bfd_mach_o_read_symtab_symbol: symbolinimi lukualueen ulkopuolella (%lu >= %lu)"
-
-#: mach-o.c:1756
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: symboli �%s� määritellyt virheellisen lohkon %d (enintään %lu): asetus on määrittelemätön"
-
-#: mach-o.c:1764
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: symboli �%s� on tukematon ’epäsuora’ viite: asetus on määrittelemätön"
-
-#: mach-o.c:1770
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x%x: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: symboli �%s� määritellyt virheellisen tyyppikentän 0x%x: asetus on määrittelemätön"
-
-#: mach-o.c:1840
-msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
-msgstr "bfd_mach_o_read_symtab_symbols: ei kyetä varaamaan muistia symboleille"
-
-#: mach-o.c:1874
-#, c-format
-msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"
-msgstr "bfd_mach_o_read_dysymtab_symbol: ei kyetä lukemaan %lu tavua osoitteesta %lu"
-
-#: mach-o.c:2556
-#, c-format
-msgid "unable to read unknown load command 0x%lx"
-msgstr "ei kyetä lukemaan tuntematonta lataa-käskyä 0x%lx"
-
-#: mach-o.c:2736
-#, c-format
-msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
-msgstr "bfd_mach_o_scan: tuntematon arkkitehtuuri 0x%lx/0x%lx"
-
-#: mach-o.c:2832
-#, c-format
-msgid "unknown header byte-order value 0x%lx"
-msgstr "tuntematon otsaketavujärjestysarvo 0x%lx"
-
-#: mach-o.c:3402
+#: mach-o.c:3403
 msgid "Mach-O header:\n"
 msgstr "Mach-O otsake:\n"
 
-#: mach-o.c:3403
+#: mach-o.c:3404
 #, c-format
 msgid " magic     : %08lx\n"
 msgstr " maaginen            : %08lx\n"
 
-#: mach-o.c:3404
+#: mach-o.c:3405
 #, c-format
 msgid " cputype   : %08lx (%s)\n"
 msgstr " prosessorityyppi    : %08lx (%s)\n"
 
-#: mach-o.c:3406
+#: mach-o.c:3407
 #, c-format
 msgid " cpusubtype: %08lx\n"
 msgstr " prosessorialityyppi : %08lx\n"
 
-#: mach-o.c:3407
+#: mach-o.c:3408
 #, c-format
 msgid " filetype  : %08lx (%s)\n"
 msgstr " tiedostotyyppi      : %08lx (%s)\n"
 
-#: mach-o.c:3410
+#: mach-o.c:3411
 #, c-format
 msgid " ncmds     : %08lx (%lu)\n"
 msgstr "ncmds                : %08lx (%lu)\n"
 
-#: mach-o.c:3411
+#: mach-o.c:3412
 #, c-format
 msgid " sizeofcmds: %08lx\n"
 msgstr " komentojenkoko      : %08lx\n"
 
-#: mach-o.c:3412
+#: mach-o.c:3413
 #, c-format
 msgid " flags     : %08lx ("
 msgstr " liput               : %08lx ("
 
-#: mach-o.c:3414 vms-alpha.c:7671
+#: mach-o.c:3415 vms-alpha.c:7652
 msgid ")\n"
 msgstr ")\n"
 
-#: mach-o.c:3415
+#: mach-o.c:3416
 #, c-format
 msgid " reserved  : %08x\n"
 msgstr " varattu   : %08x\n"
 
-#: mach-o.c:3425
+#: mach-o.c:3426
 msgid "Segments and Sections:\n"
 msgstr "Segmentit ja lohkot:\n"
 
-#: mach-o.c:3426
+#: mach-o.c:3427
 msgid " #: Segment name     Section name     Address\n"
 msgstr " #: Segmenttinimi     Lohkonnimi       Osoite\n"
 
@@ -3643,11 +3455,6 @@ msgstr "%B: hyppy liian kauas\n"
 msgid "%B: bad pair/reflo after refhi\n"
 msgstr "%B: virheellinen pari/reflo refhi:n jälkeen\n"
 
-#: pef.c:519
-#, c-format
-msgid "bfd_pef_scan: unknown architecture 0x%lx"
-msgstr "bfd_pef_scan: tuntematon arkkitehtuuri 0x%lx"
-
 #: pei-x86_64.c:444
 #, c-format
 msgid "warning: .pdata section size (%ld) is not a multiple of %d\n"
@@ -3750,11 +3557,6 @@ msgstr "Osio[%d] sektori     = 0x%.8lx (%ld)\n"
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr "Osio[%d] pituus      = 0x%.8lx (%ld)\n"
 
-#: rs6000-core.c:448
-#, c-format
-msgid "%s: warning core file truncated"
-msgstr "%s: varoitus ydintiedosto typistetty"
-
 #: som.c:5471
 #, c-format
 msgid ""
@@ -3784,32 +3586,32 @@ msgstr "%B(%A+0x%lx): Stabs-tulokohdassa on virheellinen merkkijonoindeksi."
 msgid "Unsupported .stab relocation"
 msgstr "�Ei-tuettu .stab�-sijoitus"
 
-#: vms-alpha.c:1299
+#: vms-alpha.c:1287
 #, c-format
 msgid "Unknown EGSD subtype %d"
 msgstr "Tuntematon EGSD-alityyppi %d"
 
-#: vms-alpha.c:1330
+#: vms-alpha.c:1318
 #, c-format
 msgid "Stack overflow (%d) in _bfd_vms_push"
 msgstr "Pinon ylivuoto (%d) kohteessa _bfd_vms_push"
 
-#: vms-alpha.c:1343
+#: vms-alpha.c:1331
 msgid "Stack underflow in _bfd_vms_pop"
 msgstr "Pinon ylivuoto kohteessa _bfd_vms_pop"
 
 #. These names have not yet been added to this switch statement.
-#: vms-alpha.c:1580
+#: vms-alpha.c:1568
 #, c-format
 msgid "unknown ETIR command %d"
 msgstr "tuntematon ETIR-komento %d"
 
-#: vms-alpha.c:1767
+#: vms-alpha.c:1755
 #, c-format
 msgid "bad section index in %s"
 msgstr "virheellinen lohkoindeksi kohteessa %s"
 
-#: vms-alpha.c:1780
+#: vms-alpha.c:1768
 #, c-format
 msgid "unsupported STA cmd %s"
 msgstr "ei-tuettu STA-komento %s"
@@ -3819,1390 +3621,1390 @@ msgstr "ei-tuettu STA-komento %s"
 #. Rotate.
 #. Redefine symbol to current location.
 #. Define a literal.
-#: vms-alpha.c:1956 vms-alpha.c:1987 vms-alpha.c:2234
+#: vms-alpha.c:1944 vms-alpha.c:1975 vms-alpha.c:2222
 #, c-format
 msgid "%s: not supported"
 msgstr "%s: ei tuettu"
 
-#: vms-alpha.c:1962
+#: vms-alpha.c:1950
 #, c-format
 msgid "%s: not implemented"
 msgstr "%s: ei toteutettu"
 
-#: vms-alpha.c:2218
+#: vms-alpha.c:2206
 #, c-format
 msgid "invalid use of %s with contexts"
 msgstr "virheellinen %s-käyttö sisällöillä"
 
-#: vms-alpha.c:2252
+#: vms-alpha.c:2240
 #, c-format
 msgid "reserved cmd %d"
 msgstr "varattu komento %d"
 
-#: vms-alpha.c:2337
+#: vms-alpha.c:2325
 msgid "Object module NOT error-free !\n"
 msgstr "Objektimoduli EI ole virheetön !\n"
 
-#: vms-alpha.c:2766
+#: vms-alpha.c:2754
 #, c-format
 msgid "Symbol %s replaced by %s\n"
 msgstr "Symboli %s korvattu kohteella %s\n"
 
-#: vms-alpha.c:3769
+#: vms-alpha.c:3757
 #, c-format
 msgid "SEC_RELOC with no relocs in section %s"
 msgstr "SEC_RELOC ilman relocs-tietueita lohkossa %s"
 
-#: vms-alpha.c:3822 vms-alpha.c:4053
+#: vms-alpha.c:3810 vms-alpha.c:4041
 #, c-format
 msgid "Size error in section %s"
 msgstr "Kokovirhe lohkossa %s"
 
-#: vms-alpha.c:3992
+#: vms-alpha.c:3980
 msgid "Spurious ALPHA_R_BSR reloc"
 msgstr "Väärä ALPHA_R_BSR reloc-tietue"
 
-#: vms-alpha.c:4040
+#: vms-alpha.c:4028
 #, c-format
 msgid "Unhandled relocation %s"
 msgstr "Käsittelemätön sijoitus %s"
 
-#: vms-alpha.c:4330
+#: vms-alpha.c:4318
 #, c-format
 msgid "unknown source command %d"
 msgstr "tuntematon lähdekomento %d"
 
-#: vms-alpha.c:4391
+#: vms-alpha.c:4379
 msgid "DST__K_SET_LINUM_INCR not implemented"
 msgstr "DST__K_SET_LINUM_INCR ei ole toteutettu"
 
-#: vms-alpha.c:4397
+#: vms-alpha.c:4385
 msgid "DST__K_SET_LINUM_INCR_W not implemented"
 msgstr "DST__K_SET_LINUM_INCR_W ei ole toteutettu"
 
-#: vms-alpha.c:4403
+#: vms-alpha.c:4391
 msgid "DST__K_RESET_LINUM_INCR not implemented"
 msgstr "DST__K_RESET_LINUM_INCR ei ole toteutettu"
 
-#: vms-alpha.c:4409
+#: vms-alpha.c:4397
 msgid "DST__K_BEG_STMT_MODE not implemented"
 msgstr "DST__K_BEG_STMT_MODE ei ole toteutettu"
 
-#: vms-alpha.c:4415
+#: vms-alpha.c:4403
 msgid "DST__K_END_STMT_MODE not implemented"
 msgstr "DST__K_END_STMT_MODE ei ole toteutettu"
 
-#: vms-alpha.c:4442
+#: vms-alpha.c:4430
 msgid "DST__K_SET_PC not implemented"
 msgstr "DST__K_SET_PC ei ole toteutettu"
 
-#: vms-alpha.c:4448
+#: vms-alpha.c:4436
 msgid "DST__K_SET_PC_W not implemented"
 msgstr "DST__K_SET_PC_W ei ole toteutettu"
 
-#: vms-alpha.c:4454
+#: vms-alpha.c:4442
 msgid "DST__K_SET_PC_L not implemented"
 msgstr "DST__K_SET_PC_L ei ole toteutettu"
 
-#: vms-alpha.c:4460
+#: vms-alpha.c:4448
 msgid "DST__K_SET_STMTNUM not implemented"
 msgstr "DST__K_SET_STMTNUM ei ole toteutettu"
 
-#: vms-alpha.c:4503
+#: vms-alpha.c:4491
 #, c-format
 msgid "unknown line command %d"
 msgstr "tuntematon rivikomento %d"
 
-#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003
-#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038
+#: vms-alpha.c:4938 vms-alpha.c:4955 vms-alpha.c:4969 vms-alpha.c:4984
+#: vms-alpha.c:4996 vms-alpha.c:5007 vms-alpha.c:5019
 #, c-format
 msgid "Unknown reloc %s + %s"
 msgstr "Tuntematon reloc-tietue %s + %s"
 
-#: vms-alpha.c:5093
+#: vms-alpha.c:5074
 #, c-format
 msgid "Unknown reloc %s"
 msgstr "Tuntematon reloc-tietue %s"
 
-#: vms-alpha.c:5106
+#: vms-alpha.c:5087
 msgid "Invalid section index in ETIR"
 msgstr "virheellinen lohkoindeksi kohteessa ETIR"
 
-#: vms-alpha.c:5153
+#: vms-alpha.c:5134
 #, c-format
 msgid "Unknown symbol in command %s"
 msgstr "Tuntematon symboli komennossa %s"
 
-#: vms-alpha.c:5668
+#: vms-alpha.c:5649
 #, c-format
 msgid "  EMH %u (len=%u): "
 msgstr "  EMH %u (pituus=%u): "
 
-#: vms-alpha.c:5677
+#: vms-alpha.c:5658
 #, c-format
 msgid "Module header\n"
 msgstr "Moduliotsake\n"
 
-#: vms-alpha.c:5678
+#: vms-alpha.c:5659
 #, c-format
 msgid "   structure level: %u\n"
 msgstr "   tietuetaso: %u\n"
 
-#: vms-alpha.c:5679
+#: vms-alpha.c:5660
 #, c-format
 msgid "   max record size: %u\n"
 msgstr "   tietueen enimmäiskoko: %u\n"
 
-#: vms-alpha.c:5682
+#: vms-alpha.c:5663
 #, c-format
 msgid "   module name    : %.*s\n"
 msgstr "   modulinimi    : %.*s\n"
 
-#: vms-alpha.c:5684
+#: vms-alpha.c:5665
 #, c-format
 msgid "   module version : %.*s\n"
 msgstr "   moduliversio : %.*s\n"
 
-#: vms-alpha.c:5686
+#: vms-alpha.c:5667
 #, c-format
 msgid "   compile date   : %.17s\n"
 msgstr "   käännöspäivämäärä   : %.17s\n"
 
-#: vms-alpha.c:5691
+#: vms-alpha.c:5672
 #, c-format
 msgid "Language Processor Name\n"
 msgstr "Kielisuorittimen nimi\n"
 
-#: vms-alpha.c:5692
+#: vms-alpha.c:5673
 #, c-format
 msgid "   language name: %.*s\n"
 msgstr "   kielinimi: %.*s\n"
 
-#: vms-alpha.c:5699
+#: vms-alpha.c:5680
 #, c-format
 msgid "Source Files Header\n"
 msgstr "Lähdetiedostot-otsake\n"
 
-#: vms-alpha.c:5700
+#: vms-alpha.c:5681
 #, c-format
 msgid "   file: %.*s\n"
 msgstr "   tiedosto: %.*s\n"
 
-#: vms-alpha.c:5707
+#: vms-alpha.c:5688
 #, c-format
 msgid "Title Text Header\n"
 msgstr "Otsikkotekstiotsake\n"
 
-#: vms-alpha.c:5708
+#: vms-alpha.c:5689
 #, c-format
 msgid "   title: %.*s\n"
 msgstr "   otsikko: %.*s\n"
 
-#: vms-alpha.c:5715
+#: vms-alpha.c:5696
 #, c-format
 msgid "Copyright Header\n"
 msgstr "Copyright-otsake\n"
 
-#: vms-alpha.c:5716
+#: vms-alpha.c:5697
 #, c-format
 msgid "   copyright: %.*s\n"
 msgstr "   copyright: %.*s\n"
 
-#: vms-alpha.c:5722
+#: vms-alpha.c:5703
 #, c-format
 msgid "unhandled emh subtype %u\n"
 msgstr "käsittelemätön emh-alityyppi %u\n"
 
-#: vms-alpha.c:5732
+#: vms-alpha.c:5713
 #, c-format
 msgid "  EEOM (len=%u):\n"
 msgstr "  EEOM (pituus=%u):\n"
 
-#: vms-alpha.c:5733
+#: vms-alpha.c:5714
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr "   ehdollisten linkitysparien lukumäärä: %u\n"
 
-#: vms-alpha.c:5735
+#: vms-alpha.c:5716
 #, c-format
 msgid "   completion code: %u\n"
 msgstr "   täydentämiskoodi: %u\n"
 
-#: vms-alpha.c:5739
+#: vms-alpha.c:5720
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr "   siirto-osoiteliput: 0x%02x\n"
 
-#: vms-alpha.c:5740
+#: vms-alpha.c:5721
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr "   siirrososoite psect: %u\n"
 
-#: vms-alpha.c:5742
+#: vms-alpha.c:5723
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr "   siirto-osoite   : 0x%08x\n"
 
 #  Käännettäväksi on merkitty monia (vianjäljitys)symboleja ja vastaavia, joita ei oikeastaan pitäisi suomentaa. Joissakin kohdissa vain selväkieliset sanat on suomennettu.
-#: vms-alpha.c:5751
+#: vms-alpha.c:5732
 msgid " WEAK"
 msgstr " WEAK"
 
-#: vms-alpha.c:5753
+#: vms-alpha.c:5734
 msgid " DEF"
 msgstr " DEF"
 
-#: vms-alpha.c:5755
+#: vms-alpha.c:5736
 msgid " UNI"
 msgstr " UNI"
 
-#: vms-alpha.c:5757 vms-alpha.c:5778
+#: vms-alpha.c:5738 vms-alpha.c:5759
 msgid " REL"
 msgstr " REL"
 
-#: vms-alpha.c:5759
+#: vms-alpha.c:5740
 msgid " COMM"
 msgstr " COMM"
 
-#: vms-alpha.c:5761
+#: vms-alpha.c:5742
 msgid " VECEP"
 msgstr " VECEP"
 
-#: vms-alpha.c:5763
+#: vms-alpha.c:5744
 msgid " NORM"
 msgstr " NORM"
 
-#: vms-alpha.c:5765
+#: vms-alpha.c:5746
 msgid " QVAL"
 msgstr " QVAL"
 
-#: vms-alpha.c:5772
+#: vms-alpha.c:5753
 msgid " PIC"
 msgstr " PIC"
 
-#: vms-alpha.c:5774
+#: vms-alpha.c:5755
 msgid " LIB"
 msgstr " LIB"
 
-#: vms-alpha.c:5776
+#: vms-alpha.c:5757
 msgid " OVR"
 msgstr " OVR"
 
-#: vms-alpha.c:5780
+#: vms-alpha.c:5761
 msgid " GBL"
 msgstr " GBL"
 
-#: vms-alpha.c:5782
+#: vms-alpha.c:5763
 msgid " SHR"
 msgstr " SHR"
 
-#: vms-alpha.c:5784
+#: vms-alpha.c:5765
 msgid " EXE"
 msgstr " EXE"
 
-#: vms-alpha.c:5786
+#: vms-alpha.c:5767
 msgid " RD"
 msgstr " RD"
 
-#: vms-alpha.c:5788
+#: vms-alpha.c:5769
 msgid " WRT"
 msgstr " WRT"
 
-#: vms-alpha.c:5790
+#: vms-alpha.c:5771
 msgid " VEC"
 msgstr " VEC"
 
-#: vms-alpha.c:5792
+#: vms-alpha.c:5773
 msgid " NOMOD"
 msgstr " NOMOD"
 
-#: vms-alpha.c:5794
+#: vms-alpha.c:5775
 msgid " COM"
 msgstr " COM"
 
-#: vms-alpha.c:5796
+#: vms-alpha.c:5777
 msgid " 64B"
 msgstr " 64B"
 
-#: vms-alpha.c:5805
+#: vms-alpha.c:5786
 #, c-format
 msgid "  EGSD (len=%u):\n"
 msgstr "  EGSD (pituus=%u):\n"
 
-#: vms-alpha.c:5817
+#: vms-alpha.c:5798
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
 msgstr "  EGSD tulopiste %2u (tyyppi: %u, pituus: %u): "
 
-#: vms-alpha.c:5829
+#: vms-alpha.c:5810
 #, c-format
 msgid "PSC - Program section definition\n"
 msgstr "PSC - Ohjelmalohkomäärittely\n"
 
-#: vms-alpha.c:5830 vms-alpha.c:5847
+#: vms-alpha.c:5811 vms-alpha.c:5828
 #, c-format
 msgid "   alignment  : 2**%u\n"
 msgstr "   tasaus  : 2**%u\n"
 
-#: vms-alpha.c:5831 vms-alpha.c:5848
+#: vms-alpha.c:5812 vms-alpha.c:5829
 #, c-format
 msgid "   flags      : 0x%04x"
 msgstr "   liput      : 0x%04x"
 
-#: vms-alpha.c:5835
+#: vms-alpha.c:5816
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr "   alloc (pituus): %u (0x%08x)\n"
 
-#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942
+#: vms-alpha.c:5817 vms-alpha.c:5874 vms-alpha.c:5923
 #, c-format
 msgid "   name       : %.*s\n"
 msgstr "   nimi       : %.*s\n"
 
-#: vms-alpha.c:5846
+#: vms-alpha.c:5827
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
 msgstr "SPSC - Jaettu vedosohjelmalohkomäärittely\n"
 
-#: vms-alpha.c:5852
+#: vms-alpha.c:5833
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr "   alloc (pitus) : %u (0x%08x)\n"
 
-#: vms-alpha.c:5853
+#: vms-alpha.c:5834
 #, c-format
 msgid "   image offset  : 0x%08x\n"
 msgstr "   vedossiirros  : 0x%08x\n"
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5836
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr "   symvec-siirros : 0x%08x\n"
 
-#: vms-alpha.c:5857
+#: vms-alpha.c:5838
 #, c-format
 msgid "   name          : %.*s\n"
 msgstr "   nimi          : %.*s\n"
 
-#: vms-alpha.c:5870
+#: vms-alpha.c:5851
 #, c-format
 msgid "SYM - Global symbol definition\n"
 msgstr "SYM - Yleinen symbolimäärittely\n"
 
-#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971
+#: vms-alpha.c:5852 vms-alpha.c:5912 vms-alpha.c:5933 vms-alpha.c:5952
 #, c-format
 msgid "   flags: 0x%04x"
 msgstr "   liput: 0x%04x"
 
-#: vms-alpha.c:5874
+#: vms-alpha.c:5855
 #, c-format
 msgid "   psect offset: 0x%08x\n"
 msgstr "   psect-siirros: 0x%08x\n"
 
-#: vms-alpha.c:5878
+#: vms-alpha.c:5859
 #, c-format
 msgid "   code address: 0x%08x\n"
 msgstr "   koodiosoite: 0x%08x\n"
 
-#: vms-alpha.c:5880
+#: vms-alpha.c:5861
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr "   psect-indeksi tulokohdalle : %u\n"
 
-#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978
+#: vms-alpha.c:5864 vms-alpha.c:5940 vms-alpha.c:5959
 #, c-format
 msgid "   psect index : %u\n"
 msgstr "   psect-indeksi : %u\n"
 
-#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980
+#: vms-alpha.c:5866 vms-alpha.c:5942 vms-alpha.c:5961
 #, c-format
 msgid "   name        : %.*s\n"
 msgstr "   nimi        : %.*s\n"
 
-#: vms-alpha.c:5892
+#: vms-alpha.c:5873
 #, c-format
 msgid "SYM - Global symbol reference\n"
 msgstr "SYM - Yleinen symboliviite\n"
 
-#: vms-alpha.c:5904
+#: vms-alpha.c:5885
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr "IDC - Ident-johdonmukaisuustarkistus\n"
 
-#: vms-alpha.c:5905
+#: vms-alpha.c:5886
 #, c-format
 msgid "   flags         : 0x%08x"
 msgstr "   liput          : 0x%08x"
 
-#: vms-alpha.c:5909
+#: vms-alpha.c:5890
 #, c-format
 msgid "   id match      : %x\n"
 msgstr "   tunnistetäsmäys: %x\n"
 
-#: vms-alpha.c:5911
+#: vms-alpha.c:5892
 #, c-format
 msgid "   error severity: %x\n"
 msgstr "   virhevakavuus  : %x\n"
 
-#: vms-alpha.c:5914
+#: vms-alpha.c:5895
 #, c-format
 msgid "   entity name   : %.*s\n"
 msgstr "   yksilönimi     : %.*s\n"
 
-#: vms-alpha.c:5916
+#: vms-alpha.c:5897
 #, c-format
 msgid "   object name   : %.*s\n"
 msgstr "   objektinimi    : %.*s\n"
 
-#: vms-alpha.c:5919
+#: vms-alpha.c:5900
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr "   binaari-ident  : 0x%08x\n"
 
-#: vms-alpha.c:5922
+#: vms-alpha.c:5903
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr "   ascii-ident    : %.*s\n"
 
-#: vms-alpha.c:5930
+#: vms-alpha.c:5911
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
 msgstr "SYMG - Yleinen symbolimäärittely\n"
 
-#: vms-alpha.c:5934
+#: vms-alpha.c:5915
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
 msgstr "   symbolivektorisiirros: 0x%08x\n"
 
-#: vms-alpha.c:5936
+#: vms-alpha.c:5917
 #, c-format
 msgid "   entry point: 0x%08x\n"
 msgstr "  tulokohta: 0x%08x\n"
 
-#: vms-alpha.c:5938
+#: vms-alpha.c:5919
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr "   ohjelmakuvaus  : 0x%08x\n"
 
-#: vms-alpha.c:5940
+#: vms-alpha.c:5921
 #, c-format
 msgid "   psect index: %u\n"
 msgstr "   psect-indeksi  : %u\n"
 
-#: vms-alpha.c:5951
+#: vms-alpha.c:5932
 #, c-format
 msgid "SYMV - Vectored symbol definition\n"
 msgstr "SYMV - Vektoroitu symbolimäärittely\n"
 
-#: vms-alpha.c:5955
+#: vms-alpha.c:5936
 #, c-format
 msgid "   vector      : 0x%08x\n"
 msgstr "    vektori     : 0x%08x\n"
 
-#: vms-alpha.c:5957 vms-alpha.c:5976
+#: vms-alpha.c:5938 vms-alpha.c:5957
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr "   psect-siirros: %u\n"
 
-#: vms-alpha.c:5970
+#: vms-alpha.c:5951
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
 msgstr "SYMM - Yleinen symbolimäärittely versiolla\n"
 
-#: vms-alpha.c:5974
+#: vms-alpha.c:5955
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr "   versiopeite : 0x%08x\n"
 
-#: vms-alpha.c:5985
+#: vms-alpha.c:5966
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr "käsittelemätön egsd-tulokohtatyyppi %u\n"
 
-#: vms-alpha.c:6019
+#: vms-alpha.c:6000
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr "    linkitysindeksi: %u, korvauskäsky: 0x%08x\n"
 
-#: vms-alpha.c:6022
+#: vms-alpha.c:6003
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr "    psect idx 1: %u, siirros 1: 0x%08x %08x\n"
 
-#: vms-alpha.c:6026
+#: vms-alpha.c:6007
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr "    psect idx 2: %u, siirros 2: 0x%08x %08x\n"
 
-#: vms-alpha.c:6031
+#: vms-alpha.c:6012
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr "    psect idx 3: %u, siirros 3: 0x%08x %08x\n"
 
-#: vms-alpha.c:6036
+#: vms-alpha.c:6017
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr "    yleisnimi: %.*s\n"
 
-#: vms-alpha.c:6046
+#: vms-alpha.c:6027
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr "  %s (pituus=%u+%u):\n"
 
-#: vms-alpha.c:6061
+#: vms-alpha.c:6042
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr "   (tyyppi: %3u, koko: 4+%3u): "
 
-#: vms-alpha.c:6065
+#: vms-alpha.c:6046
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr "STA_GBL (pino yleinen) %.*s\n"
 
-#: vms-alpha.c:6069
+#: vms-alpha.c:6050
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr "STA_LW (pino longword) 0x%08x\n"
 
-#: vms-alpha.c:6073
+#: vms-alpha.c:6054
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr "STA_QW (pino quadword) 0x%08x %08x\n"
 
-#: vms-alpha.c:6078
+#: vms-alpha.c:6059
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr "STA_PQ (pino psect-kanta + siirros)\n"
 
-#: vms-alpha.c:6079
+#: vms-alpha.c:6060
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr "    psect: %u, siirros: 0x%08x %08x\n"
 
-#: vms-alpha.c:6085
+#: vms-alpha.c:6066
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr "STA_LI (pinoliteraali)\n"
 
-#: vms-alpha.c:6088
+#: vms-alpha.c:6069
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr "STA_MOD (pinomoduli)\n"
 
-#: vms-alpha.c:6091
+#: vms-alpha.c:6072
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr "STA_CKARG (vertaa proseduuriargumenttia)\n"
 
-#: vms-alpha.c:6095
+#: vms-alpha.c:6076
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr "STO_B (tallenna byte)\n"
 
-#: vms-alpha.c:6098
+#: vms-alpha.c:6079
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr "STO_W (tallenna word)\n"
 
-#: vms-alpha.c:6101
+#: vms-alpha.c:6082
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr "STO_LW (tallenna longword)\n"
 
-#: vms-alpha.c:6104
+#: vms-alpha.c:6085
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr "STO_QW (tallenna quadword)\n"
 
-#: vms-alpha.c:6110
+#: vms-alpha.c:6091
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr "STO_IMMR (tallenna välitön toisto) %u tavua\n"
 
-#: vms-alpha.c:6117
+#: vms-alpha.c:6098
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr "STO_GBL (tallenna yleinen) %.*s\n"
 
-#: vms-alpha.c:6121
+#: vms-alpha.c:6102
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr "STO_CA (tallenna koodiosoite) %.*s\n"
 
-#: vms-alpha.c:6125
+#: vms-alpha.c:6106
 #, c-format
 msgid "STO_RB (store relative branch)\n"
 msgstr "STO_RB (tallenna suhteellinen haarautuminen)\n"
 
-#: vms-alpha.c:6128
+#: vms-alpha.c:6109
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
 msgstr "STO_AB (tallenna absoluuttinen haarautuminen)\n"
 
-#: vms-alpha.c:6131
+#: vms-alpha.c:6112
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr "STO_OFF (tallenna siirros kohteeseen psect)\n"
 
-#: vms-alpha.c:6137
+#: vms-alpha.c:6118
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr "STO_IMM (tallenna välitön) %u tavua\n"
 
-#: vms-alpha.c:6144
+#: vms-alpha.c:6125
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr "STO_GBL_LW (tallenna yleinen longword) %.*s\n"
 
-#: vms-alpha.c:6148
+#: vms-alpha.c:6129
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr "STO_OFF (tallenna LP-proseduurituntomerkillä)\n"
 
-#: vms-alpha.c:6151
+#: vms-alpha.c:6132
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
 msgstr "STO_BR_GBL (tallenna haarautuminen yleinen) *todo*\n"
 
-#: vms-alpha.c:6154
+#: vms-alpha.c:6135
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
 msgstr "STO_BR_PS (tallenna haarautuminen psect + siirros) *todo*\n"
 
-#: vms-alpha.c:6158
+#: vms-alpha.c:6139
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr "OPR_NOP (ei-toimintoa)\n"
 
-#: vms-alpha.c:6161
+#: vms-alpha.c:6142
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr "OPR_ADD (lisää)\n"
 
-#: vms-alpha.c:6164
+#: vms-alpha.c:6145
 #, c-format
 msgid "OPR_SUB (substract)\n"
 msgstr "OPR_SUB (vähennä)\n"
 
-#: vms-alpha.c:6167
+#: vms-alpha.c:6148
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr "OPR_MUL (kerro)\n"
 
-#: vms-alpha.c:6170
+#: vms-alpha.c:6151
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr "OPR_DIV (jaa)\n"
 
-#: vms-alpha.c:6173
+#: vms-alpha.c:6154
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr "OPR_AND (looginen ja)\n"
 
-#: vms-alpha.c:6176
+#: vms-alpha.c:6157
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr "OPR_IOR (looginen kattava tai)\n"
 
-#: vms-alpha.c:6179
+#: vms-alpha.c:6160
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr "OPR_EOR (loogisesti poissulkeva tai)\n"
 
-#: vms-alpha.c:6182
+#: vms-alpha.c:6163
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr "OPR_NEG (kieltävä)\n"
 
-#: vms-alpha.c:6185
+#: vms-alpha.c:6166
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr "OPR_COM (komplementti)\n"
 
-#: vms-alpha.c:6188
+#: vms-alpha.c:6169
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr "OPR_INSV (lisää kenttä)\n"
 
-#: vms-alpha.c:6191
+#: vms-alpha.c:6172
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr "OPR_ASH (aritmeettinen sivuttaissiirto)\n"
 
-#: vms-alpha.c:6194
+#: vms-alpha.c:6175
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr "OPR_USH (etumerkitön sivuttaissiirto)\n"
 
-#: vms-alpha.c:6197
+#: vms-alpha.c:6178
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr "OPR_ROT (pyöritä)\n"
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6181
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr "OPR_SEL (valitse)\n"
 
-#: vms-alpha.c:6203
+#: vms-alpha.c:6184
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr "OPR_REDEF (määritä symboli uudelleen nykyiseen paikkaan)\n"
 
-#: vms-alpha.c:6206
+#: vms-alpha.c:6187
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr "OPR_REDEF (määritä literaali)\n"
 
-#: vms-alpha.c:6210
+#: vms-alpha.c:6191
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr "STC_LP (tallenna ehdollinen linkityspari)\n"
 
-#: vms-alpha.c:6214
+#: vms-alpha.c:6195
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr "STC_LP_PSB (tallenna ehdollinen linkityspari + tuntomerkki)\n"
 
-#: vms-alpha.c:6215
+#: vms-alpha.c:6196
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr "   linkitysindeksi: %u, proseduuri: %.*s\n"
 
-#: vms-alpha.c:6218
+#: vms-alpha.c:6199
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr "   tuntomerkki: %.*s\n"
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6202
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr "STC_GBL (tallenna ehdollinen yleinen)\n"
 
-#: vms-alpha.c:6222
+#: vms-alpha.c:6203
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr "   linkitysindeksi: %u, yleinen: %.*s\n"
 
-#: vms-alpha.c:6226
+#: vms-alpha.c:6207
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr "STC_GCA (tallenna ehdollinen koodiosoite)\n"
 
-#: vms-alpha.c:6227
+#: vms-alpha.c:6208
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr "   linkitysindeksi: %u, proseduurinimi: %.*s\n"
 
-#: vms-alpha.c:6231
+#: vms-alpha.c:6212
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr "STC_PS (tallenna ehdollinen psect + siirros)\n"
 
-#: vms-alpha.c:6233
+#: vms-alpha.c:6214
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr "   linkitysindeksi: %u, psect: %u, siirros: 0x%08x %08x\n"
 
-#: vms-alpha.c:6240
+#: vms-alpha.c:6221
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr "STC_NOP_GBL (tallenna ehdollinen NOP yleisosoitteessa)\n"
 
-#: vms-alpha.c:6244
+#: vms-alpha.c:6225
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr "STC_NOP_PS (tallenna ehdollinen NOP kohteessa psect + siirros)\n"
 
-#: vms-alpha.c:6248
+#: vms-alpha.c:6229
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr "STC_BSR_GBL (tallenna ehdollinen BSR yleisosoitteessa)\n"
 
-#: vms-alpha.c:6252
+#: vms-alpha.c:6233
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr "STC_BSR_PS (tallenna ehdollinen BSR kohteessa psect + siirros)\n"
 
-#: vms-alpha.c:6256
+#: vms-alpha.c:6237
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr "STC_LDA_GBL (tallenna ehdollinen LDA yleisosoitteessa)\n"
 
-#: vms-alpha.c:6260
+#: vms-alpha.c:6241
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr "STC_LDA_PS (tallenna ehdollinen LDA kohteessa psect + siirros)\n"
 
-#: vms-alpha.c:6264
+#: vms-alpha.c:6245
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr "STC_BOH_GBL (tallenna ehdollinen BOH yleisosoitteessa)\n"
 
-#: vms-alpha.c:6268
+#: vms-alpha.c:6249
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr "STC_BOH_PS (tallenna ehdollinen BOH kohteessa psect + siirros)\n"
 
-#: vms-alpha.c:6273
+#: vms-alpha.c:6254
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr "STC_NBH_GBL (tallenna ehdollinen tai vihje yleisosoitteessa)\n"
 
-#: vms-alpha.c:6277
+#: vms-alpha.c:6258
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr "STC_NBH_PS (tallenna ehdollinen tai vihje kohteessa psect + siirros)\n"
 
-#: vms-alpha.c:6281
+#: vms-alpha.c:6262
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
 msgstr "CTL_SETRB (aseta sijoituskanta)\n"
 
-#: vms-alpha.c:6287
+#: vms-alpha.c:6268
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
 msgstr "CTL_AUGRB (lisäyssijoituskanta) %u\n"
 
-#: vms-alpha.c:6291
+#: vms-alpha.c:6272
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
 msgstr "CTL_DFLOC (määritä paikka)\n"
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6275
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr "CTL_STLOC (aseta paikka)\n"
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6278
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
 msgstr "CTL_STKDL (pinomääritelty paikka)\n"
 
-#: vms-alpha.c:6300 vms-alpha.c:6714
+#: vms-alpha.c:6281 vms-alpha.c:6695
 #, c-format
 msgid "*unhandled*\n"
 msgstr "*käsittelemätön*\n"
 
-#: vms-alpha.c:6330 vms-alpha.c:6369
+#: vms-alpha.c:6311 vms-alpha.c:6350
 #, c-format
 msgid "cannot read GST record length\n"
 msgstr "ei voida lukea GST-tietuepituutta\n"
 
 #. Ill-formed.
-#: vms-alpha.c:6351
+#: vms-alpha.c:6332
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr "ei voi löytää kohdetta EMH ensimmäisessä GST-tietueessa\n"
 
-#: vms-alpha.c:6377
+#: vms-alpha.c:6358
 #, c-format
 msgid "cannot read GST record header\n"
 msgstr "ei voida lukea GST-tietueotsaketta\n"
 
-#: vms-alpha.c:6390
+#: vms-alpha.c:6371
 #, c-format
 msgid " corrupted GST\n"
 msgstr " rikkoutunut kohde GST\n"
 
-#: vms-alpha.c:6398
+#: vms-alpha.c:6379
 #, c-format
 msgid "cannot read GST record\n"
 msgstr "ei voida lukea GST-tietuetta\n"
 
-#: vms-alpha.c:6427
+#: vms-alpha.c:6408
 #, c-format
 msgid " unhandled EOBJ record type %u\n"
 msgstr " käsittelemätön EOBJ-tietuetyyppi %u\n"
 
-#: vms-alpha.c:6450
+#: vms-alpha.c:6431
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr "  bittilukumäärä: %u, perusosoite: 0x%08x\n"
 
-#: vms-alpha.c:6463
+#: vms-alpha.c:6444
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
-msgstr "   bittikartta: 0x%08x (lukumäärä: %u):\n"
+msgstr "   bitmap: 0x%08x (lukumäärä: %u):\n"
 
-#: vms-alpha.c:6470
+#: vms-alpha.c:6451
 #, c-format
 msgid " %08x"
 msgstr " %08x"
 
-#: vms-alpha.c:6495
+#: vms-alpha.c:6476
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr "  vedos %u (%u alkiota)\n"
 
-#: vms-alpha.c:6500
+#: vms-alpha.c:6481
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr "   siirros: 0x%08x, arvo: 0x%08x\n"
 
-#: vms-alpha.c:6521
+#: vms-alpha.c:6502
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr "  vedos %u (%u alkiota), siirrokset:\n"
 
-#: vms-alpha.c:6528
+#: vms-alpha.c:6509
 #, c-format
 msgid " 0x%08x"
 msgstr " 0x%08x"
 
 #. 64 bits.
-#: vms-alpha.c:6650
+#: vms-alpha.c:6631
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr "64 bittinen *käsittelemätön*\n"
 
-#: vms-alpha.c:6654
+#: vms-alpha.c:6635
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr "luokka: %u, dtype: %u, pituus: %u, osoitin: 0x%08x\n"
 
-#: vms-alpha.c:6665
+#: vms-alpha.c:6646
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr "ei-yhtenäinen %s-taulukko\n"
 
-#: vms-alpha.c:6669
+#: vms-alpha.c:6650
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr "dimct: %u, a-liput: 0x%02x, numerot: %u, skaala: %u\n"
 
-#: vms-alpha.c:6673
+#: vms-alpha.c:6654
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr "arsize: %u, a0: 0x%08x\n"
 
-#: vms-alpha.c:6677
+#: vms-alpha.c:6658
 #, c-format
 msgid "Strides:\n"
 msgstr "Askeleet:\n"
 
-#: vms-alpha.c:6682
+#: vms-alpha.c:6663
 #, c-format
 msgid "[%u]: %u\n"
 msgstr "[%u]: %u\n"
 
-#: vms-alpha.c:6687
+#: vms-alpha.c:6668
 #, c-format
 msgid "Bounds:\n"
 msgstr "Rajat:\n"
 
-#: vms-alpha.c:6692
+#: vms-alpha.c:6673
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr "[%u]: Alempi: %u, ylempi: %u\n"
 
-#: vms-alpha.c:6704
+#: vms-alpha.c:6685
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr "tasaamaton %s-bittimerkkijono\n"
 
-#: vms-alpha.c:6708
+#: vms-alpha.c:6689
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr "kanta: %u, paikka: %u\n"
 
-#: vms-alpha.c:6728
+#: vms-alpha.c:6709
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr "v-liput: 0x%02x, arvo: 0x%08x "
 
-#: vms-alpha.c:6734
+#: vms-alpha.c:6715
 #, c-format
 msgid "(no value)\n"
 msgstr "(ei arvoa)\n"
 
-#: vms-alpha.c:6737
+#: vms-alpha.c:6718
 #, c-format
 msgid "(not active)\n"
 msgstr "(ei käytössä)\n"
 
-#: vms-alpha.c:6740
+#: vms-alpha.c:6721
 #, c-format
 msgid "(not allocated)\n"
 msgstr "(ei varattu)\n"
 
-#: vms-alpha.c:6743
+#: vms-alpha.c:6724
 #, c-format
 msgid "(descriptor)\n"
 msgstr "(kuvaaja)\n"
 
-#: vms-alpha.c:6747
+#: vms-alpha.c:6728
 #, c-format
 msgid "(trailing value)\n"
 msgstr "(jälkiarvo)\n"
 
-#: vms-alpha.c:6750
+#: vms-alpha.c:6731
 #, c-format
 msgid "(value spec follows)\n"
 msgstr "(arvomäärittely seuraa)\n"
 
-#: vms-alpha.c:6753
+#: vms-alpha.c:6734
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr "(bittisiirroksessa %u)\n"
 
-#: vms-alpha.c:6756
+#: vms-alpha.c:6737
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr "(rekisteri: %u, sijoitus: %u, suunta: %u, tyyppi: "
 
-#: vms-alpha.c:6763
+#: vms-alpha.c:6744
 msgid "literal"
 msgstr "literaali"
 
-#: vms-alpha.c:6766
+#: vms-alpha.c:6747
 msgid "address"
 msgstr "osoite"
 
-#: vms-alpha.c:6769
+#: vms-alpha.c:6750
 msgid "desc"
 msgstr "kuvaus"
 
-#: vms-alpha.c:6772
+#: vms-alpha.c:6753
 msgid "reg"
 msgstr "rekisteri"
 
-#: vms-alpha.c:6847
+#: vms-alpha.c:6828
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr "Vianjäljityssymbolitaulu:\n"
 
-#: vms-alpha.c:6858
+#: vms-alpha.c:6839
 #, c-format
 msgid "cannot read DST header\n"
 msgstr "ei voida lukea DST-otsaketta\n"
 
-#: vms-alpha.c:6863
+#: vms-alpha.c:6844
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr " tyyppi: %3u, pituus: %3u (osoitteessa 0x%08x): "
 
-#: vms-alpha.c:6877
+#: vms-alpha.c:6858
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr "ei voida lukea DST-symbolia\n"
 
-#: vms-alpha.c:6920
+#: vms-alpha.c:6901
 #, c-format
 msgid "standard data: %s\n"
 msgstr "vakiotiedot: %s\n"
 
-#: vms-alpha.c:6923 vms-alpha.c:7007
+#: vms-alpha.c:6904 vms-alpha.c:6988
 #, c-format
 msgid "    name: %.*s\n"
 msgstr "    nimi: %.*s\n"
 
-#: vms-alpha.c:6930
+#: vms-alpha.c:6911
 #, c-format
 msgid "modbeg\n"
 msgstr "modbeg-alku\n"
 
-#: vms-alpha.c:6931
+#: vms-alpha.c:6912
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr "   liput: %d, kieli: %u, major: %u, minor: %u\n"
 
-#: vms-alpha.c:6937 vms-alpha.c:7203
+#: vms-alpha.c:6918 vms-alpha.c:7184
 #, c-format
 msgid "   module name: %.*s\n"
 msgstr "   modulinimi: %.*s\n"
 
-#: vms-alpha.c:6940
+#: vms-alpha.c:6921
 #, c-format
 msgid "   compiler   : %.*s\n"
 msgstr "   kääntäjä   : %.*s\n"
 
-#: vms-alpha.c:6945
+#: vms-alpha.c:6926
 #, c-format
 msgid "modend\n"
 msgstr "modend-loppu\n"
 
-#: vms-alpha.c:6952
+#: vms-alpha.c:6933
 msgid "rtnbeg\n"
 msgstr "rtnbeg-alku\n"
 
-#: vms-alpha.c:6953
+#: vms-alpha.c:6934
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr "    liput: %u, osoite: 0x%08x, pd-osoite: 0x%08x\n"
 
-#: vms-alpha.c:6958
+#: vms-alpha.c:6939
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr "    rutiininimi: %.*s\n"
 
-#: vms-alpha.c:6966
+#: vms-alpha.c:6947
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr "rtnend-loppu: koko 0x%08x\n"
 
-#: vms-alpha.c:6974
+#: vms-alpha.c:6955
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr "prolog: bkpt-osoite 0x%08x\n"
 
-#: vms-alpha.c:6982
+#: vms-alpha.c:6963
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr "epilog: liput: %u, lukumäärä: %u\n"
 
-#: vms-alpha.c:6991
+#: vms-alpha.c:6972
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr "blkbeg-alku: osoite: 0x%08x, nimi: %.*s\n"
 
-#: vms-alpha.c:7000
+#: vms-alpha.c:6981
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr "blkend-loppu: koko: 0x%08x\n"
 
-#: vms-alpha.c:7006
+#: vms-alpha.c:6987
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr "typspec (pituus: %u)\n"
 
-#: vms-alpha.c:7013
+#: vms-alpha.c:6994
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr "septyp, nimi: %.*s\n"
 
-#: vms-alpha.c:7022
+#: vms-alpha.c:7003
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr "recbeg-alku: nimi: %.*s\n"
 
-#: vms-alpha.c:7029
+#: vms-alpha.c:7010
 #, c-format
 msgid "recend\n"
 msgstr "recend-loppu\n"
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7013
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr "enumbeg-alku, pituus: %u, nimi: %.*s\n"
 
-#: vms-alpha.c:7036
+#: vms-alpha.c:7017
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr "enumelt, nimi: %.*s\n"
 
-#: vms-alpha.c:7040
+#: vms-alpha.c:7021
 #, c-format
 msgid "enumend\n"
 msgstr "enumend-loppu\n"
 
-#: vms-alpha.c:7057
+#: vms-alpha.c:7038
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr "ei-yhtenäinen lukualue (numero: %u)\n"
 
-#: vms-alpha.c:7059
+#: vms-alpha.c:7040
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr "    osoite: 0x%08x, koko: %u\n"
 
-#: vms-alpha.c:7069
+#: vms-alpha.c:7050
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr "rivinumero (pituus: %u)\n"
 
-#: vms-alpha.c:7086
+#: vms-alpha.c:7067
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr "delta_pc_w %u\n"
 
-#: vms-alpha.c:7093
+#: vms-alpha.c:7074
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr "incr_linum(b): +%u\n"
 
-#: vms-alpha.c:7099
+#: vms-alpha.c:7080
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr "incr_linum_w: +%u\n"
 
-#: vms-alpha.c:7105
+#: vms-alpha.c:7086
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr "incr_linum_l: +%u\n"
 
-#: vms-alpha.c:7111
+#: vms-alpha.c:7092
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr "set_line_num(w) %u\n"
 
-#: vms-alpha.c:7116
+#: vms-alpha.c:7097
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr "set_line_num_b %u\n"
 
-#: vms-alpha.c:7121
+#: vms-alpha.c:7102
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr "set_line_num_l %u\n"
 
-#: vms-alpha.c:7126
+#: vms-alpha.c:7107
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr "set_abs_pc: 0x%08x\n"
 
-#: vms-alpha.c:7130
+#: vms-alpha.c:7111
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr "delta_pc_l: +0x%08x\n"
 
-#: vms-alpha.c:7135
+#: vms-alpha.c:7116
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr "term(b): 0x%02x"
 
-#: vms-alpha.c:7137
+#: vms-alpha.c:7118
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr "        pc: 0x%08x\n"
 
-#: vms-alpha.c:7142
+#: vms-alpha.c:7123
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr "term_w: 0x%04x"
 
-#: vms-alpha.c:7144
+#: vms-alpha.c:7125
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr "    pc: 0x%08x\n"
 
-#: vms-alpha.c:7150
+#: vms-alpha.c:7131
 #, c-format
 msgid "delta pc +%-4d"
 msgstr "delta pc +%-4d"
 
-#: vms-alpha.c:7153
+#: vms-alpha.c:7134
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
 msgstr "    pc: 0x%08x rivi: %5u\n"
 
-#: vms-alpha.c:7158
+#: vms-alpha.c:7139
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr "    *käsittelemätön* komento %u\n"
 
-#: vms-alpha.c:7173
+#: vms-alpha.c:7154
 #, c-format
 msgid "source (len: %u)\n"
 msgstr "lähde (pituus: %u)\n"
 
-#: vms-alpha.c:7187
+#: vms-alpha.c:7168
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr "   declfile: pituus: %u, liput: %u, tiedostotunniste: %u\n"
 
-#: vms-alpha.c:7191
+#: vms-alpha.c:7172
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 
-#: vms-alpha.c:7200
+#: vms-alpha.c:7181
 #, c-format
 msgid "   filename   : %.*s\n"
 msgstr "   tiedostonimi: %.*s\n"
 
-#: vms-alpha.c:7209
+#: vms-alpha.c:7190
 #, c-format
 msgid "   setfile %u\n"
 msgstr "   setfile %u\n"
 
-#: vms-alpha.c:7214 vms-alpha.c:7219
+#: vms-alpha.c:7195 vms-alpha.c:7200
 #, c-format
 msgid "   setrec %u\n"
 msgstr "   setrec %u\n"
 
-#: vms-alpha.c:7224 vms-alpha.c:7229
+#: vms-alpha.c:7205 vms-alpha.c:7210
 #, c-format
 msgid "   setlnum %u\n"
 msgstr "   setlnum %u\n"
 
-#: vms-alpha.c:7234 vms-alpha.c:7239
+#: vms-alpha.c:7215 vms-alpha.c:7220
 #, c-format
 msgid "   deflines %u\n"
 msgstr "   deflines %u\n"
 
-#: vms-alpha.c:7243
+#: vms-alpha.c:7224
 #, c-format
 msgid "   formfeed\n"
 msgstr "   formfeed\n"
 
-#: vms-alpha.c:7247
+#: vms-alpha.c:7228
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr "   *käsittelemätön* komento %u\n"
 
-#: vms-alpha.c:7259
+#: vms-alpha.c:7240
 #, c-format
 msgid "*unhandled* dst type %u\n"
 msgstr "*käsittelemätön* kohdetyyppi %u\n"
 
-#: vms-alpha.c:7291
+#: vms-alpha.c:7272
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr "ei voida lukea kohdetta EIHD\n"
 
-#: vms-alpha.c:7294
+#: vms-alpha.c:7275
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr "EIHD: (koko: %u, nbr lohkoa: %u)\n"
 
-#: vms-alpha.c:7297
+#: vms-alpha.c:7278
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr " majorid: %u, minorid: %u\n"
 
-#: vms-alpha.c:7305
+#: vms-alpha.c:7286
 msgid "executable"
 msgstr "suoritettava tiedosto"
 
-#: vms-alpha.c:7308
+#: vms-alpha.c:7289
 msgid "linkable image"
 msgstr "linkitettävä vedos"
 
-#: vms-alpha.c:7314
+#: vms-alpha.c:7295
 #, c-format
 msgid " image type: %u (%s)"
 msgstr " vedostyyppi: %u (%s)"
 
-#: vms-alpha.c:7320
+#: vms-alpha.c:7301
 msgid "native"
 msgstr "kotoperäinen"
 
-#: vms-alpha.c:7323
+#: vms-alpha.c:7304
 msgid "CLI"
 msgstr "CLI"
 
-#: vms-alpha.c:7329
+#: vms-alpha.c:7310
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ", alityyppi: %u (%s)\n"
 
-#: vms-alpha.c:7335
+#: vms-alpha.c:7316
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr " siirrokset: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 
-#: vms-alpha.c:7339
+#: vms-alpha.c:7320
 #, c-format
 msgid " fixup info rva: "
 msgstr " korjaustiedot rva: "
 
-#: vms-alpha.c:7341
+#: vms-alpha.c:7322
 #, c-format
 msgid ", symbol vector rva: "
 msgstr ", symbolivektori rva: "
 
-#: vms-alpha.c:7344
+#: vms-alpha.c:7325
 #, c-format
 msgid ""
 "\n"
@@ -5211,461 +5013,461 @@ msgstr ""
 "\n"
 " versiotaulukkosiirros: %u\n"
 
-#: vms-alpha.c:7348
+#: vms-alpha.c:7329
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr " img I/O lukumäärä: %u, kanavien lukumäärä: %u, req pri: %08x%08x\n"
 
-#: vms-alpha.c:7354
+#: vms-alpha.c:7335
 #, c-format
 msgid " linker flags: %08x:"
 msgstr " linkkeriliput: %08x:"
 
-#: vms-alpha.c:7384
+#: vms-alpha.c:7365
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr " ident: 0x%08x, sysver: 0x%08x, täsmää ctrl: %u, symvect_size: %u\n"
 
-#: vms-alpha.c:7390
+#: vms-alpha.c:7371
 #, c-format
 msgid " BPAGE: %u"
 msgstr " BPAGE: %u"
 
-#: vms-alpha.c:7396
+#: vms-alpha.c:7377
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ", ext korjaussiirros: %u, no_opt psect -siirros: %u"
 
-#: vms-alpha.c:7399
+#: vms-alpha.c:7380
 #, c-format
 msgid ", alias: %u\n"
 msgstr ", alias: %u\n"
 
-#: vms-alpha.c:7407
+#: vms-alpha.c:7388
 #, c-format
 msgid "system version array information:\n"
 msgstr "järjestelmäversion taulukkotiedot:\n"
 
-#: vms-alpha.c:7411
+#: vms-alpha.c:7392
 #, c-format
 msgid "cannot read EIHVN header\n"
 msgstr "ei voida lukea EIHVN-otsaketta\n"
 
-#: vms-alpha.c:7421
+#: vms-alpha.c:7402
 #, c-format
 msgid "cannot read EIHVN version\n"
 msgstr "ei voida lukea EIHVN-versiota\n"
 
-#: vms-alpha.c:7424
+#: vms-alpha.c:7405
 #, c-format
 msgid "   %02u "
 msgstr "   %02u "
 
-#: vms-alpha.c:7428
+#: vms-alpha.c:7409
 msgid "BASE_IMAGE       "
 msgstr "PERUS_VEDOS      "
 
-#: vms-alpha.c:7431
+#: vms-alpha.c:7412
 msgid "MEMORY_MANAGEMENT"
 msgstr "MUISTI_HALLINTA  "
 
-#: vms-alpha.c:7434
+#: vms-alpha.c:7415
 msgid "IO               "
 msgstr "SIIRRÄNTÄ        "
 
-#: vms-alpha.c:7437
+#: vms-alpha.c:7418
 msgid "FILES_VOLUMES    "
 msgstr "TIEDOSTOT_TALTIOT"
 
-#: vms-alpha.c:7440
+#: vms-alpha.c:7421
 msgid "PROCESS_SCHED    "
 msgstr "PROSESSI_AIKAT.  "
 
-#: vms-alpha.c:7443
+#: vms-alpha.c:7424
 msgid "SYSGEN           "
 msgstr "SYSGEN           "
 
-#: vms-alpha.c:7446
+#: vms-alpha.c:7427
 msgid "CLUSTERS_LOCKMGR "
 msgstr "KLUSTERIEN_LUKOT "
 
-#: vms-alpha.c:7449
+#: vms-alpha.c:7430
 msgid "LOGICAL_NAMES    "
 msgstr "LOOGISET_NIMET   "
 
-#: vms-alpha.c:7452
+#: vms-alpha.c:7433
 msgid "SECURITY         "
 msgstr "TURVALLISUUS     "
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7436
 msgid "IMAGE_ACTIVATOR  "
 msgstr "VEDOS_AKTIVOIJA  "
 
-#: vms-alpha.c:7458
+#: vms-alpha.c:7439
 msgid "NETWORKS         "
 msgstr "VERKOT           "
 
-#: vms-alpha.c:7461
+#: vms-alpha.c:7442
 msgid "COUNTERS         "
 msgstr "LASKURIT         "
 
-#: vms-alpha.c:7464
+#: vms-alpha.c:7445
 msgid "STABLE           "
 msgstr "STABIILI         "
 
-#: vms-alpha.c:7467
+#: vms-alpha.c:7448
 msgid "MISC             "
 msgstr "SEKALAISET       "
 
-#: vms-alpha.c:7470
+#: vms-alpha.c:7451
 msgid "CPU              "
 msgstr "PROSESSORI       "
 
-#: vms-alpha.c:7473
+#: vms-alpha.c:7454
 msgid "VOLATILE         "
 msgstr "KATOAVA          "
 
-#: vms-alpha.c:7476
+#: vms-alpha.c:7457
 msgid "SHELL            "
 msgstr "KUORI            "
 
-#: vms-alpha.c:7479
+#: vms-alpha.c:7460
 msgid "POSIX            "
 msgstr "POSIX            "
 
-#: vms-alpha.c:7482
+#: vms-alpha.c:7463
 msgid "MULTI_PROCESSING "
 msgstr "MONI_PROSESSOINTI"
 
-#: vms-alpha.c:7485
+#: vms-alpha.c:7466
 msgid "GALAXY           "
 msgstr "GALAKSI          "
 
-#: vms-alpha.c:7488
+#: vms-alpha.c:7469
 msgid "*unknown*        "
 msgstr "*tuntematon*     "
 
-#: vms-alpha.c:7491
+#: vms-alpha.c:7472
 #, c-format
 msgid ": %u.%u\n"
 msgstr ": %u.%u\n"
 
-#: vms-alpha.c:7504 vms-alpha.c:7763
+#: vms-alpha.c:7485 vms-alpha.c:7744
 #, c-format
 msgid "cannot read EIHA\n"
 msgstr "ei voida lukea kohdetta EIHA\n"
 
-#: vms-alpha.c:7507
+#: vms-alpha.c:7488
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr "Vedosaktivointi:  (koko=%u)\n"
 
-#: vms-alpha.c:7509
+#: vms-alpha.c:7490
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
 msgstr " Ensimmäinen osoite : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7512
+#: vms-alpha.c:7493
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
 msgstr " Toinen osoite      : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7515
+#: vms-alpha.c:7496
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
 msgstr " Kolmas osoite      : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7499
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
 msgstr " Neljäs osoite      : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7521
+#: vms-alpha.c:7502
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
 msgstr " Jaettu vedos       : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7532
+#: vms-alpha.c:7513
 #, c-format
 msgid "cannot read EIHI\n"
 msgstr "ei voida lukea kohdetta EIHI\n"
 
-#: vms-alpha.c:7535
+#: vms-alpha.c:7516
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr "Vedostunnistus: (major: %u, minor: %u)\n"
 
-#: vms-alpha.c:7538
+#: vms-alpha.c:7519
 #, c-format
 msgid " image name       : %.*s\n"
 msgstr " vedosnimi             : %.*s\n"
 
-#: vms-alpha.c:7540
+#: vms-alpha.c:7521
 #, c-format
 msgid " link time        : %s\n"
 msgstr " linkitysaika          : %s\n"
 
-#: vms-alpha.c:7542
+#: vms-alpha.c:7523
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr " vedossisennys         : %.*s\n"
 
-#: vms-alpha.c:7544
+#: vms-alpha.c:7525
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr " linkkeri-ident        : %.*s\n"
 
-#: vms-alpha.c:7546
+#: vms-alpha.c:7527
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr " vedoksen rakennusident: %.*s\n"
 
-#: vms-alpha.c:7556
+#: vms-alpha.c:7537
 #, c-format
 msgid "cannot read EIHS\n"
 msgstr "ei voida lukea kohdetta EIHS\n"
 
-#: vms-alpha.c:7559
+#: vms-alpha.c:7540
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
 msgstr "Vedossymboli- ja vianjäljitystaulu: (major: %u, minor: %u)\n"
 
-#: vms-alpha.c:7564
+#: vms-alpha.c:7545
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
 msgstr " vianjäljityssymbolitaulu : vbn: %u, koko: %u (0x%x)\n"
 
-#: vms-alpha.c:7568
+#: vms-alpha.c:7549
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
 msgstr " yleinen symbolitaulu: vbn: %u, tietueet: %u\n"
 
-#: vms-alpha.c:7572
+#: vms-alpha.c:7553
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
 msgstr " vianjäljitysmodulitaulu : vbn: %u, koko: %u\n"
 
-#: vms-alpha.c:7585
+#: vms-alpha.c:7566
 #, c-format
 msgid "cannot read EISD\n"
 msgstr "ei voida lukea kohdetta EISD\n"
 
-#: vms-alpha.c:7595
+#: vms-alpha.c:7576
 #, c-format
 msgid "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
 msgstr "Vedoslohkokuvaaja: (major: %u, minor: %u, koko: %u, siirros: %u)\n"
 
-#: vms-alpha.c:7602
+#: vms-alpha.c:7583
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr " lohko: kanta: 0x%08x%08x koko: 0x%08x\n"
 
-#: vms-alpha.c:7607
+#: vms-alpha.c:7588
 #, c-format
 msgid " flags: 0x%04x"
 msgstr " liput: 0x%04x"
 
-#: vms-alpha.c:7644
+#: vms-alpha.c:7625
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr " vbn: %u, pfc: %u, matchctl: %u tyyppi: %u ("
 
-#: vms-alpha.c:7650
+#: vms-alpha.c:7631
 msgid "NORMAL"
 msgstr "NORMAALI"
 
-#: vms-alpha.c:7653
+#: vms-alpha.c:7634
 msgid "SHRFXD"
 msgstr "SHRFXD"
 
-#: vms-alpha.c:7656
+#: vms-alpha.c:7637
 msgid "PRVFXD"
 msgstr "PRVFXD"
 
-#: vms-alpha.c:7659
+#: vms-alpha.c:7640
 msgid "SHRPIC"
 msgstr "SHRPIC"
 
-#: vms-alpha.c:7662
+#: vms-alpha.c:7643
 msgid "PRVPIC"
 msgstr "PRVPIC"
 
-#: vms-alpha.c:7665
+#: vms-alpha.c:7646
 msgid "USRSTACK"
 msgstr "USRSTACK"
 
-#: vms-alpha.c:7673
+#: vms-alpha.c:7654
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr " ident: 0x%08x, nimi: %.*s\n"
 
-#: vms-alpha.c:7683
+#: vms-alpha.c:7664
 #, c-format
 msgid "cannot read DMT\n"
 msgstr "ei voida lukea kohdetta DMT\n"
 
-#: vms-alpha.c:7687
+#: vms-alpha.c:7668
 #, c-format
 msgid "Debug module table:\n"
 msgstr "Vianjäljitysmodulitaulu:\n"
 
-#: vms-alpha.c:7696
+#: vms-alpha.c:7677
 #, c-format
 msgid "cannot read DMT header\n"
 msgstr "ei voida lukea DMT-otsaketta\n"
 
-#: vms-alpha.c:7701
+#: vms-alpha.c:7682
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
 msgstr " modulisiirros: 0x%08x, koko: 0x%08x, (%u psects)\n"
 
-#: vms-alpha.c:7711
+#: vms-alpha.c:7692
 #, c-format
 msgid "cannot read DMT psect\n"
 msgstr "ei voida lukea kohdetta DMT psect\n"
 
-#: vms-alpha.c:7714
+#: vms-alpha.c:7695
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
 msgstr "  psect-alku: 0x%08x, pituus: %u\n"
 
-#: vms-alpha.c:7727
+#: vms-alpha.c:7708
 #, c-format
 msgid "cannot read DST\n"
 msgstr "ei voida lukea kohdetta DST\n"
 
-#: vms-alpha.c:7737
+#: vms-alpha.c:7718
 #, c-format
 msgid "cannot read GST\n"
 msgstr "ei voida lukea kohdetta GST\n"
 
-#: vms-alpha.c:7741
+#: vms-alpha.c:7722
 #, c-format
 msgid "Global symbol table:\n"
 msgstr "Yleinen symbolitaulu:\n"
 
-#: vms-alpha.c:7769
+#: vms-alpha.c:7750
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr "Vedosaktivaattorikorjaus: (major: %u, minor: %u)\n"
 
-#: vms-alpha.c:7772
+#: vms-alpha.c:7753
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
 msgstr "  iaflink : 0x%08x %08x\n"
 
-#: vms-alpha.c:7775
+#: vms-alpha.c:7756
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
 msgstr "  fixuplnk: 0x%08x %08x\n"
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7759
 #, c-format
 msgid "  size : %u\n"
 msgstr "  koko : %u\n"
 
-#: vms-alpha.c:7780
+#: vms-alpha.c:7761
 #, c-format
 msgid "  flags: 0x%08x\n"
 msgstr "  liput: 0x%08x\n"
 
-#: vms-alpha.c:7784
+#: vms-alpha.c:7765
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 msgstr "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 
-#: vms-alpha.c:7788
+#: vms-alpha.c:7769
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
 msgstr "  qdotadroff: %5u, ldotadroff: %5u\n"
 
-#: vms-alpha.c:7792
+#: vms-alpha.c:7773
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
 msgstr "  codeadroff: %5u, lpfixoff  : %5u\n"
 
-#: vms-alpha.c:7795
+#: vms-alpha.c:7776
 #, c-format
 msgid "  chgprtoff : %5u\n"
 msgstr "  chgprtoff : %5u\n"
 
-#: vms-alpha.c:7798
+#: vms-alpha.c:7779
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
 msgstr "  shlstoff  : %5u, shrimgcnt : %5u\n"
 
-#: vms-alpha.c:7800
+#: vms-alpha.c:7781
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
 msgstr "  shlextra  : %5u, permctx   : %5u\n"
 
-#: vms-alpha.c:7803
+#: vms-alpha.c:7784
 #, c-format
 msgid "  base_va : 0x%08x\n"
 msgstr "  base_va : 0x%08x\n"
 
-#: vms-alpha.c:7805
+#: vms-alpha.c:7786
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
 msgstr "  lppsbfixoff: %5u\n"
 
-#: vms-alpha.c:7813
+#: vms-alpha.c:7794
 #, c-format
 msgid " Shareable images:\n"
 msgstr " Jaettavat vedokset:\n"
 
-#: vms-alpha.c:7817
+#: vms-alpha.c:7798
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
 msgstr "  %u: koko: %u, liput: 0x%02x, nimi: %.*s\n"
 
-#: vms-alpha.c:7824
+#: vms-alpha.c:7805
 #, c-format
 msgid " quad-word relocation fixups:\n"
 msgstr " quad-sanaiset sijoituskorjaukset:\n"
 
-#: vms-alpha.c:7829
+#: vms-alpha.c:7810
 #, c-format
 msgid " long-word relocation fixups:\n"
 msgstr " long-word-sijoituskorjaukset:\n"
 
-#: vms-alpha.c:7834
+#: vms-alpha.c:7815
 #, c-format
 msgid " quad-word .address reference fixups:\n"
 msgstr " quad-word .address -viitekorjaukset:\n"
 
-#: vms-alpha.c:7839
+#: vms-alpha.c:7820
 #, c-format
 msgid " long-word .address reference fixups:\n"
 msgstr " long-word .address -viitekorjaukset:\n"
 
-#: vms-alpha.c:7844
+#: vms-alpha.c:7825
 #, c-format
 msgid " Code Address Reference Fixups:\n"
 msgstr " Koodiosoiteviitekorjaukset:\n"
 
-#: vms-alpha.c:7849
+#: vms-alpha.c:7830
 #, c-format
 msgid " Linkage Pairs Referece Fixups:\n"
 msgstr " Linkitysparien viitekorjaukset:\n"
 
-#: vms-alpha.c:7858
+#: vms-alpha.c:7839
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr " Vaihda suoja (%u alkiota):\n"
 
-#: vms-alpha.c:7863
+#: vms-alpha.c:7844
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
 msgstr "  kanta: 0x%08x %08x, koko: 0x%08x, prot: 0x%08x "
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8694
+#: vms-alpha.c:8676
 msgid "%P: relocatable link is not supported\n"
 msgstr "%P: sijoitettava linkki ei ole tuettu\n"
 
-#: vms-alpha.c:8764
+#: vms-alpha.c:8746
 msgid "%P: multiple entry points: in modules %B and %B\n"
 msgstr "%P: useita tulokohtia: moduuleissa %B ja %B\n"
 
@@ -5692,142 +5494,150 @@ msgstr "%s: XCOFF jaettu objekti kun ei tuoteta XCOFF-tulostetta"
 msgid "%s: dynamic object with no .loader section"
 msgstr "%s: dynaaminen objekti ilman �.loader�-lohkoa"
 
-#: xcofflink.c:1416
+#: xcofflink.c:1415
 msgid "%B: `%s' has line numbers but no enclosing section"
 msgstr "%B: �%s� on rivinumerot, mutta ei sulkevaa lohkoa"
 
-#: xcofflink.c:1468
+#: xcofflink.c:1467
 msgid "%B: class %d symbol `%s' has no aux entries"
 msgstr "%B: luokassa %d symbolissa �%s� ei ole aputulokohtia"
 
-#: xcofflink.c:1490
+#: xcofflink.c:1489
 msgid "%B: symbol `%s' has unrecognized csect type %d"
 msgstr "%B: symbolissa �%s� on tunnistamaton ohjauslohkotyyppi %d"
 
-#: xcofflink.c:1502
+#: xcofflink.c:1501
 msgid "%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"
 msgstr "%B: virheellinen XTY_ER-symboli �%s�: luokka %d ohjauslohkonumero %d ohjauslohkopituus %d"
 
-#: xcofflink.c:1531
+#: xcofflink.c:1530
 msgid "%B: XMC_TC0 symbol `%s' is class %d scnlen %d"
 msgstr "%B: XMC_TC0-symboli �%s� on luokka %d ohjauslohkopituus %d"
 
-#: xcofflink.c:1677
+#: xcofflink.c:1676
 msgid "%B: csect `%s' not in enclosing section"
 msgstr "%B: ohjauslohkoa �%s� ei ole sulkeutuvassa lohkossa"
 
-#: xcofflink.c:1784
+#: xcofflink.c:1783
 msgid "%B: misplaced XTY_LD `%s'"
 msgstr "%B: väärin sijoitettu XTY_LD �%s�"
 
-#: xcofflink.c:2103
+#: xcofflink.c:2102
 msgid "%B: reloc %s:%d not in csect"
 msgstr "%B: reloc-tietue %s:%d ei ole ohjauslohkossa"
 
-#: xcofflink.c:3194
+#: xcofflink.c:3186
 #, c-format
 msgid "%s: no such symbol"
 msgstr "%s: tuntematon symboli"
 
-#: xcofflink.c:3299
+#: xcofflink.c:3291
 #, c-format
 msgid "warning: attempt to export undefined symbol `%s'"
 msgstr "varoitus: yritettiin viedä määrittelemätön symboli �%s�"
 
-#: xcofflink.c:3681
+#: xcofflink.c:3673
 msgid "error: undefined symbol __rtinit"
 msgstr "virhe: määrittelemätön symboli �__rtinit�"
 
-#: xcofflink.c:4060
+#: xcofflink.c:4052
 msgid "%B: loader reloc in unrecognized section `%s'"
 msgstr "%B: �loader reloc�-tietue tunnistamattomassa lohkossa �%s"
 
-#: xcofflink.c:4071
+#: xcofflink.c:4063
 msgid "%B: `%s' in loader reloc but not loader sym"
 msgstr "%B: �%s� �loader reloc�-tietueessa, mutta ei �loader.sym�-binaarissa"
 
-#: xcofflink.c:4087
+#: xcofflink.c:4079
 msgid "%B: loader reloc in read-only section %A"
 msgstr "%B: �loader reloc�-tietue kirjoitussuojatussa lohkossa %A"
 
-#: xcofflink.c:5109
+#: xcofflink.c:5097
 #, c-format
 msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"
 msgstr "Sisältöluettelon ylivuoto: 0x%lx > 0x10000; yritä �-mminimal-toc� käännettäessä"
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
-#: elf32-ia64.c:628 elf64-ia64.c:628
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#: elf32-ia64.c:1110 elf64-ia64.c:1110
 msgid "%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."
 msgstr "%B: Ei voi avartaa br-käskyä kohteessa 0x%lx lohkossa �%A�. Käytä �brl�-käskyä tai epäsuoraa haarautumista."
 
-#: elf32-ia64.c:2290 elf64-ia64.c:2290
+#: elf32-ia64.c:2809 elf64-ia64.c:2809
 msgid "@pltoff reloc against local symbol"
 msgstr "�@pltoff reloc�-tietue paikallista symbolia varten"
 
-#: elf32-ia64.c:3693 elf64-ia64.c:3693
+#: elf32-ia64.c:4430 elf64-ia64.c:4430
 #, c-format
 msgid "%s: short data segment overflowed (0x%lx >= 0x400000)"
 msgstr "%s: �short�-datasegmentti ylivuotanut (0x%lx >= 0x400000)"
 
-#: elf32-ia64.c:3704 elf64-ia64.c:3704
+#: elf32-ia64.c:4441 elf64-ia64.c:4441
 #, c-format
 msgid "%s: __gp does not cover short data segment"
 msgstr "%s: �__gp� ei kata �short�-datasegmenttiä"
 
-#: elf32-ia64.c:3971 elf64-ia64.c:3971
+#: elf32-ia64.c:4708 elf64-ia64.c:4708
 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
 msgstr "%B: paikkariippuvainen koodi välittömällä sijoituksella dynaamista symbolia �%s� varten"
 
-#: elf32-ia64.c:4038 elf64-ia64.c:4038
+#: elf32-ia64.c:4775 elf64-ia64.c:4775
 msgid "%B: @gprel relocation against dynamic symbol %s"
 msgstr "%B: �@gprel�-sijoitus dynaamista symbolia %s varten"
 
-#: elf32-ia64.c:4101 elf64-ia64.c:4101
+#: elf32-ia64.c:4838 elf64-ia64.c:4838
 msgid "%B: linking non-pic code in a position independent executable"
 msgstr "%B: linkitetään paikkariippuvainen koodi paikkariippumattomassa suoritettavassa tiedostossa"
 
-#: elf32-ia64.c:4238 elf64-ia64.c:4238
+#: elf32-ia64.c:4975 elf64-ia64.c:4975
 msgid "%B: @internal branch to dynamic symbol %s"
 msgstr "%B: @sisäinen haarautuminen dynaamiseen symboliin %s"
 
-#: elf32-ia64.c:4240 elf64-ia64.c:4240
+#: elf32-ia64.c:4977 elf64-ia64.c:4977
 msgid "%B: speculation fixup to dynamic symbol %s"
 msgstr "%B: spekulaatiokorjaus dynaamiseen symboliin %s"
 
-#: elf32-ia64.c:4242 elf64-ia64.c:4242
+#: elf32-ia64.c:4979 elf64-ia64.c:4979
 msgid "%B: @pcrel relocation against dynamic symbol %s"
 msgstr "%B: �@pcrel�-sijoitus dynaamista symbolia %s varten"
 
-#: elf32-ia64.c:4439 elf64-ia64.c:4439
+#: elf32-ia64.c:5176 elf64-ia64.c:5176
 msgid "unsupported reloc"
 msgstr "ei-tuettu reloc-tietue"
 
-#: elf32-ia64.c:4477 elf64-ia64.c:4477
+#: elf32-ia64.c:5214 elf64-ia64.c:5214
 msgid "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."
 msgstr "%B: siirroksen %s puuttuva TLS-lohko kohdetta �%s� varten osoitteessa 0x%lx lohkossa �%A�."
 
-#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
-#: elf32-ia64.c:4492 elf64-ia64.c:4492
+#  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle,
+#  assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä.
+#  Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska
+#  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen
+#  rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
+#: elf32-ia64.c:5229 elf64-ia64.c:5229
 msgid "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."
 msgstr "%B: Ei voi avartaa br-käskyä (%s) kohteelle �%s� kohteessa 0x%lx lohkossa �%A� koolla 0x%lx (> 0x1000000)."
 
-#: elf32-ia64.c:4754 elf64-ia64.c:4754
+#: elf32-ia64.c:5491 elf64-ia64.c:5491
 msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
 msgstr "%B: linkitetään keskeytysnollassa uudelleenviite �ei-keskeytetä�-tiedostojen kanssa"
 
-#: elf32-ia64.c:4763 elf64-ia64.c:4763
+#: elf32-ia64.c:5500 elf64-ia64.c:5500
 msgid "%B: linking big-endian files with little-endian files"
 msgstr "%B: linkitetään �big-endian�-tiedostoja �little-endian�-tiedostojen kanssa"
 
-#: elf32-ia64.c:4772 elf64-ia64.c:4772
+#: elf32-ia64.c:5509 elf64-ia64.c:5509
 msgid "%B: linking 64-bit files with 32-bit files"
 msgstr "%B: linkitetään 64-bittiset tiedostot 32-bittisten tiedostojen kanssa"
 
-#: elf32-ia64.c:4781 elf64-ia64.c:4781
+#: elf32-ia64.c:5518 elf64-ia64.c:5518
 msgid "%B: linking constant-gp files with non-constant-gp files"
 msgstr "%B: linkitetään vakioyleisosoitintiedostot ei-vakioiden yleisosoitintiedostojen kanssa"
 
-#: elf32-ia64.c:4791 elf64-ia64.c:4791
+#: elf32-ia64.c:5528 elf64-ia64.c:5528
 msgid "%B: linking auto-pic files with non-auto-pic files"
 msgstr "%B: linkitetään automaattiset paikkariippumattomat kooditiedostot ei-automaattisten paikkariippumattomien kooditiedostojen kanssa"
 
@@ -6210,22 +6020,10 @@ msgstr "%B: DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)]:ia ei voi täyttää, k
 msgid "%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because .idata$6 is missing"
 msgstr "%B: DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)]:ia ei voi täyttää, koska �.idata$6� puuttuu"
 
-#: peigen.c:2438 pepigen.c:2438 pex64igen.c:2438
+#: peigen.c:2436 pepigen.c:2436 pex64igen.c:2436
 msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing"
 msgstr "%B: DataDictionary[9]:ia ei voi täyttää, koska �__tls_used� puuttuu"
 
-#~ msgid "relocation references a different segment"
-#~ msgstr "sijoitus viittaa eri segmenttiin"
-
-#~ msgid "%B: relocation type %d not implemented"
-#~ msgstr "%B: sijoitustyyppiä %d ei ole toteutettu"
-
-#~ msgid "warning: %B and %B differ in position-dependence of data addressing"
-#~ msgstr "varoitus: %B ja %B eroavat siinä, että datan osoitteet ovat paikkariippuvaisia"
-
-#~ msgid "warning: %B and %B differ in position-dependence of code addressing"
-#~ msgstr "varoitus: %B ja %B eroavat siinä, että koodin osoitteet ovat paikkariippuvaisia"
-
 #~ msgid "Can't Make it a Short Jump"
 #~ msgstr "Sitä ei voi tehdä lyhyeksi hypyksi"
 
diff --git a/bfd/po/fr.po b/bfd/po/fr.po
index 4a2fbf7e6c..6580675e9d 100644
--- a/bfd/po/fr.po
+++ b/bfd/po/fr.po
@@ -1,22 +1,21 @@
 # Messages français pour GNU concernant bfd.
-# Copyright © 2011 Free Software Foundation, Inc.
+# Copyright © 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
-# Frédéric Marchal <fmarchal@perso.be>, 2011.
+# Frédéric Marchal <fmarchal@perso.be>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: bfd-2.21.53\n"
+"Project-Id-Version: bfd-2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:25+0100\n"
-"PO-Revision-Date: 2011-09-23 16:30+0200\n"
+"POT-Creation-Date: 2010-11-05 11:31+0100\n"
+"PO-Revision-Date: 2010-11-11 20:08+0100\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: aout-adobe.c:127
 msgid "%B: Unknown section type in a.out.adobe file: %x\n"
@@ -25,15 +24,15 @@ msgstr "%B: Type de section inconnu dans le fichier a.out.adobe: %x\n"
 #: aout-cris.c:199
 #, c-format
 msgid "%s: Invalid relocation type exported: %d"
-msgstr "%s: Type de réadressage exporté invalide: %d"
+msgstr "%s: relocalisation invalide du type exporté: %d"
 
 #: aout-cris.c:242
 msgid "%B: Invalid relocation type imported: %d"
-msgstr "%B: Type de réadressage importé invalide: %d"
+msgstr "%B: Relocalisation invalide du type importé: %d"
 
 #: aout-cris.c:253
 msgid "%B: Bad relocation record imported: %d"
-msgstr "%B: Mauvais enregistrement de réadressage importé: %d"
+msgstr "%B: Mauvais enregistrement de relocalisation importé: %d"
 
 #: aoutx.h:1273 aoutx.h:1611
 #, c-format
@@ -45,132 +44,132 @@ msgstr "%s: ne peut représenter la section «%s» dans le fichier format objet
 msgid "%s: can not represent section for symbol `%s' in a.out object file format"
 msgstr "%s: ne peut représenter la section pour le symbole «%s» dans le fichier format objet a.out"
 
-#: aoutx.h:1579 vms-alpha.c:7668
+#: aoutx.h:1579 vms-alpha.c:7649
 msgid "*unknown*"
 msgstr "*inconnu*"
 
-#: aoutx.h:4017 aoutx.h:4343
+#: aoutx.h:4007 aoutx.h:4333
 msgid "%P: %B: unexpected relocation type\n"
-msgstr "%P: %B: type de réadressage non supporté\n"
+msgstr "%P: %B: type de relocalisation non supporté\n"
 
-#: aoutx.h:5374
+#: aoutx.h:5364
 #, c-format
 msgid "%s: relocatable link from %s to %s not supported"
 msgstr "%s: lien relocalisable de %s vers %s n'est pas supporté"
 
-#: archive.c:2194
+#: archive.c:2125
 msgid "Warning: writing archive was slow: rewriting timestamp\n"
 msgstr "Attention: l'écriture de l'archive était lente: réécriture du cachet de date-heure\n"
 
-#: archive.c:2482
+#: archive.c:2416
 msgid "Reading archive file mod timestamp"
 msgstr "Lecture du cachet date-heure modifié du fichier d'archive"
 
-#: archive.c:2506
+#: archive.c:2440
 msgid "Writing updated armap timestamp"
 msgstr "Écriture du cachet date-heure armap mise à jour"
 
-#: bfd.c:398
+#: bfd.c:395
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: bfd.c:399
+#: bfd.c:396
 msgid "System call error"
 msgstr "Erreur d'appel système"
 
-#: bfd.c:400
+#: bfd.c:397
 msgid "Invalid bfd target"
 msgstr "Cible bfd invalide"
 
-#: bfd.c:401
+#: bfd.c:398
 msgid "File in wrong format"
 msgstr "Fichier dans un mauvais format"
 
-#: bfd.c:402
+#: bfd.c:399
 msgid "Archive object file in wrong format"
 msgstr "Fichier objet d'archive dans un mauvais format"
 
-#: bfd.c:403
+#: bfd.c:400
 msgid "Invalid operation"
 msgstr "Opération invalide"
 
-#: bfd.c:404
+#: bfd.c:401
 msgid "Memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: bfd.c:405
+#: bfd.c:402
 msgid "No symbols"
 msgstr "Aucun symbole"
 
-#: bfd.c:406
+#: bfd.c:403
 msgid "Archive has no index; run ranlib to add one"
 msgstr "L'archive n'a pas d'index; exécuter ranlib pour en ajouter un"
 
-#: bfd.c:407
+#: bfd.c:404
 msgid "No more archived files"
 msgstr "Aucun autre fichier d'archive"
 
-#: bfd.c:408
+#: bfd.c:405
 msgid "Malformed archive"
 msgstr "Archive mal formée"
 
-#: bfd.c:409
+#: bfd.c:406
 msgid "File format not recognized"
 msgstr "Format de fichier non reconnu"
 
-#: bfd.c:410
+#: bfd.c:407
 msgid "File format is ambiguous"
 msgstr "Format de fichier ambigu"
 
-#: bfd.c:411
+#: bfd.c:408
 msgid "Section has no contents"
 msgstr "Section sans contenu"
 
-#: bfd.c:412
+#: bfd.c:409
 msgid "Nonrepresentable section on output"
 msgstr "Section non-représentable sur la sortie"
 
-#: bfd.c:413
+#: bfd.c:410
 msgid "Symbol needs debug section which does not exist"
 msgstr "Symboles ont besoin de la section de débug qui est inexistente"
 
-#: bfd.c:414
+#: bfd.c:411
 msgid "Bad value"
 msgstr "Mauvaise valeur"
 
-#: bfd.c:415
+#: bfd.c:412
 msgid "File truncated"
 msgstr "Fichier tronqué"
 
-#: bfd.c:416
+#: bfd.c:413
 msgid "File too big"
 msgstr "Fichier trop gros"
 
-#: bfd.c:417
+#: bfd.c:414
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s: %s"
 
-#: bfd.c:418
+#: bfd.c:415
 msgid "#<Invalid error code>"
 msgstr "#<Code d'erreur invalide>"
 
-#: bfd.c:945
+#: bfd.c:939
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr "BFD assertion %s a échoué %s:%d"
 
-#: bfd.c:957
+#: bfd.c:951
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d in %s\n"
 msgstr "BFD erreur interne %s, abandon à %s, ligne %d dans %s\n"
 
-#: bfd.c:961
+#: bfd.c:955
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d\n"
 msgstr "BFD erreur interne %s, abandon à %s, ligne %d\n"
 
-#: bfd.c:963
+#: bfd.c:957
 msgid "Please report this bug.\n"
 msgstr "Merci de rapporter cette anomalie.\n"
 
@@ -189,9 +188,9 @@ msgstr "pas de table de projection: variable d'environnement pas initialisée\n"
 msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
 msgstr "Attention: Écriture de la section «%s» vers un énorme décalage (ie négatif) dans le fichier 0x%lx."
 
-#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731
-#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360
-#: elf64-ia64.c:360
+#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1640 elf32-frv.c:5740
+#: elfxx-sparc.c:2795 reloc.c:5646 reloc16.c:162 elf32-ia64.c:842
+#: elf64-ia64.c:842
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr "%P%F: --relax et -r ne peuvent pas être utilisés en même temps\n"
 
@@ -209,11 +208,11 @@ msgstr ""
 
 #: coff-alpha.c:648
 msgid "%B: unknown/unsupported relocation type %d"
-msgstr "%B: type de réadressage %d inconnu ou non supporté"
+msgstr "%B: type de relocalisation %d inconnu ou non supporté"
 
 #: coff-alpha.c:900 coff-alpha.c:937 coff-alpha.c:2025 coff-mips.c:1003
 msgid "GP relative relocation used when GP not defined"
-msgstr "Réadressage relatif GP utilisé alors que GP n'est pas défini"
+msgstr "Relocalisation relative GP utilisé alors que GP n'est pas défini"
 
 #: coff-alpha.c:1502
 msgid "using multiple gp values"
@@ -221,16 +220,16 @@ msgstr "utilisation de valeurs gp multiples"
 
 #: coff-alpha.c:1561
 msgid "%B: unsupported relocation: ALPHA_R_GPRELHIGH"
-msgstr "%B: type de réadressage non supporté: ALPHA_R_GPRELHIGH"
+msgstr "%B: type de relocalisation non supporté: ALPHA_R_GPRELHIGH"
 
 #: coff-alpha.c:1568
 msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
-msgstr "%B: type de réadressage non supporté: ALPHA_R_GPRELLOW"
+msgstr "%B: type de relocalisation non supporté: ALPHA_R_GPRELLOW"
 
-#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228
-#: elf32-ia64.c:3845 elf64-ia64.c:3845
+#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:3991 elf64-alpha.c:4140
+#: elf32-ia64.c:4582 elf64-ia64.c:4582
 msgid "%B: unknown relocation type %d"
-msgstr "%B: type de réadressage %d inconnu"
+msgstr "%B: type de relocalisation %d inconnu"
 
 #: coff-arm.c:1038
 #, c-format
@@ -242,7 +241,7 @@ msgstr "%B: incapable de repérer le REPÈRE de liant «%s» pour «%s»"
 msgid "%B: unable to find ARM glue '%s' for `%s'"
 msgstr "%B: incapable de repérer le liant ARM «%s» pour «%s»"
 
-#: coff-arm.c:1369 elf32-arm.c:6980
+#: coff-arm.c:1369 elf32-arm.c:6501
 #, c-format
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
@@ -262,7 +261,7 @@ msgstr ""
 "  première occurrence: %B: appel arm au repère\n"
 "  reliez avec --support-old-code activé"
 
-#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3081
+#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3043
 msgid "%B: bad reloc address 0x%lx in section `%A'"
 msgstr "%B: mauvaise adresse de relocalisation 0x%lx dans la section «%A»"
 
@@ -275,12 +274,12 @@ msgstr "%B: symbole index illégal dans la relocalisation: %d"
 msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
 msgstr "erreur: %B compilé pour APCS-%d alors que %B a été compilé pour APCS-%d"
 
-#: coff-arm.c:2226 elf32-arm.c:15580
+#: coff-arm.c:2226 elf32-arm.c:14105
 #, c-format
 msgid "error: %B passes floats in float registers, whereas %B passes them in integer registers"
 msgstr "erreur: %B passage de valeurs en virgule flottante dans les registres FP alors que %B les passe dans les registres entiers"
 
-#: coff-arm.c:2229 elf32-arm.c:15584
+#: coff-arm.c:2229 elf32-arm.c:14109
 #, c-format
 msgid "error: %B passes floats in integer registers, whereas %B passes them in float registers"
 msgstr "erreur: %B passage de valeurs en virgule flottante dans les registres entiers alors que %B les passe dans les registres FP"
@@ -295,12 +294,12 @@ msgstr "erreur: %B compilé avec du code à position indépendante alors que la
 msgid "error: %B is compiled as absolute position code, whereas target %B is position independent"
 msgstr "erreur: %B compilé avec du code à position absolu alors que la cible %B est à position indépendante"
 
-#: coff-arm.c:2274 elf32-arm.c:15649
+#: coff-arm.c:2274 elf32-arm.c:14174
 #, c-format
 msgid "Warning: %B supports interworking, whereas %B does not"
 msgstr "Attention: %B supporte l'inter-réseautage, contrairement à %B"
 
-#: coff-arm.c:2277 elf32-arm.c:15655
+#: coff-arm.c:2277 elf32-arm.c:14180
 #, c-format
 msgid "Warning: %B does not support interworking, whereas %B does"
 msgstr "Attention: %B ne supporte pas l'inter-réseautage, contrairement à %B"
@@ -310,7 +309,7 @@ msgstr "Attention: %B ne supporte pas l'inter-réseautage, contrairement à %B"
 msgid "private flags = %x:"
 msgstr "fanions privés = %x:"
 
-#: coff-arm.c:2309 elf32-arm.c:11752
+#: coff-arm.c:2309 elf32-arm.c:10492
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr " [valeurs en virgule flottante passées dans des registres de valeurs en virgule flottante]"
@@ -320,7 +319,7 @@ msgstr " [valeurs en virgule flottante passées dans des registres de valeurs en
 msgid " [floats passed in integer registers]"
 msgstr " [valeurs en virgule flottante passées dans des registres de valeurs entières]"
 
-#: coff-arm.c:2314 elf32-arm.c:11755
+#: coff-arm.c:2314 elf32-arm.c:10495
 #, c-format
 msgid " [position independent]"
 msgstr " [position indépendante]"
@@ -345,12 +344,12 @@ msgstr " [inter-réseautage supporté]"
 msgid " [interworking not supported]"
 msgstr " [inter-réseautage non supporté]"
 
-#: coff-arm.c:2370 elf32-arm.c:10787
+#: coff-arm.c:2370 elf32-arm.c:9520
 #, c-format
 msgid "Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"
 msgstr "Attention: Pas d'initialisation du fanion d'inter-réseautage de %B puisqu'il a déjà été spécifié sans inter-réseautage"
 
-#: coff-arm.c:2374 elf32-arm.c:10791
+#: coff-arm.c:2374 elf32-arm.c:9524
 #, c-format
 msgid "Warning: Clearing the interworking flag of %B due to outside request"
 msgstr "Attention: Mise à zéro du fanion d'inter-réseautage de %B en raison d'une requête externe"
@@ -362,10 +361,10 @@ msgstr "ne peut traiter la relocalisation R_MEM_INDIRECT lorsque %s est utilisé
 
 #: coff-i860.c:147
 #, c-format
-msgid "relocation `%s' not yet implemented"
-msgstr "réadressage « %s » pas encore implémenté"
+msgid "Relocation `%s' not yet implemented\n"
+msgstr "Relocalisation «%s» pas encore implémentée\n"
 
-#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192
+#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5147
 msgid "%B: warning: illegal symbol index %ld in relocs"
 msgstr "%B: attention: symbole index illégal %ld dans les relocalisations"
 
@@ -373,38 +372,33 @@ msgstr "%B: attention: symbole index illégal %ld dans les relocalisations"
 msgid "uncertain calling convention for non-COFF symbol"
 msgstr "convention d'appel incertaine pour un symbole non COFF"
 
-#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677
+#: coff-m68k.c:506 elf32-bfin.c:5678 elf32-cr16.c:2897 elf32-m68k.c:4672
 msgid "unsupported reloc type"
 msgstr "type de relocalisation non supporté"
 
 #: coff-mips.c:688 elf32-mips.c:1014 elf32-score.c:430 elf32-score7.c:330
 #: elf64-mips.c:2019 elfn32-mips.c:1832
 msgid "GP relative relocation when _gp not defined"
-msgstr "réadressage relatif GP sans que _gp ne soit défini"
+msgstr "relocalisation relative GP sans que _gp ne soit défini"
 
 #: coff-or32.c:229
 msgid "Unrecognized reloc"
 msgstr "Relocalisation non reconnue"
 
-#: coff-rs6000.c:2676
+#: coff-rs6000.c:2794
 #, c-format
 msgid "%s: unsupported relocation type 0x%02x"
-msgstr "%s: type de réadressage non supporté 0x%02x"
+msgstr "%s: type de relocalisation non supporté 0x%02x"
 
-#: coff-rs6000.c:2761
+#: coff-rs6000.c:2887
 #, c-format
 msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"
 msgstr "%s: table des matières des relocalisations à 0x%x pour le symbole «%s» sans aucune entrée"
 
-#: coff-rs6000.c:3512 coff64-rs6000.c:2111
+#: coff-rs6000.c:3652 coff64-rs6000.c:2175
 msgid "%B: symbol `%s' has unrecognized smclas %d"
 msgstr "%B: symbole «%s» a une classe smclas %d non reconnue"
 
-#: coff-sh.c:521
-#, c-format
-msgid "SH Error: unknown reloc type %d"
-msgstr "Erreur SH: type de réadressage %d inconnu"
-
 #: coff-tic4x.c:195 coff-tic54x.c:299 coff-tic80.c:458
 #, c-format
 msgid "Unrecognized reloc type 0x%x"
@@ -420,84 +414,80 @@ msgstr "%s: attention: symbole index illégal %ld dans les relocalisations"
 msgid "ignoring reloc %s\n"
 msgstr "relocalisation %s ignorée\n"
 
-#: coffcode.h:991
+#: coffcode.h:973
 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr "%B: attention: symbole COMDAT «%s» ne concorde par avec le nom de section «%s»"
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1215
+#: coffcode.h:1197
 msgid "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
 msgstr "%B: Attention: Ignore le fanion de section IMAGE_SCN_MEM_NOT_PAGED dans la section %s"
 
-#: coffcode.h:1282
+#: coffcode.h:1264
 msgid "%B (%s): Section flag %s (0x%x) ignored"
 msgstr "%B (%s): Fanion de section %s (0x%x) ignoré"
 
-#: coffcode.h:2424
+#: coffcode.h:2390
 #, c-format
 msgid "Unrecognized TI COFF target id '0x%x'"
 msgstr "Identificateur de cible TI COFF non reconnu «0x%x»"
 
-#: coffcode.h:2738
+#: coffcode.h:2704
 msgid "%B: reloc against a non-existant symbol index: %ld"
 msgstr "%B: relocalisation par rapport à un indexe de symbole inexistant: %ld"
 
-#: coffcode.h:3296
+#: coffcode.h:3262
 msgid "%B: too many sections (%d)"
 msgstr "%B: trop de sections (%d)"
 
-#: coffcode.h:3712
+#: coffcode.h:3676
 msgid "%B: section %s: string table overflow at offset %ld"
 msgstr "%B: section %s: débordement de la table de chaînes à l'offset %ld"
 
-#: coffcode.h:4517
+#: coffcode.h:4481
 msgid "%B: warning: line number table read failed"
 msgstr "%B: attention: erreur lors de la lecture de la table des numéros de ligne"
 
-#: coffcode.h:4547
+#: coffcode.h:4511
 msgid "%B: warning: illegal symbol index %ld in line numbers"
 msgstr "%B: attention: symbole d'index illégal %ld dans les numéros de ligne"
 
-#: coffcode.h:4561
+#: coffcode.h:4525
 msgid "%B: warning: duplicate line number information for `%s'"
 msgstr "%B: attention: information de numéro de ligne dédoublée pour «%s»"
 
-#: coffcode.h:4961
+#: coffcode.h:4916
 msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
 msgstr "%B: Classe de stockage %d non reconnue pour %s symbole «%s»"
 
-#: coffcode.h:5087
+#: coffcode.h:5042
 msgid "warning: %B: local symbol `%s' has no section"
 msgstr "attention: %B: symbole local «%s» n'a pas de section"
 
-#: coffcode.h:5231
+#: coffcode.h:5186
 msgid "%B: illegal relocation type %d at address 0x%lx"
-msgstr "%B: type de réadressage %d illégal à l'adresse 0x%lx"
+msgstr "%B: type de relocalisation %d illégal à l'adresse 0x%lx"
 
-#: coffgen.c:1578
+#: coffgen.c:1573
 msgid "%B: bad string table size %lu"
 msgstr "%B: mauvaise taille de la table des chaînes %lu"
 
-#: cofflink.c:533 elflink.c:4353
+#: cofflink.c:524 elflink.c:4339
 msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
 msgstr "Attention: type de symbole «%s» a changé de %d à %d dans %B"
 
-#: cofflink.c:2330
+#: cofflink.c:2321
 msgid "%B: relocs in section `%A', but it has no contents"
 msgstr "%B: relocalisations dans la section «%A» qui est vide"
 
-#: cofflink.c:2392 elflink.c:9554
-msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
-msgstr "%X«%s» référencé dans la section «%A» de %B: défini dans la section abandonnée «%A» de %B\n"
-
-#: cofflink.c:2690 coffswap.h:826
+#: cofflink.c:2652 coffswap.h:826
 #, c-format
 msgid "%s: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr "%s: %s: débordement de relocalisation: 0x%lx > 0xffff"
 
-#: cofflink.c:2699 coffswap.h:812
+#: cofflink.c:2661 coffswap.h:812
 #, c-format
 msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr "%s: attention: %s: débordement du compteur de numéro de ligne: 0x%lx > 0xffff"
@@ -543,22 +533,22 @@ msgstr "Erreur DWARF: Opérations maximum par instruction invalide."
 msgid "Dwarf Error: mangled line number section."
 msgstr "Erreur DWARF: numéro de ligne de section mutilé"
 
-#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383
+#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2382
 #, c-format
 msgid "Dwarf Error: Could not find abbrev number %u."
 msgstr "Erreur DWARF: ne peut repérer le numéro abrégé %u"
 
-#: dwarf2.c:2344
+#: dwarf2.c:2343
 #, c-format
 msgid "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 and 4 information."
 msgstr "Erreur DWARF: version DWARF trouvée «%u», ce lecteur ne supporte que les informations des versions 2, 3 et 4."
 
-#: dwarf2.c:2351
+#: dwarf2.c:2350
 #, c-format
 msgid "Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."
 msgstr "Erreur DWARF: taille d'adresse obtenue «%u», ce lecteur ne peut traiter des tailles plus grandes que «%u»."
 
-#: dwarf2.c:2374
+#: dwarf2.c:2373
 #, c-format
 msgid "Dwarf Error: Bad abbrev number: %u."
 msgstr "Erreur DWARF: mauvais numéro abrégé: %u"
@@ -656,36 +646,32 @@ msgstr "%P: erreur dans %B(%A); aucune table .eh_frame_hdr ne sera créée.\n"
 msgid "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
 msgstr "%P: encodage fde dans %B(%A) empêche la création de la table .eh_frame_hdr.\n"
 
-#: elf-eh-frame.c:1583
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
-msgstr "%P: DW_EH_PE_datarel non spécifié pour cette architecture.\n"
-
 #: elf-ifunc.c:179
 msgid "%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can not be used when making an executable; recompile with -fPIE and relink with -pie\n"
 msgstr "%P%P: symbole dynamique STT_GNU_IFUNC «%s» avec une égalité de pointeur dans «%B» ne peut pas être utilisé lors de la création d'un exécutable. Recompilez avec -fPIE et reliez avec -pie\n"
 
-#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209
+#: elf-m10200.c:450 elf-m10300.c:1560 elf32-avr.c:1263 elf32-bfin.c:3193
 #: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922
-#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509
+#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4111 elf32-h8300.c:509
 #: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168
-#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535
+#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:534
 #: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395
 #: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540
 #: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522
 msgid "internal error: out of range error"
 msgstr "erreur interne: hors limite"
 
-#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213
+#: elf-m10200.c:454 elf-m10300.c:1564 elf32-avr.c:1267 elf32-bfin.c:3197
 #: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926
-#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513
+#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4115 elf32-h8300.c:513
 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557
-#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539
+#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:538
 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490
 #: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544
 #: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526
-#: elfxx-mips.c:9193
+#: elfxx-mips.c:9186
 msgid "internal error: unsupported relocation error"
-msgstr "erreur interne: erreur de réadressage non supportée"
+msgstr "erreur interne: erreur de relocalisation non supportée"
 
 #: elf-m10200.c:458 elf32-cr16.c:1490 elf32-cr16c.c:788 elf32-crx.c:930
 #: elf32-d10v.c:517 elf32-h8300.c:517 elf32-lm32.c:1176 elf32-m32r.c:3119
@@ -694,40 +680,37 @@ msgstr "erreur interne: erreur de réadressage non supportée"
 msgid "internal error: dangerous error"
 msgstr "erreur interne: erreur dangereuse"
 
-#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221
+#: elf-m10200.c:462 elf-m10300.c:1577 elf32-avr.c:1275 elf32-bfin.c:3205
 #: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934
-#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521
+#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4123 elf32-h8300.c:521
 #: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180
-#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547
+#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:546
 #: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403
 #: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552
 #: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534
 msgid "internal error: unknown error"
 msgstr "erreur interne: erreur inconnue"
 
-#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604
-#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067
-#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807
+#: elf-m10300.c:1504 elf32-arm.c:9098 elf32-i386.c:4081 elf32-m32r.c:2604
+#: elf32-m68k.c:4156 elf32-ppc.c:8089 elf32-s390.c:3010 elf32-sh.c:4223
+#: elf32-xtensa.c:3067 elf64-ppc.c:13115 elf64-s390.c:2985 elf64-sh64.c:1636
+#: elf64-x86-64.c:3719 elfxx-sparc.c:3806
 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"
-msgstr "%B(%A+0x%lx): réadressage %s sans solution vers le symbole « %s »"
+msgstr "%B(%A+0x%lx): relocalisation %s sans solution vers le symbole «%s»"
 
-#: elf-m10300.c:1580
+#: elf-m10300.c:1569
 msgid "error: inappropriate relocation type for shared library (did you forget -fpic?)"
-msgstr "erreur: type de réadressage inapproprié pour une librairie partagée (avez-vous oublié -fpic ?)"
+msgstr "erreur: type de relocalisation inapproprié pour une librairie partagée (avez vous oublié -fpic ?)"
 
-#: elf-m10300.c:1583
-msgid "%B: error: taking the address of protected function '%s' cannot be done when making a shared library"
-msgstr "%B: erreur: l'adresse de la fonction protégée « %s » ne peut être prise lors de la création d'une librairie partagée"
-
-#: elf-m10300.c:1586
+#: elf-m10300.c:1572
 msgid "internal error: suspicious relocation type used in shared library"
-msgstr "erreur interne: type de réadressage douteux utilisé dans une librairie partagée"
+msgstr "erreur interne: type de relocalisation douteux utilisé dans une librairie partagée"
 
-#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044
-#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868
-#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931
-#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377
-#: elf64-x86-64.c:1985 elfxx-sparc.c:2104
+#: elf-m10300.c:4372 elf32-arm.c:11392 elf32-cr16.c:2451 elf32-cris.c:3044
+#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2036 elf32-lm32.c:1868
+#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-ppc.c:4994 elf32-s390.c:1652
+#: elf32-sh.c:2931 elf32-vax.c:1040 elf64-ppc.c:6483 elf64-s390.c:1635
+#: elf64-sh64.c:3377 elf64-x86-64.c:1871 elfxx-sparc.c:2104
 #, c-format
 msgid "dynamic variable `%s' is zero size"
 msgstr "la variable dynamique «%s» a une taille nulle"
@@ -752,7 +735,7 @@ msgstr "%B: entrée SHT_GROUP invalide"
 msgid "%B: no group info for section %A"
 msgstr "%B: aucune info de groupe pour la section %A"
 
-#: elf.c:737 elf.c:3121 elflink.c:10144
+#: elf.c:737 elf.c:3090 elflink.c:10062
 msgid "%B: warning: sh_link not set for section `%A'"
 msgstr "%B: attention: sh_link n'a pas de valeur pour la section «%A»"
 
@@ -768,11 +751,11 @@ msgstr "%B: [%d] inconnu dans la section «%s» du groupe [%s]"
 msgid "%B: unable to initialize commpress status for section %s"
 msgstr "%B: impossible d'initialiser le statut de compression de la section %s"
 
-#: elf.c:1061
+#: elf.c:1050
 msgid "%B: unable to initialize decommpress status for section %s"
 msgstr "%B: impossible d'initialiser le statut de décompression de la section %s"
 
-#: elf.c:1181
+#: elf.c:1158
 #, c-format
 msgid ""
 "\n"
@@ -781,7 +764,7 @@ msgstr ""
 "\n"
 "En-tête de programme:\n"
 
-#: elf.c:1223
+#: elf.c:1200
 #, c-format
 msgid ""
 "\n"
@@ -790,7 +773,7 @@ msgstr ""
 "\n"
 "Section dynamique:\n"
 
-#: elf.c:1359
+#: elf.c:1336
 #, c-format
 msgid ""
 "\n"
@@ -799,7 +782,7 @@ msgstr ""
 "\n"
 "Définitions des versions:\n"
 
-#: elf.c:1384
+#: elf.c:1361
 #, c-format
 msgid ""
 "\n"
@@ -808,82 +791,82 @@ msgstr ""
 "\n"
 "Références de version:\n"
 
-#: elf.c:1389
+#: elf.c:1366
 #, c-format
 msgid "  required from %s:\n"
 msgstr " requis par %s:\n"
 
-#: elf.c:1796
+#: elf.c:1773
 msgid "%B: invalid link %lu for reloc section %s (index %u)"
 msgstr "%B: lien invalide %lu pour la section de relocalisation %s (index %u)"
 
-#: elf.c:1966
+#: elf.c:1943
 msgid "%B: don't know how to handle allocated, application specific section `%s' [0x%8x]"
 msgstr "%B: je ne sais pas comment traiter la section «%s» [0x%8x] allouée et spécifique à l'application"
 
-#: elf.c:1978
+#: elf.c:1955
 msgid "%B: don't know how to handle processor specific section `%s' [0x%8x]"
 msgstr "%B: je ne sais pas comment traiter la section «%s» [0x%8x] spécifique au processeur"
 
-#: elf.c:1989
+#: elf.c:1966
 msgid "%B: don't know how to handle OS specific section `%s' [0x%8x]"
 msgstr "%B: je ne sais pas comment traiter la section «%s» [0x%8x] spécifique au système d'exploitation"
 
-#: elf.c:1999
+#: elf.c:1976
 msgid "%B: don't know how to handle section `%s' [0x%8x]"
 msgstr "%B: je ne sais pas comment traiter la section «%s» [0x%8x]"
 
-#: elf.c:2634
+#: elf.c:2603
 #, c-format
 msgid "warning: section `%A' type changed to PROGBITS"
 msgstr "attention: type de la section «%A» changé en PROGBITS"
 
-#: elf.c:3078
+#: elf.c:3047
 msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
 msgstr "%B: le sh_link de la section «%A» pointe vers la section abandonnée «%A» de «%B»"
 
-#: elf.c:3101
+#: elf.c:3070
 msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
 msgstr "%B: le sh_link de la section «%A» pointe vers la section supprimée «%A» de «%B»"
 
-#: elf.c:4527
+#: elf.c:4480
 msgid "%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr "%B: La première section dans le segment PT_DYNAMIC n'est pas la section .dynamic"
 
-#: elf.c:4554
+#: elf.c:4507
 msgid "%B: Not enough room for program headers, try linking with -N"
 msgstr "%B: Pas suffisamment d'espace pour les en-têtes du programme, essayer l'option -N"
 
-#: elf.c:4641
+#: elf.c:4594
 msgid "%B: section %A lma %#lx adjusted to %#lx"
 msgstr "%B: section %A avec lma %#lx ajustée à %#lx"
 
-#: elf.c:4774
+#: elf.c:4713
 msgid "%B: section `%A' can't be allocated in segment %d"
 msgstr "%B: la section «%A» ne peut pas être allouée dans le segment %d"
 
-#: elf.c:4822
+#: elf.c:4761
 msgid "%B: warning: allocated section `%s' not in segment"
 msgstr "%B: attention: section allouée «%s» n'est pas dans le segment"
 
-#: elf.c:5322
+#: elf.c:5257
 msgid "%B: symbol `%s' required but not present"
 msgstr "%B: symbole «%s» requis mais absent"
 
-#: elf.c:5660
+#: elf.c:5595
 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n"
 msgstr "%B: attention: segment chargeable vide détecté, est-ce intentionnel ?\n"
 
-#: elf.c:6688
+#: elf.c:6622
 #, c-format
 msgid "Unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr "Incapable de trouver un équivalent pour le symbole «%s» de la section «%s»"
 
-#: elf.c:7684
+#: elf.c:7611
 msgid "%B: unsupported relocation type %s"
-msgstr "%B: type de réadressage %s non supporté"
+msgstr "%B: type de relocalisation %s non supporté"
 
-#: elf32-arm.c:3590
+#: elf32-arm.c:3183
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: Thumb call to ARM"
@@ -891,7 +874,7 @@ msgstr ""
 "%B(%s): attention: l'inter-réseautage n'est pas activé.\n"
 "  première occurrence: %B: appel de repère vers ARM"
 
-#: elf32-arm.c:3637
+#: elf32-arm.c:3226
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: ARM call to Thumb"
@@ -899,40 +882,40 @@ msgstr ""
 "%B(%s): attention: l'inter-réseautage n'est pas activé.\n"
 "  première occurrence: %B: appel ARM vers repère"
 
-#: elf32-arm.c:3849 elf32-arm.c:5286
+#: elf32-arm.c:3432 elf32-arm.c:4807
 #, c-format
 msgid "%s: cannot create stub entry %s"
 msgstr "%s: ne peut créer l'entrée d'ébauche %s"
 
-#: elf32-arm.c:5402
+#: elf32-arm.c:4923
 #, c-format
 msgid "unable to find THUMB glue '%s' for '%s'"
 msgstr "incapable de repérer le REPÈRE de liant «%s» pour «%s»"
 
-#: elf32-arm.c:5438
+#: elf32-arm.c:4959
 #, c-format
 msgid "unable to find ARM glue '%s' for '%s'"
 msgstr "incapable de repérer le liant ARM «%s» pour «%s»"
 
-#: elf32-arm.c:5964
+#: elf32-arm.c:5485
 msgid "%B: BE8 images only valid in big-endian mode."
 msgstr "%B: les images BE8 ne sont valables qu'en mode gros boutiste."
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:6194
+#: elf32-arm.c:5715
 msgid "%B: warning: selected VFP11 erratum workaround is not necessary for target architecture"
 msgstr "%B: attention: le palliatif VFP11 n'est pas nécessaire avec l'architecture cible"
 
-#: elf32-arm.c:6738 elf32-arm.c:6758
+#: elf32-arm.c:6259 elf32-arm.c:6279
 msgid "%B: unable to find VFP11 veneer `%s'"
 msgstr "%B: incapable de trouver le vernis VFP11 «%s»"
 
-#: elf32-arm.c:6806
+#: elf32-arm.c:6327
 #, c-format
 msgid "Invalid TARGET2 relocation type '%s'."
-msgstr "Type de réadressage TARGET2 « %s » invalide"
+msgstr "Type de relocalisation TARGET2 «%s» invalide"
 
-#: elf32-arm.c:6890
+#: elf32-arm.c:6411
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: thumb call to arm"
@@ -940,439 +923,415 @@ msgstr ""
 "%B(%s): attention: l'inter-réseautage n'est pas activé.\n"
 "  première occurrence: %B: appel de repère vers arm"
 
-#: elf32-arm.c:7674
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx): instruction Thumb « 0x%x » inattendue dans le trampoline TLS"
-
-#: elf32-arm.c:7713
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx): instruction ARM « 0x%x » inattendue dans le trampoline TLS"
-
-#: elf32-arm.c:8166
+#: elf32-arm.c:7130
 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'."
 msgstr "\\%B: Attention: instruction Arm BLX vise la fonction Arm «%s»."
 
-#: elf32-arm.c:8575
+#: elf32-arm.c:7541
 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
 msgstr "%B: Attention: instruction de repérage BLX vise la fonction de repérage «%s»."
 
-#: elf32-arm.c:9408
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx): instruction Thumb « 0x%x » inattendue référencée par TLS_GOTDESC"
-
-#: elf32-arm.c:9431
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx): instruction ARM '0x%x' inattendue référencée par TLS_GOTDESC"
-
-#: elf32-arm.c:9460
+#: elf32-arm.c:8223
 msgid "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"
-msgstr "%B(%A+0x%lx): réadressage R_ARM_TLS_LE32 pas permis dans un objet partagé"
+msgstr "%B(%A+0x%lx): relocalisation R_ARM_TLS_LE32 pas permise dans un objet partagé"
 
-#: elf32-arm.c:9675
+#: elf32-arm.c:8438
 msgid "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"
-msgstr "%B(%A+0x%lx): Seuls ADD ou SUB sont permis dans les réadressages du groupe ALU"
+msgstr "%B(%A+0x%lx): Seuls ADD ou SUB sont permis dans les relocalisations du groupe ALU"
 
-#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970
+#: elf32-arm.c:8478 elf32-arm.c:8565 elf32-arm.c:8648 elf32-arm.c:8733
 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"
-msgstr "%B(%A+0x%lx): Débordement en scindant 0x%lx pour le réadressage du groupe %s"
+msgstr "%B(%A+0x%lx): Débordement en scindant 0x%lx pour la relocalisation du group %s"
 
-#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544
+#: elf32-arm.c:8963 elf32-sh.c:4112 elf64-sh64.c:1544
 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section"
-msgstr "%B(%A+0x%lx): %s réadressage vers une section SEC_MERGE"
+msgstr "%B(%A+0x%lx): %s relocalisation vers une section SEC_MERGE"
 
-#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805
+#: elf32-arm.c:9074 elf32-m68k.c:4191 elf32-xtensa.c:2805 elf64-ppc.c:11689
 msgid "%B(%A+0x%lx): %s used with TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s utilisé avec le symbole TLS %s"
 
-#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806
+#: elf32-arm.c:9075 elf32-m68k.c:4192 elf32-xtensa.c:2806 elf64-ppc.c:11690
 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s utilisé avec le symbole non-TLS %s"
 
-#: elf32-arm.c:10399 elf32-tic6x.c:2751
+#: elf32-arm.c:9132 elf32-tic6x.c:1632
 msgid "out of range"
 msgstr "hors limite"
 
-#: elf32-arm.c:10403 elf32-tic6x.c:2755
+#: elf32-arm.c:9136 elf32-tic6x.c:1636
 msgid "unsupported relocation"
-msgstr "réadressage non supporté"
+msgstr "relocalisation non supportée"
 
-#: elf32-arm.c:10411 elf32-tic6x.c:2763
+#: elf32-arm.c:9144 elf32-tic6x.c:1644
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: elf32-arm.c:10836
+#: elf32-arm.c:9569
 msgid "Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"
 msgstr "Attention: mise à zéro du fanion d'inter-réseautage %B en raison du code sans inter-réseautage dans %B lié avec lui"
 
-#: elf32-arm.c:10930
+#: elf32-arm.c:9663
 msgid "%B: Unknown mandatory EABI object attribute %d"
 msgstr "%B: L'attribut d'objet EABI obligatoire %d est manquant"
 
-#: elf32-arm.c:10938
+#: elf32-arm.c:9671
 msgid "Warning: %B: Unknown EABI object attribute %d"
 msgstr "Attention: %B: Attribut d'objet EABI %d inconnu"
 
-#: elf32-arm.c:11119
+#: elf32-arm.c:9852
 msgid "error: %B: Unknown CPU architecture"
 msgstr "erreur: %B: Architecture CPU inconnue"
 
-#: elf32-arm.c:11157
+#: elf32-arm.c:9890
 msgid "error: %B: Conflicting CPU architectures %d/%d"
 msgstr "erreur: %B: Architectures CPU conflictuelles %d/%d"
 
-#: elf32-arm.c:11206
+#: elf32-arm.c:9942
 msgid "Error: %B has both the current and legacy Tag_MPextension_use attributes"
 msgstr "Erreur: %B utilise les deux attributs Tag_MPextension_use actuel et hérité"
 
-#: elf32-arm.c:11231
+#: elf32-arm.c:9967
 msgid "error: %B uses VFP register arguments, %B does not"
 msgstr "erreur: %B passe les paramètres dans un registre VFP alors que %B ne le fait pas"
 
-#: elf32-arm.c:11376
+#: elf32-arm.c:10112
 msgid "error: %B: unable to merge virtualization attributes with %B"
 msgstr "erreur: %B: impossible de fusionner les attributs de visualisation avec %B"
 
-#: elf32-arm.c:11402
+#: elf32-arm.c:10138
 msgid "error: %B: Conflicting architecture profiles %c/%c"
 msgstr "erreur: %B: Profils d'architecture conflictuels %c/%c"
 
-#: elf32-arm.c:11503
+#: elf32-arm.c:10239
 msgid "Warning: %B: Conflicting platform configuration"
 msgstr "Attention: %B: Configuration de platforme conflictuelle"
 
-#: elf32-arm.c:11512
+#: elf32-arm.c:10248
 msgid "error: %B: Conflicting use of R9"
 msgstr "erreur: %B: Utilisation conflictuelle de R9"
 
-#: elf32-arm.c:11524
+#: elf32-arm.c:10260
 msgid "error: %B: SB relative addressing conflicts with use of R9"
 msgstr "erreur: %B: Adressage relatif SB entre en conflit avec l'utilisation de R9"
 
-#: elf32-arm.c:11537
+#: elf32-arm.c:10273
 msgid "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"
 msgstr "attention: %B utilise des wchar_t de %u octets alors que la sortie doit utiliser des wchar_t de %u octets. L'utilisation de wchar_t entre objets peu échouer"
 
-#: elf32-arm.c:11568
+#: elf32-arm.c:10304
 msgid "warning: %B uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"
 msgstr "attantion: %B utilise des enums %s alors que la sortie doit utiliser des enums %s. L'utilisation des valeurs enum entre objets peu échouer"
 
-#: elf32-arm.c:11580
+#: elf32-arm.c:10316
 msgid "error: %B uses iWMMXt register arguments, %B does not"
 msgstr "erreur: %B passe les paramètres dans le registre iWMMXt contrairement à %B"
 
-#: elf32-arm.c:11597
+#: elf32-arm.c:10333
 msgid "error: fp16 format mismatch between %B and %B"
 msgstr "erreur: désaccord de format fp16 entre %B et %B"
 
-#: elf32-arm.c:11621
+#: elf32-arm.c:10357
 msgid "DIV usage mismatch between %B and %B"
 msgstr "incohérence d'utilisation de DIV entre %B et %B"
 
-#: elf32-arm.c:11640
+#: elf32-arm.c:10376
 msgid "%B has has both the current and legacy Tag_MPextension_use attributes"
 msgstr "%B utilise les deux attributs Tag_MPextension_use actuel et hérité"
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
-#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282
+#: elf32-arm.c:10468 elf32-bfin.c:5065 elf32-cris.c:4162 elf32-m68hc1x.c:1282
 #: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528
-#: elfxx-mips.c:12857
+#: elfxx-mips.c:12842
 #, c-format
 msgid "private flags = %lx:"
 msgstr "fanions privés = %lx"
 
-#: elf32-arm.c:11737
+#: elf32-arm.c:10477
 #, c-format
 msgid " [interworking enabled]"
 msgstr " [inter-réseautage autorisé]"
 
-#: elf32-arm.c:11745
+#: elf32-arm.c:10485
 #, c-format
 msgid " [VFP float format]"
 msgstr " [format flottant VFP]"
 
-#: elf32-arm.c:11747
+#: elf32-arm.c:10487
 #, c-format
 msgid " [Maverick float format]"
 msgstr " [format flottant Maverick]"
 
-#: elf32-arm.c:11749
+#: elf32-arm.c:10489
 #, c-format
 msgid " [FPA float format]"
 msgstr " [format flottant FPA]"
 
-#: elf32-arm.c:11758
+#: elf32-arm.c:10498
 #, c-format
 msgid " [new ABI]"
 msgstr " [nouvel ABI]"
 
-#: elf32-arm.c:11761
+#: elf32-arm.c:10501
 #, c-format
 msgid " [old ABI]"
 msgstr " [ancien ABI]"
 
-#: elf32-arm.c:11764
+#: elf32-arm.c:10504
 #, c-format
 msgid " [software FP]"
 msgstr " [virgule flottante logiciel]"
 
-#: elf32-arm.c:11773
+#: elf32-arm.c:10513
 #, c-format
 msgid " [Version1 EABI]"
 msgstr " [Version1 EABI]"
 
-#: elf32-arm.c:11776 elf32-arm.c:11787
+#: elf32-arm.c:10516 elf32-arm.c:10527
 #, c-format
 msgid " [sorted symbol table]"
 msgstr " [table des symboles triés]"
 
-#: elf32-arm.c:11778 elf32-arm.c:11789
+#: elf32-arm.c:10518 elf32-arm.c:10529
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr " [table des symboles non triés]"
 
-#: elf32-arm.c:11784
+#: elf32-arm.c:10524
 #, c-format
 msgid " [Version2 EABI]"
 msgstr " [Version2 EABI]"
 
-#: elf32-arm.c:11792
+#: elf32-arm.c:10532
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr " [symboles dynamiques utilisent un index de segment]"
 
-#: elf32-arm.c:11795
+#: elf32-arm.c:10535
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr " [mapping de symboles précèdes les autres]"
 
-#: elf32-arm.c:11802
+#: elf32-arm.c:10542
 #, c-format
 msgid " [Version3 EABI]"
 msgstr " [Version3 EABI]"
 
-#: elf32-arm.c:11806
+#: elf32-arm.c:10546
 #, c-format
 msgid " [Version4 EABI]"
 msgstr " [Version4 EABI]"
 
-#: elf32-arm.c:11810
+#: elf32-arm.c:10550
 #, c-format
 msgid " [Version5 EABI]"
 msgstr " [Version5 EABI]"
 
-#: elf32-arm.c:11813
+#: elf32-arm.c:10553
 #, c-format
 msgid " [BE8]"
 msgstr " [BE8]"
 
-#: elf32-arm.c:11816
+#: elf32-arm.c:10556
 #, c-format
 msgid " [LE8]"
 msgstr " [LE8]"
 
-#: elf32-arm.c:11822
+#: elf32-arm.c:10562
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr " <Version EABI non reconnue>"
 
-#: elf32-arm.c:11829
+#: elf32-arm.c:10569
 #, c-format
 msgid " [relocatable executable]"
 msgstr " [exécutables relocalisés]"
 
-#: elf32-arm.c:11832
+#: elf32-arm.c:10572
 #, c-format
 msgid " [has entry point]"
 msgstr " [a des points d'entrées]"
 
-#: elf32-arm.c:11837
+#: elf32-arm.c:10577
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr "<Bits de fanions non reconnus>"
 
-#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827
-#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370
+#: elf32-arm.c:10824 elf32-i386.c:1322 elf32-s390.c:1000 elf32-xtensa.c:1009
+#: elf64-s390.c:960 elf64-x86-64.c:1105 elfxx-sparc.c:1370
 msgid "%B: bad symbol index: %d"
 msgstr "%B: symbole index erroné: %d"
 
-#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949
+#: elf32-arm.c:10946 elf64-x86-64.c:1265 elf64-x86-64.c:1434 elfxx-mips.c:7942
 msgid "%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"
-msgstr "%B: réadressage de %s en vertu de « %s » ne peut être utilisé lors de la création d'un objet partagé; recompilez avec -fPIC"
+msgstr "%B: relocalisation de %s en vertu de «%s» ne peut être utilisée lors de la création d'un objet partagé; recompiler avec -fPIC"
 
-#: elf32-arm.c:13412
+#: elf32-arm.c:11948
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr "Erreurs rencontrées pendant le traitement du fichier %s"
 
-#: elf32-arm.c:14795
+#: elf32-arm.c:13334
 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr "%B: erreur: L'ébauche d'erratum du Cortex A8 est allouée à un emplacement peu sûr"
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:14822
+#: elf32-arm.c:13361
 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr "%B: erreur: L'ébauche d'erratum du Cortex A8 est hors limite (fichier d'entrée trop grand)"
 
-#: elf32-arm.c:14916 elf32-arm.c:14938
+#: elf32-arm.c:13455 elf32-arm.c:13477
 msgid "%B: error: VFP11 veneer out of range"
 msgstr "%B: erreur: vernis VFP11 hors limite"
 
-#: elf32-arm.c:15477
+#: elf32-arm.c:14002
 msgid "error: %B is already in final BE8 format"
 msgstr "erreur: %B est déjà au format final BE8"
 
-#: elf32-arm.c:15553
+#: elf32-arm.c:14078
 msgid "error: Source object %B has EABI version %d, but target %B has EABI version %d"
 msgstr "erreur: L'objet source %B a l'EABI version %d alors que la cible %B a l'EABI version %d"
 
-#: elf32-arm.c:15569
+#: elf32-arm.c:14094
 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
 msgstr "erreur: %B compilé pour APCS-%d alors que la cible %B utilise APCS-%d"
 
-#: elf32-arm.c:15594
+#: elf32-arm.c:14119
 msgid "error: %B uses VFP instructions, whereas %B does not"
 msgstr "erreur: %B utilise les instructions VFP alors que %B ne les utilise pas"
 
-#: elf32-arm.c:15598
+#: elf32-arm.c:14123
 msgid "error: %B uses FPA instructions, whereas %B does not"
 msgstr "erreur: %B utilise les instructions FPA alors que %B ne les utilise pas"
 
-#: elf32-arm.c:15608
+#: elf32-arm.c:14133
 msgid "error: %B uses Maverick instructions, whereas %B does not"
 msgstr "erreur: %B utilise les instructions Maverick alors que %B ne les utilise pas"
 
-#: elf32-arm.c:15612
+#: elf32-arm.c:14137
 msgid "error: %B does not use Maverick instructions, whereas %B does"
 msgstr "erreur: %B n'utilise pas les instructions Maverick alors que %B les utilise"
 
-#: elf32-arm.c:15631
+#: elf32-arm.c:14156
 msgid "error: %B uses software FP, whereas %B uses hardware FP"
 msgstr "erreur: %B utilise le logiciel pour virgule flottante alors que %B utilise le matériel pour virgule flottante"
 
-#: elf32-arm.c:15635
+#: elf32-arm.c:14160
 msgid "error: %B uses hardware FP, whereas %B uses software FP"
 msgstr "erreur: %B utilise le matériel pour virgule flottante alors que %B utilise le logiciel pour virgule flottante"
 
-#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617
-#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
-#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494
+#: elf32-avr.c:1271 elf32-bfin.c:3201 elf32-cris.c:2085 elf32-fr30.c:617
+#: elf32-frv.c:4119 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
+#: elf32-m32c.c:561 elf32-mep.c:542 elf32-moxie.c:290 elf32-msp430.c:494
 #: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949
 #: elf64-mmix.c:1530
 msgid "internal error: dangerous relocation"
-msgstr "erreur interne: réadressage dangereux"
+msgstr "erreur interne: relocalisation dangereuse"
 
-#: elf32-avr.c:2415 elf32-hppa.c:598 elf32-m68hc1x.c:166
+#: elf32-avr.c:2400 elf32-hppa.c:598 elf32-m68hc1x.c:166 elf64-ppc.c:4175
 msgid "%B: cannot create stub entry %s"
 msgstr "%B: ne peut créer l'entrée de l'ébauche %s"
 
-#: elf32-bfin.c:107 elf32-bfin.c:363
-msgid "relocation should be even number"
-msgstr "le réadressage devrait être un nombre paire"
-
-#: elf32-bfin.c:1591
+#: elf32-bfin.c:1575
 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'"
-msgstr "%B(%A+0x%lx): réadressage sans solution vers le symbole « %s »"
+msgstr "%B(%A+0x%lx): relocalisation sans solution vers le symbole «%s»"
 
-#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062
-#: elf64-s390.c:3037 elf64-x86-64.c:3923
+#: elf32-bfin.c:1608 elf32-i386.c:4123 elf32-m68k.c:4233 elf32-s390.c:3062
+#: elf64-s390.c:3037 elf64-x86-64.c:3759
 msgid "%B(%A+0x%lx): reloc against `%s': error %d"
 msgstr "%B(%A+0x%lx): relocalisation vers «%s»: erreur %d"
 
-#: elf32-bfin.c:2723
+#: elf32-bfin.c:2707
 msgid "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"
-msgstr "%B: réadressage à « %A+0x%x » fait référence au symbole « %s » avec un opérande non nul"
+msgstr "%B: relocalisation à «%A+0x%x» fait référence au symbole «%s» avec un opérande non nul"
 
-#: elf32-bfin.c:2737
+#: elf32-bfin.c:2721 elf32-frv.c:2901
 msgid "relocation references symbol not defined in the module"
-msgstr "le réadressage fait référence à un symbole non défini dans le module"
+msgstr "la relocalisation fait référence à un symbole non défini dans le module"
 
-#: elf32-bfin.c:2834
+#: elf32-bfin.c:2818
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC fait référence à un symbole dynamique avec un opérande non nul"
 
-#: elf32-bfin.c:2875 elf32-bfin.c:2998
+#: elf32-bfin.c:2859 elf32-bfin.c:2982 elf32-frv.c:3638 elf32-frv.c:3759
 msgid "cannot emit fixups in read-only section"
 msgstr "impossible d'apporter des corrections dans une section en lecture seule"
 
-#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021
+#: elf32-bfin.c:2890 elf32-bfin.c:3020 elf32-frv.c:3669 elf32-frv.c:3803
+#: elf32-lm32.c:1103 elf32-sh.c:5021
 msgid "cannot emit dynamic relocations in read-only section"
-msgstr "impossible d'éditer les réadressages dynamiques dans une section en lecture seule"
+msgstr "impossible d'éditer les relocalisations dynamiques dans une section en lecture seule"
 
-#: elf32-bfin.c:2956
+#: elf32-bfin.c:2940
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC_VALUE fait référence à un symbole dynamique avec un opérande non nul"
 
-#: elf32-bfin.c:3121
+#: elf32-bfin.c:3105
 msgid "relocations between different segments are not supported"
-msgstr "les réadressages entre segments différents ne sont pas supportés"
+msgstr "les relocalisations entre segments différents ne sont pas supportées"
 
-#: elf32-bfin.c:3122
+#: elf32-bfin.c:3106
 msgid "warning: relocation references a different segment"
-msgstr "attention: réadressage fait référence à un segment différent"
+msgstr "attention: relocalisation fait référence à un segment différent"
 
-#: elf32-bfin.c:4967
+#: elf32-bfin.c:4957 elf32-frv.c:6406
 msgid "%B: unsupported relocation type %i"
-msgstr "%B: type de réadressage %i non supporté"
+msgstr "%B: type de relocalisation %i non supporté"
 
-#: elf32-bfin.c:5121 elf32-frv.c:6805
+#: elf32-bfin.c:5111 elf32-frv.c:6814
 #, c-format
 msgid "%s: cannot link non-fdpic object file into fdpic executable"
 msgstr "%s: ne peut lier un fichier objet non fdpic dans un exécutable fdpic"
 
-#: elf32-bfin.c:5125 elf32-frv.c:6809
+#: elf32-bfin.c:5115 elf32-frv.c:6818
 #, c-format
 msgid "%s: cannot link fdpic object file into non-fdpic executable"
 msgstr "%s: ne peut lier un fichier objet fdpic dans un exécutable non fdpic"
 
-#: elf32-bfin.c:5279
-#, c-format
-msgid "*** check this relocation %s"
-msgstr "*** vérifiez ce réadressage %s"
-
 #: elf32-cris.c:1172
 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
-msgstr "%B, section %A: réadressage %s non résolu sur le symbole « %s »"
+msgstr "%B, section %A: relocalisation %s non résolue sur le symbole «%s»"
 
 #: elf32-cris.c:1234
 msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'"
-msgstr "%B, section %a: Pas de PLT ni de GOT pour réadresser %s sur le symbole « %s »"
+msgstr "%B, section %a: Pas de PLT ni de GOT pour relocaliser %s sur le symbole «%s»"
 
 #: elf32-cris.c:1236
 msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
-msgstr "%B, section %A: Pas de PLT pour réadresser %s sur le symbole « %s »"
+msgstr "%B, section %A: Pas de PLT pour relocaliser %s sur le symbole «%s»"
 
 #: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718
-#: elf32-cris.c:1871 elf32-tic6x.c:2660
+#: elf32-cris.c:1871
 msgid "[whose name is lost]"
 msgstr "[dont le nom est perdu]"
 
-#: elf32-cris.c:1361 elf32-tic6x.c:2645
+#: elf32-cris.c:1361
 msgid "%B, section %A: relocation %s with non-zero addend %d against local symbol"
-msgstr "%B, section %A: réadressage de %s avec un opérande non nul %d sur le symbole local"
+msgstr "%B, section %A: relocalisation de %s avec un opérande non nul %d sur le symbole local"
 
-#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653
+#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865
 msgid "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'"
-msgstr "%B, section %A: réadressage de %s avec un opérande non nul %d sur le symbole « %s »"
+msgstr "%B, section %A: relocalisation de %s avec un opérande non nul %d sur le symbole «%s»"
 
 #: elf32-cris.c:1395
 msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'"
-msgstr "%B, section %A: le réadressage de %s n'est pas permis pour le symbole global: « %s »"
+msgstr "%B, section %A: la relocation de %s n'est pas permise pour le symbole global: «%s»"
 
 #: elf32-cris.c:1411
 msgid "%B, section %A: relocation %s with no GOT created"
-msgstr "%B, section %A: réadressage de %s sans GOT"
+msgstr "%B, section %A: relocalisation de %s sans GOT"
 
 #. We shouldn't get here for GCC-emitted code.
 #: elf32-cris.c:1626
 msgid "%B, section %A: relocation %s has an undefined reference to `%s', perhaps a declaration mixup?"
-msgstr "%B, section %A: réadressage de %s a une référence non définie vers « %s », peut-être un mélange dans les déclarations ?"
+msgstr "%B, section %A: relocalisation de %s a une référence non définie vers «%s», peut-être un mélange dans les déclarations ?"
 
 #: elf32-cris.c:1998
 msgid "%B, section %A: relocation %s is not allowed for symbol: `%s' which is defined outside the program, perhaps a declaration mixup?"
-msgstr "%B, section %A: réadressage de %s n'est pas permis pour le symbole « %s » qui est défini en dehors du programme, peut-être un mélange dans les déclarations ?"
+msgstr "%B, section %A: relocalisation de %s n'est pas permise pour le symbole «%s» qui est défini en dehors du programme, peut-être un mélange dans les déclarations ?"
 
 #: elf32-cris.c:2051
 msgid "(too many global variables for -fpic: recompile with -fPIC)"
@@ -1388,7 +1347,7 @@ msgid ""
 "  v10/v32 compatible object %s must not contain a PIC relocation"
 msgstr ""
 "%B, section %A:\n"
-"  l'objet compatible v10/v32 %s ne peut pas contenir de réadressage PIC"
+"  l'objet compatible v10/v32 %s ne peut pas contenir de relocalisation PIC"
 
 #: elf32-cris.c:3353
 msgid ""
@@ -1396,7 +1355,7 @@ msgid ""
 "  relocation %s not valid in a shared object; typically an option mixup, recompile with -fPIC"
 msgstr ""
 "%B, section %A:\n"
-"  réadressage de %s pas valable dans un objet partagé; typiquement un mélange dans les options. Recompilez avec -fPIC"
+"  relocalisation de %s pas valable dans un objet partagé; typiquement un mélange dans les options. Recompilez avec -fPIC"
 
 #: elf32-cris.c:3567
 msgid ""
@@ -1404,7 +1363,7 @@ msgid ""
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
 msgstr ""
 "%B, section %A:\n"
-"  réadressage de %s ne devrait pas être utilisé dans un objet partagé; recompilez avec -fPIC"
+"  relocalisation de %s ne devrait pas être utilisée dans un objet partagé; recompilez avec -fPIC"
 
 #: elf32-cris.c:3992
 msgid ""
@@ -1412,7 +1371,7 @@ msgid ""
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
 msgstr ""
 "%B, section «%A», vers le symbole «%s»:\n"
-"  réadressage de %s ne devrait pas être utilisé dans un objet partagé; recompilez avec -fPIC"
+"  relocalisation de %s ne devrait pas être utilisée dans un objet partagé; recompilez avec -fPIC"
 
 #: elf32-cris.c:4111
 msgid "Unexpected machine number"
@@ -1449,128 +1408,102 @@ msgstr "%B contient du code CRIS v32 incompatible avec les objets précédents"
 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr "%B contient du code non CRIS v32 incompatible avec les objets précédents"
 
-#: elf32-dlx.c:142
-#, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
-msgstr "Erreur de liaison BFD: branchement (PC rel16) à la section (%s) n'est pas supporté"
-
-#: elf32-dlx.c:204
-#, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr "Erreur de liaison BFD: saut (PC rel26) à la section (%s) n'est pas supporté"
-
 #: elf32-frv.c:1509 elf32-frv.c:1658
 msgid "relocation requires zero addend"
-msgstr "le réadressage exige un opérande nul"
+msgstr "la relocalisation exige un opérande nul"
 
 #: elf32-frv.c:2888
-msgid "%H: relocation to `%s+%v' may have caused the error above\n"
-msgstr "%H: le réadressage en « %s+%v » peut avoir causé le problème ci-dessus\n"
+msgid "%B(%A+0x%x): relocation to `%s+%x' may have caused the error above"
+msgstr "%B(%A+0x%x): la relocalisation en «%s+%x» peut avoir causé le problème ci-dessus"
 
-#: elf32-frv.c:2902
-msgid "%H: relocation references symbol not defined in the module\n"
-msgstr "%H: le réadressage fait référence à un symbole non défini dans le module\n"
-
-#: elf32-frv.c:2978
-msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF pas appliqué à une instruction d'appel\n"
+#: elf32-frv.c:2977
+msgid "R_FRV_GETTLSOFF not applied to a call instruction"
+msgstr "R_FRV_GETTLSOFF pas appliqué à une instruction d'appel"
 
 #: elf32-frv.c:3019
-msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESC12 pas appliqué à une instruction lddi\n"
+msgid "R_FRV_GOTTLSDESC12 not applied to an lddi instruction"
+msgstr "R_FRV_GOTTLSDESC12 pas appliqué à une instruction lddi"
 
 #: elf32-frv.c:3090
-msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCHI pas appliqué à une instruction sethi\n"
+msgid "R_FRV_GOTTLSDESCHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSDESCHI pas appliqué à une instruction sethi"
 
 #: elf32-frv.c:3127
-msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCLO pas appliqué à une instruction setlo ou setlos\n"
-
-#: elf32-frv.c:3174
-msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
-msgstr "%H: R_FRV_TLSDESC_RELAX pas appliqué à une instruction ldd\n"
+msgid "R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSDESCLO pas appliqué à une instruction setlo ou setlos"
 
-#: elf32-frv.c:3258
-msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF_RELAX pas appliqué à une instruction calll\n"
+#: elf32-frv.c:3175
+msgid "R_FRV_TLSDESC_RELAX not applied to an ldd instruction"
+msgstr "R_FRV_TLSDESC_RELAX pas appliqué à une instruction ldd"
 
-#: elf32-frv.c:3312
-msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFF12 pas appliqué à une instruction ldi\n"
+#: elf32-frv.c:3259
+msgid "R_FRV_GETTLSOFF_RELAX not applied to a calll instruction"
+msgstr "R_FRV_GETTLSOFF_RELAX pas appliqué à une instruction calll"
 
-#: elf32-frv.c:3342
-msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFHI pas appliqué à une instruction sethi\n"
+#: elf32-frv.c:3314
+msgid "R_FRV_GOTTLSOFF12 not applied to an ldi instruction"
+msgstr "R_FRV_GOTTLSOFF12 pas appliqué à une instruction ldi"
 
-#: elf32-frv.c:3371
-msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFLO pas appliqué à une instruction setlo ou setlos\n"
+#: elf32-frv.c:3344
+msgid "R_FRV_GOTTLSOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSOFFHI pas appliqué à une instruction sethi"
 
-#: elf32-frv.c:3401
-msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
-msgstr "%H: R_FRV_TLSOFF_RELAX pas appliqué à une instruction ld\n"
+#: elf32-frv.c:3373
+msgid "R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSOFFLO pas appliqué à une instruction setlo ou setlos"
 
-#: elf32-frv.c:3446
-msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_TLSMOFFHI pas appliqué à une instruction sethi\n"
+#: elf32-frv.c:3404
+msgid "R_FRV_TLSOFF_RELAX not applied to an ld instruction"
+msgstr "R_FRV_TLSOFF_RELAX pas appliqué à une instruction ld"
 
-#: elf32-frv.c:3473
-msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "R_FRV_TLSMOFFLO pas appliqué à une instruction setlo ou setlos\n"
+#: elf32-frv.c:3449
+msgid "R_FRV_TLSMOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_TLSMOFFHI pas appliqué à une instruction sethi"
 
-#: elf32-frv.c:3594
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC fait référence à un symbole dynamique avec un opérande non nul\n"
+#: elf32-frv.c:3476
+msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_TLSMOFFLO pas appliqué à une instruction setlo ou setlos"
 
-#: elf32-frv.c:3635 elf32-frv.c:3757
-msgid "%H: cannot emit fixups in read-only section\n"
-msgstr "%H: impossible d'apporter des corrections dans une section en lecture seule\n"
+#: elf32-frv.c:3597
+msgid "R_FRV_FUNCDESC references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC fait référence à un symbole dynamique avec un opérande non nul"
 
-#: elf32-frv.c:3666 elf32-frv.c:3800
-msgid "%H: cannot emit dynamic relocations in read-only section\n"
-msgstr "%H: impossible d'éditer les réadressages dynamiques dans une section en lecture seule\n"
+#: elf32-frv.c:3717
+msgid "R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC_VALUE fait référence à un symbole dynamique avec un opérande non nul"
 
-#: elf32-frv.c:3715
-msgid "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC_VALUE fait référence à un symbole dynamique avec un opérande non nul\n"
+#: elf32-frv.c:3974 elf32-frv.c:4130
+msgid "%B(%A+0x%lx): reloc against `%s': %s"
+msgstr "%B(%A+0x%lx): relocalisation vers «%s»: %s"
 
-#: elf32-frv.c:3971
-msgid "%H: reloc against `%s' references a different segment\n"
-msgstr "%H: le réadressage sur « %s » fait référence à un segment différent\n"
+#: elf32-frv.c:3976 elf32-frv.c:3980
+msgid "relocation references a different segment"
+msgstr "la relocalisation fait référence à un segment différent"
 
-#: elf32-frv.c:4121
-msgid "%H: reloc against `%s': %s\n"
-msgstr "%H: réadressage sur « %s »: %s\n"
-
-#: elf32-frv.c:6397
-msgid "%B: unsupported relocation type %i\n"
-msgstr "%B: type de réadressage %i non supporté\n"
-
-#: elf32-frv.c:6719
+#: elf32-frv.c:6728
 #, c-format
 msgid "%s: compiled with %s and linked with modules that use non-pic relocations"
-msgstr "%s: compilé avec %s et lié avec les modules qui utilisent le réadressage non PIC"
+msgstr "%s: compilé avec %s et lié avec les modules qui utilisent de la relocalisation non PIC"
 
-#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807
+#: elf32-frv.c:6781 elf32-iq2000.c:845 elf32-m32c.c:807
 #, c-format
 msgid "%s: compiled with %s and linked with modules compiled with %s"
 msgstr "%s: compilé avec %s et lié avec les modules compilés avec %s"
 
-#: elf32-frv.c:6784
+#: elf32-frv.c:6793
 #, c-format
 msgid "%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%s: utilise différents champs e_flags (0x%lx) que les modules précédents (0x%lx)"
 
-#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
-#: elf32-rx.c:2937
+#: elf32-frv.c:6843 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
+#: elf32-rx.c:2925
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr "fanions privés = 0x%lx:"
 
 #: elf32-gen.c:69 elf64-gen.c:69
 msgid "%B: Relocations in generic ELF (EM: %d)"
-msgstr "%B: Réadressages en format ELF générique (EM: %d)"
+msgstr "%B: Relocalisation en format ELF générique (EM: %d)"
 
 #: elf32-hppa.c:850 elf32-hppa.c:3610
 msgid "%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"
@@ -1578,7 +1511,7 @@ msgstr "%B(%A+0x%lx): ne peut atteindre %s, recompilez avec -ffunction-sections"
 
 #: elf32-hppa.c:1284
 msgid "%B: relocation %s can not be used when making a shared object; recompile with -fPIC"
-msgstr "%B: réadressage de %s ne peut être utilisé lors de la création d'un objet partagé; recompilez avec -fPIC"
+msgstr "%B: relocalisation de %s ne peut être utilisée lors de la création d'un objet partagé; recompilez avec -fPIC"
 
 #: elf32-hppa.c:2803
 msgid "%B: duplicate export stub %s"
@@ -1597,69 +1530,61 @@ msgid ".got section not immediately after .plt section"
 msgstr "section .got pas immédiatement après la section .plt"
 
 #. Unknown relocation.
-#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379
-#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243
+#: elf32-i386.c:371 elf32-m68k.c:383 elf32-ppc.c:1674 elf32-s390.c:379
+#: elf32-tic6x.c:1563 elf64-ppc.c:2284 elf64-s390.c:403 elf64-x86-64.c:234
 msgid "%B: invalid relocation type %d"
-msgstr "%B: type de réadressage %d invalide"
+msgstr "%B: type de relocalisation %d invalide"
 
-#: elf32-i386.c:1266 elf64-x86-64.c:1116
+#: elf32-i386.c:1265 elf64-x86-64.c:1049
 msgid "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed"
 msgstr "%B: Échec de la transition TLS de %s vers %s sur «%s» à 0x%lx dans la section «%A»"
 
-#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909
-#: elfxx-sparc.c:3077
+#: elf32-i386.c:1408 elf32-i386.c:3068 elf64-x86-64.c:1194 elf64-x86-64.c:2780
+#: elfxx-sparc.c:3076
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
-msgstr "%B: le réadressage %s sur le symbole STT_GNU_IFUNC « %s » n'est pas géré par %s"
+msgstr "%B: la relocalisation %s sur le symbole STT_GNU_IFUNC «%s» n'est pas gérée par %s"
 
-#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
+#: elf32-i386.c:1570 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
 #: elf64-s390.c:1151 elfxx-sparc.c:1547
 msgid "%B: `%s' accessed both as normal and thread local symbol"
 msgstr "%B: «%s» accédé à la fois comme symbole normal et comme symbole locale au thread"
 
-#: elf32-i386.c:2405 elf64-x86-64.c:2320
-msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"
-msgstr "%P: %B: attention: réadressage sur « %s » dans la section en lecture seule « %A ».\n"
-
-#: elf32-i386.c:2496 elf64-x86-64.c:2407
-msgid "%P: %B: warning: relocation in readonly section `%A'.\n"
-msgstr "%P: %B: attention: réadressage dans la section « %A » en lecture seule.\n"
-
-#: elf32-i386.c:2932
+#: elf32-i386.c:2910
 msgid "%B: unrecognized relocation (0x%x) in section `%A'"
-msgstr "%B: réadressage inconnu (0x%x) dans la section « %A »"
+msgstr "%B: relocalisation inconnue (0x%x) dans la section «%A»"
 
-#: elf32-i386.c:3339 elf64-x86-64.c:3295
+#: elf32-i386.c:3317 elf64-x86-64.c:3174
 msgid "hidden symbol"
 msgstr "symbole caché"
 
-#: elf32-i386.c:3342 elf64-x86-64.c:3298
+#: elf32-i386.c:3320 elf64-x86-64.c:3177
 msgid "internal symbol"
 msgstr "symbole interne"
 
-#: elf32-i386.c:3345 elf64-x86-64.c:3301
+#: elf32-i386.c:3323 elf64-x86-64.c:3180
 msgid "protected symbol"
 msgstr "symbole protégé"
 
-#: elf32-i386.c:3348 elf64-x86-64.c:3304
+#: elf32-i386.c:3326 elf64-x86-64.c:3183
 msgid "symbol"
 msgstr "symbole"
 
-#: elf32-i386.c:3353
+#: elf32-i386.c:3331
 msgid "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"
-msgstr "%B: réadressage R_386_GOTOFF sur le symbole %s « %s » non défini ne peut pas être utilisé lors de la création d'un objet partagé"
+msgstr "%B: relocalisation R_386_GOTOFF sur le symbole %s «%s» non défini ne peut pas être utilisée lors de la création d'un objet partagé"
 
-#: elf32-i386.c:3363
+#: elf32-i386.c:3341
 msgid "%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"
-msgstr "%B: réadressage R_386_GOTOFF vers la fonction protégée « %s » ne peut pas être utilisé lors de la création d'un objet partagé"
+msgstr "%B: relocaliastion R_386_GOTOFF vers la fonction protégée «%s» ne peut pas être utilisée lors de la création d'un objet partagé"
 
-#: elf32-i386.c:4660 elf64-x86-64.c:4378
+#: elf32-i386.c:4633 elf64-x86-64.c:4206
 #, c-format
 msgid "discarded output section: `%A'"
 msgstr "section de sortie rejetée: «%A»"
 
 #: elf32-ip2k.c:857 elf32-ip2k.c:863 elf32-ip2k.c:930 elf32-ip2k.c:936
 msgid "ip2k relaxer: switch table without complete matching relocation information."
-msgstr "relâche ip2k: table de commutation sans concordance complète des informations de réadressage"
+msgstr "relâche ip2k: table de commutation sans concordance complète des informations de relocalisation"
 
 #: elf32-ip2k.c:880 elf32-ip2k.c:963
 msgid "ip2k relaxer: switch table header corrupt."
@@ -1678,7 +1603,7 @@ msgstr "liaison ip2k: instruction de page redondante à 0x%08lx (cible = 0x%08lx
 #. Only if it's not an unresolved symbol.
 #: elf32-ip2k.c:1475
 msgid "unsupported relocation between data/insn address spaces"
-msgstr "réadressage non supporté entre les espaces d'adresses data/insn"
+msgstr "relocalisation non supporté entre les espaces d'adresses data/insn"
 
 #: elf32-iq2000.c:858 elf32-m32c.c:819
 #, c-format
@@ -1687,7 +1612,7 @@ msgstr "%s: utilise des champs e_flags (0x%lx) différents des modules précéde
 
 #: elf32-lm32.c:706
 msgid "global pointer relative relocation when _gp not defined"
-msgstr "réadressage relatif au pointeur global sans que _gp ne soit défini"
+msgstr "relocalisation relative au pointeur global sans que _gp ne soit défini"
 
 #: elf32-lm32.c:761
 msgid "global pointer relative address out of range"
@@ -1699,11 +1624,11 @@ msgstr "erreur interne: opérande devrait être zéro pour R_LM32_16_GOT"
 
 #: elf32-m32r.c:1453
 msgid "SDA relocation when _SDA_BASE_ not defined"
-msgstr "réadressage SDA alors que _SDA_BASE_ n'est pas défini"
+msgstr "relocalisation SDA alors que _SDA_BASE_ n'est pas définie"
 
 #: elf32-m32r.c:3048
 msgid "%B: The target (%s) of an %s relocation is in the wrong section (%A)"
-msgstr "%B: la cible (%s) du réadressage %s est dans la mauvaise section (%A)"
+msgstr "%B: la cible (%s) de la relocalisation %s est dans la mauvaise section (%A)"
 
 #: elf32-m32r.c:3576
 msgid "%B: Instruction set mismatch with previous modules"
@@ -1732,7 +1657,7 @@ msgstr ": instructions m32r2"
 #: elf32-m68hc1x.c:1050
 #, c-format
 msgid "Reference to the far symbol `%s' using a wrong relocation may result in incorrect execution"
-msgstr "Référence à un symbole far « %s » utilisant le mauvais réadressage peut provoquer une exécution incorrecte"
+msgstr "Référence à un symbole far «%s» utilisant la mauvaise relocalisation peut provoquer une exécution incorrecte"
 
 #: elf32-m68hc1x.c:1073
 #, c-format
@@ -1756,7 +1681,7 @@ msgstr "%B: fichiers liés compilés pour des doubles de 32 bits (-fshort-double
 msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
 msgstr "%B: certains fichiers liés compilés pour HCS12 avec d'autres compilés pour HC12"
 
-#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719
+#: elf32-m68hc1x.c:1257 elf32-ppc.c:4232 elf64-sparc.c:703 elfxx-mips.c:12704
 msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%B: utilise des champs e_flags (0x%lx) différents des modules précédents (0x%lx)"
 
@@ -1805,50 +1730,39 @@ msgstr " [memory=bank-model]"
 msgid " [memory=flat]"
 msgstr " [memory=flat]"
 
-#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326
+#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7292 vms-alpha.c:7307
 msgid "unknown"
 msgstr "inconnu"
 
 #: elf32-m68k.c:1714
 msgid "%B: GOT overflow: Number of relocations with 8-bit offset > %d"
-msgstr "%B: débordement GOT: Nombre de réadressages avec des offsets de 8 bits > %d"
+msgstr "%B: débordement GOT: Nombre de relocalisations avec des offsets de 8 bits > %d"
 
 #: elf32-m68k.c:1720
 msgid "%B: GOT overflow: Number of relocations with 8- or 16-bit offset > %d"
-msgstr "%B: débordement GOT: Nombre de réadressages avec des offsets de 8 ou 16 bits > %d"
+msgstr "%B: débordement GOT: Nombre de relocalisations avec des offsets de 8 ou 16 bits > %d"
 
 #: elf32-m68k.c:3959
 msgid "%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted in shared object"
-msgstr "%B(%A+0x%lx): réadressage R_68K_TLS_LE32 pas permis dans un objet partagé"
+msgstr "%B(%A+0x%lx): relocalisation R_68K_TLS_LE32 pas permise dans un objet partagé"
 
 #: elf32-mcore.c:99 elf32-mcore.c:442
 msgid "%B: Relocation %s (%d) is not currently supported.\n"
-msgstr "%B: Réadressage %s (%d) n'est pas actuellement supporté.\n"
+msgstr "%B: relocalisation %s (%d) n'est pas actuellement supportée.\n"
 
 #: elf32-mcore.c:428
 msgid "%B: Unknown relocation type %d\n"
-msgstr "%B: Type de réadressage %d inconnu\n"
-
-#. Pacify gcc -Wall.
-#: elf32-mep.c:157
-#, c-format
-msgid "mep: no reloc for code %d"
-msgstr "mep: pas de réadressage pour le code %d"
-
-#: elf32-mep.c:163
-#, c-format
-msgid "MeP: howto %d has type %d"
-msgstr "MeP: le howto %d a le type %d"
+msgstr "%B: Type de relocalisation %d inconnue\n"
 
-#: elf32-mep.c:648
+#: elf32-mep.c:647
 msgid "%B and %B are for different cores"
 msgstr "%B et %B sont pour des noyaux différents"
 
-#: elf32-mep.c:665
+#: elf32-mep.c:664
 msgid "%B and %B are for different configurations"
 msgstr "%B et %B sont pour des configurations différentes"
 
-#: elf32-mep.c:702
+#: elf32-mep.c:701
 #, c-format
 msgid "private flags = 0x%lx"
 msgstr "fanions privés = 0x%lx"
@@ -1856,207 +1770,190 @@ msgstr "fanions privés = 0x%lx"
 #: elf32-microblaze.c:742
 #, c-format
 msgid "%s: unknown relocation type %d"
-msgstr "%s: type de réadressage %d inconnu"
+msgstr "%s: type de relocalisation %d inconnu"
 
 #: elf32-microblaze.c:867 elf32-microblaze.c:912
 #, c-format
 msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
-msgstr "%s: la cible (%s) du réadressage %s est dans la mauvaise section (%s)"
+msgstr "%s: la cible (%s) de la relocalisation %s est dans la mauvaise section (%s)"
 
-#: elf32-microblaze.c:1155 elfxx-sparc.c:3451
+#: elf32-microblaze.c:1155 elfxx-sparc.c:3450
 msgid "%B: probably compiled without -fPIC?"
 msgstr "%B: probablement compilé sans -fPIC?"
 
-#: elf32-microblaze.c:2074
+#: elf32-microblaze.c:2074 elflink.c:12601
 msgid "%B: bad relocation section name `%s'"
-msgstr "%B: nom de section de réadressage erroné « %s »"
+msgstr "%B: nom de section de relocalisation erroné «%s»"
 
 #: elf32-mips.c:1045 elf64-mips.c:2084 elfn32-mips.c:1888
 msgid "literal relocation occurs for an external symbol"
-msgstr "réadressage littéral rencontré pour un symbole externe"
+msgstr "relocalisation littérale rencontrée pour un symbole externe"
 
 #: elf32-mips.c:1085 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:2127
 #: elfn32-mips.c:1929
 msgid "32bits gp relative relocation occurs for an external symbol"
-msgstr "réadressage relatif gp 32bits rencontré pour un symbole externe"
+msgstr "relocalisation relative gp 32bits rencontrée pour un symbole externe"
 
-#: elf32-ppc.c:1740
+#: elf32-ppc.c:1739
 #, c-format
 msgid "generic linker can't handle %s"
 msgstr "liaison générique ne peut traiter %s"
 
-#: elf32-ppc.c:2183
+#: elf32-ppc.c:2180
 msgid "corrupt %s section in %B"
 msgstr "section %s corrompue dans %B"
 
-#: elf32-ppc.c:2202
+#: elf32-ppc.c:2199
 msgid "unable to read in %s section from %B"
 msgstr "incapable de lire dans la section %s à partir de %B"
 
-#: elf32-ppc.c:2243
+#: elf32-ppc.c:2240
 msgid "warning: unable to set size of %s section in %B"
 msgstr "attention: incapable d'initialiser la taille de la section %s dans %B"
 
-#: elf32-ppc.c:2293
+#: elf32-ppc.c:2290
 msgid "failed to allocate space for new APUinfo section."
 msgstr "échec d'allocation d'espace pour une nouvelle section APUinfo"
 
-#: elf32-ppc.c:2312
+#: elf32-ppc.c:2309
 msgid "failed to compute new APUinfo section."
 msgstr "échec d'évaluation de la nouvelle section APUinfo"
 
-#: elf32-ppc.c:2315
+#: elf32-ppc.c:2312
 msgid "failed to install new APUinfo section."
 msgstr "échec d'installation de la nouvelle section APUinfo"
 
-#: elf32-ppc.c:3343
+#: elf32-ppc.c:3358
 msgid "%B: relocation %s cannot be used when making a shared object"
-msgstr "%B: réadressage %s ne peut être utilisé lors de la création d'un objet partagé"
+msgstr "%B: relocalisation %s ne peut être utilisée lors de la création d'un objet partagé"
 
 #. It does not make sense to have a procedure linkage
 #. table entry for a local symbol.
-#: elf32-ppc.c:3687
-msgid "%H: %s reloc against local symbol\n"
-msgstr "%H: %s réadressé par rapport à un symbole local\n"
+#: elf32-ppc.c:3702
+msgid "%B(%A+0x%lx): %s reloc against local symbol"
+msgstr "%B(%A+0x%lx): %s relocalisation vers un symbole local"
 
-#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449
-#: elfxx-mips.c:12471 elfxx-mips.c:12497
+#: elf32-ppc.c:4044 elf32-ppc.c:4059 elfxx-mips.c:12411 elfxx-mips.c:12437
+#: elfxx-mips.c:12459 elfxx-mips.c:12485
 msgid "Warning: %B uses hard float, %B uses soft float"
 msgstr "Attention: %B utilise la virgule flottante matérielle, %B utilise la virgule flottante logicielle"
 
-#: elf32-ppc.c:4029 elf32-ppc.c:4033
+#: elf32-ppc.c:4047 elf32-ppc.c:4051
 msgid "Warning: %B uses double-precision hard float, %B uses single-precision hard float"
 msgstr "Attention: %B utilise la virgule flottante double précision matérielle, %B utilise la virgule flottante simple précision matérielle"
 
-#: elf32-ppc.c:4037
+#: elf32-ppc.c:4055
 msgid "Warning: %B uses soft float, %B uses single-precision hard float"
 msgstr "Attention: %B utilise la virgule flottante logicielle, %B utilise la virgule flottante simple précision matérielle"
 
-#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407
+#: elf32-ppc.c:4062 elf32-ppc.c:4066 elfxx-mips.c:12391 elfxx-mips.c:12395
 msgid "Warning: %B uses unknown floating point ABI %d"
 msgstr "Attention: %B utilise l'ABI inconnu %d pour la gestion des virgules flottantes"
 
-#: elf32-ppc.c:4090 elf32-ppc.c:4094
+#: elf32-ppc.c:4108 elf32-ppc.c:4112
 msgid "Warning: %B uses unknown vector ABI %d"
 msgstr "Attention: %B utilise l'ABI inconnu %d pour les vecteurs"
 
-#: elf32-ppc.c:4098
+#: elf32-ppc.c:4116
 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\""
 msgstr "Attention: %B utilise l'ABI de vecteurs «%s», %B utilise «%s»"
 
-#: elf32-ppc.c:4115 elf32-ppc.c:4118
+#: elf32-ppc.c:4133 elf32-ppc.c:4136
 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
 msgstr "Attention: %B utilise r3/r4 pour les retours de petites structures, %B utilise la mémoire"
 
-#: elf32-ppc.c:4121 elf32-ppc.c:4125
+#: elf32-ppc.c:4139 elf32-ppc.c:4143
 msgid "Warning: %B uses unknown small structure return convention %d"
 msgstr "Attention: %B utilise la convention inconnue %d pour le retour des petites structures"
 
-#: elf32-ppc.c:4179
+#: elf32-ppc.c:4197
 msgid "%B: compiled with -mrelocatable and linked with modules compiled normally"
 msgstr "%B: compilé avec -mrelocatable et fait l'édition de lien avec les modules compilés normalement"
 
-#: elf32-ppc.c:4187
+#: elf32-ppc.c:4205
 msgid "%B: compiled normally and linked with modules compiled with -mrelocatable"
 msgstr "%B: compilé normalement et fait l'édition de lien avec les modules compilés avec -mrelocatable"
 
-#: elf32-ppc.c:4275
+#: elf32-ppc.c:4293
 msgid "Using bss-plt due to %B"
 msgstr "Utilisation de bss-plt à cause de %B"
 
-#. Uh oh, we didn't find the expected call.  We
-#. could just mark this symbol to exclude it
-#. from tls optimization but it's safer to skip
-#. the entire optimization.
-#: elf32-ppc.c:4771 elf64-ppc.c:7778
-msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
-msgstr "%H l'argument a perdu __tls_get_addr, optimisation TLS désactivée\n"
-
-#: elf32-ppc.c:5006 elf64-ppc.c:6494
-#, c-format
-msgid "dynamic variable `%s' is zero size\n"
-msgstr "la variable dynamique « %s » a une taille nulle\n"
-
-#: elf32-ppc.c:7204 elf64-ppc.c:12431
-msgid "%B: unknown relocation type %d for symbol %s\n"
-msgstr "%B: type de réadressage %d inconnu pour le symbole %s\n"
+#: elf32-ppc.c:7192 elf64-ppc.c:12307
+msgid "%B: unknown relocation type %d for symbol %s"
+msgstr "%B: type de relocalisation %d inconnue pour le symbole %s"
 
-#: elf32-ppc.c:7465
-msgid "%H: non-zero addend on %s reloc against `%s'\n"
-msgstr "%H: opérande non nul sur le réadressage %s par rapport à « %s »\n"
+#: elf32-ppc.c:7453
+msgid "%B(%A+0x%lx): non-zero addend on %s reloc against `%s'"
+msgstr "%B(%A+0x%lx): opérande non nulle sur la relocalisation %s vers «%s»"
 
-#: elf32-ppc.c:7661 elf64-ppc.c:12936
-msgid "%H: relocation %s for indirect function %s unsupported\n"
-msgstr "%H: réadressage %s non supporté pour la fonction indirecte %s\n"
+#: elf32-ppc.c:7651 elf64-ppc.c:12812
+msgid "%B(%A+0x%lx): relocation %s for indirect function %s unsupported"
+msgstr "%B(%A+0x%lx): relocalisation %s non supportée pour la fonction indirecte %s"
 
-#: elf32-ppc.c:7889 elf32-ppc.c:7919 elf32-ppc.c:7966
-msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)\n"
-msgstr "%B: la cible (%s) d'un réadressage %s est dans la mauvaise section de sortie (%s)\n"
+#: elf32-ppc.c:7881 elf32-ppc.c:7911 elf32-ppc.c:7958
+msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)"
+msgstr "%B: la cible (%s) d'une relocalisation %s est dans la mauvaise section de sortie (%s)"
 
-#: elf32-ppc.c:8038
-msgid "%B: relocation %s is not yet supported for symbol %s\n"
-msgstr "%B: réadressage %s n'est pas encore supporté pour le symbole %s\n"
+#: elf32-ppc.c:8030
+msgid "%B: relocation %s is not yet supported for symbol %s."
+msgstr "%B: relocalisation %s n'est pas encore supporté pour le symbole %s."
 
-#: elf32-ppc.c:8097 elf64-ppc.c:13237
-msgid "%H: unresolvable %s relocation against symbol `%s'\n"
-msgstr "%H: réadressage %s sans solution par rapport au symbole « %s »\n"
+#: elf32-ppc.c:8138 elf64-ppc.c:13162
+msgid "%B(%A+0x%lx): %s reloc against `%s': error %d"
+msgstr "%B(%A+0x%lx): relocalisation %s vers «%s»: erreur %d"
 
-#: elf32-ppc.c:8144 elf64-ppc.c:13282
-msgid "%H: %s reloc against `%s': error %d\n"
-msgstr "%H: réadressage %s vers « %s »: erreur %d\n"
-
-#: elf32-ppc.c:8635
+#: elf32-ppc.c:8629
 #, c-format
-msgid "%s not defined in linker created %s\n"
-msgstr "%s pas défini dans %s créé par l'éditeur de liens\n"
+msgid "%s not defined in linker created %s"
+msgstr "%s pas défini dans %s créé par l'éditeur de liens"
 
-#: elf32-rx.c:553
+#: elf32-rx.c:544
 msgid "%B:%A: Warning: deprecated Red Hat reloc "
 msgstr "%B:%A: Attention: relocalisation Red Hat réprouvée "
 
-#: elf32-rx.c:1095
+#: elf32-rx.c:1086
 msgid "Warning: RX_SYM reloc with an unknown symbol"
 msgstr "Attention: Relocalistaion RX_SYM avec un symbole inconnu"
 
-#: elf32-rx.c:1260
+#: elf32-rx.c:1251
 msgid "%B(%A): error: call to undefined function '%s'"
 msgstr "%B(%A): erreur: appel à la fonction non définie «%s»"
 
-#: elf32-rx.c:1274
+#: elf32-rx.c:1265
 msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
 msgstr "%B(%A): attention: accès non aligné au symbole «%s» dans la zone des petites données"
 
-#: elf32-rx.c:1278
+#: elf32-rx.c:1269
 msgid "%B(%A): internal error: out of range error"
 msgstr "%B(%A): erreur interne: hors limite"
 
-#: elf32-rx.c:1282
+#: elf32-rx.c:1273
 msgid "%B(%A): internal error: unsupported relocation error"
-msgstr "%B(%A): erreur interne: réadressage non supporté"
+msgstr "%B(%A): erreur interne: relocalisation non supportée"
 
-#: elf32-rx.c:1286
+#: elf32-rx.c:1277
 msgid "%B(%A): internal error: dangerous relocation"
-msgstr "%B(%A): erreur interne: réadressage dangereux"
+msgstr "%B(%A): erreur interne: relocalisation dangereuse"
 
-#: elf32-rx.c:1290
+#: elf32-rx.c:1281
 msgid "%B(%A): internal error: unknown error"
 msgstr "%B(%A): erreur interne: erreur inconnue"
 
-#: elf32-rx.c:2940
+#: elf32-rx.c:2928
 #, c-format
 msgid " [64-bit doubles]"
 msgstr " [doubles de 64 bits]"
 
-#: elf32-rx.c:2942
+#: elf32-rx.c:2930
 #, c-format
 msgid " [dsp]"
 msgstr " [dsp]"
 
 #: elf32-s390.c:2209 elf64-s390.c:2196
 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s"
-msgstr "%B(%A+0x%lx): instruction invalide pour le réadressage TLS %s"
+msgstr "%B(%A+0x%lx): instruction invalide pour la relocalisation TLS %s"
 
-#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324
+#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3323
 msgid "not enough GOT space for local GOT entries"
 msgstr "pas suffisamment d'espace GOT pour les entrées locales GOT"
 
@@ -2095,7 +1992,7 @@ msgstr "%B: la directive IMPORT AS de %s masque l'IMPORT AS précédent"
 msgid "%B: Unrecognised .directive command: %s"
 msgstr "%B: Commande .directive non reconnue: %s"
 
-#: elf32-sh-symbian.c:504
+#: elf32-sh-symbian.c:503
 msgid "%B: Failed to add renamed symbol %s"
 msgstr "%B: Échec de l'ajout du symbole renommé %s"
 
@@ -2137,19 +2034,19 @@ msgstr "STO_SH5_ISA32 inattendu sur le symbole local n'est pas traité"
 
 #: elf32-sh.c:4304
 msgid "%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"
-msgstr "%B: 0x%lx: fatal: cible de branchement non alignée pour un réadressage de type relax-support"
+msgstr "%B: 0x%lx: fatal: cible de branchement non alignée pour une relocalisatin de type relax-support"
 
 #: elf32-sh.c:4337 elf32-sh.c:4352
 msgid "%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"
-msgstr "%B: 0x%lx: fatal: réadressage %s non aligné 0x%lx"
+msgstr "%B: 0x%lx: fatal: relocalisation %s non alignée 0x%lx"
 
 #: elf32-sh.c:4366
 msgid "%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"
-msgstr "%B: 0x%lx: fatal: réadressage R_SH_PSHA %d pas dans l'intervalle -32..32"
+msgstr "%B: 0x%lx: fatal: relocalisation R_SH_PSHA %d pas dans l'intervalle -32..32"
 
 #: elf32-sh.c:4380
 msgid "%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"
-msgstr "%B: 0x%lx: fatal: réadressage R_SH_PSHL %d n'est pas dans l'intervalle -32..32"
+msgstr "%B: 0x%lx: fatal: relocalisation R_SH_PSHL %d n'est pas dans l'intervalle -32..32"
 
 #: elf32-sh.c:4524 elf32-sh.c:4994
 msgid "%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"
@@ -2157,17 +2054,17 @@ msgstr "%B(%A+0x%lx): impossible d'apporter des corrections à «%s» dans une s
 
 #: elf32-sh.c:5101
 msgid "%B(%A+0x%lx): %s relocation against external symbol \"%s\""
-msgstr "%B(%A+0x%lx): %s réadressage vers le symbole externe « %s »"
+msgstr "%B(%A+0x%lx): %s relocalisation vers le symbole externe «%s»"
 
 #: elf32-sh.c:5574
 #, c-format
 msgid "%X%C: relocation to \"%s\" references a different segment\n"
-msgstr "%X%C: le réadressage vers « %s » fait référence à un segment différent\n"
+msgstr "%X%C: la relocalisation vers «%s» fait référence à un segment différent\n"
 
 #: elf32-sh.c:5580
 #, c-format
 msgid "%C: warning: relocation to \"%s\" references a different segment\n"
-msgstr "%C: attention: réadressage vers « %s » fait référence à un segment différent\n"
+msgstr "%C: attention: relocalisation vers «%s» fait référence à un segment différent\n"
 
 #: elf32-sh.c:6358 elf32-sh.c:6441
 msgid "%B: `%s' accessed both as normal and FDPIC symbol"
@@ -2179,9 +2076,9 @@ msgstr "%B: «%s» accédé à la fois comme symbole FDPIC et comme symbole loca
 
 #: elf32-sh.c:6393
 msgid "%B: Function descriptor relocation with non-zero addend"
-msgstr "%B: Descripteur de fonction réadressé avec un opérande non nul"
+msgstr "%B: Descripteur de fonction relocalisé avec un opérande non nul"
 
-#: elf32-sh.c:6629 elf64-alpha.c:4648
+#: elf32-sh.c:6629 elf64-alpha.c:4560
 msgid "%B: TLS local exec code cannot be linked into shared objects"
 msgstr "%B: code exécutable local TLS ne peut être lié en objets partagés"
 
@@ -2220,7 +2117,7 @@ msgstr "%s: Erreur GAS: insn PTB inattendue avec R_SH_PT_16"
 
 #: elf32-sh64.c:598
 msgid "%B: error: unaligned relocation type %d at %08x reloc %p\n"
-msgstr "%B: erreur: type de réadressage %d non aligné à %08x réadressé %p\n"
+msgstr "%B: erreur: type de relocalisation %d non aligné à %08x relocalisé %p\n"
 
 #: elf32-sh64.c:674
 #, c-format
@@ -2280,9 +2177,9 @@ msgstr "%s dans une section de recouvrement"
 
 #: elf32-spu.c:1951
 msgid "overlay stub relocation overflow"
-msgstr "débordement du réadressage de l'ébauche de recouvrement"
+msgstr "débordement de la relocalisation de l'ébauche de recouvrement"
 
-#: elf32-spu.c:1960
+#: elf32-spu.c:1960 elf64-ppc.c:11327
 msgid "stubs don't match calculated size"
 msgstr "taille des ébauches ne concorde pas avec la taille calculée"
 
@@ -2370,56 +2267,54 @@ msgstr "erreur fatale lors de la création de .fixup"
 
 #: elf32-spu.c:5006
 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"
-msgstr "%B(%A+0x%lx): réadressage %s sans solution vers le symbole « %s »"
-
-#: elf32-tic6x.c:1602
-msgid "warning: generating a shared library containing non-PIC code"
-msgstr "attention: production d'une librairie partagée contenant du code non-PIC"
+msgstr "%B(%A+0x%lx): relocalisation %s sans solution vers le symbole «%s»"
 
-#: elf32-tic6x.c:1607
-msgid "warning: generating a shared library containing non-PID code"
-msgstr "attention: production d'une librairie partagée contenant du code non-PID"
-
-#: elf32-tic6x.c:2539
+#: elf32-tic6x.c:1539
 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
-msgstr "%B: réadressage relatif à SB mais __c6xabi_DSBT_BASE n'est pas défini"
-
-#: elf32-tic6x.c:2759
-msgid "dangerous relocation"
-msgstr "réadressage dangereux"
+msgstr "%B: relocalisation relative à SB mais __c6xabi_DSBT_BASE n'est pas défini"
 
-#: elf32-tic6x.c:3740
-msgid "%B: error: unknown mandatory EABI object attribute %d"
-msgstr "%B: erreur: l'attribut d'objet EABI obligatoire %d est manquant"
+#. Shared libraries and exception handling support not
+#. implemented.
+#: elf32-tic6x.c:1554
+msgid "%B: relocation type %d not implemented"
+msgstr "%B: relocalisation de type %d pas implémentée"
 
-#: elf32-tic6x.c:3748
-msgid "%B: warning: unknown EABI object attribute %d"
-msgstr "%B: attention: attribut d'objet EABI %d inconnu"
+#: elf32-tic6x.c:1640
+msgid "dangerous relocation"
+msgstr "relocalisation dangereuse"
 
-#: elf32-tic6x.c:3860 elf32-tic6x.c:3868
+#: elf32-tic6x.c:1788 elf32-tic6x.c:1796
 msgid "error: %B requires more stack alignment than %B preserves"
 msgstr "erreur: %B nécessite un plus grand alignement de pile que ce que %B préserve"
 
-#: elf32-tic6x.c:3878 elf32-tic6x.c:3887
+#: elf32-tic6x.c:1806 elf32-tic6x.c:1815
 msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
 msgstr "erreur: valeur Tag_ABI_array_object_alignment inconnue dans %B"
 
-#: elf32-tic6x.c:3896 elf32-tic6x.c:3905
+#: elf32-tic6x.c:1824 elf32-tic6x.c:1833
 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
 msgstr "erreur: valeur Tag_ABI_array_object_align_expected inconnue dans %B"
 
-#: elf32-tic6x.c:3913 elf32-tic6x.c:3920
+#: elf32-tic6x.c:1841 elf32-tic6x.c:1848
 msgid "error: %B requires more array alignment than %B preserves"
 msgstr "erreur: %B nécessite un plus grand alignement de tableau que ce que %B préserve"
 
-#: elf32-tic6x.c:3942
+#: elf32-tic6x.c:1870
 msgid "warning: %B and %B differ in wchar_t size"
 msgstr "attention: %B et %B on des tailles de wchar_t différentes"
 
-#: elf32-tic6x.c:3960
+#: elf32-tic6x.c:1888
 msgid "warning: %B and %B differ in whether code is compiled for DSBT"
 msgstr "attention: %B et %B ne sont pas d'accord sur la compilation du code pour DSBT"
 
+#: elf32-tic6x.c:1898
+msgid "warning: %B and %B differ in position-dependence of data addressing"
+msgstr "attention: %B et %B divergent sur la dépendance de la position de l'adressage des données"
+
+#: elf32-tic6x.c:1908
+msgid "warning: %B and %B differ in position-dependence of code addressing"
+msgstr "attention: %B et %B divergent sur la dépendance de la position de l'adressage du code"
+
 #: elf32-v850.c:173
 #, c-format
 msgid "Variable `%s' cannot occupy in multiple small data regions"
@@ -2446,8 +2341,9 @@ msgid "Variable `%s' cannot be in both zero and tiny data regions simultaneously
 msgstr "Variable «%s» ne peut être dans une région de données zéro et minuscule à la fois"
 
 #: elf32-v850.c:483
-msgid "FAILED to find previous HI16 reloc"
-msgstr "ÉCHEC de repérage du réadressage HI16 précédent"
+#, c-format
+msgid "FAILED to find previous HI16 reloc\n"
+msgstr "ÉCHEC de repérage de la relocalisation précédente HI16\n"
 
 #: elf32-v850.c:2155
 msgid "could not locate special linker symbol __gp"
@@ -2524,14 +2420,14 @@ msgstr "%s: attention: ignore l'ajout PLT de %d à «%s» de la section %s"
 #: elf32-vax.c:1714
 #, c-format
 msgid "%s: warning: %s relocation against symbol `%s' from %s section"
-msgstr "%s: attention: réadressage %s vers le symbole « %s » de la section %s"
+msgstr "%s: attention: relocalisation %s vers le symbole «%s» de la section %s"
 
 #: elf32-vax.c:1720
 #, c-format
 msgid "%s: warning: %s relocation to 0x%x from %s section"
-msgstr "%s: attention: réadressage %s vers 0x%x de la section %s"
+msgstr "%s: attention: relocalisation %s vers 0x%x de la section %s"
 
-#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342
+#: elf32-xstormy16.c:451 elf32-ia64.c:2861 elf64-ia64.c:2861
 msgid "non-zero addend in @fptr reloc"
 msgstr "ajout non nul dans la relocalisation @fptr"
 
@@ -2541,15 +2437,15 @@ msgstr "%B(%A): table de propriété invalide"
 
 #: elf32-xtensa.c:2780
 msgid "%B(%A+0x%lx): relocation offset out of range (size=0x%x)"
-msgstr "%B(%A+0x%lx): décalage de réadressage hors limite (taille=0x%x)"
+msgstr "%B(%A+0x%lx): décalage de relocalisation hors limite (taille=0x%x)"
 
 #: elf32-xtensa.c:2859 elf32-xtensa.c:2980
 msgid "dynamic relocation in read-only section"
-msgstr "réadressage dynamique dans une section en lecture seule"
+msgstr "relocalisation dynamique dans une section en lecture seule"
 
 #: elf32-xtensa.c:2956
 msgid "TLS relocation invalid without dynamic sections"
-msgstr "réadressage TLS incorrecte sans section dynamique"
+msgstr "relocalisation TLS incorrecte sans section dynamique"
 
 #: elf32-xtensa.c:3173
 msgid "internal inconsistency in size of .got.loc section"
@@ -2569,11 +2465,11 @@ msgstr "%B(%A+0x%lx): l'instruction ne peut pas être décodée; la configuratio
 
 #: elf32-xtensa.c:7265
 msgid "%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"
-msgstr "%B(%A+0x%lx): l'instruction ne peut pas être décodée pour un réadressage XTENSA_ASM_SIMPLIFY; la configuration est peut-être erronée"
+msgstr "%B(%A+0x%lx): l'instruction ne peut pas être décodée pour une relocalisation XTENSA_ASM_SIMPLIFY; la configuration est peut-être erronée"
 
 #: elf32-xtensa.c:9024
 msgid "invalid relocation address"
-msgstr "adresse de réadressage incorrecte"
+msgstr "adresse de relocalisation incorrecte"
 
 #: elf32-xtensa.c:9073
 msgid "overflow after relaxation"
@@ -2581,58 +2477,58 @@ msgstr "débordement après la relâche"
 
 #: elf32-xtensa.c:10205
 msgid "%B(%A+0x%lx): unexpected fix for %s relocation"
-msgstr "%B(%A+0x%lx): correction inattendue pour le réadressage %s"
+msgstr "%B(%A+0x%lx): correction inattendue pour la relocalisation %s"
 
 #: elf64-alpha.c:460
 msgid "GPDISP relocation did not find ldah and lda instructions"
-msgstr "le réadressage GPDISP n'a pas repéré les instructions ldah et lda"
+msgstr "la relocalisation GPDISP n'a pas repéré les instructions ldah et lda"
 
-#: elf64-alpha.c:2495
+#: elf64-alpha.c:2408
 msgid "%B: .got subsegment exceeds 64K (size %d)"
 msgstr "%B: le sous-segment .got excède 64K (taille %d)"
 
-#: elf64-alpha.c:4392 elf64-alpha.c:4404
+#: elf64-alpha.c:4304 elf64-alpha.c:4316
 msgid "%B: gp-relative relocation against dynamic symbol %s"
-msgstr "%B: réadressage relatif au gp vers le symbole dynamique %s"
+msgstr "%B: relocalisation relative au gp vers le symbole dynamique %s"
 
-#: elf64-alpha.c:4430 elf64-alpha.c:4565
+#: elf64-alpha.c:4342 elf64-alpha.c:4477
 msgid "%B: pc-relative relocation against dynamic symbol %s"
-msgstr "%B: réadressage relatif au PC vers le symbole dynamique %s"
+msgstr "%B: relocalisation relative au PC vers le symbole dynamique %s"
 
-#: elf64-alpha.c:4458
+#: elf64-alpha.c:4370
 msgid "%B: change in gp: BRSGP %s"
 msgstr "%B: changé dans le GP: BRSGP %s"
 
-#: elf64-alpha.c:4483
+#: elf64-alpha.c:4395
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: elf64-alpha.c:4488
+#: elf64-alpha.c:4400
 msgid "%B: !samegp reloc against symbol without .prologue: %s"
 msgstr "%B: relocalisation !samegp vers le symbole sans .prologue: %s"
 
-#: elf64-alpha.c:4540
+#: elf64-alpha.c:4452
 msgid "%B: unhandled dynamic relocation against %s"
-msgstr "%B: réadressage dynamique non traité vers %s"
+msgstr "%B: relocalisation dynamique non traitée vers %s"
 
-#: elf64-alpha.c:4572
+#: elf64-alpha.c:4484
 msgid "%B: pc-relative relocation against undefined weak symbol %s"
-msgstr "%B: réadressage relatif au PC vers le symbole faible non défini %s"
+msgstr "%B: relocalisation relative au PC vers le symbole faible non défini %s"
 
-#: elf64-alpha.c:4632
+#: elf64-alpha.c:4544
 msgid "%B: dtp-relative relocation against dynamic symbol %s"
-msgstr "%B: réadressage relatif au dtp vers le symbole dynamique %s"
+msgstr "%B: relocalisation relative au dtp vers le symbole dynamique %s"
 
-#: elf64-alpha.c:4655
+#: elf64-alpha.c:4567
 msgid "%B: tp-relative relocation against dynamic symbol %s"
-msgstr "%B: réadressage relatif au tp vers le symbole dynamique %s"
+msgstr "%B: relocalisation relative au tp vers le symbole dynamique %s"
 
-#: elf64-hppa.c:2094
+#: elf64-hppa.c:2101
 #, c-format
 msgid "stub entry for %s cannot load .plt, dp offset = %ld"
 msgstr "entrée de l'ébauche pour %s ne peut charger .plt, décalage dp = %ld"
 
-#: elf64-hppa.c:3292
+#: elf64-hppa.c:3299
 msgid "%B(%A+0x%lx): cannot reach %s"
 msgstr "%B(%A+0x%lx): ne peut atteindre %s"
 
@@ -2648,22 +2544,22 @@ msgstr ""
 #: elf64-mmix.c:1607
 #, c-format
 msgid "%s: base-plus-offset relocation against register symbol: (unknown) in %s"
-msgstr "%s: réadressage base plus décalage vers le symbole registre: (inconnu) dans %s"
+msgstr "%s: relocalisation base plus décalage vers le symbole registre: (inconnu) dans %s"
 
 #: elf64-mmix.c:1612
 #, c-format
 msgid "%s: base-plus-offset relocation against register symbol: %s in %s"
-msgstr "%s: réadressage base plus décalage vers le symbole registre: %s dans %s"
+msgstr "%s: relocalisation base plus décalage vers le symbole registre: %s dans %s"
 
 #: elf64-mmix.c:1656
 #, c-format
 msgid "%s: register relocation against non-register symbol: (unknown) in %s"
-msgstr "%s: réadressage de registre vers le symbole non-registre: (inconnu) dans %s"
+msgstr "%s: relocalisation de registre vers le symbole non-registre: (inconnu) dans %s"
 
 #: elf64-mmix.c:1661
 #, c-format
 msgid "%s: register relocation against non-register symbol: %s in %s"
-msgstr "%s: réadressage de registre vers le symbole non-registre: %s dans %s"
+msgstr "%s: relocalisation de registre vers le symbole non-registre: %s dans %s"
 
 #: elf64-mmix.c:1698
 #, c-format
@@ -2693,86 +2589,69 @@ msgstr ""
 "Inconsistence interne: reste %u != max %u.\n"
 "  Merci de rapporter cette anomalie."
 
-#: elf64-ppc.c:2744 libbfd.c:1012
+#: elf64-ppc.c:2741 libbfd.c:997
 msgid "%B: compiled for a big endian system and target is little endian"
 msgstr ""
 "%B: compilé pour un système à octets de poids fort alors que la cible\n"
 "est un système à octets de poids faible"
 
-#: elf64-ppc.c:2747 libbfd.c:1014
+#: elf64-ppc.c:2744 libbfd.c:999
 msgid "%B: compiled for a little endian system and target is big endian"
 msgstr ""
 "%B: compilé pour un système à octets de poids faible alors que la cible\n"
 "est un système à octets de poids fort"
 
-#: elf64-ppc.c:4160
-msgid "%B: cannot create stub entry %s\n"
-msgstr "%B: ne peut créer l'entrée de l'ébauche %s\n"
-
-#: elf64-ppc.c:6484
+#: elf64-ppc.c:6473
 #, c-format
-msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc\n"
-msgstr "la copie du réadressage sur « %s » nécessite un lien plt paresseux, évitez de mettre LD_BIND_NOW=1 ou mettez à jour gcc\n"
+msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc"
+msgstr "la copie de la relocalisation vers «%s» nécessite un lien plt paresseux, évitez de mettre LD_BIND_NOW=1 ou mettez à jour gcc"
 
-#: elf64-ppc.c:6912
-msgid "dynreloc miscount for %B, section %A\n"
-msgstr "erreur de décompte de réadressage dynamique pour %B, section %A\n"
+#: elf64-ppc.c:6901
+msgid "dynreloc miscount for %B, section %A"
+msgstr "erreur de décompte de relocalisation dynamique pour %B, section %A"
 
-#: elf64-ppc.c:6996
+#: elf64-ppc.c:6985
 msgid "%B: .opd is not a regular array of opd entries"
 msgstr "%B: .opd n'est pas un tableau régulier d'entrées opd"
 
-#: elf64-ppc.c:7005
+#: elf64-ppc.c:6994
 msgid "%B: unexpected reloc type %u in .opd section"
 msgstr "%B: type de relocalisation %u inattendu dans la section .opd"
 
-#: elf64-ppc.c:7026
+#: elf64-ppc.c:7015
 msgid "%B: undefined sym `%s' in .opd section"
 msgstr "%B: symbole «%s» indéfini dans la section .opd"
 
-#: elf64-ppc.c:7584
-msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
-msgstr "%H __tls_get_addr a perdu l'argument, optimisation TLS désactivée\n"
-
-#: elf64-ppc.c:7929 elf64-ppc.c:8450
+#: elf64-ppc.c:7877 elf64-ppc.c:8392
 #, c-format
 msgid "%s defined on removed toc entry"
 msgstr "%s défini dans une entrée toc supprimée"
 
-#: elf64-ppc.c:9474
-#, c-format
-msgid "cannot find opd entry toc for %s\n"
-msgstr "toc de l'entrée opd non trouvée pour %s\n"
-
-#: elf64-ppc.c:9556
+#: elf64-ppc.c:9459
 #, c-format
-msgid "long branch stub `%s' offset overflow\n"
-msgstr "débordement de l'offset du branchement long de l'ébauche « %s »\n"
+msgid "long branch stub `%s' offset overflow"
+msgstr "débordement de l'offset du branchement long de l'ébauche «%s»"
 
-#: elf64-ppc.c:9615
+#: elf64-ppc.c:9518
 #, c-format
-msgid "can't find branch stub `%s'\n"
-msgstr "ne peut repérer l'ébauche de branchement « %s »\n"
+msgid "can't find branch stub `%s'"
+msgstr "ne peut repérer l'ébauche de branchement «%s»"
 
-#: elf64-ppc.c:9677 elf64-ppc.c:9819
+#: elf64-ppc.c:9580 elf64-ppc.c:9716
 #, c-format
-msgid "linkage table error against `%s'\n"
-msgstr "erreur de la table de liaison vers « %s »\n"
+msgid "linkage table error against `%s'"
+msgstr "erreur de liaison de la table de liaison vers «%s»"
 
-#: elf64-ppc.c:9993
+#: elf64-ppc.c:9886
 #, c-format
-msgid "can't build branch stub `%s'\n"
-msgstr "ne peut construire l'ébauche de branchement « %s »\n"
+msgid "can't build branch stub `%s'"
+msgstr "ne peut construire l'ébauche de branchement «%s»"
 
-#: elf64-ppc.c:10814
+#: elf64-ppc.c:10684
 msgid "%B section %A exceeds stub group size"
 msgstr "%B section %A dépasse la taille du groupe d'ébauche"
 
-#: elf64-ppc.c:11457
-msgid "stubs don't match calculated size\n"
-msgstr "taille des ébauches ne concorde pas avec la taille calculée\n"
-
-#: elf64-ppc.c:11469
+#: elf64-ppc.c:11339
 #, c-format
 msgid ""
 "linker stubs in %u group%s\n"
@@ -2789,97 +2668,85 @@ msgstr ""
 "  long ajustements toc %lu\n"
 "  appels plt           %lu"
 
-#: elf64-ppc.c:11819
-msgid "%H: %s used with TLS symbol %s\n"
-msgstr "%H: %s utilisé avec le symbole TLS %s\n"
-
-#: elf64-ppc.c:11820
-msgid "%H: %s used with non-TLS symbol %s\n"
-msgstr "%H: %s utilisé avec le symbole non-TLS %s\n"
-
-#: elf64-ppc.c:12318
-msgid "%H: automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc\n"
-msgstr "%H: TOC multiples et automatiques non supportées utilisant votre fichier crt; recompilez avec -mminimal-toc ou mettez à jour gcc\n"
+#: elf64-ppc.c:12190
+msgid "%B(%A+0x%lx): automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc"
+msgstr "%B(%A+0x%lx): TOC multiples et automatiques non supportées utilisant votre fichier crt; recompilez avec -mminimal-toc ou mettez à jour gcc"
 
-#: elf64-ppc.c:12324
-msgid "%H: sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern\n"
-msgstr "%H: l'optimisation soeurs des appels vers « %s » n'autorise pas de TOC multiples et automatiques; recompilez avec -mminimal-toc ou -fno-optimize-sibling-calls, ou rendez « %s » externe\n"
+#: elf64-ppc.c:12198
+msgid "%B(%A+0x%lx): sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern"
+msgstr "%B(%A+0x%lx): l'optimisation soeurs des appels vers «%s» ne permet par de TOC multiples et automatiques; recompilez avec -mminimal-toc ou -fno-optimize-sibling-calls, ou rendez «%s» externe"
 
-#: elf64-ppc.c:13041
-msgid "%B: relocation %s is not supported for symbol %s\n"
-msgstr "%B: réadressage %s n'est pas supportée pour le symbole %s\n"
+#: elf64-ppc.c:12919
+msgid "%B: relocation %s is not supported for symbol %s."
+msgstr "%B: relocalisation %s n'est pas supportée pour le symbole %s."
 
-#: elf64-ppc.c:13218
-msgid "%H: error: %s not a multiple of %u\n"
-msgstr "%H: erreur: %s n'est pas un multiple de %u\n"
+#: elf64-ppc.c:13096
+msgid "%B: error: relocation %s not a multiple of %d"
+msgstr "%B: erreur: relocalisation %s n'est pas un multiple de %d"
 
 #: elf64-sh64.c:1682
 #, c-format
 msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n"
-msgstr "%s: erreur: type de réadressage %d non aligné à %08x réadressé`%08x\n"
+msgstr "%s: erreur: type de relocalisation %d non aligné à %08x relocalisé`%08x\n"
 
-#: elf64-sparc.c:445
+#: elf64-sparc.c:444
 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
 msgstr "%B: Seuls les registres %%g[2367] peuvent être déclarés en utilisant les registres STT_REGISTER"
 
-#: elf64-sparc.c:465
+#: elf64-sparc.c:464
 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
 msgstr "Registre %%g%d utilisé de manière incompatible: %s dans %B précédemment %s dans %B"
 
-#: elf64-sparc.c:488
+#: elf64-sparc.c:487
 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
 msgstr "Symbole «%s» a des types qui diffèrent: REGISTRE dans %B, précédemment %s dans %B"
 
-#: elf64-sparc.c:533
+#: elf64-sparc.c:532
 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
 msgstr "Symbole «%s» a des types qui diffèrent: %s dans %B, précédemment REGISTRE dans %B"
 
-#: elf64-sparc.c:686
+#: elf64-sparc.c:684
 msgid "%B: linking UltraSPARC specific with HAL specific code"
 msgstr "%B: édition de liens spécifiques pour UltraSPARC avec du code spécifique HAL"
 
-#: elf64-x86-64.c:1236
-msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
-msgstr "%B: le réadressage %s sur le symbole « %s » n'est pas supporté en mode x32"
-
-#: elf64-x86-64.c:1465
+#: elf64-x86-64.c:1360
 msgid "%B: '%s' accessed both as normal and thread local symbol"
 msgstr "%B: symbole «%s» accédé à la fois comme normal et comme local au thread"
 
-#: elf64-x86-64.c:2934
+#: elf64-x86-64.c:2801
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d"
-msgstr "%B: le réadressage %s vers le symbole STT_GNU_IFUNC « %s » a l'opérande non nul: %d"
+msgstr "%B: la relocalisation %s vers le symbole STT_GNU_IFUNC «%s» a l'opérande non nul: %d"
 
-#: elf64-x86-64.c:3193
+#: elf64-x86-64.c:3073
 msgid "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"
-msgstr "%B: réadressage R_X86_64_GOTOFF64 vers la fonction protégée « %s » ne peut pas être utilisé lors de la création d'un objet partagé"
+msgstr "%B: relocalisation R_X86_64_GOTOFF64 vers la fonction protégée «%s» ne peut pas être utilisée lors de la création d'un objet partagé"
 
-#: elf64-x86-64.c:3305
+#: elf64-x86-64.c:3184
 msgid "; recompile with -fPIC"
 msgstr "; recompilé avec -fPIC"
 
-#: elf64-x86-64.c:3310
+#: elf64-x86-64.c:3189
 msgid "%B: relocation %s against %s `%s' can not be used when making a shared object%s"
-msgstr "%B: réadressage %s vers %s « %s » ne peut pas être utilisé en créant un objet partagé %s"
+msgstr "%B: relocalisation %s vers %s «%s» ne peut pas être utilisée en créant un objet partagé %s"
 
-#: elf64-x86-64.c:3312
+#: elf64-x86-64.c:3191
 msgid "%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s"
-msgstr "%B: réadressage %s vers le %s non défini « %s » ne peut pas être utilisé en créant un objet partagé %s"
+msgstr "%B: relocalisation %s vers le %s non défini «%s» ne peut pas être utilisée en créant un objet partagé %s"
 
-#: elfcode.h:827
+#: elfcode.h:826
 #, c-format
 msgid "warning: %s has a corrupt string table index - ignoring"
 msgstr "attention: %s a un index de table de chaînes corrompu - ignoré"
 
-#: elfcode.h:1237
+#: elfcode.h:1236
 #, c-format
 msgid "%s: version count (%ld) does not match symbol count (%ld)"
 msgstr "%s: compteur de version (%ld) ne concorde pas avec le symbole du compteur (%ld)"
 
-#: elfcode.h:1491
+#: elfcode.h:1476
 #, c-format
 msgid "%s(%s): relocation %d has invalid symbol index %ld"
-msgstr "%s(%s): réadressage %d a un index de symbole %ld invalide"
+msgstr "%s(%s): relocalisation %d a un index de symbole %ld invalide"
 
 #: elfcore.h:312
 msgid "Warning: %B is truncated: expected core file size >= %lu, found: %lu."
@@ -2901,320 +2768,300 @@ msgstr "%s: définition TLS dans %B section %A ne correspond pas à la référen
 msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
 msgstr "%s: référence TLS dans %B ne correspond pas à la définition non TLS dans %B section %A"
 
-#: elflink.c:1764
+#: elflink.c:1763
 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
 msgstr "%B: attention: redéfinition inattendue du symbole indirect avec version «%s»"
 
-#: elflink.c:2077
+#: elflink.c:2076
 msgid "%B: version node not found for symbol %s"
 msgstr "%B: version du nœud pas trouvée pour le symbole %s"
 
-#: elflink.c:2167
+#: elflink.c:2166
 msgid "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'"
 msgstr "%B: mauvais index de relocalisation du symbole (0x%lx >= 0x%lx) pour l'offset 0x%lx de la section «%A»"
 
-#: elflink.c:2178
+#: elflink.c:2177
 msgid "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the object file has no symbol table"
 msgstr "%B: index de symbole non nul (0x%lx) pour l'offset 0x%lx de la section «%A» quand le fichier objet n'a pas de table de symboles"
 
-#: elflink.c:2368
+#: elflink.c:2367
 msgid "%B: relocation size mismatch in %B section %A"
-msgstr "%B: taille du réadressage ne concorde pas dans %B section %A"
+msgstr "%B: taille de la relocalisation ne concorde pas dans %B section %A"
 
-#: elflink.c:2663
+#: elflink.c:2662
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
 msgstr "attention: type et taille du symbole dynamique «%s» ne sont pas définis"
 
-#: elflink.c:3421
+#: elflink.c:3418
 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
 msgstr "%P: code machine ELF alternatif trouvé (%d) dans %B, %d est attendu\n"
 
-#: elflink.c:4067
+#: elflink.c:4050
 msgid "%B: %s: invalid version %u (max %d)"
 msgstr "%B: %s: version invalide %u (max %d)"
 
-#: elflink.c:4103
+#: elflink.c:4086
 msgid "%B: %s: invalid needed version %d"
 msgstr "%B: %s: version requise invalide %d"
 
-#: elflink.c:4299
+#: elflink.c:4285
 msgid "Warning: alignment %u of common symbol `%s' in %B is greater than the alignment (%u) of its section %A"
 msgstr "Attention: alignement %u du symbole commun «%s» dans %B est plus grand que l'alignement (%u) de sa section %A"
 
-#: elflink.c:4305
+#: elflink.c:4291
 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
 msgstr "Attention: alignement %u du symbole «%s» dans %B est plus petit que %u dans %B"
 
-#: elflink.c:4320
+#: elflink.c:4306
 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B"
 msgstr "Attention: taille du symbole «%s» a changé de %lu dans %B à %lu dans %B"
 
-#: elflink.c:4489
+#: elflink.c:4472
 msgid "%B: undefined reference to symbol '%s'"
 msgstr "%B: référence au symbole non défini «%s»"
 
-#: elflink.c:4492
+#: elflink.c:4475
 msgid "note: '%s' is defined in DSO %B so try adding it to the linker command line"
 msgstr "note: «%s» est défini dans le DSO %B donc essayez de l'ajouter à la ligne de commande du lieur"
 
-#: elflink.c:5795
+#: elflink.c:5779
 #, c-format
 msgid "%s: undefined version: %s"
 msgstr "%s: version non définie: %s"
 
-#: elflink.c:5863
+#: elflink.c:5847
 msgid "%B: .preinit_array section is not allowed in DSO"
 msgstr "%B: section .preinit_array n'est pas permise dans DSO"
 
-#: elflink.c:7617
+#: elflink.c:7598
 #, c-format
 msgid "undefined %s reference in complex symbol: %s"
 msgstr "référence %s non définie dans le symbole complexe: %s"
 
-#: elflink.c:7771
+#: elflink.c:7752
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr "opérateur «%c» inconnu dans le symbole complexe"
 
-#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181
+#: elflink.c:8091 elflink.c:8108 elflink.c:8145 elflink.c:8162
 msgid "%B: Unable to sort relocs - they are in more than one size"
 msgstr "%B: Impossible de trier les relocalisations - plusieurs tailles rencontrées"
 
-#: elflink.c:8141 elflink.c:8195
+#: elflink.c:8122 elflink.c:8176
 msgid "%B: Unable to sort relocs - they are of an unknown size"
 msgstr "%B: Impossible de trier les relocalisations - leur taille est inconnue"
 
-#: elflink.c:8246
+#: elflink.c:8227
 msgid "Not enough memory to sort relocations"
-msgstr "Pas assez de mémoire pour trier les réadressages"
+msgstr "Pas assez de mémoire pour trier les relocalisations"
 
-#: elflink.c:8439
+#: elflink.c:8420
 msgid "%B: Too many sections: %d (>= %d)"
 msgstr "%B: Trop de sections: %d (>= %d)"
 
-#: elflink.c:8686
-msgid "%B: internal symbol `%s' in %B is referenced by DSO"
-msgstr "%B: symbole interne « %s » dans %B est référencé par DSO"
-
-#: elflink.c:8688
-msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
-msgstr "%B: symbole caché « %s » dans %B est référencé par DSO"
+#: elflink.c:8663
+msgid "%B: %s symbol `%s' in %B is referenced by DSO"
+msgstr "%B: symbole %s «%s» dans %B est référencé par DSO"
 
-#: elflink.c:8690
-msgid "%B: local symbol `%s' in %B is referenced by DSO"
-msgstr "%B: symbole local « %s » dans %B est référencé par DSO"
-
-#: elflink.c:8785
+#: elflink.c:8754
 msgid "%B: could not find output section %A for input section %A"
 msgstr "%B: ne peut repérer la section de sortie %A pour la section d'entrée %A"
 
-#: elflink.c:8908
-msgid "%B: protected symbol `%s' isn't defined"
-msgstr "%B: symbole protégé « %s » n'est pas défini"
-
-#: elflink.c:8910
-msgid "%B: internal symbol `%s' isn't defined"
-msgstr "%B: symbole interne « %s » n'est pas défini"
-
-#: elflink.c:8912
-msgid "%B: hidden symbol `%s' isn't defined"
-msgstr "%B: symbole caché « %s » n'est pas défini"
-
-#: elflink.c:9441
-msgid "error: %B: size of section %A is not multiple of address size"
-msgstr "erreur: %B: le réadressage de la section %A n'est pas un multiple de la taille des adresses"
+#: elflink.c:8874
+msgid "%B: %s symbol `%s' isn't defined"
+msgstr "%B: symbole %s «%s» n'est pas défini"
 
-#: elflink.c:9488
+#: elflink.c:9428
 msgid "error: %B contains a reloc (0x%s) for section %A that references a non-existent global symbol"
 msgstr "erreur: %B contient une relocalisation (0x%s) pour la section %A qui fait référence à un symbole global inexistant"
 
-#: elflink.c:10223
+#: elflink.c:9494
+msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
+msgstr "%X«%s» référencé dans la section «%A» de %B: défini dans la section abandonnée «%A» de %B\n"
+
+#: elflink.c:10141
 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
 msgstr "%A a, à la fois, des sections ordonnées [«%A» dans %B] et désordonnées [«%A» dans %B]"
 
-#: elflink.c:10228
+#: elflink.c:10146
 #, c-format
 msgid "%A has both ordered and unordered sections"
 msgstr "%A a, à la fois, des sections ordonnées et désordonnées"
 
-#: elflink.c:10793
-msgid "%B: file class %s incompatible with %s"
-msgstr "%B: classe de fichier %s incompatible avec %s"
-
-#: elflink.c:11104 elflink.c:11148
+#: elflink.c:10992 elflink.c:11036
 msgid "%B: could not find output section %s"
 msgstr "%B: ne peut repérer la section de sortie %s"
 
-#: elflink.c:11109
+#: elflink.c:10997
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr "attention: section %s a une taille nulle"
 
-#: elflink.c:11214
+#: elflink.c:11102
 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
 msgstr "%P: attention: création d'un DT_TEXTREL dans un objet partagé.\n"
 
-#: elflink.c:11401
+#: elflink.c:11289
 msgid "%P%X: can not read symbols: %E\n"
 msgstr "%P%X: ne peut pas lire les symboles: %E\n"
 
-#: elflink.c:11750
+#: elflink.c:11638
 msgid "Removing unused section '%s' in file '%B'"
 msgstr "Suppression de la section inutilisée «%s» dans le fichier «%B»"
 
-#: elflink.c:11962
+#: elflink.c:11850
 msgid "Warning: gc-sections option ignored"
 msgstr "Attention: l'option de la section gc est ignorée"
 
-#: elflink.c:12511
+#: elflink.c:12399
 msgid "%B: ignoring duplicate section `%A'"
 msgstr "%B: ignore les sections dupliquées «%A»"
 
-#: elflink.c:12518 elflink.c:12525
+#: elflink.c:12406 elflink.c:12413
 msgid "%B: duplicate section `%A' has different size"
 msgstr "%B: section dupliquée «%A» avec des tailles différentes"
 
-#: elflink.c:12533 elflink.c:12538
+#: elflink.c:12421 elflink.c:12426
 msgid "%B: warning: could not read contents of section `%A'"
 msgstr "%B: attention: ne peut pas lire le contenu de la section «%A»"
 
-#: elflink.c:12542
+#: elflink.c:12430
 msgid "%B: warning: duplicate section `%A' has different contents"
 msgstr "%B: attention: section dupliquée «%A» a des contenus différents"
 
-#: elflink.c:12643 linker.c:3086
+#: elflink.c:12531 linker.c:3138
 msgid "%F%P: already_linked_table: %E\n"
 msgstr "%F%P: already_linked_table: %E\n"
 
-#: elfxx-mips.c:1221
+#: elfxx-mips.c:1220
 msgid "static procedure (no name)"
 msgstr "procédure statique (sans name)"
 
-#: elfxx-mips.c:5628
+#: elfxx-mips.c:5623
 msgid "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."
 msgstr "%B: %A+0x%lx: Les sauts directs entre modes ISA ne sont pas permis; envisagez de recompiler avec l'interliage activé."
 
-#: elfxx-mips.c:6288 elfxx-mips.c:6511
+#: elfxx-mips.c:6280 elfxx-mips.c:6503
 msgid "%B: Warning: bad `%s' option size %u smaller than its header"
 msgstr "%B: Attention: mauvaise «%s» taille d'option %u plus petite que son en-tête"
 
-#: elfxx-mips.c:7262 elfxx-mips.c:7387
+#: elfxx-mips.c:7254 elfxx-mips.c:7379
 msgid "%B: Warning: cannot determine the target function for stub section `%s'"
 msgstr "%B: Attention: ne peut pas déterminer la fonction cible de la section d'ébauche «%s»"
 
-#: elfxx-mips.c:7516
+#: elfxx-mips.c:7508
 msgid "%B: Malformed reloc detected for section %s"
 msgstr "%B: relocalisation mal composée détectée dans la section %s"
 
-#: elfxx-mips.c:7556
+#: elfxx-mips.c:7548
 msgid "%B: GOT reloc at 0x%lx not expected in executables"
 msgstr "%B: relocalisation GOT à 0x%lx pas attendue dans les executables"
 
-#: elfxx-mips.c:7678
+#: elfxx-mips.c:7670
 msgid "%B: CALL16 reloc at 0x%lx not against global symbol"
 msgstr "%B: appel CALL16 de relocalisation à 0x%lx qui n'est pas pour un symbole global"
 
-#: elfxx-mips.c:8372
+#: elfxx-mips.c:8365
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
-msgstr "réadressages non dynamiques font référence au symbole dynamique %s"
+msgstr "relocalisation non dynamique fait référence au symbole dynamique %s"
 
-#: elfxx-mips.c:9075
+#: elfxx-mips.c:9068
 msgid "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"
 msgstr "%B: Ne trouve pas de relocalisation LO16 correspondante vers «%s» pour %s à 0x%lx de la section «%A»"
 
-#: elfxx-mips.c:9214
+#: elfxx-mips.c:9207
 msgid "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
 msgstr "la taille des petites données de la section dépasse 64KB; abaissez la limite de taille des petites données (voyez l'option -G)"
 
-#: elfxx-mips.c:12038
+#: elfxx-mips.c:12027
 #, c-format
 msgid "%s: illegal section name `%s'"
 msgstr "%s: nom illégal de section «%s»"
 
-#: elfxx-mips.c:12417 elfxx-mips.c:12443
+#: elfxx-mips.c:12405 elfxx-mips.c:12431
 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float"
 msgstr "Attention: %B utilise -msingle-float, %B utilise -mdouble-float"
 
-#: elfxx-mips.c:12429 elfxx-mips.c:12485
+#: elfxx-mips.c:12417 elfxx-mips.c:12473
 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"
 msgstr "Attention: %B utilise -msingle-float, %B utilise -mips32r2 -mfp64"
 
-#: elfxx-mips.c:12455 elfxx-mips.c:12491
+#: elfxx-mips.c:12443 elfxx-mips.c:12479
 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"
 msgstr "Attention: %B utilise -mdouble-float, %B utilise -mips32r2 -mfp64"
 
-#: elfxx-mips.c:12533
+#: elfxx-mips.c:12521
 msgid "%B: endianness incompatible with that of the selected emulation"
 msgstr "%B: système de poids fort ou faible incompatible avec celui sélectionné pour l'émulation"
 
-#: elfxx-mips.c:12544
+#: elfxx-mips.c:12532
 msgid "%B: ABI is incompatible with that of the selected emulation"
 msgstr "%B: ABI est incompatible avec celui sélectionné pour l'émulation"
 
-#: elfxx-mips.c:12628
+#: elfxx-mips.c:12613
 msgid "%B: warning: linking abicalls files with non-abicalls files"
 msgstr "%B: attention: édition de liens des fichiers abicalls avec des fichiers non abicalls"
 
-#: elfxx-mips.c:12645
+#: elfxx-mips.c:12630
 msgid "%B: linking 32-bit code with 64-bit code"
 msgstr "%B: édition de liens de code 32 bits avec du code 64 bits"
 
-#: elfxx-mips.c:12673
+#: elfxx-mips.c:12658
 msgid "%B: linking %s module with previous %s modules"
 msgstr "%B: édition de liens du module %s avec les modules précédents %s"
 
-#: elfxx-mips.c:12696
+#: elfxx-mips.c:12681
 msgid "%B: ABI mismatch: linking %s module with previous %s modules"
 msgstr "%B: ABI ne concorde pas: édition de lien du module %s avec les modules précédents %s"
 
-#: elfxx-mips.c:12860
+#: elfxx-mips.c:12845
 #, c-format
 msgid " [abi=O32]"
 msgstr " [abi=O32]"
 
-#: elfxx-mips.c:12862
+#: elfxx-mips.c:12847
 #, c-format
 msgid " [abi=O64]"
 msgstr " [abi=O64]"
 
-#: elfxx-mips.c:12864
+#: elfxx-mips.c:12849
 #, c-format
 msgid " [abi=EABI32]"
 msgstr " [abi=EABI32]"
 
-#: elfxx-mips.c:12866
+#: elfxx-mips.c:12851
 #, c-format
 msgid " [abi=EABI64]"
 msgstr " [abi=EABI64]"
 
-#: elfxx-mips.c:12868
+#: elfxx-mips.c:12853
 #, c-format
 msgid " [abi unknown]"
 msgstr " [abi inconnu]"
 
-#: elfxx-mips.c:12870
+#: elfxx-mips.c:12855
 #, c-format
 msgid " [abi=N32]"
 msgstr " [abi=N32]"
 
-#: elfxx-mips.c:12872
+#: elfxx-mips.c:12857
 #, c-format
 msgid " [abi=64]"
 msgstr " [abi=64]"
 
-#: elfxx-mips.c:12874
+#: elfxx-mips.c:12859
 #, c-format
 msgid " [no abi set]"
 msgstr " [aucun jeu abi]"
 
-#: elfxx-mips.c:12895
+#: elfxx-mips.c:12880
 #, c-format
 msgid " [unknown ISA]"
 msgstr " [ISA inconnu]"
 
-#: elfxx-mips.c:12906
+#: elfxx-mips.c:12891
 #, c-format
 msgid " [not 32bitmode]"
 msgstr " [aucun mode 32 bits]"
@@ -3222,7 +3069,7 @@ msgstr " [aucun mode 32 bits]"
 #: elfxx-sparc.c:595
 #, c-format
 msgid "invalid relocation type %d"
-msgstr "type de réadressage %d invalide"
+msgstr "type de relocalisation %d invalide"
 
 #: i386linux.c:454 m68klinux.c:458 sparclinux.c:452
 #, c-format
@@ -3311,144 +3158,86 @@ msgstr "%s: adresse 0x%s hors limite pour le fichier Intel hexadécimal"
 msgid "%B: unable to get decompressed section %A"
 msgstr "%B: impossible d'obtenir la section décompressée %A"
 
-#: libbfd.c:1043
+#: libbfd.c:1027
 #, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
 msgstr "%s déprécié appelé à %s dans la ligne %d dans %s\n"
 
-#: libbfd.c:1046
+#: libbfd.c:1030
 #, c-format
 msgid "Deprecated %s called\n"
 msgstr "%s appel déprécié\n"
 
-#: linker.c:1859
+#: linker.c:1911
 msgid "%B: indirect symbol `%s' to `%s' is a loop"
 msgstr "%B: symbole indirect «%s» vers «%s» est une boucle"
 
-#: linker.c:2726
+#: linker.c:2778
 #, c-format
 msgid "Attempt to do relocatable link with %s input and %s output"
 msgstr "Tentative de relocalisation d'un lien avec %s à l'entrée et %s à la sortie"
 
-#: linker.c:3053
+#: linker.c:3105
 msgid "%B: warning: ignoring duplicate section `%A'\n"
 msgstr "%B: attention: ignore la section dupliquée «%A»\n"
 
-#: linker.c:3067
+#: linker.c:3119
 msgid "%B: warning: duplicate section `%A' has different size\n"
 msgstr "%B: attention: section dupliquée «%A» avec des tailles différentes\n"
 
-#: mach-o.c:381
-msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
-msgstr "bfd_mach_o_canonicalize_symtab: impossible de charger les symboles"
-
-#: mach-o.c:1253
-#, c-format
-msgid "unable to write unknown load command 0x%lx"
-msgstr "impossible d'écrire la commande de chargement inconnue 0x%lx"
-
-#: mach-o.c:1654
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"
-msgstr "bfd_mach_o_read_symtab_symbol: impossible de lire %d octets à %lu"
-
-#: mach-o.c:1671
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"
-msgstr "bfd_mach_o_read_symtab_symbol: nom de symbole hors limites (%lu >= %lu)"
-
-#: mach-o.c:1756
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: le symbole « %s » spécifie la section %d invalide (max %lu): laissé non défini"
-
-#: mach-o.c:1764
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: symbole « %s » a la référence non supportée « indirect »: laissé non défini"
-
-#: mach-o.c:1770
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x%x: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: symbole « %s » spécifie le champ de type 0x%x invalide: laissé non défini"
-
-#: mach-o.c:1840
-msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
-msgstr "bfd_mach_o_read_symtab_symbols: impossible d'allouer la mémoire pour les symboles"
-
-#: mach-o.c:1874
-#, c-format
-msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"
-msgstr "bfd_mach_o_read_dysymtab_symbol: impossible de lire %lu octets à %lu"
-
-#: mach-o.c:2556
-#, c-format
-msgid "unable to read unknown load command 0x%lx"
-msgstr "impossible de lire la commande de chargement inconnue 0x%lx"
-
-#: mach-o.c:2736
-#, c-format
-msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
-msgstr "bfd_mach_o_scan: architecture 0x%lx/0x%lx inconnue"
-
-#: mach-o.c:2832
-#, c-format
-msgid "unknown header byte-order value 0x%lx"
-msgstr "valeur d'ordre des octets de l'en-tête 0x%lx est inconnue"
-
-#: mach-o.c:3402
+#: mach-o.c:3403
 msgid "Mach-O header:\n"
 msgstr "En-tête Mach-O:\n"
 
-#: mach-o.c:3403
+#: mach-o.c:3404
 #, c-format
 msgid " magic     : %08lx\n"
 msgstr " magique    : %08lx\n"
 
-#: mach-o.c:3404
+#: mach-o.c:3405
 #, c-format
 msgid " cputype   : %08lx (%s)\n"
 msgstr " typecpu    : %08lx (%s)\n"
 
-#: mach-o.c:3406
+#: mach-o.c:3407
 #, c-format
 msgid " cpusubtype: %08lx\n"
 msgstr " soustypecpu: %08lx\n"
 
-#: mach-o.c:3407
+#: mach-o.c:3408
 #, c-format
 msgid " filetype  : %08lx (%s)\n"
 msgstr " typefichier: %08lx (%s)\n"
 
-#: mach-o.c:3410
+#: mach-o.c:3411
 #, c-format
 msgid " ncmds     : %08lx (%lu)\n"
 msgstr " ncmds     : %08lx (%lu)\n"
 
-#: mach-o.c:3411
+#: mach-o.c:3412
 #, c-format
 msgid " sizeofcmds: %08lx\n"
 msgstr " taillecmds: %08lx\n"
 
-#: mach-o.c:3412
+#: mach-o.c:3413
 #, c-format
 msgid " flags     : %08lx ("
 msgstr " fanions   : %08lx ("
 
-#: mach-o.c:3414 vms-alpha.c:7671
+#: mach-o.c:3415 vms-alpha.c:7652
 msgid ")\n"
 msgstr ")\n"
 
-#: mach-o.c:3415
+#: mach-o.c:3416
 #, c-format
 msgid " reserved  : %08x\n"
 msgstr " réservé   : %08x\n"
 
-#: mach-o.c:3425
+#: mach-o.c:3426
 msgid "Segments and Sections:\n"
 msgstr "Segments et Sections:\n"
 
-#: mach-o.c:3426
+#: mach-o.c:3427
 msgid " #: Segment name     Section name     Address\n"
 msgstr " #: Nom segment      Nom section      Adresse\n"
 
@@ -3612,11 +3401,6 @@ msgstr "%B: le saut va trop loin\n"
 msgid "%B: bad pair/reflo after refhi\n"
 msgstr "%B: pairage erronée pair/reflo après refhi\n"
 
-#: pef.c:519
-#, c-format
-msgid "bfd_pef_scan: unknown architecture 0x%lx"
-msgstr "bfd_pef_scan: architecture 0x%lx inconnue"
-
 #: pei-x86_64.c:444
 #, c-format
 msgid "warning: .pdata section size (%ld) is not a multiple of %d\n"
@@ -3719,11 +3503,6 @@ msgstr "Secteur de la partition[%d] = 0x%.8lx (%ld)\n"
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr "Longueur de la partition[%d] = 0x%.8lx (%ld)\n"
 
-#: rs6000-core.c:448
-#, c-format
-msgid "%s: warning core file truncated"
-msgstr "%s: fichier core d'avertissement tronqué"
-
 #: som.c:5471
 #, c-format
 msgid ""
@@ -3751,34 +3530,34 @@ msgstr "%B(%A+0x%lx): Entrée des ébauches a un indexe de chaîne invalide"
 
 #: syms.c:1079
 msgid "Unsupported .stab relocation"
-msgstr "Réadressage du .stab non supporté"
+msgstr "Relocalisation du .stab non supporté"
 
-#: vms-alpha.c:1299
+#: vms-alpha.c:1287
 #, c-format
 msgid "Unknown EGSD subtype %d"
 msgstr "Sous type EGSD %d inconnu"
 
-#: vms-alpha.c:1330
+#: vms-alpha.c:1318
 #, c-format
 msgid "Stack overflow (%d) in _bfd_vms_push"
 msgstr "Débordement de la pile (%d) dans _bfd_vms_push"
 
-#: vms-alpha.c:1343
+#: vms-alpha.c:1331
 msgid "Stack underflow in _bfd_vms_pop"
 msgstr "Sous dépilage de la pile dans _bfd_vms_pop"
 
 #. These names have not yet been added to this switch statement.
-#: vms-alpha.c:1580
+#: vms-alpha.c:1568
 #, c-format
 msgid "unknown ETIR command %d"
 msgstr "commande ETIR %d inconnue"
 
-#: vms-alpha.c:1767
+#: vms-alpha.c:1755
 #, c-format
 msgid "bad section index in %s"
 msgstr "index de section erronée dans %s"
 
-#: vms-alpha.c:1780
+#: vms-alpha.c:1768
 #, c-format
 msgid "unsupported STA cmd %s"
 msgstr "commande STA %s non supportée"
@@ -3788,1389 +3567,1389 @@ msgstr "commande STA %s non supportée"
 #. Rotate.
 #. Redefine symbol to current location.
 #. Define a literal.
-#: vms-alpha.c:1956 vms-alpha.c:1987 vms-alpha.c:2234
+#: vms-alpha.c:1944 vms-alpha.c:1975 vms-alpha.c:2222
 #, c-format
 msgid "%s: not supported"
 msgstr "%s: pas supporté"
 
-#: vms-alpha.c:1962
+#: vms-alpha.c:1950
 #, c-format
 msgid "%s: not implemented"
 msgstr "%s: non implémenté"
 
-#: vms-alpha.c:2218
+#: vms-alpha.c:2206
 #, c-format
 msgid "invalid use of %s with contexts"
 msgstr "utilisation incorrecte de %s avec des contextes"
 
-#: vms-alpha.c:2252
+#: vms-alpha.c:2240
 #, c-format
 msgid "reserved cmd %d"
 msgstr "commande %d réservée"
 
-#: vms-alpha.c:2337
+#: vms-alpha.c:2325
 msgid "Object module NOT error-free !\n"
 msgstr "Module objet N'EST PAS sans erreur !\n"
 
-#: vms-alpha.c:2766
+#: vms-alpha.c:2754
 #, c-format
 msgid "Symbol %s replaced by %s\n"
 msgstr "Symbole %s remplacé par %s\n"
 
-#: vms-alpha.c:3769
+#: vms-alpha.c:3757
 #, c-format
 msgid "SEC_RELOC with no relocs in section %s"
 msgstr "SEC_RELOC sans relocalisation dans la section %s"
 
-#: vms-alpha.c:3822 vms-alpha.c:4053
+#: vms-alpha.c:3810 vms-alpha.c:4041
 #, c-format
 msgid "Size error in section %s"
 msgstr "Erreur de taille dans la section %s"
 
-#: vms-alpha.c:3992
+#: vms-alpha.c:3980
 msgid "Spurious ALPHA_R_BSR reloc"
 msgstr "Relocalisation ALPHA_R_BSR parasite"
 
-#: vms-alpha.c:4040
+#: vms-alpha.c:4028
 #, c-format
 msgid "Unhandled relocation %s"
-msgstr "Réadressage %s non traité"
+msgstr "Relocalisation %s non traitée"
 
-#: vms-alpha.c:4330
+#: vms-alpha.c:4318
 #, c-format
 msgid "unknown source command %d"
 msgstr "commande source %d inconnue"
 
-#: vms-alpha.c:4391
+#: vms-alpha.c:4379
 msgid "DST__K_SET_LINUM_INCR not implemented"
 msgstr "DST__K_SET_LINUM_INCR pas implémenté"
 
-#: vms-alpha.c:4397
+#: vms-alpha.c:4385
 msgid "DST__K_SET_LINUM_INCR_W not implemented"
 msgstr "DST__K_SET_LINUM_INCR_W pas implémenté"
 
-#: vms-alpha.c:4403
+#: vms-alpha.c:4391
 msgid "DST__K_RESET_LINUM_INCR not implemented"
 msgstr "DST__K_RESET_LINUM_INCR pas implémenté"
 
-#: vms-alpha.c:4409
+#: vms-alpha.c:4397
 msgid "DST__K_BEG_STMT_MODE not implemented"
 msgstr "DST__K_BEG_STMT_MODE pas implémenté"
 
-#: vms-alpha.c:4415
+#: vms-alpha.c:4403
 msgid "DST__K_END_STMT_MODE not implemented"
 msgstr "DST__K_END_STMT_MODE pas implémenté"
 
-#: vms-alpha.c:4442
+#: vms-alpha.c:4430
 msgid "DST__K_SET_PC not implemented"
 msgstr "DST__K_SET_PC pas implémenté"
 
-#: vms-alpha.c:4448
+#: vms-alpha.c:4436
 msgid "DST__K_SET_PC_W not implemented"
 msgstr "DST__K_SET_PC_W pas implémenté"
 
-#: vms-alpha.c:4454
+#: vms-alpha.c:4442
 msgid "DST__K_SET_PC_L not implemented"
 msgstr "DST__K_SET_PC_L pas implémenté"
 
-#: vms-alpha.c:4460
+#: vms-alpha.c:4448
 msgid "DST__K_SET_STMTNUM not implemented"
 msgstr "DST__K_SET_STMTNUM pas implémenté"
 
-#: vms-alpha.c:4503
+#: vms-alpha.c:4491
 #, c-format
 msgid "unknown line command %d"
 msgstr "commande de ligne %d inconnue"
 
-#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003
-#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038
+#: vms-alpha.c:4938 vms-alpha.c:4955 vms-alpha.c:4969 vms-alpha.c:4984
+#: vms-alpha.c:4996 vms-alpha.c:5007 vms-alpha.c:5019
 #, c-format
 msgid "Unknown reloc %s + %s"
 msgstr "Relocalisation %s + %s inconnue"
 
-#: vms-alpha.c:5093
+#: vms-alpha.c:5074
 #, c-format
 msgid "Unknown reloc %s"
 msgstr "Relocalisation %s inconnue"
 
-#: vms-alpha.c:5106
+#: vms-alpha.c:5087
 msgid "Invalid section index in ETIR"
 msgstr "Index de section incorrect dans ETIR"
 
-#: vms-alpha.c:5153
+#: vms-alpha.c:5134
 #, c-format
 msgid "Unknown symbol in command %s"
 msgstr "Symbole inconnu dans la commande %s"
 
-#: vms-alpha.c:5668
+#: vms-alpha.c:5649
 #, c-format
 msgid "  EMH %u (len=%u): "
 msgstr "  EMH %u (long=%u): "
 
-#: vms-alpha.c:5677
+#: vms-alpha.c:5658
 #, c-format
 msgid "Module header\n"
 msgstr "En-tête module\n"
 
-#: vms-alpha.c:5678
+#: vms-alpha.c:5659
 #, c-format
 msgid "   structure level: %u\n"
 msgstr "   niveau de structure: %u\n"
 
-#: vms-alpha.c:5679
+#: vms-alpha.c:5660
 #, c-format
 msgid "   max record size: %u\n"
 msgstr "   taille max d'enregistrement: %u\n"
 
-#: vms-alpha.c:5682
+#: vms-alpha.c:5663
 #, c-format
 msgid "   module name    : %.*s\n"
 msgstr "   nom du module       : %.*s\n"
 
-#: vms-alpha.c:5684
+#: vms-alpha.c:5665
 #, c-format
 msgid "   module version : %.*s\n"
 msgstr "   version du module   : %.*s\n"
 
-#: vms-alpha.c:5686
+#: vms-alpha.c:5667
 #, c-format
 msgid "   compile date   : %.17s\n"
 msgstr "   date de compilation : %.17s\n"
 
-#: vms-alpha.c:5691
+#: vms-alpha.c:5672
 #, c-format
 msgid "Language Processor Name\n"
 msgstr "Nom du Processeur de Langage\n"
 
-#: vms-alpha.c:5692
+#: vms-alpha.c:5673
 #, c-format
 msgid "   language name: %.*s\n"
 msgstr "   nom du language: %.*s\n"
 
-#: vms-alpha.c:5699
+#: vms-alpha.c:5680
 #, c-format
 msgid "Source Files Header\n"
 msgstr "En-tête des fichiers sources\n"
 
-#: vms-alpha.c:5700
+#: vms-alpha.c:5681
 #, c-format
 msgid "   file: %.*s\n"
 msgstr "   fichier: %.*s\n"
 
-#: vms-alpha.c:5707
+#: vms-alpha.c:5688
 #, c-format
 msgid "Title Text Header\n"
 msgstr "En-tête du texte du titre\n"
 
-#: vms-alpha.c:5708
+#: vms-alpha.c:5689
 #, c-format
 msgid "   title: %.*s\n"
 msgstr "   titre: %.*s\n"
 
-#: vms-alpha.c:5715
+#: vms-alpha.c:5696
 #, c-format
 msgid "Copyright Header\n"
 msgstr "En-tête du copyright\n"
 
-#: vms-alpha.c:5716
+#: vms-alpha.c:5697
 #, c-format
 msgid "   copyright: %.*s\n"
 msgstr "   copyright: %.*s\n"
 
-#: vms-alpha.c:5722
+#: vms-alpha.c:5703
 #, c-format
 msgid "unhandled emh subtype %u\n"
 msgstr "sous-type emh %u non pris en charge\n"
 
-#: vms-alpha.c:5732
+#: vms-alpha.c:5713
 #, c-format
 msgid "  EEOM (len=%u):\n"
 msgstr "  EEOM (long=%u):\n"
 
-#: vms-alpha.c:5733
+#: vms-alpha.c:5714
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr "   nombre de paires de liaisons cond: %u\n"
 
-#: vms-alpha.c:5735
+#: vms-alpha.c:5716
 #, c-format
 msgid "   completion code: %u\n"
 msgstr "   code de complétion: %u\n"
 
-#: vms-alpha.c:5739
+#: vms-alpha.c:5720
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr "   fanions de transfert d'adr: 0x%02x\n"
 
-#: vms-alpha.c:5740
+#: vms-alpha.c:5721
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr "   psect transert adr: %u\n"
 
-#: vms-alpha.c:5742
+#: vms-alpha.c:5723
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr "   adresse de transert: 0x%08x\n"
 
-#: vms-alpha.c:5751
+#: vms-alpha.c:5732
 msgid " WEAK"
 msgstr " FAIBLE"
 
-#: vms-alpha.c:5753
+#: vms-alpha.c:5734
 msgid " DEF"
 msgstr " DEF"
 
-#: vms-alpha.c:5755
+#: vms-alpha.c:5736
 msgid " UNI"
 msgstr " UNI"
 
-#: vms-alpha.c:5757 vms-alpha.c:5778
+#: vms-alpha.c:5738 vms-alpha.c:5759
 msgid " REL"
 msgstr " REL"
 
-#: vms-alpha.c:5759
+#: vms-alpha.c:5740
 msgid " COMM"
 msgstr " COMM"
 
-#: vms-alpha.c:5761
+#: vms-alpha.c:5742
 msgid " VECEP"
 msgstr " VECEP"
 
-#: vms-alpha.c:5763
+#: vms-alpha.c:5744
 msgid " NORM"
 msgstr " NORM"
 
-#: vms-alpha.c:5765
+#: vms-alpha.c:5746
 msgid " QVAL"
 msgstr " QVAL"
 
-#: vms-alpha.c:5772
+#: vms-alpha.c:5753
 msgid " PIC"
 msgstr " PIC"
 
-#: vms-alpha.c:5774
+#: vms-alpha.c:5755
 msgid " LIB"
 msgstr " LIB"
 
-#: vms-alpha.c:5776
+#: vms-alpha.c:5757
 msgid " OVR"
 msgstr " OVR"
 
-#: vms-alpha.c:5780
+#: vms-alpha.c:5761
 msgid " GBL"
 msgstr " GBL"
 
-#: vms-alpha.c:5782
+#: vms-alpha.c:5763
 msgid " SHR"
 msgstr " SHR"
 
-#: vms-alpha.c:5784
+#: vms-alpha.c:5765
 msgid " EXE"
 msgstr " EXE"
 
-#: vms-alpha.c:5786
+#: vms-alpha.c:5767
 msgid " RD"
 msgstr " RD"
 
-#: vms-alpha.c:5788
+#: vms-alpha.c:5769
 msgid " WRT"
 msgstr " WRT"
 
-#: vms-alpha.c:5790
+#: vms-alpha.c:5771
 msgid " VEC"
 msgstr " VEC"
 
-#: vms-alpha.c:5792
+#: vms-alpha.c:5773
 msgid " NOMOD"
 msgstr " NOMOD"
 
-#: vms-alpha.c:5794
+#: vms-alpha.c:5775
 msgid " COM"
 msgstr " COM"
 
-#: vms-alpha.c:5796
+#: vms-alpha.c:5777
 msgid " 64B"
 msgstr " 64B"
 
-#: vms-alpha.c:5805
+#: vms-alpha.c:5786
 #, c-format
 msgid "  EGSD (len=%u):\n"
 msgstr "  EGSD (long=%u):\n"
 
-#: vms-alpha.c:5817
+#: vms-alpha.c:5798
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
 msgstr "  entrée EGSD %2u (type: %u, long: %u): "
 
-#: vms-alpha.c:5829
+#: vms-alpha.c:5810
 #, c-format
 msgid "PSC - Program section definition\n"
 msgstr "PSC - Définition de section du programme\n"
 
-#: vms-alpha.c:5830 vms-alpha.c:5847
+#: vms-alpha.c:5811 vms-alpha.c:5828
 #, c-format
 msgid "   alignment  : 2**%u\n"
 msgstr "   alignement : 2**%u\n"
 
-#: vms-alpha.c:5831 vms-alpha.c:5848
+#: vms-alpha.c:5812 vms-alpha.c:5829
 #, c-format
 msgid "   flags      : 0x%04x"
 msgstr "   fanions    : 0x%04x"
 
-#: vms-alpha.c:5835
+#: vms-alpha.c:5816
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr "  alloc (long): %u (0x%08x)\n"
 
-#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942
+#: vms-alpha.c:5817 vms-alpha.c:5874 vms-alpha.c:5923
 #, c-format
 msgid "   name       : %.*s\n"
 msgstr "   nom        : %.*s\n"
 
-#: vms-alpha.c:5846
+#: vms-alpha.c:5827
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
 msgstr "SPSC - Def de section de l'image partagée du programme\n"
 
-#: vms-alpha.c:5852
+#: vms-alpha.c:5833
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr "   alloc (long)  : %u (0x%08x)\n"
 
-#: vms-alpha.c:5853
+#: vms-alpha.c:5834
 #, c-format
 msgid "   image offset  : 0x%08x\n"
 msgstr "   offset d'image: 0x%08x\n"
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5836
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr "   offset symvec : 0x%08x\n"
 
-#: vms-alpha.c:5857
+#: vms-alpha.c:5838
 #, c-format
 msgid "   name          : %.*s\n"
 msgstr "   nom           : %.*s\n"
 
-#: vms-alpha.c:5870
+#: vms-alpha.c:5851
 #, c-format
 msgid "SYM - Global symbol definition\n"
 msgstr "SYM - Définition du symbol global\n"
 
-#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971
+#: vms-alpha.c:5852 vms-alpha.c:5912 vms-alpha.c:5933 vms-alpha.c:5952
 #, c-format
 msgid "   flags: 0x%04x"
 msgstr "   fanions: 0x%04x"
 
-#: vms-alpha.c:5874
+#: vms-alpha.c:5855
 #, c-format
 msgid "   psect offset: 0x%08x\n"
 msgstr "   offset psect: 0x%08x\n"
 
-#: vms-alpha.c:5878
+#: vms-alpha.c:5859
 #, c-format
 msgid "   code address: 0x%08x\n"
 msgstr "   adresse code: 0x%08x\n"
 
-#: vms-alpha.c:5880
+#: vms-alpha.c:5861
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr "   index psect pour point d'entrée: %u\n"
 
-#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978
+#: vms-alpha.c:5864 vms-alpha.c:5940 vms-alpha.c:5959
 #, c-format
 msgid "   psect index : %u\n"
 msgstr "   index psect : %u\n"
 
-#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980
+#: vms-alpha.c:5866 vms-alpha.c:5942 vms-alpha.c:5961
 #, c-format
 msgid "   name        : %.*s\n"
 msgstr "   nom         : %.*s\n"
 
-#: vms-alpha.c:5892
+#: vms-alpha.c:5873
 #, c-format
 msgid "SYM - Global symbol reference\n"
 msgstr "SYM - Référence du symbol globaux\n"
 
-#: vms-alpha.c:5904
+#: vms-alpha.c:5885
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr "IDC - Vérification de la consistance d'identité\n"
 
-#: vms-alpha.c:5905
+#: vms-alpha.c:5886
 #, c-format
 msgid "   flags         : 0x%08x"
 msgstr "   fanions       : 0x%08x"
 
-#: vms-alpha.c:5909
+#: vms-alpha.c:5890
 #, c-format
 msgid "   id match      : %x\n"
 msgstr "   correspondance id : %x\n"
 
-#: vms-alpha.c:5911
+#: vms-alpha.c:5892
 #, c-format
 msgid "   error severity: %x\n"
 msgstr "   sévérité d'erreur: %x\n"
 
-#: vms-alpha.c:5914
+#: vms-alpha.c:5895
 #, c-format
 msgid "   entity name   : %.*s\n"
 msgstr "   nom d'entité  : %.*s\n"
 
-#: vms-alpha.c:5916
+#: vms-alpha.c:5897
 #, c-format
 msgid "   object name   : %.*s\n"
 msgstr "   nom d'objet   : %.*s\n"
 
-#: vms-alpha.c:5919
+#: vms-alpha.c:5900
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr "   ident binaire : 0x%08x\n"
 
-#: vms-alpha.c:5922
+#: vms-alpha.c:5903
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr "   ident ascii   : %.*s\n"
 
-#: vms-alpha.c:5930
+#: vms-alpha.c:5911
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
 msgstr "SYMG - Définition de symbole universel\n"
 
-#: vms-alpha.c:5934
+#: vms-alpha.c:5915
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
 msgstr "   offset vecteur symbole: 0x%08x\n"
 
-#: vms-alpha.c:5936
+#: vms-alpha.c:5917
 #, c-format
 msgid "   entry point: 0x%08x\n"
 msgstr "   point d'entrée: 0x%08x\n"
 
-#: vms-alpha.c:5938
+#: vms-alpha.c:5919
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr "   descr proc : 0x%08x\n"
 
-#: vms-alpha.c:5940
+#: vms-alpha.c:5921
 #, c-format
 msgid "   psect index: %u\n"
 msgstr "   index psect: %u\n"
 
-#: vms-alpha.c:5951
+#: vms-alpha.c:5932
 #, c-format
 msgid "SYMV - Vectored symbol definition\n"
 msgstr "SYMV - Définition symbole vectorisé\n"
 
-#: vms-alpha.c:5955
+#: vms-alpha.c:5936
 #, c-format
 msgid "   vector      : 0x%08x\n"
 msgstr "   vecteur     : 0x%08x\n"
 
-#: vms-alpha.c:5957 vms-alpha.c:5976
+#: vms-alpha.c:5938 vms-alpha.c:5957
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr "   offset psect: %u\n"
 
-#: vms-alpha.c:5970
+#: vms-alpha.c:5951
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
 msgstr "SYMM - Définition de symbole globale avec version\n"
 
-#: vms-alpha.c:5974
+#: vms-alpha.c:5955
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr "   masque de version: 0x%08x\n"
 
-#: vms-alpha.c:5985
+#: vms-alpha.c:5966
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr "type d'entrée egsd %u non supporté\n"
 
-#: vms-alpha.c:6019
+#: vms-alpha.c:6000
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr "   index de liaison: %u, instruction de remplacement: 0x%08x\n"
 
-#: vms-alpha.c:6022
+#: vms-alpha.c:6003
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr "   index psect 1: %u, offset 1: 0x%08x %08x\n"
 
-#: vms-alpha.c:6026
+#: vms-alpha.c:6007
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr "   index psect 2: %u, offset 2: 0x%08x %08x\n"
 
-#: vms-alpha.c:6031
+#: vms-alpha.c:6012
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr "   index psect 3: %u, offset 3: 0x%08x %08x\n"
 
-#: vms-alpha.c:6036
+#: vms-alpha.c:6017
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr "   nom global: %.*s\n"
 
-#: vms-alpha.c:6046
+#: vms-alpha.c:6027
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr "  %s (long=%u+%u):\n"
 
-#: vms-alpha.c:6061
+#: vms-alpha.c:6042
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr "   (type: %3u, taille: 4+%3u): "
 
-#: vms-alpha.c:6065
+#: vms-alpha.c:6046
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr "STA_GBL (pile globals) %.*s\n"
 
-#: vms-alpha.c:6069
+#: vms-alpha.c:6050
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr "STA_LW (pile mot long) 0x%08x\n"
 
-#: vms-alpha.c:6073
+#: vms-alpha.c:6054
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr "STA_QW (pile quad mot) 0x%08x %08x\n"
 
-#: vms-alpha.c:6078
+#: vms-alpha.c:6059
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr "STA_PQ (base pile psect + offset)\n"
 
-#: vms-alpha.c:6079
+#: vms-alpha.c:6060
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr "   psect: %u, offset: 0x%08x %08x\n"
 
-#: vms-alpha.c:6085
+#: vms-alpha.c:6066
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr "STA_LI (pile literale)\n"
 
-#: vms-alpha.c:6088
+#: vms-alpha.c:6069
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr "STA_MOD (pile module)\n"
 
-#: vms-alpha.c:6091
+#: vms-alpha.c:6072
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr "STA_CKARG (compare les arguments de la procédure)\n"
 
-#: vms-alpha.c:6095
+#: vms-alpha.c:6076
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr "STO_B (stocke octet)\n"
 
-#: vms-alpha.c:6098
+#: vms-alpha.c:6079
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr "STO_W (stocke mot)\n"
 
-#: vms-alpha.c:6101
+#: vms-alpha.c:6082
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr "STO_LW (stocke mot long)\n"
 
-#: vms-alpha.c:6104
+#: vms-alpha.c:6085
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr "STO_QW (stocke quad mot)\n"
 
-#: vms-alpha.c:6110
+#: vms-alpha.c:6091
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr "STO_IMMR (stock répétition immédiate) %u octets\n"
 
-#: vms-alpha.c:6117
+#: vms-alpha.c:6098
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr "STO_GBL (stocke globale) %.*s\n"
 
-#: vms-alpha.c:6121
+#: vms-alpha.c:6102
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr "STO_CA (stock adresse code) %.*s\n"
 
-#: vms-alpha.c:6125
+#: vms-alpha.c:6106
 #, c-format
 msgid "STO_RB (store relative branch)\n"
 msgstr "STO_RB (stocke branche relative)\n"
 
-#: vms-alpha.c:6128
+#: vms-alpha.c:6109
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
 msgstr "STO_AB (stocke branche absolue)\n"
 
-#: vms-alpha.c:6131
+#: vms-alpha.c:6112
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr "STO_OFF (stocke offset de psect)\n"
 
-#: vms-alpha.c:6137
+#: vms-alpha.c:6118
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr "STO_IMM (stocke immediat) %u octets\n"
 
-#: vms-alpha.c:6144
+#: vms-alpha.c:6125
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr "STO_GBL_LW (stocke mot long global) %.*s\n"
 
-#: vms-alpha.c:6148
+#: vms-alpha.c:6129
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr "STO_OFF (stocke LP avec la signature de la procédure)\n"
 
-#: vms-alpha.c:6151
+#: vms-alpha.c:6132
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
 msgstr "STO_BR_GBL (stocke branche globale) *todo*\n"
 
-#: vms-alpha.c:6154
+#: vms-alpha.c:6135
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
 msgstr "STO_BR_PS (stocke branche psect + offset) *todo*\n"
 
-#: vms-alpha.c:6158
+#: vms-alpha.c:6139
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr "OPR_NOP (pas d'operation)\n"
 
-#: vms-alpha.c:6161
+#: vms-alpha.c:6142
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr "OPR_ADD (ajout)\n"
 
-#: vms-alpha.c:6164
+#: vms-alpha.c:6145
 #, c-format
 msgid "OPR_SUB (substract)\n"
 msgstr "OPR_SUB (soustraction)\n"
 
-#: vms-alpha.c:6167
+#: vms-alpha.c:6148
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr "OPR_MUL (multiplication)\n"
 
-#: vms-alpha.c:6170
+#: vms-alpha.c:6151
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr "OPR_DIV (division)\n"
 
-#: vms-alpha.c:6173
+#: vms-alpha.c:6154
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr "OPR_AND (et logique)\n"
 
-#: vms-alpha.c:6176
+#: vms-alpha.c:6157
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr "OPR_IOR (ou inclusif logique)\n"
 
-#: vms-alpha.c:6179
+#: vms-alpha.c:6160
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr "OPR_EOR (ou exclusif logique)\n"
 
-#: vms-alpha.c:6182
+#: vms-alpha.c:6163
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr "OPR_NEG (négation)\n"
 
-#: vms-alpha.c:6185
+#: vms-alpha.c:6166
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr "OPR_COM (complément)\n"
 
-#: vms-alpha.c:6188
+#: vms-alpha.c:6169
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr "OPR_INSV (insertion champ)\n"
 
-#: vms-alpha.c:6191
+#: vms-alpha.c:6172
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr "OPR_ASH (décalage arithmetique)\n"
 
-#: vms-alpha.c:6194
+#: vms-alpha.c:6175
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr "OPR_USH (décalage non signé)\n"
 
-#: vms-alpha.c:6197
+#: vms-alpha.c:6178
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr "OPR_ROT (rotation)\n"
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6181
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr "OPR_SEL (selection)\n"
 
-#: vms-alpha.c:6203
+#: vms-alpha.c:6184
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr "OPR_REDEF (redéfini le symbole à la position actuelle)\n"
 
-#: vms-alpha.c:6206
+#: vms-alpha.c:6187
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr "OPR_REDEF (définir un litéral)\n"
 
-#: vms-alpha.c:6210
+#: vms-alpha.c:6191
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr "STC_LP (stocke pair de liaison cond)\n"
 
-#: vms-alpha.c:6214
+#: vms-alpha.c:6195
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr "STC_LP_PSB (stocke pair de liaison cond + signature)\n"
 
-#: vms-alpha.c:6215
+#: vms-alpha.c:6196
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr "   index liaison: %u, procédure: %.*s\n"
 
-#: vms-alpha.c:6218
+#: vms-alpha.c:6199
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr "   signature: %.*s\n"
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6202
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr "STC_GBL (stocke cond globale)\n"
 
-#: vms-alpha.c:6222
+#: vms-alpha.c:6203
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr "   index liaison: %u, globale: %.*s\n"
 
-#: vms-alpha.c:6226
+#: vms-alpha.c:6207
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr "STC_GCA (stocke adresse code cond)\n"
 
-#: vms-alpha.c:6227
+#: vms-alpha.c:6208
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr "   index liaison: %u, nom procédure: %.*s\n"
 
-#: vms-alpha.c:6231
+#: vms-alpha.c:6212
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr "STC_PS (stocke psect cond + offset)\n"
 
-#: vms-alpha.c:6233
+#: vms-alpha.c:6214
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr "   index liaison: %u, psect: %u, offset: 0x%08x %08x\n"
 
-#: vms-alpha.c:6240
+#: vms-alpha.c:6221
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr "STC_NOP_GBL (stocke NOP cond à l'adresse globale)\n"
 
-#: vms-alpha.c:6244
+#: vms-alpha.c:6225
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr "STC_NOP_PS (stocke NOP cond à psect + offset)\n"
 
-#: vms-alpha.c:6248
+#: vms-alpha.c:6229
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr "STC_BSR_GBL (stocke BSR cond à l'adresse globale)\n"
 
-#: vms-alpha.c:6252
+#: vms-alpha.c:6233
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr "STC_BSR_PS (stocke BSR cond à psect + offset)\n"
 
-#: vms-alpha.c:6256
+#: vms-alpha.c:6237
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr "STC_LDA_GBL (stocke LDA cond à l'adresse globale)\n"
 
-#: vms-alpha.c:6260
+#: vms-alpha.c:6241
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr "STC_LDA_PS (stocke LDA cond à psect + offset)\n"
 
-#: vms-alpha.c:6264
+#: vms-alpha.c:6245
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr "STC_BOH_GBL (stocke BOH cond à l'adresse globale)\n"
 
-#: vms-alpha.c:6268
+#: vms-alpha.c:6249
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr "STC_BOH_PS (stocke BOH cond à psect + offset)\n"
 
-#: vms-alpha.c:6273
+#: vms-alpha.c:6254
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr "STC_NBH_GBL (stocke cond ou suggestion à l'adresse globale)\n"
 
-#: vms-alpha.c:6277
+#: vms-alpha.c:6258
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr "STC_NBH_PS (stocke cond or suggestion à psect + offset)\n"
 
-#: vms-alpha.c:6281
+#: vms-alpha.c:6262
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
-msgstr "CTL_SETRB (fixe la base du réadressage)\n"
+msgstr "CTL_SETRB (fixe la base de relocalisation)\n"
 
-#: vms-alpha.c:6287
+#: vms-alpha.c:6268
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
-msgstr "CTL_AUGRB (augmente la base du réadressage) %u\n"
+msgstr "CTL_AUGRB (augmente la base de relocalisation) %u\n"
 
-#: vms-alpha.c:6291
+#: vms-alpha.c:6272
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
 msgstr "CTL_DFLOC (définir position)\n"
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6275
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr "CTL_STLOC (fixer position)\n"
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6278
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
 msgstr "CTL_STKDL (position définie dans la pile)\n"
 
-#: vms-alpha.c:6300 vms-alpha.c:6714
+#: vms-alpha.c:6281 vms-alpha.c:6695
 #, c-format
 msgid "*unhandled*\n"
 msgstr "*non pris en charge*\n"
 
-#: vms-alpha.c:6330 vms-alpha.c:6369
+#: vms-alpha.c:6311 vms-alpha.c:6350
 #, c-format
 msgid "cannot read GST record length\n"
 msgstr "impossible de lire la longueur de l'enregistrement GST\n"
 
 #. Ill-formed.
-#: vms-alpha.c:6351
+#: vms-alpha.c:6332
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr "impossible de trouver le EMH dans le premier enregistrement GST\n"
 
-#: vms-alpha.c:6377
+#: vms-alpha.c:6358
 #, c-format
 msgid "cannot read GST record header\n"
 msgstr "impossible de lire l'en-tête de l'enregistrement GST\n"
 
-#: vms-alpha.c:6390
+#: vms-alpha.c:6371
 #, c-format
 msgid " corrupted GST\n"
 msgstr " GST corrompu\n"
 
-#: vms-alpha.c:6398
+#: vms-alpha.c:6379
 #, c-format
 msgid "cannot read GST record\n"
 msgstr "ne peut lire l'enregistrement GST\n"
 
-#: vms-alpha.c:6427
+#: vms-alpha.c:6408
 #, c-format
 msgid " unhandled EOBJ record type %u\n"
 msgstr " type d'enregistrement EOBJ %u non supporté\n"
 
-#: vms-alpha.c:6450
+#: vms-alpha.c:6431
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr "  décompte des bits: %u, adr base: 0x%08x\n"
 
-#: vms-alpha.c:6463
+#: vms-alpha.c:6444
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
 msgstr "   carte des bits: 0x%08x (occurrence: %u):\n"
 
-#: vms-alpha.c:6470
+#: vms-alpha.c:6451
 #, c-format
 msgid " %08x"
 msgstr " %08x"
 
-#: vms-alpha.c:6495
+#: vms-alpha.c:6476
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr "  image %u (%u entrées)\n"
 
-#: vms-alpha.c:6500
+#: vms-alpha.c:6481
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr "   offset: 0x%08x, val: 0x%08x\n"
 
-#: vms-alpha.c:6521
+#: vms-alpha.c:6502
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr "  image %u (%u entrées), offsets:\n"
 
-#: vms-alpha.c:6528
+#: vms-alpha.c:6509
 #, c-format
 msgid " 0x%08x"
 msgstr " 0x%08x"
 
 #. 64 bits.
-#: vms-alpha.c:6650
+#: vms-alpha.c:6631
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr "64 bits *non supporté*\n"
 
-#: vms-alpha.c:6654
+#: vms-alpha.c:6635
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr "classe: %u, dtype: %u, longueur: %u, pointeur: 0x%08x\n"
 
-#: vms-alpha.c:6665
+#: vms-alpha.c:6646
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr "table de %s non contiguë\n"
 
-#: vms-alpha.c:6669
+#: vms-alpha.c:6650
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr "dimct: %u, aflags: 0x%02x, digits: %u, échelle: %u\n"
 
-#: vms-alpha.c:6673
+#: vms-alpha.c:6654
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr "arsize: %u, a0: 0x%08x\n"
 
-#: vms-alpha.c:6677
+#: vms-alpha.c:6658
 #, c-format
 msgid "Strides:\n"
 msgstr "Pas:\n"
 
-#: vms-alpha.c:6682
+#: vms-alpha.c:6663
 #, c-format
 msgid "[%u]: %u\n"
 msgstr "[%u]: %u\n"
 
-#: vms-alpha.c:6687
+#: vms-alpha.c:6668
 #, c-format
 msgid "Bounds:\n"
 msgstr "Limites:\n"
 
-#: vms-alpha.c:6692
+#: vms-alpha.c:6673
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr "[%u]: Inférieure: %u, supérieure: %u\n"
 
-#: vms-alpha.c:6704
+#: vms-alpha.c:6685
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr "chaine de bits de %s désalignée\n"
 
-#: vms-alpha.c:6708
+#: vms-alpha.c:6689
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr "base: %u, pos: %u\n"
 
-#: vms-alpha.c:6728
+#: vms-alpha.c:6709
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr "vflags: 0x%02x, valeur: 0x%08x "
 
-#: vms-alpha.c:6734
+#: vms-alpha.c:6715
 #, c-format
 msgid "(no value)\n"
 msgstr "(pas de valeur)\n"
 
-#: vms-alpha.c:6737
+#: vms-alpha.c:6718
 #, c-format
 msgid "(not active)\n"
 msgstr "(pas active)\n"
 
-#: vms-alpha.c:6740
+#: vms-alpha.c:6721
 #, c-format
 msgid "(not allocated)\n"
 msgstr "(pas allouée)\n"
 
-#: vms-alpha.c:6743
+#: vms-alpha.c:6724
 #, c-format
 msgid "(descriptor)\n"
 msgstr "(descripteur)\n"
 
-#: vms-alpha.c:6747
+#: vms-alpha.c:6728
 #, c-format
 msgid "(trailing value)\n"
 msgstr "(valeur postérieure)\n"
 
-#: vms-alpha.c:6750
+#: vms-alpha.c:6731
 #, c-format
 msgid "(value spec follows)\n"
 msgstr "(spécificités de la valeur suivent)\n"
 
-#: vms-alpha.c:6753
+#: vms-alpha.c:6734
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr "(à l'offset de bit %u)\n"
 
-#: vms-alpha.c:6756
+#: vms-alpha.c:6737
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr "(reg: %u, aff: %u, indir: %u, type: "
 
-#: vms-alpha.c:6763
+#: vms-alpha.c:6744
 msgid "literal"
 msgstr "litérale"
 
-#: vms-alpha.c:6766
+#: vms-alpha.c:6747
 msgid "address"
 msgstr "adresse"
 
-#: vms-alpha.c:6769
+#: vms-alpha.c:6750
 msgid "desc"
 msgstr "desc"
 
-#: vms-alpha.c:6772
+#: vms-alpha.c:6753
 msgid "reg"
 msgstr "reg"
 
-#: vms-alpha.c:6847
+#: vms-alpha.c:6828
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr "Table des symboles de debug:\n"
 
-#: vms-alpha.c:6858
+#: vms-alpha.c:6839
 #, c-format
 msgid "cannot read DST header\n"
 msgstr "impossible de lire l'en-tête DST\n"
 
-#: vms-alpha.c:6863
+#: vms-alpha.c:6844
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr " type: %3u, long: %3u (à 0x%08x): "
 
-#: vms-alpha.c:6877
+#: vms-alpha.c:6858
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr "ne peut lire le symbole DST\n"
 
-#: vms-alpha.c:6920
+#: vms-alpha.c:6901
 #, c-format
 msgid "standard data: %s\n"
 msgstr "données standards: %s\n"
 
-#: vms-alpha.c:6923 vms-alpha.c:7007
+#: vms-alpha.c:6904 vms-alpha.c:6988
 #, c-format
 msgid "    name: %.*s\n"
 msgstr "    nom: %.*s\n"
 
-#: vms-alpha.c:6930
+#: vms-alpha.c:6911
 #, c-format
 msgid "modbeg\n"
 msgstr "début module\n"
 
-#: vms-alpha.c:6931
+#: vms-alpha.c:6912
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr "   fanions: %d, language: %u, majeur: %u, mineur: %u\n"
 
-#: vms-alpha.c:6937 vms-alpha.c:7203
+#: vms-alpha.c:6918 vms-alpha.c:7184
 #, c-format
 msgid "   module name: %.*s\n"
 msgstr "   nom du module: %.*s\n"
 
-#: vms-alpha.c:6940
+#: vms-alpha.c:6921
 #, c-format
 msgid "   compiler   : %.*s\n"
 msgstr "   compilateur  : %.*s\n"
 
-#: vms-alpha.c:6945
+#: vms-alpha.c:6926
 #, c-format
 msgid "modend\n"
 msgstr "fin module\n"
 
-#: vms-alpha.c:6952
+#: vms-alpha.c:6933
 msgid "rtnbeg\n"
 msgstr "début rtn\n"
 
-#: vms-alpha.c:6953
+#: vms-alpha.c:6934
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr "    fanions: %u, adresse: 0x%08x, pd-adresse: 0x%08x\n"
 
-#: vms-alpha.c:6958
+#: vms-alpha.c:6939
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr "    nom routine : %.*s\n"
 
-#: vms-alpha.c:6966
+#: vms-alpha.c:6947
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr "fin rtn: taille 0x%08x\n"
 
-#: vms-alpha.c:6974
+#: vms-alpha.c:6955
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr "prologue: adresse bkpt 0x%08x\n"
 
-#: vms-alpha.c:6982
+#: vms-alpha.c:6963
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr "épilogue: fanions: %u, nombre: %u\n"
 
-#: vms-alpha.c:6991
+#: vms-alpha.c:6972
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr "début blk: adresse: 0x%08x, nom: %.*s\n"
 
-#: vms-alpha.c:7000
+#: vms-alpha.c:6981
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr "fin blk: taille: 0x%08x\n"
 
-#: vms-alpha.c:7006
+#: vms-alpha.c:6987
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr "typspec (long: %u)\n"
 
-#: vms-alpha.c:7013
+#: vms-alpha.c:6994
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr "septyp, nom: %.*s\n"
 
-#: vms-alpha.c:7022
+#: vms-alpha.c:7003
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr "début rec: nom: %.*s\n"
 
-#: vms-alpha.c:7029
+#: vms-alpha.c:7010
 #, c-format
 msgid "recend\n"
 msgstr "fin rec\n"
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7013
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr "début énumération, long: %u, nom: %.*s\n"
 
-#: vms-alpha.c:7036
+#: vms-alpha.c:7017
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr "énumération éléments, nom: %.*s\n"
 
-#: vms-alpha.c:7040
+#: vms-alpha.c:7021
 #, c-format
 msgid "enumend\n"
 msgstr "fin énumération\n"
 
-#: vms-alpha.c:7057
+#: vms-alpha.c:7038
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr "plage discontinue (nbr: %u)\n"
 
-#: vms-alpha.c:7059
+#: vms-alpha.c:7040
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr "    adresse: 0x%08x, taille: %u\n"
 
-#: vms-alpha.c:7069
+#: vms-alpha.c:7050
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr "num ligne  (long: %u)\n"
 
-#: vms-alpha.c:7086
+#: vms-alpha.c:7067
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr "delta_pc_w %u\n"
 
-#: vms-alpha.c:7093
+#: vms-alpha.c:7074
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr "incr_linum(b): +%u\n"
 
-#: vms-alpha.c:7099
+#: vms-alpha.c:7080
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr "incr_linum_w: +%u\n"
 
-#: vms-alpha.c:7105
+#: vms-alpha.c:7086
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr "incr_linum_l: +%u\n"
 
-#: vms-alpha.c:7111
+#: vms-alpha.c:7092
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr "set_line_num(w) %u\n"
 
-#: vms-alpha.c:7116
+#: vms-alpha.c:7097
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr "set_line_num_b %u\n"
 
-#: vms-alpha.c:7121
+#: vms-alpha.c:7102
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr "set_line_num_l %u\n"
 
-#: vms-alpha.c:7126
+#: vms-alpha.c:7107
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr "set_abs_pc: 0x%08x\n"
 
-#: vms-alpha.c:7130
+#: vms-alpha.c:7111
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr "delta_pc_l: +0x%08x\n"
 
-#: vms-alpha.c:7135
+#: vms-alpha.c:7116
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr "term(b): 0x%02x"
 
-#: vms-alpha.c:7137
+#: vms-alpha.c:7118
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr "        pc: 0x%08x\n"
 
-#: vms-alpha.c:7142
+#: vms-alpha.c:7123
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr "term_w: 0x%04x"
 
-#: vms-alpha.c:7144
+#: vms-alpha.c:7125
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr "    pc: 0x%08x\n"
 
-#: vms-alpha.c:7150
+#: vms-alpha.c:7131
 #, c-format
 msgid "delta pc +%-4d"
 msgstr "delta pc +%-4d"
 
-#: vms-alpha.c:7153
+#: vms-alpha.c:7134
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
 msgstr "    pc: 0x%08x ligne: %5u\n"
 
-#: vms-alpha.c:7158
+#: vms-alpha.c:7139
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr "    cmd %u *non gérée*\n"
 
-#: vms-alpha.c:7173
+#: vms-alpha.c:7154
 #, c-format
 msgid "source (len: %u)\n"
 msgstr "source (long: %u)\n"
 
-#: vms-alpha.c:7187
+#: vms-alpha.c:7168
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr "   declfile: long: %u, fanions: %u, id fichier: %u\n"
 
-#: vms-alpha.c:7191
+#: vms-alpha.c:7172
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 
-#: vms-alpha.c:7200
+#: vms-alpha.c:7181
 #, c-format
 msgid "   filename   : %.*s\n"
 msgstr "   nom fichier: %.*s\n"
 
-#: vms-alpha.c:7209
+#: vms-alpha.c:7190
 #, c-format
 msgid "   setfile %u\n"
 msgstr "   setfile %u\n"
 
-#: vms-alpha.c:7214 vms-alpha.c:7219
+#: vms-alpha.c:7195 vms-alpha.c:7200
 #, c-format
 msgid "   setrec %u\n"
 msgstr "   setrec %u\n"
 
-#: vms-alpha.c:7224 vms-alpha.c:7229
+#: vms-alpha.c:7205 vms-alpha.c:7210
 #, c-format
 msgid "   setlnum %u\n"
 msgstr "   setlnum %u\n"
 
-#: vms-alpha.c:7234 vms-alpha.c:7239
+#: vms-alpha.c:7215 vms-alpha.c:7220
 #, c-format
 msgid "   deflines %u\n"
 msgstr "   deflines %u\n"
 
-#: vms-alpha.c:7243
+#: vms-alpha.c:7224
 #, c-format
 msgid "   formfeed\n"
 msgstr "   formfeed\n"
 
-#: vms-alpha.c:7247
+#: vms-alpha.c:7228
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr "   cmd %u *non gérée*\n"
 
-#: vms-alpha.c:7259
+#: vms-alpha.c:7240
 #, c-format
 msgid "*unhandled* dst type %u\n"
 msgstr "type dst %u *non géré*\n"
 
-#: vms-alpha.c:7291
+#: vms-alpha.c:7272
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr "ne peut lire EIHD\n"
 
-#: vms-alpha.c:7294
+#: vms-alpha.c:7275
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr "EIHD: (taille: %u, nbr blocs: %u)\n"
 
-#: vms-alpha.c:7297
+#: vms-alpha.c:7278
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr " id majeur: %u, id mineur: %u\n"
 
-#: vms-alpha.c:7305
+#: vms-alpha.c:7286
 msgid "executable"
 msgstr "exécutable"
 
-#: vms-alpha.c:7308
+#: vms-alpha.c:7289
 msgid "linkable image"
 msgstr "image liable"
 
-#: vms-alpha.c:7314
+#: vms-alpha.c:7295
 #, c-format
 msgid " image type: %u (%s)"
 msgstr " type image: %u (%s)"
 
-#: vms-alpha.c:7320
+#: vms-alpha.c:7301
 msgid "native"
 msgstr "natif"
 
-#: vms-alpha.c:7323
+#: vms-alpha.c:7304
 msgid "CLI"
 msgstr "CLI"
 
-#: vms-alpha.c:7329
+#: vms-alpha.c:7310
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ", sous-type: %u (%s)\n"
 
-#: vms-alpha.c:7335
+#: vms-alpha.c:7316
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr " offsets: isd: %u, actif: %u, debug symbol: %u, id image: %u, patch: %u\n"
 
-#: vms-alpha.c:7339
+#: vms-alpha.c:7320
 #, c-format
 msgid " fixup info rva: "
 msgstr " correctif info rva: "
 
-#: vms-alpha.c:7341
+#: vms-alpha.c:7322
 #, c-format
 msgid ", symbol vector rva: "
 msgstr ", vecteur de symbol rva: "
 
-#: vms-alpha.c:7344
+#: vms-alpha.c:7325
 #, c-format
 msgid ""
 "\n"
@@ -5179,461 +4958,461 @@ msgstr ""
 "\n"
 " offset tableau version: %u\n"
 
-#: vms-alpha.c:7348
+#: vms-alpha.c:7329
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr " décompte E/S img: %u, nbr canaux: %u, priv req: %08x%08x\n"
 
-#: vms-alpha.c:7354
+#: vms-alpha.c:7335
 #, c-format
 msgid " linker flags: %08x:"
 msgstr " fanions lieur: %08x:"
 
-#: vms-alpha.c:7384
+#: vms-alpha.c:7365
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr " ident: 0x%08x, ver sys: 0x%08x, apparier ctrl: %u, taille vectsym: %u\n"
 
-#: vms-alpha.c:7390
+#: vms-alpha.c:7371
 #, c-format
 msgid " BPAGE: %u"
 msgstr " BPAGE: %u"
 
-#: vms-alpha.c:7396
+#: vms-alpha.c:7377
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ", offset correctif étendu: %u, offset no_opt psect: %u"
 
-#: vms-alpha.c:7399
+#: vms-alpha.c:7380
 #, c-format
 msgid ", alias: %u\n"
 msgstr ", alias: %u\n"
 
-#: vms-alpha.c:7407
+#: vms-alpha.c:7388
 #, c-format
 msgid "system version array information:\n"
 msgstr "information sur table de version système:\n"
 
-#: vms-alpha.c:7411
+#: vms-alpha.c:7392
 #, c-format
 msgid "cannot read EIHVN header\n"
 msgstr "ne peut lire l'en-tête EIHVN\n"
 
-#: vms-alpha.c:7421
+#: vms-alpha.c:7402
 #, c-format
 msgid "cannot read EIHVN version\n"
 msgstr "ne peut lire la version EIHVN\n"
 
-#: vms-alpha.c:7424
+#: vms-alpha.c:7405
 #, c-format
 msgid "   %02u "
 msgstr "   %02u "
 
-#: vms-alpha.c:7428
+#: vms-alpha.c:7409
 msgid "BASE_IMAGE       "
 msgstr "BASE_IMAGE       "
 
-#: vms-alpha.c:7431
+#: vms-alpha.c:7412
 msgid "MEMORY_MANAGEMENT"
 msgstr "MEMORY_MANAGEMENT"
 
-#: vms-alpha.c:7434
+#: vms-alpha.c:7415
 msgid "IO               "
 msgstr "IO               "
 
-#: vms-alpha.c:7437
+#: vms-alpha.c:7418
 msgid "FILES_VOLUMES    "
 msgstr "FILES_VOLUMES    "
 
-#: vms-alpha.c:7440
+#: vms-alpha.c:7421
 msgid "PROCESS_SCHED    "
 msgstr "PROCESS_SCHED    "
 
-#: vms-alpha.c:7443
+#: vms-alpha.c:7424
 msgid "SYSGEN           "
 msgstr "SYSGEN           "
 
-#: vms-alpha.c:7446
+#: vms-alpha.c:7427
 msgid "CLUSTERS_LOCKMGR "
 msgstr "CLUSTERS_LOCKMGR "
 
-#: vms-alpha.c:7449
+#: vms-alpha.c:7430
 msgid "LOGICAL_NAMES    "
 msgstr "LOGICAL_NAMES    "
 
-#: vms-alpha.c:7452
+#: vms-alpha.c:7433
 msgid "SECURITY         "
 msgstr "SECURITY         "
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7436
 msgid "IMAGE_ACTIVATOR  "
 msgstr "IMAGE_ACTIVATOR  "
 
-#: vms-alpha.c:7458
+#: vms-alpha.c:7439
 msgid "NETWORKS         "
 msgstr "NETWORKS         "
 
-#: vms-alpha.c:7461
+#: vms-alpha.c:7442
 msgid "COUNTERS         "
 msgstr "COUNTERS         "
 
-#: vms-alpha.c:7464
+#: vms-alpha.c:7445
 msgid "STABLE           "
 msgstr "STABLE           "
 
-#: vms-alpha.c:7467
+#: vms-alpha.c:7448
 msgid "MISC             "
 msgstr "MISC             "
 
-#: vms-alpha.c:7470
+#: vms-alpha.c:7451
 msgid "CPU              "
 msgstr "CPU              "
 
-#: vms-alpha.c:7473
+#: vms-alpha.c:7454
 msgid "VOLATILE         "
 msgstr "VOLATILE         "
 
-#: vms-alpha.c:7476
+#: vms-alpha.c:7457
 msgid "SHELL            "
 msgstr "SHELL            "
 
-#: vms-alpha.c:7479
+#: vms-alpha.c:7460
 msgid "POSIX            "
 msgstr "POSIX            "
 
-#: vms-alpha.c:7482
+#: vms-alpha.c:7463
 msgid "MULTI_PROCESSING "
 msgstr "MULTI_PROCESSING "
 
-#: vms-alpha.c:7485
+#: vms-alpha.c:7466
 msgid "GALAXY           "
 msgstr "GALAXY           "
 
-#: vms-alpha.c:7488
+#: vms-alpha.c:7469
 msgid "*unknown*        "
 msgstr "*inconnu*        "
 
-#: vms-alpha.c:7491
+#: vms-alpha.c:7472
 #, c-format
 msgid ": %u.%u\n"
 msgstr ": %u.%u\n"
 
-#: vms-alpha.c:7504 vms-alpha.c:7763
+#: vms-alpha.c:7485 vms-alpha.c:7744
 #, c-format
 msgid "cannot read EIHA\n"
 msgstr "ne peut lire EIHA\n"
 
-#: vms-alpha.c:7507
+#: vms-alpha.c:7488
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr "Activation de l'image:  (taille=%u)\n"
 
-#: vms-alpha.c:7509
+#: vms-alpha.c:7490
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
 msgstr " Première adresse : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7512
+#: vms-alpha.c:7493
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
 msgstr " Deuxième adresse : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7515
+#: vms-alpha.c:7496
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
 msgstr " Troisième adresse: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7499
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
 msgstr " Quatrième adresse: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7521
+#: vms-alpha.c:7502
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
 msgstr " Image partagée   : 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7532
+#: vms-alpha.c:7513
 #, c-format
 msgid "cannot read EIHI\n"
 msgstr "ne peut lire EIHI\n"
 
-#: vms-alpha.c:7535
+#: vms-alpha.c:7516
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr "Identification d'image: (majeur: %u, mineur: %u)\n"
 
-#: vms-alpha.c:7538
+#: vms-alpha.c:7519
 #, c-format
 msgid " image name       : %.*s\n"
 msgstr " nom de l'image    : %.*s\n"
 
-#: vms-alpha.c:7540
+#: vms-alpha.c:7521
 #, c-format
 msgid " link time        : %s\n"
 msgstr " heure de liaison  : %s\n"
 
-#: vms-alpha.c:7542
+#: vms-alpha.c:7523
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr " ident image       : %.*s\n"
 
-#: vms-alpha.c:7544
+#: vms-alpha.c:7525
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr " ident lieur       : %.*s\n"
 
-#: vms-alpha.c:7546
+#: vms-alpha.c:7527
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr " ident construction image: %.*s\n"
 
-#: vms-alpha.c:7556
+#: vms-alpha.c:7537
 #, c-format
 msgid "cannot read EIHS\n"
 msgstr "ne peut lire EIHS\n"
 
-#: vms-alpha.c:7559
+#: vms-alpha.c:7540
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
 msgstr "Image des symboles et table debug: (majeur: %u, mineur: %u)\n"
 
-#: vms-alpha.c:7564
+#: vms-alpha.c:7545
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
 msgstr " table des symboles de debug : vbn: %u, taille: %u (0x%x)\n"
 
-#: vms-alpha.c:7568
+#: vms-alpha.c:7549
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
 msgstr " table des symboles globale: vbn: %u, enregistrements: %u\n"
 
-#: vms-alpha.c:7572
+#: vms-alpha.c:7553
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
 msgstr " table des modules de debug: vbn: %u, taille: %u\n"
 
-#: vms-alpha.c:7585
+#: vms-alpha.c:7566
 #, c-format
 msgid "cannot read EISD\n"
 msgstr "ne peut lire EISD\n"
 
-#: vms-alpha.c:7595
+#: vms-alpha.c:7576
 #, c-format
 msgid "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
 msgstr "Descripteur de section d'image: (majeur: %u, mineur: %u, taille: %u, offset: %u)\n"
 
-#: vms-alpha.c:7602
+#: vms-alpha.c:7583
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr " section: base: 0x%08x%08x taille: 0x%08x\n"
 
-#: vms-alpha.c:7607
+#: vms-alpha.c:7588
 #, c-format
 msgid " flags: 0x%04x"
 msgstr " fanions: 0x%04x"
 
-#: vms-alpha.c:7644
+#: vms-alpha.c:7625
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 
-#: vms-alpha.c:7650
+#: vms-alpha.c:7631
 msgid "NORMAL"
 msgstr "NORMAL"
 
-#: vms-alpha.c:7653
+#: vms-alpha.c:7634
 msgid "SHRFXD"
 msgstr "SHRFXD"
 
-#: vms-alpha.c:7656
+#: vms-alpha.c:7637
 msgid "PRVFXD"
 msgstr "PRVFXD"
 
-#: vms-alpha.c:7659
+#: vms-alpha.c:7640
 msgid "SHRPIC"
 msgstr "SHRPIC"
 
-#: vms-alpha.c:7662
+#: vms-alpha.c:7643
 msgid "PRVPIC"
 msgstr "PRVPIC"
 
-#: vms-alpha.c:7665
+#: vms-alpha.c:7646
 msgid "USRSTACK"
 msgstr "USRSTACK"
 
-#: vms-alpha.c:7673
+#: vms-alpha.c:7654
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr " ident: 0x%08x, nom: %.*s\n"
 
-#: vms-alpha.c:7683
+#: vms-alpha.c:7664
 #, c-format
 msgid "cannot read DMT\n"
 msgstr "ne peut lire DMT\n"
 
-#: vms-alpha.c:7687
+#: vms-alpha.c:7668
 #, c-format
 msgid "Debug module table:\n"
 msgstr "Table de debug du module:\n"
 
-#: vms-alpha.c:7696
+#: vms-alpha.c:7677
 #, c-format
 msgid "cannot read DMT header\n"
 msgstr "ne peut lire l'en-tête DMT\n"
 
-#: vms-alpha.c:7701
+#: vms-alpha.c:7682
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
 msgstr " offset du module: 0x%08x, taille: 0x%08x, (%u psects)\n"
 
-#: vms-alpha.c:7711
+#: vms-alpha.c:7692
 #, c-format
 msgid "cannot read DMT psect\n"
 msgstr "ne peut lire le psect DMT\n"
 
-#: vms-alpha.c:7714
+#: vms-alpha.c:7695
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
 msgstr "  début psect: 0x%08x, longueur: %u\n"
 
-#: vms-alpha.c:7727
+#: vms-alpha.c:7708
 #, c-format
 msgid "cannot read DST\n"
 msgstr "ne peut lire DST\n"
 
-#: vms-alpha.c:7737
+#: vms-alpha.c:7718
 #, c-format
 msgid "cannot read GST\n"
 msgstr "ne peut lire GST\n"
 
-#: vms-alpha.c:7741
+#: vms-alpha.c:7722
 #, c-format
 msgid "Global symbol table:\n"
 msgstr "Table des symboles globaux:\n"
 
-#: vms-alpha.c:7769
+#: vms-alpha.c:7750
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr "Correction de l'activateur de l'image: (majeur: %u, mineur: %u)\n"
 
-#: vms-alpha.c:7772
+#: vms-alpha.c:7753
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
 msgstr "  lien iaf : 0x%08x %08x\n"
 
-#: vms-alpha.c:7775
+#: vms-alpha.c:7756
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
 msgstr "  lien correctif: 0x%08x %08x\n"
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7759
 #, c-format
 msgid "  size : %u\n"
 msgstr "  taille : %u\n"
 
-#: vms-alpha.c:7780
+#: vms-alpha.c:7761
 #, c-format
 msgid "  flags: 0x%08x\n"
 msgstr "  fanions: 0x%08x\n"
 
-#: vms-alpha.c:7784
+#: vms-alpha.c:7765
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 msgstr "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 
-#: vms-alpha.c:7788
+#: vms-alpha.c:7769
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
 msgstr "  qdotadroff: %5u, ldotadroff: %5u\n"
 
-#: vms-alpha.c:7792
+#: vms-alpha.c:7773
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
 msgstr "  codeadroff: %5u, lpfixoff  : %5u\n"
 
-#: vms-alpha.c:7795
+#: vms-alpha.c:7776
 #, c-format
 msgid "  chgprtoff : %5u\n"
 msgstr "  chgprtoff : %5u\n"
 
-#: vms-alpha.c:7798
+#: vms-alpha.c:7779
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
 msgstr "  shlstoff  : %5u, shrimgcnt : %5u\n"
 
-#: vms-alpha.c:7800
+#: vms-alpha.c:7781
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
 msgstr "  shlextra  : %5u, permctx   : %5u\n"
 
-#: vms-alpha.c:7803
+#: vms-alpha.c:7784
 #, c-format
 msgid "  base_va : 0x%08x\n"
 msgstr "  base_va : 0x%08x\n"
 
-#: vms-alpha.c:7805
+#: vms-alpha.c:7786
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
 msgstr "  lppsbfixoff: %5u\n"
 
-#: vms-alpha.c:7813
+#: vms-alpha.c:7794
 #, c-format
 msgid " Shareable images:\n"
 msgstr " Images partageables:\n"
 
-#: vms-alpha.c:7817
+#: vms-alpha.c:7798
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
 msgstr "  %u: taille: %u, fanions: 0x%02x, nom: %.*s\n"
 
-#: vms-alpha.c:7824
+#: vms-alpha.c:7805
 #, c-format
 msgid " quad-word relocation fixups:\n"
-msgstr " correctifs du réadressage des quad-mots:\n"
+msgstr " correctifs de relocalisation des quad-mots:\n"
 
-#: vms-alpha.c:7829
+#: vms-alpha.c:7810
 #, c-format
 msgid " long-word relocation fixups:\n"
-msgstr " correctifs du réadressage des mots longs:\n"
+msgstr " correctifs de relocalisation des mots longs:\n"
 
-#: vms-alpha.c:7834
+#: vms-alpha.c:7815
 #, c-format
 msgid " quad-word .address reference fixups:\n"
 msgstr " correctifs des références quad-mots «.address»:\n"
 
-#: vms-alpha.c:7839
+#: vms-alpha.c:7820
 #, c-format
 msgid " long-word .address reference fixups:\n"
 msgstr " correctifs des références mots longs «.address»:\n"
 
-#: vms-alpha.c:7844
+#: vms-alpha.c:7825
 #, c-format
 msgid " Code Address Reference Fixups:\n"
 msgstr " Correctifs des références des adresses de code:\n"
 
-#: vms-alpha.c:7849
+#: vms-alpha.c:7830
 #, c-format
 msgid " Linkage Pairs Referece Fixups:\n"
 msgstr " Correctifs des références des paires de liaison:\n"
 
-#: vms-alpha.c:7858
+#: vms-alpha.c:7839
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr " Changement de protection (%u entrées):\n"
 
-#: vms-alpha.c:7863
+#: vms-alpha.c:7844
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
 msgstr "  base: 0x%08x %08x, taille: 0x%08x, prot: 0x%08x "
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8694
+#: vms-alpha.c:8676
 msgid "%P: relocatable link is not supported\n"
 msgstr "%P: lien relocalisable pas supporté\n"
 
-#: vms-alpha.c:8764
+#: vms-alpha.c:8746
 msgid "%P: multiple entry points: in modules %B and %B\n"
 msgstr "%P: points d'entrée multiples: dans les modules %B et %B\n"
 
@@ -5660,140 +5439,140 @@ msgstr "%s: objet XCOFF partagé alors qu'on ne produit pas de sortie XCOFF"
 msgid "%s: dynamic object with no .loader section"
 msgstr "%s: objet dynamique sans section .loader"
 
-#: xcofflink.c:1416
+#: xcofflink.c:1415
 msgid "%B: `%s' has line numbers but no enclosing section"
 msgstr "%B: «%s» contient des numéros de lignes mais de section d'encadrement"
 
-#: xcofflink.c:1468
+#: xcofflink.c:1467
 msgid "%B: class %d symbol `%s' has no aux entries"
 msgstr "%B: classe %d symbole «%s» n'a pas d'entrée auxiliaire"
 
-#: xcofflink.c:1490
+#: xcofflink.c:1489
 msgid "%B: symbol `%s' has unrecognized csect type %d"
 msgstr "%B: symbole «%s» a un type csect %d non reconnu"
 
-#: xcofflink.c:1502
+#: xcofflink.c:1501
 msgid "%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"
 msgstr "%B: symbole XTY_ER «%s» erroné: classe %d scnum %d scnlen %d"
 
-#: xcofflink.c:1531
+#: xcofflink.c:1530
 msgid "%B: XMC_TC0 symbol `%s' is class %d scnlen %d"
 msgstr "%B: XMC_TC0 symbol «%s» est la classe %d scnlen %d"
 
-#: xcofflink.c:1677
+#: xcofflink.c:1676
 msgid "%B: csect `%s' not in enclosing section"
 msgstr "%B: csect «%s» n'est pas dans un section d'encadrement"
 
-#: xcofflink.c:1784
+#: xcofflink.c:1783
 msgid "%B: misplaced XTY_LD `%s'"
 msgstr "%B: XTY_LD «%s» mal placé"
 
-#: xcofflink.c:2103
+#: xcofflink.c:2102
 msgid "%B: reloc %s:%d not in csect"
 msgstr "%B: relocalisation %s:%d n'est pas dans csect"
 
-#: xcofflink.c:3194
+#: xcofflink.c:3186
 #, c-format
 msgid "%s: no such symbol"
 msgstr "%s: pas de tel symbole"
 
-#: xcofflink.c:3299
+#: xcofflink.c:3291
 #, c-format
 msgid "warning: attempt to export undefined symbol `%s'"
 msgstr "attention: tentative d'exportation d'un symbole non défini «%s»"
 
-#: xcofflink.c:3681
+#: xcofflink.c:3673
 msgid "error: undefined symbol __rtinit"
 msgstr "erreur: symbole __rtinit non défini"
 
-#: xcofflink.c:4060
+#: xcofflink.c:4052
 msgid "%B: loader reloc in unrecognized section `%s'"
 msgstr "%B: chargeur de relocalisation dans une section non reconnnue «%s»"
 
-#: xcofflink.c:4071
+#: xcofflink.c:4063
 msgid "%B: `%s' in loader reloc but not loader sym"
 msgstr "%B: «%s» est dans le chargeur de relocalisation mais pas dans celui des symboles"
 
-#: xcofflink.c:4087
+#: xcofflink.c:4079
 msgid "%B: loader reloc in read-only section %A"
 msgstr "%B: chargeur de relocalisation dans la section %A en lecture seule"
 
-#: xcofflink.c:5109
+#: xcofflink.c:5097
 #, c-format
 msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"
 msgstr "Débordement de la table des entrées: 0x%lx > 0x10000; essayez l'option -mminimal-toc à la compilation"
 
-#: elf32-ia64.c:628 elf64-ia64.c:628
+#: elf32-ia64.c:1110 elf64-ia64.c:1110
 msgid "%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."
 msgstr "%B: Ne peut relâcher br à 0x%lx dans la section «%A». Veuillez utiliser brl ou un branchement indirect."
 
-#: elf32-ia64.c:2290 elf64-ia64.c:2290
+#: elf32-ia64.c:2809 elf64-ia64.c:2809
 msgid "@pltoff reloc against local symbol"
 msgstr "relocalisation @pltoff vers un symbole local"
 
-#: elf32-ia64.c:3693 elf64-ia64.c:3693
+#: elf32-ia64.c:4430 elf64-ia64.c:4430
 #, c-format
 msgid "%s: short data segment overflowed (0x%lx >= 0x400000)"
 msgstr "%s: débordement du segment de données court (0x%lx >= 0x400000)"
 
-#: elf32-ia64.c:3704 elf64-ia64.c:3704
+#: elf32-ia64.c:4441 elf64-ia64.c:4441
 #, c-format
 msgid "%s: __gp does not cover short data segment"
 msgstr "%s: __gp ne couvre pas le segment de données court"
 
-#: elf32-ia64.c:3971 elf64-ia64.c:3971
+#: elf32-ia64.c:4708 elf64-ia64.c:4708
 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
-msgstr "%B: code non pic avec des réadressages imm vers le symbole dynamique « %s »"
+msgstr "%B: code non pic avec des relocalisations imm vers le symbole dynamique «%s»"
 
-#: elf32-ia64.c:4038 elf64-ia64.c:4038
+#: elf32-ia64.c:4775 elf64-ia64.c:4775
 msgid "%B: @gprel relocation against dynamic symbol %s"
-msgstr "%B: réadressage @gprel vers le symbole dynamique %s"
+msgstr "%B: relocalisation @gprel vers le symbole dynamique %s"
 
-#: elf32-ia64.c:4101 elf64-ia64.c:4101
+#: elf32-ia64.c:4838 elf64-ia64.c:4838
 msgid "%B: linking non-pic code in a position independent executable"
 msgstr "%B: liaison de code non-pic dans un exécutable à position indépendante"
 
-#: elf32-ia64.c:4238 elf64-ia64.c:4238
+#: elf32-ia64.c:4975 elf64-ia64.c:4975
 msgid "%B: @internal branch to dynamic symbol %s"
 msgstr "%B: branchement @internal vers le symbole dynamique %s"
 
-#: elf32-ia64.c:4240 elf64-ia64.c:4240
+#: elf32-ia64.c:4977 elf64-ia64.c:4977
 msgid "%B: speculation fixup to dynamic symbol %s"
 msgstr "%B: spéculation d'ajustements vers le symbole dynamique %s"
 
-#: elf32-ia64.c:4242 elf64-ia64.c:4242
+#: elf32-ia64.c:4979 elf64-ia64.c:4979
 msgid "%B: @pcrel relocation against dynamic symbol %s"
-msgstr "%B: réadressage @pcrel vers le symbole dynamique %s"
+msgstr "%B: relocalisation @pcrel vers le symbole dynamique %s"
 
-#: elf32-ia64.c:4439 elf64-ia64.c:4439
+#: elf32-ia64.c:5176 elf64-ia64.c:5176
 msgid "unsupported reloc"
 msgstr "relocalisation non supportée"
 
-#: elf32-ia64.c:4477 elf64-ia64.c:4477
+#: elf32-ia64.c:5214 elf64-ia64.c:5214
 msgid "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."
-msgstr "%B: setion TLS manquante pour le réadressage %s vers « %s » à 0x%lx dans la section « %A »."
+msgstr "%B: setion TLS manquante pour la relocalisation %s vers «%s» à 0x%lx dans la section «%A»."
 
-#: elf32-ia64.c:4492 elf64-ia64.c:4492
+#: elf32-ia64.c:5229 elf64-ia64.c:5229
 msgid "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."
 msgstr "%B:Ne peut pas relâcher br (%s) sur «%s» à 0x%lx dans la section «%A» avec la taille 0x%lx (> 0x1000000)."
 
-#: elf32-ia64.c:4754 elf64-ia64.c:4754
+#: elf32-ia64.c:5491 elf64-ia64.c:5491
 msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
 msgstr "%B: édition de liens trap-on-NULL-dereference avec des fichiers non-trapping"
 
-#: elf32-ia64.c:4763 elf64-ia64.c:4763
+#: elf32-ia64.c:5500 elf64-ia64.c:5500
 msgid "%B: linking big-endian files with little-endian files"
 msgstr "%B: édition de liens entre des fichiers à octets de poids fort et des fichiers à octets de poids faible"
 
-#: elf32-ia64.c:4772 elf64-ia64.c:4772
+#: elf32-ia64.c:5509 elf64-ia64.c:5509
 msgid "%B: linking 64-bit files with 32-bit files"
 msgstr "%B: édition de liens entre fichiers 64 bits et fichiers 32 bits"
 
-#: elf32-ia64.c:4781 elf64-ia64.c:4781
+#: elf32-ia64.c:5518 elf64-ia64.c:5518
 msgid "%B: linking constant-gp files with non-constant-gp files"
 msgstr "%B: édition de liens entre fichiers constant-gp et fichiers non-constant-gp"
 
-#: elf32-ia64.c:4791 elf64-ia64.c:4791
+#: elf32-ia64.c:5528 elf64-ia64.c:5528
 msgid "%B: linking auto-pic files with non-auto-pic files"
 msgstr "%B: édition de liens entre fichiers auto-pic et fichiers non-auto-pic"
 
@@ -5824,7 +5603,7 @@ msgstr "Répertoire de la sécurité"
 
 #: peigen.c:1034 pepigen.c:1034 pex64igen.c:1034
 msgid "Base Relocation Directory [.reloc]"
-msgstr "Répertoire de base du réadressage [.reloc]"
+msgstr "Répertoire de base de relocalisation [.reloc]"
 
 #: peigen.c:1035 pepigen.c:1035 pex64igen.c:1035
 msgid "Debug Directory"
@@ -6125,7 +5904,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Fichier de base des réadressages PE (contenus interprétés de la section .reloc)\n"
+"Fichier de base des relocalisation PE (contenus interprété de la section .reloc)\n"
 
 #: peigen.c:1958 pepigen.c:1958 pex64igen.c:1958
 #, c-format
@@ -6173,22 +5952,10 @@ msgstr "%B: impossible de remplir DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] c
 msgid "%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because .idata$6 is missing"
 msgstr "%B: impossible de remplir DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] car .idata$6 est manquant"
 
-#: peigen.c:2438 pepigen.c:2438 pex64igen.c:2438
+#: peigen.c:2436 pepigen.c:2436 pex64igen.c:2436
 msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing"
 msgstr "%B: impossible de remplir DataDictionary[9] car __tls_used est manquant"
 
-#~ msgid "relocation references a different segment"
-#~ msgstr "la relocalisation fait référence à un segment différent"
-
-#~ msgid "%B: relocation type %d not implemented"
-#~ msgstr "%B: relocalisation de type %d pas implémentée"
-
-#~ msgid "warning: %B and %B differ in position-dependence of data addressing"
-#~ msgstr "attention: %B et %B divergent sur la dépendance de la position de l'adressage des données"
-
-#~ msgid "warning: %B and %B differ in position-dependence of code addressing"
-#~ msgstr "attention: %B et %B divergent sur la dépendance de la position de l'adressage du code"
-
 #~ msgid "Can't Make it a Short Jump"
 #~ msgstr "Impossible d'en faire un Saut Court"
 
diff --git a/bfd/po/ja.po b/bfd/po/ja.po
index 9f3688384e..e746fd3e5f 100644
--- a/bfd/po/ja.po
+++ b/bfd/po/ja.po
@@ -5,26 +5,17 @@
 # Yasuaki Taniguchi <yasuakit@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: bfd 2.21.53\n"
+"Project-Id-Version: bfd 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:25+0100\n"
-"PO-Revision-Date: 2011-10-23 16:09+0900\n"
+"POT-Creation-Date: 2010-11-05 11:31+0100\n"
+"PO-Revision-Date: 2010-11-23 22:18+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nulurals=1; plural=0;\n"
 
-# BFD 内�利用�れる書�文字列����� bfd/bfd.c を�照������。
-# BFD �書�文字列���置パラメータ (%1$A, %2$B 等) �使用出�����注�������。
-# フラグ� c-format ������も�%A, %B �内部�利用�れ��る書�変��
-# �置�変更��る場���り��。
-# C 標準�書�文字��使用�れ��る場��も _bfd_default_error_handler() �仕様変更���より
-# 動作����る場���る���置パラメータを使用�����を推奨���。
-#     - 2010/12/27 binutils-2.20.90 �書�文字列��置パラメータ�動作�����を確� (谷�)
-#
 #: aout-adobe.c:127
 msgid "%B: Unknown section type in a.out.adobe file: %x\n"
 msgstr "%B: a.out.adobe ファイル��明�セクション型��り��: %x\n"
@@ -52,132 +43,132 @@ msgstr "%s: a.out オブジェクトファイル形���セクション `%s'
 msgid "%s: can not represent section for symbol `%s' in a.out object file format"
 msgstr "%s: a.out オブジェクトファイル形���シンボル `%s' 用�セクションを表�����ん"
 
-#: aoutx.h:1579 vms-alpha.c:7668
+#: aoutx.h:1579 vms-alpha.c:7649
 msgid "*unknown*"
 msgstr "*�明*"
 
-#: aoutx.h:4017 aoutx.h:4343
+#: aoutx.h:4007 aoutx.h:4333
 msgid "%P: %B: unexpected relocation type\n"
 msgstr "%P: %B: 予期�����置タイプ��\n"
 
-#: aoutx.h:5374
+#: aoutx.h:5364
 #, c-format
 msgid "%s: relocatable link from %s to %s not supported"
 msgstr "%s: %s �ら %s ����置�能リンク�サ�ート�れ����ん"
 
-#: archive.c:2194
+#: archive.c:2125
 msgid "Warning: writing archive was slow: rewriting timestamp\n"
 msgstr "警告: 書庫��書�込���れ���: タイムスタンプを書�����\n"
 
-#: archive.c:2482
+#: archive.c:2416
 msgid "Reading archive file mod timestamp"
 msgstr "書庫ファイル�更新日時を読�込ん����"
 
-#: archive.c:2506
+#: archive.c:2440
 msgid "Writing updated armap timestamp"
 msgstr "更新�れ� armap 日時を書�込�中��"
 
-#: bfd.c:398
+#: bfd.c:395
 msgid "No error"
 msgstr "エラー��り��ん"
 
-#: bfd.c:399
+#: bfd.c:396
 msgid "System call error"
 msgstr "システムコールエラー"
 
-#: bfd.c:400
+#: bfd.c:397
 msgid "Invalid bfd target"
 msgstr "無効� bfd ターゲット��"
 
-#: bfd.c:401
+#: bfd.c:398
 msgid "File in wrong format"
 msgstr "誤��形��ファイル��"
 
-#: bfd.c:402
+#: bfd.c:399
 msgid "Archive object file in wrong format"
 msgstr "誤��形��オブジェクトファイル書庫��"
 
-#: bfd.c:403
+#: bfd.c:400
 msgid "Invalid operation"
 msgstr "無効��作��"
 
-#: bfd.c:404
+#: bfd.c:401
 msgid "Memory exhausted"
 msgstr "メモリを使�果�����"
 
-#: bfd.c:405
+#: bfd.c:402
 msgid "No symbols"
 msgstr "シンボル��り��ん"
 
-#: bfd.c:406
+#: bfd.c:403
 msgid "Archive has no index; run ranlib to add one"
 msgstr "書庫�索引��り��ん。追加�る��� ranlib を実行������"
 
-#: bfd.c:407
+#: bfd.c:404
 msgid "No more archived files"
 msgstr "�れ以上書庫ファイル��り��ん"
 
-#: bfd.c:408
+#: bfd.c:405
 msgid "Malformed archive"
 msgstr "�正�形��書庫��"
 
-#: bfd.c:409
+#: bfd.c:406
 msgid "File format not recognized"
 msgstr "ファイル形���識����ん"
 
-#: bfd.c:410
+#: bfd.c:407
 msgid "File format is ambiguous"
 msgstr "ファイル形��曖昧��"
 
-#: bfd.c:411
+#: bfd.c:408
 msgid "Section has no contents"
 msgstr "セクション�内容��り��ん"
 
-#: bfd.c:412
+#: bfd.c:409
 msgid "Nonrepresentable section on output"
 msgstr "出力�対応�るセクション��り��ん"
 
-#: bfd.c:413
+#: bfd.c:410
 msgid "Symbol needs debug section which does not exist"
 msgstr "存在�����デ�ッグセクションをシンボル�必�������"
 
-#: bfd.c:414
+#: bfd.c:411
 msgid "Bad value"
 msgstr "�正�値��"
 
-#: bfd.c:415
+#: bfd.c:412
 msgid "File truncated"
 msgstr "ファイル�途切れ����"
 
-#: bfd.c:416
+#: bfd.c:413
 msgid "File too big"
 msgstr "ファイル�大�����"
 
-#: bfd.c:417
+#: bfd.c:414
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "%s を読�込�中�エラー�発生����: %s"
 
-#: bfd.c:418
+#: bfd.c:415
 msgid "#<Invalid error code>"
-msgstr "#<無効�エラーコード>"
+msgstr "#<��切�エラーコード>"
 
-#: bfd.c:945
+#: bfd.c:939
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr "BFD %s アサーション失敗 %s:%d"
 
-#: bfd.c:957
+#: bfd.c:951
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d in %s\n"
-msgstr "BFD %s 内部エラー。�置 %s�行 %d�%s 内�中止����\n"
+msgstr "BFD %1$s 内部エラー。 %4$s 内 %3$d 行 %2$s �中止����\n"
 
-#: bfd.c:961
+#: bfd.c:955
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d\n"
-msgstr "BFD %s 内部エラー。�置 %s�行 %d �中止����\n"
+msgstr "BFD %1$s 内部エラー。%3$d 行 %2$s �中止����\n"
 
-#: bfd.c:963
+#: bfd.c:957
 msgid "Please report this bug.\n"
 msgstr "���グを報告������。\n"
 
@@ -196,9 +187,9 @@ msgstr "マップ���ん: 環境変数�設定�れ����ん\n"
 msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
 msgstr "警告: セクション `%s' �巨大� (例: 負数) ファイルオフセット 0x%lx ��書�込���"
 
-#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731
-#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360
-#: elf64-ia64.c:360
+#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1640 elf32-frv.c:5740
+#: elfxx-sparc.c:2795 reloc.c:5646 reloc16.c:162 elf32-ia64.c:842
+#: elf64-ia64.c:842
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr "%P%F: --relax �よ� -r ��時�使用����ん\n"
 
@@ -234,22 +225,22 @@ msgstr "%B: サ�ート�れ������置��: ALPHA_R_GPRELHIGH"
 msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
 msgstr "%B: サ�ート�れ������置��: ALPHA_R_GPRELLOW"
 
-#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228
-#: elf32-ia64.c:3845 elf64-ia64.c:3845
+#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:3991 elf64-alpha.c:4140
+#: elf32-ia64.c:4582 elf64-ia64.c:4582
 msgid "%B: unknown relocation type %d"
 msgstr "%B: �明���置型 %d ��"
 
 #: coff-arm.c:1038
 #, c-format
 msgid "%B: unable to find THUMB glue '%s' for `%s'"
-msgstr "%B: Thumb 糊 '%s' (`%s' 用) �見��り��ん"
+msgstr "%1$B: `%3$s' �対�る Thumb 糊 '%2$s' �見��り��ん"
 
 #: coff-arm.c:1067
 #, c-format
 msgid "%B: unable to find ARM glue '%s' for `%s'"
-msgstr "%B: ARM 糊 '%s' (`%s' 用) �見��り��ん"
+msgstr "%1$B: `%3$s' �対�る ARM 糊 '%2$s' �見��り��ん"
 
-#: coff-arm.c:1369 elf32-arm.c:6980
+#: coff-arm.c:1369 elf32-arm.c:6501
 #, c-format
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
@@ -269,9 +260,9 @@ msgstr ""
 "  最��出�箇所: %B: ARM を呼�出� Thumb 命令\n"
 "  --support-old-code を有効����リンク�る��を検討������"
 
-#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3081
+#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3043
 msgid "%B: bad reloc address 0x%lx in section `%A'"
-msgstr "%B: 誤����置アドレス 0x%lx �セクション `%A' 内��り��"
+msgstr "%1$B: セクション `%3$A' 内�誤����置アドレス 0x%2$lx ��り��"
 
 #: coff-arm.c:2079
 msgid "%B: illegal symbol index in reloc: %d"
@@ -282,12 +273,12 @@ msgstr "%B: ��置内�シンボル索引��正��: %d"
 msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
 msgstr "エラー: %B � APCS-%d �対��コンパイル�れ��る�も���ら�� %B � APCS-%d �対��コンパイル�れ����"
 
-#: coff-arm.c:2226 elf32-arm.c:15580
+#: coff-arm.c:2226 elf32-arm.c:14105
 #, c-format
 msgid "error: %B passes floats in float registers, whereas %B passes them in integer registers"
 msgstr "エラー: %B �浮動�数を浮動�数レジスタ�渡���る�も���ら�� %B �浮動�数を整数レジスタ�渡�����"
 
-#: coff-arm.c:2229 elf32-arm.c:15584
+#: coff-arm.c:2229 elf32-arm.c:14109
 #, c-format
 msgid "error: %B passes floats in integer registers, whereas %B passes them in float registers"
 msgstr "エラー: %B �浮動�数を整数レジスタ�渡���る�も���ら�� %B �浮動�数を浮動�数レジスタ�渡�����"
@@ -302,12 +293,12 @@ msgstr "エラー: %B ã�¯ä½�ç½®é�žä¾�存コードã�¨ã�—ã�¦ã‚³ãƒ³ãƒ‘イルã�•ã‚Œã
 msgid "error: %B is compiled as absolute position code, whereas target %B is position independent"
 msgstr "エラー: %B �絶対�置コード���コンパイル�れ��る�も���ら��ターゲット %B ��置��存コード�������"
 
-#: coff-arm.c:2274 elf32-arm.c:15649
+#: coff-arm.c:2274 elf32-arm.c:14174
 #, c-format
 msgid "Warning: %B supports interworking, whereas %B does not"
 msgstr "警告: %B � ARM/Thumb 命令相互利用をサ�ート���る�も���ら�� %B �サ�ート�����ん"
 
-#: coff-arm.c:2277 elf32-arm.c:15655
+#: coff-arm.c:2277 elf32-arm.c:14180
 #, c-format
 msgid "Warning: %B does not support interworking, whereas %B does"
 msgstr "警告: %B � ARM/Thumb 命令相互利用をサ�ート������も���ら�� %B �サ�ート�����"
@@ -317,7 +308,7 @@ msgstr "警告: %B ã�¯ ARM/Thumb 命令相互利用をサãƒ�ートã�—ã�¦ã�„ã�ªã�
 msgid "private flags = %x:"
 msgstr "private フラグ = %x:"
 
-#: coff-arm.c:2309 elf32-arm.c:11752
+#: coff-arm.c:2309 elf32-arm.c:10492
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr " [浮動�数�浮動�数レジスタ�渡�れ���]"
@@ -327,7 +318,7 @@ msgstr " [浮動�数�浮動�数レジスタ�渡�れ���]"
 msgid " [floats passed in integer registers]"
 msgstr " [浮動�数�整数レジスタ�渡�れ���]"
 
-#: coff-arm.c:2314 elf32-arm.c:11755
+#: coff-arm.c:2314 elf32-arm.c:10495
 #, c-format
 msgid " [position independent]"
 msgstr " [�置��存]"
@@ -352,12 +343,12 @@ msgstr " [ARM/Thumb 命令相互利用�サ�ート�れ����]"
 msgid " [interworking not supported]"
 msgstr " [ARM/Thumb 命令相互利用�サ�ート�れ����ん]"
 
-#: coff-arm.c:2370 elf32-arm.c:10787
+#: coff-arm.c:2370 elf32-arm.c:9520
 #, c-format
 msgid "Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"
 msgstr "警告: ARM/Thumb 命令相互利用を���よ��既�指定�れ��る��� %B � ARM/Thumb 命令相互利用フラグを設定���ん"
 
-#: coff-arm.c:2374 elf32-arm.c:10791
+#: coff-arm.c:2374 elf32-arm.c:9524
 #, c-format
 msgid "Warning: Clearing the interworking flag of %B due to outside request"
 msgstr "警告: �求外��� %s � ARM/Thumb 命令相互利用フラグをクリア���"
@@ -369,10 +360,10 @@ msgstr "%s 出力を利用ã�—ã�¦ã�„る時ã�«ã�¯ R_MEM_INDIRECT å†�é…�置を扱ã�
 
 #: coff-i860.c:147
 #, c-format
-msgid "relocation `%s' not yet implemented"
-msgstr "��置 `%s' ���実装�れ����ん"
+msgid "Relocation `%s' not yet implemented\n"
+msgstr "��置 `%s' ���実装�れ����ん\n"
 
-#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192
+#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5147
 msgid "%B: warning: illegal symbol index %ld in relocs"
 msgstr "%B: 警告: �正�シンボル索引 %ld ���置領域内��り��"
 
@@ -380,7 +371,7 @@ msgstr "%B: 警告: ä¸�æ­£ã�ªã‚·ãƒ³ãƒœãƒ«ç´¢å¼• %ld ã�Œå†�é…�置領域内ã�«ã�‚ã
 msgid "uncertain calling convention for non-COFF symbol"
 msgstr "� COFF シンボル�対�る呼�出��約��確定��"
 
-#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677
+#: coff-m68k.c:506 elf32-bfin.c:5678 elf32-cr16.c:2897 elf32-m68k.c:4672
 msgid "unsupported reloc type"
 msgstr "サ�ート�れ������置型��"
 
@@ -393,25 +384,20 @@ msgstr "GP 関連���置� _gp �未定義�時点��れ���"
 msgid "Unrecognized reloc"
 msgstr "�識������置��"
 
-#: coff-rs6000.c:2676
+#: coff-rs6000.c:2794
 #, c-format
 msgid "%s: unsupported relocation type 0x%02x"
 msgstr "%s: ��置型 0x%02x �サ�ート�れ����ん"
 
-#: coff-rs6000.c:2761
+#: coff-rs6000.c:2887
 #, c-format
 msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"
 msgstr "%s: TOC ��置(0x%x, シンボル `%s') � TOC エントリ��り��ん"
 
-#: coff-rs6000.c:3512 coff64-rs6000.c:2111
+#: coff-rs6000.c:3652 coff64-rs6000.c:2175
 msgid "%B: symbol `%s' has unrecognized smclas %d"
 msgstr "%B: シンボル `%s' ��識���� smclas %d を������"
 
-#: coff-sh.c:521
-#, c-format
-msgid "SH Error: unknown reloc type %d"
-msgstr "SH エラー: �明���置型 %d ��"
-
 #: coff-tic4x.c:195 coff-tic54x.c:299 coff-tic80.c:458
 #, c-format
 msgid "Unrecognized reloc type 0x%x"
@@ -427,84 +413,80 @@ msgstr "%s: 警告: ä¸�æ­£ã�ªã‚·ãƒ³ãƒœãƒ«ç´¢å¼• %ld ã�Œå†�é…�置領域内ã�«ã�‚ã
 msgid "ignoring reloc %s\n"
 msgstr "��置 %s を無視�����\n"
 
-#: coffcode.h:991
+#: coffcode.h:973
 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr "%B: 警告: COMDAT シンボル '%s' �セクション� '%s' ������ん"
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1215
+#: coffcode.h:1197
 msgid "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
 msgstr "%B: 警告: セクション %s 内� IMAGE_SCN_MEM_NOT_PAGED セクションフラグを無視�����"
 
-#: coffcode.h:1282
+#: coffcode.h:1264
 msgid "%B (%s): Section flag %s (0x%x) ignored"
 msgstr "%B (%s): セクションフラグ %s (0x%x) を無視����"
 
-#: coffcode.h:2424
+#: coffcode.h:2390
 #, c-format
 msgid "Unrecognized TI COFF target id '0x%x'"
 msgstr "TI COFF ターゲット id '0x%x' を�識����ん"
 
-#: coffcode.h:2738
+#: coffcode.h:2704
 msgid "%B: reloc against a non-existant symbol index: %ld"
 msgstr "%B: 存在���シンボル索引�対�る��置��: %ld"
 
-#: coffcode.h:3296
+#: coffcode.h:3262
 msgid "%B: too many sections (%d)"
 msgstr "%B: セクション�多���� (%d)"
 
-#: coffcode.h:3712
+#: coffcode.h:3676
 msgid "%B: section %s: string table overflow at offset %ld"
 msgstr "%B: セクション %s: オフセット %ld �文字列表�溢れ���"
 
-#: coffcode.h:4517
+#: coffcode.h:4481
 msgid "%B: warning: line number table read failed"
 msgstr "%B: 警告: 行番�表�読�込��失敗����"
 
-#: coffcode.h:4547
+#: coffcode.h:4511
 msgid "%B: warning: illegal symbol index %ld in line numbers"
 msgstr "%B: 警告: 無効�シンボル索引 %ld �行番�中��り��"
 
-#: coffcode.h:4561
+#: coffcode.h:4525
 msgid "%B: warning: duplicate line number information for `%s'"
 msgstr "%B: 警告: `%s' �対�る行番�情報��複�����"
 
-#: coffcode.h:4961
+#: coffcode.h:4916
 msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
-msgstr "%B:  �識����記憶域クラス %d (%s シンボル `%s' 用) ��"
+msgstr "%1$B: %3$s シンボル `%4$s' �対�る�識����記憶域クラス %2$d ��"
 
-#: coffcode.h:5087
+#: coffcode.h:5042
 msgid "warning: %B: local symbol `%s' has no section"
 msgstr "警告: %B: 局所シンボル `%s' �セクションを������ん"
 
-#: coffcode.h:5231
+#: coffcode.h:5186
 msgid "%B: illegal relocation type %d at address 0x%lx"
 msgstr "%B: �正���置型 %d �アドレス 0x%lx ��り��"
 
-#: coffgen.c:1578
+#: coffgen.c:1573
 msgid "%B: bad string table size %lu"
 msgstr "%s: 文字列表サイズ %lu �誤�����"
 
-#: cofflink.c:533 elflink.c:4353
+#: cofflink.c:524 elflink.c:4339
 msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
-msgstr "警告: シンボル `%s' �型� %d �ら %d � %B 内�変更�れ���"
+msgstr "警告: %4$B 内�シンボル `%1$s' �型� %2$d �ら %3$d �変更�れ���"
 
-#: cofflink.c:2330
+#: cofflink.c:2321
 msgid "%B: relocs in section `%A', but it has no contents"
 msgstr "%B: セクション `%A' ���置領域��り����中身��り��ん"
 
-#: cofflink.c:2392 elflink.c:9554
-msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
-msgstr "%X`%s' � `%A' セクション (%B 内) ��照�れ��るも�: 破棄�れ�セクション `%A' (%B 内) �定義�れ����\n"
-
-#: cofflink.c:2690 coffswap.h:826
+#: cofflink.c:2652 coffswap.h:826
 #, c-format
 msgid "%s: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr "%s: %s: ��置領域�溢れ���: 0x%lx > 0xffff"
 
-#: cofflink.c:2699 coffswap.h:812
+#: cofflink.c:2661 coffswap.h:812
 #, c-format
 msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr "%s: 警告: %s: 行番��溢れ���: 0x%lx > 0xffff"
@@ -516,7 +498,7 @@ msgstr "エラー: %B ã�¯ EP9312 ã�«å¯¾ã�—ã�¦ã‚³ãƒ³ãƒ‘イルã�•ã‚Œã�¦ã�„ã‚‹ã�«ã‚
 #: cpu-arm.c:333
 #, c-format
 msgid "warning: unable to update contents of %s section in %s"
-msgstr "警告: %s セクション (%s 内) �内容を更新����ん"
+msgstr "警告: %2$s 内��る %1$s セクション�内容を更新����ん"
 
 #: dwarf2.c:490
 #, c-format
@@ -550,22 +532,22 @@ msgstr "Dwarf エラー: 無効�命令���最大�作数��。"
 msgid "Dwarf Error: mangled line number section."
 msgstr "Dwarf エラー: 行番�セクション�変形�れ���。"
 
-#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383
+#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2382
 #, c-format
 msgid "Dwarf Error: Could not find abbrev number %u."
 msgstr "Dwarf エラー: abbrev 番� %u �見��り��ん���。"
 
-#: dwarf2.c:2344
+#: dwarf2.c:2343
 #, c-format
 msgid "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 and 4 information."
 msgstr "Dwarf エラー: dwarf �ージョン '%u' �見��り�������処�系��ージョン 2, 3 �よ� 4 �情報��読�込���ん。"
 
-#: dwarf2.c:2351
+#: dwarf2.c:2350
 #, c-format
 msgid "Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."
 msgstr "Dwarf エラー: アドレスサイズ '%u' �見��り�������処�系�サイズ '%u' より大��サイズを扱���ん。"
 
-#: dwarf2.c:2374
+#: dwarf2.c:2373
 #, c-format
 msgid "Dwarf Error: Bad abbrev number: %u."
 msgstr "Dwarf エラー: �正� abbrev 番���: %u"
@@ -663,34 +645,30 @@ msgstr "%P: %B(%A) 内ã�«ã‚¨ãƒ©ãƒ¼ã�Œç™ºç”Ÿã�—ã�¾ã�—ã�Ÿã€‚.eh_frame_hdr 表ã�¯ä½
 msgid "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
 msgstr "%P: %B(%A) 内� fde エンコード� .eh_frame_hdr 表�作�を阻害���。\n"
 
-#: elf-eh-frame.c:1583
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
-msgstr "%P: ��アーキテク�ャ用�� DW_EH_PE_datarel �指定�れ����ん\n"
-
 #: elf-ifunc.c:179
 msgid "%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can not be used when making an executable; recompile with -fPIE and relink with -pie\n"
-msgstr "%F%P: �インタ�等��動的 STT_GNU_IFUNC シンボル `%s' (`%B' 内) �実行ファイルを作��る時�使用����ん。-fPIE を付���コンパイル��後�-pie を付��リンク������\n"
+msgstr ""
 
-#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209
+#: elf-m10200.c:450 elf-m10300.c:1560 elf32-avr.c:1263 elf32-bfin.c:3193
 #: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922
-#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509
+#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4111 elf32-h8300.c:509
 #: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168
-#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535
+#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:534
 #: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395
 #: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540
 #: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522
 msgid "internal error: out of range error"
 msgstr "内部エラー: 範囲外エラー��"
 
-#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213
+#: elf-m10200.c:454 elf-m10300.c:1564 elf32-avr.c:1267 elf32-bfin.c:3197
 #: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926
-#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513
+#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4115 elf32-h8300.c:513
 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557
-#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539
+#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:538
 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490
 #: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544
 #: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526
-#: elfxx-mips.c:9193
+#: elfxx-mips.c:9186
 msgid "internal error: unsupported relocation error"
 msgstr "内部エラー: 未サ�ート���置エラー"
 
@@ -701,47 +679,44 @@ msgstr "内部エラー: 未サ�ート���置エラー"
 msgid "internal error: dangerous error"
 msgstr "内部エラー: �険�エラー"
 
-#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221
+#: elf-m10200.c:462 elf-m10300.c:1577 elf32-avr.c:1275 elf32-bfin.c:3205
 #: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934
-#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521
+#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4123 elf32-h8300.c:521
 #: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180
-#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547
+#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:546
 #: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403
 #: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552
 #: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534
 msgid "internal error: unknown error"
 msgstr "内部エラー: �明�エラー"
 
-#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604
-#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067
-#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807
+#: elf-m10300.c:1504 elf32-arm.c:9098 elf32-i386.c:4081 elf32-m32r.c:2604
+#: elf32-m68k.c:4156 elf32-ppc.c:8089 elf32-s390.c:3010 elf32-sh.c:4223
+#: elf32-xtensa.c:3067 elf64-ppc.c:13115 elf64-s390.c:2985 elf64-sh64.c:1636
+#: elf64-x86-64.c:3719 elfxx-sparc.c:3806
 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"
-msgstr "%B(%A+0x%lx): 解決���� %s ��置 (シンボル `%s' �対�る) ��"
+msgstr "%1$B(%2$A+0x%3$lx): シンボル `%5$s' �対�る解決���� %4$s ��置��"
 
-#: elf-m10300.c:1580
+#: elf-m10300.c:1569
 msgid "error: inappropriate relocation type for shared library (did you forget -fpic?)"
 msgstr "エラー: 共有ライブラリ�対�る��切���置型�� (-fpic を忘れ����ん�?)"
 
-#: elf-m10300.c:1583
-msgid "%B: error: taking the address of protected function '%s' cannot be done when making a shared library"
-msgstr "%B: エラー: �護�れ�関数 '%s' �アドレス�共有ライブラリ作�時���得����ん"
-
-#: elf-m10300.c:1586
+#: elf-m10300.c:1572
 msgid "internal error: suspicious relocation type used in shared library"
 msgstr "内部エラー: 共有ライブラリ内�疑��残る��置型�使用�れ����"
 
-#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044
-#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868
-#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931
-#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377
-#: elf64-x86-64.c:1985 elfxx-sparc.c:2104
+#: elf-m10300.c:4372 elf32-arm.c:11392 elf32-cr16.c:2451 elf32-cris.c:3044
+#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2036 elf32-lm32.c:1868
+#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-ppc.c:4994 elf32-s390.c:1652
+#: elf32-sh.c:2931 elf32-vax.c:1040 elf64-ppc.c:6483 elf64-s390.c:1635
+#: elf64-sh64.c:3377 elf64-x86-64.c:1871 elfxx-sparc.c:2104
 #, c-format
 msgid "dynamic variable `%s' is zero size"
 msgstr "動的変数 `%s' �サイズ� 0 ��"
 
 #: elf.c:334
 msgid "%B: invalid string offset %u >= %lu for section `%s'"
-msgstr "%B: 無効�文字列オフセット %u >= %lu (セクション `%s' 用) ��"
+msgstr "%1$B: `%4$s' �対�る無効�文字列オフセット %2$u >= %3$lu ��"
 
 #: elf.c:446
 msgid "%B symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
@@ -759,27 +734,27 @@ msgstr "%B: 無効� SHT_GROUP エントリ��"
 msgid "%B: no group info for section %A"
 msgstr "%B: セクション %A �グループ情報��り��ん"
 
-#: elf.c:737 elf.c:3121 elflink.c:10144
+#: elf.c:737 elf.c:3090 elflink.c:10062
 msgid "%B: warning: sh_link not set for section `%A'"
 msgstr "%B: 警告: セクション `%A' �対�る sh_link �設定�れ����ん"
 
 #: elf.c:756
 msgid "%B: sh_link [%d] in section `%A' is incorrect"
-msgstr "%B: sh_link [%d] (セクション `%A' 内) �誤り��り��"
+msgstr "%1$B: セクション `%2$A' 内� sh_link [%d] �誤り��り��"
 
 #: elf.c:791
 msgid "%B: unknown [%d] section `%s' in group [%s]"
-msgstr "%B: �明� [%d] セクション `%s' �グループ [%s] 内��り�� "
+msgstr "%1$B: グループ [%4$s] 内��明� [%2$d] セクション `%3$s' ��り��"
 
 #: elf.c:1041
 msgid "%B: unable to initialize commpress status for section %s"
 msgstr "%B: セクション %s �対�る圧縮状態を�期化����ん"
 
-#: elf.c:1061
+#: elf.c:1050
 msgid "%B: unable to initialize decommpress status for section %s"
 msgstr "%B: セクション %s �対�る伸張状態を�期化����ん"
 
-#: elf.c:1181
+#: elf.c:1158
 #, c-format
 msgid ""
 "\n"
@@ -788,7 +763,7 @@ msgstr ""
 "\n"
 "プログラムヘッダ:\n"
 
-#: elf.c:1223
+#: elf.c:1200
 #, c-format
 msgid ""
 "\n"
@@ -797,7 +772,7 @@ msgstr ""
 "\n"
 "動的セクション:\n"
 
-#: elf.c:1359
+#: elf.c:1336
 #, c-format
 msgid ""
 "\n"
@@ -806,7 +781,7 @@ msgstr ""
 "\n"
 "�ージョン定義:\n"
 
-#: elf.c:1384
+#: elf.c:1361
 #, c-format
 msgid ""
 "\n"
@@ -815,82 +790,82 @@ msgstr ""
 "\n"
 "�ージョン�照:\n"
 
-#: elf.c:1389
+#: elf.c:1366
 #, c-format
 msgid "  required from %s:\n"
 msgstr "  %s �ら��求:\n"
 
-#: elf.c:1796
+#: elf.c:1773
 msgid "%B: invalid link %lu for reloc section %s (index %u)"
-msgstr "%B: 無効�リンク %lu (��置セクション %s 用) �� (索引 %u)"
+msgstr "%1$B: ��置セクション %3$s �対�る無効�リンク %2$lu �� (索引 %4$u)"
 
-#: elf.c:1966
+#: elf.c:1943
 msgid "%B: don't know how to handle allocated, application specific section `%s' [0x%8x]"
 msgstr "%B: 割り当�済��アプリケーション固有�セクション `%s' [0x%8x] を扱�方法�分�り��ん"
 
-#: elf.c:1978
+#: elf.c:1955
 msgid "%B: don't know how to handle processor specific section `%s' [0x%8x]"
 msgstr "%B: プロセッサ固有�セクション `%s' [0x%8x] を扱�方法�分�り��ん"
 
-#: elf.c:1989
+#: elf.c:1966
 msgid "%B: don't know how to handle OS specific section `%s' [0x%8x]"
 msgstr "%B: OS 固有�セクション `%s' [0x%8x] を扱�方法�分�り��ん"
 
-#: elf.c:1999
+#: elf.c:1976
 msgid "%B: don't know how to handle section `%s' [0x%8x]"
 msgstr "%B: セクション `%s' [0x%8x] を扱�方法�分�り��ん"
 
-#: elf.c:2634
+#: elf.c:2603
 #, c-format
 msgid "warning: section `%A' type changed to PROGBITS"
 msgstr "警告: セクション `%A' �型� PROGBITS �変更�れ���"
 
-#: elf.c:3078
+#: elf.c:3047
 msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
-msgstr "%B: セクション `%A' � sh_link �破棄�れ�セクション `%A' (`%B' 内) を指�����"
+msgstr "%1$B: セクション `%2$A' � sh_link � `%4$B' �破棄�れ�セクション `%3$A' を指�����"
 
-#: elf.c:3101
+#: elf.c:3070
 msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
-msgstr "%B: セクション `%A' � sh_link � 削除�れ�セクション `%A' (`%B' 内) を指����� "
+msgstr "%1$B: セクション `%2$A' � sh_link � `%4$B' �削除�れ�セクション `%3$A' を指�����"
 
-#: elf.c:4527
+#: elf.c:4480
 msgid "%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr "%B: PT_DYNAMIC セグメント�最��セクション� .dynamic セクション���り��ん"
 
-#: elf.c:4554
+#: elf.c:4507
 msgid "%B: Not enough room for program headers, try linking with -N"
 msgstr "%B: プログラムヘッダ用�空間���分��。-N を付��リンク��������"
 
-#: elf.c:4641
+#: elf.c:4594
 msgid "%B: section %A lma %#lx adjusted to %#lx"
-msgstr "%B: セクション %A � lma %#lx � %#lx �調節�れ���"
+msgstr ""
 
-#: elf.c:4774
+#: elf.c:4713
 msgid "%B: section `%A' can't be allocated in segment %d"
 msgstr "%B: セクション `%A' をセグメント %d 内�割り当�る�������ん"
 
-#: elf.c:4822
+#: elf.c:4761
 msgid "%B: warning: allocated section `%s' not in segment"
 msgstr "%B: 警告: 割り当�済��セクション `%s' �セグメント内��り��ん"
 
-#: elf.c:5322
+#: elf.c:5257
 msgid "%B: symbol `%s' required but not present"
 msgstr "%B: シンボル `%s' ��求�れ����存在���ん"
 
-#: elf.c:5660
+#: elf.c:5595
 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n"
 msgstr "%B: 警告: 空�ロード�能セグメント�検出�れ���。�れ��図��も����?\n"
 
-#: elf.c:6688
-#, c-format
+#: elf.c:6622
+#, fuzzy, c-format
 msgid "Unable to find equivalent output section for symbol '%s' from section '%s'"
-msgstr "シンボル '%s' 用�等価�出力セクションをセクション '%s' �ら見��る���出���ん"
+msgstr "%s: 出力セクション %s (入力セクション %s 用) を見��られ��ん"
 
-#: elf.c:7684
+#: elf.c:7611
 msgid "%B: unsupported relocation type %s"
 msgstr "%B: サ�ート�れ������置型 %s ��"
 
-#: elf32-arm.c:3590
+#: elf32-arm.c:3183
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: Thumb call to ARM"
@@ -898,7 +873,7 @@ msgstr ""
 "%B(%s): 警告: ARM/Thumb 命令相互利用�有効���り��ん\n"
 "  最��出�箇所: %B: ARM を呼�出� Thumb 命令"
 
-#: elf32-arm.c:3637
+#: elf32-arm.c:3226
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: ARM call to Thumb"
@@ -906,40 +881,40 @@ msgstr ""
 "%B(%s):  警告: ARM/Thumb 命令相互利用�有効���り��ん\n"
 "  最��出�箇所: %B: Thumb を呼�出� ARM 命令"
 
-#: elf32-arm.c:3849 elf32-arm.c:5286
+#: elf32-arm.c:3432 elf32-arm.c:4807
 #, c-format
 msgid "%s: cannot create stub entry %s"
 msgstr "%s: スタブエントリ %s を作�����ん"
 
-#: elf32-arm.c:5402
+#: elf32-arm.c:4923
 #, c-format
 msgid "unable to find THUMB glue '%s' for '%s'"
-msgstr "Thumb 糊 '%s' ('%s' 用) �見��り��ん"
+msgstr "'%2$s' �対�る Thumb 糊 '%1$s' �見��り��ん"
 
-#: elf32-arm.c:5438
+#: elf32-arm.c:4959
 #, c-format
 msgid "unable to find ARM glue '%s' for '%s'"
-msgstr "ARM 糊 '%s' ('%s' 用) �見��り��ん"
+msgstr "'%2$s' �対�る  ARM 糊 '%1$s' �見��り��ん"
 
-#: elf32-arm.c:5964
+#: elf32-arm.c:5485
 msgid "%B: BE8 images only valid in big-endian mode."
 msgstr "%B: BE8 イメージ�ビッグエンディアンモード���有効��"
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:6194
+#: elf32-arm.c:5715
 msgid "%B: warning: selected VFP11 erratum workaround is not necessary for target architecture"
-msgstr "%B: 警告: �択�れ� VFP11 エラッタ回��ターゲットアーキテク�ャ��必����り��ん"
+msgstr ""
 
-#: elf32-arm.c:6738 elf32-arm.c:6758
+#: elf32-arm.c:6259 elf32-arm.c:6279
 msgid "%B: unable to find VFP11 veneer `%s'"
 msgstr ""
 
-#: elf32-arm.c:6806
+#: elf32-arm.c:6327
 #, c-format
 msgid "Invalid TARGET2 relocation type '%s'."
 msgstr "無効� TARGET2 ��置型 '%s' ��。"
 
-#: elf32-arm.c:6890
+#: elf32-arm.c:6411
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: thumb call to arm"
@@ -947,479 +922,451 @@ msgstr ""
 "%B(%s):  警告: ARM/Thumb 命令相互利用�有効���り��ん\n"
 "  最��出�箇所: %B: ARM を呼�出� Thumb 命令"
 
-#: elf32-arm.c:7674
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx): TLS トラン�リン内�予期��� Thumb 命令 '0x%x' ��り��"
-
-#: elf32-arm.c:7713
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx): TLS トラン�リン内�予期��� ARM 命令 '0x%x' ��り��"
-
-#: elf32-arm.c:8166
+#: elf32-arm.c:7130
 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'."
 msgstr "\\%B: 警告: ARM � BLX 命令� ARM 関数 '%s' を指�����。"
 
-#: elf32-arm.c:8575
+#: elf32-arm.c:7541
 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
 msgstr "%B: 警告: Thumb � BLX 命令� Thumb 関数 '%s' を指�����。"
 
-#: elf32-arm.c:9408
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx): 予期��� Thumb 命令 '0x%x' � TLS_GOTDESC �よ���照�れ����"
-
-#: elf32-arm.c:9431
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx): 予期��� ARM 命令 '0x%x' � TLS_GOTDESC �よ���照�れ����"
-
-#: elf32-arm.c:9460
+#: elf32-arm.c:8223
 msgid "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"
 msgstr "%B(%A+0x%lx): R_ARM_TLS_LE32 ��置�共有オブジェクト内��許��れ����ん"
 
-#: elf32-arm.c:9675
+#: elf32-arm.c:8438
 msgid "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"
 msgstr "%B(%A+0x%lx): ALU グループ��置�対��� ADD ��� SUB 命令��許��れ����"
 
-#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970
+#: elf32-arm.c:8478 elf32-arm.c:8565 elf32-arm.c:8648 elf32-arm.c:8733
 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"
-msgstr "%B(%A+0x%lx):  0x%lx をクループ��置 %s 用�分割中�オー�ーフロー����"
+msgstr ""
 
-#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544
+#: elf32-arm.c:8963 elf32-sh.c:4112 elf64-sh64.c:1544
 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section"
 msgstr "%B(%A+0x%lx): SEC_MERGE セクション�対�る %s ��置��"
 
-#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805
+#: elf32-arm.c:9074 elf32-m68k.c:4191 elf32-xtensa.c:2805 elf64-ppc.c:11689
 msgid "%B(%A+0x%lx): %s used with TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s � TLS シンボル %s �併��使用�れ���"
 
-#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806
+#: elf32-arm.c:9075 elf32-m68k.c:4192 elf32-xtensa.c:2806 elf64-ppc.c:11690
 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s � TLS ����シンボル %s �併��使用�れ���"
 
-#: elf32-arm.c:10399 elf32-tic6x.c:2751
+#: elf32-arm.c:9132 elf32-tic6x.c:1632
 msgid "out of range"
 msgstr "範囲外"
 
-#: elf32-arm.c:10403 elf32-tic6x.c:2755
+#: elf32-arm.c:9136 elf32-tic6x.c:1636
 msgid "unsupported relocation"
 msgstr "サ�ート�れ������置"
 
-#: elf32-arm.c:10411 elf32-tic6x.c:2763
+#: elf32-arm.c:9144 elf32-tic6x.c:1644
 msgid "unknown error"
 msgstr "�明�エラー"
 
-#: elf32-arm.c:10836
+#: elf32-arm.c:9569
 msgid "Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"
-msgstr "警告: %B � ARM/Thumb 命令相互利用フラグをクリア����� (%B 内�� ARM/Thumb 命令相互利用コード�リンク�れ���)"
+msgstr ""
 
-#: elf32-arm.c:10930
+#: elf32-arm.c:9663
 msgid "%B: Unknown mandatory EABI object attribute %d"
 msgstr "%B: �明�必須 EABI オブジェクト属性 %d ��"
 
-#: elf32-arm.c:10938
+#: elf32-arm.c:9671
 msgid "Warning: %B: Unknown EABI object attribute %d"
 msgstr "警告: %B: �明�EABI オブジェクト属性 %d ��"
 
-#: elf32-arm.c:11119
+#: elf32-arm.c:9852
 msgid "error: %B: Unknown CPU architecture"
 msgstr "エラー: %B: �明� CPU アーキテク�ャ��"
 
-#: elf32-arm.c:11157
+#: elf32-arm.c:9890
 msgid "error: %B: Conflicting CPU architectures %d/%d"
 msgstr "エラー: %B: CPU アーキテク�ャ %d/%d �競������"
 
-#: elf32-arm.c:11206
+#: elf32-arm.c:9942
 msgid "Error: %B has both the current and legacy Tag_MPextension_use attributes"
-msgstr "エラー: %B ��在�昔� Tag_MPextension_use 属性を両方�も������"
+msgstr ""
 
-#: elf32-arm.c:11231
+#: elf32-arm.c:9967
 msgid "error: %B uses VFP register arguments, %B does not"
-msgstr "エラー: %B � VFP レジスタ引数を使用�������%B �使用�����ん"
+msgstr ""
 
-#: elf32-arm.c:11376
+#: elf32-arm.c:10112
 msgid "error: %B: unable to merge virtualization attributes with %B"
-msgstr "エラー: %B: 仮想属性を %B �併�����ん"
+msgstr ""
 
-#: elf32-arm.c:11402
+#: elf32-arm.c:10138
 msgid "error: %B: Conflicting architecture profiles %c/%c"
 msgstr "エラー: %B: アーキテク�ャプロファイル %c/%c �競������"
 
-#: elf32-arm.c:11503
+#: elf32-arm.c:10239
 msgid "Warning: %B: Conflicting platform configuration"
 msgstr "警告: %B: プラットフォーム設定�競������"
 
-#: elf32-arm.c:11512
+#: elf32-arm.c:10248
 msgid "error: %B: Conflicting use of R9"
 msgstr "エラー: %B: R9 �使用�競������"
 
-#: elf32-arm.c:11524
+#: elf32-arm.c:10260
 msgid "error: %B: SB relative addressing conflicts with use of R9"
-msgstr "error: %B: SB 相対アドレス�使用� R9 �使用�競������"
+msgstr ""
 
-#: elf32-arm.c:11537
+#: elf32-arm.c:10273
 msgid "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"
-msgstr "警告: %B � %u �イト� wchar_t を使用�������出力� %u �イト� wchar_t を使用�����。オブジェクトを���る wchar_t 値�使用�失敗�る�も�れ��ん"
+msgstr ""
 
-#: elf32-arm.c:11568
+#: elf32-arm.c:10304
 msgid "warning: %B uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"
-msgstr "警告: %B � %s enum を使用�������出力� %s enum を使用���。オブジェクトを���る enum 値�使用�失敗�る�も�れ��ん"
+msgstr ""
 
-#: elf32-arm.c:11580
+#: elf32-arm.c:10316
 msgid "error: %B uses iWMMXt register arguments, %B does not"
 msgstr "エラー: %B � iWMMXt レジスタ引数を使用������� %B �使用�����ん"
 
-#: elf32-arm.c:11597
+#: elf32-arm.c:10333
 msgid "error: fp16 format mismatch between %B and %B"
 msgstr "エラー: fp16 �形�� %B � %B �間�一致���ん"
 
-#: elf32-arm.c:11621
+#: elf32-arm.c:10357
 msgid "DIV usage mismatch between %B and %B"
 msgstr "DIV �使用法� %B � %B �間�一致���ん"
 
-#: elf32-arm.c:11640
+#: elf32-arm.c:10376
 msgid "%B has has both the current and legacy Tag_MPextension_use attributes"
-msgstr "%B ��在�昔�� Tag_MPextension_use 属性を������"
+msgstr ""
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
-#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282
+#: elf32-arm.c:10468 elf32-bfin.c:5065 elf32-cris.c:4162 elf32-m68hc1x.c:1282
 #: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528
-#: elfxx-mips.c:12857
+#: elfxx-mips.c:12842
 #, c-format
 msgid "private flags = %lx:"
 msgstr "private フラグ = %lx:"
 
-#: elf32-arm.c:11737
+#: elf32-arm.c:10477
 #, c-format
 msgid " [interworking enabled]"
 msgstr " [ARM/Thumb 命令相互利用�有効]"
 
-#: elf32-arm.c:11745
+#: elf32-arm.c:10485
 #, c-format
 msgid " [VFP float format]"
 msgstr " [VFP 浮動�数形�]"
 
-#: elf32-arm.c:11747
+#: elf32-arm.c:10487
 #, c-format
 msgid " [Maverick float format]"
 msgstr " [Maverick 浮動�数形�]"
 
-#: elf32-arm.c:11749
+#: elf32-arm.c:10489
 #, c-format
 msgid " [FPA float format]"
 msgstr " [FPA 浮動�数形�]"
 
-#: elf32-arm.c:11758
+#: elf32-arm.c:10498
 #, c-format
 msgid " [new ABI]"
 msgstr " [æ–° ABI]"
 
-#: elf32-arm.c:11761
+#: elf32-arm.c:10501
 #, c-format
 msgid " [old ABI]"
 msgstr " [æ—§ ABI]"
 
-#: elf32-arm.c:11764
+#: elf32-arm.c:10504
 #, c-format
 msgid " [software FP]"
 msgstr " [ソフトウェア浮動�数点]"
 
-#: elf32-arm.c:11773
+#: elf32-arm.c:10513
 #, c-format
 msgid " [Version1 EABI]"
 msgstr " [�ージョン 1 EABI]"
 
-#: elf32-arm.c:11776 elf32-arm.c:11787
+#: elf32-arm.c:10516 elf32-arm.c:10527
 #, c-format
 msgid " [sorted symbol table]"
 msgstr " [ソート済シンボル表]"
 
-#: elf32-arm.c:11778 elf32-arm.c:11789
+#: elf32-arm.c:10518 elf32-arm.c:10529
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr " [未ソートシンボル表]"
 
-#: elf32-arm.c:11784
+#: elf32-arm.c:10524
 #, c-format
 msgid " [Version2 EABI]"
 msgstr " [�ージョン 2 EABI]"
 
-#: elf32-arm.c:11792
+#: elf32-arm.c:10532
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr ""
 
-#: elf32-arm.c:11795
+#: elf32-arm.c:10535
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr ""
 
-#: elf32-arm.c:11802
+#: elf32-arm.c:10542
 #, c-format
 msgid " [Version3 EABI]"
 msgstr " [�ージョン 3 EABI]"
 
-#: elf32-arm.c:11806
+#: elf32-arm.c:10546
 #, c-format
 msgid " [Version4 EABI]"
 msgstr " [�ージョン 4 EABI]"
 
-#: elf32-arm.c:11810
+#: elf32-arm.c:10550
 #, c-format
 msgid " [Version5 EABI]"
 msgstr " [�ージョン 5 EABI]"
 
-#: elf32-arm.c:11813
+#: elf32-arm.c:10553
 #, c-format
 msgid " [BE8]"
 msgstr " [BE8]"
 
-#: elf32-arm.c:11816
+#: elf32-arm.c:10556
 #, c-format
 msgid " [LE8]"
 msgstr " [LE8]"
 
-#: elf32-arm.c:11822
+#: elf32-arm.c:10562
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr " <EABI �ージョンを�識����ん>"
 
-#: elf32-arm.c:11829
+#: elf32-arm.c:10569
 #, c-format
 msgid " [relocatable executable]"
 msgstr " [��置�能実行ファイル]"
 
-#: elf32-arm.c:11832
+#: elf32-arm.c:10572
 #, c-format
 msgid " [has entry point]"
 msgstr " [エントリ�イントを������]"
 
-#: elf32-arm.c:11837
+#: elf32-arm.c:10577
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr "<フラグビットセットを�識����ん>"
 
-#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827
-#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370
+#: elf32-arm.c:10824 elf32-i386.c:1322 elf32-s390.c:1000 elf32-xtensa.c:1009
+#: elf64-s390.c:960 elf64-x86-64.c:1105 elfxx-sparc.c:1370
 msgid "%B: bad symbol index: %d"
 msgstr "%B: シンボル索引�誤り��り��: %d"
 
-#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949
+#: elf32-arm.c:10946 elf64-x86-64.c:1265 elf64-x86-64.c:1434 elfxx-mips.c:7942
 msgid "%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"
-msgstr "%B: ��置 %s (`%s' �対�る) �共有オブジェクト作�時��使用����ん。-fPIC を付���コンパイル������。"
+msgstr "%1$B: `%3$s' �対�る��置 %2$s �共有オブジェクト作�時��使用����ん。-fPIC を付���コンパイル������。"
 
-#: elf32-arm.c:13412
+#: elf32-arm.c:11948
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr "ファイル %s を処�中�エラー�発生����"
 
-#: elf32-arm.c:14795
+#: elf32-arm.c:13334
 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
-msgstr "%B: エラー: Cortex-A8 エラッタスタブ�安全����置��置�れ����"
+msgstr ""
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:14822
+#: elf32-arm.c:13361
 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
-msgstr "%B: エラー: Cortex-A8 エラッタスタブ�範囲外�� (入力ファイル�大�����)"
+msgstr ""
 
-#: elf32-arm.c:14916 elf32-arm.c:14938
+#: elf32-arm.c:13455 elf32-arm.c:13477
 msgid "%B: error: VFP11 veneer out of range"
 msgstr ""
 
-#: elf32-arm.c:15477
+#: elf32-arm.c:14002
 msgid "error: %B is already in final BE8 format"
 msgstr "エラー: %B �既�最終 BE8 形���"
 
-#: elf32-arm.c:15553
+#: elf32-arm.c:14078
 msgid "error: Source object %B has EABI version %d, but target %B has EABI version %d"
 msgstr "エラー: ソースオブジェクト %B � EABI �ージョン %d ����ターゲット %B � EABI �ージョン %d ��"
 
-#: elf32-arm.c:15569
+#: elf32-arm.c:14094
 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
 msgstr "エラー: %B � APCS-%d �対��コンパイル�れ����。一方ターゲット %B � APCS-%d を使用�����"
 
-#: elf32-arm.c:15594
+#: elf32-arm.c:14119
 msgid "error: %B uses VFP instructions, whereas %B does not"
 msgstr "error: %B � VFP 命令を使用�����。一方 %B �使用�����ん"
 
-#: elf32-arm.c:15598
+#: elf32-arm.c:14123
 msgid "error: %B uses FPA instructions, whereas %B does not"
 msgstr "エラー: %B � FPA 命令を使用�����。一方 %B �使用�����ん"
 
-#: elf32-arm.c:15608
+#: elf32-arm.c:14133
 msgid "error: %B uses Maverick instructions, whereas %B does not"
 msgstr "エラー: %B � Maverick 命令を使用�����。一方 %B �使用�����ん"
 
-#: elf32-arm.c:15612
+#: elf32-arm.c:14137
 msgid "error: %B does not use Maverick instructions, whereas %B does"
 msgstr "エラー: %B � Maverick 命令を使用�����ん。一方 %B �使用�����"
 
-#: elf32-arm.c:15631
+#: elf32-arm.c:14156
 msgid "error: %B uses software FP, whereas %B uses hardware FP"
 msgstr "エラー: %B �ソフトウェア浮動�数点を使用�����。一方 %B ��ードウェア浮動�数点を使用�����"
 
-#: elf32-arm.c:15635
+#: elf32-arm.c:14160
 msgid "error: %B uses hardware FP, whereas %B uses software FP"
 msgstr "エラー: %B ��ードウェア浮動�数点を使用�����。一方 %B �ソフトウェア浮動�数点を使用�����"
 
-#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617
-#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
-#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494
+#: elf32-avr.c:1271 elf32-bfin.c:3201 elf32-cris.c:2085 elf32-fr30.c:617
+#: elf32-frv.c:4119 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
+#: elf32-m32c.c:561 elf32-mep.c:542 elf32-moxie.c:290 elf32-msp430.c:494
 #: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949
 #: elf64-mmix.c:1530
 msgid "internal error: dangerous relocation"
 msgstr "内部エラー: �険���置��"
 
-#: elf32-avr.c:2415 elf32-hppa.c:598 elf32-m68hc1x.c:166
+#: elf32-avr.c:2400 elf32-hppa.c:598 elf32-m68hc1x.c:166 elf64-ppc.c:4175
 msgid "%B: cannot create stub entry %s"
 msgstr "%B: スタブエントリ %s を作�����ん"
 
-#: elf32-bfin.c:107 elf32-bfin.c:363
-msgid "relocation should be even number"
-msgstr ""
-
-#: elf32-bfin.c:1591
+#: elf32-bfin.c:1575
 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'"
 msgstr "%B(%A+0x%lx): シンボル `%s' �対�る解決������置��"
 
-#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062
-#: elf64-s390.c:3037 elf64-x86-64.c:3923
+#: elf32-bfin.c:1608 elf32-i386.c:4123 elf32-m68k.c:4233 elf32-s390.c:3062
+#: elf64-s390.c:3037 elf64-x86-64.c:3759
 msgid "%B(%A+0x%lx): reloc against `%s': error %d"
 msgstr "%B(%A+0x%lx): `%s' �対�る��置: エラー %d"
 
-#: elf32-bfin.c:2723
+#: elf32-bfin.c:2707
 msgid "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:2737
+#: elf32-bfin.c:2721 elf32-frv.c:2901
 msgid "relocation references symbol not defined in the module"
 msgstr "��置�モジュール内�定義�れ����シンボルを�照�����"
 
-#: elf32-bfin.c:2834
+#: elf32-bfin.c:2818
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:2875 elf32-bfin.c:2998
+#: elf32-bfin.c:2859 elf32-bfin.c:2982 elf32-frv.c:3638 elf32-frv.c:3759
 msgid "cannot emit fixups in read-only section"
 msgstr "読�込�専用セクション内�修正を行��������ん"
 
-#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021
+#: elf32-bfin.c:2890 elf32-bfin.c:3020 elf32-frv.c:3669 elf32-frv.c:3803
+#: elf32-lm32.c:1103 elf32-sh.c:5021
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr "読�込�専用セクション内�動的��置を行��������ん"
 
-#: elf32-bfin.c:2956
+#: elf32-bfin.c:2940
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:3121
+#: elf32-bfin.c:3105
 msgid "relocations between different segments are not supported"
 msgstr "異�るセグメント間���置�サ�ート�れ����ん"
 
-#: elf32-bfin.c:3122
+#: elf32-bfin.c:3106
 msgid "warning: relocation references a different segment"
 msgstr "警告: ��置�異�るセグメントを�照�����"
 
-#: elf32-bfin.c:4967
+#: elf32-bfin.c:4957 elf32-frv.c:6406
 msgid "%B: unsupported relocation type %i"
 msgstr "%B: サ�ート�れ������置型 %i ��"
 
-#: elf32-bfin.c:5121 elf32-frv.c:6805
+#: elf32-bfin.c:5111 elf32-frv.c:6814
 #, c-format
 msgid "%s: cannot link non-fdpic object file into fdpic executable"
 msgstr "%s: fdpic 実行ファイル内�� fdpic オブジェクトをリンク�る�������ん"
 
-#: elf32-bfin.c:5125 elf32-frv.c:6809
+#: elf32-bfin.c:5115 elf32-frv.c:6818
 #, c-format
 msgid "%s: cannot link fdpic object file into non-fdpic executable"
 msgstr "%s: � fdpic 実行ファイル内� fdpic オブジェクトをリンク�る�������ん"
 
-#: elf32-bfin.c:5279
-#, c-format
-msgid "*** check this relocation %s"
-msgstr "*** ��置 %s を確�������"
-
 #: elf32-cris.c:1172
 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
-msgstr "%B セクション %A: 解決������置 %s (シンボル `%s' �対�る) ��"
+msgstr "%1$B セクション %2$A: シンボル `%4$s' �対�る解決������置 %3$s ��"
 
 #: elf32-cris.c:1234
 msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'"
-msgstr "%B, セクション %A: ��置 %s (シンボル `%s' �対�る) �関�る PLT ��� GOT ��り��ん"
+msgstr ""
 
 #: elf32-cris.c:1236
 msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
-msgstr "%B, セクション %A: ��置 %s (シンボル `%s' �対�る) �関�る PLT ��り��ん"
+msgstr ""
 
 #: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718
-#: elf32-cris.c:1871 elf32-tic6x.c:2660
+#: elf32-cris.c:1871
 msgid "[whose name is lost]"
-msgstr "[���無�������]"
+msgstr ""
 
-#: elf32-cris.c:1361 elf32-tic6x.c:2645
+#: elf32-cris.c:1361
 msgid "%B, section %A: relocation %s with non-zero addend %d against local symbol"
 msgstr ""
 
-#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653
+#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865
 msgid "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'"
 msgstr ""
 
 #: elf32-cris.c:1395
+#, fuzzy
 msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'"
-msgstr "%B�セクション %A: ��置 %s �大域シンボル�対��許��れ����ん: `%s'"
+msgstr "%s: ��置 %s �シンボル %s 用�も�������サ�ート�れ����ん"
 
 #: elf32-cris.c:1411
 msgid "%B, section %A: relocation %s with no GOT created"
-msgstr "%B�セクション %A: GOT �無���置 %s �作��れ���"
+msgstr ""
 
 #. We shouldn't get here for GCC-emitted code.
 #: elf32-cris.c:1626
 msgid "%B, section %A: relocation %s has an undefined reference to `%s', perhaps a declaration mixup?"
-msgstr "%B�セクション %A: ��置 %s ��未定義� `%s' ���照��り��。��ら�宣言�混乱�����。"
+msgstr ""
 
 #: elf32-cris.c:1998
 msgid "%B, section %A: relocation %s is not allowed for symbol: `%s' which is defined outside the program, perhaps a declaration mixup?"
-msgstr "%B�セクション %A: ��置 %s �シンボル用����許��れ����ん: `%s' �プログラム外�定義�れ����。��ら�宣言�混乱�����。"
+msgstr ""
 
 #: elf32-cris.c:2051
 msgid "(too many global variables for -fpic: recompile with -fPIC)"
-msgstr "(-fpic �対�る大域変数�多����: -fPIC を付���コンパイルを������)"
+msgstr ""
 
 #: elf32-cris.c:2058
 msgid "(thread-local data too big for -fpic or -msmall-tls: recompile with -fPIC or -mno-small-tls)"
-msgstr "(-fpic ��� -msmall-tls �対�るスレッド局所データ�大�����: -fPIC ��� -mno-small-tls を付���コンパイル������)"
+msgstr ""
 
 #: elf32-cris.c:3248
 msgid ""
 "%B, section %A:\n"
 "  v10/v32 compatible object %s must not contain a PIC relocation"
 msgstr ""
-"%B�セクション %A:\n"
-"  v10/v32 互�オブジェクト %s � PIC ��置を�ん��������ん"
 
 #: elf32-cris.c:3353
+#, fuzzy
 msgid ""
 "%B, section %A:\n"
 "  relocation %s not valid in a shared object; typically an option mixup, recompile with -fPIC"
-msgstr ""
-"%B�セクション %A:\n"
-"  ��置 %s �共有オブジェクト内��無効��。通常�オプション�混乱�����。-fPIC を付���コンパイル������"
+msgstr "%s: ��置 %s �共有オブジェクトを作�������使���ん -- -fPIC を付���コンパイル������"
 
 #: elf32-cris.c:3567
+#, fuzzy
 msgid ""
 "%B, section %A:\n"
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
-msgstr ""
-"%B�セクション %A:\n"
-"  ��置 %s �共有オブジェクト内�使用������り��ん。-fPIC を付���コンパイル������"
+msgstr "%s: ��置 %s �共有オブジェクトを作�������使������り��ん -- -fPIC を����コンパイル������"
 
 #: elf32-cris.c:3992
+#, fuzzy
 msgid ""
 "%B, section `%A', to symbol `%s':\n"
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
-msgstr ""
-"%B�セクション `%A'�シンボル `%s' �関��:\n"
-"  ��置 %s �共有オブジェクト内�使用������り��ん。-fPIC を付���コンパイル������"
+msgstr "%s: ��置 %s �共有オブジェクトを作�������使������り��ん -- -fPIC を����コンパイル������"
 
 #: elf32-cris.c:4111
 msgid "Unexpected machine number"
@@ -1456,221 +1403,191 @@ msgstr "%B ã�«ã�¯ CRIS v32 コードã�Œå�«ã�¾ã‚Œã�¦ã�„ã�¾ã�™ã€‚ã�“ã‚Œã�¯å‰�ã�®ã‚
 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr "%B ���-CRIS-v32 コード���れ����。�れ���オブジェクト�互�性��り��ん"
 
-#: elf32-dlx.c:142
-#, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
-msgstr "BFD リンクエラー: セクション (%s) ��分� (PC rel16) �サ�ート�れ����ん"
-
-#: elf32-dlx.c:204
-#, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr "BFD リンクエラー: セクション (%s) ��ジャンプ (PC rel26) �サ�ート�れ����ん"
-
 #: elf32-frv.c:1509 elf32-frv.c:1658
 msgid "relocation requires zero addend"
 msgstr ""
 
 #: elf32-frv.c:2888
-msgid "%H: relocation to `%s+%v' may have caused the error above\n"
-msgstr "%H: `%s+%v' ����置�上�エラー�原因�も�れ��ん\n"
-
-#: elf32-frv.c:2902
-msgid "%H: relocation references symbol not defined in the module\n"
-msgstr "%H: ��置�モジュール内�定義�れ����シンボルを�照�����\n"
+msgid "%B(%A+0x%x): relocation to `%s+%x' may have caused the error above"
+msgstr ""
 
-#: elf32-frv.c:2978
-msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF � call 命令���用�れ��ん\n"
+#: elf32-frv.c:2977
+msgid "R_FRV_GETTLSOFF not applied to a call instruction"
+msgstr "R_FRV_GETTLSOFF � call 命令��用�れ��ん"
 
 #: elf32-frv.c:3019
-msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESC12 � lddi 命令���用�れ��ん\n"
+msgid "R_FRV_GOTTLSDESC12 not applied to an lddi instruction"
+msgstr "R_FRV_GOTTLSDESC12 � lddi 命令��用�れ��ん"
 
 #: elf32-frv.c:3090
-msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCHI � sethi 命令���用�れ��ん\n"
+msgid "R_FRV_GOTTLSDESCHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSDESCHI � sethi 命令��用�れ��ん"
 
 #: elf32-frv.c:3127
-msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCLO � setlo ��� setlos 命令���用�れ��ん\n"
+msgid "R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSDESCLO � setlo ��� setlos 命令��用�れ��ん"
 
-#: elf32-frv.c:3174
-msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
-msgstr "%H: R_FRV_TLSDESC_RELAX � ldd 命令���用�れ��ん\n"
+#: elf32-frv.c:3175
+msgid "R_FRV_TLSDESC_RELAX not applied to an ldd instruction"
+msgstr "R_FRV_TLSDESC_RELAX � ldd 命令��用�れ��ん"
 
-#: elf32-frv.c:3258
-msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF_RELAX � calll 命令���用�れ��ん\n"
+#: elf32-frv.c:3259
+msgid "R_FRV_GETTLSOFF_RELAX not applied to a calll instruction"
+msgstr "R_FRV_GETTLSOFF_RELAX � calll 命令��用�れ��ん"
 
-#: elf32-frv.c:3312
-msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFF12 � ldi 命令���用�れ��ん\n"
+#: elf32-frv.c:3314
+msgid "R_FRV_GOTTLSOFF12 not applied to an ldi instruction"
+msgstr "R_FRV_GOTTLSOFF12 � ldi 命令��用�れ��ん"
 
-#: elf32-frv.c:3342
-msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFHI � sethi 命令���用�れ��ん\n"
+#: elf32-frv.c:3344
+msgid "R_FRV_GOTTLSOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSOFFHI � sethi 命令��用�れ��ん"
 
-#: elf32-frv.c:3371
-msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFLO � setlo ��� setlos 命令���用�れ��ん\n"
+#: elf32-frv.c:3373
+msgid "R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSOFFLO � setlo ��� setlos 命令��用�れ��ん"
 
-#: elf32-frv.c:3401
-msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
-msgstr "%H: R_FRV_TLSOFF_RELAX � ld 命令���用�れ��ん\n"
+#: elf32-frv.c:3404
+msgid "R_FRV_TLSOFF_RELAX not applied to an ld instruction"
+msgstr "R_FRV_TLSOFF_RELAX � ld 命令��用�れ��ん"
 
-#: elf32-frv.c:3446
-msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_TLSMOFFHI � sethi 命令���用�れ��ん\n"
+#: elf32-frv.c:3449
+msgid "R_FRV_TLSMOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_TLSMOFFHI � sethi 命令��用�れ��ん"
 
-#: elf32-frv.c:3473
-msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "R_FRV_TLSMOFFLO � setlo ��� setlos 命令���用�れ��ん\n"
+#: elf32-frv.c:3476
+msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_TLSMOFFLO � setlo ��� setlos 命令��用�れ��ん"
 
-#: elf32-frv.c:3594
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
+#: elf32-frv.c:3597
+msgid "R_FRV_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-frv.c:3635 elf32-frv.c:3757
-msgid "%H: cannot emit fixups in read-only section\n"
-msgstr "%H: 読�込�専用セクション内�修正を行��������ん\n"
-
-#: elf32-frv.c:3666 elf32-frv.c:3800
-msgid "%H: cannot emit dynamic relocations in read-only section\n"
-msgstr "%H: 読�込�専用セクション内�動的��置を行��������ん\n"
-
-#: elf32-frv.c:3715
-msgid "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
+#: elf32-frv.c:3717
+msgid "R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-frv.c:3971
-msgid "%H: reloc against `%s' references a different segment\n"
-msgstr "%H: `%s' ����置�異�るセグメントを�照�����\n"
-
-#: elf32-frv.c:4121
-msgid "%H: reloc against `%s': %s\n"
-msgstr "%H: `%s' �対�る��置: %s\n"
+#: elf32-frv.c:3974 elf32-frv.c:4130
+msgid "%B(%A+0x%lx): reloc against `%s': %s"
+msgstr "%B(%A+0x%lx): `%s' �対�る��置: %s"
 
-#: elf32-frv.c:6397
-msgid "%B: unsupported relocation type %i\n"
-msgstr "%B: サ�ート�れ������置型 %i ��\n"
+#: elf32-frv.c:3976 elf32-frv.c:3980
+msgid "relocation references a different segment"
+msgstr ""
 
-#: elf32-frv.c:6719
+#: elf32-frv.c:6728
 #, c-format
 msgid "%s: compiled with %s and linked with modules that use non-pic relocations"
-msgstr "%s: %s 付��コンパイル�れ������� pic ��置を使用�るモジュール�リンク�����"
+msgstr ""
 
-#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807
+#: elf32-frv.c:6781 elf32-iq2000.c:845 elf32-m32c.c:807
 #, c-format
 msgid "%s: compiled with %s and linked with modules compiled with %s"
-msgstr "%s: %s 付��コンパイル�れ������ %s 付��コンパイル��モジュール�リンク�����"
+msgstr ""
 
-#: elf32-frv.c:6784
+#: elf32-frv.c:6793
 #, c-format
 msgid "%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"
-msgstr "%s: �明� e_flags (0x%lx) フィールドを使用�����。�れ���モジュール�異�るフィールド (0x%lx) ��"
+msgstr ""
 
-#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
-#: elf32-rx.c:2937
-#, c-format
+#: elf32-frv.c:6843 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
+#: elf32-rx.c:2925
+#, fuzzy, c-format
 msgid "private flags = 0x%lx:"
-msgstr "private フラグ = 0x%lx:"
+msgstr "private フラグ = %lx:"
 
 #: elf32-gen.c:69 elf64-gen.c:69
 msgid "%B: Relocations in generic ELF (EM: %d)"
-msgstr "%B: 一般的� ELF 内���置 (EM: %d)"
+msgstr ""
 
 #: elf32-hppa.c:850 elf32-hppa.c:3610
+#, fuzzy
 msgid "%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"
-msgstr "%B(%A+0x%lx): %s �届���ん。-ffunction-sections を付���コンパイル������"
+msgstr "%s(%s+0x%lx): %s �届���ん。-ffunction-sections を付���コンパイル������"
 
 #: elf32-hppa.c:1284
+#, fuzzy
 msgid "%B: relocation %s can not be used when making a shared object; recompile with -fPIC"
-msgstr "%B: ��置 %s �共有オブジェクトを作��る����使���ん。-fPIC を付���コンパイル������"
+msgstr "%s: ��置 %s �共有オブジェクトを作�������使���ん -- -fPIC を付���コンパイル������"
 
 #: elf32-hppa.c:2803
+#, fuzzy
 msgid "%B: duplicate export stub %s"
-msgstr "%B: export スタブ %s ��複�����"
+msgstr "%s: export スタブ %s ��複�����"
 
 #: elf32-hppa.c:3449
 msgid "%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"
-msgstr "%B(%A+0x%lx): %s 修正 (命令 0x%x 用) ��共有リンク��サ�ート�れ����ん"
+msgstr ""
 
 #: elf32-hppa.c:4296
+#, fuzzy
 msgid "%B(%A+0x%lx): cannot handle %s for %s"
-msgstr "%B(%A+0x%lx): %s (%s) を�り扱���ん"
+msgstr "%s(%s+0x%lx): %s (%s) を�り扱���ん"
 
 #: elf32-hppa.c:4608
 msgid ".got section not immediately after .plt section"
 msgstr ".got セクション� .plt セクション�直後��り��ん"
 
 #. Unknown relocation.
-#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379
-#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243
+#: elf32-i386.c:371 elf32-m68k.c:383 elf32-ppc.c:1674 elf32-s390.c:379
+#: elf32-tic6x.c:1563 elf64-ppc.c:2284 elf64-s390.c:403 elf64-x86-64.c:234
 msgid "%B: invalid relocation type %d"
 msgstr "%B: 無効���置型 %d ��"
 
-#: elf32-i386.c:1266 elf64-x86-64.c:1116
+#: elf32-i386.c:1265 elf64-x86-64.c:1049
 msgid "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed"
-msgstr "%B: %s �ら %s ��TLS 移行 (`%s' �対�る��置 0x%lx�セクション `%A' 内) �失敗����"
+msgstr ""
 
-#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909
-#: elfxx-sparc.c:3077
+#: elf32-i386.c:1408 elf32-i386.c:3068 elf64-x86-64.c:1194 elf64-x86-64.c:2780
+#: elfxx-sparc.c:3076
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
-msgstr "%B: ��置  %s (STT_GNU_IFUNC シンボル `%s' �対�る) � %s �よ���り扱�れ��ん"
+msgstr ""
 
-#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
+#: elf32-i386.c:1570 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
 #: elf64-s390.c:1151 elfxx-sparc.c:1547
 msgid "%B: `%s' accessed both as normal and thread local symbol"
 msgstr "%B: `%s' �通常�シンボル�スレッド局所シンボル�アクセス����"
 
-#: elf32-i386.c:2405 elf64-x86-64.c:2320
-msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"
-msgstr "%P: %B: 警告: `%s' �対�る��置 (読��り専用セクション `%A' �ら) ��。\n"
-
-#: elf32-i386.c:2496 elf64-x86-64.c:2407
-msgid "%P: %B: warning: relocation in readonly section `%A'.\n"
-msgstr "%P: %B: 警告: 読��り専用セクション `%A' ��る��置��。\n"
-
-#: elf32-i386.c:2932
+#: elf32-i386.c:2910
 msgid "%B: unrecognized relocation (0x%x) in section `%A'"
-msgstr "%B: �識������置 (0x%x) �セクション `%A' ��り��"
+msgstr "%1$B: セクション `%3$A' ��識������置 (0x%2$x) ��り��"
 
-#: elf32-i386.c:3339 elf64-x86-64.c:3295
+#: elf32-i386.c:3317 elf64-x86-64.c:3174
 msgid "hidden symbol"
 msgstr "隠�れ�シンボル"
 
-#: elf32-i386.c:3342 elf64-x86-64.c:3298
+#: elf32-i386.c:3320 elf64-x86-64.c:3177
 msgid "internal symbol"
 msgstr "内部シンボル"
 
-#: elf32-i386.c:3345 elf64-x86-64.c:3301
+#: elf32-i386.c:3323 elf64-x86-64.c:3180
 msgid "protected symbol"
 msgstr "�護�れ�シンボル"
 
-#: elf32-i386.c:3348 elf64-x86-64.c:3304
+#: elf32-i386.c:3326 elf64-x86-64.c:3183
 msgid "symbol"
 msgstr "シンボル"
 
-#: elf32-i386.c:3353
+#: elf32-i386.c:3331
 msgid "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"
-msgstr "%B: 未定義�%s `%s' �対�る��置 R_386_GOTOFF �共有オブジェクト作�時��使用����ん"
+msgstr ""
 
-#: elf32-i386.c:3363
+#: elf32-i386.c:3341
 msgid "%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"
-msgstr "%B: 未定義��護�れ�関数 `%s' �対�る��置 R_386_GOTOFF �共有オブジェクト作�時��使用����ん"
+msgstr ""
 
-#: elf32-i386.c:4660 elf64-x86-64.c:4378
-#, c-format
+#: elf32-i386.c:4633 elf64-x86-64.c:4206
+#, fuzzy, c-format
 msgid "discarded output section: `%A'"
-msgstr "破棄�れ�出力セクション: `%A'"
+msgstr "%s: 出力セクション %s (入力セクション %s 用) を見��られ��ん"
 
 #: elf32-ip2k.c:857 elf32-ip2k.c:863 elf32-ip2k.c:930 elf32-ip2k.c:936
 msgid "ip2k relaxer: switch table without complete matching relocation information."
-msgstr "ip2k relaxer: 完全�一致�る��置情報�無� switch 表��。"
+msgstr ""
 
 #: elf32-ip2k.c:880 elf32-ip2k.c:963
 msgid "ip2k relaxer: switch table header corrupt."
-msgstr "ip2k relaxer: switch 表ヘッダ�破������。"
+msgstr ""
 
 #: elf32-ip2k.c:1292
 #, c-format
@@ -1684,8 +1601,9 @@ msgstr ""
 
 #. Only if it's not an unresolved symbol.
 #: elf32-ip2k.c:1475
+#, fuzzy
 msgid "unsupported relocation between data/insn address spaces"
-msgstr "データアドレス空間�命令アドレス空間�間���置�サ�ート�れ����ん"
+msgstr "%s: サ�ート�れ������置タイプ %s ��"
 
 #: elf32-iq2000.c:858 elf32-m32c.c:819
 #, c-format
@@ -1693,12 +1611,13 @@ msgid "%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%s: 使用���る e_flags(0x%lx) �以��モジュール (0x%lx) �異������"
 
 #: elf32-lm32.c:706
+#, fuzzy
 msgid "global pointer relative relocation when _gp not defined"
-msgstr "_gp �未定義�時�大域�インタ関連��置��り��"
+msgstr "GP 関連���置� _gp �未定義�時点��れ���"
 
 #: elf32-lm32.c:761
 msgid "global pointer relative address out of range"
-msgstr "大域�インタ関連アドレス�範囲外��"
+msgstr ""
 
 #: elf32-lm32.c:1057
 msgid "internal error: addend should be zero for R_LM32_16_GOT"
@@ -1709,12 +1628,14 @@ msgid "SDA relocation when _SDA_BASE_ not defined"
 msgstr "_SDA_BASE_ �未定義�時点�� SDA ��置��"
 
 #: elf32-m32r.c:3048
+#, fuzzy
 msgid "%B: The target (%s) of an %s relocation is in the wrong section (%A)"
-msgstr "%B: ターゲット %s (%s ��置�) �間���セクション (%A) 内��り��"
+msgstr "%s: ターゲット (%s, %s ��置) �間���セクション (%s) 内��り��"
 
 #: elf32-m32r.c:3576
+#, fuzzy
 msgid "%B: Instruction set mismatch with previous modules"
-msgstr "%B: 命令セット�以��モジュール������ん"
+msgstr "%s: 命令セット�以��モジュール������ん"
 
 #: elf32-m32r.c:3597
 #, c-format
@@ -1739,7 +1660,7 @@ msgstr ": m32r2 命令"
 #: elf32-m68hc1x.c:1050
 #, c-format
 msgid "Reference to the far symbol `%s' using a wrong relocation may result in incorrect execution"
-msgstr "間�����置を利用����シンボル `%s' ���照�正����実行�果��る�も�れ��ん"
+msgstr ""
 
 #: elf32-m68hc1x.c:1073
 #, c-format
@@ -1753,19 +1674,21 @@ msgstr ""
 
 #: elf32-m68hc1x.c:1225
 msgid "%B: linking files compiled for 16-bit integers (-mshort) and others for 32-bit integers"
-msgstr "%B: リンク中�ファイル� 16 ビット整数用  (-mshort) �コンパイル�れ�����他�も�� 32 ビット整数用��"
+msgstr ""
 
 #: elf32-m68hc1x.c:1232
 msgid "%B: linking files compiled for 32-bit double (-fshort-double) and others for 64-bit double"
-msgstr "%B: リンク中�ファイル� 32 ビット�精度浮動�数用 (-fshort-double) �コンパイル�れ�����他�も�� 64 ビット�精度浮動�数用��"
+msgstr ""
 
 #: elf32-m68hc1x.c:1241
+#, fuzzy
 msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
-msgstr "%B: リンク中�ファイル� HCS12 用�コンパイル�れ�����他�も�� HC12 用��"
+msgstr "エラー: %s � APCS-%d 用�コンパイル�れ��も���ら��%s � APCS-%d 用�コンパイル�れ���"
 
-#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719
+#: elf32-m68hc1x.c:1257 elf32-ppc.c:4232 elf64-sparc.c:703 elfxx-mips.c:12704
+#, fuzzy
 msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
-msgstr "%B: 使用���る e_flags (0x%lx) ���モジュール (0x%lx) �異�り��"
+msgstr "%s: 使用���る e_flags(0x%lx) �以��モジュール (0x%lx) �異������"
 
 #: elf32-m68hc1x.c:1285
 #, c-format
@@ -1805,28 +1728,28 @@ msgstr "cpu=HC12]"
 #: elf32-m68hc1x.c:1302
 #, c-format
 msgid " [memory=bank-model]"
-msgstr " [memory=bank-model]"
+msgstr ""
 
 #: elf32-m68hc1x.c:1304
 #, c-format
 msgid " [memory=flat]"
-msgstr " [memory=flat]"
+msgstr ""
 
-#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326
+#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7292 vms-alpha.c:7307
 msgid "unknown"
 msgstr "�明"
 
 #: elf32-m68k.c:1714
 msgid "%B: GOT overflow: Number of relocations with 8-bit offset > %d"
-msgstr "%B: GOT オー�ーフロー: 8ビットオフセットを����置�数� %d より大����"
+msgstr ""
 
 #: elf32-m68k.c:1720
 msgid "%B: GOT overflow: Number of relocations with 8- or 16-bit offset > %d"
-msgstr "%B: GOT オー�ーフロー: 8 ビット��� 16 ビットオフセットを����置�数� > %d より大����"
+msgstr ""
 
 #: elf32-m68k.c:3959
 msgid "%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted in shared object"
-msgstr "%B(%A+0x%lx): R_68K_TLS_LE32 ��置�共有オブジェクト内��許��れ����ん"
+msgstr ""
 
 #: elf32-mcore.c:99 elf32-mcore.c:442
 msgid "%B: Relocation %s (%d) is not currently supported.\n"
@@ -1836,27 +1759,16 @@ msgstr "%B: å†�é…�ç½® %s (%d) ã�¯ç�¾åœ¨ã�®ã�¨ã�“ã‚�サãƒ�ートã�•ã‚Œã�¦ã�„ã�¾ã�
 msgid "%B: Unknown relocation type %d\n"
 msgstr "%B: �明���置型 %d ��\n"
 
-#. Pacify gcc -Wall.
-#: elf32-mep.c:157
-#, c-format
-msgid "mep: no reloc for code %d"
-msgstr "mep: コード %d 用���置��り��ん"
-
-#: elf32-mep.c:163
-#, c-format
-msgid "MeP: howto %d has type %d"
-msgstr ""
-
-#: elf32-mep.c:648
+#: elf32-mep.c:647
 msgid "%B and %B are for different cores"
 msgstr "%B �よ� %B �異�るコア�対�るも���"
 
-#: elf32-mep.c:665
+#: elf32-mep.c:664
 msgid "%B and %B are for different configurations"
 msgstr "%B �よ� %B �異�る設定�対�るも���"
 
-#: elf32-mep.c:702
-#, c-format
+#: elf32-mep.c:701
+#, fuzzy, c-format
 msgid "private flags = 0x%lx"
 msgstr "private フラグ = 0x%lx"
 
@@ -1870,220 +1782,222 @@ msgstr "%s: ��置型 %d ��明��"
 msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
 msgstr "%s: ターゲット (%s, %s ��置) �間���セクション (%s) 内��り��"
 
-#: elf32-microblaze.c:1155 elfxx-sparc.c:3451
+#: elf32-microblaze.c:1155 elfxx-sparc.c:3450
 msgid "%B: probably compiled without -fPIC?"
 msgstr "%B: �ら� -fPIC を付���コンパイル�����?"
 
-#: elf32-microblaze.c:2074
+#: elf32-microblaze.c:2074 elflink.c:12601
+#, fuzzy
 msgid "%B: bad relocation section name `%s'"
-msgstr "%B: 誤����置セクション� `%s' ��"
+msgstr "%s: �正���置アドレス 0x%lx �セクション `%s' 内��り��"
 
 #: elf32-mips.c:1045 elf64-mips.c:2084 elfn32-mips.c:1888
+#, fuzzy
 msgid "literal relocation occurs for an external symbol"
-msgstr "リテラル��置�外部シンボル用�発生����"
+msgstr "32ビット gp 関連��置�外部シンボル�用�発生����"
 
 #: elf32-mips.c:1085 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:2127
 #: elfn32-mips.c:1929
 msgid "32bits gp relative relocation occurs for an external symbol"
-msgstr "32ビット gp 関連��置�外部シンボル用�発生����"
+msgstr "32ビット gp 関連��置�外部シンボル�用�発生����"
 
-#: elf32-ppc.c:1740
+#: elf32-ppc.c:1739
 #, c-format
 msgid "generic linker can't handle %s"
-msgstr "一般的リンカ� %s を扱���ん"
+msgstr ""
 
-#: elf32-ppc.c:2183
+#: elf32-ppc.c:2180
 msgid "corrupt %s section in %B"
-msgstr "%s セクション (%B 内) �破������"
+msgstr ""
 
-#: elf32-ppc.c:2202
+#: elf32-ppc.c:2199
+#, fuzzy
 msgid "unable to read in %s section from %B"
-msgstr "%s セクションを %B �ら読�込���ん"
+msgstr "%s 用���置セクションを見��られ��ん"
 
-#: elf32-ppc.c:2243
+#: elf32-ppc.c:2240
+#, fuzzy
 msgid "warning: unable to set size of %s section in %B"
-msgstr "警告: %s セクション (%B 内) �サイズを設定����ん"
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
-#: elf32-ppc.c:2293
+#: elf32-ppc.c:2290
 msgid "failed to allocate space for new APUinfo section."
-msgstr "新�� APUinfo セクション用�空間割り当��失敗����"
+msgstr ""
 
-#: elf32-ppc.c:2312
+#: elf32-ppc.c:2309
 msgid "failed to compute new APUinfo section."
-msgstr "新�� APUinfo セクション�計算�失敗����"
+msgstr ""
 
-#: elf32-ppc.c:2315
+#: elf32-ppc.c:2312
 msgid "failed to install new APUinfo section."
-msgstr "新�� APUinfo セクション�インストール�失敗����"
+msgstr ""
 
-#: elf32-ppc.c:3343
+#: elf32-ppc.c:3358
+#, fuzzy
 msgid "%B: relocation %s cannot be used when making a shared object"
-msgstr "%B: ��置 %s �共有ライブラリ作�時��使用����ん"
+msgstr "%s: ��置 %s �共有オブジェクトを作����る時点��利用����ん"
 
 #. It does not make sense to have a procedure linkage
 #. table entry for a local symbol.
-#: elf32-ppc.c:3687
-msgid "%H: %s reloc against local symbol\n"
-msgstr "%H: 局所シンボル�対�る %s ��置��\n"
+#: elf32-ppc.c:3702
+#, fuzzy
+msgid "%B(%A+0x%lx): %s reloc against local symbol"
+msgstr "%s: 0x%lx �� CALL16 ��置�大域シンボルを対象������ん"
 
-#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449
-#: elfxx-mips.c:12471 elfxx-mips.c:12497
+#: elf32-ppc.c:4044 elf32-ppc.c:4059 elfxx-mips.c:12411 elfxx-mips.c:12437
+#: elfxx-mips.c:12459 elfxx-mips.c:12485
 msgid "Warning: %B uses hard float, %B uses soft float"
-msgstr "警告: %B ��ードウェア浮動�数を使用�����。%B �ソフトウェア浮動�数を利用�����"
+msgstr ""
 
-#: elf32-ppc.c:4029 elf32-ppc.c:4033
+#: elf32-ppc.c:4047 elf32-ppc.c:4051
 msgid "Warning: %B uses double-precision hard float, %B uses single-precision hard float"
-msgstr "警告: %B ��ードウェア�精度浮動�数を使用�����。%B ��ードウェア�精度浮動�数を使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4037
+#: elf32-ppc.c:4055
 msgid "Warning: %B uses soft float, %B uses single-precision hard float"
-msgstr "警告: %B �ソフトウェア浮動�数を使用�����。%B ��ードウェア�精度浮動�数を使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407
+#: elf32-ppc.c:4062 elf32-ppc.c:4066 elfxx-mips.c:12391 elfxx-mips.c:12395
 msgid "Warning: %B uses unknown floating point ABI %d"
-msgstr "警告: %B ��明�浮動�数点 ABI %d を使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4090 elf32-ppc.c:4094
+#: elf32-ppc.c:4108 elf32-ppc.c:4112
 msgid "Warning: %B uses unknown vector ABI %d"
-msgstr "警告: %B ��明�ベクトル ABI %d を使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4098
+#: elf32-ppc.c:4116
 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\""
-msgstr "警告: %B �ベクトル ABI \"%s\" を使用�����。%B �ベクトル ABI \"%s\" を使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4115 elf32-ppc.c:4118
+#: elf32-ppc.c:4133 elf32-ppc.c:4136
 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
-msgstr "警告: %B ����構造体�戻り値� r3/r4 を使用�����。%B �メモリを使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4121 elf32-ppc.c:4125
+#: elf32-ppc.c:4139 elf32-ppc.c:4143
 msgid "Warning: %B uses unknown small structure return convention %d"
-msgstr "警告: %B ��明����構造体戻り値変� %d を使用�����"
+msgstr ""
 
-#: elf32-ppc.c:4179
+#: elf32-ppc.c:4197
+#, fuzzy
 msgid "%B: compiled with -mrelocatable and linked with modules compiled normally"
-msgstr "%B: -mrelocatable を付��コンパイル�れ�も��普通�コンパイル�れ�モジュール�をリンク����"
+msgstr "%s: -mrelocatable を付��コンパイル�れ�も��普通�コンパイル�れ�モジュール�をリンク����"
 
-#: elf32-ppc.c:4187
+#: elf32-ppc.c:4205
+#, fuzzy
 msgid "%B: compiled normally and linked with modules compiled with -mrelocatable"
-msgstr "%B: 普通�コンパイル�れ�も�� -mrelocatable を付��コンパイル�れ�モジュール�をリンク����"
+msgstr "%s: 普通�コンパイル�れ�も�� -mrelocatable を付��コンパイル�れ�モジュール�をリンク����"
 
-#: elf32-ppc.c:4275
+#: elf32-ppc.c:4293
 msgid "Using bss-plt due to %B"
-msgstr "%B ���� bss-plt を使用�����"
-
-#. Uh oh, we didn't find the expected call.  We
-#. could just mark this symbol to exclude it
-#. from tls optimization but it's safer to skip
-#. the entire optimization.
-#: elf32-ppc.c:4771 elf64-ppc.c:7778
-msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
-msgstr "%H 引数� __tls_get_addr �無��り���。TLS 最�化�無効��り��\n"
-
-#: elf32-ppc.c:5006 elf64-ppc.c:6494
-#, c-format
-msgid "dynamic variable `%s' is zero size\n"
-msgstr "動的変数 `%s' �サイズ� 0 ��\n"
+msgstr ""
 
-#: elf32-ppc.c:7204 elf64-ppc.c:12431
-msgid "%B: unknown relocation type %d for symbol %s\n"
-msgstr "%B: �明���置型 %d (シンボル %s 用) ��\n"
+#: elf32-ppc.c:7192 elf64-ppc.c:12307
+#, fuzzy
+msgid "%B: unknown relocation type %d for symbol %s"
+msgstr "%s: ��置タイプ %d (シンボル %s) ��明��"
 
-#: elf32-ppc.c:7465
-msgid "%H: non-zero addend on %s reloc against `%s'\n"
+#: elf32-ppc.c:7453
+msgid "%B(%A+0x%lx): non-zero addend on %s reloc against `%s'"
 msgstr ""
 
-#: elf32-ppc.c:7661 elf64-ppc.c:12936
-msgid "%H: relocation %s for indirect function %s unsupported\n"
-msgstr "%H: ��置 %s (間接関数 %s 用) �サ�ート�れ����ん\n"
-
-#: elf32-ppc.c:7889 elf32-ppc.c:7919 elf32-ppc.c:7966
-msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)\n"
-msgstr "%B: ターゲット (%s) (%s ��置�) �間���出力セクション (%s) 内��り��\n"
+#: elf32-ppc.c:7651 elf64-ppc.c:12812
+msgid "%B(%A+0x%lx): relocation %s for indirect function %s unsupported"
+msgstr ""
 
-#: elf32-ppc.c:8038
-msgid "%B: relocation %s is not yet supported for symbol %s\n"
-msgstr "%B: ��置 %s (シンボル %s 用) ���サ�ート�れ����ん\n"
+#: elf32-ppc.c:7881 elf32-ppc.c:7911 elf32-ppc.c:7958
+#, fuzzy
+msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)"
+msgstr "%s: ターゲット %s (%s��置) �間���出力セクション (%s) ��り��"
 
-#: elf32-ppc.c:8097 elf64-ppc.c:13237
-msgid "%H: unresolvable %s relocation against symbol `%s'\n"
-msgstr "%H: 解決���� %s ��置 (シンボル `%s' �対�る) ��\n"
+#: elf32-ppc.c:8030
+#, fuzzy
+msgid "%B: relocation %s is not yet supported for symbol %s."
+msgstr "%s: ��置 %s �シンボル %s 用�も�������サ�ート�れ����ん"
 
-#: elf32-ppc.c:8144 elf64-ppc.c:13282
-msgid "%H: %s reloc against `%s': error %d\n"
-msgstr "%H: %s ��置 (`%s' �対�る): エラー %d\n"
+#: elf32-ppc.c:8138 elf64-ppc.c:13162
+msgid "%B(%A+0x%lx): %s reloc against `%s': error %d"
+msgstr ""
 
-#: elf32-ppc.c:8635
-#, c-format
-msgid "%s not defined in linker created %s\n"
-msgstr "%s �リンカ�作��� %s 内��定義�れ����ん\n"
+#: elf32-ppc.c:8629
+#, fuzzy, c-format
+msgid "%s not defined in linker created %s"
+msgstr "%s: シンボル� %s ��ージョン�未定義��"
 
-#: elf32-rx.c:553
+#: elf32-rx.c:544
+#, fuzzy
 msgid "%B:%A: Warning: deprecated Red Hat reloc "
-msgstr "%B:%A: 警告: 廃止�れ� Red Hat ��置�� "
+msgstr "%s: 0x%lx: 警告: 存在�る�����置領域を見��られ��ん"
 
-#: elf32-rx.c:1095
+#: elf32-rx.c:1086
 msgid "Warning: RX_SYM reloc with an unknown symbol"
-msgstr "警告: �明�シンボル��る RX_SYM ��置��"
+msgstr ""
 
-#: elf32-rx.c:1260
+#: elf32-rx.c:1251
 msgid "%B(%A): error: call to undefined function '%s'"
-msgstr "%B(%A): エラー: 定義�れ����関数 '%s' �呼�出���"
+msgstr ""
 
-#: elf32-rx.c:1274
+#: elf32-rx.c:1265
+#, fuzzy
 msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
-msgstr "%B(%A): 警告: small データ領域内�シンボル '%s' ��整列�れ����アクセス��り��"
+msgstr "警告: シンボル `%s' �サイズ� %lu �ら %lu �変更�れ��� (%s 内)"
 
-#: elf32-rx.c:1278
+#: elf32-rx.c:1269
+#, fuzzy
 msgid "%B(%A): internal error: out of range error"
-msgstr "%B(%A): 内部エラー: 範囲外エラー��"
+msgstr "内部エラー: 範囲外エラー��"
 
-#: elf32-rx.c:1282
+#: elf32-rx.c:1273
+#, fuzzy
 msgid "%B(%A): internal error: unsupported relocation error"
-msgstr "%B(%A): 内部エラー: サ�ート�れ������置エラー��"
+msgstr "内部エラー: 未サ�ート���置エラー"
 
-#: elf32-rx.c:1286
+#: elf32-rx.c:1277
+#, fuzzy
 msgid "%B(%A): internal error: dangerous relocation"
-msgstr "%B(%A): 内部エラー: �険���置��"
+msgstr "内部エラー: �険���置��"
 
-#: elf32-rx.c:1290
+#: elf32-rx.c:1281
+#, fuzzy
 msgid "%B(%A): internal error: unknown error"
-msgstr "%B(%A): 内部エラー: �明�エラー��"
+msgstr "内部エラー: �明�エラー"
 
-#: elf32-rx.c:2940
-#, c-format
+#: elf32-rx.c:2928
+#, fuzzy, c-format
 msgid " [64-bit doubles]"
-msgstr " [64 ビット�精度浮動�数]"
+msgstr "64-ビット�精度浮動�数, "
 
-#: elf32-rx.c:2942
+#: elf32-rx.c:2930
 #, c-format
 msgid " [dsp]"
-msgstr " [dsp]"
+msgstr ""
 
 #: elf32-s390.c:2209 elf64-s390.c:2196
 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s"
-msgstr "%B(%A+0x%lx): TLS ��置 %s 用�無効�命令��"
+msgstr ""
 
-#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324
+#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3323
 msgid "not enough GOT space for local GOT entries"
 msgstr "局所 GOT エントリ用� GOT 空間���分��"
 
 #: elf32-score.c:2744
+#, fuzzy
 msgid "address not word align"
-msgstr "アドレス� WORD �整列�れ����ん"
+msgstr "��置領域��切�アライン�れ����ん"
 
 #: elf32-score.c:2829 elf32-score7.c:2634
-#, c-format
+#, fuzzy, c-format
 msgid "%s: Malformed reloc detected for section %s"
-msgstr "%s: セクション %s �対�る誤��形����置�検出�れ���"
+msgstr "セクション %s 用����������置を検出����"
 
 #: elf32-score.c:2880 elf32-score7.c:2685
+#, fuzzy
 msgid "%B: CALL15 reloc at 0x%lx not against global symbol"
-msgstr "%B: �置 0x%lx ��る CALL15 ��置�大域シンボル�対�るも����り��ん"
+msgstr "%s: 0x%lx �� CALL16 ��置�大域シンボルを対象������ん"
 
 #: elf32-score.c:3999 elf32-score7.c:3806
 #, c-format
 msgid " [pic]"
-msgstr " [pic]"
+msgstr ""
 
 #: elf32-score.c:4003 elf32-score7.c:3810
 #, c-format
@@ -2091,121 +2005,139 @@ msgid " [fix dep]"
 msgstr ""
 
 #: elf32-score.c:4045 elf32-score7.c:3852
+#, fuzzy
 msgid "%B: warning: linking PIC files with non-PIC files"
-msgstr "%B: 警告: PIC ファイル�� PIC ファイルをリンク�����"
+msgstr "%s: PIC ファイル�� PIC ファイルをリンク�よ������"
 
 #: elf32-sh-symbian.c:130
 msgid "%B: IMPORT AS directive for %s conceals previous IMPORT AS"
-msgstr "%B: %s 用� IMPORT AS 指示��� IMPORT AS 指示を隠���"
+msgstr ""
 
 #: elf32-sh-symbian.c:383
+#, fuzzy
 msgid "%B: Unrecognised .directive command: %s"
-msgstr "%B: �識���� .directive コマンド��: %s"
+msgstr "%s: import タイプを�識����ん -- %x"
 
-#: elf32-sh-symbian.c:504
+#: elf32-sh-symbian.c:503
 msgid "%B: Failed to add renamed symbol %s"
-msgstr "%B: ��を変更��シンボル %s を追加�る��失敗����"
+msgstr ""
 
 #: elf32-sh.c:568
+#, fuzzy
 msgid "%B: 0x%lx: warning: bad R_SH_USES offset"
-msgstr "%B: 0x%lx: 警告: 誤�� R_SH_USES オフセット��"
+msgstr "%s: 0x%lx: 警告: R_SH_USES オフセット��正��"
 
 #: elf32-sh.c:580
+#, fuzzy
 msgid "%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"
-msgstr "%B: 0x%lx: 警告: R_SH_USES ��識����命令 0x%x を指�����"
+msgstr "%s: 0x%lx: 警告: R_SH_USES ��識����命令 0x%x を指�����"
 
 #: elf32-sh.c:597
+#, fuzzy
 msgid "%B: 0x%lx: warning: bad R_SH_USES load offset"
-msgstr "%B: 0x%lx: 警告: 誤�� R_SH_USES ロードオフセット��"
+msgstr "%s: 0x%lx: 警告: R_SH_USES load オフセット��正��"
 
 #: elf32-sh.c:612
+#, fuzzy
 msgid "%B: 0x%lx: warning: could not find expected reloc"
-msgstr "%B: 0x%lx: 警告: 予期�れる��置を見��り��ん���"
+msgstr "%s: 0x%lx: 警告: 存在�る�����置領域を見��られ��ん"
 
 #: elf32-sh.c:640
+#, fuzzy
 msgid "%B: 0x%lx: warning: symbol in unexpected section"
-msgstr "%B: 0x%lx: 警告: 予期���セクション内�シンボル��り��"
+msgstr "%s: 0x%lx: 警告: シンボル�予期��セクション��り��"
 
 #: elf32-sh.c:766
+#, fuzzy
 msgid "%B: 0x%lx: warning: could not find expected COUNT reloc"
-msgstr "%B: 0x%lx: 警告: 予期�れる COUNT ��置�見��り��ん���"
+msgstr "%s: 0x%lx: 警告: 存在�る��� COUNT ��置領域を見��られ��ん"
 
 #: elf32-sh.c:775
+#, fuzzy
 msgid "%B: 0x%lx: warning: bad count"
-msgstr "%B: 0x%lx: 警告: 誤�� count ��"
+msgstr "%s: 0x%lx: 警告: count ��正��"
 
 #: elf32-sh.c:1179 elf32-sh.c:1549
+#, fuzzy
 msgid "%B: 0x%lx: fatal: reloc overflow while relaxing"
-msgstr "%B: 0x%lx: 致命的: 緩和中���置�溢れ���"
+msgstr "%s: 0x%lx: 致命的: relax 中���置領域�オー�ーフロー����"
 
 #: elf32-sh.c:4057 elf64-sh64.c:1514
 msgid "Unexpected STO_SH5_ISA32 on local symbol is not handled"
-msgstr "局所シンボル�関�る予期��� STO_SH5_ISA32 ��り扱�れ��ん"
+msgstr ""
 
 #: elf32-sh.c:4304
 msgid "%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"
-msgstr "%B: 0x%lx: 致命的: 緩和をサ�ート�る��置用�分�ターゲット�整列�れ����ん"
+msgstr ""
 
 #: elf32-sh.c:4337 elf32-sh.c:4352
 msgid "%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"
-msgstr "%B: 0x%lx: 致命的: 整列�れ���� %s ��置 0x%lx ��"
+msgstr ""
 
 #: elf32-sh.c:4366
 msgid "%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"
-msgstr "%B: 0x%lx: 致命的: R_SH_PSHA ��置 %d � -32..32 �範囲内��り��ん"
+msgstr ""
 
 #: elf32-sh.c:4380
 msgid "%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"
-msgstr "%B: 0x%lx: 致命的: R_SH_PSHL ��置 %d � -32..32 ��範囲内��り��ん"
+msgstr ""
 
 #: elf32-sh.c:4524 elf32-sh.c:4994
+#, fuzzy
 msgid "%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"
-msgstr "%B(%A+0x%lx): 読��り専用セクション内��る `%s' ��修正を発行����ん"
+msgstr "%s: ローダ��置�読込�専用セクション %s ��り��"
 
 #: elf32-sh.c:5101
+#, fuzzy
 msgid "%B(%A+0x%lx): %s relocation against external symbol \"%s\""
-msgstr "%B(%A+0x%lx): %s ��置 (外部シンボル \"%s\" �対�る) ��"
+msgstr "%s: 0x%lx �� CALL16 ��置�大域シンボルを対象������ん"
 
 #: elf32-sh.c:5574
-#, c-format
+#, fuzzy, c-format
 msgid "%X%C: relocation to \"%s\" references a different segment\n"
-msgstr "%X%C: \"%s\" ����置�異�るセグメントを�照�����\n"
+msgstr "%s: 警告: 確��れ�セクション `%s' �セグメント内��り��ん"
 
 #: elf32-sh.c:5580
-#, c-format
+#, fuzzy, c-format
 msgid "%C: warning: relocation to \"%s\" references a different segment\n"
-msgstr "%C: 警告: \"%s\" ����置�異�るセグメントを�照�����\n"
+msgstr "%s: 警告: 確��れ�セクション `%s' �セグメント内��り��ん"
 
 #: elf32-sh.c:6358 elf32-sh.c:6441
+#, fuzzy
 msgid "%B: `%s' accessed both as normal and FDPIC symbol"
-msgstr "%B: `%s' �通常�シンボル� FDPIC シンボル�両方���アクセス�れ���"
+msgstr "%B: `%s' �通常�シンボル�スレッド局所シンボル�アクセス����"
 
 #: elf32-sh.c:6363 elf32-sh.c:6445
+#, fuzzy
 msgid "%B: `%s' accessed both as FDPIC and thread local symbol"
-msgstr "%B: `%s' � FDPIC シンボル�局所シンボル�両方���アクセス�れ���"
+msgstr "%B: `%s' �通常�シンボル�スレッド局所シンボル�アクセス����"
 
 #: elf32-sh.c:6393
+#, fuzzy
 msgid "%B: Function descriptor relocation with non-zero addend"
 msgstr ""
+"\n"
+"関数記述��開始アドレス��置�����: %04lx\n"
 
-#: elf32-sh.c:6629 elf64-alpha.c:4648
+#: elf32-sh.c:6629 elf64-alpha.c:4560
+#, fuzzy
 msgid "%B: TLS local exec code cannot be linked into shared objects"
-msgstr "%B: TLS 局所実行コード�共有オブジェクト内�リンク����ん"
+msgstr "%s: ��置 %s �共有オブジェクトを作����る時点��利用����ん"
 
 #: elf32-sh64.c:223 elf64-sh64.c:2314
-#, c-format
+#, fuzzy, c-format
 msgid "%s: compiled as 32-bit object and %s is 64-bit"
-msgstr "%s: 32-bit オブジェクト���コンパイル�れ���� %s � 64 ビット���コンパイル�れ���"
+msgstr "%s: 64 ビットシステム用�コンパイル�れ����ターゲット� 32 ビット��"
 
 #: elf32-sh64.c:226 elf64-sh64.c:2317
-#, c-format
+#, fuzzy, c-format
 msgid "%s: compiled as 64-bit object and %s is 32-bit"
-msgstr "%s: 64 ビットオブジェクト���コンパイル�れ���� %s �32 ビットオブジェクト���コンパイル�れ���"
+msgstr "%s: 64 ビットシステム用�コンパイル�れ����ターゲット� 32 ビット��"
 
 #: elf32-sh64.c:228 elf64-sh64.c:2319
 #, c-format
 msgid "%s: object size does not match that of target %s"
-msgstr "%s: オブジェクトサイズ�ターゲット %s ������ん"
+msgstr ""
 
 #: elf32-sh64.c:451 elf64-sh64.c:2833
 #, c-format
@@ -2214,38 +2146,41 @@ msgstr ""
 
 #: elf32-sh64.c:528
 msgid "PTB mismatch: a SHmedia address (bit 0 == 1)"
-msgstr "PTB �一致: SHmedia アドレス (ビット0 == 1)"
+msgstr ""
 
 #: elf32-sh64.c:531
 msgid "PTA mismatch: a SHcompact address (bit 0 == 0)"
-msgstr "PTA �一致: SHcompact アドレス (ビット0 == 0)"
+msgstr ""
 
 #: elf32-sh64.c:549
 #, c-format
 msgid "%s: GAS error: unexpected PTB insn with R_SH_PT_16"
-msgstr "%s: GAS エラー: 予期��� PTB 命令 (R_SH_PT_16 付�) ��"
+msgstr ""
 
 #: elf32-sh64.c:598
+#, fuzzy
 msgid "%B: error: unaligned relocation type %d at %08x reloc %p\n"
-msgstr "%B: エラー: 整列�れ������置型 %d �� (�置 %08x���置 %p)\n"
+msgstr "%s: �正���置タイプ %d �アドレス 0x%lx �見��り���"
 
 #: elf32-sh64.c:674
 #, c-format
 msgid "%s: could not write out added .cranges entries"
-msgstr "%s: 追加�れ� .cranges エントリを書�出���ん���"
+msgstr ""
 
 #: elf32-sh64.c:734
 #, c-format
 msgid "%s: could not write out sorted .cranges entries"
-msgstr "%s: ソート�れ� .cranges エントリを書�出���ん���"
+msgstr ""
 
 #: elf32-sparc.c:89
+#, fuzzy
 msgid "%B: compiled for a 64 bit system and target is 32 bit"
-msgstr "%B: 64 ビットシステム用�コンパイル�れ����ターゲット� 32 ビット��"
+msgstr "%s: 64 ビットシステム用�コンパイル�れ����ターゲット� 32 ビット��"
 
 #: elf32-sparc.c:102
+#, fuzzy
 msgid "%B: linking little endian files with big endian files"
-msgstr "%B: リトルエンディアン�ファイル�ビッグエンディアン�ファイル�をリンク�����"
+msgstr "%s: リトルエンディアン�ファイル�ビッグエンディアン�ファイル�をリンク�よ�������"
 
 #: elf32-spu.c:719
 msgid "%X%P: overlay section %A does not start on a cache line.\n"
@@ -2265,20 +2200,20 @@ msgstr ""
 
 #: elf32-spu.c:1011
 msgid "warning: call to non-function symbol %s defined in %B"
-msgstr "警告: �関数シンボル %s (%B 内�定義�れ�) �呼�出���"
+msgstr ""
 
 #: elf32-spu.c:1361
 msgid "%A:0x%v lrlive .brinfo (%u) differs from analysis (%u)\n"
-msgstr "%A:0x%v lrlive .brinfo (%u) �分�内容 (%u) �異�り��\n"
+msgstr ""
 
 #: elf32-spu.c:1880
 msgid "%B is not allowed to define %s"
-msgstr "%B � %s を定義�る���許��れ����ん"
+msgstr ""
 
 #: elf32-spu.c:1888
 #, c-format
 msgid "you are not allowed to define %s in a script"
-msgstr "スクリプト内� %s を定義�る���許��れ����ん"
+msgstr ""
 
 #: elf32-spu.c:1922
 #, c-format
@@ -2289,59 +2224,59 @@ msgstr ""
 msgid "overlay stub relocation overflow"
 msgstr ""
 
-#: elf32-spu.c:1960
+#: elf32-spu.c:1960 elf64-ppc.c:11327
 msgid "stubs don't match calculated size"
-msgstr "スタブ�計算��サイズ�一致�����ん"
+msgstr ""
 
 #: elf32-spu.c:2542
 #, c-format
 msgid "warning: %s overlaps %s\n"
-msgstr "警告: %s � %s ���り������\n"
+msgstr ""
 
 #: elf32-spu.c:2558
 #, c-format
 msgid "warning: %s exceeds section size\n"
-msgstr "警告: %s �セクション長を超�����\n"
+msgstr ""
 
 #: elf32-spu.c:2589
 msgid "%A:0x%v not found in function table\n"
-msgstr "%A:0x%v �関数表内�見��り��ん\n"
+msgstr ""
 
 #: elf32-spu.c:2729
 msgid "%B(%A+0x%v): call to non-code section %B(%A), analysis incomplete\n"
-msgstr "%B(%A+0x%v): �コードセクション %B(%A) �呼�出���。分���完全��\n"
+msgstr ""
 
 #: elf32-spu.c:3297
 #, c-format
 msgid "Stack analysis will ignore the call from %s to %s\n"
-msgstr "スタック分�� %s �ら %s ��呼�出��無視�れ��\n"
+msgstr ""
 
 #: elf32-spu.c:3988
 msgid "  %s: 0x%v\n"
-msgstr "  %s: 0x%v\n"
+msgstr ""
 
 #: elf32-spu.c:3989
 msgid "%s: 0x%v 0x%v\n"
-msgstr "%s: 0x%v 0x%v\n"
+msgstr ""
 
 #: elf32-spu.c:3994
 msgid "  calls:\n"
-msgstr "  呼�出�:\n"
+msgstr ""
 
 #: elf32-spu.c:4002
 #, c-format
 msgid "   %s%s %s\n"
-msgstr "   %s%s %s\n"
+msgstr ""
 
 #: elf32-spu.c:4307
-#, c-format
+#, fuzzy, c-format
 msgid "%s duplicated in %s\n"
-msgstr "%s � %s 内��複�����\n"
+msgstr "%s: export スタブ %s ��複�����"
 
 #: elf32-spu.c:4311
 #, c-format
 msgid "%s duplicated\n"
-msgstr "%s ��複�����\n"
+msgstr ""
 
 #: elf32-spu.c:4318
 msgid "sorry, no support for duplicate object files in auto-overlay script\n"
@@ -2367,63 +2302,65 @@ msgstr ""
 
 #: elf32-spu.c:4687
 msgid "Maximum stack required is 0x%v\n"
-msgstr "�求�れる最大スタック� 0x%v ��\n"
+msgstr ""
 
 #: elf32-spu.c:4778
 msgid "fatal error while creating .fixup"
-msgstr ".fixup 作�中�致命的エラー�発生����"
+msgstr ""
 
 #: elf32-spu.c:5006
+#, fuzzy
 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"
-msgstr "%B(%s+0x%lx): 解決���� %s ��置 (シンボル `%s' �対�る) ��"
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
-#: elf32-tic6x.c:1602
-msgid "warning: generating a shared library containing non-PIC code"
-msgstr "警告: � PIC コードを�む共有ライブラリを生������"
-
-#: elf32-tic6x.c:1607
-msgid "warning: generating a shared library containing non-PID code"
-msgstr "警告: � PID コードを�む共有ライブラリを生������"
-
-#: elf32-tic6x.c:2539
+#: elf32-tic6x.c:1539
+#, fuzzy
 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
-msgstr "%B: SB �関連����置����__c6xabi_DSBT_BASE �定義�れ����ん"
-
-#: elf32-tic6x.c:2759
-msgid "dangerous relocation"
-msgstr "�険���置��"
+msgstr "GP 関連���置� _gp �未定義�時点��れ���"
 
-#: elf32-tic6x.c:3740
-msgid "%B: error: unknown mandatory EABI object attribute %d"
-msgstr "%B: エラー: �明�必須 EABI オブジェクト属性 %d ��"
+#. Shared libraries and exception handling support not
+#. implemented.
+#: elf32-tic6x.c:1554
+#, fuzzy
+msgid "%B: relocation type %d not implemented"
+msgstr "��置 `%s' ���実装�れ����ん\n"
 
-#: elf32-tic6x.c:3748
-msgid "%B: warning: unknown EABI object attribute %d"
-msgstr "%B: 警告: �明�EABI オブジェクト属性 %d ��"
+#: elf32-tic6x.c:1640
+#, fuzzy
+msgid "dangerous relocation"
+msgstr "内部エラー: �険���置��"
 
-#: elf32-tic6x.c:3860 elf32-tic6x.c:3868
+#: elf32-tic6x.c:1788 elf32-tic6x.c:1796
 msgid "error: %B requires more stack alignment than %B preserves"
-msgstr "error: %B � %B ������るより大��スタック整列を必�����"
+msgstr ""
 
-#: elf32-tic6x.c:3878 elf32-tic6x.c:3887
+#: elf32-tic6x.c:1806 elf32-tic6x.c:1815
 msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
-msgstr "エラー: %B 内��明� Tag_ABI_array_object_alignment 値��"
+msgstr ""
 
-#: elf32-tic6x.c:3896 elf32-tic6x.c:3905
+#: elf32-tic6x.c:1824 elf32-tic6x.c:1833
 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
-msgstr "エラー: %B 内��明� Tag_ABI_array_object_align_expected 値��"
+msgstr ""
 
-#: elf32-tic6x.c:3913 elf32-tic6x.c:3920
+#: elf32-tic6x.c:1841 elf32-tic6x.c:1848
 msgid "error: %B requires more array alignment than %B preserves"
-msgstr "エラー: %B � %B ������るより大���列整列を必�����"
+msgstr ""
 
-#: elf32-tic6x.c:3942
+#: elf32-tic6x.c:1870
 msgid "warning: %B and %B differ in wchar_t size"
-msgstr "警告: %B � %B � wchar_t サイズ�異�り��"
+msgstr ""
 
-#: elf32-tic6x.c:3960
+#: elf32-tic6x.c:1888
 msgid "warning: %B and %B differ in whether code is compiled for DSBT"
-msgstr "警告: %B � %B �コード� DSBT 用�コンパイル�れ���異�り��"
+msgstr ""
+
+#: elf32-tic6x.c:1898
+msgid "warning: %B and %B differ in position-dependence of data addressing"
+msgstr ""
+
+#: elf32-tic6x.c:1908
+msgid "warning: %B and %B differ in position-dependence of code addressing"
+msgstr ""
 
 #: elf32-v850.c:173
 #, c-format
@@ -2451,8 +2388,9 @@ msgid "Variable `%s' cannot be in both zero and tiny data regions simultaneously
 msgstr "変数 `%s' � zero � tiny データ領域��時�置��������ん"
 
 #: elf32-v850.c:483
-msgid "FAILED to find previous HI16 reloc"
-msgstr "以�� HI16 ��置を見��られ��ん���"
+#, c-format
+msgid "FAILED to find previous HI16 reloc\n"
+msgstr "以�� HI16 ��置を見��られ��ん���\n"
 
 #: elf32-v850.c:2155
 msgid "could not locate special linker symbol __gp"
@@ -2467,8 +2405,9 @@ msgid "could not locate special linker symbol __ctbp"
 msgstr "特殊リンカシンボル __ctbp ��置を特定����ん���"
 
 #: elf32-v850.c:2341
+#, fuzzy
 msgid "%B: Architecture mismatch with previous modules"
-msgstr "%B: ��モジュール�アーキテク�ャ�一致���ん"
+msgstr "%s: 以��モジュール�アーキテク�ャ�一致���ん"
 
 #. xgettext:c-format.
 #: elf32-v850.c:2360
@@ -2487,19 +2426,19 @@ msgid "v850e architecture"
 msgstr "v850e アーキテク�ャ"
 
 #: elf32-v850.c:2367
-#, c-format
+#, fuzzy, c-format
 msgid "v850e1 architecture"
-msgstr "v850e1 アーキテク�ャ"
+msgstr "v850e アーキテク�ャ"
 
 #: elf32-v850.c:2368
-#, c-format
+#, fuzzy, c-format
 msgid "v850e2 architecture"
-msgstr "v850e2 アーキテク�ャ"
+msgstr "v850e アーキテク�ャ"
 
 #: elf32-v850.c:2369
-#, c-format
+#, fuzzy, c-format
 msgid "v850e2v3 architecture"
-msgstr "v850e2v3 アーキテク�ャ"
+msgstr "v850e アーキテク�ャ"
 
 #: elf32-vax.c:531
 #, c-format
@@ -2507,14 +2446,14 @@ msgid " [nonpic]"
 msgstr ""
 
 #: elf32-vax.c:534
-#, c-format
+#, fuzzy, c-format
 msgid " [d-float]"
-msgstr ""
+msgstr "浮動�数"
 
 #: elf32-vax.c:537
-#, c-format
+#, fuzzy, c-format
 msgid " [g-float]"
-msgstr ""
+msgstr "浮動�数"
 
 #: elf32-vax.c:654
 #, c-format
@@ -2522,170 +2461,181 @@ msgid "%s: warning: GOT addend of %ld to `%s' does not match previous GOT addend
 msgstr ""
 
 #: elf32-vax.c:1587
-#, c-format
+#, fuzzy, c-format
 msgid "%s: warning: PLT addend of %d to `%s' from %s section ignored"
-msgstr ""
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
 #: elf32-vax.c:1714
-#, c-format
+#, fuzzy, c-format
 msgid "%s: warning: %s relocation against symbol `%s' from %s section"
-msgstr "%s: 警告: %s ��置 (シンボル `%s' �対�る %s セクション�ら) ��"
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
 #: elf32-vax.c:1720
-#, c-format
+#, fuzzy, c-format
 msgid "%s: warning: %s relocation to 0x%x from %s section"
-msgstr "%s: 警告: %s ��置 (0x%x � %s セクション�ら) ��"
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
-#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342
+#: elf32-xstormy16.c:451 elf32-ia64.c:2861 elf64-ia64.c:2861
 msgid "non-zero addend in @fptr reloc"
 msgstr ""
 
 #: elf32-xtensa.c:918
 msgid "%B(%A): invalid property table"
-msgstr "%B(%A): 無効�プロパティ表��"
+msgstr ""
 
 #: elf32-xtensa.c:2780
 msgid "%B(%A+0x%lx): relocation offset out of range (size=0x%x)"
-msgstr "%B(%A+0x%lx): ��置オフセット�範囲外�� (サイズ=0x%x)"
+msgstr ""
 
 #: elf32-xtensa.c:2859 elf32-xtensa.c:2980
+#, fuzzy
 msgid "dynamic relocation in read-only section"
-msgstr "動的��置�読�込�専用セクション��り��"
+msgstr "%s: ローダ��置�読込�専用セクション %s ��り��"
 
 #: elf32-xtensa.c:2956
 msgid "TLS relocation invalid without dynamic sections"
-msgstr "動的セクション���場�� TLS ��置�無効��"
+msgstr ""
 
 #: elf32-xtensa.c:3173
 msgid "internal inconsistency in size of .got.loc section"
-msgstr ".got.loc セクション�サイズ�内部一貫性��り��ん"
+msgstr ""
 
 #: elf32-xtensa.c:3486
 msgid "%B: incompatible machine type. Output is 0x%x. Input is 0x%x"
-msgstr "%B: 互�性���マシン型��。出力� 0x%x�入力� 0x%x ��"
+msgstr ""
 
 #: elf32-xtensa.c:4715 elf32-xtensa.c:4723
 msgid "Attempt to convert L32R/CALLX to CALL failed"
-msgstr "L32R/CALLX �ら CALL ��変��試��失敗����"
+msgstr ""
 
 #: elf32-xtensa.c:6333 elf32-xtensa.c:6409 elf32-xtensa.c:7525
 msgid "%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"
-msgstr "%B(%A+0x%lx): 命令をデコード����ん。設定���������能性��り��"
+msgstr ""
 
 #: elf32-xtensa.c:7265
 msgid "%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"
-msgstr "%B(%A+0x%lx): XTENSA_ASM_SIMPLIFY ��置用�命令をデコード����ん。設定���������能性��り��"
+msgstr ""
 
 #: elf32-xtensa.c:9024
+#, fuzzy
 msgid "invalid relocation address"
-msgstr "無効���置アドレス��"
+msgstr "%s: ��置タイプ %d ���切��"
 
 #: elf32-xtensa.c:9073
 msgid "overflow after relaxation"
-msgstr "緩和後�オー�ーフロー����"
+msgstr ""
 
 #: elf32-xtensa.c:10205
 msgid "%B(%A+0x%lx): unexpected fix for %s relocation"
-msgstr "%B(%A+0x%lx): %s ��置用�予期���修正��"
+msgstr ""
 
 #: elf64-alpha.c:460
 msgid "GPDISP relocation did not find ldah and lda instructions"
 msgstr "GPDISP ��置� ldah � lda 命令を見����ん���"
 
-#: elf64-alpha.c:2495
+#: elf64-alpha.c:2408
 msgid "%B: .got subsegment exceeds 64K (size %d)"
 msgstr "%B: .got サブセグメント� 64K を超����� (サイズ %d)"
 
-#: elf64-alpha.c:4392 elf64-alpha.c:4404
+#: elf64-alpha.c:4304 elf64-alpha.c:4316
+#, fuzzy
 msgid "%B: gp-relative relocation against dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �対�る gp 関連��置��"
+msgstr "32ビット gp 関連��置�外部シンボル�用�発生����"
 
-#: elf64-alpha.c:4430 elf64-alpha.c:4565
+#: elf64-alpha.c:4342 elf64-alpha.c:4477
+#, fuzzy
 msgid "%B: pc-relative relocation against dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �対�る pc 関連��置��"
+msgstr "32ビット gp 関連��置�外部シンボル�用�発生����"
 
-#: elf64-alpha.c:4458
+#: elf64-alpha.c:4370
 msgid "%B: change in gp: BRSGP %s"
-msgstr "%B: gp 内�変更��り��: BRSGP %s"
+msgstr ""
 
-#: elf64-alpha.c:4483
+#: elf64-alpha.c:4395
+#, fuzzy
 msgid "<unknown>"
-msgstr "<�明>"
+msgstr "*� 明*"
 
-#: elf64-alpha.c:4488
+#: elf64-alpha.c:4400
 msgid "%B: !samegp reloc against symbol without .prologue: %s"
-msgstr "%B: .prologue �無�シンボル�対�る !samegp ��置��: %s"
+msgstr ""
 
-#: elf64-alpha.c:4540
+#: elf64-alpha.c:4452
+#, fuzzy
 msgid "%B: unhandled dynamic relocation against %s"
-msgstr "%B: %s �対�る�り扱�れ��動的��置��"
+msgstr "��置 %s ��り扱�れ��ん���"
 
-#: elf64-alpha.c:4572
+#: elf64-alpha.c:4484
+#, fuzzy
 msgid "%B: pc-relative relocation against undefined weak symbol %s"
-msgstr "%B: 未定義�弱�シンボル %s �対�る pc 関連���置��"
+msgstr "GP 関連���置� _gp �未定義�時点��れ���"
 
-#: elf64-alpha.c:4632
+#: elf64-alpha.c:4544
+#, fuzzy
 msgid "%B: dtp-relative relocation against dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �対�る dtp 関連���置��"
+msgstr "32ビット gp 関連��置�外部シンボル�用�発生����"
 
-#: elf64-alpha.c:4655
+#: elf64-alpha.c:4567
+#, fuzzy
 msgid "%B: tp-relative relocation against dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �対�る tp 関連���置��"
+msgstr "32ビット gp 関連��置�外部シンボル�用�発生����"
 
-#: elf64-hppa.c:2094
+#: elf64-hppa.c:2101
 #, c-format
 msgid "stub entry for %s cannot load .plt, dp offset = %ld"
-msgstr "%s 用�スタブエントリ� .plt をロード����ん。 dp オフセット = %ld"
+msgstr ""
 
-#: elf64-hppa.c:3292
+#: elf64-hppa.c:3299
+#, fuzzy
 msgid "%B(%A+0x%lx): cannot reach %s"
-msgstr "%B(%A+0x%lx): %s ��到�����ん"
+msgstr "%s(%s+0x%lx): %s (%s) を�り扱���ん"
 
 #: elf64-mmix.c:1177
 #, c-format
 msgid ""
 "%s: Internal inconsistency error for value for\n"
 " linker-allocated global register: linked: 0x%lx%08lx != relaxed: 0x%lx%08lx\n"
-msgstr "%s: リンカ��置��大域レジスタ�値�内部一貫性���れ����エラー��: リンク: 0x%lx%08lx != 緩和: 0x%lx%08lx\n"
+msgstr ""
 
 #: elf64-mmix.c:1607
 #, c-format
 msgid "%s: base-plus-offset relocation against register symbol: (unknown) in %s"
-msgstr "%s: レジスタシンボル�対�る base-plus-offset ��置��: (�明) (%s 内)"
+msgstr ""
 
 #: elf64-mmix.c:1612
-#, c-format
+#, fuzzy, c-format
 msgid "%s: base-plus-offset relocation against register symbol: %s in %s"
-msgstr "%s: レジスタシンボル�対�る base-plus-offset ��置��: %s (%s 内)"
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
 #: elf64-mmix.c:1656
 #, c-format
 msgid "%s: register relocation against non-register symbol: (unknown) in %s"
-msgstr "%s: �レジスタシンボル�対�るレジスタ��置��: (�明) (%s 内)"
+msgstr ""
 
 #: elf64-mmix.c:1661
-#, c-format
+#, fuzzy, c-format
 msgid "%s: register relocation against non-register symbol: %s in %s"
-msgstr "%s: �レジスタシンボル�対�るレジスタ��置��: %s (%s 内)"
+msgstr "%s: 警告: シンボル `%s' (%s セクション)�対�る��置を解決����ん"
 
 #: elf64-mmix.c:1698
 #, c-format
 msgid "%s: directive LOCAL valid only with a register or absolute value"
-msgstr "%s: LOCAL 指示�レジスタ���絶対値�対����有効��"
+msgstr ""
 
 #: elf64-mmix.c:1726
 #, c-format
 msgid "%s: LOCAL directive: Register $%ld is not a local register.  First global register is $%ld."
-msgstr "%s: LOCAL 指示: レジスタ $%ld �局所レジスタ���り��ん。最��大域レジスタ� $%ld ��。"
+msgstr ""
 
 #: elf64-mmix.c:2190
 #, c-format
 msgid "%s: Error: multiple definition of `%s'; start of %s is set in a earlier linked file\n"
-msgstr "%s: エラー: `%s' �複数定義�れ����; %s �開始�先�リンク�れ�ファイル�設定�れ��\n"
+msgstr ""
 
 #: elf64-mmix.c:2248
+#, fuzzy
 msgid "Register section has contents\n"
-msgstr "レジスタセクション�内容��り��\n"
+msgstr "セクション�内容��り��ん"
 
 #: elf64-mmix.c:2440
 #, c-format
@@ -2693,85 +2643,70 @@ msgid ""
 "Internal inconsistency: remaining %u != max %u.\n"
 "  Please report this bug."
 msgstr ""
-"内部一貫性���れ����ん: 残り %u != 最大 %u。\n"
-"  ���グを報告������。"
 
-#: elf64-ppc.c:2744 libbfd.c:1012
+#: elf64-ppc.c:2741 libbfd.c:997
+#, fuzzy
 msgid "%B: compiled for a big endian system and target is little endian"
-msgstr "%B: ビッグエンディアンシステム用�コンパイル�れ�����ターゲット�リトルエンディアン��"
+msgstr "%s: ビッグエンディアンシステム用�コンパイル�れ�ターゲット�リトルエンディアン��"
 
-#: elf64-ppc.c:2747 libbfd.c:1014
+#: elf64-ppc.c:2744 libbfd.c:999
+#, fuzzy
 msgid "%B: compiled for a little endian system and target is big endian"
-msgstr "%B: リトルエンディアンシステム用�コンパイル�れ�����ターゲット�ビッグエンディアン��"
+msgstr "%s: リトルエンディアンシステム用�コンパイル�れ�ターゲット�ビッグエンディアン��。"
 
-#: elf64-ppc.c:4160
-msgid "%B: cannot create stub entry %s\n"
-msgstr "%B: スタブエントリ %s を作�����ん\n"
-
-#: elf64-ppc.c:6484
+#: elf64-ppc.c:6473
 #, c-format
-msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc\n"
+msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc"
 msgstr ""
 
-#: elf64-ppc.c:6912
-msgid "dynreloc miscount for %B, section %A\n"
-msgstr "動的��置数�����ん (ファイル %B, セクション %A)\n"
+#: elf64-ppc.c:6901
+#, fuzzy
+msgid "dynreloc miscount for %B, section %A"
+msgstr "セクション %s 用����������置を検出����"
 
-#: elf64-ppc.c:6996
+#: elf64-ppc.c:6985
 msgid "%B: .opd is not a regular array of opd entries"
-msgstr "%B: .opd � opd エントリ�通常�列���り��ん"
+msgstr ""
 
-#: elf64-ppc.c:7005
+#: elf64-ppc.c:6994
+#, fuzzy
 msgid "%B: unexpected reloc type %u in .opd section"
-msgstr "%B: .opd セクション内�予期�����置型 %u ��"
+msgstr "%s: external 部分��る ATN タイプ %d ������り得��ん"
 
-#: elf64-ppc.c:7026
+#: elf64-ppc.c:7015
 msgid "%B: undefined sym `%s' in .opd section"
-msgstr "%B: .opd セクション内�未定義シンボル `%s' ��"
-
-#: elf64-ppc.c:7584
-msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
-msgstr "%H __tls_get_addr �引数�失�れ���。TLS 最�化�無効��り��\n"
+msgstr ""
 
-#: elf64-ppc.c:7929 elf64-ppc.c:8450
+#: elf64-ppc.c:7877 elf64-ppc.c:8392
 #, c-format
 msgid "%s defined on removed toc entry"
-msgstr "削除�れ� toc エントリ� %s �定義�れ����"
-
-#: elf64-ppc.c:9474
-#, c-format
-msgid "cannot find opd entry toc for %s\n"
 msgstr ""
 
-#: elf64-ppc.c:9556
+#: elf64-ppc.c:9459
 #, c-format
-msgid "long branch stub `%s' offset overflow\n"
-msgstr "長�分�スタブ `%s' �オフセット�オー�ーフロー����\n"
+msgid "long branch stub `%s' offset overflow"
+msgstr ""
 
-#: elf64-ppc.c:9615
+#: elf64-ppc.c:9518
 #, c-format
-msgid "can't find branch stub `%s'\n"
-msgstr "分�スタブ `%s' �見��り��ん\n"
+msgid "can't find branch stub `%s'"
+msgstr ""
 
-#: elf64-ppc.c:9677 elf64-ppc.c:9819
+#: elf64-ppc.c:9580 elf64-ppc.c:9716
 #, c-format
-msgid "linkage table error against `%s'\n"
-msgstr "`%s' �対�るリンク表エラー��\n"
+msgid "linkage table error against `%s'"
+msgstr ""
 
-#: elf64-ppc.c:9993
+#: elf64-ppc.c:9886
 #, c-format
-msgid "can't build branch stub `%s'\n"
-msgstr "分�スタブ `%s' を構築����ん\n"
+msgid "can't build branch stub `%s'"
+msgstr ""
 
-#: elf64-ppc.c:10814
+#: elf64-ppc.c:10684
 msgid "%B section %A exceeds stub group size"
-msgstr "%B セクション %A �スタブグループサイズを超������"
-
-#: elf64-ppc.c:11457
-msgid "stubs don't match calculated size\n"
-msgstr "スタブ�計算��サイズ�一致�����ん\n"
+msgstr ""
 
-#: elf64-ppc.c:11469
+#: elf64-ppc.c:11339
 #, c-format
 msgid ""
 "linker stubs in %u group%s\n"
@@ -2781,447 +2716,434 @@ msgid ""
 "  long toc adj %lu\n"
 "  plt call     %lu"
 msgstr ""
-"%u グループ%s 内�リンクスタブ\n"
-"  分�         %lu\n"
-"  toc 調整     %lu\n"
-"  長分�       %lu\n"
-"  長 toc 調整  %lu\n"
-"  plt 呼�出� %lu"
-
-#: elf64-ppc.c:11819
-msgid "%H: %s used with TLS symbol %s\n"
-msgstr "%H: %s � TLS シンボル %s �併��使用�れ���\n"
 
-#: elf64-ppc.c:11820
-msgid "%H: %s used with non-TLS symbol %s\n"
-msgstr "%H: %s ��-TLS シンボル %s �併��使用�れ���\n"
-
-#: elf64-ppc.c:12318
-msgid "%H: automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc\n"
-msgstr "%H: 自動的�複数 TOC �使用���る crt ファイル��サ�ート�れ����ん。 -mminimal-toc を付���コンパイル�る�� gcc をアップグレード������\n"
+#: elf64-ppc.c:12190
+msgid "%B(%A+0x%lx): automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc"
+msgstr ""
 
-#: elf64-ppc.c:12324
-msgid "%H: sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern\n"
+#: elf64-ppc.c:12198
+msgid "%B(%A+0x%lx): sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern"
 msgstr ""
 
-#: elf64-ppc.c:13041
-msgid "%B: relocation %s is not supported for symbol %s\n"
-msgstr "%B: ��置 %s (シンボル %s 用) �サ�ート�れ����ん\n"
+#: elf64-ppc.c:12919
+#, fuzzy
+msgid "%B: relocation %s is not supported for symbol %s."
+msgstr "%s: ��置 %s �シンボル %s 用�も�������サ�ート�れ����ん"
 
-#: elf64-ppc.c:13218
-msgid "%H: error: %s not a multiple of %u\n"
-msgstr "%H: エラー: %s � %u ��数���り��ん\n"
+#: elf64-ppc.c:13096
+#, fuzzy
+msgid "%B: error: relocation %s not a multiple of %d"
+msgstr "警告�.pdata セクションサイズ (%ld) � %d ��数���り��ん\n"
 
 #: elf64-sh64.c:1682
-#, c-format
+#, fuzzy, c-format
 msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n"
-msgstr "%s: エラー: 整列�れ������置型 %d �� (�置 %08x���置 %08x)\n"
+msgstr "%s: �正���置タイプ %d �アドレス 0x%lx �見��り���"
 
-#: elf64-sparc.c:445
+#: elf64-sparc.c:444
+#, fuzzy
 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
-msgstr "%B: STT_REGISTER を使��宣言��る��レジスタ %%g[2367] ����"
+msgstr "%s: STT_REGISTER を使��宣言��る��レジスタ %%g[2367] ����"
 
-#: elf64-sparc.c:465
+#: elf64-sparc.c:464
+#, fuzzy
 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
-msgstr "レジスタ %%g%d �互�性���方法�使用�れ����: %s (%B 内)������ %s (%B 内) ��"
+msgstr "レジスタ %%g%d �矛盾��使�れ���: 以��宣言� %s � %s�%s � %s ��定義�れ���"
 
-#: elf64-sparc.c:488
+#: elf64-sparc.c:487
+#, fuzzy
 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
-msgstr "シンボル `%s' �異�る型を������: REGISTER (%B 内) ������ %s (%B 内) ��"
+msgstr "シンボル `%s' �異�る型を������: %s � REGISTER, ��� %s � %s �定義�れ����"
 
-#: elf64-sparc.c:533
+#: elf64-sparc.c:532
+#, fuzzy
 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
-msgstr "シンボル `%s' �異�る型を������: %s (%B 内) ������ REGISTER (%B 内) ��"
+msgstr "シンボル `%s' �異�る型をも�����: 以�� %s, %s �� REGISTER"
 
-#: elf64-sparc.c:686
+#: elf64-sparc.c:684
+#, fuzzy
 msgid "%B: linking UltraSPARC specific with HAL specific code"
-msgstr "%B: UltraSPARC 特有�コード� HAL 特有�コードをリンク�����"
-
-#: elf64-x86-64.c:1236
-msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
-msgstr "%B: ��置 %s (シンボル `%s' �対�る) � x32 モード��サ�ート�れ��ん"
+msgstr "%s: UltraSPARC 特有�コード� HAL 特有�コード�をリンク�よ�������"
 
-#: elf64-x86-64.c:1465
+#: elf64-x86-64.c:1360
 msgid "%B: '%s' accessed both as normal and thread local symbol"
-msgstr "%B: '%s' �通常シンボル�スレッド局所シンボル�両方���アクセス�れ���"
+msgstr ""
 
-#: elf64-x86-64.c:2934
+#: elf64-x86-64.c:2801
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d"
 msgstr ""
 
-#: elf64-x86-64.c:3193
+#: elf64-x86-64.c:3073
+#, fuzzy
 msgid "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"
-msgstr "%B: �護�れ�関数 `%s' �対�る��置 R_X86_64_GOTOFF64  �共有オブジェクト作�時��使用出���ん"
+msgstr "%s: ��置 %s �共有オブジェクトを作����る時点��利用����ん"
 
-#: elf64-x86-64.c:3305
+#: elf64-x86-64.c:3184
+#, fuzzy
 msgid "; recompile with -fPIC"
-msgstr "。 -fPIC を付���コンパイル������。"
+msgstr "%s: �ら� -fPIC を付���コンパイル�����？"
 
-#: elf64-x86-64.c:3310
+#: elf64-x86-64.c:3189
+#, fuzzy
 msgid "%B: relocation %s against %s `%s' can not be used when making a shared object%s"
-msgstr "%B: ��置 %s (%s `%s' �対�る) �共有オブジェクト作�時��使用出���ん%s"
+msgstr "%s: ��置 %s �共有オブジェクトを作����る時点��利用����ん"
 
-#: elf64-x86-64.c:3312
+#: elf64-x86-64.c:3191
+#, fuzzy
 msgid "%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s"
-msgstr "%B: ��置 %s (未定義 %s `%s' �対�る) �共有オブジェクト作�時��使用出���ん%s"
+msgstr "%s: ��置 %s �共有オブジェクトを作����る時点��利用����ん"
 
-#: elfcode.h:827
+#: elfcode.h:826
 #, c-format
 msgid "warning: %s has a corrupt string table index - ignoring"
-msgstr "警告: %s �破���文字列表索引を������。無視�����"
+msgstr ""
 
-#: elfcode.h:1237
+#: elfcode.h:1236
 #, c-format
 msgid "%s: version count (%ld) does not match symbol count (%ld)"
 msgstr "%s: �ージョンカウント (%ld) �シンボルカウント (%ld) �一致���ん"
 
-#: elfcode.h:1491
+#: elfcode.h:1476
 #, c-format
 msgid "%s(%s): relocation %d has invalid symbol index %ld"
-msgstr "%s(%s): ��置 %d �無効�シンボル索引 %ld を������"
+msgstr ""
 
 #: elfcore.h:312
 msgid "Warning: %B is truncated: expected core file size >= %lu, found: %lu."
-msgstr "警告: %B �切り詰�られ����: 予期�れるコアファイルサイズ >= %lu。見����サイズ: %lu。"
+msgstr ""
 
 #: elflink.c:1119
 msgid "%s: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"
-msgstr "%s: %B 内セクション %A � TLS 定義��%B 内セクション %A �� TLS 定義�一致���ん"
+msgstr ""
 
 #: elflink.c:1123
 msgid "%s: TLS reference in %B mismatches non-TLS reference in %B"
-msgstr "%s: %B 内� TLS �照� %B 内�� TLS �照�一致���ん"
+msgstr ""
 
 #: elflink.c:1127
 msgid "%s: TLS definition in %B section %A mismatches non-TLS reference in %B"
-msgstr "%s: %B 内セクション %A � TLS 定義� %B 内�� TLS �照�一致���ん"
+msgstr ""
 
 #: elflink.c:1131
 msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
-msgstr "%s: %B 内� TLS �照� %B 内セクション %A �� TLS 定義�一致���ん"
+msgstr ""
 
-#: elflink.c:1764
+#: elflink.c:1763
+#, fuzzy
 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
-msgstr "%B: 間接�ージョン付�シンボル `%s' �予期����定義��"
+msgstr "%s: 警告: `%s' ��定義��り得������"
 
-#: elflink.c:2077
+#: elflink.c:2076
+#, fuzzy
 msgid "%B: version node not found for symbol %s"
-msgstr "%B: シンボル %s 用��ージョンノード�見��り��ん"
+msgstr "%s: ��置 %s �シンボル %s 用�も�������サ�ート�れ����ん"
 
-#: elflink.c:2167
+#: elflink.c:2166
+#, fuzzy
 msgid "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'"
-msgstr "%B: 誤����置シンボル索引 (0x%lx >= 0x%lx) (オフセット 0x%lx�セクション `%A' 内用) ��"
+msgstr "%s: �正���置アドレス 0x%lx �セクション `%s' 内��り��"
 
-#: elflink.c:2178
+#: elflink.c:2177
 msgid "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the object file has no symbol table"
-msgstr "%B: オブジェクトファイル�シンボル表�無��も���ら�� 0 ���シンボル索引 (0x%lx) (オフセット 0x%lx�セクション `%A' 内) ��り��"
+msgstr ""
 
-#: elflink.c:2368
+#: elflink.c:2367
 msgid "%B: relocation size mismatch in %B section %A"
-msgstr "%B: ��置サイズ�一致���ん (%B 内セクション %A)"
+msgstr ""
 
-#: elflink.c:2663
+#: elflink.c:2662
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
 msgstr "警告: 動的シンボル `%s' �型�サイズ�定義�れ����ん"
 
-#: elflink.c:3421
+#: elflink.c:3418
 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
-msgstr "%P: 代替 ELF マシンコード (%d) � %B 内�見��り���。予期�れる�� %d ��\n"
+msgstr ""
 
-#: elflink.c:4067
+#: elflink.c:4050
+#, fuzzy
 msgid "%B: %s: invalid version %u (max %d)"
-msgstr "%B: %s: 無効��ージョン %u (最大 %d)"
+msgstr "%s: %s: ��切��ージョン %u (最大 %d)"
 
-#: elflink.c:4103
+#: elflink.c:4086
+#, fuzzy
 msgid "%B: %s: invalid needed version %d"
-msgstr "%B: %s: 無効�必���れる�ージョン %d ��"
+msgstr "%s: %s: 必���れる�ージョン %d ���切��"
 
-#: elflink.c:4299
+#: elflink.c:4285
 msgid "Warning: alignment %u of common symbol `%s' in %B is greater than the alignment (%u) of its section %A"
-msgstr "警告: 整列 %u (共通シンボル `%s' ��%B 内) �整列 %u (セクション %A) より大����"
+msgstr ""
 
-#: elflink.c:4305
+#: elflink.c:4291
+#, fuzzy
 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
-msgstr "警告: 整列 %u (シンボル `%s' ��%B 内) � %u (%B 内) より�����"
+msgstr "警告: シンボル `%s' �サイズ� %lu �ら %lu �変更�れ��� (%s 内)"
 
-#: elflink.c:4320
+#: elflink.c:4306
+#, fuzzy
 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B"
-msgstr "警告: シンボル `%s' �サイズ� %lu (%B 内) �ら %lu (%B 内) �変更�れ���"
+msgstr "警告: シンボル `%s' �サイズ� %lu �ら %lu �変更�れ��� (%s 内)"
 
-#: elflink.c:4489
+#: elflink.c:4472
+#, fuzzy
 msgid "%B: undefined reference to symbol '%s'"
-msgstr "%B: シンボル '%s' ��未定義�照��"
+msgstr "%s: シンボル� %s ��ージョン�未定義��"
 
-#: elflink.c:4492
+#: elflink.c:4475
 msgid "note: '%s' is defined in DSO %B so try adding it to the linker command line"
-msgstr "注: '%s' � DSO %B 内�定義�れ��る��リンカ�コマンドライン�追加��������"
+msgstr ""
 
-#: elflink.c:5795
-#, c-format
+#: elflink.c:5779
+#, fuzzy, c-format
 msgid "%s: undefined version: %s"
-msgstr "%s: 未定義�ージョン: %s"
+msgstr "%s: シンボル� %s ��ージョン�未定義��"
 
-#: elflink.c:5863
+#: elflink.c:5847
 msgid "%B: .preinit_array section is not allowed in DSO"
-msgstr "%B: .preinit_array セクション� DSO 内��許��れ����ん"
+msgstr ""
 
-#: elflink.c:7617
-#, c-format
+#: elflink.c:7598
+#, fuzzy, c-format
 msgid "undefined %s reference in complex symbol: %s"
-msgstr ""
+msgstr "%s: シンボル� %s ��ージョン�未定義��"
 
-#: elflink.c:7771
+#: elflink.c:7752
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr ""
 
-#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181
+#: elflink.c:8091 elflink.c:8108 elflink.c:8145 elflink.c:8162
 msgid "%B: Unable to sort relocs - they are in more than one size"
-msgstr "%B: ��置をソート����ん。2個以上�サイズ�������"
+msgstr ""
 
-#: elflink.c:8141 elflink.c:8195
+#: elflink.c:8122 elflink.c:8176
 msgid "%B: Unable to sort relocs - they are of an unknown size"
-msgstr "%B: ��置をソート����ん。�明�サイズ��。"
+msgstr ""
 
-#: elflink.c:8246
+#: elflink.c:8227
 msgid "Not enough memory to sort relocations"
-msgstr "��置をソート�る����分�メモリ��り��ん"
+msgstr ""
 
-#: elflink.c:8439
+#: elflink.c:8420
 msgid "%B: Too many sections: %d (>= %d)"
-msgstr "%B: セクション�多����: %d (>= %d)"
-
-#: elflink.c:8686
-msgid "%B: internal symbol `%s' in %B is referenced by DSO"
-msgstr "%B: 内部シンボル `%s' (%B 内) � DSO �よ���照�れ����"
-
-#: elflink.c:8688
-msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
-msgstr "%B: 隠�れ�シンボル `%s' (%B 内) � DSO �よ���照�れ����"
+msgstr ""
 
-#: elflink.c:8690
-msgid "%B: local symbol `%s' in %B is referenced by DSO"
-msgstr "%B: 局所シンボル `%s' (%B 内) � DSO �よ���照�れ����"
+#: elflink.c:8663
+msgid "%B: %s symbol `%s' in %B is referenced by DSO"
+msgstr ""
 
-#: elflink.c:8785
+#: elflink.c:8754
+#, fuzzy
 msgid "%B: could not find output section %A for input section %A"
-msgstr "%B: 出力セクション %A (入力セクション %A 用) �見��り��ん���"
-
-#: elflink.c:8908
-msgid "%B: protected symbol `%s' isn't defined"
-msgstr "%B: �護�れ�シンボル `%s' �定義�れ����ん"
-
-#: elflink.c:8910
-msgid "%B: internal symbol `%s' isn't defined"
-msgstr "%B: 内部シンボル `%s' �定義�れ����ん"
+msgstr "%s: 出力セクション %s (入力セクション %s 用) を見��られ��ん"
 
-#: elflink.c:8912
-msgid "%B: hidden symbol `%s' isn't defined"
-msgstr "%B: 隠�れ�シンボル `%s' �定義�れ����ん"
+#: elflink.c:8874
+#, fuzzy
+msgid "%B: %s symbol `%s' isn't defined"
+msgstr "%s: クラス %d シンボル `%s' �補助エントリ��り��ん"
 
-#: elflink.c:9441
-msgid "error: %B: size of section %A is not multiple of address size"
-msgstr "エラー: %B: セクション %A �サイズ�アドレスサイズ��数���り��ん"
-
-#: elflink.c:9488
+#: elflink.c:9428
 msgid "error: %B contains a reloc (0x%s) for section %A that references a non-existent global symbol"
-msgstr "エラー: %B ��存在���大域シンボルを�照�る��置 (0x%s) (セクション %A 用) ���れ��"
+msgstr ""
+
+#: elflink.c:9494
+msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
+msgstr ""
 
-#: elflink.c:10223
+#: elflink.c:10141
 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
-msgstr "%A ��順�付� [`%A' (%B 内) ] �順�無� [`%A' (%B 内)] セクション�両方��り��"
+msgstr ""
 
-#: elflink.c:10228
+#: elflink.c:10146
 #, c-format
 msgid "%A has both ordered and unordered sections"
-msgstr "%A ��順�付��順�無�セクション�両方��り��"
-
-#: elflink.c:10793
-msgid "%B: file class %s incompatible with %s"
-msgstr "%B: ファイルクラス %s � %s �互�性��り��ん"
+msgstr ""
 
-#: elflink.c:11104 elflink.c:11148
+#: elflink.c:10992 elflink.c:11036
 msgid "%B: could not find output section %s"
 msgstr "%B: 出力セクション %s �見��り��ん���"
 
-#: elflink.c:11109
+#: elflink.c:10997
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr "警告: %s セクション�サイズ� 0 ��"
 
-#: elflink.c:11214
+#: elflink.c:11102
 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
 msgstr "%P: 警告: 共有オブジェクト内� DT_TEXTREL を作������\n"
 
-#: elflink.c:11401
+#: elflink.c:11289
 msgid "%P%X: can not read symbols: %E\n"
 msgstr "%P%X: シンボルを読�込���ん: %E\n"
 
-#: elflink.c:11750
+#: elflink.c:11638
 msgid "Removing unused section '%s' in file '%B'"
-msgstr "使用�れ��セクション '%s' (ファイル '%B' 内) を削除�����"
+msgstr "ファイル '%2$B' 内�使用�れ��セクション '%1$s' を削除�����"
 
-#: elflink.c:11962
+#: elflink.c:11850
 msgid "Warning: gc-sections option ignored"
 msgstr "警告: gc-sections オプション�無視�れ���"
 
-#: elflink.c:12511
+#: elflink.c:12399
 msgid "%B: ignoring duplicate section `%A'"
 msgstr "%B: �複��セクション `%A' を無視�����"
 
-#: elflink.c:12518 elflink.c:12525
+#: elflink.c:12406 elflink.c:12413
 msgid "%B: duplicate section `%A' has different size"
 msgstr "%B: �複��セクション `%A' �異�るサイズ��"
 
-#: elflink.c:12533 elflink.c:12538
+#: elflink.c:12421 elflink.c:12426
 msgid "%B: warning: could not read contents of section `%A'"
 msgstr "%B: 警告: セクション `%A' �中身を読�込���ん"
 
-#: elflink.c:12542
+#: elflink.c:12430
 msgid "%B: warning: duplicate section `%A' has different contents"
 msgstr "%B: 警告: �複��セクション `%A' �中身�異�り��"
 
-#: elflink.c:12643 linker.c:3086
+#: elflink.c:12531 linker.c:3138
 msgid "%F%P: already_linked_table: %E\n"
 msgstr "%F%P: already_linked_table: %E\n"
 
-#: elfxx-mips.c:1221
+#: elfxx-mips.c:1220
 msgid "static procedure (no name)"
 msgstr "�的プロシージャ(��無�)"
 
-#: elfxx-mips.c:5628
+#: elfxx-mips.c:5623
 msgid "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."
-msgstr "%B: %A+0x%lx: ISA モード間�直接�ジャンプ�許��れ����ん。相互リンクを有効����コンパイル��������"
+msgstr ""
 
-#: elfxx-mips.c:6288 elfxx-mips.c:6511
+#: elfxx-mips.c:6280 elfxx-mips.c:6503
 msgid "%B: Warning: bad `%s' option size %u smaller than its header"
-msgstr "%B: 警告: 間��� `%s' オプションサイズ %u �� (ヘッダより�����)"
+msgstr ""
 
-#: elfxx-mips.c:7262 elfxx-mips.c:7387
+#: elfxx-mips.c:7254 elfxx-mips.c:7379
 msgid "%B: Warning: cannot determine the target function for stub section `%s'"
-msgstr "%B: 警告: スタブセクション `%s' 用�ターゲット関数を決定����ん"
+msgstr ""
 
-#: elfxx-mips.c:7516
+#: elfxx-mips.c:7508
 msgid "%B: Malformed reloc detected for section %s"
 msgstr "%B: セクション %s �対�る������置�検出�れ���"
 
-#: elfxx-mips.c:7556
+#: elfxx-mips.c:7548
 msgid "%B: GOT reloc at 0x%lx not expected in executables"
-msgstr "%B: �置 0x%lx �実行ファイル内��予期�れ�� GOT ��置��り��"
+msgstr ""
 
-#: elfxx-mips.c:7678
+#: elfxx-mips.c:7670
+#, fuzzy
 msgid "%B: CALL16 reloc at 0x%lx not against global symbol"
-msgstr "%B: �置 0x%lx � CALL16 ��置�大域シンボル�対�����り��ん"
+msgstr "%s: 0x%lx �� CALL16 ��置�大域シンボルを対象������ん"
 
-#: elfxx-mips.c:8372
+#: elfxx-mips.c:8365
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
-msgstr "�動的��置�動的��置 %s を�照�����"
+msgstr ""
 
-#: elfxx-mips.c:9075
+#: elfxx-mips.c:9068
 msgid "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"
 msgstr ""
 
-#: elfxx-mips.c:9214
+#: elfxx-mips.c:9207
 msgid "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
 msgstr ""
 
-#: elfxx-mips.c:12038
+#: elfxx-mips.c:12027
 #, c-format
 msgid "%s: illegal section name `%s'"
 msgstr "%s: �正�セクション� `%s' ��"
 
-#: elfxx-mips.c:12417 elfxx-mips.c:12443
+#: elfxx-mips.c:12405 elfxx-mips.c:12431
 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float"
-msgstr "警告: %B � -msingle-float を使用�����。%B � -mdouble-float を使用�����"
+msgstr ""
 
-#: elfxx-mips.c:12429 elfxx-mips.c:12485
+#: elfxx-mips.c:12417 elfxx-mips.c:12473
 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"
-msgstr "警告: %B � -msingle-float を使用�����。%B � -mips32r2 -mfp64 を使用�����"
+msgstr ""
 
-#: elfxx-mips.c:12455 elfxx-mips.c:12491
+#: elfxx-mips.c:12443 elfxx-mips.c:12479
 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"
-msgstr "警告: %B � -mdouble-float を使用�����。%B � -mips32r2 -mfp64 を使用�����"
+msgstr ""
 
-#: elfxx-mips.c:12533
+#: elfxx-mips.c:12521
 msgid "%B: endianness incompatible with that of the selected emulation"
-msgstr "%B: �択��エミュレーション�エンディアン�互�性��り��ん"
+msgstr ""
 
-#: elfxx-mips.c:12544
+#: elfxx-mips.c:12532
 msgid "%B: ABI is incompatible with that of the selected emulation"
-msgstr "%B: �択��エミュレーション�ABI �互�性��り��ん"
+msgstr ""
 
-#: elfxx-mips.c:12628
+#: elfxx-mips.c:12613
+#, fuzzy
 msgid "%B: warning: linking abicalls files with non-abicalls files"
-msgstr "%B: 警告: abicalls ファイル�� abicalls ファイルをリンク�����"
+msgstr "%s: abicall ファイル�� abicall ファイルをリンク�よ������"
 
-#: elfxx-mips.c:12645
+#: elfxx-mips.c:12630
 msgid "%B: linking 32-bit code with 64-bit code"
-msgstr "%B: 32 ビットコード� 64 ビットコードをリンク�����"
+msgstr ""
 
-#: elfxx-mips.c:12673
+#: elfxx-mips.c:12658
+#, fuzzy
 msgid "%B: linking %s module with previous %s modules"
-msgstr "%B: %s モジュールを�� %s モジュール�リンク�����"
+msgstr "%s: ABI �一致���ん -- %s モジュールを以�� %s モジュール�リンク�よ������"
 
-#: elfxx-mips.c:12696
+#: elfxx-mips.c:12681
+#, fuzzy
 msgid "%B: ABI mismatch: linking %s module with previous %s modules"
-msgstr "%B: ABI �一致���ん: %s モジュールを�� %s モジュール�リンク�����"
+msgstr "%s: ABI �一致���ん -- %s モジュールを以�� %s モジュール�リンク�よ������"
 
-#: elfxx-mips.c:12860
+#: elfxx-mips.c:12845
 #, c-format
 msgid " [abi=O32]"
 msgstr " [abi=O32]"
 
-#: elfxx-mips.c:12862
+#: elfxx-mips.c:12847
 #, c-format
 msgid " [abi=O64]"
 msgstr " [abi=O64]"
 
-#: elfxx-mips.c:12864
+#: elfxx-mips.c:12849
 #, c-format
 msgid " [abi=EABI32]"
 msgstr " [abi=EABI32]"
 
-#: elfxx-mips.c:12866
+#: elfxx-mips.c:12851
 #, c-format
 msgid " [abi=EABI64]"
 msgstr " [abi=EABI64]"
 
-#: elfxx-mips.c:12868
+#: elfxx-mips.c:12853
 #, c-format
 msgid " [abi unknown]"
 msgstr " [abi unknown]"
 
-#: elfxx-mips.c:12870
+#: elfxx-mips.c:12855
 #, c-format
 msgid " [abi=N32]"
 msgstr " [abi=N32]"
 
-#: elfxx-mips.c:12872
+#: elfxx-mips.c:12857
 #, c-format
 msgid " [abi=64]"
 msgstr " [abi=64]"
 
-#: elfxx-mips.c:12874
+#: elfxx-mips.c:12859
 #, c-format
 msgid " [no abi set]"
-msgstr ""
+msgstr " [abi �セット�れ����ん]"
 
-#: elfxx-mips.c:12895
+#: elfxx-mips.c:12880
 #, c-format
 msgid " [unknown ISA]"
 msgstr " [�明� ISA]"
 
-#: elfxx-mips.c:12906
+#: elfxx-mips.c:12891
 #, c-format
 msgid " [not 32bitmode]"
 msgstr " [� 32 ビットモード]"
 
 #: elfxx-sparc.c:595
-#, c-format
+#, fuzzy, c-format
 msgid "invalid relocation type %d"
-msgstr "無効���置型 %d ��"
+msgstr "%s: ��置タイプ %d ���切��"
 
 #: i386linux.c:454 m68klinux.c:458 sparclinux.c:452
 #, c-format
@@ -3254,262 +3176,222 @@ msgid "%s: unrecognized symbol `%s' flags 0x%x"
 msgstr "%s: シンボル `%s' フラグ 0x%x を�識����ん"
 
 #: ieee.c:792
+#, fuzzy
 msgid "%B: unimplemented ATI record %u for symbol %u"
-msgstr "%B: ATI レコード %u (シンボル %u 用) �実装�れ����ん"
+msgstr "%s: ATI レコード %u (シンボル %u 用) �実装�れ����ん"
 
 #: ieee.c:816
+#, fuzzy
 msgid "%B: unexpected ATN type %d in external part"
-msgstr "%B: 予期��� ATN 型 %d � external 部分��り��"
+msgstr "%s: external 部分��る ATN タイプ %d ������り得��ん"
 
 #: ieee.c:838
+#, fuzzy
 msgid "%B: unexpected type after ATN"
-msgstr "%B: ATN �後�予期���型��"
+msgstr "%s: ATN �後���り得��タイプ��り��"
 
 #: ihex.c:230
+#, fuzzy
 msgid "%B:%d: unexpected character `%s' in Intel Hex file"
-msgstr "%B:%d: Intel Hex ファイル内�予期���文字 `%s' ��り��"
+msgstr "%s:%d: Intel Hex ファイル����り得��文字 `%s' ��り��\n"
 
 #: ihex.c:337
+#, fuzzy
 msgid "%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"
-msgstr "%B:%u: Intel Hex ファイル内��ェックサム�間������ (予期�れる�� %u�実際� %u)"
+msgstr "%s:%d: Intel Hex ファイル��ェックサム��正�� (%u �筈� %u ��)"
 
 #: ihex.c:392
+#, fuzzy
 msgid "%B:%u: bad extended address record length in Intel Hex file"
-msgstr "%B:%u: Intel Hex ファイル内�間���拡張アドレスレコード��り��"
+msgstr "%s:%d: 拡張アドレスレコード長� Intel Hex ファイル�����正��"
 
 #: ihex.c:409
+#, fuzzy
 msgid "%B:%u: bad extended start address length in Intel Hex file"
-msgstr "%B:%u: Intel Hex ファイル内�間���拡張開始アドレス長��り��"
+msgstr "%s:%d: 拡張開始アドレス長� Intel Hex ファイル�����正��"
 
 #: ihex.c:426
+#, fuzzy
 msgid "%B:%u: bad extended linear address record length in Intel Hex file"
-msgstr "%B:%u: Intel Hex ファイル内�間���拡張線形アドレスレコード長��り��"
+msgstr "%s:%d: 拡張リニアアドレスレコード長� Intel Hex ファイル����正��"
 
 #: ihex.c:443
+#, fuzzy
 msgid "%B:%u: bad extended linear start address length in Intel Hex file"
-msgstr "%B:%u: Intel Hex ファイル内�間���拡張線形開始アドレス長��り��"
+msgstr "%s:%d: 拡張リニア開始アドレス帳� Intel Hex ファイル�����正��"
 
 #: ihex.c:460
+#, fuzzy
 msgid "%B:%u: unrecognized ihex type %u in Intel Hex file"
-msgstr "%B:%u: Intel Hex ファイル内��識���� ihex 型 %u ��"
+msgstr "%s:%d: Intel Hex ファイル� ihex タイプ %u を�識����ん\n"
 
 #: ihex.c:579
+#, fuzzy
 msgid "%B: internal error in ihex_read_section"
-msgstr "%B: ihex_read_section 内�内部エラー��"
+msgstr "%s: ihex_read_section 内�内部エラー"
 
 #: ihex.c:613
+#, fuzzy
 msgid "%B: bad section length in ihex_read_section"
-msgstr "%B: ihex_read_section 内�間���セクション長��"
+msgstr "%s: ihex_read_section 内��正�セクション長��り��"
 
 #: ihex.c:826
-#, c-format
+#, fuzzy, c-format
 msgid "%s: address 0x%s out of range for Intel Hex file"
-msgstr "%s: アドレス 0x%s � Intel Hex ファイル�範囲外��"
+msgstr "%s: アドレス 0x%s � Intel Hex ファイル�範囲を超�����"
 
 #: libbfd.c:863
+#, fuzzy
 msgid "%B: unable to get decompressed section %A"
-msgstr "%B: 伸張��セクション %A を�得����ん"
+msgstr "Dwarf エラー: %s セクションを伸張����ん。"
 
-#: libbfd.c:1043
-#, c-format
+#: libbfd.c:1027
+#, fuzzy, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
-msgstr "廃止�れ� %s �呼�れ��� (�置 %s�行 %d� %s 内)\n"
+msgstr "BFD 内部エラー。%s � %d 行目 %s �中断����\n"
 
-#: libbfd.c:1046
+#: libbfd.c:1030
 #, c-format
 msgid "Deprecated %s called\n"
-msgstr "廃止�れ� %s �呼�れ���\n"
+msgstr ""
 
-#: linker.c:1859
+#: linker.c:1911
 msgid "%B: indirect symbol `%s' to `%s' is a loop"
-msgstr "%B: 間接シンボル `%s' (`%s' �) �循環�����"
+msgstr ""
 
-#: linker.c:2726
-#, c-format
+#: linker.c:2778
+#, fuzzy, c-format
 msgid "Attempt to do relocatable link with %s input and %s output"
-msgstr "%s 入力� %s 出力を��置�能リンク�よ��試����"
+msgstr "入力 %s �出力 %s �を��置�能リンク�よ������"
 
-#: linker.c:3053
+#: linker.c:3105
+#, fuzzy
 msgid "%B: warning: ignoring duplicate section `%A'\n"
-msgstr "%B: 警告: �複���るセクション `%A' を無視�����\n"
+msgstr "%s: 0x%lx: 警告: シンボル�予期��セクション��り��"
 
-#: linker.c:3067
+#: linker.c:3119
+#, fuzzy
 msgid "%B: warning: duplicate section `%A' has different size\n"
-msgstr "%B: 警告: �複���るセクション `%A' �異�るサイズ��\n"
-
-#: mach-o.c:381
-msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
-msgstr "bfd_mach_o_canonicalize_symtab: シンボルをロード����ん"
-
-#: mach-o.c:1253
-#, c-format
-msgid "unable to write unknown load command 0x%lx"
-msgstr "�明�ロードコマンド 0x%lx を書�込���ん"
+msgstr "%s: 警告: 確��れ�セクション `%s' �セグメント内��り��ん"
 
-#: mach-o.c:1654
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"
-msgstr "bfd_mach_o_read_symtab_symbol: %d �イト(�置 %lu ) を読�込���ん"
-
-#: mach-o.c:1671
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"
-msgstr "bfd_mach_o_read_symtab_symbol: シンボル��範囲外 (%lu >= %lu) ��"
-
-#: mach-o.c:1756
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: シンボル \"%s\" �無効�セクション %d (最大 %lu) �指定�れ����: 未定義�設定�れ���"
-
-#: mach-o.c:1764
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: シンボル \"%s\" �サ�ート�れ���� '間接' �照��: 未定義�設定�れ���"
-
-#: mach-o.c:1770
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x%x: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: シンボル \"%s\" �無効�タイプフィールド 0x%x �指定�れ����: 未定義�設定�れ���"
-
-#: mach-o.c:1840
-msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
-msgstr "bfd_mach_o_read_symtab_symbols: シンボル用�メモリを�置����ん"
-
-#: mach-o.c:1874
-#, c-format
-msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"
-msgstr "bfd_mach_o_read_dysymtab_symbol: %lu �イト (�置 %lu) を読�込���ん"
-
-#: mach-o.c:2556
-#, c-format
-msgid "unable to read unknown load command 0x%lx"
-msgstr "�明�コマンド 0x%lx をロード����ん"
-
-#: mach-o.c:2736
-#, c-format
-msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
-msgstr "bfd_mach_o_scan: �明�アーキテク�ャ 0x%lx/0x%lx ��"
-
-#: mach-o.c:2832
-#, c-format
-msgid "unknown header byte-order value 0x%lx"
-msgstr "�明�ヘッダ�イト順�値 0x%lx ��"
-
-#: mach-o.c:3402
+#: mach-o.c:3403
+#, fuzzy
 msgid "Mach-O header:\n"
-msgstr "Mach-O ヘッダ:\n"
+msgstr ""
+"\n"
+"ppcboot ヘッダ:\n"
 
-#: mach-o.c:3403
+#: mach-o.c:3404
 #, c-format
 msgid " magic     : %08lx\n"
-msgstr " マジック番�: %08lx\n"
+msgstr ""
 
-#: mach-o.c:3404
+#: mach-o.c:3405
 #, c-format
 msgid " cputype   : %08lx (%s)\n"
-msgstr " CPU タイプ : %08lx (%s)\n"
+msgstr ""
 
-#: mach-o.c:3406
+#: mach-o.c:3407
 #, c-format
 msgid " cpusubtype: %08lx\n"
-msgstr " CPU サブタイプ: %08lx\n"
+msgstr ""
 
-#: mach-o.c:3407
+#: mach-o.c:3408
 #, c-format
 msgid " filetype  : %08lx (%s)\n"
-msgstr " ファイルタイプ: %08lx (%s)\n"
+msgstr ""
 
-#: mach-o.c:3410
+#: mach-o.c:3411
 #, c-format
 msgid " ncmds     : %08lx (%lu)\n"
-msgstr " コマンド数  : %08lx (%lu)\n"
+msgstr ""
 
-#: mach-o.c:3411
+#: mach-o.c:3412
 #, c-format
 msgid " sizeofcmds: %08lx\n"
-msgstr " コマンドサイズ: %08lx\n"
+msgstr ""
 
-#: mach-o.c:3412
+#: mach-o.c:3413
 #, c-format
 msgid " flags     : %08lx ("
-msgstr " フラグ    : %08lx ("
+msgstr ""
 
-#: mach-o.c:3414 vms-alpha.c:7671
+#: mach-o.c:3415 vms-alpha.c:7652
 msgid ")\n"
-msgstr ")\n"
+msgstr ""
 
-#: mach-o.c:3415
+#: mach-o.c:3416
 #, c-format
 msgid " reserved  : %08x\n"
-msgstr " 予約      : %08x\n"
+msgstr ""
 
-#: mach-o.c:3425
+#: mach-o.c:3426
 msgid "Segments and Sections:\n"
-msgstr "セグメント�セクション:\n"
+msgstr ""
 
-#: mach-o.c:3426
+#: mach-o.c:3427
 msgid " #: Segment name     Section name     Address\n"
-msgstr " #: セグメント�     セクション�     アドレス\n"
+msgstr ""
 
 #: merge.c:832
 #, c-format
 msgid "%s: access beyond end of merged section (%ld)"
-msgstr "%s: 併���セクション�終端 (%ld) を超��アクセス��"
+msgstr ""
 
 #: mmo.c:456
-#, c-format
+#, fuzzy, c-format
 msgid "%s: No core to allocate section name %s\n"
-msgstr "%s: セクション� %s を割り当�る���コア��り��ん\n"
+msgstr "%s: �正�セクション� `%s' ��"
 
 #: mmo.c:531
 #, c-format
 msgid "%s: No core to allocate a symbol %d bytes long\n"
-msgstr "%s: %d �イト長�シンボルを割り当�る���コア��り��ん\n"
+msgstr ""
 
 #: mmo.c:1187
 #, c-format
 msgid "%s: invalid mmo file: initialization value for $255 is not `Main'\n"
-msgstr "%s: 無効� mmo ファイル: $255 ��期値� `Main' ���り��ん\n"
+msgstr ""
 
 #: mmo.c:1332
 #, c-format
 msgid "%s: unsupported wide character sequence 0x%02X 0x%02X after symbol name starting with `%s'\n"
-msgstr "%s: サ�ート�れ����ワイド文字シーケンス 0x%02X 0x%02X � `%s' �開始�るシンボル��後��り��\n"
+msgstr ""
 
 #: mmo.c:1565
 #, c-format
 msgid "%s: invalid mmo file: unsupported lopcode `%d'\n"
-msgstr "%s: 無効� mmo ファイル��: サ�ート�れ���� lopcode `%d' ��\n"
+msgstr ""
 
 #: mmo.c:1575
 #, c-format
 msgid "%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"
-msgstr "%s: 無効� mmo ファイル��: lop_quote ���予期�れる��YZ = 1 �����得�れ��� YZ = %d ��\n"
+msgstr ""
 
 #: mmo.c:1611
 #, c-format
 msgid "%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"
-msgstr "%s: 無効� mmo ファイル��: lop_loc ���予期�れる�� z = 1 ��� z = 2 �����得�れ��� z = %d ��\n"
+msgstr ""
 
 #: mmo.c:1657
 #, c-format
 msgid "%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"
-msgstr "%s: 無効� mmo ファイル��: lop_fixo ���予期�れる�� z = 1 ��� z = 2�����得�れ��� got z = %d ��\n"
+msgstr ""
 
 #: mmo.c:1696
 #, c-format
 msgid "%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"
-msgstr "%s: 無効� mmo ファイル��: lop_fixrx ���予期�れる�� y = 0 �����得�れ��� y = %d ��\n"
+msgstr ""
 
 #: mmo.c:1705
 #, c-format
 msgid "%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"
-msgstr "%s: 無効� mmo ファイル��: lop_fixrx ���予期�れる�� z = 16 ��� z = 24 �����得�れ��� z = %d ��\n"
+msgstr ""
 
 #: mmo.c:1728
 #, c-format
 msgid "%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"
-msgstr "%s: 無効� mmo ファイル��: lop_fixrx 用�被演算�ワード�先頭�イト� 0 ��� 1 ���れ�����ん���得�れ��� %d ��\n"
+msgstr ""
 
 #: mmo.c:1751
 #, c-format
@@ -3534,7 +3416,7 @@ msgstr ""
 #: mmo.c:1926
 #, c-format
 msgid "%s: invalid mmo file: lop_end not last item in file\n"
-msgstr "%s: 無効� mmo ファイル��: lop_end �ファイル内�最後��素���り��ん\n"
+msgstr ""
 
 #: mmo.c:1939
 #, c-format
@@ -3544,7 +3426,7 @@ msgstr ""
 #: mmo.c:2649
 #, c-format
 msgid "%s: invalid symbol table: duplicate symbol `%s'\n"
-msgstr "%s: 無効�シンボル表��: �複��シンボル `%s' ��り��\n"
+msgstr ""
 
 #: mmo.c:2889
 #, c-format
@@ -3557,29 +3439,29 @@ msgid "%s: warning: symbol table too large for mmo, larger than 65535 32-bit wor
 msgstr ""
 
 #: mmo.c:3026
-#, c-format
+#, fuzzy, c-format
 msgid "%s: internal error, symbol table changed size from %d to %d words\n"
-msgstr "%s: 内部エラー�シンボル表�サイズ� %d ワード�ら %d ワード�変更�れ���\n"
+msgstr "警告: シンボル `%s' �型� %d �ら %d �変更�れ��� (%s 内)"
 
 #: mmo.c:3078
-#, c-format
+#, fuzzy, c-format
 msgid "%s: internal error, internal register section %s had contents\n"
-msgstr "%s: 内部エラー�内部レジスタセクション %s �内容を����\n"
+msgstr "%s: ihex_read_section 内�内部エラー"
 
 #: mmo.c:3129
 #, c-format
 msgid "%s: no initialized registers; section length 0\n"
-msgstr "%s: �期化�れ�レジスタ��り��ん。セクション長� 0 ��\n"
+msgstr ""
 
 #: mmo.c:3135
 #, c-format
 msgid "%s: too many initialized registers; section length %ld\n"
-msgstr "%s: �期化�れ�レジスタ�多����。セクション長� %ld ��\n"
+msgstr ""
 
 #: mmo.c:3140
 #, c-format
 msgid "%s: invalid start address for initialized registers of length %ld: 0x%lx%08lx\n"
-msgstr "%s: 長� %ld ��期化�れ�レジスタ用�無効�開始アドレス�� : 0x%lx%08lx\n"
+msgstr ""
 
 #: oasys.c:882
 #, c-format
@@ -3589,37 +3471,36 @@ msgstr "%s: oasys ��セクション `%s' を表�����ん"
 #: osf-core.c:140
 #, c-format
 msgid "Unhandled OSF/1 core file section type %d\n"
-msgstr "�り扱�れ�� OSF/1 コアファイルセクション型 %d ��\n"
+msgstr "OSF/1 コアファイルセクションタイプ %d ��り扱�れ��ん���\n"
 
 #: pe-mips.c:607
+#, fuzzy
 msgid "%B: `ld -r' not supported with PE MIPS objects\n"
-msgstr "%B: `ld -r' � PE MIPS オブジェクト�併��使用����ん\n"
+msgstr "%s: `ld -r' を PE MIPS objects �共�使�事�サ�ート�れ����ん\n"
 
 #. OK, at this point the following variables are set up:
 #. src = VMA of the memory we're fixing up
 #. mem = pointer to memory we're fixing up
 #. val = VMA of what we need to refer to.
 #: pe-mips.c:719
+#, fuzzy
 msgid "%B: unimplemented %s\n"
-msgstr "%B: 未実装� %s ��\n"
+msgstr "%s: 未実装� %s ��\n"
 
 #: pe-mips.c:745
+#, fuzzy
 msgid "%B: jump too far away\n"
-msgstr "%B: ジャンプ先������\n"
+msgstr "%s: ジャンプ先������\n"
 
 #: pe-mips.c:771
+#, fuzzy
 msgid "%B: bad pair/reflo after refhi\n"
-msgstr "%B: 誤�� pair/reflo � refhi �後���り��\n"
-
-#: pef.c:519
-#, c-format
-msgid "bfd_pef_scan: unknown architecture 0x%lx"
-msgstr ""
+msgstr "%s: �正� pair/reflo � refhi �後���り��\n"
 
 #: pei-x86_64.c:444
-#, c-format
+#, fuzzy, c-format
 msgid "warning: .pdata section size (%ld) is not a multiple of %d\n"
-msgstr "警告: .pdata セクションサイズ (%ld) � %d ��数���り��ん\n"
+msgstr "警告�.pdata セクションサイズ (%ld) � %d ��数���り��ん\n"
 
 #: pei-x86_64.c:448 peigen.c:1618 peigen.c:1801 pepigen.c:1618 pepigen.c:1801
 #: pex64igen.c:1618 pex64igen.c:1801
@@ -3629,41 +3510,48 @@ msgid ""
 "The Function Table (interpreted .pdata section contents)\n"
 msgstr ""
 "\n"
-"関数表 (.pdata セクション�内容を解釈)\n"
+"関数テーブル (.pdata セクション�内容を解釈)\n"
 
 #: pei-x86_64.c:450
-#, c-format
+#, fuzzy, c-format
 msgid "vma:\t\t\tBeginAddress\t EndAddress\t  UnwindData\n"
-msgstr ""
+msgstr " vma:\t\t\t開始アドレス    終了アドレス      Unwind 情報\n"
 
 #. XXX code yet to be written.
 #: peicode.h:751
+#, fuzzy
 msgid "%B: Unhandled import type; %x"
-msgstr "%B: �り扱���イン�ート型 %x ��"
+msgstr "%s: import タイプ %x ��り扱�れ��ん���"
 
 #: peicode.h:756
+#, fuzzy
 msgid "%B: Unrecognised import type; %x"
-msgstr "%B: �識����イン�ート型 %x ��"
+msgstr "%s: import タイプを�識����ん -- %x"
 
 #: peicode.h:770
+#, fuzzy
 msgid "%B: Unrecognised import name type; %x"
-msgstr "%B: �識����イン�ート��型 %x ��"
+msgstr "%s: import ��タイプを�識����ん -- %x"
 
 #: peicode.h:1162
+#, fuzzy
 msgid "%B: Unrecognised machine type (0x%x) in Import Library Format archive"
-msgstr "%B: イン�ートライブラリ形�書庫�マシン型 (0x%x) ��識����ん"
+msgstr "%s: Import Library Format 書庫内�マシンタイプ (0x%x) を�識����ん"
 
 #: peicode.h:1174
+#, fuzzy
 msgid "%B: Recognised but unhandled machine type (0x%x) in Import Library Format archive"
-msgstr "%B: イン�ートライブラリ形�書庫�マシン型 (0x%x) ��識�����扱���ん"
+msgstr "%s: Import Library Format 書庫内�マシンタイプ (0x%x) ��識�������り扱�れ��ん���"
 
 #: peicode.h:1192
+#, fuzzy
 msgid "%B: size field is zero in Import Library Format header"
-msgstr "%B: イン�ートライブラリ形�ヘッダ内�サイズフィールド� 0 ��"
+msgstr "%s: Import Library Format ヘッダ内�サイズフィールド�ゼロ��"
 
 #: peicode.h:1223
+#, fuzzy
 msgid "%B: string not null terminated in ILF object file."
-msgstr "%B: ILF オブジェクトファイル内�文字列� null �終端�れ����ん。"
+msgstr "%s: ILF オブジェクトファイル内�文字列� null 終端�れ����ん。"
 
 #: ppcboot.c:414
 #, c-format
@@ -3718,31 +3606,26 @@ msgstr "領域[%d] セクタ = 0x%.8lx (%ld)\n"
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr "領域[%d] 長� = 0x%.8lx (%ld)\n"
 
-#: rs6000-core.c:448
-#, c-format
-msgid "%s: warning core file truncated"
-msgstr ""
-
 #: som.c:5471
 #, c-format
 msgid ""
 "\n"
 "Exec Auxiliary Header\n"
 msgstr ""
-"\n"
-"実行補助ヘッダ\n"
 
 #: som.c:5776
 msgid "som_sizeof_headers unimplemented"
 msgstr "som_sizeof_headers �未実装��"
 
 #: srec.c:261
+#, fuzzy
 msgid "%B:%d: Unexpected character `%s' in S-record file\n"
-msgstr "%B:%d: S-record ファイル内�予期���文字 `%s' ��り��\n"
+msgstr "%s:%d: `%s' � S-record ファイル内���り得��文字��\n"
 
 #: srec.c:567 srec.c:600
+#, fuzzy
 msgid "%B:%d: Bad checksum in S-record file\n"
-msgstr "%B:%d: S-record ファイル内��ェックサム�誤�����\n"
+msgstr "%s:%d: `%s' � S-record ファイル内���り得��文字��\n"
 
 #: stabs.c:279
 msgid "%B(%A+0x%lx): Stabs entry has invalid string index."
@@ -3752,1892 +3635,1916 @@ msgstr ""
 msgid "Unsupported .stab relocation"
 msgstr ".stab ��置�サ�ート�れ����ん"
 
-#: vms-alpha.c:1299
-#, c-format
+#: vms-alpha.c:1287
+#, fuzzy, c-format
 msgid "Unknown EGSD subtype %d"
-msgstr "�明� EGSD サブタイプ %d ��"
+msgstr "�明� gsd/egsd サブタイプ %d ��"
 
-#: vms-alpha.c:1330
+#: vms-alpha.c:1318
 #, c-format
 msgid "Stack overflow (%d) in _bfd_vms_push"
 msgstr "_bfd_vms_push �スタックオー�ーフロー(%d)����"
 
-#: vms-alpha.c:1343
+#: vms-alpha.c:1331
 msgid "Stack underflow in _bfd_vms_pop"
 msgstr "_bfd_vms_pop �スタックアンダーフロー����"
 
 #. These names have not yet been added to this switch statement.
-#: vms-alpha.c:1580
+#: vms-alpha.c:1568
 #, c-format
 msgid "unknown ETIR command %d"
-msgstr "�明� ETIR コマンド %d ��"
+msgstr ""
 
-#: vms-alpha.c:1767
-#, c-format
+#: vms-alpha.c:1755
+#, fuzzy, c-format
 msgid "bad section index in %s"
-msgstr ""
+msgstr "ETIR_S_C_STA_PQ ��るセクションインデックス��正��"
 
-#: vms-alpha.c:1780
-#, c-format
+#: vms-alpha.c:1768
+#, fuzzy, c-format
 msgid "unsupported STA cmd %s"
-msgstr "サ�ート�れ���� STA cmd %s ��"
+msgstr "STA cmd %d �サ�ート�れ��ん"
 
 #. Insert field.
 #. Unsigned shift.
 #. Rotate.
 #. Redefine symbol to current location.
 #. Define a literal.
-#: vms-alpha.c:1956 vms-alpha.c:1987 vms-alpha.c:2234
-#, c-format
+#: vms-alpha.c:1944 vms-alpha.c:1975 vms-alpha.c:2222
+#, fuzzy, c-format
 msgid "%s: not supported"
-msgstr "%s: サ�ート�れ����ん"
+msgstr "サ�ート�����ん"
 
-#: vms-alpha.c:1962
-#, c-format
+#: vms-alpha.c:1950
+#, fuzzy, c-format
 msgid "%s: not implemented"
-msgstr "%s: 実装�れ����ん"
+msgstr "%s: 未実装� %s ��\n"
 
-#: vms-alpha.c:2218
+#: vms-alpha.c:2206
 #, c-format
 msgid "invalid use of %s with contexts"
 msgstr ""
 
-#: vms-alpha.c:2252
-#, c-format
+#: vms-alpha.c:2240
+#, fuzzy, c-format
 msgid "reserved cmd %d"
-msgstr "予約�れ� cmd %d ��"
+msgstr "STA cmd %d �予約済��"
 
-#: vms-alpha.c:2337
+#: vms-alpha.c:2325
 msgid "Object module NOT error-free !\n"
-msgstr "オブジェクトモジュール�エラー無����り��ん!\n"
+msgstr "オブジェクトモジュール�エラーフリー���り��ん!\n"
 
-#: vms-alpha.c:2766
+#: vms-alpha.c:2754
 #, c-format
 msgid "Symbol %s replaced by %s\n"
 msgstr "シンボル %s � %s �置���られ���\n"
 
-#: vms-alpha.c:3769
+#: vms-alpha.c:3757
 #, c-format
 msgid "SEC_RELOC with no relocs in section %s"
-msgstr "セクション %s 内���置�無� SEC_RELOC ��り��"
+msgstr "SEC_RELOC �セクション %s ��り�����置��り��ん"
 
-#: vms-alpha.c:3822 vms-alpha.c:4053
-#, c-format
+#: vms-alpha.c:3810 vms-alpha.c:4041
+#, fuzzy, c-format
 msgid "Size error in section %s"
-msgstr "セクション %s 内�サイズエラー��"
+msgstr "SEC_RELOC �セクション %s ��り�����置��り��ん"
 
-#: vms-alpha.c:3992
+#: vms-alpha.c:3980
 msgid "Spurious ALPHA_R_BSR reloc"
-msgstr "疑��� ALPHA_R_BSR ��置��"
+msgstr ""
 
-#: vms-alpha.c:4040
+#: vms-alpha.c:4028
 #, c-format
 msgid "Unhandled relocation %s"
-msgstr "�り扱�れ����置 %s ��"
+msgstr "��置 %s ��り扱�れ��ん���"
 
-#: vms-alpha.c:4330
+#: vms-alpha.c:4318
 #, c-format
 msgid "unknown source command %d"
-msgstr "�明�ソースコマンド %d ��"
+msgstr ""
 
-#: vms-alpha.c:4391
+#: vms-alpha.c:4379
+#, fuzzy
 msgid "DST__K_SET_LINUM_INCR not implemented"
-msgstr "DST__K_SET_LINUM_INCR �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4397
+#: vms-alpha.c:4385
+#, fuzzy
 msgid "DST__K_SET_LINUM_INCR_W not implemented"
-msgstr "DST__K_SET_LINUM_INCR_W �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4403
+#: vms-alpha.c:4391
+#, fuzzy
 msgid "DST__K_RESET_LINUM_INCR not implemented"
-msgstr "DST__K_RESET_LINUM_INCR �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4409
+#: vms-alpha.c:4397
+#, fuzzy
 msgid "DST__K_BEG_STMT_MODE not implemented"
-msgstr "DST__K_BEG_STMT_MODE �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4415
+#: vms-alpha.c:4403
+#, fuzzy
 msgid "DST__K_END_STMT_MODE not implemented"
-msgstr "DST__K_END_STMT_MODE �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4442
+#: vms-alpha.c:4430
+#, fuzzy
 msgid "DST__K_SET_PC not implemented"
-msgstr "DST__K_SET_PC �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4448
+#: vms-alpha.c:4436
+#, fuzzy
 msgid "DST__K_SET_PC_W not implemented"
-msgstr "DST__K_SET_PC_W �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4454
+#: vms-alpha.c:4442
+#, fuzzy
 msgid "DST__K_SET_PC_L not implemented"
-msgstr "DST__K_SET_PC_L �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_GBL: 実装�れ����ん"
 
-#: vms-alpha.c:4460
+#: vms-alpha.c:4448
+#, fuzzy
 msgid "DST__K_SET_STMTNUM not implemented"
-msgstr "DST__K_SET_STMTNUM �実装�れ����ん"
+msgstr "ETIR_S_C_STO_HINT_PS: 実装�れ����ん"
 
-#: vms-alpha.c:4503
+#: vms-alpha.c:4491
 #, c-format
 msgid "unknown line command %d"
-msgstr "�明�行コマンド %d ��"
+msgstr ""
 
-#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003
-#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038
-#, c-format
+#: vms-alpha.c:4938 vms-alpha.c:4955 vms-alpha.c:4969 vms-alpha.c:4984
+#: vms-alpha.c:4996 vms-alpha.c:5007 vms-alpha.c:5019
+#, fuzzy, c-format
 msgid "Unknown reloc %s + %s"
-msgstr "�明���置 %s + %s ��"
+msgstr "��置 %s を無視���\n"
 
-#: vms-alpha.c:5093
-#, c-format
+#: vms-alpha.c:5074
+#, fuzzy, c-format
 msgid "Unknown reloc %s"
-msgstr "�明���置 %s ��"
+msgstr "��置 %s を無視���\n"
 
-#: vms-alpha.c:5106
+#: vms-alpha.c:5087
+#, fuzzy
 msgid "Invalid section index in ETIR"
-msgstr "ETIR 内�無効�セクション索引��り��。"
+msgstr "ETIR_S_C_STA_PQ ��るセクションインデックス��正��"
 
-#: vms-alpha.c:5153
+#: vms-alpha.c:5134
 #, c-format
 msgid "Unknown symbol in command %s"
-msgstr "コマンド %s 内��明�シンボル��"
+msgstr ""
 
-#: vms-alpha.c:5668
+#: vms-alpha.c:5649
 #, c-format
 msgid "  EMH %u (len=%u): "
-msgstr "  EMH %u (長�=%u): "
+msgstr ""
 
-#: vms-alpha.c:5677
-#, c-format
+#: vms-alpha.c:5658
+#, fuzzy, c-format
 msgid "Module header\n"
-msgstr "モジュールヘッダ\n"
+msgstr ""
+"\n"
+"ppcboot ヘッダ:\n"
 
-#: vms-alpha.c:5678
+#: vms-alpha.c:5659
 #, c-format
 msgid "   structure level: %u\n"
-msgstr "   構造体レベル   : %u\n"
+msgstr ""
 
-#: vms-alpha.c:5679
+#: vms-alpha.c:5660
 #, c-format
 msgid "   max record size: %u\n"
-msgstr "   最大レコードサイズ: %u\n"
+msgstr ""
 
-#: vms-alpha.c:5682
+#: vms-alpha.c:5663
 #, c-format
 msgid "   module name    : %.*s\n"
-msgstr "   モジュール�   : %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5684
-#, c-format
+#: vms-alpha.c:5665
+#, fuzzy, c-format
 msgid "   module version : %.*s\n"
-msgstr "   モジュール�ージョン: %.*s\n"
+msgstr "%s: シンボル� %s ��ージョン�未定義��"
 
-#: vms-alpha.c:5686
+#: vms-alpha.c:5667
 #, c-format
 msgid "   compile date   : %.17s\n"
-msgstr "   コンパイル日   : %.17s\n"
+msgstr ""
 
-#: vms-alpha.c:5691
+#: vms-alpha.c:5672
 #, c-format
 msgid "Language Processor Name\n"
-msgstr "言語処�系�\n"
+msgstr ""
 
-#: vms-alpha.c:5692
+#: vms-alpha.c:5673
 #, c-format
 msgid "   language name: %.*s\n"
-msgstr "   言語�       : %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5699
+#: vms-alpha.c:5680
 #, c-format
 msgid "Source Files Header\n"
-msgstr "ソースファイルヘッダ\n"
+msgstr ""
 
-#: vms-alpha.c:5700
+#: vms-alpha.c:5681
 #, c-format
 msgid "   file: %.*s\n"
-msgstr "   ファイル: %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5707
+#: vms-alpha.c:5688
 #, c-format
 msgid "Title Text Header\n"
-msgstr "タイトルテキストヘッダ\n"
+msgstr ""
 
-#: vms-alpha.c:5708
+#: vms-alpha.c:5689
 #, c-format
 msgid "   title: %.*s\n"
-msgstr "   タイトル: %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5715
+#: vms-alpha.c:5696
 #, c-format
 msgid "Copyright Header\n"
-msgstr "著作権ヘッダ\n"
+msgstr ""
 
-#: vms-alpha.c:5716
+#: vms-alpha.c:5697
 #, c-format
 msgid "   copyright: %.*s\n"
-msgstr "   著作権   : %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5722
-#, c-format
+#: vms-alpha.c:5703
+#, fuzzy, c-format
 msgid "unhandled emh subtype %u\n"
-msgstr "�り扱��� emh サブタイプ %u ��\n"
+msgstr "%s: import タイプ %x ��り扱�れ��ん���"
 
-#: vms-alpha.c:5732
+#: vms-alpha.c:5713
 #, c-format
 msgid "  EEOM (len=%u):\n"
-msgstr "  EEOM (長�=%u):\n"
+msgstr ""
 
-#: vms-alpha.c:5733
+#: vms-alpha.c:5714
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5735
+#: vms-alpha.c:5716
 #, c-format
 msgid "   completion code: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5739
+#: vms-alpha.c:5720
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr ""
 
-#: vms-alpha.c:5740
+#: vms-alpha.c:5721
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5742
+#: vms-alpha.c:5723
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5751
+#: vms-alpha.c:5732
 msgid " WEAK"
-msgstr " WEAK"
+msgstr ""
 
-#: vms-alpha.c:5753
+#: vms-alpha.c:5734
 msgid " DEF"
-msgstr " DEF"
+msgstr ""
 
-#: vms-alpha.c:5755
+#: vms-alpha.c:5736
 msgid " UNI"
-msgstr " UNI"
+msgstr ""
 
-#: vms-alpha.c:5757 vms-alpha.c:5778
+#: vms-alpha.c:5738 vms-alpha.c:5759
 msgid " REL"
-msgstr " REL"
+msgstr ""
 
-#: vms-alpha.c:5759
+#: vms-alpha.c:5740
 msgid " COMM"
-msgstr " COMM"
+msgstr ""
 
-#: vms-alpha.c:5761
+#: vms-alpha.c:5742
 msgid " VECEP"
-msgstr " VECEP"
+msgstr ""
 
-#: vms-alpha.c:5763
+#: vms-alpha.c:5744
 msgid " NORM"
-msgstr " NORM"
+msgstr ""
 
-#: vms-alpha.c:5765
+#: vms-alpha.c:5746
 msgid " QVAL"
-msgstr " QVAL"
+msgstr ""
 
-#: vms-alpha.c:5772
+#: vms-alpha.c:5753
 msgid " PIC"
-msgstr " PIC"
+msgstr ""
 
-#: vms-alpha.c:5774
+#: vms-alpha.c:5755
 msgid " LIB"
-msgstr " LIB"
+msgstr ""
 
-#: vms-alpha.c:5776
+#: vms-alpha.c:5757
 msgid " OVR"
-msgstr " OVR"
+msgstr ""
 
-#: vms-alpha.c:5780
+#: vms-alpha.c:5761
 msgid " GBL"
-msgstr " GBL"
+msgstr ""
 
-#: vms-alpha.c:5782
+#: vms-alpha.c:5763
 msgid " SHR"
-msgstr " SHR"
+msgstr ""
 
-#: vms-alpha.c:5784
+#: vms-alpha.c:5765
 msgid " EXE"
-msgstr " EXE"
+msgstr ""
 
-#: vms-alpha.c:5786
+#: vms-alpha.c:5767
 msgid " RD"
-msgstr " RD"
+msgstr ""
 
-#: vms-alpha.c:5788
+#: vms-alpha.c:5769
 msgid " WRT"
-msgstr " WRT"
+msgstr ""
 
-#: vms-alpha.c:5790
+#: vms-alpha.c:5771
 msgid " VEC"
-msgstr " VEC"
+msgstr ""
 
-#: vms-alpha.c:5792
+#: vms-alpha.c:5773
 msgid " NOMOD"
-msgstr " NOMOD"
+msgstr ""
 
-#: vms-alpha.c:5794
+#: vms-alpha.c:5775
 msgid " COM"
-msgstr " COM"
+msgstr ""
 
-#: vms-alpha.c:5796
+#: vms-alpha.c:5777
 msgid " 64B"
-msgstr " 64B"
+msgstr ""
 
-#: vms-alpha.c:5805
+#: vms-alpha.c:5786
 #, c-format
 msgid "  EGSD (len=%u):\n"
-msgstr "  EGSD (長�=%u):\n"
+msgstr ""
 
-#: vms-alpha.c:5817
+#: vms-alpha.c:5798
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
-msgstr "  EGSD エントリ %2u (型: %u, 長�: %u): "
+msgstr ""
 
-#: vms-alpha.c:5829
-#, c-format
+#: vms-alpha.c:5810
+#, fuzzy, c-format
 msgid "PSC - Program section definition\n"
-msgstr "PSC - プログラムセクション定義\n"
+msgstr ""
+"\n"
+"�ージョン定義:\n"
 
-#: vms-alpha.c:5830 vms-alpha.c:5847
+#: vms-alpha.c:5811 vms-alpha.c:5828
 #, c-format
 msgid "   alignment  : 2**%u\n"
-msgstr "   整列       : 2**%u\n"
+msgstr ""
 
-#: vms-alpha.c:5831 vms-alpha.c:5848
+#: vms-alpha.c:5812 vms-alpha.c:5829
 #, c-format
 msgid "   flags      : 0x%04x"
-msgstr "   フラグ     : 0x%04x"
+msgstr ""
 
-#: vms-alpha.c:5835
+#: vms-alpha.c:5816
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr ""
 
-#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942
-#, c-format
+#: vms-alpha.c:5817 vms-alpha.c:5874 vms-alpha.c:5923
+#, fuzzy, c-format
 msgid "   name       : %.*s\n"
-msgstr "   ��       : %.*s\n"
+msgstr "領域�              = \"%s\"\n"
 
-#: vms-alpha.c:5846
+#: vms-alpha.c:5827
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
-msgstr "SPSC - 共有イメージプログラムセクション定義\n"
+msgstr ""
 
-#: vms-alpha.c:5852
+#: vms-alpha.c:5833
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr ""
 
-#: vms-alpha.c:5853
+#: vms-alpha.c:5834
 #, c-format
 msgid "   image offset  : 0x%08x\n"
-msgstr "   イメージオフセット : 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5836
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5857
-#, c-format
+#: vms-alpha.c:5838
+#, fuzzy, c-format
 msgid "   name          : %.*s\n"
-msgstr "   ��          : %.*s\n"
+msgstr "フラグフィールド    = 0x%.2x\n"
 
-#: vms-alpha.c:5870
+#: vms-alpha.c:5851
 #, c-format
 msgid "SYM - Global symbol definition\n"
-msgstr "SYM - 大域シンボル定義\n"
+msgstr ""
 
-#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971
+#: vms-alpha.c:5852 vms-alpha.c:5912 vms-alpha.c:5933 vms-alpha.c:5952
 #, c-format
 msgid "   flags: 0x%04x"
-msgstr "   フラグ: 0x%04x"
+msgstr ""
 
-#: vms-alpha.c:5874
+#: vms-alpha.c:5855
 #, c-format
 msgid "   psect offset: 0x%08x\n"
-msgstr "   psect オフセット: 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:5878
+#: vms-alpha.c:5859
 #, c-format
 msgid "   code address: 0x%08x\n"
-msgstr "   コードアドレス: 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:5880
+#: vms-alpha.c:5861
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr ""
 
-#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978
-#, c-format
+#: vms-alpha.c:5864 vms-alpha.c:5940 vms-alpha.c:5959
+#, fuzzy, c-format
 msgid "   psect index : %u\n"
-msgstr "   psect 索引 : %u\n"
+msgstr "ETIR_S_C_STA_PQ ��るセクションインデックス��正��"
 
-#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980
-#, c-format
+#: vms-alpha.c:5866 vms-alpha.c:5942 vms-alpha.c:5961
+#, fuzzy, c-format
 msgid "   name        : %.*s\n"
-msgstr "   ��        : %.*s\n"
+msgstr "領域�              = \"%s\"\n"
 
-#: vms-alpha.c:5892
+#: vms-alpha.c:5873
 #, c-format
 msgid "SYM - Global symbol reference\n"
-msgstr "SYM - 大域シンボル�照\n"
+msgstr ""
 
-#: vms-alpha.c:5904
+#: vms-alpha.c:5885
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr ""
 
-#: vms-alpha.c:5905
-#, c-format
+#: vms-alpha.c:5886
+#, fuzzy, c-format
 msgid "   flags         : 0x%08x"
-msgstr "   フラグ        : 0x%08x"
+msgstr "フラグフィールド    = 0x%.2x\n"
 
-#: vms-alpha.c:5909
+#: vms-alpha.c:5890
 #, c-format
 msgid "   id match      : %x\n"
 msgstr ""
 
-#: vms-alpha.c:5911
+#: vms-alpha.c:5892
 #, c-format
 msgid "   error severity: %x\n"
 msgstr ""
 
-#: vms-alpha.c:5914
+#: vms-alpha.c:5895
 #, c-format
 msgid "   entity name   : %.*s\n"
-msgstr "   エントリ�    : %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5916
+#: vms-alpha.c:5897
 #, c-format
 msgid "   object name   : %.*s\n"
-msgstr "   オブジェクト�: %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:5919
+#: vms-alpha.c:5900
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5922
+#: vms-alpha.c:5903
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:5930
+#: vms-alpha.c:5911
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
-msgstr "SYMG - ユニ�ーサルシンボル定義\n"
+msgstr ""
 
-#: vms-alpha.c:5934
+#: vms-alpha.c:5915
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
-msgstr "   シンボルベクトルオフセット: 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:5936
-#, c-format
+#: vms-alpha.c:5917
+#, fuzzy, c-format
 msgid "   entry point: 0x%08x\n"
-msgstr "   エントリ�イント: 0x%08x\n"
+msgstr " [エントリ�イントを������]"
 
-#: vms-alpha.c:5938
+#: vms-alpha.c:5919
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5940
-#, c-format
+#: vms-alpha.c:5921
+#, fuzzy, c-format
 msgid "   psect index: %u\n"
-msgstr ""
+msgstr "ETIR_S_C_STA_PQ ��るセクションインデックス��正��"
 
-#: vms-alpha.c:5951
-#, c-format
+#: vms-alpha.c:5932
+#, fuzzy, c-format
 msgid "SYMV - Vectored symbol definition\n"
-msgstr "SYMV - ベクトル化�れ�シンボル定義\n"
+msgstr ""
+"\n"
+"�ージョン定義:\n"
 
-#: vms-alpha.c:5955
+#: vms-alpha.c:5936
 #, c-format
 msgid "   vector      : 0x%08x\n"
-msgstr "   ベクトル    : 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:5957 vms-alpha.c:5976
+#: vms-alpha.c:5938 vms-alpha.c:5957
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr ""
 
-#: vms-alpha.c:5970
+#: vms-alpha.c:5951
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
-msgstr "SYMM - �ージョン付�大域シンボル定義\n"
+msgstr ""
 
-#: vms-alpha.c:5974
+#: vms-alpha.c:5955
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:5985
+#: vms-alpha.c:5966
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr ""
 
-#: vms-alpha.c:6019
+#: vms-alpha.c:6000
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6022
+#: vms-alpha.c:6003
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6026
+#: vms-alpha.c:6007
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6031
+#: vms-alpha.c:6012
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6036
+#: vms-alpha.c:6017
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6046
+#: vms-alpha.c:6027
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr ""
 
-#: vms-alpha.c:6061
+#: vms-alpha.c:6042
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr ""
 
-#: vms-alpha.c:6065
+#: vms-alpha.c:6046
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6069
+#: vms-alpha.c:6050
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6073
+#: vms-alpha.c:6054
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6078
+#: vms-alpha.c:6059
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6079
+#: vms-alpha.c:6060
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6085
+#: vms-alpha.c:6066
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr ""
 
-#: vms-alpha.c:6088
+#: vms-alpha.c:6069
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr ""
 
-#: vms-alpha.c:6091
+#: vms-alpha.c:6072
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr ""
 
-#: vms-alpha.c:6095
+#: vms-alpha.c:6076
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr ""
 
-#: vms-alpha.c:6098
+#: vms-alpha.c:6079
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr ""
 
-#: vms-alpha.c:6101
+#: vms-alpha.c:6082
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr ""
 
-#: vms-alpha.c:6104
+#: vms-alpha.c:6085
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr ""
 
-#: vms-alpha.c:6110
+#: vms-alpha.c:6091
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr ""
 
-#: vms-alpha.c:6117
+#: vms-alpha.c:6098
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6121
+#: vms-alpha.c:6102
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6125
+#: vms-alpha.c:6106
 #, c-format
 msgid "STO_RB (store relative branch)\n"
 msgstr ""
 
-#: vms-alpha.c:6128
+#: vms-alpha.c:6109
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
 msgstr ""
 
-#: vms-alpha.c:6131
+#: vms-alpha.c:6112
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr ""
 
-#: vms-alpha.c:6137
+#: vms-alpha.c:6118
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr ""
 
-#: vms-alpha.c:6144
+#: vms-alpha.c:6125
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6148
+#: vms-alpha.c:6129
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr ""
 
-#: vms-alpha.c:6151
+#: vms-alpha.c:6132
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
 msgstr ""
 
-#: vms-alpha.c:6154
+#: vms-alpha.c:6135
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
 msgstr ""
 
-#: vms-alpha.c:6158
+#: vms-alpha.c:6139
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr ""
 
-#: vms-alpha.c:6161
+#: vms-alpha.c:6142
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr ""
 
-#: vms-alpha.c:6164
+#: vms-alpha.c:6145
 #, c-format
 msgid "OPR_SUB (substract)\n"
 msgstr ""
 
-#: vms-alpha.c:6167
+#: vms-alpha.c:6148
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr ""
 
-#: vms-alpha.c:6170
+#: vms-alpha.c:6151
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr ""
 
-#: vms-alpha.c:6173
+#: vms-alpha.c:6154
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr ""
 
-#: vms-alpha.c:6176
+#: vms-alpha.c:6157
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr ""
 
-#: vms-alpha.c:6179
+#: vms-alpha.c:6160
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr ""
 
-#: vms-alpha.c:6182
+#: vms-alpha.c:6163
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr ""
 
-#: vms-alpha.c:6185
+#: vms-alpha.c:6166
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr ""
 
-#: vms-alpha.c:6188
+#: vms-alpha.c:6169
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr ""
 
-#: vms-alpha.c:6191
+#: vms-alpha.c:6172
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr ""
 
-#: vms-alpha.c:6194
+#: vms-alpha.c:6175
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr ""
 
-#: vms-alpha.c:6197
+#: vms-alpha.c:6178
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr ""
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6181
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr ""
 
-#: vms-alpha.c:6203
+#: vms-alpha.c:6184
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr ""
 
-#: vms-alpha.c:6206
+#: vms-alpha.c:6187
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr ""
 
-#: vms-alpha.c:6210
+#: vms-alpha.c:6191
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr ""
 
-#: vms-alpha.c:6214
+#: vms-alpha.c:6195
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr ""
 
-#: vms-alpha.c:6215
+#: vms-alpha.c:6196
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6218
+#: vms-alpha.c:6199
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6202
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr ""
 
-#: vms-alpha.c:6222
+#: vms-alpha.c:6203
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6226
+#: vms-alpha.c:6207
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr ""
 
-#: vms-alpha.c:6227
+#: vms-alpha.c:6208
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6231
+#: vms-alpha.c:6212
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6233
+#: vms-alpha.c:6214
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr ""
 
-#: vms-alpha.c:6240
+#: vms-alpha.c:6221
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6244
+#: vms-alpha.c:6225
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6248
+#: vms-alpha.c:6229
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6252
+#: vms-alpha.c:6233
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6256
+#: vms-alpha.c:6237
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6260
+#: vms-alpha.c:6241
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6264
+#: vms-alpha.c:6245
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6268
+#: vms-alpha.c:6249
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6273
+#: vms-alpha.c:6254
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr ""
 
-#: vms-alpha.c:6277
+#: vms-alpha.c:6258
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr ""
 
-#: vms-alpha.c:6281
+#: vms-alpha.c:6262
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
 msgstr ""
 
-#: vms-alpha.c:6287
+#: vms-alpha.c:6268
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
 msgstr ""
 
-#: vms-alpha.c:6291
+#: vms-alpha.c:6272
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
-msgstr "CTL_DFLOC (定義�置)\n"
+msgstr ""
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6275
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr ""
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6278
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
-msgstr "CTL_STKDL (スタック定義�置)\n"
+msgstr ""
 
-#: vms-alpha.c:6300 vms-alpha.c:6714
+#: vms-alpha.c:6281 vms-alpha.c:6695
 #, c-format
 msgid "*unhandled*\n"
 msgstr ""
 
-#: vms-alpha.c:6330 vms-alpha.c:6369
+#: vms-alpha.c:6311 vms-alpha.c:6350
 #, c-format
 msgid "cannot read GST record length\n"
-msgstr "GST レコード長を読�込���ん\n"
+msgstr ""
 
 #. Ill-formed.
-#: vms-alpha.c:6351
+#: vms-alpha.c:6332
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr ""
 
-#: vms-alpha.c:6377
+#: vms-alpha.c:6358
 #, c-format
 msgid "cannot read GST record header\n"
-msgstr "GST レコードヘッダを読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:6390
+#: vms-alpha.c:6371
 #, c-format
 msgid " corrupted GST\n"
-msgstr " 破����る GST ��\n"
+msgstr ""
 
-#: vms-alpha.c:6398
+#: vms-alpha.c:6379
 #, c-format
 msgid "cannot read GST record\n"
-msgstr "GST レコードを読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:6427
-#, c-format
+#: vms-alpha.c:6408
+#, fuzzy, c-format
 msgid " unhandled EOBJ record type %u\n"
-msgstr "扱��� EOBJ レコード型 %u ��\n"
+msgstr "%s: import タイプ %x ��り扱�れ��ん���"
 
-#: vms-alpha.c:6450
+#: vms-alpha.c:6431
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6463
+#: vms-alpha.c:6444
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
 msgstr ""
 
-#: vms-alpha.c:6470
+#: vms-alpha.c:6451
 #, c-format
 msgid " %08x"
-msgstr " %08x"
+msgstr ""
 
-#: vms-alpha.c:6495
+#: vms-alpha.c:6476
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr ""
 
-#: vms-alpha.c:6500
+#: vms-alpha.c:6481
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6521
+#: vms-alpha.c:6502
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr ""
 
-#: vms-alpha.c:6528
+#: vms-alpha.c:6509
 #, c-format
 msgid " 0x%08x"
 msgstr ""
 
 #. 64 bits.
-#: vms-alpha.c:6650
+#: vms-alpha.c:6631
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr ""
 
-#: vms-alpha.c:6654
+#: vms-alpha.c:6635
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6665
+#: vms-alpha.c:6646
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr ""
 
-#: vms-alpha.c:6669
+#: vms-alpha.c:6650
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6673
+#: vms-alpha.c:6654
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6677
+#: vms-alpha.c:6658
 #, c-format
 msgid "Strides:\n"
 msgstr ""
 
-#: vms-alpha.c:6682
+#: vms-alpha.c:6663
 #, c-format
 msgid "[%u]: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6687
+#: vms-alpha.c:6668
 #, c-format
 msgid "Bounds:\n"
 msgstr ""
 
-#: vms-alpha.c:6692
+#: vms-alpha.c:6673
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6704
+#: vms-alpha.c:6685
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr ""
 
-#: vms-alpha.c:6708
+#: vms-alpha.c:6689
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6728
+#: vms-alpha.c:6709
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr ""
 
-#: vms-alpha.c:6734
-#, c-format
+#: vms-alpha.c:6715
+#, fuzzy, c-format
 msgid "(no value)\n"
-msgstr "(値無�)\n"
+msgstr "�正�値��"
 
-#: vms-alpha.c:6737
+#: vms-alpha.c:6718
 #, c-format
 msgid "(not active)\n"
 msgstr ""
 
-#: vms-alpha.c:6740
+#: vms-alpha.c:6721
 #, c-format
 msgid "(not allocated)\n"
-msgstr "(未割り当�)\n"
+msgstr ""
 
-#: vms-alpha.c:6743
+#: vms-alpha.c:6724
 #, c-format
 msgid "(descriptor)\n"
-msgstr "(記述�)\n"
+msgstr ""
 
-#: vms-alpha.c:6747
+#: vms-alpha.c:6728
 #, c-format
 msgid "(trailing value)\n"
-msgstr "(後続�値)\n"
+msgstr ""
 
-#: vms-alpha.c:6750
+#: vms-alpha.c:6731
 #, c-format
 msgid "(value spec follows)\n"
 msgstr ""
 
-#: vms-alpha.c:6753
+#: vms-alpha.c:6734
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr ""
 
-#: vms-alpha.c:6756
+#: vms-alpha.c:6737
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr ""
 
-#: vms-alpha.c:6763
+#: vms-alpha.c:6744
 msgid "literal"
 msgstr ""
 
-#: vms-alpha.c:6766
+#: vms-alpha.c:6747
+#, fuzzy
 msgid "address"
-msgstr "アドレス"
+msgstr "テーブルアドレス\n"
 
-#: vms-alpha.c:6769
+#: vms-alpha.c:6750
+#, fuzzy
 msgid "desc"
-msgstr ""
+msgstr "サ�ート�����"
 
-#: vms-alpha.c:6772
+#: vms-alpha.c:6753
 msgid "reg"
 msgstr ""
 
-#: vms-alpha.c:6847
+#: vms-alpha.c:6828
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr "デ�ッグシンボル表:\n"
 
-#: vms-alpha.c:6858
+#: vms-alpha.c:6839
 #, c-format
 msgid "cannot read DST header\n"
 msgstr ""
 
-#: vms-alpha.c:6863
+#: vms-alpha.c:6844
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr ""
 
-#: vms-alpha.c:6877
+#: vms-alpha.c:6858
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr ""
 
-#: vms-alpha.c:6920
+#: vms-alpha.c:6901
 #, c-format
 msgid "standard data: %s\n"
 msgstr ""
 
-#: vms-alpha.c:6923 vms-alpha.c:7007
-#, c-format
+#: vms-alpha.c:6904 vms-alpha.c:6988
+#, fuzzy, c-format
 msgid "    name: %.*s\n"
-msgstr "    ��: %.*s\n"
+msgstr ""
+"\n"
+"      åž‹: %s"
 
-#: vms-alpha.c:6930
+#: vms-alpha.c:6911
 #, c-format
 msgid "modbeg\n"
 msgstr ""
 
-#: vms-alpha.c:6931
+#: vms-alpha.c:6912
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6937 vms-alpha.c:7203
+#: vms-alpha.c:6918 vms-alpha.c:7184
 #, c-format
 msgid "   module name: %.*s\n"
-msgstr "   モジュール�: %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:6940
+#: vms-alpha.c:6921
 #, c-format
 msgid "   compiler   : %.*s\n"
-msgstr "   コンパイラ : %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:6945
+#: vms-alpha.c:6926
 #, c-format
 msgid "modend\n"
 msgstr ""
 
-#: vms-alpha.c:6952
+#: vms-alpha.c:6933
 msgid "rtnbeg\n"
 msgstr ""
 
-#: vms-alpha.c:6953
+#: vms-alpha.c:6934
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6958
+#: vms-alpha.c:6939
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:6966
+#: vms-alpha.c:6947
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6974
+#: vms-alpha.c:6955
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:6982
+#: vms-alpha.c:6963
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr ""
 
-#: vms-alpha.c:6991
+#: vms-alpha.c:6972
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7000
+#: vms-alpha.c:6981
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7006
+#: vms-alpha.c:6987
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7013
+#: vms-alpha.c:6994
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7022
+#: vms-alpha.c:7003
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7029
+#: vms-alpha.c:7010
 #, c-format
 msgid "recend\n"
 msgstr ""
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7013
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7036
+#: vms-alpha.c:7017
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7040
+#: vms-alpha.c:7021
 #, c-format
 msgid "enumend\n"
 msgstr ""
 
-#: vms-alpha.c:7057
+#: vms-alpha.c:7038
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7059
+#: vms-alpha.c:7040
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7069
+#: vms-alpha.c:7050
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7086
+#: vms-alpha.c:7067
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr ""
 
-#: vms-alpha.c:7093
+#: vms-alpha.c:7074
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7099
+#: vms-alpha.c:7080
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7105
+#: vms-alpha.c:7086
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr ""
 
-#: vms-alpha.c:7111
+#: vms-alpha.c:7092
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr ""
 
-#: vms-alpha.c:7116
+#: vms-alpha.c:7097
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr ""
 
-#: vms-alpha.c:7121
+#: vms-alpha.c:7102
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr ""
 
-#: vms-alpha.c:7126
+#: vms-alpha.c:7107
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7130
+#: vms-alpha.c:7111
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7135
+#: vms-alpha.c:7116
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr ""
 
-#: vms-alpha.c:7137
+#: vms-alpha.c:7118
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7142
+#: vms-alpha.c:7123
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr ""
 
-#: vms-alpha.c:7144
+#: vms-alpha.c:7125
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7150
+#: vms-alpha.c:7131
 #, c-format
 msgid "delta pc +%-4d"
 msgstr ""
 
-#: vms-alpha.c:7153
+#: vms-alpha.c:7134
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
-msgstr "    pc: 0x%08x 行: %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7158
+#: vms-alpha.c:7139
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr ""
 
-#: vms-alpha.c:7173
+#: vms-alpha.c:7154
 #, c-format
 msgid "source (len: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7187
+#: vms-alpha.c:7168
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7191
+#: vms-alpha.c:7172
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7200
+#: vms-alpha.c:7181
 #, c-format
 msgid "   filename   : %.*s\n"
-msgstr "   ファイル� : %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:7209
+#: vms-alpha.c:7190
 #, c-format
 msgid "   setfile %u\n"
 msgstr ""
 
-#: vms-alpha.c:7214 vms-alpha.c:7219
+#: vms-alpha.c:7195 vms-alpha.c:7200
 #, c-format
 msgid "   setrec %u\n"
 msgstr ""
 
-#: vms-alpha.c:7224 vms-alpha.c:7229
+#: vms-alpha.c:7205 vms-alpha.c:7210
 #, c-format
 msgid "   setlnum %u\n"
 msgstr ""
 
-#: vms-alpha.c:7234 vms-alpha.c:7239
+#: vms-alpha.c:7215 vms-alpha.c:7220
 #, c-format
 msgid "   deflines %u\n"
 msgstr ""
 
-#: vms-alpha.c:7243
+#: vms-alpha.c:7224
 #, c-format
 msgid "   formfeed\n"
 msgstr ""
 
-#: vms-alpha.c:7247
+#: vms-alpha.c:7228
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr ""
 
-#: vms-alpha.c:7259
-#, c-format
+#: vms-alpha.c:7240
+#, fuzzy, c-format
 msgid "*unhandled* dst type %u\n"
-msgstr ""
+msgstr "%s: import タイプ %x ��り扱�れ��ん���"
 
-#: vms-alpha.c:7291
+#: vms-alpha.c:7272
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr ""
 
-#: vms-alpha.c:7294
+#: vms-alpha.c:7275
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7297
+#: vms-alpha.c:7278
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7305
+#: vms-alpha.c:7286
 msgid "executable"
 msgstr ""
 
-#: vms-alpha.c:7308
+#: vms-alpha.c:7289
 msgid "linkable image"
 msgstr ""
 
-#: vms-alpha.c:7314
+#: vms-alpha.c:7295
 #, c-format
 msgid " image type: %u (%s)"
 msgstr ""
 
-#: vms-alpha.c:7320
+#: vms-alpha.c:7301
 msgid "native"
 msgstr ""
 
-#: vms-alpha.c:7323
+#: vms-alpha.c:7304
 msgid "CLI"
 msgstr ""
 
-#: vms-alpha.c:7329
+#: vms-alpha.c:7310
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ""
 
-#: vms-alpha.c:7335
+#: vms-alpha.c:7316
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7339
+#: vms-alpha.c:7320
 #, c-format
 msgid " fixup info rva: "
 msgstr ""
 
-#: vms-alpha.c:7341
+#: vms-alpha.c:7322
 #, c-format
 msgid ", symbol vector rva: "
 msgstr ""
 
-#: vms-alpha.c:7344
+#: vms-alpha.c:7325
 #, c-format
 msgid ""
 "\n"
 " version array off: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7348
+#: vms-alpha.c:7329
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7354
-#, c-format
+#: vms-alpha.c:7335
+#, fuzzy, c-format
 msgid " linker flags: %08x:"
-msgstr " リンカフラグ: %08x:"
+msgstr "private フラグ = %x:"
 
-#: vms-alpha.c:7384
+#: vms-alpha.c:7365
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7390
+#: vms-alpha.c:7371
 #, c-format
 msgid " BPAGE: %u"
 msgstr ""
 
-#: vms-alpha.c:7396
+#: vms-alpha.c:7377
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ""
 
-#: vms-alpha.c:7399
+#: vms-alpha.c:7380
 #, c-format
 msgid ", alias: %u\n"
 msgstr ""
 
-#: vms-alpha.c:7407
+#: vms-alpha.c:7388
 #, c-format
 msgid "system version array information:\n"
-msgstr "システム�ージョン�列情報:\n"
+msgstr ""
 
-#: vms-alpha.c:7411
+#: vms-alpha.c:7392
 #, c-format
 msgid "cannot read EIHVN header\n"
-msgstr "EIHVN ヘッダを読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7421
+#: vms-alpha.c:7402
 #, c-format
 msgid "cannot read EIHVN version\n"
-msgstr "EIHVN �ージョンを読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7424
+#: vms-alpha.c:7405
 #, c-format
 msgid "   %02u "
 msgstr ""
 
-#: vms-alpha.c:7428
+#: vms-alpha.c:7409
 msgid "BASE_IMAGE       "
 msgstr ""
 
-#: vms-alpha.c:7431
+#: vms-alpha.c:7412
 msgid "MEMORY_MANAGEMENT"
 msgstr ""
 
-#: vms-alpha.c:7434
+#: vms-alpha.c:7415
 msgid "IO               "
 msgstr ""
 
-#: vms-alpha.c:7437
+#: vms-alpha.c:7418
 msgid "FILES_VOLUMES    "
 msgstr ""
 
-#: vms-alpha.c:7440
+#: vms-alpha.c:7421
 msgid "PROCESS_SCHED    "
 msgstr ""
 
-#: vms-alpha.c:7443
+#: vms-alpha.c:7424
 msgid "SYSGEN           "
 msgstr ""
 
-#: vms-alpha.c:7446
+#: vms-alpha.c:7427
 msgid "CLUSTERS_LOCKMGR "
 msgstr ""
 
-#: vms-alpha.c:7449
+#: vms-alpha.c:7430
 msgid "LOGICAL_NAMES    "
 msgstr ""
 
-#: vms-alpha.c:7452
+#: vms-alpha.c:7433
 msgid "SECURITY         "
 msgstr ""
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7436
 msgid "IMAGE_ACTIVATOR  "
 msgstr ""
 
-#: vms-alpha.c:7458
+#: vms-alpha.c:7439
 msgid "NETWORKS         "
 msgstr ""
 
-#: vms-alpha.c:7461
+#: vms-alpha.c:7442
 msgid "COUNTERS         "
 msgstr ""
 
-#: vms-alpha.c:7464
+#: vms-alpha.c:7445
 msgid "STABLE           "
 msgstr ""
 
-#: vms-alpha.c:7467
+#: vms-alpha.c:7448
 msgid "MISC             "
 msgstr ""
 
-#: vms-alpha.c:7470
+#: vms-alpha.c:7451
 msgid "CPU              "
 msgstr ""
 
-#: vms-alpha.c:7473
+#: vms-alpha.c:7454
 msgid "VOLATILE         "
 msgstr ""
 
-#: vms-alpha.c:7476
+#: vms-alpha.c:7457
 msgid "SHELL            "
 msgstr ""
 
-#: vms-alpha.c:7479
+#: vms-alpha.c:7460
 msgid "POSIX            "
 msgstr ""
 
-#: vms-alpha.c:7482
+#: vms-alpha.c:7463
 msgid "MULTI_PROCESSING "
 msgstr ""
 
-#: vms-alpha.c:7485
+#: vms-alpha.c:7466
 msgid "GALAXY           "
 msgstr ""
 
-#: vms-alpha.c:7488
+#: vms-alpha.c:7469
+#, fuzzy
 msgid "*unknown*        "
-msgstr "*�明*           "
+msgstr "*�明*"
 
-#: vms-alpha.c:7491
+#: vms-alpha.c:7472
 #, c-format
 msgid ": %u.%u\n"
 msgstr ""
 
-#: vms-alpha.c:7504 vms-alpha.c:7763
+#: vms-alpha.c:7485 vms-alpha.c:7744
 #, c-format
 msgid "cannot read EIHA\n"
-msgstr "EIHA を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7507
+#: vms-alpha.c:7488
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr ""
 
-#: vms-alpha.c:7509
+#: vms-alpha.c:7490
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
-msgstr " 1番目�アドレス: 0x%08x 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7512
+#: vms-alpha.c:7493
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
-msgstr " 2番目�アドレス: 0x%08x 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7515
+#: vms-alpha.c:7496
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
-msgstr " 3番目�アドレス: 0x%08x 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7499
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
-msgstr " 4番目�アドレス: 0x%08x 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7521
+#: vms-alpha.c:7502
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
-msgstr " 共有イメージ  : 0x%08x 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7532
+#: vms-alpha.c:7513
 #, c-format
 msgid "cannot read EIHI\n"
-msgstr "EIHI を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7535
+#: vms-alpha.c:7516
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7538
-#, c-format
+#: vms-alpha.c:7519
+#, fuzzy, c-format
 msgid " image name       : %.*s\n"
-msgstr " イメージ�       : %.*s\n"
+msgstr "領域�              = \"%s\"\n"
 
-#: vms-alpha.c:7540
-#, c-format
+#: vms-alpha.c:7521
+#, fuzzy, c-format
 msgid " link time        : %s\n"
-msgstr " リンク時刻       : %s\n"
+msgstr "領域�              = \"%s\"\n"
 
-#: vms-alpha.c:7542
+#: vms-alpha.c:7523
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7544
+#: vms-alpha.c:7525
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7546
+#: vms-alpha.c:7527
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7556
+#: vms-alpha.c:7537
 #, c-format
 msgid "cannot read EIHS\n"
-msgstr "EIHS を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7559
+#: vms-alpha.c:7540
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
-msgstr "イメージシンボル&デ�ッグ表: (メジャー: %u�マイナー: %u)\n"
+msgstr ""
 
-#: vms-alpha.c:7564
+#: vms-alpha.c:7545
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
-msgstr " デ�ッグシンボル表 : vbn: %u�サイズ: %u (0x%x)\n"
+msgstr ""
 
-#: vms-alpha.c:7568
+#: vms-alpha.c:7549
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
-msgstr " 大域シンボル表     : vbn: %u�レコード: %u\n"
+msgstr ""
 
-#: vms-alpha.c:7572
+#: vms-alpha.c:7553
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
-msgstr " デ�ッグモジュール表: vbn: %u�サイズ: %u\n"
+msgstr ""
 
-#: vms-alpha.c:7585
+#: vms-alpha.c:7566
 #, c-format
 msgid "cannot read EISD\n"
-msgstr "EISD を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7595
+#: vms-alpha.c:7576
 #, c-format
 msgid "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
-msgstr "イメージセクション記述�: (メジャー: %u�マイナー: %u�サイズ: %u�オフセット: %u)\n"
+msgstr ""
 
-#: vms-alpha.c:7602
+#: vms-alpha.c:7583
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr ""
 
-#: vms-alpha.c:7607
-#, c-format
+#: vms-alpha.c:7588
+#, fuzzy, c-format
 msgid " flags: 0x%04x"
-msgstr "フラグ: 0x%04x"
+msgstr "private フラグ = 0x%lx"
 
-#: vms-alpha.c:7644
+#: vms-alpha.c:7625
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr ""
 
-#: vms-alpha.c:7650
+#: vms-alpha.c:7631
 msgid "NORMAL"
-msgstr "NORMAL"
+msgstr ""
 
-#: vms-alpha.c:7653
+#: vms-alpha.c:7634
 msgid "SHRFXD"
-msgstr "SHRFXD"
+msgstr ""
 
-#: vms-alpha.c:7656
+#: vms-alpha.c:7637
 msgid "PRVFXD"
-msgstr "PRVFXD"
+msgstr ""
 
-#: vms-alpha.c:7659
+#: vms-alpha.c:7640
 msgid "SHRPIC"
-msgstr "SHRPIC"
+msgstr ""
 
-#: vms-alpha.c:7662
+#: vms-alpha.c:7643
 msgid "PRVPIC"
-msgstr "PRVPIC"
+msgstr ""
 
-#: vms-alpha.c:7665
+#: vms-alpha.c:7646
 msgid "USRSTACK"
-msgstr "USRSTACK"
+msgstr ""
 
-#: vms-alpha.c:7673
+#: vms-alpha.c:7654
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr ""
 
-#: vms-alpha.c:7683
+#: vms-alpha.c:7664
 #, c-format
 msgid "cannot read DMT\n"
-msgstr "DMT を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7687
+#: vms-alpha.c:7668
 #, c-format
 msgid "Debug module table:\n"
-msgstr "デ�ッグモジュール表:\n"
+msgstr ""
 
-#: vms-alpha.c:7696
+#: vms-alpha.c:7677
 #, c-format
 msgid "cannot read DMT header\n"
-msgstr "DMT ヘッダを読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7701
+#: vms-alpha.c:7682
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
-msgstr " モジュールオフセット: 0x%08x, サイズ: 0x%08x, (%u psects)\n"
+msgstr ""
 
-#: vms-alpha.c:7711
+#: vms-alpha.c:7692
 #, c-format
 msgid "cannot read DMT psect\n"
-msgstr "DMT psect を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7714
+#: vms-alpha.c:7695
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
-msgstr "  psect 開始: 0x%08x, 長�: %u\n"
+msgstr ""
 
-#: vms-alpha.c:7727
+#: vms-alpha.c:7708
 #, c-format
 msgid "cannot read DST\n"
-msgstr "DST を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7737
+#: vms-alpha.c:7718
 #, c-format
 msgid "cannot read GST\n"
-msgstr "GST を読�込���ん\n"
+msgstr ""
 
-#: vms-alpha.c:7741
+#: vms-alpha.c:7722
 #, c-format
 msgid "Global symbol table:\n"
 msgstr "大域シンボル表:\n"
 
-#: vms-alpha.c:7769
+#: vms-alpha.c:7750
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr ""
 
-#: vms-alpha.c:7772
+#: vms-alpha.c:7753
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
-msgstr "  iaflink : 0x%08x %08x\n"
+msgstr ""
 
-#: vms-alpha.c:7775
+#: vms-alpha.c:7756
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
-msgstr "  fixuplnk: 0x%08x %08x\n"
+msgstr ""
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7759
 #, c-format
 msgid "  size : %u\n"
-msgstr "  サイズ: %u\n"
+msgstr ""
 
-#: vms-alpha.c:7780
+#: vms-alpha.c:7761
 #, c-format
 msgid "  flags: 0x%08x\n"
-msgstr "  フラグ: 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7784
+#: vms-alpha.c:7765
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
-msgstr "  qrelfixoff: %5u, lrelfixoff: %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7788
+#: vms-alpha.c:7769
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
-msgstr "  qdotadroff: %5u, ldotadroff: %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7792
+#: vms-alpha.c:7773
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
-msgstr "  codeadroff: %5u, lpfixoff  : %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7795
+#: vms-alpha.c:7776
 #, c-format
 msgid "  chgprtoff : %5u\n"
-msgstr "  chgprtoff : %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7798
+#: vms-alpha.c:7779
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
-msgstr "  shlstoff  : %5u, shrimgcnt : %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7800
+#: vms-alpha.c:7781
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
-msgstr "  shlextra  : %5u, permctx   : %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7803
+#: vms-alpha.c:7784
 #, c-format
 msgid "  base_va : 0x%08x\n"
-msgstr "  base_va : 0x%08x\n"
+msgstr ""
 
-#: vms-alpha.c:7805
+#: vms-alpha.c:7786
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
-msgstr "  lppsbfixoff: %5u\n"
+msgstr ""
 
-#: vms-alpha.c:7813
+#: vms-alpha.c:7794
 #, c-format
 msgid " Shareable images:\n"
-msgstr " 共有�能イメージ:\n"
+msgstr ""
 
-#: vms-alpha.c:7817
+#: vms-alpha.c:7798
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
-msgstr "  %u: サイズ: %u, フラグ: 0x%02x, ��: %.*s\n"
+msgstr ""
 
-#: vms-alpha.c:7824
-#, c-format
+#: vms-alpha.c:7805
+#, fuzzy, c-format
 msgid " quad-word relocation fixups:\n"
-msgstr " 4�ワード��置修正:\n"
+msgstr "��置 %s ��り扱�れ��ん���"
 
-#: vms-alpha.c:7829
+#: vms-alpha.c:7810
 #, c-format
 msgid " long-word relocation fixups:\n"
-msgstr " 長ワード��置修正:\n"
+msgstr ""
 
-#: vms-alpha.c:7834
+#: vms-alpha.c:7815
 #, c-format
 msgid " quad-word .address reference fixups:\n"
-msgstr " 4�ワード .address �照修正:\n"
+msgstr ""
 
-#: vms-alpha.c:7839
+#: vms-alpha.c:7820
 #, c-format
 msgid " long-word .address reference fixups:\n"
-msgstr " 長ワード .address �照修正:\n"
+msgstr ""
 
-#: vms-alpha.c:7844
-#, c-format
+#: vms-alpha.c:7825
+#, fuzzy, c-format
 msgid " Code Address Reference Fixups:\n"
-msgstr " コードアドレス�照修正:\n"
+msgstr ""
+"\n"
+"�ージョン�照:\n"
 
-#: vms-alpha.c:7849
+#: vms-alpha.c:7830
 #, c-format
 msgid " Linkage Pairs Referece Fixups:\n"
 msgstr ""
 
-#: vms-alpha.c:7858
+#: vms-alpha.c:7839
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr ""
 
-#: vms-alpha.c:7863
+#: vms-alpha.c:7844
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
-msgstr "  ベース: 0x%08x %08x, サイズ: 0x%08x, prot: 0x%08x "
+msgstr ""
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8694
+#: vms-alpha.c:8676
+#, fuzzy
 msgid "%P: relocatable link is not supported\n"
-msgstr "%P: ��置�能リンク�サ�ート�れ����ん\n"
+msgstr "%s: %s �ら %s ����置�能リンク�サ�ート�れ����ん"
 
-#: vms-alpha.c:8764
+#: vms-alpha.c:8746
 msgid "%P: multiple entry points: in modules %B and %B\n"
-msgstr "%P: 複数�エントリ�イント: モジュール %B 内� %B 内\n"
+msgstr ""
 
 #: vms-lib.c:1421
 #, c-format
 msgid "could not open shared image '%s' from '%s'"
-msgstr "共有イメージ '%s' ('%s' �ら) を開��������ん"
+msgstr ""
 
 #: vms-misc.c:360
 msgid "_bfd_vms_output_counted called with zero bytes"
@@ -5657,155 +5564,174 @@ msgstr "%s: XCOFF ã�Œ XCOFF 出力生æˆ�時以外ã�«ã‚ªãƒ–ジェクトを共有ã
 msgid "%s: dynamic object with no .loader section"
 msgstr "%s: 動的オブジェクト� .loader セクション��り��ん"
 
-#: xcofflink.c:1416
+#: xcofflink.c:1415
+#, fuzzy
 msgid "%B: `%s' has line numbers but no enclosing section"
-msgstr "%B: `%s' �行番�を������セクションを囲�込ん����ん"
+msgstr "%s: `%s' �行番�を������セクションを囲�込ん����ん"
 
-#: xcofflink.c:1468
+#: xcofflink.c:1467
+#, fuzzy
 msgid "%B: class %d symbol `%s' has no aux entries"
-msgstr "%B: クラス %d シンボル `%s' �補助エントリを������ん"
+msgstr "%s: クラス %d シンボル `%s' �補助エントリ��り��ん"
 
-#: xcofflink.c:1490
+#: xcofflink.c:1489
+#, fuzzy
 msgid "%B: symbol `%s' has unrecognized csect type %d"
-msgstr "%B: シンボル `%s' ��識���� csect 型 %d を������"
+msgstr "%s: シンボル `%s' ��識���� csect タイプ %d を������"
 
-#: xcofflink.c:1502
+#: xcofflink.c:1501
+#, fuzzy
 msgid "%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"
-msgstr "%B: 間��� XTY_ER シンボル `%s': クラス %d scnum %d scnlen %d"
+msgstr "%s: �正 XTY_ER シンボル `%s': クラス %d scnum %d scnlen %d"
 
-#: xcofflink.c:1531
+#: xcofflink.c:1530
+#, fuzzy
 msgid "%B: XMC_TC0 symbol `%s' is class %d scnlen %d"
-msgstr "%B: XMC_TC0 シンボル `%s' � class %d scnlen %d ��"
+msgstr "%s: XMC_TC0 シンボル `%s' � class %d scnlen %d ��"
 
-#: xcofflink.c:1677
+#: xcofflink.c:1676
+#, fuzzy
 msgid "%B: csect `%s' not in enclosing section"
-msgstr "%B: csect `%s' �セクション�囲��中��り��ん"
+msgstr "%s: csect `%s' �セクション�囲��中��り��ん"
 
-#: xcofflink.c:1784
+#: xcofflink.c:1783
+#, fuzzy
 msgid "%B: misplaced XTY_LD `%s'"
-msgstr "%B: 間����置��る XTY_LD `%s' ��"
+msgstr "%s: XTY_LD `%s' を置�������"
 
-#: xcofflink.c:2103
+#: xcofflink.c:2102
+#, fuzzy
 msgid "%B: reloc %s:%d not in csect"
-msgstr "%B: ��置 %s:%d � csect 内��り��ん"
+msgstr "%s: ��置 %s:%d � csect 内��り��ん"
 
-#: xcofflink.c:3194
+#: xcofflink.c:3186
 #, c-format
 msgid "%s: no such symbol"
 msgstr "%s: ��よ��シンボル��り��ん"
 
-#: xcofflink.c:3299
+#: xcofflink.c:3291
 #, c-format
 msgid "warning: attempt to export undefined symbol `%s'"
-msgstr "警告: 未定義シンボル `%s' をエクス�ート�よ�������"
+msgstr "警告: 未定義シンボル `%s' を export �よ�������"
 
-#: xcofflink.c:3681
+#: xcofflink.c:3673
 msgid "error: undefined symbol __rtinit"
-msgstr "エラー: 未定義シンボル __rtinit ��"
+msgstr ""
 
-#: xcofflink.c:4060
+#: xcofflink.c:4052
+#, fuzzy
 msgid "%B: loader reloc in unrecognized section `%s'"
-msgstr "%B: �識����セクション `%s' 内��るローダ��置��"
+msgstr "%s: ローダ��置��識����セクション `%s' ��り��"
 
-#: xcofflink.c:4071
+#: xcofflink.c:4063
+#, fuzzy
 msgid "%B: `%s' in loader reloc but not loader sym"
-msgstr "%B: ローダ��置内� `%s' ��り���ローダシンボル��り��ん"
+msgstr "%s: `%s' �ローダ��置��り���ローダシンボル���り��ん"
 
-#: xcofflink.c:4087
+#: xcofflink.c:4079
+#, fuzzy
 msgid "%B: loader reloc in read-only section %A"
-msgstr "%B: 読�込�専用セクション %A 内��るローダ��置��"
+msgstr "%s: ローダ��置�読込�専用セクション %s ��り��"
 
-#: xcofflink.c:5109
+#: xcofflink.c:5097
 #, c-format
 msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"
 msgstr "TOC オー�ーフロー: 0x%lx > 0x10000 -- コンパイル時� -mminimal-toc を試���ょ�"
 
-#: elf32-ia64.c:628 elf64-ia64.c:628
+#: elf32-ia64.c:1110 elf64-ia64.c:1110
 msgid "%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."
 msgstr ""
 
-#: elf32-ia64.c:2290 elf64-ia64.c:2290
+#: elf32-ia64.c:2809 elf64-ia64.c:2809
+#, fuzzy
 msgid "@pltoff reloc against local symbol"
-msgstr "局所シンボル�対�る @pltoff ��置��"
+msgstr "%s: 0x%lx �� CALL16 ��置�大域シンボルを対象������ん"
 
-#: elf32-ia64.c:3693 elf64-ia64.c:3693
+#: elf32-ia64.c:4430 elf64-ia64.c:4430
 #, c-format
 msgid "%s: short data segment overflowed (0x%lx >= 0x400000)"
-msgstr "%s: 短�データセグメント�溢れ��� (0x%lx >= 0x400000)"
+msgstr ""
 
-#: elf32-ia64.c:3704 elf64-ia64.c:3704
+#: elf32-ia64.c:4441 elf64-ia64.c:4441
 #, c-format
 msgid "%s: __gp does not cover short data segment"
 msgstr ""
 
-#: elf32-ia64.c:3971 elf64-ia64.c:3971
+#: elf32-ia64.c:4708 elf64-ia64.c:4708
 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
-msgstr "%B: 動的シンボル `%s' �対�る iim ��置付�� pic コード��"
+msgstr ""
 
-#: elf32-ia64.c:4038 elf64-ia64.c:4038
+#: elf32-ia64.c:4775 elf64-ia64.c:4775
+#, fuzzy
 msgid "%B: @gprel relocation against dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �対�る @gprel ��置��"
+msgstr "%s: ��置タイプ %d (シンボル %s) ��明��"
 
-#: elf32-ia64.c:4101 elf64-ia64.c:4101
+#: elf32-ia64.c:4838 elf64-ia64.c:4838
 msgid "%B: linking non-pic code in a position independent executable"
-msgstr "%B: �置��存実行ファイル内�� pic コードをリンク�����"
+msgstr ""
 
-#: elf32-ia64.c:4238 elf64-ia64.c:4238
+#: elf32-ia64.c:4975 elf64-ia64.c:4975
 msgid "%B: @internal branch to dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �� @internal 分���"
+msgstr ""
 
-#: elf32-ia64.c:4240 elf64-ia64.c:4240
+#: elf32-ia64.c:4977 elf64-ia64.c:4977
 msgid "%B: speculation fixup to dynamic symbol %s"
 msgstr ""
 
-#: elf32-ia64.c:4242 elf64-ia64.c:4242
+#: elf32-ia64.c:4979 elf64-ia64.c:4979
+#, fuzzy
 msgid "%B: @pcrel relocation against dynamic symbol %s"
-msgstr "%B: 動的シンボル %s �対�る @pcrel ��置��"
+msgstr "%s: ��置タイプ %d (シンボル %s) ��明��"
 
-#: elf32-ia64.c:4439 elf64-ia64.c:4439
+#: elf32-ia64.c:5176 elf64-ia64.c:5176
+#, fuzzy
 msgid "unsupported reloc"
-msgstr "サ�ート�れ������置��"
+msgstr "サ�ート�れ������置タイプ��"
 
-#: elf32-ia64.c:4477 elf64-ia64.c:4477
+#: elf32-ia64.c:5214 elf64-ia64.c:5214
 msgid "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."
-msgstr "%B:  ��置 %s (`%s' �対�る��置 0x%lx�セクション `%A') 用� TLS セクション��り��ん。"
+msgstr ""
 
-#: elf32-ia64.c:4492 elf64-ia64.c:4492
+#: elf32-ia64.c:5229 elf64-ia64.c:5229
 msgid "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."
 msgstr ""
 
-#: elf32-ia64.c:4754 elf64-ia64.c:4754
+#: elf32-ia64.c:5491 elf64-ia64.c:5491
 msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
 msgstr ""
 
-#: elf32-ia64.c:4763 elf64-ia64.c:4763
+#: elf32-ia64.c:5500 elf64-ia64.c:5500
+#, fuzzy
 msgid "%B: linking big-endian files with little-endian files"
-msgstr "%B: ビッグエンディアン�ファイル�リトルエンディアン�ファイルをリンク�����"
+msgstr "%s: リトルエンディアン�ファイル�ビッグエンディアン�ファイル�をリンク�よ�������"
 
-#: elf32-ia64.c:4772 elf64-ia64.c:4772
+#: elf32-ia64.c:5509 elf64-ia64.c:5509
+#, fuzzy
 msgid "%B: linking 64-bit files with 32-bit files"
-msgstr "%B: 64 ビットファイル� 32 ビットファイルをリンク�����"
+msgstr "%s: abicall ファイル�� abicall ファイルをリンク�よ������"
 
-#: elf32-ia64.c:4781 elf64-ia64.c:4781
+#: elf32-ia64.c:5518 elf64-ia64.c:5518
+#, fuzzy
 msgid "%B: linking constant-gp files with non-constant-gp files"
-msgstr "%B: 定数 gp ファイル��定数 gp ファイルをリンク�����"
+msgstr "%s: abicall ファイル�� abicall ファイルをリンク�よ������"
 
-#: elf32-ia64.c:4791 elf64-ia64.c:4791
+#: elf32-ia64.c:5528 elf64-ia64.c:5528
+#, fuzzy
 msgid "%B: linking auto-pic files with non-auto-pic files"
-msgstr "%B: 自動 pic ファイル��自動 pic ファイルをリンク�����"
+msgstr "%s: abicall ファイル�� abicall ファイルをリンク�よ������"
 
 #: peigen.c:1002 pepigen.c:1002 pex64igen.c:1002
 #, c-format
 msgid "%s: line number overflow: 0x%lx > 0xffff"
-msgstr "%s: 行番��溢れ���: 0x%lx > 0xffff"
+msgstr "%s: 行番��オー�ーフロー����: 0x%lx > 0xffff"
 
 #: peigen.c:1029 pepigen.c:1029 pex64igen.c:1029
 msgid "Export Directory [.edata (or where ever we found it)]"
-msgstr "エクス�ートディレクトリ [.edata (��������見����場所)]"
+msgstr "Export ディレクトリ [.edata (或�������見���場所)]"
 
 #: peigen.c:1030 pepigen.c:1030 pex64igen.c:1030
 msgid "Import Directory [parts of .idata]"
-msgstr "イン�ートディレクトリ [.idata �部分]"
+msgstr "Import ディレクトリ [.idata �部分]"
 
 #: peigen.c:1031 pepigen.c:1031 pex64igen.c:1031
 msgid "Resource Directory [.rsrc]"
@@ -5857,7 +5783,7 @@ msgstr "�延イン�ートディレクトリ"
 
 #: peigen.c:1043 pepigen.c:1043 pex64igen.c:1043
 msgid "CLR Runtime Header"
-msgstr "CLR ランタイムヘッダ"
+msgstr ""
 
 #: peigen.c:1044 pepigen.c:1044 pex64igen.c:1044
 msgid "Reserved"
@@ -5879,7 +5805,7 @@ msgid ""
 "There is an import table in %s at 0x%lx\n"
 msgstr ""
 "\n"
-"%s 内� 0x%lx �イン�ート表��り��\n"
+"%s 内� 0x%lx ��る import テーブル��\n"
 
 #: peigen.c:1151 pepigen.c:1151 pex64igen.c:1151
 #, c-format
@@ -5888,7 +5814,7 @@ msgid ""
 "Function descriptor located at the start address: %04lx\n"
 msgstr ""
 "\n"
-"開始アドレス��置���る関数記述�: %04lx\n"
+"関数記述��開始アドレス��置�����: %04lx\n"
 
 #: peigen.c:1154 pepigen.c:1154 pex64igen.c:1154
 #, c-format
@@ -5911,16 +5837,14 @@ msgid ""
 "The Import Tables (interpreted %s section contents)\n"
 msgstr ""
 "\n"
-"イン�ート表 ( %sセクション�内容を解釈)\n"
+"Import テーブル (%s セクション�内容を解釈)\n"
 
 #: peigen.c:1170 pepigen.c:1170 pex64igen.c:1170
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " vma:            Hint    Time      Forward  DLL       First\n"
 "                 Table   Stamp     Chain    Name      Thunk\n"
-msgstr ""
-" vma:            Hint    Time      Forward  DLL       First\n"
-"                 Table   Stamp     Chain    Name      Thunk\n"
+msgstr " vma:            Hint    Time      Forward  DLL       First\n"
 
 #: peigen.c:1218 pepigen.c:1218 pex64igen.c:1218
 #, c-format
@@ -5932,16 +5856,18 @@ msgstr ""
 "\tDLL �: %s\n"
 
 #: peigen.c:1229 pepigen.c:1229 pex64igen.c:1229
-#, c-format
+#, fuzzy, c-format
 msgid "\tvma:  Hint/Ord Member-Name Bound-To\n"
-msgstr ""
+msgstr "\tvma:  Hint/Ord メン��\n"
 
 #: peigen.c:1254 pepigen.c:1254 pex64igen.c:1254
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "There is a first thunk, but the section containing it could not be found\n"
 msgstr ""
+"\n"
+"import テーブル��り������を�ん��るセクションを見��られ��ん���\n"
 
 #: peigen.c:1415 pepigen.c:1415 pex64igen.c:1415
 #, c-format
@@ -5950,16 +5876,16 @@ msgid ""
 "There is an export table, but the section containing it could not be found\n"
 msgstr ""
 "\n"
-"エクス�ート表��り�����れを�むセクション�見��り��ん���\n"
+"export テーブル��り�����れを�ん��るセクションを見��られ��ん���\n"
 
 #: peigen.c:1424 pepigen.c:1424 pex64igen.c:1424
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "There is an export table in %s, but it does not fit into that section\n"
 msgstr ""
 "\n"
-"%s 内�エクス�ート表��り������セクション内�入り��ん\n"
+"export テーブル��り�����れを�ん��るセクションを見��られ��ん���\n"
 
 #: peigen.c:1430 pepigen.c:1430 pex64igen.c:1430
 #, c-format
@@ -5968,7 +5894,7 @@ msgid ""
 "There is an export table in %s at 0x%lx\n"
 msgstr ""
 "\n"
-"%s � 0x%lx �エクス�ート表��り��\n"
+"%s � 0x%lx � export テーブル��り��\n"
 
 #: peigen.c:1458 pepigen.c:1458 pex64igen.c:1458
 #, c-format
@@ -5978,13 +5904,13 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"エクス�ート表 (%s セクション�内容を解釈)\n"
+"Export テーブル (%s セクション�内容を解釈)\n"
 "\n"
 
 #: peigen.c:1462 pepigen.c:1462 pex64igen.c:1462
 #, c-format
 msgid "Export Flags \t\t\t%lx\n"
-msgstr "エクス�ートフラグ \t\t\t%lx\n"
+msgstr "Export フラグ \t\t\t%lx\n"
 
 #: peigen.c:1465 pepigen.c:1465 pex64igen.c:1465
 #, c-format
@@ -6024,12 +5950,12 @@ msgstr "\t[���インタ/�数] テーブル\t%08lx\n"
 #: peigen.c:1490 pepigen.c:1490 pex64igen.c:1490
 #, c-format
 msgid "Table Addresses\n"
-msgstr "表アドレス\n"
+msgstr "テーブルアドレス\n"
 
 #: peigen.c:1493 pepigen.c:1493 pex64igen.c:1493
 #, c-format
 msgid "\tExport Address Table \t\t"
-msgstr "\tエクス�ートアドレス表\t\t"
+msgstr "\tExport アドレステーブル\t\t"
 
 #: peigen.c:1498 pepigen.c:1498 pex64igen.c:1498
 #, c-format
@@ -6079,13 +6005,11 @@ msgid " vma:\t\t\tBegin Address    End Address      Unwind Info\n"
 msgstr " vma:\t\t\t開始アドレス    終了アドレス      Unwind 情報\n"
 
 #: peigen.c:1623 pepigen.c:1623 pex64igen.c:1623
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " vma:\t\tBegin    End      EH       EH       PrologEnd  Exception\n"
 "     \t\tAddress  Address  Handler  Data     Address    Mask\n"
-msgstr ""
-" vma:\t\t開始     終了     EH       EH       PrologEnd  例外\n"
-"     \t\tアドレス アドレス �ンドラ データ   アドレス   マスク\n"
+msgstr " vma:\t\t開始     終了     EH       EH       PrologEnd  例外\n"
 
 #: peigen.c:1697 pepigen.c:1697 pex64igen.c:1697
 #, c-format
@@ -6108,8 +6032,6 @@ msgid ""
 " vma:\t\tBegin    Prolog   Function Flags    Exception EH\n"
 "     \t\tAddress  Length   Length   32b exc  Handler   Data\n"
 msgstr ""
-" vma:\t\t開始     Prolog   関数     フラグ   例外      EH\n"
-"     \t\tアドレス 長       長       32b exc  �ンドラ  データ\n"
 
 #: peigen.c:1929 pepigen.c:1929 pex64igen.c:1929
 #, c-format
@@ -6150,33 +6072,337 @@ msgstr ""
 
 #: peigen.c:2310 pepigen.c:2310 pex64igen.c:2310
 msgid "%B: unable to fill in DataDictionary[1] because .idata$2 is missing"
-msgstr "%B: .idata$2 �無��� DataDictionary[1] を埋�る�������ん"
+msgstr ""
 
 #: peigen.c:2330 pepigen.c:2330 pex64igen.c:2330
 msgid "%B: unable to fill in DataDictionary[1] because .idata$4 is missing"
-msgstr "%B: .idata$4 �無��� DataDictionary[1] を埋�る�������ん"
+msgstr ""
 
 #: peigen.c:2351 pepigen.c:2351 pex64igen.c:2351
 msgid "%B: unable to fill in DataDictionary[12] because .idata$5 is missing"
-msgstr "%B: .idata$5 �無��� DataDictionary[12] を埋�る�������ん"
+msgstr ""
 
 #: peigen.c:2371 pepigen.c:2371 pex64igen.c:2371
 msgid "%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because .idata$6 is missing"
-msgstr "%B: .idata$6 �無��� DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] を埋�る�������ん"
+msgstr ""
 
 #: peigen.c:2413 pepigen.c:2413 pex64igen.c:2413
 msgid "%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because .idata$6 is missing"
-msgstr "%B: .idata$6 �無��� DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] を埋�る�������ん"
+msgstr ""
 
-#: peigen.c:2438 pepigen.c:2438 pex64igen.c:2438
+#: peigen.c:2436 pepigen.c:2436 pex64igen.c:2436
 msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing"
-msgstr "%B: __tls_used �無��� DataDictionary[9] を埋�る�������ん"
+msgstr ""
+
+#~ msgid "Can't Make it a Short Jump"
+#~ msgstr "短�ジャンプを行��������ん"
+
+#~ msgid "Exceeds Long Jump Range"
+#~ msgstr "長�ジャンプ�範囲を超�����"
+
+#~ msgid "Absolute address Exceeds 16 bit Range"
+#~ msgstr "絶対アドレス� 16 bit �範囲を超�����"
+
+#~ msgid "Absolute address Exceeds 8 bit Range"
+#~ msgstr "絶対アドレス� 8 bit �範囲を超�����"
+
+#~ msgid "Unrecognized Reloc Type"
+#~ msgstr "�識������置型��"
+
+#, fuzzy
+#~ msgid "%B: %A+0x%lx: jump to stub routine which is not jal"
+#~ msgstr "%s: %s+0x%lx: jal ����スタブルー�ン��ジャンプ��"
+
+#~ msgid "bfd_make_section (%s) failed"
+#~ msgstr "bfd_make_section (%s) �失敗����"
+
+#~ msgid "bfd_set_section_flags (%s, %x) failed"
+#~ msgstr "bfd_set_section_flags (%s, %x) �失敗����"
+
+#~ msgid "Size mismatch section %s=%lx, %s=%lx"
+#~ msgstr "セクション %s=%lx, %s=%lx �サイズ�一致���ん"
+
+#~ msgid "failed to enter %s"
+#~ msgstr "%s �入れ��ん���"
+
+#~ msgid "No Mem !"
+#~ msgstr "メモリ��り��ん!"
+
+#, fuzzy
+#~ msgid "reserved STO cmd %d"
+#~ msgstr "STO cmd %d �予約済��"
+
+#, fuzzy
+#~ msgid "reserved OPR cmd %d"
+#~ msgstr "OPR cmd %d �予約済��"
+
+#, fuzzy
+#~ msgid "reserved CTL cmd %d"
+#~ msgstr "CTL cmd %d �予約済��"
+
+#, fuzzy
+#~ msgid "reserved STC cmd %d"
+#~ msgstr "STA cmd %d �予約済��"
+
+#, fuzzy
+#~ msgid "stack-from-image not implemented"
+#~ msgstr "Stack-from-image �実装�れ����ん"
+
+#, fuzzy
+#~ msgid "stack-entry-mask not fully implemented"
+#~ msgstr "Stack-entry-mask �完全��実装�れ����ん"
+
+#~ msgid "PASSMECH not fully implemented"
+#~ msgstr "PASSMECH �完全��実装�れ����ん"
+
+#, fuzzy
+#~ msgid "stack-local-symbol not fully implemented"
+#~ msgstr "Stack-local-symbol �完全��実装�れ����ん"
+
+#, fuzzy
+#~ msgid "stack-literal not fully implemented"
+#~ msgstr "Stack-literal �完全��実装�れ����ん"
+
+#, fuzzy
+#~ msgid "stack-local-symbol-entry-point-mask not fully implemented"
+#~ msgstr "Stack-local-symbol-entry-point-mask �完全��実装�れ����ん"
+
+#, fuzzy
+#~ msgid "%s: not fully implemented"
+#~ msgstr "PASSMECH �完全��実装�れ����ん"
+
+#, fuzzy
+#~ msgid "obj code %d not found"
+#~ msgstr "オブジェクトコード %d �見��り��ん"
+
+#, fuzzy
+#~ msgid "Reloc size error in section %s"
+#~ msgstr "%s: ローダ��置�読込�専用セクション %s ��り��"
+
+#~ msgid "Missing IHCONST"
+#~ msgstr "IHCONST を欠�����"
+
+#~ msgid "Missing IHIHALF"
+#~ msgstr "IHIHALF を欠�����"
+
+#~ msgid "missing IHCONST reloc"
+#~ msgstr "IHCONST ��置を欠�����"
+
+#~ msgid "missing IHIHALF reloc"
+#~ msgstr "IHIHALF ��置を欠�����"
+
+#~ msgid "GP relative relocation when GP not defined"
+#~ msgstr "GP �未定義�時� GP 関連��置��"
+
+#~ msgid "  first occurrence: %s: arm call to thumb"
+#~ msgstr "  �回発生: %s: arm � thumb 呼�出�"
+
+#~ msgid "  first occurrence: %s: thumb call to arm"
+#~ msgstr "  �回発生: %s: thumb � arm 呼�出�"
+
+#~ msgid "  consider relinking with --support-old-code enabled"
+#~ msgstr "  --support-old-code を有効����リンク�る��を考慮��������"
+
+#~ msgid "%s: ERROR: passes floats in float registers whereas target %s uses integer registers"
+#~ msgstr "%s: エラー: 浮動�数レジスタ�浮動�数を渡���る�も���ら��ターゲット %s �整数レジスタを使�����"
+
+#~ msgid "%s: ERROR: passes floats in integer registers whereas target %s uses float registers"
+#~ msgstr "%s: エラー: 整数レジスタ�浮動�数を渡���る�も���ら��ターゲット %s �浮動�数レジスタを使�����"
+
+#~ msgid "AUX tagndx %ld ttlsiz 0x%lx lnnos %ld next %ld"
+#~ msgstr "AUX tagndx %ld ttlsiz 0x%lx lnnos %ld next %ld"
+
+#~ msgid "reloc against unsupported section"
+#~ msgstr "サ�ート外�セクション�対�る��置��"
+
+#~ msgid "Dwarf Error: Can't find .debug_abbrev section."
+#~ msgstr "Dwarf エラー: .debug_abbrev セクションを見��られ��ん。"
+
+#~ msgid "Dwarf Error: Abbrev offset (%u) bigger than abbrev size (%u)."
+#~ msgstr "Dwarf エラー: abbrev オフセット (%u) � abbrev サイズ (%u) より大����。"
+
+#~ msgid "Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"
+#~ msgstr "警告: � interworking �既�指定�れ��る���%s � interwork フラグをセット���ん"
+
+#~ msgid "Warning: Clearing the interwork flag of %s due to outside request"
+#~ msgstr "警告: �求外��� %s � interwork フラグをクリア���"
+
+#~ msgid "Error: %s compiled for EABI version %d, whereas %s is compiled for version %d"
+#~ msgstr "エラー: %s � EABI �ージョン %d 用�コンパイル�れ��も���ら��%s ��ージョン %d 用�コンパイル�れ���"
+
+#~ msgid "integer"
+#~ msgstr "æ•´æ•°"
+
+#~ msgid "soft"
+#~ msgstr "ソフト"
+
+#~ msgid "hard"
+#~ msgstr "�ード"
+
+#~ msgid "Warning: %s %s interworking, whereas %s %s"
+#~ msgstr "警告: %s � interworking を%s�も���ら��%s �%s"
+
+#~ msgid "supports"
+#~ msgstr "サ�ート���る"
+
+#~ msgid "does not"
+#~ msgstr "サ�ート�����ん"
+
+#~ msgid " [APCS-26]"
+#~ msgstr " [APCS-26]"
+
+#~ msgid " [APCS-32]"
+#~ msgstr " [APCS-32]"
+
+#~ msgid "%s(%s+0x%lx): cannot find stub entry %s"
+#~ msgstr "%s(%s+0x%lx): スタブエントリ %s を見��られ��ん"
+
+#~ msgid "%s(%s+0x%lx): cannot relocate %s, recompile with -ffunction-sections"
+#~ msgstr "%s(%s+0x%lx): %s を��置����ん。-ffunction-sections を付���コンパイル���ょ�"
+
+#~ msgid "%s(%s+0x%lx): fixing %s"
+#~ msgstr "%s(%s+0x%lx): %s を修復���"
+
+#~ msgid "Linking mips16 objects into %s format is not supported"
+#~ msgstr "%s 形��� mips16 オブジェクトをリンク�る���サ�ート�れ����ん"
+
+#~ msgid "%s: ISA mismatch (-mips%d) with previous modules (-mips%d)"
+#~ msgstr "%s: ISA (-mips%d) �以��モジュール (-mips%d) �一致���ん"
+
+#~ msgid "%s: ISA mismatch (%d) with previous modules (%d)"
+#~ msgstr "%s: ISA (%d) �以��モジュール (%d) �一致���ん"
+
+#~ msgid " [mips1]"
+#~ msgstr " [mips1]"
+
+#~ msgid " [mips2]"
+#~ msgstr " [mips2]"
+
+#~ msgid " [mips3]"
+#~ msgstr " [mips3]"
+
+#~ msgid " [mips4]"
+#~ msgstr " [mips4]"
+
+#~ msgid " [mips5]"
+#~ msgstr " [mips5]"
+
+#~ msgid " [mips32]"
+#~ msgstr " [mips32]"
+
+#~ msgid " [mips64]"
+#~ msgstr " [mips64]"
+
+#~ msgid " [32bitmode]"
+#~ msgstr " [32ビットモード]"
+
+#~ msgid "%s: Unknown special linker type %d"
+#~ msgstr "%s: スペシャルリンカタイプ %d ��明��"
+
+#~ msgid "v850ea architecture"
+#~ msgstr "v850ea アーキテク�ャ"
+
+#~ msgid "%s: check_relocs: unhandled reloc type %d"
+#~ msgstr "%s: check_relocs: ��置タイプ %d ��り扱�れ��ん"
+
+#~ msgid "creating section symbol, name = %s, value = 0x%.8lx, index = %d, section = 0x%.8lx\n"
+#~ msgstr "セクションシンボルを作����, �� = %s, 値 = 0x%.8lx, 索引 = %d, セクション = 0x%.8lx\n"
+
+#~ msgid "%s: Not enough room for program headers (allocated %u, need %u)"
+#~ msgstr "%s: プログラムヘッダ用�空間���分�� (確�済 %u, � %u)"
+
+#~ msgid "Error: First section in segment (%s) starts at 0x%x"
+#~ msgstr "エラー: セグメント (%s) �最��セクション� 0x%x �始����る"
+
+#~ msgid "       whereas segment starts at 0x%x"
+#~ msgstr "       �も���ら��セグメント� 0x%x �始������"
+
+#~ msgid "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx%s\n"
+#~ msgstr "elf_symbol_from_bfd_symbol 0x%.8lx, �� = %s, シンボル番� = %d, フラグ = 0x%.8lx%s\n"
+
+#~ msgid "%s: Section %s is already to large to put hole of %ld bytes in"
+#~ msgstr "%s: 既�セクション %s �大���� %ld �イト� hole を置���ん"
+
+#~ msgid "%s: reloc overflow 1: 0x%lx > 0xffff"
+#~ msgstr "%s: ��置領域�オー�ーフロー���� 1: 0x%lx > 0xffff"
+
+#~ msgid "                 Table   Stamp     Chain    Name      Thunk\n"
+#~ msgstr "                 Table   Stamp     Chain    Name      Thunk\n"
+
+#~ msgid "\tThe Import Address Table (difference found)\n"
+#~ msgstr "\tImport アドレステーブル (差異を発見)\n"
+
+#~ msgid "\t>>> Ran out of IAT members!\n"
+#~ msgstr "\t>>> IAT メン�を追�出����!\n"
+
+#~ msgid "\tThe Import Address Table is identical\n"
+#~ msgstr "\tImport Address Table �全�����\n"
+
+#~ msgid "     \t\tAddress  Address  Handler  Data     Address    Mask\n"
+#~ msgstr "     \t\tアドレス アドレス �ンドラ データ   アドレス   マスク\n"
+
+#~ msgid "ETIR_S_C_STO_GBL: no symbol \"%s\""
+#~ msgstr "ETIR_S_C_STO_GBL: シンボル \"%s\" ��り��ん"
+
+#~ msgid "ETIR_S_C_STO_CA: no symbol \"%s\""
+#~ msgstr "ETIR_S_C_STO_CA: シンボル \"%s\" ��り��ん"
+
+#~ msgid "ETIR_S_C_STO_RB/AB: Not supported"
+#~ msgstr "ETIR_S_C_STO_RB/AB: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_STO_LP_PSB: Not supported"
+#~ msgstr "ETIR_S_C_STO_LP_PSB: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_OPR_INSV: Not supported"
+#~ msgstr "ETIR_S_C_OPR_INSV: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_OPR_USH: Not supported"
+#~ msgstr "ETIR_S_C_OPR_USH: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_OPR_ROT: Not supported"
+#~ msgstr "ETIR_S_C_OPR_ROT: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_OPR_REDEF: Not supported"
+#~ msgstr "ETIR_S_C_OPR_REDEF: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_OPR_DFLIT: Not supported"
+#~ msgstr "ETIR_S_C_OPR_DFLIT: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_STC_LP: not supported"
+#~ msgstr "ETIR_S_C_STC_LP: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_STC_GBL: not supported"
+#~ msgstr "ETIR_S_C_STC_GBL: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_STC_GCA: not supported"
+#~ msgstr "ETIR_S_C_STC_GCA: サ�ート�れ��ん"
+
+#~ msgid "ETIR_S_C_STC_PS: not supported"
+#~ msgstr "ETIR_S_C_STC_PS: サ�ート�れ��ん"
+
+#~ msgid "Unimplemented STO cmd %d"
+#~ msgstr "STO cmd %d �実装�れ����ん"
+
+#~ msgid "TIR_S_C_OPR_ASH incomplete"
+#~ msgstr "TIR_S_C_OPR_ASH ��完全��"
+
+#~ msgid "TIR_S_C_OPR_USH incomplete"
+#~ msgstr "TIR_S_C_OPR_USH ��完全��"
+
+#~ msgid "TIR_S_C_OPR_ROT incomplete"
+#~ msgstr "TIR_S_C_OPR_ROT ��完全��"
+
+#~ msgid "TIR_S_C_OPR_REDEF not supported"
+#~ msgstr "TIR_S_C_OPR_REDEF �サ�ート�れ��ん"
+
+#~ msgid "TIR_S_C_OPR_DFLIT not supported"
+#~ msgstr "TIR_S_C_OPR_DFLIT �サ�ート�れ��ん"
 
-#~ msgid "%B: relocation type %d not implemented"
-#~ msgstr "%B: ��置型 %d �実装�れ����ん"
+#~ msgid "TIR_S_C_CTL_DFLOC not fully implemented"
+#~ msgstr "TIR_S_C_CTL_DFLOC �完全��実装�れ����ん"
 
-#~ msgid "warning: %B and %B differ in position-dependence of data addressing"
-#~ msgstr "警告: %B � %B �データアドレス割り当��関�る�置�存性�異�り��"
+#~ msgid "TIR_S_C_CTL_STLOC not fully implemented"
+#~ msgstr "TIR_S_C_CTL_STLOC �完全��実装�れ����ん"
 
-#~ msgid "warning: %B and %B differ in position-dependence of code addressing"
-#~ msgstr "警告: %B � %B �コードアドレス割り当��関�る�置�存性�異�り��"
+#~ msgid "TIR_S_C_CTL_STKDL not fully implemented"
+#~ msgstr "TIR_S_C_CTL_STKDL �完全��実装�れ����ん"
diff --git a/bfd/po/ru.po b/bfd/po/ru.po
index eec672c33a..fc8084d858 100644
--- a/bfd/po/ru.po
+++ b/bfd/po/ru.po
@@ -2,16 +2,15 @@
 # Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 #
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: bfd 2.21.53\n"
+"Project-Id-Version: bfd 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:25+0100\n"
-"PO-Revision-Date: 2011-09-24 09:55+0400\n"
+"POT-Creation-Date: 2010-11-05 11:31+0100\n"
+"PO-Revision-Date: 2010-11-10 11:25+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,139 +37,139 @@ msgstr "%B: Импортирована некорректна� запи�ь о
 #: aoutx.h:1273 aoutx.h:1611
 #, c-format
 msgid "%s: can not represent section `%s' in a.out object file format"
-msgstr "%s: нельз� пред�тавить раздел «%s» в объектном файле формата a.out"
+msgstr "%s: нельз� пред�тавить раздел `%s' в объектном файле формата a.out"
 
 #: aoutx.h:1577
 #, c-format
 msgid "%s: can not represent section for symbol `%s' in a.out object file format"
-msgstr "%s: нельз� пред�тавить раздел дл� �имвола «%s» в объектном файле формата a.out"
+msgstr "%s: нельз� пред�тавить раздел дл� �имвола `%s' в объектном файле формата a.out"
 
-#: aoutx.h:1579 vms-alpha.c:7668
+#: aoutx.h:1579 vms-alpha.c:7649
 msgid "*unknown*"
 msgstr "*неизве�тно*"
 
-#: aoutx.h:4017 aoutx.h:4343
+#: aoutx.h:4007 aoutx.h:4333
 msgid "%P: %B: unexpected relocation type\n"
 msgstr "%P: %B: неожиданный тип перемещени�\n"
 
-#: aoutx.h:5374
+#: aoutx.h:5364
 #, c-format
 msgid "%s: relocatable link from %s to %s not supported"
 msgstr "%s: перемещаема� ��ылка из %s в %s не поддерживает��"
 
-#: archive.c:2194
+#: archive.c:2125
 msgid "Warning: writing archive was slow: rewriting timestamp\n"
 msgstr "Предупреждение: медленна� запи�ь в архив: обновл�ет�� метка времени\n"
 
-#: archive.c:2482
+#: archive.c:2416
 msgid "Reading archive file mod timestamp"
 msgstr "Чтение метки времени архивного файла mod"
 
-#: archive.c:2506
+#: archive.c:2440
 msgid "Writing updated armap timestamp"
 msgstr "Запи�ь обновлённой метки времени armap"
 
-#: bfd.c:398
+#: bfd.c:395
 msgid "No error"
 msgstr "�ет ошибки"
 
-#: bfd.c:399
+#: bfd.c:396
 msgid "System call error"
 msgstr "Ошибка �и�темного вызова"
 
-#: bfd.c:400
+#: bfd.c:397
 msgid "Invalid bfd target"
 msgstr "�еверна� цель bfd"
 
-#: bfd.c:401
+#: bfd.c:398
 msgid "File in wrong format"
 msgstr "Файл в неправильном формате"
 
-#: bfd.c:402
+#: bfd.c:399
 msgid "Archive object file in wrong format"
 msgstr "�рхивный объектный файл в неправильном формате"
 
-#: bfd.c:403
+#: bfd.c:400
 msgid "Invalid operation"
 msgstr "�еверна� операци�"
 
-#: bfd.c:404
+#: bfd.c:401
 msgid "Memory exhausted"
 msgstr "Закончила�ь пам�ть"
 
-#: bfd.c:405
+#: bfd.c:402
 msgid "No symbols"
 msgstr "�ет �имволов"
 
-#: bfd.c:406
+#: bfd.c:403
 msgid "Archive has no index; run ranlib to add one"
 msgstr "�рхив без индек�а; запу�к ranlib дл� �оздани�"
 
-#: bfd.c:407
+#: bfd.c:404
 msgid "No more archived files"
 msgstr "�рхивные файлы закончили�ь"
 
-#: bfd.c:408
+#: bfd.c:405
 msgid "Malformed archive"
 msgstr "И�кажённый архив"
 
-#: bfd.c:409
+#: bfd.c:406
 msgid "File format not recognized"
 msgstr "Формат файла не ра�познан"
 
-#: bfd.c:410
+#: bfd.c:407
 msgid "File format is ambiguous"
 msgstr "Формат файла неоднозначен"
 
-#: bfd.c:411
+#: bfd.c:408
 msgid "Section has no contents"
 msgstr "Раздел не имеет �одержимого"
 
-#: bfd.c:412
+#: bfd.c:409
 msgid "Nonrepresentable section on output"
 msgstr "Раздел, непред�тавимый дл� вывода"
 
-#: bfd.c:413
+#: bfd.c:410
 msgid "Symbol needs debug section which does not exist"
 msgstr "Дл� �имвола требует�� отладочный раздел, но его не �уще�твует"
 
-#: bfd.c:414
+#: bfd.c:411
 msgid "Bad value"
 msgstr "�екорректное значение"
 
-#: bfd.c:415
+#: bfd.c:412
 msgid "File truncated"
 msgstr "Файл у�ечён"
 
-#: bfd.c:416
+#: bfd.c:413
 msgid "File too big"
 msgstr "Файл �лишком большой"
 
-#: bfd.c:417
+#: bfd.c:414
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ошибка чтени� %s: %s"
 
-#: bfd.c:418
+#: bfd.c:415
 msgid "#<Invalid error code>"
 msgstr "#<�еверный код ошибки>"
 
-#: bfd.c:945
+#: bfd.c:939
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr "Оператор контрол� BFD %s обнаружил ошибку %s:%d"
 
-#: bfd.c:957
+#: bfd.c:951
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d in %s\n"
 msgstr "Внутренн�� ошибка BFD %s, о�танов на %s, �трока %d в %s\n"
 
-#: bfd.c:961
+#: bfd.c:955
 #, c-format
 msgid "BFD %s internal error, aborting at %s line %d\n"
 msgstr "Внутренн�� ошибка BFD %s, о�танов на %s, �трока %d\n"
 
-#: bfd.c:963
+#: bfd.c:957
 msgid "Please report this bug.\n"
 msgstr "Пожалуй�та, �ообщите об �той ошибке.\n"
 
@@ -187,11 +186,11 @@ msgstr "не отображено: переменна� env не задана\n"
 #: binary.c:271
 #, c-format
 msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
-msgstr "Предупреждение: Выполн�ет�� запи�ь раздела «%s» в файл по огромному (т.е. отрицательному) �мещению 0x%lx."
+msgstr "Предупреждение: Выполн�ет�� запи�ь раздела `%s' в файл по огромному (т.е. отрицательному) �мещению 0x%lx."
 
-#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731
-#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360
-#: elf64-ia64.c:360
+#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1640 elf32-frv.c:5740
+#: elfxx-sparc.c:2795 reloc.c:5646 reloc16.c:162 elf32-ia64.c:842
+#: elf64-ia64.c:842
 msgid "%P%F: --relax and -r may not be used together\n"
 msgstr "%P%F: --relax и -r нельз� и�пользовать вме�те\n"
 
@@ -227,22 +226,22 @@ msgstr "%B: неподдерживаемое перемещение: ALPHA_R_GPR
 msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
 msgstr "%B: неподдерживаемое перемещение: ALPHA_R_GPRELLOW"
 
-#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228
-#: elf32-ia64.c:3845 elf64-ia64.c:3845
+#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:3991 elf64-alpha.c:4140
+#: elf32-ia64.c:4582 elf64-ia64.c:4582
 msgid "%B: unknown relocation type %d"
 msgstr "%B: неизве�тный тип перемещени�: %d"
 
 #: coff-arm.c:1038
 #, c-format
 msgid "%B: unable to find THUMB glue '%s' for `%s'"
-msgstr "%B: не удало�ь найти THUMB-�клейку «%s» дл� «%s»"
+msgstr "%B: не удало�ь найти THUMB-�клейку '%s' дл� `%s'"
 
 #: coff-arm.c:1067
 #, c-format
 msgid "%B: unable to find ARM glue '%s' for `%s'"
-msgstr "%B: не удало�ь найти ARM-�клейку «%s» дл� «%s»"
+msgstr "%B: не удало�ь найти ARM-�клейку '%s' дл� `%s'"
 
-#: coff-arm.c:1369 elf32-arm.c:6980
+#: coff-arm.c:1369 elf32-arm.c:6501
 #, c-format
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
@@ -262,9 +261,9 @@ msgstr ""
 "  первое упоминание: %B: thumb-вызов в arm\n"
 "  выполните пере�борку � включённым параметром --support-old-code"
 
-#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3081
+#: coff-arm.c:1754 coff-tic80.c:695 cofflink.c:3043
 msgid "%B: bad reloc address 0x%lx in section `%A'"
-msgstr "%B: неправильный адре� перемещени� 0x%lx в разделе «%A»"
+msgstr "%B: неправильный адре� перемещени� 0x%lx в разделе `%A'"
 
 #: coff-arm.c:2079
 msgid "%B: illegal symbol index in reloc: %d"
@@ -275,12 +274,12 @@ msgstr "%B: недопу�тимый �имвольный индек� в пер
 msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
 msgstr "ошибка: %B �обран дл� APCS-%d, в то врем� как %B �обран дл� APCS-%d"
 
-#: coff-arm.c:2226 elf32-arm.c:15580
+#: coff-arm.c:2226 elf32-arm.c:14105
 #, c-format
 msgid "error: %B passes floats in float registers, whereas %B passes them in integer registers"
 msgstr "ошибка: %B передаёт чи�ла � плавающей точкой в реги�трах � плавающей точкой, в то врем� как %B передаёт их в целочи�ленных реги�трах"
 
-#: coff-arm.c:2229 elf32-arm.c:15584
+#: coff-arm.c:2229 elf32-arm.c:14109
 #, c-format
 msgid "error: %B passes floats in integer registers, whereas %B passes them in float registers"
 msgstr "ошибка: %B передаёт чи�ла в целочи�ленных реги�трах, в то врем� как %B передаёт их в реги�трах � плавающей точкой"
@@ -295,12 +294,12 @@ msgstr "ошибка: %B �компилирован как позиционно-
 msgid "error: %B is compiled as absolute position code, whereas target %B is position independent"
 msgstr "ошибка: %B �компилирован как код � аб�олютной позицией, в то врем� как целью %B �вл�ет�� позиционно-незави�имый код"
 
-#: coff-arm.c:2274 elf32-arm.c:15649
+#: coff-arm.c:2274 elf32-arm.c:14174
 #, c-format
 msgid "Warning: %B supports interworking, whereas %B does not"
 msgstr "Предупреждение: %B поддерживает �овме�тную работу, в то врем� как %B нет"
 
-#: coff-arm.c:2277 elf32-arm.c:15655
+#: coff-arm.c:2277 elf32-arm.c:14180
 #, c-format
 msgid "Warning: %B does not support interworking, whereas %B does"
 msgstr "Предупреждение: %B не поддерживает �овме�тную работу, в то врем� как %B поддерживает"
@@ -310,7 +309,7 @@ msgstr "Предупреждение: %B не поддерживает Ñ�овмÐ
 msgid "private flags = %x:"
 msgstr "�об�твенные флаги = %x:"
 
-#: coff-arm.c:2309 elf32-arm.c:11752
+#: coff-arm.c:2309 elf32-arm.c:10492
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr " [чи�ла � плавающей точкой передают�� в реги�трах � плавающей точкой]"
@@ -320,7 +319,7 @@ msgstr " [чи�ла � плавающей точкой передают�� в
 msgid " [floats passed in integer registers]"
 msgstr " [чи�ла � плавающей точкой передают�� в целочи�ленных реги�трах]"
 
-#: coff-arm.c:2314 elf32-arm.c:11755
+#: coff-arm.c:2314 elf32-arm.c:10495
 #, c-format
 msgid " [position independent]"
 msgstr " [позиционно-незави�имый]"
@@ -345,12 +344,12 @@ msgstr " [поддерживает�� �овме�тна� работа]"
 msgid " [interworking not supported]"
 msgstr " [�овме�тна� работа не поддерживает��]"
 
-#: coff-arm.c:2370 elf32-arm.c:10787
+#: coff-arm.c:2370 elf32-arm.c:9520
 #, c-format
 msgid "Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"
 msgstr "Предупреждение: Флаг �овме�тной работы дл� %B не у�танавливает��, так как так как он уже указывает на не�овме�тную работу"
 
-#: coff-arm.c:2374 elf32-arm.c:10791
+#: coff-arm.c:2374 elf32-arm.c:9524
 #, c-format
 msgid "Warning: Clearing the interworking flag of %B due to outside request"
 msgstr "Предупреждение: Очищает�� флаг �овме�тной работы дл� %B по внешнему запро�у"
@@ -362,10 +361,10 @@ msgstr "невозможно обработать перемещение R_MEM_I
 
 #: coff-i860.c:147
 #, c-format
-msgid "relocation `%s' not yet implemented"
-msgstr "перемещение «%s» пока не реализовано"
+msgid "Relocation `%s' not yet implemented\n"
+msgstr "Перемещение `%s' пока не реализовано\n"
 
-#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192
+#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5147
 msgid "%B: warning: illegal symbol index %ld in relocs"
 msgstr "%B: предупреждение: недопу�тимый �имвольный индек� %ld в перемещени�х"
 
@@ -373,7 +372,7 @@ msgstr "%B: предупреждение: недопуÑ�тимый Ñ�имволÑ
 msgid "uncertain calling convention for non-COFF symbol"
 msgstr "не��ное �оглашение о вызове дл� не-COFF �имвола"
 
-#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677
+#: coff-m68k.c:506 elf32-bfin.c:5678 elf32-cr16.c:2897 elf32-m68k.c:4672
 msgid "unsupported reloc type"
 msgstr "неподдерживаемый тип перемещени�"
 
@@ -386,24 +385,19 @@ msgstr "Отно�ительное перемещение GP, но _gp не оп
 msgid "Unrecognized reloc"
 msgstr "�ера�познанное перемещение"
 
-#: coff-rs6000.c:2676
+#: coff-rs6000.c:2794
 #, c-format
 msgid "%s: unsupported relocation type 0x%02x"
 msgstr "%s: неподдерживаемый тип перемещени� 0x%02x"
 
-#: coff-rs6000.c:2761
+#: coff-rs6000.c:2887
 #, c-format
 msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"
-msgstr "%s: перемещение TOC по адре�у 0x%x �имвола «%s» без �лемента TOC"
+msgstr "%s: перемещение TOC по адре�у 0x%x �имвола `%s' без �лемента TOC"
 
-#: coff-rs6000.c:3512 coff64-rs6000.c:2111
+#: coff-rs6000.c:3652 coff64-rs6000.c:2175
 msgid "%B: symbol `%s' has unrecognized smclas %d"
-msgstr "%B: �имвол «%s» имеет нера�познанный smclas %d"
-
-#: coff-sh.c:521
-#, c-format
-msgid "SH Error: unknown reloc type %d"
-msgstr "Ошибка SH: неизве�тный тип перемещени� %d"
+msgstr "%B: �имвол `%s' имеет нера�познанный smclas %d"
 
 #: coff-tic4x.c:195 coff-tic54x.c:299 coff-tic80.c:458
 #, c-format
@@ -420,84 +414,80 @@ msgstr "%s: предупреждение: в перемещени�х недоп
 msgid "ignoring reloc %s\n"
 msgstr "игнорирует�� перемещение %s\n"
 
-#: coffcode.h:991
+#: coffcode.h:973
 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr "%B: предупреждение: COMDAT �имвол '%s' не �оответ�твует имени раздела '%s'"
 
 #. Generate a warning message rather using the 'unhandled'
 #. variable as this will allow some .sys files generate by
 #. other toolchains to be processed.  See bugzilla issue 196.
-#: coffcode.h:1215
+#: coffcode.h:1197
 msgid "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
 msgstr "%B: Предупреждение: Игнорирует�� флаг раздела IMAGE_SCN_MEM_NOT_PAGED в разделе %s"
 
-#: coffcode.h:1282
+#: coffcode.h:1264
 msgid "%B (%s): Section flag %s (0x%x) ignored"
 msgstr "%B (%s): Игнорирует�� флаг раздела %s (0x%x)"
 
-#: coffcode.h:2424
+#: coffcode.h:2390
 #, c-format
 msgid "Unrecognized TI COFF target id '0x%x'"
 msgstr "�ера�познанный идентификатор цели TI COFF '0x%x'"
 
-#: coffcode.h:2738
+#: coffcode.h:2704
 msgid "%B: reloc against a non-existant symbol index: %ld"
 msgstr "%B: перемещение по не�уще�твующему �имвольному индек�у: %ld"
 
-#: coffcode.h:3296
+#: coffcode.h:3262
 msgid "%B: too many sections (%d)"
 msgstr "%B: �лишком много разделов: (%d)"
 
-#: coffcode.h:3712
+#: coffcode.h:3676
 msgid "%B: section %s: string table overflow at offset %ld"
 msgstr "%B: раздел %s: переполнение таблицы �трок по �мещению %d"
 
-#: coffcode.h:4517
+#: coffcode.h:4481
 msgid "%B: warning: line number table read failed"
 msgstr "%B: предупреждение: не удало�ь прочитать таблицу номеров �трок"
 
-#: coffcode.h:4547
+#: coffcode.h:4511
 msgid "%B: warning: illegal symbol index %ld in line numbers"
 msgstr "%B: предупреждение: недопу�тимый �имвольный индек� %ld в номерах �трок"
 
-#: coffcode.h:4561
+#: coffcode.h:4525
 msgid "%B: warning: duplicate line number information for `%s'"
-msgstr "%B: предупреждение: повтор�юща��� информаци� о номере �троки дл� «%s»"
+msgstr "%B: предупреждение: повтор�юща��� информаци� о номере �троки дл� `%s'"
 
-#: coffcode.h:4961
+#: coffcode.h:4916
 msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
-msgstr "%B: �ера�познанный кла�� хранени� %d дл� %s, �имвол «%s»"
+msgstr "%B: �ера�познанный кла�� хранени� %d дл� %s, �имвол `%s'"
 
-#: coffcode.h:5087
+#: coffcode.h:5042
 msgid "warning: %B: local symbol `%s' has no section"
-msgstr "предупреждение: %B: локальный �имвол «%s» не имеет раздела"
+msgstr "предупреждение: %B: локальный �имвол `%s' не имеет раздела"
 
-#: coffcode.h:5231
+#: coffcode.h:5186
 msgid "%B: illegal relocation type %d at address 0x%lx"
 msgstr "%B: недопу�тимый тип перемещени� %d по адре�у 0x%lx"
 
-#: coffgen.c:1578
+#: coffgen.c:1573
 msgid "%B: bad string table size %lu"
 msgstr "%B: неправильный размер таблицы �трок %lu"
 
-#: cofflink.c:533 elflink.c:4353
+#: cofflink.c:524 elflink.c:4339
 msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
-msgstr "Предупреждение: в %B изменён тип �имвола «%s» � %d на %d"
+msgstr "Предупреждение: в %B изменён тип �имвола `%s' � %d на %d"
 
-#: cofflink.c:2330
+#: cofflink.c:2321
 msgid "%B: relocs in section `%A', but it has no contents"
-msgstr "%B: перемещени� в разделе «%A», но он не имеет �одержимого"
+msgstr "%B: перемещени� в разделе `%A', но он не имеет �одержимого"
 
-#: cofflink.c:2392 elflink.c:9554
-msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
-msgstr "%X«%s» указывает в раздел «%A» из %B: определён в отброшенном разделе «%A» из %B\n"
-
-#: cofflink.c:2690 coffswap.h:826
+#: cofflink.c:2652 coffswap.h:826
 #, c-format
 msgid "%s: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr "%s: %s: переполнение перемещени�: 0x%lx > 0xffff"
 
-#: cofflink.c:2699 coffswap.h:812
+#: cofflink.c:2661 coffswap.h:812
 #, c-format
 msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr "%s: предупреждение: %s: переполнение номера �троки: 0x%lx > 0xffff"
@@ -543,22 +533,22 @@ msgstr "Ошибка в dwarf: неверное макÑ�имальное колÐ
 msgid "Dwarf Error: mangled line number section."
 msgstr "Ошибка в dwarf: и�кажённый раздел номеров �трок."
 
-#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383
+#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2382
 #, c-format
 msgid "Dwarf Error: Could not find abbrev number %u."
 msgstr "Ошибка в dwarf: �евозможно найти укороченный номер %u."
 
-#: dwarf2.c:2344
+#: dwarf2.c:2343
 #, c-format
 msgid "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 and 4 information."
 msgstr "Ошибка в dwarf: найдена вер�и� dwarf «%u», текуща� функци� чтени� понимает только вер�ии 2, 3 и 4."
 
-#: dwarf2.c:2351
+#: dwarf2.c:2350
 #, c-format
 msgid "Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."
 msgstr "Ошибка в dwarf: найден размер адре�а «%u», текуща� функци� чтени� не умеет работать � размерами более чем «%u»."
 
-#: dwarf2.c:2374
+#: dwarf2.c:2373
 #, c-format
 msgid "Dwarf Error: Bad abbrev number: %u."
 msgstr "Ошибка в dwarf: �еверный укороченный номер: %u."
@@ -656,34 +646,30 @@ msgstr "%P: ошибка в %B(%A); таблиц .eh_frame_hdr �оздана н
 msgid "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
 msgstr "%P: из-за кодировки fde в %B(%A) таблица .eh_frame_hdr �оздана не будет.\n"
 
-#: elf-eh-frame.c:1583
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
-msgstr "%P: DW_EH_PE_datarel не определена дл� �той архитектуры.\n"
-
 #: elf-ifunc.c:179
 msgid "%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can not be used when making an executable; recompile with -fPIE and relink with -pie\n"
-msgstr "%F%P: динамиче�кий STT_GNU_IFUNC �имвол «%s» � одинаковым указателем в «%B» нельз� и�пользовать при �оздании и�полн�емого файла; перекомпилируйте � параметром -fPIE и перекомпонуйте � параметром -pie\n"
+msgstr "%F%P: динамиче�кий STT_GNU_IFUNC �имвол `%s' � одинаковым указателем в `%B' нельз� и�пользовать при �оздании и�полн�емого файла; перекомпилируйте � параметром -fPIE и перекомпонуйте � параметром -pie\n"
 
-#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209
+#: elf-m10200.c:450 elf-m10300.c:1560 elf32-avr.c:1263 elf32-bfin.c:3193
 #: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922
-#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509
+#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4111 elf32-h8300.c:509
 #: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168
-#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535
+#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:534
 #: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395
 #: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540
 #: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522
 msgid "internal error: out of range error"
 msgstr "внутренн�� ошибка: ошибка выхода из диапазона"
 
-#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213
+#: elf-m10200.c:454 elf-m10300.c:1564 elf32-avr.c:1267 elf32-bfin.c:3197
 #: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926
-#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513
+#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4115 elf32-h8300.c:513
 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557
-#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539
+#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:538
 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490
 #: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544
 #: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526
-#: elfxx-mips.c:9193
+#: elfxx-mips.c:9186
 msgid "internal error: unsupported relocation error"
 msgstr "внутренн�� ошибка: ошибка неподдерживаемого перемещени�"
 
@@ -694,47 +680,44 @@ msgstr "внутренн�� ошибка: ошибка неподдержива
 msgid "internal error: dangerous error"
 msgstr "внутренн�� ошибка: ошибка ри�ка"
 
-#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221
+#: elf-m10200.c:462 elf-m10300.c:1577 elf32-avr.c:1275 elf32-bfin.c:3205
 #: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934
-#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521
+#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4123 elf32-h8300.c:521
 #: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180
-#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547
+#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:546
 #: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403
 #: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552
 #: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534
 msgid "internal error: unknown error"
 msgstr "внутренн�� ошибка: неизве�тна� ошибка"
 
-#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604
-#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067
-#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807
+#: elf-m10300.c:1504 elf32-arm.c:9098 elf32-i386.c:4081 elf32-m32r.c:2604
+#: elf32-m68k.c:4156 elf32-ppc.c:8089 elf32-s390.c:3010 elf32-sh.c:4223
+#: elf32-xtensa.c:3067 elf64-ppc.c:13115 elf64-s390.c:2985 elf64-sh64.c:1636
+#: elf64-x86-64.c:3719 elfxx-sparc.c:3806
 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"
-msgstr "%B(%A+0x%lx): неразрешимое перемещение %s отно�ительно �имвола «%s»"
+msgstr "%B(%A+0x%lx): неразрешимое перемещение %s отно�ительно �имвола `%s'"
 
-#: elf-m10300.c:1580
+#: elf-m10300.c:1569
 msgid "error: inappropriate relocation type for shared library (did you forget -fpic?)"
-msgstr "ошибка: неподход�щий тип перемещени� дл� общей библиотеки (не указан -fpic?)"
-
-#: elf-m10300.c:1583
-msgid "%B: error: taking the address of protected function '%s' cannot be done when making a shared library"
-msgstr "%B: ошибка: получение адре�а защищённой функции «%s» не может быть выполнено при �оздании общей библиотеки"
+msgstr "ошибка: неподход�щий тип перемещени� дл� динамиче�кой библиотеки (не указан -fpic?)"
 
-#: elf-m10300.c:1586
+#: elf-m10300.c:1572
 msgid "internal error: suspicious relocation type used in shared library"
-msgstr "внутренн�� ошибка: подозрительный тип перемещени� в общей библиотеке"
+msgstr "внутренн�� ошибка: подозрительный тип перемещени� в динамиче�кой библиотеке"
 
-#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044
-#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868
-#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931
-#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377
-#: elf64-x86-64.c:1985 elfxx-sparc.c:2104
+#: elf-m10300.c:4372 elf32-arm.c:11392 elf32-cr16.c:2451 elf32-cris.c:3044
+#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2036 elf32-lm32.c:1868
+#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-ppc.c:4994 elf32-s390.c:1652
+#: elf32-sh.c:2931 elf32-vax.c:1040 elf64-ppc.c:6483 elf64-s390.c:1635
+#: elf64-sh64.c:3377 elf64-x86-64.c:1871 elfxx-sparc.c:2104
 #, c-format
 msgid "dynamic variable `%s' is zero size"
-msgstr "динамиче�ка� переменна� «%s» имеет нулевой размер"
+msgstr "динамиче�ка� переменна� `%s' имеет нулевой размер"
 
 #: elf.c:334
 msgid "%B: invalid string offset %u >= %lu for section `%s'"
-msgstr "%B: недопу�тимое �мещение �троки %u >= %lu дл� раздела «%s»"
+msgstr "%B: недопу�тимое �мещение �троки %u >= %lu дл� раздела `%s'"
 
 #: elf.c:446
 msgid "%B symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
@@ -752,27 +735,27 @@ msgstr "%B: недопу�тимый �лемент SHT_GROUP"
 msgid "%B: no group info for section %A"
 msgstr "%B: нет информации о группе дл� раздела %A"
 
-#: elf.c:737 elf.c:3121 elflink.c:10144
+#: elf.c:737 elf.c:3090 elflink.c:10062
 msgid "%B: warning: sh_link not set for section `%A'"
-msgstr "%B: предупреждение: не задан sh_link дл� раздела «%A»"
+msgstr "%B: предупреждение: не задан sh_link дл� раздела `%A'"
 
 #: elf.c:756
 msgid "%B: sh_link [%d] in section `%A' is incorrect"
-msgstr "%B: некорректный sh_link [%d] в разделе «%A»"
+msgstr "%B: некорректный sh_link [%d] в разделе `%A'"
 
 #: elf.c:791
 msgid "%B: unknown [%d] section `%s' in group [%s]"
-msgstr "%B: неизве�тный [%d] раздел «%s» в группе [%s]"
+msgstr "%B: неизве�тный [%d] раздел `%s' в группе [%s]"
 
 #: elf.c:1041
 msgid "%B: unable to initialize commpress status for section %s"
 msgstr "%B: не удало�ь инициализировать �о�то�ние �жати� раздела %s"
 
-#: elf.c:1061
+#: elf.c:1050
 msgid "%B: unable to initialize decommpress status for section %s"
 msgstr "%B: не удало�ь инициализировать �о�то�ние разжати� раздела %s"
 
-#: elf.c:1181
+#: elf.c:1158
 #, c-format
 msgid ""
 "\n"
@@ -781,7 +764,7 @@ msgstr ""
 "\n"
 "Заголовок программы:\n"
 
-#: elf.c:1223
+#: elf.c:1200
 #, c-format
 msgid ""
 "\n"
@@ -790,7 +773,7 @@ msgstr ""
 "\n"
 "Динамиче�кий раздел:\n"
 
-#: elf.c:1359
+#: elf.c:1336
 #, c-format
 msgid ""
 "\n"
@@ -799,7 +782,7 @@ msgstr ""
 "\n"
 "Объ�влени� вер�ий:\n"
 
-#: elf.c:1384
+#: elf.c:1361
 #, c-format
 msgid ""
 "\n"
@@ -808,82 +791,82 @@ msgstr ""
 "\n"
 "Вер�ии ��ылок:\n"
 
-#: elf.c:1389
+#: elf.c:1366
 #, c-format
 msgid "  required from %s:\n"
 msgstr "  требует�� из %s:\n"
 
-#: elf.c:1796
+#: elf.c:1773
 msgid "%B: invalid link %lu for reloc section %s (index %u)"
 msgstr "%B: недопу�тима� ��ылка %lu дл� раздела перемещений %s (индек� %u)"
 
-#: elf.c:1966
+#: elf.c:1943
 msgid "%B: don't know how to handle allocated, application specific section `%s' [0x%8x]"
-msgstr "%B: неизве�тно как обработать размещённый, �пециальный раздел приложени� «%s» [0x%8x]"
+msgstr "%B: неизве�тно как обработать размещённый, �пециальный раздел приложени� `%s' [0x%8x]"
 
-#: elf.c:1978
+#: elf.c:1955
 msgid "%B: don't know how to handle processor specific section `%s' [0x%8x]"
-msgstr "%B: неизве�тно как обработать �пециальный раздел проце��ора «%s» [0x%8x]"
+msgstr "%B: неизве�тно как обработать �пециальный раздел проце��ора `%s' [0x%8x]"
 
-#: elf.c:1989
+#: elf.c:1966
 msgid "%B: don't know how to handle OS specific section `%s' [0x%8x]"
-msgstr "%B: неизве�тно как обработать �пециальный раздел ОС «%s» [0x%8x]"
+msgstr "%B: неизве�тно как обработать �пециальный раздел ОС `%s' [0x%8x]"
 
-#: elf.c:1999
+#: elf.c:1976
 msgid "%B: don't know how to handle section `%s' [0x%8x]"
-msgstr "%B: неизве�тно как обработать раздел «%s» [0x%8x]"
+msgstr "%B: неизве�тно как обработать раздел `%s' [0x%8x]"
 
-#: elf.c:2634
+#: elf.c:2603
 #, c-format
 msgid "warning: section `%A' type changed to PROGBITS"
-msgstr "предупреждение: тип раздела «%A» изменён на PROGBITS"
+msgstr "предупреждение: тип раздела `%A' изменён на PROGBITS"
 
-#: elf.c:3078
+#: elf.c:3047
 msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
-msgstr "%B: sh_link раздела «%A» указывает на отброшенный раздел «%A» из «%B»"
+msgstr "%B: sh_link раздела `%A' указывает на отброшенный раздел `%A' из `%B'"
 
-#: elf.c:3101
+#: elf.c:3070
 msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
-msgstr "%B: sh_link раздела «%A» указывает на удалённый раздел «%A» из «%B»"
+msgstr "%B: sh_link раздела `%A' указывает на удалённый раздел `%A' из `%B'"
 
-#: elf.c:4527
+#: elf.c:4480
 msgid "%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr "%B: Первый раздел в �егменте PT_DYNAMIC не �вл�ет�� разделом .dynamic"
 
-#: elf.c:4554
+#: elf.c:4507
 msgid "%B: Not enough room for program headers, try linking with -N"
 msgstr "%B: �едо�таточно ме�та дл� заголовков программы, попытайте�ь �компоновать � параметром -N"
 
-#: elf.c:4641
+#: elf.c:4594
 msgid "%B: section %A lma %#lx adjusted to %#lx"
 msgstr "%B: lma %#lx раздела %A подогнано к %#lx"
 
-#: elf.c:4774
+#: elf.c:4713
 msgid "%B: section `%A' can't be allocated in segment %d"
 msgstr "%B: раздел «%A» не может быть ра�пределён в �егмент %d"
 
-#: elf.c:4822
+#: elf.c:4761
 msgid "%B: warning: allocated section `%s' not in segment"
-msgstr "%B: предупреждение: ра�пределённый раздел «%s» не в �егменте"
+msgstr "%B: предупреждение: ра�пределённый раздел `%s' не в �егменте"
 
-#: elf.c:5322
+#: elf.c:5257
 msgid "%B: symbol `%s' required but not present"
-msgstr "%B: требует�� �имвол «%s», но он от�ут�твует"
+msgstr "%B: требует�� �имвол `%s', но он от�ут�твует"
 
-#: elf.c:5660
+#: elf.c:5595
 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n"
 msgstr "%B: предупреждение: Обнаружен пу�той загружаемый �егмент, �то так задумывало�ь?\n"
 
-#: elf.c:6688
+#: elf.c:6622
 #, c-format
 msgid "Unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr "�е удало�ь найти подход�щее ме�то вывода дл� �имвола '%s' из раздела '%s'"
 
-#: elf.c:7684
+#: elf.c:7611
 msgid "%B: unsupported relocation type %s"
 msgstr "%B: неподдерживаемый тип перемещени� %s"
 
-#: elf32-arm.c:3590
+#: elf32-arm.c:3183
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: Thumb call to ARM"
@@ -891,7 +874,7 @@ msgstr ""
 "%B(%s): предупреждение: �овме�тна� работа не включена.\n"
 "  первое упоминание: %B: Thumb-вызов в ARM"
 
-#: elf32-arm.c:3637
+#: elf32-arm.c:3226
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: ARM call to Thumb"
@@ -899,40 +882,40 @@ msgstr ""
 "%B(%s): предупреждение: �овме�тна� работа не включена.\n"
 "  первое упоминание: %B: ARM-вызов в Thumb"
 
-#: elf32-arm.c:3849 elf32-arm.c:5286
+#: elf32-arm.c:3432 elf32-arm.c:4807
 #, c-format
 msgid "%s: cannot create stub entry %s"
 msgstr "%s: невозможно �оздать �лемент заглушки %s"
 
-#: elf32-arm.c:5402
+#: elf32-arm.c:4923
 #, c-format
 msgid "unable to find THUMB glue '%s' for '%s'"
 msgstr "не удало�ь найти THUMB-�клейку '%s' дл� '%s'"
 
-#: elf32-arm.c:5438
+#: elf32-arm.c:4959
 #, c-format
 msgid "unable to find ARM glue '%s' for '%s'"
 msgstr "не удало�ь найти ARM-�клейку '%s' дл� '%s'"
 
-#: elf32-arm.c:5964
+#: elf32-arm.c:5485
 msgid "%B: BE8 images only valid in big-endian mode."
 msgstr "%B: образы BE8 разрешены только в режиме big-endian."
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:6194
+#: elf32-arm.c:5715
 msgid "%B: warning: selected VFP11 erratum workaround is not necessary for target architecture"
 msgstr "%B: предупреждение: выбранный обход ошибки VFP11 не требует�� дл� целевой архитектуры"
 
-#: elf32-arm.c:6738 elf32-arm.c:6758
+#: elf32-arm.c:6259 elf32-arm.c:6279
 msgid "%B: unable to find VFP11 veneer `%s'"
-msgstr "%B: невозможно найти �клейку VFP11 «%s»"
+msgstr "%B: невозможно найти �клейку VFP11 `%s'"
 
-#: elf32-arm.c:6806
+#: elf32-arm.c:6327
 #, c-format
 msgid "Invalid TARGET2 relocation type '%s'."
-msgstr "�едопу�тимый в TARGET2 тип перемещени� «%s»."
+msgstr "�едопу�тимый в TARGET2 тип перемещени� '%s'."
 
-#: elf32-arm.c:6890
+#: elf32-arm.c:6411
 msgid ""
 "%B(%s): warning: interworking not enabled.\n"
 "  first occurrence: %B: thumb call to arm"
@@ -940,426 +923,402 @@ msgstr ""
 "%B(%s): предупреждение: interworking not enabled.\n"
 "  первое упоминание: %B: thumb-вызов в arm"
 
-#: elf32-arm.c:7674
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx): неожидаема� Thumb-ин�трукци� «0x%x» в трамплине TLS"
-
-#: elf32-arm.c:7713
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"
-msgstr "%B(%A+0x%lx): неожидаема� ARM-ин�трукци� «0x%x» в трамплине TLS"
-
-#: elf32-arm.c:8166
+#: elf32-arm.c:7130
 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'."
 msgstr "\\%B: Предупреждение: Arm ин�трукци� BLX в функции Arm '%s'."
 
-#: elf32-arm.c:8575
+#: elf32-arm.c:7541
 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
 msgstr "\\%B: Предупреждение: Thumb ин�трукци� BLX в функции thumb '%s'."
 
-#: elf32-arm.c:9408
-msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx): неожидаема� Thumb-ин�трукци� «0x%x», на которую ��ылает�� TLS_GOTDESC"
-
-#: elf32-arm.c:9431
-msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"
-msgstr "%B(%A+0x%lx): неожидаема� ARM-ин�трукци� «0x%x», на которую ��ылает�� TLS_GOTDESC"
-
-#: elf32-arm.c:9460
+#: elf32-arm.c:8223
 msgid "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"
-msgstr "%B(%A+0x%lx): перемещение R_ARM_TLS_LE32 не разрешено дл� общего объекта"
+msgstr "%B(%A+0x%lx): перемещение R_ARM_TLS_LE32 не разрешено дл� раздел�емого объекта"
 
-#: elf32-arm.c:9675
+#: elf32-arm.c:8438
 msgid "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"
 msgstr "%B(%A+0x%lx): В группе перемещений ALU разрешена только ин�трукци� ADD или SUB"
 
-#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970
+#: elf32-arm.c:8478 elf32-arm.c:8565 elf32-arm.c:8648 elf32-arm.c:8733
 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"
 msgstr "%B(%A+0x%lx): Переполнение во врем� разделени� 0x%lx дл� перемещение группы %s"
 
-#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544
+#: elf32-arm.c:8963 elf32-sh.c:4112 elf64-sh64.c:1544
 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section"
 msgstr "%B(%A+0x%lx): %s перемещение в разделе SEC_MERGE"
 
-#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805
+#: elf32-arm.c:9074 elf32-m68k.c:4191 elf32-xtensa.c:2805 elf64-ppc.c:11689
 msgid "%B(%A+0x%lx): %s used with TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s и�пользует�� � TLS-�имволом %s"
 
-#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806
+#: elf32-arm.c:9075 elf32-m68k.c:4192 elf32-xtensa.c:2806 elf64-ppc.c:11690
 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s"
 msgstr "%B(%A+0x%lx): %s и�пользует�� � не-TLS �имволом %s"
 
-#: elf32-arm.c:10399 elf32-tic6x.c:2751
+#: elf32-arm.c:9132 elf32-tic6x.c:1632
 msgid "out of range"
 msgstr "вне диапазона"
 
-#: elf32-arm.c:10403 elf32-tic6x.c:2755
+#: elf32-arm.c:9136 elf32-tic6x.c:1636
 msgid "unsupported relocation"
 msgstr "неподдерживаемое перемещение"
 
-#: elf32-arm.c:10411 elf32-tic6x.c:2763
+#: elf32-arm.c:9144 elf32-tic6x.c:1644
 msgid "unknown error"
 msgstr "неизве�тна� ошибка"
 
-#: elf32-arm.c:10836
+#: elf32-arm.c:9569
 msgid "Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"
 msgstr "Предупреждение: Сбро� флага �овме�тной работы %B, как � ним был �компонован код без �овме�тной работы из %B"
 
-#: elf32-arm.c:10930
+#: elf32-arm.c:9663
 msgid "%B: Unknown mandatory EABI object attribute %d"
 msgstr "%B: �еизве�тный об�зательный атрибут EABI-объекта %d"
 
-#: elf32-arm.c:10938
+#: elf32-arm.c:9671
 msgid "Warning: %B: Unknown EABI object attribute %d"
 msgstr "Предупреждение: %B: �еизве�тный атрибут EABI-объекта %d"
 
-#: elf32-arm.c:11119
+#: elf32-arm.c:9852
 msgid "error: %B: Unknown CPU architecture"
 msgstr "ошибка: %B: �еизве�тна� проце��орна� архитектура"
 
-#: elf32-arm.c:11157
+#: elf32-arm.c:9890
 msgid "error: %B: Conflicting CPU architectures %d/%d"
 msgstr "ошибка: %B: Противоречащие архитектурные профили %d/%d"
 
-#: elf32-arm.c:11206
+#: elf32-arm.c:9942
 msgid "Error: %B has both the current and legacy Tag_MPextension_use attributes"
 msgstr "Ошибка: %B �одержит одновременно и текущий и у�таревший атрибут Tag_MPextension_use"
 
-#: elf32-arm.c:11231
+#: elf32-arm.c:9967
 msgid "error: %B uses VFP register arguments, %B does not"
 msgstr "ошибка: %B и�пользует реги�тровые аргументы VFP, а %B не и�пользует"
 
-#: elf32-arm.c:11376
+#: elf32-arm.c:10112
 msgid "error: %B: unable to merge virtualization attributes with %B"
 msgstr "ошибка: %B: не удало�ь объединить атрибуты виртуализации � %B"
 
-#: elf32-arm.c:11402
+#: elf32-arm.c:10138
 msgid "error: %B: Conflicting architecture profiles %c/%c"
 msgstr "ошибка: %B: противоречащие архитектурные профили %c/%c"
 
-#: elf32-arm.c:11503
+#: elf32-arm.c:10239
 msgid "Warning: %B: Conflicting platform configuration"
 msgstr "Предупреждение: %B: Противоречивые на�тройки платформы"
 
-#: elf32-arm.c:11512
+#: elf32-arm.c:10248
 msgid "error: %B: Conflicting use of R9"
 msgstr "ошибка: %B: Противоречащее и�пользование R9"
 
-#: elf32-arm.c:11524
+#: elf32-arm.c:10260
 msgid "error: %B: SB relative addressing conflicts with use of R9"
 msgstr "ошибка: %B: противоречащее и�пользование отно�ительной адре�ации SB и R9"
 
-#: elf32-arm.c:11537
+#: elf32-arm.c:10273
 msgid "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"
 msgstr "предупреждение: %B и�пользует %u-байтовый wchar_t, хот� уже и�пользовал�� %u-байтовый wchar_t; и�пользование значений wchar_t в разных объектах может приве�ти к ошибке"
 
-#: elf32-arm.c:11568
+#: elf32-arm.c:10304
 msgid "warning: %B uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"
 msgstr "предупреждение: %B и�пользует %s enum, хот� уже и�пользовал�� %s enum; и�пользование значений enum в разных объектах может приве�ти к ошибке"
 
-#: elf32-arm.c:11580
+#: elf32-arm.c:10316
 msgid "error: %B uses iWMMXt register arguments, %B does not"
 msgstr "ошибка: %B и�пользует реги�тровые аргументы iWMMXt, а %B не и�пользует"
 
-#: elf32-arm.c:11597
+#: elf32-arm.c:10333
 msgid "error: fp16 format mismatch between %B and %B"
 msgstr "ошибка: формат fp16 ра�ходит�� в %B и %B"
 
-#: elf32-arm.c:11621
+#: elf32-arm.c:10357
 msgid "DIV usage mismatch between %B and %B"
 msgstr "И�пользование DIV ра�ходит�� в %B и %B"
 
-#: elf32-arm.c:11640
+#: elf32-arm.c:10376
 msgid "%B has has both the current and legacy Tag_MPextension_use attributes"
 msgstr "%B �одержит одновременно и текущий и у�таревший атрибут Tag_MPextension_use"
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
-#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282
+#: elf32-arm.c:10468 elf32-bfin.c:5065 elf32-cris.c:4162 elf32-m68hc1x.c:1282
 #: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528
-#: elfxx-mips.c:12857
+#: elfxx-mips.c:12842
 #, c-format
 msgid "private flags = %lx:"
 msgstr "�об�твенные флаги = %lx:"
 
-#: elf32-arm.c:11737
+#: elf32-arm.c:10477
 #, c-format
 msgid " [interworking enabled]"
 msgstr " [�овме�тна� работа включена]"
 
-#: elf32-arm.c:11745
+#: elf32-arm.c:10485
 #, c-format
 msgid " [VFP float format]"
 msgstr " [VFP формат плавающей точки]"
 
-#: elf32-arm.c:11747
+#: elf32-arm.c:10487
 #, c-format
 msgid " [Maverick float format]"
 msgstr " [Maverick формат плавающей точки]"
 
-#: elf32-arm.c:11749
+#: elf32-arm.c:10489
 #, c-format
 msgid " [FPA float format]"
 msgstr " [FPA формат плавающей точки]"
 
-#: elf32-arm.c:11758
+#: elf32-arm.c:10498
 #, c-format
 msgid " [new ABI]"
 msgstr " [новый ABI]"
 
-#: elf32-arm.c:11761
+#: elf32-arm.c:10501
 #, c-format
 msgid " [old ABI]"
 msgstr " [�тарый ABI]"
 
-#: elf32-arm.c:11764
+#: elf32-arm.c:10504
 #, c-format
 msgid " [software FP]"
 msgstr " [программна� FP]"
 
-#: elf32-arm.c:11773
+#: elf32-arm.c:10513
 #, c-format
 msgid " [Version1 EABI]"
 msgstr " [Вер�и�1 EABI]"
 
-#: elf32-arm.c:11776 elf32-arm.c:11787
+#: elf32-arm.c:10516 elf32-arm.c:10527
 #, c-format
 msgid " [sorted symbol table]"
 msgstr " [от�ортированна� таблица �имволов]"
 
-#: elf32-arm.c:11778 elf32-arm.c:11789
+#: elf32-arm.c:10518 elf32-arm.c:10529
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr " [не�ортированна� таблица �имволов]"
 
-#: elf32-arm.c:11784
+#: elf32-arm.c:10524
 #, c-format
 msgid " [Version2 EABI]"
 msgstr " [Вер�и�2 EABI]"
 
-#: elf32-arm.c:11792
+#: elf32-arm.c:10532
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr " [динамиче�кие �имволы и�пользуют �егментный индек�]"
 
-#: elf32-arm.c:11795
+#: elf32-arm.c:10535
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr " [проецируемые �имволы указывают�� раньше]"
 
-#: elf32-arm.c:11802
+#: elf32-arm.c:10542
 #, c-format
 msgid " [Version3 EABI]"
 msgstr " [Вер�и�3 EABI]"
 
-#: elf32-arm.c:11806
+#: elf32-arm.c:10546
 #, c-format
 msgid " [Version4 EABI]"
 msgstr " [Вер�и�4 EABI]"
 
-#: elf32-arm.c:11810
+#: elf32-arm.c:10550
 #, c-format
 msgid " [Version5 EABI]"
 msgstr " [Вер�и�5 EABI]"
 
-#: elf32-arm.c:11813
+#: elf32-arm.c:10553
 #, c-format
 msgid " [BE8]"
 msgstr " [BE8]"
 
-#: elf32-arm.c:11816
+#: elf32-arm.c:10556
 #, c-format
 msgid " [LE8]"
 msgstr " [LE8]"
 
-#: elf32-arm.c:11822
+#: elf32-arm.c:10562
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr " <нера�познанна� вер�и� EABI>"
 
-#: elf32-arm.c:11829
+#: elf32-arm.c:10569
 #, c-format
 msgid " [relocatable executable]"
 msgstr " [перемещаемый и�полн�емый]"
 
-#: elf32-arm.c:11832
+#: elf32-arm.c:10572
 #, c-format
 msgid " [has entry point]"
 msgstr " [имеет точку входа]"
 
-#: elf32-arm.c:11837
+#: elf32-arm.c:10577
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr "<�ера�познанный набор битов флага>"
 
-#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827
-#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370
+#: elf32-arm.c:10824 elf32-i386.c:1322 elf32-s390.c:1000 elf32-xtensa.c:1009
+#: elf64-s390.c:960 elf64-x86-64.c:1105 elfxx-sparc.c:1370
 msgid "%B: bad symbol index: %d"
 msgstr "%B: неправильный �имвольный индек�: %d"
 
-#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949
+#: elf32-arm.c:10946 elf64-x86-64.c:1265 elf64-x86-64.c:1434 elfxx-mips.c:7942
 msgid "%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"
-msgstr "%B: перемещение %s дл� «%s» не может и�пользовать�� при �оздании общего объекта; перекомпилируйте � -fPIC"
+msgstr "%B: перемещение %s дл� `%s' не может и�пользовать�� при �оздании раздел�емого объекта; перекомпилируйте � -fPIC"
 
-#: elf32-arm.c:13412
+#: elf32-arm.c:11948
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr "При обработке файла %s обнаружены ошибки"
 
-#: elf32-arm.c:14795
+#: elf32-arm.c:13334
 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr "%B: ошибка: заглушка дл� ошибки Cortex-A8 ра�положена в небезопа�ном ме�те"
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:14822
+#: elf32-arm.c:13361
 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr "%B: ошибка: заглушка дл� ошибки Cortex-A8 находит�� вне диапазона (�лишком большой входной файл)"
 
-#: elf32-arm.c:14916 elf32-arm.c:14938
+#: elf32-arm.c:13455 elf32-arm.c:13477
 msgid "%B: error: VFP11 veneer out of range"
 msgstr "%B: ошибка: �клейка VFP11 вне диапазона"
 
-#: elf32-arm.c:15477
+#: elf32-arm.c:14002
 msgid "error: %B is already in final BE8 format"
 msgstr "ошибка: %B уже в конечном формате BE8"
 
-#: elf32-arm.c:15553
+#: elf32-arm.c:14078
 msgid "error: Source object %B has EABI version %d, but target %B has EABI version %d"
 msgstr "ошибка: Объект-и�точник %B имеет вер�ию EABI %d, а цель %B имеет вер�ию EABI %d"
 
-#: elf32-arm.c:15569
+#: elf32-arm.c:14094
 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
 msgstr "ошибка: %B �компилирован дл� APCS-%d, в то врем� как цель %B и�пользует APCS-%d"
 
-#: elf32-arm.c:15594
+#: elf32-arm.c:14119
 msgid "error: %B uses VFP instructions, whereas %B does not"
 msgstr "ошибка: %B и�пользует ин�трукции VFP, в то врем� как %B не и�пользует"
 
-#: elf32-arm.c:15598
+#: elf32-arm.c:14123
 msgid "error: %B uses FPA instructions, whereas %B does not"
 msgstr "ошибка: %B и�пользует ин�трукции FPA, в то врем� как %B не и�пользует"
 
-#: elf32-arm.c:15608
+#: elf32-arm.c:14133
 msgid "error: %B uses Maverick instructions, whereas %B does not"
 msgstr "ошибка: %B и�пользует ин�трукции Maverick, в то врем� как %B не и�пользует"
 
-#: elf32-arm.c:15612
+#: elf32-arm.c:14137
 msgid "error: %B does not use Maverick instructions, whereas %B does"
 msgstr "ошибка: %B не и�пользует ин�трукции Maverick, в то врем� как %B и�пользует"
 
-#: elf32-arm.c:15631
+#: elf32-arm.c:14156
 msgid "error: %B uses software FP, whereas %B uses hardware FP"
 msgstr "ошибка: %B и�пользует программную FP, в то врем� как %B и�пользует аппаратную FP"
 
-#: elf32-arm.c:15635
+#: elf32-arm.c:14160
 msgid "error: %B uses hardware FP, whereas %B uses software FP"
 msgstr "ошибка: %B и�пользует аппаратную FP, в то врем� как %B и�пользует программную FP"
 
-#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617
-#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
-#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494
+#: elf32-avr.c:1271 elf32-bfin.c:3201 elf32-cris.c:2085 elf32-fr30.c:617
+#: elf32-frv.c:4119 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692
+#: elf32-m32c.c:561 elf32-mep.c:542 elf32-moxie.c:290 elf32-msp430.c:494
 #: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949
 #: elf64-mmix.c:1530
 msgid "internal error: dangerous relocation"
 msgstr "внутренн�� ошибка: опа�ное перемещение"
 
-#: elf32-avr.c:2415 elf32-hppa.c:598 elf32-m68hc1x.c:166
+#: elf32-avr.c:2400 elf32-hppa.c:598 elf32-m68hc1x.c:166 elf64-ppc.c:4175
 msgid "%B: cannot create stub entry %s"
 msgstr "%B: невозможно �оздать �лемент заглушки %s"
 
-#: elf32-bfin.c:107 elf32-bfin.c:363
-msgid "relocation should be even number"
-msgstr "значение перемещени� должно быть чётным чи�лом"
-
-#: elf32-bfin.c:1591
+#: elf32-bfin.c:1575
 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'"
-msgstr "%B(%A+0x%lx): неразрешимое перемещение отно�ительно �имвола «%s»"
+msgstr "%B(%A+0x%lx): неразрешимое перемещение отно�ительно �имвола `%s'"
 
-#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062
-#: elf64-s390.c:3037 elf64-x86-64.c:3923
+#: elf32-bfin.c:1608 elf32-i386.c:4123 elf32-m68k.c:4233 elf32-s390.c:3062
+#: elf64-s390.c:3037 elf64-x86-64.c:3759
 msgid "%B(%A+0x%lx): reloc against `%s': error %d"
-msgstr "%B(%A+0x%lx): перемещение к «%s»: ошибка %d"
+msgstr "%B(%A+0x%lx): перемещение к `%s': ошибка %d"
 
-#: elf32-bfin.c:2723
+#: elf32-bfin.c:2707
 msgid "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"
-msgstr "%B: перемещение «%A+0x%x» ��ылает�� на �имвол «%s» � ненулевым добавлением"
+msgstr "%B: перемещение `%A+0x%x' ��ылает�� на �имвол `%s' � ненулевым добавлением"
 
-#: elf32-bfin.c:2737
+#: elf32-bfin.c:2721 elf32-frv.c:2901
 msgid "relocation references symbol not defined in the module"
 msgstr "перемещение указывает на неопределённый �имвол в модуле"
 
-#: elf32-bfin.c:2834
+#: elf32-bfin.c:2818
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC указывает на динамиче�кий �имвол � ненулевым добавлением"
 
-#: elf32-bfin.c:2875 elf32-bfin.c:2998
+#: elf32-bfin.c:2859 elf32-bfin.c:2982 elf32-frv.c:3638 elf32-frv.c:3759
 msgid "cannot emit fixups in read-only section"
 msgstr "невозможно �генерировать ме�тоположени� в разделе только дл� чтени�"
 
-#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021
+#: elf32-bfin.c:2890 elf32-bfin.c:3020 elf32-frv.c:3669 elf32-frv.c:3803
+#: elf32-lm32.c:1103 elf32-sh.c:5021
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr "невозможно �генерировать динамиче�кие перемещени� в разделе только дл� чтени�"
 
-#: elf32-bfin.c:2956
+#: elf32-bfin.c:2940
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr "R_BFIN_FUNCDESC_VALUE указывает на динамиче�кий �имвол � ненулевым добавлением"
 
-#: elf32-bfin.c:3121
+#: elf32-bfin.c:3105
 msgid "relocations between different segments are not supported"
 msgstr "перемещени� между различными �егментами не поддерживают��"
 
-#: elf32-bfin.c:3122
+#: elf32-bfin.c:3106
 msgid "warning: relocation references a different segment"
 msgstr "предупреждение: перемещение ��ылает�� на другой �егмент"
 
-#: elf32-bfin.c:4967
+#: elf32-bfin.c:4957 elf32-frv.c:6406
 msgid "%B: unsupported relocation type %i"
 msgstr "%B: неподдерживаемый тип перемещени� %i"
 
-#: elf32-bfin.c:5121 elf32-frv.c:6805
+#: elf32-bfin.c:5111 elf32-frv.c:6814
 #, c-format
 msgid "%s: cannot link non-fdpic object file into fdpic executable"
 msgstr "%s: невозможно �компоновать не-fdpic объектный файл в и�полн�емый fdpic"
 
-#: elf32-bfin.c:5125 elf32-frv.c:6809
+#: elf32-bfin.c:5115 elf32-frv.c:6818
 #, c-format
 msgid "%s: cannot link fdpic object file into non-fdpic executable"
 msgstr "%s: невозможно �компоновать fdpic объектный файл в и�полн�емый не-fdpic"
 
-#: elf32-bfin.c:5279
-#, c-format
-msgid "*** check this relocation %s"
-msgstr "*** проверьте �то перемещение %s"
-
 #: elf32-cris.c:1172
 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
-msgstr "%B, раздел %A: неразрешимое перемещение %s у �имвола «%s»"
+msgstr "%B, раздел %A: неразрешимое перемещение %s у �имвола `%s'"
 
 #: elf32-cris.c:1234
 msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'"
-msgstr "%B, раздел %A: �ет ни PLT ни GOT дл� перемещени� %s у �имвола «%s»"
+msgstr "%B, раздел %A: �ет ни PLT ни GOT дл� перемещени� %s у �имвола `%s'"
 
 #: elf32-cris.c:1236
 msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
-msgstr "%B, раздел %A: �ет PLT дл� перемещени� %s у �имвола «%s»"
+msgstr "%B, раздел %A: �ет PLT дл� перемещени� %s у �имвола `%s'"
 
 #: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718
-#: elf32-cris.c:1871 elf32-tic6x.c:2660
+#: elf32-cris.c:1871
 msgid "[whose name is lost]"
 msgstr "[чьё им� потер�но]"
 
-#: elf32-cris.c:1361 elf32-tic6x.c:2645
+#: elf32-cris.c:1361
 msgid "%B, section %A: relocation %s with non-zero addend %d against local symbol"
 msgstr "%B, раздел %A: перемещение %s � ненулевым добавлением %d у локального �имвола"
 
-#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653
+#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865
 msgid "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'"
-msgstr "%B, раздел %A: перемещение %s � ненулевым добавлением %d у �имвола «%s»"
+msgstr "%B, раздел %A: перемещение %s � ненулевым добавлением %d у �имвола `%s'"
 
 #: elf32-cris.c:1395
 msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'"
-msgstr "%B, раздел %A: перемещение %s не разрешено дл� глобального �имвола: «%s»"
+msgstr "%B, раздел %A: перемещение %s не разрешено дл� глобального �имвола: `%s'"
 
 #: elf32-cris.c:1411
 msgid "%B, section %A: relocation %s with no GOT created"
@@ -1368,11 +1327,11 @@ msgstr "%B, раздел %A: перемещение %s без �озданног
 #. We shouldn't get here for GCC-emitted code.
 #: elf32-cris.c:1626
 msgid "%B, section %A: relocation %s has an undefined reference to `%s', perhaps a declaration mixup?"
-msgstr "%B, раздел %A: перемещение %s имеет неопределённую ��ылку на «%s»; возможно, �мешение объ�влений?"
+msgstr "%B, раздел %A: перемещение %s имеет неопределённую ��ылку на `%s'; возможно, �мешение объ�влений?"
 
 #: elf32-cris.c:1998
 msgid "%B, section %A: relocation %s is not allowed for symbol: `%s' which is defined outside the program, perhaps a declaration mixup?"
-msgstr "%B, раздел %A: перемещение %s не разрешено дл� �имвола: «%s», который определён вне программы; возможно, �мешение объ�влений?"
+msgstr "%B, раздел %A: перемещение %s не разрешено дл� �имвола: `%s', который определён вне программы; возможно, �мешение объ�влений?"
 
 #: elf32-cris.c:2051
 msgid "(too many global variables for -fpic: recompile with -fPIC)"
@@ -1396,7 +1355,7 @@ msgid ""
 "  relocation %s not valid in a shared object; typically an option mixup, recompile with -fPIC"
 msgstr ""
 "%B, раздел %A:\n"
-"  перемещение %s не должно и�пользовать�� в общем объекте; возможно, �мешение параметров, перекомпилируйте � -fPIC"
+"  перемещение %s не должно и�пользовать�� в раздел�емом объекте; возможно, �мешение параметров, перекомпилируйте � -fPIC"
 
 #: elf32-cris.c:3567
 msgid ""
@@ -1404,15 +1363,15 @@ msgid ""
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
 msgstr ""
 "%B, раздел %A:\n"
-"  перемещение %s не должно и�пользовать�� в общем объекте; перекомпилируйте � -fPIC"
+"  перемещение %s не должно и�пользовать�� в раздел�емом объекте; перекомпилируйте � -fPIC"
 
 #: elf32-cris.c:3992
 msgid ""
 "%B, section `%A', to symbol `%s':\n"
 "  relocation %s should not be used in a shared object; recompile with -fPIC"
 msgstr ""
-"%B, раздел «%A», к �имволу «%s»:\n"
-"  перемещение %s не должно и�пользовать�� в общем объекте; перекомпилируйте � -fPIC"
+"%B, раздел %A, к �имволу %s:\n"
+"  перемещение %s не должно и�пользовать�� в раздел�емом объекте; перекомпилируйте � -fPIC"
 
 #: elf32-cris.c:4111
 msgid "Unexpected machine number"
@@ -1449,121 +1408,95 @@ msgstr "%B Ñ�одержит код CRIS v32, который не Ñ�овмеÑ�Ñ‚Ð
 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr "%B �одержит код не-CRIS v32, который не �овме�тим � предыдущими объектами"
 
-#: elf32-dlx.c:142
-#, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
-msgstr "Ошибка компоновки BFD: ветвление (PC rel16) в раздел (%s) не поддерживает��"
-
-#: elf32-dlx.c:204
-#, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr "Ошибка компоновки BFD: прыжок (PC rel26) в раздел (%s) не поддерживает��"
-
 #: elf32-frv.c:1509 elf32-frv.c:1658
 msgid "relocation requires zero addend"
 msgstr "дл� перемещени� требует�� нулевое добавление"
 
 #: elf32-frv.c:2888
-msgid "%H: relocation to `%s+%v' may have caused the error above\n"
-msgstr "%H: перемещение в «%s+%v» может быть вызвано предыдущей ошибкой\n"
-
-#: elf32-frv.c:2902
-msgid "%H: relocation references symbol not defined in the module\n"
-msgstr "%H: перемещение указывает на неопределённый �имвол в модуле\n"
+msgid "%B(%A+0x%x): relocation to `%s+%x' may have caused the error above"
+msgstr "%B(%A+0x%x): перемещение в `%s+%x' может быть вызвано предыдущей ошибкой"
 
-#: elf32-frv.c:2978
-msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF не применимо дл� ин�трукции call\n"
+#: elf32-frv.c:2977
+msgid "R_FRV_GETTLSOFF not applied to a call instruction"
+msgstr "R_FRV_GETTLSOFF не применимо дл� ин�трукции call"
 
 #: elf32-frv.c:3019
-msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
-msgstr "%H R_FRV_GOTTLSDESC12 не применимо дл� ин�трукции lddi\n"
+msgid "R_FRV_GOTTLSDESC12 not applied to an lddi instruction"
+msgstr "R_FRV_GOTTLSDESC12 не применимо дл� ин�трукции lddi"
 
 #: elf32-frv.c:3090
-msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCHI не применимо дл� ин�трукции sethi\n"
+msgid "R_FRV_GOTTLSDESCHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSDESCHI не применимо дл� ин�трукции sethi"
 
 #: elf32-frv.c:3127
-msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSDESCLO не применимо дл� ин�трукции setlo или setlos\n"
-
-#: elf32-frv.c:3174
-msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
-msgstr "%H: R_FRV_TLSDESC_RELAX не применимо дл� ин�трукции ldd\n"
-
-#: elf32-frv.c:3258
-msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
-msgstr "%H: R_FRV_GETTLSOFF_RELAX не применимо дл� ин�трукции calll\n"
+msgid "R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSDESCLO не применимо дл� ин�трукции setlo или setlos"
 
-#: elf32-frv.c:3312
-msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFF12 не применимо дл� ин�трукции ldi\n"
+#: elf32-frv.c:3175
+msgid "R_FRV_TLSDESC_RELAX not applied to an ldd instruction"
+msgstr "R_FRV_TLSDESC_RELAX не применимо дл� ин�трукции ldd"
 
-#: elf32-frv.c:3342
-msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFHI не применимо дл� ин�трукции sethi\n"
+#: elf32-frv.c:3259
+msgid "R_FRV_GETTLSOFF_RELAX not applied to a calll instruction"
+msgstr "R_FRV_GETTLSOFF_RELAX не применимо дл� ин�трукции calll"
 
-#: elf32-frv.c:3371
-msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "%H: R_FRV_GOTTLSOFFLO не применимо дл� ин�трукции setlo или setlos\n"
+#: elf32-frv.c:3314
+msgid "R_FRV_GOTTLSOFF12 not applied to an ldi instruction"
+msgstr "R_FRV_GOTTLSOFF12 не применимо дл� ин�трукции ldi"
 
-#: elf32-frv.c:3401
-msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
-msgstr "%H: R_FRV_TLSOFF_RELAX не применимо дл� ин�трукции ld\n"
+#: elf32-frv.c:3344
+msgid "R_FRV_GOTTLSOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_GOTTLSOFFHI не применимо дл� ин�трукции sethi"
 
-#: elf32-frv.c:3446
-msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
-msgstr "%H: R_FRV_TLSMOFFHI не применимо дл� ин�трукции sethi\n"
+#: elf32-frv.c:3373
+msgid "R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_GOTTLSOFFLO не применимо дл� ин�трукции setlo или setlos"
 
-#: elf32-frv.c:3473
-msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
-msgstr "R_FRV_TLSMOFFLO не применимо дл� ин�трукции setlo или setlos\n"
+#: elf32-frv.c:3404
+msgid "R_FRV_TLSOFF_RELAX not applied to an ld instruction"
+msgstr "R_FRV_TLSOFF_RELAX не применимо дл� ин�трукции ld"
 
-#: elf32-frv.c:3594
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC указывает на динамиче�кий �имвол � ненулевым добавлением\n"
+#: elf32-frv.c:3449
+msgid "R_FRV_TLSMOFFHI not applied to a sethi instruction"
+msgstr "R_FRV_TLSMOFFHI не применимо дл� ин�трукции sethi"
 
-#: elf32-frv.c:3635 elf32-frv.c:3757
-msgid "%H: cannot emit fixups in read-only section\n"
-msgstr "%H: невозможно �генерировать ме�тоположени� в разделе только дл� чтени�\n"
+#: elf32-frv.c:3476
+msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction"
+msgstr "R_FRV_TLSMOFFLO не применимо дл� ин�трукции setlo или setlos"
 
-#: elf32-frv.c:3666 elf32-frv.c:3800
-msgid "%H: cannot emit dynamic relocations in read-only section\n"
-msgstr "%H: невозможно �генерировать динамиче�кие перемещени� в разделе только дл� чтени�\n"
+#: elf32-frv.c:3597
+msgid "R_FRV_FUNCDESC references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC указывает на динамиче�кий �имвол � ненулевым добавлением"
 
-#: elf32-frv.c:3715
-msgid "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
-msgstr "%H: R_FRV_FUNCDESC_VALUE указывает на динамиче�кий �имвол � ненулевым добавлением\n"
+#: elf32-frv.c:3717
+msgid "R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
+msgstr "R_FRV_FUNCDESC_VALUE указывает на динамиче�кий �имвол � ненулевым добавлением"
 
-#: elf32-frv.c:3971
-msgid "%H: reloc against `%s' references a different segment\n"
-msgstr "%H: перемещение указывает на ��ылки «%s» другого �егмента\n"
+#: elf32-frv.c:3974 elf32-frv.c:4130
+msgid "%B(%A+0x%lx): reloc against `%s': %s"
+msgstr "%B(%A+0x%lx): перемещение дл� `%s': %s"
 
-#: elf32-frv.c:4121
-msgid "%H: reloc against `%s': %s\n"
-msgstr "%H: перемещение указывает на «%s»: %s\n"
+#: elf32-frv.c:3976 elf32-frv.c:3980
+msgid "relocation references a different segment"
+msgstr "перемещение указывает на другой �егмент"
 
-#: elf32-frv.c:6397
-msgid "%B: unsupported relocation type %i\n"
-msgstr "%B: неподдерживаемый тип перемещени� %i\n"
-
-#: elf32-frv.c:6719
+#: elf32-frv.c:6728
 #, c-format
 msgid "%s: compiled with %s and linked with modules that use non-pic relocations"
 msgstr "%s: компилирует�� � %s и компонует�� � модул�ми, в которых и�пользуют�� не-pic перемещени�"
 
-#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807
+#: elf32-frv.c:6781 elf32-iq2000.c:845 elf32-m32c.c:807
 #, c-format
 msgid "%s: compiled with %s and linked with modules compiled with %s"
 msgstr "%s: компилирует�� � %s и компонует�� � модул�ми, �компилированными � %s"
 
-#: elf32-frv.c:6784
+#: elf32-frv.c:6793
 #, c-format
 msgid "%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%s: и�пользует другие неизве�тные флаги e_flags (0x%lx) чем предыдущие модули (0x%lx)"
 
-#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
-#: elf32-rx.c:2937
+#: elf32-frv.c:6843 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576
+#: elf32-rx.c:2925
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr "�об�твенные флаги = 0x%lx:"
@@ -1578,7 +1511,7 @@ msgstr "%B(%A+0x%lx): невозможно до�тичь %s, перекомпи
 
 #: elf32-hppa.c:1284
 msgid "%B: relocation %s can not be used when making a shared object; recompile with -fPIC"
-msgstr "%B: перемещение %s не может и�пользовать�� при �оздании общего объекта; перекомпилируйте � -fPIC"
+msgstr "%B: перемещение %s не может и�пользовать�� при �оздании раздел�емого объекта; перекомпилируйте � -fPIC"
 
 #: elf32-hppa.c:2803
 msgid "%B: duplicate export stub %s"
@@ -1586,7 +1519,7 @@ msgstr "%B: повторный �к�порт заглушки %s"
 
 #: elf32-hppa.c:3449
 msgid "%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"
-msgstr "%B(%A+0x%lx): %s ме�тоположение дл� insn 0x%x не поддерживает�� в общей ��ылке"
+msgstr "%B(%A+0x%lx): %s ме�тоположение дл� insn 0x%x не поддерживает�� в нераздел�емой ��ылке"
 
 #: elf32-hppa.c:4296
 msgid "%B(%A+0x%lx): cannot handle %s for %s"
@@ -1597,62 +1530,54 @@ msgid ".got section not immediately after .plt section"
 msgstr "раздел .got не может �то�ть �разу по�ле раздела .plt"
 
 #. Unknown relocation.
-#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379
-#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243
+#: elf32-i386.c:371 elf32-m68k.c:383 elf32-ppc.c:1674 elf32-s390.c:379
+#: elf32-tic6x.c:1563 elf64-ppc.c:2284 elf64-s390.c:403 elf64-x86-64.c:234
 msgid "%B: invalid relocation type %d"
 msgstr "%B: неверный тип перемещени� %d"
 
-#: elf32-i386.c:1266 elf64-x86-64.c:1116
+#: elf32-i386.c:1265 elf64-x86-64.c:1049
 msgid "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed"
-msgstr "%B: TLS-переход из %s в %s дл� «%s» по 0x%lx в разделе «%A» завершил�� неудачно"
+msgstr "%B: TLS-переход из %s в %s дл� `%s' по 0x%lx в разделе `%A' завершил�� неудачно"
 
-#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909
-#: elfxx-sparc.c:3077
+#: elf32-i386.c:1408 elf32-i386.c:3068 elf64-x86-64.c:1194 elf64-x86-64.c:2780
+#: elfxx-sparc.c:3076
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
-msgstr "%B: перемещение %s вме�те � STT_GNU_IFUNC �имволом «%s» не обрабатывает�� %s"
+msgstr "%B: перемещение %s вме�те � STT_GNU_IFUNC �имволом `%s' не обрабатывает�� %s"
 
-#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
+#: elf32-i386.c:1570 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182
 #: elf64-s390.c:1151 elfxx-sparc.c:1547
 msgid "%B: `%s' accessed both as normal and thread local symbol"
-msgstr "%B: «%s» до�тупен как обычный и как локальный дл� нити �имвол"
-
-#: elf32-i386.c:2405 elf64-x86-64.c:2320
-msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"
-msgstr "%P: %B: предупреждение: перемещение указывает на «%s» из раздела только дл� чтени� «%A».\n"
+msgstr "%B: `%s' до�тупен как обычный и как локальный дл� нити �имвол"
 
-#: elf32-i386.c:2496 elf64-x86-64.c:2407
-msgid "%P: %B: warning: relocation in readonly section `%A'.\n"
-msgstr "P: %B: предупреждение: перемещение в разделе только дл� чтени� «%A».\n"
-
-#: elf32-i386.c:2932
+#: elf32-i386.c:2910
 msgid "%B: unrecognized relocation (0x%x) in section `%A'"
-msgstr "%B: нера�познанное перемещение (0x%x) в разделе «%A»"
+msgstr "%B: нера�познанное перемещение (0x%x) в разделе `%A'"
 
-#: elf32-i386.c:3339 elf64-x86-64.c:3295
+#: elf32-i386.c:3317 elf64-x86-64.c:3174
 msgid "hidden symbol"
 msgstr "�крытый �имвол"
 
-#: elf32-i386.c:3342 elf64-x86-64.c:3298
+#: elf32-i386.c:3320 elf64-x86-64.c:3177
 msgid "internal symbol"
 msgstr "внутренний �имвол"
 
-#: elf32-i386.c:3345 elf64-x86-64.c:3301
+#: elf32-i386.c:3323 elf64-x86-64.c:3180
 msgid "protected symbol"
 msgstr "защищённый �имвол"
 
-#: elf32-i386.c:3348 elf64-x86-64.c:3304
+#: elf32-i386.c:3326 elf64-x86-64.c:3183
 msgid "symbol"
 msgstr "�имвол"
 
-#: elf32-i386.c:3353
+#: elf32-i386.c:3331
 msgid "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"
-msgstr "%B: перемещение R_386_GOTOFF дл� неопределённого %s «%s» не может и�пользовать�� при �оздании общего объекта"
+msgstr "%B: перемещение R_386_GOTOFF дл� неопределённого %s `%s' не может и�пользовать�� при �оздании раздел�емого объекта"
 
-#: elf32-i386.c:3363
+#: elf32-i386.c:3341
 msgid "%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"
-msgstr "%B: перемещение R_386_GOTOFF дл� защищённой функции «%s» не может и�пользовать�� при �оздании общего объекта"
+msgstr "%B: перемещение R_386_GOTOFF дл� защищённой функции `%s' не может и�пользовать�� при �оздании раздел�емого объекта"
 
-#: elf32-i386.c:4660 elf64-x86-64.c:4378
+#: elf32-i386.c:4633 elf64-x86-64.c:4206
 #, c-format
 msgid "discarded output section: `%A'"
 msgstr "отброшенный выходной раздел: «%A»"
@@ -1732,7 +1657,7 @@ msgstr ": ин�трукции m32r2"
 #: elf32-m68hc1x.c:1050
 #, c-format
 msgid "Reference to the far symbol `%s' using a wrong relocation may result in incorrect execution"
-msgstr "Указание на дальний �имвол «%s» � помощью ошибочного перемещени� может приве�ти к неправильному выполнению"
+msgstr "Указание на дальний �имвол `%s' � помощью ошибочного перемещени� может приве�ти к неправильному выполнению"
 
 #: elf32-m68hc1x.c:1073
 #, c-format
@@ -1756,7 +1681,7 @@ msgstr "%B: компоновка файлов, �компилированных
 msgid "%B: linking files compiled for HCS12 with others compiled for HC12"
 msgstr "%B: компоновка файлов, �компилированных дл� HCS12, � файлами, �компилированными дл� HC12"
 
-#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719
+#: elf32-m68hc1x.c:1257 elf32-ppc.c:4232 elf64-sparc.c:703 elfxx-mips.c:12704
 msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr "%B: и�пользует другие неизве�тные флаги e_flags (0x%lx), чем предыдущие модули (0x%lx)"
 
@@ -1805,7 +1730,7 @@ msgstr " [пам�ть=модель � банками]"
 msgid " [memory=flat]"
 msgstr " [пам�ть=пло�ка�]"
 
-#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326
+#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7292 vms-alpha.c:7307
 msgid "unknown"
 msgstr "неизве�тно"
 
@@ -1819,7 +1744,7 @@ msgstr "%B: переполнение GOT: КоличеÑ�тво перемещеÐ
 
 #: elf32-m68k.c:3959
 msgid "%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted in shared object"
-msgstr "%B(%A+0x%lx): перемещение R_68K_TLS_LE32 не разрешено дл� общего объекта"
+msgstr "%B(%A+0x%lx): перемещение R_68K_TLS_LE32 не разрешено дл� раздел�емого объекта"
 
 #: elf32-mcore.c:99 elf32-mcore.c:442
 msgid "%B: Relocation %s (%d) is not currently supported.\n"
@@ -1829,26 +1754,15 @@ msgstr "%B: Перемещение %s (%d) в данный момент не пÐ
 msgid "%B: Unknown relocation type %d\n"
 msgstr "%B: �еизве�тный тип перемещени� %d\n"
 
-#. Pacify gcc -Wall.
-#: elf32-mep.c:157
-#, c-format
-msgid "mep: no reloc for code %d"
-msgstr "mep: нет перемещени� дл� кода %d"
-
-#: elf32-mep.c:163
-#, c-format
-msgid "MeP: howto %d has type %d"
-msgstr "MeP: howto %d имеет тип %d"
-
-#: elf32-mep.c:648
+#: elf32-mep.c:647
 msgid "%B and %B are for different cores"
 msgstr "%B и %B дл� разных �дер"
 
-#: elf32-mep.c:665
+#: elf32-mep.c:664
 msgid "%B and %B are for different configurations"
 msgstr "%B и %B дл� разных конфигураций"
 
-#: elf32-mep.c:702
+#: elf32-mep.c:701
 #, c-format
 msgid "private flags = 0x%lx"
 msgstr "�об�твенные флаги = 0x%lx"
@@ -1863,13 +1777,13 @@ msgstr "%s: неизве�тный тип перемещени� %d"
 msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
 msgstr "%s: Цель (%s) перемещени� %s в ошибочном разделе (%s)"
 
-#: elf32-microblaze.c:1155 elfxx-sparc.c:3451
+#: elf32-microblaze.c:1155 elfxx-sparc.c:3450
 msgid "%B: probably compiled without -fPIC?"
 msgstr "%B: веро�тно, компил�ци� без -fPIC?"
 
-#: elf32-microblaze.c:2074
+#: elf32-microblaze.c:2074 elflink.c:12601
 msgid "%B: bad relocation section name `%s'"
-msgstr "%B: неправильное им� перемещаемого раздела «%s»"
+msgstr "%B: неправильное им� перемещаемого раздела `%s'"
 
 #: elf32-mips.c:1045 elf64-mips.c:2084 elfn32-mips.c:1888
 msgid "literal relocation occurs for an external symbol"
@@ -1880,174 +1794,157 @@ msgstr "дл� внешнего �имвола обнаружено кон�та
 msgid "32bits gp relative relocation occurs for an external symbol"
 msgstr "дл� внешнего �имвола обнаружено 32—битное отно�ительное перемещение"
 
-#: elf32-ppc.c:1740
+#: elf32-ppc.c:1739
 #, c-format
 msgid "generic linker can't handle %s"
 msgstr "универ�альный компоновщик не �мог обработать %s"
 
-#: elf32-ppc.c:2183
+#: elf32-ppc.c:2180
 msgid "corrupt %s section in %B"
 msgstr "повреждённый раздел %s в %B"
 
-#: elf32-ppc.c:2202
+#: elf32-ppc.c:2199
 msgid "unable to read in %s section from %B"
 msgstr "не удало�ь прочитать раздел %s из %B"
 
-#: elf32-ppc.c:2243
+#: elf32-ppc.c:2240
 msgid "warning: unable to set size of %s section in %B"
 msgstr "предупреждение: не удало�ь у�тановить размер раздела %s в %B"
 
-#: elf32-ppc.c:2293
+#: elf32-ppc.c:2290
 msgid "failed to allocate space for new APUinfo section."
 msgstr "не удало�ь выделить ме�то дл� нового раздела APUinfo."
 
-#: elf32-ppc.c:2312
+#: elf32-ppc.c:2309
 msgid "failed to compute new APUinfo section."
 msgstr "не удало�ь вычи�лить новый раздел APUinfo."
 
-#: elf32-ppc.c:2315
+#: elf32-ppc.c:2312
 msgid "failed to install new APUinfo section."
 msgstr "не удало�ь у�тановить новый раздел APUinfo."
 
-#: elf32-ppc.c:3343
+#: elf32-ppc.c:3358
 msgid "%B: relocation %s cannot be used when making a shared object"
-msgstr "%B: раздел %s не может и�пользовать�� при �оздании общего объекта"
+msgstr "%B: раздел %s не может и�пользовать�� при �оздании раздел�емого объекта"
 
 #. It does not make sense to have a procedure linkage
 #. table entry for a local symbol.
-#: elf32-ppc.c:3687
-msgid "%H: %s reloc against local symbol\n"
-msgstr "%H: перемещение %s дл� локального �имвола\n"
+#: elf32-ppc.c:3702
+msgid "%B(%A+0x%lx): %s reloc against local symbol"
+msgstr "%B(%A+0x%lx): %s перемещение дл� локального �имвола"
 
-#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449
-#: elfxx-mips.c:12471 elfxx-mips.c:12497
+#: elf32-ppc.c:4044 elf32-ppc.c:4059 elfxx-mips.c:12411 elfxx-mips.c:12437
+#: elfxx-mips.c:12459 elfxx-mips.c:12485
 msgid "Warning: %B uses hard float, %B uses soft float"
 msgstr "Предупреждение: %B и�пользует аппаратную плавающую точку, %B и�пользует программную плавающую точку"
 
-#: elf32-ppc.c:4029 elf32-ppc.c:4033
+#: elf32-ppc.c:4047 elf32-ppc.c:4051
 msgid "Warning: %B uses double-precision hard float, %B uses single-precision hard float"
 msgstr "Предупреждение: %B и�пользует аппаратную плавающую точку двойной точно�ти, %B и�пользует аппаратную плавающую точку одинарной точно�ти"
 
-#: elf32-ppc.c:4037
+#: elf32-ppc.c:4055
 msgid "Warning: %B uses soft float, %B uses single-precision hard float"
 msgstr "Предупреждение: %B и�пользует программную плавающую точку, %B аппаратную плавающую точку одинарной точно�ти"
 
-#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407
+#: elf32-ppc.c:4062 elf32-ppc.c:4066 elfxx-mips.c:12391 elfxx-mips.c:12395
 msgid "Warning: %B uses unknown floating point ABI %d"
 msgstr "Предупреждение: %B и�пользует неизве�тный ABI плавающей точки %d"
 
-#: elf32-ppc.c:4090 elf32-ppc.c:4094
+#: elf32-ppc.c:4108 elf32-ppc.c:4112
 msgid "Warning: %B uses unknown vector ABI %d"
 msgstr "Предупреждение: %B и�пользует неизве�тный ABI векторов %d"
 
-#: elf32-ppc.c:4098
+#: elf32-ppc.c:4116
 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\""
 msgstr "Предупреждение: %B и�пользует ABI векторов \"%s\", %B и�пользует \"%s\""
 
-#: elf32-ppc.c:4115 elf32-ppc.c:4118
+#: elf32-ppc.c:4133 elf32-ppc.c:4136
 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory"
 msgstr "Предупреждение: %B и�пользует r3/r4 дл� возврата маленькой �труктуры, %B и�пользует пам�ть"
 
-#: elf32-ppc.c:4121 elf32-ppc.c:4125
+#: elf32-ppc.c:4139 elf32-ppc.c:4143
 msgid "Warning: %B uses unknown small structure return convention %d"
 msgstr "Предупреждение: %B и�пользует неизве�тное �оглашение %d по возврату маленькой �труктуры"
 
-#: elf32-ppc.c:4179
+#: elf32-ppc.c:4197
 msgid "%B: compiled with -mrelocatable and linked with modules compiled normally"
 msgstr "%B: �компилирована � параметром -mrelocatable и нормально �компонована �о �компилированными модул�ми"
 
-#: elf32-ppc.c:4187
+#: elf32-ppc.c:4205
 msgid "%B: compiled normally and linked with modules compiled with -mrelocatable"
 msgstr "%B: нормально �компилирована и �компонована � модул�ми, �компилированными � параметром -mrelocatable"
 
-#: elf32-ppc.c:4275
+#: elf32-ppc.c:4293
 msgid "Using bss-plt due to %B"
 msgstr "И�пользует�� bss-plt из-за %B"
 
-#. Uh oh, we didn't find the expected call.  We
-#. could just mark this symbol to exclude it
-#. from tls optimization but it's safer to skip
-#. the entire optimization.
-#: elf32-ppc.c:4771 elf64-ppc.c:7778
-msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
-msgstr "%H аргумент lost __tls_get_addr, оптимизаци� TLS выключена\n"
-
-#: elf32-ppc.c:5006 elf64-ppc.c:6494
-#, c-format
-msgid "dynamic variable `%s' is zero size\n"
-msgstr "динамиче�ка� переменна� «%s» имеет нулевой размер\n"
-
-#: elf32-ppc.c:7204 elf64-ppc.c:12431
-msgid "%B: unknown relocation type %d for symbol %s\n"
-msgstr "%B: неизве�тный тип перемещени� %d дл� �имвола %s\n"
-
-#: elf32-ppc.c:7465
-msgid "%H: non-zero addend on %s reloc against `%s'\n"
-msgstr "%H: ненулевое добавление в перемещении %s дл� «%s»\n"
+#: elf32-ppc.c:7192 elf64-ppc.c:12307
+msgid "%B: unknown relocation type %d for symbol %s"
+msgstr "%B: неизве�тный тип перемещени� %d дл� �имвола %s"
 
-#: elf32-ppc.c:7661 elf64-ppc.c:12936
-msgid "%H: relocation %s for indirect function %s unsupported\n"
-msgstr "%H: перемещение %s дл� не�вного вызова функции %s не поддерживает��\n"
+#: elf32-ppc.c:7453
+msgid "%B(%A+0x%lx): non-zero addend on %s reloc against `%s'"
+msgstr "%B(%A+0x%lx): ненулевое добавление в перемещении %s дл� `%s'"
 
-#: elf32-ppc.c:7889 elf32-ppc.c:7919 elf32-ppc.c:7966
-msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)\n"
-msgstr "%B: назначение (%s) перемещени� %s в ошибочный выходной раздел (%s)\n"
+#: elf32-ppc.c:7651 elf64-ppc.c:12812
+msgid "%B(%A+0x%lx): relocation %s for indirect function %s unsupported"
+msgstr "%B(%A+0x%lx): перемещение %s дл� не�вного вызова функции %s не поддерживает��"
 
-#: elf32-ppc.c:8038
-msgid "%B: relocation %s is not yet supported for symbol %s\n"
-msgstr "%B: перемещение %s пока не поддерживает�� дл� �имвола %s\n"
+#: elf32-ppc.c:7881 elf32-ppc.c:7911 elf32-ppc.c:7958
+msgid "%B: the target (%s) of a %s relocation is in the wrong output section (%s)"
+msgstr "%B: назначение (%s) перемещени� %s в ошибочный выходной раздел (%s)"
 
-#: elf32-ppc.c:8097 elf64-ppc.c:13237
-msgid "%H: unresolvable %s relocation against symbol `%s'\n"
-msgstr "%H: неразрешимое перемещение %s отно�ительно дл� �имвола «%s»\n"
+#: elf32-ppc.c:8030
+msgid "%B: relocation %s is not yet supported for symbol %s."
+msgstr "%B: перемещение %s пока не поддерживает�� дл� �имвола %s."
 
-#: elf32-ppc.c:8144 elf64-ppc.c:13282
-msgid "%H: %s reloc against `%s': error %d\n"
-msgstr "%H: перемещение %s дл� «%s»: ошибка %d\n"
+#: elf32-ppc.c:8138 elf64-ppc.c:13162
+msgid "%B(%A+0x%lx): %s reloc against `%s': error %d"
+msgstr "%B(%A+0x%lx): %s перемещение дл� `%s': ошибка %d"
 
-#: elf32-ppc.c:8635
+#: elf32-ppc.c:8629
 #, c-format
-msgid "%s not defined in linker created %s\n"
-msgstr "%s не определено в компоновщике, �озданном %s\n"
+msgid "%s not defined in linker created %s"
+msgstr "%s не определено в компоновщике, �озданном %s"
 
-#: elf32-rx.c:553
+#: elf32-rx.c:544
 msgid "%B:%A: Warning: deprecated Red Hat reloc "
 msgstr "%B:%A: предупреждение: у�таревшее перемещение Red Hat"
 
-#: elf32-rx.c:1095
+#: elf32-rx.c:1086
 msgid "Warning: RX_SYM reloc with an unknown symbol"
 msgstr "Предупреждение: перемещение RX_SYM � неизве�тным �имволом"
 
-#: elf32-rx.c:1260
+#: elf32-rx.c:1251
 msgid "%B(%A): error: call to undefined function '%s'"
 msgstr "%B(%A): ошибка: вызов неопределённой функции «%s»"
 
-#: elf32-rx.c:1274
+#: elf32-rx.c:1265
 msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
 msgstr "%B(%A): предупреждение: невыровненный до�туп к �имволу «%s» в малой обла�ти данных"
 
-#: elf32-rx.c:1278
+#: elf32-rx.c:1269
 msgid "%B(%A): internal error: out of range error"
 msgstr "%B(%A): внутренн�� ошибка: ошибка выхода из диапазона"
 
-#: elf32-rx.c:1282
+#: elf32-rx.c:1273
 msgid "%B(%A): internal error: unsupported relocation error"
 msgstr "%B(%A): внутренн�� ошибка: ошибка неподдерживаемого перемещени�"
 
-#: elf32-rx.c:1286
+#: elf32-rx.c:1277
 msgid "%B(%A): internal error: dangerous relocation"
 msgstr "%B(%A): внутренн�� ошибка: опа�ное перемещение"
 
-#: elf32-rx.c:1290
+#: elf32-rx.c:1281
 msgid "%B(%A): internal error: unknown error"
 msgstr "%B(%A): внутренн�� ошибка: неизве�тна� ошибка"
 
-#: elf32-rx.c:2940
+#: elf32-rx.c:2928
 #, c-format
 msgid " [64-bit doubles]"
 msgstr "[64-битные double]"
 
-#: elf32-rx.c:2942
+#: elf32-rx.c:2930
 #, c-format
 msgid " [dsp]"
 msgstr " [dsp]"
@@ -2056,7 +1953,7 @@ msgstr " [dsp]"
 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s"
 msgstr "%B(%A+0x%lx): недопу�тима� ин�трукци� дл� TLS-перемещени� %s"
 
-#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324
+#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3323
 msgid "not enough GOT space for local GOT entries"
 msgstr "недо�таточно про�тран�тва GOT дл� локальных �лементов GOT"
 
@@ -2095,7 +1992,7 @@ msgstr "%B: директива IMPORT AS дл� %s �крывает�� пред
 msgid "%B: Unrecognised .directive command: %s"
 msgstr "%B: �ера�познанна� команда .directive: %s"
 
-#: elf32-sh-symbian.c:504
+#: elf32-sh-symbian.c:503
 msgid "%B: Failed to add renamed symbol %s"
 msgstr "%B: �е удало�ь добавить переименованный �имвол %s"
 
@@ -2137,7 +2034,7 @@ msgstr "�еожиданное STO_SH5_ISA32 локального �имвола
 
 #: elf32-sh.c:4304
 msgid "%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"
-msgstr "%B: 0x%lx: о�танов: невыровненное назначение ветвлени� дл� перемещени� � поддержкой о�лаблени�"
+msgstr "%B: 0x%lx: о�танов: невыровненное назначение ветви дл� перемещени� � поддержкой о�лаблени�"
 
 #: elf32-sh.c:4337 elf32-sh.c:4352
 msgid "%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"
@@ -2181,9 +2078,9 @@ msgstr "%B: «%s» до�тупен как FDPIC и как локальный �
 msgid "%B: Function descriptor relocation with non-zero addend"
 msgstr "%B: перемещение де�криптора функции � ненулевым добавлением"
 
-#: elf32-sh.c:6629 elf64-alpha.c:4648
+#: elf32-sh.c:6629 elf64-alpha.c:4560
 msgid "%B: TLS local exec code cannot be linked into shared objects"
-msgstr "%B: локальный и�полн�емый код TLS не может быть �компонован � общими объектами"
+msgstr "%B: локальный и�полн�емый код TLS не может быть �компонован � раздел�емыми объектами"
 
 #: elf32-sh64.c:223 elf64-sh64.c:2314
 #, c-format
@@ -2282,7 +2179,7 @@ msgstr "%s в разделе оверлеев"
 msgid "overlay stub relocation overflow"
 msgstr "переполнение оверлейной заглушки перемещени�"
 
-#: elf32-spu.c:1960
+#: elf32-spu.c:1960 elf64-ppc.c:11327
 msgid "stubs don't match calculated size"
 msgstr "заглушка не �оответ�твует вычи�ленному размеру"
 
@@ -2370,84 +2267,83 @@ msgstr "неи�правима� ошибка при �оздании .fixup"
 
 #: elf32-spu.c:5006
 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"
-msgstr "%B(%s+0x%lx): неразрешённое перемещение %s дл� �имвола «%s»"
+msgstr "%B(%s+0x%lx): неразрешённое перемещение %s дл� �имвола `%s'"
 
-#: elf32-tic6x.c:1602
-msgid "warning: generating a shared library containing non-PIC code"
-msgstr "предупреждение: генераци� общей библиотеки �одержащей не-PIC код"
-
-#: elf32-tic6x.c:1607
-msgid "warning: generating a shared library containing non-PID code"
-msgstr "предупреждение: генераци� общей библиотеки �одержащей не-PID код"
-
-#: elf32-tic6x.c:2539
+#: elf32-tic6x.c:1539
 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
 msgstr "%B: отно�ительное перемещение SB, но __c6xabi_DSBT_BASE не определён"
 
-#: elf32-tic6x.c:2759
+#. Shared libraries and exception handling support not
+#. implemented.
+#: elf32-tic6x.c:1554
+msgid "%B: relocation type %d not implemented"
+msgstr "%B: тип перемещени� «%s» не реализован"
+
+#: elf32-tic6x.c:1640
 msgid "dangerous relocation"
 msgstr "опа�ное перемещение"
 
-#: elf32-tic6x.c:3740
-msgid "%B: error: unknown mandatory EABI object attribute %d"
-msgstr "%B: ошибка: неизве�тный об�зательный атрибут EABI-объекта %d"
-
-#: elf32-tic6x.c:3748
-msgid "%B: warning: unknown EABI object attribute %d"
-msgstr "%B: предупреждение: неизве�тный атрибут EABI-объекта %d"
-
-#: elf32-tic6x.c:3860 elf32-tic6x.c:3868
+#: elf32-tic6x.c:1788 elf32-tic6x.c:1796
 msgid "error: %B requires more stack alignment than %B preserves"
 msgstr "ошибка: дл� %B требует�� большее выравнивание �тека, чем �охранено в %B"
 
-#: elf32-tic6x.c:3878 elf32-tic6x.c:3887
+#: elf32-tic6x.c:1806 elf32-tic6x.c:1815
 msgid "error: unknown Tag_ABI_array_object_alignment value in %B"
 msgstr "ошибка: неизве�тное значение Tag_ABI_array_object_alignment в %B"
 
-#: elf32-tic6x.c:3896 elf32-tic6x.c:3905
+#: elf32-tic6x.c:1824 elf32-tic6x.c:1833
 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B"
 msgstr "ошибка: неизве�тное значение Tag_ABI_array_object_align_expected в %B"
 
-#: elf32-tic6x.c:3913 elf32-tic6x.c:3920
+#: elf32-tic6x.c:1841 elf32-tic6x.c:1848
 msgid "error: %B requires more array alignment than %B preserves"
 msgstr "ошибка: дл� %B требует�� большее выравнивание ма��ива, чем �охранено в %B"
 
-#: elf32-tic6x.c:3942
+#: elf32-tic6x.c:1870
 msgid "warning: %B and %B differ in wchar_t size"
 msgstr "предупреждение: в %B и %B различает�� размер wchar_t"
 
-#: elf32-tic6x.c:3960
+#: elf32-tic6x.c:1888
 msgid "warning: %B and %B differ in whether code is compiled for DSBT"
 msgstr "предупреждение: в %B и %B по-разному �компилирован код дл� DSBT"
 
+#: elf32-tic6x.c:1898
+msgid "warning: %B and %B differ in position-dependence of data addressing"
+msgstr "предупреждение: в %B и %B различает�� адре�аци� незави�имых по положени� данных"
+
+#: elf32-tic6x.c:1908
+msgid "warning: %B and %B differ in position-dependence of code addressing"
+msgstr "предупреждение: в %B и %B различает�� адре�аци� незави�имого по положени� кода"
+
 #: elf32-v850.c:173
 #, c-format
 msgid "Variable `%s' cannot occupy in multiple small data regions"
-msgstr "Переменна� «%s» не может занимать не�колько маленьких обла�тей данных"
+msgstr "Переменна� `%s' не может занимать не�колько маленьких обла�тей данных"
 
 #: elf32-v850.c:176
 #, c-format
 msgid "Variable `%s' can only be in one of the small, zero, and tiny data regions"
-msgstr "Переменна� «%s» может быть только в одном из маленьких, нулевых и крошечных обла�тей данных"
+msgstr "Переменна� `%s' может быть только в одном из маленьких, нулевых и крошечных обла�тей данных"
 
 #: elf32-v850.c:179
 #, c-format
 msgid "Variable `%s' cannot be in both small and zero data regions simultaneously"
-msgstr "Переменна� «%s» не может быть в маленьких и нулевых обла�т�х данных одновременно"
+msgstr "Переменна� `%s' не может быть в маленьких и нулевых обла�т�х данных одновременно"
 
 #: elf32-v850.c:182
 #, c-format
 msgid "Variable `%s' cannot be in both small and tiny data regions simultaneously"
-msgstr "Переменна� «%s» не может быть в маленьких и крошечных обла�т�х данных одновременно"
+msgstr "Переменна� `%s' не может быть в маленьких и крошечных обла�т�х данных одновременно"
 
 #: elf32-v850.c:185
 #, c-format
 msgid "Variable `%s' cannot be in both zero and tiny data regions simultaneously"
-msgstr "Переменна� «%s» не может быть в нулевых и крошечных обла�т�х данных одновременно"
+msgstr "Переменна� `%s' не может быть в нулевых и крошечных обла�т�х данных одновременно"
 
 #: elf32-v850.c:483
-msgid "FAILED to find previous HI16 reloc"
-msgstr "�Е УД�ЛОСЬ найти предыдущее перемещение HI16"
+#, c-format
+msgid "FAILED to find previous HI16 reloc\n"
+msgstr "�Е УД�ЛОСЬ найти предыдущее перемещение HI16\n"
 
 #: elf32-v850.c:2155
 msgid "could not locate special linker symbol __gp"
@@ -2514,24 +2410,24 @@ msgstr " [g-float]"
 #: elf32-vax.c:654
 #, c-format
 msgid "%s: warning: GOT addend of %ld to `%s' does not match previous GOT addend of %ld"
-msgstr "%s: предупреждение: добавление GOT из %ld к «%s» не �овпадает � предыдущим добавлением GOT из %ld"
+msgstr "%s: предупреждение: добавление GOT из %ld к `%s' не �овпадает � предыдущим добавлением GOT из %ld"
 
 #: elf32-vax.c:1587
 #, c-format
 msgid "%s: warning: PLT addend of %d to `%s' from %s section ignored"
-msgstr "%s: предупреждение: добавление PLT из %d к «%s» из раздела %s игнорирует��"
+msgstr "%s: предупреждение: добавление PLT из %d к `%s' из раздела %s игнорирует��"
 
 #: elf32-vax.c:1714
 #, c-format
 msgid "%s: warning: %s relocation against symbol `%s' from %s section"
-msgstr "%s: предупреждение: перемещение %s дл� �имвола «%s» из раздела %s"
+msgstr "%s: предупреждение: перемещение %s дл� �имвола `%s' из раздела %s"
 
 #: elf32-vax.c:1720
 #, c-format
 msgid "%s: warning: %s relocation to 0x%x from %s section"
 msgstr "%s: предупреждение: перемещение %s к 0x%x из раздела %s"
 
-#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342
+#: elf32-xstormy16.c:451 elf32-ia64.c:2861 elf64-ia64.c:2861
 msgid "non-zero addend in @fptr reloc"
 msgstr "ненулевое добавление в перемещение @fptr"
 
@@ -2587,52 +2483,52 @@ msgstr "%B(%A+0x%lx): неожиданное назначение длÑ� перÐ
 msgid "GPDISP relocation did not find ldah and lda instructions"
 msgstr "�е найдены ин�трукции ldah и lda дл� перемещени� GPDISP"
 
-#: elf64-alpha.c:2495
+#: elf64-alpha.c:2408
 msgid "%B: .got subsegment exceeds 64K (size %d)"
 msgstr "%B: подраздел .got превышает 64K (размер %d)"
 
-#: elf64-alpha.c:4392 elf64-alpha.c:4404
+#: elf64-alpha.c:4304 elf64-alpha.c:4316
 msgid "%B: gp-relative relocation against dynamic symbol %s"
 msgstr "%B: gp-отно�ительное перемещение дл� динамиче�кого �имвола %s"
 
-#: elf64-alpha.c:4430 elf64-alpha.c:4565
+#: elf64-alpha.c:4342 elf64-alpha.c:4477
 msgid "%B: pc-relative relocation against dynamic symbol %s"
 msgstr "%B: pc-отно�ительное перемещение дл� динамиче�кого �имвола %s"
 
-#: elf64-alpha.c:4458
+#: elf64-alpha.c:4370
 msgid "%B: change in gp: BRSGP %s"
 msgstr "%B: изменение в gp: BRSGP %s"
 
-#: elf64-alpha.c:4483
+#: elf64-alpha.c:4395
 msgid "<unknown>"
 msgstr "<неизве�тно>"
 
-#: elf64-alpha.c:4488
+#: elf64-alpha.c:4400
 msgid "%B: !samegp reloc against symbol without .prologue: %s"
 msgstr "%B: перемещение !samegp дл� �имвола без .prologue: %s"
 
-#: elf64-alpha.c:4540
+#: elf64-alpha.c:4452
 msgid "%B: unhandled dynamic relocation against %s"
 msgstr "%B: необработанное динамиче�кое перемещение дл� %s"
 
-#: elf64-alpha.c:4572
+#: elf64-alpha.c:4484
 msgid "%B: pc-relative relocation against undefined weak symbol %s"
 msgstr "%B: pc-отно�ительное перемещение дл� неопределённого �лабого �имвола %s"
 
-#: elf64-alpha.c:4632
+#: elf64-alpha.c:4544
 msgid "%B: dtp-relative relocation against dynamic symbol %s"
 msgstr "%B: dtp-отно�ительное перемещение дл� динамиче�кого �имвола %s"
 
-#: elf64-alpha.c:4655
+#: elf64-alpha.c:4567
 msgid "%B: tp-relative relocation against dynamic symbol %s"
 msgstr "%B: tp-отно�ительное перемещение дл� динамиче�кого �имвола %s"
 
-#: elf64-hppa.c:2094
+#: elf64-hppa.c:2101
 #, c-format
 msgid "stub entry for %s cannot load .plt, dp offset = %ld"
 msgstr "�лемент заглушки дл� %s не может загрузить .plt, �мещение dp = %ld"
 
-#: elf64-hppa.c:3292
+#: elf64-hppa.c:3299
 msgid "%B(%A+0x%lx): cannot reach %s"
 msgstr "%B(%A+0x%lx): невозможно добрать�� до %s"
 
@@ -2678,7 +2574,7 @@ msgstr "%s: директива LOCAL: Реги�тр $%ld не �вл�ет��
 #: elf64-mmix.c:2190
 #, c-format
 msgid "%s: Error: multiple definition of `%s'; start of %s is set in a earlier linked file\n"
-msgstr "%s: Ошибка: множе�твенные объ�влени� «%s»; начало %s у�тановлено в ранее �компонованном файле\n"
+msgstr "%s: Ошибка: множе�твенные объ�влени� `%s'; начало %s у�тановлено в ранее �компонованном файле\n"
 
 #: elf64-mmix.c:2248
 msgid "Register section has contents\n"
@@ -2693,82 +2589,65 @@ msgstr ""
 "Внутреннее противоречие: о�таёт�� %u != мак� %u.\n"
 "  Сообщите об ошибке."
 
-#: elf64-ppc.c:2744 libbfd.c:1012
+#: elf64-ppc.c:2741 libbfd.c:997
 msgid "%B: compiled for a big endian system and target is little endian"
 msgstr "%B: �компилировано дл� �и�темы � пр�мым пор�дком байт, а цель � обратным пор�дком байт"
 
-#: elf64-ppc.c:2747 libbfd.c:1014
+#: elf64-ppc.c:2744 libbfd.c:999
 msgid "%B: compiled for a little endian system and target is big endian"
 msgstr "%B: �компилировано дл� �и�темы � обратным пор�дком байт, а цель � пр�мым пор�дком байт"
 
-#: elf64-ppc.c:4160
-msgid "%B: cannot create stub entry %s\n"
-msgstr "%B: невозможно �оздать �лемент заглушки %s\n"
-
-#: elf64-ppc.c:6484
+#: elf64-ppc.c:6473
 #, c-format
-msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc\n"
-msgstr "копирование перемещени� дл� «%s» требует ленивой plt-компоновки; не задавайте LD_BIND_NOW=1 или обновите gcc\n"
+msgid "copy reloc against `%s' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc"
+msgstr "копирование перемещени� дл� `%s' требует ленивой plt-компоновки; не задавайте LD_BIND_NOW=1 или обновите gcc"
 
-#: elf64-ppc.c:6912
-msgid "dynreloc miscount for %B, section %A\n"
-msgstr "ошибка в вычи�лении dynreloc %B, раздел %A\n"
+#: elf64-ppc.c:6901
+msgid "dynreloc miscount for %B, section %A"
+msgstr "ошибка в вычи�лении dynreloc %B, раздел %A"
 
-#: elf64-ppc.c:6996
+#: elf64-ppc.c:6985
 msgid "%B: .opd is not a regular array of opd entries"
 msgstr "%B: .opd не �вл�ет�� обычным ма��ивом �лементов opd"
 
-#: elf64-ppc.c:7005
+#: elf64-ppc.c:6994
 msgid "%B: unexpected reloc type %u in .opd section"
 msgstr "%B: неожиданный тип перемещени� %u в разделе .opd"
 
-#: elf64-ppc.c:7026
+#: elf64-ppc.c:7015
 msgid "%B: undefined sym `%s' in .opd section"
-msgstr "%B: неопределённый �имвол «%s» в разделе .opd"
+msgstr "%B: неопределённый �имвол `%s' в разделе .opd"
 
-#: elf64-ppc.c:7584
-msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
-msgstr "%H __tls_get_addr без аргумента, оптимизаци� TLS выключена\n"
-
-#: elf64-ppc.c:7929 elf64-ppc.c:8450
+#: elf64-ppc.c:7877 elf64-ppc.c:8392
 #, c-format
 msgid "%s defined on removed toc entry"
 msgstr "%s определён на удалённом �лементе toc"
 
-#: elf64-ppc.c:9474
-#, c-format
-msgid "cannot find opd entry toc for %s\n"
-msgstr "�е удало�ь найти opd �лемента toc дл� %s\n"
-
-#: elf64-ppc.c:9556
+#: elf64-ppc.c:9459
 #, c-format
-msgid "long branch stub `%s' offset overflow\n"
-msgstr "переполнение �мещени� заглушки длинного ветвлени� «%s»\n"
+msgid "long branch stub `%s' offset overflow"
+msgstr "переполнение �мещени� заглушки длинного перехода «%s»"
 
-#: elf64-ppc.c:9615
+#: elf64-ppc.c:9518
 #, c-format
-msgid "can't find branch stub `%s'\n"
-msgstr "не найдена заглушка ветвлени� «%s»\n"
+msgid "can't find branch stub `%s'"
+msgstr "не найдена заглушка перехода `%s'"
 
-#: elf64-ppc.c:9677 elf64-ppc.c:9819
+#: elf64-ppc.c:9580 elf64-ppc.c:9716
 #, c-format
-msgid "linkage table error against `%s'\n"
-msgstr "ошибка в таблице компоновки дл� «%s»\n"
+msgid "linkage table error against `%s'"
+msgstr "ошибка в таблице компоновки дл� `%s'"
 
-#: elf64-ppc.c:9993
+#: elf64-ppc.c:9886
 #, c-format
-msgid "can't build branch stub `%s'\n"
-msgstr "невозможно �обрать заглушку ветвлени� «%s»\n"
+msgid "can't build branch stub `%s'"
+msgstr "невозможно �обрать заглушку перехода `%s'"
 
-#: elf64-ppc.c:10814
+#: elf64-ppc.c:10684
 msgid "%B section %A exceeds stub group size"
 msgstr "%B раздел %A превышает групповой размер заглушки"
 
-#: elf64-ppc.c:11457
-msgid "stubs don't match calculated size\n"
-msgstr "заглушки не �оответ�твуют вычи�ленному размеру\n"
-
-#: elf64-ppc.c:11469
+#: elf64-ppc.c:11339
 #, c-format
 msgid ""
 "linker stubs in %u group%s\n"
@@ -2779,100 +2658,88 @@ msgid ""
 "  plt call     %lu"
 msgstr ""
 "заглушки компоновщика в %u группе%s\n"
-"  ветвление                 %lu\n"
+"  переход                   %lu\n"
 "  и�правление toc           %lu\n"
-"  длинное ветвление         %lu\n"
+"  длинный переход           %lu\n"
 "  и�правление длинного long %lu\n"
-"  plt-вызов                 %lu"
+"  plt-вызовl                %lu"
 
-#: elf64-ppc.c:11819
-msgid "%H: %s used with TLS symbol %s\n"
-msgstr "%H: %s и�пользует�� � TLS-�имволом %s\n"
+#: elf64-ppc.c:12190
+msgid "%B(%A+0x%lx): automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc"
+msgstr "%B(%A+0x%lx): автоматиче�кие множе�твенные TOC не поддерживают�� через ваши файлы crt; перекомпилируйте � параметром -mminimal-toc или обновите gcc"
 
-#: elf64-ppc.c:11820
-msgid "%H: %s used with non-TLS symbol %s\n"
-msgstr "%H: %s и�пользует�� � не-TLS �имволом %s\n"
+#: elf64-ppc.c:12198
+msgid "%B(%A+0x%lx): sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern"
+msgstr "%B(%A+0x%lx): оптимизаци� одноуровневых вызовов к `%s' не разрешена из-за автоматиче�ких множе�твенных TOC; перекомпилируйте � параметром -mminimal-toc или -fno-optimize-sibling-calls, или �оздайте внешний `%s'"
 
-#: elf64-ppc.c:12318
-msgid "%H: automatic multiple TOCs not supported using your crt files; recompile with -mminimal-toc or upgrade gcc\n"
-msgstr "%H: автоматиче�кие множе�твенные TOC не поддерживают�� через ваши файлы crt; перекомпилируйте � параметром -mminimal-toc или обновите gcc\n"
+#: elf64-ppc.c:12919
+msgid "%B: relocation %s is not supported for symbol %s."
+msgstr "%B: перемещение %s не поддерживает�� дл� �имвола %s."
 
-#: elf64-ppc.c:12324
-msgid "%H: sibling call optimization to `%s' does not allow automatic multiple TOCs; recompile with -mminimal-toc or -fno-optimize-sibling-calls, or make `%s' extern\n"
-msgstr "%H: оптимизаци� одноуровневых вызовов к «%s» не разрешена из-за автоматиче�ких множе�твенных TOC; перекомпилируйте � параметром -mminimal-toc или -fno-optimize-sibling-calls, или �оздайте внешний «%s»\n"
-
-#: elf64-ppc.c:13041
-msgid "%B: relocation %s is not supported for symbol %s\n"
-msgstr "%B: перемещение %s не поддерживает�� дл� �имвола %s\n"
-
-#: elf64-ppc.c:13218
-msgid "%H: error: %s not a multiple of %u\n"
-msgstr "%H: ошибка: %s не кратно %u\n"
+#: elf64-ppc.c:13096
+msgid "%B: error: relocation %s not a multiple of %d"
+msgstr "%B: ошибка: перемещение %s не кратно %d"
 
 #: elf64-sh64.c:1682
 #, c-format
 msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n"
 msgstr "%s: ошибка: невыровненный тип перемещени� %d по адре�у %08x перемещение %08x\n"
 
-#: elf64-sparc.c:445
+#: elf64-sparc.c:444
 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER"
 msgstr "%B: Только реги�тры %%g[2367] могут объ�вл�ть�� � помощью STT_REGISTER"
 
-#: elf64-sparc.c:465
+#: elf64-sparc.c:464
 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B"
 msgstr "�е�овме�тимое и�пользование реги�тра %%g%d: %s в %B, ранее %s в %B"
 
-#: elf64-sparc.c:488
+#: elf64-sparc.c:487
 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"
-msgstr "Символ «%s» имеет различные типы: REGISTER в %B, ранее %s в %B"
+msgstr "Символ `%s' имеет различные типы: REGISTER в %B, ранее %s в %B"
 
-#: elf64-sparc.c:533
+#: elf64-sparc.c:532
 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"
-msgstr "Символ «%s» имеет различные типы: %s в %B, ранее REGISTER в %B"
+msgstr "Символ `%s' имеет различные типы: %s в %B, ранее REGISTER в %B"
 
-#: elf64-sparc.c:686
+#: elf64-sparc.c:684
 msgid "%B: linking UltraSPARC specific with HAL specific code"
 msgstr "%B: UltraSPARC-�пецифична� компоновка � HAL-�пецифичным кодом"
 
-#: elf64-x86-64.c:1236
-msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode"
-msgstr "%B: перемещение %s дл� �имвола «%s» не поддерживает�� в режиме x32"
-
-#: elf64-x86-64.c:1465
+#: elf64-x86-64.c:1360
 msgid "%B: '%s' accessed both as normal and thread local symbol"
-msgstr "%B: «%s» до�тупен как обычный и как локальный дл� нити �имвол"
+msgstr "%B: '%s' до�тупен как обычный и как локальный дл� нити �имвол"
 
-#: elf64-x86-64.c:2934
+#: elf64-x86-64.c:2801
 msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d"
-msgstr "%B: перемещение %s вме�те � STT_GNU_IFUNC �имволом «%s» имеет ненулевое добавление: %d"
+msgstr "%B: перемещение %s вме�те � STT_GNU_IFUNC �имволом %s имеет ненулевое добавление: %d"
 
-#: elf64-x86-64.c:3193
+#: elf64-x86-64.c:3073
 msgid "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"
-msgstr "%B: перемещение R_X86_64_GOTOFF64 дл� защищённой функции «%s» не может и�пользовать�� при �оздании общего объекта"
+msgstr "%B: перемещение R_X86_64_GOTOFF64 дл� защищённой функции `%s' не может и�пользовать�� при �оздании раздел�емого объекта"
 
-#: elf64-x86-64.c:3305
+#: elf64-x86-64.c:3184
 msgid "; recompile with -fPIC"
 msgstr "; перекомпилируйте � параметром -fPIC"
 
-#: elf64-x86-64.c:3310
+#: elf64-x86-64.c:3189
 msgid "%B: relocation %s against %s `%s' can not be used when making a shared object%s"
-msgstr "%B: перемещение %s дл� %s «%s» не может и�пользовать�� при �оздании общего объекта(ов)"
+msgstr "%B: перемещение %s дл� %s `%s' не может и�пользовать�� при �оздании раздел�емого объекта(ов)"
 
-#: elf64-x86-64.c:3312
+#: elf64-x86-64.c:3191
 msgid "%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s"
-msgstr "%B: перемещение %s дл� неопределённого %s «%s» не может и�пользовать�� при �оздании общего объекта(ов)"
+msgstr "%B: перемещение %s дл� неопределённого %s `%s' не может и�пользовать�� при �оздании раздел�емого объекта(ов)"
 
-#: elfcode.h:827
+#: elfcode.h:826
 #, c-format
 msgid "warning: %s has a corrupt string table index - ignoring"
-msgstr "предупреждение: у %s повреждена таблица индек�ов �трок — игнорирует��"
+msgstr "предупреждение: у %s повреждена таблица индек�ов �трок - игнорирует��"
 
-#: elfcode.h:1237
+#: elfcode.h:1236
 #, c-format
 msgid "%s: version count (%ld) does not match symbol count (%ld)"
 msgstr "%s: �чётчик вер�ии (%ld) не �овпадает �о �чётчиком �имвола (%ld)"
 
-#: elfcode.h:1491
+#: elfcode.h:1476
 #, c-format
 msgid "%s(%s): relocation %d has invalid symbol index %ld"
 msgstr "%s(%s): перемещение %d имеет недопу�тимый индек� �имвола %ld"
@@ -2897,320 +2764,300 @@ msgstr "%s: TLS-определение в %B раздела %A не �овпад
 msgid "%s: TLS reference in %B mismatches non-TLS definition in %B section %A"
 msgstr "%s: TLS-��ылка в %B не �овпадает � не-TLS определением в %B раздела %A"
 
-#: elflink.c:1764
+#: elflink.c:1763
 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'"
-msgstr "%B: неожиданное переопределение ко�венного вер�ионного �имвола «%s»"
+msgstr "%B: неожиданное переопределение ко�венного вер�ионного �имвола `%s'"
 
-#: elflink.c:2077
+#: elflink.c:2076
 msgid "%B: version node not found for symbol %s"
 msgstr "%B: вер�и� узла не найдена дл� �имвола %s"
 
-#: elflink.c:2167
+#: elflink.c:2166
 msgid "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'"
-msgstr "%B: неправильный индек� перемещаемого �имвола (0x%lx >= 0x%lx) дл� �мещени� 0x%lx в разделе «%A»"
+msgstr "%B: неправильный индек� перемещаемого �имвола (0x%lx >= 0x%lx) дл� �мещени� 0x%lx в разделе `%A'"
 
-#: elflink.c:2178
+#: elflink.c:2177
 msgid "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the object file has no symbol table"
-msgstr "%B: ненулевой индек� �имвола (0x%lx) дл� �мещени� 0x%lx в разделе «%A», в то врем� как в объектном файле нет таблицы �имволов"
+msgstr "%B: ненулевой индек� �имвола (0x%lx) дл� �мещени� 0x%lx в разделе `%A', в то врем� как в объектном файле нет таблицы �имволов"
 
-#: elflink.c:2368
+#: elflink.c:2367
 msgid "%B: relocation size mismatch in %B section %A"
 msgstr "%B: размер перемещени� не �овпадает в %B раздела %A"
 
-#: elflink.c:2663
+#: elflink.c:2662
 #, c-format
 msgid "warning: type and size of dynamic symbol `%s' are not defined"
-msgstr "предупреждение: тип и размер динамиче�кого �имвола «%s» не определён"
+msgstr "предупреждение: тип и размер динамиче�кого �имвола `%s' не определён"
 
-#: elflink.c:3421
+#: elflink.c:3418
 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n"
 msgstr "%P: обнаружен альтернативный машинный код ELF (%d) в %B, ожидает�� %d\n"
 
-#: elflink.c:4067
+#: elflink.c:4050
 msgid "%B: %s: invalid version %u (max %d)"
 msgstr "%B: %s: недопу�тима� вер�и� %u (мак� %d)"
 
-#: elflink.c:4103
+#: elflink.c:4086
 msgid "%B: %s: invalid needed version %d"
 msgstr "%B: %s: недопу�тима� необходима� вер�и� %d"
 
-#: elflink.c:4299
+#: elflink.c:4285
 msgid "Warning: alignment %u of common symbol `%s' in %B is greater than the alignment (%u) of its section %A"
-msgstr "Предупреждение: выравнивание %u общего �имвола «%s» в %B больше, чем выравнивание (%u) его раздела %A"
+msgstr "Предупреждение: выравнивание %u общего �имвола `%s' в %B больше, чем выравнивание (%u) его раздела %A"
 
-#: elflink.c:4305
+#: elflink.c:4291
 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B"
-msgstr "Предупреждение: выравнивание %u �имвола «%s» в %B меньше, чем %u в %B"
+msgstr "Предупреждение: выравнивание %u �имвола `%s' в %B меньше, чем %u в %B"
 
-#: elflink.c:4320
+#: elflink.c:4306
 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B"
-msgstr "Предупреждение: размер �имвола «%s» изменил�� � %lu в %B на %lu в %B"
+msgstr "Предупреждение: размер �имвола `%s' изменил�� � %lu в %B на %lu в %B"
 
-#: elflink.c:4489
+#: elflink.c:4472
 msgid "%B: undefined reference to symbol '%s'"
 msgstr "%B: неопределённа� ��ылка на �имвол «%s»"
 
-#: elflink.c:4492
+#: elflink.c:4475
 msgid "note: '%s' is defined in DSO %B so try adding it to the linker command line"
 msgstr "замечание: «%s» определён в DSO %B, попробуйте добавить его в командную �троку компоновщика"
 
-#: elflink.c:5795
+#: elflink.c:5779
 #, c-format
 msgid "%s: undefined version: %s"
 msgstr "%s: неопределённа� вер�и�: %s"
 
-#: elflink.c:5863
+#: elflink.c:5847
 msgid "%B: .preinit_array section is not allowed in DSO"
 msgstr "%B: раздел .preinit_array не разрешает�� в DSO"
 
-#: elflink.c:7617
+#: elflink.c:7598
 #, c-format
 msgid "undefined %s reference in complex symbol: %s"
 msgstr "неопределённа� ��ылка %s в �ложном �имволе: %s"
 
-#: elflink.c:7771
+#: elflink.c:7752
 #, c-format
 msgid "unknown operator '%c' in complex symbol"
 msgstr "неизве�тный оператор '%c' в �ложном �имволе"
 
-#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181
+#: elflink.c:8091 elflink.c:8108 elflink.c:8145 elflink.c:8162
 msgid "%B: Unable to sort relocs - they are in more than one size"
 msgstr "%B: �евозможно от�ортировать перемещени� - они разных размеров"
 
-#: elflink.c:8141 elflink.c:8195
+#: elflink.c:8122 elflink.c:8176
 msgid "%B: Unable to sort relocs - they are of an unknown size"
 msgstr "%B: �евозможно от�ортировать перемещени� - они неизве�тного размера"
 
-#: elflink.c:8246
+#: elflink.c:8227
 msgid "Not enough memory to sort relocations"
 msgstr "�едо�таточно пам�ти дл� �ортировки перемещений"
 
-#: elflink.c:8439
+#: elflink.c:8420
 msgid "%B: Too many sections: %d (>= %d)"
 msgstr "%B: Слишком много разделов: %d (>= %d)"
 
-#: elflink.c:8686
-msgid "%B: internal symbol `%s' in %B is referenced by DSO"
-msgstr "%B: на внутренний �имвол «%s» из %B ��ылают�� из DSO"
-
-#: elflink.c:8688
-msgid "%B: hidden symbol `%s' in %B is referenced by DSO"
-msgstr "%B: на �крытый �имвол «%s» из %B ��ылают�� из DSO"
-
-#: elflink.c:8690
-msgid "%B: local symbol `%s' in %B is referenced by DSO"
-msgstr "%B: на локальный �имвол «%s» из %B ��ылают�� из DSO"
+#: elflink.c:8663
+msgid "%B: %s symbol `%s' in %B is referenced by DSO"
+msgstr "%B: %s �имвол `%s' в %B указывает�� из DSO"
 
-#: elflink.c:8785
+#: elflink.c:8754
 msgid "%B: could not find output section %A for input section %A"
 msgstr "%B: невозможно найти выходной раздел %A дл� входного раздела %A"
 
-#: elflink.c:8908
-msgid "%B: protected symbol `%s' isn't defined"
-msgstr "%B: защищённый �имвол «%s» не определён"
+#: elflink.c:8874
+msgid "%B: %s symbol `%s' isn't defined"
+msgstr "%B: %s �имвол `%s' не определён"
 
-#: elflink.c:8910
-msgid "%B: internal symbol `%s' isn't defined"
-msgstr "%B: внутренний �имвол «%s» не определён"
-
-#: elflink.c:8912
-msgid "%B: hidden symbol `%s' isn't defined"
-msgstr "%B: �крытый �имвол «%s» не определён"
-
-#: elflink.c:9441
-msgid "error: %B: size of section %A is not multiple of address size"
-msgstr "ошибка: %B: размер раздела %A не кратен размеру адре�а"
-
-#: elflink.c:9488
+#: elflink.c:9428
 msgid "error: %B contains a reloc (0x%s) for section %A that references a non-existent global symbol"
 msgstr "ошибка: %B �одержит перемещение (0x%s) дл� раздела %A, который ��ылает�� на не�уще�твующий глобальный �имвол"
 
-#: elflink.c:10223
+#: elflink.c:9494
+msgid "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' of %B\n"
+msgstr "%X`%s' указывает в раздел `%A' из %B: определён в отброшенном разделе `%A' из %B\n"
+
+#: elflink.c:10141
 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"
-msgstr "%A �одержит упор�доченные [«%A» в %B] и неупор�доченные [«%A» в %B] разделы"
+msgstr "%A �одержит упор�доченные [`%A' в %B] и неупор�доченные [`%A' в %B] разделы"
 
-#: elflink.c:10228
+#: elflink.c:10146
 #, c-format
 msgid "%A has both ordered and unordered sections"
 msgstr "%A �одержит упор�доченные и неупор�доченные разделы"
 
-#: elflink.c:10793
-msgid "%B: file class %s incompatible with %s"
-msgstr "%B: файловый кла�� %s не�овме�тим � %s"
-
-#: elflink.c:11104 elflink.c:11148
+#: elflink.c:10992 elflink.c:11036
 msgid "%B: could not find output section %s"
 msgstr "%B: невозможно найти выходной раздел %s"
 
-#: elflink.c:11109
+#: elflink.c:10997
 #, c-format
 msgid "warning: %s section has zero size"
 msgstr "предупреждение: раздел %s имеет нулевой размер"
 
-#: elflink.c:11214
+#: elflink.c:11102
 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n"
-msgstr "%P: предупреждение: �оздаёт�� DT_TEXTREL в общем объекте.\n"
+msgstr "%P: предупреждение: �оздаёт�� DT_TEXTREL в раздел�емом объекте.\n"
 
-#: elflink.c:11401
+#: elflink.c:11289
 msgid "%P%X: can not read symbols: %E\n"
 msgstr "%P%X: невозможно прочитать �имволы: %E\n"
 
-#: elflink.c:11750
+#: elflink.c:11638
 msgid "Removing unused section '%s' in file '%B'"
 msgstr "Удал�ет�� неи�пользуемый раздел '%s' в файле '%B'"
 
-#: elflink.c:11962
+#: elflink.c:11850
 msgid "Warning: gc-sections option ignored"
 msgstr "Предупреждение: параметр gc-sections игнорирует��"
 
-#: elflink.c:12511
+#: elflink.c:12399
 msgid "%B: ignoring duplicate section `%A'"
-msgstr "%B: игнорирует�� повтор�ющий�� раздел «%A»"
+msgstr "%B: игнорирует�� повтор�ющий�� раздел `%A'"
 
-#: elflink.c:12518 elflink.c:12525
+#: elflink.c:12406 elflink.c:12413
 msgid "%B: duplicate section `%A' has different size"
-msgstr "%B: повтор�ющий�� раздел «%A» имеет другой размер"
+msgstr "%B: повтор�ющий�� раздел `%A' имеет другой размер"
 
-#: elflink.c:12533 elflink.c:12538
+#: elflink.c:12421 elflink.c:12426
 msgid "%B: warning: could not read contents of section `%A'"
-msgstr "%B: предупреждение: невозможно прочитать �одержимое раздела «%A»"
+msgstr "%B: предупреждение: невозможно прочитать �одержимое раздела `%A'"
 
-#: elflink.c:12542
+#: elflink.c:12430
 msgid "%B: warning: duplicate section `%A' has different contents"
-msgstr "%B: предупреждение: повтор�ющий�� раздел «%A» имеет другое �одержимое"
+msgstr "%B: предупреждение: повтор�ющий�� раздел `%A' имеет другое �одержимое"
 
-#: elflink.c:12643 linker.c:3086
+#: elflink.c:12531 linker.c:3138
 msgid "%F%P: already_linked_table: %E\n"
 msgstr "%F%P: already_linked_table: %E\n"
 
-#: elfxx-mips.c:1221
+#: elfxx-mips.c:1220
 msgid "static procedure (no name)"
 msgstr "�татиче�ка� процедура (без имени)"
 
-#: elfxx-mips.c:5628
+#: elfxx-mips.c:5623
 msgid "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."
 msgstr "%B: %A+0x%lx: пр�мые переходы между режимами ISA недопу�тимы; попробуйте перекомпилировать � включённой ув�зкой."
 
-#: elfxx-mips.c:6288 elfxx-mips.c:6511
+#: elfxx-mips.c:6280 elfxx-mips.c:6503
 msgid "%B: Warning: bad `%s' option size %u smaller than its header"
 msgstr "%B: предупреждение: размер параметра «%s» (%u) меньше, чем его заголовок"
 
-#: elfxx-mips.c:7262 elfxx-mips.c:7387
+#: elfxx-mips.c:7254 elfxx-mips.c:7379
 msgid "%B: Warning: cannot determine the target function for stub section `%s'"
-msgstr "%B: Предупреждение: невозможно определить функцию назначени� дл� раздела заглушки «%s»"
+msgstr "%B: Предупреждение: невозможно определить функцию назначени� дл� раздела заглушки `%s'"
 
-#: elfxx-mips.c:7516
+#: elfxx-mips.c:7508
 msgid "%B: Malformed reloc detected for section %s"
 msgstr "%B: Обнаружено и�кажённое перемещение в разделе %s"
 
-#: elfxx-mips.c:7556
+#: elfxx-mips.c:7548
 msgid "%B: GOT reloc at 0x%lx not expected in executables"
 msgstr "%B: перемещение GOT по адре�у 0x%lx не ожидает�� в и�полн�емых файлах"
 
-#: elfxx-mips.c:7678
+#: elfxx-mips.c:7670
 msgid "%B: CALL16 reloc at 0x%lx not against global symbol"
 msgstr "%B: перемещение CALL16 по адре�у 0x%lx не предназначено дл� глобального �имвола"
 
-#: elfxx-mips.c:8372
+#: elfxx-mips.c:8365
 #, c-format
 msgid "non-dynamic relocations refer to dynamic symbol %s"
 msgstr "не-динамиче�кие перемещени� указывают на динамиче�кий �имвол %s"
 
-#: elfxx-mips.c:9075
+#: elfxx-mips.c:9068
 msgid "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"
-msgstr "%B: �евозможно найти подход�щее LO16 перемещение у «%s» дл� %s по адре�у 0x%lx в разделе «%A»"
+msgstr "%B: �евозможно найти подход�щее LO16 перемещение у `%s' дл� %s по адре�у 0x%lx в разделе `%A'"
 
-#: elfxx-mips.c:9214
+#: elfxx-mips.c:9207
 msgid "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
-msgstr "раздел small-data превышает 64КБ — нижний предел small-data (�м. параметр -G)"
+msgstr "раздел small-data превышает 64КБ - нижний предел small-data (�м. параметр -G)"
 
-#: elfxx-mips.c:12038
+#: elfxx-mips.c:12027
 #, c-format
 msgid "%s: illegal section name `%s'"
-msgstr "%s: недопу�тимое им� раздела «%s»"
+msgstr "%s: недопу�тимое им� раздела `%s'"
 
-#: elfxx-mips.c:12417 elfxx-mips.c:12443
+#: elfxx-mips.c:12405 elfxx-mips.c:12431
 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float"
 msgstr "Предупреждение: %B и�пользует -msingle-float, %B и�пользует -mdouble-float"
 
-#: elfxx-mips.c:12429 elfxx-mips.c:12485
+#: elfxx-mips.c:12417 elfxx-mips.c:12473
 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"
 msgstr "Предупреждение: %B и�пользует -msingle-float, %B и�пользует -mips32r2 -mfp64"
 
-#: elfxx-mips.c:12455 elfxx-mips.c:12491
+#: elfxx-mips.c:12443 elfxx-mips.c:12479
 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"
 msgstr "Предупреждение: %B и�пользует -mdouble-float, %B и�пользует -mips32r2 -mfp64"
 
-#: elfxx-mips.c:12533
+#: elfxx-mips.c:12521
 msgid "%B: endianness incompatible with that of the selected emulation"
 msgstr "%B: пор�док байт не �овме�тим � выбранным в �мул�ции"
 
-#: elfxx-mips.c:12544
+#: elfxx-mips.c:12532
 msgid "%B: ABI is incompatible with that of the selected emulation"
 msgstr "%B: ABI не �овме�тим � выбранным в �мул�ции"
 
-#: elfxx-mips.c:12628
+#: elfxx-mips.c:12613
 msgid "%B: warning: linking abicalls files with non-abicalls files"
 msgstr "%B: предупреждение: компоновка файлов abicalls � файлами не-abicalls"
 
-#: elfxx-mips.c:12645
+#: elfxx-mips.c:12630
 msgid "%B: linking 32-bit code with 64-bit code"
 msgstr "%B: компоновка 32-битного кода � 64-битным кодом"
 
-#: elfxx-mips.c:12673
+#: elfxx-mips.c:12658
 msgid "%B: linking %s module with previous %s modules"
 msgstr "%B: компоновка модул� %s � предыдущими модул�ми %s"
 
-#: elfxx-mips.c:12696
+#: elfxx-mips.c:12681
 msgid "%B: ABI mismatch: linking %s module with previous %s modules"
 msgstr "%B: не�овпадение ABI: компоновка модул� %s � предыдущими модул�ми %s"
 
-#: elfxx-mips.c:12860
+#: elfxx-mips.c:12845
 #, c-format
 msgid " [abi=O32]"
 msgstr " [abi=O32]"
 
-#: elfxx-mips.c:12862
+#: elfxx-mips.c:12847
 #, c-format
 msgid " [abi=O64]"
 msgstr " [abi=O64]"
 
-#: elfxx-mips.c:12864
+#: elfxx-mips.c:12849
 #, c-format
 msgid " [abi=EABI32]"
 msgstr " [abi=EABI32]"
 
-#: elfxx-mips.c:12866
+#: elfxx-mips.c:12851
 #, c-format
 msgid " [abi=EABI64]"
 msgstr " [abi=EABI64]"
 
-#: elfxx-mips.c:12868
+#: elfxx-mips.c:12853
 #, c-format
 msgid " [abi unknown]"
 msgstr " [abi неизве�тен]"
 
-#: elfxx-mips.c:12870
+#: elfxx-mips.c:12855
 #, c-format
 msgid " [abi=N32]"
 msgstr " [abi=N32]"
 
-#: elfxx-mips.c:12872
+#: elfxx-mips.c:12857
 #, c-format
 msgid " [abi=64]"
 msgstr " [abi=64]"
 
-#: elfxx-mips.c:12874
+#: elfxx-mips.c:12859
 #, c-format
 msgid " [no abi set]"
 msgstr " [abi не задан]"
 
-#: elfxx-mips.c:12895
+#: elfxx-mips.c:12880
 #, c-format
 msgid " [unknown ISA]"
 msgstr " [неизве�тный ISA]"
 
-#: elfxx-mips.c:12906
+#: elfxx-mips.c:12891
 #, c-format
 msgid " [not 32bitmode]"
 msgstr " [не 32-битный режим]"
@@ -3223,12 +3070,12 @@ msgstr "недопу�тимый тип перемещени� %d"
 #: i386linux.c:454 m68klinux.c:458 sparclinux.c:452
 #, c-format
 msgid "Output file requires shared library `%s'\n"
-msgstr "Дл� выходного файла требует�� обща� библиотека «%s»\n"
+msgstr "Дл� выходного файла требует�� динамиче�ка� библиотека `%s'\n"
 
 #: i386linux.c:462 m68klinux.c:466 sparclinux.c:460
 #, c-format
 msgid "Output file requires shared library `%s.so.%s'\n"
-msgstr "Дл� выходного файла требует�� обща� библиотека «%s.so.%s»\n"
+msgstr "Дл� выходного файла требует�� динамиче�ка� библиотека `%s.so.%s'\n"
 
 #: i386linux.c:651 i386linux.c:701 m68klinux.c:658 m68klinux.c:706
 #: sparclinux.c:650 sparclinux.c:700
@@ -3248,7 +3095,7 @@ msgstr "%s: Ñ�лишком длиннаÑ� Ñ�трока (%d Ñ�имволов, мÐ
 #: ieee.c:286
 #, c-format
 msgid "%s: unrecognized symbol `%s' flags 0x%x"
-msgstr "%s: нера�познанные флаги �имвола «%s» (0x%x)"
+msgstr "%s: нера�познанные флаги �имвола `%s' (0x%x)"
 
 #: ieee.c:792
 msgid "%B: unimplemented ATI record %u for symbol %u"
@@ -3264,7 +3111,7 @@ msgstr "%B: неожиданный тип по�ле ATN"
 
 #: ihex.c:230
 msgid "%B:%d: unexpected character `%s' in Intel Hex file"
-msgstr "%B:%d: неожиданный �имвол «%s» в Intel Hex файле"
+msgstr "%B:%d: неожиданный �имвол `%s' в Intel Hex файле"
 
 #: ihex.c:337
 msgid "%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"
@@ -3307,144 +3154,86 @@ msgstr "%s: адреÑ� 0x%s вне диапазона длÑ� Intel Hex файлÐ
 msgid "%B: unable to get decompressed section %A"
 msgstr "Ошибка в dwarf: не удало�ь получить ра�жатый раздел %A"
 
-#: libbfd.c:1043
+#: libbfd.c:1027
 #, c-format
 msgid "Deprecated %s called at %s line %d in %s\n"
 msgstr "Вызван нерекомендуемый %s р�дом � %s в �троке %d в %s\n"
 
-#: libbfd.c:1046
+#: libbfd.c:1030
 #, c-format
 msgid "Deprecated %s called\n"
 msgstr "Вызван нерекомендуемый %s\n"
 
-#: linker.c:1859
+#: linker.c:1911
 msgid "%B: indirect symbol `%s' to `%s' is a loop"
-msgstr "%B: ко�венный �имвол «%s» к «%s» �оздаёт зацикливание"
+msgstr "%B: ко�венный �имвол `%s' к `%s' �оздаёт зацикливание"
 
-#: linker.c:2726
+#: linker.c:2778
 #, c-format
 msgid "Attempt to do relocatable link with %s input and %s output"
 msgstr "Попытка �делать перемещаемую ��ылку � входом %s и выходом %s"
 
-#: linker.c:3053
+#: linker.c:3105
 msgid "%B: warning: ignoring duplicate section `%A'\n"
-msgstr "%B: предупреждение: игнорирует�� повтор�ющий�� раздел «%A»\n"
+msgstr "%B: предупреждение: игнорирует�� повтор�ющий�� раздел `%A'\n"
 
-#: linker.c:3067
+#: linker.c:3119
 msgid "%B: warning: duplicate section `%A' has different size\n"
-msgstr "%B: предупреждение: повтор�ющий�� раздел «%A» имеет другой размер\n"
-
-#: mach-o.c:381
-msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
-msgstr "bfd_mach_o_canonicalize_symtab: невозможно загрузить �имволы"
-
-#: mach-o.c:1253
-#, c-format
-msgid "unable to write unknown load command 0x%lx"
-msgstr "невозможно запи�ать неизве�тную команду загрузки 0x%lx"
-
-#: mach-o.c:1654
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"
-msgstr "bfd_mach_o_read_symtab_symbol: невозможно прочитать %d байт из %lu"
+msgstr "%B: предупреждение: повтор�ющий�� раздел `%A' имеет другой размер\n"
 
-#: mach-o.c:1671
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"
-msgstr "bfd_mach_o_read_symtab_symbol: им� �имвола вне диапазона (%lu >= %lu)"
-
-#: mach-o.c:1756
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: �имвол «%s» указывает на неверный раздел %d (мак�имальное значение %lu): на�тройка не определена"
-
-#: mach-o.c:1764
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: �имвол «%s» �вл�ет�� неподдерживаемой «не�вной» ��ылкой: на�тройка не определена"
-
-#: mach-o.c:1770
-#, c-format
-msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x%x: setting to undefined"
-msgstr "bfd_mach_o_read_symtab_symbol: �имвол «%s» указывает на неверный тип пол� 0x%x: на�тройка не определена"
-
-#: mach-o.c:1840
-msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"
-msgstr "bfd_mach_o_read_symtab_symbols: невозможно выделить пам�ть дл� �имволов"
-
-#: mach-o.c:1874
-#, c-format
-msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"
-msgstr "bfd_mach_o_read_dysymtab_symbol: невозможно прочитать %lu байт из %lu"
-
-#: mach-o.c:2556
-#, c-format
-msgid "unable to read unknown load command 0x%lx"
-msgstr "невозможно прочитать неизве�тную команду загрузки 0x%lx"
-
-#: mach-o.c:2736
-#, c-format
-msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
-msgstr "bfd_mach_o_scan: неизве�тна� архитектура 0x%lx/0x%lx"
-
-#: mach-o.c:2832
-#, c-format
-msgid "unknown header byte-order value 0x%lx"
-msgstr "неизве�тное значение пор�дка байт в заголовке 0x%lx"
-
-#: mach-o.c:3402
+#: mach-o.c:3403
 msgid "Mach-O header:\n"
 msgstr "заголовок Mach-O:\n"
 
-#: mach-o.c:3403
+#: mach-o.c:3404
 #, c-format
 msgid " magic     : %08lx\n"
 msgstr " отл.призн : %08lx\n"
 
-#: mach-o.c:3404
+#: mach-o.c:3405
 #, c-format
 msgid " cputype   : %08lx (%s)\n"
 msgstr " тип ЦП    : %08lx (%s)\n"
 
-#: mach-o.c:3406
+#: mach-o.c:3407
 #, c-format
 msgid " cpusubtype: %08lx\n"
 msgstr " подтип ЦП : %08lx\n"
 
-#: mach-o.c:3407
+#: mach-o.c:3408
 #, c-format
 msgid " filetype  : %08lx (%s)\n"
 msgstr " тип файла : %08lx (%s)\n"
 
-#: mach-o.c:3410
+#: mach-o.c:3411
 #, c-format
 msgid " ncmds     : %08lx (%lu)\n"
 msgstr " ч_кмнд    : %08lx (%lu)\n"
 
-#: mach-o.c:3411
+#: mach-o.c:3412
 #, c-format
 msgid " sizeofcmds: %08lx\n"
 msgstr " разм_кмнд : %08lx\n"
 
-#: mach-o.c:3412
+#: mach-o.c:3413
 #, c-format
 msgid " flags     : %08lx ("
 msgstr " флаги     : %08lx ("
 
-#: mach-o.c:3414 vms-alpha.c:7671
+#: mach-o.c:3415 vms-alpha.c:7652
 msgid ")\n"
 msgstr ")\n"
 
-#: mach-o.c:3415
+#: mach-o.c:3416
 #, c-format
 msgid " reserved  : %08x\n"
 msgstr " зарезерв  : %08x\n"
 
-#: mach-o.c:3425
+#: mach-o.c:3426
 msgid "Segments and Sections:\n"
 msgstr "Сегменты и разделы:\n"
 
-#: mach-o.c:3426
+#: mach-o.c:3427
 msgid " #: Segment name     Section name     Address\n"
 msgstr ""
 " #: Segment name     Section name     Address\n"
@@ -3468,17 +3257,17 @@ msgstr "%s: �ет о�новани� дл� выделени� �имвольн
 #: mmo.c:1187
 #, c-format
 msgid "%s: invalid mmo file: initialization value for $255 is not `Main'\n"
-msgstr "%s: недопу�тимый mmo-файл: инициализационное значение дл� $255 не равно «Main»\n"
+msgstr "%s: недопу�тимый mmo-файл: инициализационное значение дл� $255 не равно `Main'\n"
 
 #: mmo.c:1332
 #, c-format
 msgid "%s: unsupported wide character sequence 0x%02X 0x%02X after symbol name starting with `%s'\n"
-msgstr "%s: неподдерживаема� по�ледовательно�ть широких �имволов 0x%02X 0x%02X по�ле имени �имвола, начинающего�� � «%s»\n"
+msgstr "%s: неподдерживаема� по�ледовательно�ть широких �имволов 0x%02X 0x%02X по�ле имени �имвола, начинающего�� � `%s'\n"
 
 #: mmo.c:1565
 #, c-format
 msgid "%s: invalid mmo file: unsupported lopcode `%d'\n"
-msgstr "%s: недопу�тимый mmo-файл: неподдерживаемый lopcode «%d»\n"
+msgstr "%s: недопу�тимый mmo-файл: неподдерживаемый lopcode `%d'\n"
 
 #: mmo.c:1575
 #, c-format
@@ -3518,7 +3307,7 @@ msgstr "%s: невозможно выделить меÑ�то длÑ� имени Ñ
 #: mmo.c:1771
 #, c-format
 msgid "%s: invalid mmo file: file number %d `%s', was already entered as `%s'\n"
-msgstr "%s: недопу�тимый mmo-файл: номер файла %d «%s», был уже введён как «%s»\n"
+msgstr "%s: недопу�тимый mmo-файл: номер файла %d `%s', был уже введён как `%s'\n"
 
 #: mmo.c:1784
 #, c-format
@@ -3543,17 +3332,17 @@ msgstr "%s: недопу�тимый mmo-файл: YZ в lop_end (%ld) не ра
 #: mmo.c:2649
 #, c-format
 msgid "%s: invalid symbol table: duplicate symbol `%s'\n"
-msgstr "%s: ошибка в таблице �имволов: повтор�ющий�� �имвол «%s»\n"
+msgstr "%s: ошибка в таблице �имволов: повтор�ющий�� �имвол `%s'\n"
 
 #: mmo.c:2889
 #, c-format
 msgid "%s: Bad symbol definition: `Main' set to %s rather than the start address %s\n"
-msgstr "%s: �еверное определение �имвола: «Main» у�тановлена в %s, а не в начальный адре� %s\n"
+msgstr "%s: �еверное определение �имвола: `Main' у�тановлена в %s, а не в начальный адре� %s\n"
 
 #: mmo.c:2981
 #, c-format
 msgid "%s: warning: symbol table too large for mmo, larger than 65535 32-bit words: %d.  Only `Main' will be emitted.\n"
-msgstr "%s: предупреждение: таблица �имволов �лишком больша� дл� mmo, больше чем 65535 32-битных �лов: %d. Будет выделена только «Main».\n"
+msgstr "%s: предупреждение: таблица �имволов �лишком больша� дл� mmo, больше чем 65535 32-битных �лов: %d. Будет выделена только `Main'.\n"
 
 #: mmo.c:3026
 #, c-format
@@ -3583,7 +3372,7 @@ msgstr "%s: недопу�тимый начальный адре� дл� ини
 #: oasys.c:882
 #, c-format
 msgid "%s: can not represent section `%s' in oasys"
-msgstr "%s: невозможно пред�тавить раздел «%s» в oasys"
+msgstr "%s: невозможно пред�тавить раздел `%s' в oasys"
 
 #: osf-core.c:140
 #, c-format
@@ -3592,7 +3381,7 @@ msgstr "Ð�еобработанный файл Ñ�дра OSF/1 раздела Ñ� Ñ
 
 #: pe-mips.c:607
 msgid "%B: `ld -r' not supported with PE MIPS objects\n"
-msgstr "%B: «ld -r» не поддерживает�� � объектами PE MIPS\n"
+msgstr "%B: `ld -r' не поддерживает�� � объектами PE MIPS\n"
 
 #. OK, at this point the following variables are set up:
 #. src = VMA of the memory we're fixing up
@@ -3610,11 +3399,6 @@ msgstr "%B: точка перехода �лишком далеко\n"
 msgid "%B: bad pair/reflo after refhi\n"
 msgstr "%B: неверна� pair/reflo по�ле refhi\n"
 
-#: pef.c:519
-#, c-format
-msgid "bfd_pef_scan: unknown architecture 0x%lx"
-msgstr "bfd_pef_scan: неизве�тна� архитектура 0x%lx"
-
 #: pei-x86_64.c:444
 #, c-format
 msgid "warning: .pdata section size (%ld) is not a multiple of %d\n"
@@ -3717,11 +3501,6 @@ msgstr "Сектор раздела[%d]  = 0x%.8lx (%ld)\n"
 msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
 msgstr "Длина раздела[%d]   = 0x%.8lx (%ld)\n"
 
-#: rs6000-core.c:448
-#, c-format
-msgid "%s: warning core file truncated"
-msgstr "%s: предупреждение: файл core у�ечён"
-
 #: som.c:5471
 #, c-format
 msgid ""
@@ -3737,7 +3516,7 @@ msgstr "som_sizeof_headers не реализован"
 
 #: srec.c:261
 msgid "%B:%d: Unexpected character `%s' in S-record file\n"
-msgstr "%B:%d: �еожиданный �имвол «%s» в файле S-record\n"
+msgstr "%B:%d: �еожиданный �имвол `%s' в файле S-record\n"
 
 #: srec.c:567 srec.c:600
 msgid "%B:%d: Bad checksum in S-record file\n"
@@ -3751,32 +3530,32 @@ msgstr "%B(%A+0x%lx): Элемент Stabs имеет недопуÑ�тимый Ð
 msgid "Unsupported .stab relocation"
 msgstr "�еподдерживаемое перемещение .stab"
 
-#: vms-alpha.c:1299
+#: vms-alpha.c:1287
 #, c-format
 msgid "Unknown EGSD subtype %d"
 msgstr "�еизве�тный подтип EGSD %d"
 
-#: vms-alpha.c:1330
+#: vms-alpha.c:1318
 #, c-format
 msgid "Stack overflow (%d) in _bfd_vms_push"
 msgstr "Переполнение �тека (%d) в _bfd_vms_push"
 
-#: vms-alpha.c:1343
+#: vms-alpha.c:1331
 msgid "Stack underflow in _bfd_vms_pop"
 msgstr "Выход за нижнюю границу �тека в _bfd_vms_pop"
 
 #. These names have not yet been added to this switch statement.
-#: vms-alpha.c:1580
+#: vms-alpha.c:1568
 #, c-format
 msgid "unknown ETIR command %d"
 msgstr "неизве�тна� ETIR команда %d"
 
-#: vms-alpha.c:1767
+#: vms-alpha.c:1755
 #, c-format
 msgid "bad section index in %s"
 msgstr "неверный индек� раздела в %s"
 
-#: vms-alpha.c:1780
+#: vms-alpha.c:1768
 #, c-format
 msgid "unsupported STA cmd %s"
 msgstr "неподдерживаемый STA cmd %s"
@@ -3786,1389 +3565,1389 @@ msgstr "неподдерживаемый STA cmd %s"
 #. Rotate.
 #. Redefine symbol to current location.
 #. Define a literal.
-#: vms-alpha.c:1956 vms-alpha.c:1987 vms-alpha.c:2234
+#: vms-alpha.c:1944 vms-alpha.c:1975 vms-alpha.c:2222
 #, c-format
 msgid "%s: not supported"
 msgstr "%s: не поддерживает��"
 
-#: vms-alpha.c:1962
+#: vms-alpha.c:1950
 #, c-format
 msgid "%s: not implemented"
 msgstr "%s: не реализовано"
 
-#: vms-alpha.c:2218
+#: vms-alpha.c:2206
 #, c-format
 msgid "invalid use of %s with contexts"
 msgstr "неправильное и�пользование %s � контек�тами"
 
-#: vms-alpha.c:2252
+#: vms-alpha.c:2240
 #, c-format
 msgid "reserved cmd %d"
 msgstr "зарезервированный cmd %d"
 
-#: vms-alpha.c:2337
+#: vms-alpha.c:2325
 msgid "Object module NOT error-free !\n"
 msgstr "Объектный модуль �Е error-free !\n"
 
-#: vms-alpha.c:2766
+#: vms-alpha.c:2754
 #, c-format
 msgid "Symbol %s replaced by %s\n"
 msgstr "Символ %s заменён на %s\n"
 
-#: vms-alpha.c:3769
+#: vms-alpha.c:3757
 #, c-format
 msgid "SEC_RELOC with no relocs in section %s"
 msgstr "SEC_RELOC без перемещений в разделе %s"
 
-#: vms-alpha.c:3822 vms-alpha.c:4053
+#: vms-alpha.c:3810 vms-alpha.c:4041
 #, c-format
 msgid "Size error in section %s"
 msgstr "Ошибка размера в разделе %s"
 
-#: vms-alpha.c:3992
+#: vms-alpha.c:3980
 msgid "Spurious ALPHA_R_BSR reloc"
 msgstr "�етипичное перемещение ALPHA_R_BSR"
 
-#: vms-alpha.c:4040
+#: vms-alpha.c:4028
 #, c-format
 msgid "Unhandled relocation %s"
 msgstr "�еобработанное перемещение %s"
 
-#: vms-alpha.c:4330
+#: vms-alpha.c:4318
 #, c-format
 msgid "unknown source command %d"
 msgstr "неизве�тна� и�ходна� команда %d"
 
-#: vms-alpha.c:4391
+#: vms-alpha.c:4379
 msgid "DST__K_SET_LINUM_INCR not implemented"
 msgstr "DST__K_SET_LINUM_INCR не реализован"
 
-#: vms-alpha.c:4397
+#: vms-alpha.c:4385
 msgid "DST__K_SET_LINUM_INCR_W not implemented"
 msgstr "DST__K_SET_LINUM_INCR_W не реализован"
 
-#: vms-alpha.c:4403
+#: vms-alpha.c:4391
 msgid "DST__K_RESET_LINUM_INCR not implemented"
 msgstr "DST__K_RESET_LINUM_INCR не реализован"
 
-#: vms-alpha.c:4409
+#: vms-alpha.c:4397
 msgid "DST__K_BEG_STMT_MODE not implemented"
 msgstr "DST__K_BEG_STMT_MODE не реализован"
 
-#: vms-alpha.c:4415
+#: vms-alpha.c:4403
 msgid "DST__K_END_STMT_MODE not implemented"
 msgstr "DST__K_END_STMT_MODE не реализован"
 
-#: vms-alpha.c:4442
+#: vms-alpha.c:4430
 msgid "DST__K_SET_PC not implemented"
 msgstr "DST__K_SET_PC не реализован"
 
-#: vms-alpha.c:4448
+#: vms-alpha.c:4436
 msgid "DST__K_SET_PC_W not implemented"
 msgstr "DST__K_SET_PC_W не реализован"
 
-#: vms-alpha.c:4454
+#: vms-alpha.c:4442
 msgid "DST__K_SET_PC_L not implemented"
 msgstr "DST__K_SET_PC_L не реализован"
 
-#: vms-alpha.c:4460
+#: vms-alpha.c:4448
 msgid "DST__K_SET_STMTNUM not implemented"
 msgstr "DST__K_SET_STMTNUM не реализован"
 
-#: vms-alpha.c:4503
+#: vms-alpha.c:4491
 #, c-format
 msgid "unknown line command %d"
 msgstr "неизве�тна� �трока команды %d"
 
-#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003
-#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038
+#: vms-alpha.c:4938 vms-alpha.c:4955 vms-alpha.c:4969 vms-alpha.c:4984
+#: vms-alpha.c:4996 vms-alpha.c:5007 vms-alpha.c:5019
 #, c-format
 msgid "Unknown reloc %s + %s"
 msgstr "�еизве�тное перемещение %s + %s"
 
-#: vms-alpha.c:5093
+#: vms-alpha.c:5074
 #, c-format
 msgid "Unknown reloc %s"
 msgstr "�еизве�тное перемещение %s"
 
-#: vms-alpha.c:5106
+#: vms-alpha.c:5087
 msgid "Invalid section index in ETIR"
 msgstr "�еверный индек� раздела в ETIR"
 
-#: vms-alpha.c:5153
+#: vms-alpha.c:5134
 #, c-format
 msgid "Unknown symbol in command %s"
 msgstr "�еизве�тный �имвол в команде %s"
 
-#: vms-alpha.c:5668
+#: vms-alpha.c:5649
 #, c-format
 msgid "  EMH %u (len=%u): "
 msgstr "  EMH %u (len=%u): "
 
-#: vms-alpha.c:5677
+#: vms-alpha.c:5658
 #, c-format
 msgid "Module header\n"
 msgstr "Заголовок модул�\n"
 
-#: vms-alpha.c:5678
+#: vms-alpha.c:5659
 #, c-format
 msgid "   structure level: %u\n"
 msgstr "   уровень �труктуры  : %u\n"
 
-#: vms-alpha.c:5679
+#: vms-alpha.c:5660
 #, c-format
 msgid "   max record size: %u\n"
 msgstr "   мак�. размер запи�и: %u\n"
 
-#: vms-alpha.c:5682
+#: vms-alpha.c:5663
 #, c-format
 msgid "   module name    : %.*s\n"
 msgstr "   им� модул�         : %.*s\n"
 
-#: vms-alpha.c:5684
+#: vms-alpha.c:5665
 #, c-format
 msgid "   module version : %.*s\n"
 msgstr "   вер�и� модул�      : %.*s\n"
 
-#: vms-alpha.c:5686
+#: vms-alpha.c:5667
 #, c-format
 msgid "   compile date   : %.17s\n"
 msgstr "   дата компил�ции    : %.17s\n"
 
-#: vms-alpha.c:5691
+#: vms-alpha.c:5672
 #, c-format
 msgid "Language Processor Name\n"
 msgstr "�азвание проце��орного �зыка\n"
 
-#: vms-alpha.c:5692
+#: vms-alpha.c:5673
 #, c-format
 msgid "   language name: %.*s\n"
 msgstr "   название �зыка     : %.*s\n"
 
-#: vms-alpha.c:5699
+#: vms-alpha.c:5680
 #, c-format
 msgid "Source Files Header\n"
 msgstr "Заголовок и�ходных файлов\n"
 
-#: vms-alpha.c:5700
+#: vms-alpha.c:5681
 #, c-format
 msgid "   file: %.*s\n"
 msgstr "   файл: %.*s\n"
 
-#: vms-alpha.c:5707
+#: vms-alpha.c:5688
 #, c-format
 msgid "Title Text Header\n"
 msgstr "Заголовок названи� тек�та\n"
 
-#: vms-alpha.c:5708
+#: vms-alpha.c:5689
 #, c-format
 msgid "   title: %.*s\n"
 msgstr "   название : %.*s\n"
 
-#: vms-alpha.c:5715
+#: vms-alpha.c:5696
 #, c-format
 msgid "Copyright Header\n"
 msgstr "Заголовок автор�кого права\n"
 
-#: vms-alpha.c:5716
+#: vms-alpha.c:5697
 #, c-format
 msgid "   copyright: %.*s\n"
 msgstr "   автор�кое право: %.*s\n"
 
-#: vms-alpha.c:5722
+#: vms-alpha.c:5703
 #, c-format
 msgid "unhandled emh subtype %u\n"
 msgstr "необработанный подтип emh %u\n"
 
-#: vms-alpha.c:5732
+#: vms-alpha.c:5713
 #, c-format
 msgid "  EEOM (len=%u):\n"
 msgstr "  EEOM (len=%u):\n"
 
-#: vms-alpha.c:5733
+#: vms-alpha.c:5714
 #, c-format
 msgid "   number of cond linkage pairs: %u\n"
 msgstr "   кол-во у�ловно компонуемых пар: %u\n"
 
-#: vms-alpha.c:5735
+#: vms-alpha.c:5716
 #, c-format
 msgid "   completion code: %u\n"
 msgstr "   завершённый код: %u\n"
 
-#: vms-alpha.c:5739
+#: vms-alpha.c:5720
 #, c-format
 msgid "   transfer addr flags: 0x%02x\n"
 msgstr "   адре�а передачи flags: 0x%02x\n"
 
-#: vms-alpha.c:5740
+#: vms-alpha.c:5721
 #, c-format
 msgid "   transfer addr psect: %u\n"
 msgstr "   адре� передачи psect: %u\n"
 
-#: vms-alpha.c:5742
+#: vms-alpha.c:5723
 #, c-format
 msgid "   transfer address   : 0x%08x\n"
 msgstr "   адре� передачи   : 0x%08x\n"
 
-#: vms-alpha.c:5751
+#: vms-alpha.c:5732
 msgid " WEAK"
 msgstr " WEAK"
 
-#: vms-alpha.c:5753
+#: vms-alpha.c:5734
 msgid " DEF"
 msgstr " DEF"
 
-#: vms-alpha.c:5755
+#: vms-alpha.c:5736
 msgid " UNI"
 msgstr " UNI"
 
-#: vms-alpha.c:5757 vms-alpha.c:5778
+#: vms-alpha.c:5738 vms-alpha.c:5759
 msgid " REL"
 msgstr " REL"
 
-#: vms-alpha.c:5759
+#: vms-alpha.c:5740
 msgid " COMM"
 msgstr " COMM"
 
-#: vms-alpha.c:5761
+#: vms-alpha.c:5742
 msgid " VECEP"
 msgstr " VECEP"
 
-#: vms-alpha.c:5763
+#: vms-alpha.c:5744
 msgid " NORM"
 msgstr " NORM"
 
-#: vms-alpha.c:5765
+#: vms-alpha.c:5746
 msgid " QVAL"
 msgstr " QVAL"
 
-#: vms-alpha.c:5772
+#: vms-alpha.c:5753
 msgid " PIC"
 msgstr " PIC"
 
-#: vms-alpha.c:5774
+#: vms-alpha.c:5755
 msgid " LIB"
 msgstr " LIB"
 
-#: vms-alpha.c:5776
+#: vms-alpha.c:5757
 msgid " OVR"
 msgstr " OVR"
 
-#: vms-alpha.c:5780
+#: vms-alpha.c:5761
 msgid " GBL"
 msgstr " GBL"
 
-#: vms-alpha.c:5782
+#: vms-alpha.c:5763
 msgid " SHR"
 msgstr " SHR"
 
-#: vms-alpha.c:5784
+#: vms-alpha.c:5765
 msgid " EXE"
 msgstr " EXE"
 
-#: vms-alpha.c:5786
+#: vms-alpha.c:5767
 msgid " RD"
 msgstr " RD"
 
-#: vms-alpha.c:5788
+#: vms-alpha.c:5769
 msgid " WRT"
 msgstr " WRT"
 
-#: vms-alpha.c:5790
+#: vms-alpha.c:5771
 msgid " VEC"
 msgstr " VEC"
 
-#: vms-alpha.c:5792
+#: vms-alpha.c:5773
 msgid " NOMOD"
 msgstr " NOMOD"
 
-#: vms-alpha.c:5794
+#: vms-alpha.c:5775
 msgid " COM"
 msgstr " COM"
 
-#: vms-alpha.c:5796
+#: vms-alpha.c:5777
 msgid " 64B"
 msgstr " 64B"
 
-#: vms-alpha.c:5805
+#: vms-alpha.c:5786
 #, c-format
 msgid "  EGSD (len=%u):\n"
 msgstr "  EGSD (len=%u):\n"
 
-#: vms-alpha.c:5817
+#: vms-alpha.c:5798
 #, c-format
 msgid "  EGSD entry %2u (type: %u, len: %u): "
 msgstr "  запи�ь EGSD %2u (тип: %u, длина: %u): "
 
-#: vms-alpha.c:5829
+#: vms-alpha.c:5810
 #, c-format
 msgid "PSC - Program section definition\n"
 msgstr "PSC - определение программного раздела\n"
 
-#: vms-alpha.c:5830 vms-alpha.c:5847
+#: vms-alpha.c:5811 vms-alpha.c:5828
 #, c-format
 msgid "   alignment  : 2**%u\n"
 msgstr "   выравнивание  : 2**%u\n"
 
-#: vms-alpha.c:5831 vms-alpha.c:5848
+#: vms-alpha.c:5812 vms-alpha.c:5829
 #, c-format
 msgid "   flags      : 0x%04x"
 msgstr "   флаги      : 0x%04x"
 
-#: vms-alpha.c:5835
+#: vms-alpha.c:5816
 #, c-format
 msgid "   alloc (len): %u (0x%08x)\n"
 msgstr "   alloc (len): %u (0x%08x)\n"
 
-#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942
+#: vms-alpha.c:5817 vms-alpha.c:5874 vms-alpha.c:5923
 #, c-format
 msgid "   name       : %.*s\n"
 msgstr "   им�       : %.*s\n"
 
-#: vms-alpha.c:5846
+#: vms-alpha.c:5827
 #, c-format
 msgid "SPSC - Shared Image Program section def\n"
-msgstr "SPSC — определение программного раздела общего образа\n"
+msgstr "SPSC - определение программного раздела общего образа\n"
 
-#: vms-alpha.c:5852
+#: vms-alpha.c:5833
 #, c-format
 msgid "   alloc (len)   : %u (0x%08x)\n"
 msgstr "   alloc (len)   : %u (0x%08x)\n"
 
-#: vms-alpha.c:5853
+#: vms-alpha.c:5834
 #, c-format
 msgid "   image offset  : 0x%08x\n"
 msgstr "   �мещение образа : 0x%08x\n"
 
-#: vms-alpha.c:5855
+#: vms-alpha.c:5836
 #, c-format
 msgid "   symvec offset : 0x%08x\n"
 msgstr "   �мещение symvec: 0x%08x\n"
 
-#: vms-alpha.c:5857
+#: vms-alpha.c:5838
 #, c-format
 msgid "   name          : %.*s\n"
 msgstr "   им�          : %.*s\n"
 
-#: vms-alpha.c:5870
+#: vms-alpha.c:5851
 #, c-format
 msgid "SYM - Global symbol definition\n"
 msgstr "SYM - определение глобальных �имволов\n"
 
-#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971
+#: vms-alpha.c:5852 vms-alpha.c:5912 vms-alpha.c:5933 vms-alpha.c:5952
 #, c-format
 msgid "   flags: 0x%04x"
 msgstr "   флаги: 0x%04x"
 
-#: vms-alpha.c:5874
+#: vms-alpha.c:5855
 #, c-format
 msgid "   psect offset: 0x%08x\n"
 msgstr "   �мещение psect: 0x%08x\n"
 
-#: vms-alpha.c:5878
+#: vms-alpha.c:5859
 #, c-format
 msgid "   code address: 0x%08x\n"
 msgstr "   адре� кода: 0x%08x\n"
 
-#: vms-alpha.c:5880
+#: vms-alpha.c:5861
 #, c-format
 msgid "   psect index for entry point : %u\n"
 msgstr "   индек� psect дл� точки входа: %u\n"
 
-#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978
+#: vms-alpha.c:5864 vms-alpha.c:5940 vms-alpha.c:5959
 #, c-format
 msgid "   psect index : %u\n"
 msgstr "   индек� psect: %u\n"
 
-#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980
+#: vms-alpha.c:5866 vms-alpha.c:5942 vms-alpha.c:5961
 #, c-format
 msgid "   name        : %.*s\n"
 msgstr "   им�        : %.*s\n"
 
-#: vms-alpha.c:5892
+#: vms-alpha.c:5873
 #, c-format
 msgid "SYM - Global symbol reference\n"
 msgstr "SYM - ��ылки глобальных �имволов\n"
 
-#: vms-alpha.c:5904
+#: vms-alpha.c:5885
 #, c-format
 msgid "IDC - Ident Consistency check\n"
 msgstr "IDC - проверка идентификатора цело�тно�ти\n"
 
-#: vms-alpha.c:5905
+#: vms-alpha.c:5886
 #, c-format
 msgid "   flags         : 0x%08x"
 msgstr "   флаги         : 0x%08x"
 
-#: vms-alpha.c:5909
+#: vms-alpha.c:5890
 #, c-format
 msgid "   id match      : %x\n"
 msgstr "   id �оответ�тви� : %x\n"
 
-#: vms-alpha.c:5911
+#: vms-alpha.c:5892
 #, c-format
 msgid "   error severity: %x\n"
 msgstr "   �ерьёзно�ть ошибки: %x\n"
 
-#: vms-alpha.c:5914
+#: vms-alpha.c:5895
 #, c-format
 msgid "   entity name   : %.*s\n"
 msgstr "   название категории: %.*s\n"
 
-#: vms-alpha.c:5916
+#: vms-alpha.c:5897
 #, c-format
 msgid "   object name   : %.*s\n"
 msgstr "   им� объекта: %.*s\n"
 
-#: vms-alpha.c:5919
+#: vms-alpha.c:5900
 #, c-format
 msgid "   binary ident  : 0x%08x\n"
 msgstr "   двоичный идентификатор: 0x%08x\n"
 
-#: vms-alpha.c:5922
+#: vms-alpha.c:5903
 #, c-format
 msgid "   ascii ident   : %.*s\n"
 msgstr "   ascii-идентификатор: %.*s\n"
 
-#: vms-alpha.c:5930
+#: vms-alpha.c:5911
 #, c-format
 msgid "SYMG - Universal symbol definition\n"
 msgstr "SYMG - определение универ�альных �имволов\n"
 
-#: vms-alpha.c:5934
+#: vms-alpha.c:5915
 #, c-format
 msgid "   symbol vector offset: 0x%08x\n"
 msgstr "   �мещение �имвольного вектора: 0x%08x\n"
 
-#: vms-alpha.c:5936
+#: vms-alpha.c:5917
 #, c-format
 msgid "   entry point: 0x%08x\n"
 msgstr "   точка входа: 0x%08x\n"
 
-#: vms-alpha.c:5938
+#: vms-alpha.c:5919
 #, c-format
 msgid "   proc descr : 0x%08x\n"
 msgstr "   proc descr : 0x%08x\n"
 
-#: vms-alpha.c:5940
+#: vms-alpha.c:5921
 #, c-format
 msgid "   psect index: %u\n"
 msgstr "   индек� psect: %u\n"
 
-#: vms-alpha.c:5951
+#: vms-alpha.c:5932
 #, c-format
 msgid "SYMV - Vectored symbol definition\n"
 msgstr "SYMV - определение векторных �имволов\n"
 
-#: vms-alpha.c:5955
+#: vms-alpha.c:5936
 #, c-format
 msgid "   vector      : 0x%08x\n"
 msgstr "   вектор      : 0x%08x\n"
 
-#: vms-alpha.c:5957 vms-alpha.c:5976
+#: vms-alpha.c:5938 vms-alpha.c:5957
 #, c-format
 msgid "   psect offset: %u\n"
 msgstr "   �мещение psect: %u\n"
 
-#: vms-alpha.c:5970
+#: vms-alpha.c:5951
 #, c-format
 msgid "SYMM - Global symbol definition with version\n"
 msgstr "SYMM - определение глобальных �имволов � вер�ией\n"
 
-#: vms-alpha.c:5974
+#: vms-alpha.c:5955
 #, c-format
 msgid "   version mask: 0x%08x\n"
 msgstr "   ма�ка вер�ии: 0x%08x\n"
 
-#: vms-alpha.c:5985
+#: vms-alpha.c:5966
 #, c-format
 msgid "unhandled egsd entry type %u\n"
 msgstr "необработанный egsd-�лемент типа %u\n"
 
-#: vms-alpha.c:6019
+#: vms-alpha.c:6000
 #, c-format
 msgid "    linkage index: %u, replacement insn: 0x%08x\n"
 msgstr "    индек� компоновки: %u, заменитель insn: 0x%08x\n"
 
-#: vms-alpha.c:6022
+#: vms-alpha.c:6003
 #, c-format
 msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
 msgstr "    1-й индек� psect: %u, 1-е �мещение: 0x%08x %08x\n"
 
-#: vms-alpha.c:6026
+#: vms-alpha.c:6007
 #, c-format
 msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
 msgstr "    2-й индек� psect: %u, 2-е �мещение: 0x%08x %08x\n"
 
-#: vms-alpha.c:6031
+#: vms-alpha.c:6012
 #, c-format
 msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
 msgstr "    3-й индек� psect: %u, 3-е �мещение: 0x%08x %08x\n"
 
-#: vms-alpha.c:6036
+#: vms-alpha.c:6017
 #, c-format
 msgid "    global name: %.*s\n"
 msgstr "    глобальное им�: %.*s\n"
 
-#: vms-alpha.c:6046
+#: vms-alpha.c:6027
 #, c-format
 msgid "  %s (len=%u+%u):\n"
 msgstr "  %s (len=%u+%u):\n"
 
-#: vms-alpha.c:6061
+#: vms-alpha.c:6042
 #, c-format
 msgid "   (type: %3u, size: 4+%3u): "
 msgstr "   (тип: %3u, размер: 4+%3u): "
 
-#: vms-alpha.c:6065
+#: vms-alpha.c:6046
 #, c-format
 msgid "STA_GBL (stack global) %.*s\n"
 msgstr "STA_GBL (глобальный �тек) %.*s\n"
 
-#: vms-alpha.c:6069
+#: vms-alpha.c:6050
 #, c-format
 msgid "STA_LW (stack longword) 0x%08x\n"
 msgstr "STA_LW (�тек длинных �лов) 0x%08x\n"
 
-#: vms-alpha.c:6073
+#: vms-alpha.c:6054
 #, c-format
 msgid "STA_QW (stack quadword) 0x%08x %08x\n"
 msgstr "STA_QW (�тек четверных �лов) 0x%08x %08x\n"
 
-#: vms-alpha.c:6078
+#: vms-alpha.c:6059
 #, c-format
 msgid "STA_PQ (stack psect base + offset)\n"
 msgstr "STA_PQ (�тек psect база + �мещение)\n"
 
-#: vms-alpha.c:6079
+#: vms-alpha.c:6060
 #, c-format
 msgid "    psect: %u, offset: 0x%08x %08x\n"
 msgstr "    psect: %u, �мещение: 0x%08x %08x\n"
 
-#: vms-alpha.c:6085
+#: vms-alpha.c:6066
 #, c-format
 msgid "STA_LI (stack literal)\n"
 msgstr "STA_LI (�тек литерала)\n"
 
-#: vms-alpha.c:6088
+#: vms-alpha.c:6069
 #, c-format
 msgid "STA_MOD (stack module)\n"
 msgstr "STA_MOD (�тек модулей)\n"
 
-#: vms-alpha.c:6091
+#: vms-alpha.c:6072
 #, c-format
 msgid "STA_CKARG (compare procedure argument)\n"
 msgstr "STA_CKARG (аргумент процедуры �равнени�)\n"
 
-#: vms-alpha.c:6095
+#: vms-alpha.c:6076
 #, c-format
 msgid "STO_B (store byte)\n"
 msgstr "STO_B (хранимый байт)\n"
 
-#: vms-alpha.c:6098
+#: vms-alpha.c:6079
 #, c-format
 msgid "STO_W (store word)\n"
 msgstr "STO_W (хранимое �лово)\n"
 
-#: vms-alpha.c:6101
+#: vms-alpha.c:6082
 #, c-format
 msgid "STO_LW (store longword)\n"
 msgstr "STO_LW (хранимое длинное �лово)\n"
 
-#: vms-alpha.c:6104
+#: vms-alpha.c:6085
 #, c-format
 msgid "STO_QW (store quadword)\n"
 msgstr "STO_QW (хранимое учетверённое �лово)\n"
 
-#: vms-alpha.c:6110
+#: vms-alpha.c:6091
 #, c-format
 msgid "STO_IMMR (store immediate repeat) %u bytes\n"
 msgstr "STO_IMMR (хранимый непо�ред�твенный повтор) %u байт\n"
 
-#: vms-alpha.c:6117
+#: vms-alpha.c:6098
 #, c-format
 msgid "STO_GBL (store global) %.*s\n"
 msgstr "STO_GBL (хранима� глобальна�) %.*s\n"
 
-#: vms-alpha.c:6121
+#: vms-alpha.c:6102
 #, c-format
 msgid "STO_CA (store code address) %.*s\n"
 msgstr "STO_CA (хранимый адре� кода) %.*s\n"
 
-#: vms-alpha.c:6125
+#: vms-alpha.c:6106
 #, c-format
 msgid "STO_RB (store relative branch)\n"
-msgstr "STO_RB (хранимое отно�ительное ветвление)\n"
+msgstr "STO_RB (хранимый отно�ительный переход)\n"
 
-#: vms-alpha.c:6128
+#: vms-alpha.c:6109
 #, c-format
 msgid "STO_AB (store absolute branch)\n"
-msgstr "STO_AB (хранимое аб�олютное ветвление)\n"
+msgstr "STO_AB (хранимый аб�олютный переход)\n"
 
-#: vms-alpha.c:6131
+#: vms-alpha.c:6112
 #, c-format
 msgid "STO_OFF (store offset to psect)\n"
 msgstr "STO_OFF (хранимое �мещение на psect)\n"
 
-#: vms-alpha.c:6137
+#: vms-alpha.c:6118
 #, c-format
 msgid "STO_IMM (store immediate) %u bytes\n"
 msgstr "STO_IMM (хранима� непо�ред�твенно) %u байт\n"
 
-#: vms-alpha.c:6144
+#: vms-alpha.c:6125
 #, c-format
 msgid "STO_GBL_LW (store global longword) %.*s\n"
 msgstr "STO_GBL_LW (хранимое глобальное длинное �лово) %.*s\n"
 
-#: vms-alpha.c:6148
+#: vms-alpha.c:6129
 #, c-format
 msgid "STO_OFF (store LP with procedure signature)\n"
 msgstr "STO_OFF (хранимый LP � �игнатурой процедуры)\n"
 
-#: vms-alpha.c:6151
+#: vms-alpha.c:6132
 #, c-format
 msgid "STO_BR_GBL (store branch global) *todo*\n"
-msgstr "STO_BR_GBL (хранимое глобальное ветвление) *todo*\n"
+msgstr "STO_BR_GBL (хранимый глобальный переход) *todo*\n"
 
-#: vms-alpha.c:6154
+#: vms-alpha.c:6135
 #, c-format
 msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
-msgstr "STO_BR_PS (хранимое ветвление psect + �мещение) *todo*\n"
+msgstr "STO_BR_PS (хранимый переход psect + �мещение) *todo*\n"
 
-#: vms-alpha.c:6158
+#: vms-alpha.c:6139
 #, c-format
 msgid "OPR_NOP (no-operation)\n"
 msgstr "OPR_NOP (нет операции)\n"
 
-#: vms-alpha.c:6161
+#: vms-alpha.c:6142
 #, c-format
 msgid "OPR_ADD (add)\n"
 msgstr "OPR_ADD (�ложение)\n"
 
-#: vms-alpha.c:6164
+#: vms-alpha.c:6145
 #, c-format
 msgid "OPR_SUB (substract)\n"
 msgstr "OPR_SUB (вычитание)\n"
 
-#: vms-alpha.c:6167
+#: vms-alpha.c:6148
 #, c-format
 msgid "OPR_MUL (multiply)\n"
 msgstr "OPR_MUL (умножение)\n"
 
-#: vms-alpha.c:6170
+#: vms-alpha.c:6151
 #, c-format
 msgid "OPR_DIV (divide)\n"
 msgstr "OPR_DIV (деление)\n"
 
-#: vms-alpha.c:6173
+#: vms-alpha.c:6154
 #, c-format
 msgid "OPR_AND (logical and)\n"
 msgstr "OPR_AND (логиче�кое и)\n"
 
-#: vms-alpha.c:6176
+#: vms-alpha.c:6157
 #, c-format
 msgid "OPR_IOR (logical inclusive or)\n"
 msgstr "OPR_IOR (логиче�кое включающее или)\n"
 
-#: vms-alpha.c:6179
+#: vms-alpha.c:6160
 #, c-format
 msgid "OPR_EOR (logical exclusive or)\n"
 msgstr "OPR_EOR (логиче�кое не включающее или)\n"
 
-#: vms-alpha.c:6182
+#: vms-alpha.c:6163
 #, c-format
 msgid "OPR_NEG (negate)\n"
 msgstr "OPR_NEG (инвер�и�)\n"
 
-#: vms-alpha.c:6185
+#: vms-alpha.c:6166
 #, c-format
 msgid "OPR_COM (complement)\n"
 msgstr "OPR_COM (дополнение)\n"
 
-#: vms-alpha.c:6188
+#: vms-alpha.c:6169
 #, c-format
 msgid "OPR_INSV (insert field)\n"
 msgstr "OPR_INSV (поле в�тавки)\n"
 
-#: vms-alpha.c:6191
+#: vms-alpha.c:6172
 #, c-format
 msgid "OPR_ASH (arithmetic shift)\n"
 msgstr "OPR_ASH (арифметиче�кий �двиг)\n"
 
-#: vms-alpha.c:6194
+#: vms-alpha.c:6175
 #, c-format
 msgid "OPR_USH (unsigned shift)\n"
 msgstr "OPR_USH (беззнаковый �двиг)\n"
 
-#: vms-alpha.c:6197
+#: vms-alpha.c:6178
 #, c-format
 msgid "OPR_ROT (rotate)\n"
 msgstr "OPR_ROT (цикличе�кий �двиг)\n"
 
-#: vms-alpha.c:6200
+#: vms-alpha.c:6181
 #, c-format
 msgid "OPR_SEL (select)\n"
 msgstr "OPR_SEL (выбор)\n"
 
-#: vms-alpha.c:6203
+#: vms-alpha.c:6184
 #, c-format
 msgid "OPR_REDEF (redefine symbol to curr location)\n"
 msgstr "OPR_REDEF (переопределение �имвола в текущей позиции)\n"
 
-#: vms-alpha.c:6206
+#: vms-alpha.c:6187
 #, c-format
 msgid "OPR_REDEF (define a literal)\n"
 msgstr "OPR_REDEF (определение литерала)\n"
 
-#: vms-alpha.c:6210
+#: vms-alpha.c:6191
 #, c-format
 msgid "STC_LP (store cond linkage pair)\n"
 msgstr "STC_LP (хранима� у�ловно компонуема� пара)\n"
 
-#: vms-alpha.c:6214
+#: vms-alpha.c:6195
 #, c-format
 msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
 msgstr "STC_LP_PSB (хранима� у�ловно компонуема� пара + �игнатура)\n"
 
-#: vms-alpha.c:6215
+#: vms-alpha.c:6196
 #, c-format
 msgid "   linkage index: %u, procedure: %.*s\n"
 msgstr "   индек� компоновки: %u, процедура: %.*s\n"
 
-#: vms-alpha.c:6218
+#: vms-alpha.c:6199
 #, c-format
 msgid "   signature: %.*s\n"
 msgstr "   �игнатура: %.*s\n"
 
-#: vms-alpha.c:6221
+#: vms-alpha.c:6202
 #, c-format
 msgid "STC_GBL (store cond global)\n"
 msgstr "STC_GBL (хранима� глобальное у�ловие)\n"
 
-#: vms-alpha.c:6222
+#: vms-alpha.c:6203
 #, c-format
 msgid "   linkage index: %u, global: %.*s\n"
 msgstr "   индек� компоновки: %u, глобальный: %.*s\n"
 
-#: vms-alpha.c:6226
+#: vms-alpha.c:6207
 #, c-format
 msgid "STC_GCA (store cond code address)\n"
 msgstr "STC_GCA (хранимый адре� у�ловного кода)\n"
 
-#: vms-alpha.c:6227
+#: vms-alpha.c:6208
 #, c-format
 msgid "   linkage index: %u, procedure name: %.*s\n"
 msgstr "   индек� компоновки: %u, им� процедуры: %.*s\n"
 
-#: vms-alpha.c:6231
+#: vms-alpha.c:6212
 #, c-format
 msgid "STC_PS (store cond psect + offset)\n"
 msgstr "STC_PS (хранимое у�ловие psect + �мещение)\n"
 
-#: vms-alpha.c:6233
+#: vms-alpha.c:6214
 #, c-format
 msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
 msgstr "   индек� компоновки: %u, psect: %u, �мещение: 0x%08x %08x\n"
 
-#: vms-alpha.c:6240
+#: vms-alpha.c:6221
 #, c-format
 msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
 msgstr "STC_NOP_GBL (хранимое у�ловие NOP по глобальному адре�у)\n"
 
-#: vms-alpha.c:6244
+#: vms-alpha.c:6225
 #, c-format
 msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
 msgstr "STC_NOP_PS (хранимое у�ловие NOP по psect + �мещение)\n"
 
-#: vms-alpha.c:6248
+#: vms-alpha.c:6229
 #, c-format
 msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
 msgstr "STC_BSR_GBL (хранимое у�ловие BSR по глобальному адре�у)\n"
 
-#: vms-alpha.c:6252
+#: vms-alpha.c:6233
 #, c-format
 msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
 msgstr "STC_BSR_PS (хранимое у�ловие BSR по psect + �мещение)\n"
 
-#: vms-alpha.c:6256
+#: vms-alpha.c:6237
 #, c-format
 msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
 msgstr "STC_LDA_GBL (хранимое у�ловие LDA по глобальному адре�у)\n"
 
-#: vms-alpha.c:6260
+#: vms-alpha.c:6241
 #, c-format
 msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
 msgstr "STC_LDA_PS (хранимое у�ловие LDA по psect + �мещение)\n"
 
-#: vms-alpha.c:6264
+#: vms-alpha.c:6245
 #, c-format
 msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
 msgstr "STC_BOH_GBL (хранимое у�ловие BOH по глобальному адре�у)\n"
 
-#: vms-alpha.c:6268
+#: vms-alpha.c:6249
 #, c-format
 msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
 msgstr "STC_BOH_PS (хранимое у�ловие BOH по psect + �мещение)\n"
 
-#: vms-alpha.c:6273
+#: vms-alpha.c:6254
 #, c-format
 msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
 msgstr "STC_NBH_GBL (хранимое у�ловие или указание по глобальному адре�у)\n"
 
-#: vms-alpha.c:6277
+#: vms-alpha.c:6258
 #, c-format
 msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
 msgstr "STC_NBH_PS (хранимое у�ловие или указание по psect + �мещение)\n"
 
-#: vms-alpha.c:6281
+#: vms-alpha.c:6262
 #, c-format
 msgid "CTL_SETRB (set relocation base)\n"
 msgstr "CTL_SETRB (у�тановка базы перемещени�)\n"
 
-#: vms-alpha.c:6287
+#: vms-alpha.c:6268
 #, c-format
 msgid "CTL_AUGRB (augment relocation base) %u\n"
 msgstr "CTL_AUGRB (дополнение базы перемещени�) %u\n"
 
-#: vms-alpha.c:6291
+#: vms-alpha.c:6272
 #, c-format
 msgid "CTL_DFLOC (define location)\n"
 msgstr "CTL_DFLOC (определение положени�)\n"
 
-#: vms-alpha.c:6294
+#: vms-alpha.c:6275
 #, c-format
 msgid "CTL_STLOC (set location)\n"
 msgstr "CTL_STLOC (задание положени�)\n"
 
-#: vms-alpha.c:6297
+#: vms-alpha.c:6278
 #, c-format
 msgid "CTL_STKDL (stack defined location)\n"
 msgstr "CTL_STKDL (положение определ�емое �теком)\n"
 
-#: vms-alpha.c:6300 vms-alpha.c:6714
+#: vms-alpha.c:6281 vms-alpha.c:6695
 #, c-format
 msgid "*unhandled*\n"
 msgstr "*не обработано*\n"
 
-#: vms-alpha.c:6330 vms-alpha.c:6369
+#: vms-alpha.c:6311 vms-alpha.c:6350
 #, c-format
 msgid "cannot read GST record length\n"
 msgstr "не удало�ь прочитать длину запи�и GST\n"
 
 #. Ill-formed.
-#: vms-alpha.c:6351
+#: vms-alpha.c:6332
 #, c-format
 msgid "cannot find EMH in first GST record\n"
 msgstr "не удало�ь найти EMH в первой запи�и GST\n"
 
-#: vms-alpha.c:6377
+#: vms-alpha.c:6358
 #, c-format
 msgid "cannot read GST record header\n"
 msgstr "не удало�ь прочитать заголовок запи�и GST\n"
 
-#: vms-alpha.c:6390
+#: vms-alpha.c:6371
 #, c-format
 msgid " corrupted GST\n"
 msgstr " повреждённый GST\n"
 
-#: vms-alpha.c:6398
+#: vms-alpha.c:6379
 #, c-format
 msgid "cannot read GST record\n"
 msgstr "не удало�ь прочитать запи�ь GST\n"
 
-#: vms-alpha.c:6427
+#: vms-alpha.c:6408
 #, c-format
 msgid " unhandled EOBJ record type %u\n"
 msgstr " необработанный тип запи�и EOBJ %u\n"
 
-#: vms-alpha.c:6450
+#: vms-alpha.c:6431
 #, c-format
 msgid "  bitcount: %u, base addr: 0x%08x\n"
 msgstr "  �чётчик бит: %u, базовый адре�: 0x%08x\n"
 
-#: vms-alpha.c:6463
+#: vms-alpha.c:6444
 #, c-format
 msgid "   bitmap: 0x%08x (count: %u):\n"
 msgstr "   bitmap: 0x%08x (�чётчик: %u):\n"
 
-#: vms-alpha.c:6470
+#: vms-alpha.c:6451
 #, c-format
 msgid " %08x"
 msgstr " %08x"
 
-#: vms-alpha.c:6495
+#: vms-alpha.c:6476
 #, c-format
 msgid "  image %u (%u entries)\n"
 msgstr "  образ %u (%u �лементов)\n"
 
-#: vms-alpha.c:6500
+#: vms-alpha.c:6481
 #, c-format
 msgid "   offset: 0x%08x, val: 0x%08x\n"
 msgstr "   �мещение: 0x%08x, значение: 0x%08x\n"
 
-#: vms-alpha.c:6521
+#: vms-alpha.c:6502
 #, c-format
 msgid "  image %u (%u entries), offsets:\n"
 msgstr "  образ %u (%u �лементов), �мещени�:\n"
 
-#: vms-alpha.c:6528
+#: vms-alpha.c:6509
 #, c-format
 msgid " 0x%08x"
 msgstr " 0x%08x"
 
 #. 64 bits.
-#: vms-alpha.c:6650
+#: vms-alpha.c:6631
 #, c-format
 msgid "64 bits *unhandled*\n"
 msgstr "64 бита *не обработано*\n"
 
-#: vms-alpha.c:6654
+#: vms-alpha.c:6635
 #, c-format
 msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
 msgstr "кла��: %u, dtype: %u, длина: %u, указатель: 0x%08x\n"
 
-#: vms-alpha.c:6665
+#: vms-alpha.c:6646
 #, c-format
 msgid "non-contiguous array of %s\n"
 msgstr "не�в�зный ма��ив %s\n"
 
-#: vms-alpha.c:6669
+#: vms-alpha.c:6650
 #, c-format
 msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
 msgstr "dimct: %u, aflags: 0x%02x, цифр: %u, шкала: %u\n"
 
-#: vms-alpha.c:6673
+#: vms-alpha.c:6654
 #, c-format
 msgid "arsize: %u, a0: 0x%08x\n"
 msgstr "arsize: %u, a0: 0x%08x\n"
 
-#: vms-alpha.c:6677
+#: vms-alpha.c:6658
 #, c-format
 msgid "Strides:\n"
 msgstr "Шаги:\n"
 
-#: vms-alpha.c:6682
+#: vms-alpha.c:6663
 #, c-format
 msgid "[%u]: %u\n"
 msgstr "[%u]: %u\n"
 
-#: vms-alpha.c:6687
+#: vms-alpha.c:6668
 #, c-format
 msgid "Bounds:\n"
 msgstr "Границы:\n"
 
-#: vms-alpha.c:6692
+#: vms-alpha.c:6673
 #, c-format
 msgid "[%u]: Lower: %u, upper: %u\n"
 msgstr "[%u]: нижн��: %u, верхн��: %u\n"
 
-#: vms-alpha.c:6704
+#: vms-alpha.c:6685
 #, c-format
 msgid "unaligned bit-string of %s\n"
 msgstr "невыровненна� �трока бит %s\n"
 
-#: vms-alpha.c:6708
+#: vms-alpha.c:6689
 #, c-format
 msgid "base: %u, pos: %u\n"
 msgstr "база: %u, позици�: %u\n"
 
-#: vms-alpha.c:6728
+#: vms-alpha.c:6709
 #, c-format
 msgid "vflags: 0x%02x, value: 0x%08x "
 msgstr "vflags: 0x%02x, значение: 0x%08x "
 
-#: vms-alpha.c:6734
+#: vms-alpha.c:6715
 #, c-format
 msgid "(no value)\n"
 msgstr "(нет значени�)\n"
 
-#: vms-alpha.c:6737
+#: vms-alpha.c:6718
 #, c-format
 msgid "(not active)\n"
 msgstr "(не активно)\n"
 
-#: vms-alpha.c:6740
+#: vms-alpha.c:6721
 #, c-format
 msgid "(not allocated)\n"
 msgstr "(не выделено)\n"
 
-#: vms-alpha.c:6743
+#: vms-alpha.c:6724
 #, c-format
 msgid "(descriptor)\n"
 msgstr "(де�криптор)\n"
 
-#: vms-alpha.c:6747
+#: vms-alpha.c:6728
 #, c-format
 msgid "(trailing value)\n"
 msgstr "(конечное значение)\n"
 
-#: vms-alpha.c:6750
+#: vms-alpha.c:6731
 #, c-format
 msgid "(value spec follows)\n"
 msgstr "(далее значение �пецификации)\n"
 
-#: vms-alpha.c:6753
+#: vms-alpha.c:6734
 #, c-format
 msgid "(at bit offset %u)\n"
 msgstr "(по битовому �мещению %u)\n"
 
-#: vms-alpha.c:6756
+#: vms-alpha.c:6737
 #, c-format
 msgid "(reg: %u, disp: %u, indir: %u, kind: "
 msgstr "(reg: %u, disp: %u, indir: %u, kind: "
 
-#: vms-alpha.c:6763
+#: vms-alpha.c:6744
 msgid "literal"
 msgstr "литерал"
 
-#: vms-alpha.c:6766
+#: vms-alpha.c:6747
 msgid "address"
 msgstr "адре�"
 
-#: vms-alpha.c:6769
+#: vms-alpha.c:6750
 msgid "desc"
 msgstr "де�к"
 
-#: vms-alpha.c:6772
+#: vms-alpha.c:6753
 msgid "reg"
 msgstr "рег"
 
-#: vms-alpha.c:6847
+#: vms-alpha.c:6828
 #, c-format
 msgid "Debug symbol table:\n"
 msgstr "Таблица �имволов отладки:\n"
 
-#: vms-alpha.c:6858
+#: vms-alpha.c:6839
 #, c-format
 msgid "cannot read DST header\n"
 msgstr "не удало�ь прочитать заголовок DST\n"
 
-#: vms-alpha.c:6863
+#: vms-alpha.c:6844
 #, c-format
 msgid " type: %3u, len: %3u (at 0x%08x): "
 msgstr " тип: %3u, длина: %3u (по 0x%08x): "
 
-#: vms-alpha.c:6877
+#: vms-alpha.c:6858
 #, c-format
 msgid "cannot read DST symbol\n"
 msgstr "не удало�ь прочитать �имвол DST\n"
 
-#: vms-alpha.c:6920
+#: vms-alpha.c:6901
 #, c-format
 msgid "standard data: %s\n"
 msgstr "�тандартные данные: %s\n"
 
-#: vms-alpha.c:6923 vms-alpha.c:7007
+#: vms-alpha.c:6904 vms-alpha.c:6988
 #, c-format
 msgid "    name: %.*s\n"
 msgstr "    им�: %.*s\n"
 
-#: vms-alpha.c:6930
+#: vms-alpha.c:6911
 #, c-format
 msgid "modbeg\n"
 msgstr "modbeg\n"
 
-#: vms-alpha.c:6931
+#: vms-alpha.c:6912
 #, c-format
 msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
 msgstr "   флаги: %d, �зык: %u, �тарший: %u, младший: %u\n"
 
-#: vms-alpha.c:6937 vms-alpha.c:7203
+#: vms-alpha.c:6918 vms-alpha.c:7184
 #, c-format
 msgid "   module name: %.*s\n"
 msgstr "   им� модул�: %.*s\n"
 
-#: vms-alpha.c:6940
+#: vms-alpha.c:6921
 #, c-format
 msgid "   compiler   : %.*s\n"
 msgstr "   компил�тор   : %.*s\n"
 
-#: vms-alpha.c:6945
+#: vms-alpha.c:6926
 #, c-format
 msgid "modend\n"
 msgstr "modend\n"
 
-#: vms-alpha.c:6952
+#: vms-alpha.c:6933
 msgid "rtnbeg\n"
 msgstr "rtnbeg\n"
 
-#: vms-alpha.c:6953
+#: vms-alpha.c:6934
 #, c-format
 msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
 msgstr "    флаги: %u, адре�: 0x%08x, pd-адре�: 0x%08x\n"
 
-#: vms-alpha.c:6958
+#: vms-alpha.c:6939
 #, c-format
 msgid "    routine name: %.*s\n"
 msgstr "    им� процедуры: %.*s\n"
 
-#: vms-alpha.c:6966
+#: vms-alpha.c:6947
 #, c-format
 msgid "rtnend: size 0x%08x\n"
 msgstr "rtnend: размер 0x%08x\n"
 
-#: vms-alpha.c:6974
+#: vms-alpha.c:6955
 #, c-format
 msgid "prolog: bkpt address 0x%08x\n"
 msgstr "пролог: адре� bkpt 0x%08x\n"
 
-#: vms-alpha.c:6982
+#: vms-alpha.c:6963
 #, c-format
 msgid "epilog: flags: %u, count: %u\n"
 msgstr "�пилог: флаги: %u, �чётчик: %u\n"
 
-#: vms-alpha.c:6991
+#: vms-alpha.c:6972
 #, c-format
 msgid "blkbeg: address: 0x%08x, name: %.*s\n"
 msgstr "blkbeg: адре�: 0x%08x, им�: %.*s\n"
 
-#: vms-alpha.c:7000
+#: vms-alpha.c:6981
 #, c-format
 msgid "blkend: size: 0x%08x\n"
 msgstr "blkend: размер: 0x%08x\n"
 
-#: vms-alpha.c:7006
+#: vms-alpha.c:6987
 #, c-format
 msgid "typspec (len: %u)\n"
 msgstr "typspec (длина: %u)\n"
 
-#: vms-alpha.c:7013
+#: vms-alpha.c:6994
 #, c-format
 msgid "septyp, name: %.*s\n"
 msgstr "septyp, им�: %.*s\n"
 
-#: vms-alpha.c:7022
+#: vms-alpha.c:7003
 #, c-format
 msgid "recbeg: name: %.*s\n"
 msgstr "recbeg: им�: %.*s\n"
 
-#: vms-alpha.c:7029
+#: vms-alpha.c:7010
 #, c-format
 msgid "recend\n"
 msgstr "recend\n"
 
-#: vms-alpha.c:7032
+#: vms-alpha.c:7013
 #, c-format
 msgid "enumbeg, len: %u, name: %.*s\n"
 msgstr "enumbeg, длина: %u, им�: %.*s\n"
 
-#: vms-alpha.c:7036
+#: vms-alpha.c:7017
 #, c-format
 msgid "enumelt, name: %.*s\n"
 msgstr "enumelt, им�: %.*s\n"
 
-#: vms-alpha.c:7040
+#: vms-alpha.c:7021
 #, c-format
 msgid "enumend\n"
 msgstr "enumend\n"
 
-#: vms-alpha.c:7057
+#: vms-alpha.c:7038
 #, c-format
 msgid "discontiguous range (nbr: %u)\n"
 msgstr "не�межный диапазон (nbr: %u)\n"
 
-#: vms-alpha.c:7059
+#: vms-alpha.c:7040
 #, c-format
 msgid "    address: 0x%08x, size: %u\n"
 msgstr "    адре�: 0x%08x, размер: %u\n"
 
-#: vms-alpha.c:7069
+#: vms-alpha.c:7050
 #, c-format
 msgid "line num  (len: %u)\n"
 msgstr "номер �троки (длина: %u)\n"
 
-#: vms-alpha.c:7086
+#: vms-alpha.c:7067
 #, c-format
 msgid "delta_pc_w %u\n"
 msgstr "delta_pc_w %u\n"
 
-#: vms-alpha.c:7093
+#: vms-alpha.c:7074
 #, c-format
 msgid "incr_linum(b): +%u\n"
 msgstr "incr_linum(b): +%u\n"
 
-#: vms-alpha.c:7099
+#: vms-alpha.c:7080
 #, c-format
 msgid "incr_linum_w: +%u\n"
 msgstr "incr_linum_w: +%u\n"
 
-#: vms-alpha.c:7105
+#: vms-alpha.c:7086
 #, c-format
 msgid "incr_linum_l: +%u\n"
 msgstr "incr_linum_l: +%u\n"
 
-#: vms-alpha.c:7111
+#: vms-alpha.c:7092
 #, c-format
 msgid "set_line_num(w) %u\n"
 msgstr "set_line_num(w) %u\n"
 
-#: vms-alpha.c:7116
+#: vms-alpha.c:7097
 #, c-format
 msgid "set_line_num_b %u\n"
 msgstr "set_line_num_b %u\n"
 
-#: vms-alpha.c:7121
+#: vms-alpha.c:7102
 #, c-format
 msgid "set_line_num_l %u\n"
 msgstr "set_line_num_l %u\n"
 
-#: vms-alpha.c:7126
+#: vms-alpha.c:7107
 #, c-format
 msgid "set_abs_pc: 0x%08x\n"
 msgstr "set_abs_pc: 0x%08x\n"
 
-#: vms-alpha.c:7130
+#: vms-alpha.c:7111
 #, c-format
 msgid "delta_pc_l: +0x%08x\n"
 msgstr "delta_pc_l: +0x%08x\n"
 
-#: vms-alpha.c:7135
+#: vms-alpha.c:7116
 #, c-format
 msgid "term(b): 0x%02x"
 msgstr "term(b): 0x%02x"
 
-#: vms-alpha.c:7137
+#: vms-alpha.c:7118
 #, c-format
 msgid "        pc: 0x%08x\n"
 msgstr "        pc: 0x%08x\n"
 
-#: vms-alpha.c:7142
+#: vms-alpha.c:7123
 #, c-format
 msgid "term_w: 0x%04x"
 msgstr "term_w: 0x%04x"
 
-#: vms-alpha.c:7144
+#: vms-alpha.c:7125
 #, c-format
 msgid "    pc: 0x%08x\n"
 msgstr "    pc: 0x%08x\n"
 
-#: vms-alpha.c:7150
+#: vms-alpha.c:7131
 #, c-format
 msgid "delta pc +%-4d"
 msgstr "delta pc +%-4d"
 
-#: vms-alpha.c:7153
+#: vms-alpha.c:7134
 #, c-format
 msgid "    pc: 0x%08x line: %5u\n"
 msgstr "    pc: 0x%08x �трока: %5u\n"
 
-#: vms-alpha.c:7158
+#: vms-alpha.c:7139
 #, c-format
 msgid "    *unhandled* cmd %u\n"
 msgstr "    *необработанна�* команда %u\n"
 
-#: vms-alpha.c:7173
+#: vms-alpha.c:7154
 #, c-format
 msgid "source (len: %u)\n"
 msgstr "и�точник (длина: %u)\n"
 
-#: vms-alpha.c:7187
+#: vms-alpha.c:7168
 #, c-format
 msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
 msgstr "   declfile: длина: %u, флаги: %u, fileid: %u\n"
 
-#: vms-alpha.c:7191
+#: vms-alpha.c:7172
 #, c-format
 msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 msgstr "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
 
-#: vms-alpha.c:7200
+#: vms-alpha.c:7181
 #, c-format
 msgid "   filename   : %.*s\n"
 msgstr "   им� файла   : %.*s\n"
 
-#: vms-alpha.c:7209
+#: vms-alpha.c:7190
 #, c-format
 msgid "   setfile %u\n"
 msgstr "   setfile %u\n"
 
-#: vms-alpha.c:7214 vms-alpha.c:7219
+#: vms-alpha.c:7195 vms-alpha.c:7200
 #, c-format
 msgid "   setrec %u\n"
 msgstr "   setrec %u\n"
 
-#: vms-alpha.c:7224 vms-alpha.c:7229
+#: vms-alpha.c:7205 vms-alpha.c:7210
 #, c-format
 msgid "   setlnum %u\n"
 msgstr "   setlnum %u\n"
 
-#: vms-alpha.c:7234 vms-alpha.c:7239
+#: vms-alpha.c:7215 vms-alpha.c:7220
 #, c-format
 msgid "   deflines %u\n"
 msgstr "   deflines %u\n"
 
-#: vms-alpha.c:7243
+#: vms-alpha.c:7224
 #, c-format
 msgid "   formfeed\n"
 msgstr "   formfeed\n"
 
-#: vms-alpha.c:7247
+#: vms-alpha.c:7228
 #, c-format
 msgid "   *unhandled* cmd %u\n"
 msgstr "   *необработанна�* команда %u\n"
 
-#: vms-alpha.c:7259
+#: vms-alpha.c:7240
 #, c-format
 msgid "*unhandled* dst type %u\n"
 msgstr "*необработанный* тип назначени� %u\n"
 
-#: vms-alpha.c:7291
+#: vms-alpha.c:7272
 #, c-format
 msgid "cannot read EIHD\n"
 msgstr "не удало�ь прочитать EIHD\n"
 
-#: vms-alpha.c:7294
+#: vms-alpha.c:7275
 #, c-format
 msgid "EIHD: (size: %u, nbr blocks: %u)\n"
 msgstr "EIHD: (размер: %u, nbr блоков: %u)\n"
 
-#: vms-alpha.c:7297
+#: vms-alpha.c:7278
 #, c-format
 msgid " majorid: %u, minorid: %u\n"
 msgstr " majorid: %u, minorid: %u\n"
 
-#: vms-alpha.c:7305
+#: vms-alpha.c:7286
 msgid "executable"
 msgstr "и�полн�емый"
 
-#: vms-alpha.c:7308
+#: vms-alpha.c:7289
 msgid "linkable image"
 msgstr "компонуемый образ"
 
-#: vms-alpha.c:7314
+#: vms-alpha.c:7295
 #, c-format
 msgid " image type: %u (%s)"
 msgstr " тип образа: %u (%s)"
 
-#: vms-alpha.c:7320
+#: vms-alpha.c:7301
 msgid "native"
 msgstr "родной"
 
-#: vms-alpha.c:7323
+#: vms-alpha.c:7304
 msgid "CLI"
 msgstr "CLI"
 
-#: vms-alpha.c:7329
+#: vms-alpha.c:7310
 #, c-format
 msgid ", subtype: %u (%s)\n"
 msgstr ", подтип: %u (%s)\n"
 
-#: vms-alpha.c:7335
+#: vms-alpha.c:7316
 #, c-format
 msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 msgstr " �мещени�: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
 
-#: vms-alpha.c:7339
+#: vms-alpha.c:7320
 #, c-format
 msgid " fixup info rva: "
 msgstr " fixup info rva: "
 
-#: vms-alpha.c:7341
+#: vms-alpha.c:7322
 #, c-format
 msgid ", symbol vector rva: "
 msgstr ", �имвольный вектор rva: "
 
-#: vms-alpha.c:7344
+#: vms-alpha.c:7325
 #, c-format
 msgid ""
 "\n"
@@ -5177,461 +4956,461 @@ msgstr ""
 "\n"
 " �мещение ма��ива вер�ий: %u\n"
 
-#: vms-alpha.c:7348
+#: vms-alpha.c:7329
 #, c-format
 msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 msgstr " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
 
-#: vms-alpha.c:7354
+#: vms-alpha.c:7335
 #, c-format
 msgid " linker flags: %08x:"
 msgstr " флаги компоновщика: %08x:"
 
-#: vms-alpha.c:7384
+#: vms-alpha.c:7365
 #, c-format
 msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 msgstr " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
 
-#: vms-alpha.c:7390
+#: vms-alpha.c:7371
 #, c-format
 msgid " BPAGE: %u"
 msgstr " BPAGE: %u"
 
-#: vms-alpha.c:7396
+#: vms-alpha.c:7377
 #, c-format
 msgid ", ext fixup offset: %u, no_opt psect off: %u"
 msgstr ", ext fixup offset: %u, no_opt psect off: %u"
 
-#: vms-alpha.c:7399
+#: vms-alpha.c:7380
 #, c-format
 msgid ", alias: %u\n"
 msgstr ", п�евдоним: %u\n"
 
-#: vms-alpha.c:7407
+#: vms-alpha.c:7388
 #, c-format
 msgid "system version array information:\n"
 msgstr "ма��ив информации вер�ии �и�темы:\n"
 
-#: vms-alpha.c:7411
+#: vms-alpha.c:7392
 #, c-format
 msgid "cannot read EIHVN header\n"
 msgstr "не удало�ь прочитать заголовок EIHVN\n"
 
-#: vms-alpha.c:7421
+#: vms-alpha.c:7402
 #, c-format
 msgid "cannot read EIHVN version\n"
 msgstr "не удало�ь прочитать вер�ию EIHVN\n"
 
-#: vms-alpha.c:7424
+#: vms-alpha.c:7405
 #, c-format
 msgid "   %02u "
 msgstr "   %02u "
 
-#: vms-alpha.c:7428
+#: vms-alpha.c:7409
 msgid "BASE_IMAGE       "
 msgstr "BASE_IMAGE       "
 
-#: vms-alpha.c:7431
+#: vms-alpha.c:7412
 msgid "MEMORY_MANAGEMENT"
 msgstr "MEMORY_MANAGEMENT"
 
-#: vms-alpha.c:7434
+#: vms-alpha.c:7415
 msgid "IO               "
 msgstr "IO               "
 
-#: vms-alpha.c:7437
+#: vms-alpha.c:7418
 msgid "FILES_VOLUMES    "
 msgstr "FILES_VOLUMES    "
 
-#: vms-alpha.c:7440
+#: vms-alpha.c:7421
 msgid "PROCESS_SCHED    "
 msgstr "PROCESS_SCHED    "
 
-#: vms-alpha.c:7443
+#: vms-alpha.c:7424
 msgid "SYSGEN           "
 msgstr "SYSGEN           "
 
-#: vms-alpha.c:7446
+#: vms-alpha.c:7427
 msgid "CLUSTERS_LOCKMGR "
 msgstr "CLUSTERS_LOCKMGR "
 
-#: vms-alpha.c:7449
+#: vms-alpha.c:7430
 msgid "LOGICAL_NAMES    "
 msgstr "LOGICAL_NAMES    "
 
-#: vms-alpha.c:7452
+#: vms-alpha.c:7433
 msgid "SECURITY         "
 msgstr "SECURITY         "
 
-#: vms-alpha.c:7455
+#: vms-alpha.c:7436
 msgid "IMAGE_ACTIVATOR  "
 msgstr "IMAGE_ACTIVATOR  "
 
-#: vms-alpha.c:7458
+#: vms-alpha.c:7439
 msgid "NETWORKS         "
 msgstr "NETWORKS         "
 
-#: vms-alpha.c:7461
+#: vms-alpha.c:7442
 msgid "COUNTERS         "
 msgstr "COUNTERS         "
 
-#: vms-alpha.c:7464
+#: vms-alpha.c:7445
 msgid "STABLE           "
 msgstr "STABLE           "
 
-#: vms-alpha.c:7467
+#: vms-alpha.c:7448
 msgid "MISC             "
 msgstr "MISC             "
 
-#: vms-alpha.c:7470
+#: vms-alpha.c:7451
 msgid "CPU              "
 msgstr "CPU              "
 
-#: vms-alpha.c:7473
+#: vms-alpha.c:7454
 msgid "VOLATILE         "
 msgstr "VOLATILE         "
 
-#: vms-alpha.c:7476
+#: vms-alpha.c:7457
 msgid "SHELL            "
 msgstr "SHELL            "
 
-#: vms-alpha.c:7479
+#: vms-alpha.c:7460
 msgid "POSIX            "
 msgstr "POSIX            "
 
-#: vms-alpha.c:7482
+#: vms-alpha.c:7463
 msgid "MULTI_PROCESSING "
 msgstr "MULTI_PROCESSING "
 
-#: vms-alpha.c:7485
+#: vms-alpha.c:7466
 msgid "GALAXY           "
 msgstr "GALAXY           "
 
-#: vms-alpha.c:7488
+#: vms-alpha.c:7469
 msgid "*unknown*        "
 msgstr "*неизве�тно*        "
 
-#: vms-alpha.c:7491
+#: vms-alpha.c:7472
 #, c-format
 msgid ": %u.%u\n"
 msgstr ": %u.%u\n"
 
-#: vms-alpha.c:7504 vms-alpha.c:7763
+#: vms-alpha.c:7485 vms-alpha.c:7744
 #, c-format
 msgid "cannot read EIHA\n"
 msgstr "не удало�ь прочитать EIHA\n"
 
-#: vms-alpha.c:7507
+#: vms-alpha.c:7488
 #, c-format
 msgid "Image activation:  (size=%u)\n"
 msgstr "�ктиваци� образа:  (размер=%u)\n"
 
-#: vms-alpha.c:7509
+#: vms-alpha.c:7490
 #, c-format
 msgid " First address : 0x%08x 0x%08x\n"
 msgstr " Первый адре�: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7512
+#: vms-alpha.c:7493
 #, c-format
 msgid " Second address: 0x%08x 0x%08x\n"
 msgstr " Второй адре�: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7515
+#: vms-alpha.c:7496
 #, c-format
 msgid " Third address : 0x%08x 0x%08x\n"
 msgstr " Третий адре�: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7518
+#: vms-alpha.c:7499
 #, c-format
 msgid " Fourth address: 0x%08x 0x%08x\n"
 msgstr " Четвёртый адре�: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7521
+#: vms-alpha.c:7502
 #, c-format
 msgid " Shared image  : 0x%08x 0x%08x\n"
 msgstr " Общий образ: 0x%08x 0x%08x\n"
 
-#: vms-alpha.c:7532
+#: vms-alpha.c:7513
 #, c-format
 msgid "cannot read EIHI\n"
 msgstr "не удало�ь прочитать EIHI\n"
 
-#: vms-alpha.c:7535
+#: vms-alpha.c:7516
 #, c-format
 msgid "Image identification: (major: %u, minor: %u)\n"
 msgstr "Идентификаци� образа: (�тарший: %u, младший: %u)\n"
 
-#: vms-alpha.c:7538
+#: vms-alpha.c:7519
 #, c-format
 msgid " image name       : %.*s\n"
 msgstr " им� образа       : %.*s\n"
 
-#: vms-alpha.c:7540
+#: vms-alpha.c:7521
 #, c-format
 msgid " link time        : %s\n"
 msgstr " врем� компоновки : %s\n"
 
-#: vms-alpha.c:7542
+#: vms-alpha.c:7523
 #, c-format
 msgid " image ident      : %.*s\n"
 msgstr " идент-р образа      : %.*s\n"
 
-#: vms-alpha.c:7544
+#: vms-alpha.c:7525
 #, c-format
 msgid " linker ident     : %.*s\n"
 msgstr " идент-р компоновщика: %.*s\n"
 
-#: vms-alpha.c:7546
+#: vms-alpha.c:7527
 #, c-format
 msgid " image build ident: %.*s\n"
 msgstr " идент-р �борки образа: %.*s\n"
 
-#: vms-alpha.c:7556
+#: vms-alpha.c:7537
 #, c-format
 msgid "cannot read EIHS\n"
 msgstr "не удало�ь прочитать EIHS\n"
 
-#: vms-alpha.c:7559
+#: vms-alpha.c:7540
 #, c-format
 msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
 msgstr "Таблица �имволов & отладки образа: (�тарший: %u, младший: %u)\n"
 
-#: vms-alpha.c:7564
+#: vms-alpha.c:7545
 #, c-format
 msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
 msgstr " таблица отладочных �имволов: vbn: %u, размер: %u (0x%x)\n"
 
-#: vms-alpha.c:7568
+#: vms-alpha.c:7549
 #, c-format
 msgid " global symbol table: vbn: %u, records: %u\n"
 msgstr " глобальна� таблица �имволов: vbn: %u, запи�ей: %u\n"
 
-#: vms-alpha.c:7572
+#: vms-alpha.c:7553
 #, c-format
 msgid " debug module table : vbn: %u, size: %u\n"
 msgstr " таблица отладочных модулей: vbn: %u, размер: %u\n"
 
-#: vms-alpha.c:7585
+#: vms-alpha.c:7566
 #, c-format
 msgid "cannot read EISD\n"
 msgstr "не удало�ь прочитать EISD\n"
 
-#: vms-alpha.c:7595
+#: vms-alpha.c:7576
 #, c-format
 msgid "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
 msgstr "Де�криптор раздела образа: (�тарший: %u, младший: %u, размер: %u, �мещение: %u)\n"
 
-#: vms-alpha.c:7602
+#: vms-alpha.c:7583
 #, c-format
 msgid " section: base: 0x%08x%08x size: 0x%08x\n"
 msgstr " раздел: база: 0x%08x%08x размер: 0x%08x\n"
 
-#: vms-alpha.c:7607
+#: vms-alpha.c:7588
 #, c-format
 msgid " flags: 0x%04x"
 msgstr " флаги: 0x%04x"
 
-#: vms-alpha.c:7644
+#: vms-alpha.c:7625
 #, c-format
 msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
 msgstr " vbn: %u, pfc: %u, matchctl: %u тип: %u ("
 
-#: vms-alpha.c:7650
+#: vms-alpha.c:7631
 msgid "NORMAL"
 msgstr "NORMAL"
 
-#: vms-alpha.c:7653
+#: vms-alpha.c:7634
 msgid "SHRFXD"
 msgstr "SHRFXD"
 
-#: vms-alpha.c:7656
+#: vms-alpha.c:7637
 msgid "PRVFXD"
 msgstr "PRVFXD"
 
-#: vms-alpha.c:7659
+#: vms-alpha.c:7640
 msgid "SHRPIC"
 msgstr "SHRPIC"
 
-#: vms-alpha.c:7662
+#: vms-alpha.c:7643
 msgid "PRVPIC"
 msgstr "PRVPIC"
 
-#: vms-alpha.c:7665
+#: vms-alpha.c:7646
 msgid "USRSTACK"
 msgstr "USRSTACK"
 
-#: vms-alpha.c:7673
+#: vms-alpha.c:7654
 #, c-format
 msgid " ident: 0x%08x, name: %.*s\n"
 msgstr " иден-р: 0x%08x, им�: %.*s\n"
 
-#: vms-alpha.c:7683
+#: vms-alpha.c:7664
 #, c-format
 msgid "cannot read DMT\n"
 msgstr "не удало�ь прочитать DMT\n"
 
-#: vms-alpha.c:7687
+#: vms-alpha.c:7668
 #, c-format
 msgid "Debug module table:\n"
 msgstr "Таблица отладочных модулей:\n"
 
-#: vms-alpha.c:7696
+#: vms-alpha.c:7677
 #, c-format
 msgid "cannot read DMT header\n"
 msgstr "не удало�ь прочитать заголовок DMT\n"
 
-#: vms-alpha.c:7701
+#: vms-alpha.c:7682
 #, c-format
 msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
 msgstr " �мещение модул�: 0x%08x, размер: 0x%08x, (%u psects)\n"
 
-#: vms-alpha.c:7711
+#: vms-alpha.c:7692
 #, c-format
 msgid "cannot read DMT psect\n"
 msgstr "не удало�ь прочитать DMT psect\n"
 
-#: vms-alpha.c:7714
+#: vms-alpha.c:7695
 #, c-format
 msgid "  psect start: 0x%08x, length: %u\n"
 msgstr "  начало psect: 0x%08x, длина: %u\n"
 
-#: vms-alpha.c:7727
+#: vms-alpha.c:7708
 #, c-format
 msgid "cannot read DST\n"
 msgstr "не удало�ь прочитать DST\n"
 
-#: vms-alpha.c:7737
+#: vms-alpha.c:7718
 #, c-format
 msgid "cannot read GST\n"
 msgstr "не удало�ь прочитать GST\n"
 
-#: vms-alpha.c:7741
+#: vms-alpha.c:7722
 #, c-format
 msgid "Global symbol table:\n"
 msgstr "Таблица глобальных �имволов:\n"
 
-#: vms-alpha.c:7769
+#: vms-alpha.c:7750
 #, c-format
 msgid "Image activator fixup: (major: %u, minor: %u)\n"
 msgstr "�ктиватор ме�тоположени� образа: (�тарший: %u, младший: %u)\n"
 
-#: vms-alpha.c:7772
+#: vms-alpha.c:7753
 #, c-format
 msgid "  iaflink : 0x%08x %08x\n"
 msgstr "  iaflink : 0x%08x %08x\n"
 
-#: vms-alpha.c:7775
+#: vms-alpha.c:7756
 #, c-format
 msgid "  fixuplnk: 0x%08x %08x\n"
 msgstr "  fixuplnk: 0x%08x %08x\n"
 
-#: vms-alpha.c:7778
+#: vms-alpha.c:7759
 #, c-format
 msgid "  size : %u\n"
 msgstr "  размер: %u\n"
 
-#: vms-alpha.c:7780
+#: vms-alpha.c:7761
 #, c-format
 msgid "  flags: 0x%08x\n"
 msgstr "  флаги: 0x%08x\n"
 
-#: vms-alpha.c:7784
+#: vms-alpha.c:7765
 #, c-format
 msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 msgstr "  qrelfixoff: %5u, lrelfixoff: %5u\n"
 
-#: vms-alpha.c:7788
+#: vms-alpha.c:7769
 #, c-format
 msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
 msgstr "  qdotadroff: %5u, ldotadroff: %5u\n"
 
-#: vms-alpha.c:7792
+#: vms-alpha.c:7773
 #, c-format
 msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
 msgstr "  codeadroff: %5u, lpfixoff  : %5u\n"
 
-#: vms-alpha.c:7795
+#: vms-alpha.c:7776
 #, c-format
 msgid "  chgprtoff : %5u\n"
 msgstr "  chgprtoff : %5u\n"
 
-#: vms-alpha.c:7798
+#: vms-alpha.c:7779
 #, c-format
 msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
 msgstr "  shlstoff  : %5u, shrimgcnt : %5u\n"
 
-#: vms-alpha.c:7800
+#: vms-alpha.c:7781
 #, c-format
 msgid "  shlextra  : %5u, permctx   : %5u\n"
 msgstr "  shlextra  : %5u, permctx   : %5u\n"
 
-#: vms-alpha.c:7803
+#: vms-alpha.c:7784
 #, c-format
 msgid "  base_va : 0x%08x\n"
 msgstr "  base_va : 0x%08x\n"
 
-#: vms-alpha.c:7805
+#: vms-alpha.c:7786
 #, c-format
 msgid "  lppsbfixoff: %5u\n"
 msgstr "  lppsbfixoff: %5u\n"
 
-#: vms-alpha.c:7813
+#: vms-alpha.c:7794
 #, c-format
 msgid " Shareable images:\n"
 msgstr " Общие образы:\n"
 
-#: vms-alpha.c:7817
+#: vms-alpha.c:7798
 #, c-format
 msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
 msgstr "  %u: размер: %u, флаги: 0x%02x, им�: %.*s\n"
 
-#: vms-alpha.c:7824
+#: vms-alpha.c:7805
 #, c-format
 msgid " quad-word relocation fixups:\n"
 msgstr " четверное �лово перемещаемых ме�тоположений:\n"
 
-#: vms-alpha.c:7829
+#: vms-alpha.c:7810
 #, c-format
 msgid " long-word relocation fixups:\n"
 msgstr " длинное �лово перемещаемых ме�тоположений:\n"
 
-#: vms-alpha.c:7834
+#: vms-alpha.c:7815
 #, c-format
 msgid " quad-word .address reference fixups:\n"
 msgstr " четверное �лово ��ылочных ме�тоположений .address:\n"
 
-#: vms-alpha.c:7839
+#: vms-alpha.c:7820
 #, c-format
 msgid " long-word .address reference fixups:\n"
 msgstr " длинное �лово ��ылочных ме�тоположений .address:\n"
 
-#: vms-alpha.c:7844
+#: vms-alpha.c:7825
 #, c-format
 msgid " Code Address Reference Fixups:\n"
 msgstr " С�ылочные ме�тоположени� адре�а кода:\n"
 
-#: vms-alpha.c:7849
+#: vms-alpha.c:7830
 #, c-format
 msgid " Linkage Pairs Referece Fixups:\n"
 msgstr " С�ылочные ме�тоположени� компонуемых пар:\n"
 
-#: vms-alpha.c:7858
+#: vms-alpha.c:7839
 #, c-format
 msgid " Change Protection (%u entries):\n"
 msgstr " Изменение защиты (%u �лементов):\n"
 
-#: vms-alpha.c:7863
+#: vms-alpha.c:7844
 #, c-format
 msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
 msgstr "  база: 0x%08x %08x, размер: 0x%08x, prot: 0x%08x "
 
 #. FIXME: we do not yet support relocatable link.  It is not obvious
 #. how to do it for debug infos.
-#: vms-alpha.c:8694
+#: vms-alpha.c:8676
 msgid "%P: relocatable link is not supported\n"
 msgstr "%P: перемещаема� ��ылка не поддерживает��\n"
 
-#: vms-alpha.c:8764
+#: vms-alpha.c:8746
 msgid "%P: multiple entry points: in modules %B and %B\n"
 msgstr "%P: не�колько точек входа: в модул�х %B и %B\n"
 
@@ -5651,147 +5430,147 @@ msgstr "Вызов _bfd_vms_output_counted �о �лишком большим к
 #: xcofflink.c:836
 #, c-format
 msgid "%s: XCOFF shared object when not producing XCOFF output"
-msgstr "%s: общий объект XCOFF без �оздани� вывода XCOFF"
+msgstr "%s: раздел�емый объект XCOFF без �оздани� вывода XCOFF"
 
 #: xcofflink.c:857
 #, c-format
 msgid "%s: dynamic object with no .loader section"
 msgstr "%s: динамиче�кий объект без раздела .loader"
 
-#: xcofflink.c:1416
+#: xcofflink.c:1415
 msgid "%B: `%s' has line numbers but no enclosing section"
-msgstr "%B: «%s» �одержит номера �трок, но в обрамл�ющем разделе"
+msgstr "%B: `%s' �одержит номера �трок, но в обрамл�ющем разделе"
 
-#: xcofflink.c:1468
+#: xcofflink.c:1467
 msgid "%B: class %d symbol `%s' has no aux entries"
-msgstr "%B: кла�� %d �имвола «%s» не имеет �лементов aux"
+msgstr "%B: кла�� %d �имвола `%s' не имеет �лементов aux"
 
-#: xcofflink.c:1490
+#: xcofflink.c:1489
 msgid "%B: symbol `%s' has unrecognized csect type %d"
-msgstr "%B: �имвол «%s» имеет нера�познанный тип csect: %d"
+msgstr "%B: �имвол `%s' имеет нера�познанный тип csect: %d"
 
-#: xcofflink.c:1502
+#: xcofflink.c:1501
 msgid "%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"
-msgstr "%B: неверный �имвол XTY_ER «%s»: кла�� %d scnum %d scnlen %d"
+msgstr "%B: неверный �имвол XTY_ER `%s': кла�� %d scnum %d scnlen %d"
 
-#: xcofflink.c:1531
+#: xcofflink.c:1530
 msgid "%B: XMC_TC0 symbol `%s' is class %d scnlen %d"
-msgstr "%B: �имвол XMC_TC0 «%s» �вл�ет�� кла��ом %d scnlen %d"
+msgstr "%B: �имвол XMC_TC0 `%s' �вл�ет�� кла��ом %d scnlen %d"
 
-#: xcofflink.c:1677
+#: xcofflink.c:1676
 msgid "%B: csect `%s' not in enclosing section"
-msgstr "%B: csect «%s» не в обрамл�ющем разделе"
+msgstr "%B: csect `%s' не в обрамл�ющем разделе"
 
-#: xcofflink.c:1784
+#: xcofflink.c:1783
 msgid "%B: misplaced XTY_LD `%s'"
-msgstr "%B: неправильно ра�положенный XTY_LD «%s»"
+msgstr "%B: неправильно ра�положенный XTY_LD `%s'"
 
-#: xcofflink.c:2103
+#: xcofflink.c:2102
 msgid "%B: reloc %s:%d not in csect"
 msgstr "%B: перемещение %s:%d не в csect"
 
-#: xcofflink.c:3194
+#: xcofflink.c:3186
 #, c-format
 msgid "%s: no such symbol"
 msgstr "%s: нет такого �имвола"
 
-#: xcofflink.c:3299
+#: xcofflink.c:3291
 #, c-format
 msgid "warning: attempt to export undefined symbol `%s'"
-msgstr "предупреждение: попытка �к�портировать неопределённый �имвол «%s»"
+msgstr "предупреждение: попытка �к�портировать неопределённый �имвол `%s'"
 
-#: xcofflink.c:3681
+#: xcofflink.c:3673
 msgid "error: undefined symbol __rtinit"
 msgstr "ошибка: неопределённый �имвол __rtinit"
 
-#: xcofflink.c:4060
+#: xcofflink.c:4052
 msgid "%B: loader reloc in unrecognized section `%s'"
-msgstr "%B: перемещение загрузчика в нера�познанном разделе «%s»"
+msgstr "%B: перемещение загрузчика в нера�познанном разделе `%s'"
 
-#: xcofflink.c:4071
+#: xcofflink.c:4063
 msgid "%B: `%s' in loader reloc but not loader sym"
-msgstr "%B: «%s» в перемещении загрузчика, но не �имволе загрузчика"
+msgstr "%B: `%s' в перемещении загрузчика, но не �имволе загрузчика"
 
-#: xcofflink.c:4087
+#: xcofflink.c:4079
 msgid "%B: loader reloc in read-only section %A"
 msgstr "%B: перемещение загрузчика в разделе %A, до�тупном только дл� чтени�"
 
-#: xcofflink.c:5109
+#: xcofflink.c:5097
 #, c-format
 msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"
 msgstr "переполнение TOC: 0x%lx > 0x10000; попробуйте �компилировать � -mminimal-toc"
 
-#: elf32-ia64.c:628 elf64-ia64.c:628
+#: elf32-ia64.c:1110 elf64-ia64.c:1110
 msgid "%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."
-msgstr "%B: �евозможно о�лабить br по адре�у 0x%lx в разделе «%A». И�пользуйте brl или ко�венное ветвление."
+msgstr "%B: �евозможно о�лабить br по адре�у 0x%lx в разделе `%A'. И�пользуйте brl или ко�венный переход."
 
-#: elf32-ia64.c:2290 elf64-ia64.c:2290
+#: elf32-ia64.c:2809 elf64-ia64.c:2809
 msgid "@pltoff reloc against local symbol"
 msgstr "перемещение @pltoff дл� локального �имвола"
 
-#: elf32-ia64.c:3693 elf64-ia64.c:3693
+#: elf32-ia64.c:4430 elf64-ia64.c:4430
 #, c-format
 msgid "%s: short data segment overflowed (0x%lx >= 0x400000)"
 msgstr "%s: переполнение короткого �егмента данных (0x%lx >= 0x400000)"
 
-#: elf32-ia64.c:3704 elf64-ia64.c:3704
+#: elf32-ia64.c:4441 elf64-ia64.c:4441
 #, c-format
 msgid "%s: __gp does not cover short data segment"
 msgstr "%s: __gp не покрывает короткий �егмент данных"
 
-#: elf32-ia64.c:3971 elf64-ia64.c:3971
+#: elf32-ia64.c:4708 elf64-ia64.c:4708
 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'"
-msgstr "%B: не-pic код � перемещением imm дл� динамиче�кого �имвола «%s»"
+msgstr "%B: не-pic код � перемещением imm дл� динамиче�кого �имвола `%s'"
 
-#: elf32-ia64.c:4038 elf64-ia64.c:4038
+#: elf32-ia64.c:4775 elf64-ia64.c:4775
 msgid "%B: @gprel relocation against dynamic symbol %s"
 msgstr "%B: перемещение @gprel дл� динамиче�кого �имвола %s"
 
-#: elf32-ia64.c:4101 elf64-ia64.c:4101
+#: elf32-ia64.c:4838 elf64-ia64.c:4838
 msgid "%B: linking non-pic code in a position independent executable"
 msgstr "%B: компоновка не-pic кода в позиционно-незави�имый и�полн�емый"
 
-#: elf32-ia64.c:4238 elf64-ia64.c:4238
+#: elf32-ia64.c:4975 elf64-ia64.c:4975
 msgid "%B: @internal branch to dynamic symbol %s"
-msgstr "%B: ветвление @internal к динамиче�кому �имволу %s"
+msgstr "%B: переход @internal на динамиче�кий �имвол %s"
 
-#: elf32-ia64.c:4240 elf64-ia64.c:4240
+#: elf32-ia64.c:4977 elf64-ia64.c:4977
 msgid "%B: speculation fixup to dynamic symbol %s"
 msgstr "%B: догадка ме�тоположени� динамиче�кого �имвола %s"
 
-#: elf32-ia64.c:4242 elf64-ia64.c:4242
+#: elf32-ia64.c:4979 elf64-ia64.c:4979
 msgid "%B: @pcrel relocation against dynamic symbol %s"
 msgstr "%B: перемещение @pcrel дл� динамиче�кого �имвола %s"
 
-#: elf32-ia64.c:4439 elf64-ia64.c:4439
+#: elf32-ia64.c:5176 elf64-ia64.c:5176
 msgid "unsupported reloc"
 msgstr "неподдерживаемое перемещение"
 
-#: elf32-ia64.c:4477 elf64-ia64.c:4477
+#: elf32-ia64.c:5214 elf64-ia64.c:5214
 msgid "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."
-msgstr "%B: от�ут�твует TLS-раздел дл� перемещени� %s дл� «%s» по адре�у 0x%lx в разделе «%A»."
+msgstr "%B: от�ут�твует TLS-раздел дл� перемещени� %s дл� `%s' по адре�у 0x%lx в разделе `%A'."
 
-#: elf32-ia64.c:4492 elf64-ia64.c:4492
+#: elf32-ia64.c:5229 elf64-ia64.c:5229
 msgid "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."
-msgstr "%B: �евозможно о�лабить br (%s) до «%s» по адре�у 0x%lx в разделе «%A» � размером 0x%lx (> 0x1000000)."
+msgstr "%B: �евозможно о�лабить br (%s) до `%s' по адре�у 0x%lx в разделе `%A' � размером 0x%lx (> 0x1000000)."
 
-#: elf32-ia64.c:4754 elf64-ia64.c:4754
+#: elf32-ia64.c:5491 elf64-ia64.c:5491
 msgid "%B: linking trap-on-NULL-dereference with non-trapping files"
 msgstr "%B: компоновка trap-on-NULL-dereference � не-trapping файлами"
 
-#: elf32-ia64.c:4763 elf64-ia64.c:4763
+#: elf32-ia64.c:5500 elf64-ia64.c:5500
 msgid "%B: linking big-endian files with little-endian files"
 msgstr "%B: компоновка файлов � пр�мым пор�дком байт � файлами � обратным пор�дком байт"
 
-#: elf32-ia64.c:4772 elf64-ia64.c:4772
+#: elf32-ia64.c:5509 elf64-ia64.c:5509
 msgid "%B: linking 64-bit files with 32-bit files"
 msgstr "%B: компоновка 64-битных файлов � 32-битными файлами"
 
-#: elf32-ia64.c:4781 elf64-ia64.c:4781
+#: elf32-ia64.c:5518 elf64-ia64.c:5518
 msgid "%B: linking constant-gp files with non-constant-gp files"
 msgstr "%B: компоновка constant-gp файлов � не-constant-gp файлами"
 
-#: elf32-ia64.c:4791 elf64-ia64.c:4791
+#: elf32-ia64.c:5528 elf64-ia64.c:5528
 msgid "%B: linking auto-pic files with non-auto-pic files"
 msgstr "%B: компоновка auto-pic файлов � не-auto-pic файлами"
 
@@ -6171,22 +5950,10 @@ msgstr "%B: невозможно заполнить DataDictionary[PE_IMPORT_ADD
 msgid "%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because .idata$6 is missing"
 msgstr "%B: невозможно заполнить DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)], так как от�ут�твует .idata$6"
 
-#: peigen.c:2438 pepigen.c:2438 pex64igen.c:2438
+#: peigen.c:2436 pepigen.c:2436 pex64igen.c:2436
 msgid "%B: unable to fill in DataDictionary[9] because __tls_used is missing"
 msgstr "%B: невозможно заполнить DataDictionary[9], так как от�ут�твует __tls_used"
 
-#~ msgid "relocation references a different segment"
-#~ msgstr "перемещение указывает на другой �егмент"
-
-#~ msgid "%B: relocation type %d not implemented"
-#~ msgstr "%B: тип перемещени� «%s» не реализован"
-
-#~ msgid "warning: %B and %B differ in position-dependence of data addressing"
-#~ msgstr "предупреждение: в %B и %B различает�� адре�аци� незави�имых по положени� данных"
-
-#~ msgid "warning: %B and %B differ in position-dependence of code addressing"
-#~ msgstr "предупреждение: в %B и %B различает�� адре�аци� незави�имого по положени� кода"
-
 #~ msgid "Can't Make it a Short Jump"
 #~ msgstr "�евозможно выполнить короткий переход (Short Jump)"
 
diff --git a/bfd/reloc.c b/bfd/reloc.c
index fb3aab2656..6ac7148902 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -2247,23 +2247,6 @@ ENUMDOC
   MIPS16 low 16 bits.
 
 ENUM
-  BFD_RELOC_MIPS16_TLS_GD
-ENUMX
-  BFD_RELOC_MIPS16_TLS_LDM
-ENUMX
-  BFD_RELOC_MIPS16_TLS_DTPREL_HI16
-ENUMX
-  BFD_RELOC_MIPS16_TLS_DTPREL_LO16
-ENUMX
-  BFD_RELOC_MIPS16_TLS_GOTTPREL
-ENUMX
-  BFD_RELOC_MIPS16_TLS_TPREL_HI16
-ENUMX
-  BFD_RELOC_MIPS16_TLS_TPREL_LO16
-ENUMDOC
-  MIPS16 TLS relocations
-
-ENUM
   BFD_RELOC_MIPS_LITERAL
 ENUMX
   BFD_RELOC_MICROMIPS_LITERAL
@@ -2547,36 +2530,6 @@ ENUMDOC
   The addend of this reloc is an alignment power that must
   be honoured at the offset's location, regardless of linker
   relaxation.
-ENUM
-  BFD_RELOC_MN10300_TLS_GD
-ENUMX
-  BFD_RELOC_MN10300_TLS_LD
-ENUMX
-  BFD_RELOC_MN10300_TLS_LDO
-ENUMX
-  BFD_RELOC_MN10300_TLS_GOTIE
-ENUMX
-  BFD_RELOC_MN10300_TLS_IE
-ENUMX
-  BFD_RELOC_MN10300_TLS_LE
-ENUMX
-  BFD_RELOC_MN10300_TLS_DTPMOD
-ENUMX
-  BFD_RELOC_MN10300_TLS_DTPOFF
-ENUMX
-  BFD_RELOC_MN10300_TLS_TPOFF
-ENUMDOC
-  Various TLS-related relocations.
-ENUM
-  BFD_RELOC_MN10300_32_PCREL
-ENUMDOC
-  This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
-  instruction.
-ENUM
-  BFD_RELOC_MN10300_16_PCREL
-ENUMDOC
-  This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
-  instruction.
 COMMENT
 
 ENUM
@@ -3951,6 +3904,16 @@ ENUM
   BFD_RELOC_V850_DATA
 ENUMDOC
   start data in text.
+ENUM
+  BFD_RELOC_MN10300_32_PCREL
+ENUMDOC
+  This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
+  instruction.
+ENUM
+  BFD_RELOC_MN10300_16_PCREL
+ENUMDOC
+  This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
+  instruction.
 
 ENUM
   BFD_RELOC_TIC30_LDP
@@ -4353,73 +4316,6 @@ ENUMDOC
   instructions
 
 ENUM
-  BFD_RELOC_RL78_NEG8
-ENUMX
-  BFD_RELOC_RL78_NEG16
-ENUMX
-  BFD_RELOC_RL78_NEG24
-ENUMX
-  BFD_RELOC_RL78_NEG32
-ENUMX
-  BFD_RELOC_RL78_16_OP
-ENUMX
-  BFD_RELOC_RL78_24_OP
-ENUMX
-  BFD_RELOC_RL78_32_OP
-ENUMX
-  BFD_RELOC_RL78_8U
-ENUMX
-  BFD_RELOC_RL78_16U
-ENUMX
-  BFD_RELOC_RL78_24U
-ENUMX
-  BFD_RELOC_RL78_DIR3U_PCREL
-ENUMX
-  BFD_RELOC_RL78_DIFF
-ENUMX
-  BFD_RELOC_RL78_GPRELB
-ENUMX
-  BFD_RELOC_RL78_GPRELW
-ENUMX
-  BFD_RELOC_RL78_GPRELL
-ENUMX
-  BFD_RELOC_RL78_SYM
-ENUMX
-  BFD_RELOC_RL78_OP_SUBTRACT
-ENUMX
-  BFD_RELOC_RL78_OP_NEG
-ENUMX
-  BFD_RELOC_RL78_OP_AND
-ENUMX
-  BFD_RELOC_RL78_OP_SHRA
-ENUMX
-  BFD_RELOC_RL78_ABS8
-ENUMX
-  BFD_RELOC_RL78_ABS16
-ENUMX
-  BFD_RELOC_RL78_ABS16_REV
-ENUMX
-  BFD_RELOC_RL78_ABS32
-ENUMX
-  BFD_RELOC_RL78_ABS32_REV
-ENUMX
-  BFD_RELOC_RL78_ABS16U
-ENUMX
-  BFD_RELOC_RL78_ABS16UW
-ENUMX
-  BFD_RELOC_RL78_ABS16UL
-ENUMX
-  BFD_RELOC_RL78_RELAX
-ENUMX
-  BFD_RELOC_RL78_HI16
-ENUMX
-  BFD_RELOC_RL78_HI8
-ENUMX
-  BFD_RELOC_RL78_LO16
-ENUMDOC
-  Renesas RL78 Relocations.
-
-ENUM
   BFD_RELOC_RX_NEG8
 ENUMX
   BFD_RELOC_RX_NEG16
@@ -5614,10 +5510,6 @@ ENUMDOC
   Difference between two section addreses.  Must be followed by a
   BFD_RELOC_MACH_O_PAIR.
 ENUM
-  BFD_RELOC_MACH_O_LOCAL_SECTDIFF
-ENUMDOC
-  Like BFD_RELOC_MACH_O_SECTDIFF but with a local symbol.
-ENUM
   BFD_RELOC_MACH_O_PAIR
 ENUMDOC
   Pair of relocation.  Contains the first symbol.
@@ -5819,18 +5711,6 @@ ENUMX
 ENUMX
   BFD_RELOC_TILEPRO_SHAMT_Y1
 ENUMX
-  BFD_RELOC_TILEPRO_TLS_GD_CALL
-ENUMX
-  BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEPRO_TLS_IE_LOAD
-ENUMX
   BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD
 ENUMX
   BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD
@@ -5868,22 +5748,6 @@ ENUMX
   BFD_RELOC_TILEPRO_TLS_DTPOFF32
 ENUMX
   BFD_RELOC_TILEPRO_TLS_TPOFF32
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_LO
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_LO
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HI
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HI
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HA
-ENUMX
-  BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HA
 ENUMDOC
   Tilera TILEPro Relocations.
 
@@ -6002,6 +5866,18 @@ ENUMX
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT
 ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT
+ENUMX
   BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT
@@ -6010,21 +5886,25 @@ ENUMX
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT
 ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT
+ENUMX
   BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD
 ENUMX
-  BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_LE
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD
 ENUMX
-  BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_LE
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD
 ENUMX
-  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_LE
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD
 ENUMX
-  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_LE
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD
 ENUMX
-  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_LE
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD
 ENUMX
-  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_LE
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD
 ENUMX
@@ -6034,10 +5914,26 @@ ENUMX
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD
 ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD
+ENUMX
   BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE
 ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE
+ENUMX
   BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE
@@ -6046,6 +5942,10 @@ ENUMX
 ENUMX
   BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE
 ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE
+ENUMX
   BFD_RELOC_TILEGX_TLS_DTPMOD64
 ENUMX
   BFD_RELOC_TILEGX_TLS_DTPOFF64
@@ -6057,58 +5957,9 @@ ENUMX
   BFD_RELOC_TILEGX_TLS_DTPOFF32
 ENUMX
   BFD_RELOC_TILEGX_TLS_TPOFF32
-ENUMX
-  BFD_RELOC_TILEGX_TLS_GD_CALL
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_X0_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_X1_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_Y0_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_Y1_TLS_GD_ADD
-ENUMX
-  BFD_RELOC_TILEGX_TLS_IE_LOAD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_X0_TLS_ADD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_X1_TLS_ADD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_Y0_TLS_ADD
-ENUMX
-  BFD_RELOC_TILEGX_IMM8_Y1_TLS_ADD
 ENUMDOC
   Tilera TILE-Gx Relocations.
 
-ENUM
-  BFD_RELOC_EPIPHANY_SIMM8
-ENUMDOC
-  Adapteva EPIPHANY - 8 bit signed pc-relative displacement
-ENUM
-  BFD_RELOC_EPIPHANY_SIMM24
-ENUMDOC
-  Adapteva EPIPHANY - 24 bit signed pc-relative displacement
-ENUM
-  BFD_RELOC_EPIPHANY_HIGH
-ENUMDOC
-  Adapteva EPIPHANY - 16 most-significant bits of absolute address
-ENUM
-  BFD_RELOC_EPIPHANY_LOW
-ENUMDOC
-  Adapteva EPIPHANY - 16 least-significant bits of absolute address
-ENUM
-  BFD_RELOC_EPIPHANY_SIMM11
-ENUMDOC
-  Adapteva EPIPHANY - 11 bit signed number - add/sub immediate
-ENUM
-  BFD_RELOC_EPIPHANY_IMM11
-ENUMDOC
-  Adapteva EPIPHANY - 11 bit sign-magnitude number (ld/st displacement)
-ENUM
-  BFD_RELOC_EPIPHANY_IMM8
-ENUMDOC
-  Adapteva EPIPHANY - 8 bit immediate for 16 bit mov instruction.
-
 
 ENDSENUM
   BFD_RELOC_UNUSED
@@ -6273,9 +6124,9 @@ DESCRIPTION
 
 void
 bfd_generic_lookup_section_flags (struct bfd_link_info *info ATTRIBUTE_UNUSED,
-				  struct flag_info *flaginfo) 
+				  struct flag_info *finfo) 
 {
-  if (flaginfo != NULL)
+  if (finfo != NULL)
     {
       (*_bfd_error_handler) (_("INPUT_SECTION_FLAGS are not supported.\n"));
       return;
@@ -6426,15 +6277,6 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
 		    goto error_return;
 		  break;
 		case bfd_reloc_outofrange:
-		  /* PR ld/13730:
-		     This error can result when processing some partially
-		     complete binaries.  Do not abort, but issue an error
-		     message instead.  */
-		  link_info->callbacks->einfo
-		    (_("%X%P: %B(%A): relocation \"%R\" goes out of range\n"),
-		     abfd, input_section, * parent);
-		  goto error_return;
-
 		default:
 		  abort ();
 		  break;
diff --git a/bfd/targets.c b/bfd/targets.c
index 112ac12552..46c2c9442e 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1,6 +1,6 @@
 /* Generic target-file-type support for the BFD library.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -607,7 +607,6 @@ extern const bfd_target bfd_elf32_crx_vec;
 extern const bfd_target bfd_elf32_d10v_vec;
 extern const bfd_target bfd_elf32_d30v_vec;
 extern const bfd_target bfd_elf32_dlx_big_vec;
-extern const bfd_target bfd_elf32_epiphany_vec;
 extern const bfd_target bfd_elf32_fr30_vec;
 extern const bfd_target bfd_elf32_frv_vec;
 extern const bfd_target bfd_elf32_frvfdpic_vec;
@@ -668,9 +667,7 @@ extern const bfd_target bfd_elf32_pj_vec;
 extern const bfd_target bfd_elf32_pjl_vec;
 extern const bfd_target bfd_elf32_powerpc_vec;
 extern const bfd_target bfd_elf32_powerpcle_vec;
-extern const bfd_target bfd_elf32_powerpc_freebsd_vec;
 extern const bfd_target bfd_elf32_powerpc_vxworks_vec;
-extern const bfd_target bfd_elf32_rl78_vec;
 extern const bfd_target bfd_elf32_rx_le_vec;
 extern const bfd_target bfd_elf32_rx_be_vec;
 extern const bfd_target bfd_elf32_rx_be_ns_vec;
@@ -704,8 +701,7 @@ extern const bfd_target bfd_elf32_tic6x_elf_be_vec;
 extern const bfd_target bfd_elf32_tic6x_elf_le_vec;
 extern const bfd_target bfd_elf32_tic6x_linux_be_vec;
 extern const bfd_target bfd_elf32_tic6x_linux_le_vec;
-extern const bfd_target bfd_elf32_tilegx_be_vec;
-extern const bfd_target bfd_elf32_tilegx_le_vec;
+extern const bfd_target bfd_elf32_tilegx_vec;
 extern const bfd_target bfd_elf32_tilepro_vec;
 extern const bfd_target bfd_elf32_tradbigmips_vec;
 extern const bfd_target bfd_elf32_tradlittlemips_vec;
@@ -733,7 +729,6 @@ extern const bfd_target bfd_elf64_littlemips_vec;
 extern const bfd_target bfd_elf64_mmix_vec;
 extern const bfd_target bfd_elf64_powerpc_vec;
 extern const bfd_target bfd_elf64_powerpcle_vec;
-extern const bfd_target bfd_elf64_powerpc_freebsd_vec;
 extern const bfd_target bfd_elf64_s390_vec;
 extern const bfd_target bfd_elf64_sh64_vec;
 extern const bfd_target bfd_elf64_sh64l_vec;
@@ -744,17 +739,14 @@ extern const bfd_target bfd_elf64_sh64nbsd_vec;
 extern const bfd_target bfd_elf64_sparc_vec;
 extern const bfd_target bfd_elf64_sparc_freebsd_vec;
 extern const bfd_target bfd_elf64_sparc_sol2_vec;
-extern const bfd_target bfd_elf64_tilegx_be_vec;
-extern const bfd_target bfd_elf64_tilegx_le_vec;
+extern const bfd_target bfd_elf64_tilegx_vec;
 extern const bfd_target bfd_elf64_tradbigmips_vec;
 extern const bfd_target bfd_elf64_tradlittlemips_vec;
 extern const bfd_target bfd_elf64_tradbigmips_freebsd_vec;
 extern const bfd_target bfd_elf64_tradlittlemips_freebsd_vec;
 extern const bfd_target bfd_elf64_x86_64_freebsd_vec;
-extern const bfd_target bfd_elf64_x86_64_nacl_vec;
 extern const bfd_target bfd_elf64_x86_64_sol2_vec;
 extern const bfd_target bfd_elf64_x86_64_vec;
-extern const bfd_target bfd_elf32_x86_64_nacl_vec;
 extern const bfd_target bfd_elf32_x86_64_vec;
 extern const bfd_target bfd_elf64_l1om_freebsd_vec;
 extern const bfd_target bfd_elf64_l1om_vec;
@@ -976,7 +968,6 @@ static const bfd_target * const _bfd_target_vector[] =
 	&bfd_elf32_d10v_vec,
 	&bfd_elf32_d30v_vec,
 	&bfd_elf32_dlx_big_vec,
-	&bfd_elf32_epiphany_vec,
 	&bfd_elf32_fr30_vec,
 	&bfd_elf32_frv_vec,
 	&bfd_elf32_frvfdpic_vec,
@@ -1042,8 +1033,6 @@ static const bfd_target * const _bfd_target_vector[] =
 	&bfd_elf32_powerpc_vec,
 	&bfd_elf32_powerpc_vxworks_vec,
 	&bfd_elf32_powerpcle_vec,
-	&bfd_elf32_powerpc_freebsd_vec,
-	&bfd_elf32_rl78_vec,
 	&bfd_elf32_rx_be_vec,
 	&bfd_elf32_rx_be_ns_vec,
 	&bfd_elf32_rx_le_vec,
@@ -1077,8 +1066,7 @@ static const bfd_target * const _bfd_target_vector[] =
 	&bfd_elf32_spu_vec,
 	&bfd_elf32_tic6x_be_vec,
 	&bfd_elf32_tic6x_le_vec,
-	&bfd_elf32_tilegx_be_vec,
-	&bfd_elf32_tilegx_le_vec,
+	&bfd_elf32_tilegx_vec,
 	&bfd_elf32_tilepro_vec,
 	&bfd_elf32_tradbigmips_vec,
 	&bfd_elf32_tradlittlemips_vec,
@@ -1107,7 +1095,6 @@ static const bfd_target * const _bfd_target_vector[] =
 	&bfd_elf64_mmix_vec,
 	&bfd_elf64_powerpc_vec,
 	&bfd_elf64_powerpcle_vec,
-	&bfd_elf64_powerpc_freebsd_vec,
 	&bfd_elf64_s390_vec,
 	&bfd_elf64_sh64_vec,
 	&bfd_elf64_sh64l_vec,
@@ -1118,17 +1105,14 @@ static const bfd_target * const _bfd_target_vector[] =
 	&bfd_elf64_sparc_vec,
 	&bfd_elf64_sparc_freebsd_vec,
 	&bfd_elf64_sparc_sol2_vec,
-	&bfd_elf64_tilegx_be_vec,
-	&bfd_elf64_tilegx_le_vec,
+	&bfd_elf64_tilegx_vec,
 	&bfd_elf64_tradbigmips_vec,
 	&bfd_elf64_tradlittlemips_vec,
 	&bfd_elf64_tradbigmips_freebsd_vec,
 	&bfd_elf64_tradlittlemips_freebsd_vec,
 	&bfd_elf64_x86_64_freebsd_vec,
-	&bfd_elf64_x86_64_nacl_vec,
 	&bfd_elf64_x86_64_sol2_vec,
 	&bfd_elf64_x86_64_vec,
-	&bfd_elf32_x86_64_nacl_vec,
 	&bfd_elf32_x86_64_vec,
 	&bfd_elf64_l1om_freebsd_vec,
 	&bfd_elf64_l1om_vec,
diff --git a/bfd/version.h b/bfd/version.h
index d9d8427cde..c6800ec4a6 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20120328
+#define BFD_VERSION_DATE 20111121
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index cc62d11b8b..0584186014 100644
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -277,9 +277,6 @@ vms_traverse_index (bfd *abfd, unsigned int vbn, struct carsym_mem *cs)
       if (idx_vbn == 0)
         return FALSE;
 
-      /* Point to the next index entry.  */
-      p = keyname + keylen;
-
       if (idx_off == RFADEF__C_INDEX)
         {
           /* Indirect entry.  Recurse.  */
@@ -371,6 +368,9 @@ vms_traverse_index (bfd *abfd, unsigned int vbn, struct carsym_mem *cs)
                 return FALSE;
             }
         }
+
+      /* Point to the next index entry.  */
+      p = keyname + keylen;
     }
 
   return TRUE;
@@ -1542,24 +1542,18 @@ get_idxlen (struct lib_index *idx, bfd_boolean is_elfidx)
 {
   if (is_elfidx)
     {
-      /* 9 is the size of struct vms_elfidx without keyname.  */
       if (idx->namlen > MAX_KEYLEN)
-        return 9 + sizeof (struct vms_kbn);
+        return 9 + sizeof (struct vms_rfa);
       else
         return 9 + idx->namlen;
     }
   else
-    {
-      /* 7 is the size of struct vms_idx without keyname.  */
-      return 7 + idx->namlen;
-    }
+    return 7 + idx->namlen;
 }
 
-/* Write the index composed by NBR symbols contained in IDX.
-   VBN is the first vbn to be used, and will contain on return the last vbn.
+/* Write the index.  VBN is the first vbn to be used, and will contain
+   on return the last vbn.
    Can be called with ABFD set to NULL just to size the index.
-   If not null, TOPVBN will be assigned to the vbn of the root index tree.
-   IS_ELFIDX is true for elfidx (ie ia64) indexes layout.
    Return TRUE on success.  */
 
 static bfd_boolean
@@ -1643,11 +1637,9 @@ vms_write_index (bfd *abfd,
                         }
                       *(unsigned short *)kbn_blk = 0;
                     }
-                  /* Allocate a new block for the keys.  */
                   kbn_vbn = (*vbn)++;
                   kbn_sz = VMS_BLOCK_SIZE - 2;
                 }
-              /* Size of the chunk written to the current key block.  */
               if (kl + sizeof (struct vms_kbn) > kbn_sz)
                 kl_chunk = kbn_sz - sizeof (struct vms_kbn);
               else
@@ -2006,7 +1998,6 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
   unsigned int mod_idx_vbn;
   unsigned int sym_idx_vbn;
   bfd_boolean is_elfidx = tdata->kind == vms_lib_ia64;
-  unsigned int max_keylen = is_elfidx ? 1025 : MAX_KEYLEN;
 
   /* Count the number of modules (and do a first sanity check).  */
   nbr_modules = 0;
@@ -2038,7 +2029,7 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
        current != NULL;
        current = current->archive_next, i++)
     {
-      unsigned int nl;
+      int nl;
 
       modules[i].abfd = current;
       modules[i].name = vms_get_module_name (current->filename, FALSE);
@@ -2046,7 +2037,7 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
 
       /* FIXME: silently truncate long names ?  */
       nl = strlen (modules[i].name);
-      modules[i].namlen = (nl > max_keylen ? max_keylen : nl);
+      modules[i].namlen = (nl > MAX_KEYLEN ? MAX_KEYLEN : nl);
     }
 
   /* Create the module index.  */
@@ -2237,27 +2228,20 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
     bfd_putl32 (nbr_modules, lhd->modcnt);
     bfd_putl32 (nbr_modules, lhd->modhdrs);
 
-    /* Number of blocks for index.  */
-    bfd_putl32 (nbr_mod_iblk + nbr_sym_iblk, lhd->idxblks);
     bfd_putl32 (vbn - 1, lhd->hipreal);
     bfd_putl32 (vbn - 1, lhd->hiprusd);
 
-    /* VBN of the next free block.  */
-    bfd_putl32 ((off / VMS_BLOCK_SIZE) + 1, lhd->nextvbn);
-    bfd_putl32 ((off / VMS_BLOCK_SIZE) + 1, lhd->nextrfa + 0);
-    bfd_putl16 (0, lhd->nextrfa + 4);
-
     /* First index (modules name).  */
     idd_flags = IDD__FLAGS_ASCII | IDD__FLAGS_VARLENIDX
       | IDD__FLAGS_NOCASECMP | IDD__FLAGS_NOCASENTR;
     bfd_putl16 (idd_flags, idd->flags);
-    bfd_putl16 (max_keylen, idd->keylen);
+    bfd_putl16 (MAX_KEYLEN, idd->keylen);
     bfd_putl16 (mod_idx_vbn, idd->vbn);
     idd++;
 
     /* Second index (symbols name).  */
     bfd_putl16 (idd_flags, idd->flags);
-    bfd_putl16 (max_keylen, idd->keylen);
+    bfd_putl16 (MAX_KEYLEN, idd->keylen);
     bfd_putl16 (sym_idx_vbn, idd->vbn);
     idd++;
 
diff --git a/bfd/xsym.c b/bfd/xsym.c
index 0926297e05..01434e1b72 100644
--- a/bfd/xsym.c
+++ b/bfd/xsym.c
@@ -19,8 +19,6 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-/* xSYM is the debugging format used by CodeWarrior on Mac OS classic.  */
-
 #include "alloca-conf.h"
 #include "sysdep.h"
 #include "xsym.h"
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 425f9268b2..2f5af61ba9 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,161 +1,648 @@
-2012-03-07  Nick Clifton  <nickc@redhat.com>
-
-	* readelf.c (is_16bit_abs_reloc): Add detection of R_MN10300_16.
-
-2012-02-29  Jeff Law  <law@redhat.com>
-
-	* doc/binutils.texi (c++filt): Fix typos.
-
-2012-02-24  Kai Tietz  <ktietz@redhat.com>
-
-	PR binutils/13710
-	* defparse.y (keyword_as_name): Disable LIBRARY
-	keyword.
-	* doc/binutils.texi: Document LIBRARY exception.
-
-2012-02-21  Kai Tietz<ktietz@redhat.com>
-
-	PR binutils/13682
-	* NEWS: Mention new feature.
-	* dlltool.c (i386_x64_dljtab): New stub-code for x64
-	delayed-load feature.
-	(i386_x64_trampoline): New trampoline-code for x64
-	delayed-load feature.
-	(make_one_lib_file): Add support for x64 delayed-load
-	feature.
-	(make_delay_head): Likewis
-
-2012-02-20  Namhyung Kim  <namhyung.kim@lge.com>
-
-	* objdump.c (slurp_file): Close file if fstat fails.
-
-2012-02-14  Cary Coutant  <ccoutant@google.com>
-
-	* dwarf.c (dwarf_vmatoa64): New function.
-	(read_and_display_attr_value): Print 8-byte forms as single hex
-	numbers.
-	(process_debug_info): Print type signatures as single hex numbers.
-	* elfcomm.c (byte_get_64): New function.
-	* elfcomm.h (byte_get_64): New function.
-
-2012-02-11  Kai Tietz  <ktietz@redhat.com>
-
-	PR binutils/13657
-	* defparse.y (%union): New type id_const.
-	(opt_name2): New rule.
-	(keyword_as_name): New rule.
-	(opt_name): Adjust rule.
-	(opt_import_name): Likewise.
-	(opt_equal_name): Likewise.
-
-2012-02-11  Kai Tietz  <ktietz@redhat.com>
-
-	PR binutils/13297
-	* resrc.c (write_rc_dialog_control): Omit text dump for
-	EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR.
-
-2012-02-09  Alan Modra  <amodra@gmail.com>
-
-	* sysdep.h: Include sys/stat.h here.
-	* ar.c: Don't include headers already included by sysdep.h.
-	* bucomm.c: Likewise.
-	* budbg.h: Likewise.
-	* dlltool.h: Likewise.
-	* elfedit.c: Likewise.
-	* nlmconv.c: Likewise.
-	* objcopy.c: Likewise.
-	* objdump.c: Likewise.
-	* objdump.h: Likewise.
-	* readelf.c: Likewise.
-	* rename.c: Likewise.
-	* resrc.c: Likewise.
-	* strings.c: Likewise.
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+	PR binutils/13278
+	* ar.c (open_inarch): Set the target from the the first object
+	on the list only if it isn't set.
+
+2011-09-22  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add marker for 2.22.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* MAINTAINER: Take over from Jakub Jalinek as SPARC maintainer.
+
+	* readelf.c (display_sparc_hwcaps): New.
+	(display_sparc_gnu_attribute): New.
+	(process_sparc_specific): New.
+	(process_arch_specific): When EM_SPARC, EM_SPARC32PLUS,
+	or EM_SPARCV9 invoke process_sparc_specific.
+
+2011-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/13196
+	* dwarf.c (display_debug_aranges): Check zero address size.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/13180
+	* objcopy.c (is_strip_section_1): New.
+	(is_strip_section): Use it.  Remove the group section if all
+	members are removed.
+
+2011-09-08  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese translation.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-08  Marcus Comstedt  <marcus@mc.pp.se>
+
+	PR binutils/12964
+	* Makefile.am (embedspu): Use awk rather than sed.
+	* Makefile.in: Regenerate.
+
+2011-07-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (read_and_display_attr_value): Recognize DW_FORM_data4 and
+	DW_FORM_data8 as location list pointers only for DWARF < 4.
+
+2011-07-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* NEWS: Mention .debug_macro support.
+	* dwarf.c (read_and_display_attr_value): Don't print a tab
+	if attribute is 0.
+	(get_AT_name): Handle DW_AT_GNU_macros.
+	(get_line_filename_and_dirname, display_debug_macro): New
+	functions.
+	(debug_displays): Add an entry for .debug_macro and .zdebug_macro.
+	* readelf.c (process_section_headers): With do_debug_macinfo
+	handle also .debug_macro sections.
+	* dwarf.h (dwarf_section_display_enum): Add macro.
+
+2011-07-24  Chao-ying Fu  <fu@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Handle microMIPS ASE.
+	(get_mips_symbol_other): Likewise.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (init_dwarf_regnames): Handle EM_K1OM.
+
+	* elfedit.c (elf_machine): Support EM_K1OM.
+	(elf_class): Likewise.
+
+	* readelf.c (guess_is_rela): Handle EM_K1OM.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	(get_section_type_name): Likewise.
+	(get_elf_section_flags): Likewise.
+	(process_section_headers): Likewise.
+	(get_symbol_index_type): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+	(is_32bit_pcrel_reloc): Likewise.
+	(is_64bit_abs_reloc): Likewise.
+	(is_64bit_pcrel_reloc): Likewise.
+	(is_none_reloc): Likewise.
+
+	* doc/binutils.texi: Mention K1OM for elfedit.
+
+2011-07-11  Cary Coutant  <ccoutant@google.com>
+
+	PR 12983
+	* binutils/nm.c (display_file): Decompress debug sections when
+	printing line numbers.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* elfedit.c (osabis): Use ELFOSABI_GNU name instead of ELFOSABI_LINUX
+	alias and ELFOSABI_HURD.  Add GNU alias.
+	* readelf.c (get_osabi_name, get_symbol_binding, get_symbol_type):
+	Likewise.
+	* doc/binutils.texi <elfedit>: Update accordingly.
+
+2011-07-01  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12325
+	* doc/binutils.texi (ar cmdline): Document --target, --version and
+	--help command line options.
+
+2011-06-30  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12558
+	* ar.c (main): When asked to move members in an archive that is
+	being created, ignore the move request.
+
+2011-06-29  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_section_type_name): When displaying an unknown
+	section type display the hex value first on the assumption that
+	the full message will probably be truncated into a 15 character
+	field.
+
+2011-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (decode_location_expression): For DW_OP_GNU_convert and
+	DW_OP_GNU_reinterpret, if uvalue is 0, don't add cu_offset.
+	Handle DW_OP_GNU_parameter_ref.
+
+2011-06-16  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf-mode.el (dwarf-do-insert-substructure): Call
+	expand-file-name.
+	(dwarf-do-refresh): Likewise.
+
+2011-06-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* readelf.c (get_note_type): Handle NT_ARM_VFP.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* readelf.c: Include tilepro.h and tilegx.h.
+	(guess_is_rela): Handle EM_TILEGX and EM_TILEPRO.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+	(is_32bit_pcerel_reloc): Likewise.
+	(is_64bit_abs_reloc): Likewise.
+	(is_64bit_pcrel_reloc): Likewise.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* od-xcoff.c (xcoff32_read_symbols): Allow missing string table
+	length.
+
+2011-06-08  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12855
+	* readelf.c (process_version_sections): Handle binaries containing
+	corrupt version information.
+	(process_symbol_table): Stop processing a symbol's version
+	information if it could not be read in.
+
+	(get_data): Add comment describing the function.
+	(process_section_headers): Set dynamic_strings_length to 0 if the
+	dynamic strings could not be read in.
+	(process_dynamic_section): Likewise.
+	(process_section_groups): Stop processing the group information if
+	the data could not be read in.
+	(hppa_processs_unwind): Assert that there is only one string table
+	in the file.
+	(arm_process_unwind): Likewise.
+	(ia64_process_unwind): Likewise.
+	Set the size of the unwind auxillary information to 0 if the data
+	could not be read.
+	(load_specific_debug_section): Handle a failure to read in the
+	section.
+	(process_mips_specific): Stop display of the PLT GOT section if it
+	could not be read in.
+
+2011-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (DEFS): Define OBJDUMP_PRIVATE_VECTORS.
+
+2011-06-07  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf.c: Fix conversion to TU number.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* resres.c: Fix spelling typo.
+	* windint.h: Likewise.
+	* windmc.c: Likewise.
 	* windres.c: Likewise.
-	* od-macho.c: Ensure #include sysdep.h is first.
-	* od-xcoff.c: Likewise.
-	* dllwrap.c: Remove alloca pragma handled by sysdep.h, and
-	remove duplicate headers.
-	* dlltool.c: Likewise and ensure #include sysdep.h is first.
+	* po/POTFILES.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2011-06-01  Daniel Jacobowitz  <drow@false.org>
+
+	* MAINTAINERS: Update my email address.
+
+2011-05-31  Matthias Klose  <doko@ubuntu.com>
+
+	* configure.in (BUILD_INSTALL_MISC): Only add embedspu once.
+	* configure: Regenerate.
+
+2011-05-30  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12820
+	* Makefile.am (bin_PROGRAMS): Move BUILD_INSTALL_MISC to..
+	(bin_SCRIPTS): ..here.
+	(EXTRA_SCRIPTS): Define.
+	(EXTRA_DIST): Add embedspu.sh.
+	(DISTCLEANFILES): Add embedspu.
+	(embedspu): Depend on Makefile.  Replace sed "s" command with "c".
+	* Makefile.in: Regenerate.
+
+2011-05-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (loc_offsets): New variable.
+	(loc_offsets_compar): New routine.
+	(display_debug_loc): Handle loc_offsets not being in ascending order
+	and also a single .debug_loc entry being used multiple times.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12753
+	* nm.c (filter_symbols): Treat unique symbols as global symbols.
+	* doc/binutils.texi (nm): Mention that some lowercase letters
+	actually indicate global symbols.
+
+2011-05-15  Tristan Gingold  <gingold@adacore.com>
+
+	* od-xcoff.c: New file.
+	* objdump.h: New file.
+	* objdump.c: Include objdump.h
+	(dump_private_options, objdump_private_vectors): New variables.
+	(usage): Mention -P/--private.  Display handled options.
+	(long_options): Add -P/--private.
+	(dump_target_specific): New function.
+	(dump_bfd): Handle dump_private_options.
+	(main): Handle -P.
+	* doc/binutils.texi (objdump): Document -P/--private.
+	* configure.in (OBJDUMP_PRIVATE_VECTORS, OBJDUMP_PRIVATE_OFILES):
+	New variables, compute them.
+	(od_vectors): Add vectors for private dumpers. Make them uniq.
+	(OBJDUMP_DEFS): Add OBJDUMP_PRIVATE_VECTORS.
+	* Makefile.am (HFILES): Add objdump.h
+	(CFILES): Add od-xcoff.c
+	(OBJDUMP_PRIVATE_OFILES): New variable.
+	(objdump_DEPENDENCIES): Append OBJDUMP_PRIVATE_OFILES.
+	(objdump_LDADD): Ditto.
+	(EXTRA_objdump_SOURCES): Define.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2011-05-10  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf.c (process_extended_line_op): Dump unknown records.
+
+2011-05-07  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12632
+	* objcopy.c (copy_archive): Check bfd_openw result in unknown object
+	case.  Rewrite without goto.
+
+2011-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (decode_location_expression): Handle DW_OP_GNU_const_type,
+	DW_OP_GNU_regval_type, DW_OP_GNU_deref_type, DW_OP_GNU_convert
+	and DW_OP_GNU_reinterpret.
+
+	* MAINTAINERS: Add myself as DWARF2 maintainer.
+
+2011-05-02  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12720
+	Revert the following change
+	Michael Snyder  <msnyder@vmware.com>
+	* ar.c (move_members): Plug memory leak.
+	(delete_members): Plug memory leak.
+
+2011-04-28  Tom Tromey  <tromey@redhat.com>
+
+	* NEWS: Add note about --dwarf-depth, --dwarf-start, and
+	dwarf-mode.el.
+	* objdump.c (suppress_bfd_header): New global.
+	(usage): Update.
+	(OPTION_DWARF_DEPTH, OPTION_DWARF_START): New constants.
+	(options): Add dwarf-depth and dwarf-start entries.
+	(dump_bfd): Use suppress_bfd_header.
+	(main): Handle OPTION_DWARF_START, OPTION_DWARF_DEPTH.
+	* doc/binutils.texi (objcopy): Document --dwarf-depth and
+	--dwarf-start.
+	(readelf): Likewise.
+	* dwarf-mode.el: New file.
+	* dwarf.c (dwarf_cutoff_level, dwarf_start_die): New globals.
+	(read_and_display_attr_value): Also check debug_info_p.
+	(process_debug_info): Handle dwarf_start_die and
+	dwarf_cutoff_level.
+	* dwarf.h (dwarf_cutoff_level, dwarf_start_die): Declare.
+	* readelf.c (usage): Update.
+	(OPTION_DWARF_DEPTH): New macro.
+	(OPTION_DWARF_START): Likewise.
+	(options): Add dwarf-depth and dwarf-start entries.
+	(parse_args): Handle OPTION_DWARF_START and OPTION_DWARF_DEPTH.
+
+2011-04-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (display_gdb_index): Support version 5, warn on version 4.
+
+2011-04-27  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf.c (process_extended_line_op): Handle
+	DW_LNE_HP_source_file_correlation.
+
+2011-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (print_stapsdt_note): New function.
+	(process_note): Use it.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (get_stapsdt_note_type): New function.
+	(process_note): Recognize "stapsdt" notes.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (process_corefile_note_segment): Change header field
+	widths.
+	(process_note): Change field widths.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (print_gnu_note): New function.
+	(process_note): Use it.
+
+2011-04-21  Jie Zhang  <jzhang918@gmail.com>
+
+	* MAINTAINERS: Update my email address.
+
+2011-04-11  Kai Tietz  <ktietz@redhat.com>
+
+	* windres.c (usage): Add new --preprocessor-arg option.
+	(option_values): Add new OPTION_PREPROCESSOR_ARG enumerator.
+	(option long_options): Add preprocessor-arg option.
+	(main): Handle it.
+	* doc/binutils.texi: Add documentation for --preprocessor-arg
+	option.
+	* NEWS: Add line about new --preprocessor-arg option for windres.
+
+2011-04-08  John Marino  <binutils@marino.st>
+
+	* arlex.l: Prevent redefinition of YY_NO_UNPUT.
+	* syslex.l: Likewise.
+
+2011-04-07  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (arm_section_get_word): Handle C6000 relocations.
+	(decode_tic6x_unwind_regmask, decode_arm_unwind_bytecode,
+	decode_tic6x_unwind_bytecode, expand_prel31): New functions.
+	(decode_arm_unwind): Split out common code from ARM specific bits.
+	(dump_arm_unwind): Use expand_prel31.
+	(arm_process_unwind): Handle SHT_C6000_UNWIND sections.
+	(process_unwind): Add SHT_C6000_UNWIND.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (thumb-*-pe*): Remove.
+	* configure: Regenerate.
+
+2011-04-05  Sterling Augustine  <augustine.sterling@gmail.com>
+
+	* MAINTAINERS: Update my email address.
+
+2011-04-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12632
+	* objcopy.c (copy_unknown_object): Make the archive element
+	readable.
+
+2011-04-03  David S. Miller  <davem@davemloft.net>
+
+	* objdump.c (dump_reloc_set): Output R_SPARC_OLO10 relocations
+	accurately, rather than how they are represented internally.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (readelf.exe): New target.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (DEBUG_OBJS): Add elfcomm.obj.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* readelf.c (get_symbol_index_type): Handle SCOM for TIC6X.
+	(dump_relocations): Likewise.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* readelf.c (get_ia64_vms_note_type): New function.
+	(print_ia64_vms_note): Ditto.
+	(process_note): Recognize VMS/ia64 specific notes.
+	Display them.
+	(process_corefile_note_segment): Decode VMS notes.
+
+2011-03-30  Catherine Moore  <clm@codesourcery.com>
+
+	* addr2line.c (translate_addresses): Sign extend the pc
+	if sign_extend_vma is enabled.
+
+2011-03-30  Michael Snyder  <msnyder@msnyder-server.eng.vmware.com>
+
+	* readelf.c (process_gnu_liblist): Stop memory leak.
+
+2011-03-29  Alan Modra  <amodra@gmail.com>
+
+	* coffdump.c: Include bfd_stdint.h
+
+2011-03-28  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* coffdump.c (coff_dump): Correct spelling error.
+	(show_usage): Replace SYSROFF by COFF.
+
+2011-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* coffdump.c (dump_coff_scope): Use double typecast for pointer P
+	to allow compilation for all targets.
 
-2012-02-01  Nick Clifton  <nickc@redhat.com>
+2011-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
 
-	PR binutils/13493
-	* ar.c (ranlib_main): Process --plugin option.
-	* doc/binutils.texi: Document --plugin support for ranlib.
+	* dwarf.c (process_debug_info): Use offset_size to determine
+	the bit-size of the computation unit's offset.
+	(decode_location_expression): Use dwarf_vmatoa function to display
+	DW_OP_addr OP.
+	(process_debug_info): Use dwarf_vma type for local variables
+	length and type_offset.
 
-2012-02-01  Nick Clifton  <nickc@redhat.com>
+2011-03-25  Michael Snyder  <msnyder@vmware.com>
 
-	PR binutils/13482
-	* readelf.c (process_corefile_note_segment): Fix off-by-one errors
-	verifying the contents of a note.
+	* strings.c (print_strings): Plug memory leak.
+	* ar.c (move_members): Plug memory leak.
+	(delete_members): Plug memory leak.
+	(write_archive): Plug memory leak.
+	* ieee.c (ieee_add_bb11): Plug memory leak.
+	(ieee_function_type): Likewise.
+	(ieee_class_baseclass): Likewise.
+	* prdbg.c (pr_function_type): Close memory leaks.
+	(pr_method_type): Likewise.
+	(tg_class_static_member): Likewise.
+	(tg_class_method_variant): Likewise.
+	(tg_class_static_method_variant): Likewise.
+	* stabs.c (parse_stab_enum_type): Fix memory leaks.
+	(parse_stab_struct_type): Likewise.
+	(parse_stab_struct_fields): Likewise.
+	(parse_stab_one_struct_field): Likewise.
+	(parse_stab_members): Likewise.
+	(stab_demangle_qualified): Likewise.
+	* objdump.c (dump_reloc_set): Free malloced memory.
+	* bucomm.c (make_tempname): Stop memory leak.
 
-2012-01-26  Nick Clifton  <nickc@redhat.com>
+2011-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
 
-	PR binutils/13622
-	* readelf.c (process_section_groups): If there are no section
-	headers do not scan for section groups.
-	(process_note_sections): Likewise for note sections.
+	Replace bfd_vma type and analog types by dwarf_vma and analogs.
+	Use dwarf specific print functions to display these type values.
+	* dwarf.h (dwarf_signed_vma): New type;
+	(DWARF2_External_LineInfo): Replace bfd_vma by dwarf_vma.
+	(DWARF2_External_PubNames): Likewise.
+	(DWARF2_External_CompUnit): Likewise.
+	(DWARF2_External_ARange): Likewise.
+	(read_leb128): Change return type to dwarf_vma.
+	* dwarf.c (print_dwarf_vma): Use __MINGW32__ conditional and
+	check byte_size values.
+	(dwarf_vmatoa): Change parameter type to dwarf_vma.
+	(dwarf_svmatoa): New static function.
+	(read_leb128): Change return type to dwarf_vma.
+	(read_sleb128): New static function.
+	(struct State_Machine_Registers): Change address field type to
+	dwarf_vma.
+	(process_extended_line_op): Adapt to type changes.
+	(fetch_indirect_string): Likewise.
+	(idisplay_block): Likewise.
+	(decode_location_expression): Likewise.
+	(read_and_display_attr_value): Likewise.
+	(process_debug_info): Likewise.
+	(display_debug_lines_raw): Likewise.
+	(display_debug_lines_decoded): Likewise.
+	(SLEB macro): Use new read_sleb128 function.
+
+2011-03-17  Alan Modra  <amodra@gmail.com>
+
+	PR 12590
+	* ar.c (ranlib_main): Init arg_index properly.
+	(usage): Describe --target.
+
+2011-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (dw_TAG_name): Handle DW_TAG_GNU_call_site_parameter.
+	(read_and_display_attr_value): Handle DW_AT_GNU_call_site_data_value,
+	DW_AT_GNU_call_site_target and DW_AT_GNU_call_site_target_clobbered.
+	(get_AT_name): Handle DW_AT_GNU_call_site_value,
+	DW_AT_GNU_call_site_data_value, DW_AT_GNU_call_site_target,
+	DW_AT_GNU_call_site_target_clobbered, DW_AT_GNU_tail_call,
+	DW_AT_GNU_all_tail_call_sites, DW_AT_GNU_all_call_sites and
+	DW_AT_GNU_all_source_call_sites.
+	(decode_location_expression) <case DW_OP_GNU_entry_value>: Adjust
+	handling.
+
+2011-03-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (get_TAG_name): Handle DW_TAG_GNU_call_site.
+	(decode_location_expression): Handle DW_OP_GNU_entry_value.
+	(read_and_display_attr_value): Handle DW_AT_GNU_call_site_value.
+	(get_AT_name): Likewise.
+
+2011-03-14  Michael Snyder  <msnyder@vmware.com>
+
+	* objcopy.c (set_pe_subsystem): Free subsystem.
+
+	* wrstabs.c (stab_start_struct_type): Close memory leak.
+
+	* readelf.c (process_version_sections): Free symbols.
+
+	* nm.c (display_rel_file): Free symsizes.
+
+2011-03-10  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_machine_name): Update EM_V850 entry.
+
+2011-03-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* objdump.c (usage): Fix single typo.
+	* po/bg.po, po/binutils.pot, po/da.po, po/es.po, po/fi.po,
+	po/fr.po, po/id.po, po/ja.po, po/ru.po, po/vi.po: Likewise.
+
+2011-03-01  Akos Pasztory  <akos.pasztory@gmail.com>
+
+	PR binutils/12523
+	* readelf.c (process_object): Clear dynamic_info_DT_GNU_HASH.
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* debug.c (debug_start_source): Use filename_(n)cmp.
+	* ieee.c (ieee_finish_compilation_unit): Likewise.
+	(ieee_lineno): Likewise.
+	* nlmconv.c (main): Likewise.
+	* objcopy.c (strip_main): Likewise.
+	(copy_main): Likewise.
+	* objdump.c (show_line): Likewise.
+	(dump_reloc_set): Likewise.
+	* srconv.c (main): Likewise.
+	* wrstabs.c (stab_lineno): Likewise.
+
+2011-02-24  Zachary T Welch  <zwelch@codesourcery.com>
+
+	* readelf.c (decode_arm_unwind): Implement decoding of remaining
+	ARM unwind instructions (i.e. VFP/NEON and Intel Wireless MMX).
 
-2012-01-20  Tristan Gingold  <gingold@adacore.com>
+2011-02-23  Kai Tietz  <kai.tietz@onevision.com>
 
-	* od-macho.c (OPT_SEG_SPLIT_INFO): New macro.
-	(options): Add an entry for seg_split_info.
-	(mach_o_help): Document it.
-	(dump_segment_split_info): New function.
-	(dump_load_command): Handle seg_split_info.
+	* dwarf.c (read_leb128): Use bfd_vma instead of
+	long type.
+	(dwarf_vmatoa): New helper routine.
+	(process_extended_line_op): Use for adr bfd_vma
+	type and print those typed values via BFD_VMA_FMT
+	or via dwarf_vmatoa for localized prints.
+	(fetch_indirect_string): Adjust offset's type.
+	(decode_location_expression): Adjust argument types
+	and uvalue type.
+	(read_and_display_attr_value): Likewise.
+	(read_and_display_attr): Likewise.
+	(decode_location_expression): Adjust printf format.
+	(process_debug_info): Likewise.
+	(display_debug_lines_raw): Likewise.
+	(display_debug_lines_decoded): Likewise.
+	(display_debug_pubnames): Likewise.
+	(display_debug_loc): Likewise.
+	(display_debug_aranges): Likewise.
+	* dwarf.h (DWARF2_External_LineInfo,
+	DWARF2_Internal_LineInfo, DWARF2_External_PubNames,
+	DWARF2_Internal_PubNames, DWARF2_External_CompUnit,
+	DWARF2_Internal_CompUnit, DWARF2_External_ARange,
+	DWARF2_Internal_ARange): Added..
+	(read_leb128): Adjust return type.
 
-2012-01-19  Tristan Gingold  <gingold@adacore.com>
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
-	* dwarf.c (process_extended_line_op): Add a cast to silent a
-	warning.
+	* configure: Regenerate.
 
-2012-01-19  Tristan Gingold  <gingold@adacore.com>
+2011-02-08  Nick Clifton  <nickc@redhat.com>
 
-	* dwarf.c (process_extended_line_op): Reindent define_file output.
-	Detect define_file opcode length mismatch.
-	(display_debug_lines_decoded): Add an entry in file_table for each
-	define_file opcode.
-	Ignore DW_LNE_set_discriminator and DW_LNE_HP_set_sequence.
-	Display extended opcode for unhandle opcode.
+	PR binutils/12467
+	* readelf.c (process_program_headers): Issue a warning if there
+	are no program headers but the file header has a non-zero program
+	header offset.
+	(process_section_headers): Issue a warning if there are no section
+	headers but the file header has a non-zero section header offset.
+	(process_section_groups): Reword the no section message so that it
+	can be distinguished from the one issued by process_section_headers.
 
-2012-01-17  Alan Modra  <amodra@gmail.com>
+2011-01-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Doug Evans  <dje@google.com>
 
-	* version.c (print_version): Update copyright message year.
+	* dwarf.c (display_gdb_index): Support version 4, warn on version 3.
 
-2012-01-16  Alan Modra  <amodra@gmail.com>
+2011-01-19  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	PR binutils/13593
-	* nm.c (OPTION_SIZE_SORT): Define.
-	(long_options): Don't set no_sort, sort_numerically or
-	sort_by_size directly.
-	(main): Instead set the flags here, making them mutually exclusive.
+	* readelf.c (process_object): Free dynamic_section after use.
 
-2012-01-10  Tristan Gingold  <gingold@adacore.com>
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* objdump.c (display_object_bfd): Renamed from ...
-	(display_bfd): ... this.
-	(display_any_bfd): New function.
-	(display_file): Split.  Handle nested archives.
+	PR binutils/12408
+	* readelf.c (process_archive): Free and reset dump_sects
+	after processing each archive member.
 
-2012-01-09  Roland McGrath  <mcgrathr@google.com>
+2011-01-11  Andreas Schwab  <schwab@redhat.com>
 
-	* configure.in: Use AM_ZLIB.
-	* configure: Regenerated.
+	* readelf.c (print_symbol): Handle symbol characters as unsigned.
+	Whitespace fixes.
 
-2012-01-06  Nick Clifton  <nickc@redhat.com>
+2011-01-10  Nick Clifton  <nickc@redhat.com>
 
-	* po/ru.po: Updated Russian translation.
+	* po/da.po: Updated Danish translation.
 
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
+2011-01-06  Vladimir Siminov  <sv@sw.ru>
 
-	* od-macho.c (dump_load_command): Handle fvmlib.
+	* bucomm.c (get_file_size): Check for negative sizes and issue a
+	warning message if encountered.
 
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
+2011-01-01  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* od-macho.c: Update copyright year.
-	(dump_load_command): Handle BFD_MACH_O_LC_ENCRYPTION_INFO.
+	* version.c (print_version): Update copyright to 2011.
 
-For older changes see ChangeLog-2011
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS
index 8984df4c2b..2b60a002cd 100644
--- a/binutils/MAINTAINERS
+++ b/binutils/MAINTAINERS
@@ -73,7 +73,6 @@ responsibility among the other maintainers.
   DLX              Nikolaos Kavvadias <nkavv@physics.auth.gr>
   DWARF2	   Jason Merrill <jason@redhat.com>
   DWARF2	   Jakub Jelinek <jakub@redhat.com>
-  EPIPHANY	   Joern Rennecke <joern.rennecke@embecosm.com>
   FR30		   Dave Brolley <brolley@redhat.com>
   FRV		   Dave Brolley <brolley@redhat.com>
   FRV		   Alexandre Oliva <aoliva@redhat.com>
@@ -107,7 +106,6 @@ responsibility among the other maintainers.
   PPC		   Geoff Keating <geoffk@geoffk.org>
   PPC		   Alan Modra <amodra@gmail.com>
   PPC vector ext   Aldy Hernandez <aldyh@redhat.com>
-  RL78             DJ Delorie <dj@redhat.com>
   RX               DJ Delorie <dj@redhat.com>
   RX               Nick Clifton <nickc@redhat.com>
   s390, s390x	   Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -119,8 +117,6 @@ responsibility among the other maintainers.
   TIC4X            Svein Seldal <svein@dev.seldal.com>
   TIC54X           Timothy Wall <twall@alum.mit.edu>
   TIC6X            Joseph Myers <joseph@codesourcery.com>
-  TILE-Gx          Walter Lee <walt@tilera.com>
-  TILEPro          Walter Lee <walt@tilera.com>
   VAX		   Matt Thomas <matt@netbsd.org>
   VAX		   Jan-Benedict Glaw <jbglaw@lug-owl.de>
   VMS		   Tristan Gingold <gingold@adacore.com>
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 8d191d7d50..bbe58e2132 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -102,7 +102,7 @@ CFILES = \
 	ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \
 	nlmconv.c nm.c not-ranlib.c not-strip.c \
 	objcopy.c objdump.c prdbg.c \
-	od-xcoff.c od-macho.c \
+	od-xcoff.c \
 	rclex.c rdcoff.c rddbg.c readelf.c rename.c \
 	resbin.c rescoff.c resrc.c resres.c \
 	size.c srconv.c stabs.c strings.c sysdump.c \
@@ -272,7 +272,7 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
 
 syslex.@OBJEXT@: syslex.c sysinfo.h config.h
 	if [ -r syslex.c ]; then \
-	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
 	else \
 	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
 	fi
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 4796b5be25..9f10781d58 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -471,7 +471,7 @@ CFILES = \
 	ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \
 	nlmconv.c nm.c not-ranlib.c not-strip.c \
 	objcopy.c objdump.c prdbg.c \
-	od-xcoff.c od-macho.c \
+	od-xcoff.c \
 	rclex.c rdcoff.c rddbg.c readelf.c rename.c \
 	resbin.c rescoff.c resrc.c resres.c \
 	size.c srconv.c stabs.c strings.c sysdump.c \
@@ -861,7 +861,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/not-strip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objcopy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objdump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/od-macho.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/od-xcoff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prdbg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rclex.Po@am__quote@
@@ -1287,7 +1286,7 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
 
 syslex.@OBJEXT@: syslex.c sysinfo.h config.h
 	if [ -r syslex.c ]; then \
-	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
 	else \
 	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
 	fi
diff --git a/binutils/NEWS b/binutils/NEWS
index 8e9de0a7c1..054a36b127 100644
--- a/binutils/NEWS
+++ b/binutils/NEWS
@@ -1,9 +1,5 @@
 -*- text -*-
 
-* Add support for x64 Windows target of the delayed-load-library.
-
-* Add support for the Renesas RL78 architecture.
-
 Changes in 2.22:
 
 * Add support for displaying the contents of .debug.macro sections.
@@ -14,9 +10,7 @@ Changes in 2.22:
 * Add --dwarf-start and --dwarf-end to readelf and objdump.  These are used by
   the new Emacs mode, see dwarf-mode.el.
 
-* Add support for the Tilera TILEPro and TILE-Gx architectures.
-
-changes in 2.21:
+Changes in 2.21:
 
 * Add --interleave-width option to objcopy to allowing copying a range of
   bytes from the input to the output with the --interleave option.
diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index d0f45671cb..1ece80aecd 100644
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -268,11 +268,6 @@ translate_addresses (bfd *abfd, asection *section)
 
                   printf ("%s", name);
                   if (pretty_print)
-		    /* Note for translators:  This printf is used to join the
-		       function name just printed above to the line number/
-		       file name pair that is about to be printed below.  Eg:
-
-		         foo at 123:bar.c  */
                     printf (_(" at "));
                   else
                     printf ("\n");
@@ -294,17 +289,10 @@ translate_addresses (bfd *abfd, asection *section)
               if (!unwind_inlines)
                 found = FALSE;
               else
-                found = bfd_find_inliner_info (abfd, &filename, &functionname,
-					       &line);
+                found = bfd_find_inliner_info (abfd, &filename, &functionname, &line);
               if (! found)
                 break;
               if (pretty_print)
-		/* Note for translators: This printf is used to join the
-		   line number/file name pair that has just been printed with
-		   the line number/file name pair that is going to be printed
-		   by the next iteration of the while loop.  Eg:
-
-		     123:bar.c (inlined by) 456:main.c  */
                 printf (_(" (inlined by) "));
             }
 	}
diff --git a/binutils/ar.c b/binutils/ar.c
index 13637f40c7..22be2cd053 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -1,6 +1,6 @@
 /* ar.c - Archive modify and extract.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -37,6 +37,7 @@
 #include "filenames.h"
 #include "binemul.h"
 #include "plugin.h"
+#include <sys/stat.h>
 
 #ifdef __GO32___
 #define EXT_NAME_LEN 3		/* Bufflen of addition to name if it's MS-DOS.  */
@@ -96,7 +97,7 @@ int write_armap = 0;
 /* Operate in deterministic mode: write zero for timestamps, uids,
    and gids for archive members and the archive symbol table, and write
    consistent file modes.  */
-int deterministic = -1;			/* Determinism indeterminate.  */
+int deterministic = 0;
 
 /* Nonzero means it's the name of an existing member; position new or moved
    files with respect to this one.  */
@@ -275,20 +276,7 @@ usage (int help)
   fprintf (s, _(" command specific modifiers:\n"));
   fprintf (s, _("  [a]          - put file(s) after [member-name]\n"));
   fprintf (s, _("  [b]          - put file(s) before [member-name] (same as [i])\n"));
-  if (DEFAULT_AR_DETERMINISTIC)
-    {
-      fprintf (s, _("\
-  [D]          - use zero for timestamps and uids/gids (default)\n"));
-      fprintf (s, _("\
-  [U]          - use actual timestamps and uids/gids\n"));
-    }
-  else
-    {
-      fprintf (s, _("\
-  [D]          - use zero for timestamps and uids/gids\n"));
-      fprintf (s, _("\
-  [U]          - use actual timestamps and uids/gids (default)\n"));
-    }
+  fprintf (s, _("  [D]          - use zero for timestamps and uids/gids\n"));
   fprintf (s, _("  [N]          - use instance [count] of name\n"));
   fprintf (s, _("  [f]          - truncate inserted file names\n"));
   fprintf (s, _("  [P]          - use full path names when matching\n"));
@@ -334,14 +322,6 @@ ranlib_usage (int help)
   fprintf (s, _("\
   --plugin <name>              Load the specified plugin\n"));
 #endif
-  if (DEFAULT_AR_DETERMINISTIC)
-    fprintf (s, _("\
-  -D                           Use zero for symbol map timestamp (default)\n\
-  -U                           Use an actual symbol map timestamp\n"));
-  else
-    fprintf (s, _("\
-  -D                           Use zero for symbol map timestamp\n\
-  -U                           Use actual symbol map timestamp (default)\n"));
   fprintf (s, _("\
   -t                           Update the archive's symbol map timestamp\n\
   -h --help                    Print this help message\n\
@@ -453,7 +433,7 @@ decode_options (int argc, char **argv)
       argv = new_argv;
     }
 
-  while ((c = getopt_long (argc, argv, "hdmpqrtxlcoVsSuvabiMNfPTDU",
+  while ((c = getopt_long (argc, argv, "hdmpqrtxlcoVsSuvabiMNfPTD",
 			   long_options, NULL)) != EOF)
     {
       switch (c)
@@ -550,9 +530,6 @@ decode_options (int argc, char **argv)
         case 'D':
           deterministic = TRUE;
           break;
-        case 'U':
-          deterministic = FALSE;
-          break;
 	case OPTION_PLUGIN:
 #if BFD_SUPPORTS_PLUGINS
 	  plugin_target = "plugin";
@@ -575,15 +552,6 @@ decode_options (int argc, char **argv)
   return &argv[optind];
 }
 
-/* If neither -D nor -U was not specified explicitly,
-   then use the configured default.  */
-static void
-default_deterministic (void)
-{
-  if (deterministic < 0)
-    deterministic = DEFAULT_AR_DETERMINISTIC;
-}
-
 static void
 ranlib_main (int argc, char **argv)
 {
@@ -591,16 +559,10 @@ ranlib_main (int argc, char **argv)
   bfd_boolean touch = FALSE;
   int c;
 
-  while ((c = getopt_long (argc, argv, "DhHUvVt", long_options, NULL)) != EOF)
+  while ((c = getopt_long (argc, argv, "hHvVt", long_options, NULL)) != EOF)
     {
       switch (c)
         {
-	case 'D':
-	  deterministic = TRUE;
-	  break;
-        case 'U':
-          deterministic = FALSE;
-          break;
 	case 'h':
 	case 'H':
 	  show_help = 1;
@@ -612,31 +574,18 @@ ranlib_main (int argc, char **argv)
 	case 'V':
 	  show_version = 1;
 	  break;
-
-	  /* PR binutils/13493: Support plugins.  */
-	case OPTION_PLUGIN:
-#if BFD_SUPPORTS_PLUGINS
-	  plugin_target = "plugin";
-	  bfd_plugin_set_plugin (optarg);
-#else
-	  fprintf (stderr, _("sorry - this program has been built without plugin support\n"));
-	  xexit (1);
-#endif
-	  break;
-	}
+        }
     }
 
   if (argc < 2)
     ranlib_usage (0);
 
   if (show_help)
-    ranlib_usage (1);
+    usage (1);
 
   if (show_version)
     print_version ("ranlib");
 
-  default_deterministic ();
-
   arg_index = optind;
 
   while (arg_index < argc)
@@ -746,14 +695,8 @@ main (int argc, char **argv)
       if (newer_only && operation != replace)
 	fatal (_("`u' is only meaningful with the `r' option."));
 
-      if (newer_only && deterministic > 0)
-        fatal (_("`u' is not meaningful with the `D' option."));
-
-      if (newer_only && deterministic < 0 && DEFAULT_AR_DETERMINISTIC)
-        non_fatal (_("\
-`u' modifier ignored since `D' is the default (see `U')"));
-
-      default_deterministic ();
+      if (newer_only && deterministic)
+	fatal (_("`u' is not meaningful with the `D' option."));
 
       if (postype != pos_default)
 	posname = argv[arg_index++];
@@ -1088,7 +1031,7 @@ write_archive (bfd *iarch)
   new_name = make_tempname (old_name);
 
   if (new_name == NULL)
-    bfd_fatal (_("could not create temporary file whilst writing archive"));
+    bfd_fatal ("could not create temporary file whilst writing archive");
 
   output_filename = new_name;
 
@@ -1422,9 +1365,6 @@ ranlib_touch (const char *archname)
     /* xgettext:c-format */
     fatal (_("%s: no archive map to update"), archname);
 
-  if (deterministic)
-    arch->flags |= BFD_DETERMINISTIC_OUTPUT;
-
   bfd_update_armap_timestamp (arch);
 
   if (! bfd_close (arch))
diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 86cb6e480a..9977b50137 100644
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,6 +1,6 @@
 /* bucomm.c -- Bin Utils COMmon code.
    Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
-   2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -29,6 +29,7 @@
 #include "filenames.h"
 #include "libbfd.h"
 
+#include <sys/stat.h>
 #include <time.h>		/* ctime, maybe time_t */
 #include <assert.h>
 #include "bucomm.h"
@@ -224,9 +225,9 @@ endian_string (enum bfd_endian endian)
 {
   switch (endian)
     {
-    case BFD_ENDIAN_BIG: return _("big endian");
-    case BFD_ENDIAN_LITTLE: return _("little endian");
-    default: return _("endianness unknown");
+    case BFD_ENDIAN_BIG: return "big endian";
+    case BFD_ENDIAN_LITTLE: return "little endian";
+    default: return "endianness unknown";
     }
 }
 
@@ -247,7 +248,7 @@ display_target_list (void)
       bfd *abfd = bfd_openw (dummy_name, p->name);
       int a;
 
-      printf (_("%s\n (header %s, data %s)\n"), p->name,
+      printf ("%s\n (header %s, data %s)\n", p->name,
 	      endian_string (p->header_byteorder),
 	      endian_string (p->byteorder));
 
diff --git a/binutils/budbg.h b/binutils/budbg.h
index b87defbda4..b9de0223dd 100644
--- a/binutils/budbg.h
+++ b/binutils/budbg.h
@@ -1,5 +1,5 @@
 /* budbg.c -- Interfaces to the generic debugging information routines.
-   Copyright 1995, 1996, 2002, 2003, 2005, 2007, 2008, 2012
+   Copyright 1995, 1996, 2002, 2003, 2005, 2007, 2008
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
@@ -23,6 +23,8 @@
 #ifndef BUDBG_H
 #define BUDBG_H
 
+#include <stdio.h>
+
 /* Routine used to read generic debugging information.  */
 
 extern void *read_debugging_info (bfd *, asymbol **, long, bfd_boolean);
diff --git a/binutils/coffdump.c b/binutils/coffdump.c
index d871e1ebdb..428f598bc6 100644
--- a/binutils/coffdump.c
+++ b/binutils/coffdump.c
@@ -127,56 +127,56 @@ static void
 dump_coff_type (struct coff_type *p)
 {
   tab (1);
-  printf (_("size %d "), p->size);
+  printf ("size %d ", p->size);
 
   switch (p->type)
     {
     case coff_secdef_type:
-      printf (_("section definition at %x size %x\n"),
+      printf ("section definition at %x size %x\n",
 	      p->u.asecdef.address,
 	      p->u.asecdef.size);
       nl ();
       break;
     case coff_pointer_type:
-      printf (_("pointer to"));
+      printf ("pointer to");
       nl ();
       dump_coff_type (p->u.pointer.points_to);
       break;
     case coff_array_type:
-      printf (_("array [%d] of"), p->u.array.dim);
+      printf ("array [%d] of", p->u.array.dim);
       nl ();
       dump_coff_type (p->u.array.array_of);
       break;
     case coff_function_type:
-      printf (_("function returning"));
+      printf ("function returning");
       nl ();
       dump_coff_type (p->u.function.function_returns);
       dump_coff_lines (p->u.function.lines);
-      printf (_("arguments"));
+      printf ("arguments");
       nl ();
       dump_coff_scope (p->u.function.parameters);
       tab (0);
-      printf (_("code"));
+      printf ("code");
       nl ();
       dump_coff_scope (p->u.function.code);
       tab(0);
       break;
     case coff_structdef_type:
-      printf (_("structure definition"));
+      printf ("structure definition");
       nl ();
       dump_coff_scope (p->u.astructdef.elements);
       break;
     case coff_structref_type:
       if (!p->u.aenumref.ref)
-	printf (_("structure ref to UNKNOWN struct"));
+	printf ("structure ref to UNKNOWN struct");
       else
-	printf (_("structure ref to %s"), p->u.aenumref.ref->name);
+	printf ("structure ref to %s", p->u.aenumref.ref->name);
       break;
     case coff_enumref_type:
-      printf (_("enum ref to %s"), p->u.astructref.ref->name);
+      printf ("enum ref to %s", p->u.astructref.ref->name);
       break;
     case coff_enumdef_type:
-      printf (_("enum definition"));
+      printf ("enum definition");
       nl ();
       dump_coff_scope (p->u.aenumdef.elements);
       break;
@@ -249,22 +249,22 @@ dump_coff_where (struct coff_where *p)
   switch (p->where)
     {
     case coff_where_stack:
-      printf (_("Stack offset %x"), p->offset);
+      printf ("Stack offset %x", p->offset);
       break;
     case coff_where_memory:
-      printf (_("Memory section %s+%x"), p->section->name, p->offset);
+      printf ("Memory section %s+%x", p->section->name, p->offset);
       break;
     case coff_where_register:
-      printf (_("Register %d"), p->offset);
+      printf ("Register %d", p->offset);
       break;
     case coff_where_member_of_struct:
-      printf (_("Struct Member offset %x"), p->offset);
+      printf ("Struct Member offset %x", p->offset);
       break;
     case coff_where_member_of_enum:
-      printf (_("Enum Member offset %x"), p->offset);
+      printf ("Enum Member offset %x", p->offset);
       break;
     case coff_where_unknown:
-      printf (_("Undefined symbol"));
+      printf ("Undefined symbol");
       break;
     case coff_where_strtag:
       printf ("STRTAG");
@@ -331,27 +331,27 @@ static void
 dump_coff_symbol (struct coff_symbol *p)
 {
   tab (1);
-  printf (_("List of symbols"));
+  printf ("List of symbols");
   nl ();
 
   while (p)
     {
       tab (1);
       tab (1);
-      printf (_("Symbol  %s, tag %d, number %d"), p->name, p->tag, p->number);
+      printf ("Symbol  %s, tag %d, number %d", p->name, p->tag, p->number);
       nl ();
       tab (-1);
       tab (1);
-      printf (_("Type"));
+      printf ("Type");
       nl ();
       dump_coff_type (p->type);
       tab (-1);
       tab (1);
-      printf (_("Where"));
+      printf ("Where");
       dump_coff_where (p->where);
       tab (-1);
       tab (1);
-      printf (_("Visible"));
+      printf ("Visible");
       dump_coff_visible (p->visible);
       tab (-1);
       p = p->next;
@@ -366,8 +366,7 @@ dump_coff_scope (struct coff_scope *p)
   if (p)
     {
       tab (1);
-      printf ("%s %" BFD_VMA_FMT "x ",
-	      _("List of blocks "), (bfd_vma) (uintptr_t) p);
+      printf ("List of blocks %" BFD_VMA_FMT "x ",(bfd_vma) (uintptr_t) p);
 
       if (p->sec)
 	printf( "  %s %x..%x",  p->sec->name,p->offset, p->offset + p->size -1);
@@ -380,10 +379,10 @@ dump_coff_scope (struct coff_scope *p)
       while (p)
 	{
 	  tab (0);
-	  printf (_("vars %d"), p->nvars);
+	  printf ("vars %d", p->nvars);
 	  nl ();
 	  dump_coff_symbol (p->vars_head);
-	  printf (_("blocks"));
+	  printf ("blocks");
 	  nl ();
 	  dump_coff_scope (p->list_head);
 	  nl ();
@@ -401,13 +400,13 @@ static void
 dump_coff_sfile (struct coff_sfile *p)
 {
   tab (1);
-  printf (_("List of source files"));
+  printf ("List of source files");
   nl ();
 
   while (p)
     {
       tab (0);
-      printf (_("Source file %s"), p->name);
+      printf ("Source file %s", p->name);
       nl ();
       dump_coff_scope (p->scope);
       p = p->next;
@@ -421,7 +420,7 @@ dump_coff_section (struct coff_section *ptr)
   int i;
 
   tab (1);
-  printf (_("section %s %d %d address %x size %x number %d nrelocs %d"),
+  printf ("section %s %d %d address %x size %x number %d nrelocs %d",
 	  ptr->name, ptr->code, ptr->data, ptr->address,ptr->size,
 	  ptr->number, ptr->nrelocs);
   nl ();
@@ -446,7 +445,7 @@ coff_dump (struct coff_ofile *ptr)
 
   printf ("Coff dump");
   nl ();
-  printf (_("#sources %d"), ptr->nsources);
+  printf ("#sources %d", ptr->nsources);
   nl ();
   dump_coff_sfile (ptr->source_head);
 
diff --git a/binutils/config.in b/binutils/config.in
index 62bdfa1295..0cb7290d2d 100644
--- a/binutils/config.in
+++ b/binutils/config.in
@@ -8,9 +8,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Should ar and ranlib use -D behavior by default? */
-#undef DEFAULT_AR_DETERMINISTIC
-
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
diff --git a/binutils/configure b/binutils/configure
index 8d324e489a..1a4a1efdcd 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -771,12 +771,10 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_targets
-enable_deterministic_archives
 enable_werror
 enable_build_warnings
 enable_nls
 enable_maintainer_mode
-with_zlib
 enable_rpath
 with_libiconv_prefix
 '
@@ -1419,8 +1417,6 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-targets        alternative target configurations
-  --enable-deterministic-archives
-                          ar and ranlib default to -D behavior
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings
   --disable-nls           do not use Native Language Support
@@ -1434,7 +1430,6 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-zlib             include zlib support (auto/yes/no) default=auto
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -11204,7 +11199,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11207 "configure"
+#line 11202 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11310,7 +11305,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11313 "configure"
+#line 11308 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11558,25 +11553,6 @@ if test "${enable_targets+set}" = set; then :
 esac
 fi
 
-# Check whether --enable-deterministic-archives was given.
-if test "${enable_deterministic_archives+set}" = set; then :
-  enableval=$enable_deterministic_archives;
-if test "${enableval}" = no; then
-  default_ar_deterministic=0
-else
-  default_ar_deterministic=1
-fi
-else
-  default_ar_deterministic=0
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define DEFAULT_AR_DETERMINISTIC $default_ar_deterministic
-_ACEOF
-
-
 
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12996,19 +12972,7 @@ _ACEOF
 # Link in zlib if we can.  This allows us to read compressed debug
 # sections.  This is used only by readelf.c (objdump uses bfd for
 # reading compressed sections).
-
-  # See if the user specified whether he wants zlib support or not.
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib;
-else
-  with_zlib=auto
-fi
-
-
-  if test "$with_zlib" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
 $as_echo_n "checking for library containing zlibVersion... " >&6; }
 if test "${ac_cv_search_zlibVersion+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -13075,11 +13039,6 @@ done
 
 fi
 
-    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
-      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
-    fi
-  fi
-
 
 
 case "${host}" in
@@ -13986,10 +13945,7 @@ do
 	# Add objdump private vectors.
 	case $targ in
 	powerpc-*-aix*)
-	  od_vectors="$od_vectors objdump_private_desc_xcoff"
-	  ;;
-        *-*-darwin*)
-	  od_vectors="$od_vectors objdump_private_desc_mach_o"
+	od_vectors="$od_vectors objdump_private_desc_xcoff"
 	  ;;
 	esac
     fi
@@ -14007,8 +13963,6 @@ for i in $od_vectors ; do
 	case $i in
 	objdump_private_desc_xcoff)
 	    od_files="$od_files od-xcoff" ;;
-	objdump_private_desc_mach_o)
-	    od_files="$od_files od-macho" ;;
 	*) as_fn_error "*** unknown private vector $i" "$LINENO" 5 ;;
 	esac
 	;;
diff --git a/binutils/configure.in b/binutils/configure.in
index d0443cfff6..965d66c168 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -28,20 +28,8 @@ AC_ARG_ENABLE(targets,
   *)        enable_targets=$enableval ;;
 esac])dnl
 
-AC_ARG_ENABLE(deterministic-archives,
-[AS_HELP_STRING([--enable-deterministic-archives],
-		[ar and ranlib default to -D behavior])], [
-if test "${enableval}" = no; then
-  default_ar_deterministic=0
-else
-  default_ar_deterministic=1
-fi], [default_ar_deterministic=0])
-
-AC_DEFINE_UNQUOTED(DEFAULT_AR_DETERMINISTIC, $default_ar_deterministic,
-		   [Should ar and ranlib use -D behavior by default?])
-
 AM_BINUTILS_WARNINGS
-
+		   
 AC_CONFIG_HEADERS(config.h:config.in)
 
 if test -z "$target" ; then
@@ -155,7 +143,7 @@ AC_CHECK_DECLS([fprintf, stpcpy, strstr, sbrk, getenv, environ, getc_unlocked,
 # Link in zlib if we can.  This allows us to read compressed debug
 # sections.  This is used only by readelf.c (objdump uses bfd for
 # reading compressed sections).
-AM_ZLIB
+AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
 
 BFD_BINARY_FOPEN
 
@@ -215,7 +203,7 @@ do
     else
 	case $targ in
 changequote(,)dnl
-	i[3-7]86*-*-netware*)
+	i[3-7]86*-*-netware*) 
 changequote([,])dnl
 	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
 	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
@@ -366,10 +354,7 @@ changequote([,])dnl
 	# Add objdump private vectors.
 	case $targ in
 	powerpc-*-aix*)
-	  od_vectors="$od_vectors objdump_private_desc_xcoff"
-	  ;;
-        *-*-darwin*)
-	  od_vectors="$od_vectors objdump_private_desc_mach_o"
+	od_vectors="$od_vectors objdump_private_desc_xcoff"
 	  ;;
 	esac
     fi
@@ -387,8 +372,6 @@ for i in $od_vectors ; do
 	case $i in
 	objdump_private_desc_xcoff)
 	    od_files="$od_files od-xcoff" ;;
-	objdump_private_desc_mach_o)
-	    od_files="$od_files od-macho" ;;
 	*) AC_MSG_ERROR(*** unknown private vector $i) ;;
 	esac
 	;;
@@ -444,11 +427,11 @@ fi
 AC_DEFINE_UNQUOTED(TARGET_PREPENDS_UNDERSCORE, $UNDERSCORE,
  [Define to 1 if user symbol names have a leading underscore, 0 if not.])
 
-# Emulation
+# Emulation 
 targ=$target
 . ${srcdir}/configure.tgt
 EMULATION=$targ_emul
-EMULATION_VECTOR=$targ_emul_vector
+EMULATION_VECTOR=$targ_emul_vector	
 
 AC_SUBST(EMULATION)
 AC_SUBST(EMULATION_VECTOR)
diff --git a/binutils/defparse.y b/binutils/defparse.y
index a4e73eb314..c05254a055 100644
--- a/binutils/defparse.y
+++ b/binutils/defparse.y
@@ -28,7 +28,6 @@
 
 %union {
   char *id;
-  const char *id_const;
   int number;
 };
 
@@ -41,8 +40,7 @@
 %token <number> NUMBER
 %type  <number> opt_base opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
 %type  <number> attr attr_list opt_number
-%type  <id> opt_name opt_name2 opt_equal_name opt_import_name
-%type  <id_const> keyword_as_name
+%type  <id> opt_name opt_equal_name opt_import_name
 
 %%
 
@@ -152,64 +150,13 @@ opt_PRIVATE:
 	|		{ $$ = 0; }
 	;
 
-keyword_as_name: NAME { $$ = "NAME"; }
-/*  Disabled LIBRARY keyword for a quirk in libtool. It places LIBRARY
-    command after EXPORTS list, which is illegal by specification.
-    See PR binutils/13710
-	| LIBRARY { $$ = "LIBRARY"; } */
-	| DESCRIPTION { $$ = "DESCRIPTION"; }
-	| STACKSIZE { $$ = "STACKSIZE"; }
-	| HEAPSIZE { $$ = "HEAPSIZE"; }
-	| CODE { $$ = "CODE"; }
-	| DATA { $$ = "DATA"; }
-	| SECTIONS { $$ = "SECTIONS"; }
-	| EXPORTS { $$ = "EXPORTS"; }
-	| IMPORTS { $$ = "IMPORTS"; }
-	| VERSIONK { $$ = "VERSION"; }
-	| BASE { $$ = "BASE"; }
-	| CONSTANT { $$ = "CONSTANT"; }
-	| NONAME { $$ = "NONAME"; }
-	| PRIVATE { $$ = "PRIVATE"; }
-	| READ { $$ = "READ"; }
-	| WRITE { $$ = "WRITE"; }
-	| EXECUTE { $$ = "EXECUTE"; }
-	| SHARED { $$ = "SHARED"; }
-	| NONSHARED { $$ = "NONSHARED"; }
-	| SINGLE { $$ = "SINGLE"; }
-	| MULTIPLE { $$ = "MULTIPLE"; }
-	| INITINSTANCE { $$ = "INITINSTANCE"; }
-	| INITGLOBAL { $$ = "INITGLOBAL"; }
-	| TERMINSTANCE { $$ = "TERMINSTANCE"; }
-	| TERMGLOBAL { $$ = "TERMGLOBAL"; }
-	;
-
-opt_name2: ID { $$ = $1; }
-	| '.' keyword_as_name
-	  {
-	    char *name = xmalloc (strlen ($2) + 2);
-	    sprintf (name, ".%s", $2);
-	    $$ = name;
-	  }
-	| '.' opt_name2
-	  { 
-	    char *name = xmalloc (strlen ($2) + 2);
-	    sprintf (name, ".%s", $2);
-	    $$ = name;
-	  }
-	| keyword_as_name '.' opt_name2
-	  { 
-	    char *name = xmalloc (strlen ($1) + 1 + strlen ($3) + 1);
-	    sprintf (name, "%s.%s", $1, $3);
-	    $$ = name;
-	  }
-	| ID '.' opt_name2
+opt_name: ID		{ $$ =$1; }
+	| ID '.' ID	
 	  { 
 	    char *name = xmalloc (strlen ($1) + 1 + strlen ($3) + 1);
 	    sprintf (name, "%s.%s", $1, $3);
 	    $$ = name;
 	  }
-	;
-opt_name: opt_name2 { $$ =$1; }
 	|		{ $$=""; }
 	;
 
@@ -219,12 +166,18 @@ opt_ordinal:
 	;
 
 opt_import_name:
-	  EQUAL opt_name2	{ $$ = $2; }
+	  EQUAL ID	{ $$ = $2; }
 	|		{ $$ = 0; }
 	;
 
 opt_equal_name:
-          '=' opt_name2	{ $$ = $2; }
+          '=' ID	{ $$ = $2; }
+	| '=' ID '.' ID	
+	  { 
+	    char *name = xmalloc (strlen ($2) + 1 + strlen ($4) + 1);
+	    sprintf (name, "%s.%s", $2, $4);
+	    $$ = name;
+	  }
         | 		{ $$ =  0; }			 
 	;
 
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 0c46c3a005..80aac996fc 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -1,6 +1,6 @@
 /* dlltool.c -- tool to generate stuff for PE style DLLs
    Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -232,6 +232,15 @@
 
    .idata$7 = dll name (eg: "kernel32.dll"). (.idata$6 for ppc).  */
 
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# ifdef _AIX
+ #pragma alloca
+#endif
+#endif
+
+#define show_allnames 0
+
 #include "sysdep.h"
 #include "bfd.h"
 #include "libiberty.h"
@@ -243,6 +252,8 @@
 #include "safe-ctype.h"
 
 #include <time.h>
+#include <sys/stat.h>
+#include <stdarg.h>
 #include <assert.h>
 
 #ifdef DLLTOOL_ARM
@@ -308,8 +319,6 @@ static void mcore_elf_gen_out_file (void);
 #endif /* defined (_WIN32) && ! defined (__CYGWIN32__) */
 #endif /* ! HAVE_SYS_WAIT_H */
 
-#define show_allnames 0
-
 /* ifunc and ihead data structures: ttk@cygnus.com 1997
 
    When IMPORT declarations are encountered in a .def file the
@@ -515,14 +524,6 @@ static const unsigned char i386_dljtab[] =
   0xE9, 0x00, 0x00, 0x00, 0x00        /* jmp __tailMerge__dllname        */
 };
 
-static const unsigned char i386_x64_dljtab[] =
-{
-  0xFF, 0x25, 0x00, 0x00, 0x00, 0x00, /* jmp __imp__function             */
-  0x48, 0x8d, 0x05,		      /* leaq rax, (__imp__function) */
-        0x00, 0x00, 0x00, 0x00,
-  0xE9, 0x00, 0x00, 0x00, 0x00        /* jmp __tailMerge__dllname        */
-};
-
 static const unsigned char arm_jtab[] =
 {
   0x00, 0xc0, 0x9f, 0xe5,	/* ldr  ip, [pc] */
@@ -599,22 +600,6 @@ static const char i386_trampoline[] =
   "\tpopl %%ecx\n"
   "\tjmp *%%eax\n";
 
-static const char i386_x64_trampoline[] =  
-  "\tpushq %%rcx\n"
-  "\tpushq %%rdx\n"
-  "\tpushq %%r8\n"
-  "\tpushq %%r9\n"
-  "\tsubq  $40, %%rsp\n"
-  "\tmovq  %%rax, %%rdx\n"
-  "\tleaq  __DELAY_IMPORT_DESCRIPTOR_%s(%%rip), %%rcx\n"
-  "\tcall __delayLoadHelper2\n"
-  "\taddq  $40, %%rsp\n"
-  "\tpopq %%r9\n"
-  "\tpopq %%r8\n"
-  "\tpopq %%rdx\n"
-  "\tpopq %%rcx\n"
-  "\tjmp *%%rax\n";
-
 struct mac
 {
   const char *type;
@@ -759,7 +744,7 @@ mtable[] =
     "jmp *", ".global", ".space", ".align\t2",".align\t4", "",
     "pe-x86-64",bfd_arch_i386,
     i386_jtab, sizeof (i386_jtab), 2,
-    i386_x64_dljtab, sizeof (i386_x64_dljtab), 2, 9, 14, i386_x64_trampoline
+    i386_dljtab, sizeof (i386_dljtab), 2, 7, 12, i386_trampoline
   }
   ,
   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -1278,7 +1263,7 @@ def_import (const char *app_name, const char *module, const char *dllext,
 void
 def_version (int major, int minor)
 {
-  printf (_("VERSION %d.%d\n"), major, minor);
+  printf ("VERSION %d.%d\n", major, minor);
 }
 
 void
@@ -1326,7 +1311,7 @@ run (const char *what, char *args)
   char *errmsg_fmt, *errmsg_arg;
   char *temp_base = choose_temp_base ();
 
-  inform (_("run: %s %s"), what, args);
+  inform ("run: %s %s", what, args);
 
   /* Count the args */
   i = 0;
@@ -2633,14 +2618,9 @@ make_one_lib_file (export_type *exp, int i, int delay)
 
 	      if (delay)
 	        {
-		  if (machine == MX86)
-		   rel2->howto = bfd_reloc_type_lookup (abfd,
-							BFD_RELOC_32_PCREL);
-	          else
-	            rel2->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
+	          rel2->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
 	          rel2->sym_ptr_ptr = rel->sym_ptr_ptr;
-	          rel3->howto = bfd_reloc_type_lookup (abfd,
-						       BFD_RELOC_32_PCREL);
+	          rel3->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32_PCREL);
 	          rel3->sym_ptr_ptr = iname_lab_pp;
 	        }
 
@@ -2652,11 +2632,10 @@ make_one_lib_file (export_type *exp, int i, int delay)
 	case IDATA5:
 	  if (delay)
 	    {
-	      si->size = create_for_pep ? 8 : 4;
-	      si->data = xmalloc (si->size);
+	      si->data = xmalloc (4);
+	      si->size = 4;
 	      sec->reloc_count = 1;
 	      memset (si->data, 0, si->size);
-	      /* Point after jmp [__imp_...] instruction.  */
 	      si->data[0] = 6;
 	      rel = xmalloc (sizeof (arelent));
 	      rpp = xmalloc (sizeof (arelent *) * 2);
@@ -2664,10 +2643,7 @@ make_one_lib_file (export_type *exp, int i, int delay)
 	      rpp[1] = 0;
 	      rel->address = 0;
 	      rel->addend = 0;
-	      if (create_for_pep)
-	        rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_64);
-	      else
-	        rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
+	      rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
 	      rel->sym_ptr_ptr = secdata[TEXT].sympp;
 	      sec->orelocation = rpp;
 	      break;
@@ -3038,8 +3014,6 @@ make_delay_head (void)
   fprintf (f, "\n.section .data\n");
   fprintf (f, "__DLL_HANDLE_%s:\n", imp_name_lab);
   fprintf (f, "\t%s\t0\t%s Handle\n", ASM_LONG, ASM_C);
-  if (create_for_pep)
-    fprintf (f, "\t%s\t0\n", ASM_LONG);
   fprintf (f, "\n");
 
   fprintf (f, "%sStuff for compatibility\n", ASM_C);
@@ -3048,10 +3022,11 @@ make_delay_head (void)
     {
       fprintf (f, "\t.section\t.idata$5\n");
       /* NULL terminating list.  */
-      if (create_for_pep)
-        fprintf (f,"\t%s\t0\n\t%s\t0\n", ASM_LONG, ASM_LONG);
-      else
-        fprintf (f,"\t%s\t0\n", ASM_LONG);
+#ifdef DLLTOOL_MX86_64
+      fprintf (f,"\t%s\t0\n\t%s\t0\n", ASM_LONG, ASM_LONG);
+#else
+      fprintf (f,"\t%s\t0\n", ASM_LONG);
+#endif
       fprintf (f, "__IAT_%s:\n", imp_name_lab);
     }
 
@@ -3059,8 +3034,6 @@ make_delay_head (void)
     {
       fprintf (f, "\t.section\t.idata$4\n");
       fprintf (f, "\t%s\t0\n", ASM_LONG);
-      if (create_for_pep)
-        fprintf (f, "\t%s\t0\n", ASM_LONG);
       fprintf (f, "\t.section\t.idata$4\n");
       fprintf (f, "__INT_%s:\n", imp_name_lab);
     }
diff --git a/binutils/dlltool.h b/binutils/dlltool.h
index f3b203ba9f..35a22801ff 100644
--- a/binutils/dlltool.h
+++ b/binutils/dlltool.h
@@ -1,6 +1,5 @@
 /* dlltool.h -- header file for dlltool
-   Copyright 1997, 1998, 2003, 2004, 2005, 2007, 2009, 2012
-   Free Software Foundation, Inc.
+   Copyright 1997, 1998, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -19,6 +18,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "ansidecl.h"
+#include <stdio.h>
+
 extern void def_code (int);
 extern void def_data (int);
 extern void def_description (const char *);
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index a6dae902c4..4e48f3e39d 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -1,6 +1,6 @@
 /* dllwrap.c -- wrapper for DLLTOOL and GCC to generate PE style DLLs
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009,
-   2011, 2012 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009
+   Free Software Foundation, Inc.
    Contributed by Mumit Khan (khan@xraylith.wisc.edu).
 
    This file is part of GNU Binutils.
@@ -20,6 +20,13 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# ifdef _AIX
+ #pragma alloca
+#endif
+#endif
+
 #include "sysdep.h"
 #include "bfd.h"
 #include "libiberty.h"
@@ -28,6 +35,7 @@
 #include "bucomm.h"
 
 #include <time.h>
+#include <sys/stat.h>
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -406,7 +414,7 @@ run (const char *what, char *args)
   pid = pwait (pid, &wait_status, 0);
   if (pid == -1)
     {
-      warn (_("pwait returns: %s"), strerror (errno));
+      warn ("wait: %s", strerror (errno));
       retcode = 1;
     }
   else if (WIFSIGNALED (wait_status))
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 4aeadcf7d8..35ccb87a10 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -10,9 +10,8 @@
 
 @copying
 @c man begin COPYRIGHT
-Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010, 2011, 2012
+Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -177,7 +176,7 @@ in the section entitled ``GNU Free Documentation License''.
 @c man title ar create, modify, and extract from archives
 
 @smallexample
-ar [@option{--plugin} @var{name}] [-]@var{p}[@var{mod} [@var{relpos}] [@var{count}]] [@option{--target} @var{bfdname}] @var{archive} [@var{member}@dots{}]
+ar [@option{--plugin} @var{name}] [-]@var{p}[@var{mod} [@var{relpos}] [@var{count}]] [@option{--target} @var{bfdname}] @var{archive} [@var{member}@dots{}] 
 ar -M [ <mri-script ]
 @end smallexample
 
@@ -419,7 +418,6 @@ using this modifier.
 
 @item D
 @cindex deterministic archives
-@kindex --enable-deterministic-archives
 Operate in @emph{deterministic} mode.  When adding files and the archive
 index use zero for UIDs, GIDs, timestamps, and use consistent file modes
 for all files.  When this option is used, if @command{ar} is used with
@@ -427,10 +425,6 @@ identical options and identical input files, multiple runs will create
 identical output files regardless of the input files' owners, groups,
 file modes, or modification times.
 
-If @file{binutils} was configured with
-@option{--enable-deterministic-archives}, then this mode is on by default.
-It can be disabled with the @samp{U} modifier, below.
-
 @item f
 Truncate names in the archive.  @sc{gnu} @command{ar} will normally permit file
 names of any length.  This will cause it to create archives which are
@@ -499,16 +493,6 @@ operation @samp{r} (replace).  In particular, the combination @samp{qu} is
 not allowed, since checking the timestamps would lose any speed
 advantage from the operation @samp{q}.
 
-@item U
-@cindex deterministic archives
-@kindex --enable-deterministic-archives
-Do @emph{not} operate in @emph{deterministic} mode.  This is the inverse
-of the @samp{D} modifier, above: added files and the archive index will
-get their actual UID, GID, timestamp, and file mode values.
-
-This is the default unless @file{binutils} was configured with
-@option{--enable-deterministic-archives}.
-
 @item v
 This modifier requests the @emph{verbose} version of an operation.  Many
 operations display additional information, such as filenames processed,
@@ -1452,7 +1436,7 @@ the use of long section names in the output object; when @samp{disable}
 is in effect, any long section names in the input object will be truncated.
 The @samp{enable} option will only emit long section names if any are
 present in the inputs; this is mostly the same as @samp{keep}, but it
-is left undefined whether the @samp{enable} option might force the
+is left undefined whether the @samp{enable} option might force the 
 creation of an empty string table in the output file.
 
 @item --change-leading-char
@@ -2141,7 +2125,7 @@ Display source code intermixed with disassembly, if possible.  Implies
 @item --prefix=@var{prefix}
 @cindex Add prefix to absolute paths
 Specify @var{prefix} to add to the absolute paths when used with
-@option{-S}.
+@option{-S}. 
 
 @item --prefix-strip=@var{level}
 @cindex Strip absolute paths
@@ -2158,7 +2142,7 @@ When disassembling instructions, do not print the instruction bytes.
 This is the default when @option{--prefix-addresses} is used.
 
 @item --insn-width=@var{width}
-@cindex Instruction width
+@cindex Instruction width 
 Display @var{width} bytes on a single line when disassembling
 instructions.
 
@@ -2365,7 +2349,7 @@ nm(1), readelf(1), and the Info entries for @file{binutils}.
 
 @smallexample
 @c man begin SYNOPSIS ranlib
-ranlib [@option{--plugin} @var{name}] [@option{-DhHvVt}] @var{archive}
+ranlib [@option{-vVt}] @var{archive}
 @c man end
 @end smallexample
 
@@ -2390,38 +2374,13 @@ The @sc{gnu} @command{ranlib} program is another form of @sc{gnu} @command{ar};
 @c man begin OPTIONS ranlib
 
 @table @env
-@item -h
-@itemx -H
-@itemx --help
-Show usage information for @command{ranlib}.
-
 @item -v
 @itemx -V
 @itemx --version
 Show the version number of @command{ranlib}.
 
-@item -D
-@cindex deterministic archives
-@kindex --enable-deterministic-archives
-Operate in @emph{deterministic} mode.  The symbol map archive member's
-header will show zero for the UID, GID, and timestamp.  When this
-option is used, multiple runs will produce identical output files.
-
-This is the default unless @file{binutils} was configured with
-@option{--enable-deterministic-archives}.
-
 @item -t
 Update the timestamp of the symbol map of an archive.
-
-@item -U
-@cindex deterministic archives
-@kindex --enable-deterministic-archives
-Do @emph{not} operate in @emph{deterministic} mode.  This is the
-inverse of the @samp{-D} option, above: the archive index will get
-actual UID, GID, timestamp, and file mode values.
-
-This is the default unless @file{binutils} was configured with
-@option{--enable-deterministic-archives}.
 @end table
 
 @c man end
@@ -2866,8 +2825,8 @@ the Info entries for @file{binutils}.
 
 @smallexample
 @c man begin SYNOPSIS cxxfilt
-c++filt [@option{-_}|@option{--strip-underscore}]
-        [@option{-n}|@option{--no-strip-underscore}]
+c++filt [@option{-_}|@option{--strip-underscores}]
+        [@option{-n}|@option{--no-strip-underscores}]
         [@option{-p}|@option{--no-params}]
         [@option{-t}|@option{--types}]
         [@option{-i}|@option{--no-verbose}]
@@ -2947,14 +2906,14 @@ characters trailing after a mangled name.  For example:
 
 @table @env
 @item -_
-@itemx --strip-underscore
+@itemx --strip-underscores
 On some systems, both the C and C++ compilers put an underscore in front
 of every name.  For example, the C name @code{foo} gets the low-level
 name @code{_foo}.  This option removes the initial underscore.  Whether
 @command{c++filt} removes the underscore by default is target dependent.
 
 @item -n
-@itemx --no-strip-underscore
+@itemx --no-strip-underscores
 Do not remove the initial underscore.
 
 @item -p
@@ -3081,25 +3040,11 @@ address on standard output.  In this mode, @command{addr2line} may be used
 in a pipe to convert dynamically chosen addresses.
 
 The format of the output is @samp{FILENAME:LINENO}.  The file name and
-line number for each input address is printed on separate lines.
-
-If the @option{-f} option is used, then each @samp{FILENAME:LINENO}
-line is preceded by @samp{FUNCTIONNAME} which is the name of the
-function containing the address.
-
-If the @option{-i} option is used and the code at the given address is
-present there because of inlining by the compiler then the
-@samp{@{FUNCTIONNAME@} FILENAME:LINENO} information for the inlining
-function will be displayed afterwards.  This continues recursively
-until there is no more inlining to report.
-
-If the @option{-a} option is used then the output is prefixed by the
-input address.
-
-If the @option{-p} option is used then the output for each input
-address is displayed on one, possibly quite long, line.  If
-@option{-p} is not used then the output is broken up into multiple
-lines, based on the paragraphs above.
+line number for each address is printed on a separate line.  If the
+@command{-f} option is used, then each @samp{FILENAME:LINENO} line is
+preceded by a @samp{FUNCTIONNAME} line which is the name of the function
+containing the address.  If the @command{-a} option is used, then the
+address read is first printed.
 
 If the file name or function name can not be determined,
 @command{addr2line} will print two question marks in their place.  If the
@@ -3115,7 +3060,7 @@ equivalent.
 @table @env
 @item -a
 @itemx --addresses
-Display the address before the function name, file and line number
+Display address before function names or file and line number
 information.  The address is printed with a @samp{0x} prefix to easily
 identify it.
 
@@ -3765,9 +3710,9 @@ that uses that DLL:
 
 
 @command{dlltool} may also be used to query an existing import library
-to determine the name of the DLL to which it is associated.  See the
+to determine the name of the DLL to which it is associated.  See the 
 description of the @option{-I} or @option{--identify} option.
-
+ 
 @c man end
 
 @c man begin OPTIONS dlltool
@@ -3987,9 +3932,6 @@ The result is going to be named @var{name}@code{.exe}.
 
 @item @code{LIBRARY} @var{name} @code{[ ,} @var{base} @code{]}
 The result is going to be named @var{name}@code{.dll}.
-Note: If you want to use LIBRARY as name then you need to quote.  Otherwise
-this will fail due a necessary hack for libtool (see PR binutils/13710 for more
-details).
 
 @item @code{EXPORTS ( ( (} @var{name1} @code{[ = } @var{name2} @code{] ) | ( } @var{name1} @code{=} @var{module-name} @code{.} @var{external-name} @code{) ) [ == } @var{its_name} @code{]}
 @item @code{[} @var{integer} @code{] [ NONAME ] [ CONSTANT ] [ DATA ] [ PRIVATE ] ) *}
@@ -3998,9 +3940,6 @@ ordinal number @var{integer}, or declares @var{name1} as an alias
 (forward) of the function @var{external-name} in the DLL.
 If @var{its_name} is specified, this name is used as string in export table.
 @var{module-name}.
-Note: The @code{EXPORTS} has to be the last command in .def file, as keywords
-are treated - beside @code{LIBRARY} - as simple name-identifiers.
-If you want to use LIBRARY as name then you need to quote it.
 
 @item @code{IMPORTS ( (} @var{internal-name} @code{=} @var{module-name} @code{.} @var{integer} @code{) | [} @var{internal-name} @code{= ]} @var{module-name} @code{.} @var{external-name} @code{) [ == ) @var{its_name} @code{]} *}
 Declares that @var{external-name} or the exported function whose
@@ -4009,9 +3948,6 @@ ordinal number is @var{integer} is to be imported from the file
 the name that the imported function will be referred to in the body of
 the DLL.
 If @var{its_name} is specified, this name is used as string in import table.
-Note: The @code{IMPORTS} has to be the last command in .def file, as keywords
-are treated - beside @code{LIBRARY} - as simple name-identifiers.
-If you want to use LIBRARY as name then you need to quote it.
 
 @item @code{DESCRIPTION} @var{string}
 Puts @var{string} into the output @file{.exp} file in the
@@ -4766,7 +4702,7 @@ things without first using the debugger to find the facts.
 
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
-
+ 
 @include fdl.texi
 
 @node Binutils Index
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 5ad9b93a80..1ee0e336c1 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -129,7 +129,7 @@ print_dwarf_vma (dwarf_vma val, unsigned byte_size)
       if (byte_size > 0 && byte_size <= 8)
 	offset = 16 - 2 * byte_size;
       else
-	error (_("Wrong size in print_dwarf_vma"));
+	error ("Wrong size in print_dwarf_vma");
     }
 
   fputs (buff + offset, stdout);
@@ -169,27 +169,6 @@ dwarf_vmatoa (const char *fmtch, dwarf_vma value)
   return ret;
 }
 
-/* Format a 64-bit value, given as two 32-bit values, in hex.
-   For reentrancy, this uses a buffer provided by the caller.  */
-
-static const char *
-dwarf_vmatoa64 (dwarf_vma hvalue, dwarf_vma lvalue, char *buf,
-		unsigned int buf_len)
-{
-  int len = 0;
-
-  if (hvalue == 0)
-    snprintf (buf, buf_len, "%" DWARF_VMA_FMT "x", lvalue);
-  else
-    {
-      len = snprintf (buf, buf_len, "%" DWARF_VMA_FMT "x", hvalue);
-      snprintf (buf + len, buf_len - len,
-		"%08" DWARF_VMA_FMT "x", lvalue);
-    }
-
-  return buf;
-}
-
 dwarf_vma
 read_leb128 (unsigned char *data, unsigned int *length_return, int sign)
 {
@@ -268,7 +247,6 @@ process_extended_line_op (unsigned char *data, int is_stmt)
   unsigned int len;
   unsigned char *name;
   dwarf_vma adr;
-  unsigned char *orig_data = data;
 
   len = read_leb128 (data, & bytes_read, 0);
   data += bytes_read;
@@ -299,7 +277,7 @@ process_extended_line_op (unsigned char *data, int is_stmt)
       break;
 
     case DW_LNE_define_file:
-      printf (_("define new File Table entry\n"));
+      printf (_("  define new File Table entry\n"));
       printf (_("  Entry\tDir\tTime\tSize\tName\n"));
 
       printf ("   %d\t", ++state_machine_regs.last_file_entry);
@@ -310,11 +288,7 @@ process_extended_line_op (unsigned char *data, int is_stmt)
       printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
       data += bytes_read;
       printf ("%s\t", dwarf_vmatoa ("u", read_leb128 (data, & bytes_read, 0)));
-      data += bytes_read;
-      printf ("%s", name);
-      if ((unsigned int) (data - orig_data) != len)
-        printf (_(" [Bad opcode length]"));
-      printf ("\n\n");
+      printf ("%s\n\n", name);
       break;
 
     case DW_LNE_set_discriminator:
@@ -379,21 +353,21 @@ process_extended_line_op (unsigned char *data, int is_stmt)
                 break;
               case DW_LNE_HP_SFC_associate:
                 printf ("    DW_LNE_HP_SFC_associate ");
-                printf ("(%s",
+                printf (_("(%s"),
                         dwarf_vmatoa ("u",
                                       read_leb128 (data, & bytes_read, 0)));
                 data += bytes_read;
-                printf (",%s",
+                printf (_(",%s"),
                         dwarf_vmatoa ("u",
                                       read_leb128 (data, & bytes_read, 0)));
                 data += bytes_read;
-                printf (",%s)\n",
+                printf (_(",%s)\n"),
                         dwarf_vmatoa ("u",
                                       read_leb128 (data, & bytes_read, 0)));
                 data += bytes_read;
                 break;
               default:
-                printf (_("    UNKNOWN DW_LNE_HP_SFC opcode (%u)\n"), opc);
+                printf ("    UNKNOW DW_LNE_HP_SFC opcode (%u)\n", opc);
                 data = edata;
                 break;
               }
@@ -1098,10 +1072,10 @@ decode_location_expression (unsigned char * data,
 	  break;
 	case DW_OP_bit_piece:
 	  printf ("DW_OP_bit_piece: ");
-	  printf (_("size: %s "),
+	  printf ("size: %s ",
 		  dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
 	  data += bytes_read;
-	  printf (_("offset: %s "),
+	  printf ("offset: %s ",
 		  dwarf_vmatoa ("u", read_leb128 (data, &bytes_read, 0)));
 	  data += bytes_read;
 	  break;
@@ -1121,7 +1095,7 @@ decode_location_expression (unsigned char * data,
 
 	  /* GNU extensions.  */
 	case DW_OP_GNU_push_tls_address:
-	  printf (_("DW_OP_GNU_push_tls_address or DW_OP_HP_unknown"));
+	  printf ("DW_OP_GNU_push_tls_address or DW_OP_HP_unknown");
 	  break;
 	case DW_OP_GNU_uninit:
 	  printf ("DW_OP_GNU_uninit");
@@ -1402,12 +1376,9 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_data8:
       if (!do_loc)
 	{
-	  dwarf_vma high_bits;
-	  char buf[64];
-
-	  byte_get_64 (data, &high_bits, &uvalue);
-	  printf (" 0x%s",
-		  dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
+	  uvalue = byte_get (data, 4);
+	  printf (" 0x%s", dwarf_vmatoa ("x", uvalue));
+	  printf (" 0x%lx", (unsigned long) byte_get (data + 4, 4));
 	}
       if ((do_loc || do_debug_loc || do_debug_ranges)
 	  && num_debug_info_entries == 0)
@@ -1477,14 +1448,16 @@ read_and_display_attr_value (unsigned long attribute,
     case DW_FORM_ref_sig8:
       if (!do_loc)
 	{
-	  dwarf_vma high_bits;
-	  char buf[64];
-
-	  byte_get_64 (data, &high_bits, &uvalue);
-	  printf (" signature: 0x%s",
-		  dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
+	  int i;
+	  printf (" signature: ");
+	  for (i = 0; i < 8; i++)
+	    {
+	      printf ("%02x", (unsigned) byte_get (data, 1));
+	      data += 1;
+	    }
 	}
-      data += 8;
+      else
+        data += 8;
       break;
 
     default:
@@ -1626,18 +1599,16 @@ read_and_display_attr_value (unsigned long attribute,
 	case DW_LANG_D:			printf ("(D)"); break;
 	  /* DWARF 4 values.  */
 	case DW_LANG_Python:		printf ("(Python)"); break;
-	  /* DWARF 5 values.  */
-	case DW_LANG_Go:		printf ("(Go)"); break;
 	  /* MIPS extension.  */
 	case DW_LANG_Mips_Assembler:	printf ("(MIPS assembler)"); break;
 	  /* UPC extension.  */
 	case DW_LANG_Upc:		printf ("(Unified Parallel C)"); break;
 	default:
 	  if (uvalue >= DW_LANG_lo_user && uvalue <= DW_LANG_hi_user)
-	    printf (_("(implementation defined: %s)"),
+	    printf ("(implementation defined: %s)",
 		    dwarf_vmatoa ("x", uvalue));
 	  else
-	    printf (_("(Unknown: %s)"), dwarf_vmatoa ("x", uvalue));
+	    printf ("(Unknown: %s)", dwarf_vmatoa ("x", uvalue));
 	  break;
 	}
       break;
@@ -1675,9 +1646,9 @@ read_and_display_attr_value (unsigned long attribute,
 	default:
 	  if (uvalue >= DW_ATE_lo_user
 	      && uvalue <= DW_ATE_hi_user)
-	    printf (_("(user defined type)"));
+	    printf ("(user defined type)");
 	  else
-	    printf (_("(unknown type)"));
+	    printf ("(unknown type)");
 	  break;
 	}
       break;
@@ -1689,7 +1660,7 @@ read_and_display_attr_value (unsigned long attribute,
 	case DW_ACCESS_protected:	printf ("(protected)"); break;
 	case DW_ACCESS_private:		printf ("(private)"); break;
 	default:
-	  printf (_("(unknown accessibility)"));
+	  printf ("(unknown accessibility)");
 	  break;
 	}
       break;
@@ -1700,7 +1671,7 @@ read_and_display_attr_value (unsigned long attribute,
 	case DW_VIS_local:		printf ("(local)"); break;
 	case DW_VIS_exported:		printf ("(exported)"); break;
 	case DW_VIS_qualified:		printf ("(qualified)"); break;
-	default:			printf (_("(unknown visibility)")); break;
+	default:			printf ("(unknown visibility)"); break;
 	}
       break;
 
@@ -1710,7 +1681,7 @@ read_and_display_attr_value (unsigned long attribute,
 	case DW_VIRTUALITY_none:	printf ("(none)"); break;
 	case DW_VIRTUALITY_virtual:	printf ("(virtual)"); break;
 	case DW_VIRTUALITY_pure_virtual:printf ("(pure_virtual)"); break;
-	default:			printf (_("(unknown virtuality)")); break;
+	default:			printf ("(unknown virtuality)"); break;
 	}
       break;
 
@@ -1721,7 +1692,7 @@ read_and_display_attr_value (unsigned long attribute,
 	case DW_ID_up_case:		printf ("(up_case)"); break;
 	case DW_ID_down_case:		printf ("(down_case)"); break;
 	case DW_ID_case_insensitive:	printf ("(case_insensitive)"); break;
-	default:			printf (_("(unknown case)")); break;
+	default:			printf ("(unknown case)"); break;
 	}
       break;
 
@@ -1734,16 +1705,16 @@ read_and_display_attr_value (unsigned long attribute,
 	default:
 	  if (uvalue >= DW_CC_lo_user
 	      && uvalue <= DW_CC_hi_user)
-	    printf (_("(user defined)"));
+	    printf ("(user defined)");
 	  else
-	    printf (_("(unknown convention)"));
+	    printf ("(unknown convention)");
 	}
       break;
 
     case DW_AT_ordering:
       switch (uvalue)
 	{
-	case -1: printf (_("(undefined)")); break;
+	case -1: printf ("(undefined)"); break;
 	case 0:  printf ("(row major)"); break;
 	case 1:  printf ("(column major)"); break;
 	}
@@ -1798,8 +1769,7 @@ read_and_display_attr_value (unsigned long attribute,
 
 	if (form == DW_FORM_ref1
 	    || form == DW_FORM_ref2
-	    || form == DW_FORM_ref4
-	    || form == DW_FORM_ref_udata)
+	    || form == DW_FORM_ref4)
 	  uvalue += cu_offset;
 
 	if (uvalue >= section->size)
@@ -1813,7 +1783,7 @@ read_and_display_attr_value (unsigned long attribute,
 
 	    abbrev_number = read_leb128 (section->start + uvalue, NULL, 0);
 
-	    printf (_("[Abbrev Number: %ld"), abbrev_number);
+	    printf ("[Abbrev Number: %ld", abbrev_number);
 	    for (entry = first_abbrev; entry != NULL; entry = entry->next)
 	      if (entry->entry == abbrev_number)
 		break;
@@ -2135,8 +2105,7 @@ process_debug_info (struct dwarf_section *section,
       dwarf_vma cu_offset;
       int offset_size;
       int initial_length_size;
-      dwarf_vma signature_high = 0;
-      dwarf_vma signature_low = 0;
+      unsigned char signature[8] = { 0 };
       dwarf_vma type_offset = 0;
 
       hdrptr = start;
@@ -2170,8 +2139,14 @@ process_debug_info (struct dwarf_section *section,
 
       if (do_types)
         {
-          byte_get_64 (hdrptr, &signature_high, &signature_low);
-          hdrptr += 8;
+          int i;
+
+          for (i = 0; i < 8; i++)
+            {
+              signature[i] = byte_get (hdrptr, 1);
+              hdrptr += 1;
+            }
+
           type_offset = byte_get (hdrptr, offset_size);
           hdrptr += offset_size;
         }
@@ -2208,13 +2183,13 @@ process_debug_info (struct dwarf_section *section,
 	  printf (_("   Pointer Size:  %d\n"), compunit.cu_pointer_size);
 	  if (do_types)
 	    {
-	      char buf[64];
-
-	      printf (_("   Signature:     0x%s\n"),
-		      dwarf_vmatoa64 (signature_high, signature_low,
-				      buf, sizeof (buf)));
-	      printf (_("   Type Offset:   0x%s\n"),
-		      dwarf_vmatoa ("x", type_offset));
+	      int i;
+	      printf (_("   Signature:     "));
+	      for (i = 0; i < 8; i++)
+	        printf ("%02x", signature[i]);
+	      printf ("\n");
+             printf (_("   Type Offset:   0x%s\n"),
+                     dwarf_vmatoa ("x", type_offset));
 	    }
 	}
 
@@ -2822,9 +2797,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
       int offset_size;
       int i;
       File_Entry *file_table = NULL;
-      unsigned int n_files = 0;
       unsigned char **directory_table = NULL;
-      unsigned int n_directories = 0;
 
       hdrptr = data;
 
@@ -2909,6 +2882,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
       data = standard_opcodes + linfo.li_opcode_base - 1;
       if (*data != 0)
         {
+          unsigned int n_directories = 0;
           unsigned char *ptr_directory_table = data;
 
 	  while (*data != 0)
@@ -2935,6 +2909,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
       /* Traverse the File Name table just to count the entries.  */
       if (*data != 0)
         {
+          unsigned int n_files = 0;
           unsigned char *ptr_file_name_table = data;
 
           while (*data != 0)
@@ -2986,10 +2961,9 @@ display_debug_lines_decoded (struct dwarf_section *section,
             }
           else
             {
-              unsigned int ix = file_table[0].directory_index;
-              const char *directory = ix ? (char *)directory_table[ix - 1] : ".";
-              if (do_wide || strlen (directory) < 76)
-		printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
+              if (do_wide || strlen ((char *) directory_table[0]) < 76)
+		printf (_("CU: %s/%s:\n"), directory_table[0],
+			file_table[0].name);
               else
 		printf ("%s:\n", file_table[0].name);
 
@@ -3066,36 +3040,21 @@ display_debug_lines_decoded (struct dwarf_section *section,
                     break;
                   case DW_LNE_define_file:
                     {
-                      file_table = (File_Entry *) xrealloc
-                        (file_table, (n_files + 1) * sizeof (File_Entry));
+                      unsigned int dir_index = 0;
 
                       ++state_machine_regs.last_file_entry;
-                      /* Source file name.  */
-                      file_table[n_files].name = op_code_data;
                       op_code_data += strlen ((char *) op_code_data) + 1;
-                      /* Directory index.  */
-                      file_table[n_files].directory_index =
-                        read_leb128 (op_code_data, & bytes_read, 0);
+                      dir_index = read_leb128 (op_code_data, & bytes_read, 0);
                       op_code_data += bytes_read;
-                      /* Last modification time.  */
-                      file_table[n_files].modification_date =
-                        read_leb128 (op_code_data, & bytes_read, 0);
+                      read_leb128 (op_code_data, & bytes_read, 0);
                       op_code_data += bytes_read;
-                      /* File length.  */
-                      file_table[n_files].length =
-                        read_leb128 (op_code_data, & bytes_read, 0);
+                      read_leb128 (op_code_data, & bytes_read, 0);
 
-                      n_files++;
+                      printf ("%s:\n", directory_table[dir_index]);
                       break;
                     }
-                  case DW_LNE_set_discriminator:
-                  case DW_LNE_HP_set_sequence:
-                    /* Simply ignored.  */
-                    break;
-
                   default:
-                    printf (_("UNKNOWN (%u): length %d\n"),
-                            ext_op_code, ext_op_code_len - bytes_read);
+                    printf (_("UNKNOWN: length %d\n"), ext_op_code_len - bytes_read);
                     break;
                   }
                 data += ext_op_code_len;
@@ -5149,9 +5108,6 @@ display_debug_frames (struct dwarf_section *section,
 		{
 		  fc->col_type[opa] = cie->col_type[opa];
 		  fc->col_offset[opa] = cie->col_offset[opa];
-		  if (do_debug_frames_interp
-		      && fc->col_type[opa] == DW_CFA_unreferenced)
-		    fc->col_type[opa] = DW_CFA_undefined;
 		}
 	      break;
 
diff --git a/binutils/dwarf.h b/binutils/dwarf.h
index 75d93c8651..7a755c9a28 100644
--- a/binutils/dwarf.h
+++ b/binutils/dwarf.h
@@ -152,7 +152,6 @@ enum dwarf_section_display_enum
   static_vars,
   types,
   weaknames,
-  gdb_index,
   trace_info,
   trace_abbrev,
   trace_aranges,
diff --git a/binutils/elfcomm.c b/binutils/elfcomm.c
index 4224f8235e..e44dee8348 100644
--- a/binutils/elfcomm.c
+++ b/binutils/elfcomm.c
@@ -238,25 +238,6 @@ byte_get_signed (unsigned char *field, int size)
     }
 }
 
-/* Return the high-order 32-bits and the low-order 32-bits
-   of an 8-byte value separately.  */
-
-void
-byte_get_64 (unsigned char *field, elf_vma *high, elf_vma *low)
-{
-  if (byte_get == byte_get_big_endian)
-    {
-      *high = byte_get_big_endian (field, 4);
-      *low = byte_get_big_endian (field + 4, 4);
-    }
-  else
-    {
-      *high = byte_get_little_endian (field + 4, 4);
-      *low = byte_get_little_endian (field, 4);
-    }
-  return;
-}
-
 /* Return the path name for a proxy entry in a thin archive, adjusted
    relative to the path name of the thin archive itself if necessary.
    Always returns a pointer to malloc'ed memory.  */
diff --git a/binutils/elfcomm.h b/binutils/elfcomm.h
index 2a3c9133bd..3f9727e5cb 100644
--- a/binutils/elfcomm.h
+++ b/binutils/elfcomm.h
@@ -47,7 +47,6 @@ extern elf_vma (*byte_get) (unsigned char *, int);
 extern elf_vma byte_get_signed (unsigned char *, int);
 extern elf_vma byte_get_little_endian (unsigned char *, int);
 extern elf_vma byte_get_big_endian (unsigned char *, int);
-extern void byte_get_64 (unsigned char *, elf_vma *, elf_vma *);
 
 #define BYTE_PUT(field, val)	byte_put (field, val, sizeof (field))
 #define BYTE_GET(field)		byte_get (field, sizeof (field))
diff --git a/binutils/elfedit.c b/binutils/elfedit.c
index d9e23a12b5..f7bf9e99e7 100644
--- a/binutils/elfedit.c
+++ b/binutils/elfedit.c
@@ -1,5 +1,5 @@
 /* elfedit.c -- Update the ELF header of an ELF format file
-   Copyright 2010, 2011, 2012
+   Copyright 2010
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -19,8 +19,10 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "config.h"
 #include "sysdep.h"
 #include <assert.h>
+#include <sys/stat.h>
 
 #if __GNUC__ >= 2
 /* Define BFD64 here, even if our default architecture is 32 bit ELF
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c
index 64214e7132..157b41c21f 100644
--- a/binutils/nlmconv.c
+++ b/binutils/nlmconv.c
@@ -1,7 +1,6 @@
 /* nlmconv.c -- NLM conversion program
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
-   Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -43,6 +42,8 @@
 
 #include "ansidecl.h"
 #include <time.h>
+#include <sys/stat.h>
+#include <sys/file.h>
 #include <assert.h>
 #include "getopt.h"
 
diff --git a/binutils/nm.c b/binutils/nm.c
index 27019e190c..04067b1581 100644
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -1,6 +1,6 @@
 /* nm.c -- Describe symbol table of a rel file.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -184,8 +184,7 @@ static bfd *lineno_cache_bfd;
 static bfd *lineno_cache_rel_bfd;
 
 #define OPTION_TARGET 200
-#define OPTION_PLUGIN (OPTION_TARGET + 1)
-#define OPTION_SIZE_SORT (OPTION_PLUGIN + 1)
+#define OPTION_PLUGIN 201
 
 static struct option long_options[] =
 {
@@ -198,8 +197,8 @@ static struct option long_options[] =
   {"line-numbers", no_argument, 0, 'l'},
   {"no-cplus", no_argument, &do_demangle, 0},  /* Linux compatibility.  */
   {"no-demangle", no_argument, &do_demangle, 0},
-  {"no-sort", no_argument, 0, 'p'},
-  {"numeric-sort", no_argument, 0, 'n'},
+  {"no-sort", no_argument, &no_sort, 1},
+  {"numeric-sort", no_argument, &sort_numerically, 1},
   {"plugin", required_argument, 0, OPTION_PLUGIN},
   {"portability", no_argument, 0, 'P'},
   {"print-armap", no_argument, &print_armap, 1},
@@ -207,7 +206,7 @@ static struct option long_options[] =
   {"print-size", no_argument, 0, 'S'},
   {"radix", required_argument, 0, 't'},
   {"reverse-sort", no_argument, &reverse_sort, 1},
-  {"size-sort", no_argument, 0, OPTION_SIZE_SORT},
+  {"size-sort", no_argument, &sort_by_size, 1},
   {"special-syms", no_argument, &allow_special_symbols, 1},
   {"stats", no_argument, &show_stats, 1},
   {"synthetic", no_argument, &show_synthetic, 1},
@@ -1594,19 +1593,10 @@ main (int argc, char **argv)
 	  break;
 	case 'n':
 	case 'v':
-	  no_sort = 0;
 	  sort_numerically = 1;
-	  sort_by_size = 0;
 	  break;
 	case 'p':
 	  no_sort = 1;
-	  sort_numerically = 0;
-	  sort_by_size = 0;
-	  break;
-	case OPTION_SIZE_SORT:
-	  no_sort = 0;
-	  sort_numerically = 0;
-	  sort_by_size = 1;
 	  break;
 	case 'P':
 	  set_output_format ("posix");
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 230d3e5648..31ac0a2bb3 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1,6 +1,6 @@
 /* objcopy.c -- copy object file from input to output, optionally massaging it.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -30,6 +30,7 @@
 #include "filenames.h"
 #include "fnmatch.h"
 #include "elf-bfd.h"
+#include <sys/stat.h>
 #include "libbfd.h"
 #include "coff/internal.h"
 #include "libcoff.h"
diff --git a/binutils/objdump.c b/binutils/objdump.c
index f55b79d645..784ead27e0 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1,7 +1,7 @@
 /* objdump.c -- dump information about an object file.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-   2012 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -71,6 +71,8 @@
 #include <sys/mman.h>
 #endif
 
+#include <sys/stat.h>
+
 /* Internal headers for the ELF .stab-dump code - sorry.  */
 #define	BYTES_IN_WORD	32
 #include "aout/aout64.h"
@@ -1123,28 +1125,25 @@ slurp_file (const char *fn, size_t *size)
   if (fd < 0)
     return NULL;
   if (fstat (fd, &st) < 0)
-    {
-      close (fd);
-      return NULL;
-    }
+    return NULL;
   *size = st.st_size;
 #ifdef HAVE_MMAP
   msize = (*size + ps - 1) & ~(ps - 1);
   map = mmap (NULL, msize, PROT_READ, MAP_SHARED, fd, 0);
-  if (map != (char *) -1L)
+  if (map != (char *)-1L)
     {
-      close (fd);
-      return map;
+      close(fd);
+      return map; 
     }
 #endif
   map = (const char *) malloc (*size);
-  if (!map || (size_t) read (fd, (char *) map, *size) != *size)
-    {
-      free ((void *) map);
+  if (!map || (size_t) read (fd, (char *)map, *size) != *size) 
+    { 
+      free ((void *)map);
       map = NULL;
     }
   close (fd);
-  return map;
+  return map; 
 }
 
 #define line_map_decrease 5
@@ -3258,7 +3257,7 @@ dump_bfd (bfd *abfd)
 }
 
 static void
-display_object_bfd (bfd *abfd)
+display_bfd (bfd *abfd)
 {
   char **matching;
 
@@ -3298,8 +3297,24 @@ display_object_bfd (bfd *abfd)
 }
 
 static void
-display_any_bfd (bfd *file, int level)
+display_file (char *filename, char *target)
 {
+  bfd *file;
+  bfd *arfile = NULL;
+
+  if (get_file_size (filename) < 1)
+    {
+      exit_status = 1;
+      return;
+    }
+
+  file = bfd_openr (filename, target);
+  if (file == NULL)
+    {
+      nonfatal (filename);
+      return;
+    }
+
   /* Decompress sections unless dumping the section contents.  */
   if (!dump_section_contents)
     file->flags |= BFD_DECOMPRESS;
@@ -3307,14 +3322,9 @@ display_any_bfd (bfd *file, int level)
   /* If the file is an archive, process all of its elements.  */
   if (bfd_check_format (file, bfd_archive))
     {
-      bfd *arfile = NULL;
       bfd *last_arfile = NULL;
 
-      if (level == 0)
-        printf (_("In archive %s:\n"), bfd_get_filename (file));
-      else
-        printf (_("In nested archive %s:\n"), bfd_get_filename (file));
-
+      printf (_("In archive %s:\n"), bfd_get_filename (file));
       for (;;)
 	{
 	  bfd_set_error (bfd_error_no_error);
@@ -3327,7 +3337,7 @@ display_any_bfd (bfd *file, int level)
 	      break;
 	    }
 
-	  display_any_bfd (arfile, level + 1);
+	  display_bfd (arfile);
 
 	  if (last_arfile != NULL)
 	    bfd_close (last_arfile);
@@ -3338,28 +3348,7 @@ display_any_bfd (bfd *file, int level)
 	bfd_close (last_arfile);
     }
   else
-    display_object_bfd (file);
-}
-
-static void
-display_file (char *filename, char *target)
-{
-  bfd *file;
-
-  if (get_file_size (filename) < 1)
-    {
-      exit_status = 1;
-      return;
-    }
-
-  file = bfd_openr (filename, target);
-  if (file == NULL)
-    {
-      nonfatal (filename);
-      return;
-    }
-
-  display_any_bfd (file, 0);
+    display_bfd (file);
 
   bfd_close (file);
 }
diff --git a/binutils/objdump.h b/binutils/objdump.h
index 214ecc6970..511898c495 100644
--- a/binutils/objdump.h
+++ b/binutils/objdump.h
@@ -1,5 +1,5 @@
 /* objdump.h
-   Copyright 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2011 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -18,6 +18,8 @@
    Foundation, 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#include <stdio.h>
+
 struct objdump_private_option
 {
   /* Option name.  */
@@ -46,6 +48,3 @@ struct objdump_private_desc
 
 /* XCOFF specific target.  */
 extern const struct objdump_private_desc objdump_private_desc_xcoff;
-
-/* Mach-O specific target.  */
-extern const struct objdump_private_desc objdump_private_desc_mach_o;
diff --git a/binutils/od-xcoff.c b/binutils/od-xcoff.c
index 41f8ba3306..5b8b5896eb 100644
--- a/binutils/od-xcoff.c
+++ b/binutils/od-xcoff.c
@@ -1,5 +1,5 @@
 /* od-xcoff.c -- dump information about an xcoff object file.
-   Copyright 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2011 Free Software Foundation, Inc.
    Written by Tristan Gingold, Adacore.
 
    This file is part of GNU Binutils.
@@ -19,9 +19,9 @@
    Foundation, 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#include "sysdep.h"
 #include <stddef.h>
 #include <time.h>
+#include "sysdep.h"
 #include "safe-ctype.h"
 #include "bfd.h"
 #include "objdump.h"
@@ -459,53 +459,52 @@ dump_xcoff32_aout_header (bfd *abfd, struct xcoff_dump *data)
     }
 
   magic = bfd_h_get_16 (abfd, auxhdr.magic);
-  /* We don't translate these strings as they are fields name.  */
-  printf ("  o_mflag (magic): 0x%04x 0%04o\n", magic, magic);
-  printf ("  o_vstamp:        0x%04x\n",
+  printf (_("  o_mflag (magic): 0x%04x 0%04o\n"), magic, magic);
+  printf (_("  o_vstamp:        0x%04x\n"),
           (unsigned short)bfd_h_get_16 (abfd, auxhdr.vstamp));
-  printf ("  o_tsize:         0x%08x\n",
+  printf (_("  o_tsize:         0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.tsize));
-  printf ("  o_dsize:         0x%08x\n",
+  printf (_("  o_dsize:         0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.dsize));
-  printf ("  o_entry:         0x%08x\n",
+  printf (_("  o_entry:         0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.entry));
-  printf ("  o_text_start:    0x%08x\n",
+  printf (_("  o_text_start:    0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.text_start));
-  printf ("  o_data_start:    0x%08x\n",
+  printf (_("  o_data_start:    0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.data_start));
   if (sz == offsetof (AOUTHDR, o_toc))
     return;
-  printf ("  o_toc:           0x%08x\n",
+  printf (_("  o_toc:           0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.o_toc));
-  printf ("  o_snentry:       0x%04x\n",
+  printf (_("  o_snentry:       0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_snentry));
-  printf ("  o_sntext:        0x%04x\n",
+  printf (_("  o_sntext:        0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_sntext));
-  printf ("  o_sndata:        0x%04x\n",
+  printf (_("  o_sndata:        0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_sndata));
-  printf ("  o_sntoc:         0x%04x\n",
+  printf (_("  o_sntoc:         0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_sntoc));
-  printf ("  o_snloader:      0x%04x\n",
+  printf (_("  o_snloader:      0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_snloader));
-  printf ("  o_snbss:         0x%04x\n",
+  printf (_("  o_snbss:         0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_snbss));
-  printf ("  o_algntext:      %u\n",
+  printf (_("  o_algntext:      %u\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_algntext));
-  printf ("  o_algndata:      %u\n",
+  printf (_("  o_algndata:      %u\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_algndata));
-  printf ("  o_modtype:       0x%04x",
+  printf (_("  o_modtype:       0x%04x"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_modtype));
   if (ISPRINT (auxhdr.o_modtype[0]) && ISPRINT (auxhdr.o_modtype[1]))
     printf (" (%c%c)", auxhdr.o_modtype[0], auxhdr.o_modtype[1]);
   putchar ('\n');
-  printf ("  o_cputype:       0x%04x\n",
+  printf (_("  o_cputype:       0x%04x\n"),
           (unsigned int)bfd_h_get_16 (abfd, auxhdr.o_cputype));
-  printf ("  o_maxstack:      0x%08x\n",
+  printf (_("  o_maxstack:      0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.o_maxstack));
-  printf ("  o_maxdata:       0x%08x\n",
+  printf (_("  o_maxdata:       0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.o_maxdata));
 #if 0
-  printf ("  o_debugger:      0x%08x\n",
+  printf (_("  o_debugger:      0x%08x\n"),
           (unsigned int)bfd_h_get_32 (abfd, auxhdr.o_debugger));
 #endif
 }
@@ -532,8 +531,7 @@ dump_xcoff32_sections_header (bfd *abfd, struct xcoff_dump *data)
       non_fatal (_("cannot read section header"));
       return;
     }
-  /* We don't translate this string as it consists in fields name.  */
-  printf (" # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n");
+  printf (_(" # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"));
   for (i = 0; i < data->nscns; i++)
     {
       struct external_scnhdr scn;
@@ -545,7 +543,8 @@ dump_xcoff32_sections_header (bfd *abfd, struct xcoff_dump *data)
           return;
         }
       flags = bfd_h_get_32 (abfd, scn.s_flags);
-      printf ("%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n",
+      printf (_("%2d %-8.8s %08x %08x %08x %08x %08x %08x "
+                "%-5d %-5d\n"),
               i + 1, scn.s_name,
               (unsigned int)bfd_h_get_32 (abfd, scn.s_paddr),
               (unsigned int)bfd_h_get_32 (abfd, scn.s_vaddr),
@@ -748,7 +747,7 @@ dump_xcoff32_symbols (bfd *abfd, struct xcoff_dump *data)
       return;
     }
 
-  /* Read strings table.  */
+  /* Read string table.  */
   if (data->strings_size == 0)
     printf (_(" (no strings):\n"));
   else
@@ -765,7 +764,6 @@ dump_xcoff32_symbols (bfd *abfd, struct xcoff_dump *data)
       bfd_get_section_contents (abfd, debugsec, debug, 0, size);
     }
 
-  /* Translators: 'sc' is for storage class, 'off' for offset.  */
   printf (_("  # sc         value    section  type aux name/off\n"));
   for (i = 0; i < data->nsyms; i++)
     {
@@ -817,14 +815,12 @@ dump_xcoff32_symbols (bfd *abfd, struct xcoff_dump *data)
           switch (s->sym.sclass)
             {
             case C_STAT:
-              /* Section length, number of relocs and line number.  */
               printf (_("  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"),
                       (unsigned)bfd_h_get_32 (abfd, aux->x_scn.x_scnlen),
                       (unsigned)bfd_h_get_16 (abfd, aux->x_scn.x_nreloc),
                       (unsigned)bfd_h_get_16 (abfd, aux->x_scn.x_nlinno));
               break;
             case C_DWARF:
-              /* Section length and number of relocs.  */
               printf (_("  scnlen: %08x  nreloc: %-6u\n"),
                       (unsigned)bfd_h_get_32 (abfd, aux->x_scn.x_scnlen),
                       (unsigned)bfd_h_get_16 (abfd, aux->x_scn.x_nreloc));
@@ -834,8 +830,8 @@ dump_xcoff32_symbols (bfd *abfd, struct xcoff_dump *data)
             case C_HIDEXT:
               if (j == 0 && s->sym.numaux > 1)
                 {
-                  /* Function aux entry  (Do not translate).  */
-                  printf ("  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n",
+                  /* Function aux entry.  */
+                  printf (_("  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"),
                           (unsigned)bfd_h_get_32 (abfd, aux->x_sym.x_tagndx),
                           (unsigned)bfd_h_get_32
                             (abfd, aux->x_sym.x_misc.x_fsize),
@@ -854,39 +850,38 @@ dump_xcoff32_symbols (bfd *abfd, struct xcoff_dump *data)
                   scnlen = bfd_h_get_32 (abfd, aux->x_csect.x_scnlen);
 
                   if (smtyp == XTY_LD)
-                    printf ("  scnsym: %-8u", scnlen);
+                    printf (_("  scnsym: %-8u"), scnlen);
                   else
-                    printf ("  scnlen: %08x", scnlen);
-                  printf (" h: parm=%08x sn=%04x al: 2**%u",
+                    printf (_("  scnlen: %08x"), scnlen);
+                  printf (_(" h: parm=%08x sn=%04x al: 2**%u"),
                           (unsigned)bfd_h_get_32 (abfd, aux->x_csect.x_parmhash),
                           (unsigned)bfd_h_get_16 (abfd, aux->x_csect.x_snhash),
                           SMTYP_ALIGN (smtyp));
-                  printf (" typ: ");
+                  printf (_(" typ: "));
                   dump_value (smtyp_xlat, SMTYP_SMTYP (smtyp), 2);
-                  printf (" cl: ");
+                  printf (_(" cl: "));
                   dump_value
                     (smclas_xlat,
                      (unsigned)bfd_h_get_8 (abfd, aux->x_csect.x_smclas), 6);
                   putchar ('\n');
                 }
               else
-                /* Do not translate - generic field name.  */
                 printf ("aux\n");
               break;
             case C_FILE:
               {
                 unsigned int off;
 
-                printf (" ftype: %02x ",
+                printf (_(" ftype: %02x "),
                         (unsigned)bfd_h_get_8 (abfd, aux->x_file.x_ftype));
                 if (aux->x_file.x_n.x_fname[0] != 0)
-                  printf ("fname: %.14s", aux->x_file.x_n.x_fname);
+                  printf (_("fname: %.14s"), aux->x_file.x_n.x_fname);
                 else
                   {
                     off = (unsigned)bfd_h_get_32
                       (abfd, aux->x_file.x_n.x_n.x_offset);
                     if (data->strings != NULL && off < data->strings_size)
-                      printf (" %s", data->strings + off);
+                      printf (_(" %s"), data->strings + off);
                     else
                       printf (_("offset: %08x"), off);
                   }
@@ -895,12 +890,11 @@ dump_xcoff32_symbols (bfd *abfd, struct xcoff_dump *data)
               break;
             case C_BLOCK:
             case C_FCN:
-              printf ("  lnno: %u\n",
+              printf (_("  lnno: %u\n"),
                       (unsigned)bfd_h_get_16
                       (abfd, aux->x_sym.x_misc.x_lnsz.x_lnno));
               break;
             default:
-              /* Do not translate - generic field name.  */
               printf ("aux\n");
               break;
             }
@@ -937,8 +931,7 @@ dump_xcoff32_relocs (bfd *abfd, struct xcoff_dump *data)
           non_fatal (_("cannot read relocations"));
           continue;
         }
-      /* Do not translate: fields name.  */
-      printf ("vaddr    sgn mod sz type  symndx symbol\n");
+      printf (_("vaddr    sgn mod sz type  symndx symbol\n"));
       for (j = 0; j < nrel; j++)
         {
           struct external_reloc rel;
@@ -951,7 +944,7 @@ dump_xcoff32_relocs (bfd *abfd, struct xcoff_dump *data)
               return;
             }
           rsize = bfd_h_get_8 (abfd, rel.r_size);
-          printf ("%08x  %c   %c  %-2u ",
+          printf (_("%08x  %c   %c  %-2u "),
                   (unsigned int)bfd_h_get_32 (abfd, rel.r_vaddr),
                   rsize & 0x80 ? 'S' : 'U',
                   rsize & 0x40 ? 'm' : ' ',
@@ -993,7 +986,6 @@ dump_xcoff32_lineno (bfd *abfd, struct xcoff_dump *data)
           non_fatal (_("cannot read line numbers"));
           continue;
         }
-      /* Line number, symbol index and physical address.  */
       printf (_("lineno  symndx/paddr\n"));
       for (j = 0; j < nlnno; j++)
         {
@@ -1006,7 +998,7 @@ dump_xcoff32_lineno (bfd *abfd, struct xcoff_dump *data)
               return;
             }
           no = bfd_h_get_16 (abfd, ln.l_lnno);
-          printf (" %-6u ", no);
+          printf (_(" %-6u "), no);
           if (no == 0)
             {
               unsigned int symndx = bfd_h_get_32 (abfd, ln.l_addr.l_symndx);
@@ -1071,7 +1063,6 @@ dump_xcoff32_loader (bfd *abfd)
   printf (_("  nbr symbols:       %u\n"), ndsyms);
   ndrel = bfd_h_get_32 (abfd, lhdr->l_nreloc);
   printf (_("  nbr relocs:        %u\n"), ndrel);
-  /* Import string table length.  */
   printf (_("  import strtab len: %u\n"),
           (unsigned) bfd_h_get_32 (abfd, lhdr->l_istlen));
   nimpid = bfd_h_get_32 (abfd, lhdr->l_nimpid);
@@ -1085,8 +1076,7 @@ dump_xcoff32_loader (bfd *abfd)
 
   ldsym = (struct external_ldsym *)(ldr_data + sizeof (*lhdr));
   printf (_("Dynamic symbols:\n"));
-  /* Do not translate: field names.  */
-  printf ("     # value     sc IFEW ty class file  pa name\n");
+  printf (_("     # value     sc IFEW ty class file  pa name\n"));
   for (i = 0; i < ndsyms; i++, ldsym++)
     {
       unsigned char smtype;
@@ -1121,8 +1111,7 @@ dump_xcoff32_loader (bfd *abfd)
     }
 
   printf (_("Dynamic relocs:\n"));
-  /* Do not translate fields name.  */
-  printf ("  vaddr    sec    sz typ   sym\n");
+  printf (_("  vaddr    sec    sz typ   sym\n"));
   ldrel = (struct external_ldrel *)(ldr_data + sizeof (*lhdr)
                                     + ndsyms * sizeof (*ldsym));
   for (i = 0; i < ndrel; i++, ldrel++)
@@ -1134,7 +1123,7 @@ dump_xcoff32_loader (bfd *abfd)
       rsize = bfd_h_get_8 (abfd, ldrel->l_rtype + 0);
       rtype = bfd_h_get_8 (abfd, ldrel->l_rtype + 1);
 
-      printf ("  %08x %3u %c%c %2u ",
+      printf (_("  %08x %3u %c%c %2u "),
               (unsigned)bfd_h_get_32 (abfd, ldrel->l_vaddr),
               (unsigned)bfd_h_get_16 (abfd, ldrel->l_rsecnm),
               rsize & 0x80 ? 'S' : 'U',
@@ -1145,16 +1134,16 @@ dump_xcoff32_loader (bfd *abfd)
       switch (symndx)
         {
         case 0:
-          printf (".text");
+          printf (_(".text"));
           break;
         case 1:
-          printf (".data");
+          printf (_(".data"));
           break;
         case 2:
-          printf (".bss");
+          printf (_(".bss"));
           break;
         default:
-          printf ("%u", symndx - 3);
+          printf (_("%u"), symndx - 3);
           break;
         }
       putchar ('\n');
@@ -1201,8 +1190,7 @@ dump_xcoff32_except (bfd *abfd, struct xcoff_dump *data)
   exceptab = (struct external_exceptab *)excp_data;
 
   printf (_("Exception table:\n"));
-  /* Do not translate fields name.  */
-  printf ("lang reason sym/addr\n");
+  printf (_("lang reason sym/addr\n"));
   for (i = 0; i * sizeof (*exceptab) < size; i++, exceptab++)
     {
       unsigned int reason;
@@ -1210,12 +1198,12 @@ dump_xcoff32_except (bfd *abfd, struct xcoff_dump *data)
 
       addr = bfd_get_32 (abfd, exceptab->e_addr.e_paddr);
       reason = bfd_get_8 (abfd, exceptab->e_reason);
-      printf ("  %02x     %02x ",
+      printf (_("  %02x     %02x "),
               (unsigned) bfd_get_8 (abfd, exceptab->e_lang), reason);
       if (reason == 0)
         xcoff32_print_symbol (data, addr);
       else
-        printf ("@%08x", addr);
+        printf (_("@%08x"), addr);
       putchar ('\n');
     }
   free (excp_data);
@@ -1243,8 +1231,7 @@ dump_xcoff32_typchk (bfd *abfd)
   bfd_get_section_contents (abfd, sec, data, 0, size);
 
   printf (_("Type-check section:\n"));
-  /* Do not translate field names.  */
-  printf ("offset    len  lang-id general-hash language-hash\n");
+  printf (_("offset    len  lang-id general-hash language-hash\n"));
   for (i = 0; i < size;)
     {
       unsigned int len;
@@ -1306,32 +1293,32 @@ dump_xcoff32_tbtags (bfd *abfd,
         tb1 = bfd_get_32 (abfd, text + i + 4);
         tb2 = bfd_get_32 (abfd, text + i + 8);
         off = i + 12;
-        printf (" version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n",
+        printf (_(" version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"),
                 (tb1 >> 24) & 0xff,
                 (tb1 >> 16) & 0xff,
                 (tb1 >> 15) & 1,
                 (tb1 >> 14) & 1,
                 (tb1 >> 13) & 1,
                 (tb1 >> 12) & 1);
-        printf (" has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n",
+        printf (_(" has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"),
                 (tb1 >> 11) & 1,
                 (tb1 >> 10) & 1,
                 (tb1 >> 9) & 1,
                 (tb1 >> 8) & 1,
                 (tb1 >> 7) & 1);
-        printf (" name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n",
+        printf (_(" name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"),
                 (tb1 >> 6) & 1,
                 (tb1 >> 5) & 1,
                 (tb1 >> 2) & 7,
                 (tb1 >> 1) & 1,
                 (tb1 >> 0) & 1);
-        printf (" stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n",
+        printf (_(" stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"),
                 (tb2 >> 31) & 1,
                 (tb2 >> 30) & 1,
                 (tb2 >> 24) & 63,
                 (tb2 >> 22) & 3,
                 (tb2 >> 16) & 63);
-        printf (" fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n",
+        printf (_(" fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"),
                 (tb2 >> 8) & 0xff,
                 (tb2 >> 1) & 0x7f,
                 (tb2 >> 0) & 1);
@@ -1344,7 +1331,7 @@ dump_xcoff32_tbtags (bfd *abfd,
               goto truncated;
             parminfo = bfd_get_32 (abfd, text + off);
             off += 4;
-            printf (" parminfo: 0x%08x\n", parminfo);
+            printf (_(" parminfo: 0x%08x\n"), parminfo);
           }
 
         if ((tb1 >> 13) & 1)
@@ -1355,7 +1342,7 @@ dump_xcoff32_tbtags (bfd *abfd,
               goto truncated;
             tboff = bfd_get_32 (abfd, text + off);
             off += 4;
-            printf (" tb_offset: 0x%08x (start=0x%08x)\n",
+            printf (_(" tb_offset: 0x%08x (start=0x%08x)\n"),
                     tboff, text_start + i - tboff);
           }
         if ((tb1 >> 7) & 1)
@@ -1366,7 +1353,7 @@ dump_xcoff32_tbtags (bfd *abfd,
               goto truncated;
             hand_mask = bfd_get_32 (abfd, text + off);
             off += 4;
-            printf (" hand_mask_offset: 0x%08x\n", hand_mask);
+            printf (_(" hand_mask_offset: 0x%08x\n"), hand_mask);
           }
         if ((tb1 >> 11) & 1)
           {
@@ -1382,8 +1369,8 @@ dump_xcoff32_tbtags (bfd *abfd,
               {
                 if (off >= text_size)
                   goto truncated;
-                printf ("  CTL[%u]: %08x\n",
-                        j, (unsigned)bfd_get_32 (abfd, text + off));
+                printf (_("  CTL[%u]: %08x\n"),
+                          j, (unsigned)bfd_get_32 (abfd, text + off));
                 off += 4;
               }
           }
@@ -1414,7 +1401,7 @@ dump_xcoff32_tbtags (bfd *abfd,
           {
             if (off >= text_size)
               goto truncated;
-            printf (" alloca reg: %u\n",
+            printf (_(" alloca reg: %u\n"),
                     (unsigned) bfd_get_8 (abfd, text + off));
             off++;
           }
diff --git a/binutils/po/POTFILES.in b/binutils/po/POTFILES.in
index 23f152750e..c82e24a613 100644
--- a/binutils/po/POTFILES.in
+++ b/binutils/po/POTFILES.in
@@ -41,7 +41,6 @@ not-strip.c
 objcopy.c
 objdump.c
 objdump.h
-od-macho.c
 od-xcoff.c
 prdbg.c
 rclex.c
diff --git a/binutils/po/bg.po b/binutils/po/bg.po
index f09fd0b64e..e636dc6517 100644
--- a/binutils/po/bg.po
+++ b/binutils/po/bg.po
@@ -1,37 +1,36 @@
 # Translation of binutils to Bulgarian
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010, 2011.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: binutils 2.21.53\n"
+"Project-Id-Version: binutils 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2011-10-07 23:48+0300\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2010-11-10 23:50+0200\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: addr2line.c:81
+#: addr2line.c:80
 #, c-format
 msgid "Usage: %s [option(s)] [addr(s)]\n"
 msgstr "Употреба: %s [команда(-и)] [адре�(-и)]\n"
 
-#: addr2line.c:82
+#: addr2line.c:81
 #, c-format
 msgid " Convert addresses into line number/file name pairs.\n"
 msgstr " Преобразува адре� към двойката номер на ред/име на файл.\n"
 
-#: addr2line.c:83
+#: addr2line.c:82
 #, c-format
 msgid " If no addresses are specified on the command line, they will be read from stdin\n"
 msgstr " �ко на командни� ред не �а зададени адре�и, те ще бъдат четени от �тандартни� вход\n"
 
-#: addr2line.c:84
+#: addr2line.c:83
 #, c-format
 msgid ""
 " The options are:\n"
@@ -63,215 +62,210 @@ msgstr ""
 "  -v --version           Показва вер�и� на програмата\n"
 "\n"
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
-#: windmc.c:228 windres.c:695
+#: addr2line.c:100 ar.c:293 coffdump.c:469 dlltool.c:3926 dllwrap.c:524
+#: elfedit.c:1155 nlmconv.c:1113 objcopy.c:576 objcopy.c:611 readelf.c:3219
+#: size.c:99 srconv.c:1742 strings.c:663 sysdump.c:653 windmc.c:228
+#: windres.c:694
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Подавайте доклади за грешки на %s\n"
 
-#: addr2line.c:271
+#: addr2line.c:262
 #, c-format
 msgid " at "
-msgstr " на "
+msgstr ""
 
-#: addr2line.c:296
+#: addr2line.c:287
 #, c-format
 msgid " (inlined by) "
-msgstr " (вмъкнато от) "
+msgstr ""
 
-#: addr2line.c:329
+#: addr2line.c:320
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr "%s: не може да �е получат адре�и от архива"
 
-#: addr2line.c:346
+#: addr2line.c:337
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr "%s: не може да �е намери �екци�та %s"
 
-#: addr2line.c:415 nm.c:1566 objdump.c:3423
+#: addr2line.c:406 nm.c:1563 objdump.c:3301
 #, c-format
 msgid "unknown demangling style `%s'"
-msgstr "непознат начин за въз�танов�ване '%s'"
+msgstr "непознат начин за декориране '%s'"
 
-#: ar.c:238
+#: ar.c:215
 #, c-format
 msgid "no entry %s in archive\n"
 msgstr "в архива лип�ва входна точка %s\n"
 
-#: ar.c:254
+#: ar.c:233
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
-msgstr "Употреба: %s [опции за подражаване] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <име>] [член-име] [брой] архивен-файл файл...\n"
+msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Употреба: %s [опции за подражаване] [--plugin <име>] [-]{dmpqrstx}[abcfilNoPsSuvV] [член-име] [брой] архивен-файл файл...\n"
 
-#: ar.c:260
+#: ar.c:235
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
-msgstr "Употреба: %s [опции за подражаване] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [член-име] [брой] архивен-файл файл...\n"
+msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Употреба: %s [опции за подражаване] [-]{dmpqrstx}[abcfilNoPsSuvV] [член-име] [брой] архивен-файл файл...\n"
 
-#: ar.c:266
+#: ar.c:240
 #, c-format
 msgid "       %s -M [<mri-script]\n"
 msgstr "       %s -M [<mri-�крипт]\n"
 
-#: ar.c:267
+#: ar.c:241
 #, c-format
 msgid " commands:\n"
 msgstr " команди:\n"
 
-#: ar.c:268
+#: ar.c:242
 #, c-format
 msgid "  d            - delete file(s) from the archive\n"
 msgstr "  d            - изтриване на файл(-ове) от архива\n"
 
-#: ar.c:269
+#: ar.c:243
 #, c-format
 msgid "  m[ab]        - move file(s) in the archive\n"
 msgstr "  m[ab]        - преме�тване на файл(-ове) в архива\n"
 
-#: ar.c:270
+#: ar.c:244
 #, c-format
 msgid "  p            - print file(s) found in the archive\n"
 msgstr "  p            - извеждане на файл(-ове) намерен в архива\n"
 
-#: ar.c:271
+#: ar.c:245
 #, c-format
 msgid "  q[f]         - quick append file(s) to the archive\n"
 msgstr "  q[f]         - бързо добав�не на файл/-ове към архива\n"
 
-#: ar.c:272
+#: ar.c:246
 #, c-format
 msgid "  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"
 msgstr "  r[ab][f][u]  - заме�тва �ъще�твуващ или добав� нов файл/-ове в архива\n"
 
-#: ar.c:273
+#: ar.c:247
 #, c-format
 msgid "  s            - act as ranlib\n"
 msgstr "  s            - държи �е като ranlib\n"
 
-#: ar.c:274
+#: ar.c:248
 #, c-format
 msgid "  t            - display contents of archive\n"
 msgstr "  t            - показване �ъдържанието на архива\n"
 
-#: ar.c:275
+#: ar.c:249
 #, c-format
 msgid "  x[o]         - extract file(s) from the archive\n"
 msgstr "  x[o]         - изваждане на файл/-ове от архива\n"
 
-#: ar.c:276
+#: ar.c:250
 #, c-format
 msgid " command specific modifiers:\n"
 msgstr " уточнители характерни за команда:\n"
 
-#: ar.c:277
+#: ar.c:251
 #, c-format
 msgid "  [a]          - put file(s) after [member-name]\n"
 msgstr "  [a]          - по�таване на файл/-ове �лед [член-име]\n"
 
-#: ar.c:278
+#: ar.c:252
 #, c-format
 msgid "  [b]          - put file(s) before [member-name] (same as [i])\n"
 msgstr "  [b]          - по�таване на файл/-ове преди [член-име] (�ъщо като [i])\n"
 
-#: ar.c:279
+#: ar.c:253
 #, c-format
 msgid "  [D]          - use zero for timestamps and uids/gids\n"
 msgstr "  [D]          - използване на нула за дата и ча� и идентификатори за потребител и група\n"
 
-#: ar.c:280
+#: ar.c:254
 #, c-format
 msgid "  [N]          - use instance [count] of name\n"
 msgstr ""
 
-#: ar.c:281
+#: ar.c:255
 #, c-format
 msgid "  [f]          - truncate inserted file names\n"
 msgstr "  [f]          - отр�зване на вмъкнати имена на файлове\n"
 
-#: ar.c:282
+#: ar.c:256
 #, c-format
 msgid "  [P]          - use full path names when matching\n"
 msgstr "  [P]          - използване на пълни имена за пътища ако �ъвпадат\n"
 
-#: ar.c:283
+#: ar.c:257
 #, c-format
 msgid "  [o]          - preserve original dates\n"
 msgstr "  [o]          - запазване на първоначалните дати\n"
 
-#: ar.c:284
+#: ar.c:258
 #, c-format
 msgid "  [u]          - only replace files that are newer than current archive contents\n"
 msgstr "  [u]          - да �е заме�т�т �амо файловете, които �а по-нови от текущото �ъдържание на архива\n"
 
-#: ar.c:285
+#: ar.c:259
 #, c-format
 msgid " generic modifiers:\n"
 msgstr " о�новни уточнители:\n"
 
-#: ar.c:286
+#: ar.c:260
 #, c-format
 msgid "  [c]          - do not warn if the library had to be created\n"
 msgstr "  [c]          - без предупреждение, ако тр�бва да �е �ъздаде библиотека\n"
 
-#: ar.c:287
+#: ar.c:261
 #, c-format
 msgid "  [s]          - create an archive index (cf. ranlib)\n"
 msgstr "  [s]          - �ъздаване на индек� на архива (виж ranlib)\n"
 
-#: ar.c:288
+#: ar.c:262
 #, c-format
 msgid "  [S]          - do not build a symbol table\n"
 msgstr "  [S]          - без �ъздаване на таблица за имена\n"
 
-#: ar.c:289
+#: ar.c:263
 #, c-format
 msgid "  [T]          - make a thin archive\n"
 msgstr "  [T]          - �ъздаване на \"тънък\" архив\n"
 
-#: ar.c:290
+#: ar.c:264
 #, c-format
 msgid "  [v]          - be verbose\n"
 msgstr "  [v]          - � подробно�ти\n"
 
-#: ar.c:291
+#: ar.c:265
 #, c-format
 msgid "  [V]          - display the version number\n"
 msgstr "  [V]          - показване номер на вер�и�\n"
 
-#: ar.c:292
+#: ar.c:266
 #, c-format
 msgid "  @<file>      - read options from <file>\n"
 msgstr "  @<файл>      - прочитане на команди от <файл>\n"
 
-#: ar.c:293
-#, c-format
-msgid "  --target=BFDNAME - specify the target object format as BFDNAME\n"
-msgstr "  --target=BFD–ИМЕ - задава BFD–ИМЕ за формата на целеви� обект\n"
-
-#: ar.c:295
+#: ar.c:268
 #, c-format
 msgid " optional:\n"
 msgstr " възможни:\n"
 
-#: ar.c:296
+#: ar.c:269
 #, c-format
 msgid "  --plugin <p> - load the specified plugin\n"
 msgstr "  --plugin <п> - зареждане на указаната при�тавка\n"
 
-#: ar.c:317
+#: ar.c:276
 #, c-format
 msgid "Usage: %s [options] archive\n"
 msgstr "Употреба: %s [команди] архив\n"
 
-#: ar.c:318
+#: ar.c:277
 #, c-format
 msgid " Generate an index to speed access to archives\n"
 msgstr " Създаване на индек� за у�кор�ване до�тъпа до архивите\n"
 
-#: ar.c:319
+#: ar.c:278
 #, c-format
 msgid ""
 " The options are:\n"
@@ -280,12 +274,12 @@ msgstr ""
 " Командите �а:\n"
 "  @<файл>                      Прочитане на команди от <файл>\n"
 
-#: ar.c:322
+#: ar.c:281
 #, c-format
 msgid "  --plugin <name>              Load the specified plugin\n"
 msgstr "  --plugin <име>               Зарежда указаната при�тавка\n"
 
-#: ar.c:325
+#: ar.c:284
 #, c-format
 msgid ""
 "  -t                           Update the archive's symbol map timestamp\n"
@@ -296,70 +290,86 @@ msgstr ""
 "  -h --help                    Извежда това помощно �ъобщение\n"
 "  -v --version                 Извежда информаци� за вер�и�та\n"
 
-#: ar.c:449
+#: ar.c:481 nm.c:1636
+#, c-format
+msgid "sorry - this program has been built without plugin support\n"
+msgstr "за �ъжаление, тази програма е �ъздадена без поддръжка на при�тавки\n"
+
+#: ar.c:508
 msgid "two different operation options specified"
 msgstr "указани �а две различни опции за операци�"
 
-#: ar.c:538 nm.c:1639
+#: ar.c:589
 #, c-format
-msgid "sorry - this program has been built without plugin support\n"
-msgstr "за �ъжаление, тази програма е �ъздадена без поддръжка на при�тавки\n"
+msgid "illegal option -- %c"
+msgstr "незаконна команда -- %c"
 
-#: ar.c:693
+#: ar.c:632
 msgid "no operation specified"
 msgstr "не е зададена операци�"
 
-#: ar.c:696
+#: ar.c:635
 msgid "`u' is only meaningful with the `r' option."
 msgstr "'u' има �ми�ъл �амо � команда 'r'."
 
-#: ar.c:699
+#: ar.c:638
 msgid "`u' is not meaningful with the `D' option."
 msgstr "'u' н�ма �ми�ъл � опци� 'D'."
 
-#: ar.c:707
+#: ar.c:646
 msgid "`N' is only meaningful with the `x' and `d' options."
 msgstr "'N' има �ми�ъл �амо � команди 'x' и 'd'."
 
-#: ar.c:710
+#: ar.c:649
 msgid "Value for `N' must be positive."
 msgstr "Стойно�тта на 'N' тр�бва да е положителна."
 
-#: ar.c:724
+#: ar.c:661
 msgid "`x' cannot be used on thin archives."
 msgstr "'x' не може да �е използва в архиви \"по�редници\"(thin archives)."
 
-#: ar.c:765
+#: ar.c:702
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr "вътрешна грешка -- тази команда не е внедрена"
 
-#: ar.c:834
+#: ar.c:771
 #, c-format
 msgid "creating %s"
 msgstr "�ъздаване на %s"
 
-#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
+#: ar.c:820 ar.c:875 ar.c:1203 objcopy.c:2052
 #, c-format
 msgid "internal stat error on %s"
 msgstr "вътрешна грешка при определ�не атрибутите на файл %s"
 
-#: ar.c:902 ar.c:970
+#: ar.c:824
+#, c-format
+msgid ""
+"\n"
+"<%s>\n"
+"\n"
+msgstr ""
+"\n"
+"<%s>\n"
+"\n"
+
+#: ar.c:840 ar.c:908
 #, c-format
 msgid "%s is not a valid archive"
 msgstr "%s е невалиден архив"
 
-#: ar.c:1171
+#: ar.c:1108
 #, c-format
 msgid "No member named `%s'\n"
 msgstr "��ма ча�т � име '%s'\n"
 
-#: ar.c:1221
+#: ar.c:1158
 #, c-format
 msgid "no entry %s in archive %s!"
 msgstr "н�ма входна точка %s в архива %s!"
 
-#: ar.c:1360
+#: ar.c:1297
 #, c-format
 msgid "%s: no archive map to update"
 msgstr "%s: лип�ва \"изображение на архива\" за обнов�ване"
@@ -419,13 +429,23 @@ msgstr "Текущи� отворен архив е %s\n"
 msgid "%s: no open archive\n"
 msgstr "%s: н�ма отворен архив\n"
 
-#: binemul.c:39
+#: bin2c.c:59
+#, c-format
+msgid "Usage: %s < input_file > output_file\n"
+msgstr "Употреба: %s < вход�щ_файл > изход�щ_файл\n"
+
+#: bin2c.c:60
+#, c-format
+msgid "Prints bytes from stdin in hex format.\n"
+msgstr "Извеждане байтовете от �тандартни� вход в ше�тнаде�етичен форма.\n"
+
+#: binemul.c:38
 #, c-format
 msgid "  No emulation specific options\n"
 msgstr "  Без опции характерни за подражаване\n"
 
 #. Macros for common output.
-#: binemul.h:49
+#: binemul.h:46
 #, c-format
 msgid " emulation options: \n"
 msgstr " опции за подражаване: \n"
@@ -465,47 +485,42 @@ msgstr "%s: поддържани архитектури:"
 msgid "BFD header file version %s\n"
 msgstr "BFD заглавен файл вер�и� %s\n"
 
-#: bucomm.c:559
+#: bucomm.c:556
 #, c-format
 msgid "%s: bad number: %s"
 msgstr "%s: погрешно чи�ло: %s"
 
-#: bucomm.c:576 strings.c:409
+#: bucomm.c:573 strings.c:409
 #, c-format
 msgid "'%s': No such file"
 msgstr "'%s': ��ма такъв файл"
 
-#: bucomm.c:578 strings.c:411
+#: bucomm.c:575 strings.c:411
 #, c-format
 msgid "Warning: could not locate '%s'.  reason: %s"
 msgstr "Предупреждение: не може да �е намери '%s', причина: %s"
 
-#: bucomm.c:582
+#: bucomm.c:579
 #, c-format
 msgid "Warning: '%s' is not an ordinary file"
 msgstr "Предупреждение: '%s' не е обикновен файл"
 
-#: bucomm.c:584
-#, c-format
-msgid "Warning: '%s' has negative size, probably it is too large"
-msgstr "Предупреждение: '%s' е � отрицателен размер. Може би е много гол�м"
-
-#: coffdump.c:107
+#: coffdump.c:106
 #, c-format
 msgid "#lines %d "
 msgstr "#редове %d "
 
-#: coffdump.c:461 sysdump.c:646
+#: coffdump.c:460 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr "Употреба: %s [команда(-и)] вх-файл\n"
 
-#: coffdump.c:462
+#: coffdump.c:461
 #, c-format
-msgid " Print a human readable interpretation of a COFF object file\n"
-msgstr " Извеждане на разбираемо от човек об��нение за COFF обектен файл\n"
+msgid " Print a human readable interpretation of a SYSROFF object file\n"
+msgstr " Извеждане на разбираемо от човек об��нение за SYSROFF обектен файл\n"
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid ""
 " The options are:\n"
@@ -520,548 +535,548 @@ msgstr ""
 "  -v --version           Показване на вер�и�та на програмата\n"
 "\n"
 
-#: coffdump.c:532 srconv.c:1833 sysdump.c:710
+#: coffdump.c:531 srconv.c:1832 sysdump.c:710
 msgid "no input file specified"
 msgstr "не е зададен вход�щ файл "
 
-#: cxxfilt.c:119 nm.c:269 objdump.c:281
+#: cxxfilt.c:119 nm.c:269 objdump.c:256
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Подавайте доклади за грешки на %s.\n"
 
-#: debug.c:648
+#: debug.c:647
 msgid "debug_add_to_current_namespace: no current file"
 msgstr "debug_add_to_current_namespace: лип�ва текущ файл"
 
-#: debug.c:727
+#: debug.c:726
 msgid "debug_start_source: no debug_set_filename call"
 msgstr "debug_start_source: лип�ва извикване на debug_set_filename"
 
-#: debug.c:781
+#: debug.c:782
 msgid "debug_record_function: no debug_set_filename call"
 msgstr "debug_record_function: лип�ва извикване на debug_set_filename"
 
-#: debug.c:833
+#: debug.c:834
 msgid "debug_record_parameter: no current function"
 msgstr "debug_record_parameter: лип�ва текуща функци�"
 
-#: debug.c:865
+#: debug.c:866
 msgid "debug_end_function: no current function"
 msgstr "debug_end_function: лип�ва текуща функци�"
 
-#: debug.c:871
+#: debug.c:872
 msgid "debug_end_function: some blocks were not closed"
 msgstr "debug_end_function: не �а затворени н�кой от блоковете"
 
-#: debug.c:899
+#: debug.c:900
 msgid "debug_start_block: no current block"
 msgstr "debug_start_block: лип�ва текущ блок"
 
-#: debug.c:935
+#: debug.c:936
 msgid "debug_end_block: no current block"
 msgstr "debug_end_block: лип�ва текущ блок"
 
-#: debug.c:942
+#: debug.c:943
 msgid "debug_end_block: attempt to close top level block"
 msgstr "debug_end_block: опит за затвар�не на най-горни� блок"
 
-#: debug.c:965
+#: debug.c:966
 msgid "debug_record_line: no current unit"
 msgstr "debug_record_line: лип�ва текуща ча�т"
 
 #. FIXME
-#: debug.c:1018
+#: debug.c:1019
 msgid "debug_start_common_block: not implemented"
 msgstr "debug_start_common_block: не е реализирана"
 
 #. FIXME
-#: debug.c:1029
+#: debug.c:1030
 msgid "debug_end_common_block: not implemented"
 msgstr "debug_end_common_block: не е реализирана"
 
 #. FIXME.
-#: debug.c:1113
+#: debug.c:1114
 msgid "debug_record_label: not implemented"
 msgstr "debug_record_label: не е реализирана"
 
-#: debug.c:1135
+#: debug.c:1136
 msgid "debug_record_variable: no current file"
 msgstr "debug_record_variable: лип�ва текущ файл"
 
-#: debug.c:1663
+#: debug.c:1664
 msgid "debug_make_undefined_type: unsupported kind"
 msgstr "debug_make_undefined_type: неподдържан начин"
 
-#: debug.c:1840
+#: debug.c:1841
 msgid "debug_name_type: no current file"
 msgstr "debug_name_type: лип�ва текущ файл"
 
-#: debug.c:1885
+#: debug.c:1886
 msgid "debug_tag_type: no current file"
 msgstr "debug_tag_type: лип�ва текущ файл"
 
-#: debug.c:1893
+#: debug.c:1894
 msgid "debug_tag_type: extra tag attempted"
 msgstr "debug_tag_type: опитан е белег в повече"
 
-#: debug.c:1930
+#: debug.c:1931
 #, c-format
 msgid "Warning: changing type size from %d to %d\n"
 msgstr "Предупреждение: пром�на на размера на типа от %d на %d\n"
 
-#: debug.c:1952
+#: debug.c:1953
 msgid "debug_find_named_type: no current compilation unit"
 msgstr "debug_find_named_type: н�ма текуща единица за компилиране"
 
-#: debug.c:2055
+#: debug.c:2056
 #, c-format
 msgid "debug_get_real_type: circular debug information for %s\n"
 msgstr "debug_get_real_type: циклична информаци� за те�тване за %s\n"
 
-#: debug.c:2482
+#: debug.c:2483
 msgid "debug_write_type: illegal type encountered"
 msgstr "debug_write_type: �блъ�кване � незаконен тип"
 
-#: dlltool.c:902 dlltool.c:928 dlltool.c:959
+#: dlltool.c:901 dlltool.c:927 dlltool.c:958
 #, c-format
 msgid "Internal error: Unknown machine type: %d"
 msgstr "Вътрешна грешка: �еизве�тен тип машина: %d"
 
-#: dlltool.c:1000
+#: dlltool.c:999
 #, c-format
 msgid "Can't open def file: %s"
 msgstr "�е може да �е отвори def-файл: %s"
 
-#: dlltool.c:1005
+#: dlltool.c:1004
 #, c-format
 msgid "Processing def file: %s"
 msgstr "Обработка на def-файл: %s"
 
-#: dlltool.c:1009
+#: dlltool.c:1008
 msgid "Processed def file"
 msgstr "Обработен def-файл"
 
-#: dlltool.c:1033
+#: dlltool.c:1032
 #, c-format
 msgid "Syntax error in def file %s:%d"
 msgstr "Синтактична грешка в def-файл %s:%d"
 
-#: dlltool.c:1070
+#: dlltool.c:1069
 #, c-format
 msgid "%s: Path components stripped from image name, '%s'."
 msgstr "%s: компонента за път е премахнат от името на образа '%s'."
 
-#: dlltool.c:1088
+#: dlltool.c:1087
 #, c-format
 msgid "NAME: %s base: %x"
 msgstr "NAME(програма): %s базов адре�: %x"
 
-#: dlltool.c:1091 dlltool.c:1112
+#: dlltool.c:1090 dlltool.c:1106
 msgid "Can't have LIBRARY and NAME"
 msgstr "Заедно не може LIBRARY(библиотека) и NAME(програма)"
 
-#: dlltool.c:1109
+#: dlltool.c:1103
 #, c-format
 msgid "LIBRARY: %s base: %x"
 msgstr "LIBRARY(библотека): %s базов адре�: %x"
 
-#: dlltool.c:1354 resrc.c:293
+#: dlltool.c:1342 resrc.c:293
 #, c-format
 msgid "wait: %s"
 msgstr "чакане: %s"
 
-#: dlltool.c:1359 dllwrap.c:422 resrc.c:298
+#: dlltool.c:1347 dllwrap.c:422 resrc.c:298
 #, c-format
 msgid "subprocess got fatal signal %d"
 msgstr "подпроце�а получи �игнал за прекъ�ване %d"
 
-#: dlltool.c:1365 dllwrap.c:429 resrc.c:305
+#: dlltool.c:1353 dllwrap.c:429 resrc.c:305
 #, c-format
 msgid "%s exited with status %d"
 msgstr "%s завърши � код за изход %d"
 
-#: dlltool.c:1396
+#: dlltool.c:1384
 #, c-format
 msgid "Sucking in info from %s section in %s"
 msgstr "�агазване в информаци�та на �екци� %s от %s"
 
-#: dlltool.c:1536
+#: dlltool.c:1524
 #, c-format
 msgid "Excluding symbol: %s"
 msgstr "Игнориране на: %s"
 
-#: dlltool.c:1625 dlltool.c:1636 nm.c:1012 nm.c:1023
+#: dlltool.c:1613 dlltool.c:1624 nm.c:1010 nm.c:1021
 #, c-format
 msgid "%s: no symbols"
 msgstr "%s: лип�ват имена"
 
 #. FIXME: we ought to read in and block out the base relocations.
-#: dlltool.c:1662
+#: dlltool.c:1650
 #, c-format
 msgid "Done reading %s"
 msgstr "Завърши четенето на %s"
 
-#: dlltool.c:1672
+#: dlltool.c:1660
 #, c-format
 msgid "Unable to open object file: %s: %s"
 msgstr "�е можа да �е отвори обектни� файл: %s: %s"
 
-#: dlltool.c:1675
+#: dlltool.c:1663
 #, c-format
 msgid "Scanning object file %s"
 msgstr "Сканиране на обектни� файл %s"
 
-#: dlltool.c:1690
+#: dlltool.c:1678
 #, c-format
 msgid "Cannot produce mcore-elf dll from archive file: %s"
 msgstr "�е може да �е �ъздаде mcore-elf dll от архива: %s"
 
-#: dlltool.c:1792
+#: dlltool.c:1780
 msgid "Adding exports to output file"
 msgstr "Добав�не на \"изна��ни�\" към изходни� файл"
 
-#: dlltool.c:1844
+#: dlltool.c:1832
 msgid "Added exports to output file"
 msgstr "Добавени \"изна��ни�\" към изходни� файл"
 
-#: dlltool.c:1986
+#: dlltool.c:1974
 #, c-format
 msgid "Generating export file: %s"
 msgstr "Създаване на файл � \"изна��ни�\" : %s"
 
-#: dlltool.c:1991
+#: dlltool.c:1979
 #, c-format
 msgid "Unable to open temporary assembler file: %s"
 msgstr "�е може да �е отвори временен файл на а�емблер: %s"
 
-#: dlltool.c:1994
+#: dlltool.c:1982
 #, c-format
 msgid "Opened temporary file: %s"
 msgstr "Отворен временен файл: %s"
 
-#: dlltool.c:2171
+#: dlltool.c:2159
 msgid "failed to read the number of entries from base file"
 msgstr "пропадна прочитането на бро� запи�и от базови� файл"
 
-#: dlltool.c:2219
+#: dlltool.c:2207
 msgid "Generated exports file"
 msgstr "Създаден на файл � \"изна��ни�\""
 
-#: dlltool.c:2428
+#: dlltool.c:2416
 #, c-format
 msgid "bfd_open failed open stub file: %s: %s"
 msgstr "bfd_open не у�п� да отвори stub файл: %s: %s"
 
-#: dlltool.c:2432
+#: dlltool.c:2420
 #, c-format
 msgid "Creating stub file: %s"
 msgstr "Създаване на stub файл: %s"
 
-#: dlltool.c:2894
+#: dlltool.c:2882
 #, c-format
 msgid "bfd_open failed reopen stub file: %s: %s"
 msgstr "bfd_open не у�п� да отвори stub файл: %s: %s"
 
-#: dlltool.c:2908 dlltool.c:2984
+#: dlltool.c:2896 dlltool.c:2972
 #, c-format
 msgid "failed to open temporary head file: %s"
 msgstr "не у�п� да �е отвори временен head файл: %s"
 
-#: dlltool.c:2970 dlltool.c:3050
+#: dlltool.c:2958 dlltool.c:3038
 #, c-format
 msgid "failed to open temporary head file: %s: %s"
 msgstr "не у�п� да �е отвори временен head файл: %s: %s"
 
-#: dlltool.c:3064
+#: dlltool.c:3052
 #, c-format
 msgid "failed to open temporary tail file: %s"
 msgstr "не у�п� да �е отвори временен tail файл: %s"
 
-#: dlltool.c:3121
+#: dlltool.c:3109
 #, c-format
 msgid "failed to open temporary tail file: %s: %s"
 msgstr "не у�п� да �е отвори временен tail файл: %s: %s"
 
-#: dlltool.c:3143
+#: dlltool.c:3131
 #, c-format
 msgid "Can't create .lib file: %s: %s"
 msgstr "�е може да �е �ъздаде .lib файл: %s: %s"
 
-#: dlltool.c:3147
+#: dlltool.c:3135
 #, c-format
 msgid "Creating library file: %s"
 msgstr "Създаване на библиотечен файл: %s"
 
-#: dlltool.c:3239 dlltool.c:3245
+#: dlltool.c:3227 dlltool.c:3233
 #, c-format
 msgid "cannot delete %s: %s"
 msgstr "не може да �е изтрие %s: %s"
 
-#: dlltool.c:3250
+#: dlltool.c:3238
 msgid "Created lib file"
 msgstr "Библиотечни�т файл е �ъздаден"
 
-#: dlltool.c:3462
+#: dlltool.c:3450
 #, c-format
 msgid "Can't open .lib file: %s: %s"
 msgstr "�е може да �е отвори .lib файл: %s: %s"
 
-#: dlltool.c:3470 dlltool.c:3492
+#: dlltool.c:3458 dlltool.c:3480
 #, c-format
 msgid "%s is not a library"
 msgstr "%s не е библиотека"
 
-#: dlltool.c:3510
+#: dlltool.c:3498
 #, c-format
 msgid "Import library `%s' specifies two or more dlls"
 msgstr "Import библиотека '%s' задава две или повече dlls"
 
-#: dlltool.c:3521
+#: dlltool.c:3509
 #, c-format
 msgid "Unable to determine dll name for `%s' (not an import library?)"
 msgstr "�е може да �е определи име на dll за '%s' (не е библиотека за вна��не?)"
 
-#: dlltool.c:3745
+#: dlltool.c:3733
 #, c-format
 msgid "Warning, ignoring duplicate EXPORT %s %d,%d"
 msgstr "Предупреждение, игнориране на повторен EXPORT %s %d,%d"
 
-#: dlltool.c:3751
+#: dlltool.c:3739
 #, c-format
 msgid "Error, duplicate EXPORT with ordinals: %s"
 msgstr "Грешка, повторен EXPORT � номер: %s"
 
-#: dlltool.c:3856
+#: dlltool.c:3844
 msgid "Processing definitions"
 msgstr "Обработване на определени�та"
 
-#: dlltool.c:3888
+#: dlltool.c:3876
 msgid "Processed definitions"
 msgstr "Определени�та �а обработени"
 
 #. xgetext:c-format
-#: dlltool.c:3895 dllwrap.c:483
+#: dlltool.c:3883 dllwrap.c:483
 #, c-format
 msgid "Usage %s <option(s)> <object-file(s)>\n"
 msgstr "Употреба %s <опции> <обектни файлове>\n"
 
 #. xgetext:c-format
-#: dlltool.c:3897
+#: dlltool.c:3885
 #, c-format
 msgid "   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"
 msgstr "   -m --machine <машина>     Създаване на DLL за <машина>.  [по подразбиране: %s]\n"
 
-#: dlltool.c:3898
+#: dlltool.c:3886
 #, c-format
 msgid "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 msgstr "        възможна <машина>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 
-#: dlltool.c:3899
+#: dlltool.c:3887
 #, c-format
 msgid "   -e --output-exp <outname> Generate an export file.\n"
 msgstr "   -e --output-exp <изх_име> Създаване на файл � \"изна��ни�\".\n"
 
-#: dlltool.c:3900
+#: dlltool.c:3888
 #, c-format
 msgid "   -l --output-lib <outname> Generate an interface library.\n"
 msgstr "   -l --output-lib <изх_име> Създаване на интерфей�на библиотека.\n"
 
-#: dlltool.c:3901
+#: dlltool.c:3889
 #, c-format
 msgid "   -y --output-delaylib <outname> Create a delay-import library.\n"
 msgstr "   -y --output-delaylib <изх_име> Създаване на delay-import библиотека.\n"
 
-#: dlltool.c:3902
+#: dlltool.c:3890
 #, c-format
 msgid "   -a --add-indirect         Add dll indirects to export file.\n"
 msgstr "   -a --add-indirect         Добав�не на dll indirects към файла � \"изна��ни�\".\n"
 
-#: dlltool.c:3903
+#: dlltool.c:3891
 #, c-format
 msgid "   -D --dllname <name>       Name of input dll to put into interface lib.\n"
 msgstr "   -D --dllname <име>        Име на вход�що dll в интерфей�ната библиотека.\n"
 
-#: dlltool.c:3904
+#: dlltool.c:3892
 #, c-format
 msgid "   -d --input-def <deffile>  Name of .def file to be read in.\n"
 msgstr "   -d --input-def <defфайл>  Име на .def файл за прочитане като вход.\n"
 
-#: dlltool.c:3905
+#: dlltool.c:3893
 #, c-format
 msgid "   -z --output-def <deffile> Name of .def file to be created.\n"
 msgstr "   -z --output-def <defфайл> Име на .def файл за �ъздаване.\n"
 
-#: dlltool.c:3906
+#: dlltool.c:3894
 #, c-format
 msgid "      --export-all-symbols   Export all symbols to .def\n"
 msgstr "      --export-all-symbols   Изна��не на в�ички имена в .def\n"
 
-#: dlltool.c:3907
+#: dlltool.c:3895
 #, c-format
 msgid "      --no-export-all-symbols  Only export listed symbols\n"
 msgstr "      --no-export-all-symbols  Изн��ане �амо на опи�аните имена\n"
 
-#: dlltool.c:3908
+#: dlltool.c:3896
 #, c-format
 msgid "      --exclude-symbols <list> Don't export <list>\n"
 msgstr "      --exclude-symbols <опи�> Без изн��ане на <опи�>\n"
 
-#: dlltool.c:3909
+#: dlltool.c:3897
 #, c-format
 msgid "      --no-default-excludes  Clear default exclude symbols\n"
-msgstr "      --no-default-excludes  Изчи�тва подразбиращите �е имена за изключване\n"
+msgstr ""
 
-#: dlltool.c:3910
+#: dlltool.c:3898
 #, c-format
 msgid "   -b --base-file <basefile> Read linker generated base file.\n"
-msgstr "   -b --base-file <о�нфайл> Добав� о�новен файл при �вързване.\n"
+msgstr ""
 
-#: dlltool.c:3911
+#: dlltool.c:3899
 #, c-format
 msgid "   -x --no-idata4            Don't generate idata$4 section.\n"
 msgstr "   -x --no-idata4            Без �ъздаване на раздел idata$4.\n"
 
-#: dlltool.c:3912
+#: dlltool.c:3900
 #, c-format
 msgid "   -c --no-idata5            Don't generate idata$5 section.\n"
 msgstr "   -c --no-idata5            Без �ъздаване на раздел idata$5.\n"
 
-#: dlltool.c:3913
+#: dlltool.c:3901
 #, c-format
 msgid "      --use-nul-prefixed-import-tables Use zero prefixed idata$4 and idata$5.\n"
 msgstr "      --use-nul-prefixed-import-tables Използване на idata$4 и idata$5 без пред�тавка.\n"
 
-#: dlltool.c:3914
+#: dlltool.c:3902
 #, c-format
 msgid "   -U --add-underscore       Add underscores to all symbols in interface library.\n"
 msgstr "   -U --add-underscore       Добав�не на подчертавка към в�ички имена в интерфай�ната библиотека.\n"
 
-#: dlltool.c:3915
+#: dlltool.c:3903
 #, c-format
 msgid "      --add-stdcall-underscore Add underscores to stdcall symbols in interface library.\n"
 msgstr "      --add-stdcall-underscore Добав�не на подчертавка към stdcall имена в интерфай�ната библиотека.\n"
 
-#: dlltool.c:3916
+#: dlltool.c:3904
 #, c-format
 msgid "      --no-leading-underscore All symbols shouldn't be prefixed by an underscore.\n"
-msgstr "      --no-leading-underscore В�ички имена да �а без подчертавка за пред�тавка.\n"
+msgstr ""
 
-#: dlltool.c:3917
+#: dlltool.c:3905
 #, c-format
 msgid "      --leading-underscore   All symbols should be prefixed by an underscore.\n"
-msgstr "      --leading-underscore   В�ички имена да �а � подчертавка за пред�тавка.\n"
+msgstr ""
 
-#: dlltool.c:3918
+#: dlltool.c:3906
 #, c-format
 msgid "   -k --kill-at              Kill @<n> from exported names.\n"
 msgstr "   -k --kill-at              Премахване на @<n> от изне�ените имена.\n"
 
-#: dlltool.c:3919
+#: dlltool.c:3907
 #, c-format
 msgid "   -A --add-stdcall-alias    Add aliases without @<n>.\n"
 msgstr "   -A --add-stdcall-alias    Добаване на п�евдоними без @<n>.\n"
 
-#: dlltool.c:3920
+#: dlltool.c:3908
 #, c-format
 msgid "   -p --ext-prefix-alias <prefix> Add aliases with <prefix>.\n"
 msgstr "   -p --ext-prefix-alias <пред�т> Добаване на п�евдоними � <пред�т>.\n"
 
-#: dlltool.c:3921
+#: dlltool.c:3909
 #, c-format
 msgid "   -S --as <name>            Use <name> for assembler.\n"
 msgstr "   -S --as <име>             Използване на <име> за а�емблер.\n"
 
-#: dlltool.c:3922
+#: dlltool.c:3910
 #, c-format
 msgid "   -f --as-flags <flags>     Pass <flags> to the assembler.\n"
 msgstr "   -f --as-flags <флагове>   Продаване на <флагове> към а�емблера.\n"
 
-#: dlltool.c:3923
+#: dlltool.c:3911
 #, c-format
 msgid "   -C --compat-implib        Create backward compatible import library.\n"
-msgstr "   -C --compat-implib        Създаване на �ъвме�тима � по-преди библиотека за вна��не.\n"
+msgstr ""
 
-#: dlltool.c:3924
+#: dlltool.c:3912
 #, c-format
 msgid "   -n --no-delete            Keep temp files (repeat for extra preservation).\n"
-msgstr "   -n --no-delete            Запазване на времени файлове (при повтар�не запазване в повече).\n"
+msgstr ""
 
-#: dlltool.c:3925
+#: dlltool.c:3913
 #, c-format
 msgid "   -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
 msgstr "   -t --temp-prefix <пред�т> Използване на <пред�т> при �ъздаване на име за временен файл.\n"
 
-#: dlltool.c:3926
+#: dlltool.c:3914
 #, c-format
 msgid "   -I --identify <implib>    Report the name of the DLL associated with <implib>.\n"
-msgstr "   -I --identify <вна�_библ> Репортува името на DLL �вързан � <вна�_библ>.\n"
+msgstr ""
 
-#: dlltool.c:3927
+#: dlltool.c:3915
 #, c-format
 msgid "      --identify-strict      Causes --identify to report error when multiple DLLs.\n"
-msgstr "      --identify-strict      Причин�ва --identify да рапортува грешка при много DLLs.\n"
+msgstr ""
 
-#: dlltool.c:3928
+#: dlltool.c:3916
 #, c-format
 msgid "   -v --verbose              Be verbose.\n"
-msgstr "   -v --verbose              С подробно�ти.\n"
+msgstr ""
 
-#: dlltool.c:3929
+#: dlltool.c:3917
 #, c-format
 msgid "   -V --version              Display the program version.\n"
-msgstr "   -V --version              Покзване на вер�и�та на програмата.\n"
+msgstr ""
 
-#: dlltool.c:3930
+#: dlltool.c:3918
 #, c-format
 msgid "   -h --help                 Display this information.\n"
-msgstr "   -h --help                 Показване на това �ведение.\n"
+msgstr ""
 
-#: dlltool.c:3931
+#: dlltool.c:3919
 #, c-format
 msgid "   @<file>                   Read options from <file>.\n"
 msgstr "   @<файл>                   Прочитане на команди от <файл>.\n"
 
-#: dlltool.c:3933
+#: dlltool.c:3921
 #, c-format
 msgid "   -M --mcore-elf <outname>  Process mcore-elf object files into <outname>.\n"
 msgstr ""
 
-#: dlltool.c:3934
+#: dlltool.c:3922
 #, c-format
 msgid "   -L --linker <name>        Use <name> as the linker.\n"
-msgstr "   -L --linker <име>         Използва <име> за �вързване.\n"
+msgstr ""
 
-#: dlltool.c:3935
+#: dlltool.c:3923
 #, c-format
 msgid "   -F --linker-flags <flags> Pass <flags> to the linker.\n"
-msgstr "   -F --linker-flags <флагове> Подава <флагове> към �вързването.\n"
+msgstr ""
 
-#: dlltool.c:4082
+#: dlltool.c:4070
 #, c-format
 msgid "Path components stripped from dllname, '%s'."
-msgstr "Съ�тавка за път �мъкната от името на dll: '%s'."
+msgstr ""
 
-#: dlltool.c:4130
+#: dlltool.c:4118
 #, c-format
 msgid "Unable to open base-file: %s"
-msgstr "�е можа де �е отвори о�новен файл: %s"
+msgstr ""
 
-#: dlltool.c:4165
+#: dlltool.c:4153
 #, c-format
 msgid "Machine '%s' not supported"
 msgstr "�е �е поддържа машина '%s'"
 
-#: dlltool.c:4245
+#: dlltool.c:4232
 #, c-format
 msgid "Warning, machine type (%d) not supported for delayimport."
-msgstr "Предупреждение: типа (%d) за машина не �е поддържа при отложени вна��ни�."
+msgstr ""
 
-#: dlltool.c:4313 dllwrap.c:213
+#: dlltool.c:4300 dllwrap.c:213
 #, c-format
 msgid "Tried file: %s"
-msgstr "Пробва �е файл: %s"
+msgstr ""
 
-#: dlltool.c:4320 dllwrap.c:220
+#: dlltool.c:4307 dllwrap.c:220
 #, c-format
 msgid "Using file: %s"
 msgstr "Използва �е файл: %s"
@@ -1099,7 +1114,7 @@ msgstr "Изтриване на временен def файл %s"
 #: dllwrap.c:484
 #, c-format
 msgid "  Generic options:\n"
-msgstr "  О�новни възможно�ти:\n"
+msgstr ""
 
 #: dllwrap.c:485
 #, c-format
@@ -1109,22 +1124,22 @@ msgstr "   @<файл>                Прочитане на команди оÑ
 #: dllwrap.c:486
 #, c-format
 msgid "   --quiet, -q            Work quietly\n"
-msgstr "   --quiet, -q            Безмълвна работа\n"
+msgstr ""
 
 #: dllwrap.c:487
 #, c-format
 msgid "   --verbose, -v          Verbose\n"
-msgstr "   --verbose, -v          Подробно\n"
+msgstr ""
 
 #: dllwrap.c:488
 #, c-format
 msgid "   --version              Print dllwrap version\n"
-msgstr "   --version              Извежда вер�и�та на dllwrap\n"
+msgstr ""
 
 #: dllwrap.c:489
 #, c-format
 msgid "   --implib <outname>     Synonym for --output-lib\n"
-msgstr "   --implib <изх_име>     Синоним за --output-lib\n"
+msgstr ""
 
 #: dllwrap.c:490
 #, c-format
@@ -1134,37 +1149,37 @@ msgstr "  Опции за %s:\n"
 #: dllwrap.c:491
 #, c-format
 msgid "   --driver-name <driver> Defaults to \"gcc\"\n"
-msgstr "   --driver-name <име> По подразбиране \"gcc\"\n"
+msgstr ""
 
 #: dllwrap.c:492
 #, c-format
 msgid "   --driver-flags <flags> Override default ld flags\n"
-msgstr "   --driver-flags <флагове> Припокрива подразбиращите �е флагове на ld\n"
+msgstr ""
 
 #: dllwrap.c:493
 #, c-format
 msgid "   --dlltool-name <dlltool> Defaults to \"dlltool\"\n"
-msgstr "   --dlltool-name <име> По подразбиране \"dlltool\"\n"
+msgstr ""
 
 #: dllwrap.c:494
 #, c-format
 msgid "   --entry <entry>        Specify alternate DLL entry point\n"
-msgstr "   --entry <вход>         Задава друга входна точка на DLL\n"
+msgstr ""
 
 #: dllwrap.c:495
 #, c-format
 msgid "   --image-base <base>    Specify image base address\n"
-msgstr "   --image-base <о�н>     Задава о�новен адре� на образа\n"
+msgstr ""
 
 #: dllwrap.c:496
 #, c-format
 msgid "   --target <machine>     i386-cygwin32 or i386-mingw32\n"
-msgstr "   --target <машина>      i386-cygwin32 или i386-mingw32\n"
+msgstr "   --target <машина>     i386-cygwin32 или i386-mingw32\n"
 
 #: dllwrap.c:497
 #, c-format
 msgid "   --dry-run              Show what needs to be run\n"
-msgstr "   --dry-run              Показва какво ще �е пу�не\n"
+msgstr ""
 
 #: dllwrap.c:498
 #, c-format
@@ -1174,7 +1189,7 @@ msgstr "   --mno-cygwin           Създаване на Mingw DLL\n"
 #: dllwrap.c:499
 #, c-format
 msgid "  Options passed to DLLTOOL:\n"
-msgstr "  Флагове подадени към DLLTOOL:\n"
+msgstr ""
 
 #: dllwrap.c:500
 #, c-format
@@ -1184,12 +1199,12 @@ msgstr "   --machine <машина>\n"
 #: dllwrap.c:501
 #, c-format
 msgid "   --output-exp <outname> Generate export file.\n"
-msgstr "   --output-exp <изх_име> Създаване на файл � \"изна�ани�\".\n"
+msgstr ""
 
 #: dllwrap.c:502
 #, c-format
 msgid "   --output-lib <outname> Generate input library.\n"
-msgstr "   --output-lib <изх_име> Създаване на библиотека � \"изна�ани�\".\n"
+msgstr ""
 
 #: dllwrap.c:503
 #, c-format
@@ -1316,16 +1331,22 @@ msgstr "DRIVER име      : %s\n"
 msgid "DRIVER options  : %s\n"
 msgstr "DRIVER опции    : %s\n"
 
-#: dwarf.c:256 dwarf.c:3019
+#: dwarf.c:112 dwarf.c:161 elfedit.c:123 elfedit.c:167 elfedit.c:195
+#: elfedit.c:227 readelf.c:368 readelf.c:536
+#, c-format
+msgid "Unhandled data length: %d\n"
+msgstr ""
+
+#: dwarf.c:312 dwarf.c:2890
 msgid "badly formed extended line op encountered!\n"
 msgstr ""
 
-#: dwarf.c:263
+#: dwarf.c:319
 #, c-format
 msgid "  Extended opcode %d: "
 msgstr ""
 
-#: dwarf.c:268
+#: dwarf.c:324
 #, c-format
 msgid ""
 "End of Sequence\n"
@@ -1334,552 +1355,601 @@ msgstr ""
 "Край на по�ледователно�т\n"
 "\n"
 
-#: dwarf.c:274
+#: dwarf.c:330
 #, c-format
-msgid "set Address to 0x%s\n"
-msgstr "задава адре�а на 0x%s\n"
+msgid "set Address to 0x%lx\n"
+msgstr ""
 
-#: dwarf.c:280
+#: dwarf.c:336
 #, c-format
 msgid "  define new File Table entry\n"
 msgstr ""
 
-#: dwarf.c:281 dwarf.c:2548
+#: dwarf.c:337 dwarf.c:2431
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
 msgstr "  Вход\tДир\tЧа�\tРазм\tИме\n"
 
-#: dwarf.c:295
+#: dwarf.c:339
 #, c-format
-msgid "set Discriminator to %s\n"
-msgstr ""
+msgid "   %d\t"
+msgstr "   %d\t"
 
-#: dwarf.c:356
+#: dwarf.c:342 dwarf.c:344 dwarf.c:346 dwarf.c:2443 dwarf.c:2445 dwarf.c:2447
 #, c-format
-msgid "(%s"
-msgstr "(%s"
+msgid "%lu\t"
+msgstr "%lu\t"
 
-#: dwarf.c:360
+#: dwarf.c:347
 #, c-format
-msgid ",%s"
-msgstr ",%s"
+msgid ""
+"%s\n"
+"\n"
+msgstr ""
+"%s\n"
+"\n"
 
-#: dwarf.c:364
+#: dwarf.c:351
 #, c-format
-msgid ",%s)\n"
-msgstr ",%s)\n"
+msgid "set Discriminator to %lu\n"
+msgstr ""
 
 #. The test against DW_LNW_hi_user is redundant due to
 #. the limited range of the unsigned char data type used
 #. for op_code.
 #. && op_code <= DW_LNE_hi_user
-#: dwarf.c:387
-#, c-format
-msgid "user defined: "
-msgstr "определен от потребител: "
-
-#: dwarf.c:389
+#: dwarf.c:393
 #, c-format
-msgid "UNKNOWN: "
-msgstr "�ЕПОЗ��Т: "
+msgid "user defined: length %d\n"
+msgstr ""
 
-#: dwarf.c:390
+#: dwarf.c:395 dwarf.c:2922
 #, c-format
-msgid "length %d ["
+msgid "UNKNOWN: length %d\n"
 msgstr ""
 
-#: dwarf.c:407
+#: dwarf.c:408
 msgid "<no .debug_str section>"
 msgstr ""
 
-#: dwarf.c:413
+#: dwarf.c:414
 #, c-format
-msgid "DW_FORM_strp offset too big: %s\n"
+msgid "DW_FORM_strp offset too big: %lx\n"
 msgstr ""
 
 #: dwarf.c:415
 msgid "<offset is too big>"
 msgstr "<твърде гол�мо отме�тване>"
 
-#: dwarf.c:655
+#: dwarf.c:654
 #, c-format
 msgid "Unknown TAG value: %lx"
 msgstr ""
 
-#: dwarf.c:696
+#: dwarf.c:695
 #, c-format
 msgid "Unknown FORM value: %lx"
 msgstr ""
 
-#: dwarf.c:705
+#: dwarf.c:704
 #, c-format
-msgid " %s byte block: "
+msgid " %lu byte block: "
 msgstr ""
 
-#: dwarf.c:1050
+#: dwarf.c:1037
 #, c-format
 msgid "(DW_OP_call_ref in frame info)"
 msgstr ""
 
-#: dwarf.c:1122
+#: dwarf.c:1109
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
 msgstr ""
 
-#: dwarf.c:1229
+#: dwarf.c:1167
 #, c-format
 msgid "(User defined location op)"
 msgstr ""
 
-#: dwarf.c:1231
+#: dwarf.c:1169
 #, c-format
 msgid "(Unknown location op)"
 msgstr ""
 
-#: dwarf.c:1278
+#: dwarf.c:1217
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr ""
 
-#: dwarf.c:1384
-msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
+#: dwarf.c:1323
+msgid "DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"
 msgstr ""
 
-#: dwarf.c:1434
+#: dwarf.c:1373
 #, c-format
-msgid " (indirect string, offset: 0x%s): %s"
+msgid " (indirect string, offset: 0x%lx): %s"
 msgstr ""
 
-#: dwarf.c:1459
+#: dwarf.c:1397
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr ""
 
-#: dwarf.c:1552
+#: dwarf.c:1485
 #, c-format
 msgid "(not inlined)"
 msgstr ""
 
-#: dwarf.c:1555
+#: dwarf.c:1488
 #, c-format
 msgid "(inlined)"
 msgstr ""
 
-#: dwarf.c:1558
+#: dwarf.c:1491
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr ""
 
-#: dwarf.c:1561
+#: dwarf.c:1494
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr ""
 
-#: dwarf.c:1564
+#: dwarf.c:1497
 #, c-format
-msgid "  (Unknown inline attribute value: %s)"
+msgid "  (Unknown inline attribute value: %lx)"
 msgstr ""
 
-#: dwarf.c:1735
+#: dwarf.c:1662
 #, c-format
 msgid "(location list)"
 msgstr ""
 
-#: dwarf.c:1756 dwarf.c:3722
+#: dwarf.c:1683 dwarf.c:3563
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr ""
 
-#: dwarf.c:1771
+#: dwarf.c:1698
 #, c-format
-msgid "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
+msgid "Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
 msgstr ""
 
-#: dwarf.c:1971
+#: dwarf.c:1889
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr ""
 
-#: dwarf.c:2042
+#: dwarf.c:1960
 #, c-format
-msgid "Reserved length value (0x%s) found in section %s\n"
+msgid "Reserved length value (%lx) found in section %s\n"
 msgstr ""
 
-#: dwarf.c:2054
+#: dwarf.c:1971
 #, c-format
-msgid "Corrupt unit length (0x%s) found in section %s\n"
+msgid "Corrupt unit length (%lx) found in section %s\n"
 msgstr ""
 
-#: dwarf.c:2062
+#: dwarf.c:1978
 #, c-format
 msgid "No comp units in %s section ?"
 msgstr ""
 
-#: dwarf.c:2071
+#: dwarf.c:1987
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr ""
 
-#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
-#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
+#: dwarf.c:1995 dwarf.c:3158 dwarf.c:3252 dwarf.c:3326 dwarf.c:3443
+#: dwarf.c:3598 dwarf.c:3667 dwarf.c:3862
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:2088
+#: dwarf.c:2003
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr ""
 
-#: dwarf.c:2169
+#: dwarf.c:2084
 #, c-format
-msgid "  Compilation Unit @ offset 0x%s:\n"
+msgid "  Compilation Unit @ offset 0x%lx:\n"
 msgstr ""
 
-#: dwarf.c:2171
+#: dwarf.c:2085
 #, c-format
-msgid "   Length:        0x%s (%s)\n"
-msgstr "   Дължина:       0x%s (%s)\n"
+msgid "   Length:        0x%lx (%s)\n"
+msgstr "   Дължина:       0x%lx (%s)\n"
 
-#: dwarf.c:2174
+#: dwarf.c:2087
 #, c-format
 msgid "   Version:       %d\n"
 msgstr "   Вер�и�:        %d\n"
 
-#: dwarf.c:2175
+#: dwarf.c:2088
 #, c-format
-msgid "   Abbrev Offset: %s\n"
+msgid "   Abbrev Offset: %ld\n"
 msgstr ""
 
-#: dwarf.c:2177
+#: dwarf.c:2089
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr ""
 
-#: dwarf.c:2181
+#: dwarf.c:2093
 #, c-format
 msgid "   Signature:     "
 msgstr ""
 
-#: dwarf.c:2185
+#: dwarf.c:2097
 #, c-format
-msgid "   Type Offset:   0x%s\n"
+msgid "   Type Offset:   0x%lx\n"
 msgstr ""
 
-#: dwarf.c:2193
+#: dwarf.c:2104
 #, c-format
-msgid "Debug info is corrupted, length of CU at %s extends beyond end of section (length = %s)\n"
+msgid "Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"
 msgstr ""
 
-#: dwarf.c:2206
+#: dwarf.c:2115
 #, c-format
-msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
+msgid "CU at offset %lx contains corrupt or unsupported version number: %d.\n"
 msgstr ""
 
-#: dwarf.c:2217
+#: dwarf.c:2125
 #, c-format
 msgid "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"
 msgstr ""
 
-#: dwarf.c:2267
+#: dwarf.c:2172
 #, c-format
 msgid "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr ""
 
-#: dwarf.c:2271
+#: dwarf.c:2176
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr ""
 
-#: dwarf.c:2290
+#: dwarf.c:2183
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr ""
 
-#: dwarf.c:2294
+#: dwarf.c:2200
 #, c-format
-msgid " <%d><%lx>: ...\n"
+msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
 msgstr ""
 
-#: dwarf.c:2313
+#: dwarf.c:2206
 #, c-format
-msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
+msgid " (%s)\n"
 msgstr ""
 
-#: dwarf.c:2415
+#: dwarf.c:2298
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:2453
+#: dwarf.c:2336
 #, c-format
 msgid "The information in section %s appears to be corrupt - the section is too small\n"
 msgstr ""
 
-#: dwarf.c:2465 dwarf.c:2833
+#: dwarf.c:2348 dwarf.c:2701
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr ""
 
-#: dwarf.c:2479 dwarf.c:2848
+#: dwarf.c:2362 dwarf.c:2716
 msgid "Invalid maximum operations per insn.\n"
 msgstr ""
 
-#: dwarf.c:2498
+#: dwarf.c:2381
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr "  Отме�тване:                  0x%lx\n"
 
-#: dwarf.c:2499
+#: dwarf.c:2382
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr "  Дължина:                     %ld\n"
 
-#: dwarf.c:2500
+#: dwarf.c:2383
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr "  DWARF вер�и�:                %d\n"
 
-#: dwarf.c:2501
+#: dwarf.c:2384
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr ""
 
-#: dwarf.c:2502
+#: dwarf.c:2385
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr ""
 
-#: dwarf.c:2504
+#: dwarf.c:2387
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr ""
 
-#: dwarf.c:2505
+#: dwarf.c:2388
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr ""
 
-#: dwarf.c:2506
+#: dwarf.c:2389
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr ""
 
-#: dwarf.c:2507
+#: dwarf.c:2390
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr ""
 
-#: dwarf.c:2508
+#: dwarf.c:2391
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr ""
 
-#: dwarf.c:2517
+#: dwarf.c:2400
 #, c-format
 msgid ""
 "\n"
 " Opcodes:\n"
 msgstr ""
 
-#: dwarf.c:2520
+#: dwarf.c:2403
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr ""
 
-#: dwarf.c:2526
+#: dwarf.c:2409
 #, c-format
 msgid ""
 "\n"
 " The Directory Table is empty.\n"
 msgstr ""
 
-#: dwarf.c:2529
+#: dwarf.c:2412
 #, c-format
 msgid ""
 "\n"
 " The Directory Table:\n"
 msgstr ""
 
-#: dwarf.c:2544
+#: dwarf.c:2416
+#, c-format
+msgid "  %s\n"
+msgstr ""
+
+#: dwarf.c:2427
 #, c-format
 msgid ""
 "\n"
 " The File Name Table is empty.\n"
 msgstr ""
 
-#: dwarf.c:2547
+#: dwarf.c:2430
 #, c-format
 msgid ""
 "\n"
 " The File Name Table:\n"
 msgstr ""
 
+#: dwarf.c:2438
+#, c-format
+msgid "  %d\t"
+msgstr "  %d\t"
+
+#: dwarf.c:2449
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
 #. Now display the statements.
-#: dwarf.c:2577
+#: dwarf.c:2457
 #, c-format
 msgid ""
 "\n"
 " Line Number Statements:\n"
 msgstr ""
 
-#: dwarf.c:2596
+#: dwarf.c:2476
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx"
 msgstr ""
 
-#: dwarf.c:2610
+#: dwarf.c:2488
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx[%d]"
 msgstr ""
 
-#: dwarf.c:2618
+#: dwarf.c:2494
 #, c-format
-msgid " and Line by %s to %d\n"
+msgid " and Line by %d to %d\n"
 msgstr ""
 
-#: dwarf.c:2628
+#: dwarf.c:2504
 #, c-format
 msgid "  Copy\n"
 msgstr ""
 
-#: dwarf.c:2638
+#: dwarf.c:2514
 #, c-format
-msgid "  Advance PC by %s to 0x%s\n"
+msgid "  Advance PC by %lu to 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:2651
+#: dwarf.c:2526
 #, c-format
-msgid "  Advance PC by %s to 0x%s[%d]\n"
+msgid "  Advance PC by %lu to 0x%lx[%d]\n"
 msgstr ""
 
-#: dwarf.c:2662
+#: dwarf.c:2536
 #, c-format
-msgid "  Advance Line by %s to %d\n"
+msgid "  Advance Line by %d to %d\n"
 msgstr ""
 
-#: dwarf.c:2670
+#: dwarf.c:2543
 #, c-format
-msgid "  Set File Name to entry %s in the File Name Table\n"
+msgid "  Set File Name to entry %d in the File Name Table\n"
 msgstr ""
 
-#: dwarf.c:2678
+#: dwarf.c:2551
 #, c-format
-msgid "  Set column to %s\n"
+msgid "  Set column to %lu\n"
 msgstr ""
 
-#: dwarf.c:2686
+#: dwarf.c:2558
 #, c-format
-msgid "  Set is_stmt to %s\n"
+msgid "  Set is_stmt to %d\n"
 msgstr ""
 
-#: dwarf.c:2691
+#: dwarf.c:2563
 #, c-format
 msgid "  Set basic block\n"
 msgstr ""
 
-#: dwarf.c:2701
+#: dwarf.c:2573
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s\n"
+msgid "  Advance PC by constant %lu to 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:2714
+#: dwarf.c:2585
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s[%d]\n"
+msgid "  Advance PC by constant %lu to 0x%lx[%d]\n"
 msgstr ""
 
-#: dwarf.c:2726
+#: dwarf.c:2596
 #, c-format
-msgid "  Advance PC by fixed size amount %s to 0x%s\n"
+msgid "  Advance PC by fixed size amount %lu to 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:2732
+#: dwarf.c:2601
 #, c-format
 msgid "  Set prologue_end to true\n"
 msgstr ""
 
-#: dwarf.c:2736
+#: dwarf.c:2605
 #, c-format
 msgid "  Set epilogue_begin to true\n"
 msgstr ""
 
-#: dwarf.c:2742
+#: dwarf.c:2611 dwarf.c:3027
 #, c-format
-msgid "  Set ISA to %s\n"
+msgid "  Set ISA to %lu\n"
 msgstr ""
 
-#: dwarf.c:2746 dwarf.c:3160
+#: dwarf.c:2615 dwarf.c:3031
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr ""
 
-#: dwarf.c:2780
+#: dwarf.c:2648
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:2821
+#: dwarf.c:2689
 msgid "The line info appears to be corrupt - the section is too small\n"
 msgstr ""
 
-#: dwarf.c:2953
+#: dwarf.c:2821
 #, c-format
 msgid "CU: %s:\n"
 msgstr ""
 
-#: dwarf.c:2954 dwarf.c:2964
+#: dwarf.c:2822 dwarf.c:2835
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr ""
 
-#: dwarf.c:2959
+#: dwarf.c:2828
 #, c-format
 msgid "CU: %s/%s:\n"
 msgstr ""
 
-#: dwarf.c:3051
+#: dwarf.c:2833 dwarf.c:2918
 #, c-format
-msgid "UNKNOWN: length %d\n"
+msgid "%s:\n"
 msgstr ""
 
-#: dwarf.c:3156
+#. If directory index is 0, that means current directory.
+#: dwarf.c:2964
 #, c-format
-msgid "  Set ISA to %lu\n"
+msgid ""
+"\n"
+"./%s:[++]\n"
 msgstr ""
+"\n"
+"./%s:[++]\n"
+
+#. The directory index starts counting at 1.
+#: dwarf.c:2970
+#, c-format
+msgid ""
+"\n"
+"%s/%s:\n"
+msgstr ""
+"\n"
+"%s/%s:\n"
+
+#: dwarf.c:3070
+#, c-format
+msgid "%-35s  %11d  %#18lx\n"
+msgstr "%-35s  %11d  %#18lx\n"
 
-#: dwarf.c:3322 dwarf.c:3872
+#: dwarf.c:3074
+#, c-format
+msgid "%-35s  %11d  %#18lx[%d]\n"
+msgstr "%-35s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3082
+#, c-format
+msgid "%s  %11d  %#18lx\n"
+msgstr "%s  %11d  %#18lx\n"
+
+#: dwarf.c:3086
+#, c-format
+msgid "%s  %11d  %#18lx[%d]\n"
+msgstr "%s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3192 dwarf.c:3712
 #, c-format
 msgid ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
 msgstr ""
 
-#: dwarf.c:3336
+#: dwarf.c:3206
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr ""
 
-#: dwarf.c:3343
+#: dwarf.c:3213
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr "  Дължина:                             %ld\n"
 
-#: dwarf.c:3345
+#: dwarf.c:3215
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr "  Вер�и�:                              %d\n"
 
-#: dwarf.c:3347
+#: dwarf.c:3217
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr ""
 
-#: dwarf.c:3349
+#: dwarf.c:3219
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr ""
 
-#: dwarf.c:3352
+#: dwarf.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -1888,45 +1958,55 @@ msgstr ""
 "\n"
 "    Отме�т\tИме\n"
 
-#: dwarf.c:3403
+#: dwarf.c:3273
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
 msgstr " DW_MACINFO_start_file - ред: %d ном.файл: %d\n"
 
-#: dwarf.c:3409
+#: dwarf.c:3279
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr " DW_MACINFO_end_file\n"
 
-#: dwarf.c:3417
+#: dwarf.c:3287
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_define - ред : %d макро� : %s\n"
 
-#: dwarf.c:3426
+#: dwarf.c:3296
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_undef - ред : %d макро� : %s\n"
 
-#: dwarf.c:3438
+#: dwarf.c:3308
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
 msgstr ""
 
-#: dwarf.c:3467
+#: dwarf.c:3337
 #, c-format
 msgid "  Number TAG\n"
 msgstr ""
 
-#: dwarf.c:3476
+#: dwarf.c:3343
+#, c-format
+msgid "   %ld      %s    [%s]\n"
+msgstr ""
+
+#: dwarf.c:3346
 msgid "has children"
 msgstr ""
 
-#: dwarf.c:3476
+#: dwarf.c:3346
 msgid "no children"
 msgstr ""
 
-#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
+#: dwarf.c:3349
+#, c-format
+msgid "    %-18s %s\n"
+msgstr ""
+
+#: dwarf.c:3382 dwarf.c:3594 dwarf.c:3819
 #, c-format
 msgid ""
 "\n"
@@ -1935,102 +2015,107 @@ msgstr ""
 "\n"
 "Празен раздел %s.\n"
 
-#: dwarf.c:3533 dwarf.c:3987
+#: dwarf.c:3388 dwarf.c:3825
 #, c-format
 msgid "Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"
 msgstr ""
 
-#: dwarf.c:3577
+#. FIXME: Should we handle this case?
+#: dwarf.c:3432
+msgid "Location lists in .debug_info section aren't in ascending order!\n"
+msgstr ""
+
+#: dwarf.c:3435
 msgid "No location lists in .debug_info section!\n"
 msgstr ""
 
-#: dwarf.c:3582
+#: dwarf.c:3440
 #, c-format
-msgid "Location lists in %s section start at 0x%s\n"
+msgid "Location lists in %s section start at 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:3589
+#: dwarf.c:3444
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr ""
 
-#: dwarf.c:3638
+#: dwarf.c:3479
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr ""
 
-#: dwarf.c:3642
+#: dwarf.c:3483
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr ""
 
-#: dwarf.c:3650
+#: dwarf.c:3491
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr ""
 
-#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
+#: dwarf.c:3500 dwarf.c:3535 dwarf.c:3545
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr ""
 
-#: dwarf.c:3678 dwarf.c:4075
+#: dwarf.c:3519 dwarf.c:3913
 #, c-format
 msgid "<End of list>\n"
 msgstr ""
 
-#: dwarf.c:3688
+#: dwarf.c:3529
 #, c-format
 msgid "(base address)\n"
 msgstr ""
 
-#: dwarf.c:3725
+#: dwarf.c:3566
 msgid " (start == end)"
 msgstr " (начало == край)"
 
-#: dwarf.c:3727
+#: dwarf.c:3568
 msgid " (start > end)"
 msgstr " (начало > край)"
 
-#: dwarf.c:3737
+#: dwarf.c:3578
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr ""
 
-#: dwarf.c:3883
+#: dwarf.c:3723
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr ""
 
-#: dwarf.c:3887
+#: dwarf.c:3727
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr "  Дължина:                  %ld\n"
 
-#: dwarf.c:3889
+#: dwarf.c:3728
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr "  Вер�и�:                   %d\n"
 
-#: dwarf.c:3890
+#: dwarf.c:3729
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr ""
 
-#: dwarf.c:3892
+#: dwarf.c:3730
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr ""
 
-#: dwarf.c:3893
+#: dwarf.c:3731
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr ""
 
-#: dwarf.c:3902
+#: dwarf.c:3740
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr ""
 
-#: dwarf.c:3907
+#: dwarf.c:3745
 #, c-format
 msgid ""
 "\n"
@@ -2039,7 +2124,7 @@ msgstr ""
 "\n"
 "    �дре�              Дължина\n"
 
-#: dwarf.c:3909
+#: dwarf.c:3747
 #, c-format
 msgid ""
 "\n"
@@ -2048,375 +2133,258 @@ msgstr ""
 "\n"
 "    �дре�      Дължина\n"
 
-#: dwarf.c:3997
+#: dwarf.c:3835
 msgid "No range lists in .debug_info section!\n"
 msgstr ""
 
-#: dwarf.c:4021
+#: dwarf.c:3859
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:4025
+#: dwarf.c:3863
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr "    Отме�т   �ачало   Край\n"
 
-#: dwarf.c:4046
+#: dwarf.c:3884
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr ""
 
-#: dwarf.c:4050
+#: dwarf.c:3888
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr ""
 
-#: dwarf.c:4093
+#: dwarf.c:3931
 msgid "(start == end)"
 msgstr "(начало == край)"
 
-#: dwarf.c:4095
+#: dwarf.c:3933
 msgid "(start > end)"
 msgstr "(начало > край)"
 
-#: dwarf.c:4347
+#: dwarf.c:4185
 msgid "bad register: "
 msgstr ""
 
-#. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4350 dwarf.c:5159
+#: dwarf.c:4188
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr ""
 
-#: dwarf.c:5120
+#: dwarf.c:4962
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr ""
 
-#: dwarf.c:5122
+#: dwarf.c:4964
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr ""
 
-#: dwarf.c:5163
+#: dwarf.c:4989
 #, c-format
-msgid "Truncated header in the %s section.\n"
+msgid "Displaying the debug contents of section %s is not yet supported.\n"
 msgstr ""
 
-#: dwarf.c:5168
+#: dwarf.c:5031 elfedit.c:74
 #, c-format
-msgid "Version %ld\n"
-msgstr "Вер�и� %ld\n"
-
-#: dwarf.c:5175
-msgid "The address table data in version 3 may be wrong.\n"
-msgstr ""
-
-#: dwarf.c:5178
-msgid "Version 4 does not support case insensitive lookups.\n"
-msgstr ""
+msgid "%s: Error: "
+msgstr "%s: Грешка: "
 
-#: dwarf.c:5183
+#: dwarf.c:5042
 #, c-format
-msgid "Unsupported version %lu.\n"
-msgstr ""
+msgid "%s: Warning: "
+msgstr "%s: Предупр.: "
 
-#: dwarf.c:5199
+#: dwarf.c:5145 dwarf.c:5215
 #, c-format
-msgid "Corrupt header in the %s section.\n"
+msgid "Unrecognized debug option '%s'\n"
 msgstr ""
 
-#: dwarf.c:5214
+#: elfedit.c:243
 #, c-format
-msgid ""
-"\n"
-"CU table:\n"
+msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
 msgstr ""
 
-#: dwarf.c:5220
+#: elfedit.c:251
 #, c-format
-msgid "[%3u] 0x%lx - 0x%lx\n"
+msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
 msgstr ""
 
-#: dwarf.c:5225
+#: elfedit.c:267
 #, c-format
-msgid ""
-"\n"
-"TU table:\n"
+msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
 msgstr ""
 
-#: dwarf.c:5232
+#: elfedit.c:278
 #, c-format
-msgid "[%3u] 0x%lx 0x%lx "
+msgid "%s: Unmatched e_machine: %d is not %d\n"
 msgstr ""
 
-#: dwarf.c:5239
+#: elfedit.c:289
 #, c-format
-msgid ""
-"\n"
-"Address table:\n"
+msgid "%s: Unmatched e_type: %d is not %d\n"
 msgstr ""
 
-#: dwarf.c:5248
+#: elfedit.c:300
 #, c-format
-msgid "%lu\n"
+msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
 msgstr ""
 
-#: dwarf.c:5251
+#: elfedit.c:333
 #, c-format
-msgid ""
-"\n"
-"Symbol table:\n"
+msgid "%s: Failed to update ELF header: %s\n"
 msgstr ""
 
-#: dwarf.c:5285
+#: elfedit.c:366
 #, c-format
-msgid "Displaying the debug contents of section %s is not yet supported.\n"
+msgid "Unsupported EI_CLASS: %d\n"
 msgstr ""
 
-#: dwarf.c:5421 dwarf.c:5491
-#, c-format
-msgid "Unrecognized debug option '%s'\n"
+#: elfedit.c:399
+msgid ""
+"This executable has been built without support for a\n"
+"64 bit data type and so it cannot process 64 bit ELF files.\n"
 msgstr ""
 
-#: elfcomm.c:39
+#: elfedit.c:440
 #, c-format
-msgid "%s: Error: "
-msgstr "%s: Грешка: "
-
-#: elfcomm.c:50
-#, c-format
-msgid "%s: Warning: "
-msgstr "%s: Предупр.: "
+msgid "%s: Failed to read ELF header\n"
+msgstr ""
 
-#: elfcomm.c:82 elfcomm.c:117 elfcomm.c:167 elfcomm.c:216
+#: elfedit.c:447
 #, c-format
-msgid "Unhandled data length: %d\n"
+msgid "%s: Failed to seek to ELF header\n"
 msgstr ""
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
-#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
-#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
-#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
-#: readelf.c:11866 readelf.c:12685
+#: elfedit.c:477 elfedit.c:491 elfedit.c:776 readelf.c:3674 readelf.c:3978
+#: readelf.c:4021 readelf.c:4093 readelf.c:4171 readelf.c:4936 readelf.c:4960
+#: readelf.c:7057 readelf.c:7103 readelf.c:7304 readelf.c:8494 readelf.c:8508
+#: readelf.c:9033 readelf.c:9049 readelf.c:9092 readelf.c:9117 readelf.c:11385
+#: readelf.c:11577 readelf.c:12138 readelf.c:12515 readelf.c:12529
+#: readelf.c:12891
 msgid "Out of memory\n"
-msgstr "�едо�тиг на памет\n"
-
-#: elfcomm.c:312
-#, c-format
-msgid "%s: failed to seek to first archive header\n"
-msgstr "%s: не можа да �е до�тигне първото заглавие в архива\n"
-
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
-#, c-format
-msgid "%s: failed to read archive header\n"
-msgstr "%s: не можа да �е прочете заглавието на архива\n"
-
-#: elfcomm.c:347
-#, c-format
-msgid "%s: the archive index is empty\n"
-msgstr "%s: индек�а на архива е празен\n"
-
-#: elfcomm.c:355 elfcomm.c:381
-#, c-format
-msgid "%s: failed to read archive index\n"
-msgstr "%s: не можа да �е прочете индек�а на архива\n"
-
-#: elfcomm.c:365
-#, c-format
-msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
-msgstr "%s: очава �е индек�а на архива да е � %ld запи�а, но размера на заглавието твърде малък\n"
-
-#: elfcomm.c:373
-msgid "Out of memory whilst trying to read archive symbol index\n"
-msgstr "�едо�тиг на памет при четене на имена от индек�а на архива\n"
-
-#: elfcomm.c:392
-msgid "Out of memory whilst trying to convert the archive symbol index\n"
 msgstr ""
 
-#: elfcomm.c:405
+#: elfedit.c:543 readelf.c:12581
 #, c-format
-msgid "%s: the archive has an index but no symbols\n"
-msgstr "%s: архива е � индек�, но е без имена\n"
-
-#: elfcomm.c:413
-msgid "Out of memory whilst trying to read archive index symbol table\n"
+msgid "%s: failed to seek to first archive header\n"
 msgstr ""
 
-#: elfcomm.c:419
+#: elfedit.c:553 elfedit.c:741 elfedit.c:845 readelf.c:12590 readelf.c:12858
+#: readelf.c:13026
 #, c-format
-msgid "%s: failed to read archive index symbol table\n"
+msgid "%s: failed to read archive header\n"
 msgstr ""
 
-#: elfcomm.c:428
+#: elfedit.c:568 readelf.c:12691
 #, c-format
 msgid "%s: failed to skip archive symbol table\n"
 msgstr ""
 
-#: elfcomm.c:440
+#: elfedit.c:579 readelf.c:12702
 #, c-format
 msgid "%s: failed to read archive header following archive index\n"
 msgstr ""
 
-#: elfcomm.c:446
-#, c-format
-msgid "%s has no archive index\n"
-msgstr ""
-
-#: elfcomm.c:457
+#: elfedit.c:594 readelf.c:12718
 msgid "Out of memory reading long symbol names in archive\n"
 msgstr ""
 
-#: elfcomm.c:465
+#: elfedit.c:602 readelf.c:12726
 #, c-format
 msgid "%s: failed to read long symbol name string table\n"
 msgstr ""
 
-#: elfcomm.c:605
+#: elfedit.c:734 readelf.c:12852
 #, c-format
 msgid "%s: failed to seek to next file name\n"
 msgstr ""
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
+#: elfedit.c:747 elfedit.c:852 readelf.c:12863 readelf.c:13032
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr ""
 
-#: elfedit.c:73
-#, c-format
-msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
-msgstr ""
-
-#: elfedit.c:81
-#, c-format
-msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
-msgstr ""
-
-#: elfedit.c:97
-#, c-format
-msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
-msgstr ""
-
-#: elfedit.c:108
-#, c-format
-msgid "%s: Unmatched e_machine: %d is not %d\n"
-msgstr ""
-
-#: elfedit.c:119
-#, c-format
-msgid "%s: Unmatched e_type: %d is not %d\n"
-msgstr ""
-
-#: elfedit.c:130
-#, c-format
-msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
-msgstr ""
-
-#: elfedit.c:163
-#, c-format
-msgid "%s: Failed to update ELF header: %s\n"
-msgstr ""
-
-#: elfedit.c:196
-#, c-format
-msgid "Unsupported EI_CLASS: %d\n"
-msgstr ""
-
-#: elfedit.c:229
-msgid ""
-"This executable has been built without support for a\n"
-"64 bit data type and so it cannot process 64 bit ELF files.\n"
-msgstr ""
-
-#: elfedit.c:270
-#, c-format
-msgid "%s: Failed to read ELF header\n"
-msgstr ""
-
-#: elfedit.c:277
-#, c-format
-msgid "%s: Failed to seek to ELF header\n"
-msgstr ""
-
-#: elfedit.c:331 readelf.c:13161
+#: elfedit.c:836 readelf.c:13018
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
-msgstr "%s: не можа да �е по�тигне �ледващото заглавие на архива\n"
+msgstr ""
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
+#: elfedit.c:867 elfedit.c:876 readelf.c:13046 readelf.c:13055
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr ""
 
-#: elfedit.c:391 elfedit.c:483
+#: elfedit.c:896 elfedit.c:988
 #, c-format
 msgid "Input file '%s' is not readable\n"
 msgstr "�ечетим вход�щ файл '%s'\n"
 
-#: elfedit.c:415
+#: elfedit.c:920
 #, c-format
 msgid "%s: failed to seek to archive member\n"
 msgstr "%s: не у�п� преме�тването към член на архива\n"
 
-#: elfedit.c:454 readelf.c:13284
+#: elfedit.c:959 readelf.c:13134
 #, c-format
 msgid "'%s': No such file\n"
-msgstr "'%s': ��ма такъв файл\n"
+msgstr ""
 
-#: elfedit.c:456 readelf.c:13286
+#: elfedit.c:961 readelf.c:13136
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr ""
 
-#: elfedit.c:463 readelf.c:13293
+#: elfedit.c:968 readelf.c:13143
 #, c-format
 msgid "'%s' is not an ordinary file\n"
-msgstr "'%s' не е обикновен файл\n"
+msgstr ""
 
-#: elfedit.c:489 readelf.c:13306
+#: elfedit.c:994 readelf.c:13156
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr ""
 
-#: elfedit.c:547
+#: elfedit.c:1052
 #, c-format
 msgid "Unknown OSABI: %s\n"
 msgstr ""
 
-#: elfedit.c:566
+#: elfedit.c:1071
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr "�еизве�тен тип машина: %s\n"
 
-#: elfedit.c:584
+#: elfedit.c:1089
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr "�еизве�тен тип машина: %d\n"
 
-#: elfedit.c:603
+#: elfedit.c:1108
 #, c-format
 msgid "Unknown type: %s\n"
-msgstr "�епознат тип: %s\n"
+msgstr ""
 
-#: elfedit.c:634
+#: elfedit.c:1139
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr "Употреба: %s <опции> <обектни файлове>\n"
 
-#: elfedit.c:636
+#: elfedit.c:1141
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr ""
 
-#: elfedit.c:637 objcopy.c:475 objcopy.c:585
+#: elfedit.c:1142 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
-msgstr " Възможно�тите �а:\n"
+msgstr ""
 
-#: elfedit.c:638
+#: elfedit.c:1143
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -2429,33 +2397,38 @@ msgid ""
 "  -v --version                Display the version number of %s\n"
 msgstr ""
 
-#: emul_aix.c:45
+#: emul_aix.c:43
 #, c-format
 msgid "  [-g]         - 32 bit small archive\n"
 msgstr ""
 
-#: emul_aix.c:46
+#: emul_aix.c:44
 #, c-format
 msgid "  [-X32]       - ignores 64 bit objects\n"
 msgstr ""
 
-#: emul_aix.c:47
+#: emul_aix.c:45
 #, c-format
 msgid "  [-X64]       - ignores 32 bit objects\n"
 msgstr ""
 
-#: emul_aix.c:48
+#: emul_aix.c:46
 #, c-format
 msgid "  [-X32_64]    - accepts 32 and 64 bit objects\n"
 msgstr ""
 
+#: emul_aix.c:99 emul_aix.c:109 emul_aix.c:119 emul_aix.c:129
+#, c-format
+msgid "target `%s' ignored."
+msgstr ""
+
 #: ieee.c:311
 msgid "unexpected end of debugging information"
-msgstr "неочакван край на данните за про�лед�ване"
+msgstr ""
 
 #: ieee.c:398
 msgid "invalid number"
-msgstr "неправилно чи�ло"
+msgstr ""
 
 #: ieee.c:451
 msgid "invalid string length"
@@ -2670,17 +2643,17 @@ msgstr ""
 msgid "IEEE string length overflow: %u\n"
 msgstr ""
 
-#: ieee.c:5213
+#: ieee.c:5210
 #, c-format
 msgid "IEEE unsupported integer type size %u\n"
 msgstr ""
 
-#: ieee.c:5247
+#: ieee.c:5244
 #, c-format
 msgid "IEEE unsupported float type size %u\n"
 msgstr ""
 
-#: ieee.c:5281
+#: ieee.c:5278
 #, c-format
 msgid "IEEE unsupported complex type size %u\n"
 msgstr ""
@@ -2689,120 +2662,120 @@ msgstr ""
 msgid "Duplicate symbol entered into keyword list."
 msgstr ""
 
-#: nlmconv.c:274 srconv.c:1824
+#: nlmconv.c:273 srconv.c:1823
 msgid "input and output files must be different"
 msgstr ""
 
-#: nlmconv.c:321
+#: nlmconv.c:320
 msgid "input file named both on command line and with INPUT"
 msgstr ""
 
-#: nlmconv.c:330
+#: nlmconv.c:329
 msgid "no input file"
 msgstr ""
 
-#: nlmconv.c:360
+#: nlmconv.c:359
 msgid "no name for output file"
 msgstr ""
 
-#: nlmconv.c:374
+#: nlmconv.c:373
 msgid "warning: input and output formats are not compatible"
 msgstr ""
 
-#: nlmconv.c:404
+#: nlmconv.c:403
 msgid "make .bss section"
 msgstr ""
 
-#: nlmconv.c:414
+#: nlmconv.c:413
 msgid "make .nlmsections section"
 msgstr ""
 
-#: nlmconv.c:442
+#: nlmconv.c:441
 msgid "set .bss vma"
 msgstr ""
 
-#: nlmconv.c:449
+#: nlmconv.c:448
 msgid "set .data size"
 msgstr ""
 
-#: nlmconv.c:629
+#: nlmconv.c:628
 #, c-format
 msgid "warning: symbol %s imported but not in import list"
 msgstr ""
 
-#: nlmconv.c:649
+#: nlmconv.c:648
 msgid "set start address"
 msgstr ""
 
-#: nlmconv.c:698
+#: nlmconv.c:697
 #, c-format
 msgid "warning: START procedure %s not defined"
 msgstr ""
 
-#: nlmconv.c:700
+#: nlmconv.c:699
 #, c-format
 msgid "warning: EXIT procedure %s not defined"
 msgstr ""
 
-#: nlmconv.c:702
+#: nlmconv.c:701
 #, c-format
 msgid "warning: CHECK procedure %s not defined"
 msgstr ""
 
-#: nlmconv.c:722 nlmconv.c:908
+#: nlmconv.c:721 nlmconv.c:907
 msgid "custom section"
 msgstr ""
 
-#: nlmconv.c:742 nlmconv.c:937
+#: nlmconv.c:741 nlmconv.c:936
 msgid "help section"
 msgstr ""
 
-#: nlmconv.c:764 nlmconv.c:955
+#: nlmconv.c:763 nlmconv.c:954
 msgid "message section"
 msgstr ""
 
-#: nlmconv.c:779 nlmconv.c:988
+#: nlmconv.c:778 nlmconv.c:987
 msgid "module section"
 msgstr ""
 
-#: nlmconv.c:798 nlmconv.c:1004
+#: nlmconv.c:797 nlmconv.c:1003
 msgid "rpc section"
 msgstr ""
 
 #. There is no place to record this information.
-#: nlmconv.c:834
+#: nlmconv.c:833
 #, c-format
 msgid "%s: warning: shared libraries can not have uninitialized data"
 msgstr ""
 
-#: nlmconv.c:855 nlmconv.c:1023
+#: nlmconv.c:854 nlmconv.c:1022
 msgid "shared section"
 msgstr ""
 
-#: nlmconv.c:863
+#: nlmconv.c:862
 msgid "warning: No version number given"
 msgstr ""
 
-#: nlmconv.c:903 nlmconv.c:932 nlmconv.c:950 nlmconv.c:999 nlmconv.c:1018
+#: nlmconv.c:902 nlmconv.c:931 nlmconv.c:949 nlmconv.c:998 nlmconv.c:1017
 #, c-format
 msgid "%s: read: %s"
 msgstr ""
 
-#: nlmconv.c:925
+#: nlmconv.c:924
 msgid "warning: FULLMAP is not supported; try ld -M"
 msgstr ""
 
-#: nlmconv.c:1101
+#: nlmconv.c:1100
 #, c-format
 msgid "Usage: %s [option(s)] [in-file [out-file]]\n"
 msgstr ""
 
-#: nlmconv.c:1102
+#: nlmconv.c:1101
 #, c-format
 msgid " Convert an object file into a NetWare Loadable Module\n"
 msgstr ""
 
-#: nlmconv.c:1103
+#: nlmconv.c:1102
 #, c-format
 msgid ""
 " The options are:\n"
@@ -2816,64 +2789,64 @@ msgid ""
 "  -v --version                  Display the program's version\n"
 msgstr ""
 
-#: nlmconv.c:1144
+#: nlmconv.c:1143
 #, c-format
 msgid "support not compiled in for %s"
 msgstr ""
 
-#: nlmconv.c:1181
+#: nlmconv.c:1180
 msgid "make section"
 msgstr ""
 
-#: nlmconv.c:1195
+#: nlmconv.c:1194
 msgid "set section size"
 msgstr ""
 
-#: nlmconv.c:1201
+#: nlmconv.c:1200
 msgid "set section alignment"
 msgstr ""
 
-#: nlmconv.c:1205
+#: nlmconv.c:1204
 msgid "set section flags"
 msgstr ""
 
-#: nlmconv.c:1216
+#: nlmconv.c:1215
 msgid "set .nlmsections size"
 msgstr ""
 
-#: nlmconv.c:1297 nlmconv.c:1305 nlmconv.c:1314 nlmconv.c:1319
+#: nlmconv.c:1296 nlmconv.c:1304 nlmconv.c:1313 nlmconv.c:1318
 msgid "set .nlmsection contents"
 msgstr ""
 
-#: nlmconv.c:1796
+#: nlmconv.c:1795
 msgid "stub section sizes"
 msgstr ""
 
-#: nlmconv.c:1843
+#: nlmconv.c:1842
 msgid "writing stub"
 msgstr ""
 
-#: nlmconv.c:1927
+#: nlmconv.c:1926
 #, c-format
 msgid "unresolved PC relative reloc against %s"
 msgstr ""
 
-#: nlmconv.c:1991
+#: nlmconv.c:1990
 #, c-format
 msgid "overflow when adjusting relocation against %s"
 msgstr ""
 
-#: nlmconv.c:2118
+#: nlmconv.c:2117
 #, c-format
 msgid "%s: execution of %s failed: "
 msgstr ""
 
-#: nlmconv.c:2133
+#: nlmconv.c:2132
 #, c-format
 msgid "Execution of %s failed"
 msgstr ""
 
-#: nm.c:225 size.c:78 strings.c:650
+#: nm.c:225 size.c:78 strings.c:646
 #, c-format
 msgid "Usage: %s [option(s)] [file(s)]\n"
 msgstr ""
@@ -2943,17 +2916,17 @@ msgstr "%s: �грешена о�нова"
 msgid "%s: invalid output format"
 msgstr "%s: �грешен вход�ш формат"
 
-#: nm.c:346 readelf.c:8546 readelf.c:8591
+#: nm.c:346 readelf.c:8259 readelf.c:8304
 #, c-format
 msgid "<processor specific>: %d"
 msgstr ""
 
-#: nm.c:348 readelf.c:8555 readelf.c:8609
+#: nm.c:348 readelf.c:8268 readelf.c:8322
 #, c-format
 msgid "<OS specific>: %d"
 msgstr ""
 
-#: nm.c:350 readelf.c:8558 readelf.c:8612
+#: nm.c:350 readelf.c:8271 readelf.c:8325
 #, c-format
 msgid "<unknown>: %d"
 msgstr ""
@@ -2965,7 +2938,7 @@ msgid ""
 "Archive index:\n"
 msgstr ""
 
-#: nm.c:1254
+#: nm.c:1251
 #, c-format
 msgid ""
 "\n"
@@ -2974,7 +2947,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1256
+#: nm.c:1253
 #, c-format
 msgid ""
 "\n"
@@ -2983,21 +2956,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1258 nm.c:1309
+#: nm.c:1255 nm.c:1306
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  Section\n"
 "\n"
 msgstr ""
 
-#: nm.c:1261 nm.c:1312
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         Size             Line  Section\n"
 "\n"
 msgstr ""
 
-#: nm.c:1305
+#: nm.c:1302
 #, c-format
 msgid ""
 "\n"
@@ -3006,7 +2979,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1307
+#: nm.c:1304
 #, c-format
 msgid ""
 "\n"
@@ -3014,34 +2987,30 @@ msgid ""
 "Symbols from %s[%s]:\n"
 "\n"
 msgstr ""
-"\n"
-"\n"
-"Имена от %s[%s]:\n"
-"\n"
 
-#: nm.c:1399
+#: nm.c:1396
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr ""
 
-#: nm.c:1627
+#: nm.c:1624
 msgid "Only -X 32_64 is supported"
-msgstr "Само -X 32_64 �е подрържа"
+msgstr ""
 
-#: nm.c:1656
+#: nm.c:1653
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr ""
 
-#: nm.c:1657
+#: nm.c:1654
 msgid "will produce no output, since undefined symbols have no size."
 msgstr ""
 
-#: nm.c:1685
+#: nm.c:1682
 #, c-format
 msgid "data size %ld"
 msgstr ""
 
-#: objcopy.c:473 srconv.c:1732
+#: objcopy.c:473 srconv.c:1731
 #, c-format
 msgid "Usage: %s [option(s)] in-file [out-file]\n"
 msgstr ""
@@ -3202,7 +3171,7 @@ msgstr ""
 msgid "cannot open '%s': %s"
 msgstr ""
 
-#: objcopy.c:764 objcopy.c:3392
+#: objcopy.c:764 objcopy.c:3389
 #, c-format
 msgid "%s: fread failed"
 msgstr ""
@@ -3257,295 +3226,294 @@ msgstr ""
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr ""
 
-#: objcopy.c:1429
+#: objcopy.c:1427
 msgid "Unable to change endianness of input file(s)"
 msgstr ""
 
-#: objcopy.c:1438
+#: objcopy.c:1436
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr ""
 
-#: objcopy.c:1487
+#: objcopy.c:1485
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr ""
 
-#: objcopy.c:1495
+#: objcopy.c:1493
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr ""
 
-#: objcopy.c:1498
+#: objcopy.c:1496
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr ""
 
-#: objcopy.c:1561
+#: objcopy.c:1559
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr ""
 
-#: objcopy.c:1620
+#: objcopy.c:1618
 #, c-format
 msgid "can't add section '%s'"
 msgstr ""
 
-#: objcopy.c:1634
+#: objcopy.c:1632
 #, c-format
 msgid "can't create section `%s'"
 msgstr ""
 
-#: objcopy.c:1680
+#: objcopy.c:1678
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr ""
 
-#: objcopy.c:1773
+#: objcopy.c:1771
 msgid "Can't fill gap after section"
 msgstr ""
 
-#: objcopy.c:1797
+#: objcopy.c:1795
 msgid "can't add padding"
 msgstr ""
 
-#: objcopy.c:1888
+#: objcopy.c:1886
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr ""
 
-#: objcopy.c:1951
+#: objcopy.c:1949
 msgid "error copying private BFD data"
 msgstr ""
 
-#: objcopy.c:1962
+#: objcopy.c:1960
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr ""
 
-#: objcopy.c:1966
+#: objcopy.c:1964
 msgid "treating that number as an absolute e_machine value instead"
 msgstr ""
 
-#: objcopy.c:1970
+#: objcopy.c:1968
 msgid "ignoring the alternative value"
 msgstr ""
 
-#: objcopy.c:2002 objcopy.c:2038
+#: objcopy.c:2000 objcopy.c:2035
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr ""
 
-#: objcopy.c:2068
+#: objcopy.c:2096
 msgid "Unable to recognise the format of file"
 msgstr ""
 
-#: objcopy.c:2195
+#: objcopy.c:2194
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr ""
 
-#: objcopy.c:2339
+#: objcopy.c:2338
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr ""
 
-#: objcopy.c:2390
+#: objcopy.c:2389
 msgid "error in private header data"
 msgstr ""
 
-#: objcopy.c:2468
+#: objcopy.c:2467
 msgid "failed to create output section"
 msgstr ""
 
-#: objcopy.c:2482
+#: objcopy.c:2481
 msgid "failed to set size"
 msgstr ""
 
-#: objcopy.c:2496
+#: objcopy.c:2495
 msgid "failed to set vma"
 msgstr ""
 
-#: objcopy.c:2521
+#: objcopy.c:2520
 msgid "failed to set alignment"
 msgstr ""
 
-#: objcopy.c:2555
+#: objcopy.c:2554
 msgid "failed to copy private data"
 msgstr ""
 
-#: objcopy.c:2637
+#: objcopy.c:2636
 msgid "relocation count is negative"
 msgstr ""
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2698
+#: objcopy.c:2697
 #, c-format
 msgid "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr ""
 
-#: objcopy.c:2884
+#: objcopy.c:2883
 msgid "can't create debugging section"
 msgstr ""
 
-#: objcopy.c:2897
+#: objcopy.c:2896
 msgid "can't set debugging section contents"
 msgstr ""
 
-#: objcopy.c:2905
+#: objcopy.c:2904
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr ""
 
-#: objcopy.c:3048
+#: objcopy.c:3046
 msgid "could not create temporary file to hold stripped copy"
 msgstr ""
 
-#: objcopy.c:3120
+#: objcopy.c:3118
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr ""
 
-#: objcopy.c:3150
+#: objcopy.c:3148
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr ""
 
-#: objcopy.c:3212
+#: objcopy.c:3209
 msgid "byte number must be non-negative"
 msgstr ""
 
-#: objcopy.c:3218
+#: objcopy.c:3215
 #, c-format
 msgid "architecture %s unknown"
 msgstr ""
 
-#: objcopy.c:3226
+#: objcopy.c:3223
 msgid "interleave must be positive"
 msgstr ""
 
-#: objcopy.c:3235
+#: objcopy.c:3232
 msgid "interleave width must be positive"
 msgstr "Ширината за пре�качане тр�бва да е положителна"
 
-#: objcopy.c:3255 objcopy.c:3263
+#: objcopy.c:3252 objcopy.c:3260
 #, c-format
 msgid "%s both copied and removed"
 msgstr ""
 
-#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
-#: objcopy.c:3609 objcopy.c:3629
+#: objcopy.c:3359 objcopy.c:3439 objcopy.c:3547 objcopy.c:3578 objcopy.c:3602
+#: objcopy.c:3606 objcopy.c:3626
 #, c-format
 msgid "bad format for %s"
 msgstr ""
 
-#: objcopy.c:3374
+#: objcopy.c:3371
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr ""
 
-#: objcopy.c:3519
+#: objcopy.c:3516
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr ""
 
-#: objcopy.c:3680
+#: objcopy.c:3677
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr ""
 
-#: objcopy.c:3698
+#: objcopy.c:3695
 msgid "unable to parse alternative machine code"
 msgstr ""
 
-#: objcopy.c:3743
+#: objcopy.c:3740
 msgid "number of bytes to reverse must be positive and even"
 msgstr ""
 
-#: objcopy.c:3746
+#: objcopy.c:3743
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr ""
 
-#: objcopy.c:3761
+#: objcopy.c:3758
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr ""
 
-#: objcopy.c:3767
+#: objcopy.c:3764
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr ""
 
-#: objcopy.c:3792
+#: objcopy.c:3789
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr ""
 
-#: objcopy.c:3798
+#: objcopy.c:3795
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr ""
 
-#: objcopy.c:3827
+#: objcopy.c:3824
 msgid "interleave start byte must be set with --byte"
 msgstr ""
 
-#: objcopy.c:3830
+#: objcopy.c:3827
 msgid "byte number must be less than interleave"
 msgstr ""
 
-#: objcopy.c:3833
+#: objcopy.c:3830
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr ""
 
-#: objcopy.c:3860
+#: objcopy.c:3857
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr ""
 
-#: objcopy.c:3891
+#: objcopy.c:3888
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr ""
 
-#: objcopy.c:3904
+#: objcopy.c:3901
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr ""
 
-#: objcopy.c:3916
+#: objcopy.c:3912
 #, c-format
 msgid "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr ""
 
-#: objcopy.c:3944 objcopy.c:3958
+#: objcopy.c:3956 objcopy.c:3970
 #, c-format
 msgid "%s %s%c0x%s never used"
-msgstr "%s %s%c0x%s не е използван"
+msgstr ""
 
-#: objdump.c:201
+#: objdump.c:190
 #, c-format
 msgid "Usage: %s <option(s)> <file(s)>\n"
-msgstr "Употреба: %s <опци�/-и> <файл/-ове>\n"
+msgstr ""
 
-#: objdump.c:202
+#: objdump.c:191
 #, c-format
 msgid " Display information from object <file(s)>.\n"
-msgstr " Показване на �ведени�та от обект <файл/-лове>.\n"
+msgstr ""
 
-#: objdump.c:203
+#: objdump.c:192
 #, c-format
 msgid " At least one of the following switches must be given:\n"
-msgstr " Тр�бва да �е зададе поне един от �ледните ключове:\n"
+msgstr ""
 
-#: objdump.c:204
+#: objdump.c:193
 #, c-format
 msgid ""
 "  -a, --archive-headers    Display archive header information\n"
 "  -f, --file-headers       Display the contents of the overall file header\n"
 "  -p, --private-headers    Display object format specific file header contents\n"
-"  -P, --private=OPT,OPT... Display object format specific contents\n"
 "  -h, --[section-]headers  Display the contents of the section headers\n"
 "  -x, --all-headers        Display the contents of all headers\n"
 "  -d, --disassemble        Display assembler contents of executable sections\n"
@@ -3558,7 +3526,7 @@ msgid ""
 "  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Display DWARF info in the file\n"
 "  -t, --syms               Display the contents of the symbol table(s)\n"
 "  -T, --dynamic-syms       Display the contents of the dynamic symbol table\n"
@@ -3569,43 +3537,15 @@ msgid ""
 "  -i, --info               List object formats and architectures supported\n"
 "  -H, --help               Display this information\n"
 msgstr ""
-"  -a, --archive-headers    Извеждане за �ведение за заглавието на архива\n"
-"  -f, --file-headers       Извеждане �ъдържанието на общото заглавие на файла\n"
-"  -p, --private-headers    Извеждане на �ъдържанието на ча�тните заглави�\n"
-"  -P, --private=OPT,OPT... Извеждане на ча�тните �ъдържани�\n"
-"  -h, --[section-]headers  Извеждане �ъдържанието на заглави�та на разделите\n"
-"  -x, --all-headers        Извеждане �ъдържанието на в�ички заглави�\n"
-"  -d, --disassemble        Извеждане �ъдържание на изпълнимите раздели на 'assembler'\n"
-"  -D, --disassemble-all    Извеждане �ъдържание на в�ички раздели на 'assembler'\n"
-"  -S, --source             Сме�ване на програмен код � раза�емблиран\n"
-"  -s, --full-contents      Извеждане на пълното �ъдържани� за в�ички пои�кани раздели\n"
-"  -g, --debugging          Извеждане на �ведени� за про�лед�ване от обектни� файл\n"
-"  -e, --debugging-tags     Извеждане на �ведени� за про�лед�ване по ctags начин\n"
-"  -G, --stabs              Display (in raw form) any STABS info in the file\n"
-"  -W[lLiaprmfFsoRt] или\n"
-"  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
-"          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
-"                           Извездане на DWARF �ведени� от файла\n"
-"  -t, --syms               Извеждане на �ъдържанието на таблицата/-ите � имената\n"
-"  -T, --dynamic-syms       Извеждане на �ъдържанието на таблицата/-ите � динамичните имена\n"
-"  -r, --reloc              Извеждане на преме�тваемите запи�и от файла\n"
-"  -R, --dynamic-reloc      Извеждане на динамичните преме�тваеми запи�и отфайла\n"
-"  @<файл>                  Прочитане на опциите от <файл>\n"
-"  -v, --version            Извеждане на вер�и�та на програмата\n"
-"  -i, --info               Избро�ване на поддържаните обектни формати и архитектури\n"
-"  -H, --help               Извеждане на това �ведение\n"
-
-#: objdump.c:236
+
+#: objdump.c:222
 #, c-format
 msgid ""
 "\n"
 " The following switches are optional:\n"
 msgstr ""
-"\n"
-" Следните ключове �а по избор:\n"
 
-#: objdump.c:237
+#: objdump.c:223
 #, c-format
 msgid ""
 "  -b, --target=BFDNAME           Specify the target object format as BFDNAME\n"
@@ -3633,895 +3573,183 @@ msgid ""
 "      --special-syms             Include special symbols in symbol dumps\n"
 "      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
-msgstr ""
-
-#: objdump.c:263
-#, c-format
-msgid ""
-"      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"      --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                             or deeper\n"
 "\n"
 msgstr ""
 
-#: objdump.c:275
-#, c-format
-msgid ""
-"\n"
-"Options supported for -P/--private switch:\n"
-msgstr ""
-"\n"
-"Възможно�тите за -P/--private ключ �а:\n"
-
-#: objdump.c:426
+#: objdump.c:396
 #, c-format
 msgid "section '%s' mentioned in a -j option, but not found in any input file"
-msgstr "раздела '%s, е зададен от -j опци�, но не е намерен в вход�щите файлове"
+msgstr ""
 
-#: objdump.c:530
+#: objdump.c:500
 #, c-format
 msgid "Sections:\n"
-msgstr "Раздели:\n"
+msgstr ""
 
-#: objdump.c:533 objdump.c:537
+#: objdump.c:503 objdump.c:507
 #, c-format
 msgid "Idx Name          Size      VMA       LMA       File off  Algn"
 msgstr ""
 
-#: objdump.c:539
+#: objdump.c:509
 #, c-format
 msgid "Idx Name          Size      VMA               LMA               File off  Algn"
 msgstr ""
 
-#: objdump.c:543
+#: objdump.c:513
 #, c-format
 msgid "  Flags"
-msgstr "Флагове"
+msgstr ""
+
+#: objdump.c:515
+#, c-format
+msgid "  Pg"
+msgstr ""
 
-#: objdump.c:586
+#: objdump.c:558
 #, c-format
 msgid "%s: not a dynamic object"
-msgstr "%s: не е динамичен обект"
+msgstr ""
 
-#: objdump.c:1012 objdump.c:1036
+#: objdump.c:984 objdump.c:1008
 #, c-format
 msgid " (File Offset: 0x%lx)"
-msgstr " (Отме�тване в файл: 0x%lx)"
+msgstr ""
 
-#: objdump.c:1662
+#: objdump.c:1634
 #, c-format
 msgid "disassemble_fn returned length %d"
-msgstr "disassemble_fn върна дължина %d"
+msgstr ""
 
-#: objdump.c:1967
+#: objdump.c:1939
 #, c-format
 msgid ""
 "\n"
 "Disassembly of section %s:\n"
 msgstr ""
-"\n"
-"Разглоб�ване на раздел %s:\n"
 
-#: objdump.c:2143
+#: objdump.c:2115
 #, c-format
 msgid "can't use supplied machine %s"
-msgstr "не можа де �е използва зададената машина %s"
+msgstr ""
 
-#: objdump.c:2162
+#: objdump.c:2134
 #, c-format
 msgid "can't disassemble for architecture %s\n"
-msgstr "не можа да �е разглоби за архитектура %s\n"
+msgstr ""
 
-#: objdump.c:2242 objdump.c:2265
+#: objdump.c:2214 objdump.c:2237
 #, c-format
 msgid ""
 "\n"
 "Can't get contents for section '%s'.\n"
 msgstr ""
-"\n"
-"�е можа да �е извлече �ъдържанието на раздел '%s'.\n"
 
-#: objdump.c:2406
+#: objdump.c:2378
 #, c-format
 msgid ""
 "No %s section present\n"
 "\n"
 msgstr ""
-"Лип�ва раздел %s\n"
-"\n"
 
-#: objdump.c:2415
+#: objdump.c:2387
 #, c-format
 msgid "reading %s section of %s failed: %s"
 msgstr "не у�п� четенето на раздел %s от %s: %s"
 
-#: objdump.c:2459
+#: objdump.c:2431
 #, c-format
 msgid ""
 "Contents of %s section:\n"
 "\n"
 msgstr ""
-"Съдържание на раздел %s:\n"
-"\n"
 
-#: objdump.c:2590
+#: objdump.c:2562
 #, c-format
 msgid "architecture: %s, "
-msgstr "архитектура: %s, "
+msgstr ""
 
-#: objdump.c:2593
+#: objdump.c:2565
 #, c-format
 msgid "flags 0x%08x:\n"
-msgstr "флагове 0x%08x:\n"
+msgstr ""
 
-#: objdump.c:2607
+#: objdump.c:2579
 #, c-format
 msgid ""
 "\n"
 "start address 0x"
 msgstr ""
-"\n"
-"начален адре� 0x"
-
-#: objdump.c:2633
-msgid "option -P/--private not supported by this file"
-msgstr "опци�та -P/--private не �е поддържа за този файл"
-
-#: objdump.c:2657
-#, c-format
-msgid "target specific dump '%s' not supported"
-msgstr ""
 
-#: objdump.c:2721
+#: objdump.c:2642
 #, c-format
 msgid "Contents of section %s:"
-msgstr "Съдържание на раздел %s:"
+msgstr ""
 
-#: objdump.c:2723
+#: objdump.c:2644
 #, c-format
 msgid "  (Starting at file offset: 0x%lx)"
-msgstr "  (Започва �е � отме�тване: 0x%lx)"
+msgstr ""
 
-#: objdump.c:2729
+#: objdump.c:2650
 msgid "Reading section failed"
-msgstr "Пропадна четенето на раздела"
+msgstr ""
 
-#: objdump.c:2832
+#: objdump.c:2753
 #, c-format
 msgid "no symbols\n"
-msgstr "н�ма имена\n"
+msgstr ""
 
-#: objdump.c:2839
+#: objdump.c:2760
 #, c-format
 msgid "no information for symbol number %ld\n"
-msgstr "без �ведение за име � номер %ld\n"
+msgstr ""
 
-#: objdump.c:2842
+#: objdump.c:2763
 #, c-format
 msgid "could not determine the type of symbol number %ld\n"
-msgstr "не може да �е определи типа на име � номер %ld\n"
+msgstr ""
 
-#: objdump.c:3163
+#: objdump.c:3043
 #, c-format
 msgid ""
 "\n"
 "%s:     file format %s\n"
 msgstr ""
-"\n"
-"%s:     формат на файл %s\n"
 
-#: objdump.c:3223
+#: objdump.c:3101
 #, c-format
 msgid "%s: printing debugging information failed"
-msgstr "%s: пропадна отпечатването на �ведени� за про�лед�ване"
+msgstr ""
 
-#: objdump.c:3327
+#: objdump.c:3205
 #, c-format
 msgid "In archive %s:\n"
-msgstr "В архив %s:\n"
+msgstr ""
 
-#: objdump.c:3438
+#: objdump.c:3316
 msgid "error: the start address should be before the end address"
-msgstr "грешка: начални�т адре� не може да е преди крайни�т"
+msgstr ""
 
-#: objdump.c:3443
+#: objdump.c:3321
 msgid "error: the stop address should be after the start address"
-msgstr "грешка: адре�а за �пиране тр�бва да е �лед начални�"
+msgstr ""
 
-#: objdump.c:3455
+#: objdump.c:3333
 msgid "error: prefix strip must be non-negative"
 msgstr ""
 
-#: objdump.c:3460
+#: objdump.c:3338
 msgid "error: instruction width must be positive"
 msgstr ""
 
-#: objdump.c:3469
+#: objdump.c:3347
 msgid "unrecognized -E option"
-msgstr "неразпозната -E опци�"
-
-#: objdump.c:3480
-#, c-format
-msgid "unrecognized --endian type `%s'"
-msgstr "неразпознат тип за подредба (--endian) '%s'"
-
-#: od-xcoff.c:75
-#, c-format
-msgid ""
-"For XCOFF files:\n"
-"  header      Display the file header\n"
-"  aout        Display the auxiliary header\n"
-"  sections    Display the section headers\n"
-"  syms        Display the symbols table\n"
-"  relocs      Display the relocation entries\n"
-"  lineno      Display the line number entries\n"
-"  loader      Display loader section\n"
-"  except      Display exception table\n"
-"  typchk      Display type-check section\n"
-"  traceback   Display traceback tags\n"
-"  toc         Display toc symbols\n"
-msgstr ""
-
-#: od-xcoff.c:416
-#, c-format
-msgid "  nbr sections:  %d\n"
-msgstr ""
-
-#: od-xcoff.c:417
-#, c-format
-msgid "  time and date: 0x%08x  - "
-msgstr ""
-
-#: od-xcoff.c:419
-#, c-format
-msgid "not set\n"
-msgstr "не е у�тановен\n"
-
-#: od-xcoff.c:426
-#, c-format
-msgid "  symbols off:   0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:427
-#, c-format
-msgid "  nbr symbols:   %d\n"
-msgstr "  бр. имена  :   %d\n"
-
-#: od-xcoff.c:428
-#, c-format
-msgid "  opt hdr sz:    %d\n"
-msgstr ""
-
-#: od-xcoff.c:429
-#, c-format
-msgid "  flags:         0x%04x "
-msgstr ""
-
-#: od-xcoff.c:443
-#, c-format
-msgid "Auxiliary header:\n"
-msgstr ""
-
-#: od-xcoff.c:446
-#, c-format
-msgid "  No aux header\n"
-msgstr ""
-
-#: od-xcoff.c:451
-#, c-format
-msgid "warning: optionnal header size too large (> %d)\n"
-msgstr ""
-
-#: od-xcoff.c:457
-msgid "cannot read auxhdr"
-msgstr ""
-
-#: od-xcoff.c:462
-#, c-format
-msgid "  o_mflag (magic): 0x%04x 0%04o\n"
-msgstr ""
-
-#: od-xcoff.c:463
-#, c-format
-msgid "  o_vstamp:        0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:465
-#, c-format
-msgid "  o_tsize:         0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:467
-#, c-format
-msgid "  o_dsize:         0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:469
-#, c-format
-msgid "  o_entry:         0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:471
-#, c-format
-msgid "  o_text_start:    0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:473
-#, c-format
-msgid "  o_data_start:    0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:477
-#, c-format
-msgid "  o_toc:           0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:479
-#, c-format
-msgid "  o_snentry:       0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:481
-#, c-format
-msgid "  o_sntext:        0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:483
-#, c-format
-msgid "  o_sndata:        0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:485
-#, c-format
-msgid "  o_sntoc:         0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:487
-#, c-format
-msgid "  o_snloader:      0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:489
-#, c-format
-msgid "  o_snbss:         0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:491
-#, c-format
-msgid "  o_algntext:      %u\n"
-msgstr ""
-
-#: od-xcoff.c:493
-#, c-format
-msgid "  o_algndata:      %u\n"
-msgstr ""
-
-#: od-xcoff.c:495
-#, c-format
-msgid "  o_modtype:       0x%04x"
-msgstr ""
-
-#: od-xcoff.c:500
-#, c-format
-msgid "  o_cputype:       0x%04x\n"
-msgstr ""
-
-#: od-xcoff.c:502
-#, c-format
-msgid "  o_maxstack:      0x%08x\n"
 msgstr ""
 
-#: od-xcoff.c:504
+#: objdump.c:3358
 #, c-format
-msgid "  o_maxdata:       0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:507
-#, c-format
-msgid "  o_debugger:      0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:521
-#, c-format
-msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
-msgstr ""
-
-#: od-xcoff.c:526
-#, c-format
-msgid "  No section header\n"
-msgstr ""
-
-#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
-msgid "cannot read section header"
-msgstr "раздела не можа да �е прочете"
-
-#: od-xcoff.c:534
-#, c-format
-msgid " # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-msgstr ""
-
-#: od-xcoff.c:546
-#, c-format
-msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-msgstr ""
-
-#: od-xcoff.c:557
-#, c-format
-msgid "            Flags: %08x "
-msgstr ""
-
-#: od-xcoff.c:565
-#, c-format
-msgid "overflow - nreloc: %u, nlnno: %u\n"
-msgstr ""
-
-#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
-msgid "cannot read section headers"
-msgstr "не може да �е прочетат заглави�та на ча�та"
-
-#: od-xcoff.c:650
-msgid "cannot read strings table len"
-msgstr ""
-
-#: od-xcoff.c:664
-msgid "cannot read strings table"
-msgstr ""
-
-#: od-xcoff.c:672
-msgid "cannot read symbol table"
-msgstr ""
-
-#: od-xcoff.c:687
-msgid "cannot read symbol entry"
-msgstr ""
-
-#: od-xcoff.c:722
-msgid "cannot read symbol aux entry"
-msgstr ""
-
-#: od-xcoff.c:744
-#, c-format
-msgid "Symbols table (strtable at 0x%08x)"
-msgstr ""
-
-#: od-xcoff.c:749
-#, c-format
-msgid ""
-":\n"
-"  No symbols\n"
-msgstr ""
-":\n"
-"  н�ма имена\n"
-
-#: od-xcoff.c:755
-#, c-format
-msgid " (no strings):\n"
-msgstr " (н�ма низове):\n"
-
-#: od-xcoff.c:757
-#, c-format
-msgid " (strings size: %08x):\n"
-msgstr ""
-
-#: od-xcoff.c:770
-#, c-format
-msgid "  # sc         value    section  type aux name/off\n"
-msgstr ""
-
-#: od-xcoff.c:821
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-msgstr ""
-
-#: od-xcoff.c:827
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u\n"
-msgstr ""
-
-#. Function aux entry.
-#: od-xcoff.c:837
-#, c-format
-msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-msgstr ""
-
-#: od-xcoff.c:856
-#, c-format
-msgid "  scnsym: %-8u"
-msgstr ""
-
-#: od-xcoff.c:858
-#, c-format
-msgid "  scnlen: %08x"
-msgstr ""
-
-#: od-xcoff.c:859
-#, c-format
-msgid " h: parm=%08x sn=%04x al: 2**%u"
-msgstr ""
-
-#: od-xcoff.c:863
-#, c-format
-msgid " typ: "
-msgstr ""
-
-#: od-xcoff.c:865
-#, c-format
-msgid " cl: "
-msgstr ""
-
-#: od-xcoff.c:878
-#, c-format
-msgid " ftype: %02x "
-msgstr ""
-
-#: od-xcoff.c:881
-#, c-format
-msgid "fname: %.14s"
-msgstr ""
-
-#: od-xcoff.c:887
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: od-xcoff.c:889
-#, c-format
-msgid "offset: %08x"
-msgstr ""
-
-#: od-xcoff.c:896
-#, c-format
-msgid "  lnno: %u\n"
-msgstr ""
-
-#: od-xcoff.c:931
-#, c-format
-msgid "Relocations for %s (%u)\n"
-msgstr "Преме�твани� за %s (%u)\n"
-
-#: od-xcoff.c:934
-msgid "cannot read relocations"
-msgstr "преме�твани�та не �е четат"
-
-#: od-xcoff.c:937
-#, c-format
-msgid "vaddr    sgn mod sz type  symndx symbol\n"
-msgstr ""
-
-#: od-xcoff.c:946
-msgid "cannot read relocation entry"
-msgstr ""
-
-#: od-xcoff.c:950
-#, c-format
-msgid "%08x  %c   %c  %-2u "
-msgstr ""
-
-#: od-xcoff.c:986
-#, c-format
-msgid "Line numbers for %s (%u)\n"
-msgstr ""
-
-#: od-xcoff.c:989
-msgid "cannot read line numbers"
-msgstr ""
-
-#: od-xcoff.c:992
-#, c-format
-msgid "lineno  symndx/paddr\n"
-msgstr ""
-
-#: od-xcoff.c:1000
-msgid "cannot read line number entry"
-msgstr ""
-
-#: od-xcoff.c:1004
-#, c-format
-msgid " %-6u "
-msgstr ""
-
-#: od-xcoff.c:1043
-#, c-format
-msgid "no .loader section in file\n"
-msgstr "във файла лип�ва раздел .loader\n"
-
-#: od-xcoff.c:1049
-#, c-format
-msgid "section .loader is too short\n"
-msgstr "твърде къ� раздел .loader\n"
-
-#: od-xcoff.c:1056
-#, c-format
-msgid "Loader header:\n"
-msgstr ""
-
-#: od-xcoff.c:1058
-#, c-format
-msgid "  version:           %u\n"
-msgstr "   вер�и�:           %u\n"
-
-#: od-xcoff.c:1061
-#, c-format
-msgid " Unhandled version\n"
-msgstr " �еподдържана вер�и�\n"
-
-#: od-xcoff.c:1066
-#, c-format
-msgid "  nbr symbols:       %u\n"
-msgstr ""
-
-#: od-xcoff.c:1068
-#, c-format
-msgid "  nbr relocs:        %u\n"
-msgstr ""
-
-#: od-xcoff.c:1069
-#, c-format
-msgid "  import strtab len: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1072
-#, c-format
-msgid "  nbr import files:  %u\n"
-msgstr ""
-
-#: od-xcoff.c:1074
-#, c-format
-msgid "  import file off:   %u\n"
-msgstr ""
-
-#: od-xcoff.c:1076
-#, c-format
-msgid "  string table len:  %u\n"
-msgstr ""
-
-#: od-xcoff.c:1078
-#, c-format
-msgid "  string table off:  %u\n"
-msgstr ""
-
-#: od-xcoff.c:1081
-#, c-format
-msgid "Dynamic symbols:\n"
-msgstr ""
-
-#: od-xcoff.c:1082
-#, c-format
-msgid "     # value     sc IFEW ty class file  pa name\n"
-msgstr ""
-
-#: od-xcoff.c:1087
-#, c-format
-msgid "  %4u %08x %3u "
-msgstr ""
-
-#: od-xcoff.c:1100
-#, c-format
-msgid " %3u %3u "
-msgstr ""
-
-#: od-xcoff.c:1109
-#, c-format
-msgid "(bad offset: %u)"
-msgstr ""
-
-#: od-xcoff.c:1116
-#, c-format
-msgid "Dynamic relocs:\n"
-msgstr ""
-
-#: od-xcoff.c:1117
-#, c-format
-msgid "  vaddr    sec    sz typ   sym\n"
-msgstr ""
-
-#: od-xcoff.c:1129
-#, c-format
-msgid "  %08x %3u %c%c %2u "
-msgstr ""
-
-#: od-xcoff.c:1140
-#, c-format
-msgid ".text"
-msgstr ""
-
-#: od-xcoff.c:1143
-#, c-format
-msgid ".data"
-msgstr ""
-
-#: od-xcoff.c:1146
-#, c-format
-msgid ".bss"
-msgstr ""
-
-#: od-xcoff.c:1149
-#, c-format
-msgid "%u"
-msgstr "%u"
-
-#: od-xcoff.c:1155
-#, c-format
-msgid "Import files:\n"
-msgstr ""
-
-#: od-xcoff.c:1187
-#, c-format
-msgid "no .except section in file\n"
-msgstr ""
-
-#: od-xcoff.c:1195
-#, c-format
-msgid "Exception table:\n"
-msgstr ""
-
-#: od-xcoff.c:1196
-#, c-format
-msgid "lang reason sym/addr\n"
-msgstr ""
-
-#: od-xcoff.c:1204
-#, c-format
-msgid "  %02x     %02x "
-msgstr ""
-
-#: od-xcoff.c:1209
-#, c-format
-msgid "@%08x"
-msgstr ""
-
-#: od-xcoff.c:1229
-#, c-format
-msgid "no .typchk section in file\n"
-msgstr ""
-
-#: od-xcoff.c:1236
-#, c-format
-msgid "Type-check section:\n"
-msgstr ""
-
-#: od-xcoff.c:1237
-#, c-format
-msgid "offset    len  lang-id general-hash language-hash\n"
-msgstr ""
-
-#: od-xcoff.c:1282
-#, c-format
-msgid " address beyond section size\n"
-msgstr ""
-
-#: od-xcoff.c:1292
-#, c-format
-msgid " tags at %08x\n"
-msgstr ""
-
-#: od-xcoff.c:1299
-#, c-format
-msgid " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1306
-#, c-format
-msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1312
-#, c-format
-msgid " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1318
-#, c-format
-msgid " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-msgstr ""
-
-#: od-xcoff.c:1324
-#, c-format
-msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1337
-#, c-format
-msgid " parminfo: 0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:1348
-#, c-format
-msgid " tb_offset: 0x%08x (start=0x%08x)\n"
-msgstr ""
-
-#: od-xcoff.c:1359
-#, c-format
-msgid " hand_mask_offset: 0x%08x\n"
-msgstr ""
-
-#: od-xcoff.c:1370
-#, c-format
-msgid " number of CTL anchors: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1375
-#, c-format
-msgid "  CTL[%u]: %08x\n"
-msgstr ""
-
-#: od-xcoff.c:1389
-#, c-format
-msgid " Name (len: %u): "
-msgstr ""
-
-#: od-xcoff.c:1392
-#, c-format
-msgid "[truncated]\n"
-msgstr ""
-
-#: od-xcoff.c:1407
-#, c-format
-msgid " alloca reg: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1411
-#, c-format
-msgid " (end of tags at %08x)\n"
-msgstr ""
-
-#: od-xcoff.c:1414
-#, c-format
-msgid " no tags found\n"
-msgstr ""
-
-#: od-xcoff.c:1418
-#, c-format
-msgid " Truncated .text section\n"
-msgstr ""
-
-#: od-xcoff.c:1503
-#, c-format
-msgid "TOC:\n"
-msgstr ""
-
-#: od-xcoff.c:1546
-#, c-format
-msgid "Nbr entries: %-8u Size: %08x (%u)\n"
-msgstr ""
-
-#: od-xcoff.c:1630
-msgid "cannot read header"
-msgstr ""
-
-#: od-xcoff.c:1638
-#, c-format
-msgid "File header:\n"
-msgstr ""
-
-#: od-xcoff.c:1639
-#, c-format
-msgid "  magic:         0x%04x (0%04o)  "
-msgstr ""
-
-#: od-xcoff.c:1643
-#, c-format
-msgid "(WRMAGIC: writable text segments)"
-msgstr ""
-
-#: od-xcoff.c:1646
-#, c-format
-msgid "(ROMAGIC: readonly sharablee text segments)"
-msgstr ""
-
-#: od-xcoff.c:1649
-#, c-format
-msgid "(TOCMAGIC: readonly text segments and TOC)"
-msgstr ""
-
-#: od-xcoff.c:1652
-#, c-format
-msgid "unknown magic"
-msgstr ""
-
-#: od-xcoff.c:1659
-#, c-format
-msgid "  Unhandled magic\n"
+msgid "unrecognized --endian type `%s'"
 msgstr ""
 
 #: rclex.c:197
@@ -4563,231 +3791,231 @@ msgstr ""
 msgid "Last stabs entries before error:\n"
 msgstr ""
 
-#: readelf.c:265
+#: readelf.c:268
 msgid "<none>"
 msgstr ""
 
-#: readelf.c:266
+#: readelf.c:269
 msgid "<no-name>"
 msgstr ""
 
-#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
-#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
-#: readelf.c:12153
+#: readelf.c:270 readelf.c:5047 readelf.c:5557 readelf.c:7794 readelf.c:7912
+#: readelf.c:8865 readelf.c:8945 readelf.c:8998 readelf.c:11860
+#: readelf.c:11863
 msgid "<corrupt>"
 msgstr ""
 
-#: readelf.c:300
+#: readelf.c:308
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr ""
 
-#: readelf.c:315
+#: readelf.c:323
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr ""
 
-#: readelf.c:325
+#: readelf.c:333
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr ""
 
-#: readelf.c:625
+#: readelf.c:697
 msgid "Don't know about relocations on this machine architecture\n"
 msgstr ""
 
-#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+#: readelf.c:718 readelf.c:748 readelf.c:816 readelf.c:845
 msgid "relocs"
 msgstr ""
 
-#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
+#: readelf.c:730 readelf.c:760 readelf.c:827 readelf.c:856
 msgid "out of memory parsing relocs\n"
 msgstr ""
 
-#: readelf.c:889
+#: readelf.c:961
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr ""
 
-#: readelf.c:891
+#: readelf.c:963
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr ""
 
-#: readelf.c:896
+#: readelf.c:968
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr ""
 
-#: readelf.c:898
+#: readelf.c:970
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr ""
 
-#: readelf.c:906
+#: readelf.c:978
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend\n"
 msgstr ""
 
-#: readelf.c:908
+#: readelf.c:980
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name + Addend\n"
 msgstr ""
 
-#: readelf.c:913
+#: readelf.c:985
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name\n"
 msgstr ""
 
-#: readelf.c:915
+#: readelf.c:987
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr ""
 
-#: readelf.c:1219 readelf.c:1378 readelf.c:1386
+#: readelf.c:1291 readelf.c:1448 readelf.c:1456
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr ""
 
-#: readelf.c:1244
+#: readelf.c:1316
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr ""
 
-#: readelf.c:1251
+#: readelf.c:1323
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr ""
 
-#: readelf.c:1336
+#: readelf.c:1406
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr ""
 
-#: readelf.c:1338
+#: readelf.c:1408
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr ""
 
-#: readelf.c:1731
+#: readelf.c:1801
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr ""
 
-#: readelf.c:1755
+#: readelf.c:1825
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr ""
 
-#: readelf.c:1759 readelf.c:2821
+#: readelf.c:1829 readelf.c:2875
 #, c-format
 msgid "<unknown>: %lx"
 msgstr ""
 
-#: readelf.c:1772
+#: readelf.c:1842
 msgid "NONE (None)"
 msgstr ""
 
-#: readelf.c:1773
+#: readelf.c:1843
 msgid "REL (Relocatable file)"
 msgstr ""
 
-#: readelf.c:1774
+#: readelf.c:1844
 msgid "EXEC (Executable file)"
 msgstr ""
 
-#: readelf.c:1775
+#: readelf.c:1845
 msgid "DYN (Shared object file)"
 msgstr ""
 
-#: readelf.c:1776
+#: readelf.c:1846
 msgid "CORE (Core file)"
 msgstr ""
 
-#: readelf.c:1780
+#: readelf.c:1850
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr ""
 
-#: readelf.c:1782
+#: readelf.c:1852
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr ""
 
-#: readelf.c:1784 readelf.c:3068
+#: readelf.c:1854 readelf.c:3122
 #, c-format
 msgid "<unknown>: %x"
 msgstr ""
 
-#: readelf.c:1796
+#: readelf.c:1866
 msgid "None"
 msgstr ""
 
-#: readelf.c:1964
+#: readelf.c:2034
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr ""
 
-#: readelf.c:2150
+#: readelf.c:2220
 msgid ", <unknown>"
 msgstr ""
 
-#: readelf.c:2236 readelf.c:7428
+#: readelf.c:2291 readelf.c:7145
 msgid "unknown"
 msgstr ""
 
-#: readelf.c:2237
+#: readelf.c:2292
 msgid "unknown mac"
 msgstr ""
 
-#: readelf.c:2301
+#: readelf.c:2356
 msgid ", relocatable"
 msgstr ""
 
-#: readelf.c:2304
+#: readelf.c:2359
 msgid ", relocatable-lib"
 msgstr ""
 
-#: readelf.c:2327
+#: readelf.c:2382
 msgid ", unknown v850 architecture variant"
 msgstr ""
 
-#: readelf.c:2384
+#: readelf.c:2438
 msgid ", unknown CPU"
 msgstr ""
 
-#: readelf.c:2399
+#: readelf.c:2453
 msgid ", unknown ABI"
 msgstr ""
 
-#: readelf.c:2419 readelf.c:2453
+#: readelf.c:2473 readelf.c:2507
 msgid ", unknown ISA"
 msgstr ""
 
-#: readelf.c:2626
+#: readelf.c:2680
 msgid "Standalone App"
 msgstr ""
 
-#: readelf.c:2635
+#: readelf.c:2689
 msgid "Bare-metal C6000"
 msgstr ""
 
-#: readelf.c:2645 readelf.c:3431 readelf.c:3447
+#: readelf.c:2699 readelf.c:3462 readelf.c:3478
 #, c-format
 msgid "<unknown: %x>"
 msgstr ""
 
-#: readelf.c:3123
+#: readelf.c:3172
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr ""
 
-#: readelf.c:3124
+#: readelf.c:3173
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr ""
 
-#: readelf.c:3125
+#: readelf.c:3174
 #, c-format
 msgid ""
 " Options are:\n"
@@ -4820,26 +4048,18 @@ msgid ""
 "  -w[lLiaprmfFsoRt] or\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 
-#: readelf.c:3157
-#, c-format
-msgid ""
-"  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"  --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                         or deeper\n"
-msgstr ""
-
-#: readelf.c:3162
+#: readelf.c:3207
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
 "                         Disassemble the contents of section <number|name>\n"
 msgstr ""
 
-#: readelf.c:3166
+#: readelf.c:3211
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -4849,408 +4069,405 @@ msgid ""
 "  -v --version           Display the version number of readelf\n"
 msgstr ""
 
-#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
+#: readelf.c:3240 readelf.c:3269 readelf.c:3273 readelf.c:13224
 msgid "Out of memory allocating dump request table.\n"
 msgstr ""
 
-#: readelf.c:3400
+#: readelf.c:3431
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr ""
 
-#: readelf.c:3415
+#: readelf.c:3446
 msgid "Nothing to do.\n"
 msgstr ""
 
-#: readelf.c:3427 readelf.c:3443 readelf.c:8013
+#: readelf.c:3458 readelf.c:3474 readelf.c:7730
 msgid "none"
 msgstr ""
 
-#: readelf.c:3444
+#: readelf.c:3475
 msgid "2's complement, little endian"
 msgstr ""
 
-#: readelf.c:3445
+#: readelf.c:3476
 msgid "2's complement, big endian"
 msgstr ""
 
-#: readelf.c:3463
+#: readelf.c:3494
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
 msgstr ""
 
-#: readelf.c:3473
+#: readelf.c:3504
 #, c-format
 msgid "ELF Header:\n"
 msgstr ""
 
-#: readelf.c:3474
+#: readelf.c:3505
 #, c-format
 msgid "  Magic:   "
 msgstr ""
 
-#: readelf.c:3478
+#: readelf.c:3509
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr ""
 
-#: readelf.c:3480
+#: readelf.c:3511
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr ""
 
-#: readelf.c:3482
+#: readelf.c:3513
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr ""
 
-#: readelf.c:3487
+#: readelf.c:3518
 #, c-format
 msgid "<unknown: %lx>"
 msgstr ""
 
-#: readelf.c:3489
+#: readelf.c:3520
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr ""
 
-#: readelf.c:3491
+#: readelf.c:3522
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr ""
 
-#: readelf.c:3493
+#: readelf.c:3524
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr ""
 
-#: readelf.c:3495
+#: readelf.c:3526
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr ""
 
-#: readelf.c:3497
+#: readelf.c:3528
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr ""
 
-#: readelf.c:3500
+#: readelf.c:3531
 #, c-format
 msgid "  Entry point address:               "
 msgstr ""
 
-#: readelf.c:3502
+#: readelf.c:3533
 #, c-format
 msgid ""
 "\n"
 "  Start of program headers:          "
 msgstr ""
 
-#: readelf.c:3504
+#: readelf.c:3535
 #, c-format
 msgid ""
 " (bytes into file)\n"
 "  Start of section headers:          "
 msgstr ""
 
-#: readelf.c:3506
+#: readelf.c:3537
 #, c-format
 msgid " (bytes into file)\n"
 msgstr ""
 
-#: readelf.c:3508
+#: readelf.c:3539
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr ""
 
-#: readelf.c:3511
+#: readelf.c:3542
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr ""
 
-#: readelf.c:3513
+#: readelf.c:3544
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr ""
 
-#: readelf.c:3515
+#: readelf.c:3546
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr ""
 
-#: readelf.c:3522
+#: readelf.c:3551
+#, c-format
+msgid " (%ld)"
+msgstr ""
+
+#: readelf.c:3553
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr ""
 
-#: readelf.c:3524
+#: readelf.c:3555
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr ""
 
-#: readelf.c:3529
+#: readelf.c:3560
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr ""
 
-#: readelf.c:3536
+#: readelf.c:3567
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr ""
 
-#: readelf.c:3570 readelf.c:3604
+#: readelf.c:3601 readelf.c:3635
 msgid "program headers"
 msgstr ""
 
-#: readelf.c:3671
-msgid "possibly corrupt ELF header - it has a non-zero program header offset, but no program headers"
-msgstr ""
-
-#: readelf.c:3674
+#: readelf.c:3701
 #, c-format
 msgid ""
 "\n"
 "There are no program headers in this file.\n"
 msgstr ""
 
-#: readelf.c:3680
+#: readelf.c:3707
 #, c-format
 msgid ""
 "\n"
 "Elf file type is %s\n"
 msgstr ""
 
-#: readelf.c:3681
+#: readelf.c:3708
 #, c-format
 msgid "Entry point "
 msgstr ""
 
-#: readelf.c:3683
+#: readelf.c:3710
 #, c-format
 msgid ""
 "\n"
 "There are %d program headers, starting at offset "
 msgstr ""
 
-#: readelf.c:3695 readelf.c:3697
+#: readelf.c:3722 readelf.c:3724
 #, c-format
 msgid ""
 "\n"
 "Program Headers:\n"
 msgstr ""
 
-#: readelf.c:3701
+#: readelf.c:3728
 #, c-format
 msgid "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr ""
 
-#: readelf.c:3704
+#: readelf.c:3731
 #, c-format
 msgid "  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
 msgstr ""
 
-#: readelf.c:3708
+#: readelf.c:3735
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr ""
 
-#: readelf.c:3710
+#: readelf.c:3737
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
 msgstr ""
 
-#: readelf.c:3803
+#: readelf.c:3830
 msgid "more than one dynamic segment\n"
 msgstr ""
 
-#: readelf.c:3822
+#: readelf.c:3849
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr ""
 
-#: readelf.c:3837
+#: readelf.c:3864
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr ""
 
-#: readelf.c:3840
+#: readelf.c:3867
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr ""
 
-#: readelf.c:3848
+#: readelf.c:3875
 msgid "Unable to find program interpreter name\n"
 msgstr ""
 
-#: readelf.c:3855
+#: readelf.c:3882
 msgid "Internal error: failed to create format string to display program interpreter\n"
 msgstr ""
 
-#: readelf.c:3859
+#: readelf.c:3886
 msgid "Unable to read program interpreter name\n"
 msgstr ""
 
-#: readelf.c:3862
+#: readelf.c:3889
 #, c-format
 msgid ""
 "\n"
 "      [Requesting program interpreter: %s]"
 msgstr ""
 
-#: readelf.c:3874
+#: readelf.c:3901
 #, c-format
 msgid ""
 "\n"
 " Section to Segment mapping:\n"
 msgstr ""
 
-#: readelf.c:3875
+#: readelf.c:3902
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr ""
 
-#: readelf.c:3911
+#: readelf.c:3938
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr ""
 
-#: readelf.c:3927
+#: readelf.c:3954
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr ""
 
-#: readelf.c:3942 readelf.c:3985
+#: readelf.c:3969 readelf.c:4012
 msgid "section headers"
 msgstr ""
 
-#: readelf.c:4032 readelf.c:4107
+#: readelf.c:4059 readelf.c:4134
 msgid "sh_entsize is zero\n"
 msgstr ""
 
-#: readelf.c:4040 readelf.c:4115
+#: readelf.c:4067 readelf.c:4142
 msgid "Invalid sh_entsize\n"
 msgstr ""
 
-#: readelf.c:4045 readelf.c:4120
+#: readelf.c:4072 readelf.c:4147
 msgid "symbols"
 msgstr ""
 
-#: readelf.c:4057 readelf.c:4132
+#: readelf.c:4084 readelf.c:4159
 msgid "symtab shndx"
 msgstr ""
 
-#: readelf.c:4392
+#: readelf.c:4419
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr ""
 
-#: readelf.c:4414
-msgid "possibly corrupt ELF file header - it has a non-zero section header offset, but no section headers\n"
-msgstr ""
-
-#: readelf.c:4417
+#: readelf.c:4440 readelf.c:4920
 #, c-format
 msgid ""
 "\n"
 "There are no sections in this file.\n"
 msgstr ""
 
-#: readelf.c:4423
+#: readelf.c:4446
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr ""
 
-#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
-#: readelf.c:7036 readelf.c:9132
+#: readelf.c:4467 readelf.c:5043 readelf.c:5454 readelf.c:5760 readelf.c:6173
+#: readelf.c:6754 readelf.c:8843
 msgid "string table"
 msgstr ""
 
-#: readelf.c:4511
+#: readelf.c:4534
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr ""
 
-#: readelf.c:4531
+#: readelf.c:4554
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr ""
 
-#: readelf.c:4544
+#: readelf.c:4567
 msgid "File contains multiple dynamic string tables\n"
 msgstr ""
 
-#: readelf.c:4550
+#: readelf.c:4573
 msgid "dynamic strings"
 msgstr ""
 
-#: readelf.c:4557
+#: readelf.c:4580
 msgid "File contains multiple symtab shndx tables\n"
 msgstr ""
 
-#: readelf.c:4627
+#: readelf.c:4648
 #, c-format
 msgid ""
 "\n"
 "Section Headers:\n"
 msgstr ""
 
-#: readelf.c:4629
+#: readelf.c:4650
 #, c-format
 msgid ""
 "\n"
 "Section Header:\n"
 msgstr ""
 
-#: readelf.c:4635 readelf.c:4646 readelf.c:4657
+#: readelf.c:4656 readelf.c:4667 readelf.c:4678
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr ""
 
-#: readelf.c:4636
+#: readelf.c:4657
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4640
+#: readelf.c:4661
 #, c-format
 msgid "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4647
+#: readelf.c:4668
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4651
+#: readelf.c:4672
 #, c-format
 msgid "  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4658
+#: readelf.c:4679
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr ""
 
-#: readelf.c:4659
+#: readelf.c:4680
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr ""
 
-#: readelf.c:4663
+#: readelf.c:4684
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr ""
 
-#: readelf.c:4664
+#: readelf.c:4685
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr ""
 
-#: readelf.c:4669
+#: readelf.c:4690
 #, c-format
 msgid "       Flags\n"
 msgstr ""
 
-#: readelf.c:4748
+#: readelf.c:4769
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr ""
 
-#: readelf.c:4847
+#: readelf.c:4868
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5259,7 +4476,7 @@ msgid ""
 "  O (extra OS processing required) o (OS specific), p (processor specific)\n"
 msgstr ""
 
-#: readelf.c:4852
+#: readelf.c:4873
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5268,830 +4485,819 @@ msgid ""
 "  O (extra OS processing required) o (OS specific), p (processor specific)\n"
 msgstr ""
 
-#: readelf.c:4874
+#: readelf.c:4895
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr ""
 
-#: readelf.c:4899
-#, c-format
-msgid ""
-"\n"
-"There are no sections to group in this file.\n"
-msgstr ""
-
-#: readelf.c:4906
+#: readelf.c:4927
 msgid "Section headers are not available!\n"
 msgstr ""
 
-#: readelf.c:4930
+#: readelf.c:4951
 #, c-format
 msgid ""
 "\n"
 "There are no section groups in this file.\n"
 msgstr ""
 
-#: readelf.c:4967
+#: readelf.c:4988
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
 msgstr ""
 
-#: readelf.c:4981
+#: readelf.c:5002
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr ""
 
-#: readelf.c:4992
+#: readelf.c:5013
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr ""
 
-#: readelf.c:5031
+#: readelf.c:5052
 msgid "section data"
 msgstr ""
 
-#: readelf.c:5040
+#: readelf.c:5061
 #, c-format
 msgid ""
 "\n"
 "%sgroup section [%5u] `%s' [%s] contains %u sections:\n"
 msgstr ""
 
-#: readelf.c:5043
+#: readelf.c:5064
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr ""
 
-#: readelf.c:5057
+#: readelf.c:5078
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr ""
 
-#: readelf.c:5066
+#: readelf.c:5087
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr ""
 
-#: readelf.c:5079
+#: readelf.c:5100
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr ""
 
-#: readelf.c:5146
+#: readelf.c:5167
 msgid "dynamic section image fixups"
 msgstr ""
 
-#: readelf.c:5158
+#: readelf.c:5179
 #, c-format
 msgid ""
 "\n"
 "Image fixups for needed library #%d: %s - ident: %lx\n"
 msgstr ""
 
-#: readelf.c:5161
+#: readelf.c:5182
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr ""
 
-#: readelf.c:5193
+#: readelf.c:5214
 msgid "dynamic section image relas"
 msgstr ""
 
-#: readelf.c:5197
+#: readelf.c:5218
 #, c-format
 msgid ""
 "\n"
 "Image relocs\n"
 msgstr ""
 
-#: readelf.c:5199
+#: readelf.c:5220
 #, c-format
 msgid "Seg Offset   Type                            Addend            Seg Sym Off\n"
 msgstr ""
 
-#: readelf.c:5254
+#: readelf.c:5275
 msgid "dynamic string section"
 msgstr ""
 
-#: readelf.c:5355
+#: readelf.c:5376
 #, c-format
 msgid ""
 "\n"
 "'%s' relocation section at offset 0x%lx contains %ld bytes:\n"
 msgstr ""
 
-#: readelf.c:5370
+#: readelf.c:5391
 #, c-format
 msgid ""
 "\n"
 "There are no dynamic relocations in this file.\n"
 msgstr ""
 
-#: readelf.c:5394
+#: readelf.c:5415
 #, c-format
 msgid ""
 "\n"
 "Relocation section "
 msgstr ""
 
-#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#: readelf.c:5420 readelf.c:5836 readelf.c:5851 readelf.c:6188
 #, c-format
 msgid "'%s'"
 msgstr ""
 
-#: readelf.c:5401 readelf.c:5832 readelf.c:6169
+#: readelf.c:5422 readelf.c:5853 readelf.c:6190
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:5452
+#: readelf.c:5473
 #, c-format
 msgid ""
 "\n"
 "There are no relocations in this file.\n"
 msgstr ""
 
-#: readelf.c:5590
+#: readelf.c:5611
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr ""
 
-#: readelf.c:5643 readelf.c:6016
+#: readelf.c:5664 readelf.c:6037
 msgid "unwind table"
 msgstr ""
 
-#: readelf.c:5685 readelf.c:6098 readelf.c:6358
+#: readelf.c:5706 readelf.c:6119 readelf.c:6365
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr ""
 
-#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
+#: readelf.c:5768 readelf.c:6181 readelf.c:6762 readelf.c:6808
 #, c-format
 msgid ""
 "\n"
 "There are no unwind sections in this file.\n"
 msgstr ""
 
-#: readelf.c:5810
+#: readelf.c:5831
 #, c-format
 msgid ""
 "\n"
 "Could not find unwind info section for "
 msgstr ""
 
-#: readelf.c:5823
+#: readelf.c:5844
 msgid "unwind info"
 msgstr ""
 
-#: readelf.c:5825 readelf.c:6166
+#: readelf.c:5846 readelf.c:6187
 #, c-format
 msgid ""
 "\n"
 "Unwind section "
 msgstr ""
 
-#: readelf.c:6275
+#: readelf.c:6296
 msgid "unwind data"
 msgstr ""
 
-#: readelf.c:6329
+#: readelf.c:6350
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
 msgstr ""
 
-#: readelf.c:6433
+#: readelf.c:6426
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr ""
 
-#: readelf.c:6477 readelf.c:6677
+#: readelf.c:6429
 #, c-format
-msgid "Refuse to unwind"
+msgid "0x%02x "
 msgstr ""
 
-#: readelf.c:6500
+#: readelf.c:6451
 #, c-format
-msgid "     [Reserved]"
+msgid "  Personality routine: "
 msgstr ""
 
-#: readelf.c:6528
+#: readelf.c:6469
 #, c-format
-msgid "     finish"
+msgid "  [Truncated data]\n"
 msgstr ""
 
-#: readelf.c:6533 readelf.c:6619
+#: readelf.c:6484
 #, c-format
-msgid "[Spare]"
+msgid "  [reserved compact index %d]\n"
 msgstr ""
 
-#: readelf.c:6640 readelf.c:6774
+#: readelf.c:6488
 #, c-format
-msgid "     [unsupported opcode]"
+msgid "  Compact model %d\n"
 msgstr ""
 
-#: readelf.c:6666
+#: readelf.c:6515
 #, c-format
 msgid "  0x%02x "
 msgstr ""
 
-#: readelf.c:6671
+#: readelf.c:6520
 #, c-format
-msgid "     sp = sp + %d"
+msgid "     vsp = vsp + %d"
 msgstr ""
 
-#: readelf.c:6724
+#: readelf.c:6525
 #, c-format
-msgid "pop frame {"
+msgid "     vsp = vsp - %d"
 msgstr ""
 
-#: readelf.c:6735
-msgid "[pad]"
-msgstr ""
-
-#: readelf.c:6763
+#: readelf.c:6531
 #, c-format
-msgid "sp = sp + %ld"
+msgid "Refuse to unwind"
 msgstr ""
 
-#: readelf.c:6821
+#: readelf.c:6554
 #, c-format
-msgid "  Personality routine: "
+msgid "     [Reserved]"
 msgstr ""
 
-#: readelf.c:6839
+#: readelf.c:6556
 #, c-format
-msgid "  [Truncated data]\n"
+msgid "     vsp = r%d"
 msgstr ""
 
-#: readelf.c:6854
+#: readelf.c:6581
 #, c-format
-msgid "  Compact model %d\n"
+msgid "     finish"
 msgstr ""
 
-#: readelf.c:6890
+#: readelf.c:6586
 #, c-format
-msgid "  Restore stack from frame pointer\n"
+msgid "[Spare]"
 msgstr ""
 
-#: readelf.c:6892
+#: readelf.c:6620
 #, c-format
-msgid "  Stack increment %d\n"
+msgid "vsp = vsp + %ld"
 msgstr ""
 
-#: readelf.c:6893
+#: readelf.c:6627
 #, c-format
-msgid "  Registers restored: "
+msgid "[unsupported two-byte opcode]"
 msgstr ""
 
-#: readelf.c:6898
+#: readelf.c:6631
 #, c-format
-msgid "  Return register: %s\n"
+msgid "     [unsupported opcode]"
 msgstr ""
 
-#: readelf.c:6981
+#: readelf.c:6715
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr ""
 
-#: readelf.c:7050
+#: readelf.c:6768
 #, c-format
 msgid ""
 "\n"
 "Unwind table index '%s' at offset 0x%lx contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:7102
+#: readelf.c:6819
 #, c-format
 msgid "NONE\n"
 msgstr ""
 
-#: readelf.c:7128
+#: readelf.c:6845
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr "Интерфей� вер�и�: %s\n"
 
-#: readelf.c:7130
+#: readelf.c:6847
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr ""
 
-#: readelf.c:7143
+#: readelf.c:6860
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr ""
 
-#: readelf.c:7320 readelf.c:7366
+#: readelf.c:7037 readelf.c:7083
 msgid "dynamic section"
 msgstr ""
 
-#: readelf.c:7444
+#: readelf.c:7161
 #, c-format
 msgid ""
 "\n"
 "There is no dynamic section in this file.\n"
 msgstr ""
 
-#: readelf.c:7482
+#: readelf.c:7199
 msgid "Unable to seek to end of file!\n"
 msgstr ""
 
-#: readelf.c:7495
+#: readelf.c:7212
 msgid "Unable to determine the number of symbols to load\n"
 msgstr ""
 
-#: readelf.c:7530
+#: readelf.c:7247
 msgid "Unable to seek to end of file\n"
 msgstr ""
 
-#: readelf.c:7537
+#: readelf.c:7254
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr ""
 
-#: readelf.c:7543
+#: readelf.c:7260
 msgid "dynamic string table"
 msgstr ""
 
-#: readelf.c:7580
+#: readelf.c:7297
 msgid "symbol information"
 msgstr ""
 
-#: readelf.c:7605
+#: readelf.c:7322
 #, c-format
 msgid ""
 "\n"
 "Dynamic section at offset 0x%lx contains %u entries:\n"
 msgstr ""
 
-#: readelf.c:7608
+#: readelf.c:7325
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr ""
 
-#: readelf.c:7644
+#: readelf.c:7361
 #, c-format
 msgid "Auxiliary library"
 msgstr ""
 
-#: readelf.c:7648
+#: readelf.c:7365
 #, c-format
 msgid "Filter library"
 msgstr ""
 
-#: readelf.c:7652
+#: readelf.c:7369
 #, c-format
 msgid "Configuration file"
 msgstr ""
 
-#: readelf.c:7656
+#: readelf.c:7373
 #, c-format
 msgid "Dependency audit library"
 msgstr ""
 
-#: readelf.c:7660
+#: readelf.c:7377
 #, c-format
 msgid "Audit library"
 msgstr ""
 
-#: readelf.c:7678 readelf.c:7706 readelf.c:7734
+#: readelf.c:7395 readelf.c:7423 readelf.c:7451
 #, c-format
 msgid "Flags:"
 msgstr ""
 
-#: readelf.c:7681 readelf.c:7709 readelf.c:7736
+#: readelf.c:7398 readelf.c:7426 readelf.c:7453
 #, c-format
 msgid " None\n"
 msgstr ""
 
-#: readelf.c:7857
+#: readelf.c:7574
 #, c-format
 msgid "Shared library: [%s]"
 msgstr ""
 
-#: readelf.c:7860
+#: readelf.c:7577
 #, c-format
 msgid " program interpreter"
 msgstr ""
 
-#: readelf.c:7864
+#: readelf.c:7581
 #, c-format
 msgid "Library soname: [%s]"
 msgstr ""
 
-#: readelf.c:7868
+#: readelf.c:7585
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr ""
 
-#: readelf.c:7872
+#: readelf.c:7589
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr ""
 
-#: readelf.c:7905
+#: readelf.c:7622
 #, c-format
 msgid " (bytes)\n"
 msgstr ""
 
-#: readelf.c:7935
+#: readelf.c:7652
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr ""
 
-#: readelf.c:8035
+#: readelf.c:7752
 msgid "| <unknown>"
 msgstr ""
 
-#: readelf.c:8068
+#: readelf.c:7785
 #, c-format
 msgid ""
 "\n"
 "Version definition section '%s' contains %u entries:\n"
 msgstr ""
 
-#: readelf.c:8071
+#: readelf.c:7788
 #, c-format
 msgid "  Addr: 0x"
 msgstr ""
 
-#: readelf.c:8073 readelf.c:8191 readelf.c:8332
+#: readelf.c:7790 readelf.c:7908 readelf.c:8046
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr ""
 
-#: readelf.c:8081
+#: readelf.c:7798
 msgid "version definition section"
 msgstr ""
 
-#: readelf.c:8114
+#: readelf.c:7831
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr ""
 
-#: readelf.c:8117
+#: readelf.c:7834
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr ""
 
-#: readelf.c:8133
+#: readelf.c:7850
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: readelf.c:8135
+#: readelf.c:7852
 #, c-format
 msgid "Name index: %ld\n"
 msgstr ""
 
-#: readelf.c:8157
+#: readelf.c:7874
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr ""
 
-#: readelf.c:8160
+#: readelf.c:7877
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr ""
 
-#: readelf.c:8165
+#: readelf.c:7882
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr ""
 
-#: readelf.c:8171
+#: readelf.c:7888
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr ""
 
-#: readelf.c:8186
+#: readelf.c:7903
 #, c-format
 msgid ""
 "\n"
 "Version needs section '%s' contains %u entries:\n"
 msgstr ""
 
-#: readelf.c:8189
+#: readelf.c:7906
 #, c-format
 msgid " Addr: 0x"
 msgstr ""
 
-#: readelf.c:8200
+#: readelf.c:7917
 msgid "version need section"
 msgstr ""
 
-#: readelf.c:8228
+#: readelf.c:7945
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr ""
 
-#: readelf.c:8231
+#: readelf.c:7948
 #, c-format
 msgid "  File: %s"
 msgstr ""
 
-#: readelf.c:8233
+#: readelf.c:7950
 #, c-format
 msgid "  File: %lx"
 msgstr ""
 
-#: readelf.c:8235
+#: readelf.c:7952
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr ""
 
-#: readelf.c:8260
+#: readelf.c:7977
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr ""
 
-#: readelf.c:8263
+#: readelf.c:7980
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr ""
 
-#: readelf.c:8266
+#: readelf.c:7983
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr ""
 
-#: readelf.c:8278
+#: readelf.c:7995
 #, c-format
 msgid "  Version need aux past end of section\n"
 msgstr ""
 
-#: readelf.c:8283
+#: readelf.c:8000
 #, c-format
 msgid "  Version need past end of section\n"
 msgstr ""
 
-#: readelf.c:8320
+#: readelf.c:8037
 msgid "version string table"
 msgstr ""
 
-#: readelf.c:8327
+#: readelf.c:8041
 #, c-format
 msgid ""
 "\n"
 "Version symbols section '%s' contains %d entries:\n"
 msgstr ""
 
-#: readelf.c:8330
+#: readelf.c:8044
 #, c-format
 msgid " Addr: "
 msgstr ""
 
-#: readelf.c:8341
+#: readelf.c:8055
 msgid "version symbol data"
 msgstr ""
 
-#: readelf.c:8369
+#: readelf.c:8082
 msgid "   0 (*local*)    "
 msgstr ""
 
-#: readelf.c:8373
+#: readelf.c:8086
 msgid "   1 (*global*)   "
 msgstr ""
 
-#: readelf.c:8386
+#: readelf.c:8099
 msgid "invalid index into symbol array\n"
 msgstr ""
 
-#: readelf.c:8420 readelf.c:9199
+#: readelf.c:8133 readelf.c:8910
 msgid "version need"
 msgstr ""
 
-#: readelf.c:8430
+#: readelf.c:8143
 msgid "version need aux (2)"
 msgstr ""
 
-#: readelf.c:8445 readelf.c:8500
+#: readelf.c:8158 readelf.c:8213
 msgid "*invalid*"
 msgstr "*неправилен*"
 
-#: readelf.c:8475 readelf.c:9264
+#: readelf.c:8188 readelf.c:8975
 msgid "version def"
 msgstr ""
 
-#: readelf.c:8495 readelf.c:9279
+#: readelf.c:8208 readelf.c:8990
 msgid "version def aux"
 msgstr ""
 
-#: readelf.c:8529
+#: readelf.c:8242
 #, c-format
 msgid ""
 "\n"
 "No version information found in this file.\n"
 msgstr ""
 
-#: readelf.c:8728
+#: readelf.c:8441
 #, c-format
 msgid "<other>: %x"
 msgstr ""
 
-#: readelf.c:8789
+#: readelf.c:8500
 msgid "Unable to read in dynamic data\n"
 msgstr ""
 
-#: readelf.c:8839
+#: readelf.c:8550
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr ""
 
-#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
+#: readelf.c:8593 readelf.c:8645 readelf.c:8669 readelf.c:8699 readelf.c:8723
 msgid "Unable to seek to start of dynamic information\n"
 msgstr ""
 
-#: readelf.c:8888 readelf.c:8940
+#: readelf.c:8599 readelf.c:8651
 msgid "Failed to read in number of buckets\n"
 msgstr ""
 
-#: readelf.c:8894
+#: readelf.c:8605
 msgid "Failed to read in number of chains\n"
 msgstr ""
 
-#: readelf.c:8996
+#: readelf.c:8707
 msgid "Failed to determine last chain length\n"
 msgstr ""
 
-#: readelf.c:9040
+#: readelf.c:8751
 #, c-format
 msgid ""
 "\n"
 "Symbol table for image:\n"
 msgstr ""
 
-#: readelf.c:9042 readelf.c:9060
+#: readelf.c:8753 readelf.c:8771
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9044 readelf.c:9062
+#: readelf.c:8755 readelf.c:8773
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9058
+#: readelf.c:8769
 #, c-format
 msgid ""
 "\n"
 "Symbol table of `.gnu.hash' for image:\n"
 msgstr ""
 
-#: readelf.c:9101
+#: readelf.c:8812
 #, c-format
 msgid ""
 "\n"
 "Symbol table '%s' has a sh_entsize of zero!\n"
 msgstr ""
 
-#: readelf.c:9106
+#: readelf.c:8817
 #, c-format
 msgid ""
 "\n"
 "Symbol table '%s' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:9111
+#: readelf.c:8822
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9113
+#: readelf.c:8824
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9170
+#: readelf.c:8881
 msgid "version data"
 msgstr ""
 
-#: readelf.c:9212
+#: readelf.c:8923
 msgid "version need aux (3)"
 msgstr ""
 
-#: readelf.c:9239
+#: readelf.c:8950
 msgid "bad dynamic symbol\n"
 msgstr ""
 
-#: readelf.c:9303
+#: readelf.c:9014
 #, c-format
 msgid ""
 "\n"
 "Dynamic symbol information is not available for displaying symbols.\n"
 msgstr ""
 
-#: readelf.c:9315
+#: readelf.c:9026
 #, c-format
 msgid ""
 "\n"
 "Histogram for bucket list length (total of %lu buckets):\n"
 msgstr ""
 
-#: readelf.c:9317 readelf.c:9387
+#: readelf.c:9028 readelf.c:9098
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr ""
 
-#: readelf.c:9385
+#: readelf.c:9096
 #, c-format
 msgid ""
 "\n"
 "Histogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"
 msgstr ""
 
-#: readelf.c:9451
+#: readelf.c:9162
 #, c-format
 msgid ""
 "\n"
 "Dynamic info segment at offset 0x%lx contains %d entries:\n"
 msgstr ""
 
-#: readelf.c:9454
+#: readelf.c:9165
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr ""
 
-#: readelf.c:9463
+#: readelf.c:9174
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr ""
 
-#: readelf.c:9545
+#: readelf.c:9256
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
 msgstr ""
 
-#: readelf.c:9705
+#: readelf.c:9416
 #, c-format
 msgid "Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"
 msgstr ""
 
-#: readelf.c:10009
+#: readelf.c:9720
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
 msgstr ""
 
-#: readelf.c:10017
+#: readelf.c:9728
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
 msgstr ""
 
-#: readelf.c:10041
+#: readelf.c:9752
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
 msgstr ""
 
-#: readelf.c:10087
+#: readelf.c:9798
 #, c-format
 msgid ""
 "\n"
 "Assembly dump of section %s\n"
 msgstr ""
 
-#: readelf.c:10108
+#: readelf.c:9819
 #, c-format
 msgid ""
 "\n"
 "Section '%s' has no data to dump.\n"
 msgstr ""
 
-#: readelf.c:10114
+#: readelf.c:9825
 msgid "section contents"
 msgstr ""
 
-#: readelf.c:10133
+#: readelf.c:9844
 #, c-format
 msgid ""
 "\n"
 "String dump of section '%s':\n"
 msgstr ""
 
-#: readelf.c:10151
+#: readelf.c:9862
 #, c-format
 msgid "  Note: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr ""
 
-#: readelf.c:10182
+#: readelf.c:9893
 #, c-format
 msgid "  No strings found in this section."
 msgstr ""
 
-#: readelf.c:10204
+#: readelf.c:9915
 #, c-format
 msgid ""
 "\n"
 "Hex dump of section '%s':\n"
 msgstr ""
 
-#: readelf.c:10228
+#: readelf.c:9939
 #, c-format
 msgid " NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr ""
 
-#: readelf.c:10362
+#: readelf.c:10073
 #, c-format
 msgid "%s section data"
 msgstr ""
 
-#: readelf.c:10427
+#: readelf.c:10138
 #, c-format
 msgid ""
 "\n"
@@ -6102,381 +5308,391 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10436
+#: readelf.c:10147
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
 msgstr ""
 
-#: readelf.c:10472
+#: readelf.c:10183
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr ""
 
-#: readelf.c:10500
+#: readelf.c:10211
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr ""
 
-#: readelf.c:10541
+#: readelf.c:10252
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr ""
 
-#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
+#: readelf.c:10430 readelf.c:10444 readelf.c:10463 readelf.c:10781
 #, c-format
 msgid "None\n"
 msgstr ""
 
-#: readelf.c:10720
+#: readelf.c:10431
 #, c-format
 msgid "Application\n"
 msgstr ""
 
-#: readelf.c:10721
+#: readelf.c:10432
 #, c-format
 msgid "Realtime\n"
 msgstr ""
 
-#: readelf.c:10722
+#: readelf.c:10433
 #, c-format
 msgid "Microcontroller\n"
 msgstr ""
 
-#: readelf.c:10723
+#: readelf.c:10434
 #, c-format
 msgid "Application or Realtime\n"
 msgstr ""
 
-#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
-#: readelf.c:11217 readelf.c:11238
+#: readelf.c:10445 readelf.c:10465 readelf.c:10835 readelf.c:10853
+#: readelf.c:10928 readelf.c:10949
 #, c-format
 msgid "8-byte\n"
 msgstr ""
 
-#: readelf.c:10735 readelf.c:11220 readelf.c:11241
+#: readelf.c:10446 readelf.c:10931 readelf.c:10952
 #, c-format
 msgid "4-byte\n"
 msgstr ""
 
-#: readelf.c:10739 readelf.c:10758
+#: readelf.c:10450 readelf.c:10469
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr ""
 
-#: readelf.c:10753
+#: readelf.c:10464
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr ""
 
-#: readelf.c:10769 readelf.c:10859 readelf.c:11256
+#: readelf.c:10480 readelf.c:10570 readelf.c:10967
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr ""
 
-#: readelf.c:10775
+#: readelf.c:10486
 #, c-format
 msgid "True\n"
 msgstr ""
 
-#: readelf.c:10904 readelf.c:11008
+#: readelf.c:10615 readelf.c:10719
 #, c-format
 msgid "Hard or soft float\n"
 msgstr ""
 
-#: readelf.c:10907
+#: readelf.c:10618
 #, c-format
 msgid "Hard float\n"
 msgstr ""
 
-#: readelf.c:10910 readelf.c:11017
+#: readelf.c:10621 readelf.c:10728
 #, c-format
 msgid "Soft float\n"
 msgstr ""
 
-#: readelf.c:10913
+#: readelf.c:10624
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr ""
 
-#: readelf.c:10930 readelf.c:10956
+#: readelf.c:10641 readelf.c:10667
 #, c-format
 msgid "Any\n"
 msgstr ""
 
-#: readelf.c:10933
+#: readelf.c:10644
 #, c-format
 msgid "Generic\n"
 msgstr ""
 
-#: readelf.c:10962
+#: readelf.c:10673
 #, c-format
 msgid "Memory\n"
 msgstr ""
 
-#: readelf.c:11011
+#: readelf.c:10722
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr ""
 
-#: readelf.c:11014
+#: readelf.c:10725
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr ""
 
-#: readelf.c:11020
+#: readelf.c:10731
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr ""
 
-#: readelf.c:11103
+#: readelf.c:10814
 #, c-format
 msgid "Not used\n"
 msgstr ""
 
-#: readelf.c:11106
+#: readelf.c:10817
 #, c-format
 msgid "2 bytes\n"
 msgstr ""
 
-#: readelf.c:11109
+#: readelf.c:10820
 #, c-format
 msgid "4 bytes\n"
 msgstr ""
 
-#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
+#: readelf.c:10838 readelf.c:10856 readelf.c:10934 readelf.c:10955
 #, c-format
 msgid "16-byte\n"
 msgstr ""
 
-#: readelf.c:11160
+#: readelf.c:10871
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr ""
 
-#: readelf.c:11163
+#: readelf.c:10874
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr ""
 
-#: readelf.c:11178
+#: readelf.c:10889
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr ""
 
-#: readelf.c:11181
+#: readelf.c:10892
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr ""
 
-#: readelf.c:11184
+#: readelf.c:10895
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr ""
 
-#: readelf.c:11199
+#: readelf.c:10910
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr ""
 
-#: readelf.c:11202
+#: readelf.c:10913
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr ""
 
-#: readelf.c:11308
+#: readelf.c:11019
 msgid "attributes"
 msgstr ""
 
-#: readelf.c:11329
+#: readelf.c:11040
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr ""
 
-#: readelf.c:11335
+#: readelf.c:11046
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr ""
 
-#: readelf.c:11360
+#: readelf.c:11071
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr ""
 
-#: readelf.c:11372
+#: readelf.c:11083
 #, c-format
 msgid "File Attributes\n"
 msgstr ""
 
-#: readelf.c:11375
+#: readelf.c:11086
 #, c-format
 msgid "Section Attributes:"
 msgstr ""
 
-#: readelf.c:11378
+#: readelf.c:11089
 #, c-format
 msgid "Symbol Attributes:"
 msgstr ""
 
-#: readelf.c:11393
+#: readelf.c:11104
 #, c-format
 msgid "Unknown tag: %d\n"
 msgstr ""
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11412
+#: readelf.c:11123
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr ""
 
-#: readelf.c:11419
+#: readelf.c:11130
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr ""
 
-#: readelf.c:11463 readelf.c:11485
+#: readelf.c:11174 readelf.c:11196
 msgid "<unknown>"
 msgstr ""
 
-#: readelf.c:11580 readelf.c:12102
+#: readelf.c:11291 readelf.c:11813
 msgid "liblist"
 msgstr ""
 
-#: readelf.c:11583
+#: readelf.c:11294
 #, c-format
 msgid ""
 "\n"
 "Section '.liblist' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:11585
+#: readelf.c:11296
 msgid "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr ""
 
-#: readelf.c:11611
+#: readelf.c:11322
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr ""
 
-#: readelf.c:11616
+#: readelf.c:11327
 msgid " NONE"
 msgstr ""
 
-#: readelf.c:11667
+#: readelf.c:11378
 msgid "options"
 msgstr ""
 
-#: readelf.c:11698
+#: readelf.c:11409
 #, c-format
 msgid ""
 "\n"
 "Section '%s' contains %d entries:\n"
 msgstr ""
 
-#: readelf.c:11859
+#: readelf.c:11570
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr ""
 
-#: readelf.c:11876 readelf.c:11891
+#: readelf.c:11587 readelf.c:11602
 msgid "conflict"
 msgstr ""
 
-#: readelf.c:11901
+#: readelf.c:11612
 #, c-format
 msgid ""
 "\n"
 "Section '.conflict' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:11903
+#: readelf.c:11614
 msgid "  Num:    Index       Value  Name"
 msgstr ""
 
-#: readelf.c:11915 readelf.c:11995 readelf.c:12063
+#: readelf.c:11626 readelf.c:11706 readelf.c:11774
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr ""
 
-#: readelf.c:11936
+#: readelf.c:11647
 msgid "GOT"
 msgstr ""
 
-#: readelf.c:11937
+#: readelf.c:11648
 #, c-format
 msgid ""
 "\n"
 "Primary GOT:\n"
 msgstr ""
 
-#: readelf.c:11938
+#: readelf.c:11649
 #, c-format
 msgid " Canonical gp value: "
 msgstr ""
 
-#: readelf.c:11942 readelf.c:12034
+#: readelf.c:11653 readelf.c:11745
 #, c-format
 msgid " Reserved entries:\n"
 msgstr ""
 
-#: readelf.c:11943
+#: readelf.c:11654
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr ""
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
-#: readelf.c:12045
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688 readelf.c:11747
+#: readelf.c:11756
 msgid "Address"
 msgstr ""
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688
 msgid "Access"
 msgstr ""
 
-#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
-#: readelf.c:12046
+#: readelf.c:11656 readelf.c:11673 readelf.c:11689 readelf.c:11747
+#: readelf.c:11757
 msgid "Initial"
 msgstr ""
 
-#: readelf.c:11947
+#: readelf.c:11658
 #, c-format
 msgid " Lazy resolver\n"
 msgstr ""
 
-#: readelf.c:11953
+#: readelf.c:11664
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr ""
 
-#: readelf.c:11959
+#: readelf.c:11670
 #, c-format
 msgid " Local entries:\n"
 msgstr ""
 
-#: readelf.c:11975
+#: readelf.c:11671
+#, c-format
+msgid "  %*s %10s %*s\n"
+msgstr ""
+
+#: readelf.c:11686
 #, c-format
 msgid " Global entries:\n"
 msgstr ""
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11687
+#, c-format
+msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
+msgstr ""
+
+#: readelf.c:11690 readelf.c:11758
 msgid "Sym.Val."
 msgstr ""
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Type"
 msgstr ""
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Ndx"
 msgstr ""
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Name"
 msgstr ""
 
-#: readelf.c:12032
+#: readelf.c:11743
 msgid "PLT GOT"
 msgstr ""
 
-#: readelf.c:12033
+#: readelf.c:11744
 #, c-format
 msgid ""
 "\n"
@@ -6484,466 +5700,309 @@ msgid ""
 "\n"
 msgstr ""
 
-#: readelf.c:12035
+#: readelf.c:11746
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr ""
 
-#: readelf.c:12038
+#: readelf.c:11749
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr ""
 
-#: readelf.c:12040
+#: readelf.c:11751
 #, c-format
 msgid " Module pointer\n"
 msgstr ""
 
-#: readelf.c:12043
+#: readelf.c:11754
 #, c-format
 msgid " Entries:\n"
 msgstr ""
 
-#: readelf.c:12110
+#: readelf.c:11755
+#, c-format
+msgid "  %*s %*s %*s %-7s %3s %s\n"
+msgstr ""
+
+#: readelf.c:11821
 msgid "liblist string table"
 msgstr ""
 
-#: readelf.c:12121
+#: readelf.c:11831
 #, c-format
 msgid ""
 "\n"
 "Library list section '%s' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:12125
+#: readelf.c:11835
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr ""
 
-#: readelf.c:12175
+#: readelf.c:11884
 msgid "NT_AUXV (auxiliary vector)"
 msgstr ""
 
-#: readelf.c:12177
+#: readelf.c:11886
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr ""
 
-#: readelf.c:12179
+#: readelf.c:11888
 msgid "NT_FPREGSET (floating point registers)"
 msgstr ""
 
-#: readelf.c:12181
+#: readelf.c:11890
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr ""
 
-#: readelf.c:12183
+#: readelf.c:11892
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr ""
 
-#: readelf.c:12185
+#: readelf.c:11894
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr ""
 
-#: readelf.c:12187
+#: readelf.c:11896
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr ""
 
-#: readelf.c:12189
+#: readelf.c:11898
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr ""
 
-#: readelf.c:12191
+#: readelf.c:11900
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr ""
 
-#: readelf.c:12193
+#: readelf.c:11902
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr ""
 
-#: readelf.c:12195
+#: readelf.c:11904
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr ""
 
-#: readelf.c:12197
+#: readelf.c:11906
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr ""
 
-#: readelf.c:12199
+#: readelf.c:11908
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr ""
 
-#: readelf.c:12201
+#: readelf.c:11910
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr ""
 
-#: readelf.c:12203
+#: readelf.c:11912
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr ""
 
-#: readelf.c:12205
+#: readelf.c:11914
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr ""
 
-#: readelf.c:12207
+#: readelf.c:11916
 msgid "NT_FPREGS (floating point registers)"
 msgstr ""
 
-#: readelf.c:12209
+#: readelf.c:11918
 msgid "NT_PSINFO (psinfo structure)"
 msgstr ""
 
-#: readelf.c:12211
+#: readelf.c:11920
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr ""
 
-#: readelf.c:12213
+#: readelf.c:11922
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr ""
 
-#: readelf.c:12215
+#: readelf.c:11924
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr ""
 
-#: readelf.c:12223
+#: readelf.c:11932
 msgid "NT_VERSION (version)"
 msgstr ""
 
-#: readelf.c:12225
+#: readelf.c:11934
 msgid "NT_ARCH (architecture)"
 msgstr ""
 
-#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
-#: readelf.c:12467
+#: readelf.c:11939 readelf.c:11962 readelf.c:11984
 #, c-format
 msgid "Unknown note type: (0x%08x)"
 msgstr ""
 
-#: readelf.c:12242
+#: readelf.c:11951
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr ""
 
-#: readelf.c:12244
+#: readelf.c:11953
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
 msgstr ""
 
-#: readelf.c:12246
+#: readelf.c:11955
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
 msgstr ""
 
-#: readelf.c:12248
+#: readelf.c:11957
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr ""
 
-#: readelf.c:12266
-#, c-format
-msgid "    Build ID: "
-msgstr ""
-
-#: readelf.c:12269 readelf.c:12425
-#, c-format
-msgid "\n"
-msgstr ""
-
-#: readelf.c:12305
-#, c-format
-msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
-msgstr ""
-
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12322
+#: readelf.c:11974
 msgid "NetBSD procinfo structure"
 msgstr ""
 
-#: readelf.c:12349 readelf.c:12363
+#: readelf.c:12001 readelf.c:12015
 msgid "PT_GETREGS (reg structure)"
 msgstr ""
 
-#: readelf.c:12351 readelf.c:12365
+#: readelf.c:12003 readelf.c:12017
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr ""
 
-#: readelf.c:12371
+#: readelf.c:12023
 #, c-format
 msgid "PT_FIRSTMACH+%d"
 msgstr ""
 
-#: readelf.c:12384
-msgid "NT_STAPSDT (SystemTap probe descriptors)"
-msgstr ""
-
-#: readelf.c:12417
-#, c-format
-msgid "    Provider: %s\n"
-msgstr ""
-
-#: readelf.c:12418
-#, c-format
-msgid "    Name: %s\n"
-msgstr "     Име: %s\n"
-
-#: readelf.c:12419
-#, c-format
-msgid "    Location: "
-msgstr "       М��то: "
-
-#: readelf.c:12421
-#, c-format
-msgid ", Base: "
-msgstr ", О�нова: "
-
-#: readelf.c:12423
-#, c-format
-msgid ", Semaphore: "
-msgstr ""
-
-#: readelf.c:12426
-#, c-format
-msgid "    Arguments: %s\n"
-msgstr ""
-
-#: readelf.c:12439
-msgid "NT_VMS_MHD (module header)"
-msgstr ""
-
-#: readelf.c:12441
-msgid "NT_VMS_LNM (language name)"
-msgstr ""
-
-#: readelf.c:12443
-msgid "NT_VMS_SRC (source files)"
-msgstr ""
-
-#: readelf.c:12445
-msgid "NT_VMS_TITLE"
-msgstr ""
-
-#: readelf.c:12447
-msgid "NT_VMS_EIDC (consistency check)"
-msgstr ""
-
-#: readelf.c:12449
-msgid "NT_VMS_FPMODE (FP mode)"
-msgstr ""
-
-#: readelf.c:12451
-msgid "NT_VMS_LINKTIME"
-msgstr ""
-
-#: readelf.c:12453
-msgid "NT_VMS_IMGNAM (image name)"
-msgstr ""
-
-#: readelf.c:12455
-msgid "NT_VMS_IMGID (image id)"
-msgstr ""
-
-#: readelf.c:12457
-msgid "NT_VMS_LINKID (link id)"
-msgstr ""
-
-#: readelf.c:12459
-msgid "NT_VMS_IMGBID (build id)"
-msgstr ""
-
-#: readelf.c:12461
-msgid "NT_VMS_GSTNAM (sym table name)"
-msgstr ""
-
-#: readelf.c:12463
-msgid "NT_VMS_ORIG_DYN"
-msgstr ""
-
-#: readelf.c:12465
-msgid "NT_VMS_PATCHTIME"
-msgstr ""
-
-#: readelf.c:12481
-#, c-format
-msgid "    Creation date  : %.17s\n"
-msgstr ""
-
-#: readelf.c:12482
-#, c-format
-msgid "    Last patch date: %.17s\n"
-msgstr ""
-
-#: readelf.c:12483
-#, c-format
-msgid "    Module name    : %s\n"
-msgstr "       Име на модул: %s\n"
-
-#: readelf.c:12484
-#, c-format
-msgid "    Module version : %s\n"
-msgstr "   Вер�и� на модул : %s\n"
-
-#: readelf.c:12487
-#, c-format
-msgid "    Invalid size\n"
-msgstr ""
-
-#: readelf.c:12490
-#, c-format
-msgid "   Language: %s\n"
-msgstr ""
-
-#: readelf.c:12494
-msgid "   FP mode: 0x%016"
-msgstr ""
-
-#: readelf.c:12498
-#, c-format
-msgid "   Link time: "
-msgstr ""
-
-#: readelf.c:12504
-#, c-format
-msgid "   Patch time: "
-msgstr ""
-
-#: readelf.c:12510
-#, c-format
-msgid "   Major id: %u,  minor id: %u\n"
+#: readelf.c:12080
+msgid "notes"
 msgstr ""
 
-#: readelf.c:12513
+#: readelf.c:12086
 #, c-format
-msgid "   Manip date  : "
-msgstr ""
-
-#: readelf.c:12516
 msgid ""
 "\n"
-"   Link flags  : 0x%016"
+"Notes at offset 0x%08lx with length 0x%08lx:\n"
 msgstr ""
 
-#: readelf.c:12519
+#: readelf.c:12088
 #, c-format
-msgid "   Header flags: 0x%08x\n"
+msgid "  Owner\t\tData size\tDescription\n"
 msgstr ""
 
-#: readelf.c:12521
+#: readelf.c:12108 readelf.c:12121
 #, c-format
-msgid "   Image id    : %s\n"
+msgid "corrupt note found at offset %lx into core notes\n"
 msgstr ""
 
-#: readelf.c:12525
+#: readelf.c:12110 readelf.c:12123
 #, c-format
-msgid "    Image name: %s\n"
+msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
 msgstr ""
 
-#: readelf.c:12528
+#: readelf.c:12219
 #, c-format
-msgid "    Global symbol table name: %s\n"
+msgid "No note segments present in the core file.\n"
 msgstr ""
 
-#: readelf.c:12531
-#, c-format
-msgid "    Image id: %s\n"
+#: readelf.c:12306
+msgid ""
+"This instance of readelf has been built without support for a\n"
+"64 bit data type and so it cannot read 64 bit ELF files.\n"
 msgstr ""
 
-#: readelf.c:12534
+#: readelf.c:12353
 #, c-format
-msgid "    Linker id: %s\n"
-msgstr ""
-
-#: readelf.c:12609
-msgid "notes"
+msgid "%s: Failed to read file header\n"
 msgstr ""
 
-#: readelf.c:12615
+#: readelf.c:12366
 #, c-format
 msgid ""
 "\n"
-"Notes at offset 0x%08lx with length 0x%08lx:\n"
+"File: %s\n"
 msgstr ""
 
-#: readelf.c:12617
+#: readelf.c:12615
 #, c-format
-msgid "  %-20s %10s\tDescription\n"
+msgid "%s: the archive index is empty\n"
 msgstr ""
 
-#: readelf.c:12617
-msgid "Owner"
+#: readelf.c:12623 readelf.c:12647
+#, c-format
+msgid "%s: failed to read archive index\n"
 msgstr ""
 
-#: readelf.c:12617
-msgid "Data size"
+#: readelf.c:12632
+#, c-format
+msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
 msgstr ""
 
-#: readelf.c:12655 readelf.c:12668
-#, c-format
-msgid "corrupt note found at offset %lx into core notes\n"
+#: readelf.c:12640
+msgid "Out of memory whilst trying to read archive symbol index\n"
 msgstr ""
 
-#: readelf.c:12657 readelf.c:12670
-#, c-format
-msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
+#: readelf.c:12658
+msgid "Out of memory whilst trying to convert the archive symbol index\n"
 msgstr ""
 
-#: readelf.c:12766
+#: readelf.c:12670
 #, c-format
-msgid "No note segments present in the core file.\n"
+msgid "%s: the archive has an index but no symbols\n"
 msgstr ""
 
-#: readelf.c:12853
-msgid ""
-"This instance of readelf has been built without support for a\n"
-"64 bit data type and so it cannot read 64 bit ELF files.\n"
+#: readelf.c:12677
+msgid "Out of memory whilst trying to read archive index symbol table\n"
 msgstr ""
 
-#: readelf.c:12900
+#: readelf.c:12683
 #, c-format
-msgid "%s: Failed to read file header\n"
+msgid "%s: failed to read archive index symbol table\n"
 msgstr ""
 
-#: readelf.c:12914
+#: readelf.c:12707
 #, c-format
-msgid ""
-"\n"
-"File: %s\n"
+msgid "%s has no archive index\n"
 msgstr ""
 
-#: readelf.c:13086
+#: readelf.c:12943
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr ""
 
-#: readelf.c:13092
+#: readelf.c:12949
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr ""
 
-#: readelf.c:13110
+#: readelf.c:12967
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr ""
 
-#: readelf.c:13118
+#: readelf.c:12975
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr ""
 
-#: readelf.c:13129
+#: readelf.c:12986
 #, c-format
 msgid "%s: symbols remain in the index symbol table, but without corresponding entries in the index table\n"
 msgstr ""
 
-#: readelf.c:13134
+#: readelf.c:12991
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr ""
 
-#: readelf.c:13217 readelf.c:13300
+#: readelf.c:13074 readelf.c:13150
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr ""
 
-#: readelf.c:13239
+#: readelf.c:13096
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr ""
 
-#: readelf.c:13318
+#: readelf.c:13168
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr ""
@@ -7244,6 +6303,11 @@ msgstr ""
 msgid "can't redirect stdout: `%s': %s"
 msgstr ""
 
+#: resrc.c:284
+#, c-format
+msgid "%s %s: %s"
+msgstr ""
+
 #: resrc.c:329
 #, c-format
 msgid "can't execute `%s': %s"
@@ -7278,6 +6342,11 @@ msgstr ""
 msgid "preprocessing failed."
 msgstr ""
 
+#: resrc.c:631
+#, c-format
+msgid "%s:%d: %s\n"
+msgstr ""
+
 #: resrc.c:639
 #, c-format
 msgid "%s: unexpected EOF"
@@ -7366,12 +6435,12 @@ msgstr "�грешен аргумент за --format: %s"
 msgid "Invalid radix: %s\n"
 msgstr "Сгрешена о�нова: %s\n"
 
-#: srconv.c:1733
+#: srconv.c:1732
 #, c-format
 msgid "Convert a COFF object file into a SYSROFF object file\n"
 msgstr ""
 
-#: srconv.c:1734
+#: srconv.c:1733
 #, c-format
 msgid ""
 " The options are:\n"
@@ -7383,14 +6452,14 @@ msgid ""
 "  -v --version     Print the program's version number\n"
 msgstr ""
 
-#: srconv.c:1880
+#: srconv.c:1879
 #, c-format
 msgid "unable to open output file %s"
 msgstr ""
 
 #: stabs.c:328 stabs.c:1717
 msgid "numeric overflow"
-msgstr "челочи�лено препълване"
+msgstr ""
 
 #: stabs.c:338
 #, c-format
@@ -7400,7 +6469,7 @@ msgstr ""
 #: stabs.c:346
 #, c-format
 msgid "Warning: %s: %s\n"
-msgstr "Предупреждение: %s: %s\n"
+msgstr ""
 
 #: stabs.c:456
 #, c-format
@@ -7428,98 +6497,98 @@ msgstr ""
 msgid "missing index type"
 msgstr ""
 
-#: stabs.c:2129
+#: stabs.c:2122
 msgid "unknown virtual character for baseclass"
 msgstr ""
 
-#: stabs.c:2147
+#: stabs.c:2140
 msgid "unknown visibility character for baseclass"
 msgstr ""
 
-#: stabs.c:2337
+#: stabs.c:2326
 msgid "unnamed $vb type"
 msgstr ""
 
-#: stabs.c:2343
+#: stabs.c:2332
 msgid "unrecognized C++ abbreviation"
 msgstr ""
 
-#: stabs.c:2419
+#: stabs.c:2408
 msgid "unknown visibility character for field"
 msgstr ""
 
-#: stabs.c:2679
+#: stabs.c:2660
 msgid "const/volatile indicator missing"
 msgstr ""
 
-#: stabs.c:2924
+#: stabs.c:2896
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr ""
 
-#: stabs.c:3224
+#: stabs.c:3196
 msgid "Undefined N_EXCL"
 msgstr ""
 
-#: stabs.c:3304
+#: stabs.c:3276
 #, c-format
 msgid "Type file number %d out of range\n"
 msgstr ""
 
-#: stabs.c:3309
+#: stabs.c:3281
 #, c-format
 msgid "Type index number %d out of range\n"
 msgstr ""
 
-#: stabs.c:3388
+#: stabs.c:3360
 #, c-format
 msgid "Unrecognized XCOFF type %d\n"
-msgstr "�еразпознат XCOFF тип %d\n"
+msgstr ""
 
-#: stabs.c:3680
+#: stabs.c:3652
 #, c-format
 msgid "bad mangled name `%s'\n"
-msgstr "неправилно размазано име '%s'\n"
+msgstr ""
 
-#: stabs.c:3775
+#: stabs.c:3747
 #, c-format
 msgid "no argument types in mangled string\n"
-msgstr "лип�ва тип на аргумент в размазани� низ\n"
+msgstr ""
 
-#: stabs.c:5125
+#: stabs.c:5094
 #, c-format
 msgid "Demangled name is not a function\n"
-msgstr "Въз�тановеното име не е функци�\n"
+msgstr ""
 
-#: stabs.c:5167
+#: stabs.c:5136
 #, c-format
 msgid "Unexpected type in v3 arglist demangling\n"
-msgstr "�еочакван тип при 3-та вер. на arglist за въз�танов�ване на имена\n"
+msgstr "�еочакван тип при 3-та вер. за декориране на arglist\n"
 
-#: stabs.c:5234
+#: stabs.c:5203
 #, c-format
 msgid "Unrecognized demangle component %d\n"
-msgstr "�еразпозната ча�т при въз�танов�ване на име %d\n"
+msgstr "�еразпозната компонента за декориране %d\n"
 
-#: stabs.c:5286
+#: stabs.c:5255
 #, c-format
 msgid "Failed to print demangled template\n"
-msgstr "Пропадна извеждането на въз�тановено име на шаблон\n"
+msgstr "Пропадна извеждането на шаблон за декориране\n"
 
-#: stabs.c:5366
+#: stabs.c:5335
 #, c-format
 msgid "Couldn't get demangled builtin type\n"
-msgstr "�е можа да �е определи вградени� тип за въз�танов�ване\n"
+msgstr "�е можа да �е определи вградени� тип за декориране\n"
 
-#: stabs.c:5415
+#: stabs.c:5384
 #, c-format
 msgid "Unexpected demangled varargs\n"
-msgstr "�еочавано въз�танов�ване за \"varargs\"\n"
+msgstr "�еочавана променлива за декориране \"varargs\"\n"
 
-#: stabs.c:5422
+#: stabs.c:5391
 #, c-format
 msgid "Unrecognized demangled builtin type\n"
-msgstr "�еразпознат вграден тип за въз�танов�ване\n"
+msgstr "�еразпознат вграден тип за декориране\n"
 
 #: strings.c:186 strings.c:245
 #, c-format
@@ -7531,12 +6600,12 @@ msgstr "�грешен аргумент за ц�ло чи�ло %s"
 msgid "invalid minimum string length %d"
 msgstr "�грешена минимална дължина на низ %d"
 
-#: strings.c:651
+#: strings.c:647
 #, c-format
 msgid " Display printable strings in [file(s)] (stdin by default)\n"
 msgstr " Показва пачатимите низове в [файл/-ове] (�танд.изход по подразбиране)\n"
 
-#: strings.c:652
+#: strings.c:648
 #, c-format
 msgid ""
 " The options are:\n"
@@ -7590,8 +6659,8 @@ msgstr "не можа да �е отвори вход�щ файл %s"
 
 #: version.c:36
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "�втор�ко право 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "�втор�ко право 2010 Free Software Foundation, Inc.\n"
 
 #: version.c:37
 #, c-format
@@ -7606,8 +6675,8 @@ msgstr ""
 
 #: windmc.c:190
 #, c-format
-msgid "can't create %s file `%s' for output.\n"
-msgstr "не можа да �е �ъздаде %s файл '%s' за изход.\n"
+msgid "can't create %s file ,%s' for output.\n"
+msgstr ""
 
 #: windmc.c:198
 #, c-format
@@ -7625,7 +6694,7 @@ msgid ""
 "  -C --codepage_in=<val>       Set codepage when reading mc text file\n"
 "  -d --decimal_values          Print values to text files decimal\n"
 "  -e --extension=<extension>   Set header extension used on export header file\n"
-"  -F --target <target>         Specify output target for endianness.\n"
+"  -F --target <target>         Specify output target for endianess.\n"
 "  -h --headerdir=<directory>   Set the export directory for headers\n"
 "  -u --unicode_in              Read input file as UTF16 file\n"
 "  -U --unicode_out             Write binary messages as UFT16\n"
@@ -7656,7 +6725,7 @@ msgstr "%s: предупреждение: "
 
 #: windmc.c:262
 #, c-format
-msgid "A codepage was specified switch `%s' and UTF16.\n"
+msgid "A codepage was specified switch ,%s' and UTF16.\n"
 msgstr ""
 
 #: windmc.c:263
@@ -7670,7 +6739,7 @@ msgstr ""
 
 #: windmc.c:1116
 #, c-format
-msgid "unable to open file `%s' for input.\n"
+msgid "unable to open file ,%s' for input.\n"
 msgstr "не можа да �е отвори файл '%s' за вход.\n"
 
 #: windmc.c:1124
@@ -7695,12 +6764,12 @@ msgstr ": очаква �е директори�\n"
 #: windres.c:402
 #, c-format
 msgid ": expected to be a leaf\n"
-msgstr ": очаква �е ли�т\n"
+msgstr ""
 
 #: windres.c:413
 #, c-format
 msgid ": duplicate value\n"
-msgstr ": повторна �тойно�т\n"
+msgstr ""
 
 #: windres.c:563
 #, c-format
@@ -7716,12 +6785,12 @@ msgstr "%s: поддържани формати:"
 #: windres.c:647
 #, c-format
 msgid "can not determine type of file `%s'; use the -J option"
-msgstr "не може да �е определи типа на файла '%s'; да �е използва -J флаг"
+msgstr ""
 
 #: windres.c:659
 #, c-format
 msgid "Usage: %s [option(s)] [input-file] [output-file]\n"
-msgstr "Употреба: %s [флаг(-ове)] [вх-файл] [изх-файл]\n"
+msgstr ""
 
 #: windres.c:661
 #, c-format
@@ -7733,7 +6802,6 @@ msgid ""
 "  -O --output-format=<format>  Specify output format\n"
 "  -F --target=<target>         Specify COFF target\n"
 "     --preprocessor=<program>  Program to use to preprocess rc file\n"
-"     --preprocessor-arg=<arg>  Additional preprocessor argument\n"
 "  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n"
 "  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n"
@@ -7750,24 +6818,23 @@ msgstr ""
 "  -J --input-format=<формат>   Задава вход�щ формат\n"
 "  -O --output-format=<формат>  Задава изход�щ формат\n"
 "  -F --target=<цел>            Задава COFF резултат\n"
-"     --preprocessor=<прог>     Да �е използва прог за преработка на rc-файл\n"
-"     --preprocessor-arg=<арг>  Допълнителен аргумент за преработка\n"
-"  -I --include-dir=<дир>       Включване на директори� при преработка на на rc-файл\n"
+"     --preprocessor=<прогр>    Да �е използва прогр за преработка на rc-файл\n"
+"  -I --include-dir=<дир>       Включване на директори� пре преработка на на rc-файл\n"
 "  -D --define <име>[=<�той>]   Определ� ИМЕ при преработка на rc-файл\n"
 "  -U --undefine <име>          �е определ� ИМЕ при преработка на rc-файл\n"
 "  -v --verbose                 Подробно - уведом�ва за извършваните дей�тви�\n"
 "  -c --codepage=<codepage>     Задава кодова �траница по подразбиране\n"
 "  -l --language=<�той>         Задава езика при четене на rc-файл\n"
-"     --use-temp-file           Използва �е временен файл, вме�то popen, за прочитане\n"
+"     --use-temp-file           Използва �е чременен файл, вме�то popen, за прочитане\n"
 "                               на резултата от преработката\n"
 "     --no-use-temp-file        Използва �е popen (по подразбиране)\n"
 
-#: windres.c:679
+#: windres.c:678
 #, c-format
 msgid "     --yydebug                 Turn on parser debugging\n"
 msgstr "     --yydebug                 Включва про�лед�ване на разбора\n"
 
-#: windres.c:682
+#: windres.c:681
 #, c-format
 msgid ""
 "  -r                           Ignored for compatibility with rc\n"
@@ -7780,7 +6847,7 @@ msgstr ""
 "  -h --help                    Извежда това помощно �ъобщение\n"
 "  -V --version                 Извежда информаци� за вер�и�та\n"
 
-#: windres.c:687
+#: windres.c:686
 #, c-format
 msgid ""
 "FORMAT is one of rc, res, or coff, and is deduced from the file name\n"
@@ -7788,38 +6855,38 @@ msgid ""
 "No input-file is stdin, default rc.  No output-file is stdout, default rc.\n"
 msgstr ""
 
-#: windres.c:850
+#: windres.c:847
 msgid "invalid codepage specified.\n"
-msgstr "указане е неправилна кодова-�траница.\n"
+msgstr ""
 
-#: windres.c:865
+#: windres.c:862
 msgid "invalid option -f\n"
 msgstr "�грешена опци� -f\n"
 
-#: windres.c:870
+#: windres.c:867
 msgid "No filename following the -fo option.\n"
-msgstr "��ма име на файл �лед -fo флаг.\n"
+msgstr ""
 
-#: windres.c:959
+#: windres.c:938
 #, c-format
 msgid "Option -I is deprecated for setting the input format, please use -J instead.\n"
 msgstr "Опци�та -I е забранена за задаване на форма на вход�щи� файл. Мол� използвайте -J.\n"
 
-#: windres.c:1072
+#: windres.c:1051
 msgid "no resources"
 msgstr "лип�ват ре�ур�и"
 
-#: wrstabs.c:354 wrstabs.c:1915
+#: wrstabs.c:353 wrstabs.c:1916
 #, c-format
 msgid "string_hash_lookup failed: %s"
 msgstr "string_hash_lookup не у�п�: %s"
 
-#: wrstabs.c:637
+#: wrstabs.c:636
 #, c-format
 msgid "stab_int_type: bad size %u"
 msgstr "stab_int_type: неправилен размер %u"
 
-#: wrstabs.c:1393
+#: wrstabs.c:1394
 #, c-format
 msgid "%s: warning: unknown size for field `%s' in struct"
 msgstr "%s: предупреждение: неизве�тен размер за полето '%s' на �труктурата"
diff --git a/binutils/po/binutils.pot b/binutils/po/binutils.pot
index 0d0839782f..cb11f22297 100644
--- a/binutils/po/binutils.pot
+++ b/binutils/po/binutils.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-10-25 11:20+0100\n"
+"POT-Creation-Date: 2011-06-02 14:35+0100\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"
@@ -53,46 +53,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:471 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:653 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3214 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
+#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
+#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
+#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
 #: windmc.c:228 windres.c:695
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 
-#. Note for translators:  This printf is used to join the
-#. function name just printed above to the line number/
-#. file name pair that is about to be printed below.  Eg:
-#.
-#. foo at 123:bar.c
-#: addr2line.c:276
+#: addr2line.c:271
 #, c-format
 msgid " at "
 msgstr ""
 
-#. Note for translators: This printf is used to join the
-#. line number/file name pair that has just been printed with
-#. the line number/file name pair that is going to be printed
-#. by the next iteration of the while loop.  Eg:
-#.
-#. 123:bar.c (inlined by) 456:main.c
-#: addr2line.c:308
+#: addr2line.c:296
 #, c-format
 msgid " (inlined by) "
 msgstr ""
 
-#: addr2line.c:341
+#: addr2line.c:329
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr ""
 
-#: addr2line.c:358
+#: addr2line.c:346
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr ""
 
-#: addr2line.c:427 nm.c:1570 objdump.c:3423
+#: addr2line.c:415 nm.c:1566 objdump.c:3423
 #, c-format
 msgid "unknown demangling style `%s'"
 msgstr ""
@@ -303,7 +292,7 @@ msgstr ""
 msgid "two different operation options specified"
 msgstr ""
 
-#: ar.c:538 nm.c:1643
+#: ar.c:538 nm.c:1639
 #, c-format
 msgid "sorry - this program has been built without plugin support\n"
 msgstr ""
@@ -332,41 +321,37 @@ msgstr ""
 msgid "`x' cannot be used on thin archives."
 msgstr ""
 
-#: ar.c:771
+#: ar.c:765
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr ""
 
-#: ar.c:840
+#: ar.c:834
 #, c-format
 msgid "creating %s"
 msgstr ""
 
-#: ar.c:889 ar.c:943 ar.c:1272 objcopy.c:2080
+#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
 #, c-format
 msgid "internal stat error on %s"
 msgstr ""
 
-#: ar.c:908 ar.c:976
+#: ar.c:902 ar.c:970
 #, c-format
 msgid "%s is not a valid archive"
 msgstr ""
 
-#: ar.c:1034
-msgid "could not create temporary file whilst writing archive"
-msgstr ""
-
-#: ar.c:1177
+#: ar.c:1171
 #, c-format
 msgid "No member named `%s'\n"
 msgstr ""
 
-#: ar.c:1227
+#: ar.c:1221
 #, c-format
 msgid "no entry %s in archive %s!"
 msgstr ""
 
-#: ar.c:1366
+#: ar.c:1360
 #, c-format
 msgid "%s: no archive map to update"
 msgstr ""
@@ -467,25 +452,6 @@ msgstr ""
 msgid "%s: supported architectures:"
 msgstr ""
 
-#: bucomm.c:228
-msgid "big endian"
-msgstr ""
-
-#: bucomm.c:229
-msgid "little endian"
-msgstr ""
-
-#: bucomm.c:230
-msgid "endianness unknown"
-msgstr ""
-
-#: bucomm.c:251
-#, c-format
-msgid ""
-"%s\n"
-" (header %s, data %s)\n"
-msgstr ""
-
 #: bucomm.c:407
 #, c-format
 msgid "BFD header file version %s\n"
@@ -521,166 +487,17 @@ msgstr ""
 msgid "#lines %d "
 msgstr ""
 
-#: coffdump.c:130
-#, c-format
-msgid "size %d "
-msgstr ""
-
-#: coffdump.c:135
-#, c-format
-msgid "section definition at %x size %x\n"
-msgstr ""
-
-#: coffdump.c:141
-#, c-format
-msgid "pointer to"
-msgstr ""
-
-#: coffdump.c:146
-#, c-format
-msgid "array [%d] of"
-msgstr ""
-
-#: coffdump.c:151
-#, c-format
-msgid "function returning"
-msgstr ""
-
-#: coffdump.c:155
-#, c-format
-msgid "arguments"
-msgstr ""
-
-#: coffdump.c:159
-#, c-format
-msgid "code"
-msgstr ""
-
-#: coffdump.c:165
-#, c-format
-msgid "structure definition"
-msgstr ""
-
-#: coffdump.c:171
-#, c-format
-msgid "structure ref to UNKNOWN struct"
-msgstr ""
-
-#: coffdump.c:173
-#, c-format
-msgid "structure ref to %s"
-msgstr ""
-
-#: coffdump.c:176
-#, c-format
-msgid "enum ref to %s"
-msgstr ""
-
-#: coffdump.c:179
-#, c-format
-msgid "enum definition"
-msgstr ""
-
-#: coffdump.c:252
-#, c-format
-msgid "Stack offset %x"
-msgstr ""
-
-#: coffdump.c:255
-#, c-format
-msgid "Memory section %s+%x"
-msgstr ""
-
-#: coffdump.c:258
-#, c-format
-msgid "Register %d"
-msgstr ""
-
-#: coffdump.c:261
-#, c-format
-msgid "Struct Member offset %x"
-msgstr ""
-
-#: coffdump.c:264
-#, c-format
-msgid "Enum Member offset %x"
-msgstr ""
-
-#: coffdump.c:267
-#, c-format
-msgid "Undefined symbol"
-msgstr ""
-
-#: coffdump.c:334
-#, c-format
-msgid "List of symbols"
-msgstr ""
-
-#: coffdump.c:341
-#, c-format
-msgid "Symbol  %s, tag %d, number %d"
-msgstr ""
-
-#: coffdump.c:345 readelf.c:12215 readelf.c:12289
-#, c-format
-msgid "Type"
-msgstr ""
-
-#: coffdump.c:350
-#, c-format
-msgid "Where"
-msgstr ""
-
-#: coffdump.c:354
-#, c-format
-msgid "Visible"
-msgstr ""
-
-#: coffdump.c:370
-msgid "List of blocks "
-msgstr ""
-
-#: coffdump.c:383
-#, c-format
-msgid "vars %d"
-msgstr ""
-
-#: coffdump.c:386
-#, c-format
-msgid "blocks"
-msgstr ""
-
-#: coffdump.c:404
-#, c-format
-msgid "List of source files"
-msgstr ""
-
-#: coffdump.c:410
-#, c-format
-msgid "Source file %s"
-msgstr ""
-
-#: coffdump.c:424
-#, c-format
-msgid "section %s %d %d address %x size %x number %d nrelocs %d"
-msgstr ""
-
-#: coffdump.c:449
-#, c-format
-msgid "#sources %d"
-msgstr ""
-
-#: coffdump.c:462 sysdump.c:646
+#: coffdump.c:461 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr ""
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid " Print a human readable interpretation of a COFF object file\n"
 msgstr ""
 
-#: coffdump.c:464
+#: coffdump.c:463
 #, c-format
 msgid ""
 " The options are:\n"
@@ -690,7 +507,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: coffdump.c:533 srconv.c:1833 sysdump.c:710
+#: coffdump.c:532 srconv.c:1833 sysdump.c:710
 msgid "no input file specified"
 msgstr ""
 
@@ -835,16 +652,6 @@ msgstr ""
 msgid "LIBRARY: %s base: %x"
 msgstr ""
 
-#: dlltool.c:1266
-#, c-format
-msgid "VERSION %d.%d\n"
-msgstr ""
-
-#: dlltool.c:1314
-#, c-format
-msgid "run: %s %s"
-msgstr ""
-
 #: dlltool.c:1354 resrc.c:293
 #, c-format
 msgid "wait: %s"
@@ -1299,11 +1106,6 @@ msgstr ""
 msgid "Deleting temporary def file %s"
 msgstr ""
 
-#: dllwrap.c:417
-#, c-format
-msgid "pwait returns: %s"
-msgstr ""
-
 #: dllwrap.c:484
 #, c-format
 msgid "  Generic options:\n"
@@ -1524,11 +1326,7 @@ msgstr ""
 msgid "DRIVER options  : %s\n"
 msgstr ""
 
-#: dwarf.c:132
-msgid "Wrong size in print_dwarf_vma"
-msgstr ""
-
-#: dwarf.c:256 dwarf.c:3027
+#: dwarf.c:256 dwarf.c:3019
 msgid "badly formed extended line op encountered!\n"
 msgstr ""
 
@@ -1554,7 +1352,7 @@ msgstr ""
 msgid "  define new File Table entry\n"
 msgstr ""
 
-#: dwarf.c:281 dwarf.c:2555
+#: dwarf.c:281 dwarf.c:2548
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
 msgstr ""
@@ -1564,9 +1362,19 @@ msgstr ""
 msgid "set Discriminator to %s\n"
 msgstr ""
 
-#: dwarf.c:370
+#: dwarf.c:356
+#, c-format
+msgid "(%s"
+msgstr ""
+
+#: dwarf.c:360
 #, c-format
-msgid "    UNKNOWN DW_LNE_HP_SFC opcode (%u)\n"
+msgid ",%s"
+msgstr ""
+
+#: dwarf.c:364
+#, c-format
+msgid ",%s)\n"
 msgstr ""
 
 #. The test against DW_LNW_hi_user is redundant due to
@@ -1621,380 +1429,305 @@ msgstr ""
 msgid "(DW_OP_call_ref in frame info)"
 msgstr ""
 
-#: dwarf.c:1075
-#, c-format
-msgid "size: %s "
-msgstr ""
-
-#: dwarf.c:1078
-#, c-format
-msgid "offset: %s "
-msgstr ""
-
-#: dwarf.c:1098
-#, c-format
-msgid "DW_OP_GNU_push_tls_address or DW_OP_HP_unknown"
-msgstr ""
-
 #: dwarf.c:1122
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
 msgstr ""
 
-#: dwarf.c:1234
+#: dwarf.c:1229
 #, c-format
 msgid "(User defined location op)"
 msgstr ""
 
-#: dwarf.c:1236
+#: dwarf.c:1231
 #, c-format
 msgid "(Unknown location op)"
 msgstr ""
 
-#: dwarf.c:1283
+#: dwarf.c:1278
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr ""
 
-#: dwarf.c:1389
+#: dwarf.c:1384
 msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
 msgstr ""
 
-#: dwarf.c:1439
+#: dwarf.c:1434
 #, c-format
 msgid " (indirect string, offset: 0x%s): %s"
 msgstr ""
 
-#: dwarf.c:1464
+#: dwarf.c:1459
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr ""
 
-#: dwarf.c:1557
+#: dwarf.c:1552
 #, c-format
 msgid "(not inlined)"
 msgstr ""
 
-#: dwarf.c:1560
+#: dwarf.c:1555
 #, c-format
 msgid "(inlined)"
 msgstr ""
 
-#: dwarf.c:1563
+#: dwarf.c:1558
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr ""
 
-#: dwarf.c:1566
+#: dwarf.c:1561
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr ""
 
-#: dwarf.c:1569
+#: dwarf.c:1564
 #, c-format
 msgid "  (Unknown inline attribute value: %s)"
 msgstr ""
 
-#: dwarf.c:1608
-#, c-format
-msgid "(implementation defined: %s)"
-msgstr ""
-
-#: dwarf.c:1611
-#, c-format
-msgid "(Unknown: %s)"
-msgstr ""
-
-#: dwarf.c:1649
-#, c-format
-msgid "(user defined type)"
-msgstr ""
-
-#: dwarf.c:1651
-#, c-format
-msgid "(unknown type)"
-msgstr ""
-
-#: dwarf.c:1663
-#, c-format
-msgid "(unknown accessibility)"
-msgstr ""
-
-#: dwarf.c:1674
-#, c-format
-msgid "(unknown visibility)"
-msgstr ""
-
-#: dwarf.c:1684
-#, c-format
-msgid "(unknown virtuality)"
-msgstr ""
-
-#: dwarf.c:1695
-#, c-format
-msgid "(unknown case)"
-msgstr ""
-
-#: dwarf.c:1708
-#, c-format
-msgid "(user defined)"
-msgstr ""
-
-#: dwarf.c:1710
-#, c-format
-msgid "(unknown convention)"
-msgstr ""
-
-#: dwarf.c:1717
-#, c-format
-msgid "(undefined)"
-msgstr ""
-
-#: dwarf.c:1740
+#: dwarf.c:1735
 #, c-format
 msgid "(location list)"
 msgstr ""
 
-#: dwarf.c:1761 dwarf.c:4045
+#: dwarf.c:1756 dwarf.c:3722
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr ""
 
-#: dwarf.c:1777
+#: dwarf.c:1771
 #, c-format
 msgid ""
 "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is "
 "too big.\n"
 msgstr ""
 
-#: dwarf.c:1787
-#, c-format
-msgid "[Abbrev Number: %ld"
-msgstr ""
-
-#: dwarf.c:1978
+#: dwarf.c:1971
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr ""
 
-#: dwarf.c:2049
+#: dwarf.c:2042
 #, c-format
 msgid "Reserved length value (0x%s) found in section %s\n"
 msgstr ""
 
-#: dwarf.c:2061
+#: dwarf.c:2054
 #, c-format
 msgid "Corrupt unit length (0x%s) found in section %s\n"
 msgstr ""
 
-#: dwarf.c:2069
+#: dwarf.c:2062
 #, c-format
 msgid "No comp units in %s section ?"
 msgstr ""
 
-#: dwarf.c:2078
+#: dwarf.c:2071
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr ""
 
-#: dwarf.c:2087 dwarf.c:3296 dwarf.c:3390 dwarf.c:3551 dwarf.c:3779
-#: dwarf.c:3911 dwarf.c:4081 dwarf.c:4150 dwarf.c:4354
+#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
+#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:2095
+#: dwarf.c:2088
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr ""
 
-#: dwarf.c:2176
+#: dwarf.c:2169
 #, c-format
 msgid "  Compilation Unit @ offset 0x%s:\n"
 msgstr ""
 
-#: dwarf.c:2178
+#: dwarf.c:2171
 #, c-format
 msgid "   Length:        0x%s (%s)\n"
 msgstr ""
 
-#: dwarf.c:2181
+#: dwarf.c:2174
 #, c-format
 msgid "   Version:       %d\n"
 msgstr ""
 
-#: dwarf.c:2182
+#: dwarf.c:2175
 #, c-format
 msgid "   Abbrev Offset: %s\n"
 msgstr ""
 
-#: dwarf.c:2184
+#: dwarf.c:2177
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr ""
 
-#: dwarf.c:2188
+#: dwarf.c:2181
 #, c-format
 msgid "   Signature:     "
 msgstr ""
 
-#: dwarf.c:2192
+#: dwarf.c:2185
 #, c-format
 msgid "   Type Offset:   0x%s\n"
 msgstr ""
 
-#: dwarf.c:2200
+#: dwarf.c:2193
 #, c-format
 msgid ""
 "Debug info is corrupted, length of CU at %s extends beyond end of section "
 "(length = %s)\n"
 msgstr ""
 
-#: dwarf.c:2213
+#: dwarf.c:2206
 #, c-format
 msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
 msgstr ""
 
-#: dwarf.c:2224
+#: dwarf.c:2217
 #, c-format
 msgid ""
 "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section "
 "size (%lx)\n"
 msgstr ""
 
-#: dwarf.c:2274
+#: dwarf.c:2267
 #, c-format
 msgid ""
 "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr ""
 
-#: dwarf.c:2278
+#: dwarf.c:2271
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr ""
 
-#: dwarf.c:2297
+#: dwarf.c:2290
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr ""
 
-#: dwarf.c:2301
+#: dwarf.c:2294
 #, c-format
 msgid " <%d><%lx>: ...\n"
 msgstr ""
 
-#: dwarf.c:2320
+#: dwarf.c:2313
 #, c-format
 msgid ""
 "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
 msgstr ""
 
-#: dwarf.c:2422
+#: dwarf.c:2415
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:2460
+#: dwarf.c:2453
 #, c-format
 msgid ""
 "The information in section %s appears to be corrupt - the section is too "
 "small\n"
 msgstr ""
 
-#: dwarf.c:2472 dwarf.c:2840
+#: dwarf.c:2465 dwarf.c:2833
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr ""
 
-#: dwarf.c:2486 dwarf.c:2855
+#: dwarf.c:2479 dwarf.c:2848
 msgid "Invalid maximum operations per insn.\n"
 msgstr ""
 
-#: dwarf.c:2505 dwarf.c:3574
+#: dwarf.c:2498
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr ""
 
-#: dwarf.c:2506
+#: dwarf.c:2499
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr ""
 
-#: dwarf.c:2507
+#: dwarf.c:2500
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr ""
 
-#: dwarf.c:2508
+#: dwarf.c:2501
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr ""
 
-#: dwarf.c:2509
+#: dwarf.c:2502
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr ""
 
-#: dwarf.c:2511
+#: dwarf.c:2504
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr ""
 
-#: dwarf.c:2512
+#: dwarf.c:2505
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr ""
 
-#: dwarf.c:2513
+#: dwarf.c:2506
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr ""
 
-#: dwarf.c:2514
+#: dwarf.c:2507
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr ""
 
-#: dwarf.c:2515
+#: dwarf.c:2508
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr ""
 
-#: dwarf.c:2524
+#: dwarf.c:2517
 #, c-format
 msgid ""
 "\n"
 " Opcodes:\n"
 msgstr ""
 
-#: dwarf.c:2527
+#: dwarf.c:2520
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr ""
 
-#: dwarf.c:2533
+#: dwarf.c:2526
 #, c-format
 msgid ""
 "\n"
 " The Directory Table is empty.\n"
 msgstr ""
 
-#: dwarf.c:2536
+#: dwarf.c:2529
 #, c-format
 msgid ""
 "\n"
 " The Directory Table:\n"
 msgstr ""
 
-#: dwarf.c:2551
+#: dwarf.c:2544
 #, c-format
 msgid ""
 "\n"
 " The File Name Table is empty.\n"
 msgstr ""
 
-#: dwarf.c:2554
+#: dwarf.c:2547
 #, c-format
 msgid ""
 "\n"
@@ -2002,569 +1735,461 @@ msgid ""
 msgstr ""
 
 #. Now display the statements.
-#: dwarf.c:2584
+#: dwarf.c:2577
 #, c-format
 msgid ""
 "\n"
 " Line Number Statements:\n"
 msgstr ""
 
-#: dwarf.c:2603
+#: dwarf.c:2596
 #, c-format
 msgid "  Special opcode %d: advance Address by %s to 0x%s"
 msgstr ""
 
-#: dwarf.c:2617
+#: dwarf.c:2610
 #, c-format
 msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
 msgstr ""
 
-#: dwarf.c:2625
+#: dwarf.c:2618
 #, c-format
 msgid " and Line by %s to %d\n"
 msgstr ""
 
-#: dwarf.c:2635
+#: dwarf.c:2628
 #, c-format
 msgid "  Copy\n"
 msgstr ""
 
-#: dwarf.c:2645
+#: dwarf.c:2638
 #, c-format
 msgid "  Advance PC by %s to 0x%s\n"
 msgstr ""
 
-#: dwarf.c:2658
+#: dwarf.c:2651
 #, c-format
 msgid "  Advance PC by %s to 0x%s[%d]\n"
 msgstr ""
 
-#: dwarf.c:2669
+#: dwarf.c:2662
 #, c-format
 msgid "  Advance Line by %s to %d\n"
 msgstr ""
 
-#: dwarf.c:2677
+#: dwarf.c:2670
 #, c-format
 msgid "  Set File Name to entry %s in the File Name Table\n"
 msgstr ""
 
-#: dwarf.c:2685
+#: dwarf.c:2678
 #, c-format
 msgid "  Set column to %s\n"
 msgstr ""
 
-#: dwarf.c:2693
+#: dwarf.c:2686
 #, c-format
 msgid "  Set is_stmt to %s\n"
 msgstr ""
 
-#: dwarf.c:2698
+#: dwarf.c:2691
 #, c-format
 msgid "  Set basic block\n"
 msgstr ""
 
-#: dwarf.c:2708
+#: dwarf.c:2701
 #, c-format
 msgid "  Advance PC by constant %s to 0x%s\n"
 msgstr ""
 
-#: dwarf.c:2721
+#: dwarf.c:2714
 #, c-format
 msgid "  Advance PC by constant %s to 0x%s[%d]\n"
 msgstr ""
 
-#: dwarf.c:2733
+#: dwarf.c:2726
 #, c-format
 msgid "  Advance PC by fixed size amount %s to 0x%s\n"
 msgstr ""
 
-#: dwarf.c:2739
+#: dwarf.c:2732
 #, c-format
 msgid "  Set prologue_end to true\n"
 msgstr ""
 
-#: dwarf.c:2743
+#: dwarf.c:2736
 #, c-format
 msgid "  Set epilogue_begin to true\n"
 msgstr ""
 
-#: dwarf.c:2749
+#: dwarf.c:2742
 #, c-format
 msgid "  Set ISA to %s\n"
 msgstr ""
 
-#: dwarf.c:2753 dwarf.c:3168
+#: dwarf.c:2746 dwarf.c:3160
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr ""
 
-#: dwarf.c:2787
+#: dwarf.c:2780
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:2828
+#: dwarf.c:2821
 msgid "The line info appears to be corrupt - the section is too small\n"
 msgstr ""
 
-#: dwarf.c:2960
+#: dwarf.c:2953
 #, c-format
 msgid "CU: %s:\n"
 msgstr ""
 
-#: dwarf.c:2961 dwarf.c:2972
+#: dwarf.c:2954 dwarf.c:2964
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr ""
 
-#: dwarf.c:2968
+#: dwarf.c:2959
 #, c-format
 msgid "CU: %s/%s:\n"
 msgstr ""
 
-#: dwarf.c:3059
+#: dwarf.c:3051
 #, c-format
 msgid "UNKNOWN: length %d\n"
 msgstr ""
 
-#: dwarf.c:3164
+#: dwarf.c:3156
 #, c-format
 msgid "  Set ISA to %lu\n"
 msgstr ""
 
-#: dwarf.c:3330 dwarf.c:4195
+#: dwarf.c:3322 dwarf.c:3872
 #, c-format
 msgid ""
 ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
 msgstr ""
 
-#: dwarf.c:3344
+#: dwarf.c:3336
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr ""
 
-#: dwarf.c:3351
+#: dwarf.c:3343
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr ""
 
-#: dwarf.c:3353
+#: dwarf.c:3345
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr ""
 
-#: dwarf.c:3355
+#: dwarf.c:3347
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr ""
 
-#: dwarf.c:3357
+#: dwarf.c:3349
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr ""
 
-#: dwarf.c:3360
+#: dwarf.c:3352
 #, c-format
 msgid ""
 "\n"
 "    Offset\tName\n"
 msgstr ""
 
-#: dwarf.c:3411
+#: dwarf.c:3403
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
 msgstr ""
 
-#: dwarf.c:3417
+#: dwarf.c:3409
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr ""
 
-#: dwarf.c:3425
+#: dwarf.c:3417
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
 msgstr ""
 
-#: dwarf.c:3434
+#: dwarf.c:3426
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
 msgstr ""
 
-#: dwarf.c:3446
+#: dwarf.c:3438
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
 msgstr ""
 
-#: dwarf.c:3566
-#, c-format
-msgid "Only GNU extension to DWARF 4 of %s is currently supported.\n"
-msgstr ""
-
-#: dwarf.c:3576
-#, c-format
-msgid "  Version:                     %d\n"
-msgstr ""
-
-#: dwarf.c:3577
-#, c-format
-msgid "  Offset size:                 %d\n"
-msgstr ""
-
-#: dwarf.c:3582
-#, c-format
-msgid "  Offset into .debug_line:     0x%lx\n"
-msgstr ""
-
-#: dwarf.c:3593
-#, c-format
-msgid "  Extension opcode arguments:\n"
-msgstr ""
-
-#: dwarf.c:3601
-#, c-format
-msgid "    DW_MACRO_GNU_%02x has no arguments\n"
-msgstr ""
-
-#: dwarf.c:3604
-#, c-format
-msgid "    DW_MACRO_GNU_%02x arguments: "
-msgstr ""
-
-#: dwarf.c:3628
-#, c-format
-msgid "Invalid extension opcode form %s\n"
-msgstr ""
-
-#: dwarf.c:3645
-msgid ".debug_macro section not zero terminated\n"
-msgstr ""
-
-#: dwarf.c:3666
-msgid "DW_MACRO_GNU_start_file used, but no .debug_line offset provided.\n"
-msgstr ""
-
-#: dwarf.c:3672
-#, c-format
-msgid " DW_MACRO_GNU_start_file - lineno: %d filenum: %d\n"
-msgstr ""
-
-#: dwarf.c:3675
-#, c-format
-msgid " DW_MACRO_GNU_start_file - lineno: %d filenum: %d filename: %s%s%s\n"
-msgstr ""
-
-#: dwarf.c:3683
-#, c-format
-msgid " DW_MACRO_GNU_end_file\n"
-msgstr ""
-
-#: dwarf.c:3691
-#, c-format
-msgid " DW_MACRO_GNU_define - lineno : %d macro : %s\n"
-msgstr ""
-
-#: dwarf.c:3700
-#, c-format
-msgid " DW_MACRO_GNU_undef - lineno : %d macro : %s\n"
-msgstr ""
-
-#: dwarf.c:3710
-#, c-format
-msgid " DW_MACRO_GNU_define_indirect - lineno : %d macro : %s\n"
-msgstr ""
-
-#: dwarf.c:3720
-#, c-format
-msgid " DW_MACRO_GNU_undef_indirect - lineno : %d macro : %s\n"
-msgstr ""
-
-#: dwarf.c:3727
-#, c-format
-msgid " DW_MACRO_GNU_transparent_include - offset : 0x%lx\n"
-msgstr ""
-
-#: dwarf.c:3734
-#, c-format
-msgid " Unknown macro opcode %02x seen\n"
-msgstr ""
-
-#: dwarf.c:3746
-#, c-format
-msgid " DW_MACRO_GNU_%02x\n"
-msgstr ""
-
-#: dwarf.c:3749
-#, c-format
-msgid " DW_MACRO_GNU_%02x -"
-msgstr ""
-
-#: dwarf.c:3790
+#: dwarf.c:3467
 #, c-format
 msgid "  Number TAG\n"
 msgstr ""
 
-#: dwarf.c:3799
+#: dwarf.c:3476
 msgid "has children"
 msgstr ""
 
-#: dwarf.c:3799
+#: dwarf.c:3476
 msgid "no children"
 msgstr ""
 
-#: dwarf.c:3850 dwarf.c:4077 dwarf.c:4311
+#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
 #, c-format
 msgid ""
 "\n"
 "The %s section is empty.\n"
 msgstr ""
 
-#: dwarf.c:3856 dwarf.c:4317
+#: dwarf.c:3533 dwarf.c:3987
 #, c-format
 msgid ""
 "Unable to load/parse the .debug_info section, so cannot interpret the %s "
 "section.\n"
 msgstr ""
 
-#: dwarf.c:3900
+#: dwarf.c:3577
 msgid "No location lists in .debug_info section!\n"
 msgstr ""
 
-#: dwarf.c:3905
+#: dwarf.c:3582
 #, c-format
 msgid "Location lists in %s section start at 0x%s\n"
 msgstr ""
 
-#: dwarf.c:3912
+#: dwarf.c:3589
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr ""
 
-#: dwarf.c:3961
+#: dwarf.c:3638
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr ""
 
-#: dwarf.c:3965
+#: dwarf.c:3642
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr ""
 
-#: dwarf.c:3973
+#: dwarf.c:3650
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr ""
 
-#: dwarf.c:3982 dwarf.c:4017 dwarf.c:4027
+#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr ""
 
-#: dwarf.c:4001 dwarf.c:4405
+#: dwarf.c:3678 dwarf.c:4075
 #, c-format
 msgid "<End of list>\n"
 msgstr ""
 
-#: dwarf.c:4011
+#: dwarf.c:3688
 #, c-format
 msgid "(base address)\n"
 msgstr ""
 
-#: dwarf.c:4048
+#: dwarf.c:3725
 msgid " (start == end)"
 msgstr ""
 
-#: dwarf.c:4050
+#: dwarf.c:3727
 msgid " (start > end)"
 msgstr ""
 
-#: dwarf.c:4060
+#: dwarf.c:3737
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr ""
 
-#: dwarf.c:4206
+#: dwarf.c:3883
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr ""
 
-#: dwarf.c:4210
+#: dwarf.c:3887
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr ""
 
-#: dwarf.c:4212
+#: dwarf.c:3889
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr ""
 
-#: dwarf.c:4213
+#: dwarf.c:3890
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr ""
 
-#: dwarf.c:4215
+#: dwarf.c:3892
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr ""
 
-#: dwarf.c:4216
+#: dwarf.c:3893
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr ""
 
-#: dwarf.c:4222
-#, c-format
-msgid "Invalid address size in %s section!\n"
-msgstr ""
-
-#: dwarf.c:4232
+#: dwarf.c:3902
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr ""
 
-#: dwarf.c:4237
+#: dwarf.c:3907
 #, c-format
 msgid ""
 "\n"
 "    Address            Length\n"
 msgstr ""
 
-#: dwarf.c:4239
+#: dwarf.c:3909
 #, c-format
 msgid ""
 "\n"
 "    Address    Length\n"
 msgstr ""
 
-#: dwarf.c:4327
+#: dwarf.c:3997
 msgid "No range lists in .debug_info section!\n"
 msgstr ""
 
-#: dwarf.c:4351
+#: dwarf.c:4021
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:4355
+#: dwarf.c:4025
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr ""
 
-#: dwarf.c:4376
+#: dwarf.c:4046
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr ""
 
-#: dwarf.c:4380
+#: dwarf.c:4050
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr ""
 
-#: dwarf.c:4423
+#: dwarf.c:4093
 msgid "(start == end)"
 msgstr ""
 
-#: dwarf.c:4425
+#: dwarf.c:4095
 msgid "(start > end)"
 msgstr ""
 
-#: dwarf.c:4678
+#: dwarf.c:4347
 msgid "bad register: "
 msgstr ""
 
 #. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4681 dwarf.c:5490
+#: dwarf.c:4350 dwarf.c:5159
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr ""
 
-#: dwarf.c:5451
+#: dwarf.c:5120
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr ""
 
-#: dwarf.c:5453
+#: dwarf.c:5122
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr ""
 
-#: dwarf.c:5494
+#: dwarf.c:5163
 #, c-format
 msgid "Truncated header in the %s section.\n"
 msgstr ""
 
-#: dwarf.c:5499
+#: dwarf.c:5168
 #, c-format
 msgid "Version %ld\n"
 msgstr ""
 
-#: dwarf.c:5506
+#: dwarf.c:5175
 msgid "The address table data in version 3 may be wrong.\n"
 msgstr ""
 
-#: dwarf.c:5509
+#: dwarf.c:5178
 msgid "Version 4 does not support case insensitive lookups.\n"
 msgstr ""
 
-#: dwarf.c:5514
+#: dwarf.c:5183
 #, c-format
 msgid "Unsupported version %lu.\n"
 msgstr ""
 
-#: dwarf.c:5530
+#: dwarf.c:5199
 #, c-format
 msgid "Corrupt header in the %s section.\n"
 msgstr ""
 
-#: dwarf.c:5545
+#: dwarf.c:5214
 #, c-format
 msgid ""
 "\n"
 "CU table:\n"
 msgstr ""
 
-#: dwarf.c:5551
+#: dwarf.c:5220
 #, c-format
 msgid "[%3u] 0x%lx - 0x%lx\n"
 msgstr ""
 
-#: dwarf.c:5556
+#: dwarf.c:5225
 #, c-format
 msgid ""
 "\n"
 "TU table:\n"
 msgstr ""
 
-#: dwarf.c:5563
+#: dwarf.c:5232
 #, c-format
 msgid "[%3u] 0x%lx 0x%lx "
 msgstr ""
 
-#: dwarf.c:5570
+#: dwarf.c:5239
 #, c-format
 msgid ""
 "\n"
 "Address table:\n"
 msgstr ""
 
-#: dwarf.c:5579
+#: dwarf.c:5248
 #, c-format
 msgid "%lu\n"
 msgstr ""
 
-#: dwarf.c:5582
+#: dwarf.c:5251
 #, c-format
 msgid ""
 "\n"
 "Symbol table:\n"
 msgstr ""
 
-#: dwarf.c:5616
+#: dwarf.c:5285
 #, c-format
 msgid "Displaying the debug contents of section %s is not yet supported.\n"
 msgstr ""
 
-#: dwarf.c:5752 dwarf.c:5822
+#: dwarf.c:5421 dwarf.c:5491
 #, c-format
 msgid "Unrecognized debug option '%s'\n"
 msgstr ""
@@ -2584,11 +2209,11 @@ msgstr ""
 msgid "Unhandled data length: %d\n"
 msgstr ""
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3683 readelf.c:3991
-#: readelf.c:4034 readelf.c:4108 readelf.c:4187 readelf.c:4965 readelf.c:4989
-#: readelf.c:7397 readelf.c:7443 readelf.c:7642 readelf.c:8863 readelf.c:8877
-#: readelf.c:9423 readelf.c:9439 readelf.c:9482 readelf.c:9507 readelf.c:11904
-#: readelf.c:12096 readelf.c:12929
+#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
+#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
+#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
+#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
+#: readelf.c:11866 readelf.c:12685
 msgid "Out of memory\n"
 msgstr ""
 
@@ -2597,7 +2222,7 @@ msgstr ""
 msgid "%s: failed to seek to first archive header\n"
 msgstr ""
 
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13418
+#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
 #, c-format
 msgid "%s: failed to read archive header\n"
 msgstr ""
@@ -2670,7 +2295,7 @@ msgstr ""
 msgid "%s: failed to seek to next file name\n"
 msgstr ""
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13424
+#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr ""
@@ -2731,12 +2356,12 @@ msgstr ""
 msgid "%s: Failed to seek to ELF header\n"
 msgstr ""
 
-#: elfedit.c:331 readelf.c:13410
+#: elfedit.c:331 readelf.c:13161
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
 msgstr ""
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13438 readelf.c:13447
+#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr ""
@@ -2751,22 +2376,22 @@ msgstr ""
 msgid "%s: failed to seek to archive member\n"
 msgstr ""
 
-#: elfedit.c:454 readelf.c:13533
+#: elfedit.c:454 readelf.c:13284
 #, c-format
 msgid "'%s': No such file\n"
 msgstr ""
 
-#: elfedit.c:456 readelf.c:13535
+#: elfedit.c:456 readelf.c:13286
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr ""
 
-#: elfedit.c:463 readelf.c:13542
+#: elfedit.c:463 readelf.c:13293
 #, c-format
 msgid "'%s' is not an ordinary file\n"
 msgstr ""
 
-#: elfedit.c:489 readelf.c:13555
+#: elfedit.c:489 readelf.c:13306
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr ""
@@ -2776,37 +2401,37 @@ msgstr ""
 msgid "Unknown OSABI: %s\n"
 msgstr ""
 
-#: elfedit.c:568
+#: elfedit.c:566
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr ""
 
-#: elfedit.c:587
+#: elfedit.c:584
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr ""
 
-#: elfedit.c:606
+#: elfedit.c:603
 #, c-format
 msgid "Unknown type: %s\n"
 msgstr ""
 
-#: elfedit.c:637
+#: elfedit.c:634
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr ""
 
-#: elfedit.c:639
+#: elfedit.c:636
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr ""
 
-#: elfedit.c:640 objcopy.c:475 objcopy.c:585
+#: elfedit.c:637 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
 msgstr ""
 
-#: elfedit.c:641
+#: elfedit.c:638
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -3337,17 +2962,17 @@ msgstr ""
 msgid "%s: invalid output format"
 msgstr ""
 
-#: nm.c:346 readelf.c:8616 readelf.c:8661
+#: nm.c:346 readelf.c:8546 readelf.c:8591
 #, c-format
 msgid "<processor specific>: %d"
 msgstr ""
 
-#: nm.c:348 readelf.c:8625 readelf.c:8679
+#: nm.c:348 readelf.c:8555 readelf.c:8609
 #, c-format
 msgid "<OS specific>: %d"
 msgstr ""
 
-#: nm.c:350 readelf.c:8628 readelf.c:8682
+#: nm.c:350 readelf.c:8558 readelf.c:8612
 #, c-format
 msgid "<unknown>: %d"
 msgstr ""
@@ -3359,7 +2984,7 @@ msgid ""
 "Archive index:\n"
 msgstr ""
 
-#: nm.c:1258
+#: nm.c:1254
 #, c-format
 msgid ""
 "\n"
@@ -3368,7 +2993,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1260
+#: nm.c:1256
 #, c-format
 msgid ""
 "\n"
@@ -3377,7 +3002,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1262 nm.c:1313
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  "
@@ -3385,7 +3010,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1265 nm.c:1316
+#: nm.c:1261 nm.c:1312
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         "
@@ -3393,7 +3018,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1309
+#: nm.c:1305
 #, c-format
 msgid ""
 "\n"
@@ -3402,7 +3027,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1311
+#: nm.c:1307
 #, c-format
 msgid ""
 "\n"
@@ -3411,24 +3036,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: nm.c:1403
+#: nm.c:1399
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr ""
 
-#: nm.c:1631
+#: nm.c:1627
 msgid "Only -X 32_64 is supported"
 msgstr ""
 
-#: nm.c:1660
+#: nm.c:1656
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr ""
 
-#: nm.c:1661
+#: nm.c:1657
 msgid "will produce no output, since undefined symbols have no size."
 msgstr ""
 
-#: nm.c:1689
+#: nm.c:1685
 #, c-format
 msgid "data size %ld"
 msgstr ""
@@ -3636,7 +3261,7 @@ msgstr ""
 msgid "cannot open '%s': %s"
 msgstr ""
 
-#: objcopy.c:764 objcopy.c:3417
+#: objcopy.c:764 objcopy.c:3392
 #, c-format
 msgid "%s: fread failed"
 msgstr ""
@@ -3646,316 +3271,316 @@ msgstr ""
 msgid "%s:%d: Ignoring rubbish found on this line"
 msgstr ""
 
-#: objcopy.c:1153
+#: objcopy.c:1128
 #, c-format
 msgid "not stripping symbol `%s' because it is named in a relocation"
 msgstr ""
 
-#: objcopy.c:1236
+#: objcopy.c:1211
 #, c-format
 msgid "%s: Multiple redefinition of symbol \"%s\""
 msgstr ""
 
-#: objcopy.c:1240
+#: objcopy.c:1215
 #, c-format
 msgid "%s: Symbol \"%s\" is target of more than one redefinition"
 msgstr ""
 
-#: objcopy.c:1268
+#: objcopy.c:1243
 #, c-format
 msgid "couldn't open symbol redefinition file %s (error: %s)"
 msgstr ""
 
-#: objcopy.c:1346
+#: objcopy.c:1321
 #, c-format
 msgid "%s:%d: garbage found at end of line"
 msgstr ""
 
-#: objcopy.c:1349
+#: objcopy.c:1324
 #, c-format
 msgid "%s:%d: missing new symbol name"
 msgstr ""
 
-#: objcopy.c:1359
+#: objcopy.c:1334
 #, c-format
 msgid "%s:%d: premature end of file"
 msgstr ""
 
-#: objcopy.c:1385
+#: objcopy.c:1360
 #, c-format
 msgid "stat returns negative size for `%s'"
 msgstr ""
 
-#: objcopy.c:1397
+#: objcopy.c:1372
 #, c-format
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr ""
 
-#: objcopy.c:1454
+#: objcopy.c:1429
 msgid "Unable to change endianness of input file(s)"
 msgstr ""
 
-#: objcopy.c:1463
+#: objcopy.c:1438
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr ""
 
-#: objcopy.c:1512
+#: objcopy.c:1487
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr ""
 
-#: objcopy.c:1520
+#: objcopy.c:1495
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr ""
 
-#: objcopy.c:1523
+#: objcopy.c:1498
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr ""
 
-#: objcopy.c:1586
+#: objcopy.c:1561
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr ""
 
-#: objcopy.c:1645
+#: objcopy.c:1620
 #, c-format
 msgid "can't add section '%s'"
 msgstr ""
 
-#: objcopy.c:1659
+#: objcopy.c:1634
 #, c-format
 msgid "can't create section `%s'"
 msgstr ""
 
-#: objcopy.c:1705
+#: objcopy.c:1680
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr ""
 
-#: objcopy.c:1798
+#: objcopy.c:1773
 msgid "Can't fill gap after section"
 msgstr ""
 
-#: objcopy.c:1822
+#: objcopy.c:1797
 msgid "can't add padding"
 msgstr ""
 
-#: objcopy.c:1913
+#: objcopy.c:1888
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr ""
 
-#: objcopy.c:1976
+#: objcopy.c:1951
 msgid "error copying private BFD data"
 msgstr ""
 
-#: objcopy.c:1987
+#: objcopy.c:1962
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr ""
 
-#: objcopy.c:1991
+#: objcopy.c:1966
 msgid "treating that number as an absolute e_machine value instead"
 msgstr ""
 
-#: objcopy.c:1995
+#: objcopy.c:1970
 msgid "ignoring the alternative value"
 msgstr ""
 
-#: objcopy.c:2027 objcopy.c:2063
+#: objcopy.c:2002 objcopy.c:2038
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr ""
 
-#: objcopy.c:2093
+#: objcopy.c:2068
 msgid "Unable to recognise the format of file"
 msgstr ""
 
-#: objcopy.c:2220
+#: objcopy.c:2195
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr ""
 
-#: objcopy.c:2364
+#: objcopy.c:2339
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr ""
 
-#: objcopy.c:2415
+#: objcopy.c:2390
 msgid "error in private header data"
 msgstr ""
 
-#: objcopy.c:2493
+#: objcopy.c:2468
 msgid "failed to create output section"
 msgstr ""
 
-#: objcopy.c:2507
+#: objcopy.c:2482
 msgid "failed to set size"
 msgstr ""
 
-#: objcopy.c:2521
+#: objcopy.c:2496
 msgid "failed to set vma"
 msgstr ""
 
-#: objcopy.c:2546
+#: objcopy.c:2521
 msgid "failed to set alignment"
 msgstr ""
 
-#: objcopy.c:2580
+#: objcopy.c:2555
 msgid "failed to copy private data"
 msgstr ""
 
-#: objcopy.c:2662
+#: objcopy.c:2637
 msgid "relocation count is negative"
 msgstr ""
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2723
+#: objcopy.c:2698
 #, c-format
 msgid ""
 "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr ""
 
-#: objcopy.c:2909
+#: objcopy.c:2884
 msgid "can't create debugging section"
 msgstr ""
 
-#: objcopy.c:2922
+#: objcopy.c:2897
 msgid "can't set debugging section contents"
 msgstr ""
 
-#: objcopy.c:2930
+#: objcopy.c:2905
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr ""
 
-#: objcopy.c:3073
+#: objcopy.c:3048
 msgid "could not create temporary file to hold stripped copy"
 msgstr ""
 
-#: objcopy.c:3145
+#: objcopy.c:3120
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr ""
 
-#: objcopy.c:3175
+#: objcopy.c:3150
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr ""
 
-#: objcopy.c:3237
+#: objcopy.c:3212
 msgid "byte number must be non-negative"
 msgstr ""
 
-#: objcopy.c:3243
+#: objcopy.c:3218
 #, c-format
 msgid "architecture %s unknown"
 msgstr ""
 
-#: objcopy.c:3251
+#: objcopy.c:3226
 msgid "interleave must be positive"
 msgstr ""
 
-#: objcopy.c:3260
+#: objcopy.c:3235
 msgid "interleave width must be positive"
 msgstr ""
 
-#: objcopy.c:3280 objcopy.c:3288
+#: objcopy.c:3255 objcopy.c:3263
 #, c-format
 msgid "%s both copied and removed"
 msgstr ""
 
-#: objcopy.c:3387 objcopy.c:3467 objcopy.c:3575 objcopy.c:3606 objcopy.c:3630
-#: objcopy.c:3634 objcopy.c:3654
+#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
+#: objcopy.c:3609 objcopy.c:3629
 #, c-format
 msgid "bad format for %s"
 msgstr ""
 
-#: objcopy.c:3399
+#: objcopy.c:3374
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr ""
 
-#: objcopy.c:3544
+#: objcopy.c:3519
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr ""
 
-#: objcopy.c:3705
+#: objcopy.c:3680
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr ""
 
-#: objcopy.c:3723
+#: objcopy.c:3698
 msgid "unable to parse alternative machine code"
 msgstr ""
 
-#: objcopy.c:3768
+#: objcopy.c:3743
 msgid "number of bytes to reverse must be positive and even"
 msgstr ""
 
-#: objcopy.c:3771
+#: objcopy.c:3746
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr ""
 
-#: objcopy.c:3786
+#: objcopy.c:3761
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr ""
 
-#: objcopy.c:3792
+#: objcopy.c:3767
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr ""
 
-#: objcopy.c:3817
+#: objcopy.c:3792
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr ""
 
-#: objcopy.c:3823
+#: objcopy.c:3798
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr ""
 
-#: objcopy.c:3852
+#: objcopy.c:3827
 msgid "interleave start byte must be set with --byte"
 msgstr ""
 
-#: objcopy.c:3855
+#: objcopy.c:3830
 msgid "byte number must be less than interleave"
 msgstr ""
 
-#: objcopy.c:3858
+#: objcopy.c:3833
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr ""
 
-#: objcopy.c:3885
+#: objcopy.c:3860
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr ""
 
-#: objcopy.c:3916
+#: objcopy.c:3891
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr ""
 
-#: objcopy.c:3929
+#: objcopy.c:3904
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr ""
 
-#: objcopy.c:3941
+#: objcopy.c:3916
 #, c-format
 msgid ""
 "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr ""
 
-#: objcopy.c:3969 objcopy.c:3983
+#: objcopy.c:3944 objcopy.c:3958
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr ""
@@ -4330,327 +3955,614 @@ msgstr ""
 msgid "cannot read auxhdr"
 msgstr ""
 
-#: od-xcoff.c:522
+#: od-xcoff.c:462
+#, c-format
+msgid "  o_mflag (magic): 0x%04x 0%04o\n"
+msgstr ""
+
+#: od-xcoff.c:463
+#, c-format
+msgid "  o_vstamp:        0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:465
+#, c-format
+msgid "  o_tsize:         0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:467
+#, c-format
+msgid "  o_dsize:         0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:469
+#, c-format
+msgid "  o_entry:         0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:471
+#, c-format
+msgid "  o_text_start:    0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:473
+#, c-format
+msgid "  o_data_start:    0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:477
+#, c-format
+msgid "  o_toc:           0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:479
+#, c-format
+msgid "  o_snentry:       0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:481
+#, c-format
+msgid "  o_sntext:        0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:483
+#, c-format
+msgid "  o_sndata:        0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:485
+#, c-format
+msgid "  o_sntoc:         0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:487
+#, c-format
+msgid "  o_snloader:      0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:489
+#, c-format
+msgid "  o_snbss:         0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:491
+#, c-format
+msgid "  o_algntext:      %u\n"
+msgstr ""
+
+#: od-xcoff.c:493
+#, c-format
+msgid "  o_algndata:      %u\n"
+msgstr ""
+
+#: od-xcoff.c:495
+#, c-format
+msgid "  o_modtype:       0x%04x"
+msgstr ""
+
+#: od-xcoff.c:500
+#, c-format
+msgid "  o_cputype:       0x%04x\n"
+msgstr ""
+
+#: od-xcoff.c:502
+#, c-format
+msgid "  o_maxstack:      0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:504
+#, c-format
+msgid "  o_maxdata:       0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:507
+#, c-format
+msgid "  o_debugger:      0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:521
 #, c-format
 msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
 msgstr ""
 
-#: od-xcoff.c:527
+#: od-xcoff.c:526
 #, c-format
 msgid "  No section header\n"
 msgstr ""
 
-#: od-xcoff.c:532 od-xcoff.c:544 od-xcoff.c:599
+#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
 msgid "cannot read section header"
 msgstr ""
 
-#: od-xcoff.c:558
+#: od-xcoff.c:534
+#, c-format
+msgid ""
+" # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  "
+"nlnno\n"
+msgstr ""
+
+#: od-xcoff.c:546
+#, c-format
+msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
+msgstr ""
+
+#: od-xcoff.c:557
 #, c-format
 msgid "            Flags: %08x "
 msgstr ""
 
-#: od-xcoff.c:566
+#: od-xcoff.c:565
 #, c-format
 msgid "overflow - nreloc: %u, nlnno: %u\n"
 msgstr ""
 
-#: od-xcoff.c:587 od-xcoff.c:922 od-xcoff.c:978
+#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
 msgid "cannot read section headers"
 msgstr ""
 
-#: od-xcoff.c:646
-msgid "cannot read strings table length"
+#: od-xcoff.c:650
+msgid "cannot read strings table len"
 msgstr ""
 
-#: od-xcoff.c:662
+#: od-xcoff.c:664
 msgid "cannot read strings table"
 msgstr ""
 
-#: od-xcoff.c:670
+#: od-xcoff.c:672
 msgid "cannot read symbol table"
 msgstr ""
 
-#: od-xcoff.c:685
+#: od-xcoff.c:687
 msgid "cannot read symbol entry"
 msgstr ""
 
-#: od-xcoff.c:720
+#: od-xcoff.c:722
 msgid "cannot read symbol aux entry"
 msgstr ""
 
-#: od-xcoff.c:742
+#: od-xcoff.c:744
 #, c-format
 msgid "Symbols table (strtable at 0x%08x)"
 msgstr ""
 
-#: od-xcoff.c:747
+#: od-xcoff.c:749
 #, c-format
 msgid ""
 ":\n"
 "  No symbols\n"
 msgstr ""
 
-#: od-xcoff.c:753
+#: od-xcoff.c:755
 #, c-format
 msgid " (no strings):\n"
 msgstr ""
 
-#: od-xcoff.c:755
+#: od-xcoff.c:757
 #, c-format
 msgid " (strings size: %08x):\n"
 msgstr ""
 
-#. Translators: 'sc' is for storage class, 'off' for offset.
-#: od-xcoff.c:769
+#: od-xcoff.c:770
 #, c-format
 msgid "  # sc         value    section  type aux name/off\n"
 msgstr ""
 
-#. Section length, number of relocs and line number.
 #: od-xcoff.c:821
 #, c-format
 msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
 msgstr ""
 
-#. Section length and number of relocs.
-#: od-xcoff.c:828
+#: od-xcoff.c:827
 #, c-format
 msgid "  scnlen: %08x  nreloc: %-6u\n"
 msgstr ""
 
-#: od-xcoff.c:891
+#. Function aux entry.
+#: od-xcoff.c:837
+#, c-format
+msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
+msgstr ""
+
+#: od-xcoff.c:856
+#, c-format
+msgid "  scnsym: %-8u"
+msgstr ""
+
+#: od-xcoff.c:858
+#, c-format
+msgid "  scnlen: %08x"
+msgstr ""
+
+#: od-xcoff.c:859
+#, c-format
+msgid " h: parm=%08x sn=%04x al: 2**%u"
+msgstr ""
+
+#: od-xcoff.c:863
+#, c-format
+msgid " typ: "
+msgstr ""
+
+#: od-xcoff.c:865
+#, c-format
+msgid " cl: "
+msgstr ""
+
+#: od-xcoff.c:878
+#, c-format
+msgid " ftype: %02x "
+msgstr ""
+
+#: od-xcoff.c:881
+#, c-format
+msgid "fname: %.14s"
+msgstr ""
+
+#: od-xcoff.c:887
+#, c-format
+msgid " %s"
+msgstr ""
+
+#: od-xcoff.c:889
 #, c-format
 msgid "offset: %08x"
 msgstr ""
 
-#: od-xcoff.c:934
+#: od-xcoff.c:896
+#, c-format
+msgid "  lnno: %u\n"
+msgstr ""
+
+#: od-xcoff.c:931
 #, c-format
 msgid "Relocations for %s (%u)\n"
 msgstr ""
 
-#: od-xcoff.c:937
+#: od-xcoff.c:934
 msgid "cannot read relocations"
 msgstr ""
 
-#: od-xcoff.c:950
+#: od-xcoff.c:937
+#, c-format
+msgid "vaddr    sgn mod sz type  symndx symbol\n"
+msgstr ""
+
+#: od-xcoff.c:946
 msgid "cannot read relocation entry"
 msgstr ""
 
-#: od-xcoff.c:990
+#: od-xcoff.c:950
+#, c-format
+msgid "%08x  %c   %c  %-2u "
+msgstr ""
+
+#: od-xcoff.c:986
 #, c-format
 msgid "Line numbers for %s (%u)\n"
 msgstr ""
 
-#: od-xcoff.c:993
+#: od-xcoff.c:989
 msgid "cannot read line numbers"
 msgstr ""
 
-#. Line number, symbol index and physical address.
-#: od-xcoff.c:997
+#: od-xcoff.c:992
 #, c-format
 msgid "lineno  symndx/paddr\n"
 msgstr ""
 
-#: od-xcoff.c:1005
+#: od-xcoff.c:1000
 msgid "cannot read line number entry"
 msgstr ""
 
-#: od-xcoff.c:1048
+#: od-xcoff.c:1004
+#, c-format
+msgid " %-6u "
+msgstr ""
+
+#: od-xcoff.c:1043
 #, c-format
 msgid "no .loader section in file\n"
 msgstr ""
 
-#: od-xcoff.c:1054
+#: od-xcoff.c:1049
 #, c-format
 msgid "section .loader is too short\n"
 msgstr ""
 
-#: od-xcoff.c:1061
+#: od-xcoff.c:1056
 #, c-format
 msgid "Loader header:\n"
 msgstr ""
 
-#: od-xcoff.c:1063
+#: od-xcoff.c:1058
 #, c-format
 msgid "  version:           %u\n"
 msgstr ""
 
-#: od-xcoff.c:1066
+#: od-xcoff.c:1061
 #, c-format
 msgid " Unhandled version\n"
 msgstr ""
 
-#: od-xcoff.c:1071
+#: od-xcoff.c:1066
 #, c-format
 msgid "  nbr symbols:       %u\n"
 msgstr ""
 
-#: od-xcoff.c:1073
+#: od-xcoff.c:1068
 #, c-format
 msgid "  nbr relocs:        %u\n"
 msgstr ""
 
-#. Import string table length.
-#: od-xcoff.c:1075
+#: od-xcoff.c:1069
 #, c-format
 msgid "  import strtab len: %u\n"
 msgstr ""
 
-#: od-xcoff.c:1078
+#: od-xcoff.c:1072
 #, c-format
 msgid "  nbr import files:  %u\n"
 msgstr ""
 
-#: od-xcoff.c:1080
+#: od-xcoff.c:1074
 #, c-format
 msgid "  import file off:   %u\n"
 msgstr ""
 
-#: od-xcoff.c:1082
+#: od-xcoff.c:1076
 #, c-format
 msgid "  string table len:  %u\n"
 msgstr ""
 
-#: od-xcoff.c:1084
+#: od-xcoff.c:1078
 #, c-format
 msgid "  string table off:  %u\n"
 msgstr ""
 
-#: od-xcoff.c:1087
+#: od-xcoff.c:1081
 #, c-format
 msgid "Dynamic symbols:\n"
 msgstr ""
 
-#: od-xcoff.c:1094
+#: od-xcoff.c:1082
+#, c-format
+msgid "     # value     sc IFEW ty class file  pa name\n"
+msgstr ""
+
+#: od-xcoff.c:1087
 #, c-format
 msgid "  %4u %08x %3u "
 msgstr ""
 
-#: od-xcoff.c:1107
+#: od-xcoff.c:1100
 #, c-format
 msgid " %3u %3u "
 msgstr ""
 
-#: od-xcoff.c:1116
+#: od-xcoff.c:1109
 #, c-format
 msgid "(bad offset: %u)"
 msgstr ""
 
-#: od-xcoff.c:1123
+#: od-xcoff.c:1116
 #, c-format
 msgid "Dynamic relocs:\n"
 msgstr ""
 
-#: od-xcoff.c:1163
+#: od-xcoff.c:1117
+#, c-format
+msgid "  vaddr    sec    sz typ   sym\n"
+msgstr ""
+
+#: od-xcoff.c:1129
+#, c-format
+msgid "  %08x %3u %c%c %2u "
+msgstr ""
+
+#: od-xcoff.c:1140
+#, c-format
+msgid ".text"
+msgstr ""
+
+#: od-xcoff.c:1143
+#, c-format
+msgid ".data"
+msgstr ""
+
+#: od-xcoff.c:1146
+#, c-format
+msgid ".bss"
+msgstr ""
+
+#: od-xcoff.c:1149
+#, c-format
+msgid "%u"
+msgstr ""
+
+#: od-xcoff.c:1155
 #, c-format
 msgid "Import files:\n"
 msgstr ""
 
-#: od-xcoff.c:1195
+#: od-xcoff.c:1187
 #, c-format
 msgid "no .except section in file\n"
 msgstr ""
 
-#: od-xcoff.c:1203
+#: od-xcoff.c:1195
 #, c-format
 msgid "Exception table:\n"
 msgstr ""
 
-#: od-xcoff.c:1238
+#: od-xcoff.c:1196
+#, c-format
+msgid "lang reason sym/addr\n"
+msgstr ""
+
+#: od-xcoff.c:1204
+#, c-format
+msgid "  %02x     %02x "
+msgstr ""
+
+#: od-xcoff.c:1209
+#, c-format
+msgid "@%08x"
+msgstr ""
+
+#: od-xcoff.c:1229
 #, c-format
 msgid "no .typchk section in file\n"
 msgstr ""
 
-#: od-xcoff.c:1245
+#: od-xcoff.c:1236
 #, c-format
 msgid "Type-check section:\n"
 msgstr ""
 
-#: od-xcoff.c:1292
+#: od-xcoff.c:1237
+#, c-format
+msgid "offset    len  lang-id general-hash language-hash\n"
+msgstr ""
+
+#: od-xcoff.c:1282
 #, c-format
 msgid " address beyond section size\n"
 msgstr ""
 
-#: od-xcoff.c:1302
+#: od-xcoff.c:1292
 #, c-format
 msgid " tags at %08x\n"
 msgstr ""
 
-#: od-xcoff.c:1380
+#: od-xcoff.c:1299
+#, c-format
+msgid ""
+" version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, "
+"int_proc: %u\n"
+msgstr ""
+
+#: od-xcoff.c:1306
+#, c-format
+msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
+msgstr ""
+
+#: od-xcoff.c:1312
+#, c-format
+msgid ""
+" name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
+msgstr ""
+
+#: od-xcoff.c:1318
+#, c-format
+msgid ""
+" stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
+msgstr ""
+
+#: od-xcoff.c:1324
+#, c-format
+msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
+msgstr ""
+
+#: od-xcoff.c:1337
+#, c-format
+msgid " parminfo: 0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:1348
+#, c-format
+msgid " tb_offset: 0x%08x (start=0x%08x)\n"
+msgstr ""
+
+#: od-xcoff.c:1359
+#, c-format
+msgid " hand_mask_offset: 0x%08x\n"
+msgstr ""
+
+#: od-xcoff.c:1370
 #, c-format
 msgid " number of CTL anchors: %u\n"
 msgstr ""
 
-#: od-xcoff.c:1399
+#: od-xcoff.c:1375
+#, c-format
+msgid "  CTL[%u]: %08x\n"
+msgstr ""
+
+#: od-xcoff.c:1389
 #, c-format
 msgid " Name (len: %u): "
 msgstr ""
 
-#: od-xcoff.c:1402
+#: od-xcoff.c:1392
 #, c-format
 msgid "[truncated]\n"
 msgstr ""
 
-#: od-xcoff.c:1421
+#: od-xcoff.c:1407
+#, c-format
+msgid " alloca reg: %u\n"
+msgstr ""
+
+#: od-xcoff.c:1411
 #, c-format
 msgid " (end of tags at %08x)\n"
 msgstr ""
 
-#: od-xcoff.c:1424
+#: od-xcoff.c:1414
 #, c-format
 msgid " no tags found\n"
 msgstr ""
 
-#: od-xcoff.c:1428
+#: od-xcoff.c:1418
 #, c-format
 msgid " Truncated .text section\n"
 msgstr ""
 
-#: od-xcoff.c:1513
+#: od-xcoff.c:1503
 #, c-format
 msgid "TOC:\n"
 msgstr ""
 
-#: od-xcoff.c:1556
+#: od-xcoff.c:1546
 #, c-format
 msgid "Nbr entries: %-8u Size: %08x (%u)\n"
 msgstr ""
 
-#: od-xcoff.c:1640
+#: od-xcoff.c:1630
 msgid "cannot read header"
 msgstr ""
 
-#: od-xcoff.c:1648
+#: od-xcoff.c:1638
 #, c-format
 msgid "File header:\n"
 msgstr ""
 
-#: od-xcoff.c:1649
+#: od-xcoff.c:1639
 #, c-format
 msgid "  magic:         0x%04x (0%04o)  "
 msgstr ""
 
-#: od-xcoff.c:1653
+#: od-xcoff.c:1643
 #, c-format
 msgid "(WRMAGIC: writable text segments)"
 msgstr ""
 
-#: od-xcoff.c:1656
+#: od-xcoff.c:1646
 #, c-format
 msgid "(ROMAGIC: readonly sharablee text segments)"
 msgstr ""
 
-#: od-xcoff.c:1659
+#: od-xcoff.c:1649
 #, c-format
 msgid "(TOCMAGIC: readonly text segments and TOC)"
 msgstr ""
 
-#: od-xcoff.c:1662
+#: od-xcoff.c:1652
 #, c-format
 msgid "unknown magic"
 msgstr ""
 
-#: od-xcoff.c:1669
+#: od-xcoff.c:1659
 #, c-format
 msgid "  Unhandled magic\n"
 msgstr ""
@@ -4694,250 +4606,239 @@ msgstr ""
 msgid "Last stabs entries before error:\n"
 msgstr ""
 
-#: readelf.c:268
+#: readelf.c:265
 msgid "<none>"
 msgstr ""
 
-#: readelf.c:269
+#: readelf.c:266
 msgid "<no-name>"
 msgstr ""
 
-#: readelf.c:270 readelf.c:5083 readelf.c:5594 readelf.c:8132 readelf.c:8250
-#: readelf.c:9233 readelf.c:9327 readelf.c:9388 readelf.c:12391
-#: readelf.c:12394
+#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
+#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
+#: readelf.c:12153
 msgid "<corrupt>"
 msgstr ""
 
-#: readelf.c:309
+#: readelf.c:300
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr ""
 
-#: readelf.c:324
+#: readelf.c:315
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr ""
 
-#: readelf.c:334
+#: readelf.c:325
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr ""
 
-#: readelf.c:638
+#: readelf.c:625
 msgid "Don't know about relocations on this machine architecture\n"
 msgstr ""
 
-#: readelf.c:659 readelf.c:757
-msgid "32-bit relocation data"
+#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+msgid "relocs"
 msgstr ""
 
-#: readelf.c:671 readelf.c:701 readelf.c:768 readelf.c:797
+#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
 msgid "out of memory parsing relocs\n"
 msgstr ""
 
-#: readelf.c:689 readelf.c:786
-msgid "64-bit relocation data"
-msgstr ""
-
-#: readelf.c:902
+#: readelf.c:889
 #, c-format
 msgid ""
 " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr ""
 
-#: readelf.c:904
+#: readelf.c:891
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr ""
 
-#: readelf.c:909
+#: readelf.c:896
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr ""
 
-#: readelf.c:911
+#: readelf.c:898
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr ""
 
-#: readelf.c:919
+#: readelf.c:906
 #, c-format
 msgid ""
 "    Offset             Info             Type               Symbol's Value  "
 "Symbol's Name + Addend\n"
 msgstr ""
 
-#: readelf.c:921
+#: readelf.c:908
 #, c-format
 msgid ""
 "  Offset          Info           Type           Sym. Value    Sym. Name + "
 "Addend\n"
 msgstr ""
 
-#: readelf.c:926
+#: readelf.c:913
 #, c-format
 msgid ""
 "    Offset             Info             Type               Symbol's Value  "
 "Symbol's Name\n"
 msgstr ""
 
-#: readelf.c:928
+#: readelf.c:915
 #, c-format
 msgid ""
 "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr ""
 
-#: readelf.c:1245 readelf.c:1405 readelf.c:1413
+#: readelf.c:1219 readelf.c:1378 readelf.c:1386
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr ""
 
-#: readelf.c:1270
+#: readelf.c:1244
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr ""
 
-#: readelf.c:1277
+#: readelf.c:1251
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr ""
 
-#: readelf.c:1363
+#: readelf.c:1336
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr ""
 
-#: readelf.c:1365
+#: readelf.c:1338
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr ""
 
-#: readelf.c:1758
+#: readelf.c:1731
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr ""
 
-#: readelf.c:1782
+#: readelf.c:1755
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr ""
 
-#: readelf.c:1786 readelf.c:2858
+#: readelf.c:1759 readelf.c:2821
 #, c-format
 msgid "<unknown>: %lx"
 msgstr ""
 
-#: readelf.c:1799
+#: readelf.c:1772
 msgid "NONE (None)"
 msgstr ""
 
-#: readelf.c:1800
+#: readelf.c:1773
 msgid "REL (Relocatable file)"
 msgstr ""
 
-#: readelf.c:1801
+#: readelf.c:1774
 msgid "EXEC (Executable file)"
 msgstr ""
 
-#: readelf.c:1802
+#: readelf.c:1775
 msgid "DYN (Shared object file)"
 msgstr ""
 
-#: readelf.c:1803
+#: readelf.c:1776
 msgid "CORE (Core file)"
 msgstr ""
 
-#: readelf.c:1807
+#: readelf.c:1780
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr ""
 
-#: readelf.c:1809
+#: readelf.c:1782
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr ""
 
-#: readelf.c:1811
+#: readelf.c:1784 readelf.c:3068
 #, c-format
 msgid "<unknown>: %x"
 msgstr ""
 
-#: readelf.c:1823
+#: readelf.c:1796
 msgid "None"
 msgstr ""
 
-#: readelf.c:1994
+#: readelf.c:1964
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr ""
 
-#: readelf.c:2180
+#: readelf.c:2150
 msgid ", <unknown>"
 msgstr ""
 
-#: readelf.c:2266 readelf.c:7485
+#: readelf.c:2236 readelf.c:7428
 msgid "unknown"
 msgstr ""
 
-#: readelf.c:2267
+#: readelf.c:2237
 msgid "unknown mac"
 msgstr ""
 
-#: readelf.c:2331
+#: readelf.c:2301
 msgid ", relocatable"
 msgstr ""
 
-#: readelf.c:2334
+#: readelf.c:2304
 msgid ", relocatable-lib"
 msgstr ""
 
-#: readelf.c:2357
+#: readelf.c:2327
 msgid ", unknown v850 architecture variant"
 msgstr ""
 
-#: readelf.c:2414
+#: readelf.c:2384
 msgid ", unknown CPU"
 msgstr ""
 
-#: readelf.c:2429
+#: readelf.c:2399
 msgid ", unknown ABI"
 msgstr ""
 
-#: readelf.c:2452 readelf.c:2486
+#: readelf.c:2419 readelf.c:2453
 msgid ", unknown ISA"
 msgstr ""
 
-#: readelf.c:2663
+#: readelf.c:2626
 msgid "Standalone App"
 msgstr ""
 
-#: readelf.c:2672
+#: readelf.c:2635
 msgid "Bare-metal C6000"
 msgstr ""
 
-#: readelf.c:2682 readelf.c:3471 readelf.c:3487
+#: readelf.c:2645 readelf.c:3431 readelf.c:3447
 #, c-format
 msgid "<unknown: %x>"
 msgstr ""
 
-#. This message is probably going to be displayed in a 15
-#. character wide field, so put the hex value first.
-#: readelf.c:3108
-#, c-format
-msgid "%08x: <unknown>"
-msgstr ""
-
-#: readelf.c:3163
+#: readelf.c:3123
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr ""
 
-#: readelf.c:3164
+#: readelf.c:3124
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr ""
 
-#: readelf.c:3165
+#: readelf.c:3125
 #, c-format
 msgid ""
 " Options are:\n"
@@ -4980,7 +4881,7 @@ msgid ""
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 
-#: readelf.c:3197
+#: readelf.c:3157
 #, c-format
 msgid ""
 "  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
@@ -4988,14 +4889,14 @@ msgid ""
 "                         or deeper\n"
 msgstr ""
 
-#: readelf.c:3202
+#: readelf.c:3162
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
 "                         Disassemble the contents of section <number|name>\n"
 msgstr ""
 
-#: readelf.c:3206
+#: readelf.c:3166
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -5005,421 +4906,421 @@ msgid ""
 "  -v --version           Display the version number of readelf\n"
 msgstr ""
 
-#: readelf.c:3235 readelf.c:3264 readelf.c:3268 readelf.c:13623
+#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
 msgid "Out of memory allocating dump request table.\n"
 msgstr ""
 
-#: readelf.c:3440
+#: readelf.c:3400
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr ""
 
-#: readelf.c:3455
+#: readelf.c:3415
 msgid "Nothing to do.\n"
 msgstr ""
 
-#: readelf.c:3467 readelf.c:3483 readelf.c:8068
+#: readelf.c:3427 readelf.c:3443 readelf.c:8013
 msgid "none"
 msgstr ""
 
-#: readelf.c:3484
+#: readelf.c:3444
 msgid "2's complement, little endian"
 msgstr ""
 
-#: readelf.c:3485
+#: readelf.c:3445
 msgid "2's complement, big endian"
 msgstr ""
 
-#: readelf.c:3503
+#: readelf.c:3463
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
 msgstr ""
 
-#: readelf.c:3513
+#: readelf.c:3473
 #, c-format
 msgid "ELF Header:\n"
 msgstr ""
 
-#: readelf.c:3514
+#: readelf.c:3474
 #, c-format
 msgid "  Magic:   "
 msgstr ""
 
-#: readelf.c:3518
+#: readelf.c:3478
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr ""
 
-#: readelf.c:3520
+#: readelf.c:3480
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr ""
 
-#: readelf.c:3522
+#: readelf.c:3482
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr ""
 
-#: readelf.c:3527
+#: readelf.c:3487
 #, c-format
 msgid "<unknown: %lx>"
 msgstr ""
 
-#: readelf.c:3529
+#: readelf.c:3489
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr ""
 
-#: readelf.c:3531
+#: readelf.c:3491
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr ""
 
-#: readelf.c:3533
+#: readelf.c:3493
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr ""
 
-#: readelf.c:3535
+#: readelf.c:3495
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr ""
 
-#: readelf.c:3537
+#: readelf.c:3497
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr ""
 
-#: readelf.c:3540
+#: readelf.c:3500
 #, c-format
 msgid "  Entry point address:               "
 msgstr ""
 
-#: readelf.c:3542
+#: readelf.c:3502
 #, c-format
 msgid ""
 "\n"
 "  Start of program headers:          "
 msgstr ""
 
-#: readelf.c:3544
+#: readelf.c:3504
 #, c-format
 msgid ""
 " (bytes into file)\n"
 "  Start of section headers:          "
 msgstr ""
 
-#: readelf.c:3546
+#: readelf.c:3506
 #, c-format
 msgid " (bytes into file)\n"
 msgstr ""
 
-#: readelf.c:3548
+#: readelf.c:3508
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr ""
 
-#: readelf.c:3551
+#: readelf.c:3511
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr ""
 
-#: readelf.c:3553
+#: readelf.c:3513
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr ""
 
-#: readelf.c:3555
+#: readelf.c:3515
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr ""
 
-#: readelf.c:3562
+#: readelf.c:3522
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr ""
 
-#: readelf.c:3564
+#: readelf.c:3524
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr ""
 
-#: readelf.c:3569
+#: readelf.c:3529
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr ""
 
-#: readelf.c:3576
+#: readelf.c:3536
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr ""
 
-#: readelf.c:3610 readelf.c:3644
+#: readelf.c:3570 readelf.c:3604
 msgid "program headers"
 msgstr ""
 
-#: readelf.c:3711
+#: readelf.c:3671
 msgid ""
 "possibly corrupt ELF header - it has a non-zero program header offset, but "
 "no program headers"
 msgstr ""
 
-#: readelf.c:3714
+#: readelf.c:3674
 #, c-format
 msgid ""
 "\n"
 "There are no program headers in this file.\n"
 msgstr ""
 
-#: readelf.c:3720
+#: readelf.c:3680
 #, c-format
 msgid ""
 "\n"
 "Elf file type is %s\n"
 msgstr ""
 
-#: readelf.c:3721
+#: readelf.c:3681
 #, c-format
 msgid "Entry point "
 msgstr ""
 
-#: readelf.c:3723
+#: readelf.c:3683
 #, c-format
 msgid ""
 "\n"
 "There are %d program headers, starting at offset "
 msgstr ""
 
-#: readelf.c:3735 readelf.c:3737
+#: readelf.c:3695 readelf.c:3697
 #, c-format
 msgid ""
 "\n"
 "Program Headers:\n"
 msgstr ""
 
-#: readelf.c:3741
+#: readelf.c:3701
 #, c-format
 msgid ""
 "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr ""
 
-#: readelf.c:3744
+#: readelf.c:3704
 #, c-format
 msgid ""
 "  Type           Offset   VirtAddr           PhysAddr           FileSiz  "
 "MemSiz   Flg Align\n"
 msgstr ""
 
-#: readelf.c:3748
+#: readelf.c:3708
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr ""
 
-#: readelf.c:3750
+#: readelf.c:3710
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
 msgstr ""
 
-#: readelf.c:3843
+#: readelf.c:3803
 msgid "more than one dynamic segment\n"
 msgstr ""
 
-#: readelf.c:3862
+#: readelf.c:3822
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr ""
 
-#: readelf.c:3877
+#: readelf.c:3837
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr ""
 
-#: readelf.c:3880
+#: readelf.c:3840
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr ""
 
-#: readelf.c:3888
+#: readelf.c:3848
 msgid "Unable to find program interpreter name\n"
 msgstr ""
 
-#: readelf.c:3895
+#: readelf.c:3855
 msgid ""
 "Internal error: failed to create format string to display program "
 "interpreter\n"
 msgstr ""
 
-#: readelf.c:3899
+#: readelf.c:3859
 msgid "Unable to read program interpreter name\n"
 msgstr ""
 
-#: readelf.c:3902
+#: readelf.c:3862
 #, c-format
 msgid ""
 "\n"
 "      [Requesting program interpreter: %s]"
 msgstr ""
 
-#: readelf.c:3914
+#: readelf.c:3874
 #, c-format
 msgid ""
 "\n"
 " Section to Segment mapping:\n"
 msgstr ""
 
-#: readelf.c:3915
+#: readelf.c:3875
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr ""
 
-#: readelf.c:3951
+#: readelf.c:3911
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr ""
 
-#: readelf.c:3967
+#: readelf.c:3927
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr ""
 
-#: readelf.c:3982 readelf.c:4025
+#: readelf.c:3942 readelf.c:3985
 msgid "section headers"
 msgstr ""
 
-#: readelf.c:4074 readelf.c:4154
+#: readelf.c:4032 readelf.c:4107
 msgid "sh_entsize is zero\n"
 msgstr ""
 
-#: readelf.c:4082 readelf.c:4162
+#: readelf.c:4040 readelf.c:4115
 msgid "Invalid sh_entsize\n"
 msgstr ""
 
-#: readelf.c:4087 readelf.c:4167
+#: readelf.c:4045 readelf.c:4120
 msgid "symbols"
 msgstr ""
 
-#: readelf.c:4099 readelf.c:4178
-msgid "symbol table section indicies"
+#: readelf.c:4057 readelf.c:4132
+msgid "symtab shndx"
 msgstr ""
 
-#: readelf.c:4439
+#: readelf.c:4392
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr ""
 
-#: readelf.c:4461
+#: readelf.c:4414
 msgid ""
 "possibly corrupt ELF file header - it has a non-zero section header offset, "
 "but no section headers\n"
 msgstr ""
 
-#: readelf.c:4464
+#: readelf.c:4417
 #, c-format
 msgid ""
 "\n"
 "There are no sections in this file.\n"
 msgstr ""
 
-#: readelf.c:4470
+#: readelf.c:4423
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr ""
 
-#: readelf.c:4491 readelf.c:5079 readelf.c:5491 readelf.c:5797 readelf.c:6210
-#: readelf.c:7093 readelf.c:9213
+#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
+#: readelf.c:7036 readelf.c:9132
 msgid "string table"
 msgstr ""
 
-#: readelf.c:4558
+#: readelf.c:4511
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr ""
 
-#: readelf.c:4578
+#: readelf.c:4531
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr ""
 
-#: readelf.c:4590
+#: readelf.c:4544
 msgid "File contains multiple dynamic string tables\n"
 msgstr ""
 
-#: readelf.c:4596
+#: readelf.c:4550
 msgid "dynamic strings"
 msgstr ""
 
-#: readelf.c:4603
+#: readelf.c:4557
 msgid "File contains multiple symtab shndx tables\n"
 msgstr ""
 
-#: readelf.c:4674
+#: readelf.c:4627
 #, c-format
 msgid ""
 "\n"
 "Section Headers:\n"
 msgstr ""
 
-#: readelf.c:4676
+#: readelf.c:4629
 #, c-format
 msgid ""
 "\n"
 "Section Header:\n"
 msgstr ""
 
-#: readelf.c:4682 readelf.c:4693 readelf.c:4704
+#: readelf.c:4635 readelf.c:4646 readelf.c:4657
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr ""
 
-#: readelf.c:4683
+#: readelf.c:4636
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4687
+#: readelf.c:4640
 #, c-format
 msgid ""
 "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk "
 "Inf Al\n"
 msgstr ""
 
-#: readelf.c:4694
+#: readelf.c:4647
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4698
+#: readelf.c:4651
 #, c-format
 msgid ""
 "  [Nr] Name              Type            Address          Off    Size   ES "
 "Flg Lk Inf Al\n"
 msgstr ""
 
-#: readelf.c:4705
+#: readelf.c:4658
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr ""
 
-#: readelf.c:4706
+#: readelf.c:4659
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr ""
 
-#: readelf.c:4710
+#: readelf.c:4663
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr ""
 
-#: readelf.c:4711
+#: readelf.c:4664
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr ""
 
-#: readelf.c:4716
+#: readelf.c:4669
 #, c-format
 msgid "       Flags\n"
 msgstr ""
 
-#: readelf.c:4796
+#: readelf.c:4748
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr ""
 
-#: readelf.c:4896
+#: readelf.c:4847
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5428,7 +5329,7 @@ msgid ""
 "  O (extra OS processing required) o (OS specific), p (processor specific)\n"
 msgstr ""
 
-#: readelf.c:4901
+#: readelf.c:4852
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5437,830 +5338,837 @@ msgid ""
 "  O (extra OS processing required) o (OS specific), p (processor specific)\n"
 msgstr ""
 
-#: readelf.c:4923
+#: readelf.c:4874
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr ""
 
-#: readelf.c:4949
+#: readelf.c:4899
 #, c-format
 msgid ""
 "\n"
 "There are no sections to group in this file.\n"
 msgstr ""
 
-#: readelf.c:4956
+#: readelf.c:4906
 msgid "Section headers are not available!\n"
 msgstr ""
 
-#: readelf.c:4980
+#: readelf.c:4930
 #, c-format
 msgid ""
 "\n"
 "There are no section groups in this file.\n"
 msgstr ""
 
-#: readelf.c:5018
+#: readelf.c:4967
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
 msgstr ""
 
-#: readelf.c:5032
+#: readelf.c:4981
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr ""
 
-#: readelf.c:5038 readelf.c:5049
+#: readelf.c:4992
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr ""
 
-#: readelf.c:5088
+#: readelf.c:5031
 msgid "section data"
 msgstr ""
 
-#: readelf.c:5099
+#: readelf.c:5040
 #, c-format
 msgid ""
 "\n"
 "%sgroup section [%5u] `%s' [%s] contains %u sections:\n"
 msgstr ""
 
-#: readelf.c:5102
+#: readelf.c:5043
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr ""
 
-#: readelf.c:5116
+#: readelf.c:5057
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr ""
 
-#: readelf.c:5125
+#: readelf.c:5066
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr ""
 
-#: readelf.c:5138
+#: readelf.c:5079
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr ""
 
-#: readelf.c:5205
+#: readelf.c:5146
 msgid "dynamic section image fixups"
 msgstr ""
 
-#: readelf.c:5217
+#: readelf.c:5158
 #, c-format
 msgid ""
 "\n"
 "Image fixups for needed library #%d: %s - ident: %lx\n"
 msgstr ""
 
-#: readelf.c:5220
+#: readelf.c:5161
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr ""
 
-#: readelf.c:5252
-msgid "dynamic section image relocations"
+#: readelf.c:5193
+msgid "dynamic section image relas"
 msgstr ""
 
-#: readelf.c:5256
+#: readelf.c:5197
 #, c-format
 msgid ""
 "\n"
 "Image relocs\n"
 msgstr ""
 
-#: readelf.c:5258
+#: readelf.c:5199
 #, c-format
 msgid ""
 "Seg Offset   Type                            Addend            Seg Sym Off\n"
 msgstr ""
 
-#: readelf.c:5313
+#: readelf.c:5254
 msgid "dynamic string section"
 msgstr ""
 
-#: readelf.c:5414
+#: readelf.c:5355
 #, c-format
 msgid ""
 "\n"
 "'%s' relocation section at offset 0x%lx contains %ld bytes:\n"
 msgstr ""
 
-#: readelf.c:5429
+#: readelf.c:5370
 #, c-format
 msgid ""
 "\n"
 "There are no dynamic relocations in this file.\n"
 msgstr ""
 
-#: readelf.c:5453
+#: readelf.c:5394
 #, c-format
 msgid ""
 "\n"
 "Relocation section "
 msgstr ""
 
-#: readelf.c:5460 readelf.c:5890 readelf.c:6227
+#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#, c-format
+msgid "'%s'"
+msgstr ""
+
+#: readelf.c:5401 readelf.c:5832 readelf.c:6169
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:5510
+#: readelf.c:5452
 #, c-format
 msgid ""
 "\n"
 "There are no relocations in this file.\n"
 msgstr ""
 
-#: readelf.c:5648
+#: readelf.c:5590
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr ""
 
-#: readelf.c:5701 readelf.c:6074
+#: readelf.c:5643 readelf.c:6016
 msgid "unwind table"
 msgstr ""
 
-#: readelf.c:5743 readelf.c:6156 readelf.c:6415
+#: readelf.c:5685 readelf.c:6098 readelf.c:6358
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr ""
 
-#: readelf.c:5805 readelf.c:6218 readelf.c:7101 readelf.c:7148
+#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
 #, c-format
 msgid ""
 "\n"
 "There are no unwind sections in this file.\n"
 msgstr ""
 
-#: readelf.c:5868
+#: readelf.c:5810
 #, c-format
 msgid ""
 "\n"
 "Could not find unwind info section for "
 msgstr ""
 
-#: readelf.c:5873 readelf.c:5888 readelf.c:6225
-#, c-format
-msgid "'%s'"
-msgstr ""
-
-#: readelf.c:5880
+#: readelf.c:5823
 msgid "unwind info"
 msgstr ""
 
-#: readelf.c:5883 readelf.c:6224
+#: readelf.c:5825 readelf.c:6166
 #, c-format
 msgid ""
 "\n"
 "Unwind section "
 msgstr ""
 
-#: readelf.c:6333
+#: readelf.c:6275
 msgid "unwind data"
 msgstr ""
 
-#: readelf.c:6386
+#: readelf.c:6329
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
 msgstr ""
 
-#: readelf.c:6490
+#: readelf.c:6433
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr ""
 
-#: readelf.c:6534 readelf.c:6734
+#: readelf.c:6477 readelf.c:6677
 #, c-format
 msgid "Refuse to unwind"
 msgstr ""
 
-#: readelf.c:6557
+#: readelf.c:6500
 #, c-format
 msgid "     [Reserved]"
 msgstr ""
 
-#: readelf.c:6585
+#: readelf.c:6528
 #, c-format
 msgid "     finish"
 msgstr ""
 
-#: readelf.c:6590 readelf.c:6676
+#: readelf.c:6533 readelf.c:6619
 #, c-format
 msgid "[Spare]"
 msgstr ""
 
-#: readelf.c:6697 readelf.c:6831
+#: readelf.c:6640 readelf.c:6774
 #, c-format
 msgid "     [unsupported opcode]"
 msgstr ""
 
-#: readelf.c:6781
+#: readelf.c:6666
+#, c-format
+msgid "  0x%02x "
+msgstr ""
+
+#: readelf.c:6671
+#, c-format
+msgid "     sp = sp + %d"
+msgstr ""
+
+#: readelf.c:6724
 #, c-format
 msgid "pop frame {"
 msgstr ""
 
-#: readelf.c:6792
+#: readelf.c:6735
 msgid "[pad]"
 msgstr ""
 
-#: readelf.c:6820
+#: readelf.c:6763
 #, c-format
 msgid "sp = sp + %ld"
 msgstr ""
 
-#: readelf.c:6878
+#: readelf.c:6821
 #, c-format
 msgid "  Personality routine: "
 msgstr ""
 
-#: readelf.c:6896
+#: readelf.c:6839
 #, c-format
 msgid "  [Truncated data]\n"
 msgstr ""
 
-#: readelf.c:6911
+#: readelf.c:6854
 #, c-format
 msgid "  Compact model %d\n"
 msgstr ""
 
-#: readelf.c:6947
+#: readelf.c:6890
 #, c-format
 msgid "  Restore stack from frame pointer\n"
 msgstr ""
 
-#: readelf.c:6949
+#: readelf.c:6892
 #, c-format
 msgid "  Stack increment %d\n"
 msgstr ""
 
-#: readelf.c:6950
+#: readelf.c:6893
 #, c-format
 msgid "  Registers restored: "
 msgstr ""
 
-#: readelf.c:6955
+#: readelf.c:6898
 #, c-format
 msgid "  Return register: %s\n"
 msgstr ""
 
-#: readelf.c:7038
+#: readelf.c:6981
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr ""
 
-#: readelf.c:7107
+#: readelf.c:7050
 #, c-format
 msgid ""
 "\n"
 "Unwind table index '%s' at offset 0x%lx contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:7159
+#: readelf.c:7102
 #, c-format
 msgid "NONE\n"
 msgstr ""
 
-#: readelf.c:7185
+#: readelf.c:7128
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr ""
 
-#: readelf.c:7187
+#: readelf.c:7130
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr ""
 
-#: readelf.c:7200
+#: readelf.c:7143
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr ""
 
-#: readelf.c:7377 readelf.c:7423
+#: readelf.c:7320 readelf.c:7366
 msgid "dynamic section"
 msgstr ""
 
-#: readelf.c:7501
+#: readelf.c:7444
 #, c-format
 msgid ""
 "\n"
 "There is no dynamic section in this file.\n"
 msgstr ""
 
-#: readelf.c:7539
+#: readelf.c:7482
 msgid "Unable to seek to end of file!\n"
 msgstr ""
 
-#: readelf.c:7552
+#: readelf.c:7495
 msgid "Unable to determine the number of symbols to load\n"
 msgstr ""
 
-#: readelf.c:7585
+#: readelf.c:7530
 msgid "Unable to seek to end of file\n"
 msgstr ""
 
-#: readelf.c:7592
+#: readelf.c:7537
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr ""
 
-#: readelf.c:7598
+#: readelf.c:7543
 msgid "dynamic string table"
 msgstr ""
 
-#: readelf.c:7635
+#: readelf.c:7580
 msgid "symbol information"
 msgstr ""
 
-#: readelf.c:7660
+#: readelf.c:7605
 #, c-format
 msgid ""
 "\n"
 "Dynamic section at offset 0x%lx contains %u entries:\n"
 msgstr ""
 
-#: readelf.c:7663
+#: readelf.c:7608
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr ""
 
-#: readelf.c:7699
+#: readelf.c:7644
 #, c-format
 msgid "Auxiliary library"
 msgstr ""
 
-#: readelf.c:7703
+#: readelf.c:7648
 #, c-format
 msgid "Filter library"
 msgstr ""
 
-#: readelf.c:7707
+#: readelf.c:7652
 #, c-format
 msgid "Configuration file"
 msgstr ""
 
-#: readelf.c:7711
+#: readelf.c:7656
 #, c-format
 msgid "Dependency audit library"
 msgstr ""
 
-#: readelf.c:7715
+#: readelf.c:7660
 #, c-format
 msgid "Audit library"
 msgstr ""
 
-#: readelf.c:7733 readelf.c:7761 readelf.c:7789
+#: readelf.c:7678 readelf.c:7706 readelf.c:7734
 #, c-format
 msgid "Flags:"
 msgstr ""
 
-#: readelf.c:7736 readelf.c:7764 readelf.c:7791
+#: readelf.c:7681 readelf.c:7709 readelf.c:7736
 #, c-format
 msgid " None\n"
 msgstr ""
 
-#: readelf.c:7912
+#: readelf.c:7857
 #, c-format
 msgid "Shared library: [%s]"
 msgstr ""
 
-#: readelf.c:7915
+#: readelf.c:7860
 #, c-format
 msgid " program interpreter"
 msgstr ""
 
-#: readelf.c:7919
+#: readelf.c:7864
 #, c-format
 msgid "Library soname: [%s]"
 msgstr ""
 
-#: readelf.c:7923
+#: readelf.c:7868
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr ""
 
-#: readelf.c:7927
+#: readelf.c:7872
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr ""
 
-#: readelf.c:7960
+#: readelf.c:7905
 #, c-format
 msgid " (bytes)\n"
 msgstr ""
 
-#: readelf.c:7990
+#: readelf.c:7935
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr ""
 
-#: readelf.c:8090
+#: readelf.c:8035
 msgid "| <unknown>"
 msgstr ""
 
-#: readelf.c:8123
+#: readelf.c:8068
 #, c-format
 msgid ""
 "\n"
 "Version definition section '%s' contains %u entries:\n"
 msgstr ""
 
-#: readelf.c:8126
+#: readelf.c:8071
 #, c-format
 msgid "  Addr: 0x"
 msgstr ""
 
-#: readelf.c:8128 readelf.c:8246 readelf.c:8390
+#: readelf.c:8073 readelf.c:8191 readelf.c:8332
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr ""
 
-#: readelf.c:8136
+#: readelf.c:8081
 msgid "version definition section"
 msgstr ""
 
-#: readelf.c:8169
+#: readelf.c:8114
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr ""
 
-#: readelf.c:8172
+#: readelf.c:8117
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr ""
 
-#: readelf.c:8188
+#: readelf.c:8133
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: readelf.c:8190
+#: readelf.c:8135
 #, c-format
 msgid "Name index: %ld\n"
 msgstr ""
 
-#: readelf.c:8212
+#: readelf.c:8157
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr ""
 
-#: readelf.c:8215
+#: readelf.c:8160
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr ""
 
-#: readelf.c:8220
+#: readelf.c:8165
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr ""
 
-#: readelf.c:8226
+#: readelf.c:8171
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr ""
 
-#: readelf.c:8241
+#: readelf.c:8186
 #, c-format
 msgid ""
 "\n"
 "Version needs section '%s' contains %u entries:\n"
 msgstr ""
 
-#: readelf.c:8244
+#: readelf.c:8189
 #, c-format
 msgid " Addr: 0x"
 msgstr ""
 
-#: readelf.c:8255
-msgid "Version Needs section"
+#: readelf.c:8200
+msgid "version need section"
 msgstr ""
 
-#: readelf.c:8283
+#: readelf.c:8228
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr ""
 
-#: readelf.c:8286
+#: readelf.c:8231
 #, c-format
 msgid "  File: %s"
 msgstr ""
 
-#: readelf.c:8288
+#: readelf.c:8233
 #, c-format
 msgid "  File: %lx"
 msgstr ""
 
-#: readelf.c:8290
+#: readelf.c:8235
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr ""
 
-#: readelf.c:8315
+#: readelf.c:8260
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr ""
 
-#: readelf.c:8318
+#: readelf.c:8263
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr ""
 
-#: readelf.c:8321
+#: readelf.c:8266
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr ""
 
-#: readelf.c:8334
-msgid "Missing Version Needs auxillary information\n"
+#: readelf.c:8278
+#, c-format
+msgid "  Version need aux past end of section\n"
 msgstr ""
 
-#: readelf.c:8340
-msgid "Missing Version Needs information\n"
+#: readelf.c:8283
+#, c-format
+msgid "  Version need past end of section\n"
 msgstr ""
 
-#: readelf.c:8378
+#: readelf.c:8320
 msgid "version string table"
 msgstr ""
 
-#: readelf.c:8385
+#: readelf.c:8327
 #, c-format
 msgid ""
 "\n"
 "Version symbols section '%s' contains %d entries:\n"
 msgstr ""
 
-#: readelf.c:8388
+#: readelf.c:8330
 #, c-format
 msgid " Addr: "
 msgstr ""
 
-#: readelf.c:8399
+#: readelf.c:8341
 msgid "version symbol data"
 msgstr ""
 
-#: readelf.c:8427
+#: readelf.c:8369
 msgid "   0 (*local*)    "
 msgstr ""
 
-#: readelf.c:8431
+#: readelf.c:8373
 msgid "   1 (*global*)   "
 msgstr ""
 
-#: readelf.c:8442
+#: readelf.c:8386
 msgid "invalid index into symbol array\n"
 msgstr ""
 
-#: readelf.c:8476 readelf.c:9279
+#: readelf.c:8420 readelf.c:9199
 msgid "version need"
 msgstr ""
 
-#: readelf.c:8487
+#: readelf.c:8430
 msgid "version need aux (2)"
 msgstr ""
 
-#: readelf.c:8508 readelf.c:8570
+#: readelf.c:8445 readelf.c:8500
 msgid "*invalid*"
 msgstr ""
 
-#: readelf.c:8538 readelf.c:9357
+#: readelf.c:8475 readelf.c:9264
 msgid "version def"
 msgstr ""
 
-#: readelf.c:8564 readelf.c:9379
+#: readelf.c:8495 readelf.c:9279
 msgid "version def aux"
 msgstr ""
 
-#: readelf.c:8599
+#: readelf.c:8529
 #, c-format
 msgid ""
 "\n"
 "No version information found in this file.\n"
 msgstr ""
 
-#: readelf.c:8807
+#: readelf.c:8728
 #, c-format
 msgid "<other>: %x"
 msgstr ""
 
-#: readelf.c:8869
+#: readelf.c:8789
 msgid "Unable to read in dynamic data\n"
 msgstr ""
 
-#: readelf.c:8919
+#: readelf.c:8839
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr ""
 
-#: readelf.c:8962 readelf.c:9014 readelf.c:9038 readelf.c:9068 readelf.c:9092
+#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
 msgid "Unable to seek to start of dynamic information\n"
 msgstr ""
 
-#: readelf.c:8968 readelf.c:9020
+#: readelf.c:8888 readelf.c:8940
 msgid "Failed to read in number of buckets\n"
 msgstr ""
 
-#: readelf.c:8974
+#: readelf.c:8894
 msgid "Failed to read in number of chains\n"
 msgstr ""
 
-#: readelf.c:9076
+#: readelf.c:8996
 msgid "Failed to determine last chain length\n"
 msgstr ""
 
-#: readelf.c:9120
+#: readelf.c:9040
 #, c-format
 msgid ""
 "\n"
 "Symbol table for image:\n"
 msgstr ""
 
-#: readelf.c:9122 readelf.c:9140
+#: readelf.c:9042 readelf.c:9060
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9124 readelf.c:9142
+#: readelf.c:9044 readelf.c:9062
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9138
+#: readelf.c:9058
 #, c-format
 msgid ""
 "\n"
 "Symbol table of `.gnu.hash' for image:\n"
 msgstr ""
 
-#: readelf.c:9182
+#: readelf.c:9101
 #, c-format
 msgid ""
 "\n"
 "Symbol table '%s' has a sh_entsize of zero!\n"
 msgstr ""
 
-#: readelf.c:9187
+#: readelf.c:9106
 #, c-format
 msgid ""
 "\n"
 "Symbol table '%s' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:9192
+#: readelf.c:9111
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9194
+#: readelf.c:9113
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr ""
 
-#: readelf.c:9249
+#: readelf.c:9170
 msgid "version data"
 msgstr ""
 
-#: readelf.c:9298
+#: readelf.c:9212
 msgid "version need aux (3)"
 msgstr ""
 
-#: readelf.c:9332
+#: readelf.c:9239
 msgid "bad dynamic symbol\n"
 msgstr ""
 
-#: readelf.c:9404
+#: readelf.c:9303
 #, c-format
 msgid ""
 "\n"
 "Dynamic symbol information is not available for displaying symbols.\n"
 msgstr ""
 
-#: readelf.c:9416
+#: readelf.c:9315
 #, c-format
 msgid ""
 "\n"
 "Histogram for bucket list length (total of %lu buckets):\n"
 msgstr ""
 
-#: readelf.c:9418 readelf.c:9488
+#: readelf.c:9317 readelf.c:9387
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr ""
 
-#: readelf.c:9486
+#: readelf.c:9385
 #, c-format
 msgid ""
 "\n"
 "Histogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"
 msgstr ""
 
-#: readelf.c:9552
+#: readelf.c:9451
 #, c-format
 msgid ""
 "\n"
 "Dynamic info segment at offset 0x%lx contains %d entries:\n"
 msgstr ""
 
-#: readelf.c:9555
+#: readelf.c:9454
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr ""
 
-#: readelf.c:9564
+#: readelf.c:9463
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr ""
 
-#: readelf.c:9646
+#: readelf.c:9545
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
 msgstr ""
 
-#: readelf.c:9813
+#: readelf.c:9705
 #, c-format
 msgid ""
 "Missing knowledge of 32-bit reloc types used in DWARF sections of machine "
 "number %d\n"
 msgstr ""
 
-#: readelf.c:10138
+#: readelf.c:10009
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
 msgstr ""
 
-#: readelf.c:10146
+#: readelf.c:10017
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
 msgstr ""
 
-#: readelf.c:10155
-#, c-format
-msgid "skipping invalid relocation symbol index 0x%lx in section %s\n"
-msgstr ""
-
-#: readelf.c:10177
+#: readelf.c:10041
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
 msgstr ""
 
-#: readelf.c:10223
+#: readelf.c:10087
 #, c-format
 msgid ""
 "\n"
 "Assembly dump of section %s\n"
 msgstr ""
 
-#: readelf.c:10244
+#: readelf.c:10108
 #, c-format
 msgid ""
 "\n"
 "Section '%s' has no data to dump.\n"
 msgstr ""
 
-#: readelf.c:10250
+#: readelf.c:10114
 msgid "section contents"
 msgstr ""
 
-#: readelf.c:10269
+#: readelf.c:10133
 #, c-format
 msgid ""
 "\n"
 "String dump of section '%s':\n"
 msgstr ""
 
-#: readelf.c:10287
+#: readelf.c:10151
 #, c-format
 msgid ""
 "  Note: This section has relocations against it, but these have NOT been "
 "applied to this dump.\n"
 msgstr ""
 
-#: readelf.c:10318
+#: readelf.c:10182
 #, c-format
 msgid "  No strings found in this section."
 msgstr ""
 
-#: readelf.c:10340
+#: readelf.c:10204
 #, c-format
 msgid ""
 "\n"
 "Hex dump of section '%s':\n"
 msgstr ""
 
-#: readelf.c:10364
+#: readelf.c:10228
 #, c-format
 msgid ""
 " NOTE: This section has relocations against it, but these have NOT been "
 "applied to this dump.\n"
 msgstr ""
 
-#: readelf.c:10498
+#: readelf.c:10362
 #, c-format
 msgid "%s section data"
 msgstr ""
 
-#: readelf.c:10568
+#: readelf.c:10427
 #, c-format
 msgid ""
 "\n"
@@ -6271,820 +6179,851 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10577
+#: readelf.c:10436
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
 msgstr ""
 
-#: readelf.c:10613
+#: readelf.c:10472
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr ""
 
-#: readelf.c:10641
+#: readelf.c:10500
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr ""
 
-#: readelf.c:10682
+#: readelf.c:10541
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr ""
 
-#: readelf.c:10860 readelf.c:10874 readelf.c:10893 readelf.c:11293
+#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
 #, c-format
 msgid "None\n"
 msgstr ""
 
-#: readelf.c:10861
+#: readelf.c:10720
 #, c-format
 msgid "Application\n"
 msgstr ""
 
-#: readelf.c:10862
+#: readelf.c:10721
 #, c-format
 msgid "Realtime\n"
 msgstr ""
 
-#: readelf.c:10863
+#: readelf.c:10722
 #, c-format
 msgid "Microcontroller\n"
 msgstr ""
 
-#: readelf.c:10864
+#: readelf.c:10723
 #, c-format
 msgid "Application or Realtime\n"
 msgstr ""
 
-#: readelf.c:10875 readelf.c:10895 readelf.c:11347 readelf.c:11365
-#: readelf.c:11440 readelf.c:11461
+#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
+#: readelf.c:11217 readelf.c:11238
 #, c-format
 msgid "8-byte\n"
 msgstr ""
 
-#: readelf.c:10876 readelf.c:11443 readelf.c:11464
+#: readelf.c:10735 readelf.c:11220 readelf.c:11241
 #, c-format
 msgid "4-byte\n"
 msgstr ""
 
-#: readelf.c:10880 readelf.c:10899
+#: readelf.c:10739 readelf.c:10758
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr ""
 
-#: readelf.c:10894
+#: readelf.c:10753
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr ""
 
-#: readelf.c:10910 readelf.c:11000 readelf.c:11479
+#: readelf.c:10769 readelf.c:10859 readelf.c:11256
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr ""
 
-#: readelf.c:10916
+#: readelf.c:10775
 #, c-format
 msgid "True\n"
 msgstr ""
 
-#: readelf.c:11045 readelf.c:11231
+#: readelf.c:10904 readelf.c:11008
 #, c-format
 msgid "Hard or soft float\n"
 msgstr ""
 
-#: readelf.c:11048
+#: readelf.c:10907
 #, c-format
 msgid "Hard float\n"
 msgstr ""
 
-#: readelf.c:11051 readelf.c:11240
+#: readelf.c:10910 readelf.c:11017
 #, c-format
 msgid "Soft float\n"
 msgstr ""
 
-#: readelf.c:11054
+#: readelf.c:10913
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr ""
 
-#: readelf.c:11071 readelf.c:11097
+#: readelf.c:10930 readelf.c:10956
 #, c-format
 msgid "Any\n"
 msgstr ""
 
-#: readelf.c:11074
+#: readelf.c:10933
 #, c-format
 msgid "Generic\n"
 msgstr ""
 
-#: readelf.c:11103
+#: readelf.c:10962
 #, c-format
 msgid "Memory\n"
 msgstr ""
 
-#: readelf.c:11234
+#: readelf.c:11011
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr ""
 
-#: readelf.c:11237
+#: readelf.c:11014
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr ""
 
-#: readelf.c:11243
+#: readelf.c:11020
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr ""
 
-#: readelf.c:11326
+#: readelf.c:11103
 #, c-format
 msgid "Not used\n"
 msgstr ""
 
-#: readelf.c:11329
+#: readelf.c:11106
 #, c-format
 msgid "2 bytes\n"
 msgstr ""
 
-#: readelf.c:11332
+#: readelf.c:11109
 #, c-format
 msgid "4 bytes\n"
 msgstr ""
 
-#: readelf.c:11350 readelf.c:11368 readelf.c:11446 readelf.c:11467
+#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
 #, c-format
 msgid "16-byte\n"
 msgstr ""
 
-#: readelf.c:11383
+#: readelf.c:11160
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr ""
 
-#: readelf.c:11386
+#: readelf.c:11163
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr ""
 
-#: readelf.c:11401
+#: readelf.c:11178
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr ""
 
-#: readelf.c:11404
+#: readelf.c:11181
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr ""
 
-#: readelf.c:11407
+#: readelf.c:11184
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr ""
 
-#: readelf.c:11422
+#: readelf.c:11199
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr ""
 
-#: readelf.c:11425
+#: readelf.c:11202
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr ""
 
-#: readelf.c:11531
+#: readelf.c:11308
 msgid "attributes"
 msgstr ""
 
-#: readelf.c:11552
+#: readelf.c:11329
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr ""
 
-#: readelf.c:11558
+#: readelf.c:11335
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr ""
 
-#: readelf.c:11583
+#: readelf.c:11360
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr ""
 
-#: readelf.c:11595
+#: readelf.c:11372
 #, c-format
 msgid "File Attributes\n"
 msgstr ""
 
-#: readelf.c:11598
+#: readelf.c:11375
 #, c-format
 msgid "Section Attributes:"
 msgstr ""
 
-#: readelf.c:11601
+#: readelf.c:11378
 #, c-format
 msgid "Symbol Attributes:"
 msgstr ""
 
-#: readelf.c:11616
+#: readelf.c:11393
 #, c-format
 msgid "Unknown tag: %d\n"
 msgstr ""
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11635
+#: readelf.c:11412
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr ""
 
-#: readelf.c:11642
+#: readelf.c:11419
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr ""
 
-#: readelf.c:11693 readelf.c:11715
+#: readelf.c:11463 readelf.c:11485
 msgid "<unknown>"
 msgstr ""
 
-#: readelf.c:11810 readelf.c:12344
-msgid "liblist section data"
+#: readelf.c:11580 readelf.c:12102
+msgid "liblist"
 msgstr ""
 
-#: readelf.c:11813
+#: readelf.c:11583
 #, c-format
 msgid ""
 "\n"
 "Section '.liblist' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:11815
+#: readelf.c:11585
 msgid ""
 "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr ""
 
-#: readelf.c:11841
+#: readelf.c:11611
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr ""
 
-#: readelf.c:11846
+#: readelf.c:11616
 msgid " NONE"
 msgstr ""
 
-#: readelf.c:11897
+#: readelf.c:11667
 msgid "options"
 msgstr ""
 
-#: readelf.c:11928
+#: readelf.c:11698
 #, c-format
 msgid ""
 "\n"
 "Section '%s' contains %d entries:\n"
 msgstr ""
 
-#: readelf.c:12089
+#: readelf.c:11859
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr ""
 
-#: readelf.c:12106 readelf.c:12121
+#: readelf.c:11876 readelf.c:11891
 msgid "conflict"
 msgstr ""
 
-#: readelf.c:12131
+#: readelf.c:11901
 #, c-format
 msgid ""
 "\n"
 "Section '.conflict' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:12133
+#: readelf.c:11903
 msgid "  Num:    Index       Value  Name"
 msgstr ""
 
-#: readelf.c:12145 readelf.c:12234 readelf.c:12305
+#: readelf.c:11915 readelf.c:11995 readelf.c:12063
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr ""
 
-#: readelf.c:12167
-msgid "Global Offset Table data"
+#: readelf.c:11936
+msgid "GOT"
 msgstr ""
 
-#: readelf.c:12171
+#: readelf.c:11937
 #, c-format
 msgid ""
 "\n"
 "Primary GOT:\n"
 msgstr ""
 
-#: readelf.c:12172
+#: readelf.c:11938
 #, c-format
 msgid " Canonical gp value: "
 msgstr ""
 
-#: readelf.c:12176 readelf.c:12276
+#: readelf.c:11942 readelf.c:12034
 #, c-format
 msgid " Reserved entries:\n"
 msgstr ""
 
-#: readelf.c:12177
+#: readelf.c:11943
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr ""
 
-#: readelf.c:12178 readelf.c:12195 readelf.c:12211 readelf.c:12278
-#: readelf.c:12287
+#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
+#: readelf.c:12045
 msgid "Address"
 msgstr ""
 
-#: readelf.c:12178 readelf.c:12195 readelf.c:12212
+#: readelf.c:11944 readelf.c:11961 readelf.c:11977
 msgid "Access"
 msgstr ""
 
-#: readelf.c:12179 readelf.c:12196 readelf.c:12213 readelf.c:12278
-#: readelf.c:12288
+#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
+#: readelf.c:12046
 msgid "Initial"
 msgstr ""
 
-#: readelf.c:12181
+#: readelf.c:11947
 #, c-format
 msgid " Lazy resolver\n"
 msgstr ""
 
-#: readelf.c:12187
+#: readelf.c:11953
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr ""
 
-#: readelf.c:12193
+#: readelf.c:11959
 #, c-format
 msgid " Local entries:\n"
 msgstr ""
 
-#: readelf.c:12209
+#: readelf.c:11975
 #, c-format
 msgid " Global entries:\n"
 msgstr ""
 
-#: readelf.c:12214 readelf.c:12289
+#: readelf.c:11979 readelf.c:12047
 msgid "Sym.Val."
 msgstr ""
 
-#. Note for translators: "Ndx" = abbreviated form of "Index".
-#: readelf.c:12217 readelf.c:12289
+#: readelf.c:11979 readelf.c:12047
+msgid "Type"
+msgstr ""
+
+#: readelf.c:11979 readelf.c:12047
 msgid "Ndx"
 msgstr ""
 
-#: readelf.c:12217 readelf.c:12289
+#: readelf.c:11979 readelf.c:12047
 msgid "Name"
 msgstr ""
 
-#: readelf.c:12271
-msgid "Procedure Linkage Table data"
+#: readelf.c:12032
+msgid "PLT GOT"
+msgstr ""
+
+#: readelf.c:12033
+#, c-format
+msgid ""
+"\n"
+"PLT GOT:\n"
+"\n"
 msgstr ""
 
-#: readelf.c:12277
+#: readelf.c:12035
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr ""
 
-#: readelf.c:12280
+#: readelf.c:12038
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr ""
 
-#: readelf.c:12282
+#: readelf.c:12040
 #, c-format
 msgid " Module pointer\n"
 msgstr ""
 
-#: readelf.c:12285
+#: readelf.c:12043
 #, c-format
 msgid " Entries:\n"
 msgstr ""
 
-#: readelf.c:12352
+#: readelf.c:12110
 msgid "liblist string table"
 msgstr ""
 
-#: readelf.c:12362
+#: readelf.c:12121
 #, c-format
 msgid ""
 "\n"
 "Library list section '%s' contains %lu entries:\n"
 msgstr ""
 
-#: readelf.c:12366
+#: readelf.c:12125
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr ""
 
-#: readelf.c:12416
+#: readelf.c:12175
 msgid "NT_AUXV (auxiliary vector)"
 msgstr ""
 
-#: readelf.c:12418
+#: readelf.c:12177
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr ""
 
-#: readelf.c:12420
+#: readelf.c:12179
 msgid "NT_FPREGSET (floating point registers)"
 msgstr ""
 
-#: readelf.c:12422
+#: readelf.c:12181
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr ""
 
-#: readelf.c:12424
+#: readelf.c:12183
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr ""
 
-#: readelf.c:12426
+#: readelf.c:12185
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr ""
 
-#: readelf.c:12428
+#: readelf.c:12187
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr ""
 
-#: readelf.c:12430
+#: readelf.c:12189
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr ""
 
-#: readelf.c:12432
+#: readelf.c:12191
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr ""
 
-#: readelf.c:12434
+#: readelf.c:12193
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr ""
 
-#: readelf.c:12436
+#: readelf.c:12195
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr ""
 
-#: readelf.c:12438
+#: readelf.c:12197
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr ""
 
-#: readelf.c:12440
+#: readelf.c:12199
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr ""
 
-#: readelf.c:12442
+#: readelf.c:12201
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr ""
 
-#: readelf.c:12444
+#: readelf.c:12203
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr ""
 
-#: readelf.c:12446
-msgid "NT_ARM_VFP (arm VFP registers)"
-msgstr ""
-
-#: readelf.c:12448
+#: readelf.c:12205
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr ""
 
-#: readelf.c:12450
+#: readelf.c:12207
 msgid "NT_FPREGS (floating point registers)"
 msgstr ""
 
-#: readelf.c:12452
+#: readelf.c:12209
 msgid "NT_PSINFO (psinfo structure)"
 msgstr ""
 
-#: readelf.c:12454
+#: readelf.c:12211
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr ""
 
-#: readelf.c:12456
+#: readelf.c:12213
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr ""
 
-#: readelf.c:12458
+#: readelf.c:12215
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr ""
 
-#: readelf.c:12466
+#: readelf.c:12223
 msgid "NT_VERSION (version)"
 msgstr ""
 
-#: readelf.c:12468
+#: readelf.c:12225
 msgid "NT_ARCH (architecture)"
 msgstr ""
 
-#: readelf.c:12473 readelf.c:12496 readelf.c:12575 readelf.c:12633
-#: readelf.c:12710
+#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
+#: readelf.c:12467
 #, c-format
 msgid "Unknown note type: (0x%08x)"
 msgstr ""
 
-#: readelf.c:12485
+#: readelf.c:12242
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr ""
 
-#: readelf.c:12487
+#: readelf.c:12244
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
 msgstr ""
 
-#: readelf.c:12489
+#: readelf.c:12246
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
 msgstr ""
 
-#: readelf.c:12491
+#: readelf.c:12248
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr ""
 
-#: readelf.c:12509
+#: readelf.c:12266
 #, c-format
 msgid "    Build ID: "
 msgstr ""
 
-#: readelf.c:12548
+#: readelf.c:12269 readelf.c:12425
+#, c-format
+msgid "\n"
+msgstr ""
+
+#: readelf.c:12305
 #, c-format
 msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
 msgstr ""
 
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12565
+#: readelf.c:12322
 msgid "NetBSD procinfo structure"
 msgstr ""
 
-#: readelf.c:12592 readelf.c:12606
+#: readelf.c:12349 readelf.c:12363
 msgid "PT_GETREGS (reg structure)"
 msgstr ""
 
-#: readelf.c:12594 readelf.c:12608
+#: readelf.c:12351 readelf.c:12365
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr ""
 
-#: readelf.c:12627
+#: readelf.c:12371
+#, c-format
+msgid "PT_FIRSTMACH+%d"
+msgstr ""
+
+#: readelf.c:12384
 msgid "NT_STAPSDT (SystemTap probe descriptors)"
 msgstr ""
 
-#: readelf.c:12660
+#: readelf.c:12417
 #, c-format
 msgid "    Provider: %s\n"
 msgstr ""
 
-#: readelf.c:12661
+#: readelf.c:12418
 #, c-format
 msgid "    Name: %s\n"
 msgstr ""
 
-#: readelf.c:12662
+#: readelf.c:12419
 #, c-format
 msgid "    Location: "
 msgstr ""
 
-#: readelf.c:12664
+#: readelf.c:12421
 #, c-format
 msgid ", Base: "
 msgstr ""
 
-#: readelf.c:12666
+#: readelf.c:12423
 #, c-format
 msgid ", Semaphore: "
 msgstr ""
 
-#: readelf.c:12669
+#: readelf.c:12426
 #, c-format
 msgid "    Arguments: %s\n"
 msgstr ""
 
-#: readelf.c:12682
+#: readelf.c:12439
 msgid "NT_VMS_MHD (module header)"
 msgstr ""
 
-#: readelf.c:12684
+#: readelf.c:12441
 msgid "NT_VMS_LNM (language name)"
 msgstr ""
 
-#: readelf.c:12686
+#: readelf.c:12443
 msgid "NT_VMS_SRC (source files)"
 msgstr ""
 
-#: readelf.c:12690
+#: readelf.c:12445
+msgid "NT_VMS_TITLE"
+msgstr ""
+
+#: readelf.c:12447
 msgid "NT_VMS_EIDC (consistency check)"
 msgstr ""
 
-#: readelf.c:12692
+#: readelf.c:12449
 msgid "NT_VMS_FPMODE (FP mode)"
 msgstr ""
 
-#: readelf.c:12696
+#: readelf.c:12451
+msgid "NT_VMS_LINKTIME"
+msgstr ""
+
+#: readelf.c:12453
 msgid "NT_VMS_IMGNAM (image name)"
 msgstr ""
 
-#: readelf.c:12698
+#: readelf.c:12455
 msgid "NT_VMS_IMGID (image id)"
 msgstr ""
 
-#: readelf.c:12700
+#: readelf.c:12457
 msgid "NT_VMS_LINKID (link id)"
 msgstr ""
 
-#: readelf.c:12702
+#: readelf.c:12459
 msgid "NT_VMS_IMGBID (build id)"
 msgstr ""
 
-#: readelf.c:12704
+#: readelf.c:12461
 msgid "NT_VMS_GSTNAM (sym table name)"
 msgstr ""
 
-#: readelf.c:12724
+#: readelf.c:12463
+msgid "NT_VMS_ORIG_DYN"
+msgstr ""
+
+#: readelf.c:12465
+msgid "NT_VMS_PATCHTIME"
+msgstr ""
+
+#: readelf.c:12481
 #, c-format
 msgid "    Creation date  : %.17s\n"
 msgstr ""
 
-#: readelf.c:12725
+#: readelf.c:12482
 #, c-format
 msgid "    Last patch date: %.17s\n"
 msgstr ""
 
-#: readelf.c:12726
+#: readelf.c:12483
 #, c-format
 msgid "    Module name    : %s\n"
 msgstr ""
 
-#: readelf.c:12727
+#: readelf.c:12484
 #, c-format
 msgid "    Module version : %s\n"
 msgstr ""
 
-#: readelf.c:12730
+#: readelf.c:12487
 #, c-format
 msgid "    Invalid size\n"
 msgstr ""
 
-#: readelf.c:12733
+#: readelf.c:12490
 #, c-format
 msgid "   Language: %s\n"
 msgstr ""
 
-#: readelf.c:12737
-#, c-format
-msgid "   Floating Point mode: "
+#: readelf.c:12494
+msgid "   FP mode: 0x%016"
 msgstr ""
 
-#: readelf.c:12742
+#: readelf.c:12498
 #, c-format
 msgid "   Link time: "
 msgstr ""
 
-#: readelf.c:12748
+#: readelf.c:12504
 #, c-format
 msgid "   Patch time: "
 msgstr ""
 
-#: readelf.c:12754
+#: readelf.c:12510
 #, c-format
 msgid "   Major id: %u,  minor id: %u\n"
 msgstr ""
 
-#: readelf.c:12757
+#: readelf.c:12513
 #, c-format
-msgid "   Last modified  : "
+msgid "   Manip date  : "
 msgstr ""
 
-#: readelf.c:12760
-#, c-format
+#: readelf.c:12516
 msgid ""
 "\n"
-"   Link flags  : "
+"   Link flags  : 0x%016"
 msgstr ""
 
-#: readelf.c:12763
+#: readelf.c:12519
 #, c-format
 msgid "   Header flags: 0x%08x\n"
 msgstr ""
 
-#: readelf.c:12765
+#: readelf.c:12521
 #, c-format
 msgid "   Image id    : %s\n"
 msgstr ""
 
-#: readelf.c:12769
+#: readelf.c:12525
 #, c-format
 msgid "    Image name: %s\n"
 msgstr ""
 
-#: readelf.c:12772
+#: readelf.c:12528
 #, c-format
 msgid "    Global symbol table name: %s\n"
 msgstr ""
 
-#: readelf.c:12775
+#: readelf.c:12531
 #, c-format
 msgid "    Image id: %s\n"
 msgstr ""
 
-#: readelf.c:12778
+#: readelf.c:12534
 #, c-format
 msgid "    Linker id: %s\n"
 msgstr ""
 
-#: readelf.c:12853
+#: readelf.c:12609
 msgid "notes"
 msgstr ""
 
-#: readelf.c:12859
+#: readelf.c:12615
 #, c-format
 msgid ""
 "\n"
 "Notes at offset 0x%08lx with length 0x%08lx:\n"
 msgstr ""
 
-#: readelf.c:12861
+#: readelf.c:12617
 #, c-format
 msgid "  %-20s %10s\tDescription\n"
 msgstr ""
 
-#: readelf.c:12861
+#: readelf.c:12617
 msgid "Owner"
 msgstr ""
 
-#: readelf.c:12861
+#: readelf.c:12617
 msgid "Data size"
 msgstr ""
 
-#: readelf.c:12899 readelf.c:12912
+#: readelf.c:12655 readelf.c:12668
 #, c-format
 msgid "corrupt note found at offset %lx into core notes\n"
 msgstr ""
 
-#: readelf.c:12901 readelf.c:12914
+#: readelf.c:12657 readelf.c:12670
 #, c-format
 msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
 msgstr ""
 
-#: readelf.c:13010
+#: readelf.c:12766
 #, c-format
 msgid "No note segments present in the core file.\n"
 msgstr ""
 
-#: readelf.c:13102
+#: readelf.c:12853
 msgid ""
 "This instance of readelf has been built without support for a\n"
 "64 bit data type and so it cannot read 64 bit ELF files.\n"
 msgstr ""
 
-#: readelf.c:13149
+#: readelf.c:12900
 #, c-format
 msgid "%s: Failed to read file header\n"
 msgstr ""
 
-#: readelf.c:13163
+#: readelf.c:12914
 #, c-format
 msgid ""
 "\n"
 "File: %s\n"
 msgstr ""
 
-#: readelf.c:13335
+#: readelf.c:13086
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr ""
 
-#: readelf.c:13341
+#: readelf.c:13092
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr ""
 
-#: readelf.c:13359
+#: readelf.c:13110
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr ""
 
-#: readelf.c:13367
+#: readelf.c:13118
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr ""
 
-#: readelf.c:13378
+#: readelf.c:13129
 #, c-format
 msgid ""
 "%s: symbols remain in the index symbol table, but without corresponding "
 "entries in the index table\n"
 msgstr ""
 
-#: readelf.c:13383
+#: readelf.c:13134
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr ""
 
-#: readelf.c:13466 readelf.c:13549
+#: readelf.c:13217 readelf.c:13300
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr ""
 
-#: readelf.c:13488
+#: readelf.c:13239
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr ""
 
-#: readelf.c:13567
+#: readelf.c:13318
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr ""
@@ -7234,7 +7173,7 @@ msgstr ""
 msgid "group icon"
 msgstr ""
 
-#: resbin.c:935 resbin.c:1173
+#: resbin.c:935 resbin.c:1151
 msgid "unexpected version string"
 msgstr ""
 
@@ -7276,39 +7215,31 @@ msgstr ""
 msgid "unexpected stringfileinfo value length %ld"
 msgstr ""
 
-#: resbin.c:1059
-msgid "version stringtable"
-msgstr ""
-
-#: resbin.c:1067
+#: resbin.c:1049
 #, c-format
 msgid "unexpected version stringtable value length %ld"
 msgstr ""
 
-#: resbin.c:1084
-msgid "version string"
-msgstr ""
-
-#: resbin.c:1101
+#: resbin.c:1083
 #, c-format
 msgid "unexpected version string length %ld != %ld + %ld"
 msgstr ""
 
-#: resbin.c:1108
+#: resbin.c:1094
 #, c-format
 msgid "unexpected version string length %ld < %ld"
 msgstr ""
 
-#: resbin.c:1133
+#: resbin.c:1111
 #, c-format
 msgid "unexpected varfileinfo value length %ld"
 msgstr ""
 
-#: resbin.c:1152
+#: resbin.c:1130
 msgid "version varfileinfo"
 msgstr ""
 
-#: resbin.c:1167
+#: resbin.c:1145
 #, c-format
 msgid "unexpected version value length %ld"
 msgstr ""
@@ -7475,7 +7406,7 @@ msgstr ""
 msgid "stat failed on file `%s': %s"
 msgstr ""
 
-#: resrc.c:1958
+#: resrc.c:1940
 #, c-format
 msgid "can't open `%s' for output: %s"
 msgstr ""
@@ -7708,37 +7639,6 @@ msgid ""
 "  -v -V --version           Print the program's version number\n"
 msgstr ""
 
-#: sysdump.c:66
-msgid "*undefined*"
-msgstr ""
-
-#: sysdump.c:137
-#, c-format
-msgid "SUM IS %x\n"
-msgstr ""
-
-#: sysdump.c:503
-#, c-format
-msgid "GOT A %x\n"
-msgstr ""
-
-#: sysdump.c:521
-#, c-format
-msgid "WANTED %x!!\n"
-msgstr ""
-
-#: sysdump.c:539
-msgid "SYMBOL INFO"
-msgstr ""
-
-#: sysdump.c:557
-msgid "DERIVED TYPE"
-msgstr ""
-
-#: sysdump.c:614
-msgid "MODULE***\n"
-msgstr ""
-
 #: sysdump.c:647
 #, c-format
 msgid "Print a human readable interpretation of a SYSROFF object file\n"
diff --git a/binutils/po/es.po b/binutils/po/es.po
index 17a2ef2dc1..6872b9daee 100644
--- a/binutils/po/es.po
+++ b/binutils/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para binutils 2.21.53.
+# Mensajes en español para binutils 2.20.90.
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: binutils 2.21.53\n"
+"Project-Id-Version: binutils 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2011-09-25 20:35-0500\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2011-08-24 11:48-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addr2line.c:81
+#: addr2line.c:80
 #, c-format
 msgid "Usage: %s [option(s)] [addr(s)]\n"
 msgstr "Modo de empleo: %s [opcion(es)] [direccion(es)]\n"
 
-#: addr2line.c:82
+#: addr2line.c:81
 #, c-format
 msgid " Convert addresses into line number/file name pairs.\n"
 msgstr " Convierte direcciones en pares de nombre número/fila.\n"
 
-#: addr2line.c:83
+#: addr2line.c:82
 #, c-format
 msgid " If no addresses are specified on the command line, they will be read from stdin\n"
 msgstr " Si no se especifican direcciones en la línea de órdenes, se leerán de la entrada estándar\n"
 
-#: addr2line.c:84
+#: addr2line.c:83
 #, c-format
 msgid ""
 " The options are:\n"
@@ -65,215 +65,210 @@ msgstr ""
 "  -v --version            Muestra la versión del programa\n"
 "\n"
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
-#: windmc.c:228 windres.c:695
+#: addr2line.c:100 ar.c:293 coffdump.c:469 dlltool.c:3926 dllwrap.c:524
+#: elfedit.c:1155 nlmconv.c:1113 objcopy.c:576 objcopy.c:611 readelf.c:3219
+#: size.c:99 srconv.c:1742 strings.c:663 sysdump.c:653 windmc.c:228
+#: windres.c:694
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Reportar bichos a %s\n"
 
-#: addr2line.c:271
+#: addr2line.c:262
 #, c-format
 msgid " at "
 msgstr " en "
 
-#: addr2line.c:296
+#: addr2line.c:287
 #, c-format
 msgid " (inlined by) "
 msgstr " (inlined por) "
 
-#: addr2line.c:329
+#: addr2line.c:320
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr "%s: no se pueden obtener las direcciones del archivo"
 
-#: addr2line.c:346
+#: addr2line.c:337
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr "%s: no se puede encontrar la sección %s"
 
-#: addr2line.c:415 nm.c:1566 objdump.c:3423
+#: addr2line.c:406 nm.c:1563 objdump.c:3301
 #, c-format
 msgid "unknown demangling style `%s'"
 msgstr "estilo de desenredo `%s' desconocido"
 
-#: ar.c:238
+#: ar.c:215
 #, c-format
 msgid "no entry %s in archive\n"
 msgstr "no existe la entrada %s en el archivo\n"
 
-#: ar.c:254
+#: ar.c:233
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
-msgstr "Modo de empleo: %s [opciones emulación] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <nombre>] [nombre-miembro] [cuenta] fichero-archivo fichero...\n"
+msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Modo de empleo: %s [opciones emulación] [--plugin <nombre>] [-]{dmpqrstx}[abcfilNoPsSuvV] [nombre-miembro] [cuenta] fichero-archivo fichero...\n"
 
-#: ar.c:260
+#: ar.c:235
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
-msgstr "Modo de empleo: %s [opciones emulación] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [nombre-miembro] [cuenta] fichero-archivo fichero...\n"
+msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Modo de empleo: %s [opciones emulación] [-]{dmpqrstx}[abcfilNoPsSuvV] [nombre-miembro] [cuenta] fichero-archivo fichero...\n"
 
-#: ar.c:266
+#: ar.c:240
 #, c-format
 msgid "       %s -M [<mri-script]\n"
 msgstr "       %s -M [<guión-mri>]\n"
 
-#: ar.c:267
+#: ar.c:241
 #, c-format
 msgid " commands:\n"
 msgstr " órdenes:\n"
 
-#: ar.c:268
+#: ar.c:242
 #, c-format
 msgid "  d            - delete file(s) from the archive\n"
 msgstr "  d            - borra fichero(s) del archivo\n"
 
-#: ar.c:269
+#: ar.c:243
 #, c-format
 msgid "  m[ab]        - move file(s) in the archive\n"
 msgstr "  m[ab]        - mueve fichero(s) en el archivo\n"
 
-#: ar.c:270
+#: ar.c:244
 #, c-format
 msgid "  p            - print file(s) found in the archive\n"
 msgstr "  p            - muestra fichero(s) encontrados en el archivo\n"
 
-#: ar.c:271
+#: ar.c:245
 #, c-format
 msgid "  q[f]         - quick append file(s) to the archive\n"
 msgstr "  q[f]         - agrega rápidamente fichero(s) al archivo\n"
 
-#: ar.c:272
+#: ar.c:246
 #, c-format
 msgid "  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"
 msgstr "  r[ab][f][u]  - reemplaza fichero(s) existente(s) o inserta fichero(s) nuevo(s) en el archivo\n"
 
-#: ar.c:273
+#: ar.c:247
 #, c-format
 msgid "  s            - act as ranlib\n"
 msgstr "  s            - actúa como ranlib\n"
 
-#: ar.c:274
+#: ar.c:248
 #, c-format
 msgid "  t            - display contents of archive\n"
 msgstr "  t            - muestra los contenidos del archivo\n"
 
-#: ar.c:275
+#: ar.c:249
 #, c-format
 msgid "  x[o]         - extract file(s) from the archive\n"
 msgstr "  x[o]         - extrae fichero(s) del archivo\n"
 
-#: ar.c:276
+#: ar.c:250
 #, c-format
 msgid " command specific modifiers:\n"
 msgstr " modificadores específicos de la orden:\n"
 
-#: ar.c:277
+#: ar.c:251
 #, c-format
 msgid "  [a]          - put file(s) after [member-name]\n"
 msgstr "  [a]          - coloca fichero(s) despúes de [nombre-miembro]\n"
 
-#: ar.c:278
+#: ar.c:252
 #, c-format
 msgid "  [b]          - put file(s) before [member-name] (same as [i])\n"
 msgstr "  [b]          - coloca fichero(s) antes de [nombre-miembro] (igual que [i])\n"
 
-#: ar.c:279
+#: ar.c:253
 #, c-format
 msgid "  [D]          - use zero for timestamps and uids/gids\n"
 msgstr "  [D]          - utiliza cero para marcas de tiempo y uids/gids\n"
 
-#: ar.c:280
+#: ar.c:254
 #, c-format
 msgid "  [N]          - use instance [count] of name\n"
 msgstr "  [N]          - usa la instancia [cuenta] del nombre\n"
 
-#: ar.c:281
+#: ar.c:255
 #, c-format
 msgid "  [f]          - truncate inserted file names\n"
 msgstr "  [f]          - trunca los nombres de fichero insertados\n"
 
-#: ar.c:282
+#: ar.c:256
 #, c-format
 msgid "  [P]          - use full path names when matching\n"
 msgstr "  [P]          - utiliza nombres completos de ruta cuando se buscan coincidencias\n"
 
-#: ar.c:283
+#: ar.c:257
 #, c-format
 msgid "  [o]          - preserve original dates\n"
 msgstr "  [o]          - conserva las fechas originales\n"
 
-#: ar.c:284
+#: ar.c:258
 #, c-format
 msgid "  [u]          - only replace files that are newer than current archive contents\n"
 msgstr "  [u]          - sólo reemplaza ficheros que sean más nuevos que el contenido actual del archivo\n"
 
-#: ar.c:285
+#: ar.c:259
 #, c-format
 msgid " generic modifiers:\n"
 msgstr " modificadores genéricos:\n"
 
-#: ar.c:286
+#: ar.c:260
 #, c-format
 msgid "  [c]          - do not warn if the library had to be created\n"
 msgstr "  [c]          - no avisa si se tiene que crear la biblioteca\n"
 
-#: ar.c:287
+#: ar.c:261
 #, c-format
 msgid "  [s]          - create an archive index (cf. ranlib)\n"
 msgstr "  [s]          - crea un índice del archivo (cf. ranlib)\n"
 
-#: ar.c:288
+#: ar.c:262
 #, c-format
 msgid "  [S]          - do not build a symbol table\n"
 msgstr "  [S]          - no construye una tabla de símbolos\n"
 
-#: ar.c:289
+#: ar.c:263
 #, c-format
 msgid "  [T]          - make a thin archive\n"
 msgstr "  [T]          - hace un archivo delgado\n"
 
-#: ar.c:290
+#: ar.c:264
 #, c-format
 msgid "  [v]          - be verbose\n"
 msgstr "  [v]          - detallado\n"
 
-#: ar.c:291
+#: ar.c:265
 #, c-format
 msgid "  [V]          - display the version number\n"
 msgstr "  [V]          - muestra el número de versión\n"
 
-#: ar.c:292
+#: ar.c:266
 #, c-format
 msgid "  @<file>      - read options from <file>\n"
 msgstr "  @<fichero>   - lee opciones del <fichero>\n"
 
-#: ar.c:293
-#, c-format
-msgid "  --target=BFDNAME - specify the target object format as BFDNAME\n"
-msgstr "  --target=NOMBFD  - especifica el formato objeto objetivo como NOMBFD\n"
-
-#: ar.c:295
+#: ar.c:268
 #, c-format
 msgid " optional:\n"
 msgstr " opcional:\n"
 
-#: ar.c:296
+#: ar.c:269
 #, c-format
 msgid "  --plugin <p> - load the specified plugin\n"
 msgstr "  --plugin <p> - carga el plugin especificado\n"
 
-#: ar.c:317
+#: ar.c:276
 #, c-format
 msgid "Usage: %s [options] archive\n"
 msgstr "Modo de empleo: %s [opciones] archivo\n"
 
-#: ar.c:318
+#: ar.c:277
 #, c-format
 msgid " Generate an index to speed access to archives\n"
 msgstr " Genera un índice para acelerar el acceso a los archivos\n"
 
-#: ar.c:319
+#: ar.c:278
 #, c-format
 msgid ""
 " The options are:\n"
@@ -282,12 +277,12 @@ msgstr ""
 " Las opciones son:\n"
 "  @<fichero>                   Lee opciones del <fichero>\n"
 
-#: ar.c:322
+#: ar.c:281
 #, c-format
 msgid "  --plugin <name>              Load the specified plugin\n"
 msgstr "  --plugin <nombre>            Carga el plugin especificado\n"
 
-#: ar.c:325
+#: ar.c:284
 #, c-format
 msgid ""
 "  -t                           Update the archive's symbol map timestamp\n"
@@ -299,70 +294,86 @@ msgstr ""
 "  -h --help                    Muestra este mensaje de ayuda\n"
 "  -V --version                 Muestra la información de versión\n"
 
-#: ar.c:449
+#: ar.c:481 nm.c:1636
+#, c-format
+msgid "sorry - this program has been built without plugin support\n"
+msgstr "perdón - este programa se construyó sin soporte para plugins\n"
+
+#: ar.c:508
 msgid "two different operation options specified"
 msgstr "se especificaron dos opciones de operación diferentes"
 
-#: ar.c:538 nm.c:1639
+#: ar.c:589
 #, c-format
-msgid "sorry - this program has been built without plugin support\n"
-msgstr "perdón - este programa se construyó sin soporte para plugins\n"
+msgid "illegal option -- %c"
+msgstr "opción ilegal -- %c"
 
-#: ar.c:693
+#: ar.c:632
 msgid "no operation specified"
 msgstr "no se especificó una operación"
 
-#: ar.c:696
+#: ar.c:635
 msgid "`u' is only meaningful with the `r' option."
 msgstr "`u' sólo tiene sentido con la opción `r'."
 
-#: ar.c:699
+#: ar.c:638
 msgid "`u' is not meaningful with the `D' option."
 msgstr "`u' no tiene sentido con la opción `D'."
 
-#: ar.c:707
+#: ar.c:646
 msgid "`N' is only meaningful with the `x' and `d' options."
 msgstr "`N' sólo tiene sentido con las opciones `x' y `d'."
 
-#: ar.c:710
+#: ar.c:649
 msgid "Value for `N' must be positive."
 msgstr "El valor para `N' debe ser positivo."
 
-#: ar.c:724
+#: ar.c:661
 msgid "`x' cannot be used on thin archives."
 msgstr "no se puede usar `x' en archivos delgados."
 
-#: ar.c:765
+#: ar.c:702
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr "error interno -- esta opción no está implementada"
 
-#: ar.c:834
+#: ar.c:771
 #, c-format
 msgid "creating %s"
 msgstr "creando %s"
 
-#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
+#: ar.c:820 ar.c:875 ar.c:1203 objcopy.c:2052
 #, c-format
 msgid "internal stat error on %s"
 msgstr "error interno de stat en %s"
 
-#: ar.c:902 ar.c:970
+#: ar.c:824
+#, c-format
+msgid ""
+"\n"
+"<%s>\n"
+"\n"
+msgstr ""
+"\n"
+"<%s>\n"
+"\n"
+
+#: ar.c:840 ar.c:908
 #, c-format
 msgid "%s is not a valid archive"
 msgstr "%s no es un archivo válido"
 
-#: ar.c:1171
+#: ar.c:1108
 #, c-format
 msgid "No member named `%s'\n"
 msgstr "No hay un miembro llamado `%s'\n"
 
-#: ar.c:1221
+#: ar.c:1158
 #, c-format
 msgid "no entry %s in archive %s!"
 msgstr "¡No hay una entrada %s en el archivo %s!"
 
-#: ar.c:1360
+#: ar.c:1297
 #, c-format
 msgid "%s: no archive map to update"
 msgstr "%s: no hay un mapa de archivo para actualizar"
@@ -422,13 +433,23 @@ msgstr "El archivo actualmente abierto es %s\n"
 msgid "%s: no open archive\n"
 msgstr "%s: no hay un archivo abierto\n"
 
-#: binemul.c:39
+#: bin2c.c:59
+#, c-format
+msgid "Usage: %s < input_file > output_file\n"
+msgstr "Modo de empleo: %s < fichero_entrada > fichero_salida\n"
+
+#: bin2c.c:60
+#, c-format
+msgid "Prints bytes from stdin in hex format.\n"
+msgstr "Muestra los bytes de la entrada estándar en formato hexadecimal.\n"
+
+#: binemul.c:38
 #, c-format
 msgid "  No emulation specific options\n"
 msgstr "  No hay opciones específicas de la emulación\n"
 
 #. Macros for common output.
-#: binemul.h:49
+#: binemul.h:46
 #, c-format
 msgid " emulation options: \n"
 msgstr " opciones de emulación: \n"
@@ -468,47 +489,42 @@ msgstr "%s: arquitecturas admitidas:"
 msgid "BFD header file version %s\n"
 msgstr "encabezado del fichero BFD versión %s\n"
 
-#: bucomm.c:559
+#: bucomm.c:556
 #, c-format
 msgid "%s: bad number: %s"
 msgstr "%s: número erróneo: %s"
 
-#: bucomm.c:576 strings.c:409
+#: bucomm.c:573 strings.c:409
 #, c-format
 msgid "'%s': No such file"
 msgstr "'%s': No hay tal fichero"
 
-#: bucomm.c:578 strings.c:411
+#: bucomm.c:575 strings.c:411
 #, c-format
 msgid "Warning: could not locate '%s'.  reason: %s"
 msgstr "Aviso: no se puede localizar '%s'. razón: %s"
 
-#: bucomm.c:582
+#: bucomm.c:579
 #, c-format
 msgid "Warning: '%s' is not an ordinary file"
 msgstr "Aviso: '%s' no es un fichero ordinario"
 
-#: bucomm.c:584
-#, c-format
-msgid "Warning: '%s' has negative size, probably it is too large"
-msgstr "Aviso: '%s' tiene tamaño negativo, probablemente es demasiado grande"
-
-#: coffdump.c:107
+#: coffdump.c:106
 #, c-format
 msgid "#lines %d "
 msgstr "#líneas %d "
 
-#: coffdump.c:461 sysdump.c:646
+#: coffdump.c:460 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr "Modo de empleo: %s [opcion(es)] fichero-entrada\n"
 
-#: coffdump.c:462
+#: coffdump.c:461
 #, c-format
-msgid " Print a human readable interpretation of a COFF object file\n"
-msgstr " Muestra una interpretación legible por humanos de un fichero objeto COFF\n"
+msgid " Print a human readable interpretation of a SYSROFF object file\n"
+msgstr " Muestra una interpretación legible por humanos de un fichero objeto SYSROFF\n"
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid ""
 " The options are:\n"
@@ -523,548 +539,548 @@ msgstr ""
 "  -v --version           Muestra la versión del programa\n"
 "\n"
 
-#: coffdump.c:532 srconv.c:1833 sysdump.c:710
+#: coffdump.c:531 srconv.c:1832 sysdump.c:710
 msgid "no input file specified"
 msgstr "no se especificó un fichero de entrada"
 
-#: cxxfilt.c:119 nm.c:269 objdump.c:281
+#: cxxfilt.c:119 nm.c:269 objdump.c:256
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Reportar bichos a %s.\n"
 
-#: debug.c:648
+#: debug.c:647
 msgid "debug_add_to_current_namespace: no current file"
 msgstr "debug_add_to_current_namespace: no hay un fichero actual"
 
-#: debug.c:727
+#: debug.c:726
 msgid "debug_start_source: no debug_set_filename call"
 msgstr "debug_start_source: no hay una llamada debug_set_filename"
 
-#: debug.c:781
+#: debug.c:782
 msgid "debug_record_function: no debug_set_filename call"
 msgstr "debug_record_function: no hay una llamada debug_set_filename"
 
-#: debug.c:833
+#: debug.c:834
 msgid "debug_record_parameter: no current function"
 msgstr "debug_record_parameter: no hay una función actual"
 
-#: debug.c:865
+#: debug.c:866
 msgid "debug_end_function: no current function"
 msgstr "debug_end_function: no hay una función actual"
 
-#: debug.c:871
+#: debug.c:872
 msgid "debug_end_function: some blocks were not closed"
 msgstr "debug_end_function: algunos bloques no estaban cerrados"
 
-#: debug.c:899
+#: debug.c:900
 msgid "debug_start_block: no current block"
 msgstr "debug_start_block: no hay un bloque actual"
 
-#: debug.c:935
+#: debug.c:936
 msgid "debug_end_block: no current block"
 msgstr "debug_end_block: no hay un bloque actual"
 
-#: debug.c:942
+#: debug.c:943
 msgid "debug_end_block: attempt to close top level block"
 msgstr "debug_end_block: se intenta cerrar el bloque del nivel principal"
 
-#: debug.c:965
+#: debug.c:966
 msgid "debug_record_line: no current unit"
 msgstr "debug_record_line: no hay una unidad actual"
 
 #. FIXME
-#: debug.c:1018
+#: debug.c:1019
 msgid "debug_start_common_block: not implemented"
 msgstr "debug_start_common_block: sin implementar"
 
 #. FIXME
-#: debug.c:1029
+#: debug.c:1030
 msgid "debug_end_common_block: not implemented"
 msgstr "debug_end_common_block: sin implementar"
 
 #. FIXME.
-#: debug.c:1113
+#: debug.c:1114
 msgid "debug_record_label: not implemented"
 msgstr "debug_record_label: sin implementar"
 
-#: debug.c:1135
+#: debug.c:1136
 msgid "debug_record_variable: no current file"
 msgstr "debug_record_variable: no hay un fichero actual"
 
-#: debug.c:1663
+#: debug.c:1664
 msgid "debug_make_undefined_type: unsupported kind"
 msgstr "debug_make_undefined_type: no se admite el género"
 
-#: debug.c:1840
+#: debug.c:1841
 msgid "debug_name_type: no current file"
 msgstr "debug_name_type: no hay fichero actual"
 
-#: debug.c:1885
+#: debug.c:1886
 msgid "debug_tag_type: no current file"
 msgstr "debug_tag_type: no hay fichero actual"
 
-#: debug.c:1893
+#: debug.c:1894
 msgid "debug_tag_type: extra tag attempted"
 msgstr "debug_tag_type: se intentó una marca extra"
 
-#: debug.c:1930
+#: debug.c:1931
 #, c-format
 msgid "Warning: changing type size from %d to %d\n"
 msgstr "Aviso: cambiando el tamaño del tipo de %d a %d\n"
 
-#: debug.c:1952
+#: debug.c:1953
 msgid "debug_find_named_type: no current compilation unit"
 msgstr "debug_find_named_type: no hay una unidad de compilación actual"
 
-#: debug.c:2055
+#: debug.c:2056
 #, c-format
 msgid "debug_get_real_type: circular debug information for %s\n"
 msgstr "debug_get_real_type: información de depuración circular para %s\n"
 
-#: debug.c:2482
+#: debug.c:2483
 msgid "debug_write_type: illegal type encountered"
 msgstr "debug_write_type: se encontró un tipo ilegal"
 
-#: dlltool.c:902 dlltool.c:928 dlltool.c:959
+#: dlltool.c:901 dlltool.c:927 dlltool.c:958
 #, c-format
 msgid "Internal error: Unknown machine type: %d"
 msgstr "Error interno: Tipo de máquina desconocido: %d"
 
-#: dlltool.c:1000
+#: dlltool.c:999
 #, c-format
 msgid "Can't open def file: %s"
 msgstr "No se puede abrir el fichero def: %s"
 
-#: dlltool.c:1005
+#: dlltool.c:1004
 #, c-format
 msgid "Processing def file: %s"
 msgstr "Se procesa el fichero def: %s"
 
-#: dlltool.c:1009
+#: dlltool.c:1008
 msgid "Processed def file"
 msgstr "Fichero def procesado"
 
-#: dlltool.c:1033
+#: dlltool.c:1032
 #, c-format
 msgid "Syntax error in def file %s:%d"
 msgstr "Error sintáctico en el fichero def %s:%d"
 
-#: dlltool.c:1070
+#: dlltool.c:1069
 #, c-format
 msgid "%s: Path components stripped from image name, '%s'."
 msgstr "%s: Se eliminaron los componentes de la ruta del nombre de la imagen, '%s'."
 
-#: dlltool.c:1088
+#: dlltool.c:1087
 #, c-format
 msgid "NAME: %s base: %x"
 msgstr "NOMBRE: %s base: %x"
 
-#: dlltool.c:1091 dlltool.c:1112
+#: dlltool.c:1090 dlltool.c:1106
 msgid "Can't have LIBRARY and NAME"
 msgstr "No se puede tener BIBLIOTECA y NOMBRE"
 
-#: dlltool.c:1109
+#: dlltool.c:1103
 #, c-format
 msgid "LIBRARY: %s base: %x"
 msgstr "BIBLIOTECA: %s base: %x"
 
-#: dlltool.c:1354 resrc.c:293
+#: dlltool.c:1342 resrc.c:293
 #, c-format
 msgid "wait: %s"
 msgstr "wait: %s"
 
-#: dlltool.c:1359 dllwrap.c:422 resrc.c:298
+#: dlltool.c:1347 dllwrap.c:422 resrc.c:298
 #, c-format
 msgid "subprocess got fatal signal %d"
 msgstr "el subproceso recibió la señal fatal %d"
 
-#: dlltool.c:1365 dllwrap.c:429 resrc.c:305
+#: dlltool.c:1353 dllwrap.c:429 resrc.c:305
 #, c-format
 msgid "%s exited with status %d"
 msgstr "%s terminó con estado %d"
 
-#: dlltool.c:1396
+#: dlltool.c:1384
 #, c-format
 msgid "Sucking in info from %s section in %s"
 msgstr "Se succiona la información de la sección %s en %s"
 
-#: dlltool.c:1536
+#: dlltool.c:1524
 #, c-format
 msgid "Excluding symbol: %s"
 msgstr "Se excluye el símbolo: %s"
 
-#: dlltool.c:1625 dlltool.c:1636 nm.c:1012 nm.c:1023
+#: dlltool.c:1613 dlltool.c:1624 nm.c:1010 nm.c:1021
 #, c-format
 msgid "%s: no symbols"
 msgstr "%s: no hay símbolos"
 
 #. FIXME: we ought to read in and block out the base relocations.
-#: dlltool.c:1662
+#: dlltool.c:1650
 #, c-format
 msgid "Done reading %s"
 msgstr "%s leído"
 
-#: dlltool.c:1672
+#: dlltool.c:1660
 #, c-format
 msgid "Unable to open object file: %s: %s"
 msgstr "No se puede abrir el fichero objeto: %s: %s"
 
-#: dlltool.c:1675
+#: dlltool.c:1663
 #, c-format
 msgid "Scanning object file %s"
 msgstr "Se revisa el fichero objeto %s"
 
-#: dlltool.c:1690
+#: dlltool.c:1678
 #, c-format
 msgid "Cannot produce mcore-elf dll from archive file: %s"
 msgstr "No se puede producir una dll mcore-elf del fichero archivo: %s"
 
-#: dlltool.c:1792
+#: dlltool.c:1780
 msgid "Adding exports to output file"
 msgstr "Se agregan exportaciones al fichero de salida"
 
-#: dlltool.c:1844
+#: dlltool.c:1832
 msgid "Added exports to output file"
 msgstr "Exportaciones agregadas al fichero de salida"
 
-#: dlltool.c:1986
+#: dlltool.c:1974
 #, c-format
 msgid "Generating export file: %s"
 msgstr "Se genera el fichero de exportación: %s"
 
-#: dlltool.c:1991
+#: dlltool.c:1979
 #, c-format
 msgid "Unable to open temporary assembler file: %s"
 msgstr "No se puede abrir el fichero temporal de ensamblador: %s"
 
-#: dlltool.c:1994
+#: dlltool.c:1982
 #, c-format
 msgid "Opened temporary file: %s"
 msgstr "Se abrió el fichero temporal: %s"
 
-#: dlltool.c:2171
+#: dlltool.c:2159
 msgid "failed to read the number of entries from base file"
 msgstr "Falló la lectura del número de entradas del fichero base"
 
-#: dlltool.c:2219
+#: dlltool.c:2207
 msgid "Generated exports file"
 msgstr "Fichero de exportación generado"
 
-#: dlltool.c:2428
+#: dlltool.c:2416
 #, c-format
 msgid "bfd_open failed open stub file: %s: %s"
 msgstr "falló bfd_open al abrir el fichero de cabos: %s: %s"
 
-#: dlltool.c:2432
+#: dlltool.c:2420
 #, c-format
 msgid "Creating stub file: %s"
 msgstr "Se crea el fichero de cabos: %s"
 
-#: dlltool.c:2894
+#: dlltool.c:2882
 #, c-format
 msgid "bfd_open failed reopen stub file: %s: %s"
 msgstr "falló bfd_open al reabrir el fichero de cabos: %s: %s"
 
-#: dlltool.c:2908 dlltool.c:2984
+#: dlltool.c:2896 dlltool.c:2972
 #, c-format
 msgid "failed to open temporary head file: %s"
 msgstr "falló al abrir el fichero de encabezado temporal: %s"
 
-#: dlltool.c:2970 dlltool.c:3050
+#: dlltool.c:2958 dlltool.c:3038
 #, c-format
 msgid "failed to open temporary head file: %s: %s"
 msgstr "falló al abrir el fichero de encabezado temporal: %s: %s"
 
-#: dlltool.c:3064
+#: dlltool.c:3052
 #, c-format
 msgid "failed to open temporary tail file: %s"
 msgstr "falló al abrir el fichero de cola temporal: %s"
 
-#: dlltool.c:3121
+#: dlltool.c:3109
 #, c-format
 msgid "failed to open temporary tail file: %s: %s"
 msgstr "falló al abrir el fichero de cola temporal: %s: %s"
 
-#: dlltool.c:3143
+#: dlltool.c:3131
 #, c-format
 msgid "Can't create .lib file: %s: %s"
 msgstr "No se puede crear el fichero .lib: %s: %s"
 
-#: dlltool.c:3147
+#: dlltool.c:3135
 #, c-format
 msgid "Creating library file: %s"
 msgstr "Se crea el fichero de biblioteca: %s"
 
-#: dlltool.c:3239 dlltool.c:3245
+#: dlltool.c:3227 dlltool.c:3233
 #, c-format
 msgid "cannot delete %s: %s"
 msgstr "no se puede borrar %s: %s"
 
-#: dlltool.c:3250
+#: dlltool.c:3238
 msgid "Created lib file"
 msgstr "Se creó el fichero de biblioteca"
 
-#: dlltool.c:3462
+#: dlltool.c:3450
 #, c-format
 msgid "Can't open .lib file: %s: %s"
 msgstr "No se puede abrir el fichero .lib: %s: %s"
 
-#: dlltool.c:3470 dlltool.c:3492
+#: dlltool.c:3458 dlltool.c:3480
 #, c-format
 msgid "%s is not a library"
 msgstr "%s no es una biblioteca"
 
-#: dlltool.c:3510
+#: dlltool.c:3498
 #, c-format
 msgid "Import library `%s' specifies two or more dlls"
 msgstr "La biblioteca de importación `%s' especifica dos o más dlls"
 
-#: dlltool.c:3521
+#: dlltool.c:3509
 #, c-format
 msgid "Unable to determine dll name for `%s' (not an import library?)"
 msgstr "No se puede determinar el nombre dll para `%s' (¿No es una biblioteca de importación?)"
 
-#: dlltool.c:3745
+#: dlltool.c:3733
 #, c-format
 msgid "Warning, ignoring duplicate EXPORT %s %d,%d"
 msgstr "Aviso, se descartan las EXPORTaciones duplicadas %s %d,%d"
 
-#: dlltool.c:3751
+#: dlltool.c:3739
 #, c-format
 msgid "Error, duplicate EXPORT with ordinals: %s"
 msgstr "Error, EXPORT duplicado con ordinales: %s"
 
-#: dlltool.c:3856
+#: dlltool.c:3844
 msgid "Processing definitions"
 msgstr "Se procesan definiciones"
 
-#: dlltool.c:3888
+#: dlltool.c:3876
 msgid "Processed definitions"
 msgstr "Definiciones procesadas"
 
 #. xgetext:c-format
-#: dlltool.c:3895 dllwrap.c:483
+#: dlltool.c:3883 dllwrap.c:483
 #, c-format
 msgid "Usage %s <option(s)> <object-file(s)>\n"
 msgstr "Modo de empleo %s <opcion(es)> <fichero(s)-objeto>\n"
 
 #. xgetext:c-format
-#: dlltool.c:3897
+#: dlltool.c:3885
 #, c-format
 msgid "   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"
 msgstr "   -m --machine <máquina>    Crea una DLL para la <máquina>.  [por defecto: %s]\n"
 
-#: dlltool.c:3898
+#: dlltool.c:3886
 #, c-format
 msgid "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 msgstr "        <máquina> posibles: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 
-#: dlltool.c:3899
+#: dlltool.c:3887
 #, c-format
 msgid "   -e --output-exp <outname> Generate an export file.\n"
 msgstr "   -e --output-exp <nomsal>  Genera un fichero de exportación.\n"
 
-#: dlltool.c:3900
+#: dlltool.c:3888
 #, c-format
 msgid "   -l --output-lib <outname> Generate an interface library.\n"
 msgstr "   -l --output-lib <nomsal>  Genera una biblioteca de interfaz.\n"
 
-#: dlltool.c:3901
+#: dlltool.c:3889
 #, c-format
 msgid "   -y --output-delaylib <outname> Create a delay-import library.\n"
 msgstr "   -y --output-delaylib <nomsal>  Genera una biblioteca de retraso de importación.\n"
 
-#: dlltool.c:3902
+#: dlltool.c:3890
 #, c-format
 msgid "   -a --add-indirect         Add dll indirects to export file.\n"
 msgstr "   -a --add-indirect         Agrega indirecciones dll al fichero de exportación.\n"
 
-#: dlltool.c:3903
+#: dlltool.c:3891
 #, c-format
 msgid "   -D --dllname <name>       Name of input dll to put into interface lib.\n"
 msgstr "   -D --dllname <nombre>     Nombre de la dll de entrada a colocar en la biblioteca de interfaz.\n"
 
-#: dlltool.c:3904
+#: dlltool.c:3892
 #, c-format
 msgid "   -d --input-def <deffile>  Name of .def file to be read in.\n"
 msgstr "   -d --input-def <fichdef>  Nombre del fichero .def para leer.\n"
 
-#: dlltool.c:3905
+#: dlltool.c:3893
 #, c-format
 msgid "   -z --output-def <deffile> Name of .def file to be created.\n"
 msgstr "   -z --output-def <fichdef> Nombre del fichero .def para crear.\n"
 
-#: dlltool.c:3906
+#: dlltool.c:3894
 #, c-format
 msgid "      --export-all-symbols   Export all symbols to .def\n"
 msgstr "      --export-all-symbols   Exporta todos los símbolos a un .def\n"
 
-#: dlltool.c:3907
+#: dlltool.c:3895
 #, c-format
 msgid "      --no-export-all-symbols  Only export listed symbols\n"
 msgstr "      --no-export-all-symbols  Sólo exporta los símbolos enlistados\n"
 
-#: dlltool.c:3908
+#: dlltool.c:3896
 #, c-format
 msgid "      --exclude-symbols <list> Don't export <list>\n"
 msgstr "      --exclude-symbols <list> No exporta la <list>a\n"
 
-#: dlltool.c:3909
+#: dlltool.c:3897
 #, c-format
 msgid "      --no-default-excludes  Clear default exclude symbols\n"
 msgstr "      --no-default-excludes  Limpia los símbolos excluídos por defecto\n"
 
-#: dlltool.c:3910
+#: dlltool.c:3898
 #, c-format
 msgid "   -b --base-file <basefile> Read linker generated base file.\n"
 msgstr "   -b --base-file <fichbase> Lee el fichero base generado por el enlazador.\n"
 
-#: dlltool.c:3911
+#: dlltool.c:3899
 #, c-format
 msgid "   -x --no-idata4            Don't generate idata$4 section.\n"
 msgstr "   -x --no-idata4            No genera la sección idata$4.\n"
 
-#: dlltool.c:3912
+#: dlltool.c:3900
 #, c-format
 msgid "   -c --no-idata5            Don't generate idata$5 section.\n"
 msgstr "   -c --no-idata5            No genera la sección idata$5.\n"
 
-#: dlltool.c:3913
+#: dlltool.c:3901
 #, c-format
 msgid "      --use-nul-prefixed-import-tables Use zero prefixed idata$4 and idata$5.\n"
 msgstr "      --use-nul-prefixed-import-tables Usa idata$4 e idata$5 con prefijo cero.\n"
 
-#: dlltool.c:3914
+#: dlltool.c:3902
 #, c-format
 msgid "   -U --add-underscore       Add underscores to all symbols in interface library.\n"
 msgstr "   -U --add-underscore       Agrega subrayado a todos los símbolos en la biblioteca de interfaz.\n"
 
-#: dlltool.c:3915
+#: dlltool.c:3903
 #, c-format
 msgid "      --add-stdcall-underscore Add underscores to stdcall symbols in interface library.\n"
 msgstr "      --add-stdcall-underscore Agrega subrayado a los símbolos stdcall en la biblioteca de interfaz.\n"
 
-#: dlltool.c:3916
+#: dlltool.c:3904
 #, c-format
 msgid "      --no-leading-underscore All symbols shouldn't be prefixed by an underscore.\n"
 msgstr "      --no-leading-underscore Ningún símbolo debe tener prefijo de subrayado.\n"
 
-#: dlltool.c:3917
+#: dlltool.c:3905
 #, c-format
 msgid "      --leading-underscore   All symbols should be prefixed by an underscore.\n"
 msgstr "      --leading-underscore   Todos los símbolos deben tener prefijo de subrayado.\n"
 
-#: dlltool.c:3918
+#: dlltool.c:3906
 #, c-format
 msgid "   -k --kill-at              Kill @<n> from exported names.\n"
 msgstr "   -k --kill-at              Elimina @<n> de los nombres exportados.\n"
 
-#: dlltool.c:3919
+#: dlltool.c:3907
 #, c-format
 msgid "   -A --add-stdcall-alias    Add aliases without @<n>.\n"
 msgstr "   -A --add-stdcall-alias    Agrega aliases sin @<n>.\n"
 
-#: dlltool.c:3920
+#: dlltool.c:3908
 #, c-format
 msgid "   -p --ext-prefix-alias <prefix> Add aliases with <prefix>.\n"
 msgstr "   -p --ext-prefix-alias <prefijo> Agrega aliases con <prefijo>.\n"
 
-#: dlltool.c:3921
+#: dlltool.c:3909
 #, c-format
 msgid "   -S --as <name>            Use <name> for assembler.\n"
 msgstr "   -S --as <nombre>          Usa el <nombre> para ensamblador.\n"
 
-#: dlltool.c:3922
+#: dlltool.c:3910
 #, c-format
 msgid "   -f --as-flags <flags>     Pass <flags> to the assembler.\n"
 msgstr "   -f --as-flags <opciones>  Pasa <opciones> al ensamblador.\n"
 
-#: dlltool.c:3923
+#: dlltool.c:3911
 #, c-format
 msgid "   -C --compat-implib        Create backward compatible import library.\n"
 msgstr "   -C --compat-implib        Crea biblioteca de importación compatible hacia atrás.\n"
 
-#: dlltool.c:3924
+#: dlltool.c:3912
 #, c-format
 msgid "   -n --no-delete            Keep temp files (repeat for extra preservation).\n"
 msgstr "   -n --no-delete            Conserva los ficheros temporales (repetir para conservación extra).\n"
 
-#: dlltool.c:3925
+#: dlltool.c:3913
 #, c-format
 msgid "   -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
 msgstr "   -t --temp-prefix <prefijo> Usa el <prefijo> para construir nombres de ficheros temporales.\n"
 
-#: dlltool.c:3926
+#: dlltool.c:3914
 #, c-format
 msgid "   -I --identify <implib>    Report the name of the DLL associated with <implib>.\n"
 msgstr "   -I --identify <libimp>    Reporta el nombre de la DLL asociada con <libimp>.\n"
 
-#: dlltool.c:3927
+#: dlltool.c:3915
 #, c-format
 msgid "      --identify-strict      Causes --identify to report error when multiple DLLs.\n"
 msgstr "      --identify-strict      Causa que --identify reporte error con DLLs múltiples.\n"
 
-#: dlltool.c:3928
+#: dlltool.c:3916
 #, c-format
 msgid "   -v --verbose              Be verbose.\n"
 msgstr "   -v --verbose              Detallado.\n"
 
-#: dlltool.c:3929
+#: dlltool.c:3917
 #, c-format
 msgid "   -V --version              Display the program version.\n"
 msgstr "   -V --version              Muestra la versión del programa.\n"
 
-#: dlltool.c:3930
+#: dlltool.c:3918
 #, c-format
 msgid "   -h --help                 Display this information.\n"
 msgstr "   -h --help                 Muestra esta información.\n"
 
-#: dlltool.c:3931
+#: dlltool.c:3919
 #, c-format
 msgid "   @<file>                   Read options from <file>.\n"
 msgstr "   @<fichero>                Lee opciones del <fichero>.\n"
 
-#: dlltool.c:3933
+#: dlltool.c:3921
 #, c-format
 msgid "   -M --mcore-elf <outname>  Process mcore-elf object files into <outname>.\n"
 msgstr "   -M --mcore-elf <nomsal>   Procesa los ficheros objeto mcore-elf hacia <nomsal>.\n"
 
-#: dlltool.c:3934
+#: dlltool.c:3922
 #, c-format
 msgid "   -L --linker <name>        Use <name> as the linker.\n"
 msgstr "   -L --linker <nombre>      Usa <nombre> como el enlazador.\n"
 
-#: dlltool.c:3935
+#: dlltool.c:3923
 #, c-format
 msgid "   -F --linker-flags <flags> Pass <flags> to the linker.\n"
 msgstr "   -F --linker-flags <opts>  Pasa <opts> al enlazador.\n"
 
-#: dlltool.c:4082
+#: dlltool.c:4070
 #, c-format
 msgid "Path components stripped from dllname, '%s'."
 msgstr "Se eliminaron los componentes de la ruta del nombre de dll, '%s'."
 
-#: dlltool.c:4130
+#: dlltool.c:4118
 #, c-format
 msgid "Unable to open base-file: %s"
 msgstr "No se puede abrir el fichero-base: %s"
 
-#: dlltool.c:4165
+#: dlltool.c:4153
 #, c-format
 msgid "Machine '%s' not supported"
 msgstr "No se admite la máquina '%s'"
 
-#: dlltool.c:4245
+#: dlltool.c:4232
 #, c-format
 msgid "Warning, machine type (%d) not supported for delayimport."
 msgstr "Aviso, el tipo de máquina (%d) no se admite para delayimport."
 
-#: dlltool.c:4313 dllwrap.c:213
+#: dlltool.c:4300 dllwrap.c:213
 #, c-format
 msgid "Tried file: %s"
 msgstr "Fichero intentado: %s"
 
-#: dlltool.c:4320 dllwrap.c:220
+#: dlltool.c:4307 dllwrap.c:220
 #, c-format
 msgid "Using file: %s"
 msgstr "Se usa el fichero: %s"
@@ -1322,16 +1338,22 @@ msgstr "nombre DRIVER   : %s\n"
 msgid "DRIVER options  : %s\n"
 msgstr "opciones DRIVER : %s\n"
 
-#: dwarf.c:256 dwarf.c:3019
+#: dwarf.c:112 dwarf.c:161 elfedit.c:123 elfedit.c:167 elfedit.c:195
+#: elfedit.c:227 readelf.c:368 readelf.c:536
+#, c-format
+msgid "Unhandled data length: %d\n"
+msgstr "Longitud de datos sin manejar: %d\n"
+
+#: dwarf.c:312 dwarf.c:2890
 msgid "badly formed extended line op encountered!\n"
 msgstr "¡se encontró un operador extendido de línea mal formado!\n"
 
-#: dwarf.c:263
+#: dwarf.c:319
 #, c-format
 msgid "  Extended opcode %d: "
 msgstr "  Código de operación extendido %d: "
 
-#: dwarf.c:268
+#: dwarf.c:324
 #, c-format
 msgid ""
 "End of Sequence\n"
@@ -1340,193 +1362,192 @@ msgstr ""
 "Fin de la Secuencia\n"
 "\n"
 
-#: dwarf.c:274
+#: dwarf.c:330
 #, c-format
-msgid "set Address to 0x%s\n"
-msgstr "establece la Dirección a 0x%s\n"
+msgid "set Address to 0x%lx\n"
+msgstr "establece la Dirección a 0x%lx\n"
 
-#: dwarf.c:280
+#: dwarf.c:336
 #, c-format
 msgid "  define new File Table entry\n"
 msgstr "  define la nueva entrada en la Tabla de Ficheros\n"
 
-#: dwarf.c:281 dwarf.c:2548
+#: dwarf.c:337 dwarf.c:2431
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
 msgstr "  Entr\tDir\tHora\tTam\tNombre\n"
 
-#: dwarf.c:295
+#: dwarf.c:339
 #, c-format
-msgid "set Discriminator to %s\n"
-msgstr "establece el Discriminador a %s\n"
+msgid "   %d\t"
+msgstr "   %d\t"
 
-#: dwarf.c:356
+#: dwarf.c:342 dwarf.c:344 dwarf.c:346 dwarf.c:2443 dwarf.c:2445 dwarf.c:2447
 #, c-format
-msgid "(%s"
-msgstr "(%s"
+msgid "%lu\t"
+msgstr "%lu\t"
 
-#: dwarf.c:360
+#: dwarf.c:347
 #, c-format
-msgid ",%s"
-msgstr ",%s"
+msgid ""
+"%s\n"
+"\n"
+msgstr ""
+"%s\n"
+"\n"
 
-#: dwarf.c:364
+#: dwarf.c:351
 #, c-format
-msgid ",%s)\n"
-msgstr ",%s)\n"
+msgid "set Discriminator to %lu\n"
+msgstr "establece el Discriminador a %lu\n"
 
 #. The test against DW_LNW_hi_user is redundant due to
 #. the limited range of the unsigned char data type used
 #. for op_code.
 #. && op_code <= DW_LNE_hi_user
-#: dwarf.c:387
+#: dwarf.c:393
 #, c-format
-msgid "user defined: "
-msgstr "definido por el usuario: "
+msgid "user defined: length %d\n"
+msgstr "definido por el usuario: longitud %d\n"
 
-#: dwarf.c:389
+#: dwarf.c:395 dwarf.c:2922
 #, c-format
-msgid "UNKNOWN: "
-msgstr "DESCONOCIDO: "
-
-#: dwarf.c:390
-#, c-format
-msgid "length %d ["
-msgstr "longitud %d ["
+msgid "UNKNOWN: length %d\n"
+msgstr "UNKNOWN: longitud %d\n"
 
-#: dwarf.c:407
+#: dwarf.c:408
 msgid "<no .debug_str section>"
 msgstr "<no hay sección .debug_str>"
 
-#: dwarf.c:413
+#: dwarf.c:414
 #, c-format
-msgid "DW_FORM_strp offset too big: %s\n"
-msgstr "el desplazamiento DW_FORM_strp es demasiado grande: %s\n"
+msgid "DW_FORM_strp offset too big: %lx\n"
+msgstr "el desplazamiento DW_FORM_strp es demasiado grande: %lx\n"
 
 #: dwarf.c:415
 msgid "<offset is too big>"
 msgstr "<el desplazamiento es demasiado grande>"
 
-#: dwarf.c:655
+#: dwarf.c:654
 #, c-format
 msgid "Unknown TAG value: %lx"
 msgstr "Valor TAG desconocido: %lx"
 
-#: dwarf.c:696
+#: dwarf.c:695
 #, c-format
 msgid "Unknown FORM value: %lx"
 msgstr "Valor FORM desconocido: %lx"
 
-#: dwarf.c:705
+#: dwarf.c:704
 #, c-format
-msgid " %s byte block: "
-msgstr " bloque de byte %s: "
+msgid " %lu byte block: "
+msgstr " bloque de bytes %lu: "
 
-#: dwarf.c:1050
+#: dwarf.c:1037
 #, c-format
 msgid "(DW_OP_call_ref in frame info)"
 msgstr "(DW_OP_call_ref en la información de marco)"
 
-#: dwarf.c:1122
+#: dwarf.c:1109
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
 msgstr "(DW_OP_GNU_implicit_pointer en la información de marco)"
 
-#: dwarf.c:1229
+#: dwarf.c:1167
 #, c-format
 msgid "(User defined location op)"
 msgstr "(Operador de ubicación definido por el usuario)"
 
-#: dwarf.c:1231
+#: dwarf.c:1169
 #, c-format
 msgid "(Unknown location op)"
 msgstr "(Operador de ubicación desconocido)"
 
-#: dwarf.c:1278
+#: dwarf.c:1217
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr "Error interno: la versión DWARF no es 2, 3 o 4.\n"
 
-#: dwarf.c:1384
-msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
-msgstr "DW_FORM_data8 no se admite cuando sizeof (dwarf_vma) != 8\n"
+#: dwarf.c:1323
+msgid "DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"
+msgstr "DW_FORM_data8 no se admite cuando sizeof (unsigned long) != 8\n"
 
-#: dwarf.c:1434
+#: dwarf.c:1373
 #, c-format
-msgid " (indirect string, offset: 0x%s): %s"
-msgstr " (cadena indirecta, desplazamiento 0x%s): %s"
+msgid " (indirect string, offset: 0x%lx): %s"
+msgstr " (cadena indirecta, desplazamiento 0x%lx): %s"
 
-#: dwarf.c:1459
+#: dwarf.c:1397
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr "No se reconoce form: %lu\n"
 
-#: dwarf.c:1552
+#: dwarf.c:1485
 #, c-format
 msgid "(not inlined)"
 msgstr "(no es inlined)"
 
-#: dwarf.c:1555
+#: dwarf.c:1488
 #, c-format
 msgid "(inlined)"
 msgstr "(inlined)"
 
-#: dwarf.c:1558
+#: dwarf.c:1491
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr "(se declaró como inline pero se descarta)"
 
-#: dwarf.c:1561
+#: dwarf.c:1494
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr "(se declaró como inline y es inline)"
 
-#: dwarf.c:1564
+#: dwarf.c:1497
 #, c-format
-msgid "  (Unknown inline attribute value: %s)"
-msgstr "  (Valor desconocido de atributo inline: %s)"
+msgid "  (Unknown inline attribute value: %lx)"
+msgstr "  (Valor desconocido de atributo inline: %lx)"
 
-#: dwarf.c:1735
+#: dwarf.c:1662
 #, c-format
 msgid "(location list)"
 msgstr "(lista de ubicación)"
 
-#: dwarf.c:1756 dwarf.c:3722
+#: dwarf.c:1683 dwarf.c:3563
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr " [sin DW_AT_frame_base]"
 
-#: dwarf.c:1771
+#: dwarf.c:1698
 #, c-format
-msgid "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
-msgstr "El desplazamiento %s usado como valor para el atributo DW_AT_import de DIE en el desplazamiento %lx es demasiado grande.\n"
+msgid "Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
+msgstr "El desplazamiento %lx usado como valor para el atributo DW_AT_import de DIE en el desplazamiento %lx es demasiado grande.\n"
 
-#: dwarf.c:1971
+#: dwarf.c:1889
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr "Valor AT desconocido: %lx"
 
-#: dwarf.c:2042
+#: dwarf.c:1960
 #, c-format
-msgid "Reserved length value (0x%s) found in section %s\n"
-msgstr "Se encontró un valor de longitud reservado (0x%s) en la sección %s\n"
+msgid "Reserved length value (%lx) found in section %s\n"
+msgstr "Se encontró un valor de longitud reservado (%lx) en la sección %s\n"
 
-#: dwarf.c:2054
+#: dwarf.c:1971
 #, c-format
-msgid "Corrupt unit length (0x%s) found in section %s\n"
-msgstr "Se encontró una longitud de unidad corrupta (0x%s) en la sección %s\n"
+msgid "Corrupt unit length (%lx) found in section %s\n"
+msgstr "Se encontró una longitud de unidad corrupta (%lx) en la sección %s\n"
 
-#: dwarf.c:2062
+#: dwarf.c:1978
 #, c-format
 msgid "No comp units in %s section ?"
 msgstr "¿ No hay unidades de compilación en la sección %s ?"
 
-#: dwarf.c:2071
+#: dwarf.c:1987
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr "No hay suficiente memoria para una matriz de información de depuración de %u entradas"
 
-#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
-#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
+#: dwarf.c:1995 dwarf.c:3158 dwarf.c:3252 dwarf.c:3326 dwarf.c:3443
+#: dwarf.c:3598 dwarf.c:3667 dwarf.c:3862
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
@@ -1535,86 +1556,86 @@ msgstr ""
 "Contenido de la sección %s:\n"
 "\n"
 
-#: dwarf.c:2088
+#: dwarf.c:2003
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr "¡No se puede localizar la sección %s!\n"
 
-#: dwarf.c:2169
+#: dwarf.c:2084
 #, c-format
-msgid "  Compilation Unit @ offset 0x%s:\n"
-msgstr "  Unidad de Compilación @ desplazamiento 0x%s:\n"
+msgid "  Compilation Unit @ offset 0x%lx:\n"
+msgstr "  Unidad de Compilación @ desplazamiento 0x%lx:\n"
 
-#: dwarf.c:2171
+#: dwarf.c:2085
 #, c-format
-msgid "   Length:        0x%s (%s)\n"
-msgstr "   Longitud:      0x%s (%s)\n"
+msgid "   Length:        0x%lx (%s)\n"
+msgstr "   Longitud:      0x%lx (%s)\n"
 
-#: dwarf.c:2174
+#: dwarf.c:2087
 #, c-format
 msgid "   Version:       %d\n"
 msgstr "   Versión:       %d\n"
 
-#: dwarf.c:2175
+#: dwarf.c:2088
 #, c-format
-msgid "   Abbrev Offset: %s\n"
-msgstr "   Desplaz Abrev: %s\n"
+msgid "   Abbrev Offset: %ld\n"
+msgstr "   Desplaz Abrev: %ld\n"
 
-#: dwarf.c:2177
+#: dwarf.c:2089
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr "   Tamaño de Puntero: %d\n"
 
-#: dwarf.c:2181
+#: dwarf.c:2093
 #, c-format
 msgid "   Signature:     "
 msgstr "   Firma:         "
 
-#: dwarf.c:2185
+#: dwarf.c:2097
 #, c-format
-msgid "   Type Offset:   0x%s\n"
-msgstr "   Tipo Desplaz: 0x%s\n"
+msgid "   Type Offset:   0x%lx\n"
+msgstr "   Tipo Desplaz: 0x%lx\n"
 
-#: dwarf.c:2193
+#: dwarf.c:2104
 #, c-format
-msgid "Debug info is corrupted, length of CU at %s extends beyond end of section (length = %s)\n"
-msgstr "La información de depuración está corrupta, la longitud de CU en %s se extiende más allá del final de la sección (longitud = %s)\n"
+msgid "Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"
+msgstr "La información de depuración está corrupta, la longitud de CU en %lx se extiende más allá del final de la sección (longitud = %lx)\n"
 
-#: dwarf.c:2206
+#: dwarf.c:2115
 #, c-format
-msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
-msgstr " CU en el desplazamiento %s contiene un número de versión corrupto o no admitido: %d.\n"
+msgid "CU at offset %lx contains corrupt or unsupported version number: %d.\n"
+msgstr " CU en el desplazamiento %lx contiene un número de versión corrupto o no admitido: %d.\n"
 
-#: dwarf.c:2217
+#: dwarf.c:2125
 #, c-format
 msgid "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"
 msgstr "La información de depuración está corrupta, el desplazamiento abbrev (%lx) es mayor que el tamaño de la sección abbrev (%lx)\n"
 
-#: dwarf.c:2267
+#: dwarf.c:2172
 #, c-format
 msgid "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr "Se detectó un marcador de fin-de-hermanos ambiguo en el desplazamiento %lx en la sección .debug_info\n"
 
-#: dwarf.c:2271
+#: dwarf.c:2176
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr "Se suprimen los avisos restantes sobre marcardores de fin-de-hermanos ambiguos\n"
 
-#: dwarf.c:2290
+#: dwarf.c:2183
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr " <%d><%lx>: Número de Abrev: %lu"
 
-#: dwarf.c:2294
-#, c-format
-msgid " <%d><%lx>: ...\n"
-msgstr " <%d><%lx>: ...\n"
-
-#: dwarf.c:2313
+#: dwarf.c:2200
 #, c-format
 msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
 msgstr "DIE en el desplazamiento %lx se refiere al número de abreviación %lu el cual no existe\n"
 
-#: dwarf.c:2415
+#: dwarf.c:2206
+#, c-format
+msgid " (%s)\n"
+msgstr " (%s)\n"
+
+#: dwarf.c:2298
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
@@ -1623,70 +1644,70 @@ msgstr ""
 "Volcado crudo del contenido de depuración de la sección %s:\n"
 "\n"
 
-#: dwarf.c:2453
+#: dwarf.c:2336
 #, c-format
 msgid "The information in section %s appears to be corrupt - the section is too small\n"
 msgstr "La información en la sección %s parece estar corrupta - la sección es demasiado pequeña\n"
 
-#: dwarf.c:2465 dwarf.c:2833
+#: dwarf.c:2348 dwarf.c:2701
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr "Solo se admite actualmente la información de línea de DWARF versiones 2, 3 y 4.\n"
 
-#: dwarf.c:2479 dwarf.c:2848
+#: dwarf.c:2362 dwarf.c:2716
 msgid "Invalid maximum operations per insn.\n"
 msgstr "Operaciones máximas inválidas por insn.\n"
 
-#: dwarf.c:2498
+#: dwarf.c:2381
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr "  Longitud:                    0x%lx\n"
 
-#: dwarf.c:2499
+#: dwarf.c:2382
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr "  Longitud:                    %ld\n"
 
-#: dwarf.c:2500
+#: dwarf.c:2383
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr "  Versión DWARF:               %d\n"
 
-#: dwarf.c:2501
+#: dwarf.c:2384
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr "  Longitud del Prólogo:        %d\n"
 
-#: dwarf.c:2502
+#: dwarf.c:2385
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr "  Longitud Mínima Instrucción: %d\n"
 
-#: dwarf.c:2504
+#: dwarf.c:2387
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr "  Máximo de Ops por Instrucción: %d\n"
 
-#: dwarf.c:2505
+#: dwarf.c:2388
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr "  Valor inicial de 'is_stmt':  %d\n"
 
-#: dwarf.c:2506
+#: dwarf.c:2389
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr "  Base Línea:                  %d\n"
 
-#: dwarf.c:2507
+#: dwarf.c:2390
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr "  Rango Línea:                 %d\n"
 
-#: dwarf.c:2508
+#: dwarf.c:2391
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr "  Base de Código de Operación: %d\n"
 
-#: dwarf.c:2517
+#: dwarf.c:2400
 #, c-format
 msgid ""
 "\n"
@@ -1695,12 +1716,12 @@ msgstr ""
 "\n"
 " Códigos de operación:\n"
 
-#: dwarf.c:2520
+#: dwarf.c:2403
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr "  El código de operación %d tiene %d argumentos\n"
 
-#: dwarf.c:2526
+#: dwarf.c:2409
 #, c-format
 msgid ""
 "\n"
@@ -1709,7 +1730,7 @@ msgstr ""
 "\n"
 " La Tabla de Directorios está vacía.\n"
 
-#: dwarf.c:2529
+#: dwarf.c:2412
 #, c-format
 msgid ""
 "\n"
@@ -1718,7 +1739,12 @@ msgstr ""
 "\n"
 " La Tabla de Directorios:\n"
 
-#: dwarf.c:2544
+#: dwarf.c:2416
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#: dwarf.c:2427
 #, c-format
 msgid ""
 "\n"
@@ -1727,7 +1753,7 @@ msgstr ""
 "\n"
 " La Tabla de Nombres de Fichero está vacía.\n"
 
-#: dwarf.c:2547
+#: dwarf.c:2430
 #, c-format
 msgid ""
 "\n"
@@ -1736,8 +1762,18 @@ msgstr ""
 "\n"
 " La Tabla de Nombres de Fichero:\n"
 
+#: dwarf.c:2438
+#, c-format
+msgid "  %d\t"
+msgstr "  %d\t"
+
+#: dwarf.c:2449
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
 #. Now display the statements.
-#: dwarf.c:2577
+#: dwarf.c:2457
 #, c-format
 msgid ""
 "\n"
@@ -1746,97 +1782,97 @@ msgstr ""
 "\n"
 " Declaraciones de Número de Línea:\n"
 
-#: dwarf.c:2596
+#: dwarf.c:2476
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s"
-msgstr "  Código de operación especial %d: Dirección de avance por %s a 0x%s"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx"
+msgstr "  Código de operación especial %d: Dirección de avance por %lu a 0x%lx"
 
-#: dwarf.c:2610
+#: dwarf.c:2488
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
-msgstr "  Código de operación especial %d: Dirección de avance por %s a 0x%s[%d]"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx[%d]"
+msgstr "  Código de operación especial %d: Dirección de avance por %lu a 0x%lx[%d]"
 
-#: dwarf.c:2618
+#: dwarf.c:2494
 #, c-format
-msgid " and Line by %s to %d\n"
-msgstr " y Línea por %s a %d\n"
+msgid " and Line by %d to %d\n"
+msgstr " y Línea por %d a %d\n"
 
-#: dwarf.c:2628
+#: dwarf.c:2504
 #, c-format
 msgid "  Copy\n"
 msgstr "  Copiar\n"
 
-#: dwarf.c:2638
+#: dwarf.c:2514
 #, c-format
-msgid "  Advance PC by %s to 0x%s\n"
-msgstr "  Avanza el PC por %s para %s\n"
+msgid "  Advance PC by %lu to 0x%lx\n"
+msgstr "  Avanza el PC por %lu para %lx\n"
 
-#: dwarf.c:2651
+#: dwarf.c:2526
 #, c-format
-msgid "  Advance PC by %s to 0x%s[%d]\n"
-msgstr "  Avanza el PC por %s para 0x%s[%d]\n"
+msgid "  Advance PC by %lu to 0x%lx[%d]\n"
+msgstr "  Avanza el PC por %lu para %lx[%d]\n"
 
-#: dwarf.c:2662
+#: dwarf.c:2536
 #, c-format
-msgid "  Advance Line by %s to %d\n"
-msgstr "  Línea de Avance por %s para %d\n"
+msgid "  Advance Line by %d to %d\n"
+msgstr "  Línea de Avance por %d para %d\n"
 
-#: dwarf.c:2670
+#: dwarf.c:2543
 #, c-format
-msgid "  Set File Name to entry %s in the File Name Table\n"
-msgstr "  Establece el Nombre de Fichero para la entrada %s en la Tabla de Nombres de Fichero\n"
+msgid "  Set File Name to entry %d in the File Name Table\n"
+msgstr "  Establece el Nombre de Fichero para la entrada %d en la Tabla de Nombres de Fichero\n"
 
-#: dwarf.c:2678
+#: dwarf.c:2551
 #, c-format
-msgid "  Set column to %s\n"
-msgstr "  Establece la columna a %s\n"
+msgid "  Set column to %lu\n"
+msgstr "  Establece la columna a %lu\n"
 
-#: dwarf.c:2686
+#: dwarf.c:2558
 #, c-format
-msgid "  Set is_stmt to %s\n"
-msgstr "  Establece is_stmt a %s\n"
+msgid "  Set is_stmt to %d\n"
+msgstr "  Establece is_stmt a %d\n"
 
-#: dwarf.c:2691
+#: dwarf.c:2563
 #, c-format
 msgid "  Set basic block\n"
 msgstr "  Establece el bloque básico\n"
 
-#: dwarf.c:2701
+#: dwarf.c:2573
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s\n"
-msgstr "  Avanza el PC por la constante %s a 0x%s\n"
+msgid "  Advance PC by constant %lu to 0x%lx\n"
+msgstr "  Avanza el PC por la constante %lu a 0x%lx\n"
 
-#: dwarf.c:2714
+#: dwarf.c:2585
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s[%d]\n"
-msgstr "  Avanza el PC por la constante %s a 0x%s[%d]\n"
+msgid "  Advance PC by constant %lu to 0x%lx[%d]\n"
+msgstr "  Avanza el PC por la constante %lu a 0x%lx[%d]\n"
 
-#: dwarf.c:2726
+#: dwarf.c:2596
 #, c-format
-msgid "  Advance PC by fixed size amount %s to 0x%s\n"
-msgstr "  Avanza el PC por la cantidad de tamaño fijo %s a 0x%s\n"
+msgid "  Advance PC by fixed size amount %lu to 0x%lx\n"
+msgstr "  Avanza el PC por la cantidad de tamaño fijo %lu a 0x%lx\n"
 
-#: dwarf.c:2732
+#: dwarf.c:2601
 #, c-format
 msgid "  Set prologue_end to true\n"
 msgstr "  Establece prologue_end a true\n"
 
-#: dwarf.c:2736
+#: dwarf.c:2605
 #, c-format
 msgid "  Set epilogue_begin to true\n"
 msgstr "  Establece epilogue_begin a true\n"
 
-#: dwarf.c:2742
+#: dwarf.c:2611 dwarf.c:3027
 #, c-format
-msgid "  Set ISA to %s\n"
-msgstr "  Establece ISA a %s\n"
+msgid "  Set ISA to %lu\n"
+msgstr "  Establece ISA a %lu\n"
 
-#: dwarf.c:2746 dwarf.c:3160
+#: dwarf.c:2615 dwarf.c:3031
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr "  Código de operación desconocido %d con los operandos: "
 
-#: dwarf.c:2780
+#: dwarf.c:2648
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
@@ -1845,65 +1881,100 @@ msgstr ""
 "Volcado decodificado del contenido de depuración de la sección %s:\n"
 "\n"
 
-#: dwarf.c:2821
+#: dwarf.c:2689
 msgid "The line info appears to be corrupt - the section is too small\n"
 msgstr "La información de línea parece estar corrupta - esta sección es demasiado pequeña\n"
 
-#: dwarf.c:2953
+#: dwarf.c:2821
 #, c-format
 msgid "CU: %s:\n"
 msgstr "CU: %s:\n"
 
-#: dwarf.c:2954 dwarf.c:2964
+#: dwarf.c:2822 dwarf.c:2835
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr "Nombre fichero                       Num línea      Dirección inicio\n"
 
-#: dwarf.c:2959
+#: dwarf.c:2828
 #, c-format
 msgid "CU: %s/%s:\n"
 msgstr "CU: %s/%s:\n"
 
-#: dwarf.c:3051
+#: dwarf.c:2833 dwarf.c:2918
 #, c-format
-msgid "UNKNOWN: length %d\n"
-msgstr "UNKNOWN: longitud %d\n"
+msgid "%s:\n"
+msgstr "%s:\n"
 
-#: dwarf.c:3156
+#. If directory index is 0, that means current directory.
+#: dwarf.c:2964
 #, c-format
-msgid "  Set ISA to %lu\n"
-msgstr "  Establece ISA a %lu\n"
+msgid ""
+"\n"
+"./%s:[++]\n"
+msgstr ""
+"\n"
+"./%s:[++]\n"
+
+#. The directory index starts counting at 1.
+#: dwarf.c:2970
+#, c-format
+msgid ""
+"\n"
+"%s/%s:\n"
+msgstr ""
+"\n"
+"%s/%s:\n"
+
+#: dwarf.c:3070
+#, c-format
+msgid "%-35s  %11d  %#18lx\n"
+msgstr "%-35s  %11d  %#18lx\n"
+
+#: dwarf.c:3074
+#, c-format
+msgid "%-35s  %11d  %#18lx[%d]\n"
+msgstr "%-35s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3082
+#, c-format
+msgid "%s  %11d  %#18lx\n"
+msgstr "%s  %11d  %#18lx\n"
 
-#: dwarf.c:3322 dwarf.c:3872
+#: dwarf.c:3086
+#, c-format
+msgid "%s  %11d  %#18lx[%d]\n"
+msgstr "%s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3192 dwarf.c:3712
 #, c-format
 msgid ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
 msgstr "el desplazamiento de .debug_info de 0x%lx en la sección %s no apunta a un encabezado CU.\n"
 
-#: dwarf.c:3336
+#: dwarf.c:3206
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr "Solo se admiten actualmente los nombres públicos DWARF 2 y 3\n"
 
-#: dwarf.c:3343
+#: dwarf.c:3213
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr "  Longitud:                            %ld\n"
 
-#: dwarf.c:3345
+#: dwarf.c:3215
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr "  Versión:                             %d\n"
 
-#: dwarf.c:3347
+#: dwarf.c:3217
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr "  Desplazamiento en secc .debug_info:  0x%lx\n"
 
-#: dwarf.c:3349
+#: dwarf.c:3219
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr "  Tamaño de área en secc .debug_info:  %ld\n"
 
-#: dwarf.c:3352
+#: dwarf.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -1912,45 +1983,55 @@ msgstr ""
 "\n"
 "    Desplaz\tNombre\n"
 
-#: dwarf.c:3403
+#: dwarf.c:3273
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
 msgstr " DW_MACINFO_start_file - numlinea: %d numfichero: %d\n"
 
-#: dwarf.c:3409
+#: dwarf.c:3279
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr " DW_MACINFO_end_file\n"
 
-#: dwarf.c:3417
+#: dwarf.c:3287
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_define - numlinea : %d macro : %s\n"
 
-#: dwarf.c:3426
+#: dwarf.c:3296
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_undef - numlinea : %d macro : %s\n"
 
-#: dwarf.c:3438
+#: dwarf.c:3308
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
 msgstr " DW_MACINFO_vendor_ext - constante : %d cadena : %s\n"
 
-#: dwarf.c:3467
+#: dwarf.c:3337
 #, c-format
 msgid "  Number TAG\n"
 msgstr "  Número TAG\n"
 
-#: dwarf.c:3476
+#: dwarf.c:3343
+#, c-format
+msgid "   %ld      %s    [%s]\n"
+msgstr "   %ld      %s    [%s]\n"
+
+#: dwarf.c:3346
 msgid "has children"
 msgstr "tiene hijos"
 
-#: dwarf.c:3476
+#: dwarf.c:3346
 msgid "no children"
 msgstr "sin hijos"
 
-#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
+#: dwarf.c:3349
+#, c-format
+msgid "    %-18s %s\n"
+msgstr "    %-18s %s\n"
+
+#: dwarf.c:3382 dwarf.c:3594 dwarf.c:3819
 #, c-format
 msgid ""
 "\n"
@@ -1959,102 +2040,107 @@ msgstr ""
 "\n"
 "La sección %s está vacía.\n"
 
-#: dwarf.c:3533 dwarf.c:3987
+#: dwarf.c:3388 dwarf.c:3825
 #, c-format
 msgid "Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"
 msgstr "No se puede cargar/decodificar la sección .debug_info, por eso no se puede interpretar la sección %s.\n"
 
-#: dwarf.c:3577
+#. FIXME: Should we handle this case?
+#: dwarf.c:3432
+msgid "Location lists in .debug_info section aren't in ascending order!\n"
+msgstr "¡Las listas de ubicación en la sección .debug_info no están en orden ascendente!\n"
+
+#: dwarf.c:3435
 msgid "No location lists in .debug_info section!\n"
 msgstr "¡No hay listas de ubicación en la sección .debug_info!\n"
 
-#: dwarf.c:3582
+#: dwarf.c:3440
 #, c-format
-msgid "Location lists in %s section start at 0x%s\n"
-msgstr "Las listas de ubicación en la sección %s empiezan en 0x%s\n"
+msgid "Location lists in %s section start at 0x%lx\n"
+msgstr "Las listas de ubicación en la sección %s empiezan en 0x%lx\n"
 
-#: dwarf.c:3589
+#: dwarf.c:3444
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr "    Desplaz  Inicio   Fin      Expresión\n"
 
-#: dwarf.c:3638
+#: dwarf.c:3479
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "Hay un agujero [0x%lx - 0x%lx] en la sección .debug_loc.\n"
 
-#: dwarf.c:3642
+#: dwarf.c:3483
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "Hay un traslape [0x%lx - 0x%lx] en la sección .debug_loc.\n"
 
-#: dwarf.c:3650
+#: dwarf.c:3491
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr "El desplazamiento 0x%lx es más grande que el tamaño de la sección .debug_loc.\n"
 
-#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
+#: dwarf.c:3500 dwarf.c:3535 dwarf.c:3545
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr "La lista de reubicación que comienza en el desplazamiento 0x%lx no está terminada.\n"
 
-#: dwarf.c:3678 dwarf.c:4075
+#: dwarf.c:3519 dwarf.c:3913
 #, c-format
 msgid "<End of list>\n"
 msgstr "<Fin de lista>\n"
 
-#: dwarf.c:3688
+#: dwarf.c:3529
 #, c-format
 msgid "(base address)\n"
 msgstr "(dirección base)\n"
 
-#: dwarf.c:3725
+#: dwarf.c:3566
 msgid " (start == end)"
 msgstr " (inicio == final)"
 
-#: dwarf.c:3727
+#: dwarf.c:3568
 msgid " (start > end)"
 msgstr " (inicio > final)"
 
-#: dwarf.c:3737
+#: dwarf.c:3578
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr "Hay %ld bytes sin usar al final de la sección %s\n"
 
-#: dwarf.c:3883
+#: dwarf.c:3723
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr "Solo se admiten actualmente aranges de DWARF 2 y 3.\n"
 
-#: dwarf.c:3887
+#: dwarf.c:3727
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr "  Longitud:                 %ld\n"
 
-#: dwarf.c:3889
+#: dwarf.c:3728
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr "  Versión:                  %d\n"
 
-#: dwarf.c:3890
+#: dwarf.c:3729
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr "  Desplaz. en .debug_info:  0x%lx\n"
 
-#: dwarf.c:3892
+#: dwarf.c:3730
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr "  Tamaño del Puntero:       %d\n"
 
-#: dwarf.c:3893
+#: dwarf.c:3731
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr "  Tamaño del Segmento:      %d\n"
 
-#: dwarf.c:3902
+#: dwarf.c:3740
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr "Tamaño del puntero + Tamaño del segmento no es una potencia de dos.\n"
 
-#: dwarf.c:3907
+#: dwarf.c:3745
 #, c-format
 msgid ""
 "\n"
@@ -2063,7 +2149,7 @@ msgstr ""
 "\n"
 "    Longitud  de la Dirección\n"
 
-#: dwarf.c:3909
+#: dwarf.c:3747
 #, c-format
 msgid ""
 "\n"
@@ -2072,385 +2158,260 @@ msgstr ""
 "\n"
 "    Long    Dirección\n"
 
-#: dwarf.c:3997
+#: dwarf.c:3835
 msgid "No range lists in .debug_info section!\n"
 msgstr "¡No hay listas de rango en la sección .debug_info!\n"
 
-#: dwarf.c:4021
+#: dwarf.c:3859
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr "Las listas de rango en la sección %s inician en 0x%lx\n"
 
-#: dwarf.c:4025
+#: dwarf.c:3863
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr "    Desplaz  Inicio   Fin\n"
 
-#: dwarf.c:4046
+#: dwarf.c:3884
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Hay un agujero [0x%lx - 0x%lx] en la sección %s.\n"
 
-#: dwarf.c:4050
+#: dwarf.c:3888
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Hay un traslape [0x%lx - 0x%lx] en la sección %s.\n"
 
-#: dwarf.c:4093
+#: dwarf.c:3931
 msgid "(start == end)"
 msgstr "(inicio == final)"
 
-#: dwarf.c:4095
+#: dwarf.c:3933
 msgid "(start > end)"
 msgstr "(inicio > final)"
 
-#: dwarf.c:4347
+#: dwarf.c:4185
 msgid "bad register: "
 msgstr "registro erróneo: "
 
-#. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4350 dwarf.c:5159
+#: dwarf.c:4188
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr "Contenido de la sección %s:\n"
 
-#: dwarf.c:5120
+#: dwarf.c:4962
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr "  DW_CFA_??? (Op de marco de llamada definido por el usuario: %#x)\n"
 
-#: dwarf.c:5122
+#: dwarf.c:4964
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr "número de Instrucción de Marco de Llamada Dwarf no admitido o desconocido: %#x\n"
 
-#: dwarf.c:5163
+#: dwarf.c:4989
 #, c-format
-msgid "Truncated header in the %s section.\n"
-msgstr "Encabezado trunco en la sección %s.\n"
-
-#: dwarf.c:5168
-#, c-format
-msgid "Version %ld\n"
-msgstr "Versión %ld\n"
-
-#: dwarf.c:5175
-msgid "The address table data in version 3 may be wrong.\n"
-msgstr "Los datos de la tabla de dirección en la versión 3 tal vez son erróneos.\n"
-
-#: dwarf.c:5178
-msgid "Version 4 does not support case insensitive lookups.\n"
-msgstr "La versión 4 no admite búsquedas insensibles a mayúsculas y minúsculas.\n"
+msgid "Displaying the debug contents of section %s is not yet supported.\n"
+msgstr "Aún no se admite el mostrar el contenido de depuración de la sección %s.\n"
 
-#: dwarf.c:5183
+#: dwarf.c:5031 elfedit.c:74
 #, c-format
-msgid "Unsupported version %lu.\n"
-msgstr "No se admite la versión %lu.\n"
+msgid "%s: Error: "
+msgstr "%s: Error: "
 
-#: dwarf.c:5199
+#: dwarf.c:5042
 #, c-format
-msgid "Corrupt header in the %s section.\n"
-msgstr "Encabezado corrupto en la sección %s.\n"
+msgid "%s: Warning: "
+msgstr "%s: Aviso: "
 
-#: dwarf.c:5214
+#: dwarf.c:5145 dwarf.c:5215
 #, c-format
-msgid ""
-"\n"
-"CU table:\n"
-msgstr ""
-"\n"
-"Tabla CU:\n"
+msgid "Unrecognized debug option '%s'\n"
+msgstr "No se reconoce la opción de depuración '%s'\n"
 
-#: dwarf.c:5220
+#: elfedit.c:243
 #, c-format
-msgid "[%3u] 0x%lx - 0x%lx\n"
-msgstr "[%3u] 0x%lx - 0x%lx\n"
+msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
+msgstr "%s: No es un fichero ELF - tiene los bytes mágicos erróneos en el inicio\n"
 
-#: dwarf.c:5225
+#: elfedit.c:251
 #, c-format
-msgid ""
-"\n"
-"TU table:\n"
-msgstr ""
-"\n"
-"Tabla TU:\n"
+msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
+msgstr "%s: No se admite EI_VERSION: %d no es %d\n"
 
-#: dwarf.c:5232
+#: elfedit.c:267
 #, c-format
-msgid "[%3u] 0x%lx 0x%lx "
-msgstr "[%3u] 0x%lx 0x%lx "
+msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
+msgstr "%s: No coincide EI_CLASS: %d no es %d\n"
 
-#: dwarf.c:5239
+#: elfedit.c:278
 #, c-format
-msgid ""
-"\n"
-"Address table:\n"
-msgstr ""
-"\n"
-"Tabla de direcciones:\n"
+msgid "%s: Unmatched e_machine: %d is not %d\n"
+msgstr "%s: No coincide e_machine: %d no es %d\n"
 
-#: dwarf.c:5248
+#: elfedit.c:289
 #, c-format
-msgid "%lu\n"
-msgstr "%lu\n"
+msgid "%s: Unmatched e_type: %d is not %d\n"
+msgstr "%s: No coincide e_type: %d no es %d\n"
 
-#: dwarf.c:5251
+#: elfedit.c:300
 #, c-format
-msgid ""
-"\n"
-"Symbol table:\n"
-msgstr ""
-"\n"
-"Tabla de símbolos:\n"
+msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
+msgstr "%s: No coincide EI_OSABI: %d no es %d\n"
 
-#: dwarf.c:5285
+#: elfedit.c:333
 #, c-format
-msgid "Displaying the debug contents of section %s is not yet supported.\n"
-msgstr "Aún no se admite el mostrar el contenido de depuración de la sección %s.\n"
+msgid "%s: Failed to update ELF header: %s\n"
+msgstr "%s: Falló al actualizar el encabezado ELF: %s\n"
 
-#: dwarf.c:5421 dwarf.c:5491
+#: elfedit.c:366
 #, c-format
-msgid "Unrecognized debug option '%s'\n"
-msgstr "No se reconoce la opción de depuración '%s'\n"
+msgid "Unsupported EI_CLASS: %d\n"
+msgstr "No se admite EI_CLASS: %d\n"
 
-#: elfcomm.c:39
-#, c-format
-msgid "%s: Error: "
-msgstr "%s: Error: "
+#: elfedit.c:399
+msgid ""
+"This executable has been built without support for a\n"
+"64 bit data type and so it cannot process 64 bit ELF files.\n"
+msgstr ""
+"Este ejecutable fue construido sin soporte para un\n"
+"tipo de datos de 64 bit y por eso no puede procesar ficheros ELF de 64 bit.\n"
 
-#: elfcomm.c:50
+#: elfedit.c:440
 #, c-format
-msgid "%s: Warning: "
-msgstr "%s: Aviso: "
+msgid "%s: Failed to read ELF header\n"
+msgstr "%s: Falló al leer el encabezado ELF\n"
 
-#: elfcomm.c:82 elfcomm.c:117 elfcomm.c:167 elfcomm.c:216
+#: elfedit.c:447
 #, c-format
-msgid "Unhandled data length: %d\n"
-msgstr "Longitud de datos sin manejar: %d\n"
+msgid "%s: Failed to seek to ELF header\n"
+msgstr "%s: Falló al buscar en el encabezado ELF\n"
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
-#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
-#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
-#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
-#: readelf.c:11866 readelf.c:12685
+#: elfedit.c:477 elfedit.c:491 elfedit.c:776 readelf.c:3674 readelf.c:3978
+#: readelf.c:4021 readelf.c:4093 readelf.c:4171 readelf.c:4936 readelf.c:4960
+#: readelf.c:7057 readelf.c:7103 readelf.c:7304 readelf.c:8494 readelf.c:8508
+#: readelf.c:9033 readelf.c:9049 readelf.c:9092 readelf.c:9117 readelf.c:11385
+#: readelf.c:11577 readelf.c:12138 readelf.c:12515 readelf.c:12529
+#: readelf.c:12891
 msgid "Out of memory\n"
 msgstr "Memoria agotada\n"
 
-#: elfcomm.c:312
+#: elfedit.c:543 readelf.c:12581
 #, c-format
 msgid "%s: failed to seek to first archive header\n"
 msgstr "%s: falló al buscar el primer encabezado de archivo\n"
 
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
+#: elfedit.c:553 elfedit.c:741 elfedit.c:845 readelf.c:12590 readelf.c:12858
+#: readelf.c:13026
 #, c-format
 msgid "%s: failed to read archive header\n"
 msgstr "%s: falló al leer el encabezado del archivo\n"
 
-#: elfcomm.c:347
-#, c-format
-msgid "%s: the archive index is empty\n"
-msgstr "%s: el índice del archivo está vacío\n"
-
-#: elfcomm.c:355 elfcomm.c:381
-#, c-format
-msgid "%s: failed to read archive index\n"
-msgstr "%s: falló al leer el índice del archivo\n"
-
-#: elfcomm.c:365
-#, c-format
-msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
-msgstr "%s: se supone que el índice del archivo tiene %ld entradas, pero el tamaño en el encabezado es demasiado pequeño\n"
-
-#: elfcomm.c:373
-msgid "Out of memory whilst trying to read archive symbol index\n"
-msgstr "Memoria agotada al tratar de leer el índice de símbolos del archivo\n"
-
-#: elfcomm.c:392
-msgid "Out of memory whilst trying to convert the archive symbol index\n"
-msgstr "Memoria agotada al tratar de convertir el índice de símbolos del archivo\n"
-
-#: elfcomm.c:405
-#, c-format
-msgid "%s: the archive has an index but no symbols\n"
-msgstr "%s: el archivo tiene un índice pero no tiene símbolos\n"
-
-#: elfcomm.c:413
-msgid "Out of memory whilst trying to read archive index symbol table\n"
-msgstr "Memoria agotada al tratar de leer la tabla de símbolos del índice del archivo\n"
-
-#: elfcomm.c:419
-#, c-format
-msgid "%s: failed to read archive index symbol table\n"
-msgstr "%s: falló al leer la tabla de símbolos del índice del archivo\n"
-
-#: elfcomm.c:428
+#: elfedit.c:568 readelf.c:12691
 #, c-format
 msgid "%s: failed to skip archive symbol table\n"
 msgstr "%s: falló al saltar la tabla de símbolos del archivo\n"
 
-#: elfcomm.c:440
+#: elfedit.c:579 readelf.c:12702
 #, c-format
 msgid "%s: failed to read archive header following archive index\n"
 msgstr "%s: falló al leer el encabezado del archivo a continuación del índice del archivo\n"
 
-#: elfcomm.c:446
-#, c-format
-msgid "%s has no archive index\n"
-msgstr "%s: no tiene índice de archivo\n"
-
-#: elfcomm.c:457
+#: elfedit.c:594 readelf.c:12718
 msgid "Out of memory reading long symbol names in archive\n"
 msgstr "Memoria agotada al leer los nombres de símbolo long en el archivo\n"
 
-#: elfcomm.c:465
+#: elfedit.c:602 readelf.c:12726
 #, c-format
 msgid "%s: failed to read long symbol name string table\n"
 msgstr "%s: falló al leer la tabla de cadenas de nombre de símbolo largos\n"
 
-#: elfcomm.c:605
+#: elfedit.c:734 readelf.c:12852
 #, c-format
 msgid "%s: failed to seek to next file name\n"
 msgstr "%s: falló al buscar el siguiente nombre de fichero\n"
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
+#: elfedit.c:747 elfedit.c:852 readelf.c:12863 readelf.c:13032
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr "%s no se encontró un encabezado de archivo válido\n"
 
-#: elfedit.c:73
-#, c-format
-msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
-msgstr "%s: No es un fichero ELF - tiene los bytes mágicos erróneos en el inicio\n"
-
-#: elfedit.c:81
-#, c-format
-msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
-msgstr "%s: No se admite EI_VERSION: %d no es %d\n"
-
-#: elfedit.c:97
-#, c-format
-msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
-msgstr "%s: No coincide EI_CLASS: %d no es %d\n"
-
-#: elfedit.c:108
-#, c-format
-msgid "%s: Unmatched e_machine: %d is not %d\n"
-msgstr "%s: No coincide e_machine: %d no es %d\n"
-
-#: elfedit.c:119
-#, c-format
-msgid "%s: Unmatched e_type: %d is not %d\n"
-msgstr "%s: No coincide e_type: %d no es %d\n"
-
-#: elfedit.c:130
-#, c-format
-msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
-msgstr "%s: No coincide EI_OSABI: %d no es %d\n"
-
-#: elfedit.c:163
-#, c-format
-msgid "%s: Failed to update ELF header: %s\n"
-msgstr "%s: Falló al actualizar el encabezado ELF: %s\n"
-
-#: elfedit.c:196
-#, c-format
-msgid "Unsupported EI_CLASS: %d\n"
-msgstr "No se admite EI_CLASS: %d\n"
-
-#: elfedit.c:229
-msgid ""
-"This executable has been built without support for a\n"
-"64 bit data type and so it cannot process 64 bit ELF files.\n"
-msgstr ""
-"Este ejecutable fue construido sin soporte para un\n"
-"tipo de datos de 64 bit y por eso no puede procesar ficheros ELF de 64 bit.\n"
-
-#: elfedit.c:270
-#, c-format
-msgid "%s: Failed to read ELF header\n"
-msgstr "%s: Falló al leer el encabezado ELF\n"
-
-#: elfedit.c:277
-#, c-format
-msgid "%s: Failed to seek to ELF header\n"
-msgstr "%s: Falló al buscar en el encabezado ELF\n"
-
-#: elfedit.c:331 readelf.c:13161
+#: elfedit.c:836 readelf.c:13018
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
 msgstr "%s: falló al buscar el siguiente encabezado de archivo\n"
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
+#: elfedit.c:867 elfedit.c:876 readelf.c:13046 readelf.c:13055
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr "%s: nombre de fichero de archivo erróneo\n"
 
-#: elfedit.c:391 elfedit.c:483
+#: elfedit.c:896 elfedit.c:988
 #, c-format
 msgid "Input file '%s' is not readable\n"
 msgstr "El fichero de entrada '%s' no es legible\n"
 
-#: elfedit.c:415
+#: elfedit.c:920
 #, c-format
 msgid "%s: failed to seek to archive member\n"
 msgstr "%s: falló al buscar en el miembro de archivo\n"
 
-#: elfedit.c:454 readelf.c:13284
+#: elfedit.c:959 readelf.c:13134
 #, c-format
 msgid "'%s': No such file\n"
 msgstr "'%s': No hay tal fichero\n"
 
-#: elfedit.c:456 readelf.c:13286
+#: elfedit.c:961 readelf.c:13136
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr "No se puede encontrar '%s'.  Mensaje de error del sistema: %s\n"
 
-#: elfedit.c:463 readelf.c:13293
+#: elfedit.c:968 readelf.c:13143
 #, c-format
 msgid "'%s' is not an ordinary file\n"
 msgstr "'%s' no es un fichero ordinario\n"
 
-#: elfedit.c:489 readelf.c:13306
+#: elfedit.c:994 readelf.c:13156
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr "%s: Falló al leer el número mágico del fichero\n"
 
-#: elfedit.c:547
+#: elfedit.c:1052
 #, c-format
 msgid "Unknown OSABI: %s\n"
 msgstr "OSABI desconocido: %s\n"
 
-#: elfedit.c:566
+#: elfedit.c:1071
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr "Tipo de máquina desconocido: %s\n"
 
-#: elfedit.c:584
+#: elfedit.c:1089
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr "Tipo de máquina desconocido: %d\n"
 
-#: elfedit.c:603
+#: elfedit.c:1108
 #, c-format
 msgid "Unknown type: %s\n"
 msgstr "Tipo desconocido: %s\n"
 
-#: elfedit.c:634
+#: elfedit.c:1139
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr "Modo de empleo: %s <opcion(es)> <fichero(s)elf>\n"
 
-#: elfedit.c:636
+#: elfedit.c:1141
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr " Actualiza el encabezado ELF de los ficheros ELF\n"
 
-#: elfedit.c:637 objcopy.c:475 objcopy.c:585
+#: elfedit.c:1142 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
 msgstr "  Las opciones son:\n"
 
-#: elfedit.c:638
+#: elfedit.c:1143
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -2471,26 +2432,31 @@ msgstr ""
 "  -h --help                   Muestra esta información\n"
 "  -v --version                Muestra el número de versión de %s\n"
 
-#: emul_aix.c:45
+#: emul_aix.c:43
 #, c-format
 msgid "  [-g]         - 32 bit small archive\n"
 msgstr "  [-g]         - archivo small de 32 bit\n"
 
-#: emul_aix.c:46
+#: emul_aix.c:44
 #, c-format
 msgid "  [-X32]       - ignores 64 bit objects\n"
 msgstr "  [-X32]       - descarta los objetos de 64 bit\n"
 
-#: emul_aix.c:47
+#: emul_aix.c:45
 #, c-format
 msgid "  [-X64]       - ignores 32 bit objects\n"
 msgstr "  [-X64]       - descarta los objetos de 32 bit\n"
 
-#: emul_aix.c:48
+#: emul_aix.c:46
 #, c-format
 msgid "  [-X32_64]    - accepts 32 and 64 bit objects\n"
 msgstr "  [-X32_64]    -acepta objetos de 32 y 64 bit\n"
 
+#: emul_aix.c:99 emul_aix.c:109 emul_aix.c:119 emul_aix.c:129
+#, c-format
+msgid "target `%s' ignored."
+msgstr " se descarta el objetivo `%s'."
+
 #: ieee.c:311
 msgid "unexpected end of debugging information"
 msgstr "fin inesperado de la información de depuración"
@@ -2712,17 +2678,17 @@ msgstr "desbordamiento numérico IEEE: 0x"
 msgid "IEEE string length overflow: %u\n"
 msgstr "desbordamiento de longitud de cadena IEEE: %u\n"
 
-#: ieee.c:5213
+#: ieee.c:5210
 #, c-format
 msgid "IEEE unsupported integer type size %u\n"
 msgstr "no se admite el tamaño de tipo entero IEEE %u\n"
 
-#: ieee.c:5247
+#: ieee.c:5244
 #, c-format
 msgid "IEEE unsupported float type size %u\n"
 msgstr "no se admite el tamaño de tipo coma flotante IEEE %u\n"
 
-#: ieee.c:5281
+#: ieee.c:5278
 #, c-format
 msgid "IEEE unsupported complex type size %u\n"
 msgstr "no se admite el tamaño de tipo complejo IEEE %u\n"
@@ -2731,120 +2697,120 @@ msgstr "no se admite el tamaño de tipo complejo IEEE %u\n"
 msgid "Duplicate symbol entered into keyword list."
 msgstr "Se ingresó un símbolo duplicado en la lista de palabras clave."
 
-#: nlmconv.c:274 srconv.c:1824
+#: nlmconv.c:273 srconv.c:1823
 msgid "input and output files must be different"
 msgstr "los ficheros de entrada y salida deben ser diferentes"
 
-#: nlmconv.c:321
+#: nlmconv.c:320
 msgid "input file named both on command line and with INPUT"
 msgstr "fichero de entrada nombrado en la línea de órdenes y con INPUT"
 
-#: nlmconv.c:330
+#: nlmconv.c:329
 msgid "no input file"
 msgstr "no hay fichero de entrada"
 
-#: nlmconv.c:360
+#: nlmconv.c:359
 msgid "no name for output file"
 msgstr "no hay nombre para el fichero de salida"
 
-#: nlmconv.c:374
+#: nlmconv.c:373
 msgid "warning: input and output formats are not compatible"
 msgstr "aviso: los formatos de entrada y salida no son compatibles"
 
-#: nlmconv.c:404
+#: nlmconv.c:403
 msgid "make .bss section"
 msgstr "hace sección .bss"
 
-#: nlmconv.c:414
+#: nlmconv.c:413
 msgid "make .nlmsections section"
 msgstr "hace sección .nlmsections"
 
-#: nlmconv.c:442
+#: nlmconv.c:441
 msgid "set .bss vma"
 msgstr "establece vma .bss"
 
-#: nlmconv.c:449
+#: nlmconv.c:448
 msgid "set .data size"
 msgstr "establece tamaño de .data"
 
-#: nlmconv.c:629
+#: nlmconv.c:628
 #, c-format
 msgid "warning: symbol %s imported but not in import list"
 msgstr "aviso: se importó el símbolo %s pero no está en la lista de importación"
 
-#: nlmconv.c:649
+#: nlmconv.c:648
 msgid "set start address"
 msgstr "establece la dirección de inicio"
 
-#: nlmconv.c:698
+#: nlmconv.c:697
 #, c-format
 msgid "warning: START procedure %s not defined"
 msgstr "aviso: el procedimiento START %s no está definido"
 
-#: nlmconv.c:700
+#: nlmconv.c:699
 #, c-format
 msgid "warning: EXIT procedure %s not defined"
 msgstr "aviso: el procedimiento EXIT %s no está definido"
 
-#: nlmconv.c:702
+#: nlmconv.c:701
 #, c-format
 msgid "warning: CHECK procedure %s not defined"
 msgstr "aviso: el procedimiento CHECK %s no está definido"
 
-#: nlmconv.c:722 nlmconv.c:908
+#: nlmconv.c:721 nlmconv.c:907
 msgid "custom section"
 msgstr "sección a la medida"
 
-#: nlmconv.c:742 nlmconv.c:937
+#: nlmconv.c:741 nlmconv.c:936
 msgid "help section"
 msgstr "sección de ayuda"
 
-#: nlmconv.c:764 nlmconv.c:955
+#: nlmconv.c:763 nlmconv.c:954
 msgid "message section"
 msgstr "sección de mensajes"
 
-#: nlmconv.c:779 nlmconv.c:988
+#: nlmconv.c:778 nlmconv.c:987
 msgid "module section"
 msgstr "sección de módulos"
 
-#: nlmconv.c:798 nlmconv.c:1004
+#: nlmconv.c:797 nlmconv.c:1003
 msgid "rpc section"
 msgstr "sección de rpc"
 
 #. There is no place to record this information.
-#: nlmconv.c:834
+#: nlmconv.c:833
 #, c-format
 msgid "%s: warning: shared libraries can not have uninitialized data"
 msgstr "%s: aviso: las bibliotecas compartidas no pueden tener datos sin iniciar"
 
-#: nlmconv.c:855 nlmconv.c:1023
+#: nlmconv.c:854 nlmconv.c:1022
 msgid "shared section"
 msgstr "sección compartida"
 
-#: nlmconv.c:863
+#: nlmconv.c:862
 msgid "warning: No version number given"
 msgstr "aviso: No se dió un número de versión"
 
-#: nlmconv.c:903 nlmconv.c:932 nlmconv.c:950 nlmconv.c:999 nlmconv.c:1018
+#: nlmconv.c:902 nlmconv.c:931 nlmconv.c:949 nlmconv.c:998 nlmconv.c:1017
 #, c-format
 msgid "%s: read: %s"
 msgstr "%s: leído: %s"
 
-#: nlmconv.c:925
+#: nlmconv.c:924
 msgid "warning: FULLMAP is not supported; try ld -M"
 msgstr "aviso: no se admite FULLMAP; pruebe ld -M"
 
-#: nlmconv.c:1101
+#: nlmconv.c:1100
 #, c-format
 msgid "Usage: %s [option(s)] [in-file [out-file]]\n"
 msgstr "Modo de empleo: %s [opcion(es)] [fichero-entrada [fichero-salida]]\n"
 
-#: nlmconv.c:1102
+#: nlmconv.c:1101
 #, c-format
 msgid " Convert an object file into a NetWare Loadable Module\n"
 msgstr "Convierte un fichero objeto en un Módulo Cargable de NetWare (NLM)\n"
 
-#: nlmconv.c:1103
+#: nlmconv.c:1102
 #, c-format
 msgid ""
 " The options are:\n"
@@ -2867,64 +2833,64 @@ msgstr ""
 "  -h --help                      Muestra esta información\n"
 "  -v --version                   Muestra la versión del programa\n"
 
-#: nlmconv.c:1144
+#: nlmconv.c:1143
 #, c-format
 msgid "support not compiled in for %s"
 msgstr "soporte no compilado para %s"
 
-#: nlmconv.c:1181
+#: nlmconv.c:1180
 msgid "make section"
 msgstr "crea sección"
 
-#: nlmconv.c:1195
+#: nlmconv.c:1194
 msgid "set section size"
 msgstr "establece el tamaño de la sección"
 
-#: nlmconv.c:1201
+#: nlmconv.c:1200
 msgid "set section alignment"
 msgstr "establece la alineación de la sección"
 
-#: nlmconv.c:1205
+#: nlmconv.c:1204
 msgid "set section flags"
 msgstr "establece las opciones de la sección"
 
-#: nlmconv.c:1216
+#: nlmconv.c:1215
 msgid "set .nlmsections size"
 msgstr "establece el tamaño de .nlmsections"
 
-#: nlmconv.c:1297 nlmconv.c:1305 nlmconv.c:1314 nlmconv.c:1319
+#: nlmconv.c:1296 nlmconv.c:1304 nlmconv.c:1313 nlmconv.c:1318
 msgid "set .nlmsection contents"
 msgstr "establece el contenido de .nlmsection"
 
-#: nlmconv.c:1796
+#: nlmconv.c:1795
 msgid "stub section sizes"
 msgstr "tamaños de la sección de cabos"
 
-#: nlmconv.c:1843
+#: nlmconv.c:1842
 msgid "writing stub"
 msgstr "se escribe cabo"
 
-#: nlmconv.c:1927
+#: nlmconv.c:1926
 #, c-format
 msgid "unresolved PC relative reloc against %s"
 msgstr "reubicación relativa PC contra %s sin resolver"
 
-#: nlmconv.c:1991
+#: nlmconv.c:1990
 #, c-format
 msgid "overflow when adjusting relocation against %s"
 msgstr "desbordamiento al ajustar la reubicación contra %s"
 
-#: nlmconv.c:2118
+#: nlmconv.c:2117
 #, c-format
 msgid "%s: execution of %s failed: "
 msgstr "%s: falló la ejecución de %s: "
 
-#: nlmconv.c:2133
+#: nlmconv.c:2132
 #, c-format
 msgid "Execution of %s failed"
 msgstr "Falló la ejecución de %s"
 
-#: nm.c:225 size.c:78 strings.c:650
+#: nm.c:225 size.c:78 strings.c:646
 #, c-format
 msgid "Usage: %s [option(s)] [file(s)]\n"
 msgstr "Modo de empleo: %s [opcion(es)] [fichero(s)]\n"
@@ -3033,17 +2999,17 @@ msgstr "%s: radical inválido"
 msgid "%s: invalid output format"
 msgstr "%s: formato de salida inválido"
 
-#: nm.c:346 readelf.c:8546 readelf.c:8591
+#: nm.c:346 readelf.c:8259 readelf.c:8304
 #, c-format
 msgid "<processor specific>: %d"
 msgstr "<específico del procesador> %d:"
 
-#: nm.c:348 readelf.c:8555 readelf.c:8609
+#: nm.c:348 readelf.c:8268 readelf.c:8322
 #, c-format
 msgid "<OS specific>: %d"
 msgstr "<específico del SO>: %d"
 
-#: nm.c:350 readelf.c:8558 readelf.c:8612
+#: nm.c:350 readelf.c:8271 readelf.c:8325
 #, c-format
 msgid "<unknown>: %d"
 msgstr "<desconocido>: %d"
@@ -3057,7 +3023,7 @@ msgstr ""
 "\n"
 "�ndice del archivo:\n"
 
-#: nm.c:1254
+#: nm.c:1251
 #, c-format
 msgid ""
 "\n"
@@ -3070,7 +3036,7 @@ msgstr ""
 "Símbolos sin definir de %s:\n"
 "\n"
 
-#: nm.c:1256
+#: nm.c:1253
 #, c-format
 msgid ""
 "\n"
@@ -3083,7 +3049,7 @@ msgstr ""
 "Símbolos de %s:\n"
 "\n"
 
-#: nm.c:1258 nm.c:1309
+#: nm.c:1255 nm.c:1306
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  Section\n"
@@ -3092,7 +3058,7 @@ msgstr ""
 "Nombre                Valor   Clase        Tipo         Tamaño   Línea Sección\n"
 "\n"
 
-#: nm.c:1261 nm.c:1312
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         Size             Line  Section\n"
@@ -3101,7 +3067,7 @@ msgstr ""
 "Nombre                Valor           Clase        Tipo         Tamaño           Línea Sección\n"
 "\n"
 
-#: nm.c:1305
+#: nm.c:1302
 #, c-format
 msgid ""
 "\n"
@@ -3114,7 +3080,7 @@ msgstr ""
 "Símbolos sin definir de %s[%s]:\n"
 "\n"
 
-#: nm.c:1307
+#: nm.c:1304
 #, c-format
 msgid ""
 "\n"
@@ -3127,29 +3093,29 @@ msgstr ""
 "Símbolos de %s[%s]:\n"
 "\n"
 
-#: nm.c:1399
+#: nm.c:1396
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr "No se inicializó la anchura de la impresión (%d)"
 
-#: nm.c:1627
+#: nm.c:1624
 msgid "Only -X 32_64 is supported"
 msgstr "Solamente se admite -X 32_64"
 
-#: nm.c:1656
+#: nm.c:1653
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr "Al usar juntas las opciones --size-sort y --undefined-only"
 
-#: nm.c:1657
+#: nm.c:1654
 msgid "will produce no output, since undefined symbols have no size."
 msgstr "no se producirá salida, porque los símbolos sin definir no tienen tamaño."
 
-#: nm.c:1685
+#: nm.c:1682
 #, c-format
 msgid "data size %ld"
 msgstr "tamaño de datos %ld"
 
-#: objcopy.c:473 srconv.c:1732
+#: objcopy.c:473 srconv.c:1731
 #, c-format
 msgid "Usage: %s [option(s)] in-file [out-file]\n"
 msgstr "Modo de empleo: %s [opcion(es)] fichero-entrada [fichero-salida]\n"
@@ -3486,7 +3452,7 @@ msgstr "opciones admitidas: %s"
 msgid "cannot open '%s': %s"
 msgstr "no se puede abrir '%s': %s"
 
-#: objcopy.c:764 objcopy.c:3392
+#: objcopy.c:764 objcopy.c:3389
 #, c-format
 msgid "%s: fread failed"
 msgstr "%s: falló fread"
@@ -3541,295 +3507,294 @@ msgstr "stat devuelve un valor negativo para `%s'"
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr "copia de `%s' [desconocido] a `%s' [desconocido]\n"
 
-#: objcopy.c:1429
+#: objcopy.c:1427
 msgid "Unable to change endianness of input file(s)"
 msgstr "No se puede cambiar la endianez del (los) fichero(s) de entrada"
 
-#: objcopy.c:1438
+#: objcopy.c:1436
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr "copia de `%s' [%s] a `%s' [%s]\n"
 
-#: objcopy.c:1487
+#: objcopy.c:1485
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr "El fichero de entrada `%s' descarta el parámeto binario de arquitectura."
 
-#: objcopy.c:1495
+#: objcopy.c:1493
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr "No se puede reconocer el formato del fichero de entrada `%s'"
 
-#: objcopy.c:1498
+#: objcopy.c:1496
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr "El fichero de salida no puede representar a la arquitectura `%s'"
 
-#: objcopy.c:1561
+#: objcopy.c:1559
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr "aviso: alineación del fichero (0x%s) > alineación de la sección (0x%s)"
 
-#: objcopy.c:1620
+#: objcopy.c:1618
 #, c-format
 msgid "can't add section '%s'"
 msgstr "no se puede agregar la sección '%s'"
 
-#: objcopy.c:1634
+#: objcopy.c:1632
 #, c-format
 msgid "can't create section `%s'"
 msgstr "no se puede crear la sección `%s'"
 
-#: objcopy.c:1680
+#: objcopy.c:1678
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr "no se puede crear la sección de enlace de depuración `%s'"
 
-#: objcopy.c:1773
+#: objcopy.c:1771
 msgid "Can't fill gap after section"
 msgstr "No se puede llenar el espacio después de la sección"
 
-#: objcopy.c:1797
+#: objcopy.c:1795
 msgid "can't add padding"
 msgstr "No se puede agregar relleno"
 
-#: objcopy.c:1888
+#: objcopy.c:1886
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr "no se puede llenar la sección de enlace de depuración `%s'"
 
-#: objcopy.c:1951
+#: objcopy.c:1949
 msgid "error copying private BFD data"
 msgstr "error al copiar los datos privados BFD"
 
-#: objcopy.c:1962
+#: objcopy.c:1960
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr "este objetivo no admite los códigos de máquina alternativos %lu"
 
-#: objcopy.c:1966
+#: objcopy.c:1964
 msgid "treating that number as an absolute e_machine value instead"
 msgstr "en su lugar, se trata ese número como un valor e_machine absoluto"
 
-#: objcopy.c:1970
+#: objcopy.c:1968
 msgid "ignoring the alternative value"
 msgstr "se descarta el valor alternativo"
 
-#: objcopy.c:2002 objcopy.c:2038
+#: objcopy.c:2000 objcopy.c:2035
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr "no se puede crear el directorio temporal para copiar el archivo (error: %s)"
 
-#: objcopy.c:2068
+#: objcopy.c:2096
 msgid "Unable to recognise the format of file"
 msgstr "No se puede reconocer el formato del fichero"
 
-#: objcopy.c:2195
+#: objcopy.c:2194
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr "error: el fichero de entrada '%s' está vacío"
 
-#: objcopy.c:2339
+#: objcopy.c:2338
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr "Renombrado múltiple de la sección %s"
 
-#: objcopy.c:2390
+#: objcopy.c:2389
 msgid "error in private header data"
 msgstr "error en los datos de encabezado privado"
 
-#: objcopy.c:2468
+#: objcopy.c:2467
 msgid "failed to create output section"
 msgstr "no se puede crear la sección de salida"
 
-#: objcopy.c:2482
+#: objcopy.c:2481
 msgid "failed to set size"
 msgstr "no se puede establecer el tamaño"
 
-#: objcopy.c:2496
+#: objcopy.c:2495
 msgid "failed to set vma"
 msgstr "no se puede establecer vma"
 
-#: objcopy.c:2521
+#: objcopy.c:2520
 msgid "failed to set alignment"
 msgstr "no se puede establecer la alineación"
 
-#: objcopy.c:2555
+#: objcopy.c:2554
 msgid "failed to copy private data"
 msgstr "no se pueden copiar los datos privados"
 
-#: objcopy.c:2637
+#: objcopy.c:2636
 msgid "relocation count is negative"
 msgstr "la cuenta de reubicación es negativa"
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2698
+#: objcopy.c:2697
 #, c-format
 msgid "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr "no se pueden invertir bytes: la longitud de la sección %s debe ser divisible por par por %d"
 
-#: objcopy.c:2884
+#: objcopy.c:2883
 msgid "can't create debugging section"
 msgstr "no se puede crear la sección de depuración"
 
-#: objcopy.c:2897
+#: objcopy.c:2896
 msgid "can't set debugging section contents"
 msgstr "no se puede establecer el contenido de la sección de depuración"
 
-#: objcopy.c:2905
+#: objcopy.c:2904
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr "no se sabe cómo escribir la información de depuración para %s"
 
-#: objcopy.c:3048
+#: objcopy.c:3046
 msgid "could not create temporary file to hold stripped copy"
 msgstr "no se puede crear el fichero temporal para contener la copia con símbolos eliminados"
 
-#: objcopy.c:3120
+#: objcopy.c:3118
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr "%s: versión errónea en el subsistema PE"
 
-#: objcopy.c:3150
+#: objcopy.c:3148
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr "subsistema PE desconocido: %s"
 
-#: objcopy.c:3212
+#: objcopy.c:3209
 msgid "byte number must be non-negative"
 msgstr "el número de bytes no debe ser negativo"
 
-#: objcopy.c:3218
+#: objcopy.c:3215
 #, c-format
 msgid "architecture %s unknown"
 msgstr "arquitectura %s desconocida"
 
-#: objcopy.c:3226
+#: objcopy.c:3223
 msgid "interleave must be positive"
 msgstr "el espacio debe ser positivo"
 
-#: objcopy.c:3235
+#: objcopy.c:3232
 msgid "interleave width must be positive"
 msgstr "la anchura del espacio debe ser positivo"
 
-#: objcopy.c:3255 objcopy.c:3263
+#: objcopy.c:3252 objcopy.c:3260
 #, c-format
 msgid "%s both copied and removed"
 msgstr "%s copiado y borrado al mismo tiempo"
 
-#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
-#: objcopy.c:3609 objcopy.c:3629
+#: objcopy.c:3359 objcopy.c:3439 objcopy.c:3547 objcopy.c:3578 objcopy.c:3602
+#: objcopy.c:3606 objcopy.c:3626
 #, c-format
 msgid "bad format for %s"
 msgstr "formato erróneo para %s"
 
-#: objcopy.c:3374
+#: objcopy.c:3371
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr "no se puede abrir: %s: %s"
 
-#: objcopy.c:3519
+#: objcopy.c:3516
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr "Aviso: truncando el relleno de espacio de 0x%s a 0x%x"
 
-#: objcopy.c:3680
+#: objcopy.c:3677
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr "opción de nombres de sección largos '%s' desconocida"
 
-#: objcopy.c:3698
+#: objcopy.c:3695
 msgid "unable to parse alternative machine code"
 msgstr "no se puede decodificar el código máquina alternativo"
 
-#: objcopy.c:3743
+#: objcopy.c:3740
 msgid "number of bytes to reverse must be positive and even"
 msgstr "el número de bytes para reverse debe ser positivo y par"
 
-#: objcopy.c:3746
+#: objcopy.c:3743
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr "Aviso: se descarta el valor previo --reverse-bytes de %d"
 
-#: objcopy.c:3761
+#: objcopy.c:3758
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr "%s: valor de reserva inválido para --heap"
 
-#: objcopy.c:3767
+#: objcopy.c:3764
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr "%s: valor de confirmación inválido para --heap"
 
-#: objcopy.c:3792
+#: objcopy.c:3789
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr "%s: valor de reserva inválido para --stack"
 
-#: objcopy.c:3798
+#: objcopy.c:3795
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr "%s: valor de confirmación inválido para --stack"
 
-#: objcopy.c:3827
+#: objcopy.c:3824
 msgid "interleave start byte must be set with --byte"
 msgstr "el byte de inicio del espacio se debe establecer con --byte"
 
-#: objcopy.c:3830
+#: objcopy.c:3827
 msgid "byte number must be less than interleave"
 msgstr "el número de bytes debe ser menor al espacio"
 
-#: objcopy.c:3833
+#: objcopy.c:3830
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr "la anchura del espacio debe ser menor o igual al espacio para byte`"
 
-#: objcopy.c:3860
+#: objcopy.c:3857
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr "objetivo EFI de entrada desconocido: %s"
 
-#: objcopy.c:3891
+#: objcopy.c:3888
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr "objetivo EFI de salida desconocido: %s"
 
-#: objcopy.c:3904
+#: objcopy.c:3901
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr "aviso: no se puede encontrar '%s'.  Mensaje de error del sistema: %s"
 
-#: objcopy.c:3916
+#: objcopy.c:3912
 #, c-format
 msgid "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr "aviso: no se puede crear el fichero temporal al copiar '%s', (error: %s)"
 
-#: objcopy.c:3944 objcopy.c:3958
+#: objcopy.c:3956 objcopy.c:3970
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr "%s nunca se usa %s%c0x%s"
 
-#: objdump.c:201
+#: objdump.c:190
 #, c-format
 msgid "Usage: %s <option(s)> <file(s)>\n"
 msgstr "Modo de empleo: %s <opcion(es)> <fichero(s)>\n"
 
-#: objdump.c:202
+#: objdump.c:191
 #, c-format
 msgid " Display information from object <file(s)>.\n"
 msgstr "Muestra la información de <fichero(s)> objeto.\n"
 
-#: objdump.c:203
+#: objdump.c:192
 #, c-format
 msgid " At least one of the following switches must be given:\n"
 msgstr "Se requiere por lo menos una de los siguientes opciones:\n"
 
-#: objdump.c:204
+#: objdump.c:193
 #, c-format
 msgid ""
 "  -a, --archive-headers    Display archive header information\n"
 "  -f, --file-headers       Display the contents of the overall file header\n"
 "  -p, --private-headers    Display object format specific file header contents\n"
-"  -P, --private=OPT,OPT... Display object format specific contents\n"
 "  -h, --[section-]headers  Display the contents of the section headers\n"
 "  -x, --all-headers        Display the contents of all headers\n"
 "  -d, --disassemble        Display assembler contents of executable sections\n"
@@ -3842,7 +3807,7 @@ msgid ""
 "  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Display DWARF info in the file\n"
 "  -t, --syms               Display the contents of the symbol table(s)\n"
 "  -T, --dynamic-syms       Display the contents of the dynamic symbol table\n"
@@ -3855,15 +3820,16 @@ msgid ""
 msgstr ""
 "  -a, --archive-headers    Muestra información del encabezado del archivo\n"
 "  -f, --file-headers       Muestra el contenido de todos los encabezados del\n"
-"                            fichero\n"
-"  -P, --private=OPC,OPC... Muestra contenidos específicos del formato objeto\n"
+"                           fichero\n"
+"  -p, --private-headers    Muestra el contenido del encabezado del fichero\n"
+"                           específicos del formato objeto\n"
 "  -h, --[section-]headers  Muestra el contenido de los encabezados de sección\n"
 "  -x, --all-headers        Muestra el contenido de todos los encabezados\n"
 "  -d, --disassemble        Muestra el contenido de ensamblador de las secciones\n"
-"                            ejecutables\n"
+"                           ejecutables\n"
 "  -D, --disassemble-all    Muestra el contenido de ensamblador de todas las\n"
-"                            secciones\n"
-"  -S, --source             Entremezcla código fuente con el desensamblado\n"
+"                           secciones\n"
+"  -S, --source             Intermezclar código fuente con el desensamblado\n"
 "  -s, --full-contents      Muestra el contenido completo de todas las secciones\n"
 "                            solicitadas\n"
 "  -g, --debugging          Muestra la información de depuración en el fichero\n"
@@ -3874,7 +3840,7 @@ msgstr ""
 "  -W[lLiaprmfFsoRt] o\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Muestra la información DWARF en el fichero\n"
 "  -t, --syms               Muestra el contenido de la(s) tabla(s) de símbolos\n"
 "  -T, --dynamic-syms       Muestra el contenido de la tabla de símbolos\n"
@@ -3888,7 +3854,7 @@ msgstr ""
 "                            admitidos\n"
 "  -H, --help               Muestra esta información\n"
 
-#: objdump.c:236
+#: objdump.c:222
 #, c-format
 msgid ""
 "\n"
@@ -3897,7 +3863,7 @@ msgstr ""
 "\n"
 " Los siguientes interruptores son opcionales:\n"
 
-#: objdump.c:237
+#: objdump.c:223
 #, c-format
 msgid ""
 "  -b, --target=BFDNAME           Specify the target object format as BFDNAME\n"
@@ -3920,11 +3886,12 @@ msgid ""
 "      --stop-address=ADDR        Only process data whose address is <= ADDR\n"
 "      --prefix-addresses         Print complete address alongside disassembly\n"
 "      --[no-]show-raw-insn       Display hex alongside symbolic disassembly\n"
-"      --insn-width=WIDTH         Display WIDTH bytes on a single line for -d\n"
+"      --insn-width=WIDTH         Display WIDTH bytes on a signle line for -d\n"
 "      --adjust-vma=OFFSET        Add OFFSET to all displayed section addresses\n"
 "      --special-syms             Include special symbols in symbol dumps\n"
 "      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
+"\n"
 msgstr ""
 "  -b, --target=NOMBREBFD         Especifica el formato objeto objetivo\n"
 "                                  como NOMBREBFD\n"
@@ -3932,19 +3899,18 @@ msgstr ""
 "                                  como M�QUINA\n"
 "  -j, --section=NOMBRE           Sólo muestra la información de\n"
 "                                  la sección NOMBRE\n"
-"  -M, --disassembler-options=OPC Pasa el texto OPC al desensamblador\n"
+"  -M, --disassembler-options=OPT Pasa el texto OPT al desensamblador\n"
 "  -EB --endian=big               Asume el formato big endian al desensamblar\n"
 "  -EL --endian=little            Asume el formato little endian al desensamblar\n"
 "      --file-start-context       Incluye el contexto del inicio del fichero\n"
 "                                  (con -S)\n"
 "  -I, --include=DIR              Agrega el DIRectorio a la lista de búsqueda de\n"
 "                                  ficheros fuente\n"
-"  -l, --line-numbers             Incluye los números de línea y los nombres\n"
-"                                  de fichero en la salida\n"
+"  -l, --line-numbers             Incluye los números de línea y los nombres de fichero\n"
+"                                  en la salida\n"
 "  -F, --file-offsets             Incluye desplazamientos de fichero al mostrar\n"
 "                                  la información\n"
-"  -C, --demangle[=ESTILO]        Decodifica los nombres de símbolo\n"
-"                                  obtenidos/procesados\n"
+"  -C, --demangle[=ESTILO]        Decodifica los nombres de símbolo obtenidos/procesados\n"
 "                                  El ESTILO, si se especifica, puede ser\n"
 "                                  `auto', 'gnu', `lucid', `arm', `hp', `edg',\n"
 "                                  `gnu-v3', `java' o `gnat'\n"
@@ -3967,68 +3933,52 @@ msgstr ""
 "      --prefix-strip=NIVEL       Descarta los nombres de directorio iniciales\n"
 "                                  con -S\n"
 
-#: objdump.c:263
-#, c-format
-msgid ""
-"      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"      --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                             or deeper\n"
-"\n"
-msgstr ""
-"      --dwarf-depth=N        No muestra DIEs en la profundidad N o mayor\n"
-"      --dwarf-start=N        Muestra DIEs empezando en N, a la misma\n"
-"                             profundidad o mayor\n"
-
-#: objdump.c:275
-#, c-format
-msgid ""
-"\n"
-"Options supported for -P/--private switch:\n"
-msgstr ""
-"\n"
-"Opciones admitidas para el interruptor -P/--private:\n"
-
-#: objdump.c:426
+#: objdump.c:396
 #, c-format
 msgid "section '%s' mentioned in a -j option, but not found in any input file"
 msgstr "la sección '%s' se menciona en una opción -j, pero no se encuentra en ningún fichero de entrada"
 
-#: objdump.c:530
+#: objdump.c:500
 #, c-format
 msgid "Sections:\n"
 msgstr "Secciones:\n"
 
-#: objdump.c:533 objdump.c:537
+#: objdump.c:503 objdump.c:507
 #, c-format
 msgid "Idx Name          Size      VMA       LMA       File off  Algn"
 msgstr "Ind Nombre        Tamaño    VMA       LMA       Desp fich Alin"
 
-#: objdump.c:539
+#: objdump.c:509
 #, c-format
 msgid "Idx Name          Size      VMA               LMA               File off  Algn"
 msgstr "Ind Nombre        Tamaño    VMA               LMA               Desp fich Alin"
 
-#: objdump.c:543
+#: objdump.c:513
 #, c-format
 msgid "  Flags"
 msgstr "  Opciones"
 
-#: objdump.c:586
+#: objdump.c:515
+#, c-format
+msgid "  Pg"
+msgstr "  Pg"
+
+#: objdump.c:558
 #, c-format
 msgid "%s: not a dynamic object"
 msgstr "%s: no es un objeto dinámico"
 
-#: objdump.c:1012 objdump.c:1036
+#: objdump.c:984 objdump.c:1008
 #, c-format
 msgid " (File Offset: 0x%lx)"
 msgstr " (Desplazamiento Fichero: 0x%lx)"
 
-#: objdump.c:1662
+#: objdump.c:1634
 #, c-format
 msgid "disassemble_fn returned length %d"
 msgstr "disassemble_fn devolvió la longitud %d"
 
-#: objdump.c:1967
+#: objdump.c:1939
 #, c-format
 msgid ""
 "\n"
@@ -4037,17 +3987,17 @@ msgstr ""
 "\n"
 "Desensamblado de la sección %s:\n"
 
-#: objdump.c:2143
+#: objdump.c:2115
 #, c-format
 msgid "can't use supplied machine %s"
 msgstr "no se puede utilizar la máquina %s proporcionada"
 
-#: objdump.c:2162
+#: objdump.c:2134
 #, c-format
 msgid "can't disassemble for architecture %s\n"
 msgstr "no se puede desensamblar para la arquitectura %s\n"
 
-#: objdump.c:2242 objdump.c:2265
+#: objdump.c:2214 objdump.c:2237
 #, c-format
 msgid ""
 "\n"
@@ -4056,7 +4006,7 @@ msgstr ""
 "\n"
 "No se puede obtener el contenido de la sección '%s'.\n"
 
-#: objdump.c:2406
+#: objdump.c:2378
 #, c-format
 msgid ""
 "No %s section present\n"
@@ -4065,12 +4015,12 @@ msgstr ""
 "No está presente la sección %s\n"
 "\n"
 
-#: objdump.c:2415
+#: objdump.c:2387
 #, c-format
 msgid "reading %s section of %s failed: %s"
 msgstr "falló al leer la sección %s de %s: %s"
 
-#: objdump.c:2459
+#: objdump.c:2431
 #, c-format
 msgid ""
 "Contents of %s section:\n"
@@ -4079,17 +4029,17 @@ msgstr ""
 "Contenido de la sección %s:\n"
 "\n"
 
-#: objdump.c:2590
+#: objdump.c:2562
 #, c-format
 msgid "architecture: %s, "
 msgstr "arquitectura: %s, "
 
-#: objdump.c:2593
+#: objdump.c:2565
 #, c-format
 msgid "flags 0x%08x:\n"
 msgstr "opciones 0x%08x:\n"
 
-#: objdump.c:2607
+#: objdump.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -4098,45 +4048,36 @@ msgstr ""
 "\n"
 "dirección de inicio 0x"
 
-#: objdump.c:2633
-msgid "option -P/--private not supported by this file"
-msgstr "este fichero no admite la opción -P/--private"
-
-#: objdump.c:2657
-#, c-format
-msgid "target specific dump '%s' not supported"
-msgstr "no se admite el volcado específico de destino '%s'"
-
-#: objdump.c:2721
+#: objdump.c:2642
 #, c-format
 msgid "Contents of section %s:"
 msgstr "Contenido de la sección %s:"
 
-#: objdump.c:2723
+#: objdump.c:2644
 #, c-format
 msgid "  (Starting at file offset: 0x%lx)"
 msgstr "  (Inicia en el desplazamiento de fichero: 0x%lx)"
 
-#: objdump.c:2729
+#: objdump.c:2650
 msgid "Reading section failed"
 msgstr "Falló al leer la sección"
 
-#: objdump.c:2832
+#: objdump.c:2753
 #, c-format
 msgid "no symbols\n"
 msgstr "no hay símbolos\n"
 
-#: objdump.c:2839
+#: objdump.c:2760
 #, c-format
 msgid "no information for symbol number %ld\n"
 msgstr "no hay información para el símbolo número %ld\n"
 
-#: objdump.c:2842
+#: objdump.c:2763
 #, c-format
 msgid "could not determine the type of symbol number %ld\n"
 msgstr "no se puede determinar el tipo del símbolo número %ld\n"
 
-#: objdump.c:3163
+#: objdump.c:3043
 #, c-format
 msgid ""
 "\n"
@@ -4145,732 +4086,41 @@ msgstr ""
 "\n"
 "%s:     formato del fichero %s\n"
 
-#: objdump.c:3223
+#: objdump.c:3101
 #, c-format
 msgid "%s: printing debugging information failed"
 msgstr "%s: falló al mostrar la información de depuración"
 
-#: objdump.c:3327
+#: objdump.c:3205
 #, c-format
 msgid "In archive %s:\n"
 msgstr "En el fichero %s:\n"
 
-#: objdump.c:3438
+#: objdump.c:3316
 msgid "error: the start address should be before the end address"
 msgstr "error: la dirección de inicio debe estar antes de la dirección final"
 
-#: objdump.c:3443
+#: objdump.c:3321
 msgid "error: the stop address should be after the start address"
 msgstr "error: la dirección de parada debe estar después de la dirección final"
 
-#: objdump.c:3455
+#: objdump.c:3333
 msgid "error: prefix strip must be non-negative"
 msgstr "error: el descarte de prefijo no debe ser negativo"
 
-#: objdump.c:3460
+#: objdump.c:3338
 msgid "error: instruction width must be positive"
 msgstr "error: la anchura de la instrucción debe ser positiva"
 
-#: objdump.c:3469
+#: objdump.c:3347
 msgid "unrecognized -E option"
 msgstr "no se reconoce la opción -E"
 
-#: objdump.c:3480
+#: objdump.c:3358
 #, c-format
 msgid "unrecognized --endian type `%s'"
 msgstr "no se reconoce el tipo --endian `%s'"
 
-#: od-xcoff.c:75
-#, c-format
-msgid ""
-"For XCOFF files:\n"
-"  header      Display the file header\n"
-"  aout        Display the auxiliary header\n"
-"  sections    Display the section headers\n"
-"  syms        Display the symbols table\n"
-"  relocs      Display the relocation entries\n"
-"  lineno      Display the line number entries\n"
-"  loader      Display loader section\n"
-"  except      Display exception table\n"
-"  typchk      Display type-check section\n"
-"  traceback   Display traceback tags\n"
-"  toc         Display toc symbols\n"
-msgstr ""
-"Para ficheros XCOFF:\n"
-"  header      Muestra el encabezado de fichero\n"
-"  aout        Muestra el encabezado auxiliar\n"
-"  sections    Muestra los encabezados de sección\n"
-"  syms        Muestra la tabla de símbolos\n"
-"  relocs      Muestra las entradas de reubicación\n"
-"  lineno      Muestra las entradas de número de línea\n"
-"  loader      Muestra la sección de cargador\n"
-"  except      Muestra la tabla de excepción\n"
-"  typchk      Muestra la sección de revisión de tipo\n"
-"  traceback   Muestra las etiquetas de rastreo hacia atrás\n"
-"  toc         Muestra los símbolos de la tabla de contenidos\n"
-
-#: od-xcoff.c:416
-#, c-format
-msgid "  nbr sections:  %d\n"
-msgstr "  secciones nbr: %d\n"
-
-#: od-xcoff.c:417
-#, c-format
-msgid "  time and date: 0x%08x  - "
-msgstr "  hora y fecha:  0x%08x  - "
-
-#: od-xcoff.c:419
-#, c-format
-msgid "not set\n"
-msgstr "sin def\n"
-
-#: od-xcoff.c:426
-#, c-format
-msgid "  symbols off:   0x%08x\n"
-msgstr "  desplaz simb:  0x%08x\n"
-
-#: od-xcoff.c:427
-#, c-format
-msgid "  nbr symbols:   %d\n"
-msgstr "  símbolos nbr:  %d\n"
-
-#: od-xcoff.c:428
-#, c-format
-msgid "  opt hdr sz:    %d\n"
-msgstr "   tam enc opc:  %d\n"
-
-#: od-xcoff.c:429
-#, c-format
-msgid "  flags:         0x%04x "
-msgstr "  opciones:      0x%04x "
-
-#: od-xcoff.c:443
-#, c-format
-msgid "Auxiliary header:\n"
-msgstr "Encabezado auxiliar:\n"
-
-#: od-xcoff.c:446
-#, c-format
-msgid "  No aux header\n"
-msgstr "  Sin enc aux\n"
-
-#: od-xcoff.c:451
-#, c-format
-msgid "warning: optionnal header size too large (> %d)\n"
-msgstr "warning: el tamaño del encabezado opcional es demasiado grande (> %d)\n"
-
-#: od-xcoff.c:457
-msgid "cannot read auxhdr"
-msgstr "no se puede leer encaux"
-
-#: od-xcoff.c:462
-#, c-format
-msgid "  o_mflag (magic): 0x%04x 0%04o\n"
-msgstr "  o_mflag (magic): 0x%04x 0%04o\n"
-
-#: od-xcoff.c:463
-#, c-format
-msgid "  o_vstamp:        0x%04x\n"
-msgstr "  o_vstamp:        0x%04x\n"
-
-#: od-xcoff.c:465
-#, c-format
-msgid "  o_tsize:         0x%08x\n"
-msgstr "  o_tsize:         0x%08x\n"
-
-#: od-xcoff.c:467
-#, c-format
-msgid "  o_dsize:         0x%08x\n"
-msgstr "  o_dsize:         0x%08x\n"
-
-#: od-xcoff.c:469
-#, c-format
-msgid "  o_entry:         0x%08x\n"
-msgstr "  o_entry:         0x%08x\n"
-
-#: od-xcoff.c:471
-#, c-format
-msgid "  o_text_start:    0x%08x\n"
-msgstr "  o_text_start:    0x%08x\n"
-
-#: od-xcoff.c:473
-#, c-format
-msgid "  o_data_start:    0x%08x\n"
-msgstr "  o_data_start:    0x%08x\n"
-
-#: od-xcoff.c:477
-#, c-format
-msgid "  o_toc:           0x%08x\n"
-msgstr "  o_toc:           0x%08x\n"
-
-#: od-xcoff.c:479
-#, c-format
-msgid "  o_snentry:       0x%04x\n"
-msgstr "  o_snentry:       0x%04x\n"
-
-#: od-xcoff.c:481
-#, c-format
-msgid "  o_sntext:        0x%04x\n"
-msgstr "  o_sntext:        0x%04x\n"
-
-#: od-xcoff.c:483
-#, c-format
-msgid "  o_sndata:        0x%04x\n"
-msgstr "  o_sndata:        0x%04x\n"
-
-#: od-xcoff.c:485
-#, c-format
-msgid "  o_sntoc:         0x%04x\n"
-msgstr "  o_sntoc:         0x%04x\n"
-
-#: od-xcoff.c:487
-#, c-format
-msgid "  o_snloader:      0x%04x\n"
-msgstr "  o_snloader:      0x%04x\n"
-
-#: od-xcoff.c:489
-#, c-format
-msgid "  o_snbss:         0x%04x\n"
-msgstr "  o_snbss:         0x%04x\n"
-
-#: od-xcoff.c:491
-#, c-format
-msgid "  o_algntext:      %u\n"
-msgstr "  o_algntext:      %u\n"
-
-#: od-xcoff.c:493
-#, c-format
-msgid "  o_algndata:      %u\n"
-msgstr "  o_algndata:      %u\n"
-
-#: od-xcoff.c:495
-#, c-format
-msgid "  o_modtype:       0x%04x"
-msgstr "  o_modtype:       0x%04x"
-
-#: od-xcoff.c:500
-#, c-format
-msgid "  o_cputype:       0x%04x\n"
-msgstr "  o_cputype:       0x%04x\n"
-
-#: od-xcoff.c:502
-#, c-format
-msgid "  o_maxstack:      0x%08x\n"
-msgstr "  o_maxstack:      0x%08x\n"
-
-#: od-xcoff.c:504
-#, c-format
-msgid "  o_maxdata:       0x%08x\n"
-msgstr "  o_maxdata:       0x%08x\n"
-
-#: od-xcoff.c:507
-#, c-format
-msgid "  o_debugger:      0x%08x\n"
-msgstr "  o_debugger:      0x%08x\n"
-
-#: od-xcoff.c:521
-#, c-format
-msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
-msgstr "Encabezados de sección (en %u+%u=0x%08x a 0x%08x):\n"
-
-#: od-xcoff.c:526
-#, c-format
-msgid "  No section header\n"
-msgstr "  Sin enc de sección\n"
-
-#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
-msgid "cannot read section header"
-msgstr "no se puede leer el encabezado de secció"
-
-#: od-xcoff.c:534
-#, c-format
-msgid " # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-msgstr " # Nombre   pdir     vdir     tamaño   scnpunt  relpunt  lnnpunt  nrel  nlnno\n"
-
-#: od-xcoff.c:546
-#, c-format
-msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-msgstr "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-
-#: od-xcoff.c:557
-#, c-format
-msgid "            Flags: %08x "
-msgstr "            Opcs:  %08x "
-
-#: od-xcoff.c:565
-#, c-format
-msgid "overflow - nreloc: %u, nlnno: %u\n"
-msgstr "desborde - nreloc: %u, nlnno: %u\n"
-
-#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
-msgid "cannot read section headers"
-msgstr "no de pueden leer los encabezados de sección"
-
-#: od-xcoff.c:650
-msgid "cannot read strings table len"
-msgstr "no se puede leer la long de tabla de cadenas"
-
-#: od-xcoff.c:664
-msgid "cannot read strings table"
-msgstr "no se puede leer la tabla de cadenas"
-
-#: od-xcoff.c:672
-msgid "cannot read symbol table"
-msgstr "no se puede leer la tabla de símbolos"
-
-#: od-xcoff.c:687
-msgid "cannot read symbol entry"
-msgstr "no se puede leer la entrada de símbolos"
-
-#: od-xcoff.c:722
-msgid "cannot read symbol aux entry"
-msgstr "no se puede leer la entrada aux de símbolos"
-
-#: od-xcoff.c:744
-#, c-format
-msgid "Symbols table (strtable at 0x%08x)"
-msgstr "Tabla de símbolos (initabla en 0x%08x)"
-
-#: od-xcoff.c:749
-#, c-format
-msgid ""
-":\n"
-"  No symbols\n"
-msgstr ""
-":\n"
-"  Sin símbolos\n"
-
-#: od-xcoff.c:755
-#, c-format
-msgid " (no strings):\n"
-msgstr " (sin cadenas):\n"
-
-#: od-xcoff.c:757
-#, c-format
-msgid " (strings size: %08x):\n"
-msgstr " (tamaño cadenas: %08x):\n"
-
-#: od-xcoff.c:770
-#, c-format
-msgid "  # sc         value    section  type aux name/off\n"
-msgstr "  # sc         valor    seccion  tipo aux nom/desp\n"
-
-#: od-xcoff.c:821
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-msgstr "  scnlon: %08x  nreloc: %-6u  nlinno: %-6u\n"
-
-#: od-xcoff.c:827
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u\n"
-
-#. Function aux entry.
-#: od-xcoff.c:837
-#, c-format
-msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-msgstr "  expun: %08x ftam:  %08x lnnopun: %08x finind: %u\n"
-
-#: od-xcoff.c:856
-#, c-format
-msgid "  scnsym: %-8u"
-msgstr "  scnsim: %-8u"
-
-#: od-xcoff.c:858
-#, c-format
-msgid "  scnlen: %08x"
-msgstr "  scnlon: %08x"
-
-#: od-xcoff.c:859
-#, c-format
-msgid " h: parm=%08x sn=%04x al: 2**%u"
-msgstr " h: parm=%08x sn=%04x al: 2**%u"
-
-#: od-xcoff.c:863
-#, c-format
-msgid " typ: "
-msgstr " tip: "
-
-#: od-xcoff.c:865
-#, c-format
-msgid " cl: "
-msgstr " cl: "
-
-#: od-xcoff.c:878
-#, c-format
-msgid " ftype: %02x "
-msgstr " ftipo: %02x "
-
-#: od-xcoff.c:881
-#, c-format
-msgid "fname: %.14s"
-msgstr "fnom:  %.14s"
-
-#: od-xcoff.c:887
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: od-xcoff.c:889
-#, c-format
-msgid "offset: %08x"
-msgstr "despl:  %08x"
-
-#: od-xcoff.c:896
-#, c-format
-msgid "  lnno: %u\n"
-msgstr "  numl: %u\n"
-
-#: od-xcoff.c:931
-#, c-format
-msgid "Relocations for %s (%u)\n"
-msgstr "Reubicaciones para %s (%u)\n"
-
-#: od-xcoff.c:934
-msgid "cannot read relocations"
-msgstr "no se pueden leer las reubicaciones"
-
-#: od-xcoff.c:937
-#, c-format
-msgid "vaddr    sgn mod sz type  symndx symbol\n"
-msgstr "vdir     sgn mod tm tipo  simind simbolo\n"
-
-#: od-xcoff.c:946
-msgid "cannot read relocation entry"
-msgstr "no se puede leer la sección de reubicación"
-
-#: od-xcoff.c:950
-#, c-format
-msgid "%08x  %c   %c  %-2u "
-msgstr "%08x  %c   %c  %-2u "
-
-#: od-xcoff.c:986
-#, c-format
-msgid "Line numbers for %s (%u)\n"
-msgstr "Números de línea para %s (%u)\n"
-
-#: od-xcoff.c:989
-msgid "cannot read line numbers"
-msgstr "no se pueden leer los números de línea"
-
-#: od-xcoff.c:992
-#, c-format
-msgid "lineno  symndx/paddr\n"
-msgstr "numlin  simind/pdir\n"
-
-#: od-xcoff.c:1000
-msgid "cannot read line number entry"
-msgstr "no se puede leer la entrada de número de línea"
-
-#: od-xcoff.c:1004
-#, c-format
-msgid " %-6u "
-msgstr " %-6u "
-
-#: od-xcoff.c:1043
-#, c-format
-msgid "no .loader section in file\n"
-msgstr "no hay sección .loader en el fichero\n"
-
-#: od-xcoff.c:1049
-#, c-format
-msgid "section .loader is too short\n"
-msgstr "la sección .loader es demasiado corta\n"
-
-#: od-xcoff.c:1056
-#, c-format
-msgid "Loader header:\n"
-msgstr "Encabezado de cargador:\n"
-
-#: od-xcoff.c:1058
-#, c-format
-msgid "  version:           %u\n"
-msgstr "  versión:           %u\n"
-
-#: od-xcoff.c:1061
-#, c-format
-msgid " Unhandled version\n"
-msgstr " Versión sin manejar\n"
-
-#: od-xcoff.c:1066
-#, c-format
-msgid "  nbr symbols:       %u\n"
-msgstr "  símbolos nbr:      %u\n"
-
-#: od-xcoff.c:1068
-#, c-format
-msgid "  nbr relocs:        %u\n"
-msgstr "  reubics nbr:       %u\n"
-
-#: od-xcoff.c:1069
-#, c-format
-msgid "  import strtab len: %u\n"
-msgstr "  len tabcad import: %u\n"
-
-#: od-xcoff.c:1072
-#, c-format
-msgid "  nbr import files:  %u\n"
-msgstr "  fichs import nbr:  %u\n"
-
-#: od-xcoff.c:1074
-#, c-format
-msgid "  import file off:   %u\n"
-msgstr "  desp fich import:  %u\n"
-
-#: od-xcoff.c:1076
-#, c-format
-msgid "  string table len:  %u\n"
-msgstr "  lon tabla cadenas: %u\n"
-
-#: od-xcoff.c:1078
-#, c-format
-msgid "  string table off:  %u\n"
-msgstr "  desp tabla cadena: %u\n"
-
-#: od-xcoff.c:1081
-#, c-format
-msgid "Dynamic symbols:\n"
-msgstr "Símbolos dinámicos:\n"
-
-#: od-xcoff.c:1082
-#, c-format
-msgid "     # value     sc IFEW ty class file  pa name\n"
-msgstr "     # valor     sc IFEW ti clase fich  pa nom\n"
-
-#: od-xcoff.c:1087
-#, c-format
-msgid "  %4u %08x %3u "
-msgstr "  %4u %08x %3u "
-
-#: od-xcoff.c:1100
-#, c-format
-msgid " %3u %3u "
-msgstr " %3u %3u "
-
-#: od-xcoff.c:1109
-#, c-format
-msgid "(bad offset: %u)"
-msgstr "(desplazamiento erróneo: %u)"
-
-#: od-xcoff.c:1116
-#, c-format
-msgid "Dynamic relocs:\n"
-msgstr "Reubicaciones dinámicas:\n"
-
-#: od-xcoff.c:1117
-#, c-format
-msgid "  vaddr    sec    sz typ   sym\n"
-msgstr "  vdir     sec    tm  tip  sim\n"
-
-#: od-xcoff.c:1129
-#, c-format
-msgid "  %08x %3u %c%c %2u "
-msgstr "  %08x %3u %c%c %2u "
-
-#: od-xcoff.c:1140
-#, c-format
-msgid ".text"
-msgstr ".text"
-
-#: od-xcoff.c:1143
-#, c-format
-msgid ".data"
-msgstr ".data"
-
-#: od-xcoff.c:1146
-#, c-format
-msgid ".bss"
-msgstr ".bss"
-
-#: od-xcoff.c:1149
-#, c-format
-msgid "%u"
-msgstr "%u"
-
-#: od-xcoff.c:1155
-#, c-format
-msgid "Import files:\n"
-msgstr "Ficheros de importación:\n"
-
-#: od-xcoff.c:1187
-#, c-format
-msgid "no .except section in file\n"
-msgstr "no hay una sección .except en el fichero\n"
-
-#: od-xcoff.c:1195
-#, c-format
-msgid "Exception table:\n"
-msgstr "Tabla de excepción:\n"
-
-#: od-xcoff.c:1196
-#, c-format
-msgid "lang reason sym/addr\n"
-msgstr "leng razon  sim/dir\n"
-
-#: od-xcoff.c:1204
-#, c-format
-msgid "  %02x     %02x "
-msgstr "  %02x     %02x "
-
-#: od-xcoff.c:1209
-#, c-format
-msgid "@%08x"
-msgstr "@%08x"
-
-#: od-xcoff.c:1229
-#, c-format
-msgid "no .typchk section in file\n"
-msgstr "no hay una sección .typchk en el fichero\n"
-
-#: od-xcoff.c:1236
-#, c-format
-msgid "Type-check section:\n"
-msgstr "Sección revisión de tipo:\n"
-
-#: od-xcoff.c:1237
-#, c-format
-msgid "offset    len  lang-id general-hash language-hash\n"
-msgstr "despl     lon  id-leng hash-general hash-lenguaje\n"
-
-#: od-xcoff.c:1282
-#, c-format
-msgid " address beyond section size\n"
-msgstr " dirección más allá del tamaño de la sección\n"
-
-#: od-xcoff.c:1292
-#, c-format
-msgid " tags at %08x\n"
-msgstr " etiquetas en %08x\n"
-
-#: od-xcoff.c:1299
-#, c-format
-msgid " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-msgstr " versión: %u, leng: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-
-#: od-xcoff.c:1306
-#, c-format
-msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-msgstr " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-
-#: od-xcoff.c:1312
-#, c-format
-msgid " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-msgstr " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-
-#: od-xcoff.c:1318
-#, c-format
-msgid " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-msgstr " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-
-#: od-xcoff.c:1324
-#, c-format
-msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-msgstr " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-
-#: od-xcoff.c:1337
-#, c-format
-msgid " parminfo: 0x%08x\n"
-msgstr " parminfo: 0x%08x\n"
-
-#: od-xcoff.c:1348
-#, c-format
-msgid " tb_offset: 0x%08x (start=0x%08x)\n"
-msgstr " tb_offset: 0x%08x (inicio=0x%08x)\n"
-
-#: od-xcoff.c:1359
-#, c-format
-msgid " hand_mask_offset: 0x%08x\n"
-msgstr " hand_mask_offset: 0x%08x\n"
-
-#: od-xcoff.c:1370
-#, c-format
-msgid " number of CTL anchors: %u\n"
-msgstr " número de anclas CTL: %u\n"
-
-#: od-xcoff.c:1375
-#, c-format
-msgid "  CTL[%u]: %08x\n"
-msgstr "  CTL[%u]: %08x\n"
-
-#: od-xcoff.c:1389
-#, c-format
-msgid " Name (len: %u): "
-msgstr " Nombre (lon: %u): "
-
-#: od-xcoff.c:1392
-#, c-format
-msgid "[truncated]\n"
-msgstr "[truncado]\n"
-
-#: od-xcoff.c:1407
-#, c-format
-msgid " alloca reg: %u\n"
-msgstr " reg aloja: %u\n"
-
-#: od-xcoff.c:1411
-#, c-format
-msgid " (end of tags at %08x)\n"
-msgstr " (fin de etiquetas en %08x)\n"
-
-#: od-xcoff.c:1414
-#, c-format
-msgid " no tags found\n"
-msgstr " no se encontraron etiquetas\n"
-
-#: od-xcoff.c:1418
-#, c-format
-msgid " Truncated .text section\n"
-msgstr " Sección .text truncada\n"
-
-#: od-xcoff.c:1503
-#, c-format
-msgid "TOC:\n"
-msgstr "TOC:\n"
-
-#: od-xcoff.c:1546
-#, c-format
-msgid "Nbr entries: %-8u Size: %08x (%u)\n"
-msgstr "Entradas nbr: %-8u Tam: %08x (%u)\n"
-
-#: od-xcoff.c:1630
-msgid "cannot read header"
-msgstr "no se puede leer el encabezado"
-
-#: od-xcoff.c:1638
-#, c-format
-msgid "File header:\n"
-msgstr "Fichero encabezado:\n"
-
-#: od-xcoff.c:1639
-#, c-format
-msgid "  magic:         0x%04x (0%04o)  "
-msgstr "  magic:         0x%04x (0%04o)  "
-
-#: od-xcoff.c:1643
-#, c-format
-msgid "(WRMAGIC: writable text segments)"
-msgstr " (WRMAGIC: segmentos de texto modificables)"
-
-#: od-xcoff.c:1646
-#, c-format
-msgid "(ROMAGIC: readonly sharablee text segments)"
-msgstr "(ROMAGIC: segmentos de texto compartibles de sólo lectura)"
-
-#: od-xcoff.c:1649
-#, c-format
-msgid "(TOCMAGIC: readonly text segments and TOC)"
-msgstr "(TOCMAGIC: segmentos de texto y TOC de sólo lectura)"
-
-#: od-xcoff.c:1652
-#, c-format
-msgid "unknown magic"
-msgstr "magic desconocida"
-
-#: od-xcoff.c:1659
-#, c-format
-msgid "  Unhandled magic\n"
-msgstr "  Magic sin manejar\n"
-
 #: rclex.c:197
 msgid "invalid value specified for pragma code_page.\n"
 msgstr "se especificó un valor inválido para el pragma code_page.\n"
@@ -4910,231 +4160,231 @@ msgstr "%s: no se reconoce la información de depuración"
 msgid "Last stabs entries before error:\n"
 msgstr "Últimas entradas stabs antes del error:\n"
 
-#: readelf.c:265
+#: readelf.c:268
 msgid "<none>"
 msgstr "<ninguno>"
 
-#: readelf.c:266
+#: readelf.c:269
 msgid "<no-name>"
 msgstr "<sin-nomber>"
 
-#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
-#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
-#: readelf.c:12153
+#: readelf.c:270 readelf.c:5047 readelf.c:5557 readelf.c:7794 readelf.c:7912
+#: readelf.c:8865 readelf.c:8945 readelf.c:8998 readelf.c:11860
+#: readelf.c:11863
 msgid "<corrupt>"
 msgstr "<corrupto>"
 
-#: readelf.c:300
+#: readelf.c:308
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr "No se puede buscar a 0x%lx para %s\n"
 
-#: readelf.c:315
+#: readelf.c:323
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr "Memoria agotada al asignar 0x%lx bytes para %s\n"
 
-#: readelf.c:325
+#: readelf.c:333
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr "No se pueden leer 0x%lx bytes de %s\n"
 
-#: readelf.c:625
+#: readelf.c:697
 msgid "Don't know about relocations on this machine architecture\n"
 msgstr "No se conocen las reubicaciones en esta arquitectura de máquina\n"
 
-#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+#: readelf.c:718 readelf.c:748 readelf.c:816 readelf.c:845
 msgid "relocs"
 msgstr "reubicaciones"
 
-#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
+#: readelf.c:730 readelf.c:760 readelf.c:827 readelf.c:856
 msgid "out of memory parsing relocs\n"
 msgstr "memoria agotada al decodificar reubicaciones\n"
 
-#: readelf.c:889
+#: readelf.c:961
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr " Desplaz    Info    Tipo                Val. Símbolo Nombre Símbolo + Adend\n"
 
-#: readelf.c:891
+#: readelf.c:963
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr " Desplaz    Info    Tipo            Val.Símbolo Nom.Símbolo + Adend\n"
 
-#: readelf.c:896
+#: readelf.c:968
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr " Desplaz    Info    Tipo                Val. Símbolo Nombre Símbolo\n"
 
-#: readelf.c:898
+#: readelf.c:970
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr " Desplaz    Info    Tipo            Val.Símbolo Nom. Símbolo\n"
 
-#: readelf.c:906
+#: readelf.c:978
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend\n"
 msgstr "    Desplaz            Info             Tipo               Valor Símbolo  Nombre Símbolo + Adend\n"
 
-#: readelf.c:908
+#: readelf.c:980
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name + Addend\n"
 msgstr "  Desplaz         Info           Tipo           Val. Símbolo  Nom. Símbolo + Adend\n"
 
-#: readelf.c:913
+#: readelf.c:985
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name\n"
 msgstr "    Desplaz            Info             Tipo               Valor Símbolo  Nombre Símbolo\n"
 
-#: readelf.c:915
+#: readelf.c:987
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr "  Desplaz         Info           Tipo           Val. Símbolo  Nom. Símbolo\n"
 
-#: readelf.c:1219 readelf.c:1378 readelf.c:1386
+#: readelf.c:1291 readelf.c:1448 readelf.c:1456
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr "no se reconoce: %-7lx"
 
-#: readelf.c:1244
+#: readelf.c:1316
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr "<agregado desconocido: %lx>"
 
-#: readelf.c:1251
+#: readelf.c:1323
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr "índice de símbolos erróneo: %08lx"
 
-#: readelf.c:1336
+#: readelf.c:1406
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr "<índice de la tabla de cadenas: %3ld>"
 
-#: readelf.c:1338
+#: readelf.c:1408
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr "<índice de la tabla de cadenas corrupto: %3ld>"
 
-#: readelf.c:1731
+#: readelf.c:1801
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr "Específico del Procesador: %lx"
 
-#: readelf.c:1755
+#: readelf.c:1825
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr "específico del Sistema Operativo: %lx"
 
-#: readelf.c:1759 readelf.c:2821
+#: readelf.c:1829 readelf.c:2875
 #, c-format
 msgid "<unknown>: %lx"
 msgstr "<desconocido>: %lx"
 
-#: readelf.c:1772
+#: readelf.c:1842
 msgid "NONE (None)"
 msgstr "NONE (Ninguno)"
 
-#: readelf.c:1773
+#: readelf.c:1843
 msgid "REL (Relocatable file)"
 msgstr "REL (Fichero reubicable)"
 
-#: readelf.c:1774
+#: readelf.c:1844
 msgid "EXEC (Executable file)"
 msgstr "EXEC (Fichero ejecutable)"
 
-#: readelf.c:1775
+#: readelf.c:1845
 msgid "DYN (Shared object file)"
 msgstr "DYN (Fichero objeto compartido)"
 
-#: readelf.c:1776
+#: readelf.c:1846
 msgid "CORE (Core file)"
 msgstr "CORE (Fichero núcleo)"
 
-#: readelf.c:1780
+#: readelf.c:1850
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr "Específico del Procesador: (%x)"
 
-#: readelf.c:1782
+#: readelf.c:1852
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr "Específico del SO: (%x)"
 
-#: readelf.c:1784 readelf.c:3068
+#: readelf.c:1854 readelf.c:3122
 #, c-format
 msgid "<unknown>: %x"
 msgstr "<desconocido>: %x"
 
-#: readelf.c:1796
+#: readelf.c:1866
 msgid "None"
 msgstr "Ninguno"
 
-#: readelf.c:1964
+#: readelf.c:2034
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr "<desconocido>: 0x%x"
 
-#: readelf.c:2150
+#: readelf.c:2220
 msgid ", <unknown>"
 msgstr ", <desconocido>"
 
-#: readelf.c:2236 readelf.c:7428
+#: readelf.c:2291 readelf.c:7145
 msgid "unknown"
 msgstr "desconocido"
 
-#: readelf.c:2237
+#: readelf.c:2292
 msgid "unknown mac"
 msgstr "mac desconocida"
 
-#: readelf.c:2301
+#: readelf.c:2356
 msgid ", relocatable"
 msgstr ", reubicable"
 
-#: readelf.c:2304
+#: readelf.c:2359
 msgid ", relocatable-lib"
 msgstr ", bib reubicable"
 
-#: readelf.c:2327
+#: readelf.c:2382
 msgid ", unknown v850 architecture variant"
 msgstr ", variante de arquitectura v850 desconocida"
 
-#: readelf.c:2384
+#: readelf.c:2438
 msgid ", unknown CPU"
 msgstr ", CPU desconocido"
 
-#: readelf.c:2399
+#: readelf.c:2453
 msgid ", unknown ABI"
 msgstr ", ABI desconocida"
 
-#: readelf.c:2419 readelf.c:2453
+#: readelf.c:2473 readelf.c:2507
 msgid ", unknown ISA"
 msgstr ", ISA desconocida"
 
-#: readelf.c:2626
+#: readelf.c:2680
 msgid "Standalone App"
 msgstr "Aplicación por Sí Sola"
 
-#: readelf.c:2635
+#: readelf.c:2689
 msgid "Bare-metal C6000"
 msgstr "C6000 sólo-metal"
 
-#: readelf.c:2645 readelf.c:3431 readelf.c:3447
+#: readelf.c:2699 readelf.c:3462 readelf.c:3478
 #, c-format
 msgid "<unknown: %x>"
 msgstr "<desconocido: %x>"
 
-#: readelf.c:3123
+#: readelf.c:3172
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr "Modo de empleo: readelf <opcion(es)> fichero(s)-elf\n"
 
-#: readelf.c:3124
+#: readelf.c:3173
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr " Muestra información sobre el contenido de los ficheros de formato ELF\n"
 
-#: readelf.c:3125
+#: readelf.c:3174
 #, c-format
 msgid ""
 " Options are:\n"
@@ -5167,7 +4417,7 @@ msgid ""
 "  -w[lLiaprmfFsoRt] or\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 " Las opciones son:\n"
@@ -5205,22 +4455,11 @@ msgstr ""
 "  -w[lLiaprmfFsoRt] o\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Muestra el contenido de las secciones de depuración\n"
-"                          DWARF2\n"
-
-#: readelf.c:3157
-#, c-format
-msgid ""
-"  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"  --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                         or deeper\n"
-msgstr ""
-"  --dwarf-depth=N        No muestra DIEs a la profundidad N o mayor\n"
-"  --dwarf-start=N        Muestra DIEs iniciando con N, a la misma\n"
-"                         profundidad o mayor\n"
+"                         DWARF2\n"
 
-#: readelf.c:3162
+#: readelf.c:3207
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
@@ -5229,7 +4468,7 @@ msgstr ""
 "  -i --instruction-dump=<número|nombre>\n"
 "                         Desensambla el contenido de la sección <número|nombre>\n"
 
-#: readelf.c:3166
+#: readelf.c:3211
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -5245,96 +4484,96 @@ msgstr ""
 "  -H --help              Muestra esta información\n"
 "  -v --version           Muestra el número de versión de readelf\n"
 
-#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
+#: readelf.c:3240 readelf.c:3269 readelf.c:3273 readelf.c:13224
 msgid "Out of memory allocating dump request table.\n"
 msgstr "Memoria agotada al asignar la tabla de petición de volcado.\n"
 
-#: readelf.c:3400
+#: readelf.c:3431
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr "Opción '-%c' inválida\n"
 
-#: readelf.c:3415
+#: readelf.c:3446
 msgid "Nothing to do.\n"
 msgstr "Nada por hacer.\n"
 
-#: readelf.c:3427 readelf.c:3443 readelf.c:8013
+#: readelf.c:3458 readelf.c:3474 readelf.c:7730
 msgid "none"
 msgstr "ninguno"
 
-#: readelf.c:3444
+#: readelf.c:3475
 msgid "2's complement, little endian"
 msgstr "complemento a 2, little endian"
 
-#: readelf.c:3445
+#: readelf.c:3476
 msgid "2's complement, big endian"
 msgstr "complemento a 2, big endian"
 
-#: readelf.c:3463
+#: readelf.c:3494
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
 msgstr "No es un fichero ELF - tiene los bytes mágicos erróneos en el inicio\n"
 
-#: readelf.c:3473
+#: readelf.c:3504
 #, c-format
 msgid "ELF Header:\n"
 msgstr "Encabezado ELF:\n"
 
-#: readelf.c:3474
+#: readelf.c:3505
 #, c-format
 msgid "  Magic:   "
 msgstr "  Mágico:  "
 
-#: readelf.c:3478
+#: readelf.c:3509
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr "  Clase:                             %s\n"
 
-#: readelf.c:3480
+#: readelf.c:3511
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr "  Datos:                             %s\n"
 
-#: readelf.c:3482
+#: readelf.c:3513
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr "  Versión:                           %d %s\n"
 
-#: readelf.c:3487
+#: readelf.c:3518
 #, c-format
 msgid "<unknown: %lx>"
 msgstr "<desconocido: %lx>"
 
-#: readelf.c:3489
+#: readelf.c:3520
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr "  OS/ABI:                            %s\n"
 
-#: readelf.c:3491
+#: readelf.c:3522
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr "  Versión ABI:                       %d\n"
 
-#: readelf.c:3493
+#: readelf.c:3524
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr "  Tipo:                              %s\n"
 
-#: readelf.c:3495
+#: readelf.c:3526
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr "  Máquina:                           %s\n"
 
-#: readelf.c:3497
+#: readelf.c:3528
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr "  Versión:                           0x%lx\n"
 
-#: readelf.c:3500
+#: readelf.c:3531
 #, c-format
 msgid "  Entry point address:               "
 msgstr "  Dirección del punto de entrada:    "
 
-#: readelf.c:3502
+#: readelf.c:3533
 #, c-format
 msgid ""
 "\n"
@@ -5343,7 +4582,7 @@ msgstr ""
 "\n"
 "  Inicio de encabezados de programa: "
 
-#: readelf.c:3504
+#: readelf.c:3535
 #, c-format
 msgid ""
 " (bytes into file)\n"
@@ -5352,60 +4591,61 @@ msgstr ""
 "  (bytes en el fichero)\n"
 "  Inicio de encabezados de sección:  "
 
-#: readelf.c:3506
+#: readelf.c:3537
 #, c-format
 msgid " (bytes into file)\n"
 msgstr " (bytes en el fichero)\n"
 
-#: readelf.c:3508
+#: readelf.c:3539
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr "  Opciones:                          0x%lx%s\n"
 
-#: readelf.c:3511
+#: readelf.c:3542
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr "  Tamaño de este encabezado:         %ld (bytes)\n"
 
-#: readelf.c:3513
+#: readelf.c:3544
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr "  Tamaño de encabezados de programa: %ld (bytes)\n"
 
-#: readelf.c:3515
+#: readelf.c:3546
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr "  Número de encabezados de programa: %ld"
 
-#: readelf.c:3522
+#: readelf.c:3551
+#, c-format
+msgid " (%ld)"
+msgstr " (%ld)"
+
+#: readelf.c:3553
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr "  Tamaño de encabezados de sección:  %ld (bytes)\n"
 
-#: readelf.c:3524
+#: readelf.c:3555
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr "  Número de encabezados de sección:  %ld"
 
-#: readelf.c:3529
+#: readelf.c:3560
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr "  �ndice de tabla de cadenas de sección de encabezado: %ld"
 
-#: readelf.c:3536
+#: readelf.c:3567
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr " <corrupto: fuera de rango>"
 
-#: readelf.c:3570 readelf.c:3604
+#: readelf.c:3601 readelf.c:3635
 msgid "program headers"
 msgstr "encabezados de programa"
 
-#: readelf.c:3671
-msgid "possibly corrupt ELF header - it has a non-zero program header offset, but no program headers"
-msgstr "encabezado ELF posiblemente corrupto - tiene un desplazamiento de encabezado de programa que no es cero, pero no tiene encabezados de programa"
-
-#: readelf.c:3674
+#: readelf.c:3701
 #, c-format
 msgid ""
 "\n"
@@ -5414,7 +4654,7 @@ msgstr ""
 "\n"
 "No hay encabezados de programa en este fichero.\n"
 
-#: readelf.c:3680
+#: readelf.c:3707
 #, c-format
 msgid ""
 "\n"
@@ -5423,12 +4663,12 @@ msgstr ""
 "\n"
 "El tipo del fichero elf es %s\n"
 
-#: readelf.c:3681
+#: readelf.c:3708
 #, c-format
 msgid "Entry point "
 msgstr "Punto de entrada "
 
-#: readelf.c:3683
+#: readelf.c:3710
 #, c-format
 msgid ""
 "\n"
@@ -5437,7 +4677,7 @@ msgstr ""
 "\n"
 "Hay %d encabezados de programa, empezando en el desplazamiento "
 
-#: readelf.c:3695 readelf.c:3697
+#: readelf.c:3722 readelf.c:3724
 #, c-format
 msgid ""
 "\n"
@@ -5446,55 +4686,55 @@ msgstr ""
 "\n"
 "Encabezados de Programa:\n"
 
-#: readelf.c:3701
+#: readelf.c:3728
 #, c-format
 msgid "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr "  Tipo           Desplaz  DirVirt    DirFísica  TamFich TamMem  Opt Alin\n"
 
-#: readelf.c:3704
+#: readelf.c:3731
 #, c-format
 msgid "  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
 msgstr "  Tipo           Desplaz  DirVirt            DirFísica          TamFich  TamMem   Opt Alin\n"
 
-#: readelf.c:3708
+#: readelf.c:3735
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr "  Tipo           Desplazamiento     DirVirtual         DirFísica\n"
 
-#: readelf.c:3710
+#: readelf.c:3737
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
 msgstr "                 TamFichero         TamMemoria          Opts   Alineación\n"
 
-#: readelf.c:3803
+#: readelf.c:3830
 msgid "more than one dynamic segment\n"
 msgstr "más de un segmento dinámico\n"
 
-#: readelf.c:3822
+#: readelf.c:3849
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr "no hay una sección .dynamic en el segmento dinámico\n"
 
-#: readelf.c:3837
+#: readelf.c:3864
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr "la sección .dynamic no está contenida en el segmento dinámico\n"
 
-#: readelf.c:3840
+#: readelf.c:3867
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr "la sección .dynamic no es la primera sección en el segmento dinámico.\n"
 
-#: readelf.c:3848
+#: readelf.c:3875
 msgid "Unable to find program interpreter name\n"
 msgstr "No se puede encontrar el nombre del intérprete de programa\n"
 
-#: readelf.c:3855
+#: readelf.c:3882
 msgid "Internal error: failed to create format string to display program interpreter\n"
 msgstr "Error interno: no se puede crear la cadena de formato para mostrar el intérprete de programa\n"
 
-#: readelf.c:3859
+#: readelf.c:3886
 msgid "Unable to read program interpreter name\n"
 msgstr "No se puede leer el nombre del intérprete de programa\n"
 
-#: readelf.c:3862
+#: readelf.c:3889
 #, c-format
 msgid ""
 "\n"
@@ -5503,7 +4743,7 @@ msgstr ""
 "\n"
 "      [Se solicita el intérprete de programa: %s]"
 
-#: readelf.c:3874
+#: readelf.c:3901
 #, c-format
 msgid ""
 "\n"
@@ -5512,51 +4752,47 @@ msgstr ""
 "\n"
 " mapeo de Sección a Segmento:\n"
 
-#: readelf.c:3875
+#: readelf.c:3902
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr "  Segmento Secciones...\n"
 
-#: readelf.c:3911
+#: readelf.c:3938
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr "No se pueden interpretar direcciones virtuales sin encabezados de programa.\n"
 
-#: readelf.c:3927
+#: readelf.c:3954
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr "La dirección virtual 0x%lx no está ubicada en ningún segmento PT_LOAD.\n"
 
-#: readelf.c:3942 readelf.c:3985
+#: readelf.c:3969 readelf.c:4012
 msgid "section headers"
 msgstr "encabezados de sección"
 
-#: readelf.c:4032 readelf.c:4107
+#: readelf.c:4059 readelf.c:4134
 msgid "sh_entsize is zero\n"
 msgstr "sh_entsize es cero\n"
 
-#: readelf.c:4040 readelf.c:4115
+#: readelf.c:4067 readelf.c:4142
 msgid "Invalid sh_entsize\n"
 msgstr "sh_entsize inválido\n"
 
-#: readelf.c:4045 readelf.c:4120
+#: readelf.c:4072 readelf.c:4147
 msgid "symbols"
 msgstr "símbolos"
 
 # ¿Cómo se traduce esto? cfuga
-#: readelf.c:4057 readelf.c:4132
+#: readelf.c:4084 readelf.c:4159
 msgid "symtab shndx"
 msgstr "symtab shndx"
 
-#: readelf.c:4392
+#: readelf.c:4419
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr "DESCONOCIDO (%*.*lx)"
 
-#: readelf.c:4414
-msgid "possibly corrupt ELF file header - it has a non-zero section header offset, but no section headers\n"
-msgstr "encabezado de fichero ELF probablemente corrupto - tiene un desplazamiento de encabezado de sección que no es cero, pero no tiene encabezados de sección\n"
-
-#: readelf.c:4417
+#: readelf.c:4440 readelf.c:4920
 #, c-format
 msgid ""
 "\n"
@@ -5565,38 +4801,38 @@ msgstr ""
 "\n"
 "No hay secciones en este fichero.\n"
 
-#: readelf.c:4423
+#: readelf.c:4446
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr "Hay %d encabezados de sección, comenzando en el desplazamiento: 0x%lx:\n"
 
-#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
-#: readelf.c:7036 readelf.c:9132
+#: readelf.c:4467 readelf.c:5043 readelf.c:5454 readelf.c:5760 readelf.c:6173
+#: readelf.c:6754 readelf.c:8843
 msgid "string table"
 msgstr "tabla de cadenas"
 
-#: readelf.c:4511
+#: readelf.c:4534
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr "La sección %d tiene un sh_entsize %lx inválido (se esperaba %lx)\n"
 
-#: readelf.c:4531
+#: readelf.c:4554
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr "El fichero contiene múltiples tablas dinámicas de símbolos\n"
 
-#: readelf.c:4544
+#: readelf.c:4567
 msgid "File contains multiple dynamic string tables\n"
 msgstr "El fichero contiene múltiples tablas dinámicas de cadenas\n"
 
-#: readelf.c:4550
+#: readelf.c:4573
 msgid "dynamic strings"
 msgstr "cadenas dinámicas"
 
-#: readelf.c:4557
+#: readelf.c:4580
 msgid "File contains multiple symtab shndx tables\n"
 msgstr "El fichero contiene múltiples tablas symtab shndx\n"
 
-#: readelf.c:4627
+#: readelf.c:4648
 #, c-format
 msgid ""
 "\n"
@@ -5605,7 +4841,7 @@ msgstr ""
 "\n"
 "Encabezados de Sección:\n"
 
-#: readelf.c:4629
+#: readelf.c:4650
 #, c-format
 msgid ""
 "\n"
@@ -5614,62 +4850,62 @@ msgstr ""
 "\n"
 "Encabezados de Sección:\n"
 
-#: readelf.c:4635 readelf.c:4646 readelf.c:4657
+#: readelf.c:4656 readelf.c:4667 readelf.c:4678
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr "  [Nr] Nombre\n"
 
-#: readelf.c:4636
+#: readelf.c:4657
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr "       Tipo            Direc    Desp   Tam    ES   En Inf Al\n"
 
-#: readelf.c:4640
+#: readelf.c:4661
 #, c-format
 msgid "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [Nr] Nombre            Tipo            Direc    Desp   Tam    ES Opt En Inf Al\n"
 
-#: readelf.c:4647
+#: readelf.c:4668
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr "       Tipo            Direc            Desp   Tam    ES   En Inf Al\n"
 
-#: readelf.c:4651
+#: readelf.c:4672
 #, c-format
 msgid "  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [Nr] Nombre            Tipo            Direc            Desp   Tam    ES Opt En Inf Al\n"
 
-#: readelf.c:4658
+#: readelf.c:4679
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr "       Tipo             Dirección         Despl             Enl\n"
 
-#: readelf.c:4659
+#: readelf.c:4680
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr "       Tamaño            TamEnt           Info              Alin\n"
 
-#: readelf.c:4663
+#: readelf.c:4684
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr "  [Nr] Nombre            Tipo             Dirección         Despl\n"
 
-#: readelf.c:4664
+#: readelf.c:4685
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr "       Tamaño            TamEnt           Opts   Enl   Info  Alin\n"
 
-#: readelf.c:4669
+#: readelf.c:4690
 #, c-format
 msgid "       Flags\n"
 msgstr "       Opciones\n"
 
-#: readelf.c:4748
+#: readelf.c:4769
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr "sección %u: el valor sh_link de %u es mayor que el número de secciones\n"
 
-#: readelf.c:4847
+#: readelf.c:4868
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5683,7 +4919,7 @@ msgstr ""
 "  x (desconocido), O (se requiere procesamiento extra del SO)\n"
 "  o (específico del SO), p (específico del procesador)\n"
 
-#: readelf.c:4852
+#: readelf.c:4873
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5697,25 +4933,16 @@ msgstr ""
 "  x (desconocido), O (se requiere procesamiento extra del SO)\n"
 "  o (específico del SO), p (específico del procesador)\n"
 
-#: readelf.c:4874
+#: readelf.c:4895
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr "[<desconocido>: 0x%x] "
 
-#: readelf.c:4899
-#, c-format
-msgid ""
-"\n"
-"There are no sections to group in this file.\n"
-msgstr ""
-"\n"
-"No hay secciones para agrupar en este fichero.\n"
-
-#: readelf.c:4906
+#: readelf.c:4927
 msgid "Section headers are not available!\n"
 msgstr "¡Los encabezados de sección no están disponibles!\n"
 
-#: readelf.c:4930
+#: readelf.c:4951
 #, c-format
 msgid ""
 "\n"
@@ -5724,26 +4951,26 @@ msgstr ""
 "\n"
 "No hay grupos de sección en este fichero.\n"
 
-#: readelf.c:4967
+#: readelf.c:4988
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
 msgstr "sh_link erróneo en la sección de grupo `%s'\n"
 
-#: readelf.c:4981
+#: readelf.c:5002
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr "Encabezado corrupto en la sección de grupo `%s'\n"
 
-#: readelf.c:4992
+#: readelf.c:5013
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr "sh_info erróneo en la sección de grupo `%s'\n"
 
-#: readelf.c:5031
+#: readelf.c:5052
 msgid "section data"
 msgstr "datos de sección"
 
-#: readelf.c:5040
+#: readelf.c:5061
 #, c-format
 msgid ""
 "\n"
@@ -5752,31 +4979,31 @@ msgstr ""
 "\n"
 "%sla sección de grupo [%5u] `%s' [%s] contiene %u secciones:\n"
 
-#: readelf.c:5043
+#: readelf.c:5064
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr "   [�ndice]   Nombre\n"
 
-#: readelf.c:5057
+#: readelf.c:5078
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr "la sección [%5u] en la sección de grupo [%5u] > máximo de sección [%5u]\n"
 
-#: readelf.c:5066
+#: readelf.c:5087
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr "la sección [%5u] en la sección de grupo [%5u] ya está en la sección de grupo [%5u]\n"
 
-#: readelf.c:5079
+#: readelf.c:5100
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr "sección 0 en la sección de grupo [%5u]\n"
 
-#: readelf.c:5146
+#: readelf.c:5167
 msgid "dynamic section image fixups"
 msgstr "composturas de imagen de sección dinámica"
 
-#: readelf.c:5158
+#: readelf.c:5179
 #, c-format
 msgid ""
 "\n"
@@ -5785,16 +5012,16 @@ msgstr ""
 "\n"
 "Composturas de imagen para la biblioteca requerida #%d: %s - ident: %lx\n"
 
-#: readelf.c:5161
+#: readelf.c:5182
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr "Seg Desplaz          Tipo                             VecSim TipoDato\n"
 
-#: readelf.c:5193
+#: readelf.c:5214
 msgid "dynamic section image relas"
 msgstr "reubicaciones de imagen de sección dinámica"
 
-#: readelf.c:5197
+#: readelf.c:5218
 #, c-format
 msgid ""
 "\n"
@@ -5803,16 +5030,16 @@ msgstr ""
 "\n"
 "Reubicaciones de imagen\n"
 
-#: readelf.c:5199
+#: readelf.c:5220
 #, c-format
 msgid "Seg Offset   Type                            Addend            Seg Sym Off\n"
 msgstr "Seg Desplaz  Tipo                            Addend            Seg Sim Des\n"
 
-#: readelf.c:5254
+#: readelf.c:5275
 msgid "dynamic string section"
 msgstr "sección de cadenas dinámicas"
 
-#: readelf.c:5355
+#: readelf.c:5376
 #, c-format
 msgid ""
 "\n"
@@ -5821,7 +5048,7 @@ msgstr ""
 "\n"
 "'%s' la sección de reubicación en el desplazamiento 0x%lx contiene %ld bytes:\n"
 
-#: readelf.c:5370
+#: readelf.c:5391
 #, c-format
 msgid ""
 "\n"
@@ -5830,7 +5057,7 @@ msgstr ""
 "\n"
 "No hay reubicaciones dinámicas en este fichero.\n"
 
-#: readelf.c:5394
+#: readelf.c:5415
 #, c-format
 msgid ""
 "\n"
@@ -5839,17 +5066,17 @@ msgstr ""
 "\n"
 "La sección de reubicación "
 
-#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#: readelf.c:5420 readelf.c:5836 readelf.c:5851 readelf.c:6188
 #, c-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: readelf.c:5401 readelf.c:5832 readelf.c:6169
+#: readelf.c:5422 readelf.c:5853 readelf.c:6190
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr " en el desplazamiento 0x%lx contiene %lu entradas:\n"
 
-#: readelf.c:5452
+#: readelf.c:5473
 #, c-format
 msgid ""
 "\n"
@@ -5858,21 +5085,21 @@ msgstr ""
 "\n"
 "No hay reubicaciones en este fichero.\n"
 
-#: readelf.c:5590
+#: readelf.c:5611
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr "\tVersión desconocida.\n"
 
-#: readelf.c:5643 readelf.c:6016
+#: readelf.c:5664 readelf.c:6037
 msgid "unwind table"
 msgstr "tabla desenredada"
 
-#: readelf.c:5685 readelf.c:6098 readelf.c:6358
+#: readelf.c:5706 readelf.c:6119 readelf.c:6365
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr "Se salta el tipo de reubicación %s inesperado\n"
 
-#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
+#: readelf.c:5768 readelf.c:6181 readelf.c:6762 readelf.c:6808
 #, c-format
 msgid ""
 "\n"
@@ -5881,7 +5108,7 @@ msgstr ""
 "\n"
 "No hay secciones de desenredo en este fichero.\n"
 
-#: readelf.c:5810
+#: readelf.c:5831
 #, c-format
 msgid ""
 "\n"
@@ -5890,11 +5117,11 @@ msgstr ""
 "\n"
 "No se puede encontrar la sección de información de desenredo para "
 
-#: readelf.c:5823
+#: readelf.c:5844
 msgid "unwind info"
 msgstr "información de desenredo"
 
-#: readelf.c:5825 readelf.c:6166
+#: readelf.c:5846 readelf.c:6187
 #, c-format
 msgid ""
 "\n"
@@ -5903,112 +5130,108 @@ msgstr ""
 "\n"
 "Sección de desenredo "
 
-#: readelf.c:6275
+#: readelf.c:6296
 msgid "unwind data"
 msgstr "datos desenredados"
 
-#: readelf.c:6329
+#: readelf.c:6350
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
 msgstr ""
 "Se salta la reubicación inesperada en el desplazamiento 0x%lx\n"
 "\n"
 
-#: readelf.c:6433
+#: readelf.c:6426
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr "[Codigo de operación truncado]\n"
 
-#: readelf.c:6477 readelf.c:6677
+#: readelf.c:6429
 #, c-format
-msgid "Refuse to unwind"
-msgstr "Se niega a desenredar"
+msgid "0x%02x "
+msgstr "0x%02x "
 
-#: readelf.c:6500
+#: readelf.c:6451
 #, c-format
-msgid "     [Reserved]"
-msgstr "     [Reservado]"
+msgid "  Personality routine: "
+msgstr "  Rutina de personalidad: "
 
-#: readelf.c:6528
+#: readelf.c:6469
 #, c-format
-msgid "     finish"
-msgstr "     terminar"
+msgid "  [Truncated data]\n"
+msgstr "  [Datos truncados]\n"
 
-#: readelf.c:6533 readelf.c:6619
+#: readelf.c:6484
 #, c-format
-msgid "[Spare]"
-msgstr "[Libre]"
+msgid "  [reserved compact index %d]\n"
+msgstr "  [índice compacto reservado %d]\n"
 
-#: readelf.c:6640 readelf.c:6774
+#: readelf.c:6488
 #, c-format
-msgid "     [unsupported opcode]"
-msgstr "     [no se admite el código de operación]"
+msgid "  Compact model %d\n"
+msgstr "  Modelo compacto %d\n"
 
-#: readelf.c:6666
+#: readelf.c:6515
 #, c-format
 msgid "  0x%02x "
 msgstr "  0x%02x "
 
-#: readelf.c:6671
+#: readelf.c:6520
 #, c-format
-msgid "     sp = sp + %d"
-msgstr "     sp = sp + %d"
+msgid "     vsp = vsp + %d"
+msgstr "     vsp = vsp + %d"
 
-#: readelf.c:6724
+#: readelf.c:6525
 #, c-format
-msgid "pop frame {"
-msgstr "marco pop {"
+msgid "     vsp = vsp - %d"
+msgstr "     vsp = vsp - %d"
 
-#: readelf.c:6735
-msgid "[pad]"
-msgstr "[relleno]"
-
-#: readelf.c:6763
+#: readelf.c:6531
 #, c-format
-msgid "sp = sp + %ld"
-msgstr "sp = sp + %ld"
+msgid "Refuse to unwind"
+msgstr "Se niega a desenredar"
 
-#: readelf.c:6821
+#: readelf.c:6554
 #, c-format
-msgid "  Personality routine: "
-msgstr "  Rutina de personalidad: "
+msgid "     [Reserved]"
+msgstr "     [Reservado]"
 
-#: readelf.c:6839
+#: readelf.c:6556
 #, c-format
-msgid "  [Truncated data]\n"
-msgstr "  [Datos truncados]\n"
+msgid "     vsp = r%d"
+msgstr "     vsp = r%d"
 
-#: readelf.c:6854
+#: readelf.c:6581
 #, c-format
-msgid "  Compact model %d\n"
-msgstr "  Modelo compacto %d\n"
+msgid "     finish"
+msgstr "     terminar"
 
-#: readelf.c:6890
+#: readelf.c:6586
 #, c-format
-msgid "  Restore stack from frame pointer\n"
-msgstr "  Restaurar pila desde el puntero de marco\n"
+msgid "[Spare]"
+msgstr "[Libre]"
 
-#: readelf.c:6892
+#: readelf.c:6620
 #, c-format
-msgid "  Stack increment %d\n"
-msgstr "  Incremento de pila %d\n"
+msgid "vsp = vsp + %ld"
+msgstr "vsp = vsp + %ld"
 
-#: readelf.c:6893
+#: readelf.c:6627
 #, c-format
-msgid "  Registers restored: "
-msgstr "  Registros restaurados: "
+msgid "[unsupported two-byte opcode]"
+msgstr "[no se admite el código de operación de dos bytes]"
 
-#: readelf.c:6898
+#: readelf.c:6631
 #, c-format
-msgid "  Return register: %s\n"
-msgstr "  Registro de devolución: %s\n"
+msgid "     [unsupported opcode]"
+msgstr "     [no se admite el código de operación]"
 
-#: readelf.c:6981
+#: readelf.c:6715
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr "No se puede ubicar la sección .ARM.extab que contiene 0x%lx.\n"
 
-#: readelf.c:7050
+#: readelf.c:6768
 #, c-format
 msgid ""
 "\n"
@@ -6017,31 +5240,31 @@ msgstr ""
 "\n"
 "El índice de tabla de desenredo '%s' en el desplazamiento 0x%lx contiene %lu entradas:\n"
 
-#: readelf.c:7102
+#: readelf.c:6819
 #, c-format
 msgid "NONE\n"
 msgstr "NINGUNO\n"
 
-#: readelf.c:7128
+#: readelf.c:6845
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr "Versión de Interfaz: %s\n"
 
-#: readelf.c:7130
+#: readelf.c:6847
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr "<corrupto: %ld>\n"
 
-#: readelf.c:7143
+#: readelf.c:6860
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr "Marca de Tiempo: %s\n"
 
-#: readelf.c:7320 readelf.c:7366
+#: readelf.c:7037 readelf.c:7083
 msgid "dynamic section"
 msgstr "sección dinámica"
 
-#: readelf.c:7444
+#: readelf.c:7161
 #, c-format
 msgid ""
 "\n"
@@ -6050,31 +5273,31 @@ msgstr ""
 "\n"
 "No hay sección dinámica en este fichero.\n"
 
-#: readelf.c:7482
+#: readelf.c:7199
 msgid "Unable to seek to end of file!\n"
 msgstr "¡No se puede alcanzar el final del fichero!\n"
 
-#: readelf.c:7495
+#: readelf.c:7212
 msgid "Unable to determine the number of symbols to load\n"
 msgstr "No se puede determinar el número de símbolos a cargar\n"
 
-#: readelf.c:7530
+#: readelf.c:7247
 msgid "Unable to seek to end of file\n"
 msgstr "No se puede alcanzar el final del fichero\n"
 
-#: readelf.c:7537
+#: readelf.c:7254
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr "No se puede determinar la longitud de la tabla dinámica de cadenas\n"
 
-#: readelf.c:7543
+#: readelf.c:7260
 msgid "dynamic string table"
 msgstr "tabla de cadena dinámicas"
 
-#: readelf.c:7580
+#: readelf.c:7297
 msgid "symbol information"
 msgstr "información del símbolo"
 
-#: readelf.c:7605
+#: readelf.c:7322
 #, c-format
 msgid ""
 "\n"
@@ -6083,86 +5306,86 @@ msgstr ""
 "\n"
 "La sección dinámica en el desplazamiento 0x%lx contiene %u entradas:\n"
 
-#: readelf.c:7608
+#: readelf.c:7325
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr "  Marca      Tipo                         Nombre/Valor\n"
 
-#: readelf.c:7644
+#: readelf.c:7361
 #, c-format
 msgid "Auxiliary library"
 msgstr "Biblioteca auxiliar"
 
-#: readelf.c:7648
+#: readelf.c:7365
 #, c-format
 msgid "Filter library"
 msgstr "Biblioteca de filtro"
 
-#: readelf.c:7652
+#: readelf.c:7369
 #, c-format
 msgid "Configuration file"
 msgstr "Fichero de configuración"
 
-#: readelf.c:7656
+#: readelf.c:7373
 #, c-format
 msgid "Dependency audit library"
 msgstr "Biblioteca de auditoría de dependencias"
 
-#: readelf.c:7660
+#: readelf.c:7377
 #, c-format
 msgid "Audit library"
 msgstr "Biblioteca de auditoría"
 
-#: readelf.c:7678 readelf.c:7706 readelf.c:7734
+#: readelf.c:7395 readelf.c:7423 readelf.c:7451
 #, c-format
 msgid "Flags:"
 msgstr "Opciones:"
 
-#: readelf.c:7681 readelf.c:7709 readelf.c:7736
+#: readelf.c:7398 readelf.c:7426 readelf.c:7453
 #, c-format
 msgid " None\n"
 msgstr " Ninguna\n"
 
-#: readelf.c:7857
+#: readelf.c:7574
 #, c-format
 msgid "Shared library: [%s]"
 msgstr "Biblioteca compartida: [%s]"
 
-#: readelf.c:7860
+#: readelf.c:7577
 #, c-format
 msgid " program interpreter"
 msgstr " programa intérprete"
 
-#: readelf.c:7864
+#: readelf.c:7581
 #, c-format
 msgid "Library soname: [%s]"
 msgstr "Nombre-so de la biblioteca: [%s]"
 
-#: readelf.c:7868
+#: readelf.c:7585
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr "Rpath de la biblioteca: [%s]"
 
-#: readelf.c:7872
+#: readelf.c:7589
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr "Ruta de ejecución de la biblioteca: [%s]"
 
-#: readelf.c:7905
+#: readelf.c:7622
 #, c-format
 msgid " (bytes)\n"
 msgstr " (bytes)\n"
 
-#: readelf.c:7935
+#: readelf.c:7652
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr "Objeto innecesario: [%s]\n"
 
-#: readelf.c:8035
+#: readelf.c:7752
 msgid "| <unknown>"
 msgstr "| <desconocido>"
 
-#: readelf.c:8068
+#: readelf.c:7785
 #, c-format
 msgid ""
 "\n"
@@ -6171,61 +5394,61 @@ msgstr ""
 "\n"
 "La sección de definición de versión '%s' contiene %u entradas:\n"
 
-#: readelf.c:8071
+#: readelf.c:7788
 #, c-format
 msgid "  Addr: 0x"
 msgstr "  Dir: 0x"
 
-#: readelf.c:8073 readelf.c:8191 readelf.c:8332
+#: readelf.c:7790 readelf.c:7908 readelf.c:8046
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr "   Despl: %#08lx   Enl: %u (%s)\n"
 
-#: readelf.c:8081
+#: readelf.c:7798
 msgid "version definition section"
 msgstr "sección de definición de versión"
 
-#: readelf.c:8114
+#: readelf.c:7831
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr "  %#06x: Rev: %d  Opts: %s"
 
-#: readelf.c:8117
+#: readelf.c:7834
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr "  Ind: %d  Cnt: %d  "
 
-#: readelf.c:8133
+#: readelf.c:7850
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nombre: %s\n"
 
-#: readelf.c:8135
+#: readelf.c:7852
 #, c-format
 msgid "Name index: %ld\n"
 msgstr "�ndice de nombres: %ld\n"
 
-#: readelf.c:8157
+#: readelf.c:7874
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr "  %#06x: Padre %d: %s\n"
 
-#: readelf.c:8160
+#: readelf.c:7877
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr "  %#06x: Padre %d, índice de nombres: %ld\n"
 
-#: readelf.c:8165
+#: readelf.c:7882
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr "  Versión def aux después del final de la sección\n"
 
-#: readelf.c:8171
+#: readelf.c:7888
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr "  Definición de versión después del final de la sección\n"
 
-#: readelf.c:8186
+#: readelf.c:7903
 #, c-format
 msgid ""
 "\n"
@@ -6234,65 +5457,65 @@ msgstr ""
 "\n"
 "La sección de requerimientos de versión '%s' contiene %u entradas:\n"
 
-#: readelf.c:8189
+#: readelf.c:7906
 #, c-format
 msgid " Addr: 0x"
 msgstr " Dir: 0x"
 
-#: readelf.c:8200
+#: readelf.c:7917
 msgid "version need section"
 msgstr "sección de requerimientos de versión"
 
-#: readelf.c:8228
+#: readelf.c:7945
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr "  %#06x: Versión: %d"
 
-#: readelf.c:8231
+#: readelf.c:7948
 #, c-format
 msgid "  File: %s"
 msgstr "  Fichero: %s"
 
-#: readelf.c:8233
+#: readelf.c:7950
 #, c-format
 msgid "  File: %lx"
 msgstr "  Fichero: %lx"
 
-#: readelf.c:8235
+#: readelf.c:7952
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr "  Cnt: %d\n"
 
-#: readelf.c:8260
+#: readelf.c:7977
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr "  %#06x:   Nombre: %s"
 
-#: readelf.c:8263
+#: readelf.c:7980
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr "  %#06x:   �ndice de nombres: %lx"
 
-#: readelf.c:8266
+#: readelf.c:7983
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr "  Opts: %s  Versión: %d\n"
 
-#: readelf.c:8278
+#: readelf.c:7995
 #, c-format
 msgid "  Version need aux past end of section\n"
 msgstr "  Aux de requerimientos de versión después del final de la sección\n"
 
-#: readelf.c:8283
+#: readelf.c:8000
 #, c-format
 msgid "  Version need past end of section\n"
 msgstr "  Requerimientos de versión después del final de la sección\n"
 
-#: readelf.c:8320
+#: readelf.c:8037
 msgid "version string table"
 msgstr "tabla de cadenas de versión"
 
-#: readelf.c:8327
+#: readelf.c:8041
 #, c-format
 msgid ""
 "\n"
@@ -6301,48 +5524,48 @@ msgstr ""
 "\n"
 "La sección de símbolos de versión '%s' contiene %d entradas:\n"
 
-#: readelf.c:8330
+#: readelf.c:8044
 #, c-format
 msgid " Addr: "
 msgstr " Dir: "
 
-#: readelf.c:8341
+#: readelf.c:8055
 msgid "version symbol data"
 msgstr "datos de símbolos de versión"
 
-#: readelf.c:8369
+#: readelf.c:8082
 msgid "   0 (*local*)    "
 msgstr "   0 (*local*)    "
 
-#: readelf.c:8373
+#: readelf.c:8086
 msgid "   1 (*global*)   "
 msgstr "   1 (*global*)   "
 
-#: readelf.c:8386
+#: readelf.c:8099
 msgid "invalid index into symbol array\n"
 msgstr "índice inválido en la matriz de símbolos\n"
 
-#: readelf.c:8420 readelf.c:9199
+#: readelf.c:8133 readelf.c:8910
 msgid "version need"
 msgstr "la versión necesita"
 
-#: readelf.c:8430
+#: readelf.c:8143
 msgid "version need aux (2)"
 msgstr "la versión necesita aux (2)"
 
-#: readelf.c:8445 readelf.c:8500
+#: readelf.c:8158 readelf.c:8213
 msgid "*invalid*"
 msgstr "*inválido*"
 
-#: readelf.c:8475 readelf.c:9264
+#: readelf.c:8188 readelf.c:8975
 msgid "version def"
 msgstr "versión definida"
 
-#: readelf.c:8495 readelf.c:9279
+#: readelf.c:8208 readelf.c:8990
 msgid "version def aux"
 msgstr "versión definida auxiliar"
 
-#: readelf.c:8529
+#: readelf.c:8242
 #, c-format
 msgid ""
 "\n"
@@ -6351,37 +5574,37 @@ msgstr ""
 "\n"
 "No se encontró información de versión en este fichero.\n"
 
-#: readelf.c:8728
+#: readelf.c:8441
 #, c-format
 msgid "<other>: %x"
 msgstr "<otro>: %x"
 
-#: readelf.c:8789
+#: readelf.c:8500
 msgid "Unable to read in dynamic data\n"
 msgstr "No se pueden leer los datos dinámicos\n"
 
-#: readelf.c:8839
+#: readelf.c:8550
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr " <corrupto: %14ld>"
 
-#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
+#: readelf.c:8593 readelf.c:8645 readelf.c:8669 readelf.c:8699 readelf.c:8723
 msgid "Unable to seek to start of dynamic information\n"
 msgstr "No se puede encontrar el inicio de la información dinámica\n"
 
-#: readelf.c:8888 readelf.c:8940
+#: readelf.c:8599 readelf.c:8651
 msgid "Failed to read in number of buckets\n"
 msgstr "Falló al leer el número de cubos\n"
 
-#: readelf.c:8894
+#: readelf.c:8605
 msgid "Failed to read in number of chains\n"
 msgstr "Falló al leer el número de cadenas\n"
 
-#: readelf.c:8996
+#: readelf.c:8707
 msgid "Failed to determine last chain length\n"
 msgstr "No se puede determinar la longitud de la última cadena\n"
 
-#: readelf.c:9040
+#: readelf.c:8751
 #, c-format
 msgid ""
 "\n"
@@ -6390,17 +5613,17 @@ msgstr ""
 "\n"
 "Tabla de símbolos por imagen:\n"
 
-#: readelf.c:9042 readelf.c:9060
+#: readelf.c:8753 readelf.c:8771
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
 msgstr "  Num Cub:    Valor  Tamaño Tipo   Uni  Vis      Nombre Ind\n"
 
-#: readelf.c:9044 readelf.c:9062
+#: readelf.c:8755 readelf.c:8773
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
 msgstr "  Num Cub:    Valor          Tamaño Typo   Uni  Vis      Nombre Ind\n"
 
-#: readelf.c:9058
+#: readelf.c:8769
 #, c-format
 msgid ""
 "\n"
@@ -6409,7 +5632,7 @@ msgstr ""
 "\n"
 "Tabla de símbolos de `.gnu.hash' para la imagen:\n"
 
-#: readelf.c:9101
+#: readelf.c:8812
 #, c-format
 msgid ""
 "\n"
@@ -6418,7 +5641,7 @@ msgstr ""
 "\n"
 "¡La tabla de símbolos '%s' tiene un sh_entsize de cero!\n"
 
-#: readelf.c:9106
+#: readelf.c:8817
 #, c-format
 msgid ""
 "\n"
@@ -6427,29 +5650,29 @@ msgstr ""
 "\n"
 "La tabla de símbolos '%s' contiene %lu entradas:\n"
 
-#: readelf.c:9111
+#: readelf.c:8822
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Num:    Valor  Tam  Tipo    Unión  Vis      Nombre Ind\n"
 
-#: readelf.c:9113
+#: readelf.c:8824
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Num:    Valor          Tam  Tipo    Unión  Vis      Nombre Ind\n"
 
-#: readelf.c:9170
+#: readelf.c:8881
 msgid "version data"
 msgstr "datos de versión"
 
-#: readelf.c:9212
+#: readelf.c:8923
 msgid "version need aux (3)"
 msgstr "la versión necesita aux (3)"
 
-#: readelf.c:9239
+#: readelf.c:8950
 msgid "bad dynamic symbol\n"
 msgstr "símbolo dinámico erróneo\n"
 
-#: readelf.c:9303
+#: readelf.c:9014
 #, c-format
 msgid ""
 "\n"
@@ -6458,7 +5681,7 @@ msgstr ""
 "\n"
 "La información de símbolos dinámicos no está disponible para mostrar los símbolos.\n"
 
-#: readelf.c:9315
+#: readelf.c:9026
 #, c-format
 msgid ""
 "\n"
@@ -6467,12 +5690,12 @@ msgstr ""
 "\n"
 "Histograma para la longitud de lista de cubos (total de %lu cubos):\n"
 
-#: readelf.c:9317 readelf.c:9387
+#: readelf.c:9028 readelf.c:9098
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr " Long    Número     %% del total Cobertura\n"
 
-#: readelf.c:9385
+#: readelf.c:9096
 #, c-format
 msgid ""
 "\n"
@@ -6481,7 +5704,7 @@ msgstr ""
 "\n"
 "Histograma para la longitud de lista de cubos `.gnu.hash' (total de %lu cubos):\n"
 
-#: readelf.c:9451
+#: readelf.c:9162
 #, c-format
 msgid ""
 "\n"
@@ -6490,41 +5713,41 @@ msgstr ""
 "\n"
 "El segmento de información dinámica en el desplazamiento 0x%lx contiene %d entradas:\n"
 
-#: readelf.c:9454
+#: readelf.c:9165
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr " Num: Nombre                         EnlaceA     Opts\n"
 
-#: readelf.c:9463
+#: readelf.c:9174
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr "<corrupto: %19ld>"
 
-#: readelf.c:9545
+#: readelf.c:9256
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
 msgstr "Se encontró un tipo de reubicación MN10300 sin manejar después de la reubicación SYM_DIFF"
 
-#: readelf.c:9705
+#: readelf.c:9416
 #, c-format
 msgid "Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"
 msgstr "Falta el conocimiento de los tipos de reubicación de 32-bit usados en las secciones DWARF del número de máquina %d\n"
 
-#: readelf.c:10009
+#: readelf.c:9720
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
 msgstr "no se puede aplicar el tipo de reubicación no admitido %d a la sección %s\n"
 
-#: readelf.c:10017
+#: readelf.c:9728
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
 msgstr "se salta el desplazamiento de reubicación inválido 0x%lx en la sección %s\n"
 
-#: readelf.c:10041
+#: readelf.c:9752
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
 msgstr "se salta el tipo de símbolo %s inesperado en la %ld-ésima reubicación en la sección %s\n"
 
-#: readelf.c:10087
+#: readelf.c:9798
 #, c-format
 msgid ""
 "\n"
@@ -6533,7 +5756,7 @@ msgstr ""
 "\n"
 "Volcado ensamblador de la sección %s\n"
 
-#: readelf.c:10108
+#: readelf.c:9819
 #, c-format
 msgid ""
 "\n"
@@ -6542,11 +5765,11 @@ msgstr ""
 "\n"
 "La sección '%s' no tiene datos para volcar.\n"
 
-#: readelf.c:10114
+#: readelf.c:9825
 msgid "section contents"
 msgstr "contenido de la sección"
 
-#: readelf.c:10133
+#: readelf.c:9844
 #, c-format
 msgid ""
 "\n"
@@ -6555,17 +5778,17 @@ msgstr ""
 "\n"
 "Volcado de cadenas de la sección '%s':\n"
 
-#: readelf.c:10151
+#: readelf.c:9862
 #, c-format
 msgid "  Note: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr " Nota: Esta sección tiene reubicaciones contra ella, pero NO se han aplicado a este volcado.\n"
 
-#: readelf.c:10182
+#: readelf.c:9893
 #, c-format
 msgid "  No strings found in this section."
 msgstr "  No se encontraron cadenas en esta sección."
 
-#: readelf.c:10204
+#: readelf.c:9915
 #, c-format
 msgid ""
 "\n"
@@ -6574,17 +5797,17 @@ msgstr ""
 "\n"
 "Volcado hexadecimal de la sección '%s':\n"
 
-#: readelf.c:10228
+#: readelf.c:9939
 #, c-format
 msgid " NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr " NOTA: Esta sección tiene reubicaciones contra ella, pero NO se han aplicado a este volcado.\n"
 
-#: readelf.c:10362
+#: readelf.c:10073
 #, c-format
 msgid "%s section data"
 msgstr "datos de sección %s"
 
-#: readelf.c:10427
+#: readelf.c:10138
 #, c-format
 msgid ""
 "\n"
@@ -6597,246 +5820,246 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10436
+#: readelf.c:10147
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
 msgstr "la sección '%s' tiene el tipo NOBITS - su contenido no es confiable.\n"
 
-#: readelf.c:10472
+#: readelf.c:10183
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr "No se reconoce la sección de depuración: %s\n"
 
-#: readelf.c:10500
+#: readelf.c:10211
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr "¡La sección '%s' no se volcó porque no existe!\n"
 
-#: readelf.c:10541
+#: readelf.c:10252
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr "¡La sección %d no se volcó porque no existe!\n"
 
-#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
+#: readelf.c:10430 readelf.c:10444 readelf.c:10463 readelf.c:10781
 #, c-format
 msgid "None\n"
 msgstr " Ninguna\n"
 
-#: readelf.c:10720
+#: readelf.c:10431
 #, c-format
 msgid "Application\n"
 msgstr "Aplicación\n"
 
-#: readelf.c:10721
+#: readelf.c:10432
 #, c-format
 msgid "Realtime\n"
 msgstr "Tiempo real\n"
 
-#: readelf.c:10722
+#: readelf.c:10433
 #, c-format
 msgid "Microcontroller\n"
 msgstr "Microcontrolador\n"
 
-#: readelf.c:10723
+#: readelf.c:10434
 #, c-format
 msgid "Application or Realtime\n"
 msgstr "Aplicación o Tiempo real\n"
 
-#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
-#: readelf.c:11217 readelf.c:11238
+#: readelf.c:10445 readelf.c:10465 readelf.c:10835 readelf.c:10853
+#: readelf.c:10928 readelf.c:10949
 #, c-format
 msgid "8-byte\n"
 msgstr "8 bytes\n"
 
-#: readelf.c:10735 readelf.c:11220 readelf.c:11241
+#: readelf.c:10446 readelf.c:10931 readelf.c:10952
 #, c-format
 msgid "4-byte\n"
 msgstr "4 bytes\n"
 
-#: readelf.c:10739 readelf.c:10758
+#: readelf.c:10450 readelf.c:10469
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr "8 bytes y extendido hasta %d bytes\n"
 
-#: readelf.c:10753
+#: readelf.c:10464
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr "8 bytes, excepto SP leaf\n"
 
-#: readelf.c:10769 readelf.c:10859 readelf.c:11256
+#: readelf.c:10480 readelf.c:10570 readelf.c:10967
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr "opción = %d, vendedor = %s\n"
 
-#: readelf.c:10775
+#: readelf.c:10486
 #, c-format
 msgid "True\n"
 msgstr "Verdadero\n"
 
-#: readelf.c:10904 readelf.c:11008
+#: readelf.c:10615 readelf.c:10719
 #, c-format
 msgid "Hard or soft float\n"
 msgstr "Coma flotante de hardware o software\n"
 
-#: readelf.c:10907
+#: readelf.c:10618
 #, c-format
 msgid "Hard float\n"
 msgstr "Coma flotante de hardware\n"
 
-#: readelf.c:10910 readelf.c:11017
+#: readelf.c:10621 readelf.c:10728
 #, c-format
 msgid "Soft float\n"
 msgstr "Coma flotante de software\n"
 
-#: readelf.c:10913
+#: readelf.c:10624
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr "Coma flotante de hardware de precisión sencilla\n"
 
-#: readelf.c:10930 readelf.c:10956
+#: readelf.c:10641 readelf.c:10667
 #, c-format
 msgid "Any\n"
 msgstr "Cualquiera\n"
 
-#: readelf.c:10933
+#: readelf.c:10644
 #, c-format
 msgid "Generic\n"
 msgstr "Genérica\n"
 
-#: readelf.c:10962
+#: readelf.c:10673
 #, c-format
 msgid "Memory\n"
 msgstr "Memoria\n"
 
-#: readelf.c:11011
+#: readelf.c:10722
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr "Coma flotante de hardware (precisión doble)\n"
 
-#: readelf.c:11014
+#: readelf.c:10725
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr "Coma flotante de hardware (precisión sencilla)\n"
 
-#: readelf.c:11020
+#: readelf.c:10731
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr "Coma flotante de hardware (FPU MIPS32r2 de 64 bits)\n"
 
-#: readelf.c:11103
+#: readelf.c:10814
 #, c-format
 msgid "Not used\n"
 msgstr "Sin usar\n"
 
-#: readelf.c:11106
+#: readelf.c:10817
 #, c-format
 msgid "2 bytes\n"
 msgstr "2 bytes\n"
 
-#: readelf.c:11109
+#: readelf.c:10820
 #, c-format
 msgid "4 bytes\n"
 msgstr "4 bytes\n"
 
-#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
+#: readelf.c:10838 readelf.c:10856 readelf.c:10934 readelf.c:10955
 #, c-format
 msgid "16-byte\n"
 msgstr "16 bytes\n"
 
-#: readelf.c:11160
+#: readelf.c:10871
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr "No se usa el direccionamiento DSBT\n"
 
-#: readelf.c:11163
+#: readelf.c:10874
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr "Se usa el direccionamiento DSBT\n"
 
-#: readelf.c:11178
+#: readelf.c:10889
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr "Direccionamiento de datos dependiente de posición\n"
 
-#: readelf.c:11181
+#: readelf.c:10892
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr "Direccionamiento de datos independiente de posición GOT cerca de DP\n"
 
-#: readelf.c:11184
+#: readelf.c:10895
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr "Direccionamiento de datos independiente de posición, GOT lejos de DP\n"
 
-#: readelf.c:11199
+#: readelf.c:10910
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr "Direccionamiento de código dependiente de posición\n"
 
-#: readelf.c:11202
+#: readelf.c:10913
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr "Direccionamiento de código independiente de posición\n"
 
-#: readelf.c:11308
+#: readelf.c:11019
 msgid "attributes"
 msgstr "atributos"
 
-#: readelf.c:11329
+#: readelf.c:11040
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr "ERROR: Longitud de sección errónea (%d > %d)\n"
 
-#: readelf.c:11335
+#: readelf.c:11046
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr "Sección de Atributo: %s\n"
 
-#: readelf.c:11360
+#: readelf.c:11071
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr "ERROR: Longitud de subsección errónea (%d > %d)\n"
 
-#: readelf.c:11372
+#: readelf.c:11083
 #, c-format
 msgid "File Attributes\n"
 msgstr "Atributos de Fichero\n"
 
-#: readelf.c:11375
+#: readelf.c:11086
 #, c-format
 msgid "Section Attributes:"
 msgstr "Atributos de Sección:"
 
-#: readelf.c:11378
+#: readelf.c:11089
 #, c-format
 msgid "Symbol Attributes:"
 msgstr "Atributos de Símbolos:"
 
-#: readelf.c:11393
+#: readelf.c:11104
 #, c-format
 msgid "Unknown tag: %d\n"
 msgstr "Etiqueta desconocida: %d\n"
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11412
+#: readelf.c:11123
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr "  Contexto de la sección desconocida\n"
 
-#: readelf.c:11419
+#: readelf.c:11130
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr "Formato '%c' desconocido\n"
 
-#: readelf.c:11463 readelf.c:11485
+#: readelf.c:11174 readelf.c:11196
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: readelf.c:11580 readelf.c:12102
+#: readelf.c:11291 readelf.c:11813
 msgid "liblist"
 msgstr "lista de bibliotecas"
 
-#: readelf.c:11583
+#: readelf.c:11294
 #, c-format
 msgid ""
 "\n"
@@ -6845,24 +6068,24 @@ msgstr ""
 "\n"
 "La sección '.liblist' contiene %lu entradas:\n"
 
-#: readelf.c:11585
+#: readelf.c:11296
 msgid "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr "     Biblioteca           Marca de Tiempo     Revisión   Versión Ops\n"
 
-#: readelf.c:11611
+#: readelf.c:11322
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr "<corrupto: %9ld>"
 
-#: readelf.c:11616
+#: readelf.c:11327
 msgid " NONE"
 msgstr " NINGUNO"
 
-#: readelf.c:11667
+#: readelf.c:11378
 msgid "options"
 msgstr "opciones"
 
-#: readelf.c:11698
+#: readelf.c:11409
 #, c-format
 msgid ""
 "\n"
@@ -6871,15 +6094,15 @@ msgstr ""
 "\n"
 "La sección '%s' contiene %d entradas:\n"
 
-#: readelf.c:11859
+#: readelf.c:11570
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr "se encontró una lista de conflictos sin una tabla de símbolos dinámicos\n"
 
-#: readelf.c:11876 readelf.c:11891
+#: readelf.c:11587 readelf.c:11602
 msgid "conflict"
 msgstr "tiene conflictos con"
 
-#: readelf.c:11901
+#: readelf.c:11612
 #, c-format
 msgid ""
 "\n"
@@ -6888,20 +6111,20 @@ msgstr ""
 "\n"
 "La sección '.conflict' contiene %lu entradas:\n"
 
-#: readelf.c:11903
+#: readelf.c:11614
 msgid "  Num:    Index       Value  Name"
 msgstr "  Num:    �ndice      Valor  Nombre"
 
-#: readelf.c:11915 readelf.c:11995 readelf.c:12063
+#: readelf.c:11626 readelf.c:11706 readelf.c:11774
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr "<corrupto: %14ld>"
 
-#: readelf.c:11936
+#: readelf.c:11647
 msgid "GOT"
 msgstr "GOT"
 
-#: readelf.c:11937
+#: readelf.c:11648
 #, c-format
 msgid ""
 "\n"
@@ -6910,76 +6133,86 @@ msgstr ""
 "\n"
 "GOT primario:\n"
 
-#: readelf.c:11938
+#: readelf.c:11649
 #, c-format
 msgid " Canonical gp value: "
 msgstr " Valor gp canónico: "
 
-#: readelf.c:11942 readelf.c:12034
+#: readelf.c:11653 readelf.c:11745
 #, c-format
 msgid " Reserved entries:\n"
 msgstr " Entradas reservadas:\n"
 
-#: readelf.c:11943
+#: readelf.c:11654
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr "  %*s %10s %*s Propósito\n"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
-#: readelf.c:12045
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688 readelf.c:11747
+#: readelf.c:11756
 msgid "Address"
 msgstr "Dirección"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688
 msgid "Access"
 msgstr "Acceso"
 
-#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
-#: readelf.c:12046
+#: readelf.c:11656 readelf.c:11673 readelf.c:11689 readelf.c:11747
+#: readelf.c:11757
 msgid "Initial"
 msgstr "Inicial"
 
-#: readelf.c:11947
+#: readelf.c:11658
 #, c-format
 msgid " Lazy resolver\n"
 msgstr " Resolvedor flojo\n"
 
-#: readelf.c:11953
+#: readelf.c:11664
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr " Puntero de módulo (extensión GNU)\n"
 
-#: readelf.c:11959
+#: readelf.c:11670
 #, c-format
 msgid " Local entries:\n"
 msgstr " Entradas locales\n"
 
-#: readelf.c:11975
+#: readelf.c:11671
+#, c-format
+msgid "  %*s %10s %*s\n"
+msgstr "  %*s %10s %*s\n"
+
+#: readelf.c:11686
 #, c-format
 msgid " Global entries:\n"
 msgstr " Entradas globales:\n"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11687
+#, c-format
+msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11690 readelf.c:11758
 msgid "Sym.Val."
 msgstr "Val.Sim."
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Type"
 msgstr "Tipo"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Ndx"
 msgstr "Ndx"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Name"
 msgstr "Nombre"
 
-#: readelf.c:12032
+#: readelf.c:11743
 msgid "PLT GOT"
 msgstr "GOT de PLT"
 
-#: readelf.c:12033
+#: readelf.c:11744
 #, c-format
 msgid ""
 "\n"
@@ -6989,31 +6222,36 @@ msgstr ""
 "\n"
 "GOT de PLT:\n"
 
-#: readelf.c:12035
+#: readelf.c:11746
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr "  %*s %*s Propósito\n"
 
-#: readelf.c:12038
+#: readelf.c:11749
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr " Resolvedor flojo de PLT\n"
 
-#: readelf.c:12040
+#: readelf.c:11751
 #, c-format
 msgid " Module pointer\n"
 msgstr " Puntero de módulo\n"
 
-#: readelf.c:12043
+#: readelf.c:11754
 #, c-format
 msgid " Entries:\n"
 msgstr " Entradas:\n"
 
-#: readelf.c:12110
+#: readelf.c:11755
+#, c-format
+msgid "  %*s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11821
 msgid "liblist string table"
 msgstr "tabla de cadenas liblist"
 
-#: readelf.c:12121
+#: readelf.c:11831
 #, c-format
 msgid ""
 "\n"
@@ -7022,344 +6260,146 @@ msgstr ""
 "\n"
 "La sección de lista de bibliotecas '%s' contiene %lu entradas:\n"
 
-#: readelf.c:12125
+#: readelf.c:11835
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr "     Biblioteca           Marca Tiempo        Revisión   Versión Opts"
 
-#: readelf.c:12175
+#: readelf.c:11884
 msgid "NT_AUXV (auxiliary vector)"
 msgstr "NT_AUXV (vector auxiliar)"
 
-#: readelf.c:12177
+#: readelf.c:11886
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr "NT_PRSTATUS (estructura prstatus)"
 
-#: readelf.c:12179
+#: readelf.c:11888
 msgid "NT_FPREGSET (floating point registers)"
 msgstr "NT_FPREGSET (registros de coma flotante)"
 
-#: readelf.c:12181
+#: readelf.c:11890
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr "NT_PRPSINFO (estructura prpsinfo)"
 
-#: readelf.c:12183
+#: readelf.c:11892
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr "NT_TASKSTRUCT (estructura task)"
 
-#: readelf.c:12185
+#: readelf.c:11894
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr "NT_PRXFPREG (estructura user_xfpregs)"
 
-#: readelf.c:12187
+#: readelf.c:11896
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr "NT_PPC_VMX (registros Altivec de ppc)"
 
-#: readelf.c:12189
+#: readelf.c:11898
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr "NT_PPC_VSX (registros VSX de ppc)"
 
-#: readelf.c:12191
+#: readelf.c:11900
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr "NT_X86_XSTATE (estado extendido XSAVE de x86)"
 
-#: readelf.c:12193
+#: readelf.c:11902
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr "NT_S390_HIGH_GPRS (mitades de registro superiores de s390)"
 
-#: readelf.c:12195
+#: readelf.c:11904
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr "NT_S390_TIMER (registro temporizador de s390)"
 
-#: readelf.c:12197
+#: readelf.c:11906
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr "NT_S390_TODCMP (registro comparador TOD de s390)"
 
-#: readelf.c:12199
+#: readelf.c:11908
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr "NT_S390_TODPREG (registro programable TOD de s390)"
 
-#: readelf.c:12201
+#: readelf.c:11910
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr "NT_S390_CTRS (registros de control de s390)"
 
-#: readelf.c:12203
+#: readelf.c:11912
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr "NT_S390_PREFIX (registro prefijo de s390)"
 
-#: readelf.c:12205
+#: readelf.c:11914
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr "NT_PSTATUS (estructura pstatus)"
 
-#: readelf.c:12207
+#: readelf.c:11916
 msgid "NT_FPREGS (floating point registers)"
 msgstr "NT_FPREGS (registros de coma flotante)"
 
-#: readelf.c:12209
+#: readelf.c:11918
 msgid "NT_PSINFO (psinfo structure)"
 msgstr "NT_PSINFO (estructura psinfo)"
 
-#: readelf.c:12211
+#: readelf.c:11920
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr "NT_LWPSTATUS (estructura lwpstatus_t)"
 
-#: readelf.c:12213
+#: readelf.c:11922
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr "NT_LWPSINFO (estructura lwpsinfo_t)"
 
-#: readelf.c:12215
+#: readelf.c:11924
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr "NT_WIN32PSTATUS (estructura win32_pstatus)"
 
-#: readelf.c:12223
+#: readelf.c:11932
 msgid "NT_VERSION (version)"
 msgstr "NT_VERSION (versión)"
 
-#: readelf.c:12225
+#: readelf.c:11934
 msgid "NT_ARCH (architecture)"
 msgstr "NT_ARCH (arquitectura)"
 
-#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
-#: readelf.c:12467
+#: readelf.c:11939 readelf.c:11962 readelf.c:11984
 #, c-format
 msgid "Unknown note type: (0x%08x)"
 msgstr "Tipo de nota desconocido: (0x%08x)"
 
-#: readelf.c:12242
+#: readelf.c:11951
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr "NT_GNU_ABI_TAG (etiqueta de versión de ABI)"
 
-#: readelf.c:12244
+#: readelf.c:11953
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
 msgstr "NT_GNU_HWCAP (información de HWCAP de software proporcionado por DSO)"
 
-#: readelf.c:12246
+#: readelf.c:11955
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
 msgstr "NT_GNU_BUILD_ID (cadena de bits de ID de construcción única)"
 
-#: readelf.c:12248
+#: readelf.c:11957
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr "NT_GNU_GOLD_VERSION (versión de gold)"
 
-#: readelf.c:12266
-#, c-format
-msgid "    Build ID: "
-msgstr " ID de Compilación: "
-
-#: readelf.c:12269 readelf.c:12425
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: readelf.c:12305
-#, c-format
-msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
-msgstr "    SO: %s, ABI: %ld.%ld.%ld\n"
-
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12322
+#: readelf.c:11974
 msgid "NetBSD procinfo structure"
 msgstr "estructura procinfo de NetBSD"
 
-#: readelf.c:12349 readelf.c:12363
+#: readelf.c:12001 readelf.c:12015
 msgid "PT_GETREGS (reg structure)"
 msgstr "PT_GETREGS (estructura reg)"
 
-#: readelf.c:12351 readelf.c:12365
+#: readelf.c:12003 readelf.c:12017
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr "PT_GETFPREGS (estructura fpreg)"
 
-#: readelf.c:12371
+#: readelf.c:12023
 #, c-format
 msgid "PT_FIRSTMACH+%d"
 msgstr "PT_FIRSTMACH+%d"
 
-#: readelf.c:12384
-msgid "NT_STAPSDT (SystemTap probe descriptors)"
-msgstr "NT_STAPSDT (descriptores de prueba SystemTap)"
-
-#: readelf.c:12417
-#, c-format
-msgid "    Provider: %s\n"
-msgstr "    Proveedor: %s\n"
-
-#: readelf.c:12418
-#, c-format
-msgid "    Name: %s\n"
-msgstr "  Nombre: %s\n"
-
-#: readelf.c:12419
-#, c-format
-msgid "    Location: "
-msgstr "    Ubicación: "
-
-#: readelf.c:12421
-#, c-format
-msgid ", Base: "
-msgstr ", Base: "
-
-#: readelf.c:12423
-#, c-format
-msgid ", Semaphore: "
-msgstr ", Semáforo: "
-
-#: readelf.c:12426
-#, c-format
-msgid "    Arguments: %s\n"
-msgstr "    Argumentos: %s\n"
-
-#: readelf.c:12439
-msgid "NT_VMS_MHD (module header)"
-msgstr "NT_VMS_MHD (encabezado de módulo)"
-
-#: readelf.c:12441
-msgid "NT_VMS_LNM (language name)"
-msgstr "NT_VMS_LNM (nombre de lenguaje)"
-
-#: readelf.c:12443
-msgid "NT_VMS_SRC (source files)"
-msgstr "NT_VMS_SRC (ficheros fuente)"
-
-#: readelf.c:12445
-msgid "NT_VMS_TITLE"
-msgstr "NT_VMS_TITLE"
-
-#: readelf.c:12447
-msgid "NT_VMS_EIDC (consistency check)"
-msgstr "NT_VMS_EIDC (prueba de consistencia)"
-
-#: readelf.c:12449
-msgid "NT_VMS_FPMODE (FP mode)"
-msgstr "NT_VMS_FPMODE (modo FP)"
-
-#: readelf.c:12451
-msgid "NT_VMS_LINKTIME"
-msgstr "NT_VMS_LINKTIME"
-
-#: readelf.c:12453
-msgid "NT_VMS_IMGNAM (image name)"
-msgstr "NT_VMS_IMGNAM (nombre de imagen)"
-
-#: readelf.c:12455
-msgid "NT_VMS_IMGID (image id)"
-msgstr "NT_VMS_IMGID (id de imagen)"
-
-#: readelf.c:12457
-msgid "NT_VMS_LINKID (link id)"
-msgstr "NT_VMS_LINKID (id de enlace)"
-
-#: readelf.c:12459
-msgid "NT_VMS_IMGBID (build id)"
-msgstr "NT_VMS_IMGBID (id de compilación)"
-
-#: readelf.c:12461
-msgid "NT_VMS_GSTNAM (sym table name)"
-msgstr "NT_VMS_GSTNAM (nombre de tabla de símbolos)"
-
-#: readelf.c:12463
-msgid "NT_VMS_ORIG_DYN"
-msgstr "NT_VMS_ORIG_DYN"
-
-#: readelf.c:12465
-msgid "NT_VMS_PATCHTIME"
-msgstr "NT_VMS_PATCHTIME"
-
-#: readelf.c:12481
-#, c-format
-msgid "    Creation date  : %.17s\n"
-msgstr " Fecha de creación : %.17s\n"
-
-#: readelf.c:12482
-#, c-format
-msgid "    Last patch date: %.17s\n"
-msgstr "Última fecha de parche: %.17s\n"
-
-#: readelf.c:12483
-#, c-format
-msgid "    Module name    : %s\n"
-msgstr "   Nombre de módulo: %s\n"
-
-#: readelf.c:12484
-#, c-format
-msgid "    Module version : %s\n"
-msgstr " Versión de módulo : %s\n"
-
-#: readelf.c:12487
-#, c-format
-msgid "    Invalid size\n"
-msgstr "    Tamaño inválido\n"
-
-#: readelf.c:12490
-#, c-format
-msgid "   Language: %s\n"
-msgstr "   Lenguaje: %s\n"
-
-#: readelf.c:12494
-msgid "   FP mode: 0x%016"
-msgstr "   modo FP: 0x%016"
-
-#: readelf.c:12498
-#, c-format
-msgid "   Link time: "
-msgstr " Hora de enlazado: "
-
-#: readelf.c:12504
-#, c-format
-msgid "   Patch time: "
-msgstr " Hora de parche: "
-
-#: readelf.c:12510
-#, c-format
-msgid "   Major id: %u,  minor id: %u\n"
-msgstr "   Id mayor: %u,  id menor: %u\n"
-
-#: readelf.c:12513
-#, c-format
-msgid "   Manip date  : "
-msgstr "   Fecha manip : "
-
-#: readelf.c:12516
-msgid ""
-"\n"
-"   Link flags  : 0x%016"
-msgstr ""
-"\n"
-" Opciones de enlace : 0x%016"
-
-#: readelf.c:12519
-#, c-format
-msgid "   Header flags: 0x%08x\n"
-msgstr " Opciones de encabezado: 0x%08x\n"
-
-#: readelf.c:12521
-#, c-format
-msgid "   Image id    : %s\n"
-msgstr "   Id de imagen: %s\n"
-
-#: readelf.c:12525
-#, c-format
-msgid "    Image name: %s\n"
-msgstr " Nombre de imagen: %s\n"
-
-#: readelf.c:12528
-#, c-format
-msgid "    Global symbol table name: %s\n"
-msgstr "    Nombre de tabla de símbolos globales: %s\n"
-
-#: readelf.c:12531
-#, c-format
-msgid "    Image id: %s\n"
-msgstr "    Id de imagen: %s\n"
-
-#: readelf.c:12534
-#, c-format
-msgid "    Linker id: %s\n"
-msgstr "    Id de enlazado: %s\n"
-
-#: readelf.c:12609
+#: readelf.c:12080
 msgid "notes"
 msgstr "notas"
 
-#: readelf.c:12615
+#: readelf.c:12086
 #, c-format
 msgid ""
 "\n"
@@ -7368,35 +6408,27 @@ msgstr ""
 "\n"
 "Notas en el desplazamiento 0x%08lx con longitud 0x%08lx:\n"
 
-#: readelf.c:12617
+#: readelf.c:12088
 #, c-format
-msgid "  %-20s %10s\tDescription\n"
-msgstr "  %-20s %10s\tDescripción\n"
-
-#: readelf.c:12617
-msgid "Owner"
-msgstr "Propietario"
+msgid "  Owner\t\tData size\tDescription\n"
+msgstr "  Prop\t\tTamaño datos\tDescripción\n"
 
-#: readelf.c:12617
-msgid "Data size"
-msgstr "Tamaño de datos"
-
-#: readelf.c:12655 readelf.c:12668
+#: readelf.c:12108 readelf.c:12121
 #, c-format
 msgid "corrupt note found at offset %lx into core notes\n"
 msgstr "se encontró una nota corrupta en el desplazamiento %lx en las notas de núcleo\n"
 
-#: readelf.c:12657 readelf.c:12670
+#: readelf.c:12110 readelf.c:12123
 #, c-format
 msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
 msgstr " tipo: %lx, tamañonombre: %08lx, tamañodesc: %08lx\n"
 
-#: readelf.c:12766
+#: readelf.c:12219
 #, c-format
 msgid "No note segments present in the core file.\n"
 msgstr "No hay segmentos de notas presentes el el fichero core.\n"
 
-#: readelf.c:12853
+#: readelf.c:12306
 msgid ""
 "This instance of readelf has been built without support for a\n"
 "64 bit data type and so it cannot read 64 bit ELF files.\n"
@@ -7404,12 +6436,12 @@ msgstr ""
 "Esta instancia de readelf ha sido construida sin soporte para un\n"
 "tipo de datos de 64 bit y por eso no puede leer ficheros ELF de 64 bit.\n"
 
-#: readelf.c:12900
+#: readelf.c:12353
 #, c-format
 msgid "%s: Failed to read file header\n"
 msgstr "%s: Falló al leer el encabezado del fichero\n"
 
-#: readelf.c:12914
+#: readelf.c:12366
 #, c-format
 msgid ""
 "\n"
@@ -7418,47 +6450,89 @@ msgstr ""
 "\n"
 "Fichero: %s\n"
 
-#: readelf.c:13086
+#: readelf.c:12615
+#, c-format
+msgid "%s: the archive index is empty\n"
+msgstr "%s: el índice del archivo está vacío\n"
+
+#: readelf.c:12623 readelf.c:12647
+#, c-format
+msgid "%s: failed to read archive index\n"
+msgstr "%s: falló al leer el índice del archivo\n"
+
+#: readelf.c:12632
+#, c-format
+msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
+msgstr "%s: se supone que el índice del archivo tiene %ld entradas, pero el tamaño en el encabezado es demasiado pequeño\n"
+
+#: readelf.c:12640
+msgid "Out of memory whilst trying to read archive symbol index\n"
+msgstr "Memoria agotada al tratar de leer el índice de símbolos del archivo\n"
+
+#: readelf.c:12658
+msgid "Out of memory whilst trying to convert the archive symbol index\n"
+msgstr "Memoria agotada al tratar de convertir el índice de símbolos del archivo\n"
+
+#: readelf.c:12670
+#, c-format
+msgid "%s: the archive has an index but no symbols\n"
+msgstr "%s: el archivo tiene un índice pero no tiene símbolos\n"
+
+#: readelf.c:12677
+msgid "Out of memory whilst trying to read archive index symbol table\n"
+msgstr "Memoria agotada al tratar de leer la tabla de símbolos del índice del archivo\n"
+
+#: readelf.c:12683
+#, c-format
+msgid "%s: failed to read archive index symbol table\n"
+msgstr "%s: falló al leer la tabla de símbolos del índice del archivo\n"
+
+#: readelf.c:12707
+#, c-format
+msgid "%s has no archive index\n"
+msgstr "%s: no tiene índice de archivo\n"
+
+#: readelf.c:12943
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr "%s: no se puede volcar el índice porque ninguno se encontró\n"
 
-#: readelf.c:13092
+#: readelf.c:12949
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr "�ndice del archivo %s: (%ld entradas, 0x%lx bytes en la tabla de símbolos)\n"
 
-#: readelf.c:13110
+#: readelf.c:12967
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr "El binario %s contiene:\n"
 
-#: readelf.c:13118
+#: readelf.c:12975
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr "%s: se alcanzó el final de la tabla de símbolos antes que el final del índice\n"
 
-#: readelf.c:13129
+#: readelf.c:12986
 #, c-format
 msgid "%s: symbols remain in the index symbol table, but without corresponding entries in the index table\n"
 msgstr "%s: aún hay símbolos en la tabla de símbolos de índice, pero sin su entrada correspondiente en la tabla de índice\n"
 
-#: readelf.c:13134
+#: readelf.c:12991
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr "%s: falló al buscar de nuevo el inicio de los ficheros objeto en el archivo\n"
 
-#: readelf.c:13217 readelf.c:13300
+#: readelf.c:13074 readelf.c:13150
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr "El fichero de entrada '%s' no es legible.\n"
 
-#: readelf.c:13239
+#: readelf.c:13096
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr "%s: falló al buscar el miembro de archivo.\n"
 
-#: readelf.c:13318
+#: readelf.c:13168
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr "El fichero %s no es un archivo por lo cual no se puede mostrar su índice.\n"
@@ -7759,6 +6833,11 @@ msgstr "no se puede abrir el fichero temporal `%s': %s"
 msgid "can't redirect stdout: `%s': %s"
 msgstr "no se puede redirigir la salida estándar: `%s': %s"
 
+#: resrc.c:284
+#, c-format
+msgid "%s %s: %s"
+msgstr "%s %s: %s"
+
 #: resrc.c:329
 #, c-format
 msgid "can't execute `%s': %s"
@@ -7793,6 +6872,11 @@ msgstr "Se utiliza `%s'\n"
 msgid "preprocessing failed."
 msgstr "falló el preprocesamiento."
 
+#: resrc.c:631
+#, c-format
+msgid "%s:%d: %s\n"
+msgstr "%s:%d: %s\n"
+
 #: resrc.c:639
 #, c-format
 msgid "%s: unexpected EOF"
@@ -7895,12 +6979,12 @@ msgstr "argumento inválido para --format: %s"
 msgid "Invalid radix: %s\n"
 msgstr "Radical inválido: %s\n"
 
-#: srconv.c:1733
+#: srconv.c:1732
 #, c-format
 msgid "Convert a COFF object file into a SYSROFF object file\n"
 msgstr "Convierte un fichero objeto COFF a un fichero objeto SYSROFF\n"
 
-#: srconv.c:1734
+#: srconv.c:1733
 #, c-format
 msgid ""
 " The options are:\n"
@@ -7919,7 +7003,7 @@ msgstr ""
 "  -h --help        Muestra esta información\n"
 "  -v --version     Muestra el número de versión del programa\n"
 
-#: srconv.c:1880
+#: srconv.c:1879
 #, c-format
 msgid "unable to open output file %s"
 msgstr "no se puede abrir el fichero de salida %s"
@@ -7964,95 +7048,95 @@ msgstr "no se reconoce el tipo de referencia cruzada"
 msgid "missing index type"
 msgstr "falta el tipo de índice"
 
-#: stabs.c:2129
+#: stabs.c:2122
 msgid "unknown virtual character for baseclass"
 msgstr "carácter virtual desconocido para la clase base"
 
-#: stabs.c:2147
+#: stabs.c:2140
 msgid "unknown visibility character for baseclass"
 msgstr "carácter de visibilidad desconocido para la clase base"
 
-#: stabs.c:2337
+#: stabs.c:2326
 msgid "unnamed $vb type"
 msgstr "tipo $vb sin nombre"
 
-#: stabs.c:2343
+#: stabs.c:2332
 msgid "unrecognized C++ abbreviation"
 msgstr "no se reconoce la abreviación C++"
 
-#: stabs.c:2419
+#: stabs.c:2408
 msgid "unknown visibility character for field"
 msgstr "carácter de visibilidad desconocido para el campo"
 
-#: stabs.c:2679
+#: stabs.c:2660
 msgid "const/volatile indicator missing"
 msgstr "falta el indicador const/volatile"
 
-#: stabs.c:2924
+#: stabs.c:2896
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr "No hay desenredo para \"%s\"\n"
 
-#: stabs.c:3224
+#: stabs.c:3196
 msgid "Undefined N_EXCL"
 msgstr "N_EXCL sin definir"
 
-#: stabs.c:3304
+#: stabs.c:3276
 #, c-format
 msgid "Type file number %d out of range\n"
 msgstr "Número de tipo de fichero %d fuera de rango\n"
 
-#: stabs.c:3309
+#: stabs.c:3281
 #, c-format
 msgid "Type index number %d out of range\n"
 msgstr "Número de tipo de índice %d fuera de rango\n"
 
-#: stabs.c:3388
+#: stabs.c:3360
 #, c-format
 msgid "Unrecognized XCOFF type %d\n"
 msgstr "No se reconoce el tipo XCOFF %d\n"
 
-#: stabs.c:3680
+#: stabs.c:3652
 #, c-format
 msgid "bad mangled name `%s'\n"
 msgstr "nombre desenredado erróneamente `%s'\n"
 
-#: stabs.c:3775
+#: stabs.c:3747
 #, c-format
 msgid "no argument types in mangled string\n"
 msgstr "no hay tipos de argumento en la cadena desenredada\n"
 
-#: stabs.c:5125
+#: stabs.c:5094
 #, c-format
 msgid "Demangled name is not a function\n"
 msgstr "El nombres desenredado no es una función\n"
 
-#: stabs.c:5167
+#: stabs.c:5136
 #, c-format
 msgid "Unexpected type in v3 arglist demangling\n"
 msgstr "Tipo inesperado en la lista de argumentos de desenredo v3\n"
 
-#: stabs.c:5234
+#: stabs.c:5203
 #, c-format
 msgid "Unrecognized demangle component %d\n"
 msgstr "No se reconoce el componente de desenredo %d\n"
 
-#: stabs.c:5286
+#: stabs.c:5255
 #, c-format
 msgid "Failed to print demangled template\n"
 msgstr "Falló al mostrar la plantilla desenredada\n"
 
-#: stabs.c:5366
+#: stabs.c:5335
 #, c-format
 msgid "Couldn't get demangled builtin type\n"
 msgstr "No se puede obtener el tipo interno desenredado\n"
 
-#: stabs.c:5415
+#: stabs.c:5384
 #, c-format
 msgid "Unexpected demangled varargs\n"
 msgstr "varargs desenredados inesperados\n"
 
-#: stabs.c:5422
+#: stabs.c:5391
 #, c-format
 msgid "Unrecognized demangled builtin type\n"
 msgstr "No se reconoce el tipo interno desenredado\n"
@@ -8067,12 +7151,12 @@ msgstr "argumento entero %s inválido"
 msgid "invalid minimum string length %d"
 msgstr "longitud de cadena mínima %d inválida"
 
-#: strings.c:651
+#: strings.c:647
 #, c-format
 msgid " Display printable strings in [file(s)] (stdin by default)\n"
 msgstr " Muestra las cadenas imprimibles en [fichero(s)] (por defecto entrada estándar)\n"
 
-#: strings.c:652
+#: strings.c:648
 #, c-format
 msgid ""
 " The options are:\n"
@@ -8128,8 +7212,8 @@ msgstr "no se puede abrir el fichero de entrada %s"
 
 #: version.c:36
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: version.c:37
 #, c-format
@@ -8146,8 +7230,8 @@ msgstr ""
 
 #: windmc.c:190
 #, c-format
-msgid "can't create %s file `%s' for output.\n"
-msgstr "no se puede crear el fichero %s `%s' para salida.\n"
+msgid "can't create %s file ,%s' for output.\n"
+msgstr "no se puede abrir el fichero %s ,%s' para salida.\n"
 
 #: windmc.c:198
 #, c-format
@@ -8165,7 +7249,7 @@ msgid ""
 "  -C --codepage_in=<val>       Set codepage when reading mc text file\n"
 "  -d --decimal_values          Print values to text files decimal\n"
 "  -e --extension=<extension>   Set header extension used on export header file\n"
-"  -F --target <target>         Specify output target for endianness.\n"
+"  -F --target <target>         Specify output target for endianess.\n"
 "  -h --headerdir=<directory>   Set the export directory for headers\n"
 "  -u --unicode_in              Read input file as UTF16 file\n"
 "  -U --unicode_out             Write binary messages as UFT16\n"
@@ -8180,12 +7264,12 @@ msgstr ""
 "Las opciones son:\n"
 "  -a --ascii_in                Lee el fichero de entrada como fichero ASCII\n"
 "  -A --ascii_out               Escribe los mensajes binarios como ASCII\n"
-"  -b --binprefix               Se agrega el prefijo fichero_ .mc al nombre de fichero .bin para singularidad.\n"
+"  -b --binprefix               Se agrega al nombre de fichero .bin el prefijo fichero_ .mc para singularidad.\n"
 "  -c --customflag              Define las opciones particulares para los mensajes\n"
 "  -C --codepage_in=<val>       Define el código de página para leer el fichero de texto mc\n"
 "  -d --decimal_values          Guarda los valores a ficheros de textos decimales\n"
 "  -e --extension=<extensión>   Establece la extensión del encabezado a usar en la exportación del fichero de encabezado\n"
-"  -F --target <objetivo>       Especifica el objetivo de salida por `endianez'.\n"
+"  -F --target <objetivo>       Especifica el objetivo de salida por `endianez'\n"
 "  -h --headerdir=<directorio>  Define el directorio de exportación para encabezados\n"
 "  -u --unicode_in              Lee el fichero de entrada como un fichero UTF16\n"
 "  -U --unicode_out             Escribe los mensajes binarios como UTF16\n"
@@ -8215,8 +7299,8 @@ msgstr "%s: aviso: "
 
 #: windmc.c:262
 #, c-format
-msgid "A codepage was specified switch `%s' and UTF16.\n"
-msgstr "Se especificó un código de página con la opción `%s' y UTF16.\n"
+msgid "A codepage was specified switch ,%s' and UTF16.\n"
+msgstr "Se especificó un código de página con la opción ,%s' y UTF16.\n"
 
 #: windmc.c:263
 #, c-format
@@ -8229,8 +7313,8 @@ msgstr "se trató de agregar un lenguaje erróneo."
 
 #: windmc.c:1116
 #, c-format
-msgid "unable to open file `%s' for input.\n"
-msgstr "no se puede abrir el fichero `%s' para entrada.\n"
+msgid "unable to open file ,%s' for input.\n"
+msgstr "no se puede abrir el fichero ,%s' para salida.\n"
 
 #: windmc.c:1124
 #, c-format
@@ -8292,7 +7376,6 @@ msgid ""
 "  -O --output-format=<format>  Specify output format\n"
 "  -F --target=<target>         Specify COFF target\n"
 "     --preprocessor=<program>  Program to use to preprocess rc file\n"
-"     --preprocessor-arg=<arg>  Additional preprocessor argument\n"
 "  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n"
 "  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n"
@@ -8306,7 +7389,7 @@ msgstr ""
 "Las opciones son:\n"
 "  -i --input=<fichero>         Nombra el fichero de entrada\n"
 "  -o --output=<fichero>        Nombra el fichero de salida\n"
-"  -J --input-format=<formato>  Especifica el formato de entrada\n"
+"  -I --input-format=<formato>  Especifica el formato de entrada\n"
 "  -O --output-format=<formato> Especifica el formato de salida\n"
 "  -F --target=<objetivo>       Especifica el objetivo COFF\n"
 "     --preprocessor=<programa> Programa a utilizar para preprocesar el fichero rc\n"
@@ -8320,12 +7403,12 @@ msgstr ""
 "                               leer la salida del preprocesador\n"
 "     --no-use-temp-file        Usa popen (por defecto)\n"
 
-#: windres.c:679
+#: windres.c:678
 #, c-format
 msgid "     --yydebug                 Turn on parser debugging\n"
 msgstr "     --yydebug                 Activa el decodificador de depuración\n"
 
-#: windres.c:682
+#: windres.c:681
 #, c-format
 msgid ""
 "  -r                           Ignored for compatibility with rc\n"
@@ -8339,7 +7422,7 @@ msgstr ""
 "  -h --help                    Muestra este mensaje de ayuda\n"
 "  -V --version                 Muestra la información de versión\n"
 
-#: windres.c:687
+#: windres.c:686
 #, c-format
 msgid ""
 "FORMAT is one of rc, res, or coff, and is deduced from the file name\n"
@@ -8351,153 +7434,42 @@ msgstr ""
 "entrada.  Sin fichero de entrada es la entrada estándar, por defecto rc.\n"
 "Sin fichero de salida es la salida estándar, por defecto rc.\n"
 
-#: windres.c:850
+#: windres.c:847
 msgid "invalid codepage specified.\n"
 msgstr "se especificó un código de página inválido\n"
 
-#: windres.c:865
+#: windres.c:862
 msgid "invalid option -f\n"
 msgstr "opción -f inválida\n"
 
-#: windres.c:870
+#: windres.c:867
 msgid "No filename following the -fo option.\n"
 msgstr "No hay un nombre de fichero a continuación de la opción -fo.\n"
 
-#: windres.c:959
+#: windres.c:938
 #, c-format
 msgid "Option -I is deprecated for setting the input format, please use -J instead.\n"
 msgstr "La opción -I es obsoleta para establecer el formato de salida, por favor use -J en su lugar.\n"
 
-#: windres.c:1072
+#: windres.c:1051
 msgid "no resources"
 msgstr "no hay recursos"
 
-#: wrstabs.c:354 wrstabs.c:1915
+#: wrstabs.c:353 wrstabs.c:1916
 #, c-format
 msgid "string_hash_lookup failed: %s"
 msgstr "string_hash_lookup falló: %s"
 
-#: wrstabs.c:637
+#: wrstabs.c:636
 #, c-format
 msgid "stab_int_type: bad size %u"
 msgstr "stab_int_type: tamaño %u erróneo"
 
-#: wrstabs.c:1393
+#: wrstabs.c:1394
 #, c-format
 msgid "%s: warning: unknown size for field `%s' in struct"
 msgstr "%s: aviso: tamaño desconocido para el campo `%s' en la estructura"
 
-#~ msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
-#~ msgstr "Modo de empleo: %s [opciones emulación] [--plugin <nombre>] [-]{dmpqrstx}[abcfilNoPsSuvV] [nombre-miembro] [cuenta] fichero-archivo fichero...\n"
-
-#~ msgid "illegal option -- %c"
-#~ msgstr "opción ilegal -- %c"
-
-#~ msgid ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-
-#~ msgid "Usage: %s < input_file > output_file\n"
-#~ msgstr "Modo de empleo: %s < fichero_entrada > fichero_salida\n"
-
-#~ msgid "Prints bytes from stdin in hex format.\n"
-#~ msgstr "Muestra los bytes de la entrada estándar en formato hexadecimal.\n"
-
-#~ msgid "   %d\t"
-#~ msgstr "   %d\t"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "  %d\t"
-#~ msgstr "  %d\t"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "./%s:[++]\n"
-#~ msgstr ""
-#~ "\n"
-#~ "./%s:[++]\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "%s/%s:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s/%s:\n"
-
-#~ msgid "%-35s  %11d  %#18lx\n"
-#~ msgstr "%-35s  %11d  %#18lx\n"
-
-#~ msgid "%-35s  %11d  %#18lx[%d]\n"
-#~ msgstr "%-35s  %11d  %#18lx[%d]\n"
-
-#~ msgid "%s  %11d  %#18lx\n"
-#~ msgstr "%s  %11d  %#18lx\n"
-
-#~ msgid "%s  %11d  %#18lx[%d]\n"
-#~ msgstr "%s  %11d  %#18lx[%d]\n"
-
-#~ msgid "   %ld      %s    [%s]\n"
-#~ msgstr "   %ld      %s    [%s]\n"
-
-#~ msgid "    %-18s %s\n"
-#~ msgstr "    %-18s %s\n"
-
-#~ msgid "Location lists in .debug_info section aren't in ascending order!\n"
-#~ msgstr "¡Las listas de ubicación en la sección .debug_info no están en orden ascendente!\n"
-
-#~ msgid "target `%s' ignored."
-#~ msgstr " se descarta el objetivo `%s'."
-
-#~ msgid "  Pg"
-#~ msgstr "  Pg"
-
-#~ msgid " (%ld)"
-#~ msgstr " (%ld)"
-
-#~ msgid "0x%02x "
-#~ msgstr "0x%02x "
-
-#~ msgid "  [reserved compact index %d]\n"
-#~ msgstr "  [índice compacto reservado %d]\n"
-
-#~ msgid "     vsp = vsp - %d"
-#~ msgstr "     vsp = vsp - %d"
-
-#~ msgid "     vsp = r%d"
-#~ msgstr "     vsp = r%d"
-
-#~ msgid "[unsupported two-byte opcode]"
-#~ msgstr "[no se admite el código de operación de dos bytes]"
-
-#~ msgid "  %*s %10s %*s\n"
-#~ msgstr "  %*s %10s %*s\n"
-
-#~ msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "  %*s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "%s %s: %s"
-#~ msgstr "%s %s: %s"
-
-#~ msgid "%s:%d: %s\n"
-#~ msgstr "%s:%d: %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Can't uncompress section '%s'.\n"
@@ -8604,6 +7576,9 @@ msgstr "%s: aviso: tamaño desconocido para el campo `%s' en la estructura"
 #~ msgid "Out of memory"
 #~ msgstr "Memoria agotada"
 
+#~ msgid "can't read resource section"
+#~ msgstr "no se puede leer la sección de recursos"
+
 #~ msgid "flags"
 #~ msgstr "opciones"
 
diff --git a/binutils/po/fi.po b/binutils/po/fi.po
index 0879f19024..2704bb0ec8 100644
--- a/binutils/po/fi.po
+++ b/binutils/po/fi.po
@@ -1,18 +1,17 @@
 # Finnish messages for binutils.
-# Copyright © 2005, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright © 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Jorma Karvonen <karvjorm@users.sf.net>, 2005, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: binutils 2.21.53\n"
+"Project-Id-Version: binutils 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2011-09-24 22:05+0200\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2010-11-22 08:49+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,22 +22,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 
 #  Käytetty option(s)-suomennoksessa monikkomuotoa. Samoin sanat addr(s) suomennettu monikon partitiivilla.
-#: addr2line.c:81
+#: addr2line.c:80
 #, c-format
 msgid "Usage: %s [option(s)] [addr(s)]\n"
 msgstr "Käyttö: %s [valitsimet] [osoitteita]\n"
 
-#: addr2line.c:82
+#: addr2line.c:81
 #, c-format
 msgid " Convert addresses into line number/file name pairs.\n"
 msgstr " Muunna osoitteet rivinumero-tiedostonimipareiksi.\n"
 
-#: addr2line.c:83
+#: addr2line.c:82
 #, c-format
 msgid " If no addresses are specified on the command line, they will be read from stdin\n"
 msgstr " Jos komentorivillä ei ole annettu osoitteita, ne luetaan vakiosyötteestä\n"
 
-#: addr2line.c:84
+#: addr2line.c:83
 #, c-format
 msgid ""
 " The options are:\n"
@@ -70,220 +69,215 @@ msgstr ""
 "  -v --version                Näytä ohjelman version\n"
 "\n"
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
-#: windmc.c:228 windres.c:695
+#: addr2line.c:100 ar.c:293 coffdump.c:469 dlltool.c:3926 dllwrap.c:524
+#: elfedit.c:1155 nlmconv.c:1113 objcopy.c:576 objcopy.c:611 readelf.c:3219
+#: size.c:99 srconv.c:1742 strings.c:663 sysdump.c:653 windmc.c:228
+#: windres.c:694
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 "Ilmoita ohjelmistovioista englanniksi osoitteeseen %s\n"
 "Suomennoksen virheistä voi ilmoittaa (suomeksi) osoitteeseen <mailto:translation-team-fi@lists.sourceforge.net>\n"
 
-#: addr2line.c:271
+#: addr2line.c:262
 #, c-format
 msgid " at "
 msgstr " osoitteessa "
 
-#: addr2line.c:296
+#: addr2line.c:287
 #, c-format
 msgid " (inlined by) "
 msgstr "(inline-funktiona) "
 
-#: addr2line.c:329
+#: addr2line.c:320
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr "%s: osoitteita ei saa arkistosta"
 
-#: addr2line.c:346
+#: addr2line.c:337
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr "%s: lohkoa %s ei löydy"
 
-#: addr2line.c:415 nm.c:1566 objdump.c:3423
+#: addr2line.c:406 nm.c:1563 objdump.c:3301
 #, c-format
 msgid "unknown demangling style `%s'"
 msgstr "tuntematon eheytystyyli �%s�"
 
-#: ar.c:238
+#: ar.c:215
 #, c-format
 msgid "no entry %s in archive\n"
 msgstr "arkistossa ei ole alkiota %s\n"
 
-#: ar.c:254
+#: ar.c:233
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
-msgstr "Käyttö: %s [emulointivalitsimet] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <nimi>] [jäsennimi] [lukumäärä] arkistotiedosto tiedosto...\n"
+msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Käyttö: %s [emulointivalitsimet] [--plugin <nimi>] [-]{dmpqrstx}[abcfilNoPsSuvV] [jäsennimi] [lukumäärä] arkistotiedosto tiedosto...\n"
 
-#: ar.c:260
+#: ar.c:235
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
-msgstr "Käyttö: %s [emulointivalitsimet] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [jäsennimi] [lukumäärä] arkistotiedosto tiedosto...\n"
+msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Käyttö: %s [emulointivalitsimet] [-]{dmpqrstx}[abcfilNoPsSuvV] [jäsennimi] [lukumäärä] arkistotiedosto tiedosto...\n"
 
-#: ar.c:266
+#: ar.c:240
 #, c-format
 msgid "       %s -M [<mri-script]\n"
 msgstr "       %s -M [<mri-skripti]\n"
 
-#: ar.c:267
+#: ar.c:241
 #, c-format
 msgid " commands:\n"
 msgstr " komennot:\n"
 
-#: ar.c:268
+#: ar.c:242
 #, c-format
 msgid "  d            - delete file(s) from the archive\n"
 msgstr "  d            - poista tiedosto(t) arkistosta\n"
 
-#: ar.c:269
+#: ar.c:243
 #, c-format
 msgid "  m[ab]        - move file(s) in the archive\n"
 msgstr "  m[ab]        - siirrä tiedosto(t) arkistoon\n"
 
-#: ar.c:270
+#: ar.c:244
 #, c-format
 msgid "  p            - print file(s) found in the archive\n"
 msgstr "  p            - tulosta arkistosta löytyvät tiedosto(t)\n"
 
-#: ar.c:271
+#: ar.c:245
 #, c-format
 msgid "  q[f]         - quick append file(s) to the archive\n"
 msgstr "  q[f]         - liitä tiedosto(t) nopeasti arkiston loppuun\n"
 
-#: ar.c:272
+#: ar.c:246
 #, c-format
 msgid "  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"
 msgstr "  r[ab][f][u]  - korvaa olemassa oleva(t) tai lisää uudet tiedosto(t) arkistoon\n"
 
-#: ar.c:273
+#: ar.c:247
 #, c-format
 msgid "  s            - act as ranlib\n"
 msgstr "  s            - toimi kuten ranlib\n"
 
-#: ar.c:274
+#: ar.c:248
 #, c-format
 msgid "  t            - display contents of archive\n"
 msgstr "  t            - näytä arkiston sisältö\n"
 
-#: ar.c:275
+#: ar.c:249
 #, c-format
 msgid "  x[o]         - extract file(s) from the archive\n"
 msgstr "  x[o]         - pura tiedosto(t) arkistosta\n"
 
 #  modifiers on tässä sama kuin options
-#: ar.c:276
+#: ar.c:250
 #, c-format
 msgid " command specific modifiers:\n"
 msgstr " komentokohtaiset valitsimet:\n"
 
-#: ar.c:277
+#: ar.c:251
 #, c-format
 msgid "  [a]          - put file(s) after [member-name]\n"
 msgstr "  [a]          - sijoita tiedosto(t) kohteen [jäsennimi] jälkeen\n"
 
-#: ar.c:278
+#: ar.c:252
 #, c-format
 msgid "  [b]          - put file(s) before [member-name] (same as [i])\n"
 msgstr "  [b]          - laita tiedosto(t) kohteen [jäsennimi] edelle (sama kuin [i])\n"
 
-#: ar.c:279
+#: ar.c:253
 #, c-format
 msgid "  [D]          - use zero for timestamps and uids/gids\n"
 msgstr "  [D]          - käytä nollaa aikaleimoille ja uid-käyttäjätunnisteisiin/gid-ryhmätunnisteisiin\n"
 
 #  Otaksun, että kyse on jostain taulukkomuotoisesta oliosta, jossa on lukumäärän osoittama määrä alkioita. Ohjelmointikielissä se merkataan yleensä olio[5] tai nimi[5]. Valitsimella valitaan ilmeisesti tämän muotoinen ilmentymä.
-#: ar.c:280
+#: ar.c:254
 #, c-format
 msgid "  [N]          - use instance [count] of name\n"
 msgstr "  [N]          - käytä nimen[lukumäärä]-ilmentymää\n"
 
-#: ar.c:281
+#: ar.c:255
 #, c-format
 msgid "  [f]          - truncate inserted file names\n"
 msgstr "  [f]          - katkaise lisätyt tiedostonimet\n"
 
-#: ar.c:282
+#: ar.c:256
 #, c-format
 msgid "  [P]          - use full path names when matching\n"
 msgstr "  [P]          - käytä täyttä polkunimeä, kun se täsmää\n"
 
-#: ar.c:283
+#: ar.c:257
 #, c-format
 msgid "  [o]          - preserve original dates\n"
 msgstr "  [o]          - säilytä alkuperäiset päiväykset\n"
 
-#: ar.c:284
+#: ar.c:258
 #, c-format
 msgid "  [u]          - only replace files that are newer than current archive contents\n"
 msgstr "  [u]          - korvaa vain tiedostot, jotka ovat arkiston nykysisältöä uudempia\n"
 
 #  modifiers on tässä sama kuin options
-#: ar.c:285
+#: ar.c:259
 #, c-format
 msgid " generic modifiers:\n"
 msgstr " yleiset valitsimet:\n"
 
-#: ar.c:286
+#: ar.c:260
 #, c-format
 msgid "  [c]          - do not warn if the library had to be created\n"
 msgstr "  [c]          - älä varoita, jos kirjasto pitää luoda\n"
 
-#: ar.c:287
+#: ar.c:261
 #, c-format
 msgid "  [s]          - create an archive index (cf. ranlib)\n"
 msgstr "  [s]          - luo arkiston sisältöhakemiston (vrt. ranlib)\n"
 
-#: ar.c:288
+#: ar.c:262
 #, c-format
 msgid "  [S]          - do not build a symbol table\n"
 msgstr "  [S]          - älä koosta symbolitaulua\n"
 
-#: ar.c:289
+#: ar.c:263
 #, c-format
 msgid "  [T]          - make a thin archive\n"
 msgstr "  [T]          - tee ohut arkisto\n"
 
-#: ar.c:290
+#: ar.c:264
 #, c-format
 msgid "  [v]          - be verbose\n"
 msgstr "  [v]          - laveasti\n"
 
-#: ar.c:291
+#: ar.c:265
 #, c-format
 msgid "  [V]          - display the version number\n"
 msgstr "  [V]          - näytä versionumero\n"
 
-#: ar.c:292
+#: ar.c:266
 #, c-format
 msgid "  @<file>      - read options from <file>\n"
 msgstr "  @<tiedosto>      - lue valitsimet tiedostosta <tiedosto>\n"
 
-#: ar.c:293
-#, c-format
-msgid "  --target=BFDNAME - specify the target object format as BFDNAME\n"
-msgstr "  --target=BFDNAME - määrittele kohdeobjektimuoto BFDNAME-nimenä\n"
-
-#: ar.c:295
+#: ar.c:268
 #, c-format
 msgid " optional:\n"
 msgstr " vaihtoehtoinen:\n"
 
-#: ar.c:296
+#: ar.c:269
 #, c-format
 msgid "  --plugin <p> - load the specified plugin\n"
 msgstr "  --plugin <p> - lataa määritelty lisäosa\n"
 
-#: ar.c:317
+#: ar.c:276
 #, c-format
 msgid "Usage: %s [options] archive\n"
 msgstr "Käyttö: %s [valitsimet] arkisto\n"
 
-#: ar.c:318
+#: ar.c:277
 #, c-format
 msgid " Generate an index to speed access to archives\n"
 msgstr " Tuota sisältöhakemisto nopeuttamaan arkistohakua\n"
 
-#: ar.c:319
+#: ar.c:278
 #, c-format
 msgid ""
 " The options are:\n"
@@ -292,90 +286,104 @@ msgstr ""
 " Valitsimet ovat:\n"
 "  @<tiedosto>                  Lue valitsimet <tiedosto>sta\n"
 
-#: ar.c:322
+#: ar.c:281
 #, c-format
 msgid "  --plugin <name>              Load the specified plugin\n"
 msgstr "  --plugin <nimi>              Lataa määritelty lisäosa\n"
 
-#: ar.c:325
+#: ar.c:284
 #, c-format
 msgid ""
 "  -t                           Update the archive's symbol map timestamp\n"
 "  -h --help                    Print this help message\n"
 "  -v --version                 Print version information\n"
 msgstr ""
-"  -t                           Päivitä arkiston symbolikuvauksen aikaleima\n"
+"  -t                           Päivitä arkiston symbolikartan aikaleima\n"
 "  -h --help                    Tulosta tämä opaste\n"
 "  -V --version                 Tulosta versiotiedot\n"
 
-#: ar.c:449
+#: ar.c:481 nm.c:1636
+#, c-format
+msgid "sorry - this program has been built without plugin support\n"
+msgstr "Valitettavasti tämä ohjelma on rakennettu ilman lisäosatukea\n"
+
+#: ar.c:508
 msgid "two different operation options specified"
 msgstr "kaksi erilaista toimintavalitsinta annettu"
 
-#: ar.c:538 nm.c:1639
+#: ar.c:589
 #, c-format
-msgid "sorry - this program has been built without plugin support\n"
-msgstr "Valitettavasti tämä ohjelma on rakennettu ilman lisäosatukea\n"
+msgid "illegal option -- %c"
+msgstr "virheellinen valitsin -- %c"
 
-#: ar.c:693
+#: ar.c:632
 msgid "no operation specified"
 msgstr "mitään toimintaa ei ole annettu"
 
-#: ar.c:696
+#: ar.c:635
 msgid "`u' is only meaningful with the `r' option."
 msgstr "�u� on merkityksellinen vain �r�-valitsimen kanssa."
 
-#: ar.c:699
+#: ar.c:638
 msgid "`u' is not meaningful with the `D' option."
 msgstr "�u� on merkityksellinen vain �D�-valitsimen kanssa."
 
-#: ar.c:707
+#: ar.c:646
 msgid "`N' is only meaningful with the `x' and `d' options."
 msgstr "�N� on merkityksellinen vain �x�- ja �d�-valitsimien kanssa."
 
-#: ar.c:710
+#: ar.c:649
 msgid "Value for `N' must be positive."
 msgstr "Arvon �N� on oltava positiivinen."
 
-#: ar.c:724
+#: ar.c:661
 msgid "`x' cannot be used on thin archives."
 msgstr "�x� ei voida käyttää ohuissa arkistoissa."
 
-#: ar.c:765
+#: ar.c:702
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr "sisäinen virhe -- tätä valitsinta ei ole toteutettu"
 
-#  Luomisen kohde on arkisto
-#: ar.c:834
+#: ar.c:771
 #, c-format
 msgid "creating %s"
-msgstr "luodaan arkisto %s"
+msgstr "luodaan %s"
 
 #  stat on *nix-ympäristön vakiokomentoja (katso: man stat)
-#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
+#: ar.c:820 ar.c:875 ar.c:1203 objcopy.c:2052
 #, c-format
 msgid "internal stat error on %s"
 msgstr "sisäinen stat-kutsuvirhe kohteessa %s"
 
-#: ar.c:902 ar.c:970
+#: ar.c:824
+#, c-format
+msgid ""
+"\n"
+"<%s>\n"
+"\n"
+msgstr ""
+"\n"
+"<%s>\n"
+"\n"
+
+#: ar.c:840 ar.c:908
 #, c-format
 msgid "%s is not a valid archive"
 msgstr "%s ei ole kelvollinen arkisto"
 
-#: ar.c:1171
+#: ar.c:1108
 #, c-format
 msgid "No member named `%s'\n"
 msgstr "Millään jäsenellä ei ole nimeä �%s�\n"
 
-#  Tekemisen kohde on siirrettävät tiedostot
-#: ar.c:1221
+#: ar.c:1158
 #, c-format
 msgid "no entry %s in archive %s!"
-msgstr "ei tiedostoa %s arkistossa %s!"
+msgstr "ei alkiota %s arkistossa %s!"
 
 #  Ruotsinkielisessä käännöksessä todetaan, että archive map on lähdekoodissa sama kuin indeksi, tarkoittanee tässä sisältöhakemistoa?
-#: ar.c:1360
+#: ar.c:1297
 #, c-format
 msgid "%s: no archive map to update"
 msgstr "%s: ei sisältöhakemistoa päivitettävänä"
@@ -436,13 +444,23 @@ msgstr "Nykyinen avoin arkisto on %s\n"
 msgid "%s: no open archive\n"
 msgstr "%s: ei avointa arkistoa\n"
 
-#: binemul.c:39
+#: bin2c.c:59
+#, c-format
+msgid "Usage: %s < input_file > output_file\n"
+msgstr "Käyttö: %s <syötetiedosto> tulostetiedosto\n"
+
+#: bin2c.c:60
+#, c-format
+msgid "Prints bytes from stdin in hex format.\n"
+msgstr "Tulostaa tavut vakiosyötteestä heksadesimaalimuodossa.\n"
+
+#: binemul.c:38
 #, c-format
 msgid "  No emulation specific options\n"
 msgstr "  Ei emulointikohtaisia valitsimia\n"
 
 #. Macros for common output.
-#: binemul.h:49
+#: binemul.h:46
 #, c-format
 msgid " emulation options: \n"
 msgstr " emulointivalitsimet: \n"
@@ -482,49 +500,44 @@ msgstr "%s: tuetut arkkitehtuurit:"
 msgid "BFD header file version %s\n"
 msgstr "BFD-otsaketiedoston versio %s\n"
 
-#: bucomm.c:559
+#: bucomm.c:556
 #, c-format
 msgid "%s: bad number: %s"
 msgstr "%s: virheellinen numero: %s"
 
-#: bucomm.c:576 strings.c:409
+#: bucomm.c:573 strings.c:409
 #, c-format
 msgid "'%s': No such file"
 msgstr "’%s’: Tiedostoa ei löydy"
 
 #  stat-kutsu epäonnistui, ensimmäinen parametri on tiedostonimi
-#: bucomm.c:578 strings.c:411
+#: bucomm.c:575 strings.c:411
 #, c-format
 msgid "Warning: could not locate '%s'.  reason: %s"
 msgstr "Varoitus: tiedostoa ’%s’ ei löytynyt.  syy: %s"
 
-#: bucomm.c:582
+#: bucomm.c:579
 #, c-format
 msgid "Warning: '%s' is not an ordinary file"
 msgstr "Varoitus: ’%s’ ei ole tavallinen tiedosto"
 
-#: bucomm.c:584
-#, c-format
-msgid "Warning: '%s' has negative size, probably it is too large"
-msgstr "Varoitus: ’%s’ on negatiivinen koko, ehkä se on liian suuri"
-
-#: coffdump.c:107
+#: coffdump.c:106
 #, c-format
 msgid "#lines %d "
 msgstr "#rivit %d "
 
-#: coffdump.c:461 sysdump.c:646
+#: coffdump.c:460 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr "Käyttö: %s [valitsimet] syötetiedosto\n"
 
 #  Microsoft Portable Executable and CommonObject FileFormat Specification, Revision 6.0-dokumentin mukaan "object file" on tiedosto, joka annetaan syötteenä linkkerille. Linkkeri tuottaa "image file":n, jota vuorostaan käytetään syötteenä ohjelmalataajalle. Termi "object file" ei välttämättä sisällä mitään yhteyttä olioperustaiseen ohjelmointiin.
-#: coffdump.c:462
+#: coffdump.c:461
 #, c-format
-msgid " Print a human readable interpretation of a COFF object file\n"
-msgstr " Tulosta luettavamerkkinen COFF-objektitiedoston tulkinta\n"
+msgid " Print a human readable interpretation of a SYSROFF object file\n"
+msgstr " Tulosta luettavamerkkinen SYSROFF-objektitiedoston tulkinta\n"
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid ""
 " The options are:\n"
@@ -539,138 +552,138 @@ msgstr ""
 "  -v --version           Näytä ohjelman versio\n"
 "\n"
 
-#: coffdump.c:532 srconv.c:1833 sysdump.c:710
+#: coffdump.c:531 srconv.c:1832 sysdump.c:710
 msgid "no input file specified"
 msgstr "syötetiedostoa ei ole annettu"
 
-#: cxxfilt.c:119 nm.c:269 objdump.c:281
+#: cxxfilt.c:119 nm.c:269 objdump.c:256
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "Ilmoita ohjelmointivirheistä englanniksi osoitteeseen %s.\n"
 "Ilmoita käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
 
-#: debug.c:648
+#: debug.c:647
 msgid "debug_add_to_current_namespace: no current file"
 msgstr "debug_add_to_current_namespace: ei nykyistä tiedostoa"
 
-#: debug.c:727
+#: debug.c:726
 msgid "debug_start_source: no debug_set_filename call"
 msgstr "debug_start_source: ei debug_set_filename-kutsua"
 
-#: debug.c:781
+#: debug.c:782
 msgid "debug_record_function: no debug_set_filename call"
 msgstr "debug_record_function: ei debug_set_filename-kutsua"
 
-#: debug.c:833
+#: debug.c:834
 msgid "debug_record_parameter: no current function"
 msgstr "debug_record_parameter: ei nykyistä funktiota"
 
-#: debug.c:865
+#: debug.c:866
 msgid "debug_end_function: no current function"
 msgstr "debug_end_function: ei nykyistä funktiota"
 
-#: debug.c:871
+#: debug.c:872
 msgid "debug_end_function: some blocks were not closed"
 msgstr "debug_end_function: joitakin lohkoja ei ollut suljettu"
 
-#: debug.c:899
+#: debug.c:900
 msgid "debug_start_block: no current block"
 msgstr "debug_start_block: ei nykyistä lohkoa"
 
-#: debug.c:935
+#: debug.c:936
 msgid "debug_end_block: no current block"
 msgstr "debug_end_block: ei nykyistä lohkoa"
 
-#: debug.c:942
+#: debug.c:943
 msgid "debug_end_block: attempt to close top level block"
 msgstr "debug_end_block: yritettiin sulkea ylimmän tason lohko"
 
-#: debug.c:965
+#: debug.c:966
 msgid "debug_record_line: no current unit"
 msgstr "debug_record_line: ei nykyistä yksikköä"
 
 #. FIXME
-#: debug.c:1018
+#: debug.c:1019
 msgid "debug_start_common_block: not implemented"
 msgstr "debug_start_common_block: ei toteutettu"
 
 #. FIXME
-#: debug.c:1029
+#: debug.c:1030
 msgid "debug_end_common_block: not implemented"
 msgstr "debug_end_common_block: ei toteutettu"
 
 #. FIXME.
-#: debug.c:1113
+#: debug.c:1114
 msgid "debug_record_label: not implemented"
 msgstr "debug_record_label: ei toteutettu"
 
-#: debug.c:1135
+#: debug.c:1136
 msgid "debug_record_variable: no current file"
 msgstr "debug_record_variable: ei nykyistä tiedostoa"
 
 #  Ratkaisin tämän kohdan samalla tavalla kuin ruotsinkielisessä käännöksessä: kind tulee DEBUG_KIND_UNION-tyyppisestä tyyppinimestä. Ennen tätä ilmoitusta lähdekoodissa tutkitaan, onko vianjäljitystyyppi struct, union, class, union class vai enum ja jos mikään ei täsmää, palautetaan debug_type_null.
-#: debug.c:1663
+#: debug.c:1664
 msgid "debug_make_undefined_type: unsupported kind"
 msgstr "debug_make_undefined_type: lajittelua ei tueta"
 
-#: debug.c:1840
+#: debug.c:1841
 msgid "debug_name_type: no current file"
 msgstr "debug_name_type: ei nykyistä tiedostoa"
 
-#: debug.c:1885
+#: debug.c:1886
 msgid "debug_tag_type: no current file"
 msgstr "debug_tag_type: ei nykyistä tiedostoa"
 
-#: debug.c:1893
+#: debug.c:1894
 msgid "debug_tag_type: extra tag attempted"
 msgstr "debug_tag_type: yritetty asettaa ylimääräinen tunniste"
 
-#: debug.c:1930
+#: debug.c:1931
 #, c-format
 msgid "Warning: changing type size from %d to %d\n"
 msgstr "Varoitus: tyyppikoko %d muutetaan kokoon %d\n"
 
-#: debug.c:1952
+#: debug.c:1953
 msgid "debug_find_named_type: no current compilation unit"
 msgstr "debug_find_named_type: ei nykyistä käännösyksikköä"
 
 #  Ihan outo käsite
-#: debug.c:2055
+#: debug.c:2056
 #, c-format
 msgid "debug_get_real_type: circular debug information for %s\n"
 msgstr "debug_get_real_type: kehä-vianjäljitystietoa kohteella %s\n"
 
-#: debug.c:2482
+#: debug.c:2483
 msgid "debug_write_type: illegal type encountered"
 msgstr "debug_write_type: kohdattu virheellinen tyyppi"
 
-#: dlltool.c:902 dlltool.c:928 dlltool.c:959
+#: dlltool.c:901 dlltool.c:927 dlltool.c:958
 #, c-format
 msgid "Internal error: Unknown machine type: %d"
 msgstr "Sisäinen virhe: Tuntematon konetyyppi: %d"
 
-#: dlltool.c:1000
+#: dlltool.c:999
 #, c-format
 msgid "Can't open def file: %s"
 msgstr "Ei voi avata def-tiedostoa: %s"
 
-#: dlltool.c:1005
+#: dlltool.c:1004
 #, c-format
 msgid "Processing def file: %s"
 msgstr "Käsitellään def-tiedostoa: %s"
 
-#: dlltool.c:1009
+#: dlltool.c:1008
 msgid "Processed def file"
 msgstr "Käsiteltiin def-tiedostoa"
 
-#: dlltool.c:1033
+#: dlltool.c:1032
 #, c-format
 msgid "Syntax error in def file %s:%d"
 msgstr "Syntaksivirhe def-tiedostossa %s:%d"
 
 #  Microsoft Portable Executable and Common Object File Format Specification, Revision 6.0-dokumentin mukaan "image file" on suoritettava tiedosto joko .EXE- tai .DLL-muodossa. Sitä voidaan pitää "memory image":na. Termiä "image file" on tavallisesti käytetty termin "executable file" sijasta, koska jälkimmäisen joskus oletetaan tarkoittavan vain .EXE-tiedostoa.
-#: dlltool.c:1070
+#: dlltool.c:1069
 #, c-format
 msgid "%s: Path components stripped from image name, '%s'."
 msgstr "%s: Polkukomponentit riisuttu tiedostovedosnimestä, ’%s’."
@@ -678,429 +691,429 @@ msgstr "%s: Polkukomponentit riisuttu tiedostovedosnimestä, ’%s’."
 #  A DEF file contains any number of the following commands:
 #  NAME <name> [ , <base> ]
 #  The result is going to be <name>.EXE
-#: dlltool.c:1088
+#: dlltool.c:1087
 #, c-format
 msgid "NAME: %s base: %x"
 msgstr "NAME-komento: %s kantaluku: %x"
 
-#: dlltool.c:1091 dlltool.c:1112
+#: dlltool.c:1090 dlltool.c:1106
 msgid "Can't have LIBRARY and NAME"
 msgstr "Määriteltynä ei voi olla sekä LIBRARY- että NAME-komento"
 
 #  A DEF file contains any number of the following commands:
 #  LIBRARY <name> [ , <base> ]
 #  The result is going to be <name>.DLL
-#: dlltool.c:1109
+#: dlltool.c:1103
 #, c-format
 msgid "LIBRARY: %s base: %x"
 msgstr "LIBRARY-komento: %s kantaluku: %x"
 
 #  Lähdekoodissa tämä oli status error -tuloste
-#: dlltool.c:1354 resrc.c:293
+#: dlltool.c:1342 resrc.c:293
 #, c-format
 msgid "wait: %s"
 msgstr "wait-tilavirhe: %s"
 
-#: dlltool.c:1359 dllwrap.c:422 resrc.c:298
+#: dlltool.c:1347 dllwrap.c:422 resrc.c:298
 #, c-format
 msgid "subprocess got fatal signal %d"
 msgstr "aliprosessi sai tuhoisan signaalin %d"
 
 #  Ensimmäinen parametri on ohjelma, josta poistutaan (esim. "ld").
-#: dlltool.c:1365 dllwrap.c:429 resrc.c:305
+#: dlltool.c:1353 dllwrap.c:429 resrc.c:305
 #, c-format
 msgid "%s exited with status %d"
 msgstr "%s-ohjelmasta poistuttiin tilassa %d"
 
 #  Microsoft Portable Executable and Common Object File Format Specification, Revision 6.0-dokumentin mukaan "section" on PE/COFF-tiedoston sisällä koodin ja datan perusyksikkö. Objektitiedostossa, esimerkiksi, kaikki koodi voidaan yhdistää yhdeksi lohkoksi, tai (riippuen kääntäjän toiminnasta) jokainen funktio voi varata oman lohkon. "Section" on hämärästi samanlainen kuin "section" Intel® 8086-arkkitehtuurissa.
-#: dlltool.c:1396
+#: dlltool.c:1384
 #, c-format
 msgid "Sucking in info from %s section in %s"
 msgstr "Imetään tietoja lohkosta %s kohteessa %s"
 
-#: dlltool.c:1536
+#: dlltool.c:1524
 #, c-format
 msgid "Excluding symbol: %s"
 msgstr "Poissulkeva symboli: %s"
 
-#: dlltool.c:1625 dlltool.c:1636 nm.c:1012 nm.c:1023
+#: dlltool.c:1613 dlltool.c:1624 nm.c:1010 nm.c:1021
 #, c-format
 msgid "%s: no symbols"
 msgstr "%s: ei symboleja"
 
 #. FIXME: we ought to read in and block out the base relocations.
-#: dlltool.c:1662
+#: dlltool.c:1650
 #, c-format
 msgid "Done reading %s"
 msgstr "Luettu %s"
 
-#: dlltool.c:1672
+#: dlltool.c:1660
 #, c-format
 msgid "Unable to open object file: %s: %s"
 msgstr "Ei kyetä avaamaan objektitiedostoa: %s: %s"
 
-#: dlltool.c:1675
+#: dlltool.c:1663
 #, c-format
 msgid "Scanning object file %s"
 msgstr "Selataan objektitiedostoa %s"
 
-#: dlltool.c:1690
+#: dlltool.c:1678
 #, c-format
 msgid "Cannot produce mcore-elf dll from archive file: %s"
 msgstr "Ei voi tuottaa mcore-elf-dll:ää arkistotiedostosta: %s"
 
-#: dlltool.c:1792
+#: dlltool.c:1780
 msgid "Adding exports to output file"
 msgstr "Viennit lisätään tulostetiedostoon"
 
-#: dlltool.c:1844
+#: dlltool.c:1832
 msgid "Added exports to output file"
 msgstr "Viennit lisätty tulostetiedostoon"
 
-#: dlltool.c:1986
+#: dlltool.c:1974
 #, c-format
 msgid "Generating export file: %s"
 msgstr "Tuotetaan vientitiedosto: %s"
 
-#: dlltool.c:1991
+#: dlltool.c:1979
 #, c-format
 msgid "Unable to open temporary assembler file: %s"
 msgstr "Ei voi avata tilapäistä assembler-tiedostoa: %s"
 
-#: dlltool.c:1994
+#: dlltool.c:1982
 #, c-format
 msgid "Opened temporary file: %s"
 msgstr "Avattu tilapäinen tiedosto: %s"
 
-#: dlltool.c:2171
+#: dlltool.c:2159
 msgid "failed to read the number of entries from base file"
 msgstr "alkioiden lukumäärän lukeminen perustiedostosta epäonnistui"
 
 #  exports file == export file ??
-#: dlltool.c:2219
+#: dlltool.c:2207
 msgid "Generated exports file"
 msgstr "Tuotettu vientitiedosto"
 
 #  stub on PE-tiedostoon sisällytetty ohjelma, joka esimerkiksi MS-DOS-ikkunassa ilmoittaa "This program cannot be run in DOS mode"
-#: dlltool.c:2428
+#: dlltool.c:2416
 #, c-format
 msgid "bfd_open failed open stub file: %s: %s"
 msgstr "bfd_open ei onnistunut avaamaan stub-tiedostoa: %s: %s"
 
-#: dlltool.c:2432
+#: dlltool.c:2420
 #, c-format
 msgid "Creating stub file: %s"
 msgstr "Luodaan stub-tiedosto: %s"
 
 #  stub on PE-tiedostoon sisällytetty ohjelma, joka esimerkiksi MS-DOS-ikkunassa ilmoittaa "This program cannot be run in DOS mode"
-#: dlltool.c:2894
+#: dlltool.c:2882
 #, c-format
 msgid "bfd_open failed reopen stub file: %s: %s"
 msgstr "bfd_open ei onnistunut avaamaan stub-tiedostoa: %s: %s"
 
-#: dlltool.c:2908 dlltool.c:2984
+#: dlltool.c:2896 dlltool.c:2972
 #, c-format
 msgid "failed to open temporary head file: %s"
 msgstr "ei onnistuttu avaamaan tilapäistä head-tiedostoa: %s"
 
-#: dlltool.c:2970 dlltool.c:3050
+#: dlltool.c:2958 dlltool.c:3038
 #, c-format
 msgid "failed to open temporary head file: %s: %s"
 msgstr "ei onnistuttu avaamaan tilapäistä head-tiedostoa: %s: %s"
 
-#: dlltool.c:3064
+#: dlltool.c:3052
 #, c-format
 msgid "failed to open temporary tail file: %s"
 msgstr "ei onnistuttu avamaan tilapäistä tail-tiedostoa: %s"
 
-#: dlltool.c:3121
+#: dlltool.c:3109
 #, c-format
 msgid "failed to open temporary tail file: %s: %s"
 msgstr "ei onnistuttu avamaan tilapäistä tail-tiedostoa: %s: %s"
 
-#: dlltool.c:3143
+#: dlltool.c:3131
 #, c-format
 msgid "Can't create .lib file: %s: %s"
 msgstr "Ei voi luoda .lib-tiedostoa: %s: %s"
 
-#: dlltool.c:3147
+#: dlltool.c:3135
 #, c-format
 msgid "Creating library file: %s"
 msgstr "Luodaan kirjastotiedosto: %s"
 
-#: dlltool.c:3239 dlltool.c:3245
+#: dlltool.c:3227 dlltool.c:3233
 #, c-format
 msgid "cannot delete %s: %s"
 msgstr "ei voi poistaa kohdetta %s: %s"
 
-#: dlltool.c:3250
+#: dlltool.c:3238
 msgid "Created lib file"
 msgstr "Luotu lib-tiedosto"
 
-#: dlltool.c:3462
+#: dlltool.c:3450
 #, c-format
 msgid "Can't open .lib file: %s: %s"
 msgstr "Ei voi avata .lib-tiedostoa: %s: %s"
 
-#: dlltool.c:3470 dlltool.c:3492
+#: dlltool.c:3458 dlltool.c:3480
 #, c-format
 msgid "%s is not a library"
 msgstr "%s ei ole kirjasto"
 
-#: dlltool.c:3510
+#: dlltool.c:3498
 #, c-format
 msgid "Import library `%s' specifies two or more dlls"
 msgstr "Tuontikirjasto �%s� määrittelee kaksi tai useampia dll-komponentteja"
 
-#: dlltool.c:3521
+#: dlltool.c:3509
 #, c-format
 msgid "Unable to determine dll name for `%s' (not an import library?)"
 msgstr "Ei voi määritellä dll-nimeä kohteelle �%s� (ei tuontikirjasto?)"
 
-#: dlltool.c:3745
+#: dlltool.c:3733
 #, c-format
 msgid "Warning, ignoring duplicate EXPORT %s %d,%d"
 msgstr "Varoitus, ei oteta huomioon EXPORT-kaksoiskappaletta %s %d,%d"
 
-#: dlltool.c:3751
+#: dlltool.c:3739
 #, c-format
 msgid "Error, duplicate EXPORT with ordinals: %s"
 msgstr "Virhe, EXPORT-kaksoiskappale järjestysluvuilla: %s"
 
-#: dlltool.c:3856
+#: dlltool.c:3844
 msgid "Processing definitions"
 msgstr "Käsitellään määrittelyjä"
 
-#: dlltool.c:3888
+#: dlltool.c:3876
 msgid "Processed definitions"
 msgstr "Käsiteltiin määrittelyjä"
 
 #. xgetext:c-format
-#: dlltool.c:3895 dllwrap.c:483
+#: dlltool.c:3883 dllwrap.c:483
 #, c-format
 msgid "Usage %s <option(s)> <object-file(s)>\n"
 msgstr "Käyttö %s <valitsimet> <objektitiedosto(t)>\n"
 
 #. xgetext:c-format
-#: dlltool.c:3897
+#: dlltool.c:3885
 #, c-format
 msgid "   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"
 msgstr "   -m --machine <kone>       Luo DLL:nä kohteelle <kone>.  [oletus: %s]\n"
 
-#: dlltool.c:3898
+#: dlltool.c:3886
 #, c-format
 msgid "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 msgstr "        mahdolliset <koneet>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 
-#: dlltool.c:3899
+#: dlltool.c:3887
 #, c-format
 msgid "   -e --output-exp <outname> Generate an export file.\n"
 msgstr "   -e --output-exp <tulostenimi>    Tuota vientitiedosto.\n"
 
-#: dlltool.c:3900
+#: dlltool.c:3888
 #, c-format
 msgid "   -l --output-lib <outname> Generate an interface library.\n"
 msgstr "   -l --output-lib <tulostenimi>    Tuota rajapintakirjasto.\n"
 
-#: dlltool.c:3901
+#: dlltool.c:3889
 #, c-format
 msgid "   -y --output-delaylib <outname> Create a delay-import library.\n"
 msgstr "   -y --output-delaylib <tulostenimi>  Luo viive-tuontikirjasto.\n"
 
 #  Lisäsin lainausmerkit käsitteen selventämiseksi
-#: dlltool.c:3902
+#: dlltool.c:3890
 #, c-format
 msgid "   -a --add-indirect         Add dll indirects to export file.\n"
 msgstr "   -a --add-indirect                Lisää �dll indirects� vientitiedostoon.\n"
 
-#: dlltool.c:3903
+#: dlltool.c:3891
 #, c-format
 msgid "   -D --dllname <name>       Name of input dll to put into interface lib.\n"
 msgstr "   -D --dllname <nimi>              Rajapintakirjastoon sijoitettavan syöte-dll:n nimi.\n"
 
-#: dlltool.c:3904
+#: dlltool.c:3892
 #, c-format
 msgid "   -d --input-def <deffile>  Name of .def file to be read in.\n"
 msgstr "   -d --input-def <def-tiedosto>    Luettavan .def-syötetiedoston nimi.\n"
 
-#: dlltool.c:3905
+#: dlltool.c:3893
 #, c-format
 msgid "   -z --output-def <deffile> Name of .def file to be created.\n"
 msgstr "   -z --output-def <def-tiedosto>   Luotavan .def-tiedoston nimi.\n"
 
-#: dlltool.c:3906
+#: dlltool.c:3894
 #, c-format
 msgid "      --export-all-symbols   Export all symbols to .def\n"
 msgstr "      --export-all-symbols          Vie kaikki symbolit .def-tiedostoon\n"
 
-#: dlltool.c:3907
+#: dlltool.c:3895
 #, c-format
 msgid "      --no-export-all-symbols  Only export listed symbols\n"
 msgstr "      --no-export-all-symbols       Vie vain luetellut symbolit\n"
 
 #  Tässä "list" suomennettiin sanalla "lista", koska ohjetekstin jälkiosan tekstin alku ei osu samalle kohdalle eri riveillä, jos alkuosa on liian pitkä.
-#: dlltool.c:3908
+#: dlltool.c:3896
 #, c-format
 msgid "      --exclude-symbols <list> Don't export <list>\n"
 msgstr "      --exclude-symbols <lista>     Älä vie <listan> symboleja\n"
 
-#: dlltool.c:3909
+#: dlltool.c:3897
 #, c-format
 msgid "      --no-default-excludes  Clear default exclude symbols\n"
 msgstr "      --no-default-excludes         Nollaa oletuspoissulkevat symbolit\n"
 
-#: dlltool.c:3910
+#: dlltool.c:3898
 #, c-format
 msgid "   -b --base-file <basefile> Read linker generated base file.\n"
 msgstr "   -b --base-file <kantatiedosto>   Lue linkkerin tuottama perustiedosto.\n"
 
-#: dlltool.c:3911
+#: dlltool.c:3899
 #, c-format
 msgid "   -x --no-idata4            Don't generate idata$4 section.\n"
 msgstr "   -x --no-idata4                   Älä tuota idata$4-lohkoa.\n"
 
-#: dlltool.c:3912
+#: dlltool.c:3900
 #, c-format
 msgid "   -c --no-idata5            Don't generate idata$5 section.\n"
 msgstr "   -c --no-idata5                   Älä tuota idata$5-lohkoa.\n"
 
-#: dlltool.c:3913
+#: dlltool.c:3901
 #, c-format
 msgid "      --use-nul-prefixed-import-tables Use zero prefixed idata$4 and idata$5.\n"
 msgstr "      --use-nul-prefixed-import-tables Käytä nollaetuliitteisiä idata$4- ja idata$5-lohkoja.\n"
 
-#: dlltool.c:3914
+#: dlltool.c:3902
 #, c-format
 msgid "   -U --add-underscore       Add underscores to all symbols in interface library.\n"
 msgstr "   -U --add-underscore              Lisää alaviivat rajapintakirjaston kaikkiin symboleihin.\n"
 
-#: dlltool.c:3915
+#: dlltool.c:3903
 #, c-format
 msgid "      --add-stdcall-underscore Add underscores to stdcall symbols in interface library.\n"
 msgstr "   -U --add-underscore              Lisää alaviivat rajapintakirjaston std-kutsusymboleihin.\n"
 
-#: dlltool.c:3916
+#: dlltool.c:3904
 #, c-format
 msgid "      --no-leading-underscore All symbols shouldn't be prefixed by an underscore.\n"
 msgstr "      --no-leading-underscore Kaikkiin symboleihin ei pitäisi liittää alaviivaa etuliitteenä.\n"
 
-#: dlltool.c:3917
+#: dlltool.c:3905
 #, c-format
 msgid "      --leading-underscore   All symbols should be prefixed by an underscore.\n"
 msgstr "      --leading-underscore   Kaikkiin symboleihin pitäisi liittää alaviiva etuliitteenä.\n"
 
-#: dlltool.c:3918
+#: dlltool.c:3906
 #, c-format
 msgid "   -k --kill-at              Kill @<n> from exported names.\n"
 msgstr "   -k --kill-at                     Tuhoa @<numeron> viedyistä nimistä.\n"
 
-#: dlltool.c:3919
+#: dlltool.c:3907
 #, c-format
 msgid "   -A --add-stdcall-alias    Add aliases without @<n>.\n"
 msgstr "   -A --add-stdcall-alias           Lisää aliaksia ilman @<numeroa>.\n"
 
-#: dlltool.c:3920
+#: dlltool.c:3908
 #, c-format
 msgid "   -p --ext-prefix-alias <prefix> Add aliases with <prefix>.\n"
 msgstr "   -p --ext-prefix-alias <prefiksi> Lisää aliaksiin <prefiksi>.\n"
 
-#: dlltool.c:3921
+#: dlltool.c:3909
 #, c-format
 msgid "   -S --as <name>            Use <name> for assembler.\n"
 msgstr "   -S --as <nimi>                   Käytä <nimeä> assemblerina.\n"
 
-#: dlltool.c:3922
+#: dlltool.c:3910
 #, c-format
 msgid "   -f --as-flags <flags>     Pass <flags> to the assembler.\n"
 msgstr "   -f --as-flags <liput>            Välitä <liput> assemblerille.\n"
 
-#: dlltool.c:3923
+#: dlltool.c:3911
 #, c-format
 msgid "   -C --compat-implib        Create backward compatible import library.\n"
 msgstr "   -C --compat-implib               Luo taaksepäin yhteensopiva tuontikirjasto.\n"
 
 #  Laskuria dontdeltemps kasvatetaan joka kerta kun -n esiintyy komentorivillä.
-#: dlltool.c:3924
+#: dlltool.c:3912
 #, c-format
 msgid "   -n --no-delete            Keep temp files (repeat for extra preservation).\n"
 msgstr "   -n --no-delete                   Pidä tilapäistiedostot (toisto lisäsäilytykseksi).\n"
 
-#: dlltool.c:3925
+#: dlltool.c:3913
 #, c-format
 msgid "   -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
 msgstr "   -t --temp-prefix <prefiksi>      Liitä <prefiksi> tilapäistiedostojen nimen eteen.\n"
 
-#: dlltool.c:3926
+#: dlltool.c:3914
 #, c-format
 msgid "   -I --identify <implib>    Report the name of the DLL associated with <implib>.\n"
 msgstr "   -I --identify <implib>    Ilmoita DLL-nimi, joka liittyi <implib>-kirjastoon.\n"
 
-#: dlltool.c:3927
+#: dlltool.c:3915
 #, c-format
 msgid "      --identify-strict      Causes --identify to report error when multiple DLLs.\n"
 msgstr "      --identify-strict      Saa valitsimen --identify ilmoittamaan virheestä kun DLL-moduleita on useita.\n"
 
-#: dlltool.c:3928
+#: dlltool.c:3916
 #, c-format
 msgid "   -v --verbose              Be verbose.\n"
 msgstr "   -v --verbose                     Laveasti.\n"
 
-#: dlltool.c:3929
+#: dlltool.c:3917
 #, c-format
 msgid "   -V --version              Display the program version.\n"
 msgstr "   -V --version                     Näytä ohjelman versio.\n"
 
-#: dlltool.c:3930
+#: dlltool.c:3918
 #, c-format
 msgid "   -h --help                 Display this information.\n"
 msgstr "   -h --help                        Näytä nämä tiedot.\n"
 
-#: dlltool.c:3931
+#: dlltool.c:3919
 #, c-format
 msgid "   @<file>                   Read options from <file>.\n"
 msgstr "   @<tiedosto>                      Lue valitsimet tiedostosta <tiedosto>.\n"
 
-#: dlltool.c:3933
+#: dlltool.c:3921
 #, c-format
 msgid "   -M --mcore-elf <outname>  Process mcore-elf object files into <outname>.\n"
 msgstr "   -M --mcore-elf <tulostenimi>     Käsittele mcore-elf-objektitiedostot kohteeseen <tulostenimi>.\n"
 
-#: dlltool.c:3934
+#: dlltool.c:3922
 #, c-format
 msgid "   -L --linker <name>        Use <name> as the linker.\n"
 msgstr "   -L --linker <nimi>               Käytä parametriä <nimi> linkkerinä.\n"
 
-#: dlltool.c:3935
+#: dlltool.c:3923
 #, c-format
 msgid "   -F --linker-flags <flags> Pass <flags> to the linker.\n"
 msgstr "   -F --linker-flags <liput>        Välitä <liput> linkkerille.\n"
 
-#: dlltool.c:4082
+#: dlltool.c:4070
 #, c-format
 msgid "Path components stripped from dllname, '%s'."
 msgstr "Polkukomponentit riisuttu dll-nimestä, ’%s’."
 
-#: dlltool.c:4130
+#: dlltool.c:4118
 #, c-format
 msgid "Unable to open base-file: %s"
 msgstr "Ei voi avata perustiedostoa: %s"
 
-#: dlltool.c:4165
+#: dlltool.c:4153
 #, c-format
 msgid "Machine '%s' not supported"
 msgstr "Konetta ’%s’ ei tueta"
 
-#: dlltool.c:4245
+#: dlltool.c:4232
 #, c-format
 msgid "Warning, machine type (%d) not supported for delayimport."
 msgstr "Varoitus, konetyyppi (%d) ei tue viivetuontia."
 
-#: dlltool.c:4313 dllwrap.c:213
+#: dlltool.c:4300 dllwrap.c:213
 #, c-format
 msgid "Tried file: %s"
 msgstr "Yritettiin tiedostoa: %s"
 
-#: dlltool.c:4320 dllwrap.c:220
+#: dlltool.c:4307 dllwrap.c:220
 #, c-format
 msgid "Using file: %s"
 msgstr "Käytetään tiedostoa: %s"
@@ -1275,7 +1288,7 @@ msgstr "   --no-default-excludes       Poista oletuspoissulkevat symbolit\n"
 #: dllwrap.c:511
 #, c-format
 msgid "   --base-file <basefile> Read linker generated base file\n"
-msgstr "   --base-file <perustiedosto> Lue linkkerin tuottama perustiedosto\n"
+msgstr "   --base-file <perustiedosto> Lue linkkerin luoma perustiedosto\n"
 
 #: dllwrap.c:512
 #, c-format
@@ -1363,16 +1376,22 @@ msgstr "YKSIKKÖ-nimi       : %s\n"
 msgid "DRIVER options  : %s\n"
 msgstr "YKSIKKÖ-valitsimet : %s\n"
 
-#: dwarf.c:256 dwarf.c:3019
+#: dwarf.c:112 dwarf.c:161 elfedit.c:123 elfedit.c:167 elfedit.c:195
+#: elfedit.c:227 readelf.c:368 readelf.c:536
+#, c-format
+msgid "Unhandled data length: %d\n"
+msgstr "Käsittelemätön data-pituus: %d\n"
+
+#: dwarf.c:312 dwarf.c:2890
 msgid "badly formed extended line op encountered!\n"
 msgstr "virheellisesti muotoiltu laajennusrivin käskykoodi tavattu!\n"
 
-#: dwarf.c:263
+#: dwarf.c:319
 #, c-format
 msgid "  Extended opcode %d: "
 msgstr "  Laajennettu käskykoodi %d: "
 
-#: dwarf.c:268
+#: dwarf.c:324
 #, c-format
 msgid ""
 "End of Sequence\n"
@@ -1381,194 +1400,193 @@ msgstr ""
 "Sekvenssin loppu\n"
 "\n"
 
-#: dwarf.c:274
+#: dwarf.c:330
 #, c-format
-msgid "set Address to 0x%s\n"
-msgstr "aseta osoitteeksi 0x%s\n"
+msgid "set Address to 0x%lx\n"
+msgstr "aseta osoitteeksi 0x%lx\n"
 
-#: dwarf.c:280
+#: dwarf.c:336
 #, c-format
 msgid "  define new File Table entry\n"
 msgstr "  määrittele uusi tiedostotaulualkio\n"
 
-#: dwarf.c:281 dwarf.c:2548
+#: dwarf.c:337 dwarf.c:2431
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
-msgstr "  Rivi\tHakemisto\tAika\tKoko\tNimi\n"
+msgstr "  Alkio\tHakemisto\tAika\tKoko\tNimi\n"
 
-#: dwarf.c:295
+#: dwarf.c:339
 #, c-format
-msgid "set Discriminator to %s\n"
-msgstr "aseta Erottajan arvoksi %s\n"
+msgid "   %d\t"
+msgstr "   %d\t"
 
-#: dwarf.c:356
+#: dwarf.c:342 dwarf.c:344 dwarf.c:346 dwarf.c:2443 dwarf.c:2445 dwarf.c:2447
 #, c-format
-msgid "(%s"
-msgstr "(%s"
+msgid "%lu\t"
+msgstr "%lu\t"
 
-#: dwarf.c:360
+#: dwarf.c:347
 #, c-format
-msgid ",%s"
-msgstr ",%s"
+msgid ""
+"%s\n"
+"\n"
+msgstr ""
+"%s\n"
+"\n"
 
-#: dwarf.c:364
+#: dwarf.c:351
 #, c-format
-msgid ",%s)\n"
-msgstr ",%s)\n"
+msgid "set Discriminator to %lu\n"
+msgstr "aseta Erottajan arvoksi %lu\n"
 
 #. The test against DW_LNW_hi_user is redundant due to
 #. the limited range of the unsigned char data type used
 #. for op_code.
 #. && op_code <= DW_LNE_hi_user
-#: dwarf.c:387
-#, c-format
-msgid "user defined: "
-msgstr "käyttäjän määrittelemä: "
-
-#: dwarf.c:389
+#: dwarf.c:393
 #, c-format
-msgid "UNKNOWN: "
-msgstr "TUNTEMATON: "
+msgid "user defined: length %d\n"
+msgstr "käyttäjän määrittelemä: pituus %d\n"
 
-#: dwarf.c:390
+#: dwarf.c:395 dwarf.c:2922
 #, c-format
-msgid "length %d ["
-msgstr "pituus %d ["
+msgid "UNKNOWN: length %d\n"
+msgstr "TUNTEMATON: pituus %d\n"
 
-#: dwarf.c:407
+#: dwarf.c:408
 msgid "<no .debug_str section>"
 msgstr "<ei .debug_str-lohkoa>"
 
-#: dwarf.c:413
+#: dwarf.c:414
 #, c-format
-msgid "DW_FORM_strp offset too big: %s\n"
-msgstr "DW_FORM_strp-siirros liian suuri: %s\n"
+msgid "DW_FORM_strp offset too big: %lx\n"
+msgstr "DW_FORM_strp-siirros liian suuri: %lx\n"
 
 #: dwarf.c:415
 msgid "<offset is too big>"
 msgstr "<siirros on liian suuri>"
 
-#: dwarf.c:655
+#: dwarf.c:654
 #, c-format
 msgid "Unknown TAG value: %lx"
 msgstr "Tuntematon tunnistearvo: %lx"
 
-#: dwarf.c:696
+#: dwarf.c:695
 #, c-format
 msgid "Unknown FORM value: %lx"
 msgstr "Tuntematon FORM-arvo: %lx"
 
-#: dwarf.c:705
+#: dwarf.c:704
 #, c-format
-msgid " %s byte block: "
-msgstr " %s tavulohko: "
+msgid " %lu byte block: "
+msgstr " %lu:n tavun lohko: "
 
-#: dwarf.c:1050
+#: dwarf.c:1037
 #, c-format
 msgid "(DW_OP_call_ref in frame info)"
 msgstr "(DW_OP_call_ref kehystiedoissa)"
 
-#: dwarf.c:1122
+#: dwarf.c:1109
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
 msgstr "(DW_OP_GNU_implicit_pointer kehystiedoissa)"
 
-#: dwarf.c:1229
+#: dwarf.c:1167
 #, c-format
 msgid "(User defined location op)"
 msgstr "(Käyttäjän määrittelemä sijoituskäskykoodi)"
 
-#: dwarf.c:1231
+#: dwarf.c:1169
 #, c-format
 msgid "(Unknown location op)"
 msgstr "(Tuntematon sijoituskäskykoodi)"
 
-#: dwarf.c:1278
+#: dwarf.c:1217
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr "Sisäinen virhe: DWARF-versio ei ole 2, 3 eikä 4.\n"
 
-#: dwarf.c:1384
-msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
-msgstr "DW_FORM_data8 ei ole tuettu, kun sizeof (dwarf_vma) != 8\n"
+#: dwarf.c:1323
+msgid "DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"
+msgstr "DW_FORM_data8 ei ole tuettu, kun sizeof (unsigned long) != 8\n"
 
-#: dwarf.c:1434
+#: dwarf.c:1373
 #, c-format
-msgid " (indirect string, offset: 0x%s): %s"
-msgstr " (epäsuora merkkijono, siirros: 0x%s): %s"
+msgid " (indirect string, offset: 0x%lx): %s"
+msgstr " (epäsuora merkkijono, siirros: 0x%lx): %s"
 
-#: dwarf.c:1459
+#: dwarf.c:1397
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr "Tunnistamaton muoto: %lu\n"
 
-#: dwarf.c:1552
+#: dwarf.c:1485
 #, c-format
 msgid "(not inlined)"
 msgstr "(ei inline-funktiona)"
 
-#: dwarf.c:1555
+#: dwarf.c:1488
 #, c-format
 msgid "(inlined)"
 msgstr "(inline-funktiona)"
 
-#: dwarf.c:1558
+#: dwarf.c:1491
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr "(esitelty inline-funktiona, mutta esittelyä ei ole otettu huomioon)"
 
-#: dwarf.c:1561
+#: dwarf.c:1494
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr "(esitelty inline-funktiona ja toteutettu sellaisena)"
 
-#: dwarf.c:1564
+#: dwarf.c:1497
 #, c-format
-msgid "  (Unknown inline attribute value: %s)"
-msgstr "  (Tuntematon inline-funktion attribuuttiarvo: %s)"
+msgid "  (Unknown inline attribute value: %lx)"
+msgstr "  (Tuntematon inline-funktion attribuuttiarvo: %lx)"
 
-#: dwarf.c:1735
+#: dwarf.c:1662
 #, c-format
 msgid "(location list)"
 msgstr "(sijoitusluettelo)"
 
-#: dwarf.c:1756 dwarf.c:3722
+#: dwarf.c:1683 dwarf.c:3563
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr " [DW_AT_frame_base puuttuu]"
 
-#: dwarf.c:1771
+#: dwarf.c:1698
 #, c-format
-msgid "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
-msgstr "Siirros %s, jota käytettiin DIE:n DW_AT_import-attribuutin arvona siirrososoitteessa %lx on liian suuri.\n"
+msgid "Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
+msgstr "Siirros %lx, jota käytettiin DIE:n DW_AT_import-attribuutin arvona siirrososoitteessa %lx on liian suuri.\n"
 
-#: dwarf.c:1971
+#: dwarf.c:1889
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr "Tuntematon AT-arvo: %lx"
 
-#: dwarf.c:2042
+#: dwarf.c:1960
 #, c-format
-msgid "Reserved length value (0x%s) found in section %s\n"
-msgstr "Varattu pituusarvo (0x%s) löytyi lohkossa %s\n"
+msgid "Reserved length value (%lx) found in section %s\n"
+msgstr "Varattu pituusarvo (%lx) löytyi lohkossa %s\n"
 
-#: dwarf.c:2054
+#: dwarf.c:1971
 #, c-format
-msgid "Corrupt unit length (0x%s) found in section %s\n"
-msgstr "Rikkinäinen yksikköpituus (0x%s) löytyi lohkossa %s\n"
+msgid "Corrupt unit length (%lx) found in section %s\n"
+msgstr "Rikkinäinen yksikköpituus (%lx) löytyi lohkossa %s\n"
 
 #  comp units tarkoittanee compilation unit eli käännösyksikköä?
-#: dwarf.c:2062
+#: dwarf.c:1978
 #, c-format
 msgid "No comp units in %s section ?"
 msgstr "Ei käännösyksikköjä %s-lohkossa ?"
 
-#: dwarf.c:2071
+#: dwarf.c:1987
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr "Muistia ei ole tarpeeksi %u:n alkion vianjäljitystietotaulukolle"
 
-#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
-#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
+#: dwarf.c:1995 dwarf.c:3158 dwarf.c:3252 dwarf.c:3326 dwarf.c:3443
+#: dwarf.c:3598 dwarf.c:3667 dwarf.c:3862
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
@@ -1577,90 +1595,90 @@ msgstr ""
 "Lohkon %s sisältö:\n"
 "\n"
 
-#: dwarf.c:2088
+#: dwarf.c:2003
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr "Ei voi paikantaa %s-lohkoa!\n"
 
-#: dwarf.c:2169
+#: dwarf.c:2084
 #, c-format
-msgid "  Compilation Unit @ offset 0x%s:\n"
-msgstr "  Käännösyksikkö @ siirros 0x%s:\n"
+msgid "  Compilation Unit @ offset 0x%lx:\n"
+msgstr "  Käännösyksikkö @ siirros 0x%lx:\n"
 
 #  Välilyöntilisäys
-#: dwarf.c:2171
+#: dwarf.c:2085
 #, c-format
-msgid "   Length:        0x%s (%s)\n"
-msgstr "   Pituus:        0x%s (%s)\n"
+msgid "   Length:        0x%lx (%s)\n"
+msgstr "   Pituus:        0x%lx (%s)\n"
 
 #  Välilyöntilisäys
-#: dwarf.c:2174
+#: dwarf.c:2087
 #, c-format
 msgid "   Version:       %d\n"
 msgstr "   Versio:         %d\n"
 
 #  Välilyöntilisäys
-#: dwarf.c:2175
+#: dwarf.c:2088
 #, c-format
-msgid "   Abbrev Offset: %s\n"
-msgstr "   Lyhennesiirros: %s\n"
+msgid "   Abbrev Offset: %ld\n"
+msgstr "   Lyhennesiirros: %ld\n"
 
 #  Välilyöntilisäys
-#: dwarf.c:2177
+#: dwarf.c:2089
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr "   Osoitinkoko:    %d\n"
 
-#: dwarf.c:2181
+#: dwarf.c:2093
 #, c-format
 msgid "   Signature:     "
 msgstr "   Tuntomerkki:   "
 
-#: dwarf.c:2185
+#: dwarf.c:2097
 #, c-format
-msgid "   Type Offset:   0x%s\n"
-msgstr "   Tyyppisiirros: 0x%s\n"
+msgid "   Type Offset:   0x%lx\n"
+msgstr "   Tyyppisiirros: 0x%lx\n"
 
-#: dwarf.c:2193
+#: dwarf.c:2104
 #, c-format
-msgid "Debug info is corrupted, length of CU at %s extends beyond end of section (length = %s)\n"
-msgstr "Vianjäljitystieto on rikkinäinen, käännösyksikön pituus osoitteessa %s ulottuu lohkon lopun ylitse (pituus = %s)\n"
+msgid "Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"
+msgstr "Vianjäljitystieto on rikkinäinen, keskusyksikön pituus osoitteessa %lx ulottuu lohkon lopun ylitse (pituus = %lx)\n"
 
-#: dwarf.c:2206
+#: dwarf.c:2115
 #, c-format
-msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
-msgstr "Käännösyksikkö siirrososoitteessa %s sisältää rikkinäisen tai tukemattoman versionumeron: %d.\n"
+msgid "CU at offset %lx contains corrupt or unsupported version number: %d.\n"
+msgstr "Keskusyksikkö siirrososoitteessa %lx sisältää rikkinäisen tai tukemattoman versionumeron: %d.\n"
 
-#: dwarf.c:2217
+#: dwarf.c:2125
 #, c-format
 msgid "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"
 msgstr "Vianjäljitystieto on rikkinäinen, lyhennyssiirros (%lx) on laajempi kuin lyhennyslohkon koko (%lx)\n"
 
-#: dwarf.c:2267
+#: dwarf.c:2172
 #, c-format
 msgid "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr "Valesisarusloppumerkitsijä havaittu siirrososoitteessa %lx lohkossa .debug_info\n"
 
-#: dwarf.c:2271
+#: dwarf.c:2176
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr "Lisävaroitukset valesisarusloppumerkitsijöistä on vaimennettu\n"
 
-#: dwarf.c:2290
+#: dwarf.c:2183
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr " <%d><%lx>: Lyhennenumero: %lu"
 
-#: dwarf.c:2294
-#, c-format
-msgid " <%d><%lx>: ...\n"
-msgstr " <%d><%lx>: ...\n"
-
-#: dwarf.c:2313
+#: dwarf.c:2200
 #, c-format
 msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
 msgstr "DIE siirrososoitteessa %lx viittaa lyhennenumeroon %lu, jota ei ole olemassa\n"
 
-#: dwarf.c:2415
+#: dwarf.c:2206
+#, c-format
+msgid " (%s)\n"
+msgstr " (%s)\n"
+
+#: dwarf.c:2298
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
@@ -1669,75 +1687,75 @@ msgstr ""
 "Lohkon %s vianjäljityssisällön raakavedos:\n"
 "\n"
 
-#: dwarf.c:2453
+#: dwarf.c:2336
 #, c-format
 msgid "The information in section %s appears to be corrupt - the section is too small\n"
 msgstr "Tiedot lohkossa %s näyttävät olevan rikkinäisiä - lohko on liian pieni\n"
 
-#: dwarf.c:2465 dwarf.c:2833
+#: dwarf.c:2348 dwarf.c:2701
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr "Vain DWARF-versioiden 2, 3 ja 4 rivitiedot on nykyisin tuettu.\n"
 
-#: dwarf.c:2479 dwarf.c:2848
+#: dwarf.c:2362 dwarf.c:2716
 msgid "Invalid maximum operations per insn.\n"
 msgstr "Virheellinen toimintojen enimmäismäärä per käsky.\n"
 
 #  DWARF2_Internal_LineInfo-lohkon pituus
-#: dwarf.c:2498
+#: dwarf.c:2381
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr "  Siirros:                     0x%lx\n"
 
 #  DWARF2_Internal_LineInfo-lohkon pituus
-#: dwarf.c:2499
+#: dwarf.c:2382
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr "  Pituus:                      %ld\n"
 
-#: dwarf.c:2500
+#: dwarf.c:2383
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr "  DWARF-versio:                %d\n"
 
-#: dwarf.c:2501
+#: dwarf.c:2384
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr "  Esitoimipituus:              %d\n"
 
-#: dwarf.c:2502
+#: dwarf.c:2385
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr "  Minimikäskypituus:           %d\n"
 
-#: dwarf.c:2504
+#: dwarf.c:2387
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr "  Enimmäistoimintoja per käsky:%d\n"
 
-#: dwarf.c:2505
+#: dwarf.c:2388
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr "  Kohteen ’is_stmt’ alkuarvo: %d\n"
 
 #  Välilyönti lisätty tarkoituksella.
-#: dwarf.c:2506
+#: dwarf.c:2389
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr "  Rivin kantaluku:             %d\n"
 
 #  Välilyönti lisätty tarkoituksella.
-#: dwarf.c:2507
+#: dwarf.c:2390
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr "  Rivinumeroalue:              %d\n"
 
 #  Välilyönti lisätty tarkoituksella.
-#: dwarf.c:2508
+#: dwarf.c:2391
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr "  Käskykoodin kantaluku:       %d\n"
 
-#: dwarf.c:2517
+#: dwarf.c:2400
 #, c-format
 msgid ""
 "\n"
@@ -1746,12 +1764,12 @@ msgstr ""
 "\n"
 " Käskykoodit:\n"
 
-#: dwarf.c:2520
+#: dwarf.c:2403
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr "  Käskykoodilla %d on %d argumenttia\n"
 
-#: dwarf.c:2526
+#: dwarf.c:2409
 #, c-format
 msgid ""
 "\n"
@@ -1760,7 +1778,7 @@ msgstr ""
 "\n"
 " Hakemistotaulu on tyhjä.\n"
 
-#: dwarf.c:2529
+#: dwarf.c:2412
 #, c-format
 msgid ""
 "\n"
@@ -1769,7 +1787,12 @@ msgstr ""
 "\n"
 " Hakemistotaulu:\n"
 
-#: dwarf.c:2544
+#: dwarf.c:2416
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#: dwarf.c:2427
 #, c-format
 msgid ""
 "\n"
@@ -1778,7 +1801,7 @@ msgstr ""
 "\n"
 " Tiedostonimitaulu on tyhjä.\n"
 
-#: dwarf.c:2547
+#: dwarf.c:2430
 #, c-format
 msgid ""
 "\n"
@@ -1787,8 +1810,18 @@ msgstr ""
 "\n"
 " Tiedostonimitaulu:\n"
 
+#: dwarf.c:2438
+#, c-format
+msgid "  %d\t"
+msgstr "  %d\t"
+
+#: dwarf.c:2449
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
 #. Now display the statements.
-#: dwarf.c:2577
+#: dwarf.c:2457
 #, c-format
 msgid ""
 "\n"
@@ -1797,97 +1830,97 @@ msgstr ""
 "\n"
 " Rivi Numero Lauseet:\n"
 
-#: dwarf.c:2596
+#: dwarf.c:2476
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s"
-msgstr "  Erikoiskäskykoodi %d: kasvata %s tavua osoitteeseen 0x%s"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx"
+msgstr "  Erikoiskäskykoodi %d: kasvata %lu tavua osoitteeseen 0x%lx"
 
-#: dwarf.c:2610
+#: dwarf.c:2488
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
-msgstr "  Erikoiskäskykoodi %d: kasvata osoitetta %s tavua osoitteeseen 0x%s[%d]"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx[%d]"
+msgstr "  Erikoiskäskykoodi %d: kasvata osoitetta %lu tavua osoitteeseen 0x%lx[%d]"
 
-#: dwarf.c:2618
+#: dwarf.c:2494
 #, c-format
-msgid " and Line by %s to %d\n"
-msgstr " ja %s riviä riville %d\n"
+msgid " and Line by %d to %d\n"
+msgstr " ja %d riviä riville %d\n"
 
-#: dwarf.c:2628
+#: dwarf.c:2504
 #, c-format
 msgid "  Copy\n"
 msgstr "  Kopioi\n"
 
-#: dwarf.c:2638
+#: dwarf.c:2514
 #, c-format
-msgid "  Advance PC by %s to 0x%s\n"
-msgstr "  Kasvata ohjelmalaskuria arvolla %s arvoon 0x%s\n"
+msgid "  Advance PC by %lu to 0x%lx\n"
+msgstr "  Kasvata ohjelmalaskuria arvolla %lu arvoon 0x%lx\n"
 
-#: dwarf.c:2651
+#: dwarf.c:2526
 #, c-format
-msgid "  Advance PC by %s to 0x%s[%d]\n"
-msgstr "  Kasvata ohjelmalaskuria arvolla %s arvoon 0x%s[%d]\n"
+msgid "  Advance PC by %lu to 0x%lx[%d]\n"
+msgstr "  Kasvata ohjelmalaskuria arvolla %lu arvoon 0x%lx[%d]\n"
 
-#: dwarf.c:2662
+#: dwarf.c:2536
 #, c-format
-msgid "  Advance Line by %s to %d\n"
-msgstr "  Kasvata riviä arvolla %s arvoon %d\n"
+msgid "  Advance Line by %d to %d\n"
+msgstr "  Kasvata riviä arvolla %d arvoon %d\n"
 
-#: dwarf.c:2670
+#: dwarf.c:2543
 #, c-format
-msgid "  Set File Name to entry %s in the File Name Table\n"
-msgstr "  Aseta tiedostonimi riville %s tiedostonimitaulussa\n"
+msgid "  Set File Name to entry %d in the File Name Table\n"
+msgstr "  Aseta tiedostonimi tiedostonimitaulun alkioon %d\n"
 
-#: dwarf.c:2678
+#: dwarf.c:2551
 #, c-format
-msgid "  Set column to %s\n"
-msgstr "  Aseta sarakkeeksi %s\n"
+msgid "  Set column to %lu\n"
+msgstr "  Aseta sarakkeeksi %lu\n"
 
-#: dwarf.c:2686
+#: dwarf.c:2558
 #, c-format
-msgid "  Set is_stmt to %s\n"
-msgstr "  Aseta is_stmt-arvoksi %s\n"
+msgid "  Set is_stmt to %d\n"
+msgstr "  Aseta is_stmt-arvoksi %d\n"
 
-#: dwarf.c:2691
+#: dwarf.c:2563
 #, c-format
 msgid "  Set basic block\n"
 msgstr "  Aseta peruslohko\n"
 
-#: dwarf.c:2701
+#: dwarf.c:2573
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s\n"
-msgstr "  Kasvata ohjelmalaskuria vakiolla %s arvoon 0x%s\n"
+msgid "  Advance PC by constant %lu to 0x%lx\n"
+msgstr "  Kasvata ohjelmalaskuria vakiolla %lu arvoon 0x%lx\n"
 
-#: dwarf.c:2714
+#: dwarf.c:2585
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s[%d]\n"
-msgstr "  Kasvata ohjelmalaskuria vakiolla %s arvoon 0x%s[%d]\n"
+msgid "  Advance PC by constant %lu to 0x%lx[%d]\n"
+msgstr "  Kasvata ohjelmalaskuria vakiolla %lu arvoon 0x%lx[%d]\n"
 
-#: dwarf.c:2726
+#: dwarf.c:2596
 #, c-format
-msgid "  Advance PC by fixed size amount %s to 0x%s\n"
-msgstr "  Kasvata ohjelmalaskuria kiinteäkokoisella summalla %s arvoon 0x%s\n"
+msgid "  Advance PC by fixed size amount %lu to 0x%lx\n"
+msgstr "  Kasvata ohjelmalaskuria kiinteäkokoisella summalla %lu arvoon 0x%lx\n"
 
-#: dwarf.c:2732
+#: dwarf.c:2601
 #, c-format
 msgid "  Set prologue_end to true\n"
 msgstr "  Aseta prologue_end-arvoksi true\n"
 
-#: dwarf.c:2736
+#: dwarf.c:2605
 #, c-format
 msgid "  Set epilogue_begin to true\n"
 msgstr "  Aseta epilogue_begin-arvoksi true\n"
 
-#: dwarf.c:2742
+#: dwarf.c:2611 dwarf.c:3027
 #, c-format
-msgid "  Set ISA to %s\n"
-msgstr "  Aseta ISA-arvoksi %s\n"
+msgid "  Set ISA to %lu\n"
+msgstr "  Aseta ISA-arvoksi %lu\n"
 
-#: dwarf.c:2746 dwarf.c:3160
+#: dwarf.c:2615 dwarf.c:3031
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr "  Tuntematon käskykoodi %d, jonka operandit ovat: "
 
-#: dwarf.c:2780
+#: dwarf.c:2648
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
@@ -1896,66 +1929,101 @@ msgstr ""
 "Lohkon %s vianjäljityssisällön dekoodattu vedos:\n"
 "\n"
 
-#: dwarf.c:2821
+#: dwarf.c:2689
 msgid "The line info appears to be corrupt - the section is too small\n"
 msgstr "Rivitiedot näyttävät olevan rikkinäisiä - lohko on liian pieni\n"
 
-#: dwarf.c:2953
+#: dwarf.c:2821
 #, c-format
 msgid "CU: %s:\n"
-msgstr "Käännösyksikkö: %s:\n"
+msgstr "Keskusyksikkö: %s:\n"
 
-#: dwarf.c:2954 dwarf.c:2964
+#: dwarf.c:2822 dwarf.c:2835
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr "Tiedostonimi                         Rivinumero     Aloitusosoite\n"
 
-#: dwarf.c:2959
+#: dwarf.c:2828
 #, c-format
 msgid "CU: %s/%s:\n"
-msgstr "Käännösyksikkö: %s/%s:\n"
+msgstr "Keskusyksikkö: %s/%s:\n"
 
-#: dwarf.c:3051
+#: dwarf.c:2833 dwarf.c:2918
 #, c-format
-msgid "UNKNOWN: length %d\n"
-msgstr "TUNTEMATON: pituus %d\n"
+msgid "%s:\n"
+msgstr "%s:\n"
 
-#: dwarf.c:3156
+#. If directory index is 0, that means current directory.
+#: dwarf.c:2964
 #, c-format
-msgid "  Set ISA to %lu\n"
-msgstr "  Aseta ISA-arvoksi %lu\n"
+msgid ""
+"\n"
+"./%s:[++]\n"
+msgstr ""
+"\n"
+"./%s:[++]\n"
 
-#: dwarf.c:3322 dwarf.c:3872
+#. The directory index starts counting at 1.
+#: dwarf.c:2970
+#, c-format
+msgid ""
+"\n"
+"%s/%s:\n"
+msgstr ""
+"\n"
+"%s/%s:\n"
+
+#: dwarf.c:3070
+#, c-format
+msgid "%-35s  %11d  %#18lx\n"
+msgstr "%-35s  %11d  %#18lx\n"
+
+#: dwarf.c:3074
+#, c-format
+msgid "%-35s  %11d  %#18lx[%d]\n"
+msgstr "%-35s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3082
+#, c-format
+msgid "%s  %11d  %#18lx\n"
+msgstr "%s  %11d  %#18lx\n"
+
+#: dwarf.c:3086
+#, c-format
+msgid "%s  %11d  %#18lx[%d]\n"
+msgstr "%s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3192 dwarf.c:3712
 #, c-format
 msgid ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
-msgstr ".debug_info-siirrososoite: 0x%lx lohkossa %s ei osoita käännösyksikköotsakkeeseen.\n"
+msgstr ".debug_info-siirrososoite: 0x%lx lohkossa %s ei osoita keskusyksikköotsakkeeseen.\n"
 
 #  tarkoittaako pubnames julkisia nimiä?
-#: dwarf.c:3336
+#: dwarf.c:3206
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr "Vain DWARF 2:n ja 3:n pub-nimet ovat nykyisin tuettuja\n"
 
-#: dwarf.c:3343
+#: dwarf.c:3213
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr "  Pituus:                              %ld\n"
 
-#: dwarf.c:3345
+#: dwarf.c:3215
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr "  Versio:                              %d\n"
 
-#: dwarf.c:3347
+#: dwarf.c:3217
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr "  Siirros lohkoon .debug_info:         0x%lx\n"
 
-#: dwarf.c:3349
+#: dwarf.c:3219
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr "  Alueen koko .debug_info-lohkossa:    %ld\n"
 
-#: dwarf.c:3352
+#: dwarf.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -1964,48 +2032,60 @@ msgstr ""
 "\n"
 "    Siirros\tNimi\n"
 
-#: dwarf.c:3403
+#: dwarf.c:3273
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
 msgstr " DW_MACINFO_start_file - rivinro:%d tied.nro:%d\n"
 
-#: dwarf.c:3409
+#: dwarf.c:3279
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr " DW_MACINFO_end_file\n"
 
 #  lineno tarkoittaa ilmeisesti rivinumeroa
-#: dwarf.c:3417
+#: dwarf.c:3287
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_define - rivinro: %d makro : %s\n"
 
 #  lineno tarkoittaa ilmeisesti rivinumeroa
-#: dwarf.c:3426
+#: dwarf.c:3296
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_undef - rivinro: %d makro : %s\n"
 
-#: dwarf.c:3438
+#: dwarf.c:3308
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
 msgstr " DW_MACINFO_vendor_ext - vakio : %d merkkijono : %s\n"
 
 #  Seuraava on taulukon otsikko. Itse taulukko on leveydeltään: "   %ld      %s    [%s]". Viimeinen [%s] sisältää tekstin "has children" tai "no children".
-#: dwarf.c:3467
+#: dwarf.c:3337
 #, c-format
 msgid "  Number TAG\n"
 msgstr "  Numero Tunniste\n"
 
-#: dwarf.c:3476
+#  Tämä pitäisi oikeastaan jättää pois käännettävistä teksteistä !!
+#: dwarf.c:3343
+#, c-format
+msgid "   %ld      %s    [%s]\n"
+msgstr "   %ld      %s    [%s]\n"
+
+#: dwarf.c:3346
 msgid "has children"
 msgstr "on jälkeläisiä"
 
-#: dwarf.c:3476
+#: dwarf.c:3346
 msgid "no children"
 msgstr "ei jälkeläisiä"
 
-#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
+#  Seuraava pitäisi oikeastaan jättää pois käännettävistä teksteistä.
+#: dwarf.c:3349
+#, c-format
+msgid "    %-18s %s\n"
+msgstr "    %-18s %s\n"
+
+#: dwarf.c:3382 dwarf.c:3594 dwarf.c:3819
 #, c-format
 msgid ""
 "\n"
@@ -2014,102 +2094,107 @@ msgstr ""
 "\n"
 "Lohko %s on tyhjä.\n"
 
-#: dwarf.c:3533 dwarf.c:3987
+#: dwarf.c:3388 dwarf.c:3825
 #, c-format
 msgid "Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"
 msgstr "Ei kyetä lataamaan/jäsentämään .debug_info-lohkoa, joten ei voida tulkita %s-lohkoa.\n"
 
-#: dwarf.c:3577
+#. FIXME: Should we handle this case?
+#: dwarf.c:3432
+msgid "Location lists in .debug_info section aren't in ascending order!\n"
+msgstr "Sijaintiluettelot .debug_info-lohkossa eivät ole nousevassa järjestyksessä!\n"
+
+#: dwarf.c:3435
 msgid "No location lists in .debug_info section!\n"
 msgstr "Ei sijaintiluetteloja .debug_info-lohkossa!\n"
 
-#: dwarf.c:3582
+#: dwarf.c:3440
 #, c-format
-msgid "Location lists in %s section start at 0x%s\n"
-msgstr "Sijaintiluettelot %s-lohkossa alkavat osoitteesta 0x%s\n"
+msgid "Location lists in %s section start at 0x%lx\n"
+msgstr "Sijaintiluettelot %s-lohkossa alkavat osoitteesta 0x%lx\n"
 
-#: dwarf.c:3589
+#: dwarf.c:3444
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr "    Siirros  Alku     Loppu    Lauseke\n"
 
-#: dwarf.c:3638
+#: dwarf.c:3479
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "Lohkossa .debug_loc on aukko [0x%lx - 0x%lx].\n"
 
-#: dwarf.c:3642
+#: dwarf.c:3483
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "Lohkossa .debug_loc on päällekkäisyys [0x%lx - 0x%lx].\n"
 
-#: dwarf.c:3650
+#: dwarf.c:3491
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr "Siirros 0x%lx on suurempi kuin .debug_loc-lohkon koko.\n"
 
-#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
+#: dwarf.c:3500 dwarf.c:3535 dwarf.c:3545
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr "Siirroksesta 0x%lx alkavaa sijaintiluetteloa ei ole päätetty.\n"
 
-#: dwarf.c:3678 dwarf.c:4075
+#: dwarf.c:3519 dwarf.c:3913
 #, c-format
 msgid "<End of list>\n"
 msgstr "<Luettelon loppu>\n"
 
-#: dwarf.c:3688
+#: dwarf.c:3529
 #, c-format
 msgid "(base address)\n"
 msgstr "(perusosoite)\n"
 
-#: dwarf.c:3725
+#: dwarf.c:3566
 msgid " (start == end)"
 msgstr " (alku == loppu)"
 
-#: dwarf.c:3727
+#: dwarf.c:3568
 msgid " (start > end)"
 msgstr " (alku > loppu)"
 
-#: dwarf.c:3737
+#: dwarf.c:3578
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr "Käyttämättömiä tavuja on %ld lohkon %s lopussa\n"
 
-#: dwarf.c:3883
+#: dwarf.c:3723
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr "Vain DWARF 2- ja 3-aranges on nykyisin tuettu.\n"
 
-#: dwarf.c:3887
+#: dwarf.c:3727
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr "  Pituus:                      %ld\n"
 
-#: dwarf.c:3889
+#: dwarf.c:3728
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr "  Versio:                      %d\n"
 
-#: dwarf.c:3890
+#: dwarf.c:3729
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr "  Siirros lohkoon .debug_info: 0x%lx\n"
 
-#: dwarf.c:3892
+#: dwarf.c:3730
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr "  Osoitinkoko:                 %d\n"
 
-#: dwarf.c:3893
+#: dwarf.c:3731
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr "  Segmenttikoko:               %d\n"
 
-#: dwarf.c:3902
+#: dwarf.c:3740
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr "Osoitinkoko + segmenttikoko ei ole kahden potenssi.\n"
 
-#: dwarf.c:3907
+#: dwarf.c:3745
 #, c-format
 msgid ""
 "\n"
@@ -2118,7 +2203,7 @@ msgstr ""
 "\n"
 "    Osoite            Pituus\n"
 
-#: dwarf.c:3909
+#: dwarf.c:3747
 #, c-format
 msgid ""
 "\n"
@@ -2127,388 +2212,263 @@ msgstr ""
 "\n"
 "    Osoite    Pituus\n"
 
-#: dwarf.c:3997
+#: dwarf.c:3835
 msgid "No range lists in .debug_info section!\n"
 msgstr "Ei lukualueluetteloja .debug_info-lohkossa!\n"
 
-#: dwarf.c:4021
+#: dwarf.c:3859
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr "Lukualueluettelot %s-lohkossa alkavat osoitteesta 0x%lx\n"
 
-#: dwarf.c:4025
+#: dwarf.c:3863
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr "    Siirros  Alku     Loppu\n"
 
-#: dwarf.c:4046
+#: dwarf.c:3884
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Aukko [0x%lx - 0x%lx] lohkossa %s.\n"
 
-#: dwarf.c:4050
+#: dwarf.c:3888
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Päällekkäisyys [0x%lx - 0x%lx] lohkossa %s.\n"
 
-#: dwarf.c:4093
+#: dwarf.c:3931
 msgid "(start == end)"
 msgstr "(alku == loppu)"
 
-#: dwarf.c:4095
+#: dwarf.c:3933
 msgid "(start > end)"
 msgstr "(alku > loppu)"
 
-#: dwarf.c:4347
+#: dwarf.c:4185
 msgid "bad register: "
 msgstr "virheellinen rekisteri: "
 
-#. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4350 dwarf.c:5159
+#: dwarf.c:4188
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr "Lohkon %s sisältö:\n"
 
-#: dwarf.c:5120
+#: dwarf.c:4962
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr "  DW_CFA_??? (Käyttäjämääritelty kutsukehyskäsky: %#x)\n"
 
-#: dwarf.c:5122
+#: dwarf.c:4964
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr "tukematon tai tuntematon Dwarf-kutsukehyskäskynumero: %#x\n"
 
-#: dwarf.c:5163
+#: dwarf.c:4989
 #, c-format
-msgid "Truncated header in the %s section.\n"
-msgstr "Rikkoutunut otsake lohkossa �%s�\n"
-
-#: dwarf.c:5168
-#, c-format
-msgid "Version %ld\n"
-msgstr "versio %ld\n"
-
-#: dwarf.c:5175
-msgid "The address table data in version 3 may be wrong.\n"
-msgstr "Osoitetaulutiedot versiossa 3 saattavat olla virheellisiä.\n"
-
-#: dwarf.c:5178
-msgid "Version 4 does not support case insensitive lookups.\n"
-msgstr "Versio 4 ei tue kirjainkoosta riippuvia hakuja.\n"
+msgid "Displaying the debug contents of section %s is not yet supported.\n"
+msgstr "Lohkon %s vianjäljityssisällön näyttäminen ei ole vielä tuettu.\n"
 
-#: dwarf.c:5183
+#: dwarf.c:5031 elfedit.c:74
 #, c-format
-msgid "Unsupported version %lu.\n"
-msgstr "Tukematon versio %lu.\n"
+msgid "%s: Error: "
+msgstr "%s: Virhe: "
 
-#: dwarf.c:5199
+#: dwarf.c:5042
 #, c-format
-msgid "Corrupt header in the %s section.\n"
-msgstr "Rikkoutunut otsake lohkossa �%s�\n"
+msgid "%s: Warning: "
+msgstr "%s: Varoitus: "
 
-#: dwarf.c:5214
+#: dwarf.c:5145 dwarf.c:5215
 #, c-format
-msgid ""
-"\n"
-"CU table:\n"
-msgstr ""
-"\n"
-"Käännösyksikkötaulu:\n"
+msgid "Unrecognized debug option '%s'\n"
+msgstr "Tunnistamaton vianjäljitysvalitsin ’%s’\n"
 
-#: dwarf.c:5220
+#  Valinnaisessa COFF-otsakkeessa on magic-kenttä, joka kertoo tiedoston tyypin.
+#: elfedit.c:243
 #, c-format
-msgid "[%3u] 0x%lx - 0x%lx\n"
-msgstr "[%3u] 0x%lx - 0x%lx\n"
+msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
+msgstr "%s: Ei ELF-tiedosto - siinä on väärät maagiset tavut alussa\n"
 
-#: dwarf.c:5225
+#: elfedit.c:251
 #, c-format
-msgid ""
-"\n"
-"TU table:\n"
-msgstr ""
-"\n"
-"Käännösyksikkötaulu:\n"
+msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
+msgstr "%s: Tukematon EI_VERSION: %d ei ole %d\n"
 
-#: dwarf.c:5232
+#: elfedit.c:267
 #, c-format
-msgid "[%3u] 0x%lx 0x%lx "
-msgstr "[%3u] 0x%lx 0x%lx "
+msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
+msgstr "%s: Täsmäämätön EI_CLASS: %d ei ole %d\n"
 
-#: dwarf.c:5239
+#: elfedit.c:278
 #, c-format
-msgid ""
-"\n"
-"Address table:\n"
-msgstr ""
-"\n"
-"Osoitetaulu:\n"
+msgid "%s: Unmatched e_machine: %d is not %d\n"
+msgstr "%s: Täsmäämätön e_machine: %d ei ole %d\n"
 
-#: dwarf.c:5248
+#: elfedit.c:289
 #, c-format
-msgid "%lu\n"
-msgstr "%lu\n"
+msgid "%s: Unmatched e_type: %d is not %d\n"
+msgstr "%s: Täsmäämätön e_type: %d ei ole %d\n"
 
-#: dwarf.c:5251
+#: elfedit.c:300
 #, c-format
-msgid ""
-"\n"
-"Symbol table:\n"
-msgstr ""
-"\n"
-"Symbolitaulu:\n"
+msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
+msgstr "%s: Täsmäämätön EI_OSABI: %d ei ole %d\n"
 
-#: dwarf.c:5285
+#: elfedit.c:333
 #, c-format
-msgid "Displaying the debug contents of section %s is not yet supported.\n"
-msgstr "Lohkon %s vianjäljityssisällön näyttäminen ei ole vielä tuettu.\n"
+msgid "%s: Failed to update ELF header: %s\n"
+msgstr "%s: ELF-otsakkeen päivitys epäonnistui: %s\n"
 
-#: dwarf.c:5421 dwarf.c:5491
+#: elfedit.c:366
 #, c-format
-msgid "Unrecognized debug option '%s'\n"
-msgstr "Tunnistamaton vianjäljitysvalitsin ’%s’\n"
+msgid "Unsupported EI_CLASS: %d\n"
+msgstr "Tukematon EI_CLASS: %d\n"
 
-#: elfcomm.c:39
-#, c-format
-msgid "%s: Error: "
-msgstr "%s: Virhe: "
+#: elfedit.c:399
+msgid ""
+"This executable has been built without support for a\n"
+"64 bit data type and so it cannot process 64 bit ELF files.\n"
+msgstr ""
+"Tähän suoritettavaan tiedostoon ei ole käännetty tukea 64-bittiselle\n"
+"datatyypille, joten se ei voi käsitellä 64-bittisiä ELF-tiedostoja.\n"
 
-#: elfcomm.c:50
+#: elfedit.c:440
 #, c-format
-msgid "%s: Warning: "
-msgstr "%s: Varoitus: "
+msgid "%s: Failed to read ELF header\n"
+msgstr "%s: ELF-otsakkeen lukeminen epäonnistui\n"
 
-#: elfcomm.c:82 elfcomm.c:117 elfcomm.c:167 elfcomm.c:216
+#: elfedit.c:447
 #, c-format
-msgid "Unhandled data length: %d\n"
-msgstr "Käsittelemätön data-pituus: %d\n"
+msgid "%s: Failed to seek to ELF header\n"
+msgstr "%s: ELF-otsakkeen haku epäonnistui\n"
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
-#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
-#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
-#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
-#: readelf.c:11866 readelf.c:12685
+#: elfedit.c:477 elfedit.c:491 elfedit.c:776 readelf.c:3674 readelf.c:3978
+#: readelf.c:4021 readelf.c:4093 readelf.c:4171 readelf.c:4936 readelf.c:4960
+#: readelf.c:7057 readelf.c:7103 readelf.c:7304 readelf.c:8494 readelf.c:8508
+#: readelf.c:9033 readelf.c:9049 readelf.c:9092 readelf.c:9117 readelf.c:11385
+#: readelf.c:11577 readelf.c:12138 readelf.c:12515 readelf.c:12529
+#: readelf.c:12891
 msgid "Out of memory\n"
 msgstr "Muisti loppui\n"
 
-#: elfcomm.c:312
+#: elfedit.c:543 readelf.c:12581
 #, c-format
 msgid "%s: failed to seek to first archive header\n"
 msgstr "%s: ensimmäisen arkisto-otsakkeen haku epäonnistui\n"
 
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
+#: elfedit.c:553 elfedit.c:741 elfedit.c:845 readelf.c:12590 readelf.c:12858
+#: readelf.c:13026
 #, c-format
 msgid "%s: failed to read archive header\n"
 msgstr "%s: ei voi lukea arkisto-otsaketta\n"
 
-#: elfcomm.c:347
-#, c-format
-msgid "%s: the archive index is empty\n"
-msgstr "%s: arkistoindeksi on tyhjä\n"
-
-#: elfcomm.c:355 elfcomm.c:381
-#, c-format
-msgid "%s: failed to read archive index\n"
-msgstr "%s: arkistoindeksin lukeminen epäonnistui\n"
-
-#: elfcomm.c:365
-#, c-format
-msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
-msgstr "%s: arkistoindeksissä otaksutaan olevan %ld alkiota, mutta otsakkeen koko on liian pieni\n"
-
-#: elfcomm.c:373
-msgid "Out of memory whilst trying to read archive symbol index\n"
-msgstr "Muisti loppui kun yritettiin lukea arkiston symboli-indeksiä\n"
-
-#: elfcomm.c:392
-msgid "Out of memory whilst trying to convert the archive symbol index\n"
-msgstr "Muisti loppui kun yritettiin muuntaa arkiston symboli-indeksiä\n"
-
-#: elfcomm.c:405
-#, c-format
-msgid "%s: the archive has an index but no symbols\n"
-msgstr "%s: arkistossa on indeksi, mutta ei symboleja\n"
-
-#: elfcomm.c:413
-msgid "Out of memory whilst trying to read archive index symbol table\n"
-msgstr "Muisti loppui yritettäessä lukea arkistoindeksisymbolitaulua\n"
-
-#: elfcomm.c:419
-#, c-format
-msgid "%s: failed to read archive index symbol table\n"
-msgstr "%s: arkistoindeksisymbolitaulun lukeminen epäonnistui\n"
-
-#: elfcomm.c:428
+#: elfedit.c:568 readelf.c:12691
 #, c-format
 msgid "%s: failed to skip archive symbol table\n"
 msgstr "%s: ei voi hypätä arkistosymbolitaulun yli\n"
 
-#: elfcomm.c:440
+#: elfedit.c:579 readelf.c:12702
 #, c-format
 msgid "%s: failed to read archive header following archive index\n"
 msgstr "%s: arkisto-otsaketta seuraavan arkistoindeksin lukeminen epäonnistui\n"
 
-#: elfcomm.c:446
-#, c-format
-msgid "%s has no archive index\n"
-msgstr "%s ei ole arkistoindeksiä\n"
-
-#: elfcomm.c:457
+#: elfedit.c:594 readelf.c:12718
 msgid "Out of memory reading long symbol names in archive\n"
 msgstr "Muisti loppui luettaessa pitkiä symbolinimiä arkistossa\n"
 
-#: elfcomm.c:465
+#: elfedit.c:602 readelf.c:12726
 #, c-format
 msgid "%s: failed to read long symbol name string table\n"
 msgstr "%s: pitkän symbolinimimerkkijonotaulun lukeminen epäonnistui\n"
 
-#: elfcomm.c:605
+#: elfedit.c:734 readelf.c:12852
 #, c-format
 msgid "%s: failed to seek to next file name\n"
 msgstr "%s: seuraavan tiedostonimen haku epäonnistui\n"
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
+#: elfedit.c:747 elfedit.c:852 readelf.c:12863 readelf.c:13032
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr "%s: kelvollista arkisto-otsaketta ei löytynyt\n"
 
-#  Valinnaisessa COFF-otsakkeessa on magic-kenttä, joka kertoo tiedoston tyypin.
-#: elfedit.c:73
-#, c-format
-msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
-msgstr "%s: Ei ELF-tiedosto - siinä on väärät maagiset tavut alussa\n"
-
-#: elfedit.c:81
-#, c-format
-msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
-msgstr "%s: Tukematon EI_VERSION: %d ei ole %d\n"
-
-#: elfedit.c:97
-#, c-format
-msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
-msgstr "%s: Täsmäämätön EI_CLASS: %d ei ole %d\n"
-
-#: elfedit.c:108
-#, c-format
-msgid "%s: Unmatched e_machine: %d is not %d\n"
-msgstr "%s: Täsmäämätön e_machine: %d ei ole %d\n"
-
-#: elfedit.c:119
-#, c-format
-msgid "%s: Unmatched e_type: %d is not %d\n"
-msgstr "%s: Täsmäämätön e_type: %d ei ole %d\n"
-
-#: elfedit.c:130
-#, c-format
-msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
-msgstr "%s: Täsmäämätön EI_OSABI: %d ei ole %d\n"
-
-#: elfedit.c:163
-#, c-format
-msgid "%s: Failed to update ELF header: %s\n"
-msgstr "%s: ELF-otsakkeen päivitys epäonnistui: %s\n"
-
-#: elfedit.c:196
-#, c-format
-msgid "Unsupported EI_CLASS: %d\n"
-msgstr "Tukematon EI_CLASS: %d\n"
-
-#: elfedit.c:229
-msgid ""
-"This executable has been built without support for a\n"
-"64 bit data type and so it cannot process 64 bit ELF files.\n"
-msgstr ""
-"Tähän suoritettavaan tiedostoon ei ole käännetty tukea 64-bittiselle\n"
-"datatyypille, joten se ei voi käsitellä 64-bittisiä ELF-tiedostoja.\n"
-
-#: elfedit.c:270
-#, c-format
-msgid "%s: Failed to read ELF header\n"
-msgstr "%s: ELF-otsakkeen lukeminen epäonnistui\n"
-
-#: elfedit.c:277
-#, c-format
-msgid "%s: Failed to seek to ELF header\n"
-msgstr "%s: ELF-otsakkeen haku epäonnistui\n"
-
-#: elfedit.c:331 readelf.c:13161
+#: elfedit.c:836 readelf.c:13018
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
 msgstr "%s: seuraavan arkisto-otsakkeen haku epäonnistui\n"
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
+#: elfedit.c:867 elfedit.c:876 readelf.c:13046 readelf.c:13055
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr "%s: virheellinen arkistotiedostonimi\n"
 
-#: elfedit.c:391 elfedit.c:483
+#: elfedit.c:896 elfedit.c:988
 #, c-format
 msgid "Input file '%s' is not readable\n"
 msgstr "Syötetiedosto ’%s’ ei ole luettava\n"
 
-#: elfedit.c:415
+#: elfedit.c:920
 #, c-format
 msgid "%s: failed to seek to archive member\n"
 msgstr "%s: arkistojäsenen haku epäonnistui\n"
 
-#: elfedit.c:454 readelf.c:13284
+#: elfedit.c:959 readelf.c:13134
 #, c-format
 msgid "'%s': No such file\n"
 msgstr "’%s’: Tiedostoa ei löydy\n"
 
 #  stat-kutsu tiedostonimellä %s epäonnistui, seurauksena tämä sanoma
-#: elfedit.c:456 readelf.c:13286
+#: elfedit.c:961 readelf.c:13136
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr "Tiedostoa ’%s’ ei löytynyt. Järjestelmävirhesanoma: %s\n"
 
-#: elfedit.c:463 readelf.c:13293
+#: elfedit.c:968 readelf.c:13143
 #, c-format
 msgid "'%s' is not an ordinary file\n"
 msgstr "’%s’ ei ole tavallinen tiedosto\n"
 
-#: elfedit.c:489 readelf.c:13306
+#: elfedit.c:994 readelf.c:13156
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr "%s: Tiedoston maagisen numeron lukeminen epäonnistui\n"
 
-#: elfedit.c:547
+#: elfedit.c:1052
 #, c-format
 msgid "Unknown OSABI: %s\n"
 msgstr "Tuntematon OSABI: %s\n"
 
-#: elfedit.c:566
+#: elfedit.c:1071
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr "Tuntematon konetyyppi: %s\n"
 
-#: elfedit.c:584
+#: elfedit.c:1089
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr "Tuntematon konetyyppi: %d\n"
 
 #  Handle an IEEE BB record.
-#: elfedit.c:603
+#: elfedit.c:1108
 #, c-format
 msgid "Unknown type: %s\n"
 msgstr "Tuntematon tyyppi: %s\n"
 
-#: elfedit.c:634
+#: elfedit.c:1139
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr "Käyttö: %s <valitsimet> elf-tiedosto(t)\n"
 
-#: elfedit.c:636
+#: elfedit.c:1141
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr " Päivitä ELF-tiedostojen ELF-otsake\n"
 
-#: elfedit.c:637 objcopy.c:475 objcopy.c:585
+#: elfedit.c:1142 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
 msgstr " Valitsimet ovat:\n"
 
-#: elfedit.c:638
+#: elfedit.c:1143
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -2529,26 +2489,31 @@ msgstr ""
 "  -h --help                   Näytä nämä tiedot\n"
 "  -v --version                Näytä %s:n versionumero\n"
 
-#: emul_aix.c:45
+#: emul_aix.c:43
 #, c-format
 msgid "  [-g]         - 32 bit small archive\n"
 msgstr "  [-g]         - 32-bittinen pieni arkisto\n"
 
-#: emul_aix.c:46
+#: emul_aix.c:44
 #, c-format
 msgid "  [-X32]       - ignores 64 bit objects\n"
 msgstr "  [-X32]       - ei oteta huomioon 64-bittisiä objekteja\n"
 
-#: emul_aix.c:47
+#: emul_aix.c:45
 #, c-format
 msgid "  [-X64]       - ignores 32 bit objects\n"
 msgstr "  [-X64]       - ei oteta huomioon 32-bittisiä objekteja\n"
 
-#: emul_aix.c:48
+#: emul_aix.c:46
 #, c-format
 msgid "  [-X32_64]    - accepts 32 and 64 bit objects\n"
 msgstr "  [-X32_64]    - hyväksyy 32- ja 64-bittiset objektit\n"
 
+#: emul_aix.c:99 emul_aix.c:109 emul_aix.c:119 emul_aix.c:129
+#, c-format
+msgid "target `%s' ignored."
+msgstr "kohde �%s� ohitettu."
+
 #  Lähdekoodin kommentti ennen tulostusta: Report an unexpected EOF in the IEEE debugging information.
 #: ieee.c:311
 msgid "unexpected end of debugging information"
@@ -2773,17 +2738,17 @@ msgstr "IEEE numeerinen ylivuoto: 0x"
 msgid "IEEE string length overflow: %u\n"
 msgstr "IEEE merkkijonopituuden ylivuoto: %u\n"
 
-#: ieee.c:5213
+#: ieee.c:5210
 #, c-format
 msgid "IEEE unsupported integer type size %u\n"
 msgstr "ei-tuettu IEEE kokonaislukutyyppikoko %u\n"
 
-#: ieee.c:5247
+#: ieee.c:5244
 #, c-format
 msgid "IEEE unsupported float type size %u\n"
 msgstr "ei-tuettu IEEE liukulukutyyppikoko %u\n"
 
-#: ieee.c:5281
+#: ieee.c:5278
 #, c-format
 msgid "IEEE unsupported complex type size %u\n"
 msgstr "ei-tuettu IEEE kompleksilukutyyppikoko %u\n"
@@ -2792,122 +2757,122 @@ msgstr "ei-tuettu IEEE kompleksilukutyyppikoko %u\n"
 msgid "Duplicate symbol entered into keyword list."
 msgstr "Symbolin kaksoiskappale kirjoitettu avainsanaluetteloon."
 
-#: nlmconv.c:274 srconv.c:1824
+#: nlmconv.c:273 srconv.c:1823
 msgid "input and output files must be different"
 msgstr "syöte- ja tulostetiedosto ei saa olla sama tiedosto"
 
-#: nlmconv.c:321
+#: nlmconv.c:320
 msgid "input file named both on command line and with INPUT"
 msgstr "syötetiedosto nimetty sekä komentorivillä että INPUT-tiedostossa"
 
-#: nlmconv.c:330
+#: nlmconv.c:329
 msgid "no input file"
 msgstr "ei syötetiedostoa"
 
-#: nlmconv.c:360
+#: nlmconv.c:359
 msgid "no name for output file"
 msgstr "ei tulostetiedoston nimeä"
 
-#: nlmconv.c:374
+#: nlmconv.c:373
 msgid "warning: input and output formats are not compatible"
 msgstr "varoitus: syöte- ja tulostemuodot eivät ole yhteensopivia"
 
-#: nlmconv.c:404
+#: nlmconv.c:403
 msgid "make .bss section"
 msgstr "tee .bss-lohko"
 
-#: nlmconv.c:414
+#: nlmconv.c:413
 msgid "make .nlmsections section"
 msgstr "tee .nlmsections-lohko"
 
 #  vma on Virtual Memory Address
-#: nlmconv.c:442
+#: nlmconv.c:441
 msgid "set .bss vma"
 msgstr "aseta .bss-virtuaalimuistiosoite"
 
-#: nlmconv.c:449
+#: nlmconv.c:448
 msgid "set .data size"
 msgstr "aseta .data-koko"
 
-#: nlmconv.c:629
+#: nlmconv.c:628
 #, c-format
 msgid "warning: symbol %s imported but not in import list"
 msgstr "varoitus: symboli %s tuotu mutta ei ole tuontiluettelossa"
 
-#: nlmconv.c:649
+#: nlmconv.c:648
 msgid "set start address"
 msgstr "aseta alkuosoite"
 
-#: nlmconv.c:698
+#: nlmconv.c:697
 #, c-format
 msgid "warning: START procedure %s not defined"
 msgstr "varoitus: START-proseduuria %s ei ole määritelty"
 
-#: nlmconv.c:700
+#: nlmconv.c:699
 #, c-format
 msgid "warning: EXIT procedure %s not defined"
 msgstr "varoitus: EXIT-proseduuria %s ei ole määritelty"
 
-#: nlmconv.c:702
+#: nlmconv.c:701
 #, c-format
 msgid "warning: CHECK procedure %s not defined"
 msgstr "varoitus: CHECK-proseduuria %s ei ole määritelty"
 
-#: nlmconv.c:722 nlmconv.c:908
+#: nlmconv.c:721 nlmconv.c:907
 msgid "custom section"
 msgstr "räätälöity lohko"
 
-#: nlmconv.c:742 nlmconv.c:937
+#: nlmconv.c:741 nlmconv.c:936
 msgid "help section"
 msgstr "opastelohko"
 
-#: nlmconv.c:764 nlmconv.c:955
+#: nlmconv.c:763 nlmconv.c:954
 msgid "message section"
 msgstr "sanomalohko"
 
-#: nlmconv.c:779 nlmconv.c:988
+#: nlmconv.c:778 nlmconv.c:987
 msgid "module section"
 msgstr "moduulilohko"
 
-#: nlmconv.c:798 nlmconv.c:1004
+#: nlmconv.c:797 nlmconv.c:1003
 msgid "rpc section"
 msgstr "rpc-lohko"
 
 #. There is no place to record this information.
-#: nlmconv.c:834
+#: nlmconv.c:833
 #, c-format
 msgid "%s: warning: shared libraries can not have uninitialized data"
 msgstr "%s: varoitus: jaetuissa kirjastoissa ei voi olla alustamatonta dataa"
 
-#: nlmconv.c:855 nlmconv.c:1023
+#: nlmconv.c:854 nlmconv.c:1022
 msgid "shared section"
 msgstr "jaettu lohko"
 
-#: nlmconv.c:863
+#: nlmconv.c:862
 msgid "warning: No version number given"
 msgstr "varoitus: Mitään versionumeroa ei ole annettu"
 
 #  Tämän suomensin kuten ruotsalaisessa käännöksessä
-#: nlmconv.c:903 nlmconv.c:932 nlmconv.c:950 nlmconv.c:999 nlmconv.c:1018
+#: nlmconv.c:902 nlmconv.c:931 nlmconv.c:949 nlmconv.c:998 nlmconv.c:1017
 #, c-format
 msgid "%s: read: %s"
 msgstr "%s: lukuvirhe: %s"
 
-#: nlmconv.c:925
+#: nlmconv.c:924
 msgid "warning: FULLMAP is not supported; try ld -M"
 msgstr "varoitus: FULLMAP ei ole tuettu; yritä ld -M"
 
-#: nlmconv.c:1101
+#: nlmconv.c:1100
 #, c-format
 msgid "Usage: %s [option(s)] [in-file [out-file]]\n"
 msgstr "Käyttö: %s [valitsimet] [syötetiedosto [tulostetiedosto]]\n"
 
-#: nlmconv.c:1102
+#: nlmconv.c:1101
 #, c-format
 msgid " Convert an object file into a NetWare Loadable Module\n"
 msgstr " Muunna objektitiedosto NetWare Loadable Module -muotoon\n"
 
-#: nlmconv.c:1103
+#: nlmconv.c:1102
 #, c-format
 msgid ""
 " The options are:\n"
@@ -2930,64 +2895,64 @@ msgstr ""
 "  -h --help                     Näytä nämä tiedot\n"
 "  -v --version                  Näytä ohjelman versio\n"
 
-#: nlmconv.c:1144
+#: nlmconv.c:1143
 #, c-format
 msgid "support not compiled in for %s"
 msgstr "tukea ei ole käännetty kohteeseen %s"
 
-#: nlmconv.c:1181
+#: nlmconv.c:1180
 msgid "make section"
 msgstr "tee lohko"
 
-#: nlmconv.c:1195
+#: nlmconv.c:1194
 msgid "set section size"
 msgstr "aseta lohkokoko"
 
-#: nlmconv.c:1201
+#: nlmconv.c:1200
 msgid "set section alignment"
 msgstr "aseta lohkotasaus"
 
-#: nlmconv.c:1205
+#: nlmconv.c:1204
 msgid "set section flags"
 msgstr "aseta lohkoliput"
 
-#: nlmconv.c:1216
+#: nlmconv.c:1215
 msgid "set .nlmsections size"
 msgstr "aseta .nlmsections-koko"
 
-#: nlmconv.c:1297 nlmconv.c:1305 nlmconv.c:1314 nlmconv.c:1319
+#: nlmconv.c:1296 nlmconv.c:1304 nlmconv.c:1313 nlmconv.c:1318
 msgid "set .nlmsection contents"
 msgstr "aseta .nlmsection-sisältö"
 
-#: nlmconv.c:1796
+#: nlmconv.c:1795
 msgid "stub section sizes"
 msgstr "stub-lohkokoot"
 
-#: nlmconv.c:1843
+#: nlmconv.c:1842
 msgid "writing stub"
 msgstr "kirjoitetaan stub"
 
-#: nlmconv.c:1927
+#: nlmconv.c:1926
 #, c-format
 msgid "unresolved PC relative reloc against %s"
 msgstr "ratkaisematon ohjelmalaskurisuhteellinen reloc-tietue symbolille %s"
 
-#: nlmconv.c:1991
+#: nlmconv.c:1990
 #, c-format
 msgid "overflow when adjusting relocation against %s"
 msgstr "ylivuoto säädettäessä uudelleensijoitusta symbolille %s"
 
-#: nlmconv.c:2118
+#: nlmconv.c:2117
 #, c-format
 msgid "%s: execution of %s failed: "
 msgstr "%s: kohteen %s suoritus epäonnistui: "
 
-#: nlmconv.c:2133
+#: nlmconv.c:2132
 #, c-format
 msgid "Execution of %s failed"
 msgstr "Kohteen %s suoritus epäonnistui"
 
-#: nm.c:225 size.c:78 strings.c:650
+#: nm.c:225 size.c:78 strings.c:646
 #, c-format
 msgid "Usage: %s [option(s)] [file(s)]\n"
 msgstr "Käyttö: %s [valitsimet] [tiedosto(t)]\n"
@@ -3092,17 +3057,17 @@ msgstr "%s: virheellinen kantaluku"
 msgid "%s: invalid output format"
 msgstr "%s: virheellinen tulostemuoto"
 
-#: nm.c:346 readelf.c:8546 readelf.c:8591
+#: nm.c:346 readelf.c:8259 readelf.c:8304
 #, c-format
 msgid "<processor specific>: %d"
 msgstr "<suoritinkohtainen>: %d"
 
-#: nm.c:348 readelf.c:8555 readelf.c:8609
+#: nm.c:348 readelf.c:8268 readelf.c:8322
 #, c-format
 msgid "<OS specific>: %d"
 msgstr "<Käyttöjärjestelmäkohtainen>: %d"
 
-#: nm.c:350 readelf.c:8558 readelf.c:8612
+#: nm.c:350 readelf.c:8271 readelf.c:8325
 #, c-format
 msgid "<unknown>: %d"
 msgstr "<tuntematon>: %d"
@@ -3116,7 +3081,7 @@ msgstr ""
 "\n"
 "Arkistoindeksi:\n"
 
-#: nm.c:1254
+#: nm.c:1251
 #, c-format
 msgid ""
 "\n"
@@ -3129,7 +3094,7 @@ msgstr ""
 "Määrittelemättömiä symboleja kohteesta %s:\n"
 "\n"
 
-#: nm.c:1256
+#: nm.c:1253
 #, c-format
 msgid ""
 "\n"
@@ -3142,7 +3107,7 @@ msgstr ""
 "Symboleja kohteesta %s:\n"
 "\n"
 
-#: nm.c:1258 nm.c:1309
+#: nm.c:1255 nm.c:1306
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  Section\n"
@@ -3151,7 +3116,7 @@ msgstr ""
 "Nimi                  Arvo    Luokka       Tyyppi       Koko    Rivi  Lohko\n"
 "\n"
 
-#: nm.c:1261 nm.c:1312
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         Size             Line  Section\n"
@@ -3160,7 +3125,7 @@ msgstr ""
 "Nimi                  Arvo            Luokka       Tyyppi       Koko             Rivi  Lohko\n"
 "\n"
 
-#: nm.c:1305
+#: nm.c:1302
 #, c-format
 msgid ""
 "\n"
@@ -3173,7 +3138,7 @@ msgstr ""
 "Määrittelemättömiä symboleja kohteesta %s[%s]:\n"
 "\n"
 
-#: nm.c:1307
+#: nm.c:1304
 #, c-format
 msgid ""
 "\n"
@@ -3186,30 +3151,30 @@ msgstr ""
 "Symbolit kohteesta %s[%s]:\n"
 "\n"
 
-#: nm.c:1399
+#: nm.c:1396
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr "Tulostusleveyttä ei ole alustettu (%d)"
 
-#: nm.c:1627
+#: nm.c:1624
 msgid "Only -X 32_64 is supported"
 msgstr "Vain -X 32_64 on tuettuna"
 
 #  Lisäsin ylimääräisiä lainausmerkkejä väliviivojen ja valitsimien erottamiseksi
-#: nm.c:1656
+#: nm.c:1653
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr "Käytetään �--size-sort�- ja �--undefined-only�-valitsimia yhdessä"
 
-#: nm.c:1657
+#: nm.c:1654
 msgid "will produce no output, since undefined symbols have no size."
 msgstr "ei tuota mitään tulostetta, koska määrittelemättömissä symboleissa ei ole kokoa."
 
-#: nm.c:1685
+#: nm.c:1682
 #, c-format
 msgid "data size %ld"
 msgstr "data-koko %ld"
 
-#: objcopy.c:473 srconv.c:1732
+#: objcopy.c:473 srconv.c:1731
 #, c-format
 msgid "Usage: %s [option(s)] in-file [out-file]\n"
 msgstr "Käyttö: %s [valitsimet] syötetiedosto [tulostetiedosto]\n"
@@ -3467,7 +3432,7 @@ msgstr ""
 "     --keep-file-symbols           Älä riisu tiedostosymboleja\n"
 "  -w --wildcard                    Salli jokerimerkit symbolien vertailussa\n"
 "  -x --discard-all                 Poista kaikki ei-yleiset symbolit\n"
-"  -X --discard-locals              Poista kaikki kääntäjän tuottamat symbolit\n"
+"  -X --discard-locals              Poista kaikki kääntäjän luomat symbolit\n"
 "  -v --verbose                     Luettele kaikki muutetut objektitiedostot\n"
 "  -V --version                     Näytä tämän ohjelman versionumero\n"
 "  -h --help                        Näytä tämä tuloste\n"
@@ -3489,7 +3454,7 @@ msgstr "tuetut liput: %s"
 msgid "cannot open '%s': %s"
 msgstr "ei voi avata kohdetta ’%s’: %s"
 
-#: objcopy.c:764 objcopy.c:3392
+#: objcopy.c:764 objcopy.c:3389
 #, c-format
 msgid "%s: fread failed"
 msgstr "%s: fread-kutsu epäonnistui"
@@ -3545,297 +3510,296 @@ msgstr "stat-kutsu palauttaa negatiivisen koon kohteelle �%s�"
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr "kopioidaan arvosta �%s� [tuntematon] arvoon �%s� [tuntematon]\n"
 
-#: objcopy.c:1429
+#: objcopy.c:1427
 msgid "Unable to change endianness of input file(s)"
 msgstr "Ei voi muuttaa syötetiedosto(je)n tavujärjestystyyppiä"
 
-#: objcopy.c:1438
+#: objcopy.c:1436
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr "kopioidaan kohteesta �%s� [%s] kohteeseen �%s� [%s]\n"
 
-#: objcopy.c:1487
+#: objcopy.c:1485
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr "Syötetiedosto �%s� ohittaa binaariarkkitehtuuriparametrin."
 
-#: objcopy.c:1495
+#: objcopy.c:1493
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr "Syötetiedoston �%s� muotoa ei voi tunnistaa"
 
-#: objcopy.c:1498
+#: objcopy.c:1496
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr "Tulostetiedosto ei voi edustaa arkkitehtuuria �%s�"
 
-#: objcopy.c:1561
+#: objcopy.c:1559
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr "varoitus: tiedostotasaus (0x%s) > lohkotasaus (0x%s)"
 
-#: objcopy.c:1620
+#: objcopy.c:1618
 #, c-format
 msgid "can't add section '%s'"
 msgstr "ei voi lisätä lohkoa ’%s’"
 
-#: objcopy.c:1634
+#: objcopy.c:1632
 #, c-format
 msgid "can't create section `%s'"
 msgstr "ei voi luoda lohkoa �%s�"
 
-#: objcopy.c:1680
+#: objcopy.c:1678
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr "ei voi luoda vianjäljityslinkkilohkoa �%s�"
 
-#: objcopy.c:1773
+#: objcopy.c:1771
 msgid "Can't fill gap after section"
 msgstr "Ei voi täyttää väliä lohkon jälkeen"
 
-#: objcopy.c:1797
+#: objcopy.c:1795
 msgid "can't add padding"
 msgstr "ei voi lisätä täytettä"
 
-#: objcopy.c:1888
+#: objcopy.c:1886
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr "ei voi täyttää vianjäljityslinkkilohkoa �%s�"
 
-#: objcopy.c:1951
+#: objcopy.c:1949
 msgid "error copying private BFD data"
 msgstr "virhe kopioitaessa yksityistä BFD-dataa"
 
-#: objcopy.c:1962
+#: objcopy.c:1960
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr "tämä kohde ei tue %lu vaihtoehtoisia konekoodeja"
 
-#: objcopy.c:1966
+#: objcopy.c:1964
 msgid "treating that number as an absolute e_machine value instead"
 msgstr "käsitellään tuota numeroa absoluuttisena e_machine-arvona eikä"
 
-#: objcopy.c:1970
+#: objcopy.c:1968
 msgid "ignoring the alternative value"
 msgstr "ei oteta huomioon vaihtoehtoista arvoa"
 
-#: objcopy.c:2002 objcopy.c:2038
+#: objcopy.c:2000 objcopy.c:2035
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr "ei voi luoda tempdir-hakemistoa arkiston kopiointiin (virhe: %s)"
 
-#: objcopy.c:2068
+#: objcopy.c:2096
 msgid "Unable to recognise the format of file"
 msgstr "Tiedoston muotoa ei voi tunnistaa"
 
-#: objcopy.c:2195
+#: objcopy.c:2194
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr "virhe: syötetiedosto ’%s’ on tyhjä"
 
-#: objcopy.c:2339
+#: objcopy.c:2338
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr "Useita lohkon %s uudelleennimeämisiä"
 
-#: objcopy.c:2390
+#: objcopy.c:2389
 msgid "error in private header data"
 msgstr "virhe yksityisessä otsakedatassa"
 
-#: objcopy.c:2468
+#: objcopy.c:2467
 msgid "failed to create output section"
 msgstr "tulostelohkon luominen epäonnistui"
 
-#: objcopy.c:2482
+#: objcopy.c:2481
 msgid "failed to set size"
 msgstr "koon asettaminen epäonnistui"
 
-#: objcopy.c:2496
+#: objcopy.c:2495
 msgid "failed to set vma"
 msgstr "virtuaalisen muistiosoitteen asettaminen epäonnistui"
 
-#: objcopy.c:2521
+#: objcopy.c:2520
 msgid "failed to set alignment"
 msgstr "tasauksen asettaminen epäonnistui"
 
-#: objcopy.c:2555
+#: objcopy.c:2554
 msgid "failed to copy private data"
 msgstr "yksityisen datan kopioiminen epäonnistui"
 
-#: objcopy.c:2637
+#: objcopy.c:2636
 msgid "relocation count is negative"
 msgstr "uudelleensijoituslaskuri on negatiivinen"
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2698
+#: objcopy.c:2697
 #, c-format
 msgid "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr "ei voi kääntää tavujen järjestystä päinvastaiseksi: lohkon %s pituuden on oltava parillisesti jaollinen %d:lla"
 
-#: objcopy.c:2884
+#: objcopy.c:2883
 msgid "can't create debugging section"
 msgstr "ei voi luoda vianjäljityslohkoa"
 
-#: objcopy.c:2897
+#: objcopy.c:2896
 msgid "can't set debugging section contents"
 msgstr "ei voi asettaa vianjäljityslohkon sisältöä"
 
-#: objcopy.c:2905
+#: objcopy.c:2904
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr "ei tiedetä kuinka kirjoittaa vianjäljitystietoja kohteelle %s"
 
-#: objcopy.c:3048
+#: objcopy.c:3046
 msgid "could not create temporary file to hold stripped copy"
 msgstr "ei voi luoda tilapäistä tiedostoa tallentamaan riisuttua kopiota"
 
-#: objcopy.c:3120
+#: objcopy.c:3118
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr "%s: virheellinen versio PE-alijärjestelmässä"
 
-#: objcopy.c:3150
+#: objcopy.c:3148
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr "tuntematon PE-alijärjestelmä: %s"
 
-#: objcopy.c:3212
+#: objcopy.c:3209
 msgid "byte number must be non-negative"
 msgstr "tavunumeron on oltava ei-negatiivinen"
 
-#: objcopy.c:3218
+#: objcopy.c:3215
 #, c-format
 msgid "architecture %s unknown"
 msgstr "arkkitehtuuri %s tuntematon"
 
-#: objcopy.c:3226
+#: objcopy.c:3223
 msgid "interleave must be positive"
 msgstr "lomituksen täytyy olla positiivinen"
 
-#: objcopy.c:3235
+#: objcopy.c:3232
 msgid "interleave width must be positive"
 msgstr "lomitusleveyden täytyy olla positiivinen"
 
-#: objcopy.c:3255 objcopy.c:3263
+#: objcopy.c:3252 objcopy.c:3260
 #, c-format
 msgid "%s both copied and removed"
 msgstr "%s sekä kopioitu että poistettu"
 
-#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
-#: objcopy.c:3609 objcopy.c:3629
+#: objcopy.c:3359 objcopy.c:3439 objcopy.c:3547 objcopy.c:3578 objcopy.c:3602
+#: objcopy.c:3606 objcopy.c:3626
 #, c-format
 msgid "bad format for %s"
 msgstr "virheellinen muoto kohteelle %s"
 
-#: objcopy.c:3374
+#: objcopy.c:3371
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr "ei voi avata: %s: %s"
 
-#: objcopy.c:3519
+#: objcopy.c:3516
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr "Varoitus: katkaistaan välitäyte 0x%s tavumuodoksi 0x%x"
 
-#: objcopy.c:3680
+#: objcopy.c:3677
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr "tuntematon pitkä lohkonimien valitsin ’%s’"
 
-#: objcopy.c:3698
+#: objcopy.c:3695
 msgid "unable to parse alternative machine code"
 msgstr "ei voida jäsentää vaihtoehtoista konekoodia"
 
-#: objcopy.c:3743
+#: objcopy.c:3740
 msgid "number of bytes to reverse must be positive and even"
 msgstr "päinvastaiseen järjestykseen asetettujen tavujen lukumäärän on oltava positiivinen ja parillinen"
 
-#: objcopy.c:3746
+#: objcopy.c:3743
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr "Varoitus: ei oteta huomioon edellistä %d:n �--reverse-bytes�-arvoa"
 
-#: objcopy.c:3761
+#: objcopy.c:3758
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr "%s: virheellinen reserve-arvo valitsimelle --heap"
 
-#: objcopy.c:3767
+#: objcopy.c:3764
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr "%s: virheellinen commit-arvo valitsimelle --heap"
 
-#: objcopy.c:3792
+#: objcopy.c:3789
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr "%s: virheellinen reserve-arvo valitsimelle --stack"
 
-#: objcopy.c:3798
+#: objcopy.c:3795
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr "%s: virheellinen commit-arvo valitsimelle --stack"
 
-#: objcopy.c:3827
+#: objcopy.c:3824
 msgid "interleave start byte must be set with --byte"
 msgstr "lomituksen alkutavu täytyy olla asetettu valitsimella --byte"
 
-#: objcopy.c:3830
+#: objcopy.c:3827
 msgid "byte number must be less than interleave"
 msgstr "tavunumeron on oltava lomitusta pienempi"
 
-#: objcopy.c:3833
+#: objcopy.c:3830
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr "lomitusleveyden on oltava vähemmän tai yhtä paljon kuin lomitus - byte`"
 
-#: objcopy.c:3860
+#: objcopy.c:3857
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr "tuntematon syöte-EFI-kohde: %s"
 
-#: objcopy.c:3891
+#: objcopy.c:3888
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr "tuntematon tuloste-EFI-kohde: %s"
 
-#: objcopy.c:3904
+#: objcopy.c:3901
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr "varoitus: kohdetta ’%s’ ei voitu sijoittaa.  Järjestelmävirhesanoma: %s"
 
-#: objcopy.c:3916
+#: objcopy.c:3912
 #, c-format
 msgid "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr "varoitus: ei voitu luoda tilapäistä tiedostoa kopioitaessa kohdetta ’%s’, (virhe: %s)"
 
 #  Ensimmäinen %s sisältää tekstin "--change-section-vma", toinen %s sisältää jonkin nimen, %c sisältää joko '=' tai '+' -merkin, viimeinen %s sisältää jonkun korkeintaan 20-merkkisen puskurin sisällön.
-#: objcopy.c:3944 objcopy.c:3958
+#: objcopy.c:3956 objcopy.c:3970
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr "%s %s%c0x%s ei käytetty koskaan"
 
-#: objdump.c:201
+#: objdump.c:190
 #, c-format
 msgid "Usage: %s <option(s)> <file(s)>\n"
 msgstr "Käyttö: %s <valitsimet> <tiedosto(t)>\n"
 
-#: objdump.c:202
+#: objdump.c:191
 #, c-format
 msgid " Display information from object <file(s)>.\n"
 msgstr " Näyttää tietoja objekti<tiedosto(i)sta>.\n"
 
 #  Ohjenäytöllä puhutaan riviä ylempänä valitsimista. Siksi alla käytetään samaa termiä suomennoksessa.
-#: objdump.c:203
+#: objdump.c:192
 #, c-format
 msgid " At least one of the following switches must be given:\n"
 msgstr " Seuraavista valitsimista on valittava vähintään yksi:\n"
 
-#: objdump.c:204
+#: objdump.c:193
 #, c-format
 msgid ""
 "  -a, --archive-headers    Display archive header information\n"
 "  -f, --file-headers       Display the contents of the overall file header\n"
 "  -p, --private-headers    Display object format specific file header contents\n"
-"  -P, --private=OPT,OPT... Display object format specific contents\n"
 "  -h, --[section-]headers  Display the contents of the section headers\n"
 "  -x, --all-headers        Display the contents of all headers\n"
 "  -d, --disassemble        Display assembler contents of executable sections\n"
@@ -3848,7 +3812,7 @@ msgid ""
 "  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Display DWARF info in the file\n"
 "  -t, --syms               Display the contents of the symbol table(s)\n"
 "  -T, --dynamic-syms       Display the contents of the dynamic symbol table\n"
@@ -3862,7 +3826,6 @@ msgstr ""
 "  -a, --archive-headers    Näytä arkisto-otsaketiedot\n"
 "  -f, --file-headers       Näytä ylimmän tiedosto-otsakkeen sisältö\n"
 "  -p, --private-headers    Näytä objektimuotokohtaisen tiedosto-otsakkeen sisältö\n"
-"  -P, --private=OPT,OPT... Näytä objektimuotokohtaiset sisällöt\n"
 "  -h, --[section-]headers  Näytä lohko-otsakkeiden sisältö\n"
 "  -x, --all-headers        Näytä kaikkien otsakkeiden sisältö\n"
 "  -d, --disassemble        Näytä suoritettavien lohkojen assembler-sisältö\n"
@@ -3887,7 +3850,7 @@ msgstr ""
 "  -H, --help               Näytä nämä tiedot\n"
 
 #  Ohjenäytöllä puhutaan ylempänä valitsimista. Siksi alla käytetään samaa termiä suomennoksessa.
-#: objdump.c:236
+#: objdump.c:222
 #, c-format
 msgid ""
 "\n"
@@ -3896,7 +3859,7 @@ msgstr ""
 "\n"
 " Seuraavat valitsimet ovat valinnaisia:\n"
 
-#: objdump.c:237
+#: objdump.c:223
 #, c-format
 msgid ""
 "  -b, --target=BFDNAME           Specify the target object format as BFDNAME\n"
@@ -3924,6 +3887,7 @@ msgid ""
 "      --special-syms             Include special symbols in symbol dumps\n"
 "      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
+"\n"
 msgstr ""
 "  -b, --target=BFD-NIMI          Määrittele kohdeobjektimuodoksi BFD-NIMI\n"
 "  -m, --architecture=KONE        Määrittele kohdearkkitehtuuriksi KONE\n"
@@ -3947,76 +3911,59 @@ msgstr ""
 "      --[no-]show-raw-insn       Näytä heksadesimaaliluvut symbolisen disassemblyn mukana\n"
 "      --adjust-vma=SIIRROS       Lisää arvo SIIRROS kaikkiin näytettyihin lohko-osoitteisiin\n"
 "      --insn-width=LEVEYS        Näytä LEVEYS tavua yhdellä rivillä valitsimella -d\n"
-"      --adjust-vma=SIIRROS       Lisää SIIRROS kaikkiin näytettyihin lohko-osoitteisiin\n"
 "      --special-syms             Sisällytä erikoissymbolit symbolivedoksiin\n"
 "      --prefix=ETULIITE          Lisää ETULIITE absoluuttisiin polkuihin valitsimelle -S\n"
 "      --prefix-strip=TASO        Riisu alustavat hakemistonimet valitsimelle -S\n"
-
-#: objdump.c:263
-#, c-format
-msgid ""
-"      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"      --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                             or deeper\n"
-"\n"
-msgstr ""
-"      --dwarf-depth=N        Älä näytä DIE-kohteita syvyydellä N tai syvemmällä\n"
-"      --dwarf-start=N        Näytä DIE-kohteet aloittaen numerolla N, samalla syvyydellä\n"
-"                             tai syvemmällä\n"
-"\n"
-
-#: objdump.c:275
-#, c-format
-msgid ""
-"\n"
-"Options supported for -P/--private switch:\n"
-msgstr ""
 "\n"
-"Valitsimet, jotka on tuettu -P/--private -argumentille:\n"
 
-#: objdump.c:426
+#: objdump.c:396
 #, c-format
 msgid "section '%s' mentioned in a -j option, but not found in any input file"
 msgstr "lohko '%s' mainittu valitsimessa -j, mutta ei löytynyt mistään syötetiedostosta"
 
-#: objdump.c:530
+#: objdump.c:500
 #, c-format
 msgid "Sections:\n"
 msgstr "Lohkot:\n"
 
 #  Rivin saa näkyviin esimerkiksi komennolla "objdump -x main.o"
-#: objdump.c:533 objdump.c:537
+#: objdump.c:503 objdump.c:507
 #, c-format
 msgid "Idx Name          Size      VMA       LMA       File off  Algn"
 msgstr "Ind Nimi          Koko      VirMuisOs LatMuisOs TiedSiir  Tasaus"
 
 #  Idx on ilmeisesti index. VMA on ilmeisesti Virtual Memory Address. LMA on ilmeisesti Load Memory Address: This is the address at which a section will be loaded.
-#: objdump.c:539
+#: objdump.c:509
 #, c-format
 msgid "Idx Name          Size      VMA               LMA               File off  Algn"
 msgstr "Ind Nimi          Koko      VirtMuistiOsoite  LatausMuistOsoite TiedSiir  Tasaus"
 
-#: objdump.c:543
+#: objdump.c:513
 #, c-format
 msgid "  Flags"
 msgstr "  Liput"
 
-#: objdump.c:586
+#: objdump.c:515
+#, c-format
+msgid "  Pg"
+msgstr "  Sv"
+
+#: objdump.c:558
 #, c-format
 msgid "%s: not a dynamic object"
 msgstr "%s: ei ole dynaaminen objekti"
 
-#: objdump.c:1012 objdump.c:1036
+#: objdump.c:984 objdump.c:1008
 #, c-format
 msgid " (File Offset: 0x%lx)"
 msgstr " (Tiedostosiirros: 0x%lx)"
 
-#: objdump.c:1662
+#: objdump.c:1634
 #, c-format
 msgid "disassemble_fn returned length %d"
 msgstr "disassemble_fn palautti pituuden %d"
 
-#: objdump.c:1967
+#: objdump.c:1939
 #, c-format
 msgid ""
 "\n"
@@ -4025,17 +3972,17 @@ msgstr ""
 "\n"
 "Lohkon %s disassemblointi:\n"
 
-#: objdump.c:2143
+#: objdump.c:2115
 #, c-format
 msgid "can't use supplied machine %s"
 msgstr "ei voi käyttää annettua konetta %s"
 
-#: objdump.c:2162
+#: objdump.c:2134
 #, c-format
 msgid "can't disassemble for architecture %s\n"
 msgstr "ei voi disassembloida arkkitehtuuria %s\n"
 
-#: objdump.c:2242 objdump.c:2265
+#: objdump.c:2214 objdump.c:2237
 #, c-format
 msgid ""
 "\n"
@@ -4044,7 +3991,7 @@ msgstr ""
 "\n"
 "Lohkon ’%s’ sisältöjä ei saada.\n"
 
-#: objdump.c:2406
+#: objdump.c:2378
 #, c-format
 msgid ""
 "No %s section present\n"
@@ -4053,12 +4000,12 @@ msgstr ""
 "Ei ole %s-lohkoa\n"
 "\n"
 
-#: objdump.c:2415
+#: objdump.c:2387
 #, c-format
 msgid "reading %s section of %s failed: %s"
 msgstr "lohkon %s lukeminen kohteesta %s epäonnistui: %s"
 
-#: objdump.c:2459
+#: objdump.c:2431
 #, c-format
 msgid ""
 "Contents of %s section:\n"
@@ -4067,17 +4014,17 @@ msgstr ""
 "Lohkon %s sisältö:\n"
 "\n"
 
-#: objdump.c:2590
+#: objdump.c:2562
 #, c-format
 msgid "architecture: %s, "
 msgstr "arkkitehtuuri: %s, "
 
-#: objdump.c:2593
+#: objdump.c:2565
 #, c-format
 msgid "flags 0x%08x:\n"
 msgstr "liput 0x%08x:\n"
 
-#: objdump.c:2607
+#: objdump.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -4086,45 +4033,36 @@ msgstr ""
 "\n"
 "aloitusosoite 0x"
 
-#: objdump.c:2633
-msgid "option -P/--private not supported by this file"
-msgstr "tämä tiedosto ei tule valitsinta -P/--private"
-
-#: objdump.c:2657
-#, c-format
-msgid "target specific dump '%s' not supported"
-msgstr "kohdekohtaista vedosta ’%s’ ei tueta"
-
-#: objdump.c:2721
+#: objdump.c:2642
 #, c-format
 msgid "Contents of section %s:"
 msgstr "Lohkon %s sisältö:"
 
-#: objdump.c:2723
+#: objdump.c:2644
 #, c-format
 msgid "  (Starting at file offset: 0x%lx)"
 msgstr "  (Aloitus tiedostosiirroksessa: 0x%lx)"
 
-#: objdump.c:2729
+#: objdump.c:2650
 msgid "Reading section failed"
 msgstr "Lohkon lukeminen epäonnistui"
 
-#: objdump.c:2832
+#: objdump.c:2753
 #, c-format
 msgid "no symbols\n"
 msgstr "ei symboleja\n"
 
-#: objdump.c:2839
+#: objdump.c:2760
 #, c-format
 msgid "no information for symbol number %ld\n"
 msgstr "ei tietoja symbolinumerolla %ld\n"
 
-#: objdump.c:2842
+#: objdump.c:2763
 #, c-format
 msgid "could not determine the type of symbol number %ld\n"
 msgstr "ei voitu määritellä symbolinumeron %ld tyyppiä\n"
 
-#: objdump.c:3163
+#: objdump.c:3043
 #, c-format
 msgid ""
 "\n"
@@ -4133,734 +4071,43 @@ msgstr ""
 "\n"
 "%s:     tiedostomuoto %s\n"
 
-#: objdump.c:3223
+#: objdump.c:3101
 #, c-format
 msgid "%s: printing debugging information failed"
 msgstr "%s: vianjäljitystietojen tulostaminen epäonnistui"
 
-#: objdump.c:3327
+#: objdump.c:3205
 #, c-format
 msgid "In archive %s:\n"
 msgstr "Arkistossa %s:\n"
 
-#: objdump.c:3438
+#: objdump.c:3316
 msgid "error: the start address should be before the end address"
 msgstr "virhe: aloitusosoitteen pitäisi olla ennen loppuosoitetta"
 
-#: objdump.c:3443
+#: objdump.c:3321
 msgid "error: the stop address should be after the start address"
 msgstr "virhe: pysähtymisosoitteen tulisi olla alkuosoitteen jälkeen"
 
-#: objdump.c:3455
+#: objdump.c:3333
 msgid "error: prefix strip must be non-negative"
 msgstr "virhe: etuliitenauhan on oltava ei-negatiivinen"
 
-#: objdump.c:3460
+#: objdump.c:3338
 msgid "error: instruction width must be positive"
 msgstr "virhe: käskyleveyden täytyy olla positiivinen"
 
 #  Lisäsin lainausmerkit väliviivan ja valitsinmerkin erottamiseksi
-#: objdump.c:3469
+#: objdump.c:3347
 msgid "unrecognized -E option"
 msgstr "tunnistamaton �-E�-valitsin"
 
 #  Middle-Endian ? --endian-tavujärjestystyyppi lyhennetty tavujärjestystyypiksi, joka kertoo jo kaiken.
-#: objdump.c:3480
+#: objdump.c:3358
 #, c-format
 msgid "unrecognized --endian type `%s'"
 msgstr "tunnistamaton tavujärjestystyyppi �%s�"
 
-#: od-xcoff.c:75
-#, c-format
-msgid ""
-"For XCOFF files:\n"
-"  header      Display the file header\n"
-"  aout        Display the auxiliary header\n"
-"  sections    Display the section headers\n"
-"  syms        Display the symbols table\n"
-"  relocs      Display the relocation entries\n"
-"  lineno      Display the line number entries\n"
-"  loader      Display loader section\n"
-"  except      Display exception table\n"
-"  typchk      Display type-check section\n"
-"  traceback   Display traceback tags\n"
-"  toc         Display toc symbols\n"
-msgstr ""
-"XCOFF-tiedostoille:\n"
-"  header      Näytä tiedosto-otsake\n"
-"  aout        Näytä lisäotsake\n"
-"  sections    Näytä lohko-otsakkeet\n"
-"  syms        Näytä symbolien taulu\n"
-"  relocs      Näytä sijoittelualkiot\n"
-"  lineno      Näytä rivinumeroalkiot\n"
-"  loader      Näytä lataajalohko\n"
-"  except      Näytä poikkeustaulu\n"
-"  typchk      Näytä tyyppitarksituslohko\n"
-"  traceback   Näytä paluujäljitystunnisteet\n"
-"  toc         Näytä sisällysluettelosymbolit\n"
-
-#: od-xcoff.c:416
-#, c-format
-msgid "  nbr sections:  %d\n"
-msgstr "  numerolohkot:    %d\n"
-
-#: od-xcoff.c:417
-#, c-format
-msgid "  time and date: 0x%08x  - "
-msgstr "  aika ja päivämäärä: 0x%08x  - "
-
-#: od-xcoff.c:419
-#, c-format
-msgid "not set\n"
-msgstr "ei asetettu\n"
-
-#: od-xcoff.c:426
-#, c-format
-msgid "  symbols off:   0x%08x\n"
-msgstr "  symbolien siirros: 0x%08x\n"
-
-#: od-xcoff.c:427
-#, c-format
-msgid "  nbr symbols:   %d\n"
-msgstr "  numerosymbolit: %d\n"
-
-#: od-xcoff.c:428
-#, c-format
-msgid "  opt hdr sz:    %d\n"
-msgstr "  valitsinotsakeekoko:    %d\n"
-
-#: od-xcoff.c:429
-#, c-format
-msgid "  flags:         0x%04x "
-msgstr "  liput:         0x%04x "
-
-#: od-xcoff.c:443
-#, c-format
-msgid "Auxiliary header:\n"
-msgstr "Lisäotsake:\n"
-
-#: od-xcoff.c:446
-#, c-format
-msgid "  No aux header\n"
-msgstr "  Ei lisäotsaketta\n"
-
-#: od-xcoff.c:451
-#, c-format
-msgid "warning: optionnal header size too large (> %d)\n"
-msgstr "varoitus: valinnainen otsakekoko on liian suuri (> %d)\n"
-
-#: od-xcoff.c:457
-msgid "cannot read auxhdr"
-msgstr "ei voida lukea lisäotsaketta"
-
-#: od-xcoff.c:462
-#, c-format
-msgid "  o_mflag (magic): 0x%04x 0%04o\n"
-msgstr "  o_mflag (maaginen): 0x%04x 0%04o\n"
-
-#: od-xcoff.c:463
-#, c-format
-msgid "  o_vstamp:        0x%04x\n"
-msgstr "  o_vstamp:        0x%04x\n"
-
-#: od-xcoff.c:465
-#, c-format
-msgid "  o_tsize:         0x%08x\n"
-msgstr "  o_tsize:         0x%08x\n"
-
-#: od-xcoff.c:467
-#, c-format
-msgid "  o_dsize:         0x%08x\n"
-msgstr "  o_dsize:         0x%08x\n"
-
-#: od-xcoff.c:469
-#, c-format
-msgid "  o_entry:         0x%08x\n"
-msgstr "  o_entry:         0x%08x\n"
-
-#: od-xcoff.c:471
-#, c-format
-msgid "  o_text_start:    0x%08x\n"
-msgstr "  o_text_start:    0x%08x\n"
-
-#: od-xcoff.c:473
-#, c-format
-msgid "  o_data_start:    0x%08x\n"
-msgstr "  o_data_start:    0x%08x\n"
-
-#: od-xcoff.c:477
-#, c-format
-msgid "  o_toc:           0x%08x\n"
-msgstr "  o_toc:           0x%08x\n"
-
-#: od-xcoff.c:479
-#, c-format
-msgid "  o_snentry:       0x%04x\n"
-msgstr "  o_snentry:       0x%04x\n"
-
-#: od-xcoff.c:481
-#, c-format
-msgid "  o_sntext:        0x%04x\n"
-msgstr "  o_sntext:        0x%04x\n"
-
-#: od-xcoff.c:483
-#, c-format
-msgid "  o_sndata:        0x%04x\n"
-msgstr "  o_sndata:        0x%04x\n"
-
-#: od-xcoff.c:485
-#, c-format
-msgid "  o_sntoc:         0x%04x\n"
-msgstr "  o_sntoc:         0x%04x\n"
-
-#: od-xcoff.c:487
-#, c-format
-msgid "  o_snloader:      0x%04x\n"
-msgstr "  o_snloader:      0x%04x\n"
-
-#: od-xcoff.c:489
-#, c-format
-msgid "  o_snbss:         0x%04x\n"
-msgstr "  o_snbss:         0x%04x\n"
-
-#: od-xcoff.c:491
-#, c-format
-msgid "  o_algntext:      %u\n"
-msgstr "  o_algntext:      %u\n"
-
-#: od-xcoff.c:493
-#, c-format
-msgid "  o_algndata:      %u\n"
-msgstr "  o_algndata:      %u\n"
-
-#: od-xcoff.c:495
-#, c-format
-msgid "  o_modtype:       0x%04x"
-msgstr "  o_modtype:       0x%04x"
-
-#: od-xcoff.c:500
-#, c-format
-msgid "  o_cputype:       0x%04x\n"
-msgstr "  o_cputype:       0x%04x\n"
-
-#: od-xcoff.c:502
-#, c-format
-msgid "  o_maxstack:      0x%08x\n"
-msgstr "  o_maxstack:      0x%08x\n"
-
-#: od-xcoff.c:504
-#, c-format
-msgid "  o_maxdata:       0x%08x\n"
-msgstr "  o_maxdata:       0x%08x\n"
-
-#: od-xcoff.c:507
-#, c-format
-msgid "  o_debugger:      0x%08x\n"
-msgstr "  o_debugger:      0x%08x\n"
-
-#: od-xcoff.c:521
-#, c-format
-msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
-msgstr "Lohko-otsakkeet (osoitteesta %u+%u=0x%08x osoitteeseen 0x%08x):\n"
-
-#: od-xcoff.c:526
-#, c-format
-msgid "  No section header\n"
-msgstr "  Ei lohko-otsakkeita\n"
-
-#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
-msgid "cannot read section header"
-msgstr "ei voida lukea lohko-otsakkeita"
-
-#: od-xcoff.c:534
-#, c-format
-msgid " # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-msgstr " # Nimi     paddr    vaddr    koko     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-
-#: od-xcoff.c:546
-#, c-format
-msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-msgstr "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-
-#: od-xcoff.c:557
-#, c-format
-msgid "            Flags: %08x "
-msgstr "            Liput: %08x "
-
-#: od-xcoff.c:565
-#, c-format
-msgid "overflow - nreloc: %u, nlnno: %u\n"
-msgstr "ylivuoto - nreloc: %u, nlnno: %u\n"
-
-#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
-msgid "cannot read section headers"
-msgstr "ei voida lukea lohko-otsakkeita"
-
-#: od-xcoff.c:650
-msgid "cannot read strings table len"
-msgstr "ei voida lukea merkkijonotaulupituutta"
-
-#: od-xcoff.c:664
-msgid "cannot read strings table"
-msgstr "ei voida lukea merkkijonotaulua"
-
-#: od-xcoff.c:672
-msgid "cannot read symbol table"
-msgstr "ei voida lukea symbolitaulua"
-
-#: od-xcoff.c:687
-msgid "cannot read symbol entry"
-msgstr "ei voida lukea symbolitauluriviä"
-
-#: od-xcoff.c:722
-msgid "cannot read symbol aux entry"
-msgstr "ei voida lukea symbolilisätulokohtaa"
-
-#: od-xcoff.c:744
-#, c-format
-msgid "Symbols table (strtable at 0x%08x)"
-msgstr "Symbolien taulu (strtable osoitteessa 0x%08x)"
-
-#: od-xcoff.c:749
-#, c-format
-msgid ""
-":\n"
-"  No symbols\n"
-msgstr ""
-":\n"
-"  Ei symboleja\n"
-
-#: od-xcoff.c:755
-#, c-format
-msgid " (no strings):\n"
-msgstr " (ei merkkijonoja):\n"
-
-#: od-xcoff.c:757
-#, c-format
-msgid " (strings size: %08x):\n"
-msgstr " (merkkijonojen koko: %08x):\n"
-
-#: od-xcoff.c:770
-#, c-format
-msgid "  # sc         value    section  type aux name/off\n"
-msgstr "  # sc         arvo     lohko    tyyppi lisä nimi/pois\n"
-
-#: od-xcoff.c:821
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-
-#: od-xcoff.c:827
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u\n"
-
-#. Function aux entry.
-#: od-xcoff.c:837
-#, c-format
-msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-msgstr "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-
-#: od-xcoff.c:856
-#, c-format
-msgid "  scnsym: %-8u"
-msgstr "  scnsym: %-8u"
-
-#: od-xcoff.c:858
-#, c-format
-msgid "  scnlen: %08x"
-msgstr "  scnlen: %08x"
-
-#: od-xcoff.c:859
-#, c-format
-msgid " h: parm=%08x sn=%04x al: 2**%u"
-msgstr " h: parm=%08x sn=%04x al: 2**%u"
-
-#: od-xcoff.c:863
-#, c-format
-msgid " typ: "
-msgstr " tyyppi: "
-
-#: od-xcoff.c:865
-#, c-format
-msgid " cl: "
-msgstr " cl: "
-
-#: od-xcoff.c:878
-#, c-format
-msgid " ftype: %02x "
-msgstr " ftype: %02x "
-
-#: od-xcoff.c:881
-#, c-format
-msgid "fname: %.14s"
-msgstr "fname: %.14s"
-
-#: od-xcoff.c:887
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: od-xcoff.c:889
-#, c-format
-msgid "offset: %08x"
-msgstr "offset: %08x"
-
-#: od-xcoff.c:896
-#, c-format
-msgid "  lnno: %u\n"
-msgstr "  lnno: %u\n"
-
-#: od-xcoff.c:931
-#, c-format
-msgid "Relocations for %s (%u)\n"
-msgstr "Sijoitukset kohteelle %s (%u)\n"
-
-#: od-xcoff.c:934
-msgid "cannot read relocations"
-msgstr "ei voida lukea sijoituksia"
-
-#: od-xcoff.c:937
-#, c-format
-msgid "vaddr    sgn mod sz type  symndx symbol\n"
-msgstr "vaddr    sgn mod sz tyyppi symndx symboli\n"
-
-#: od-xcoff.c:946
-msgid "cannot read relocation entry"
-msgstr "ei voida lukea sijoitusriviä"
-
-#: od-xcoff.c:950
-#, c-format
-msgid "%08x  %c   %c  %-2u "
-msgstr "%08x  %c   %c  %-2u "
-
-#: od-xcoff.c:986
-#, c-format
-msgid "Line numbers for %s (%u)\n"
-msgstr "Rivinumerot kohteelle %s (%u)\n"
-
-#: od-xcoff.c:989
-msgid "cannot read line numbers"
-msgstr "ei voida lukea rivinumeroita"
-
-#: od-xcoff.c:992
-#, c-format
-msgid "lineno  symndx/paddr\n"
-msgstr "rivinro symndx/paddr\n"
-
-#: od-xcoff.c:1000
-msgid "cannot read line number entry"
-msgstr "ei voida lukea rivinumero-kohteita"
-
-#: od-xcoff.c:1004
-#, c-format
-msgid " %-6u "
-msgstr " %-6u "
-
-#: od-xcoff.c:1043
-#, c-format
-msgid "no .loader section in file\n"
-msgstr "ei .loader-lohkoa tiedostossa\n"
-
-#: od-xcoff.c:1049
-#, c-format
-msgid "section .loader is too short\n"
-msgstr "lohko .loader on liian lyhyt\n"
-
-#: od-xcoff.c:1056
-#, c-format
-msgid "Loader header:\n"
-msgstr "Loader-otsake:\n"
-
-#: od-xcoff.c:1058
-#, c-format
-msgid "  version:           %u\n"
-msgstr "   Versio:           %u\n"
-
-#: od-xcoff.c:1061
-#, c-format
-msgid " Unhandled version\n"
-msgstr "Käsittelemätön versio\n"
-
-#: od-xcoff.c:1066
-#, c-format
-msgid "  nbr symbols:       %u\n"
-msgstr "  numerosymbolit:    %u\n"
-
-#: od-xcoff.c:1068
-#, c-format
-msgid "  nbr relocs:        %u\n"
-msgstr "  numero-reloc-tietueet:%u\n"
-
-#: od-xcoff.c:1069
-#, c-format
-msgid "  import strtab len: %u\n"
-msgstr "  tuonti strtab pituus: %u\n"
-
-#: od-xcoff.c:1072
-#, c-format
-msgid "  nbr import files:  %u\n"
-msgstr "  numerotuontitiedostot:%u\n"
-
-#: od-xcoff.c:1074
-#, c-format
-msgid "  import file off:   %u\n"
-msgstr "  tuonti tiedostosiirros: %u\n"
-
-#: od-xcoff.c:1076
-#, c-format
-msgid "  string table len:  %u\n"
-msgstr "  merkkijonotaulun pituus: %u\n"
-
-#: od-xcoff.c:1078
-#, c-format
-msgid "  string table off:  %u\n"
-msgstr "  merkkijonotaulun siirros: %u\n"
-
-#: od-xcoff.c:1081
-#, c-format
-msgid "Dynamic symbols:\n"
-msgstr "Dynaamiset symbolit:\n"
-
-#: od-xcoff.c:1082
-#, c-format
-msgid "     # value     sc IFEW ty class file  pa name\n"
-msgstr "     # arvo      sc IFEW ty luokkatiedosto pa nimi\n"
-
-#: od-xcoff.c:1087
-#, c-format
-msgid "  %4u %08x %3u "
-msgstr "  %4u %08x %3u "
-
-#: od-xcoff.c:1100
-#, c-format
-msgid " %3u %3u "
-msgstr " %3u %3u "
-
-#: od-xcoff.c:1109
-#, c-format
-msgid "(bad offset: %u)"
-msgstr "(väärä siirrososoite: %u)"
-
-#: od-xcoff.c:1116
-#, c-format
-msgid "Dynamic relocs:\n"
-msgstr "Dynaamiset relocs-tietueet:\n"
-
-#: od-xcoff.c:1117
-#, c-format
-msgid "  vaddr    sec    sz typ   sym\n"
-msgstr "  vaddr    lohko  sz tyyppi sym\n"
-
-#: od-xcoff.c:1129
-#, c-format
-msgid "  %08x %3u %c%c %2u "
-msgstr "  %08x %3u %c%c %2u "
-
-#: od-xcoff.c:1140
-#, c-format
-msgid ".text"
-msgstr ".text"
-
-#: od-xcoff.c:1143
-#, c-format
-msgid ".data"
-msgstr ".data"
-
-#: od-xcoff.c:1146
-#, c-format
-msgid ".bss"
-msgstr ".bss"
-
-#: od-xcoff.c:1149
-#, c-format
-msgid "%u"
-msgstr "%u"
-
-#: od-xcoff.c:1155
-#, c-format
-msgid "Import files:\n"
-msgstr "Tuontitiedostot:\n"
-
-#: od-xcoff.c:1187
-#, c-format
-msgid "no .except section in file\n"
-msgstr "ei .except-lohkoa tiedostossa\n"
-
-#: od-xcoff.c:1195
-#, c-format
-msgid "Exception table:\n"
-msgstr "Poikkeustaulu:\n"
-
-#: od-xcoff.c:1196
-#, c-format
-msgid "lang reason sym/addr\n"
-msgstr "kieli syy   symboli/osoite\n"
-
-#: od-xcoff.c:1204
-#, c-format
-msgid "  %02x     %02x "
-msgstr "  %02x     %02x "
-
-#: od-xcoff.c:1209
-#, c-format
-msgid "@%08x"
-msgstr "@%08x"
-
-#: od-xcoff.c:1229
-#, c-format
-msgid "no .typchk section in file\n"
-msgstr "ei .typchk-lohkooa tiedostossa\n"
-
-#: od-xcoff.c:1236
-#, c-format
-msgid "Type-check section:\n"
-msgstr "Tyyppitarkistuslohko:\n"
-
-#: od-xcoff.c:1237
-#, c-format
-msgid "offset    len  lang-id general-hash language-hash\n"
-msgstr "siirros   pituus kielitunniste general-hash language-hash\n"
-
-#: od-xcoff.c:1282
-#, c-format
-msgid " address beyond section size\n"
-msgstr "osoite lohkokoon takana\n"
-
-#: od-xcoff.c:1292
-#, c-format
-msgid " tags at %08x\n"
-msgstr " tunnisteet osoitteessa %08x\n"
-
-#: od-xcoff.c:1299
-#, c-format
-msgid " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-msgstr " versio : %u, kieli: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-
-#: od-xcoff.c:1306
-#, c-format
-msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-msgstr " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-
-#: od-xcoff.c:1312
-#, c-format
-msgid " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-msgstr " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-
-#: od-xcoff.c:1318
-#, c-format
-msgid " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-msgstr " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-
-#: od-xcoff.c:1324
-#, c-format
-msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-msgstr " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-
-#: od-xcoff.c:1337
-#, c-format
-msgid " parminfo: 0x%08x\n"
-msgstr " parminfo: 0x%08x\n"
-
-#: od-xcoff.c:1348
-#, c-format
-msgid " tb_offset: 0x%08x (start=0x%08x)\n"
-msgstr " tb_offset: 0x%08x (start=0x%08x)\n"
-
-#: od-xcoff.c:1359
-#, c-format
-msgid " hand_mask_offset: 0x%08x\n"
-msgstr " hand_mask_offset: 0x%08x\n"
-
-#: od-xcoff.c:1370
-#, c-format
-msgid " number of CTL anchors: %u\n"
-msgstr " CTL-linkkien lukumäärä: %u\n"
-
-#: od-xcoff.c:1375
-#, c-format
-msgid "  CTL[%u]: %08x\n"
-msgstr "  CTL[%u]: %08x\n"
-
-#: od-xcoff.c:1389
-#, c-format
-msgid " Name (len: %u): "
-msgstr " Nimi (pituus: %u): "
-
-#: od-xcoff.c:1392
-#, c-format
-msgid "[truncated]\n"
-msgstr "[typistetty]\n"
-
-#: od-xcoff.c:1407
-#, c-format
-msgid " alloca reg: %u\n"
-msgstr " alloca-rekisteri: %u\n"
-
-#: od-xcoff.c:1411
-#, c-format
-msgid " (end of tags at %08x)\n"
-msgstr " (tunnisteiden loppu osoitteessa %08x)\n"
-
-#: od-xcoff.c:1414
-#, c-format
-msgid " no tags found\n"
-msgstr " tunnisteita ei löytynyt\n"
-
-#: od-xcoff.c:1418
-#, c-format
-msgid " Truncated .text section\n"
-msgstr " Typistetty .text-lohko\n"
-
-#: od-xcoff.c:1503
-#, c-format
-msgid "TOC:\n"
-msgstr "Sisällysluettelo:\n"
-
-#: od-xcoff.c:1546
-#, c-format
-msgid "Nbr entries: %-8u Size: %08x (%u)\n"
-msgstr "Numerorivit: %-8u Koko: %08x (%u)\n"
-
-#: od-xcoff.c:1630
-msgid "cannot read header"
-msgstr "ei voida lukea otsaketta"
-
-#: od-xcoff.c:1638
-#, c-format
-msgid "File header:\n"
-msgstr "Tiedosto-otsake:\n"
-
-#: od-xcoff.c:1639
-#, c-format
-msgid "  magic:         0x%04x (0%04o)  "
-msgstr "  maaginen:      0x%04x (0%04o)  "
-
-#: od-xcoff.c:1643
-#, c-format
-msgid "(WRMAGIC: writable text segments)"
-msgstr "(WRMAGIC: kirjoituskelpoiset tekstisegmentit)"
-
-#: od-xcoff.c:1646
-#, c-format
-msgid "(ROMAGIC: readonly sharablee text segments)"
-msgstr "(ROMAGIC: kirjoitussuojatut jaettavat tekstisegmentit)"
-
-#: od-xcoff.c:1649
-#, c-format
-msgid "(TOCMAGIC: readonly text segments and TOC)"
-msgstr "(TOCMAGIC: kirjoitussuojatut tekstisegmentit ja sisällysluettelo)"
-
-#: od-xcoff.c:1652
-#, c-format
-msgid "unknown magic"
-msgstr "tuntematon maaginen arvo"
-
-#: od-xcoff.c:1659
-#, c-format
-msgid "  Unhandled magic\n"
-msgstr "  Käsitelemätön maaginen arvo\n"
-
 #: rclex.c:197
 msgid "invalid value specified for pragma code_page.\n"
 msgstr "virheellinen arvo annettu code_page-pragmalle.\n"
@@ -4900,234 +4147,234 @@ msgstr "%s: ei tunnistettavia vianjäljitystietoja"
 msgid "Last stabs entries before error:\n"
 msgstr "Viimeiset stabs-alkiot ennen virhettä:\n"
 
-#: readelf.c:265
+#: readelf.c:268
 msgid "<none>"
 msgstr "<ei mitään>"
 
-#: readelf.c:266
+#: readelf.c:269
 msgid "<no-name>"
 msgstr "<nimetön>"
 
-#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
-#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
-#: readelf.c:12153
+#: readelf.c:270 readelf.c:5047 readelf.c:5557 readelf.c:7794 readelf.c:7912
+#: readelf.c:8865 readelf.c:8945 readelf.c:8998 readelf.c:11860
+#: readelf.c:11863
 msgid "<corrupt>"
 msgstr "<rikki>"
 
-#: readelf.c:300
+#: readelf.c:308
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr "Ei voida hakea arvoa 0x%lx kohteelle %s\n"
 
-#: readelf.c:315
+#: readelf.c:323
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr "Muisti loppui varattaessa 0x%lx tavua kohteelle %s\n"
 
-#: readelf.c:325
+#: readelf.c:333
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr "Ei voi lukea 0x%lx tavua kohteesta %s\n"
 
-#: readelf.c:625
+#: readelf.c:697
 msgid "Don't know about relocations on this machine architecture\n"
 msgstr "Tämän konearkkitehtuurin uudelleensijoituksia ei tunneta\n"
 
 #  Viimeinen %s-parametri virheilmoitukseen: Unable to seek to 0x%x for %s\n
 #  Määritelty ainakin <linux/elf.h> -tiedostossa.
-#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+#: readelf.c:718 readelf.c:748 readelf.c:816 readelf.c:845
 msgid "relocs"
 msgstr "relocs"
 
-#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
+#: readelf.c:730 readelf.c:760 readelf.c:827 readelf.c:856
 msgid "out of memory parsing relocs\n"
 msgstr "muisti loppui jäsenneltäessä relocs-alkioita\n"
 
-#: readelf.c:889
+#: readelf.c:961
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr " Siirros    Tiedot  Tyyppi              Sym. arvo   Symbolin nimi + Lisättävä\n"
 
-#: readelf.c:891
+#: readelf.c:963
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr " Siirros    Tiedot  Tyyppi          Sym.arvo   Sym. nimi + Lisättävä\n"
 
-#: readelf.c:896
+#: readelf.c:968
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr " Siirros    Tiedot  Tyyppi              Sym. arvo   Symbolin nimi\n"
 
-#: readelf.c:898
+#: readelf.c:970
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr " Siirros  Tiedot   Tyyppi           Sym.arvo   Sym. nimi\n"
 
-#: readelf.c:906
+#: readelf.c:978
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend\n"
 msgstr "    Siirros            Tiedot           Tyyppi             Symbolin arvo   Symbolin nimi + Lisättävä\n"
 
-#: readelf.c:908
+#: readelf.c:980
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name + Addend\n"
 msgstr "  Siirros         Tiedot         Tyyppi         Sym. arvo     Sym. nimi + Lisättävä\n"
 
-#: readelf.c:913
+#: readelf.c:985
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name\n"
 msgstr "    Siirros            Tiedot           Tyyppi             Symbolin arvo   Symbolin nimi\n"
 
-#: readelf.c:915
+#: readelf.c:987
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr "  Siirros         Tiedot         Tyyppi         Sym. arvo     Symbolinimi\n"
 
-#: readelf.c:1219 readelf.c:1378 readelf.c:1386
+#: readelf.c:1291 readelf.c:1448 readelf.c:1456
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr "tunnistamaton: %-7lx"
 
-#: readelf.c:1244
+#: readelf.c:1316
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr "<tuntematon lisättävä: %lx>"
 
-#: readelf.c:1251
+#: readelf.c:1323
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr " virheellinen symboli-indeksi: %08lx"
 
-#: readelf.c:1336
+#: readelf.c:1406
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr "<merkkijonotaulun indeksi: %3ld>"
 
-#: readelf.c:1338
+#: readelf.c:1408
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr "<rikkinäinen merkkijonotauluindeksi: %3ld>"
 
-#: readelf.c:1731
+#: readelf.c:1801
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr "Suoritinkohtainen: %lx"
 
-#: readelf.c:1755
+#: readelf.c:1825
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr "Käyttöjärjestelmäkohtainen: %lx"
 
-#: readelf.c:1759 readelf.c:2821
+#: readelf.c:1829 readelf.c:2875
 #, c-format
 msgid "<unknown>: %lx"
 msgstr "<tuntematon>: %lx"
 
-#: readelf.c:1772
+#: readelf.c:1842
 msgid "NONE (None)"
 msgstr "NONE (Ei mitään)"
 
-#: readelf.c:1773
+#: readelf.c:1843
 msgid "REL (Relocatable file)"
 msgstr "REL (Uudelleensijoitettava tiedosto)"
 
-#: readelf.c:1774
+#: readelf.c:1844
 msgid "EXEC (Executable file)"
 msgstr "EXEC (Suoritettava tiedosto)"
 
-#: readelf.c:1775
+#: readelf.c:1845
 msgid "DYN (Shared object file)"
 msgstr "DYN (Jaettu objektitiedosto)"
 
-#: readelf.c:1776
+#: readelf.c:1846
 msgid "CORE (Core file)"
 msgstr "CORE (Muistivedos)"
 
-#: readelf.c:1780
+#: readelf.c:1850
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr "Suoritinkohtainen: (%x)"
 
-#: readelf.c:1782
+#: readelf.c:1852
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr "Käyttöjärjestelmäkohtainen: (%x)"
 
-#: readelf.c:1784 readelf.c:3068
+#: readelf.c:1854 readelf.c:3122
 #, c-format
 msgid "<unknown>: %x"
 msgstr "<tuntematon>: %x"
 
-#: readelf.c:1796
+#: readelf.c:1866
 msgid "None"
 msgstr "Ei mitään"
 
-#: readelf.c:1964
+#: readelf.c:2034
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr "<tuntematon>: 0x%x"
 
-#: readelf.c:2150
+#: readelf.c:2220
 msgid ", <unknown>"
 msgstr ", <tuntematon>"
 
-#: readelf.c:2236 readelf.c:7428
+#: readelf.c:2291 readelf.c:7145
 msgid "unknown"
 msgstr "tuntematon"
 
-#: readelf.c:2237
+#: readelf.c:2292
 msgid "unknown mac"
 msgstr "tuntematon mac"
 
-#: readelf.c:2301
+#: readelf.c:2356
 msgid ", relocatable"
 msgstr ", uudelleensijoitettava"
 
-#: readelf.c:2304
+#: readelf.c:2359
 msgid ", relocatable-lib"
 msgstr ", uudelleensijoitettava kirjasto"
 
-#: readelf.c:2327
+#: readelf.c:2382
 msgid ", unknown v850 architecture variant"
 msgstr ", tuntematon v850-arkkitehtuurivariantti"
 
-#: readelf.c:2384
+#: readelf.c:2438
 msgid ", unknown CPU"
 msgstr ", tuntematon prosessori"
 
-#: readelf.c:2399
+#: readelf.c:2453
 msgid ", unknown ABI"
 msgstr ", tuntematon ABI"
 
-#: readelf.c:2419 readelf.c:2453
+#: readelf.c:2473 readelf.c:2507
 msgid ", unknown ISA"
 msgstr ", tuntematon ISA"
 
-#: readelf.c:2626
+#: readelf.c:2680
 msgid "Standalone App"
 msgstr "Erillinen sovellus"
 
-#: readelf.c:2635
+#: readelf.c:2689
 msgid "Bare-metal C6000"
 msgstr "Bare-metal C6000"
 
-#: readelf.c:2645 readelf.c:3431 readelf.c:3447
+#: readelf.c:2699 readelf.c:3462 readelf.c:3478
 #, c-format
 msgid "<unknown: %x>"
 msgstr "<tuntematon: %x>"
 
-#: readelf.c:3123
+#: readelf.c:3172
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr "Käyttö: readelf <valitsimet> elf-tiedosto(t)\n"
 
-#: readelf.c:3124
+#: readelf.c:3173
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr " Näytä tietoja ELF-muotoisten tiedostojen sisällöstä\n"
 
 #  Alla "core notes" on hiukan hankala suomentaa. Notes viittaan note-lohkoihin, joita valmistaja käyttää lisätietojen sisällyttämiseksi tiedostoon. Lisätiedot olisi ehkä merkitykseltään paras suomennos. Tiedostossa saattaa esiintyä yksi tai useampi maaginen .note-lohko, jota käytetään lisätietojen tallentamiseen. Ohjelmoijille .note-lohko voi olla tuttu, mutta he eivät välttämättä osaa yhdistää sanaa "lisätiedot" lohkoon .note.
-#: readelf.c:3125
+#: readelf.c:3174
 #, c-format
 msgid ""
 " Options are:\n"
@@ -5160,7 +4407,7 @@ msgid ""
 "  -w[lLiaprmfFsoRt] or\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 " Valitsimet ovat:\n"
@@ -5185,28 +4432,17 @@ msgstr ""
 "  -D --use-dynamic       Käytä dynaamisia lohkotietoja, kun näytetään symboleja\n"
 "  -x --hex-dump=<numero|nimi>\n"
 "                         Vedosta lohkon <numero|nimi> sisältö tavuina\n"
-"  -p --string-dump=<numero|nimi>\n"
+" -p --string-dump=<numero|nimi>\n"
 "                         Vedosta lohkon <numero|nimi> sisältö merkkijonoina\n"
-"  -R --relocated-dump=<numero|nimi>\n"
+" -R --relocated-dump=<numero|nimi>\n"
 "                         Vedosta lohkon <numero|nimi> sisältö merkkijonoina\n"
-"  -w[lLiaprmfFsoRt] tai\n"
+"  -w[liaprmfFsoRt] tai\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Näytä DWARF2-vianjäljityslohkojen sisältö\n"
 
-#: readelf.c:3157
-#, c-format
-msgid ""
-"  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"  --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                         or deeper\n"
-msgstr ""
-"  --dwarf-depth=N        Älä näytä DIE-kohteita syvyydellä N tai suuremmalla\n"
-"  --dwarf-start=N        Näytä DIE-kohteet aloittaen numerolla N, samalla syvyydellä\n"
-"                         tai syvemmällä\n"
-
-#: readelf.c:3162
+#: readelf.c:3207
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
@@ -5215,7 +4451,7 @@ msgstr ""
 "  -i --instruction-dump=<numero|nimi>\n"
 "                         Disassembloi lohkon <numero|nimi> sisältö\n"
 
-#: readelf.c:3166
+#: readelf.c:3211
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -5230,110 +4466,110 @@ msgstr ""
 "  -H --help              Näytä nämä tiedot\n"
 "  -v --version           Näytä readelf-ohjelman versionumero\n"
 
-#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
+#: readelf.c:3240 readelf.c:3269 readelf.c:3273 readelf.c:13224
 msgid "Out of memory allocating dump request table.\n"
 msgstr "Muisti loppui varattaessa tiedostovedospyyntötaulua.\n"
 
-#: readelf.c:3400
+#: readelf.c:3431
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr "Virheellinen valitsin ’-%c’\n"
 
-#: readelf.c:3415
+#: readelf.c:3446
 msgid "Nothing to do.\n"
 msgstr "Ei mitään tehtävää.\n"
 
-#: readelf.c:3427 readelf.c:3443 readelf.c:8013
+#: readelf.c:3458 readelf.c:3474 readelf.c:7730
 msgid "none"
 msgstr "ei mitään"
 
 #  Selvennetty ylimääräisillä lainausmerkeillä
-#: readelf.c:3444
+#: readelf.c:3475
 msgid "2's complement, little endian"
 msgstr "kahden komplementti, �little endian�-tavujärjestys"
 
 #  Selvennetty ylimääräisillä lainausmerkeillä
-#: readelf.c:3445
+#: readelf.c:3476
 msgid "2's complement, big endian"
 msgstr "kahden komplementti, �big endian�-tavujärjestys"
 
 #  Valinnaisessa COFF-otsakkeessa on magic-kenttä, joka kertoo tiedoston tyypin.
-#: readelf.c:3463
+#: readelf.c:3494
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
 msgstr "Ei ELF-tiedosto - siinä on väärät maagiset tavut alussa\n"
 
-#: readelf.c:3473
+#: readelf.c:3504
 #, c-format
 msgid "ELF Header:\n"
 msgstr "ELF-otsake:\n"
 
 #  Valinnaisessa COFF-otsakkeessa on magic-kenttä, joka kertoo tiedoston tyypin. Joillakin COFF-lohkoilla voi olla magic-nimi, joka kertoo lohkon erikoistarkoituksesta.
-#: readelf.c:3474
+#: readelf.c:3505
 #, c-format
 msgid "  Magic:   "
 msgstr "  Maaginen numero:   "
 
 #  Levennetty tarkoituksella
-#: readelf.c:3478
+#: readelf.c:3509
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr "  Luokka:                               %s\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3480
+#: readelf.c:3511
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr "  Data:                                 %s\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3482
+#: readelf.c:3513
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr "  Versio:                               %d %s\n"
 
-#: readelf.c:3487
+#: readelf.c:3518
 #, c-format
 msgid "<unknown: %lx>"
 msgstr "<tuntematon: %lx>"
 
 #  Levennetty tarkoituksella. ABI on lyhennys sanoista Application Binary Interface
-#: readelf.c:3489
+#: readelf.c:3520
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr "  Käyttöjärjestelmä/ABI:                %s\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3491
+#: readelf.c:3522
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr "  ABI-versio:                           %d\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3493
+#: readelf.c:3524
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr "  Tyyppi:                               %s\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3495
+#: readelf.c:3526
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr "  Kone:                                 %s\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3497
+#: readelf.c:3528
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr "  Versio:                               0x%lx\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3500
+#: readelf.c:3531
 #, c-format
 msgid "  Entry point address:               "
 msgstr "  Tulokohtaosoite:                      "
 
 #  Levennetty tarkoituksella
-#: readelf.c:3502
+#: readelf.c:3533
 #, c-format
 msgid ""
 "\n"
@@ -5343,7 +4579,7 @@ msgstr ""
 "  Ohjelmaotsakkeiden alku:              "
 
 #  Levennetty tarkoituksella
-#: readelf.c:3504
+#: readelf.c:3535
 #, c-format
 msgid ""
 " (bytes into file)\n"
@@ -5352,67 +4588,68 @@ msgstr ""
 " (tavua tiedostoon)\n"
 "  Lohko-otsakkeiden alku:               "
 
-#: readelf.c:3506
+#: readelf.c:3537
 #, c-format
 msgid " (bytes into file)\n"
 msgstr " (tavua tiedostoon)\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3508
+#: readelf.c:3539
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr "  Liput:                                0x%lx%s\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3511
+#: readelf.c:3542
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr "  Tämän otsakkeen koko:                 %ld (tavua)\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3513
+#: readelf.c:3544
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr "  Ohjelmaotsakkeiden koko:              %ld (tavua)\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3515
+#: readelf.c:3546
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr "  Ohjelmaotsakkeiden lukumäärä:         %ld"
 
+#: readelf.c:3551
+#, c-format
+msgid " (%ld)"
+msgstr " (%ld)"
+
 #  Levennetty tarkoituksella
-#: readelf.c:3522
+#: readelf.c:3553
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr "  Lohko-otsakkeiden koko:               %ld (tavua)\n"
 
 #  Levennetty tarkoituksella
-#: readelf.c:3524
+#: readelf.c:3555
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr "  Lohko-otsakkeiden lukumäärä:          %ld"
 
 #  Yläpuolella olevat on levennetty tarkoituksella tämän levyisiksi
-#: readelf.c:3529
+#: readelf.c:3560
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr "  Lohko-otsakemerkkijonotaulun indeksi: %ld"
 
-#: readelf.c:3536
+#: readelf.c:3567
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr " <rikki: lukualueen ulkopuolella>"
 
-#: readelf.c:3570 readelf.c:3604
+#: readelf.c:3601 readelf.c:3635
 msgid "program headers"
 msgstr "ohjelmaotsakkeet"
 
-#: readelf.c:3671
-msgid "possibly corrupt ELF header - it has a non-zero program header offset, but no program headers"
-msgstr "mahdollisesti rikkinäinen ELF-otsake - sillä on nollasta poikkeava otsakesiirrososoite, mutta ei ohjelmaotsakkeita"
-
-#: readelf.c:3674
+#: readelf.c:3701
 #, c-format
 msgid ""
 "\n"
@@ -5421,7 +4658,7 @@ msgstr ""
 "\n"
 "Tässä tiedostossa ei ole ohjelmaotsakkeita.\n"
 
-#: readelf.c:3680
+#: readelf.c:3707
 #, c-format
 msgid ""
 "\n"
@@ -5430,12 +4667,12 @@ msgstr ""
 "\n"
 "Elf-tiedostotyyppi on %s\n"
 
-#: readelf.c:3681
+#: readelf.c:3708
 #, c-format
 msgid "Entry point "
 msgstr "Tulokohta "
 
-#: readelf.c:3683
+#: readelf.c:3710
 #, c-format
 msgid ""
 "\n"
@@ -5444,7 +4681,7 @@ msgstr ""
 "\n"
 "Ohjelmaotsakkeita on %d kpl, alkaen siirroksesta "
 
-#: readelf.c:3695 readelf.c:3697
+#: readelf.c:3722 readelf.c:3724
 #, c-format
 msgid ""
 "\n"
@@ -5453,55 +4690,55 @@ msgstr ""
 "\n"
 "Ohjelmaotsakkeet:\n"
 
-#: readelf.c:3701
+#: readelf.c:3728
 #, c-format
 msgid "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr "  Tyyppi         Siirros  VirtOsoite FyysOsoite TiedKok MuisKok Lip Tasaus\n"
 
-#: readelf.c:3704
+#: readelf.c:3731
 #, c-format
 msgid "  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
 msgstr "  Tyyppi         Siirros  VirtuaaliOsoite    FyysinenOsoite     TiedKoko MuisKoko Lip Tasaus\n"
 
-#: readelf.c:3708
+#: readelf.c:3735
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr "  Tyyppi         Siirros            VirtuaaliOsoite    FyysinenOsoite\n"
 
-#: readelf.c:3710
+#: readelf.c:3737
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
 msgstr "                 TiedostoKoko       MuistiKoko          Liput  Tasaus\n"
 
-#: readelf.c:3803
+#: readelf.c:3830
 msgid "more than one dynamic segment\n"
 msgstr "useampi kuin yksi dynaaminen segmentti\n"
 
-#: readelf.c:3822
+#: readelf.c:3849
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr "ei .dynamic-lohkoa dynaamisessa segmentissä\n"
 
-#: readelf.c:3837
+#: readelf.c:3864
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr ".dynamic-lohko ei ole dynaamisen segmentin sisällä\n"
 
-#: readelf.c:3840
+#: readelf.c:3867
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr ".dynamic-lohko ei ole dynaamisen segmentin ensimmäinen lohko.\n"
 
-#: readelf.c:3848
+#: readelf.c:3875
 msgid "Unable to find program interpreter name\n"
 msgstr "Ohjelmatulkin nimeä ei löydy\n"
 
-#: readelf.c:3855
+#: readelf.c:3882
 msgid "Internal error: failed to create format string to display program interpreter\n"
 msgstr "Sisäinen virhe: ei voitu luoda muotomerkkijonoa ohjelmatulkin näyttämiseksi\n"
 
-#: readelf.c:3859
+#: readelf.c:3886
 msgid "Unable to read program interpreter name\n"
 msgstr "Ohjelmatulkin nimeä ei voitu lukea\n"
 
-#: readelf.c:3862
+#: readelf.c:3889
 #, c-format
 msgid ""
 "\n"
@@ -5510,61 +4747,58 @@ msgstr ""
 "\n"
 "      [Pyydetään ohjelmatulkkia: %s]"
 
-#: readelf.c:3874
+#  Kartassa kohteet sijoitetaan kartalle toistensa suhteen eri paikkoihin.
+#: readelf.c:3901
 #, c-format
 msgid ""
 "\n"
 " Section to Segment mapping:\n"
 msgstr ""
 "\n"
-" Lohkosta segmenttiin ḱuvaus:\n"
+" Lohkosta Segmenttiin sijoittelu:\n"
 
-#: readelf.c:3875
+#: readelf.c:3902
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr "  Segmenttilohkot...\n"
 
-#: readelf.c:3911
+#: readelf.c:3938
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr "Virtuaalisia osoitteita ei voi tulkata ilman ohjelmaotsakkeita.\n"
 
-#: readelf.c:3927
+#: readelf.c:3954
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr "Virtuaaliosoite 0x%lx ei sijaitse missään PT_LOAD-segmentissä.\n"
 
-#: readelf.c:3942 readelf.c:3985
+#: readelf.c:3969 readelf.c:4012
 msgid "section headers"
 msgstr "lohko-otsakkeet"
 
-#: readelf.c:4032 readelf.c:4107
+#: readelf.c:4059 readelf.c:4134
 msgid "sh_entsize is zero\n"
 msgstr "sh_entsize on nolla\n"
 
-#: readelf.c:4040 readelf.c:4115
+#: readelf.c:4067 readelf.c:4142
 msgid "Invalid sh_entsize\n"
 msgstr "Virheellinen sh_entsize\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:4045 readelf.c:4120
+#: readelf.c:4072 readelf.c:4147
 msgid "symbols"
 msgstr "symbolit"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:4057 readelf.c:4132
+#: readelf.c:4084 readelf.c:4159
 msgid "symtab shndx"
 msgstr "�symtab shndx�-taululle"
 
-#: readelf.c:4392
+#: readelf.c:4419
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr "TUNTEMATON (%*.*lx)"
 
-#: readelf.c:4414
-msgid "possibly corrupt ELF file header - it has a non-zero section header offset, but no section headers\n"
-msgstr "mahdollisesti rikkinäinen ELF-tiedosto-otsake - sillä on nollasta poikkeava lohko-otssakesiirrososoite, mutta ei lohko-otsakkeita\n"
-
-#: readelf.c:4417
+#: readelf.c:4440 readelf.c:4920
 #, c-format
 msgid ""
 "\n"
@@ -5573,42 +4807,42 @@ msgstr ""
 "\n"
 "Tässä tiedostossa ei ole lohkoja.\n"
 
-#: readelf.c:4423
+#: readelf.c:4446
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr "Lohko-otsakkeita on %d kpl, alkaen siirroksesta 0x%lx:\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
-#: readelf.c:7036 readelf.c:9132
+#: readelf.c:4467 readelf.c:5043 readelf.c:5454 readelf.c:5760 readelf.c:6173
+#: readelf.c:6754 readelf.c:8843
 msgid "string table"
 msgstr "merkkijonotaulu"
 
-#: readelf.c:4511
+#: readelf.c:4534
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr "Lohkossa %d on virheellinen sh_entsize %lx (odotettiin %lx)\n"
 
-#: readelf.c:4531
+#: readelf.c:4554
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr "Tiedosto sisältää useita dynaamisia symbolitauluja\n"
 
-#: readelf.c:4544
+#: readelf.c:4567
 msgid "File contains multiple dynamic string tables\n"
 msgstr "Tiedosto sisältää useita dynaamisia merkkijonotauluja\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:4550
+#: readelf.c:4573
 msgid "dynamic strings"
 msgstr "dynaamiset merkkijonot"
 
 #  Lisäsin lainausmerkit selventämään lausetta.
-#: readelf.c:4557
+#: readelf.c:4580
 msgid "File contains multiple symtab shndx tables\n"
 msgstr "Tiedosto sisältää useita �symtab shndx�-tauluja\n"
 
 #  monikkomuoto seuraavasta msgid:stä
-#: readelf.c:4627
+#: readelf.c:4648
 #, c-format
 msgid ""
 "\n"
@@ -5618,7 +4852,7 @@ msgstr ""
 "Lohko-otsakkeet:\n"
 
 #  yksikkömuoto edellisestä msgid:stä
-#: readelf.c:4629
+#: readelf.c:4650
 #, c-format
 msgid ""
 "\n"
@@ -5627,68 +4861,68 @@ msgstr ""
 "\n"
 "Lohko-otsake:\n"
 
-#: readelf.c:4635 readelf.c:4646 readelf.c:4657
+#: readelf.c:4656 readelf.c:4667 readelf.c:4678
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr "  [Numero] Nimi\n"
 
 #  ES on kokonaiskoko, Flg on liput, Lk on Linkki, Inf on Tiedot
-#: readelf.c:4636
+#: readelf.c:4657
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr "       Tyyppi          Osoite   Siirr. Koko   Yht  LnkTdt Tasaus\n"
 
 #  ES on kokonaiskoko, Flg on liput, Lk on Linkki, Inf on Tiedot
-#: readelf.c:4640
+#: readelf.c:4661
 #, c-format
 msgid "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [Nr] Nimi              Tyyppi          Osoite   Siirr. Koko  Yht Lip Lk Tdt Tasaus\n"
 
 #  ES on kokonaiskoko, Flg on liput, Lk on Linkki, Inf on Tiedot
-#: readelf.c:4647
+#: readelf.c:4668
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr "       Tyyppi          Osoite          Siirros Koko   Yht  Lk Tdt Tasaus\n"
 
 #  ES on kokonaiskoko, Flg on liput, Lk on Linkki, Inf on Tiedot
-#: readelf.c:4651
+#: readelf.c:4672
 #, c-format
 msgid "  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [Nr] Nimi              Tyyppi          Osoite           Siirr. Koko  Yht Lip Lk Tdt Tasaus\n"
 
-#: readelf.c:4658
+#: readelf.c:4679
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr "       Tyyppi           Osoite            Siirros           Linkki\n"
 
 #  EntSize voi tarkoittaa Entire Size tai Entity Size
-#: readelf.c:4659
+#: readelf.c:4680
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr "       Koko              KokonaisKoko     Tiedot            Tasaus\n"
 
-#: readelf.c:4663
+#: readelf.c:4684
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr "  [Nr] Nimi              Tyyppi           Osoite            Siirros\n"
 
 #  EntSize voi tarkoittaa Entire Size tai Entity Size
-#: readelf.c:4664
+#: readelf.c:4685
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr "       Koko              KokonaisKoko     Liput  Link  Tied. Tasaus\n"
 
-#: readelf.c:4669
+#: readelf.c:4690
 #, c-format
 msgid "       Flags\n"
 msgstr "       Liput\n"
 
-#: readelf.c:4748
+#: readelf.c:4769
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr "lohko %u: %u-linkkiarvo sh_link on suurempi kuin lohkojen lukumäärä\n"
 
-#: readelf.c:4847
+#: readelf.c:4868
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5702,7 +4936,7 @@ msgstr ""
 "  O (vaatii käyttöjärjestelmäkohtaista lisäkäsittelyä) o (Käyttöjärjestelmäkohtainen),\n"
 "  p (suoritinkohtainen)\n"
 
-#: readelf.c:4852
+#: readelf.c:4873
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5716,25 +4950,16 @@ msgstr ""
 "  O (vaatii käyttöjärjestelmäkohtaista lisäkäsittelyä) o (Käyttöjärjestelmäkohtainen),\n"
 "  p (suoritinkohtainen)\n"
 
-#: readelf.c:4874
+#: readelf.c:4895
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr "[<tuntematon>: 0x%x] "
 
-#: readelf.c:4899
-#, c-format
-msgid ""
-"\n"
-"There are no sections to group in this file.\n"
-msgstr ""
-"\n"
-"Tässä tiedostossa ei ole lohkoja ryhmille.\n"
-
-#: readelf.c:4906
+#: readelf.c:4927
 msgid "Section headers are not available!\n"
 msgstr "Lohko-otsakkeita ei ole saatavilla!\n"
 
-#: readelf.c:4930
+#: readelf.c:4951
 #, c-format
 msgid ""
 "\n"
@@ -5744,28 +4969,28 @@ msgstr ""
 "Tässä tiedostossa ei ole lohkoryhmiä.\n"
 
 #  The sh_link field of this section contains the index of the associated SHT_SYMTAB
-#: readelf.c:4967
+#: readelf.c:4988
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
 msgstr "Virheellinen sh_link-kenttä ryhmälohkossa �%s�\n"
 
-#: readelf.c:4981
+#: readelf.c:5002
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr "Rikkoutunut otsake ryhmälohkossa �%s�\n"
 
 #  The sh_info field holds the section header index, which is displayed in decimal.
-#: readelf.c:4992
+#: readelf.c:5013
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr "Virheellinen sh_info-kenttä ryhmälohkossa �%s�\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:5031
+#: readelf.c:5052
 msgid "section data"
 msgstr "lohkodata"
 
-#: readelf.c:5040
+#: readelf.c:5061
 #, c-format
 msgid ""
 "\n"
@@ -5774,31 +4999,31 @@ msgstr ""
 "\n"
 "%sryhmälohko [%5u] �%s� [%s] sisältää %u lohkoa:\n"
 
-#: readelf.c:5043
+#: readelf.c:5064
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr "   [Indeksi]  Nimi\n"
 
-#: readelf.c:5057
+#: readelf.c:5078
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr "lohko [%5u] ryhmälohkossa [%5u] > maksimilohko [%5u]\n"
 
-#: readelf.c:5066
+#: readelf.c:5087
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr "lohko [%5u] ryhmälohkossa [%5u] on jo ryhmälohkossa [%5u]\n"
 
-#: readelf.c:5079
+#: readelf.c:5100
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr "lohko 0 ryhmälohkossa [%5u]\n"
 
-#: readelf.c:5146
+#: readelf.c:5167
 msgid "dynamic section image fixups"
 msgstr "dynaamiset lohkovedoskorjaukset"
 
-#: readelf.c:5158
+#: readelf.c:5179
 #, c-format
 msgid ""
 "\n"
@@ -5807,16 +5032,16 @@ msgstr ""
 "\n"
 "Kuvakorjaukset tarvitulle kirjastolle #%d: %s - ident: %lx\n"
 
-#: readelf.c:5161
+#: readelf.c:5182
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr "Lohkosiirros         Tyyppi                           SymVek.Tietotyyppi\n"
 
-#: readelf.c:5193
+#: readelf.c:5214
 msgid "dynamic section image relas"
 msgstr "dynaamiset lohkovedos rela-kohteet"
 
-#: readelf.c:5197
+#: readelf.c:5218
 #, c-format
 msgid ""
 "\n"
@@ -5825,16 +5050,16 @@ msgstr ""
 "\n"
 "Vedos reloc-tietueet\n"
 
-#: readelf.c:5199
+#: readelf.c:5220
 #, c-format
 msgid "Seg Offset   Type                            Addend            Seg Sym Off\n"
 msgstr "Lohko Siirros Tyyppi                         Yhteenlaskettava  Lohko Symbolit Siirros\n"
 
-#: readelf.c:5254
+#: readelf.c:5275
 msgid "dynamic string section"
 msgstr "dynaaminen merkkijonolohko"
 
-#: readelf.c:5355
+#: readelf.c:5376
 #, c-format
 msgid ""
 "\n"
@@ -5843,7 +5068,7 @@ msgstr ""
 "\n"
 "’%s’ uudelleensijoituslohko siirroksessa 0x%lx sisältää %ld tavua:\n"
 
-#: readelf.c:5370
+#: readelf.c:5391
 #, c-format
 msgid ""
 "\n"
@@ -5853,7 +5078,7 @@ msgstr ""
 "Tässä tiedostossa ei ole dynaamisia uudelleensijoituksia.\n"
 
 #  Kolme seuraava kuuluu yhteen. Siksi ensimmäinen genetiivimuodossa.
-#: readelf.c:5394
+#: readelf.c:5415
 #, c-format
 msgid ""
 "\n"
@@ -5863,18 +5088,18 @@ msgstr ""
 "Uudelleensijoituslohkon "
 
 #  Kuuluu yhteen edellisen ja seuraavan kanssa.
-#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#: readelf.c:5420 readelf.c:5836 readelf.c:5851 readelf.c:6188
 #, c-format
 msgid "'%s'"
 msgstr "’%s’"
 
 #  Kuuluu yhteen kahden edellisen kanssa.
-#: readelf.c:5401 readelf.c:5832 readelf.c:6169
+#: readelf.c:5422 readelf.c:5853 readelf.c:6190
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr " siirroksessa 0x%lx on %lu alkiota:\n"
 
-#: readelf.c:5452
+#: readelf.c:5473
 #, c-format
 msgid ""
 "\n"
@@ -5883,23 +5108,23 @@ msgstr ""
 "\n"
 "Tässä tiedostossa ei ole uudelleensijoituksia.\n"
 
-#: readelf.c:5590
+#: readelf.c:5611
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr "\tTuntematon versio.\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:5643 readelf.c:6016
+#: readelf.c:5664 readelf.c:6037
 msgid "unwind table"
 msgstr "palautustaulu"
 
-#: readelf.c:5685 readelf.c:6098 readelf.c:6358
+#: readelf.c:5706 readelf.c:6119 readelf.c:6365
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr "Ohittaa odottamattoman uudelleensijoitustyypin %s\n"
 
 #  Unwind tarkoittaa ilmeisesti jonkun aikaisemman tilanteen palautusta esimerkiksi virhetilanteessa.
-#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
+#: readelf.c:5768 readelf.c:6181 readelf.c:6762 readelf.c:6808
 #, c-format
 msgid ""
 "\n"
@@ -5909,7 +5134,7 @@ msgstr ""
 "Tässä tiedostossa ei ole palautuslohkoja.\n"
 
 #  Unwind tarkoittaa ilmeisesti jonkun aikaisemman tilanteen palautusta esimerkiksi virhetilanteessa.
-#: readelf.c:5810
+#: readelf.c:5831
 #, c-format
 msgid ""
 "\n"
@@ -5919,12 +5144,12 @@ msgstr ""
 "Ei voitu löytää palautustietolohkoja kohteelle "
 
 #  Unwind tarkoittaa ilmeisesti jonkun aikaisemman tilanteen palautusta esimerkiksi virhetilanteessa.
-#: readelf.c:5823
+#: readelf.c:5844
 msgid "unwind info"
 msgstr "palautustiedot"
 
 #  Unwind on maaginen lohkonimi ja siksi sitä ei voi kääntää.
-#: readelf.c:5825 readelf.c:6166
+#: readelf.c:5846 readelf.c:6187
 #, c-format
 msgid ""
 "\n"
@@ -5933,110 +5158,106 @@ msgstr ""
 "\n"
 "Unwind-lohko "
 
-#: readelf.c:6275
+#: readelf.c:6296
 msgid "unwind data"
 msgstr "unwind-tiedot"
 
-#: readelf.c:6329
+#: readelf.c:6350
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
 msgstr "Ohittaa odottamattoman uudelleensijoituksen siirrososoitteessa 0x%lx\n"
 
-#: readelf.c:6433
+#: readelf.c:6426
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr "[Typistetty käskykoodi]\n"
 
-#: readelf.c:6477 readelf.c:6677
+#: readelf.c:6429
 #, c-format
-msgid "Refuse to unwind"
-msgstr "Kieltäytyä palauttamaan"
+msgid "0x%02x "
+msgstr "0x%02x "
 
-#: readelf.c:6500
+#: readelf.c:6451
 #, c-format
-msgid "     [Reserved]"
-msgstr "     [Varattu]"
+msgid "  Personality routine: "
+msgstr "  Henkilörutiiini: "
 
-#: readelf.c:6528
+#: readelf.c:6469
 #, c-format
-msgid "     finish"
-msgstr "     loppu"
+msgid "  [Truncated data]\n"
+msgstr "  [Typistetyt tiedot]\n"
 
-#: readelf.c:6533 readelf.c:6619
+#: readelf.c:6484
 #, c-format
-msgid "[Spare]"
-msgstr "[Ylimääräinen]"
+msgid "  [reserved compact index %d]\n"
+msgstr "  [varattu suppea indeksi %d]\n"
 
-#: readelf.c:6640 readelf.c:6774
+#: readelf.c:6488
 #, c-format
-msgid "     [unsupported opcode]"
-msgstr "     [tukematon käskykoodi]"
+msgid "  Compact model %d\n"
+msgstr "  Suppea malli %d\n"
 
-#: readelf.c:6666
+#: readelf.c:6515
 #, c-format
 msgid "  0x%02x "
 msgstr "  0x%02x "
 
-#: readelf.c:6671
+#: readelf.c:6520
 #, c-format
-msgid "     sp = sp + %d"
-msgstr "     sp = sp + %d"
+msgid "     vsp = vsp + %d"
+msgstr "     vsp = vsp + %d"
 
-#: readelf.c:6724
+#: readelf.c:6525
 #, c-format
-msgid "pop frame {"
-msgstr "pop-kehys {"
-
-#: readelf.c:6735
-msgid "[pad]"
-msgstr "[näppäimistö]"
+msgid "     vsp = vsp - %d"
+msgstr "     vsp = vsp - %d"
 
-#: readelf.c:6763
+#: readelf.c:6531
 #, c-format
-msgid "sp = sp + %ld"
-msgstr "sp = sp + %ld"
+msgid "Refuse to unwind"
+msgstr "Kieltäytyä palauttamaan"
 
-#: readelf.c:6821
+#: readelf.c:6554
 #, c-format
-msgid "  Personality routine: "
-msgstr "  Henkilörutiini: "
+msgid "     [Reserved]"
+msgstr "     [Varattu]"
 
-#: readelf.c:6839
+#: readelf.c:6556
 #, c-format
-msgid "  [Truncated data]\n"
-msgstr "  [Typistetyt tiedot]\n"
+msgid "     vsp = r%d"
+msgstr "     vsp = r%d"
 
-#: readelf.c:6854
+#: readelf.c:6581
 #, c-format
-msgid "  Compact model %d\n"
-msgstr "  Suppea malli %d\n"
+msgid "     finish"
+msgstr "     loppu"
 
-#: readelf.c:6890
+#: readelf.c:6586
 #, c-format
-msgid "  Restore stack from frame pointer\n"
-msgstr "  Palauta pino kehysosoittimesta\n"
+msgid "[Spare]"
+msgstr "[Ylimääräinen]"
 
-#: readelf.c:6892
+#: readelf.c:6620
 #, c-format
-msgid "  Stack increment %d\n"
-msgstr "  Pinoaskelkasvatus %d\n"
+msgid "vsp = vsp + %ld"
+msgstr "vsp = vsp + %ld"
 
-#: readelf.c:6893
+#: readelf.c:6627
 #, c-format
-msgid "  Registers restored: "
-msgstr "  Rekisterit palautettu: "
+msgid "[unsupported two-byte opcode]"
+msgstr "[tukematon kaksitavuinen käskykoodi]"
 
-#: readelf.c:6898
+#: readelf.c:6631
 #, c-format
-msgid "  Return register: %s\n"
-msgstr "  Paluurekisteri: %s\n"
+msgid "     [unsupported opcode]"
+msgstr "     [tukematon käskykoodi]"
 
-#: readelf.c:6981
+#: readelf.c:6715
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr "Ei voitu paikantaa �.ARM.extab�-lohkoa, joka sisältää 0x%lx.\n"
 
-#: readelf.c:7050
+#: readelf.c:6768
 #, c-format
 msgid ""
 "\n"
@@ -6045,31 +5266,31 @@ msgstr ""
 "\n"
 "Unwind-tauluindeksi ’%s’ siirroksessa 0x%lx sisältää %lu alkiota:\n"
 
-#: readelf.c:7102
+#: readelf.c:6819
 #, c-format
 msgid "NONE\n"
 msgstr "EI MITÄÄN\n"
 
-#: readelf.c:7128
+#: readelf.c:6845
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr "Rajapintaversio: %s\n"
 
-#: readelf.c:7130
+#: readelf.c:6847
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr "<rikki: %ld>\n"
 
-#: readelf.c:7143
+#: readelf.c:6860
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr "Aikaleima: %s\n"
 
-#: readelf.c:7320 readelf.c:7366
+#: readelf.c:7037 readelf.c:7083
 msgid "dynamic section"
 msgstr "dynaaminen lohko"
 
-#: readelf.c:7444
+#: readelf.c:7161
 #, c-format
 msgid ""
 "\n"
@@ -6078,31 +5299,31 @@ msgstr ""
 "\n"
 "Tässä tiedostossa ei ole dynaamista lohkoa.\n"
 
-#: readelf.c:7482
+#: readelf.c:7199
 msgid "Unable to seek to end of file!\n"
 msgstr "Hakua ei voi suorittaa tiedoston loppuun!\n"
 
-#: readelf.c:7495
+#: readelf.c:7212
 msgid "Unable to determine the number of symbols to load\n"
 msgstr "Ei voi määritellä ladattavien symbolien lukumäärää\n"
 
-#: readelf.c:7530
+#: readelf.c:7247
 msgid "Unable to seek to end of file\n"
 msgstr "Hakua ei voi suorittaa tiedoston loppuun\n"
 
-#: readelf.c:7537
+#: readelf.c:7254
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr "Dynaamisen merkkijonotaulun pituutta ei voi määritellä\n"
 
-#: readelf.c:7543
+#: readelf.c:7260
 msgid "dynamic string table"
 msgstr "dynaaminen merkkijonotaulu"
 
-#: readelf.c:7580
+#: readelf.c:7297
 msgid "symbol information"
 msgstr "symbolitiedot"
 
-#: readelf.c:7605
+#: readelf.c:7322
 #, c-format
 msgid ""
 "\n"
@@ -6111,88 +5332,88 @@ msgstr ""
 "\n"
 "Dynaaminen lohko siirroksessa 0x%lx sisältää %u alkiota:\n"
 
-#: readelf.c:7608
+#: readelf.c:7325
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr "  Tunniste   Tyyppi                       Nimi/Arvo\n"
 
-#: readelf.c:7644
+#: readelf.c:7361
 #, c-format
 msgid "Auxiliary library"
 msgstr "Apukirjasto"
 
-#: readelf.c:7648
+#: readelf.c:7365
 #, c-format
 msgid "Filter library"
 msgstr "Suodatinkirjasto"
 
-#: readelf.c:7652
+#: readelf.c:7369
 #, c-format
 msgid "Configuration file"
 msgstr "Alustustiedosto"
 
-#: readelf.c:7656
+#: readelf.c:7373
 #, c-format
 msgid "Dependency audit library"
 msgstr "Riippuvuustarkastuskirjasto"
 
-#: readelf.c:7660
+#: readelf.c:7377
 #, c-format
 msgid "Audit library"
 msgstr "Tarkastuskirjasto"
 
-#: readelf.c:7678 readelf.c:7706 readelf.c:7734
+#: readelf.c:7395 readelf.c:7423 readelf.c:7451
 #, c-format
 msgid "Flags:"
 msgstr "Liput:"
 
-#: readelf.c:7681 readelf.c:7709 readelf.c:7736
+#: readelf.c:7398 readelf.c:7426 readelf.c:7453
 #, c-format
 msgid " None\n"
 msgstr "Ei mitään\n"
 
-#: readelf.c:7857
+#: readelf.c:7574
 #, c-format
 msgid "Shared library: [%s]"
 msgstr "Jaettu kirjasto: [%s]"
 
-#: readelf.c:7860
+#: readelf.c:7577
 #, c-format
 msgid " program interpreter"
 msgstr " ohjelmatulkki"
 
 #  soname tarkoittanee *nix-ympäristössä dynaamisen kirjaston libxml.so.6.0.1 -tyyppistä nimeä
-#: readelf.c:7864
+#: readelf.c:7581
 #, c-format
 msgid "Library soname: [%s]"
 msgstr "Kirjaston so-nimi: [%s]"
 
 #  rpath tarkoittanee samaa kuin run-path
-#: readelf.c:7868
+#: readelf.c:7585
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr "Kirjaston rpath: [%s]"
 
-#: readelf.c:7872
+#: readelf.c:7589
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr "Kirjaston run-polku: [%s]"
 
-#: readelf.c:7905
+#: readelf.c:7622
 #, c-format
 msgid " (bytes)\n"
 msgstr " (tavua)\n"
 
-#: readelf.c:7935
+#: readelf.c:7652
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr "Tarpeeton objekti: [%s]\n"
 
-#: readelf.c:8035
+#: readelf.c:7752
 msgid "| <unknown>"
 msgstr "| <tuntematon>"
 
-#: readelf.c:8068
+#: readelf.c:7785
 #, c-format
 msgid ""
 "\n"
@@ -6201,62 +5422,62 @@ msgstr ""
 "\n"
 "Versiomäärittelylohko ’%s’ sisältää %u alkiota:\n"
 
-#: readelf.c:8071
+#: readelf.c:7788
 #, c-format
 msgid "  Addr: 0x"
 msgstr "  Osoite: 0x"
 
-#: readelf.c:8073 readelf.c:8191 readelf.c:8332
+#: readelf.c:7790 readelf.c:7908 readelf.c:8046
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr "  Siirros: %#08lx Linkki: %u (%s)\n"
 
-#: readelf.c:8081
+#: readelf.c:7798
 msgid "version definition section"
 msgstr "versiomäärittelylohko"
 
 #  Rev on ilmeisesti revision.
-#: readelf.c:8114
+#: readelf.c:7831
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr "  %#06x: Rev: %d  Liput: %s"
 
-#: readelf.c:8117
+#: readelf.c:7834
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr "  Indeksi: %d  Lkm: %d  "
 
-#: readelf.c:8133
+#: readelf.c:7850
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nimi: %s\n"
 
-#: readelf.c:8135
+#: readelf.c:7852
 #, c-format
 msgid "Name index: %ld\n"
 msgstr "Nimi-indeksi: %ld\n"
 
-#: readelf.c:8157
+#: readelf.c:7874
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr "  %#06x: Lähde %d: %s\n"
 
-#: readelf.c:8160
+#: readelf.c:7877
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr "  %#06x: Lähde %d, nimi-indeksi: %ld\n"
 
-#: readelf.c:8165
+#: readelf.c:7882
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr "  Versiomäärittely lohkon lopun ohitse\n"
 
-#: readelf.c:8171
+#: readelf.c:7888
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr "  Versiomäärittely lohkon lopun ohitse\n"
 
-#: readelf.c:8186
+#: readelf.c:7903
 #, c-format
 msgid ""
 "\n"
@@ -6265,68 +5486,68 @@ msgstr ""
 "\n"
 "Versiotarpeet-lohko ’%s’ sisältää %u alkiota:\n"
 
-#: readelf.c:8189
+#: readelf.c:7906
 #, c-format
 msgid " Addr: 0x"
 msgstr " Osoite: 0x"
 
 #  kolme msgid ylempänä on Version needs section. Ilmeisesti tässä pitäisi olla sama
-#: readelf.c:8200
+#: readelf.c:7917
 msgid "version need section"
 msgstr "versiotarve-lohko"
 
-#: readelf.c:8228
+#: readelf.c:7945
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr "  %#06x: Versio:  %d"
 
-#: readelf.c:8231
+#: readelf.c:7948
 #, c-format
 msgid "  File: %s"
 msgstr "  Tiedosto: %s"
 
-#: readelf.c:8233
+#: readelf.c:7950
 #, c-format
 msgid "  File: %lx"
 msgstr "  Tiedosto: %lx"
 
-#: readelf.c:8235
+#: readelf.c:7952
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr "  Lkm: %d\n"
 
-#: readelf.c:8260
+#: readelf.c:7977
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr "  %#06x:   Nimi: %s"
 
-#: readelf.c:8263
+#: readelf.c:7980
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr "  %#06x:   Nimi-indeksi: %lx"
 
-#: readelf.c:8266
+#: readelf.c:7983
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr "  Liput: %s  Versio: %d\n"
 
 #  hiukan ylempänä on Version needs section. Ilmeisesti tässä pitäisi olla sama
-#: readelf.c:8278
+#: readelf.c:7995
 #, c-format
 msgid "  Version need aux past end of section\n"
 msgstr "  Versiotarve lohkon lopun ohitse\n"
 
 #  hiukan ylempänä on Version needs section. Ilmeisesti tässä pitäisi olla sama
-#: readelf.c:8283
+#: readelf.c:8000
 #, c-format
 msgid "  Version need past end of section\n"
 msgstr "  Versiotarve lohkon lopun ohitse\n"
 
-#: readelf.c:8320
+#: readelf.c:8037
 msgid "version string table"
 msgstr "versiomerkkijonotaulu"
 
-#: readelf.c:8327
+#: readelf.c:8041
 #, c-format
 msgid ""
 "\n"
@@ -6335,59 +5556,59 @@ msgstr ""
 "\n"
 "Versiosymbolilohko ’%s’ sisältää %d alkiota:\n"
 
-#: readelf.c:8330
+#: readelf.c:8044
 #, c-format
 msgid " Addr: "
 msgstr " Osoite: "
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:8341
+#: readelf.c:8055
 msgid "version symbol data"
 msgstr "versiosymbolidata"
 
 #  Pituus maksimissaan 9 merkkiä, "*yleinen*" on tasan 9-merkkiä. Suomennos on hiukan slanginen
-#: readelf.c:8369
+#: readelf.c:8082
 msgid "   0 (*local*)    "
 msgstr "   0 (*lokaali*)  "
 
 #  Pituus maksimissaan 9 merkkiä, (*globaali*) on liian pitkä
-#: readelf.c:8373
+#: readelf.c:8086
 msgid "   1 (*global*)   "
 msgstr "   1 (*yleinen*)  "
 
-#: readelf.c:8386
+#: readelf.c:8099
 msgid "invalid index into symbol array\n"
 msgstr "virheellinen indeksi symbolitaulukkoon\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
 #  Viittaa Elf_External_Verneed-rakenteeseen
-#: readelf.c:8420 readelf.c:9199
+#: readelf.c:8133 readelf.c:8910
 msgid "version need"
 msgstr "versiotarve"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n.
 #  Viittaa Elf_External_Vernaux -rakenteeseen.
-#: readelf.c:8430
+#: readelf.c:8143
 msgid "version need aux (2)"
 msgstr "ulkoinen versiotarve (2)"
 
-#: readelf.c:8445 readelf.c:8500
+#: readelf.c:8158 readelf.c:8213
 msgid "*invalid*"
 msgstr "*virheellinen*"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n.
 #  Viittaa Elf_External_Verdef-rakenteeseen.
-#: readelf.c:8475 readelf.c:9264
+#: readelf.c:8188 readelf.c:8975
 msgid "version def"
 msgstr "versiomäärittely"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n.
 #  Viittaa Elf_External_Verdaux-rakenteeseen.
-#: readelf.c:8495 readelf.c:9279
+#: readelf.c:8208 readelf.c:8990
 msgid "version def aux"
 msgstr "ulkoinen versiomäärittely"
 
-#: readelf.c:8529
+#: readelf.c:8242
 #, c-format
 msgid ""
 "\n"
@@ -6396,37 +5617,37 @@ msgstr ""
 "\n"
 "Tästä tiedostosta ei löytynyt versiotietoja.\n"
 
-#: readelf.c:8728
+#: readelf.c:8441
 #, c-format
 msgid "<other>: %x"
 msgstr "<toinen>: %x"
 
-#: readelf.c:8789
+#: readelf.c:8500
 msgid "Unable to read in dynamic data\n"
 msgstr "Ei voi lukea dynaamista dataa\n"
 
-#: readelf.c:8839
+#: readelf.c:8550
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr " <rikki: %14ld>"
 
-#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
+#: readelf.c:8593 readelf.c:8645 readelf.c:8669 readelf.c:8699 readelf.c:8723
 msgid "Unable to seek to start of dynamic information\n"
 msgstr "Ei voi hakea dynaamisten tietojen alkua\n"
 
-#: readelf.c:8888 readelf.c:8940
+#: readelf.c:8599 readelf.c:8651
 msgid "Failed to read in number of buckets\n"
 msgstr "Buckets-lukumäärän lukeminen epäonnistui\n"
 
-#: readelf.c:8894
+#: readelf.c:8605
 msgid "Failed to read in number of chains\n"
 msgstr "Ketjujen lukumäärän lukeminen epäonnistui\n"
 
-#: readelf.c:8996
+#: readelf.c:8707
 msgid "Failed to determine last chain length\n"
 msgstr "Viimeisen ketjupituuden määritteleminen epäonnistui\n"
 
-#: readelf.c:9040
+#: readelf.c:8751
 #, c-format
 msgid ""
 "\n"
@@ -6435,18 +5656,18 @@ msgstr ""
 "\n"
 "Symbolitaulu tiedostovedokselle:\n"
 
-#: readelf.c:9042 readelf.c:9060
+#: readelf.c:8753 readelf.c:8771
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
-msgstr "  Lohkolkm:   Arvo   Koko   Tyyppi Sidonta Näkyvyys Ind Nimi\n"
+msgstr "  Buc-lkm:    Arvo   Koko   Tyyppi Sidnta Näkyvyys Ind Nimi\n"
 
 #  Num tarkoittaa ilmeisesti number-sanaa. Bind tarkoittaa ehkä samaa kuin jossain muussa taulukossa BoundTo ?
-#: readelf.c:9044 readelf.c:9062
+#: readelf.c:8755 readelf.c:8773
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
-msgstr "  Lohkolkm:   Arvo           Koko   Tyyppi Sidnta Näkyvyys Ind Nimi\n"
+msgstr "  Buc-lkm:    Arvo           Koko   Tyyppi Sidnta Näkyvyys Ind Nimi\n"
 
-#: readelf.c:9058
+#: readelf.c:8769
 #, c-format
 msgid ""
 "\n"
@@ -6455,7 +5676,7 @@ msgstr ""
 "\n"
 "Symbolitaulu �.gnu.hash� tiedostovedokselle:\n"
 
-#: readelf.c:9101
+#: readelf.c:8812
 #, c-format
 msgid ""
 "\n"
@@ -6464,7 +5685,7 @@ msgstr ""
 "\n"
 "Symbolitaulussa ’%s’ on nolla sh_entsize-kohdetta!\n"
 
-#: readelf.c:9106
+#: readelf.c:8817
 #, c-format
 msgid ""
 "\n"
@@ -6473,32 +5694,32 @@ msgstr ""
 "\n"
 "Symbolitaulu ’%s’ sisältää %lu alkiota:\n"
 
-#: readelf.c:9111
+#: readelf.c:8822
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Num:    Arvo   Koko Tyyppi  Sidnta Näkyvyys Ind Nimi\n"
 
-#: readelf.c:9113
+#: readelf.c:8824
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Num:    Arvo           Koko Tyyppi  Sidnta Näkyvyys Ind Nimi\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:9170
+#: readelf.c:8881
 msgid "version data"
 msgstr "versiodata"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
 #  Viittaa Elf_External_Vernaux-rakenteeseen
-#: readelf.c:9212
+#: readelf.c:8923
 msgid "version need aux (3)"
 msgstr "ulkoinen versiotarve (3)"
 
-#: readelf.c:9239
+#: readelf.c:8950
 msgid "bad dynamic symbol\n"
 msgstr "virheellinen dynaaminen symboli\n"
 
-#: readelf.c:9303
+#: readelf.c:9014
 #, c-format
 msgid ""
 "\n"
@@ -6507,7 +5728,7 @@ msgstr ""
 "\n"
 "Dynaamisia symbolitietoja ei ole näytettäville symboleille.\n"
 
-#: readelf.c:9315
+#: readelf.c:9026
 #, c-format
 msgid ""
 "\n"
@@ -6516,12 +5737,12 @@ msgstr ""
 "\n"
 "Bucket-luettelopituuden histogrammi (yhteensä %lu bucketista):\n"
 
-#: readelf.c:9317 readelf.c:9387
+#: readelf.c:9028 readelf.c:9098
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr " Pituus  Numero     %% kaikesta  Yhteensä\n"
 
-#: readelf.c:9385
+#: readelf.c:9096
 #, c-format
 msgid ""
 "\n"
@@ -6530,7 +5751,7 @@ msgstr ""
 "\n"
 "�.gnu.hash�-bucket-luettelopituuden histogrammi (yhteensä %lu bucketista):\n"
 
-#: readelf.c:9451
+#: readelf.c:9162
 #, c-format
 msgid ""
 "\n"
@@ -6539,41 +5760,41 @@ msgstr ""
 "\n"
 "Dynaaminen info-segmentti siirroksessa 0x%lx sisältää %d alkiota:\n"
 
-#: readelf.c:9454
+#: readelf.c:9165
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr " Num: Nimi                           Sidotaan    Liput\n"
 
-#: readelf.c:9463
+#: readelf.c:9174
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr "<rikki: %19ld>"
 
-#: readelf.c:9545
+#: readelf.c:9256
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
 msgstr "Käsittelemätön MN10300 reloc-tyyppi löytyi SYM_DIFF reloc-tyypin jäljestä"
 
-#: readelf.c:9705
+#: readelf.c:9416
 #, c-format
 msgid "Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"
 msgstr "Kolmekymmentäkaksibittisten reloc-tyyppien puuttuvaa tietoa käytetään konenumeron %d DWARF-lohkoissa\n"
 
-#: readelf.c:10009
+#: readelf.c:9720
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
 msgstr "ei kyetä soveltamaan tukematonta reloc-tyyppiä %d lohkoon %s\n"
 
-#: readelf.c:10017
+#: readelf.c:9728
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
 msgstr "hypättiin virheellisen uudelleensijoitussiirroksen 0x%lx yli lohkossa %s\n"
 
-#: readelf.c:10041
+#: readelf.c:9752
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
 msgstr "hypättiin odottamattoman symbolityypin %s yli %ld:ssa uudelleensijoituksessa lohkossa %s\n"
 
-#: readelf.c:10087
+#: readelf.c:9798
 #, c-format
 msgid ""
 "\n"
@@ -6582,7 +5803,7 @@ msgstr ""
 "\n"
 "Lohkon %s assembly-vedos\n"
 
-#: readelf.c:10108
+#: readelf.c:9819
 #, c-format
 msgid ""
 "\n"
@@ -6591,11 +5812,11 @@ msgstr ""
 "\n"
 "Lohkossa ’%s’ ei ole vedostettavaa dataa.\n"
 
-#: readelf.c:10114
+#: readelf.c:9825
 msgid "section contents"
 msgstr "lohkosisältö"
 
-#: readelf.c:10133
+#: readelf.c:9844
 #, c-format
 msgid ""
 "\n"
@@ -6604,17 +5825,17 @@ msgstr ""
 "\n"
 "Lohkon ’%s’ merkkijonovedos:\n"
 
-#: readelf.c:10151
+#: readelf.c:9862
 #, c-format
 msgid "  Note: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr " Huomaa: Tässä lohkossa on uudelleensijoituksia sitä vastaan, mutta niitä EI ole liitetty tähän vedokseen.\n"
 
-#: readelf.c:10182
+#: readelf.c:9893
 #, c-format
 msgid "  No strings found in this section."
 msgstr "  Tästä lohkosta ei löytynyt merkkijonoja."
 
-#: readelf.c:10204
+#: readelf.c:9915
 #, c-format
 msgid ""
 "\n"
@@ -6623,18 +5844,18 @@ msgstr ""
 "\n"
 "Lohkon ’%s’ heksadesimaalilukuvedos:\n"
 
-#: readelf.c:10228
+#: readelf.c:9939
 #, c-format
 msgid " NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr " HUOMAA: Tässä lohkossa on uudelleensijoituksia sitä vastaan, mutta niitä EI ole liitetty tähän vedokseen.\n"
 
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:10362
+#: readelf.c:10073
 #, c-format
 msgid "%s section data"
 msgstr "%s lohkodata"
 
-#: readelf.c:10427
+#: readelf.c:10138
 #, c-format
 msgid ""
 "\n"
@@ -6647,248 +5868,248 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10436
+#: readelf.c:10147
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
 msgstr "lohkossa ’%s’ on NOBITS-tyyppi - sen sisältö on epäluotettava.\n"
 
-#: readelf.c:10472
+#: readelf.c:10183
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr "Tunnistamaton vianjäljityslohko: %s\n"
 
-#: readelf.c:10500
+#: readelf.c:10211
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr "Lohkoa ’%s’ ei voitu vedostaa, koska sitä ei ole olemassa!\n"
 
-#: readelf.c:10541
+#: readelf.c:10252
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr "Lohkoa %d ei voitu vedostaa, koska sitä ei ole olemassa!\n"
 
-#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
+#: readelf.c:10430 readelf.c:10444 readelf.c:10463 readelf.c:10781
 #, c-format
 msgid "None\n"
 msgstr "Ei mitään\n"
 
-#: readelf.c:10720
+#: readelf.c:10431
 #, c-format
 msgid "Application\n"
 msgstr "Sovellus\n"
 
-#: readelf.c:10721
+#: readelf.c:10432
 #, c-format
 msgid "Realtime\n"
 msgstr "Tosiaikainen\n"
 
 #  alkuosa tulostukseen "%s: not enough binary data"
-#: readelf.c:10722
+#: readelf.c:10433
 #, c-format
 msgid "Microcontroller\n"
 msgstr "Mikrokontrolleri\n"
 
-#: readelf.c:10723
+#: readelf.c:10434
 #, c-format
 msgid "Application or Realtime\n"
 msgstr "Sovellus tai tosiaikainen\n"
 
-#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
-#: readelf.c:11217 readelf.c:11238
+#: readelf.c:10445 readelf.c:10465 readelf.c:10835 readelf.c:10853
+#: readelf.c:10928 readelf.c:10949
 #, c-format
 msgid "8-byte\n"
 msgstr "8-tavuinen\n"
 
-#: readelf.c:10735 readelf.c:11220 readelf.c:11241
+#: readelf.c:10446 readelf.c:10931 readelf.c:10952
 #, c-format
 msgid "4-byte\n"
 msgstr "4-tavuinen\n"
 
-#: readelf.c:10739 readelf.c:10758
+#: readelf.c:10450 readelf.c:10469
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr "8-tavuun ja aina %d-tavuun laajennettu\n"
 
-#: readelf.c:10753
+#: readelf.c:10464
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr "8-tavua, paitsi sivu SP\n"
 
-#: readelf.c:10769 readelf.c:10859 readelf.c:11256
+#: readelf.c:10480 readelf.c:10570 readelf.c:10967
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr "lippu = %d, toimittaja = %s\n"
 
-#: readelf.c:10775
+#: readelf.c:10486
 #, c-format
 msgid "True\n"
 msgstr "Tosi\n"
 
-#: readelf.c:10904 readelf.c:11008
+#: readelf.c:10615 readelf.c:10719
 #, c-format
 msgid "Hard or soft float\n"
 msgstr "Laite- tai ohjelmistoliukuluku\n"
 
-#: readelf.c:10907
+#: readelf.c:10618
 #, c-format
 msgid "Hard float\n"
 msgstr "Laitteistoliukuluku\n"
 
-#: readelf.c:10910 readelf.c:11017
+#: readelf.c:10621 readelf.c:10728
 #, c-format
 msgid "Soft float\n"
 msgstr "Ohjelmistoliukuluku\n"
 
-#: readelf.c:10913
+#: readelf.c:10624
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr "Yksitarkkuuslaitteistoliukuluku\n"
 
-#: readelf.c:10930 readelf.c:10956
+#: readelf.c:10641 readelf.c:10667
 #, c-format
 msgid "Any\n"
 msgstr "Mikä tahansa\n"
 
-#: readelf.c:10933
+#: readelf.c:10644
 #, c-format
 msgid "Generic\n"
 msgstr "Yleinen\n"
 
-#: readelf.c:10962
+#: readelf.c:10673
 #, c-format
 msgid "Memory\n"
 msgstr "Muisti\n"
 
-#: readelf.c:11011
+#: readelf.c:10722
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr "Laitteistoliukuluku (kaksoistarkkuus)\n"
 
-#: readelf.c:11014
+#: readelf.c:10725
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr "Laitteistoliukuluku (yksittäistarkkuus)\n"
 
-#: readelf.c:11020
+#: readelf.c:10731
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr "Laitteistoliukuluku (MIPS32r2 64-bittinen liukulukuyksikkö)\n"
 
-#: readelf.c:11103
+#: readelf.c:10814
 #, c-format
 msgid "Not used\n"
 msgstr "Ei käytetty\n"
 
-#: readelf.c:11106
+#: readelf.c:10817
 #, c-format
 msgid "2 bytes\n"
 msgstr "2 tavua\n"
 
-#: readelf.c:11109
+#: readelf.c:10820
 #, c-format
 msgid "4 bytes\n"
 msgstr "4 tavua\n"
 
-#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
+#: readelf.c:10838 readelf.c:10856 readelf.c:10934 readelf.c:10955
 #, c-format
 msgid "16-byte\n"
 msgstr "16-tavuinen\n"
 
-#: readelf.c:11160
+#: readelf.c:10871
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr "DSBT-osoitteenmuodostusta ei ole käytetty\n"
 
-#: readelf.c:11163
+#: readelf.c:10874
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr "DSBT-osoitteenmuodostusta on käytetty\n"
 
-#: readelf.c:11178
+#: readelf.c:10889
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr "Paikkariippuvainen data-osoitteenmuodostus\n"
 
-#: readelf.c:11181
+#: readelf.c:10892
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr "Paikkariippumaton data-osoitteenmuodostus, GOT lähellä DP:tä\n"
 
-#: readelf.c:11184
+#: readelf.c:10895
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr "Paikkariippumaton data-osoitteenmuodostus, GOT kaukana DP:sta\n"
 
-#: readelf.c:11199
+#: readelf.c:10910
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr "Paikkariippuvainen koodiosoitteenmuodostus\n"
 
-#: readelf.c:11202
+#: readelf.c:10913
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr "Paikkariippumaton koodiosoitteenmuodostus\n"
 
-#: readelf.c:11308
+#: readelf.c:11019
 msgid "attributes"
 msgstr "attribuutit"
 
-#: readelf.c:11329
+#: readelf.c:11040
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr "VIRHE: Virheellinen lohkopituus (%d > %d)\n"
 
-#: readelf.c:11335
+#: readelf.c:11046
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr "Attribuuttilohko: %s\n"
 
-#: readelf.c:11360
+#: readelf.c:11071
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr "VIRHE: Virheellinen alilohkopituus (%d > %d)\n"
 
-#: readelf.c:11372
+#: readelf.c:11083
 #, c-format
 msgid "File Attributes\n"
 msgstr "Tiedostoattribuutit\n"
 
-#: readelf.c:11375
+#: readelf.c:11086
 #, c-format
 msgid "Section Attributes:"
 msgstr "Lohkoattribuutit:"
 
-#: readelf.c:11378
+#: readelf.c:11089
 #, c-format
 msgid "Symbol Attributes:"
 msgstr "Symboliattribuutit:"
 
-#: readelf.c:11393
+#: readelf.c:11104
 #, c-format
 msgid "Unknown tag: %d\n"
 msgstr "Tuntematon tunniste: %d\n"
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11412
+#: readelf.c:11123
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr "  Tuntemattomat lohkosisällöt\n"
 
-#: readelf.c:11419
+#: readelf.c:11130
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr "Tuntematon muototyyppi ’%c’\n"
 
-#: readelf.c:11463 readelf.c:11485
+#: readelf.c:11174 readelf.c:11196
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
 #  liblist-merkkijonotaulu ?
-#: readelf.c:11580 readelf.c:12102
+#: readelf.c:11291 readelf.c:11813
 msgid "liblist"
 msgstr "liblist"
 
-#: readelf.c:11583
+#: readelf.c:11294
 #, c-format
 msgid ""
 "\n"
@@ -6897,24 +6118,24 @@ msgstr ""
 "\n"
 "Lohko ’.liblist’ sisältää %lu alkiota:\n"
 
-#: readelf.c:11585
+#: readelf.c:11296
 msgid "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr "     Kirjasto             Aikaleima           Tark.sum.  Versio  Liput\n"
 
-#: readelf.c:11611
+#: readelf.c:11322
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr "<rikki: %9ld>"
 
-#: readelf.c:11616
+#: readelf.c:11327
 msgid " NONE"
 msgstr " EI MITÄÄN"
 
-#: readelf.c:11667
+#: readelf.c:11378
 msgid "options"
 msgstr "valitsimet"
 
-#: readelf.c:11698
+#: readelf.c:11409
 #, c-format
 msgid ""
 "\n"
@@ -6924,16 +6145,16 @@ msgstr ""
 "Lohko ’%s’ sisältää %d alkiota:\n"
 
 #  Virheilmoitus ennen maagisen .conflict-lohkon luontia (.conflict-lohkoa ei luoda).
-#: readelf.c:11859
+#: readelf.c:11570
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr "ristiriitaluettelo löydetty ilman dynaamista symbolitaulua\n"
 
 #  conflict-lohko ?
-#: readelf.c:11876 readelf.c:11891
+#: readelf.c:11587 readelf.c:11602
 msgid "conflict"
 msgstr "ristiriita"
 
-#: readelf.c:11901
+#: readelf.c:11612
 #, c-format
 msgid ""
 "\n"
@@ -6943,20 +6164,20 @@ msgstr ""
 "Lohko ’.conflict’ sisältää %lu alkiota:\n"
 
 #  Num on ehkä numero?
-#: readelf.c:11903
+#: readelf.c:11614
 msgid "  Num:    Index       Value  Name"
 msgstr "  Num:    Indeksi     Arvo   Nimi"
 
-#: readelf.c:11915 readelf.c:11995 readelf.c:12063
+#: readelf.c:11626 readelf.c:11706 readelf.c:11774
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr "<rikki: %14ld>"
 
-#: readelf.c:11936
+#: readelf.c:11647
 msgid "GOT"
 msgstr "GOT"
 
-#: readelf.c:11937
+#: readelf.c:11648
 #, c-format
 msgid ""
 "\n"
@@ -6965,77 +6186,88 @@ msgstr ""
 "\n"
 "Ensisijainen GOT:\n"
 
-#: readelf.c:11938
+#: readelf.c:11649
 #, c-format
 msgid " Canonical gp value: "
 msgstr " Sääntöjenmukainen yleiskäyttöarvo: "
 
-#: readelf.c:11942 readelf.c:12034
+#: readelf.c:11653 readelf.c:11745
 #, c-format
 msgid " Reserved entries:\n"
 msgstr " Varatut alkiot:\n"
 
-#: readelf.c:11943
+#: readelf.c:11654
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr "  %*s %10s %*s Tarkoitus\n"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
-#: readelf.c:12045
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688 readelf.c:11747
+#: readelf.c:11756
 msgid "Address"
 msgstr "Osoite"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688
 msgid "Access"
 msgstr "Haku"
 
-#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
-#: readelf.c:12046
+#: readelf.c:11656 readelf.c:11673 readelf.c:11689 readelf.c:11747
+#: readelf.c:11757
 msgid "Initial"
 msgstr "Alustava"
 
-#: readelf.c:11947
+#: readelf.c:11658
 #, c-format
 msgid " Lazy resolver\n"
 msgstr " Lazy-ratkaisija\n"
 
-#: readelf.c:11953
+#: readelf.c:11664
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr " Moduuliosoitin (GNU-laajennus)\n"
 
-#: readelf.c:11959
+#: readelf.c:11670
 #, c-format
 msgid " Local entries:\n"
 msgstr " Paikallisalkiot:\n"
 
-#: readelf.c:11975
+#  Seuraava pitäisi oikeastaan jättää pois käännettävistä teksteistä.
+#: readelf.c:11671
+#, c-format
+msgid "  %*s %10s %*s\n"
+msgstr "  %*s %10s %*s\n"
+
+#: readelf.c:11686
 #, c-format
 msgid " Global entries:\n"
 msgstr " Yleisalkiot:\n"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11687
+#, c-format
+msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11690 readelf.c:11758
 msgid "Sym.Val."
 msgstr "Sym.Arvo"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Type"
 msgstr "Tyyppi"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Ndx"
 msgstr "Ndx"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Name"
 msgstr "Nimi"
 
 #  the Global Offset Table (GOT) ja the Procedure Linkage Table (PLT)
-#: readelf.c:12032
+#: readelf.c:11743
 msgid "PLT GOT"
 msgstr "PLT GOT"
 
-#: readelf.c:12033
+#: readelf.c:11744
 #, c-format
 msgid ""
 "\n"
@@ -7046,31 +6278,36 @@ msgstr ""
 "PLT GOT:\n"
 "\n"
 
-#: readelf.c:12035
+#: readelf.c:11746
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr "  %*s %*s Tarkoitus\n"
 
-#: readelf.c:12038
+#: readelf.c:11749
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr " PLT lazy -ratkaisija\n"
 
-#: readelf.c:12040
+#: readelf.c:11751
 #, c-format
 msgid " Module pointer\n"
 msgstr " Moduuliosoitin\n"
 
-#: readelf.c:12043
+#: readelf.c:11754
 #, c-format
 msgid " Entries:\n"
 msgstr " Alkiot:\n"
 
-#: readelf.c:12110
+#: readelf.c:11755
+#, c-format
+msgid "  %*s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11821
 msgid "liblist string table"
 msgstr "liblist-merkkijonotaulu"
 
-#: readelf.c:12121
+#: readelf.c:11831
 #, c-format
 msgid ""
 "\n"
@@ -7079,348 +6316,150 @@ msgstr ""
 "\n"
 "Kirjastoluettelolohko ’%s’ sisältää %lu alkiota:\n"
 
-#: readelf.c:12125
+#: readelf.c:11835
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr "     Kirjasto             Aikaleima           Tark.sum.  Versio  Liput"
 
-#: readelf.c:12175
+#: readelf.c:11884
 msgid "NT_AUXV (auxiliary vector)"
 msgstr "NT_AUXV (apuvektori)"
 
-#: readelf.c:12177
+#: readelf.c:11886
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr "NT_PRSTATUS (prstatus-rakenne)"
 
-#: readelf.c:12179
+#: readelf.c:11888
 msgid "NT_FPREGSET (floating point registers)"
 msgstr "NT_FPREGSET (liukulukurekistereitä)"
 
-#: readelf.c:12181
+#: readelf.c:11890
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr "NT_PRPSINFO (prpsinfo-rakenne)"
 
 #  task on suomeksi tehtävä, mutta tässä tarkoitetaan ilmeisesti task (struct)-rakennetta
-#: readelf.c:12183
+#: readelf.c:11892
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr "NT_TASKSTRUCT (task-rakenne)"
 
-#: readelf.c:12185
+#: readelf.c:11894
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr "NT_PRXFPREG (user_xfpregs-rakenne)"
 
-#: readelf.c:12187
+#: readelf.c:11896
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr "NT_PPC_VMX (ppc Altivec-rekisterit)"
 
-#: readelf.c:12189
+#: readelf.c:11898
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr "NT_PPC_VSX (ppc VSX-rekisterit)"
 
-#: readelf.c:12191
+#: readelf.c:11900
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr "NT_X86_XSTATE (x86 XSAVE laajennettu tila)"
 
-#: readelf.c:12193
+#: readelf.c:11902
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr "NT_S390_HIGH_GPRS (s390 ylemmät rekisteripuoliskot)"
 
-#: readelf.c:12195
+#: readelf.c:11904
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr "NT_S390_TIMER (s390 ajastinrekisteri)"
 
-#: readelf.c:12197
+#: readelf.c:11906
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr "NT_S390_TODCMP (s390 TOD -komparaattorirekisteri)"
 
-#: readelf.c:12199
+#: readelf.c:11908
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr "NT_S390_TODPREG (s390 TOD ohjelmoitava rekisteri)"
 
-#: readelf.c:12201
+#: readelf.c:11910
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr "NT_S390_CTRS (s390 ohjausrekisterit)"
 
-#: readelf.c:12203
+#: readelf.c:11912
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr "NT_S390_PREFIX (s390 prefiksirekisteri)"
 
-#: readelf.c:12205
+#: readelf.c:11914
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr "NT_PSTATUS (pstatus-rakenne)"
 
-#: readelf.c:12207
+#: readelf.c:11916
 msgid "NT_FPREGS (floating point registers)"
 msgstr "NT_FPREGS (liukulukurekistereitä)"
 
-#: readelf.c:12209
+#: readelf.c:11918
 msgid "NT_PSINFO (psinfo structure)"
 msgstr "NT_PSINFO (psinfo-rakenne)"
 
-#: readelf.c:12211
+#: readelf.c:11920
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr "NT_LWPSTATUS (lwpstatus_t-rakenne)"
 
-#: readelf.c:12213
+#: readelf.c:11922
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr "NT_LWPSINFO (lwpsinfo_t-rakenne)"
 
-#: readelf.c:12215
+#: readelf.c:11924
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr "NT_WIN32PSTATUS (win32_pstatus-rakenne)"
 
-#: readelf.c:12223
+#: readelf.c:11932
 msgid "NT_VERSION (version)"
 msgstr "NT_VERSION (versio)"
 
-#: readelf.c:12225
+#: readelf.c:11934
 msgid "NT_ARCH (architecture)"
 msgstr "NT_ARCH (arkkitehtuuri)"
 
-#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
-#: readelf.c:12467
+#: readelf.c:11939 readelf.c:11962 readelf.c:11984
 #, c-format
 msgid "Unknown note type: (0x%08x)"
 msgstr "Tuntematon note-segmenttityyppi: (0x%08x)"
 
-#: readelf.c:12242
+#: readelf.c:11951
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr "NT_GNU_ABI_TAG (ABI-versiotunniste)"
 
-#: readelf.c:12244
+#: readelf.c:11953
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
 msgstr "NT_GNU_HWCAP (DSO-tuettu ohjelmisto-HWCAP-tiedot)"
 
-#: readelf.c:12246
+#: readelf.c:11955
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
 msgstr "NT_GNU_BUILD_ID (uniikki rakentamistunnistebittimerkkijono)"
 
-#: readelf.c:12248
+#: readelf.c:11957
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr "NT_GNU_GOLD_VERSION (kultaversio)"
 
-#: readelf.c:12266
-#, c-format
-msgid "    Build ID: "
-msgstr "    Rakentamistunniste: "
-
-#: readelf.c:12269 readelf.c:12425
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: readelf.c:12305
-#, c-format
-msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
-msgstr "    Käyttöjärjestelmä: %s, ABI: %ld.%ld.%ld\n"
-
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12322
+#: readelf.c:11974
 msgid "NetBSD procinfo structure"
 msgstr "NetBSD procinfo-rakenne"
 
 #  reg on ehkä rekisteri
-#: readelf.c:12349 readelf.c:12363
+#: readelf.c:12001 readelf.c:12015
 msgid "PT_GETREGS (reg structure)"
 msgstr "PT_GETREGS (reg-rakenne)"
 
 #  fpreg viittaa ilmeisesti floating point registers eli liukulukurekistereihin
-#: readelf.c:12351 readelf.c:12365
+#: readelf.c:12003 readelf.c:12017
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr "PT_GETFPREGS (fpreg-rakenne)"
 
-#: readelf.c:12371
+#: readelf.c:12023
 #, c-format
 msgid "PT_FIRSTMACH+%d"
 msgstr "PT_FIRSTMACH+%d"
 
-#: readelf.c:12384
-msgid "NT_STAPSDT (SystemTap probe descriptors)"
-msgstr "NT_STAPSDT (SystemTap-tunnusteluselosteet)"
-
-#: readelf.c:12417
-#, c-format
-msgid "    Provider: %s\n"
-msgstr "    Palvelutarjoaja: %s\n"
-
-#: readelf.c:12418
-#, c-format
-msgid "    Name: %s\n"
-msgstr "    Nimi: %s\n"
-
-#: readelf.c:12419
-#, c-format
-msgid "    Location: "
-msgstr "    Sijainti: "
-
-#: readelf.c:12421
-#, c-format
-msgid ", Base: "
-msgstr ", Perusosoite: "
-
-#: readelf.c:12423
-#, c-format
-msgid ", Semaphore: "
-msgstr ", Opastin: "
-
-#: readelf.c:12426
-#, c-format
-msgid "    Arguments: %s\n"
-msgstr "    Argumentit: %s\n"
-
-#: readelf.c:12439
-msgid "NT_VMS_MHD (module header)"
-msgstr "NT_VMS_MHD (moduuliotsake)"
-
-#: readelf.c:12441
-msgid "NT_VMS_LNM (language name)"
-msgstr "NT_VMS_LNM (kielinimi)"
-
-#: readelf.c:12443
-msgid "NT_VMS_SRC (source files)"
-msgstr "NT_VMS_SRC (lähdetiedostot)"
-
-#: readelf.c:12445
-msgid "NT_VMS_TITLE"
-msgstr "NT_VMS_TITLE"
-
-#: readelf.c:12447
-msgid "NT_VMS_EIDC (consistency check)"
-msgstr "NT_VMS_EIDC (johdonmukaisuustarkistus)"
-
-#: readelf.c:12449
-msgid "NT_VMS_FPMODE (FP mode)"
-msgstr "NT_VMS_FPMODE (FP-tila)"
-
-#: readelf.c:12451
-msgid "NT_VMS_LINKTIME"
-msgstr "NT_VMS_LINKTIME"
-
-#: readelf.c:12453
-msgid "NT_VMS_IMGNAM (image name)"
-msgstr "NT_VMS_IMGNAM (vedosnimi)"
-
-#: readelf.c:12455
-msgid "NT_VMS_IMGID (image id)"
-msgstr "NT_VMS_IMGID (vedostunniste)"
-
-#: readelf.c:12457
-msgid "NT_VMS_LINKID (link id)"
-msgstr "NT_VMS_LINKID (linkitystunniste)"
-
-#: readelf.c:12459
-msgid "NT_VMS_IMGBID (build id)"
-msgstr "NT_VMS_IMGBID (rakentamistunniste)"
-
-#: readelf.c:12461
-msgid "NT_VMS_GSTNAM (sym table name)"
-msgstr "NT_VMS_GSTNAM (symbolitaulunimi)"
-
-#: readelf.c:12463
-msgid "NT_VMS_ORIG_DYN"
-msgstr "NT_VMS_ORIG_DYN"
-
-#: readelf.c:12465
-msgid "NT_VMS_PATCHTIME"
-msgstr "NT_VMS_PATCHTIME"
-
-#: readelf.c:12481
-#, c-format
-msgid "    Creation date  : %.17s\n"
-msgstr "    Luontipäivämäärä  : %.17s\n"
-
-#: readelf.c:12482
-#, c-format
-msgid "    Last patch date: %.17s\n"
-msgstr "    Viimeisen korjausken päivämäärä: %.17s\n"
-
-#: readelf.c:12483
-#, c-format
-msgid "    Module name    : %s\n"
-msgstr "    Moduulinimi    : %s\n"
-
-#: readelf.c:12484
-#, c-format
-msgid "    Module version : %s\n"
-msgstr "    Moduuliversio  : %s\n"
-
-#: readelf.c:12487
-#, c-format
-msgid "    Invalid size\n"
-msgstr "    Virheellinen koko\n"
-
-#: readelf.c:12490
-#, c-format
-msgid "   Language: %s\n"
-msgstr "   Kieli: %s\n"
-
-#: readelf.c:12494
-msgid "   FP mode: 0x%016"
-msgstr "   FP-tila: 0x%016"
-
-#: readelf.c:12498
-#, c-format
-msgid "   Link time: "
-msgstr "   Linkitysaika: "
-
-#: readelf.c:12504
-#, c-format
-msgid "   Patch time: "
-msgstr "   Paikkausaika: "
-
-#: readelf.c:12510
-#, c-format
-msgid "   Major id: %u,  minor id: %u\n"
-msgstr "   Major-tunniste: %u,  minor-tunniste: %u\n"
-
-#: readelf.c:12513
-#, c-format
-msgid "   Manip date  : "
-msgstr "   Manip-päivämäärä  : "
-
-#: readelf.c:12516
-msgid ""
-"\n"
-"   Link flags  : 0x%016"
-msgstr ""
-"\n"
-"   Linkitysliput  : 0x%016"
-
-#: readelf.c:12519
-#, c-format
-msgid "   Header flags: 0x%08x\n"
-msgstr "   Otsakeliput: 0x%08x\n"
-
-#: readelf.c:12521
-#, c-format
-msgid "   Image id    : %s\n"
-msgstr "   Vedostunniste : %s\n"
-
-#: readelf.c:12525
-#, c-format
-msgid "    Image name: %s\n"
-msgstr "    Vedosnimi: %s\n"
-
-#: readelf.c:12528
-#, c-format
-msgid "    Global symbol table name: %s\n"
-msgstr "    Yleinen symbolitaulunimi: %s\n"
-
-#: readelf.c:12531
-#, c-format
-msgid "    Image id: %s\n"
-msgstr "    Vedostunniste: %s\n"
-
-#: readelf.c:12534
-#, c-format
-msgid "    Linker id: %s\n"
-msgstr "    Linkkeritunniste: %s\n"
-
 #  Viimeinen %s-parametri virheilmoituksessa: Unable to seek to 0x%x for %s\n
-#: readelf.c:12609
+#: readelf.c:12080
 msgid "notes"
 msgstr "notes"
 
-#: readelf.c:12615
+#: readelf.c:12086
 #, c-format
 msgid ""
 "\n"
@@ -7429,36 +6468,29 @@ msgstr ""
 "\n"
 "Notes-segmenttejä siirroksessa 0x%08lx pituudella 0x%08lx:\n"
 
-#: readelf.c:12617
+#  Toinen sarkain pois ensimmäisestä väliköstä, koska Omistajat on pitempi kuin Owner
+#: readelf.c:12088
 #, c-format
-msgid "  %-20s %10s\tDescription\n"
-msgstr "  %-20s %10s\tKuvaus\n"
+msgid "  Owner\t\tData size\tDescription\n"
+msgstr "  Omistajat\tData-koko\tKuvaus\n"
 
-#: readelf.c:12617
-msgid "Owner"
-msgstr "Omistaja"
-
-#: readelf.c:12617
-msgid "Data size"
-msgstr "Data-koko"
-
-#: readelf.c:12655 readelf.c:12668
+#: readelf.c:12108 readelf.c:12121
 #, c-format
 msgid "corrupt note found at offset %lx into core notes\n"
 msgstr "rikkoutunut note-segmentti löytyi siirroksesta %lx kohteeseen ydin notes\n"
 
 #  Tarkoittaako descsize samaa kuin description size?
-#: readelf.c:12657 readelf.c:12670
+#: readelf.c:12110 readelf.c:12123
 #, c-format
 msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
 msgstr " tyyppi:%lx, nimikoko:%08lx, kuvauskoko: %08lx\n"
 
-#: readelf.c:12766
+#: readelf.c:12219
 #, c-format
 msgid "No note segments present in the core file.\n"
 msgstr "Ydintiedostossa ei ole note-segmenttejä.\n"
 
-#: readelf.c:12853
+#: readelf.c:12306
 msgid ""
 "This instance of readelf has been built without support for a\n"
 "64 bit data type and so it cannot read 64 bit ELF files.\n"
@@ -7466,12 +6498,12 @@ msgstr ""
 "Tähän readelf-binaariin ei ole käännetty tukea 64-bittiselle\n"
 "datatyypille, joten 64-bittisiä ELF-tiedostoja ei voida lukea.\n"
 
-#: readelf.c:12900
+#: readelf.c:12353
 #, c-format
 msgid "%s: Failed to read file header\n"
 msgstr "%s: Tiedosto-otsakkeen lukeminen epäonnistui\n"
 
-#: readelf.c:12914
+#: readelf.c:12366
 #, c-format
 msgid ""
 "\n"
@@ -7480,47 +6512,89 @@ msgstr ""
 "\n"
 "Tiedosto: %s\n"
 
-#: readelf.c:13086
+#: readelf.c:12615
+#, c-format
+msgid "%s: the archive index is empty\n"
+msgstr "%s: arkistoindeksi on tyhjä\n"
+
+#: readelf.c:12623 readelf.c:12647
+#, c-format
+msgid "%s: failed to read archive index\n"
+msgstr "%s: arkistoindeksin lukeminen epäonnistui\n"
+
+#: readelf.c:12632
+#, c-format
+msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
+msgstr "%s: arkistoindeksissä otaksutaan olevan %ld alkiota, mutta otsakkeen koko on liian pieni\n"
+
+#: readelf.c:12640
+msgid "Out of memory whilst trying to read archive symbol index\n"
+msgstr "Muisti loppui kun yritettiin lukea arkiston symboli-indeksiä\n"
+
+#: readelf.c:12658
+msgid "Out of memory whilst trying to convert the archive symbol index\n"
+msgstr "Muisti loppui kun yritettiin muuntaa arkiston symboli-indeksiä\n"
+
+#: readelf.c:12670
+#, c-format
+msgid "%s: the archive has an index but no symbols\n"
+msgstr "%s: arkistossa on indeksi, mutta ei symboleja\n"
+
+#: readelf.c:12677
+msgid "Out of memory whilst trying to read archive index symbol table\n"
+msgstr "Muisti loppui yritettäessä lukea arkistoindeksisymbolitaulua\n"
+
+#: readelf.c:12683
+#, c-format
+msgid "%s: failed to read archive index symbol table\n"
+msgstr "%s: arkistoindeksisymbolitaulun lukeminen epäonnistui\n"
+
+#: readelf.c:12707
+#, c-format
+msgid "%s has no archive index\n"
+msgstr "%s ei ole arkistoindeksiä\n"
+
+#: readelf.c:12943
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr "%s: ei kyetä vedostamaan indeksiä, koska mitään ei löytynyt\n"
 
-#: readelf.c:13092
+#: readelf.c:12949
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr "Arkiston %s indeksi: (%ld alkiota, 0x%lx tavua symbolitaulussa)\n"
 
-#: readelf.c:13110
+#: readelf.c:12967
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr "Binaari %s sisältää:\n"
 
-#: readelf.c:13118
+#: readelf.c:12975
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr "%s: symbolitaulun loppu tavoitettiin ennen indeksin loppua\n"
 
-#: readelf.c:13129
+#: readelf.c:12986
 #, c-format
 msgid "%s: symbols remain in the index symbol table, but without corresponding entries in the index table\n"
 msgstr "%s: symbolit jäävät indeksisymbolitauluun, mutta ilman vastaavia alkioita indeksitaulussa\n"
 
-#: readelf.c:13134
+#: readelf.c:12991
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr "%s: objektitiedostojen alkuunpaluun haku arkistossa epäonnistui\n"
 
-#: readelf.c:13217 readelf.c:13300
+#: readelf.c:13074 readelf.c:13150
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr "Syötetiedosto ’%s’ ei ole luettava.\n"
 
-#: readelf.c:13239
+#: readelf.c:13096
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr "%s: arkistojäsenen haku epäonnistui.\n"
 
-#: readelf.c:13318
+#: readelf.c:13168
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr "Tiedosto %s ei ole arkisto, joten sen indeksiä ei voi näyttää.\n"
@@ -7810,12 +6884,12 @@ msgstr "hakemisto"
 #  toinen parametri viestissä "%s: %s: osoite ei ole lukualueen sisällä"
 #: rescoff.c:218
 msgid "named directory entry"
-msgstr "nimetty hakemistorivi"
+msgstr "nimetty hakemistoalkio"
 
 #  toinen parametri viestissä "%s: %s: osoite ei ole lukualueen sisällä"
 #: rescoff.c:227
 msgid "directory entry name"
-msgstr "hakemistorivin nimi"
+msgstr "hakemistoalkion nimi"
 
 #  toinen parametri viestissä "%s: %s: osoite ei ole lukualueen sisällä"
 #: rescoff.c:247
@@ -7830,7 +6904,7 @@ msgstr "nimetty resurssi"
 #  toinen parametri viestissä "%s: %s: osoite ei ole lukualueen sisällä"
 #: rescoff.c:270
 msgid "ID directory entry"
-msgstr "ID-hakemiston rivi"
+msgstr "ID-hakemiston alkio"
 
 #  toinen parametri viestissä "%s: %s: osoite ei ole lukualueen sisällä"
 #: rescoff.c:287
@@ -7882,6 +6956,11 @@ msgstr "tilapäistä tiedostoa �%s� ei voi avata: %s"
 msgid "can't redirect stdout: `%s': %s"
 msgstr "vakiotulostetta: �%s� ei voi uudelleenohjata: %s"
 
+#: resrc.c:284
+#, c-format
+msgid "%s %s: %s"
+msgstr "%s %s: %s"
+
 #: resrc.c:329
 #, c-format
 msgid "can't execute `%s': %s"
@@ -7916,6 +6995,12 @@ msgstr "Käytetään �%s�\n"
 msgid "preprocessing failed."
 msgstr "esikäsittely epäonnistui."
 
+#  Ensimmäinen parametri errmsg_fmt, toinen parametrit errmsg_arg, kolmas parametri virhenumero muutettuna merkkijonoselitykseksi
+#: resrc.c:631
+#, c-format
+msgid "%s:%d: %s\n"
+msgstr "%s:%d: %s\n"
+
 #: resrc.c:639
 #, c-format
 msgid "%s: unexpected EOF"
@@ -7931,7 +7016,7 @@ msgstr "%s: lukeminen palautti %lu merkistä (vain) %lu"
 #: resrc.c:727 resrc.c:1502
 #, c-format
 msgid "stat failed on bitmap file `%s': %s"
-msgstr "stat-kutsu ei onnistunut bittikuvaustiedostossa �%s�: %s"
+msgstr "stat-kutsu ei onnistunut bittikarttatiedostossa �%s�: %s"
 
 #: resrc.c:778
 #, c-format
@@ -8019,13 +7104,13 @@ msgstr "virheellinen argumentti valitsimelle --format: %s"
 msgid "Invalid radix: %s\n"
 msgstr "Virheellinen kantaluku: %s\n"
 
-#: srconv.c:1733
+#: srconv.c:1732
 #, c-format
 msgid "Convert a COFF object file into a SYSROFF object file\n"
 msgstr "Muuntaa COFF-objektitiedoston SYSROFF-objektitiedostoksi\n"
 
 #  COMMON on lohko,joka sisältää yleisiä symboleja, joille ei ole vielä varattu muistia.
-#: srconv.c:1734
+#: srconv.c:1733
 #, c-format
 msgid ""
 " The options are:\n"
@@ -8044,7 +7129,7 @@ msgstr ""
 "  -h --help        Näytä nämä tiedot\n"
 "  -v --version     Tulosta ohjelman versionumero\n"
 
-#: srconv.c:1880
+#: srconv.c:1879
 #, c-format
 msgid "unable to open output file %s"
 msgstr "ei voi avata tulostetiedostoa %s"
@@ -8089,98 +7174,98 @@ msgstr "tunnistamaton ristiviitetyyppi"
 msgid "missing index type"
 msgstr "indeksityyppi puuttuu"
 
-#: stabs.c:2129
+#: stabs.c:2122
 msgid "unknown virtual character for baseclass"
 msgstr "tuntematon virtuaalimerkki kantaluokalle"
 
-#: stabs.c:2147
+#: stabs.c:2140
 msgid "unknown visibility character for baseclass"
 msgstr "tuntematon näkyvyysmerkki kantaluokalle"
 
-#: stabs.c:2337
+#: stabs.c:2326
 msgid "unnamed $vb type"
 msgstr "nimeämätön $vb-tyyppi"
 
-#: stabs.c:2343
+#: stabs.c:2332
 msgid "unrecognized C++ abbreviation"
 msgstr "tunnistamaton C++-lyhenne"
 
-#: stabs.c:2419
+#: stabs.c:2408
 msgid "unknown visibility character for field"
 msgstr "tuntematon näkyvyysmerkki kentälle"
 
-#: stabs.c:2679
+#: stabs.c:2660
 msgid "const/volatile indicator missing"
 msgstr "const/volatile-indikaattori puuttuu"
 
-#: stabs.c:2924
+#: stabs.c:2896
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr "Kohdetta �%s� ei eheytetä\n"
 
 #  N_EXCL tarkoittaa include-tiedostoa, jonka linkkeri on poistanut tarpeettomana (duplikaattina), koska se on jo määritelty kerran jossain toisessa käännösyksikössä. Se on nyt siis exclude-tiedosto, ei include-tiedosto ;-)
-#: stabs.c:3224
+#: stabs.c:3196
 msgid "Undefined N_EXCL"
 msgstr "Määrittelemätön linkkerin poistama include-tiedosto"
 
-#: stabs.c:3304
+#: stabs.c:3276
 #, c-format
 msgid "Type file number %d out of range\n"
 msgstr "Tyyppitiedoston numero %d numeroalueen ulkopuolella\n"
 
-#: stabs.c:3309
+#: stabs.c:3281
 #, c-format
 msgid "Type index number %d out of range\n"
 msgstr "Tyyppi-indeksinumero %d numeroalueen ulkopuolella\n"
 
-#: stabs.c:3388
+#: stabs.c:3360
 #, c-format
 msgid "Unrecognized XCOFF type %d\n"
 msgstr "Tunnistamaton XCOFF-tyyppi %d\n"
 
-#: stabs.c:3680
+#: stabs.c:3652
 #, c-format
 msgid "bad mangled name `%s'\n"
 msgstr "virheellinen runneltu nimi �%s�\n"
 
-#: stabs.c:3775
+#: stabs.c:3747
 #, c-format
 msgid "no argument types in mangled string\n"
 msgstr "runnellussa merkkijonossa ei ole argumenttityyppejä\n"
 
-#: stabs.c:5125
+#: stabs.c:5094
 #, c-format
 msgid "Demangled name is not a function\n"
 msgstr "Eheytetty nimi ei ole funktio\n"
 
 #  v3 arglist viittaa stabs.c -funktioon stab_demangle_v3_arglist(...). Funktion nimessä v3 tarkoittaa ilmeisesti, että funktion struct demangle_component *arglist -argumentti järjestetään v-muotoiseksi puuksi (three -> tree). Yhden argumentin tyyppi on ei-odotettu, jolloin tulostetaan tämä tuloste.
-#: stabs.c:5167
+#: stabs.c:5136
 #, c-format
 msgid "Unexpected type in v3 arglist demangling\n"
 msgstr "Tuntematon tyyppi eheytettäessä puumuotoista argumenttiluetteloa\n"
 
-#: stabs.c:5234
+#: stabs.c:5203
 #, c-format
 msgid "Unrecognized demangle component %d\n"
 msgstr "Tunnistamaton eheytyskomponentti %d\n"
 
-#: stabs.c:5286
+#: stabs.c:5255
 #, c-format
 msgid "Failed to print demangled template\n"
 msgstr "Runnellun mallinteen tulostaminen epäonnistui\n"
 
-#: stabs.c:5366
+#: stabs.c:5335
 #, c-format
 msgid "Couldn't get demangled builtin type\n"
 msgstr "Ei saatu eheytettyä rakenteeseen sisältyvää tyyppiä\n"
 
 #  Lähdekoodissa tutkitaan bfd_boolean -tyyppistä *pvarargs-parametriä ja jos se on NULL, niin tulostetaan alla oleva ilmoitus. Muussa tapauksessa palautetaan parametrin kautta TRUE. Boolean arvo kertoo, ottaako eheytetty metodi vaihtelevan määrän parametrejä vai ei.
-#: stabs.c:5415
+#: stabs.c:5384
 #, c-format
 msgid "Unexpected demangled varargs\n"
 msgstr "Odottamaton eheytetty totuusarvo\n"
 
-#: stabs.c:5422
+#: stabs.c:5391
 #, c-format
 msgid "Unrecognized demangled builtin type\n"
 msgstr "Tunnistamaton eheytetty rakenteeseen sisältyvä tyyppi\n"
@@ -8195,13 +7280,13 @@ msgstr "virheellinen kokonaislukuargumentti %s"
 msgid "invalid minimum string length %d"
 msgstr "virheellinen minimimerkkijonopituus %d"
 
-#: strings.c:651
+#: strings.c:647
 #, c-format
 msgid " Display printable strings in [file(s)] (stdin by default)\n"
 msgstr " Näyttää tulostettavat merkkijonot kohteesta [tiedosto(t)] (oletuksena vakiosyöte)\n"
 
 #  Tämä mahdollistaa vain Big-Endian ja Little-Endian-tavujärjestyksen määrittelyn. Middle-Endian on tuntematon.
-#: strings.c:652
+#: strings.c:648
 #, c-format
 msgid ""
 " The options are:\n"
@@ -8227,7 +7312,7 @@ msgstr ""
 "  -o                          Alias kohteelle --radix=o\n"
 "  -T --target=<BFD-NIMI>      Määrittele binaaritiedostomuoto\n"
 "  -e --encoding={s,S,b,l,B,L} Valitse merkin koko ja tavujärjestystyyppi:\n"
-"                              s = 7-bittiä, S = 8-bittiä, {b,l} = 16-bittiä, {B,L} = 32-bittiä\n"
+"                              s = 7-bittiä, S = 8-bittiä, {b,l} = 16-bittiä, {B,L} = 32-bitttiä\n"
 "  @<tiedosto>                 Lue valitsimet tiedostosta <tiedosto>\n"
 "  -h --help                   Näytä nämä tiedot\n"
 "  -v -V --version             Tulosta ohjelman versionumero\n"
@@ -8255,8 +7340,8 @@ msgstr "syötetiedostoa %s ei voi avata"
 
 #: version.c:36
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: version.c:37
 #, c-format
@@ -8271,7 +7356,7 @@ msgstr ""
 
 #: windmc.c:190
 #, c-format
-msgid "can't create %s file `%s' for output.\n"
+msgid "can't create %s file ,%s' for output.\n"
 msgstr "ei voi luoda tiedostoa %s tulosteeseen �%s�.\n"
 
 #: windmc.c:198
@@ -8290,7 +7375,7 @@ msgid ""
 "  -C --codepage_in=<val>       Set codepage when reading mc text file\n"
 "  -d --decimal_values          Print values to text files decimal\n"
 "  -e --extension=<extension>   Set header extension used on export header file\n"
-"  -F --target <target>         Specify output target for endianness.\n"
+"  -F --target <target>         Specify output target for endianess.\n"
 "  -h --headerdir=<directory>   Set the export directory for headers\n"
 "  -u --unicode_in              Read input file as UTF16 file\n"
 "  -U --unicode_out             Write binary messages as UFT16\n"
@@ -8305,7 +7390,7 @@ msgstr ""
 " Valitsimet ovat:\n"
 "  -a --ascii_in                Lue syötetiedosto ASCII-tiedostona\n"
 "  -A --ascii_out               Kirjoita binaarisanomat ASCII-muodossa\n"
-"  -b --binprefix               �.bin�-tiedostonimillä on �.mc tiedostonimi_� -prefiksi ainutlaatuisuuden takaamiseksi.\n"
+"  -b --binprefix               �.bin�-tiedostonimillä on �.mc tiedostonimi_� -prefiksi ainutlaatuisuuden takaamiseksi\n"
 "  -c --customflag              Aseta räätälöintiliput sanomille\n"
 "  -C --codepage_in=<arvo>      Aseta koodisivu luettaessa mc-tekstitiedostoa\n"
 "  -d --decimal_values          Tulosta arvoja tekstitiedostoon desimaalina\n"
@@ -8320,7 +7405,7 @@ msgstr ""
 "  -O --codepage_out=<arvo>     Aseta kirjoitustekstitiedoston koodisivu\n"
 "  -r --rcdir=<hakemisto>       Aseta vientihakemisto rc-tiedostoille\n"
 "  -x --xdbg=<hakemisto>        Missä luoda .dbg C include-tiedosto,\n"
-"                               joka kuvaa sanomatunnukset niiden symbolinimeen.\n"
+"                               joka mappaa sanomatunnukset niiden symbolinimeen.\n"
 
 #: windmc.c:220
 #, c-format
@@ -8338,9 +7423,10 @@ msgstr ""
 msgid "%s: warning: "
 msgstr "%s: varoitus: "
 
+#  %s on ilmeisesti tarkoitettu lainausmerkin sisään, ei pilkun ja lainausmerkin
 #: windmc.c:262
 #, c-format
-msgid "A codepage was specified switch `%s' and UTF16.\n"
+msgid "A codepage was specified switch ,%s' and UTF16.\n"
 msgstr "Koodisivu oli annettu kytkin �%s� ja UTF16.\n"
 
 #: windmc.c:263
@@ -8354,7 +7440,7 @@ msgstr "yritä lisätä sairas kieli."
 
 #: windmc.c:1116
 #, c-format
-msgid "unable to open file `%s' for input.\n"
+msgid "unable to open file ,%s' for input.\n"
 msgstr "ei voi avata syötetiedostoa �%s�.\n"
 
 #: windmc.c:1124
@@ -8418,7 +7504,6 @@ msgid ""
 "  -O --output-format=<format>  Specify output format\n"
 "  -F --target=<target>         Specify COFF target\n"
 "     --preprocessor=<program>  Program to use to preprocess rc file\n"
-"     --preprocessor-arg=<arg>  Additional preprocessor argument\n"
 "  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n"
 "  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n"
@@ -8444,14 +7529,14 @@ msgstr ""
 "  -l --language=<arvo>         Aseta kieli, kun rc-tiedostoa luetaan\n"
 "     --use-temp-file           Käytä tilapäistä tiedostoa, ei popen:ia lukemaan\n"
 "                               esikääntäjätulostetta\n"
-"     --no-use-temp-file        Käytä popenia (oletus)\n"
+"     --no-use-temp-file        Käytä popen:ia (oletus)\n"
 
-#: windres.c:679
+#: windres.c:678
 #, c-format
 msgid "     --yydebug                 Turn on parser debugging\n"
 msgstr "     --yydebug                 Käännä jäsenninvianjäljitys päälle\n"
 
-#: windres.c:682
+#: windres.c:681
 #, c-format
 msgid ""
 "  -r                           Ignored for compatibility with rc\n"
@@ -8464,7 +7549,7 @@ msgstr ""
 "  -h --help                    Tulosta tämä ohje\n"
 "  -V --version                 Tulosta versiotiedot\n"
 
-#: windres.c:687
+#: windres.c:686
 #, c-format
 msgid ""
 "FORMAT is one of rc, res, or coff, and is deduced from the file name\n"
@@ -8476,167 +7561,42 @@ msgstr ""
 "syötetiedosto, ei syötetiedostoa on vakiosyöte, oletusmuoto on rc.\n"
 "Ei tulostetiedostoa on vakiotuloste, oletusmuoto rc.\n"
 
-#: windres.c:850
+#: windres.c:847
 msgid "invalid codepage specified.\n"
 msgstr "annettu virheellinen koodisivu.\n"
 
-#: windres.c:865
+#: windres.c:862
 msgid "invalid option -f\n"
 msgstr "virheellinen valitsin -f\n"
 
-#: windres.c:870
+#: windres.c:867
 msgid "No filename following the -fo option.\n"
 msgstr "Mikään tiedostonimi ei seuraa valitsinta -fo.\n"
 
-#: windres.c:959
+#: windres.c:938
 #, c-format
 msgid "Option -I is deprecated for setting the input format, please use -J instead.\n"
 msgstr "Valitsin -I on vanhentunut syötemuodon asetukseen, käytä sen sijaan valitsinta -J.\n"
 
-#: windres.c:1072
+#: windres.c:1051
 msgid "no resources"
 msgstr "ei resursseja"
 
-#: wrstabs.c:354 wrstabs.c:1915
+#: wrstabs.c:353 wrstabs.c:1916
 #, c-format
 msgid "string_hash_lookup failed: %s"
 msgstr "string_hash_lookup epäonnistui: %s"
 
-#: wrstabs.c:637
+#: wrstabs.c:636
 #, c-format
 msgid "stab_int_type: bad size %u"
 msgstr "stab_int_type: virheellinen koko %u"
 
-#: wrstabs.c:1393
+#: wrstabs.c:1394
 #, c-format
 msgid "%s: warning: unknown size for field `%s' in struct"
 msgstr "%s: varoitus: kentän �%s� koko tuntematon struct-rakenteessa"
 
-#~ msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
-#~ msgstr "Käyttö: %s [emulointivalitsimet] [--plugin <nimi>] [-]{dmpqrstx}[abcfilNoPsSuvV] [jäsennimi] [lukumäärä] arkistotiedosto tiedosto...\n"
-
-#~ msgid "illegal option -- %c"
-#~ msgstr "virheellinen valitsin -- %c"
-
-#~ msgid ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-
-#~ msgid "Usage: %s < input_file > output_file\n"
-#~ msgstr "Käyttö: %s <syötetiedosto> tulostetiedosto\n"
-
-#~ msgid "Prints bytes from stdin in hex format.\n"
-#~ msgstr "Tulostaa tavut vakiosyötteestä heksadesimaalimuodossa.\n"
-
-#~ msgid "   %d\t"
-#~ msgstr "   %d\t"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "  %d\t"
-#~ msgstr "  %d\t"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "./%s:[++]\n"
-#~ msgstr ""
-#~ "\n"
-#~ "./%s:[++]\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "%s/%s:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s/%s:\n"
-
-#~ msgid "%-35s  %11d  %#18lx\n"
-#~ msgstr "%-35s  %11d  %#18lx\n"
-
-#~ msgid "%-35s  %11d  %#18lx[%d]\n"
-#~ msgstr "%-35s  %11d  %#18lx[%d]\n"
-
-#~ msgid "%s  %11d  %#18lx\n"
-#~ msgstr "%s  %11d  %#18lx\n"
-
-#~ msgid "%s  %11d  %#18lx[%d]\n"
-#~ msgstr "%s  %11d  %#18lx[%d]\n"
-
-#  Tämä pitäisi oikeastaan jättää pois käännettävistä teksteistä !!
-#~ msgid "   %ld      %s    [%s]\n"
-#~ msgstr "   %ld      %s    [%s]\n"
-
-#  Seuraava pitäisi oikeastaan jättää pois käännettävistä teksteistä.
-#~ msgid "    %-18s %s\n"
-#~ msgstr "    %-18s %s\n"
-
-#~ msgid "Location lists in .debug_info section aren't in ascending order!\n"
-#~ msgstr "Sijaintiluettelot .debug_info-lohkossa eivät ole nousevassa järjestyksessä!\n"
-
-#~ msgid "target `%s' ignored."
-#~ msgstr "kohde �%s� ohitettu."
-
-#~ msgid "  Pg"
-#~ msgstr "  Sv"
-
-#~ msgid " (%ld)"
-#~ msgstr " (%ld)"
-
-#~ msgid "0x%02x "
-#~ msgstr "0x%02x "
-
-#~ msgid "  [reserved compact index %d]\n"
-#~ msgstr "  [varattu suppea indeksi %d]\n"
-
-#~ msgid "     vsp = vsp - %d"
-#~ msgstr "     vsp = vsp - %d"
-
-#~ msgid "     vsp = r%d"
-#~ msgstr "     vsp = r%d"
-
-#~ msgid "[unsupported two-byte opcode]"
-#~ msgstr "[tukematon kaksitavuinen käskykoodi]"
-
-#  Seuraava pitäisi oikeastaan jättää pois käännettävistä teksteistä.
-#~ msgid "  %*s %10s %*s\n"
-#~ msgstr "  %*s %10s %*s\n"
-
-#~ msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "  %*s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "%s %s: %s"
-#~ msgstr "%s %s: %s"
-
-#  Ensimmäinen parametri errmsg_fmt, toinen parametrit errmsg_arg, kolmas parametri virhenumero muutettuna merkkijonoselitykseksi
-#~ msgid "%s:%d: %s\n"
-#~ msgstr "%s:%d: %s\n"
-
-#~ msgid "can't create %s file ,%s' for output.\n"
-#~ msgstr "ei voi luoda tiedostoa %s tulosteeseen �%s�.\n"
-
-#  %s on ilmeisesti tarkoitettu lainausmerkin sisään, ei pilkun ja lainausmerkin
-#~ msgid "A codepage was specified switch ,%s' and UTF16.\n"
-#~ msgstr "Koodisivu oli annettu kytkin �%s� ja UTF16.\n"
-
-#~ msgid "unable to open file ,%s' for input.\n"
-#~ msgstr "ei voi avata syötetiedostoa �%s�.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Can't uncompress section '%s'.\n"
@@ -8680,3 +7640,12 @@ msgstr "%s: varoitus: kentän �%s� koko tuntematon struct-rakenteessa"
 
 #~ msgid "size"
 #~ msgstr "koko"
+
+#~ msgid "can't create %s file `%s' for output.\n"
+#~ msgstr "ei voi luoda tiedostoa %s tulosteeseen �%s�.\n"
+
+#~ msgid "A codepage was specified switch `%s' and UTF16.\n"
+#~ msgstr "Koodisivu oli annettu kytkin �%s� ja UTF16.\n"
+
+#~ msgid "unable to open file `%s' for input.\n"
+#~ msgstr "ei voi avata syötetiedostoa �%s�.\n"
diff --git a/binutils/po/fr.po b/binutils/po/fr.po
index 7af1ba68de..94cbce7715 100644
--- a/binutils/po/fr.po
+++ b/binutils/po/fr.po
@@ -1,41 +1,40 @@
 # translation of binutils to French
 # Messages français pour GNU concernant binutils.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 #
-# Frédéric Marchal <fmarchal@perso.be>, 2011.
+# Frédéric Marchal <fmarchal@perso.be>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: binutils-2.21.53\n"
+"Project-Id-Version: binutils-2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2011-09-23 14:54+0200\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2010-11-09 22:07+0100\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: addr2line.c:81
+#: addr2line.c:80
 #, c-format
 msgid "Usage: %s [option(s)] [addr(s)]\n"
 msgstr "Usage: %s [options] [adresses]\n"
 
-#: addr2line.c:82
+#: addr2line.c:81
 #, c-format
 msgid " Convert addresses into line number/file name pairs.\n"
 msgstr "Convertir les adresses en paires numéro de ligne/fichier.\n"
 
-#: addr2line.c:83
+#: addr2line.c:82
 #, c-format
 msgid " If no addresses are specified on the command line, they will be read from stdin\n"
 msgstr "Si aucune adresse n'est spécifiée sur la ligne de commande, elles seront lues de stdin\n"
 
-#: addr2line.c:84
+#: addr2line.c:83
 #, c-format
 msgid ""
 " The options are:\n"
@@ -68,215 +67,210 @@ msgstr ""
 "  -v --version           Afficher le nom et la version du logiciel\n"
 "\n"
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
-#: windmc.c:228 windres.c:695
+#: addr2line.c:100 ar.c:293 coffdump.c:469 dlltool.c:3926 dllwrap.c:524
+#: elfedit.c:1155 nlmconv.c:1113 objcopy.c:576 objcopy.c:611 readelf.c:3219
+#: size.c:99 srconv.c:1742 strings.c:663 sysdump.c:653 windmc.c:228
+#: windres.c:694
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Rapporter toutes anomalies à %s\n"
 
-#: addr2line.c:271
+#: addr2line.c:262
 #, c-format
 msgid " at "
 msgstr " à "
 
-#: addr2line.c:296
+#: addr2line.c:287
 #, c-format
 msgid " (inlined by) "
 msgstr " (en ligne par) "
 
-#: addr2line.c:329
+#: addr2line.c:320
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr "%s: ne peut obtenir les adresses à partir de l'archive"
 
-#: addr2line.c:346
+#: addr2line.c:337
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr "%s: ne peut initialiser l'heure: %s"
 
-#: addr2line.c:415 nm.c:1566 objdump.c:3423
+#: addr2line.c:406 nm.c:1563 objdump.c:3301
 #, c-format
 msgid "unknown demangling style `%s'"
 msgstr "style d'encodage par mutilation inconnu « %s »"
 
-#: ar.c:238
+#: ar.c:215
 #, c-format
 msgid "no entry %s in archive\n"
 msgstr "pas d'entrée %s dans l'archive\n"
 
-#: ar.c:254
+#: ar.c:233
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
-msgstr "Usage: %s [options d'émulation] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <nom>] [nom-du-membre] [compteur] fichier-archive fichier...\n"
+msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Usage: %s [options d'émulation] [--plugin <nom>] [-]{dmpqrstx}[abcfilNoPsSuvV] [nom-du-membre] [compteur] fichier-archive fichier...\n"
 
-#: ar.c:260
+#: ar.c:235
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
-msgstr "Usage: %s [options d'émulation] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [nom-du-membre] [compteur] fichier-archive fichier...\n"
+msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "Usage: %s [options d'émulation] [-]{dmpqrstx}[abcfilNoPsSuvV] [nom-du-membre] [compteur] fichier-archive fichier...\n"
 
-#: ar.c:266
+#: ar.c:240
 #, c-format
 msgid "       %s -M [<mri-script]\n"
 msgstr "       %s -M [<script-mri]\n"
 
-#: ar.c:267
+#: ar.c:241
 #, c-format
 msgid " commands:\n"
 msgstr " commandes:\n"
 
-#: ar.c:268
+#: ar.c:242
 #, c-format
 msgid "  d            - delete file(s) from the archive\n"
 msgstr "  d            - détruire le(s) fichier(s) de l'archive\n"
 
-#: ar.c:269
+#: ar.c:243
 #, c-format
 msgid "  m[ab]        - move file(s) in the archive\n"
 msgstr "  m[ab]        - déplacer le(s) fichier(s) dans l'archive\n"
 
-#: ar.c:270
+#: ar.c:244
 #, c-format
 msgid "  p            - print file(s) found in the archive\n"
 msgstr "  p            - afficher le nom des fichiers trouvés dans l'archive\n"
 
-#: ar.c:271
+#: ar.c:245
 #, c-format
 msgid "  q[f]         - quick append file(s) to the archive\n"
 msgstr "  q[f]         - ajout rapide des fichiers à l'archive\n"
 
-#: ar.c:272
+#: ar.c:246
 #, c-format
 msgid "  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"
 msgstr "  r[ab][f][u]  - remplacer les fichiers exitants ou inserer les nouveaux dans l'archive\n"
 
-#: ar.c:273
+#: ar.c:247
 #, c-format
 msgid "  s            - act as ranlib\n"
 msgstr "  s            - se comporte comme ranlib\n"
 
-#: ar.c:274
+#: ar.c:248
 #, c-format
 msgid "  t            - display contents of archive\n"
 msgstr "  t            - afficher le contenu de l'archive\n"
 
-#: ar.c:275
+#: ar.c:249
 #, c-format
 msgid "  x[o]         - extract file(s) from the archive\n"
 msgstr "  x[o]         - extraire les fichiers de l'archive\n"
 
-#: ar.c:276
+#: ar.c:250
 #, c-format
 msgid " command specific modifiers:\n"
 msgstr " modificateurs spécifiques de commandes:\n"
 
-#: ar.c:277
+#: ar.c:251
 #, c-format
 msgid "  [a]          - put file(s) after [member-name]\n"
 msgstr "  [a]          - placer le(s) fichier(s) après le [nom-de-membre]\n"
 
-#: ar.c:278
+#: ar.c:252
 #, c-format
 msgid "  [b]          - put file(s) before [member-name] (same as [i])\n"
 msgstr "  [b]          - placer le(s) fichier(s) avant le [nom-de-membre] (identique à [i])\n"
 
-#: ar.c:279
+#: ar.c:253
 #, c-format
 msgid "  [D]          - use zero for timestamps and uids/gids\n"
 msgstr "  [D]          - utilise zéro pour les horodatages et les uid/gid\n"
 
-#: ar.c:280
+#: ar.c:254
 #, c-format
 msgid "  [N]          - use instance [count] of name\n"
 msgstr "  [N]          - utiliser le [compteur] du nom\n"
 
-#: ar.c:281
+#: ar.c:255
 #, c-format
 msgid "  [f]          - truncate inserted file names\n"
 msgstr "  [f]          - tronquer les noms des fichiers insérés\n"
 
-#: ar.c:282
+#: ar.c:256
 #, c-format
 msgid "  [P]          - use full path names when matching\n"
 msgstr "  [P]          - utliser des chemins complets lors d'un appariement\n"
 
-#: ar.c:283
+#: ar.c:257
 #, c-format
 msgid "  [o]          - preserve original dates\n"
 msgstr "  [o]          - préserver les dates d'origine\n"
 
-#: ar.c:284
+#: ar.c:258
 #, c-format
 msgid "  [u]          - only replace files that are newer than current archive contents\n"
 msgstr "  [u]          - remplacer seulement les fichiers de l'archive par les plus récents\n"
 
-#: ar.c:285
+#: ar.c:259
 #, c-format
 msgid " generic modifiers:\n"
 msgstr " modificateurs génériques:\n"
 
-#: ar.c:286
+#: ar.c:260
 #, c-format
 msgid "  [c]          - do not warn if the library had to be created\n"
 msgstr "  [c]          - ne pas avertir si la librarie doit être créée\n"
 
-#: ar.c:287
+#: ar.c:261
 #, c-format
 msgid "  [s]          - create an archive index (cf. ranlib)\n"
 msgstr "  [s]          - créer un index d'archive (voir ranlib)\n"
 
-#: ar.c:288
+#: ar.c:262
 #, c-format
 msgid "  [S]          - do not build a symbol table\n"
 msgstr "  [S]          - ne pas construire une table de symboles\n"
 
-#: ar.c:289
+#: ar.c:263
 #, c-format
 msgid "  [T]          - make a thin archive\n"
 msgstr "  [T]          - créer une archive légère\n"
 
-#: ar.c:290
+#: ar.c:264
 #, c-format
 msgid "  [v]          - be verbose\n"
 msgstr "  [v]          - utiliser le mode verbeux\n"
 
-#: ar.c:291
+#: ar.c:265
 #, c-format
 msgid "  [V]          - display the version number\n"
 msgstr "  [V]          - afficher le numéro de version\n"
 
-#: ar.c:292
+#: ar.c:266
 #, c-format
 msgid "  @<file>      - read options from <file>\n"
 msgstr "  @<fichier_def>        lire les options à partir du <fichier>\n"
 
-#: ar.c:293
-#, c-format
-msgid "  --target=BFDNAME - specify the target object format as BFDNAME\n"
-msgstr "  --target=NOMBFD - spécifie le format de l'objet cible comme étant NOMBFD\n"
-
-#: ar.c:295
+#: ar.c:268
 #, c-format
 msgid " optional:\n"
 msgstr " les options sont:\n"
 
-#: ar.c:296
+#: ar.c:269
 #, c-format
 msgid "  --plugin <p> - load the specified plugin\n"
 msgstr "  -plugin <p> - charge le plugin spécifié\n"
 
-#: ar.c:317
+#: ar.c:276
 #, c-format
 msgid "Usage: %s [options] archive\n"
 msgstr "Usage: %s [options] archive\n"
 
-#: ar.c:318
+#: ar.c:277
 #, c-format
 msgid " Generate an index to speed access to archives\n"
 msgstr " Générer un index pour accélérer les accès aux archives\n"
 
-#: ar.c:319
+#: ar.c:278
 #, c-format
 msgid ""
 " The options are:\n"
@@ -285,12 +279,12 @@ msgstr ""
 " Les options sont:\n"
 "   @<fichier>                lire les options à partir du <fichier>\n"
 
-#: ar.c:322
+#: ar.c:281
 #, c-format
 msgid "  --plugin <name>              Load the specified plugin\n"
 msgstr "  --plugin <nom>               Utilise le plugin spécifié\n"
 
-#: ar.c:325
+#: ar.c:284
 #, c-format
 msgid ""
 "  -t                           Update the archive's symbol map timestamp\n"
@@ -301,70 +295,86 @@ msgstr ""
 "  -h --help                  Afficher l'aide-mémoire\n"
 "  -V --version               Afficher le nom et la version du logiciel\n"
 
-#: ar.c:449
+#: ar.c:481 nm.c:1636
+#, c-format
+msgid "sorry - this program has been built without plugin support\n"
+msgstr "désolé - ce programme a été construit sans support pour les plugins\n"
+
+#: ar.c:508
 msgid "two different operation options specified"
 msgstr "deux operations différentes spécifiées"
 
-#: ar.c:538 nm.c:1639
+#: ar.c:589
 #, c-format
-msgid "sorry - this program has been built without plugin support\n"
-msgstr "désolé - ce programme a été construit sans support pour les plugins\n"
+msgid "illegal option -- %c"
+msgstr "option illégale -- %c"
 
-#: ar.c:693
+#: ar.c:632
 msgid "no operation specified"
 msgstr "aucune opération spécifiée"
 
-#: ar.c:696
+#: ar.c:635
 msgid "`u' is only meaningful with the `r' option."
 msgstr "« u » n'a de sens qu'avec l'option « r »."
 
-#: ar.c:699
+#: ar.c:638
 msgid "`u' is not meaningful with the `D' option."
 msgstr "« u » n'a de sens qu'avec l'option « D »."
 
-#: ar.c:707
+#: ar.c:646
 msgid "`N' is only meaningful with the `x' and `d' options."
 msgstr "« N » n'a de  sens qu'avec les options « x » et « d »."
 
-#: ar.c:710
+#: ar.c:649
 msgid "Value for `N' must be positive."
 msgstr "La valeur de « N » doit être positive."
 
-#: ar.c:724
+#: ar.c:661
 msgid "`x' cannot be used on thin archives."
 msgstr "«x» ne peut pas être utilisé avec des archives légères."
 
-#: ar.c:765
+#: ar.c:702
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr "erreur interne -- cette option n'est pas implantée"
 
-#: ar.c:834
+#: ar.c:771
 #, c-format
 msgid "creating %s"
 msgstr "création de %s"
 
-#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
+#: ar.c:820 ar.c:875 ar.c:1203 objcopy.c:2052
 #, c-format
 msgid "internal stat error on %s"
 msgstr "erreur interne d'évaluation de %s par stat()"
 
-#: ar.c:902 ar.c:970
+#: ar.c:824
+#, c-format
+msgid ""
+"\n"
+"<%s>\n"
+"\n"
+msgstr ""
+"\n"
+"<%s>\n"
+"\n"
+
+#: ar.c:840 ar.c:908
 #, c-format
 msgid "%s is not a valid archive"
 msgstr "%s n'est pas une archive valide"
 
-#: ar.c:1171
+#: ar.c:1108
 #, c-format
 msgid "No member named `%s'\n"
 msgstr "Aucun membre ayant le nom « %s »\n"
 
-#: ar.c:1221
+#: ar.c:1158
 #, c-format
 msgid "no entry %s in archive %s!"
 msgstr "aucune entrée %s dans l'archive %s!"
 
-#: ar.c:1360
+#: ar.c:1297
 #, c-format
 msgid "%s: no archive map to update"
 msgstr "%s: aucune table d'archive à mettre à jour"
@@ -424,13 +434,23 @@ msgstr "L'archive actuellement ouverte est %s\n"
 msgid "%s: no open archive\n"
 msgstr "%s: aucune archive ouverte\n"
 
-#: binemul.c:39
+#: bin2c.c:59
+#, c-format
+msgid "Usage: %s < input_file > output_file\n"
+msgstr "Usage: %s <fichier-d-entrée> fichier-de-sortie\n"
+
+#: bin2c.c:60
+#, c-format
+msgid "Prints bytes from stdin in hex format.\n"
+msgstr "Affiche les octets de stdin sous forme hexadécimale.\n"
+
+#: binemul.c:38
 #, c-format
 msgid "  No emulation specific options\n"
 msgstr "  Pas d'options d'émulation spécifiques\n"
 
 #. Macros for common output.
-#: binemul.h:49
+#: binemul.h:46
 #, c-format
 msgid " emulation options: \n"
 msgstr "  Options d'émulation: \n"
@@ -470,47 +490,42 @@ msgstr "%s: architectures supportées:"
 msgid "BFD header file version %s\n"
 msgstr "Version de l'en-tête du fichier BFD %s\n"
 
-#: bucomm.c:559
+#: bucomm.c:556
 #, c-format
 msgid "%s: bad number: %s"
 msgstr "%s: mauvais numéro: %s"
 
-#: bucomm.c:576 strings.c:409
+#: bucomm.c:573 strings.c:409
 #, c-format
 msgid "'%s': No such file"
 msgstr "'%s': pas de fichier comme tel"
 
-#: bucomm.c:578 strings.c:411
+#: bucomm.c:575 strings.c:411
 #, c-format
 msgid "Warning: could not locate '%s'.  reason: %s"
-msgstr "Attention: ne peut localiser « %s ». Raison: %s"
+msgstr "AVERTISSEMENT: ne peut localiser '%s'. Raison: %s"
 
-#: bucomm.c:582
+#: bucomm.c:579
 #, c-format
 msgid "Warning: '%s' is not an ordinary file"
-msgstr "Attention: « %s » n'est pas un fichier ordinaire"
+msgstr "AVERTISSEMENT: '%s' n'est pas un fichier ordinaire"
 
-#: bucomm.c:584
-#, c-format
-msgid "Warning: '%s' has negative size, probably it is too large"
-msgstr "Attention: « %s » a une taille négative, elle est probablement trop grande"
-
-#: coffdump.c:107
+#: coffdump.c:106
 #, c-format
 msgid "#lines %d "
 msgstr "# de lignes %d "
 
-#: coffdump.c:461 sysdump.c:646
+#: coffdump.c:460 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr "Usage: %s [options] fichier\n"
 
-#: coffdump.c:462
+#: coffdump.c:461
 #, c-format
-msgid " Print a human readable interpretation of a COFF object file\n"
-msgstr "Afficher une interprétation humainement lisible du fichier objet COFF\n"
+msgid " Print a human readable interpretation of a SYSROFF object file\n"
+msgstr "Aficher dans un format humainement lisible une interprétation du fichier objet SYSROFF\n"
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid ""
 " The options are:\n"
@@ -525,548 +540,548 @@ msgstr ""
 "   -V --version              afficher le nom et la version du logiciel\n"
 "\n"
 
-#: coffdump.c:532 srconv.c:1833 sysdump.c:710
+#: coffdump.c:531 srconv.c:1832 sysdump.c:710
 msgid "no input file specified"
 msgstr "Aucune fichier spécifié à l'entrée"
 
-#: cxxfilt.c:119 nm.c:269 objdump.c:281
+#: cxxfilt.c:119 nm.c:269 objdump.c:256
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Rapporter toutes anomalies à %s\n"
 
-#: debug.c:648
+#: debug.c:647
 msgid "debug_add_to_current_namespace: no current file"
 msgstr "debug_add_to_current_namespace: aucun fichier courant"
 
-#: debug.c:727
+#: debug.c:726
 msgid "debug_start_source: no debug_set_filename call"
 msgstr "debug_start_source: aucun appel no debug_set_filename"
 
-#: debug.c:781
+#: debug.c:782
 msgid "debug_record_function: no debug_set_filename call"
 msgstr "debug_record_function: aucun appel debug_set_filename"
 
-#: debug.c:833
+#: debug.c:834
 msgid "debug_record_parameter: no current function"
 msgstr "debug_record_parameter: aucune fonction courante"
 
-#: debug.c:865
+#: debug.c:866
 msgid "debug_end_function: no current function"
 msgstr "debug_end_function: aucune fonction courante"
 
-#: debug.c:871
+#: debug.c:872
 msgid "debug_end_function: some blocks were not closed"
 msgstr "debug_end_function: quelques blocs n'ont pas été fermés"
 
-#: debug.c:899
+#: debug.c:900
 msgid "debug_start_block: no current block"
 msgstr "debug_start_block: aucun bloc couratn"
 
-#: debug.c:935
+#: debug.c:936
 msgid "debug_end_block: no current block"
 msgstr "debug_end_block: aucun bloc courant"
 
-#: debug.c:942
+#: debug.c:943
 msgid "debug_end_block: attempt to close top level block"
 msgstr "debug_end_block: tentative de fermeture du bloc du niveau supérieur"
 
-#: debug.c:965
+#: debug.c:966
 msgid "debug_record_line: no current unit"
 msgstr "debug_record_line: aucune unité courante"
 
 #. FIXME
-#: debug.c:1018
+#: debug.c:1019
 msgid "debug_start_common_block: not implemented"
 msgstr "debug_start_common_block: pas implanté"
 
 #. FIXME
-#: debug.c:1029
+#: debug.c:1030
 msgid "debug_end_common_block: not implemented"
 msgstr "debug_end_common_block: pas implanté"
 
 #. FIXME.
-#: debug.c:1113
+#: debug.c:1114
 msgid "debug_record_label: not implemented"
 msgstr "debug_record_label: pas implanté"
 
-#: debug.c:1135
+#: debug.c:1136
 msgid "debug_record_variable: no current file"
 msgstr "debug_record_variable: aucun fichier courant"
 
-#: debug.c:1663
+#: debug.c:1664
 msgid "debug_make_undefined_type: unsupported kind"
 msgstr "debug_make_undefined_type: type non supportée"
 
-#: debug.c:1840
+#: debug.c:1841
 msgid "debug_name_type: no current file"
 msgstr "debug_name_type: aucun fichier courant"
 
-#: debug.c:1885
+#: debug.c:1886
 msgid "debug_tag_type: no current file"
 msgstr "debug_tag_type: aucune fichier courant"
 
-#: debug.c:1893
+#: debug.c:1894
 msgid "debug_tag_type: extra tag attempted"
 msgstr "debug_tag_type: tentative d'étiquetage additionnelle"
 
-#: debug.c:1930
+#: debug.c:1931
 #, c-format
 msgid "Warning: changing type size from %d to %d\n"
 msgstr "AVERTISSEMENT: changement de taille du type de %d à %d\n"
 
-#: debug.c:1952
+#: debug.c:1953
 msgid "debug_find_named_type: no current compilation unit"
 msgstr "debug_find_named_type: aucune unité de compilation courante"
 
-#: debug.c:2055
+#: debug.c:2056
 #, c-format
 msgid "debug_get_real_type: circular debug information for %s\n"
 msgstr "debug_get_real_type: information circulaire de débogage pour %s\n"
 
-#: debug.c:2482
+#: debug.c:2483
 msgid "debug_write_type: illegal type encountered"
 msgstr "debug_write_type: type illégal rencontré"
 
-#: dlltool.c:902 dlltool.c:928 dlltool.c:959
+#: dlltool.c:901 dlltool.c:927 dlltool.c:958
 #, c-format
 msgid "Internal error: Unknown machine type: %d"
 msgstr "erreur interne: type de machine inconnue: %d"
 
-#: dlltool.c:1000
+#: dlltool.c:999
 #, c-format
 msgid "Can't open def file: %s"
 msgstr "Ne peut ouvrir le fichier de définition: %s"
 
-#: dlltool.c:1005
+#: dlltool.c:1004
 #, c-format
 msgid "Processing def file: %s"
 msgstr "Traitement du fichier de définition: %s"
 
-#: dlltool.c:1009
+#: dlltool.c:1008
 msgid "Processed def file"
 msgstr "Traitement complété du fichier de définition"
 
-#: dlltool.c:1033
+#: dlltool.c:1032
 #, c-format
 msgid "Syntax error in def file %s:%d"
 msgstr "Erreur de syntaxe dans le fichier de définition %s:%d"
 
-#: dlltool.c:1070
+#: dlltool.c:1069
 #, c-format
 msgid "%s: Path components stripped from image name, '%s'."
 msgstr "%s: composants du chemin ont été éliminé du nom de l'imiage '%s'."
 
-#: dlltool.c:1088
+#: dlltool.c:1087
 #, c-format
 msgid "NAME: %s base: %x"
 msgstr "NOM: %s base: %x"
 
-#: dlltool.c:1091 dlltool.c:1112
+#: dlltool.c:1090 dlltool.c:1106
 msgid "Can't have LIBRARY and NAME"
 msgstr "Ne peut trouver la LIBRAIRIE et le NOM"
 
-#: dlltool.c:1109
+#: dlltool.c:1103
 #, c-format
 msgid "LIBRARY: %s base: %x"
 msgstr "LIBRAIRIE: %s base %x"
 
-#: dlltool.c:1354 resrc.c:293
+#: dlltool.c:1342 resrc.c:293
 #, c-format
 msgid "wait: %s"
 msgstr "en attente: %s"
 
-#: dlltool.c:1359 dllwrap.c:422 resrc.c:298
+#: dlltool.c:1347 dllwrap.c:422 resrc.c:298
 #, c-format
 msgid "subprocess got fatal signal %d"
 msgstr "sous-processus a reçu le signal fatal %d"
 
-#: dlltool.c:1365 dllwrap.c:429 resrc.c:305
+#: dlltool.c:1353 dllwrap.c:429 resrc.c:305
 #, c-format
 msgid "%s exited with status %d"
 msgstr "%s a terminé avec le statut %d"
 
-#: dlltool.c:1396
+#: dlltool.c:1384
 #, c-format
 msgid "Sucking in info from %s section in %s"
 msgstr "Aspirer les informations de la section %s dans %s"
 
-#: dlltool.c:1536
+#: dlltool.c:1524
 #, c-format
 msgid "Excluding symbol: %s"
 msgstr "Exclusion de symbole: %s"
 
-#: dlltool.c:1625 dlltool.c:1636 nm.c:1012 nm.c:1023
+#: dlltool.c:1613 dlltool.c:1624 nm.c:1010 nm.c:1021
 #, c-format
 msgid "%s: no symbols"
 msgstr "%s: aucun symbole"
 
 #. FIXME: we ought to read in and block out the base relocations.
-#: dlltool.c:1662
+#: dlltool.c:1650
 #, c-format
 msgid "Done reading %s"
 msgstr "Lecture complétée %s"
 
-#: dlltool.c:1672
+#: dlltool.c:1660
 #, c-format
 msgid "Unable to open object file: %s: %s"
 msgstr "Incapable d'ouvrir le fichier objet: %s: %s"
 
-#: dlltool.c:1675
+#: dlltool.c:1663
 #, c-format
 msgid "Scanning object file %s"
 msgstr "Scrutation du fichier objet %s"
 
-#: dlltool.c:1690
+#: dlltool.c:1678
 #, c-format
 msgid "Cannot produce mcore-elf dll from archive file: %s"
 msgstr "Ne peutproduire mcore-elf dll à partir du fichier d'archive: %s"
 
-#: dlltool.c:1792
+#: dlltool.c:1780
 msgid "Adding exports to output file"
 msgstr "Ajout des exports au fichier de sortie"
 
-#: dlltool.c:1844
+#: dlltool.c:1832
 msgid "Added exports to output file"
 msgstr "Exports ajoutés au fichier de sortie"
 
-#: dlltool.c:1986
+#: dlltool.c:1974
 #, c-format
 msgid "Generating export file: %s"
 msgstr "Génération du fichier d'exports: %s"
 
-#: dlltool.c:1991
+#: dlltool.c:1979
 #, c-format
 msgid "Unable to open temporary assembler file: %s"
 msgstr "Incapable d'ouvrir le fichier assembleur temporaire: %s"
 
-#: dlltool.c:1994
+#: dlltool.c:1982
 #, c-format
 msgid "Opened temporary file: %s"
 msgstr "Fichier temporaire ouvert: %s"
 
-#: dlltool.c:2171
+#: dlltool.c:2159
 msgid "failed to read the number of entries from base file"
 msgstr "échec de lecture du nombre d'entrées dans le fichier de base"
 
-#: dlltool.c:2219
+#: dlltool.c:2207
 msgid "Generated exports file"
 msgstr "Fichier d'exports généré"
 
-#: dlltool.c:2428
+#: dlltool.c:2416
 #, c-format
 msgid "bfd_open failed open stub file: %s: %s"
 msgstr "échec de bfd_open lors de l'ouverture du fichier stub: %s: %s"
 
-#: dlltool.c:2432
+#: dlltool.c:2420
 #, c-format
 msgid "Creating stub file: %s"
 msgstr "Création du fichier stub: %s"
 
-#: dlltool.c:2894
+#: dlltool.c:2882
 #, c-format
 msgid "bfd_open failed reopen stub file: %s: %s"
 msgstr "échec de bfd_open lors de l'ouverture du fichier stub: %s: %s"
 
-#: dlltool.c:2908 dlltool.c:2984
+#: dlltool.c:2896 dlltool.c:2972
 #, c-format
 msgid "failed to open temporary head file: %s"
 msgstr "échec d'ouverture du fichier de tête temporaire: %s"
 
-#: dlltool.c:2970 dlltool.c:3050
+#: dlltool.c:2958 dlltool.c:3038
 #, c-format
 msgid "failed to open temporary head file: %s: %s"
 msgstr "échec d'ouverture du fichier temporaire de tête: %s: %s"
 
-#: dlltool.c:3064
+#: dlltool.c:3052
 #, c-format
 msgid "failed to open temporary tail file: %s"
 msgstr "échec d'ouverture du fichier de queue temporaire: %s"
 
-#: dlltool.c:3121
+#: dlltool.c:3109
 #, c-format
 msgid "failed to open temporary tail file: %s: %s"
 msgstr "échec d'ouverture du fichier temporaire de queue: %s: %s"
 
-#: dlltool.c:3143
+#: dlltool.c:3131
 #, c-format
 msgid "Can't create .lib file: %s: %s"
 msgstr "Ne peut ouvrir le fichier .lib: %s: %s"
 
-#: dlltool.c:3147
+#: dlltool.c:3135
 #, c-format
 msgid "Creating library file: %s"
 msgstr "Création du fichier de librairie: %s"
 
-#: dlltool.c:3239 dlltool.c:3245
+#: dlltool.c:3227 dlltool.c:3233
 #, c-format
 msgid "cannot delete %s: %s"
 msgstr "ne peut détruire %s: %s"
 
-#: dlltool.c:3250
+#: dlltool.c:3238
 msgid "Created lib file"
 msgstr "Fichier de libraire créé"
 
-#: dlltool.c:3462
+#: dlltool.c:3450
 #, c-format
 msgid "Can't open .lib file: %s: %s"
 msgstr "Ne peut ouvrir le fichier .lib: %s: %s"
 
-#: dlltool.c:3470 dlltool.c:3492
+#: dlltool.c:3458 dlltool.c:3480
 #, c-format
 msgid "%s is not a library"
 msgstr "%s n'est pas une archive"
 
-#: dlltool.c:3510
+#: dlltool.c:3498
 #, c-format
 msgid "Import library `%s' specifies two or more dlls"
 msgstr "La librairie d'importation «%s» spécifie deux DLL ou plus"
 
-#: dlltool.c:3521
+#: dlltool.c:3509
 #, c-format
 msgid "Unable to determine dll name for `%s' (not an import library?)"
 msgstr "Incapable de déterminer le nom de dll pour «%s» (pas une librairie d'importation ?)"
 
-#: dlltool.c:3745
+#: dlltool.c:3733
 #, c-format
 msgid "Warning, ignoring duplicate EXPORT %s %d,%d"
 msgstr "AVERTISSEMENT: EXPORT en duplication ignoré %s %d,%d"
 
-#: dlltool.c:3751
+#: dlltool.c:3739
 #, c-format
 msgid "Error, duplicate EXPORT with ordinals: %s"
 msgstr "ERREUR, EXPORT en duplication avec ordinals: %s"
 
-#: dlltool.c:3856
+#: dlltool.c:3844
 msgid "Processing definitions"
 msgstr "Traitement des définitions"
 
-#: dlltool.c:3888
+#: dlltool.c:3876
 msgid "Processed definitions"
 msgstr "Définitions traitées"
 
 #. xgetext:c-format
-#: dlltool.c:3895 dllwrap.c:483
+#: dlltool.c:3883 dllwrap.c:483
 #, c-format
 msgid "Usage %s <option(s)> <object-file(s)>\n"
 msgstr "Usage %s <options> <fichiers-objet>\n"
 
 #. xgetext:c-format
-#: dlltool.c:3897
+#: dlltool.c:3885
 #, c-format
 msgid "   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"
 msgstr "   -m --machine <machine>    créer comme DLL pour la <machine>.  [défaut: %s]\n"
 
-#: dlltool.c:3898
+#: dlltool.c:3886
 #, c-format
 msgid "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 msgstr "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 
-#: dlltool.c:3899
+#: dlltool.c:3887
 #, c-format
 msgid "   -e --output-exp <outname> Generate an export file.\n"
 msgstr "   -e --output-exp <nom_de_sortie> générer un fichier d'export.\n"
 
-#: dlltool.c:3900
+#: dlltool.c:3888
 #, c-format
 msgid "   -l --output-lib <outname> Generate an interface library.\n"
 msgstr "   -l --output-lib <nom_de_sortie> générer une librairie d'interface.\n"
 
-#: dlltool.c:3901
+#: dlltool.c:3889
 #, c-format
 msgid "   -y --output-delaylib <outname> Create a delay-import library.\n"
 msgstr "   -y --output-delaylib <nom-de-sortie> Générer une librairie d'importation différée.\n"
 
-#: dlltool.c:3902
+#: dlltool.c:3890
 #, c-format
 msgid "   -a --add-indirect         Add dll indirects to export file.\n"
 msgstr "   -a --add-indirect         ajouter les dll indirectes au fichier d'exports.\n"
 
-#: dlltool.c:3903
+#: dlltool.c:3891
 #, c-format
 msgid "   -D --dllname <name>       Name of input dll to put into interface lib.\n"
 msgstr "   -D --dllname <nom>        nom du dll à placer dans la libraire d'interface.\n"
 
-#: dlltool.c:3904
+#: dlltool.c:3892
 #, c-format
 msgid "   -d --input-def <deffile>  Name of .def file to be read in.\n"
 msgstr "   -d --input-def <fichier_def>  nom du fichier .def à lire\n"
 
-#: dlltool.c:3905
+#: dlltool.c:3893
 #, c-format
 msgid "   -z --output-def <deffile> Name of .def file to be created.\n"
 msgstr "   -z --output-def <fichier_def> nom du fichier .def à créer.\n"
 
-#: dlltool.c:3906
+#: dlltool.c:3894
 #, c-format
 msgid "      --export-all-symbols   Export all symbols to .def\n"
 msgstr "      --export-all-symbols   exporter tous les symboles vers le fichier .def\n"
 
-#: dlltool.c:3907
+#: dlltool.c:3895
 #, c-format
 msgid "      --no-export-all-symbols  Only export listed symbols\n"
 msgstr "      --no-export-all-symbols  exporter seulement la liste des symboles\n"
 
-#: dlltool.c:3908
+#: dlltool.c:3896
 #, c-format
 msgid "      --exclude-symbols <list> Don't export <list>\n"
 msgstr "      --exclude-symbols <liste> ne pas exporter la <liste>\n"
 
-#: dlltool.c:3909
+#: dlltool.c:3897
 #, c-format
 msgid "      --no-default-excludes  Clear default exclude symbols\n"
 msgstr "      --no-default-excludes  ne pas tenir compte des symboles d'exclusion par défaut\n"
 
-#: dlltool.c:3910
+#: dlltool.c:3898
 #, c-format
 msgid "   -b --base-file <basefile> Read linker generated base file.\n"
 msgstr "   -b --base-file <fichier_base> lire le fichier de base généré par l'éditeur de liens\n"
 
-#: dlltool.c:3911
+#: dlltool.c:3899
 #, c-format
 msgid "   -x --no-idata4            Don't generate idata$4 section.\n"
 msgstr "   -x --no-idata4            ne pas générer la section idata$4\n"
 
-#: dlltool.c:3912
+#: dlltool.c:3900
 #, c-format
 msgid "   -c --no-idata5            Don't generate idata$5 section.\n"
 msgstr "   -c --no-idata5            ne pas générer la section idata$5\n"
 
-#: dlltool.c:3913
+#: dlltool.c:3901
 #, c-format
 msgid "      --use-nul-prefixed-import-tables Use zero prefixed idata$4 and idata$5.\n"
 msgstr "      --use-nul-prefixed-import-tables Utilise idata$4 et idata$5 avec un préfixe nul.\n"
 
-#: dlltool.c:3914
+#: dlltool.c:3902
 #, c-format
 msgid "   -U --add-underscore       Add underscores to all symbols in interface library.\n"
 msgstr "   -U --add-underscore       Ajouter des soulignés aux symboles dans la librairie d'interface\n"
 
-#: dlltool.c:3915
+#: dlltool.c:3903
 #, c-format
 msgid "      --add-stdcall-underscore Add underscores to stdcall symbols in interface library.\n"
 msgstr "      --add-underscore       Ajouter des soulignés aux symboles dans la librairie d'interface\n"
 
-#: dlltool.c:3916
+#: dlltool.c:3904
 #, c-format
 msgid "      --no-leading-underscore All symbols shouldn't be prefixed by an underscore.\n"
 msgstr "      --no-leading-underscore Tous les symboles ne devraient pas être préfixés par un souligné.\n"
 
-#: dlltool.c:3917
+#: dlltool.c:3905
 #, c-format
 msgid "      --leading-underscore   All symbols should be prefixed by an underscore.\n"
 msgstr "      --leading-underscore   Tous les symboles devraient être préfixés par un souligné.\n"
 
-#: dlltool.c:3918
+#: dlltool.c:3906
 #, c-format
 msgid "   -k --kill-at              Kill @<n> from exported names.\n"
 msgstr "   -k --kill-at              stopper @<n> à partir des noms exportés\n"
 
-#: dlltool.c:3919
+#: dlltool.c:3907
 #, c-format
 msgid "   -A --add-stdcall-alias    Add aliases without @<n>.\n"
 msgstr "   -A --add-stdcall-alias    ajouter des aliases sans @<n>\n"
 
-#: dlltool.c:3920
+#: dlltool.c:3908
 #, c-format
 msgid "   -p --ext-prefix-alias <prefix> Add aliases with <prefix>.\n"
 msgstr "   -p --axd-prefix-alias <préfixe>  ajouter des aliases avec <préfixe>.\n"
 
-#: dlltool.c:3921
+#: dlltool.c:3909
 #, c-format
 msgid "   -S --as <name>            Use <name> for assembler.\n"
 msgstr "   -S --as <nom>             utiliser le <nom> pour l'assembleur\n"
 
-#: dlltool.c:3922
+#: dlltool.c:3910
 #, c-format
 msgid "   -f --as-flags <flags>     Pass <flags> to the assembler.\n"
 msgstr "   -f --as-flags <fanions>   relayer les <fanions> à l'assembleur\n"
 
-#: dlltool.c:3923
+#: dlltool.c:3911
 #, c-format
 msgid "   -C --compat-implib        Create backward compatible import library.\n"
 msgstr "   -C --compat-implib        créer une compatibilité arrière à la librairie d'importation\n"
 
-#: dlltool.c:3924
+#: dlltool.c:3912
 #, c-format
 msgid "   -n --no-delete            Keep temp files (repeat for extra preservation).\n"
 msgstr "   -n --no-delete            conserver les fichier temporaires\n"
 
-#: dlltool.c:3925
+#: dlltool.c:3913
 #, c-format
 msgid "   -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
 msgstr "   -t --temp-prefix <préfixe> utiliser le <préfixe> pour construire les noms de fichiers temporaires.\n"
 
-#: dlltool.c:3926
+#: dlltool.c:3914
 #, c-format
 msgid "   -I --identify <implib>    Report the name of the DLL associated with <implib>.\n"
 msgstr "   -I --identify <implib>    Rapporte le nom de la DLL associée à <implib>.\n"
 
-#: dlltool.c:3927
+#: dlltool.c:3915
 #, c-format
 msgid "      --identify-strict      Causes --identify to report error when multiple DLLs.\n"
 msgstr "      --identify-strict      Rapporte des erreurs quand --identify détecte des DLL multiples.\n"
 
-#: dlltool.c:3928
+#: dlltool.c:3916
 #, c-format
 msgid "   -v --verbose              Be verbose.\n"
 msgstr "   -v --verbose              passer en mode bavard\n"
 
-#: dlltool.c:3929
+#: dlltool.c:3917
 #, c-format
 msgid "   -V --version              Display the program version.\n"
 msgstr "   -V --version              afficher le nom et la version du logiciel\n"
 
-#: dlltool.c:3930
+#: dlltool.c:3918
 #, c-format
 msgid "   -h --help                 Display this information.\n"
 msgstr "   -h --help                 afficher l'aide-mémoire\n"
 
-#: dlltool.c:3931
+#: dlltool.c:3919
 #, c-format
 msgid "   @<file>                   Read options from <file>.\n"
 msgstr "   @<fichier>                lire les options à partir du <fichier>\n"
 
-#: dlltool.c:3933
+#: dlltool.c:3921
 #, c-format
 msgid "   -M --mcore-elf <outname>  Process mcore-elf object files into <outname>.\n"
 msgstr "   -M --mcore-elf <nom_sortie>  traiter le fichier objet mcore-elf selon le <nom_de_sortie>\n"
 
-#: dlltool.c:3934
+#: dlltool.c:3922
 #, c-format
 msgid "   -L --linker <name>        Use <name> as the linker.\n"
 msgstr "   -L --linker <nom>         utiliser <nom> comme éditeur de liens\n"
 
-#: dlltool.c:3935
+#: dlltool.c:3923
 #, c-format
 msgid "   -F --linker-flags <flags> Pass <flags> to the linker.\n"
 msgstr "   -F --linker-flags <fanions> relayer les <fanions> à l'éditeur de liens\n"
 
-#: dlltool.c:4082
+#: dlltool.c:4070
 #, c-format
 msgid "Path components stripped from dllname, '%s'."
 msgstr "Composants du chemin ont été éliminés du nom dll '%s'."
 
-#: dlltool.c:4130
+#: dlltool.c:4118
 #, c-format
 msgid "Unable to open base-file: %s"
 msgstr "Incapable d'ouvrir le fichier de base: %s"
 
-#: dlltool.c:4165
+#: dlltool.c:4153
 #, c-format
 msgid "Machine '%s' not supported"
 msgstr "Machine « %s » n'est pas supportée"
 
-#: dlltool.c:4245
+#: dlltool.c:4232
 #, c-format
 msgid "Warning, machine type (%d) not supported for delayimport."
 msgstr "Avertissement, le type de machine (%d) n'est pas supporté par «delayimport»."
 
-#: dlltool.c:4313 dllwrap.c:213
+#: dlltool.c:4300 dllwrap.c:213
 #, c-format
 msgid "Tried file: %s"
 msgstr "Essai avec le fichier: %s"
 
-#: dlltool.c:4320 dllwrap.c:220
+#: dlltool.c:4307 dllwrap.c:220
 #, c-format
 msgid "Using file: %s"
 msgstr "Utilisation du fichier: %s"
@@ -1323,16 +1338,22 @@ msgstr "PILOTE name     : %s\n"
 msgid "DRIVER options  : %s\n"
 msgstr "PILOTE options  : %s\n"
 
-#: dwarf.c:256 dwarf.c:3019
+#: dwarf.c:112 dwarf.c:161 elfedit.c:123 elfedit.c:167 elfedit.c:195
+#: elfedit.c:227 readelf.c:368 readelf.c:536
+#, c-format
+msgid "Unhandled data length: %d\n"
+msgstr "Taille de données non traitées: %d\n"
+
+#: dwarf.c:312 dwarf.c:2890
 msgid "badly formed extended line op encountered!\n"
 msgstr "ligne rencontrée de l'extension de l'opérateur est mal composée!\n"
 
-#: dwarf.c:263
+#: dwarf.c:319
 #, c-format
 msgid "  Extended opcode %d: "
 msgstr "  Code op étendu  %d: "
 
-#: dwarf.c:268
+#: dwarf.c:324
 #, c-format
 msgid ""
 "End of Sequence\n"
@@ -1341,193 +1362,192 @@ msgstr ""
 "Fin de séquence\n"
 "\n"
 
-#: dwarf.c:274
+#: dwarf.c:330
 #, c-format
-msgid "set Address to 0x%s\n"
-msgstr "initialisé l'adresse à 0x%s\n"
+msgid "set Address to 0x%lx\n"
+msgstr "initialisé l'adresse à 0x%lx\n"
 
-#: dwarf.c:280
+#: dwarf.c:336
 #, c-format
 msgid "  define new File Table entry\n"
 msgstr "  définir une entrée pour un nouveau fichier de table\n"
 
-#: dwarf.c:281 dwarf.c:2548
+#: dwarf.c:337 dwarf.c:2431
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
 msgstr "  Entrée\tRép.\tDate\tTaille\tNom\n"
 
-#: dwarf.c:295
+#: dwarf.c:339
 #, c-format
-msgid "set Discriminator to %s\n"
-msgstr "initialise le « Discriminator » à %s\n"
+msgid "   %d\t"
+msgstr "   %d\t"
 
-#: dwarf.c:356
+#: dwarf.c:342 dwarf.c:344 dwarf.c:346 dwarf.c:2443 dwarf.c:2445 dwarf.c:2447
 #, c-format
-msgid "(%s"
-msgstr "(%s"
+msgid "%lu\t"
+msgstr "%lu\t"
 
-#: dwarf.c:360
+#: dwarf.c:347
 #, c-format
-msgid ",%s"
-msgstr ",%s"
+msgid ""
+"%s\n"
+"\n"
+msgstr ""
+"%s\n"
+"\n"
 
-#: dwarf.c:364
+#: dwarf.c:351
 #, c-format
-msgid ",%s)\n"
-msgstr ",%s)\n"
+msgid "set Discriminator to %lu\n"
+msgstr "initialise le «Discriminator» à %lu\n"
 
 #. The test against DW_LNW_hi_user is redundant due to
 #. the limited range of the unsigned char data type used
 #. for op_code.
 #. && op_code <= DW_LNE_hi_user
-#: dwarf.c:387
-#, c-format
-msgid "user defined: "
-msgstr "défini par l'usager: "
-
-#: dwarf.c:389
+#: dwarf.c:393
 #, c-format
-msgid "UNKNOWN: "
-msgstr "UNKNOWN: "
+msgid "user defined: length %d\n"
+msgstr "défini par l'usager: longueur %d\n"
 
-#: dwarf.c:390
+#: dwarf.c:395 dwarf.c:2922
 #, c-format
-msgid "length %d ["
-msgstr "longueur %d ["
+msgid "UNKNOWN: length %d\n"
+msgstr "UNKNOWN: longueur %d\n"
 
-#: dwarf.c:407
+#: dwarf.c:408
 msgid "<no .debug_str section>"
 msgstr "<aucune section .debug_str>"
 
-#: dwarf.c:413
+#: dwarf.c:414
 #, c-format
-msgid "DW_FORM_strp offset too big: %s\n"
-msgstr "décalage DW_FORM_strp est trop grand: %s\n"
+msgid "DW_FORM_strp offset too big: %lx\n"
+msgstr "décalage DW_FORM_strp est trop grand: %lx\n"
 
 #: dwarf.c:415
 msgid "<offset is too big>"
 msgstr "<décalage trop grand>"
 
-#: dwarf.c:655
+#: dwarf.c:654
 #, c-format
 msgid "Unknown TAG value: %lx"
 msgstr "Valeur d'étiquette (« TAG ») inconnue: %lx"
 
-#: dwarf.c:696
+#: dwarf.c:695
 #, c-format
 msgid "Unknown FORM value: %lx"
 msgstr "Valeur FORM inconnue: %lx"
 
-#: dwarf.c:705
+#: dwarf.c:704
 #, c-format
-msgid " %s byte block: "
-msgstr " %s bloc d'octets: "
+msgid " %lu byte block: "
+msgstr " %lu bloc d'octets: "
 
-#: dwarf.c:1050
+#: dwarf.c:1037
 #, c-format
 msgid "(DW_OP_call_ref in frame info)"
 msgstr "(DW_OP_call_ref dans l'info de trame)"
 
-#: dwarf.c:1122
+#: dwarf.c:1109
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
 msgstr "(DW_OP_GNU_implicit_pointer dans l'info de trame)"
 
-#: dwarf.c:1229
+#: dwarf.c:1167
 #, c-format
 msgid "(User defined location op)"
 msgstr "(Op de localisation défini par l'usager)"
 
-#: dwarf.c:1231
+#: dwarf.c:1169
 #, c-format
 msgid "(Unknown location op)"
 msgstr "(Op de localisation inconnu)"
 
-#: dwarf.c:1278
+#: dwarf.c:1217
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr "Erreur interne: version DWARF n'est ni 2, 3 ou 4.\n"
 
-#: dwarf.c:1384
-msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
-msgstr "DW_FORM_data8 n'est pas supporté lorsque sizeof (dwarf_vma) != 8\n"
+#: dwarf.c:1323
+msgid "DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"
+msgstr "DW_FORM_data8 n'est pas supporté lorsque  sizeof (unsigned long) != 8\n"
 
-#: dwarf.c:1434
+#: dwarf.c:1373
 #, c-format
-msgid " (indirect string, offset: 0x%s): %s"
-msgstr " (chaîne indirecte, décalage: 0x%s): %s"
+msgid " (indirect string, offset: 0x%lx): %s"
+msgstr " (chaîne indirecte, décalage: 0x%lx): %s"
 
-#: dwarf.c:1459
+#: dwarf.c:1397
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr "Forme non reconnue: %lu\n"
 
-#: dwarf.c:1552
+#: dwarf.c:1485
 #, c-format
 msgid "(not inlined)"
 msgstr "(pas en ligne)"
 
-#: dwarf.c:1555
+#: dwarf.c:1488
 #, c-format
 msgid "(inlined)"
 msgstr "(en ligne)"
 
-#: dwarf.c:1558
+#: dwarf.c:1491
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr "(déclaré comme en ligne mais ignoré)"
 
-#: dwarf.c:1561
+#: dwarf.c:1494
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr "(déclaré comme en-ligne et en-ligné"
 
-#: dwarf.c:1564
+#: dwarf.c:1497
 #, c-format
-msgid "  (Unknown inline attribute value: %s)"
-msgstr "  (valeur d'attribut en ligne inconnue: %s)"
+msgid "  (Unknown inline attribute value: %lx)"
+msgstr "  (valeur d'attribut en ligne inconnu: %lx)"
 
-#: dwarf.c:1735
+#: dwarf.c:1662
 #, c-format
 msgid "(location list)"
 msgstr "(liste de localisation)"
 
-#: dwarf.c:1756 dwarf.c:3722
+#: dwarf.c:1683 dwarf.c:3563
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr " [sans DW_AT_frame_base]"
 
-#: dwarf.c:1771
+#: dwarf.c:1698
 #, c-format
-msgid "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
-msgstr "L'offset %s utilisé comme valeur pour l'attribut DW_AT_import de DIE à l'offset %lx est trop grand.\n"
+msgid "Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
+msgstr "L'offset %lx utilisé comme valeur pour l'attribut DW_AT_import de DIE à l'offset %lx est trop grand.\n"
 
-#: dwarf.c:1971
+#: dwarf.c:1889
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr "Valeur AT inconnue: %lx"
 
-#: dwarf.c:2042
+#: dwarf.c:1960
 #, c-format
-msgid "Reserved length value (0x%s) found in section %s\n"
-msgstr "La longueur réservée (0x%s) a été trouvée dans la section %s\n"
+msgid "Reserved length value (%lx) found in section %s\n"
+msgstr "La longueur réservée (%lx) a été trouvée dans la section %s\n"
 
-#: dwarf.c:2054
+#: dwarf.c:1971
 #, c-format
-msgid "Corrupt unit length (0x%s) found in section %s\n"
-msgstr "Longueur d'unité corrompue (0x%s) dans la section %s\n"
+msgid "Corrupt unit length (%lx) found in section %s\n"
+msgstr "Longueur d'unité corrompue (%lx) dans la section %s\n"
 
-#: dwarf.c:2062
+#: dwarf.c:1978
 #, c-format
 msgid "No comp units in %s section ?"
 msgstr "Pas d'unités de comptabilisation dans la section %s ?"
 
-#: dwarf.c:2071
+#: dwarf.c:1987
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr "Pas asses de mémoire pour les infos dans un tableau de mise au point de %u entrées"
 
-#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
-#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
+#: dwarf.c:1995 dwarf.c:3158 dwarf.c:3252 dwarf.c:3326 dwarf.c:3443
+#: dwarf.c:3598 dwarf.c:3667 dwarf.c:3862
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
@@ -1536,86 +1556,86 @@ msgstr ""
 "Contenue de la section %s:\n"
 "\n"
 
-#: dwarf.c:2088
+#: dwarf.c:2003
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr "Incapable de localiser la section %s!\n"
 
-#: dwarf.c:2169
+#: dwarf.c:2084
 #, c-format
-msgid "  Compilation Unit @ offset 0x%s:\n"
-msgstr "  Unité de compilation @ décalée de 0x%s:\n"
+msgid "  Compilation Unit @ offset 0x%lx:\n"
+msgstr "  Unité de compilation @ décalée de 0x%lx:\n"
 
-#: dwarf.c:2171
+#: dwarf.c:2085
 #, c-format
-msgid "   Length:        0x%s (%s)\n"
-msgstr "   Longueur:      0x%s (%s)\n"
+msgid "   Length:        0x%lx (%s)\n"
+msgstr "   Longueur:      0x%lx (%s)\n"
 
-#: dwarf.c:2174
+#: dwarf.c:2087
 #, c-format
 msgid "   Version:       %d\n"
 msgstr "   Version:       %d\n"
 
-#: dwarf.c:2175
+#: dwarf.c:2088
 #, c-format
-msgid "   Abbrev Offset: %s\n"
-msgstr "   Décalage abrégé: %s\n"
+msgid "   Abbrev Offset: %ld\n"
+msgstr "   Décalage agrégé: %ld\n"
 
-#: dwarf.c:2177
+#: dwarf.c:2089
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr "   Taille des pointeurs:  %d\n"
 
-#: dwarf.c:2181
+#: dwarf.c:2093
 #, c-format
 msgid "   Signature:     "
 msgstr "   Signature:     "
 
-#: dwarf.c:2185
+#: dwarf.c:2097
 #, c-format
-msgid "   Type Offset:   0x%s\n"
-msgstr "   Offset de type:   0x%s\n"
+msgid "   Type Offset:   0x%lx\n"
+msgstr "   Offset de type:   0x%lx\n"
 
-#: dwarf.c:2193
+#: dwarf.c:2104
 #, c-format
-msgid "Debug info is corrupted, length of CU at %s extends beyond end of section (length = %s)\n"
-msgstr "L'information de debug est corrompue, la longueur du CU à %s s'étend au delà de la fin de la section (longueur = %s)\n"
+msgid "Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"
+msgstr "L'information de debug est corrompue, la longueur du CU à %lx s'étend au delà de la fin de la section (longueur = %lx)\n"
 
-#: dwarf.c:2206
+#: dwarf.c:2115
 #, c-format
-msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
-msgstr "CU à l'offset %s contient un numéro de version corrompu ou non supporté: %d.\n"
+msgid "CU at offset %lx contains corrupt or unsupported version number: %d.\n"
+msgstr "CU à l'offset %lx contient un numéro de version corrompu ou non supporté: %d.\n"
 
-#: dwarf.c:2217
+#: dwarf.c:2125
 #, c-format
 msgid "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"
 msgstr "L'information de debug est corrompue, l'offset «abbrev» (%lx) est plus grand que la taille de la section «abbrev» (%lx)\n"
 
-#: dwarf.c:2267
+#: dwarf.c:2172
 #, c-format
 msgid "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr "Mauvais marqueur «end-of-siblings» détecté à l'offset %lx dans la section .debug_info\n"
 
-#: dwarf.c:2271
+#: dwarf.c:2176
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr "Ceci est le seul avertissement qui sera émis pour de mauvais marqueurs «end-of-siblings»\n"
 
-#: dwarf.c:2290
+#: dwarf.c:2183
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr " <%d><%lx>: Numéro d'abréviation: %lu"
 
-#: dwarf.c:2294
-#, c-format
-msgid " <%d><%lx>: ...\n"
-msgstr " <%d><%lx>: ...\n"
-
-#: dwarf.c:2313
+#: dwarf.c:2200
 #, c-format
 msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
 msgstr "DIE à l'offset %lx renvoie à l'abréviation numéro %lu qui n'existe pas\n"
 
-#: dwarf.c:2415
+#: dwarf.c:2206
+#, c-format
+msgid " (%s)\n"
+msgstr " (%s)\n"
+
+#: dwarf.c:2298
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
@@ -1624,70 +1644,70 @@ msgstr ""
 "Vidange du contenu de débug de la section %s:\n"
 "\n"
 
-#: dwarf.c:2453
+#: dwarf.c:2336
 #, c-format
 msgid "The information in section %s appears to be corrupt - the section is too small\n"
 msgstr "L'information de la section %s semble corrompue - la section est trop petite\n"
 
-#: dwarf.c:2465 dwarf.c:2833
+#: dwarf.c:2348 dwarf.c:2701
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr "Seule la ligne d'info des versions 2, 3 et 4 de DWARF est actuellement supportée.\n"
 
-#: dwarf.c:2479 dwarf.c:2848
+#: dwarf.c:2362 dwarf.c:2716
 msgid "Invalid maximum operations per insn.\n"
 msgstr "Nombre maximum d'opérations par insn.\n"
 
-#: dwarf.c:2498
+#: dwarf.c:2381
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr "  Offset:                      0x%lx\n"
 
-#: dwarf.c:2499
+#: dwarf.c:2382
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr "  Longueur:                    %ld\n"
 
-#: dwarf.c:2500
+#: dwarf.c:2383
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr "  Version DWARF:               %d\n"
 
-#: dwarf.c:2501
+#: dwarf.c:2384
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr "  Longueur du prologue:        %d\n"
 
-#: dwarf.c:2502
+#: dwarf.c:2385
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr "  Longueur minimale des instructions:  %d\n"
 
-#: dwarf.c:2504
+#: dwarf.c:2387
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr "  Maximum d'Ops par Instruction: %d\n"
 
-#: dwarf.c:2505
+#: dwarf.c:2388
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr "  Valeur initiale de « is_stmt »:  %d\n"
 
-#: dwarf.c:2506
+#: dwarf.c:2389
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr "  Ligne de base:               %d\n"
 
-#: dwarf.c:2507
+#: dwarf.c:2390
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr "  Ligne d'étendue:             %d\n"
 
-#: dwarf.c:2508
+#: dwarf.c:2391
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr "  Code op Base:                %d\n"
 
-#: dwarf.c:2517
+#: dwarf.c:2400
 #, c-format
 msgid ""
 "\n"
@@ -1696,12 +1716,12 @@ msgstr ""
 "\n"
 " Codes op:\n"
 
-#: dwarf.c:2520
+#: dwarf.c:2403
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr "  Code op %d a %d arguments\n"
 
-#: dwarf.c:2526
+#: dwarf.c:2409
 #, c-format
 msgid ""
 "\n"
@@ -1710,7 +1730,7 @@ msgstr ""
 "\n"
 " La table des répertoires est vide.\n"
 
-#: dwarf.c:2529
+#: dwarf.c:2412
 #, c-format
 msgid ""
 "\n"
@@ -1719,7 +1739,12 @@ msgstr ""
 "\n"
 " La table des répertoire:\n"
 
-#: dwarf.c:2544
+#: dwarf.c:2416
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#: dwarf.c:2427
 #, c-format
 msgid ""
 "\n"
@@ -1728,7 +1753,7 @@ msgstr ""
 "\n"
 " La talbe des noms de fichiers est vide.\n"
 
-#: dwarf.c:2547
+#: dwarf.c:2430
 #, c-format
 msgid ""
 "\n"
@@ -1737,8 +1762,18 @@ msgstr ""
 "\n"
 " La table des noms de fichiers:\n"
 
+#: dwarf.c:2438
+#, c-format
+msgid "  %d\t"
+msgstr "  %d\t"
+
+#: dwarf.c:2449
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
 #. Now display the statements.
-#: dwarf.c:2577
+#: dwarf.c:2457
 #, c-format
 msgid ""
 "\n"
@@ -1747,97 +1782,97 @@ msgstr ""
 "\n"
 " Numéro de ligne des déclarations:\n"
 
-#: dwarf.c:2596
+#: dwarf.c:2476
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s"
-msgstr "  Op code spécial %d: devance l'Adresse par %s à 0x%s"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx"
+msgstr "  Op code spécial %d: devance l'adresse par %lu à 0x%lx"
 
-#: dwarf.c:2610
+#: dwarf.c:2488
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
-msgstr "  Op code spécial %d: devance l'Adresse par %s à 0x%s[%d]"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx[%d]"
+msgstr "  Op code spécial %d: devance l'adresse par %lu à 0x%lx[%d]"
 
-#: dwarf.c:2618
+#: dwarf.c:2494
 #, c-format
-msgid " and Line by %s to %d\n"
-msgstr " et Ligne par %s à %d\n"
+msgid " and Line by %d to %d\n"
+msgstr " et Ligne par %d à %d\n"
 
-#: dwarf.c:2628
+#: dwarf.c:2504
 #, c-format
 msgid "  Copy\n"
 msgstr "  Copie\n"
 
-#: dwarf.c:2638
+#: dwarf.c:2514
 #, c-format
-msgid "  Advance PC by %s to 0x%s\n"
-msgstr "  Avancer le compteur PC de %s à 0x%s\n"
+msgid "  Advance PC by %lu to 0x%lx\n"
+msgstr "  Avancer le compteur PC de %lu à 0x%lx\n"
 
-#: dwarf.c:2651
+#: dwarf.c:2526
 #, c-format
-msgid "  Advance PC by %s to 0x%s[%d]\n"
-msgstr "  Avancer le compteur PC de %s à 0x%s[%d]\n"
+msgid "  Advance PC by %lu to 0x%lx[%d]\n"
+msgstr "  Avancer le compteur PC de %lu à 0x%lx[%d]\n"
 
-#: dwarf.c:2662
+#: dwarf.c:2536
 #, c-format
-msgid "  Advance Line by %s to %d\n"
-msgstr "  Avancer la ligne de %s à %d\n"
+msgid "  Advance Line by %d to %d\n"
+msgstr "  Avancer la ligne de %d à %d\n"
 
-#: dwarf.c:2670
+#: dwarf.c:2543
 #, c-format
-msgid "  Set File Name to entry %s in the File Name Table\n"
-msgstr "  Initialisé le nom du fichier à l'entrée %s dans la table des noms de fichiers\n"
+msgid "  Set File Name to entry %d in the File Name Table\n"
+msgstr "  Initialisé le nom du fichier à l'entrée %d dans la table des noms de fichiers\n"
 
-#: dwarf.c:2678
+#: dwarf.c:2551
 #, c-format
-msgid "  Set column to %s\n"
-msgstr "  Initialiser la colonne à %s\n"
+msgid "  Set column to %lu\n"
+msgstr "  Initialiser la colonne à %lu\n"
 
-#: dwarf.c:2686
+#: dwarf.c:2558
 #, c-format
-msgid "  Set is_stmt to %s\n"
-msgstr "  Initialisé is_stmt avec %s\n"
+msgid "  Set is_stmt to %d\n"
+msgstr "  Initialisé is_stmt avec %d\n"
 
-#: dwarf.c:2691
+#: dwarf.c:2563
 #, c-format
 msgid "  Set basic block\n"
 msgstr "  Initialisé le bloc de base\n"
 
-#: dwarf.c:2701
+#: dwarf.c:2573
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s\n"
-msgstr "  Avancer le compteur PC par une constante de %s à 0x%s\n"
+msgid "  Advance PC by constant %lu to 0x%lx\n"
+msgstr "  Avancer le compteur PC par une constante de %lu à 0x%lx\n"
 
-#: dwarf.c:2714
+#: dwarf.c:2585
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s[%d]\n"
-msgstr "  Avancer le compteur PC par une constante de %s à 0x%s[%d]\n"
+msgid "  Advance PC by constant %lu to 0x%lx[%d]\n"
+msgstr "  Avancer le compteur PC par une constante de %lu à 0x%lx[%d]\n"
 
-#: dwarf.c:2726
+#: dwarf.c:2596
 #, c-format
-msgid "  Advance PC by fixed size amount %s to 0x%s\n"
-msgstr "  Avancer le compteur PC par une taille fixe de %s à 0x%s\n"
+msgid "  Advance PC by fixed size amount %lu to 0x%lx\n"
+msgstr "  Avancer le compteur PC par une taille fixe de %lu à 0x%lx\n"
 
-#: dwarf.c:2732
+#: dwarf.c:2601
 #, c-format
 msgid "  Set prologue_end to true\n"
 msgstr "  Initialiser prologue_end à VRAI\n"
 
-#: dwarf.c:2736
+#: dwarf.c:2605
 #, c-format
 msgid "  Set epilogue_begin to true\n"
 msgstr "  Initialiser epilogue_begin à VRAI\n"
 
-#: dwarf.c:2742
+#: dwarf.c:2611 dwarf.c:3027
 #, c-format
-msgid "  Set ISA to %s\n"
-msgstr "  Initialiser ISA à %s\n"
+msgid "  Set ISA to %lu\n"
+msgstr "  Initialiser ISA à %lu\n"
 
-#: dwarf.c:2746 dwarf.c:3160
+#: dwarf.c:2615 dwarf.c:3031
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr "  opcode inconnu %d avec les opérandes:"
 
-#: dwarf.c:2780
+#: dwarf.c:2648
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
@@ -1846,65 +1881,100 @@ msgstr ""
 "Vidange du contenu de débug de la section %s:\n"
 "\n"
 
-#: dwarf.c:2821
+#: dwarf.c:2689
 msgid "The line info appears to be corrupt - the section is too small\n"
 msgstr "La ligne d'information semble corrompue - la section est trop petite\n"
 
-#: dwarf.c:2953
+#: dwarf.c:2821
 #, c-format
 msgid "CU: %s:\n"
 msgstr "CU: %s:\n"
 
-#: dwarf.c:2954 dwarf.c:2964
+#: dwarf.c:2822 dwarf.c:2835
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr "Nom fichier                          Num ligne      Adresse début\n"
 
-#: dwarf.c:2959
+#: dwarf.c:2828
 #, c-format
 msgid "CU: %s/%s:\n"
 msgstr "CU: %s/%s:\n"
 
-#: dwarf.c:3051
+#: dwarf.c:2833 dwarf.c:2918
 #, c-format
-msgid "UNKNOWN: length %d\n"
-msgstr "UNKNOWN: longueur %d\n"
+msgid "%s:\n"
+msgstr "%s:\n"
 
-#: dwarf.c:3156
+#. If directory index is 0, that means current directory.
+#: dwarf.c:2964
 #, c-format
-msgid "  Set ISA to %lu\n"
-msgstr "  Initialiser ISA à %lu\n"
+msgid ""
+"\n"
+"./%s:[++]\n"
+msgstr ""
+"\n"
+"./%s:[++]\n"
 
-#: dwarf.c:3322 dwarf.c:3872
+#. The directory index starts counting at 1.
+#: dwarf.c:2970
+#, c-format
+msgid ""
+"\n"
+"%s/%s:\n"
+msgstr ""
+"\n"
+"%s/%s:\n"
+
+#: dwarf.c:3070
+#, c-format
+msgid "%-35s  %11d  %#18lx\n"
+msgstr "%-35s  %11d  %#18lx\n"
+
+#: dwarf.c:3074
+#, c-format
+msgid "%-35s  %11d  %#18lx[%d]\n"
+msgstr "%-35s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3082
+#, c-format
+msgid "%s  %11d  %#18lx\n"
+msgstr "%s  %11d  %#18lx\n"
+
+#: dwarf.c:3086
+#, c-format
+msgid "%s  %11d  %#18lx[%d]\n"
+msgstr "%s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3192 dwarf.c:3712
 #, c-format
 msgid ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
 msgstr "L'offset «.debug_info» de 0x%lx dans la section %s ne pointe pas vers un en-tête CU.\n"
 
-#: dwarf.c:3336
+#: dwarf.c:3206
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr "Seuls les noms publics DWARF 2 et 3 sont couramment supportés\n"
 
-#: dwarf.c:3343
+#: dwarf.c:3213
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr "  Longueur:                            %ld\n"
 
-#: dwarf.c:3345
+#: dwarf.c:3215
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr "  Version:                             %d\n"
 
-#: dwarf.c:3347
+#: dwarf.c:3217
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr "  Décalage dans la section .debug_info:0x%lx\n"
 
-#: dwarf.c:3349
+#: dwarf.c:3219
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr "  Taille de la zone dans la section .debug_info: %ld\n"
 
-#: dwarf.c:3352
+#: dwarf.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -1913,45 +1983,55 @@ msgstr ""
 "\n"
 "    Décalage\tNom\n"
 
-#: dwarf.c:3403
+#: dwarf.c:3273
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
 msgstr " DW_MACINFO_start_file - no de ligne: %d no de fichier: %d\n"
 
-#: dwarf.c:3409
+#: dwarf.c:3279
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr " DW_MACINFO_end_file\n"
 
-#: dwarf.c:3417
+#: dwarf.c:3287
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_define - no de ligne : %d macro : %s\n"
 
-#: dwarf.c:3426
+#: dwarf.c:3296
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_undef - no de ligne : %d macro : %s\n"
 
-#: dwarf.c:3438
+#: dwarf.c:3308
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
 msgstr " DW_MACINFO_vendor_ext - constante : %d chaîne : %s\n"
 
-#: dwarf.c:3467
+#: dwarf.c:3337
 #, c-format
 msgid "  Number TAG\n"
 msgstr "  Numéro d'étiquette\n"
 
-#: dwarf.c:3476
+#: dwarf.c:3343
+#, c-format
+msgid "   %ld      %s    [%s]\n"
+msgstr "   %ld      %s    [%s]\n"
+
+#: dwarf.c:3346
 msgid "has children"
 msgstr "a des rejetons"
 
-#: dwarf.c:3476
+#: dwarf.c:3346
 msgid "no children"
 msgstr "aucun rejeton"
 
-#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
+#: dwarf.c:3349
+#, c-format
+msgid "    %-18s %s\n"
+msgstr "    %-18s %s\n"
+
+#: dwarf.c:3382 dwarf.c:3594 dwarf.c:3819
 #, c-format
 msgid ""
 "\n"
@@ -1960,102 +2040,107 @@ msgstr ""
 "\n"
 "La section %s est vide.\n"
 
-#: dwarf.c:3533 dwarf.c:3987
+#: dwarf.c:3388 dwarf.c:3825
 #, c-format
 msgid "Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"
 msgstr "Incapable de charger/décoder la section «.debug_info», donc on ne peut pas interpréter la section %s.\n"
 
-#: dwarf.c:3577
+#. FIXME: Should we handle this case?
+#: dwarf.c:3432
+msgid "Location lists in .debug_info section aren't in ascending order!\n"
+msgstr "Liste de localisation dans la ssection .debug_info ne sont pas en ordre ascendant!\n"
+
+#: dwarf.c:3435
 msgid "No location lists in .debug_info section!\n"
 msgstr "Pas de liste de localisation dans la section .debug_info!\n"
 
-#: dwarf.c:3582
+#: dwarf.c:3440
 #, c-format
-msgid "Location lists in %s section start at 0x%s\n"
-msgstr "Listes de localisation dans la section %s débutent à 0x%s\n"
+msgid "Location lists in %s section start at 0x%lx\n"
+msgstr "Listes de localisation dans la section %s qui débute à 0x%lx\n"
 
-#: dwarf.c:3589
+#: dwarf.c:3444
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr "    Décalage Début    Fin      Expression\n"
 
-#: dwarf.c:3638
+#: dwarf.c:3479
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "Il y a un trou [0x%lx - 0x%lx] dans la section .debug_loc.\n"
 
-#: dwarf.c:3642
+#: dwarf.c:3483
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "Il y a un chevauchement [0x%lx - 0x%lx] dans la section .debug_loc.\n"
 
-#: dwarf.c:3650
+#: dwarf.c:3491
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr "Le décalage 0x%lx est plus grand que la taille de la section .debug_loc.\n"
 
-#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
+#: dwarf.c:3500 dwarf.c:3535 dwarf.c:3545
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr "La liste de localisation débutan à l'adresse 0x%lx n'est pas terminée.\n"
 
-#: dwarf.c:3678 dwarf.c:4075
+#: dwarf.c:3519 dwarf.c:3913
 #, c-format
 msgid "<End of list>\n"
 msgstr "<Fin de liste>\n"
 
-#: dwarf.c:3688
+#: dwarf.c:3529
 #, c-format
 msgid "(base address)\n"
 msgstr "(adresse de départ)\n"
 
-#: dwarf.c:3725
+#: dwarf.c:3566
 msgid " (start == end)"
 msgstr " (début == fin)"
 
-#: dwarf.c:3727
+#: dwarf.c:3568
 msgid " (start > end)"
 msgstr " (début > fin)"
 
-#: dwarf.c:3737
+#: dwarf.c:3578
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr "Il y a %ld octets inutilisés à la fin de la section %s\n"
 
-#: dwarf.c:3883
+#: dwarf.c:3723
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr "Seuls les aranges DWARF de version 2 et 3 sont couramment supportés.\n"
 
-#: dwarf.c:3887
+#: dwarf.c:3727
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr "  Longueur                  %ld\n"
 
-#: dwarf.c:3889
+#: dwarf.c:3728
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr "  Version:                  %d\n"
 
-#: dwarf.c:3890
+#: dwarf.c:3729
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr "  Décalage dans .debug_info: 0x%lx\n"
 
-#: dwarf.c:3892
+#: dwarf.c:3730
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr "  Taille des pointeurs:     %d\n"
 
-#: dwarf.c:3893
+#: dwarf.c:3731
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr "  Taille des segments:      %d\n"
 
-#: dwarf.c:3902
+#: dwarf.c:3740
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr "Taille du segment + taille du pointer n'est pas une puissance de deux.\n"
 
-#: dwarf.c:3907
+#: dwarf.c:3745
 #, c-format
 msgid ""
 "\n"
@@ -2064,7 +2149,7 @@ msgstr ""
 "\n"
 "    Adresse            Longueur\n"
 
-#: dwarf.c:3909
+#: dwarf.c:3747
 #, c-format
 msgid ""
 "\n"
@@ -2073,385 +2158,260 @@ msgstr ""
 "\n"
 "    Adresse    Longueur\n"
 
-#: dwarf.c:3997
+#: dwarf.c:3835
 msgid "No range lists in .debug_info section!\n"
 msgstr "Aucune liste d'étendues dans la section .debug_info!\n"
 
-#: dwarf.c:4021
+#: dwarf.c:3859
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr "Listes d'étendues dans la section %s débutent à 0x%lx\n"
 
-#: dwarf.c:4025
+#: dwarf.c:3863
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr "    Décalage Début    Fin\n"
 
-#: dwarf.c:4046
+#: dwarf.c:3884
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Il y a un trou [0x%lx - 0x%lx] dans la section %s.\n"
 
-#: dwarf.c:4050
+#: dwarf.c:3888
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Il y a un chevauchement [0x%lx - 0x%lx] dans la section %s.\n"
 
-#: dwarf.c:4093
+#: dwarf.c:3931
 msgid "(start == end)"
 msgstr "(début == fin)"
 
-#: dwarf.c:4095
+#: dwarf.c:3933
 msgid "(start > end)"
 msgstr "(début > fin)"
 
-#: dwarf.c:4347
+#: dwarf.c:4185
 msgid "bad register: "
 msgstr "mauvais registre: "
 
-#. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4350 dwarf.c:5159
+#: dwarf.c:4188
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr "Contenu de la section %s:\n"
 
-#: dwarf.c:5120
+#: dwarf.c:4962
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr "  DW_CFA_??? (Op d'appel de cadre défini par l'utilisateur: %#x)\n"
 
-#: dwarf.c:5122
+#: dwarf.c:4964
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr "numéro d'instruction «Dwarf Call Frame» non supporté ou inconnu: %#x\n"
 
-#: dwarf.c:5163
+#: dwarf.c:4989
 #, c-format
-msgid "Truncated header in the %s section.\n"
-msgstr "En-tête tronqué dans la section %s.\n"
-
-#: dwarf.c:5168
-#, c-format
-msgid "Version %ld\n"
-msgstr "Version %ld\n"
-
-#: dwarf.c:5175
-msgid "The address table data in version 3 may be wrong.\n"
-msgstr "Les données de la table d'adresse à la version 3 pourraient être mauvaises.\n"
-
-#: dwarf.c:5178
-msgid "Version 4 does not support case insensitive lookups.\n"
-msgstr "Version 4 ne supporte pas les recherches insensibles à la casse.\n"
+msgid "Displaying the debug contents of section %s is not yet supported.\n"
+msgstr "L'affichage du contenu de la section de débug %s n'est pas encore supporté.\n"
 
-#: dwarf.c:5183
+#: dwarf.c:5031 elfedit.c:74
 #, c-format
-msgid "Unsupported version %lu.\n"
-msgstr "Version %lu non supportée.\n"
+msgid "%s: Error: "
+msgstr "%s: ERREUR: "
 
-#: dwarf.c:5199
+#: dwarf.c:5042
 #, c-format
-msgid "Corrupt header in the %s section.\n"
-msgstr "En-tête corrompu dans la section %s.\n"
+msgid "%s: Warning: "
+msgstr "%s: AVERTISSEMENT: "
 
-#: dwarf.c:5214
+#: dwarf.c:5145 dwarf.c:5215
 #, c-format
-msgid ""
-"\n"
-"CU table:\n"
-msgstr ""
-"\n"
-"Table CU:\n"
+msgid "Unrecognized debug option '%s'\n"
+msgstr "Option de débug non reconnue « %s »\n"
 
-#: dwarf.c:5220
+#: elfedit.c:243
 #, c-format
-msgid "[%3u] 0x%lx - 0x%lx\n"
-msgstr "[%3u] 0x%lx - 0x%lx\n"
+msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
+msgstr "%s: N'est pas un fichier ELF - ne commence pas par les octets magiques\n"
 
-#: dwarf.c:5225
+#: elfedit.c:251
 #, c-format
-msgid ""
-"\n"
-"TU table:\n"
-msgstr ""
-"\n"
-"Table TU:\n"
+msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
+msgstr "%s: EI_VERSION non supportée: %d n'est pas %d\n"
 
-#: dwarf.c:5232
+#: elfedit.c:267
 #, c-format
-msgid "[%3u] 0x%lx 0x%lx "
-msgstr "[%3u] 0x%lx 0x%lx "
+msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
+msgstr "%s: EI_CLASS sans correspondance: %d n'est pas %d\n"
 
-#: dwarf.c:5239
+#: elfedit.c:278
 #, c-format
-msgid ""
-"\n"
-"Address table:\n"
-msgstr ""
-"\n"
-"Table d'adresses:\n"
+msgid "%s: Unmatched e_machine: %d is not %d\n"
+msgstr "%s: e_machine sans correspondance: %d n'est pas %d\n"
 
-#: dwarf.c:5248
+#: elfedit.c:289
 #, c-format
-msgid "%lu\n"
-msgstr "%lu\n"
+msgid "%s: Unmatched e_type: %d is not %d\n"
+msgstr "%s: e_type sans correspondance: %d n'est pas %d\n"
 
-#: dwarf.c:5251
+#: elfedit.c:300
 #, c-format
-msgid ""
-"\n"
-"Symbol table:\n"
-msgstr ""
-"\n"
-"Table des symboles:\n"
+msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
+msgstr "%s: EI_OSABI sans correspondance: %d n'est pas %d\n"
 
-#: dwarf.c:5285
+#: elfedit.c:333
 #, c-format
-msgid "Displaying the debug contents of section %s is not yet supported.\n"
-msgstr "L'affichage du contenu de la section de débug %s n'est pas encore supporté.\n"
+msgid "%s: Failed to update ELF header: %s\n"
+msgstr "%s: Échec à la mise à jour de l'en-tête ELF: %s\n"
 
-#: dwarf.c:5421 dwarf.c:5491
+#: elfedit.c:366
 #, c-format
-msgid "Unrecognized debug option '%s'\n"
-msgstr "Option de débug non reconnue « %s »\n"
+msgid "Unsupported EI_CLASS: %d\n"
+msgstr "EI_CLASS non supportée: %d\n"
 
-#: elfcomm.c:39
-#, c-format
-msgid "%s: Error: "
-msgstr "%s: ERREUR: "
+#: elfedit.c:399
+msgid ""
+"This executable has been built without support for a\n"
+"64 bit data type and so it cannot process 64 bit ELF files.\n"
+msgstr ""
+"Cet exécutable a été construit sans support pour des\n"
+"types de données 64 bits et ne peut donc traiter des fichiers ELF 64 bits.\n"
 
-#: elfcomm.c:50
+#: elfedit.c:440
 #, c-format
-msgid "%s: Warning: "
-msgstr "%s: AVERTISSEMENT: "
+msgid "%s: Failed to read ELF header\n"
+msgstr "%s: Échec de lecture de l'en-tête ELF\n"
 
-#: elfcomm.c:82 elfcomm.c:117 elfcomm.c:167 elfcomm.c:216
+#: elfedit.c:447
 #, c-format
-msgid "Unhandled data length: %d\n"
-msgstr "Taille de données non traitées: %d\n"
+msgid "%s: Failed to seek to ELF header\n"
+msgstr "%s: Erreur lors de la recherche de l'en-tête ELF\n"
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
-#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
-#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
-#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
-#: readelf.c:11866 readelf.c:12685
+#: elfedit.c:477 elfedit.c:491 elfedit.c:776 readelf.c:3674 readelf.c:3978
+#: readelf.c:4021 readelf.c:4093 readelf.c:4171 readelf.c:4936 readelf.c:4960
+#: readelf.c:7057 readelf.c:7103 readelf.c:7304 readelf.c:8494 readelf.c:8508
+#: readelf.c:9033 readelf.c:9049 readelf.c:9092 readelf.c:9117 readelf.c:11385
+#: readelf.c:11577 readelf.c:12138 readelf.c:12515 readelf.c:12529
+#: readelf.c:12891
 msgid "Out of memory\n"
 msgstr "Mémoire épuisée\n"
 
-#: elfcomm.c:312
+#: elfedit.c:543 readelf.c:12581
 #, c-format
 msgid "%s: failed to seek to first archive header\n"
 msgstr "%s: échec de repérage du premier en-tête d'archive\n"
 
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
+#: elfedit.c:553 elfedit.c:741 elfedit.c:845 readelf.c:12590 readelf.c:12858
+#: readelf.c:13026
 #, c-format
 msgid "%s: failed to read archive header\n"
 msgstr "%s: échec de lecture de l'en-tête de l'archive\n"
 
-#: elfcomm.c:347
-#, c-format
-msgid "%s: the archive index is empty\n"
-msgstr "%s: l'index de l'archive est vide\n"
-
-#: elfcomm.c:355 elfcomm.c:381
-#, c-format
-msgid "%s: failed to read archive index\n"
-msgstr "%s: échec de lecture de l'index de l'archive\n"
-
-#: elfcomm.c:365
-#, c-format
-msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
-msgstr "%s: l'index de l'archive devrait avoir %ld entrées mais l'en-tête est trop petit\n"
-
-#: elfcomm.c:373
-msgid "Out of memory whilst trying to read archive symbol index\n"
-msgstr "Mémoire épuisée lors de la lecture de l'index des symboles de l'archive\n"
-
-#: elfcomm.c:392
-msgid "Out of memory whilst trying to convert the archive symbol index\n"
-msgstr "Mémoire épuisée lors de la conversion de l'index des symboles de l'archive\n"
-
-#: elfcomm.c:405
-#, c-format
-msgid "%s: the archive has an index but no symbols\n"
-msgstr "%s: l'archive a un index mais pas de symbole\n"
-
-#: elfcomm.c:413
-msgid "Out of memory whilst trying to read archive index symbol table\n"
-msgstr "Mémoire épuisée lors de la lecture de la table des symboles de l'index de l'archive\n"
-
-#: elfcomm.c:419
-#, c-format
-msgid "%s: failed to read archive index symbol table\n"
-msgstr "%s: erreur de lecture de la table de symboles de l'index de l'archive\n"
-
-#: elfcomm.c:428
+#: elfedit.c:568 readelf.c:12691
 #, c-format
 msgid "%s: failed to skip archive symbol table\n"
 msgstr "%s: échec d'escamotage de la table de symboles dans l'archive\n"
 
-#: elfcomm.c:440
+#: elfedit.c:579 readelf.c:12702
 #, c-format
 msgid "%s: failed to read archive header following archive index\n"
 msgstr "%s: échec de lecture de l'en-tête de l'archive après l'index de l'archive\n"
 
-#: elfcomm.c:446
-#, c-format
-msgid "%s has no archive index\n"
-msgstr "%s n'a pas d'index d'archive\n"
-
-#: elfcomm.c:457
+#: elfedit.c:594 readelf.c:12718
 msgid "Out of memory reading long symbol names in archive\n"
 msgstr "Mémoire épuisée lors de la lecture des noms longs des symboles de l'archive\n"
 
-#: elfcomm.c:465
+#: elfedit.c:602 readelf.c:12726
 #, c-format
 msgid "%s: failed to read long symbol name string table\n"
 msgstr "%s: échec de lecture de la table des noms longs de symboles\n"
 
-#: elfcomm.c:605
+#: elfedit.c:734 readelf.c:12852
 #, c-format
 msgid "%s: failed to seek to next file name\n"
 msgstr "%s: échec de repérage du nom de fichier suivant\n"
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
+#: elfedit.c:747 elfedit.c:852 readelf.c:12863 readelf.c:13032
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr "%s: pas d'en-tête d'archive valable\n"
 
-#: elfedit.c:73
-#, c-format
-msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
-msgstr "%s: N'est pas un fichier ELF - ne commence pas par les octets magiques\n"
-
-#: elfedit.c:81
-#, c-format
-msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
-msgstr "%s: EI_VERSION non supportée: %d n'est pas %d\n"
-
-#: elfedit.c:97
-#, c-format
-msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
-msgstr "%s: EI_CLASS sans correspondance: %d n'est pas %d\n"
-
-#: elfedit.c:108
-#, c-format
-msgid "%s: Unmatched e_machine: %d is not %d\n"
-msgstr "%s: e_machine sans correspondance: %d n'est pas %d\n"
-
-#: elfedit.c:119
-#, c-format
-msgid "%s: Unmatched e_type: %d is not %d\n"
-msgstr "%s: e_type sans correspondance: %d n'est pas %d\n"
-
-#: elfedit.c:130
-#, c-format
-msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
-msgstr "%s: EI_OSABI sans correspondance: %d n'est pas %d\n"
-
-#: elfedit.c:163
-#, c-format
-msgid "%s: Failed to update ELF header: %s\n"
-msgstr "%s: Échec à la mise à jour de l'en-tête ELF: %s\n"
-
-#: elfedit.c:196
-#, c-format
-msgid "Unsupported EI_CLASS: %d\n"
-msgstr "EI_CLASS non supportée: %d\n"
-
-#: elfedit.c:229
-msgid ""
-"This executable has been built without support for a\n"
-"64 bit data type and so it cannot process 64 bit ELF files.\n"
-msgstr ""
-"Cet exécutable a été construit sans support pour des\n"
-"types de données 64 bits et ne peut donc traiter des fichiers ELF 64 bits.\n"
-
-#: elfedit.c:270
-#, c-format
-msgid "%s: Failed to read ELF header\n"
-msgstr "%s: Échec de lecture de l'en-tête ELF\n"
-
-#: elfedit.c:277
-#, c-format
-msgid "%s: Failed to seek to ELF header\n"
-msgstr "%s: Erreur lors de la recherche de l'en-tête ELF\n"
-
-#: elfedit.c:331 readelf.c:13161
+#: elfedit.c:836 readelf.c:13018
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
 msgstr "%s: échec de repérage de la prochaine en-tête d'archive\n"
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
+#: elfedit.c:867 elfedit.c:876 readelf.c:13046 readelf.c:13055
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr "%s: nom erroné du fichier d'archive\n"
 
-#: elfedit.c:391 elfedit.c:483
+#: elfedit.c:896 elfedit.c:988
 #, c-format
 msgid "Input file '%s' is not readable\n"
 msgstr "Fichier d'entrée «%s» illisible.\n"
 
-#: elfedit.c:415
+#: elfedit.c:920
 #, c-format
 msgid "%s: failed to seek to archive member\n"
 msgstr "%s: erreur lors de la recherche du membre de l'archive.\n"
 
-#: elfedit.c:454 readelf.c:13284
+#: elfedit.c:959 readelf.c:13134
 #, c-format
 msgid "'%s': No such file\n"
 msgstr "'%s': pas de fichier comme tel\n"
 
-#: elfedit.c:456 readelf.c:13286
+#: elfedit.c:961 readelf.c:13136
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr "Ne peut retrouver '%s'. Message d'erreur système: %s\n"
 
-#: elfedit.c:463 readelf.c:13293
+#: elfedit.c:968 readelf.c:13143
 #, c-format
 msgid "'%s' is not an ordinary file\n"
 msgstr "'%s' n'est pas un fichier ordinaire\n"
 
-#: elfedit.c:489 readelf.c:13306
+#: elfedit.c:994 readelf.c:13156
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr "%s: échec de lecture du numéro magique du fichier\n"
 
-#: elfedit.c:547
+#: elfedit.c:1052
 #, c-format
 msgid "Unknown OSABI: %s\n"
 msgstr "OSABI inconnu: %s\n"
 
-#: elfedit.c:566
+#: elfedit.c:1071
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr "Type de machine inconnu: %s\n"
 
-#: elfedit.c:584
+#: elfedit.c:1089
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr "Type de machine inconnu: %d\n"
 
-#: elfedit.c:603
+#: elfedit.c:1108
 #, c-format
 msgid "Unknown type: %s\n"
 msgstr "Type inconnu: %s\n"
 
-#: elfedit.c:634
+#: elfedit.c:1139
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr "Usage: %s <option(s)> fichier(s)elf\n"
 
-#: elfedit.c:636
+#: elfedit.c:1141
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr " Mise à jour de l'en-tête ELF des fichiers ELF\n"
 
-#: elfedit.c:637 objcopy.c:475 objcopy.c:585
+#: elfedit.c:1142 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
 msgstr " Les options sont:\n"
 
-#: elfedit.c:638
+#: elfedit.c:1143
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -2472,26 +2432,31 @@ msgstr ""
 "  -h --help                   Afficher ces informations\n"
 "  -v --version                Afficher la version de %s\n"
 
-#: emul_aix.c:45
+#: emul_aix.c:43
 #, c-format
 msgid "  [-g]         - 32 bit small archive\n"
 msgstr "  [-g]         - petite archive de 32 bits\n"
 
-#: emul_aix.c:46
+#: emul_aix.c:44
 #, c-format
 msgid "  [-X32]       - ignores 64 bit objects\n"
 msgstr "  [-X32]       - ignore les objets de 64 bits\n"
 
-#: emul_aix.c:47
+#: emul_aix.c:45
 #, c-format
 msgid "  [-X64]       - ignores 32 bit objects\n"
 msgstr "  [-X64]       - ignore les objets de 32 bits\n"
 
-#: emul_aix.c:48
+#: emul_aix.c:46
 #, c-format
 msgid "  [-X32_64]    - accepts 32 and 64 bit objects\n"
 msgstr "  [-X32_64]    - accepter les objets de 32 et 64 bits\n"
 
+#: emul_aix.c:99 emul_aix.c:109 emul_aix.c:119 emul_aix.c:129
+#, c-format
+msgid "target `%s' ignored."
+msgstr "cible «%s» ignorée."
+
 #: ieee.c:311
 msgid "unexpected end of debugging information"
 msgstr "fin inattendue des informations de débug"
@@ -2713,17 +2678,17 @@ msgstr "débordement numériquie IEEE: Ox"
 msgid "IEEE string length overflow: %u\n"
 msgstr "débordement de la longueur de la chaîne IEEE: %u\n"
 
-#: ieee.c:5213
+#: ieee.c:5210
 #, c-format
 msgid "IEEE unsupported integer type size %u\n"
 msgstr "taille de type d'entier IEEE non supporté %u\n"
 
-#: ieee.c:5247
+#: ieee.c:5244
 #, c-format
 msgid "IEEE unsupported float type size %u\n"
 msgstr "taille de type de nombre IEEE en notation flottante non supporté %u\n"
 
-#: ieee.c:5281
+#: ieee.c:5278
 #, c-format
 msgid "IEEE unsupported complex type size %u\n"
 msgstr "taille de nombre complexe IEEE non supportée %u\n"
@@ -2732,120 +2697,120 @@ msgstr "taille de nombre complexe IEEE non supportée %u\n"
 msgid "Duplicate symbol entered into keyword list."
 msgstr "Symbole dupliqué dans le liste des mots clés."
 
-#: nlmconv.c:274 srconv.c:1824
+#: nlmconv.c:273 srconv.c:1823
 msgid "input and output files must be different"
 msgstr "fichiers d'entrée et de sortie doivent être différents"
 
-#: nlmconv.c:321
+#: nlmconv.c:320
 msgid "input file named both on command line and with INPUT"
 msgstr "fichier d'entrée nommé à la fois sur la ligne de commande et dans la champ INPUT"
 
-#: nlmconv.c:330
+#: nlmconv.c:329
 msgid "no input file"
 msgstr "aucun fichier d'entrée"
 
-#: nlmconv.c:360
+#: nlmconv.c:359
 msgid "no name for output file"
 msgstr "aucun nom pour le fichier de sortie"
 
-#: nlmconv.c:374
+#: nlmconv.c:373
 msgid "warning: input and output formats are not compatible"
 msgstr "AVERTISSEMENT: les formats d'entrée et de sortie sont incompatibles"
 
-#: nlmconv.c:404
+#: nlmconv.c:403
 msgid "make .bss section"
 msgstr "générer la section .bss"
 
-#: nlmconv.c:414
+#: nlmconv.c:413
 msgid "make .nlmsections section"
 msgstr "générer la section .nlmsections"
 
-#: nlmconv.c:442
+#: nlmconv.c:441
 msgid "set .bss vma"
 msgstr "initialiser le vma de la section .bss"
 
-#: nlmconv.c:449
+#: nlmconv.c:448
 msgid "set .data size"
 msgstr "initialiser la taille de la section .data"
 
-#: nlmconv.c:629
+#: nlmconv.c:628
 #, c-format
 msgid "warning: symbol %s imported but not in import list"
 msgstr "AVERTISSEMENT: symbole %s importé mais n'est pas dans la liste d'importation"
 
-#: nlmconv.c:649
+#: nlmconv.c:648
 msgid "set start address"
 msgstr "initialiser l'adresse de départ"
 
-#: nlmconv.c:698
+#: nlmconv.c:697
 #, c-format
 msgid "warning: START procedure %s not defined"
 msgstr "AVERTISSEMENT: procédure START %s n'est pas définie"
 
-#: nlmconv.c:700
+#: nlmconv.c:699
 #, c-format
 msgid "warning: EXIT procedure %s not defined"
 msgstr "AVERTISSEMENT: procédure EXIT %s n'est pas définie"
 
-#: nlmconv.c:702
+#: nlmconv.c:701
 #, c-format
 msgid "warning: CHECK procedure %s not defined"
 msgstr "AVERTISSEMENT: procédure CHECK %s n'est pas définie"
 
-#: nlmconv.c:722 nlmconv.c:908
+#: nlmconv.c:721 nlmconv.c:907
 msgid "custom section"
 msgstr "section « custom »"
 
-#: nlmconv.c:742 nlmconv.c:937
+#: nlmconv.c:741 nlmconv.c:936
 msgid "help section"
 msgstr "section d'aide"
 
-#: nlmconv.c:764 nlmconv.c:955
+#: nlmconv.c:763 nlmconv.c:954
 msgid "message section"
 msgstr "section message"
 
-#: nlmconv.c:779 nlmconv.c:988
+#: nlmconv.c:778 nlmconv.c:987
 msgid "module section"
 msgstr "section module"
 
-#: nlmconv.c:798 nlmconv.c:1004
+#: nlmconv.c:797 nlmconv.c:1003
 msgid "rpc section"
 msgstr "section rpc"
 
 #. There is no place to record this information.
-#: nlmconv.c:834
+#: nlmconv.c:833
 #, c-format
 msgid "%s: warning: shared libraries can not have uninitialized data"
 msgstr "%s: AVERTISSEMENT: les librairies partagées ne peuvent avoir des données non initialisées"
 
-#: nlmconv.c:855 nlmconv.c:1023
+#: nlmconv.c:854 nlmconv.c:1022
 msgid "shared section"
 msgstr "section partagée"
 
-#: nlmconv.c:863
+#: nlmconv.c:862
 msgid "warning: No version number given"
 msgstr "AVERTISSEMENT: aucun numéro de version fourni"
 
-#: nlmconv.c:903 nlmconv.c:932 nlmconv.c:950 nlmconv.c:999 nlmconv.c:1018
+#: nlmconv.c:902 nlmconv.c:931 nlmconv.c:949 nlmconv.c:998 nlmconv.c:1017
 #, c-format
 msgid "%s: read: %s"
 msgstr "%s: lu: %s"
 
-#: nlmconv.c:925
+#: nlmconv.c:924
 msgid "warning: FULLMAP is not supported; try ld -M"
 msgstr "AVERTISSEMENT: FULLMAP n'est pas supporté; essayer ld -M"
 
-#: nlmconv.c:1101
+#: nlmconv.c:1100
 #, c-format
 msgid "Usage: %s [option(s)] [in-file [out-file]]\n"
 msgstr "Usage: %s [options] fichier_entrée [fichier_sortie]\n"
 
-#: nlmconv.c:1102
+#: nlmconv.c:1101
 #, c-format
 msgid " Convert an object file into a NetWare Loadable Module\n"
 msgstr "Convertir un fichier objet en un module NetWare Loadable\n"
 
-#: nlmconv.c:1103
+#: nlmconv.c:1102
 #, c-format
 msgid ""
 " The options are:\n"
@@ -2868,64 +2833,64 @@ msgstr ""
 "   -h --help                    afficher l'aide-mémoire\n"
 "   -V --version                 afficher le nom et la version du logiciel\n"
 
-#: nlmconv.c:1144
+#: nlmconv.c:1143
 #, c-format
 msgid "support not compiled in for %s"
 msgstr "soutien non compilé pour %s"
 
-#: nlmconv.c:1181
+#: nlmconv.c:1180
 msgid "make section"
 msgstr "section make"
 
-#: nlmconv.c:1195
+#: nlmconv.c:1194
 msgid "set section size"
 msgstr "initialisation de la taille de la section"
 
-#: nlmconv.c:1201
+#: nlmconv.c:1200
 msgid "set section alignment"
 msgstr "initialisation de l'alignement de la section"
 
-#: nlmconv.c:1205
+#: nlmconv.c:1204
 msgid "set section flags"
 msgstr "initialisation des fanions de la section"
 
-#: nlmconv.c:1216
+#: nlmconv.c:1215
 msgid "set .nlmsections size"
 msgstr "initialisation de la taille de .nlmsections"
 
-#: nlmconv.c:1297 nlmconv.c:1305 nlmconv.c:1314 nlmconv.c:1319
+#: nlmconv.c:1296 nlmconv.c:1304 nlmconv.c:1313 nlmconv.c:1318
 msgid "set .nlmsection contents"
 msgstr "initialisation du contenu de .nlmsection"
 
-#: nlmconv.c:1796
+#: nlmconv.c:1795
 msgid "stub section sizes"
 msgstr "taille de la section stub"
 
-#: nlmconv.c:1843
+#: nlmconv.c:1842
 msgid "writing stub"
 msgstr "écriture du stub"
 
-#: nlmconv.c:1927
+#: nlmconv.c:1926
 #, c-format
 msgid "unresolved PC relative reloc against %s"
-msgstr "réadressage relatif sur PC non résolu de %s"
+msgstr "relocalisation relative sur PC non résolue de %s"
 
-#: nlmconv.c:1991
+#: nlmconv.c:1990
 #, c-format
 msgid "overflow when adjusting relocation against %s"
-msgstr "débordement lors du réadressage de %s"
+msgstr "débordement lors de la relocalisation de %s"
 
-#: nlmconv.c:2118
+#: nlmconv.c:2117
 #, c-format
 msgid "%s: execution of %s failed: "
 msgstr "%s: échec d'exécution de %s :"
 
-#: nlmconv.c:2133
+#: nlmconv.c:2132
 #, c-format
 msgid "Execution of %s failed"
 msgstr "Échec d'exécution de %s"
 
-#: nm.c:225 size.c:78 strings.c:650
+#: nm.c:225 size.c:78 strings.c:646
 #, c-format
 msgid "Usage: %s [option(s)] [file(s)]\n"
 msgstr "Usage: %s [options] fichiers\n"
@@ -3029,17 +2994,17 @@ msgstr "%s: base numérique invalide"
 msgid "%s: invalid output format"
 msgstr "%s: format de sortie invalide"
 
-#: nm.c:346 readelf.c:8546 readelf.c:8591
+#: nm.c:346 readelf.c:8259 readelf.c:8304
 #, c-format
 msgid "<processor specific>: %d"
 msgstr "<spécificités du processor>: %d"
 
-#: nm.c:348 readelf.c:8555 readelf.c:8609
+#: nm.c:348 readelf.c:8268 readelf.c:8322
 #, c-format
 msgid "<OS specific>: %d"
 msgstr "<spécificités du système d'exploitation>: %d"
 
-#: nm.c:350 readelf.c:8558 readelf.c:8612
+#: nm.c:350 readelf.c:8271 readelf.c:8325
 #, c-format
 msgid "<unknown>: %d"
 msgstr "<inconnu>: %d"
@@ -3053,7 +3018,7 @@ msgstr ""
 "\n"
 "Indexe de l'archive:\n"
 
-#: nm.c:1254
+#: nm.c:1251
 #, c-format
 msgid ""
 "\n"
@@ -3066,7 +3031,7 @@ msgstr ""
 "Symboles indéfinis dans %s:\n"
 "\n"
 
-#: nm.c:1256
+#: nm.c:1253
 #, c-format
 msgid ""
 "\n"
@@ -3079,7 +3044,7 @@ msgstr ""
 "Symboles de %s:\n"
 "\n"
 
-#: nm.c:1258 nm.c:1309
+#: nm.c:1255 nm.c:1306
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  Section\n"
@@ -3088,7 +3053,7 @@ msgstr ""
 "Nom                   Valeur  Classe       Type         Taille   Ligne Section\n"
 "\n"
 
-#: nm.c:1261 nm.c:1312
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         Size             Line  Section\n"
@@ -3097,7 +3062,7 @@ msgstr ""
 "Nom                   Valeur          Classe       Type         Taille           Ligne Section\n"
 "\n"
 
-#: nm.c:1305
+#: nm.c:1302
 #, c-format
 msgid ""
 "\n"
@@ -3110,7 +3075,7 @@ msgstr ""
 "Symboles indéfinis dans %s[%s]:\n"
 "\n"
 
-#: nm.c:1307
+#: nm.c:1304
 #, c-format
 msgid ""
 "\n"
@@ -3123,29 +3088,29 @@ msgstr ""
 "Symboles de %s[%s]:\n"
 "\n"
 
-#: nm.c:1399
+#: nm.c:1396
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr "La largeur d'impression n'a pas été initialisée (%d)"
 
-#: nm.c:1627
+#: nm.c:1624
 msgid "Only -X 32_64 is supported"
 msgstr "Seul -X 32_64 est supporté"
 
-#: nm.c:1656
+#: nm.c:1653
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr "Utiliser ensemble les options --size-sort et --undefined-only"
 
-#: nm.c:1657
+#: nm.c:1654
 msgid "will produce no output, since undefined symbols have no size."
 msgstr "ne produira aucune sortie étant donnée que les symboles n'ont aucune taille."
 
-#: nm.c:1685
+#: nm.c:1682
 #, c-format
 msgid "data size %ld"
 msgstr "taille des donnée %ld"
 
-#: objcopy.c:473 srconv.c:1732
+#: objcopy.c:473 srconv.c:1731
 #, c-format
 msgid "Usage: %s [option(s)] in-file [out-file]\n"
 msgstr "Usage: %s [options] fichier_d_entrée [fichier_de_sortie]\n"
@@ -3264,13 +3229,13 @@ msgstr ""
 "  -j --only-section <nom>          Copier seulement la section <nom> dans le fichier de sortie\n"
 "     --add-gnu-debuglink=<fichier> Ajouter la section .gnu_debuglink d'édition de liens au <fichier>\n"
 "  -R --remove-section <nom>        Retirer la section <nom> du fichier de sortie\n"
-"  -S --strip-all                   Retirer tous les symboles et les informations de réadressage\n"
+"  -S --strip-all                   Retirer tous les symboles et les informations de relocalisation\n"
 "  -g --strip-debug                 Retirer tous les symboles et sections de débug\n"
-"     --strip-unneeded              Retirer tous les symboles qui ne sont pas nécessaires au réadressage\n"
+"     --strip-unneeded              Retirer tous les symboles qui ne sont pas nécessaires à la relocalisation\n"
 "  -N --strip-symbol <nom>          Ne pas copier le symbole <nom>\n"
 "     --strip-unneeded-symbol <name>\n"
 "                                   Ne pas copier le symbole <nom> à moins qu'il soit\n"
-"                                     nécessaire au réadressage\n"
+"                                     nécessaire à la relocalisation\n"
 "     --only-keep-debug             Élaguer tout sauf les informations de mise au point\n"
 "     --extract-symbol              Supprimer le contenu de la section mais garder les symboles\n"
 "  -K --keep-symbol <nom>           Ne pas élaguer le symbole <nom>\n"
@@ -3392,9 +3357,9 @@ msgstr ""
 "  -F --target <nombfd>             utiliser à l'entrée et à la sortie le format <nombfd>\n"
 "  -p --preserve-dates              préserver les dates d'accès et de modification lors de la copie\n"
 "  -R --remove-section=<nom>        retirer la section <nom> du fichier de sortie\n"
-"  -s --strip-all                   retirer tous les symboles et les informations de réadressage\n"
+"  -s --strip-all                   retirer tous les symboles et les informations de relocalisation\n"
 "  -g -S -d --strip-debug           retirer tous les symboles de débug\n"
-"     --strip-unneeded              retirer tous les symboles qui ne sont pas nécessaire au réadressage\n"
+"     --strip-unneeded              retirer tous les symboles qui ne sont pas nécessaire à la relocalisation\n"
 "     --only-keep-debug             retirer tous les symboles sauf les informations de mise au point\n"
 "  -N --strip-symbol <nom>          ne pas copier le symbole <nom>\n"
 "  -K --keep-symbol <nom>           copier seulement le symbole <nom>\n"
@@ -3423,7 +3388,7 @@ msgstr "fanions supportés: %s"
 msgid "cannot open '%s': %s"
 msgstr "ne peut ouvrir: « %s »: %s"
 
-#: objcopy.c:764 objcopy.c:3392
+#: objcopy.c:764 objcopy.c:3389
 #, c-format
 msgid "%s: fread failed"
 msgstr "%s: fread en échec"
@@ -3478,295 +3443,294 @@ msgstr "stat() a retourné une taille négative for « %s »"
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr "copier à partir de « %s » [inconnu] vers « %s » [inconnu]\n"
 
-#: objcopy.c:1429
+#: objcopy.c:1427
 msgid "Unable to change endianness of input file(s)"
 msgstr "Incapable de changer de systèmes d'encodage (poids fort- faible) des fichiers d'entrée"
 
-#: objcopy.c:1438
+#: objcopy.c:1436
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr "copier de « %s » [%s] vers « %s » [%s]\n"
 
-#: objcopy.c:1487
+#: objcopy.c:1485
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr "Le fichier d'entrée «%s» ignore les paramètres de l'architecture binaire."
 
-#: objcopy.c:1495
+#: objcopy.c:1493
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr "Incapable de reconnaître le format du fichier d'entrée « %s »"
 
-#: objcopy.c:1498
+#: objcopy.c:1496
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr "Fichier de sortie ne peut représenter l'architecture « %s »"
 
-#: objcopy.c:1561
+#: objcopy.c:1559
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr "attention: alignement du fichier (0x%s) > alignment de la section (0x%s)"
 
-#: objcopy.c:1620
+#: objcopy.c:1618
 #, c-format
 msgid "can't add section '%s'"
 msgstr "ne peut créer la section « %s »"
 
-#: objcopy.c:1634
+#: objcopy.c:1632
 #, c-format
 msgid "can't create section `%s'"
 msgstr "ne peut créer la section « %s »"
 
-#: objcopy.c:1680
+#: objcopy.c:1678
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr "ne peut créer la section de débug «%s»"
 
-#: objcopy.c:1773
+#: objcopy.c:1771
 msgid "Can't fill gap after section"
 msgstr "ne peut remplir le vide après la section"
 
-#: objcopy.c:1797
+#: objcopy.c:1795
 msgid "can't add padding"
 msgstr "ne peut ajouter de remplissage"
 
-#: objcopy.c:1888
+#: objcopy.c:1886
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr "ne peut remplir la section de débug «%s»"
 
-#: objcopy.c:1951
+#: objcopy.c:1949
 msgid "error copying private BFD data"
 msgstr "erreur de copie des données privées BFD"
 
-#: objcopy.c:1962
+#: objcopy.c:1960
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr "cette cible ne supporte pas %lu codes machine alternatifs"
 
-#: objcopy.c:1966
+#: objcopy.c:1964
 msgid "treating that number as an absolute e_machine value instead"
 msgstr "traite ce nombre comme une valeur e_machine absolue"
 
-#: objcopy.c:1970
+#: objcopy.c:1968
 msgid "ignoring the alternative value"
 msgstr "ignore la valeur alternative"
 
-#: objcopy.c:2002 objcopy.c:2038
+#: objcopy.c:2000 objcopy.c:2035
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr "ne peut créer le répertoire temporaire pour copier l'archivage (erreur: %s)"
 
-#: objcopy.c:2068
+#: objcopy.c:2096
 msgid "Unable to recognise the format of file"
 msgstr "Incapable de reconnaître le format du fichier"
 
-#: objcopy.c:2195
+#: objcopy.c:2194
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr "ERREUR: le fichier d'entrée « %s » est vide"
 
-#: objcopy.c:2339
+#: objcopy.c:2338
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr "Changement multiples de noms de la section %s"
 
-#: objcopy.c:2390
+#: objcopy.c:2389
 msgid "error in private header data"
 msgstr "erreur dans les données d'en-tête privées"
 
-#: objcopy.c:2468
+#: objcopy.c:2467
 msgid "failed to create output section"
 msgstr "incapable de créer la section de sortie"
 
-#: objcopy.c:2482
+#: objcopy.c:2481
 msgid "failed to set size"
 msgstr "incapable d'initialiser la taille"
 
-#: objcopy.c:2496
+#: objcopy.c:2495
 msgid "failed to set vma"
 msgstr "incapable d'initialiser le vma"
 
-#: objcopy.c:2521
+#: objcopy.c:2520
 msgid "failed to set alignment"
 msgstr "incapable d'initialiser l'alignement"
 
-#: objcopy.c:2555
+#: objcopy.c:2554
 msgid "failed to copy private data"
 msgstr "erreur de copie des données privées"
 
-#: objcopy.c:2637
+#: objcopy.c:2636
 msgid "relocation count is negative"
 msgstr "le compteur de relocation est négatif"
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2698
+#: objcopy.c:2697
 #, c-format
 msgid "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr "ne peut pas inverser les octets: la longueur de la section %s doit être équitablement divisible en %d"
 
-#: objcopy.c:2884
+#: objcopy.c:2883
 msgid "can't create debugging section"
 msgstr "ne peut créer la section de débug"
 
-#: objcopy.c:2897
+#: objcopy.c:2896
 msgid "can't set debugging section contents"
 msgstr "ne peut initialiser le contenu de la section de débug"
 
-#: objcopy.c:2905
+#: objcopy.c:2904
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr "ne sait comment écrire les informations de débug de %s"
 
-#: objcopy.c:3048
+#: objcopy.c:3046
 msgid "could not create temporary file to hold stripped copy"
 msgstr "le fichier temporaire pour contenir la copie élaguée n'a pas pu être créé"
 
-#: objcopy.c:3120
+#: objcopy.c:3118
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr "%s: mauvaise version dans le sous-système PE"
 
-#: objcopy.c:3150
+#: objcopy.c:3148
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr "sous-système PE inconnu: %s"
 
-#: objcopy.c:3212
+#: objcopy.c:3209
 msgid "byte number must be non-negative"
 msgstr "le nombre d'octet ne peut être négatif"
 
-#: objcopy.c:3218
+#: objcopy.c:3215
 #, c-format
 msgid "architecture %s unknown"
 msgstr "architecture %s inconnue"
 
-#: objcopy.c:3226
+#: objcopy.c:3223
 msgid "interleave must be positive"
 msgstr "l'intercalage doit être positif"
 
-#: objcopy.c:3235
+#: objcopy.c:3232
 msgid "interleave width must be positive"
 msgstr "la largeur d'intercalage doit être positive"
 
-#: objcopy.c:3255 objcopy.c:3263
+#: objcopy.c:3252 objcopy.c:3260
 #, c-format
 msgid "%s both copied and removed"
 msgstr "%s les deux doivent être copiés et enlevés"
 
-#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
-#: objcopy.c:3609 objcopy.c:3629
+#: objcopy.c:3359 objcopy.c:3439 objcopy.c:3547 objcopy.c:3578 objcopy.c:3602
+#: objcopy.c:3606 objcopy.c:3626
 #, c-format
 msgid "bad format for %s"
 msgstr "mauvais format pour %s"
 
-#: objcopy.c:3374
+#: objcopy.c:3371
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr "ne peut ouvrir: %s: %s"
 
-#: objcopy.c:3519
+#: objcopy.c:3516
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr "AVERTISSEMENT: réduction du remplissage de 0x%s à 0x%x"
 
-#: objcopy.c:3680
+#: objcopy.c:3677
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr "option de noms de section longs inconnue «%s»"
 
-#: objcopy.c:3698
+#: objcopy.c:3695
 msgid "unable to parse alternative machine code"
 msgstr "incapable de décoder le code de machine alternatif"
 
-#: objcopy.c:3743
+#: objcopy.c:3740
 msgid "number of bytes to reverse must be positive and even"
 msgstr "Le nombre d'octets à inverser doit être positif et paire"
 
-#: objcopy.c:3746
+#: objcopy.c:3743
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr "Attention : la valeur précédente de --reverse-bytes (%d) est ignorée"
 
-#: objcopy.c:3761
+#: objcopy.c:3758
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr "%s: la valeur de réserve pour --heap n'est pas valable"
 
-#: objcopy.c:3767
+#: objcopy.c:3764
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr "%s: la valeur confirmée pour --heap n'est pas valable"
 
-#: objcopy.c:3792
+#: objcopy.c:3789
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr "%s: la valeur de réserve pour --stack n'est pas valable"
 
-#: objcopy.c:3798
+#: objcopy.c:3795
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr "%s: la valeur confirmée pour --stack n'est pas valable"
 
-#: objcopy.c:3827
+#: objcopy.c:3824
 msgid "interleave start byte must be set with --byte"
 msgstr "l'octet de départ de l'intercalage doit être fixé avec --byte"
 
-#: objcopy.c:3830
+#: objcopy.c:3827
 msgid "byte number must be less than interleave"
 msgstr "le nombre d'octets ne peut être plus petit que celui de l'intercalage"
 
-#: objcopy.c:3833
+#: objcopy.c:3830
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr "la largeur d'intercalage doit être plus petite ou égale à l'intercalage - byte`"
 
-#: objcopy.c:3860
+#: objcopy.c:3857
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr "cible EFI d'entrée inconnue : %s"
 
-#: objcopy.c:3891
+#: objcopy.c:3888
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr "cible EFI de sortie inconnue : %s"
 
-#: objcopy.c:3904
+#: objcopy.c:3901
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr "AVERTISSEMENT: ne peut localiser '%s'. Message d'erreur système: %s"
 
-#: objcopy.c:3916
+#: objcopy.c:3912
 #, c-format
 msgid "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr "attention : le fichier temporaire n'a pas pu être créé pendant la copie de «%s» (erreur : %s)"
 
-#: objcopy.c:3944 objcopy.c:3958
+#: objcopy.c:3956 objcopy.c:3970
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr "%s %s%c0x%s jamais utilisé"
 
-#: objdump.c:201
+#: objdump.c:190
 #, c-format
 msgid "Usage: %s <option(s)> <file(s)>\n"
 msgstr "Usage: %s <options> <fichiers>\n"
 
-#: objdump.c:202
+#: objdump.c:191
 #, c-format
 msgid " Display information from object <file(s)>.\n"
 msgstr "Afficher les informations depuis les <fichiers> objet.\n"
 
-#: objdump.c:203
+#: objdump.c:192
 #, c-format
 msgid " At least one of the following switches must be given:\n"
 msgstr "Au moins un des commutateurs suivants doit être fourni:\n"
 
-#: objdump.c:204
+#: objdump.c:193
 #, c-format
 msgid ""
 "  -a, --archive-headers    Display archive header information\n"
 "  -f, --file-headers       Display the contents of the overall file header\n"
 "  -p, --private-headers    Display object format specific file header contents\n"
-"  -P, --private=OPT,OPT... Display object format specific contents\n"
 "  -h, --[section-]headers  Display the contents of the section headers\n"
 "  -x, --all-headers        Display the contents of all headers\n"
 "  -d, --disassemble        Display assembler contents of executable sections\n"
@@ -3779,7 +3743,7 @@ msgid ""
 "  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Display DWARF info in the file\n"
 "  -t, --syms               Display the contents of the symbol table(s)\n"
 "  -T, --dynamic-syms       Display the contents of the dynamic symbol table\n"
@@ -3793,12 +3757,11 @@ msgstr ""
 "  -a, --archive-headers    Afficher l'information de l'en-tête de l'archive\n"
 "  -f, --file-headers       Afficher le contenu global du fichier d'en-tête\n"
 "  -p, --private-headers    Afficher le format spécifique du contenu de l'en-tête de l'objet\n"
-"  -P, --private=OPT,OPT... Afficher les contenus spécifiques au format de l'objet\n"
 "  -h, --[section-]headers  Afficher le contenu des en-têtes de section\n"
-"  -x, --all-headers        Afficher le contenu de tous les en-têtes\n"
+"  -x, --all-headers        Afficher le contenu de toutes les en-têtes\n"
 "  -d, --disassemble        Afficher le contenu en assembleur des sections exécutables\n"
 "  -D, --disassemble-all    Afficher le contenu en assembleur de toutes les sections\n"
-"  -S, --source             Inter-mêler le code source avec le désassemblage\n"
+"  -S, --source             Inter-mêler le code source avec le déassemblage\n"
 "  -s, --full-contents      Afficher le contenu complet de toutes les sections voulues\n"
 "  -g, --debugging          Afficher les informations de mise au point du fichier objet\n"
 "  -e, --debugging-tags     Afficher les informations de mise au point en utilisant le style ctags\n"
@@ -3806,18 +3769,18 @@ msgstr ""
 "  -W[lLiaprmfFsoRt] ou\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Afficher les informations DWARF dans le fichier\n"
 "  -t, --syms               Afficher le contenu de(s) table(s) de symboles\n"
 "  -T, --dynamic-syms       Afficher le contenu de la table dynamique de symboles\n"
-"  -r, --reloc              Afficher les entrées de réadressage du fichier\n"
-"  -R, --dynamic-reloc      Afficher les entrées dynamiques de réadressage du fichier\n"
+"  -r, --reloc              Afficher les entrées de relocalisation du fichier\n"
+"  -R, --dynamic-reloc      Afficher les entrées dynamiques de relocalisation du fichier\n"
 "  @<fichier>               Lire les options à partir du <fichier>\n"
 "  -v, --version            Afficher la version du logiciel\n"
 "  -i, --info               Afficher les formats objets et les architectures supportées\n"
 "  -H, --help               Afficher cette information\n"
 
-#: objdump.c:236
+#: objdump.c:222
 #, c-format
 msgid ""
 "\n"
@@ -3826,7 +3789,7 @@ msgstr ""
 "\n"
 " Les commutateurs suivants sont optionnels:\n"
 
-#: objdump.c:237
+#: objdump.c:223
 #, c-format
 msgid ""
 "  -b, --target=BFDNAME           Specify the target object format as BFDNAME\n"
@@ -3854,13 +3817,14 @@ msgid ""
 "      --special-syms             Include special symbols in symbol dumps\n"
 "      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
+"\n"
 msgstr ""
 "  -b, --target=NOMBFD            spécifier le format de l'objet cible comme NOMBFD\n"
 "  -m, --architecture=MACHINE     spécifier l'architecture cible de la MACHINE\n"
 "  -j, --section=NOM              afficher seulement les informations de la section du NOM\n"
-"  -M, --disassembler-options=OPT relayer l'OPTion au désassembleur\n"
-"  -EB --endian=big               assumer le format « big endian » lors du désassemblage\n"
-"  -EL --endian=little            assumer le format « little endian » lors du désassemblage\n"
+"  -M, --disassembler-options=OPT relayer l'OPTion au dé-assembleur\n"
+"  -EB --endian=big               assumer le format « big endian » lors du dé-assemblage\n"
+"  -EL --endian=little            assumer le format « little endian » lors du dé-assemblage\n"
 "      --file-start-context       inclure le contexte à partir du début du fichier (avec -S)\n"
 "  -I, --include=RÉPERTOIRE       ajouter le répertoire à la liste de recherche des fichiers sources\n"
 "  -l, --line-numbers             inclure les numéros de ligne et les noms de fichier dans la sortie\n"
@@ -3870,79 +3834,64 @@ msgstr ""
 "                                  « lucid », « arm », « hp », « edg », « gnu-v3 », « java »\n"
 "                                  ou « gnat »\n"
 "  -w, --wide                     formatter la sortie pour plus de 80 colonnes\n"
-"  -z, --disassemble-zeroes       ne pas escamoter les blocs de zéros lors du désassemblage\n"
+"  -z, --disassemble-zeroes       ne pas escamoter les blocs de zéros lors du dé-assemblage\n"
 "      --start-address=ADR        traiter seulement les données dont les adresses sont >= ADR\n"
 "      --stop-address=ADR         traiter seulement les données dont les adresses sont <= ADR\n"
 "      --prefix-addresses         afficher les adresses complètes dans le dé-assemblage\n"
 "      --[no-]show-raw-insn       afficher en hexadécimal le dé-assemblage symbolique\n"
 "      --insn-width=LARGEUR       afficher LARGEUR octets sur une seule ligne avec -d\n"
-"      --adjust-vma=DÉCALAGE      ajouter un DÉCALAGE à toutes les adresses affichées des sections\n"
+"      --adjust-vma=DÉCALAGE      ajouter un DÉCALAGE à toutes les adresses affichés des sections\n"
 "      --special-syms             inclure les symboles spéciaux dans la vidange de symboles\n"
 "      --prefix=PRÉFIXE           ajouter le PRÉFIXE aux chemins absolus pour -S\n"
 "      --prefix-strip=NIVEAU      supprimer des répertoires au début de -S\n"
-
-#: objdump.c:263
-#, c-format
-msgid ""
-"      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"      --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                             or deeper\n"
 "\n"
-msgstr ""
-"      --dwarf-depth=N        Ne pas afficher les DIEs à une profondeur supérieure ou égale à N\n"
-"      --dwarf-start=N        Afficher les DIEs en commençant par N, à la même profondeur ou plus bas\n"
-"\n"
-
-#: objdump.c:275
-#, c-format
-msgid ""
-"\n"
-"Options supported for -P/--private switch:\n"
-msgstr ""
-"\n"
-"Options supportées par -P/--private:\n"
 
-#: objdump.c:426
+#: objdump.c:396
 #, c-format
 msgid "section '%s' mentioned in a -j option, but not found in any input file"
 msgstr "section «%s» mentionnée dans une option -j n'a été trouvée dans aucun fichier d'entrée"
 
-#: objdump.c:530
+#: objdump.c:500
 #, c-format
 msgid "Sections:\n"
 msgstr "Sections:\n"
 
-#: objdump.c:533 objdump.c:537
+#: objdump.c:503 objdump.c:507
 #, c-format
 msgid "Idx Name          Size      VMA       LMA       File off  Algn"
 msgstr "Idx Nom           Taille    VMA       LMA       Fich off  Algn"
 
-#: objdump.c:539
+#: objdump.c:509
 #, c-format
 msgid "Idx Name          Size      VMA               LMA               File off  Algn"
 msgstr "Idx Nom           Taille    VMA               LMA               Fich off  Algn"
 
-#: objdump.c:543
+#: objdump.c:513
 #, c-format
 msgid "  Flags"
 msgstr "  Fanions"
 
-#: objdump.c:586
+#: objdump.c:515
+#, c-format
+msgid "  Pg"
+msgstr "  Pg"
+
+#: objdump.c:558
 #, c-format
 msgid "%s: not a dynamic object"
 msgstr "%s: n'est pas un objet dynamique"
 
-#: objdump.c:1012 objdump.c:1036
+#: objdump.c:984 objdump.c:1008
 #, c-format
 msgid " (File Offset: 0x%lx)"
 msgstr " (Offset dans le fichier: 0x%lx)"
 
-#: objdump.c:1662
+#: objdump.c:1634
 #, c-format
 msgid "disassemble_fn returned length %d"
 msgstr "disassemble_fn a retourné la longueur %d"
 
-#: objdump.c:1967
+#: objdump.c:1939
 #, c-format
 msgid ""
 "\n"
@@ -3951,17 +3900,17 @@ msgstr ""
 "\n"
 "Déassemblage de la section %s:\n"
 
-#: objdump.c:2143
+#: objdump.c:2115
 #, c-format
 msgid "can't use supplied machine %s"
 msgstr "ne peut utiliser la machine fournie %s"
 
-#: objdump.c:2162
+#: objdump.c:2134
 #, c-format
 msgid "can't disassemble for architecture %s\n"
 msgstr "ne peut déassembler pour l'architecture %s\n"
 
-#: objdump.c:2242 objdump.c:2265
+#: objdump.c:2214 objdump.c:2237
 #, c-format
 msgid ""
 "\n"
@@ -3970,7 +3919,7 @@ msgstr ""
 "\n"
 "Ne peut obtenir le contenu de la section « %s ».\n"
 
-#: objdump.c:2406
+#: objdump.c:2378
 #, c-format
 msgid ""
 "No %s section present\n"
@@ -3979,12 +3928,12 @@ msgstr ""
 "Aucune section %s présente\n"
 "\n"
 
-#: objdump.c:2415
+#: objdump.c:2387
 #, c-format
 msgid "reading %s section of %s failed: %s"
 msgstr "lecture de la section %s de %s a échouée: %s"
 
-#: objdump.c:2459
+#: objdump.c:2431
 #, c-format
 msgid ""
 "Contents of %s section:\n"
@@ -3993,17 +3942,17 @@ msgstr ""
 "Contenu de la section %s:\n"
 "\n"
 
-#: objdump.c:2590
+#: objdump.c:2562
 #, c-format
 msgid "architecture: %s, "
 msgstr "architecture: %s, "
 
-#: objdump.c:2593
+#: objdump.c:2565
 #, c-format
 msgid "flags 0x%08x:\n"
 msgstr "fanions 0x%08x:\n"
 
-#: objdump.c:2607
+#: objdump.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -4012,45 +3961,36 @@ msgstr ""
 "\n"
 "adresse de départ 0x"
 
-#: objdump.c:2633
-msgid "option -P/--private not supported by this file"
-msgstr "option -P/--private pas supportée par ce fichier"
-
-#: objdump.c:2657
-#, c-format
-msgid "target specific dump '%s' not supported"
-msgstr "Le dump « %s » spécifique à la cible n'est pas supporté"
-
-#: objdump.c:2721
+#: objdump.c:2642
 #, c-format
 msgid "Contents of section %s:"
 msgstr "Contenu de la section %s:"
 
-#: objdump.c:2723
+#: objdump.c:2644
 #, c-format
 msgid "  (Starting at file offset: 0x%lx)"
 msgstr "  (Démarrage à l'offset du fichier: 0x%lx)"
 
-#: objdump.c:2729
+#: objdump.c:2650
 msgid "Reading section failed"
 msgstr "Lecture de la section a échouée"
 
-#: objdump.c:2832
+#: objdump.c:2753
 #, c-format
 msgid "no symbols\n"
 msgstr "aucun symbole\n"
 
-#: objdump.c:2839
+#: objdump.c:2760
 #, c-format
 msgid "no information for symbol number %ld\n"
 msgstr "pas d'information pour le symbol numéro %ld\n"
 
-#: objdump.c:2842
+#: objdump.c:2763
 #, c-format
 msgid "could not determine the type of symbol number %ld\n"
 msgstr "incapable de déterminer le type du symbole numéro %ld\n"
 
-#: objdump.c:3163
+#: objdump.c:3043
 #, c-format
 msgid ""
 "\n"
@@ -4059,732 +3999,41 @@ msgstr ""
 "\n"
 "%s:     format de fichier %s\n"
 
-#: objdump.c:3223
+#: objdump.c:3101
 #, c-format
 msgid "%s: printing debugging information failed"
 msgstr "%s: échec d'affichage des information de débug"
 
-#: objdump.c:3327
+#: objdump.c:3205
 #, c-format
 msgid "In archive %s:\n"
 msgstr "Dans l'archive %s:\n"
 
-#: objdump.c:3438
+#: objdump.c:3316
 msgid "error: the start address should be before the end address"
 msgstr "erreur: l'adresse de début doit être avant l'adresse de fin"
 
-#: objdump.c:3443
+#: objdump.c:3321
 msgid "error: the stop address should be after the start address"
 msgstr "erreur: l'adresse de fin doit être après l'adresse de début"
 
-#: objdump.c:3455
+#: objdump.c:3333
 msgid "error: prefix strip must be non-negative"
 msgstr "erreur: le préfixe à supprimer ne peut pas être négatif"
 
-#: objdump.c:3460
+#: objdump.c:3338
 msgid "error: instruction width must be positive"
 msgstr "erreur: la largeur de l'instruction doit être positive"
 
-#: objdump.c:3469
+#: objdump.c:3347
 msgid "unrecognized -E option"
 msgstr "option -E non reconnue"
 
-#: objdump.c:3480
+#: objdump.c:3358
 #, c-format
 msgid "unrecognized --endian type `%s'"
 msgstr "type non reconnu --endian « %s »"
 
-#: od-xcoff.c:75
-#, c-format
-msgid ""
-"For XCOFF files:\n"
-"  header      Display the file header\n"
-"  aout        Display the auxiliary header\n"
-"  sections    Display the section headers\n"
-"  syms        Display the symbols table\n"
-"  relocs      Display the relocation entries\n"
-"  lineno      Display the line number entries\n"
-"  loader      Display loader section\n"
-"  except      Display exception table\n"
-"  typchk      Display type-check section\n"
-"  traceback   Display traceback tags\n"
-"  toc         Display toc symbols\n"
-msgstr ""
-"Pour les fichiers XCOFF:\n"
-"  header      Afficher l'en-tête du fichier\n"
-"  aout        Afficher l'en-tête auxiliaire\n"
-"  sections    Afficher l'en-tête de section\n"
-"  syms        Afficher la table des symboles\n"
-"  relocs      Afficher les entrées de réadressage\n"
-"  lineno      Afficher les numéros de lignes des entrées\n"
-"  loader      Afficher la section du chargeur\n"
-"  except      Afficher la table des exceptions\n"
-"  typchk      Afficher la section de contrôle du type\n"
-"  traceback   Afficher les balises traceback\n"
-"  toc         Afficher la table des matières des symboles\n"
-
-#: od-xcoff.c:416
-#, c-format
-msgid "  nbr sections:  %d\n"
-msgstr "  nombre de sections:    %d\n"
-
-#: od-xcoff.c:417
-#, c-format
-msgid "  time and date: 0x%08x  - "
-msgstr "  heure et date:         0x%08x  - "
-
-#: od-xcoff.c:419
-#, c-format
-msgid "not set\n"
-msgstr "non définie\n"
-
-#: od-xcoff.c:426
-#, c-format
-msgid "  symbols off:   0x%08x\n"
-msgstr "  off symboles:          0x%08x\n"
-
-#: od-xcoff.c:427
-#, c-format
-msgid "  nbr symbols:   %d\n"
-msgstr "  nombre de symboles:    %d\n"
-
-#: od-xcoff.c:428
-#, c-format
-msgid "  opt hdr sz:    %d\n"
-msgstr "  taille en-tête option: %d\n"
-
-#: od-xcoff.c:429
-#, c-format
-msgid "  flags:         0x%04x "
-msgstr "  fanions:               0x%04x "
-
-#: od-xcoff.c:443
-#, c-format
-msgid "Auxiliary header:\n"
-msgstr "En-tête auxiliaire:\n"
-
-#: od-xcoff.c:446
-#, c-format
-msgid "  No aux header\n"
-msgstr "  Pas d'en-tête auxiliaire\n"
-
-#: od-xcoff.c:451
-#, c-format
-msgid "warning: optionnal header size too large (> %d)\n"
-msgstr "attention: taille de l'en-tête optionnel trop grande (> %d)\n"
-
-#: od-xcoff.c:457
-msgid "cannot read auxhdr"
-msgstr "impossible de lire auxhdr"
-
-#: od-xcoff.c:462
-#, c-format
-msgid "  o_mflag (magic): 0x%04x 0%04o\n"
-msgstr "  o_mflag (magic): 0x%04x 0%04o\n"
-
-#: od-xcoff.c:463
-#, c-format
-msgid "  o_vstamp:        0x%04x\n"
-msgstr "  o_vstamp:        0x%04x\n"
-
-#: od-xcoff.c:465
-#, c-format
-msgid "  o_tsize:         0x%08x\n"
-msgstr "  o_tsize:         0x%08x\n"
-
-#: od-xcoff.c:467
-#, c-format
-msgid "  o_dsize:         0x%08x\n"
-msgstr "  o_dsize:         0x%08x\n"
-
-#: od-xcoff.c:469
-#, c-format
-msgid "  o_entry:         0x%08x\n"
-msgstr "  o_entry:         0x%08x\n"
-
-#: od-xcoff.c:471
-#, c-format
-msgid "  o_text_start:    0x%08x\n"
-msgstr "  o_text_start:    0x%08x\n"
-
-#: od-xcoff.c:473
-#, c-format
-msgid "  o_data_start:    0x%08x\n"
-msgstr "  o_data_start:    0x%08x\n"
-
-#: od-xcoff.c:477
-#, c-format
-msgid "  o_toc:           0x%08x\n"
-msgstr "  o_toc:           0x%08x\n"
-
-#: od-xcoff.c:479
-#, c-format
-msgid "  o_snentry:       0x%04x\n"
-msgstr "  o_snentry:       0x%04x\n"
-
-#: od-xcoff.c:481
-#, c-format
-msgid "  o_sntext:        0x%04x\n"
-msgstr "  o_sntext:        0x%04x\n"
-
-#: od-xcoff.c:483
-#, c-format
-msgid "  o_sndata:        0x%04x\n"
-msgstr "  o_sndata:        0x%04x\n"
-
-#: od-xcoff.c:485
-#, c-format
-msgid "  o_sntoc:         0x%04x\n"
-msgstr "  o_sntoc:         0x%04x\n"
-
-#: od-xcoff.c:487
-#, c-format
-msgid "  o_snloader:      0x%04x\n"
-msgstr "  o_snloader:      0x%04x\n"
-
-#: od-xcoff.c:489
-#, c-format
-msgid "  o_snbss:         0x%04x\n"
-msgstr "  o_snbss:         0x%04x\n"
-
-#: od-xcoff.c:491
-#, c-format
-msgid "  o_algntext:      %u\n"
-msgstr "  o_algntext:      %u\n"
-
-#: od-xcoff.c:493
-#, c-format
-msgid "  o_algndata:      %u\n"
-msgstr "  o_algndata:      %u\n"
-
-#: od-xcoff.c:495
-#, c-format
-msgid "  o_modtype:       0x%04x"
-msgstr "  o_modtype:       0x%04x"
-
-#: od-xcoff.c:500
-#, c-format
-msgid "  o_cputype:       0x%04x\n"
-msgstr "  o_cputype:       0x%04x\n"
-
-#: od-xcoff.c:502
-#, c-format
-msgid "  o_maxstack:      0x%08x\n"
-msgstr "  o_maxstack:      0x%08x\n"
-
-#: od-xcoff.c:504
-#, c-format
-msgid "  o_maxdata:       0x%08x\n"
-msgstr "  o_maxdata:       0x%08x\n"
-
-#: od-xcoff.c:507
-#, c-format
-msgid "  o_debugger:      0x%08x\n"
-msgstr "  o_debugger:      0x%08x\n"
-
-#: od-xcoff.c:521
-#, c-format
-msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
-msgstr "En-têtes de sections (à %u+%u=0x%08x jusque 0x%08x):\n"
-
-#: od-xcoff.c:526
-#, c-format
-msgid "  No section header\n"
-msgstr "  Pas d'en-tête de section\n"
-
-#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
-msgid "cannot read section header"
-msgstr "impossible de lire l'en-tête de section"
-
-#: od-xcoff.c:534
-#, c-format
-msgid " # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-msgstr " # Nom      paddr    vaddr    taille    scnptr   relptr   lnnoptr  nrel  nlnno\n"
-
-#: od-xcoff.c:546
-#, c-format
-msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-msgstr "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-
-#: od-xcoff.c:557
-#, c-format
-msgid "            Flags: %08x "
-msgstr "            Fanions: %08x "
-
-#: od-xcoff.c:565
-#, c-format
-msgid "overflow - nreloc: %u, nlnno: %u\n"
-msgstr "débordement - nreloc: %u, nlnno: %u\n"
-
-#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
-msgid "cannot read section headers"
-msgstr "impossible de lire les en-têtes de sections"
-
-#: od-xcoff.c:650
-msgid "cannot read strings table len"
-msgstr "impossible de lire la longueur de la table des chaînes"
-
-#: od-xcoff.c:664
-msgid "cannot read strings table"
-msgstr "impossible de lire la table des chaînes"
-
-#: od-xcoff.c:672
-msgid "cannot read symbol table"
-msgstr "impossible de lire la table des symboles"
-
-#: od-xcoff.c:687
-msgid "cannot read symbol entry"
-msgstr "impossible de lire une entrée de symbole"
-
-#: od-xcoff.c:722
-msgid "cannot read symbol aux entry"
-msgstr "impossible de lire une entrée auxiliaire de symbole"
-
-#: od-xcoff.c:744
-#, c-format
-msgid "Symbols table (strtable at 0x%08x)"
-msgstr "Table des symboles (strtable à 0x%08x)"
-
-#: od-xcoff.c:749
-#, c-format
-msgid ""
-":\n"
-"  No symbols\n"
-msgstr ""
-":\n"
-"  Aucun symbole\n"
-
-#: od-xcoff.c:755
-#, c-format
-msgid " (no strings):\n"
-msgstr " (aucune chaîne):\n"
-
-#: od-xcoff.c:757
-#, c-format
-msgid " (strings size: %08x):\n"
-msgstr " (taille des chaînes: %08x):\n"
-
-#: od-xcoff.c:770
-#, c-format
-msgid "  # sc         value    section  type aux name/off\n"
-msgstr "  # sc         valeur   section  type aux nom/off\n"
-
-#: od-xcoff.c:821
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-
-#: od-xcoff.c:827
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u\n"
-
-#. Function aux entry.
-#: od-xcoff.c:837
-#, c-format
-msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-msgstr "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-
-#: od-xcoff.c:856
-#, c-format
-msgid "  scnsym: %-8u"
-msgstr "  scnsym: %-8u"
-
-#: od-xcoff.c:858
-#, c-format
-msgid "  scnlen: %08x"
-msgstr "  scnlen: %08x"
-
-#: od-xcoff.c:859
-#, c-format
-msgid " h: parm=%08x sn=%04x al: 2**%u"
-msgstr " h: parm=%08x sn=%04x al: 2**%u"
-
-#: od-xcoff.c:863
-#, c-format
-msgid " typ: "
-msgstr " typ: "
-
-#: od-xcoff.c:865
-#, c-format
-msgid " cl: "
-msgstr " cl: "
-
-#: od-xcoff.c:878
-#, c-format
-msgid " ftype: %02x "
-msgstr " ftype: %02x "
-
-#: od-xcoff.c:881
-#, c-format
-msgid "fname: %.14s"
-msgstr "fname: %.14s"
-
-#: od-xcoff.c:887
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: od-xcoff.c:889
-#, c-format
-msgid "offset: %08x"
-msgstr "offset: %08x"
-
-#: od-xcoff.c:896
-#, c-format
-msgid "  lnno: %u\n"
-msgstr "  lnno: %u\n"
-
-#: od-xcoff.c:931
-#, c-format
-msgid "Relocations for %s (%u)\n"
-msgstr "Réadressages pour %s (%u)\n"
-
-#: od-xcoff.c:934
-msgid "cannot read relocations"
-msgstr "ne peut lire les réadressages"
-
-#: od-xcoff.c:937
-#, c-format
-msgid "vaddr    sgn mod sz type  symndx symbol\n"
-msgstr "vaddr    sgn mod sz type  symndx symbole\n"
-
-#: od-xcoff.c:946
-msgid "cannot read relocation entry"
-msgstr "ne peut lire une entrée de réadressage"
-
-#: od-xcoff.c:950
-#, c-format
-msgid "%08x  %c   %c  %-2u "
-msgstr "%08x  %c   %c  %-2u "
-
-#: od-xcoff.c:986
-#, c-format
-msgid "Line numbers for %s (%u)\n"
-msgstr "Numéros de lignes pour %s (%u)\n"
-
-#: od-xcoff.c:989
-msgid "cannot read line numbers"
-msgstr "ne peut lire les numéros de lignes"
-
-#: od-xcoff.c:992
-#, c-format
-msgid "lineno  symndx/paddr\n"
-msgstr "numligne symndx/paddr\n"
-
-#: od-xcoff.c:1000
-msgid "cannot read line number entry"
-msgstr "ne peut lire une entrée de numéro de ligne"
-
-#: od-xcoff.c:1004
-#, c-format
-msgid " %-6u "
-msgstr " %-6u "
-
-#: od-xcoff.c:1043
-#, c-format
-msgid "no .loader section in file\n"
-msgstr "pas de section .loader dans le fichier\n"
-
-#: od-xcoff.c:1049
-#, c-format
-msgid "section .loader is too short\n"
-msgstr "la section .loader est trop courte\n"
-
-#: od-xcoff.c:1056
-#, c-format
-msgid "Loader header:\n"
-msgstr "En-tête du chargeur:\n"
-
-#: od-xcoff.c:1058
-#, c-format
-msgid "  version:           %u\n"
-msgstr "  version:           %u\n"
-
-#: od-xcoff.c:1061
-#, c-format
-msgid " Unhandled version\n"
-msgstr "Version non supportée\n"
-
-#: od-xcoff.c:1066
-#, c-format
-msgid "  nbr symbols:       %u\n"
-msgstr "  nombre de symboles:    %u\n"
-
-#: od-xcoff.c:1068
-#, c-format
-msgid "  nbr relocs:        %u\n"
-msgstr "  nombre réadressages:   %u\n"
-
-#: od-xcoff.c:1069
-#, c-format
-msgid "  import strtab len: %u\n"
-msgstr "  longueur import strtab: %u\n"
-
-#: od-xcoff.c:1072
-#, c-format
-msgid "  nbr import files:  %u\n"
-msgstr "  nombre fichiers import: %u\n"
-
-#: od-xcoff.c:1074
-#, c-format
-msgid "  import file off:   %u\n"
-msgstr "  offset fichier import: %u\n"
-
-#: od-xcoff.c:1076
-#, c-format
-msgid "  string table len:  %u\n"
-msgstr "  longueur table chaînes: %u\n"
-
-#: od-xcoff.c:1078
-#, c-format
-msgid "  string table off:  %u\n"
-msgstr "  offset table chaînes: %u\n"
-
-#: od-xcoff.c:1081
-#, c-format
-msgid "Dynamic symbols:\n"
-msgstr "Symboles dynamiques:\n"
-
-#: od-xcoff.c:1082
-#, c-format
-msgid "     # value     sc IFEW ty class file  pa name\n"
-msgstr "     # valeur    sc IFEW ty classe fichier  pa nom\n"
-
-#: od-xcoff.c:1087
-#, c-format
-msgid "  %4u %08x %3u "
-msgstr "  %4u %08x %3u "
-
-#: od-xcoff.c:1100
-#, c-format
-msgid " %3u %3u "
-msgstr " %3u %3u "
-
-#: od-xcoff.c:1109
-#, c-format
-msgid "(bad offset: %u)"
-msgstr "(mauvais offset: %u)"
-
-#: od-xcoff.c:1116
-#, c-format
-msgid "Dynamic relocs:\n"
-msgstr "Réadressages dynamiques:\n"
-
-#: od-xcoff.c:1117
-#, c-format
-msgid "  vaddr    sec    sz typ   sym\n"
-msgstr "  vaddr    sec    sz typ   sym\n"
-
-#: od-xcoff.c:1129
-#, c-format
-msgid "  %08x %3u %c%c %2u "
-msgstr "  %08x %3u %c%c %2u "
-
-#: od-xcoff.c:1140
-#, c-format
-msgid ".text"
-msgstr ".text"
-
-#: od-xcoff.c:1143
-#, c-format
-msgid ".data"
-msgstr ".data"
-
-#: od-xcoff.c:1146
-#, c-format
-msgid ".bss"
-msgstr ".bss"
-
-#: od-xcoff.c:1149
-#, c-format
-msgid "%u"
-msgstr "%u"
-
-#: od-xcoff.c:1155
-#, c-format
-msgid "Import files:\n"
-msgstr "Fichiers import:\n"
-
-#: od-xcoff.c:1187
-#, c-format
-msgid "no .except section in file\n"
-msgstr "pas de section .except dans le fichier\n"
-
-#: od-xcoff.c:1195
-#, c-format
-msgid "Exception table:\n"
-msgstr "Table des exceptions:\n"
-
-#: od-xcoff.c:1196
-#, c-format
-msgid "lang reason sym/addr\n"
-msgstr "lang raison sym/adr\n"
-
-#: od-xcoff.c:1204
-#, c-format
-msgid "  %02x     %02x "
-msgstr "  %02x     %02x "
-
-#: od-xcoff.c:1209
-#, c-format
-msgid "@%08x"
-msgstr "@%08x"
-
-#: od-xcoff.c:1229
-#, c-format
-msgid "no .typchk section in file\n"
-msgstr "pas de section .typchk dans le fichier\n"
-
-#: od-xcoff.c:1236
-#, c-format
-msgid "Type-check section:\n"
-msgstr "Section de contrôle de type:\n"
-
-#: od-xcoff.c:1237
-#, c-format
-msgid "offset    len  lang-id general-hash language-hash\n"
-msgstr "offset    lon  lang-id general-hash langage-hash\n"
-
-#: od-xcoff.c:1282
-#, c-format
-msgid " address beyond section size\n"
-msgstr " adresse au delà de la taille de la section\n"
-
-#: od-xcoff.c:1292
-#, c-format
-msgid " tags at %08x\n"
-msgstr " balises à %08x\n"
-
-#: od-xcoff.c:1299
-#, c-format
-msgid " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-msgstr " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-
-#: od-xcoff.c:1306
-#, c-format
-msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-msgstr " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-
-#: od-xcoff.c:1312
-#, c-format
-msgid " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-msgstr " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-
-#: od-xcoff.c:1318
-#, c-format
-msgid " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-msgstr " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-
-#: od-xcoff.c:1324
-#, c-format
-msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-msgstr " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-
-#: od-xcoff.c:1337
-#, c-format
-msgid " parminfo: 0x%08x\n"
-msgstr " parminfo: 0x%08x\n"
-
-#: od-xcoff.c:1348
-#, c-format
-msgid " tb_offset: 0x%08x (start=0x%08x)\n"
-msgstr " tb_offset: 0x%08x (début=0x%08x)\n"
-
-#: od-xcoff.c:1359
-#, c-format
-msgid " hand_mask_offset: 0x%08x\n"
-msgstr " hand_mask_offset: 0x%08x\n"
-
-#: od-xcoff.c:1370
-#, c-format
-msgid " number of CTL anchors: %u\n"
-msgstr " nombre d'ancrages CTL: %u\n"
-
-#: od-xcoff.c:1375
-#, c-format
-msgid "  CTL[%u]: %08x\n"
-msgstr "  CTL[%u]: %08x\n"
-
-#: od-xcoff.c:1389
-#, c-format
-msgid " Name (len: %u): "
-msgstr " Nom (long: %u): "
-
-#: od-xcoff.c:1392
-#, c-format
-msgid "[truncated]\n"
-msgstr "[tronqué]\n"
-
-#: od-xcoff.c:1407
-#, c-format
-msgid " alloca reg: %u\n"
-msgstr " alloca reg: %u\n"
-
-#: od-xcoff.c:1411
-#, c-format
-msgid " (end of tags at %08x)\n"
-msgstr " (fin des balises à %08x)\n"
-
-#: od-xcoff.c:1414
-#, c-format
-msgid " no tags found\n"
-msgstr " pas de balise trouvée\n"
-
-#: od-xcoff.c:1418
-#, c-format
-msgid " Truncated .text section\n"
-msgstr " Section .text tronquée\n"
-
-#: od-xcoff.c:1503
-#, c-format
-msgid "TOC:\n"
-msgstr "TOC:\n"
-
-#: od-xcoff.c:1546
-#, c-format
-msgid "Nbr entries: %-8u Size: %08x (%u)\n"
-msgstr "Nombre entrées: %-8u Taille: %08x (%u)\n"
-
-#: od-xcoff.c:1630
-msgid "cannot read header"
-msgstr "ne peut lire l'en-tête"
-
-#: od-xcoff.c:1638
-#, c-format
-msgid "File header:\n"
-msgstr "En-tête du fichier:\n"
-
-#: od-xcoff.c:1639
-#, c-format
-msgid "  magic:         0x%04x (0%04o)  "
-msgstr "  magique:       0x%04x (0%04o)  "
-
-#: od-xcoff.c:1643
-#, c-format
-msgid "(WRMAGIC: writable text segments)"
-msgstr "(WRMAGIC: segments textes accessibles en écriture)"
-
-#: od-xcoff.c:1646
-#, c-format
-msgid "(ROMAGIC: readonly sharablee text segments)"
-msgstr "(ROMAGIC: segments textes partageables en lecture seule)"
-
-#: od-xcoff.c:1649
-#, c-format
-msgid "(TOCMAGIC: readonly text segments and TOC)"
-msgstr "(TOCMAGIC: segments textes et TOC en lecture seule)"
-
-#: od-xcoff.c:1652
-#, c-format
-msgid "unknown magic"
-msgstr "magique inconnue"
-
-#: od-xcoff.c:1659
-#, c-format
-msgid "  Unhandled magic\n"
-msgstr "  Magique non supportée\n"
-
 #: rclex.c:197
 msgid "invalid value specified for pragma code_page.\n"
 msgstr "valeur erronée pour le pragma code_page.\n"
@@ -4824,231 +4073,231 @@ msgstr "%s: aucune information de débug reconnue"
 msgid "Last stabs entries before error:\n"
 msgstr "Dernière entrées à inclure avant erreur:\n"
 
-#: readelf.c:265
+#: readelf.c:268
 msgid "<none>"
 msgstr "<aucun>"
 
-#: readelf.c:266
+#: readelf.c:269
 msgid "<no-name>"
 msgstr "<sans-nom>"
 
-#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
-#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
-#: readelf.c:12153
+#: readelf.c:270 readelf.c:5047 readelf.c:5557 readelf.c:7794 readelf.c:7912
+#: readelf.c:8865 readelf.c:8945 readelf.c:8998 readelf.c:11860
+#: readelf.c:11863
 msgid "<corrupt>"
 msgstr "<corrompu>"
 
-#: readelf.c:300
+#: readelf.c:308
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr "Incapable de repérer 0x%lx pour %s\n"
 
-#: readelf.c:315
+#: readelf.c:323
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr "Mémoire épuisée lors de l'allocation de 0x%lx octets pour %s\n"
 
-#: readelf.c:325
+#: readelf.c:333
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr "Incapable de lire 0x%lx octets de %s\n"
 
-#: readelf.c:625
+#: readelf.c:697
 msgid "Don't know about relocations on this machine architecture\n"
-msgstr "Ne connaît pas de méthode pour le réadressage sur l'architecture de cette machine\n"
+msgstr "Ne connaît pas de méthode pour la relocalisation sur l'architecture de cette machine\n"
 
-#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+#: readelf.c:718 readelf.c:748 readelf.c:816 readelf.c:845
 msgid "relocs"
-msgstr "réadressages"
+msgstr "relocalisations"
 
-#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
+#: readelf.c:730 readelf.c:760 readelf.c:827 readelf.c:856
 msgid "out of memory parsing relocs\n"
-msgstr "Mémoire épuisée lors de l'analyse syntaxique des réadressages\n"
+msgstr "Mémoire épuisée lors de l'analyse syntaxique des relocalisations\n"
 
-#: readelf.c:889
+#: readelf.c:961
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr " Décalage   Info    Type                Val.-sym.   Noms-symb.    + Addenda\n"
 
-#: readelf.c:891
+#: readelf.c:963
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr " Décalage   Info    Type            Val.-sym   Noms-symb + Addenda\n"
 
-#: readelf.c:896
+#: readelf.c:968
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr " Décalage   Info    Type                Val.-sym.   Noms-symboles\n"
 
-#: readelf.c:898
+#: readelf.c:970
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr " Décalage   Info    Type            Val.-sym   Noms-symboles\n"
 
-#: readelf.c:906
+#: readelf.c:978
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend\n"
 msgstr "    Décalage           Info             Type               Valeurs symbols Noms symboles + Addenda\n"
 
-#: readelf.c:908
+#: readelf.c:980
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name + Addend\n"
 msgstr "  Décalage        Info           Type           Val.-symboles Noms-symb.+ Addenda\n"
 
-#: readelf.c:913
+#: readelf.c:985
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name\n"
 msgstr "    Décalage           Info             Type               Valeurs symbols Noms symbols\n"
 
-#: readelf.c:915
+#: readelf.c:987
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr "  Décalage        Info           Type           Val.-symboles Noms-symboles\n"
 
-#: readelf.c:1219 readelf.c:1378 readelf.c:1386
+#: readelf.c:1291 readelf.c:1448 readelf.c:1456
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr "non reconnue: %-7lx"
 
-#: readelf.c:1244
+#: readelf.c:1316
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr "<ajout inconnu: %lx>"
 
-#: readelf.c:1251
+#: readelf.c:1323
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr " mauvais index de symbole: %08lx"
 
-#: readelf.c:1336
+#: readelf.c:1406
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr "<chaîne de la table index: %3ld>"
 
-#: readelf.c:1338
+#: readelf.c:1408
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr "<chaîne corrompu de la table index: %3ld>"
 
-#: readelf.c:1731
+#: readelf.c:1801
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr "Spécificités du processeur: %lx"
 
-#: readelf.c:1755
+#: readelf.c:1825
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr "Spécificités du systèmes d'exploitation: %lx"
 
-#: readelf.c:1759 readelf.c:2821
+#: readelf.c:1829 readelf.c:2875
 #, c-format
 msgid "<unknown>: %lx"
 msgstr "<inconnu>: %lx"
 
-#: readelf.c:1772
+#: readelf.c:1842
 msgid "NONE (None)"
 msgstr "NONE (Aucun)"
 
-#: readelf.c:1773
+#: readelf.c:1843
 msgid "REL (Relocatable file)"
-msgstr "REL (Fichier de réadressage)"
+msgstr "REL (Fichier de relocalisation)"
 
-#: readelf.c:1774
+#: readelf.c:1844
 msgid "EXEC (Executable file)"
 msgstr "EXEC (fichier exécutable)"
 
-#: readelf.c:1775
+#: readelf.c:1845
 msgid "DYN (Shared object file)"
 msgstr "DYN (fichier objet partagé)"
 
-#: readelf.c:1776
+#: readelf.c:1846
 msgid "CORE (Core file)"
 msgstr "CORE (fichier core)"
 
-#: readelf.c:1780
+#: readelf.c:1850
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr "Spécificités du processor: (%x)"
 
-#: readelf.c:1782
+#: readelf.c:1852
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr "Spécificités du système d'exploitation: (%x)"
 
-#: readelf.c:1784 readelf.c:3068
+#: readelf.c:1854 readelf.c:3122
 #, c-format
 msgid "<unknown>: %x"
 msgstr "<inconnu>: %x"
 
-#: readelf.c:1796
+#: readelf.c:1866
 msgid "None"
 msgstr "Aucun"
 
-#: readelf.c:1964
+#: readelf.c:2034
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr "<inconnu>: 0x%x"
 
-#: readelf.c:2150
+#: readelf.c:2220
 msgid ", <unknown>"
 msgstr ", <inconnu>"
 
-#: readelf.c:2236 readelf.c:7428
+#: readelf.c:2291 readelf.c:7145
 msgid "unknown"
 msgstr "inconnu"
 
-#: readelf.c:2237
+#: readelf.c:2292
 msgid "unknown mac"
 msgstr "mac inconnue"
 
-#: readelf.c:2301
+#: readelf.c:2356
 msgid ", relocatable"
 msgstr ", relocalisable"
 
-#: readelf.c:2304
+#: readelf.c:2359
 msgid ", relocatable-lib"
 msgstr ", relocalisable-lib"
 
-#: readelf.c:2327
+#: readelf.c:2382
 msgid ", unknown v850 architecture variant"
 msgstr ", variante d'architecture v850 inconnue"
 
-#: readelf.c:2384
+#: readelf.c:2438
 msgid ", unknown CPU"
 msgstr ", CPU inconnu"
 
-#: readelf.c:2399
+#: readelf.c:2453
 msgid ", unknown ABI"
 msgstr ", ABI inconnu"
 
-#: readelf.c:2419 readelf.c:2453
+#: readelf.c:2473 readelf.c:2507
 msgid ", unknown ISA"
 msgstr ", ISA inconnu"
 
-#: readelf.c:2626
+#: readelf.c:2680
 msgid "Standalone App"
 msgstr "Tache autonome"
 
-#: readelf.c:2635
+#: readelf.c:2689
 msgid "Bare-metal C6000"
 msgstr "C6000 brut de fonderie"
 
-#: readelf.c:2645 readelf.c:3431 readelf.c:3447
+#: readelf.c:2699 readelf.c:3462 readelf.c:3478
 #, c-format
 msgid "<unknown: %x>"
 msgstr "<inconnu: %x>"
 
-#: readelf.c:3123
+#: readelf.c:3172
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr "Usage: readelf <options> fichiers-elf\n"
 
-#: readelf.c:3124
+#: readelf.c:3173
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr "Afficher les informations à propos du contenu du format des fichiers ELF\n"
 
-#: readelf.c:3125
+#: readelf.c:3174
 #, c-format
 msgid ""
 " Options are:\n"
@@ -5081,7 +4330,7 @@ msgid ""
 "  -w[lLiaprmfFsoRt] or\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 "Les options sont:\n"
@@ -5098,7 +4347,7 @@ msgstr ""
 "      --symbols          Un alias pour --syms\n"
 "  --dyn-syms             Afficher la table des symboles dynamiques\n"
 "  -n --notes             Afficher les notes du core (si présentes)\n"
-"  -r --relocs            Afficher les réadressages (si présents)\n"
+"  -r --relocs            Afficher les relocalisation (si présentes)\n"
 "  -u --unwind            Afficher les informations de déroulage (si présentes)\n"
 "  -d --dynamic           Afficher le segment dynamique (si présent)\n"
 "  -V --version-info      Afficher la version des sections (si présentes)\n"
@@ -5115,20 +4364,10 @@ msgstr ""
 "  -w[lLiaprmfFsoRt] ou\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Afficher le contenu des sections débug DWARF2\n"
 
-#: readelf.c:3157
-#, c-format
-msgid ""
-"  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"  --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                         or deeper\n"
-msgstr ""
-"  --dwarf-depth=N        Ne pas afficher les DIEs à une profondeur supérieure ou égale à N\n"
-"  --dwarf-start=N        Afficher les DIEs en commençant par N, à la même profondeur ou plus bas\n"
-
-#: readelf.c:3162
+#: readelf.c:3207
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
@@ -5137,7 +4376,7 @@ msgstr ""
 "  -i --instruction-dump=<numéro|nom>\n"
 "                         déassembler le contenu de la section <numéro|nom>\n"
 
-#: readelf.c:3166
+#: readelf.c:3211
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -5152,96 +4391,96 @@ msgstr ""
 "  -H --help              afficher l'aide-mémoire\n"
 "  -V --version           afficher le nom et la version du logiciel\n"
 
-#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
+#: readelf.c:3240 readelf.c:3269 readelf.c:3273 readelf.c:13224
 msgid "Out of memory allocating dump request table.\n"
 msgstr "Mémoire épuisée allocation d'une table pour requêtes de vidange.\n"
 
-#: readelf.c:3400
+#: readelf.c:3431
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr "Option invalide '-%c»\n"
 
-#: readelf.c:3415
+#: readelf.c:3446
 msgid "Nothing to do.\n"
 msgstr "Rien à faire.\n"
 
-#: readelf.c:3427 readelf.c:3443 readelf.c:8013
+#: readelf.c:3458 readelf.c:3474 readelf.c:7730
 msgid "none"
 msgstr "aucun"
 
-#: readelf.c:3444
+#: readelf.c:3475
 msgid "2's complement, little endian"
 msgstr "complément à 2, système à octets de poids faible d'abord (little endian)"
 
-#: readelf.c:3445
+#: readelf.c:3476
 msgid "2's complement, big endian"
 msgstr "complément à 2, système à octets de poids fort d'abord (big endian)"
 
-#: readelf.c:3463
+#: readelf.c:3494
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
 msgstr "N'est pas un fichier ELF - a les mauvais octets magiques au départ\n"
 
-#: readelf.c:3473
+#: readelf.c:3504
 #, c-format
 msgid "ELF Header:\n"
 msgstr "En-tête ELF:\n"
 
-#: readelf.c:3474
+#: readelf.c:3505
 #, c-format
 msgid "  Magic:   "
 msgstr "  Magique:   "
 
-#: readelf.c:3478
+#: readelf.c:3509
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr "  Classe:                            %s\n"
 
-#: readelf.c:3480
+#: readelf.c:3511
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr "  Données:                          %s\n"
 
-#: readelf.c:3482
+#: readelf.c:3513
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr "  Version:                           %d %s\n"
 
-#: readelf.c:3487
+#: readelf.c:3518
 #, c-format
 msgid "<unknown: %lx>"
 msgstr "<inconnu: %lx>"
 
-#: readelf.c:3489
+#: readelf.c:3520
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr "  OS/ABI:                            %s\n"
 
-#: readelf.c:3491
+#: readelf.c:3522
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr "  Version ABI:                       %d\n"
 
-#: readelf.c:3493
+#: readelf.c:3524
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr "  Type:                              %s\n"
 
-#: readelf.c:3495
+#: readelf.c:3526
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr "  Machine:                           %s\n"
 
-#: readelf.c:3497
+#: readelf.c:3528
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr "  Version:                           0x%lx\n"
 
-#: readelf.c:3500
+#: readelf.c:3531
 #, c-format
 msgid "  Entry point address:               "
 msgstr "  Adresse du point d'entrée:         "
 
-#: readelf.c:3502
+#: readelf.c:3533
 #, c-format
 msgid ""
 "\n"
@@ -5250,7 +4489,7 @@ msgstr ""
 "\n"
 "  Début des en-têtes de programme:   "
 
-#: readelf.c:3504
+#: readelf.c:3535
 #, c-format
 msgid ""
 " (bytes into file)\n"
@@ -5259,60 +4498,61 @@ msgstr ""
 " (octets dans le fichier)\n"
 "  Début des en-têtes de section:          "
 
-#: readelf.c:3506
+#: readelf.c:3537
 #, c-format
 msgid " (bytes into file)\n"
 msgstr " (octets dans le fichier)\n"
 
-#: readelf.c:3508
+#: readelf.c:3539
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr "  Fanions:                           0x%lx%s\n"
 
-#: readelf.c:3511
+#: readelf.c:3542
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr "  Taille de cet en-tête:             %ld (bytes)\n"
 
-#: readelf.c:3513
+#: readelf.c:3544
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr "  Taille de l'en-tête du programme:  %ld (bytes)\n"
 
-#: readelf.c:3515
+#: readelf.c:3546
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr "  Nombre d'en-tête du programme:     %ld"
 
-#: readelf.c:3522
+#: readelf.c:3551
+#, c-format
+msgid " (%ld)"
+msgstr " (%ld)"
+
+#: readelf.c:3553
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr "  Taille des en-têtes de section:    %ld (bytes)\n"
 
-#: readelf.c:3524
+#: readelf.c:3555
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr "  Nombre d'en-têtes de section:      %ld"
 
-#: readelf.c:3529
+#: readelf.c:3560
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr "  Table d'indexes des chaînes d'en-tête de section: %ld"
 
-#: readelf.c:3536
+#: readelf.c:3567
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr " <corrompu: hors limites>"
 
-#: readelf.c:3570 readelf.c:3604
+#: readelf.c:3601 readelf.c:3635
 msgid "program headers"
 msgstr "En-tête de programme"
 
-#: readelf.c:3671
-msgid "possibly corrupt ELF header - it has a non-zero program header offset, but no program headers"
-msgstr "en-tête ELF peut-être endommagé - il a un offset non nul pour l'en-tête du programme mais pas d'en-tête de programme"
-
-#: readelf.c:3674
+#: readelf.c:3701
 #, c-format
 msgid ""
 "\n"
@@ -5321,7 +4561,7 @@ msgstr ""
 "\n"
 "Il n'y a pas d'en-têtes de programme dans ce fichier.\n"
 
-#: readelf.c:3680
+#: readelf.c:3707
 #, c-format
 msgid ""
 "\n"
@@ -5330,12 +4570,12 @@ msgstr ""
 "\n"
 "Type de fichier ELF est %s\n"
 
-#: readelf.c:3681
+#: readelf.c:3708
 #, c-format
 msgid "Entry point "
 msgstr "Point d'entrée "
 
-#: readelf.c:3683
+#: readelf.c:3710
 #, c-format
 msgid ""
 "\n"
@@ -5344,7 +4584,7 @@ msgstr ""
 "\n"
 "Il y a %d en-têtes de programme, débutant à l'adresse de décalage"
 
-#: readelf.c:3695 readelf.c:3697
+#: readelf.c:3722 readelf.c:3724
 #, c-format
 msgid ""
 "\n"
@@ -5353,55 +4593,55 @@ msgstr ""
 "\n"
 "En-têtes de programme:\n"
 
-#: readelf.c:3701
+#: readelf.c:3728
 #, c-format
 msgid "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr "  Type           Décalage Adr. vir.  Adr.phys.  T.Fich. T.Mém.  Fan Alignement\n"
 
-#: readelf.c:3704
+#: readelf.c:3731
 #, c-format
 msgid "  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
 msgstr "  Type           Décalage Adr. vir.          Adr.phys.          T.Fich.  T.Mém.   Fan Alignement\n"
 
-#: readelf.c:3708
+#: readelf.c:3735
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr "  Type           Décalage           Adr.virt           Adr.phys.\n"
 
-#: readelf.c:3710
+#: readelf.c:3737
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
 msgstr "                 Taille fichier     Taille mémoire      Fanion Alignement\n"
 
-#: readelf.c:3803
+#: readelf.c:3830
 msgid "more than one dynamic segment\n"
 msgstr "plus d'un segment dynamique\n"
 
-#: readelf.c:3822
+#: readelf.c:3849
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr "pas de section .dynamic dans le segment dynamique\n"
 
-#: readelf.c:3837
+#: readelf.c:3864
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr "la section .dynamic n'est pas contenue à l'intérieur du segment dynamique\n"
 
-#: readelf.c:3840
+#: readelf.c:3867
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr "la section .dynamic n'est pas la première section dans le segment dynamique.\n"
 
-#: readelf.c:3848
+#: readelf.c:3875
 msgid "Unable to find program interpreter name\n"
 msgstr "Incapable de repérer le nom de l'interpréteur du programme\n"
 
-#: readelf.c:3855
+#: readelf.c:3882
 msgid "Internal error: failed to create format string to display program interpreter\n"
 msgstr "Erreur interne: la chaîne de format n'a pas pu être créée pour afficher l'interpréteur du programme\n"
 
-#: readelf.c:3859
+#: readelf.c:3886
 msgid "Unable to read program interpreter name\n"
 msgstr "Incapable de lire le nom de l'interpréteur du programme\n"
 
-#: readelf.c:3862
+#: readelf.c:3889
 #, c-format
 msgid ""
 "\n"
@@ -5410,7 +4650,7 @@ msgstr ""
 "\n"
 "      [Réquisition de l'interpréteur de programme: %s]"
 
-#: readelf.c:3874
+#: readelf.c:3901
 #, c-format
 msgid ""
 "\n"
@@ -5419,50 +4659,46 @@ msgstr ""
 "\n"
 " Section à la projection de segement:\n"
 
-#: readelf.c:3875
+#: readelf.c:3902
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr "  Sections de segment...\n"
 
-#: readelf.c:3911
+#: readelf.c:3938
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr "Ne peut interpréter les adresses virtuelles sans l'en-tête du programme.\n"
 
-#: readelf.c:3927
+#: readelf.c:3954
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr "L'adresse virtuelle 0x%lx ne peut être localisé dans chaque segment PT_LOAD.\n"
 
-#: readelf.c:3942 readelf.c:3985
+#: readelf.c:3969 readelf.c:4012
 msgid "section headers"
 msgstr "En-têtes de section"
 
-#: readelf.c:4032 readelf.c:4107
+#: readelf.c:4059 readelf.c:4134
 msgid "sh_entsize is zero\n"
 msgstr "sh_entsize est zéro\n"
 
-#: readelf.c:4040 readelf.c:4115
+#: readelf.c:4067 readelf.c:4142
 msgid "Invalid sh_entsize\n"
 msgstr "sh_entsize incorrect\n"
 
-#: readelf.c:4045 readelf.c:4120
+#: readelf.c:4072 readelf.c:4147
 msgid "symbols"
 msgstr "symboles"
 
-#: readelf.c:4057 readelf.c:4132
+#: readelf.c:4084 readelf.c:4159
 msgid "symtab shndx"
 msgstr "symtab shndx"
 
-#: readelf.c:4392
+#: readelf.c:4419
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr "INCONNU (%*.*lx)"
 
-#: readelf.c:4414
-msgid "possibly corrupt ELF file header - it has a non-zero section header offset, but no section headers\n"
-msgstr "en-tête ELF peut-être endommagé - il a un offset non nul pour l'en-tête de section mais pas d'en-tête de section\n"
-
-#: readelf.c:4417
+#: readelf.c:4440 readelf.c:4920
 #, c-format
 msgid ""
 "\n"
@@ -5471,38 +4707,38 @@ msgstr ""
 "\n"
 "Il n'y a pas de section dans ce fichier.\n"
 
-#: readelf.c:4423
+#: readelf.c:4446
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr "Il y a %d en-têtes de section, débutant à l'adresse de décalage 0x%lx:\n"
 
-#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
-#: readelf.c:7036 readelf.c:9132
+#: readelf.c:4467 readelf.c:5043 readelf.c:5454 readelf.c:5760 readelf.c:6173
+#: readelf.c:6754 readelf.c:8843
 msgid "string table"
 msgstr "table de chaînes"
 
-#: readelf.c:4511
+#: readelf.c:4534
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr "La section %d a une sh_entsize %lx invalide (attendait %lx)\n"
 
-#: readelf.c:4531
+#: readelf.c:4554
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr "Le fichier contient plusieurs tables dynamiques de symboles\n"
 
-#: readelf.c:4544
+#: readelf.c:4567
 msgid "File contains multiple dynamic string tables\n"
 msgstr "Le fichier contient plusieurs tables de chaînes dynamiques\n"
 
-#: readelf.c:4550
+#: readelf.c:4573
 msgid "dynamic strings"
 msgstr "chaînes dynamiques"
 
-#: readelf.c:4557
+#: readelf.c:4580
 msgid "File contains multiple symtab shndx tables\n"
 msgstr "Le fichier contient de multiples tables symboliques shndx\n"
 
-#: readelf.c:4627
+#: readelf.c:4648
 #, c-format
 msgid ""
 "\n"
@@ -5511,7 +4747,7 @@ msgstr ""
 "\n"
 "En-têtes de section:\n"
 
-#: readelf.c:4629
+#: readelf.c:4650
 #, c-format
 msgid ""
 "\n"
@@ -5520,62 +4756,62 @@ msgstr ""
 "\n"
 "En-têtes de section:\n"
 
-#: readelf.c:4635 readelf.c:4646 readelf.c:4657
+#: readelf.c:4656 readelf.c:4667 readelf.c:4678
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr "  [Nr] Nom\n"
 
-#: readelf.c:4636
+#: readelf.c:4657
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr "       Type            Adr      Décala.Taille ES   LN Inf Al\n"
 
-#: readelf.c:4640
+#: readelf.c:4661
 #, c-format
 msgid "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [Nr] Nom               Type            Adr      Décala.Taille ES Fan LN Inf Al\n"
 
-#: readelf.c:4647
+#: readelf.c:4668
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr "       Type            Adresse          Décala.Taille ES   LN Inf Al\n"
 
-#: readelf.c:4651
+#: readelf.c:4672
 #, c-format
 msgid "  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [Nr] Nom               Type            Adr              Décala.Taille ES Fan LN Inf Al\n"
 
-#: readelf.c:4658
+#: readelf.c:4679
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr "       Type              Adresse          Décalage          Lien\n"
 
-#: readelf.c:4659
+#: readelf.c:4680
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr "       Taille            TaillEntré       Info              Alignement\n"
 
-#: readelf.c:4663
+#: readelf.c:4684
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr "  [Nr] Nom               Type             Adresse           Décalage\n"
 
-#: readelf.c:4664
+#: readelf.c:4685
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr "       Taille            TaillEntré       Fanion Lien  Info  Alignement\n"
 
-#: readelf.c:4669
+#: readelf.c:4690
 #, c-format
 msgid "       Flags\n"
 msgstr "       Fanions\n"
 
-#: readelf.c:4748
+#: readelf.c:4769
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr "section %u: la valeur %u de sh_link est plus grande que le nombre de sections\n"
 
-#: readelf.c:4847
+#: readelf.c:4868
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5588,7 +4824,7 @@ msgstr ""
 "  I (info), L (ordre des liens), G (groupe), T (TLS), E (exclu), x (inconnu)\n"
 "  O (traiterment additionnel requis pour l'OS) o (spécifique à l'OS), p (spécifique au processeur)\n"
 
-#: readelf.c:4852
+#: readelf.c:4873
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5601,25 +4837,16 @@ msgstr ""
 "  I (info), L (ordre des liens), G (groupe), T (TLS), E (exclu), x (inconnu)\n"
 "  O (traiterment additionnel requis pour l'OS) o (spécifique à l'OS), p (spécifique au processeur)\n"
 
-#: readelf.c:4874
+#: readelf.c:4895
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr "[<inconnu>: 0x%x] "
 
-#: readelf.c:4899
-#, c-format
-msgid ""
-"\n"
-"There are no sections to group in this file.\n"
-msgstr ""
-"\n"
-"Il n'y a pas de section à grouper dans ce fichier.\n"
-
-#: readelf.c:4906
+#: readelf.c:4927
 msgid "Section headers are not available!\n"
 msgstr "En-têtes de section ne sont pas disponibles!\n"
 
-#: readelf.c:4930
+#: readelf.c:4951
 #, c-format
 msgid ""
 "\n"
@@ -5628,26 +4855,26 @@ msgstr ""
 "\n"
 "Il n'y a pas de groupe de section dans ce fichier.\n"
 
-#: readelf.c:4967
+#: readelf.c:4988
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
 msgstr "sh_link erroné dans la section de groupe `%s'\n"
 
-#: readelf.c:4981
+#: readelf.c:5002
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr "En-tête corrompu dans la section de groupe «%s»\n"
 
-#: readelf.c:4992
+#: readelf.c:5013
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr "sh_info erroné dans la section de groupe`%s'\n"
 
-#: readelf.c:5031
+#: readelf.c:5052
 msgid "section data"
 msgstr "données de section"
 
-#: readelf.c:5040
+#: readelf.c:5061
 #, c-format
 msgid ""
 "\n"
@@ -5656,31 +4883,31 @@ msgstr ""
 "\n"
 "%sgroupe section [%5u] «%s» [%s] contient %u sections:\n"
 
-#: readelf.c:5043
+#: readelf.c:5064
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr "   [Index]    Nom\n"
 
-#: readelf.c:5057
+#: readelf.c:5078
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr "section [%5u] est dans le groupe section [%5u] > que le maximum de la section [%5u]\n"
 
-#: readelf.c:5066
+#: readelf.c:5087
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr "section [%5u] est dans le groupe section [%5u] qui est déjà dans le groupe section [%5u]\n"
 
-#: readelf.c:5079
+#: readelf.c:5100
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr "section 0 dans le groupe section [%5u]\n"
 
-#: readelf.c:5146
+#: readelf.c:5167
 msgid "dynamic section image fixups"
 msgstr "embellissement de l'image de section dynamique"
 
-#: readelf.c:5158
+#: readelf.c:5179
 #, c-format
 msgid ""
 "\n"
@@ -5689,16 +4916,16 @@ msgstr ""
 "\n"
 "Embellisement de l'image pour la librairie requise #%d: %s - identation: %lx\n"
 
-#: readelf.c:5161
+#: readelf.c:5182
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr "Seg Offset           Type                             VecSym TypeDonnées\n"
 
-#: readelf.c:5193
+#: readelf.c:5214
 msgid "dynamic section image relas"
 msgstr "relas de l'image de la section dynamique"
 
-#: readelf.c:5197
+#: readelf.c:5218
 #, c-format
 msgid ""
 "\n"
@@ -5707,76 +4934,76 @@ msgstr ""
 "\n"
 "Relocalisations d'image\n"
 
-#: readelf.c:5199
+#: readelf.c:5220
 #, c-format
 msgid "Seg Offset   Type                            Addend            Seg Sym Off\n"
 msgstr "Seg Offset   Type                            Ajoute            Seg Sym Off\n"
 
-#: readelf.c:5254
+#: readelf.c:5275
 msgid "dynamic string section"
 msgstr "section de chaînes dynamiques"
 
-#: readelf.c:5355
+#: readelf.c:5376
 #, c-format
 msgid ""
 "\n"
 "'%s' relocation section at offset 0x%lx contains %ld bytes:\n"
 msgstr ""
 "\n"
-"'%s' section de réadressage à l'adresse de décalage 0x%lx contient %ld octets:\n"
+"'%s' section de relocalisation à l'adresse de décalage 0x%lx contient %ld octets:\n"
 
-#: readelf.c:5370
+#: readelf.c:5391
 #, c-format
 msgid ""
 "\n"
 "There are no dynamic relocations in this file.\n"
 msgstr ""
 "\n"
-"Il n'y a pas d'informations de réadressage dynamique dans ce fichier.\n"
+"Il n'y a pas d'informations de relocalisation dynamique dans ce fichier.\n"
 
-#: readelf.c:5394
+#: readelf.c:5415
 #, c-format
 msgid ""
 "\n"
 "Relocation section "
 msgstr ""
 "\n"
-"Section de réadressage "
+"Section de relocalisation "
 
-#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#: readelf.c:5420 readelf.c:5836 readelf.c:5851 readelf.c:6188
 #, c-format
 msgid "'%s'"
 msgstr "« %s »"
 
-#: readelf.c:5401 readelf.c:5832 readelf.c:6169
+#: readelf.c:5422 readelf.c:5853 readelf.c:6190
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr " à l'adresse de décalage 0x%lx contient %lu entrées:\n"
 
-#: readelf.c:5452
+#: readelf.c:5473
 #, c-format
 msgid ""
 "\n"
 "There are no relocations in this file.\n"
 msgstr ""
 "\n"
-"Il n'y a pas de réadressage dans ce fichier.\n"
+"Il n'y a pas de relocalisation dans ce fichier.\n"
 
-#: readelf.c:5590
+#: readelf.c:5611
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr "\tVersion inconnue.\n"
 
-#: readelf.c:5643 readelf.c:6016
+#: readelf.c:5664 readelf.c:6037
 msgid "unwind table"
 msgstr "table de déroulage"
 
-#: readelf.c:5685 readelf.c:6098 readelf.c:6358
+#: readelf.c:5706 readelf.c:6119 readelf.c:6365
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
-msgstr "Escamotage du type de réadressage inattendu %s\n"
+msgstr "Escamotage du type de relocalisation inattendue %s\n"
 
-#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
+#: readelf.c:5768 readelf.c:6181 readelf.c:6762 readelf.c:6808
 #, c-format
 msgid ""
 "\n"
@@ -5785,7 +5012,7 @@ msgstr ""
 "\n"
 "Il n'y a pas de section de déroulage dans ce fichier.\n"
 
-#: readelf.c:5810
+#: readelf.c:5831
 #, c-format
 msgid ""
 "\n"
@@ -5794,11 +5021,11 @@ msgstr ""
 "\n"
 "N'a pu repérer les infos de la section de déroulage pour "
 
-#: readelf.c:5823
+#: readelf.c:5844
 msgid "unwind info"
 msgstr "info déroulage"
 
-#: readelf.c:5825 readelf.c:6166
+#: readelf.c:5846 readelf.c:6187
 #, c-format
 msgid ""
 "\n"
@@ -5807,110 +5034,106 @@ msgstr ""
 "\n"
 "Section de déroulage "
 
-#: readelf.c:6275
+#: readelf.c:6296
 msgid "unwind data"
 msgstr "données déroulage"
 
-#: readelf.c:6329
+#: readelf.c:6350
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
-msgstr "Escamotage du réadressage inattendu à l'offset 0x%lx\n"
+msgstr "Escamotage de la relocalisation inattendue à l'offset 0x%lx\n"
 
-#: readelf.c:6433
+#: readelf.c:6426
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr "[Opcode tronqué]\n"
 
-#: readelf.c:6477 readelf.c:6677
+#: readelf.c:6429
 #, c-format
-msgid "Refuse to unwind"
-msgstr "Refus de dérouler"
+msgid "0x%02x "
+msgstr "0x%02x "
 
-#: readelf.c:6500
+#: readelf.c:6451
 #, c-format
-msgid "     [Reserved]"
-msgstr "     [Réservé]"
+msgid "  Personality routine: "
+msgstr "  Routine de personnalité: "
 
-#: readelf.c:6528
+#: readelf.c:6469
 #, c-format
-msgid "     finish"
-msgstr "     terminé"
+msgid "  [Truncated data]\n"
+msgstr "  [Données tronquées]\n"
 
-#: readelf.c:6533 readelf.c:6619
+#: readelf.c:6484
 #, c-format
-msgid "[Spare]"
-msgstr "[Réserve]"
+msgid "  [reserved compact index %d]\n"
+msgstr "  [index compact réservé %d]\n"
 
-#: readelf.c:6640 readelf.c:6774
+#: readelf.c:6488
 #, c-format
-msgid "     [unsupported opcode]"
-msgstr "     [opcode non supporté]"
+msgid "  Compact model %d\n"
+msgstr "  Modèle compact %d\n"
 
-#: readelf.c:6666
+#: readelf.c:6515
 #, c-format
 msgid "  0x%02x "
 msgstr "  0x%02x "
 
-#: readelf.c:6671
+#: readelf.c:6520
 #, c-format
-msgid "     sp = sp + %d"
-msgstr "     sp = sp + %d"
+msgid "     vsp = vsp + %d"
+msgstr "     vsp = vsp + %d"
 
-#: readelf.c:6724
+#: readelf.c:6525
 #, c-format
-msgid "pop frame {"
-msgstr "pop frame {"
-
-#: readelf.c:6735
-msgid "[pad]"
-msgstr "[pad]"
+msgid "     vsp = vsp - %d"
+msgstr "     vsp = vsp - %d"
 
-#: readelf.c:6763
+#: readelf.c:6531
 #, c-format
-msgid "sp = sp + %ld"
-msgstr "sp = sp + %ld"
+msgid "Refuse to unwind"
+msgstr "Refus de dérouler"
 
-#: readelf.c:6821
+#: readelf.c:6554
 #, c-format
-msgid "  Personality routine: "
-msgstr "  Routine de personnalité: "
+msgid "     [Reserved]"
+msgstr "     [Réservé]"
 
-#: readelf.c:6839
+#: readelf.c:6556
 #, c-format
-msgid "  [Truncated data]\n"
-msgstr "  [Données tronquées]\n"
+msgid "     vsp = r%d"
+msgstr "     vsp = r%d"
 
-#: readelf.c:6854
+#: readelf.c:6581
 #, c-format
-msgid "  Compact model %d\n"
-msgstr "  Modèle compact %d\n"
+msgid "     finish"
+msgstr "     terminé"
 
-#: readelf.c:6890
+#: readelf.c:6586
 #, c-format
-msgid "  Restore stack from frame pointer\n"
-msgstr "  Rétablir la pile depuis le pointeur de trame\n"
+msgid "[Spare]"
+msgstr "[Réserve]"
 
-#: readelf.c:6892
+#: readelf.c:6620
 #, c-format
-msgid "  Stack increment %d\n"
-msgstr "  Incrément de pile %d\n"
+msgid "vsp = vsp + %ld"
+msgstr "vsp = vsp + %ld"
 
-#: readelf.c:6893
+#: readelf.c:6627
 #, c-format
-msgid "  Registers restored: "
-msgstr "  Registres rétablis: "
+msgid "[unsupported two-byte opcode]"
+msgstr "[opcode sur deux octets non supporté]"
 
-#: readelf.c:6898
+#: readelf.c:6631
 #, c-format
-msgid "  Return register: %s\n"
-msgstr "  Registre de retour: %s\n"
+msgid "     [unsupported opcode]"
+msgstr "     [opcode non supporté]"
 
-#: readelf.c:6981
+#: readelf.c:6715
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr "Impossible de trouver la section .ARM.extab contenant 0x%lx.\n"
 
-#: readelf.c:7050
+#: readelf.c:6768
 #, c-format
 msgid ""
 "\n"
@@ -5919,31 +5142,31 @@ msgstr ""
 "\n"
 "Index de table de déroulage «%s» à l'offset 0x%lx contient %lu entrées:\n"
 
-#: readelf.c:7102
+#: readelf.c:6819
 #, c-format
 msgid "NONE\n"
 msgstr "AUCUNE\n"
 
-#: readelf.c:7128
+#: readelf.c:6845
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr "Version de l'interface: %s\n"
 
-#: readelf.c:7130
+#: readelf.c:6847
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr "<corrompu: %ld>\n"
 
-#: readelf.c:7143
+#: readelf.c:6860
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr "Horodatage: %s\n"
 
-#: readelf.c:7320 readelf.c:7366
+#: readelf.c:7037 readelf.c:7083
 msgid "dynamic section"
 msgstr "section dynamique"
 
-#: readelf.c:7444
+#: readelf.c:7161
 #, c-format
 msgid ""
 "\n"
@@ -5952,31 +5175,31 @@ msgstr ""
 "\n"
 "Il n'y a pas de section dynamique dans ce fichier.\n"
 
-#: readelf.c:7482
+#: readelf.c:7199
 msgid "Unable to seek to end of file!\n"
 msgstr "Incapable de repérer la fin du fichier!\n"
 
-#: readelf.c:7495
+#: readelf.c:7212
 msgid "Unable to determine the number of symbols to load\n"
 msgstr "Incapable de déterminer le nombre de symboles à charger\n"
 
-#: readelf.c:7530
+#: readelf.c:7247
 msgid "Unable to seek to end of file\n"
 msgstr "Incapable de repérer la fin du fichier\n"
 
-#: readelf.c:7537
+#: readelf.c:7254
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr "Incapable de déterminer la longueur de la table de chaînes dynamiques\n"
 
-#: readelf.c:7543
+#: readelf.c:7260
 msgid "dynamic string table"
 msgstr "table dynamique de chaînes"
 
-#: readelf.c:7580
+#: readelf.c:7297
 msgid "symbol information"
 msgstr "information de symbole"
 
-#: readelf.c:7605
+#: readelf.c:7322
 #, c-format
 msgid ""
 "\n"
@@ -5985,86 +5208,86 @@ msgstr ""
 "\n"
 "Section dynamique à l'adresse de décalage 0x%lx contient %u entrées:\n"
 
-#: readelf.c:7608
+#: readelf.c:7325
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr "  Étiquettes Type                         Nom/Valeur\n"
 
-#: readelf.c:7644
+#: readelf.c:7361
 #, c-format
 msgid "Auxiliary library"
 msgstr "Librairie auxiliaire"
 
-#: readelf.c:7648
+#: readelf.c:7365
 #, c-format
 msgid "Filter library"
 msgstr "Librairie de filtre"
 
-#: readelf.c:7652
+#: readelf.c:7369
 #, c-format
 msgid "Configuration file"
 msgstr "Fichier de configuration"
 
-#: readelf.c:7656
+#: readelf.c:7373
 #, c-format
 msgid "Dependency audit library"
 msgstr "Librairie d'audit des dépendances"
 
-#: readelf.c:7660
+#: readelf.c:7377
 #, c-format
 msgid "Audit library"
 msgstr "Librairie des audits"
 
-#: readelf.c:7678 readelf.c:7706 readelf.c:7734
+#: readelf.c:7395 readelf.c:7423 readelf.c:7451
 #, c-format
 msgid "Flags:"
 msgstr "Fanions:"
 
-#: readelf.c:7681 readelf.c:7709 readelf.c:7736
+#: readelf.c:7398 readelf.c:7426 readelf.c:7453
 #, c-format
 msgid " None\n"
 msgstr "Aucun\n"
 
-#: readelf.c:7857
+#: readelf.c:7574
 #, c-format
 msgid "Shared library: [%s]"
 msgstr "Librairie partagées: [%s]"
 
-#: readelf.c:7860
+#: readelf.c:7577
 #, c-format
 msgid " program interpreter"
 msgstr " programme interpréteur"
 
-#: readelf.c:7864
+#: readelf.c:7581
 #, c-format
 msgid "Library soname: [%s]"
 msgstr "Librairie soname: [%s]"
 
-#: readelf.c:7868
+#: readelf.c:7585
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr "Librairie rpath: [%s]"
 
-#: readelf.c:7872
+#: readelf.c:7589
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr "Librairie runpath:[%s]"
 
-#: readelf.c:7905
+#: readelf.c:7622
 #, c-format
 msgid " (bytes)\n"
 msgstr " (octets)\n"
 
-#: readelf.c:7935
+#: readelf.c:7652
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr "Objet non nécessaire: [%s]\n"
 
-#: readelf.c:8035
+#: readelf.c:7752
 msgid "| <unknown>"
 msgstr "  <inconnu>"
 
-#: readelf.c:8068
+#: readelf.c:7785
 #, c-format
 msgid ""
 "\n"
@@ -6073,61 +5296,61 @@ msgstr ""
 "\n"
 "Section des définitions de version « %s » contient %u entrées:\n"
 
-#: readelf.c:8071
+#: readelf.c:7788
 #, c-format
 msgid "  Addr: 0x"
 msgstr "  Adr: 0x"
 
-#: readelf.c:8073 readelf.c:8191 readelf.c:8332
+#: readelf.c:7790 readelf.c:7908 readelf.c:8046
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr "  Décalage: %#08lx  Lien: %u (%s)\n"
 
-#: readelf.c:8081
+#: readelf.c:7798
 msgid "version definition section"
 msgstr "section de définition de version"
 
-#: readelf.c:8114
+#: readelf.c:7831
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr "  %#06x: Rev: %d  Fanions: %s"
 
-#: readelf.c:8117
+#: readelf.c:7834
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr "  Index: %d  Compteur: %d  "
 
-#: readelf.c:8133
+#: readelf.c:7850
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nom: %s\n"
 
-#: readelf.c:8135
+#: readelf.c:7852
 #, c-format
 msgid "Name index: %ld\n"
 msgstr "Nom de l'index: %ld\n"
 
-#: readelf.c:8157
+#: readelf.c:7874
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr "  %#06x: Parent %d: %s\n"
 
-#: readelf.c:8160
+#: readelf.c:7877
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr "  %#06x: Parent %d, name index: %ld\n"
 
-#: readelf.c:8165
+#: readelf.c:7882
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr "  Définition de version «aux» au delà de la fin de la section\n"
 
-#: readelf.c:8171
+#: readelf.c:7888
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr "  Définition de version au delà de la fin de la section\n"
 
-#: readelf.c:8186
+#: readelf.c:7903
 #, c-format
 msgid ""
 "\n"
@@ -6136,65 +5359,65 @@ msgstr ""
 "\n"
 "Version nécessitant la section « %s » contenant %u entrées:\n"
 
-#: readelf.c:8189
+#: readelf.c:7906
 #, c-format
 msgid " Addr: 0x"
 msgstr " Adr: 0x"
 
-#: readelf.c:8200
+#: readelf.c:7917
 msgid "version need section"
 msgstr "section de version «need»"
 
-#: readelf.c:8228
+#: readelf.c:7945
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr "  %#06x: Version: %d"
 
-#: readelf.c:8231
+#: readelf.c:7948
 #, c-format
 msgid "  File: %s"
 msgstr "  Fichier: %s"
 
-#: readelf.c:8233
+#: readelf.c:7950
 #, c-format
 msgid "  File: %lx"
 msgstr "  Fichier: %lx"
 
-#: readelf.c:8235
+#: readelf.c:7952
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr "  Compteur: %d\n"
 
-#: readelf.c:8260
+#: readelf.c:7977
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr "  %#06x:   Nom: %s"
 
-#: readelf.c:8263
+#: readelf.c:7980
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr "  %#06x:   Nom de l'index: %lx"
 
-#: readelf.c:8266
+#: readelf.c:7983
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr "  Fanions: %s  Version: %d\n"
 
-#: readelf.c:8278
+#: readelf.c:7995
 #, c-format
 msgid "  Version need aux past end of section\n"
 msgstr "  Version «need aux» au delà de la fin de la section\n"
 
-#: readelf.c:8283
+#: readelf.c:8000
 #, c-format
 msgid "  Version need past end of section\n"
 msgstr "  Version «need» au delà de la fin de la section\n"
 
-#: readelf.c:8320
+#: readelf.c:8037
 msgid "version string table"
 msgstr "table chaîne de version"
 
-#: readelf.c:8327
+#: readelf.c:8041
 #, c-format
 msgid ""
 "\n"
@@ -6203,48 +5426,48 @@ msgstr ""
 "\n"
 "La version de section « %s » des symboles contient %d entrée:\n"
 
-#: readelf.c:8330
+#: readelf.c:8044
 #, c-format
 msgid " Addr: "
 msgstr " Adr: "
 
-#: readelf.c:8341
+#: readelf.c:8055
 msgid "version symbol data"
 msgstr "données de symbole de version"
 
-#: readelf.c:8369
+#: readelf.c:8082
 msgid "   0 (*local*)    "
 msgstr "   0 (*local*)    "
 
-#: readelf.c:8373
+#: readelf.c:8086
 msgid "   1 (*global*)   "
 msgstr "   1 (*global*)   "
 
-#: readelf.c:8386
+#: readelf.c:8099
 msgid "invalid index into symbol array\n"
 msgstr "mauvais index dans la table\n"
 
-#: readelf.c:8420 readelf.c:9199
+#: readelf.c:8133 readelf.c:8910
 msgid "version need"
 msgstr "version «need»"
 
-#: readelf.c:8430
+#: readelf.c:8143
 msgid "version need aux (2)"
 msgstr "version «need aux» (2)"
 
-#: readelf.c:8445 readelf.c:8500
+#: readelf.c:8158 readelf.c:8213
 msgid "*invalid*"
 msgstr "*invalide*"
 
-#: readelf.c:8475 readelf.c:9264
+#: readelf.c:8188 readelf.c:8975
 msgid "version def"
 msgstr "définition de version"
 
-#: readelf.c:8495 readelf.c:9279
+#: readelf.c:8208 readelf.c:8990
 msgid "version def aux"
 msgstr "définition de version «aux»"
 
-#: readelf.c:8529
+#: readelf.c:8242
 #, c-format
 msgid ""
 "\n"
@@ -6253,37 +5476,37 @@ msgstr ""
 "\n"
 "Aucune information de version repérée dans ce fichier.\n"
 
-#: readelf.c:8728
+#: readelf.c:8441
 #, c-format
 msgid "<other>: %x"
 msgstr "<autre>: %x"
 
-#: readelf.c:8789
+#: readelf.c:8500
 msgid "Unable to read in dynamic data\n"
 msgstr "Incapable de lire les données dynamiques\n"
 
-#: readelf.c:8839
+#: readelf.c:8550
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr " <corrompu: %14ld>"
 
-#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
+#: readelf.c:8593 readelf.c:8645 readelf.c:8669 readelf.c:8699 readelf.c:8723
 msgid "Unable to seek to start of dynamic information\n"
 msgstr "Incapable de repérer le début des informations dynamiques\n"
 
-#: readelf.c:8888 readelf.c:8940
+#: readelf.c:8599 readelf.c:8651
 msgid "Failed to read in number of buckets\n"
 msgstr "Échec de lecture parmi tous les baquets\n"
 
-#: readelf.c:8894
+#: readelf.c:8605
 msgid "Failed to read in number of chains\n"
 msgstr "Échec de lecture du nombre de chaînes\n"
 
-#: readelf.c:8996
+#: readelf.c:8707
 msgid "Failed to determine last chain length\n"
 msgstr "Ne peux pas déterminer la longueur de la dernière chaîne\n"
 
-#: readelf.c:9040
+#: readelf.c:8751
 #, c-format
 msgid ""
 "\n"
@@ -6292,17 +5515,17 @@ msgstr ""
 "\n"
 "Table de symbole de l'image:\n"
 
-#: readelf.c:9042 readelf.c:9060
+#: readelf.c:8753 readelf.c:8771
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
 msgstr "  Nb  Buc:    Valeur Taille Type   Lien Vis      Ndx Nom\n"
 
-#: readelf.c:9044 readelf.c:9062
+#: readelf.c:8755 readelf.c:8773
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
 msgstr "  Nb  Buc:    Valeur         Taille Type   Lien Vis      Ndx Nom\n"
 
-#: readelf.c:9058
+#: readelf.c:8769
 #, c-format
 msgid ""
 "\n"
@@ -6311,7 +5534,7 @@ msgstr ""
 "\n"
 "Table de symbole de l'image «.gnu.hash»:\n"
 
-#: readelf.c:9101
+#: readelf.c:8812
 #, c-format
 msgid ""
 "\n"
@@ -6320,7 +5543,7 @@ msgstr ""
 "\n"
 "Table de symboles «%s» a un sh_entsize à zéro !\n"
 
-#: readelf.c:9106
+#: readelf.c:8817
 #, c-format
 msgid ""
 "\n"
@@ -6329,29 +5552,29 @@ msgstr ""
 "\n"
 "Table de symboles « %s » contient %lu entrées:\n"
 
-#: readelf.c:9111
+#: readelf.c:8822
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Num:    Valeur Tail Type    Lien   Vis      Ndx Nom\n"
 
-#: readelf.c:9113
+#: readelf.c:8824
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Num:    Valeur         Tail Type    Lien   Vis      Ndx Nom\n"
 
-#: readelf.c:9170
+#: readelf.c:8881
 msgid "version data"
 msgstr "données de version"
 
-#: readelf.c:9212
+#: readelf.c:8923
 msgid "version need aux (3)"
 msgstr "version «need aux» (3)"
 
-#: readelf.c:9239
+#: readelf.c:8950
 msgid "bad dynamic symbol\n"
 msgstr "mauvais symbole dynamique\n"
 
-#: readelf.c:9303
+#: readelf.c:9014
 #, c-format
 msgid ""
 "\n"
@@ -6360,7 +5583,7 @@ msgstr ""
 "\n"
 "L'information dynamique des symboles n'est pas disponible pour l'affichage des symboles.\n"
 
-#: readelf.c:9315
+#: readelf.c:9026
 #, c-format
 msgid ""
 "\n"
@@ -6369,12 +5592,12 @@ msgstr ""
 "\n"
 "Histogramme de la longueur de la liste des baquets (total de %lu baquets):\n"
 
-#: readelf.c:9317 readelf.c:9387
+#: readelf.c:9028 readelf.c:9098
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr " Long.   Nombre     %% de couverture totale\n"
 
-#: readelf.c:9385
+#: readelf.c:9096
 #, c-format
 msgid ""
 "\n"
@@ -6383,7 +5606,7 @@ msgstr ""
 "\n"
 "Histogramme de la longueur de la liste des baquets «.gnu.hash» (total de %lu baquets):\n"
 
-#: readelf.c:9451
+#: readelf.c:9162
 #, c-format
 msgid ""
 "\n"
@@ -6392,41 +5615,41 @@ msgstr ""
 "\n"
 "Segment d'informations dynamiques à l'adresse de décalage 0x%lx contient %d entrées:\n"
 
-#: readelf.c:9454
+#: readelf.c:9165
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr " Num: Nom                            Lier à      Fanions\n"
 
-#: readelf.c:9463
+#: readelf.c:9174
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr "<corrompu: %19ld>"
 
-#: readelf.c:9545
+#: readelf.c:9256
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
-msgstr "Type de réadressage MN10300 non géré après un réadressage SYM_DIFF"
+msgstr "Type de relocalisation MN10300 non géré après une relocalisation SYM_DIFF"
 
-#: readelf.c:9705
+#: readelf.c:9416
 #, c-format
 msgid "Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"
-msgstr "Types de réadressages 32 bits inconnus dans les sections DWARF de la machine %d\n"
+msgstr "Types de relocalisation 32 bits inconnus dans les sections DWARF de la machine %d\n"
 
-#: readelf.c:10009
+#: readelf.c:9720
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
-msgstr "Incapable d'appliquer le type de réadressage non supporté %d à la section %s\n"
+msgstr "Incapable d'appliquer le type de relocalisation non supporté %d à la section %s\n"
 
-#: readelf.c:10017
+#: readelf.c:9728
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
-msgstr "passe outre l'offset de réadressage invalide 0x%lx dans la section %s\n"
+msgstr "escamotage invalide de relocalisation du décalage 0x%lx dans la section %s\n"
 
-#: readelf.c:10041
+#: readelf.c:9752
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
-msgstr "passe outre le type de symbole inattendu %s dans le réadressage %ld de la section %s\n"
+msgstr "escamotage du type de symbole inattendu %s dans la relocalisation %ld de la section %s\n"
 
-#: readelf.c:10087
+#: readelf.c:9798
 #, c-format
 msgid ""
 "\n"
@@ -6435,7 +5658,7 @@ msgstr ""
 "\n"
 "Vidange de la section assembleur %s\n"
 
-#: readelf.c:10108
+#: readelf.c:9819
 #, c-format
 msgid ""
 "\n"
@@ -6444,11 +5667,11 @@ msgstr ""
 "\n"
 "La section « %s » n'a pas de données à être videngé.\n"
 
-#: readelf.c:10114
+#: readelf.c:9825
 msgid "section contents"
 msgstr "contenus de la section"
 
-#: readelf.c:10133
+#: readelf.c:9844
 #, c-format
 msgid ""
 "\n"
@@ -6457,17 +5680,17 @@ msgstr ""
 "\n"
 "Vidange textuelle de la section « %s »:\n"
 
-#: readelf.c:10151
+#: readelf.c:9862
 #, c-format
 msgid "  Note: This section has relocations against it, but these have NOT been applied to this dump.\n"
-msgstr "  Note: Cette section a des réadressages mais ils n'ont PAS été appliqués dans cette vidange.\n"
+msgstr "  Note: Cette section a des relocalisations mais elles n'ont PAS été appliquées dans cette vidange.\n"
 
-#: readelf.c:10182
+#: readelf.c:9893
 #, c-format
 msgid "  No strings found in this section."
 msgstr "  Aucun texte trouvé dans cette section."
 
-#: readelf.c:10204
+#: readelf.c:9915
 #, c-format
 msgid ""
 "\n"
@@ -6476,17 +5699,17 @@ msgstr ""
 "\n"
 "Vidange hexadécimale de la section « %s »:\n"
 
-#: readelf.c:10228
+#: readelf.c:9939
 #, c-format
 msgid " NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"
-msgstr " NOTE: Cette section a des réadressages mais ils n'ont PAS été appliqués dans cette vidange.\n"
+msgstr " NOTE: Cette section a des relocalisations mais elles n'ont PAS été appliquées dans cette vidange.\n"
 
-#: readelf.c:10362
+#: readelf.c:10073
 #, c-format
 msgid "%s section data"
 msgstr "données de section %s"
 
-#: readelf.c:10427
+#: readelf.c:10138
 #, c-format
 msgid ""
 "\n"
@@ -6499,246 +5722,246 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10436
+#: readelf.c:10147
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
 msgstr "la section «%s» a le type NOBITS - son contenu n'est pas fiable.\n"
 
-#: readelf.c:10472
+#: readelf.c:10183
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr "Section de débug non reconnue: %s\n"
 
-#: readelf.c:10500
+#: readelf.c:10211
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr "La section «%s» n'a pas été vidangée parce qu'inexistante!\n"
 
-#: readelf.c:10541
+#: readelf.c:10252
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr "La section %d n'a pas été vidangée parce qu'inexistante!\n"
 
-#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
+#: readelf.c:10430 readelf.c:10444 readelf.c:10463 readelf.c:10781
 #, c-format
 msgid "None\n"
 msgstr "Aucun\n"
 
-#: readelf.c:10720
+#: readelf.c:10431
 #, c-format
 msgid "Application\n"
 msgstr "Application\n"
 
-#: readelf.c:10721
+#: readelf.c:10432
 #, c-format
 msgid "Realtime\n"
 msgstr "Temps réel\n"
 
-#: readelf.c:10722
+#: readelf.c:10433
 #, c-format
 msgid "Microcontroller\n"
 msgstr "Microcontrolleur\n"
 
-#: readelf.c:10723
+#: readelf.c:10434
 #, c-format
 msgid "Application or Realtime\n"
 msgstr "Application on temps réel\n"
 
-#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
-#: readelf.c:11217 readelf.c:11238
+#: readelf.c:10445 readelf.c:10465 readelf.c:10835 readelf.c:10853
+#: readelf.c:10928 readelf.c:10949
 #, c-format
 msgid "8-byte\n"
 msgstr "8-octet\n"
 
-#: readelf.c:10735 readelf.c:11220 readelf.c:11241
+#: readelf.c:10446 readelf.c:10931 readelf.c:10952
 #, c-format
 msgid "4-byte\n"
 msgstr "4-octet\n"
 
-#: readelf.c:10739 readelf.c:10758
+#: readelf.c:10450 readelf.c:10469
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr "8-octet et plus jusqu'à une extension de %d-octet\n"
 
-#: readelf.c:10753
+#: readelf.c:10464
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr "8-octet, sauf pour feuille SP\n"
 
-#: readelf.c:10769 readelf.c:10859 readelf.c:11256
+#: readelf.c:10480 readelf.c:10570 readelf.c:10967
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr "fanion = %d, vendeur = %s\n"
 
-#: readelf.c:10775
+#: readelf.c:10486
 #, c-format
 msgid "True\n"
 msgstr "Vrai\n"
 
-#: readelf.c:10904 readelf.c:11008
+#: readelf.c:10615 readelf.c:10719
 #, c-format
 msgid "Hard or soft float\n"
 msgstr "Flottant matériel ou logiciel\n"
 
-#: readelf.c:10907
+#: readelf.c:10618
 #, c-format
 msgid "Hard float\n"
 msgstr "Flottant matériel\n"
 
-#: readelf.c:10910 readelf.c:11017
+#: readelf.c:10621 readelf.c:10728
 #, c-format
 msgid "Soft float\n"
 msgstr "Flottant logiciel\n"
 
-#: readelf.c:10913
+#: readelf.c:10624
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr "Flottant matériel simple précision\n"
 
-#: readelf.c:10930 readelf.c:10956
+#: readelf.c:10641 readelf.c:10667
 #, c-format
 msgid "Any\n"
 msgstr "Au choix\n"
 
-#: readelf.c:10933
+#: readelf.c:10644
 #, c-format
 msgid "Generic\n"
 msgstr "Générique\n"
 
-#: readelf.c:10962
+#: readelf.c:10673
 #, c-format
 msgid "Memory\n"
 msgstr "Mémoire\n"
 
-#: readelf.c:11011
+#: readelf.c:10722
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr "Flottant matériel (double précision)\n"
 
-#: readelf.c:11014
+#: readelf.c:10725
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr "Flottant matériel (simple précision)\n"
 
-#: readelf.c:11020
+#: readelf.c:10731
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr "Flottant matériel (MIPS32r2 64-bit FPU)\n"
 
-#: readelf.c:11103
+#: readelf.c:10814
 #, c-format
 msgid "Not used\n"
 msgstr "Pas utilisé\n"
 
-#: readelf.c:11106
+#: readelf.c:10817
 #, c-format
 msgid "2 bytes\n"
 msgstr "2 octets\n"
 
-#: readelf.c:11109
+#: readelf.c:10820
 #, c-format
 msgid "4 bytes\n"
 msgstr "4 octets\n"
 
-#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
+#: readelf.c:10838 readelf.c:10856 readelf.c:10934 readelf.c:10955
 #, c-format
 msgid "16-byte\n"
 msgstr "16-octets\n"
 
-#: readelf.c:11160
+#: readelf.c:10871
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr "Adressage DSBT pas utilisé\n"
 
-#: readelf.c:11163
+#: readelf.c:10874
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr "Adressage DSBT utilisé\n"
 
-#: readelf.c:11178
+#: readelf.c:10889
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr "Adressage des données dépendant de la position\n"
 
-#: readelf.c:11181
+#: readelf.c:10892
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr "Adressage des données indépendant de la position, GOT près de DP\n"
 
-#: readelf.c:11184
+#: readelf.c:10895
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr "Adressage des données indépendant de la position, GOT loin de DP\n"
 
-#: readelf.c:11199
+#: readelf.c:10910
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr "Adressage de code dépendant de la position\n"
 
-#: readelf.c:11202
+#: readelf.c:10913
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr "Adressage de code indépendant de la position\n"
 
-#: readelf.c:11308
+#: readelf.c:11019
 msgid "attributes"
 msgstr "attributs"
 
-#: readelf.c:11329
+#: readelf.c:11040
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr "ERREUR: longueur erronée de section (%d > %d)\n"
 
-#: readelf.c:11335
+#: readelf.c:11046
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr "Section d'Attribut: %s\n"
 
-#: readelf.c:11360
+#: readelf.c:11071
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr "EREUR: longueur erronée de la sous-section (%d > %d)\n"
 
-#: readelf.c:11372
+#: readelf.c:11083
 #, c-format
 msgid "File Attributes\n"
 msgstr "Attributs du fichier\n"
 
-#: readelf.c:11375
+#: readelf.c:11086
 #, c-format
 msgid "Section Attributes:"
 msgstr "Attributs de Section:"
 
-#: readelf.c:11378
+#: readelf.c:11089
 #, c-format
 msgid "Symbol Attributes:"
 msgstr "Attributs de Symbols:"
 
-#: readelf.c:11393
+#: readelf.c:11104
 #, c-format
 msgid "Unknown tag: %d\n"
 msgstr "Tag inconnu: %d\n"
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11412
+#: readelf.c:11123
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr "  Contexte de section inconnu\n"
 
-#: readelf.c:11419
+#: readelf.c:11130
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr "Format inconnu « %c »\n"
 
-#: readelf.c:11463 readelf.c:11485
+#: readelf.c:11174 readelf.c:11196
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: readelf.c:11580 readelf.c:12102
+#: readelf.c:11291 readelf.c:11813
 msgid "liblist"
 msgstr "liblist"
 
-#: readelf.c:11583
+#: readelf.c:11294
 #, c-format
 msgid ""
 "\n"
@@ -6747,24 +5970,24 @@ msgstr ""
 "\n"
 "La section « .liblist » contient %lu entrées:\n"
 
-#: readelf.c:11585
+#: readelf.c:11296
 msgid "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr "     Librarie             Horodatage          Checksum   Version Fanions\n"
 
-#: readelf.c:11611
+#: readelf.c:11322
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr "<corrompu: %9ld>"
 
-#: readelf.c:11616
+#: readelf.c:11327
 msgid " NONE"
 msgstr " AUCUN"
 
-#: readelf.c:11667
+#: readelf.c:11378
 msgid "options"
 msgstr "options"
 
-#: readelf.c:11698
+#: readelf.c:11409
 #, c-format
 msgid ""
 "\n"
@@ -6773,15 +5996,15 @@ msgstr ""
 "\n"
 "Section « %s » contient %d entrées:\n"
 
-#: readelf.c:11859
+#: readelf.c:11570
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr "conflit de liste repéré sans symbole de table dynamique\n"
 
-#: readelf.c:11876 readelf.c:11891
+#: readelf.c:11587 readelf.c:11602
 msgid "conflict"
 msgstr "conflit"
 
-#: readelf.c:11901
+#: readelf.c:11612
 #, c-format
 msgid ""
 "\n"
@@ -6790,20 +6013,20 @@ msgstr ""
 "\n"
 "La section « .conflict » contient %lu entrées:\n"
 
-#: readelf.c:11903
+#: readelf.c:11614
 msgid "  Num:    Index       Value  Name"
 msgstr "  Nombre: Index       Valeur Nom"
 
-#: readelf.c:11915 readelf.c:11995 readelf.c:12063
+#: readelf.c:11626 readelf.c:11706 readelf.c:11774
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr "<corrompu: %14ld>"
 
-#: readelf.c:11936
+#: readelf.c:11647
 msgid "GOT"
 msgstr "TOG"
 
-#: readelf.c:11937
+#: readelf.c:11648
 #, c-format
 msgid ""
 "\n"
@@ -6812,76 +6035,86 @@ msgstr ""
 "\n"
 "TOG principale:\n"
 
-#: readelf.c:11938
+#: readelf.c:11649
 #, c-format
 msgid " Canonical gp value: "
 msgstr " Valeur gp canonique: "
 
-#: readelf.c:11942 readelf.c:12034
+#: readelf.c:11653 readelf.c:11745
 #, c-format
 msgid " Reserved entries:\n"
 msgstr " Entrées réservées:\n"
 
-#: readelf.c:11943
+#: readelf.c:11654
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr "  %*s %10s %*s Purpose\n"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
-#: readelf.c:12045
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688 readelf.c:11747
+#: readelf.c:11756
 msgid "Address"
 msgstr "Adresse"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688
 msgid "Access"
 msgstr "Accès"
 
-#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
-#: readelf.c:12046
+#: readelf.c:11656 readelf.c:11673 readelf.c:11689 readelf.c:11747
+#: readelf.c:11757
 msgid "Initial"
 msgstr "Initial"
 
-#: readelf.c:11947
+#: readelf.c:11658
 #, c-format
 msgid " Lazy resolver\n"
 msgstr " Résolution différée\n"
 
-#: readelf.c:11953
+#: readelf.c:11664
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr " Pointer de module (extension GNU)\n"
 
-#: readelf.c:11959
+#: readelf.c:11670
 #, c-format
 msgid " Local entries:\n"
 msgstr " Entrées locales:\n"
 
-#: readelf.c:11975
+#: readelf.c:11671
+#, c-format
+msgid "  %*s %10s %*s\n"
+msgstr "  %*s %10s %*s\n"
+
+#: readelf.c:11686
 #, c-format
 msgid " Global entries:\n"
 msgstr " Entrées globales:\n"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11687
+#, c-format
+msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11690 readelf.c:11758
 msgid "Sym.Val."
 msgstr "Val.Sym."
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Type"
 msgstr "Type"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Ndx"
 msgstr "Ndx"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Name"
 msgstr "Nom"
 
-#: readelf.c:12032
+#: readelf.c:11743
 msgid "PLT GOT"
 msgstr "PLT TOG"
 
-#: readelf.c:12033
+#: readelf.c:11744
 #, c-format
 msgid ""
 "\n"
@@ -6892,31 +6125,36 @@ msgstr ""
 "PLT TOG:\n"
 "\n"
 
-#: readelf.c:12035
+#: readelf.c:11746
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr "  %*s %*s Purpose\n"
 
-#: readelf.c:12038
+#: readelf.c:11749
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr " Solveur différé de la PLT\n"
 
-#: readelf.c:12040
+#: readelf.c:11751
 #, c-format
 msgid " Module pointer\n"
 msgstr " Pointer du module\n"
 
-#: readelf.c:12043
+#: readelf.c:11754
 #, c-format
 msgid " Entries:\n"
 msgstr " Entrées:\n"
 
-#: readelf.c:12110
+#: readelf.c:11755
+#, c-format
+msgid "  %*s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11821
 msgid "liblist string table"
 msgstr "table de chaînes liblist"
 
-#: readelf.c:12121
+#: readelf.c:11831
 #, c-format
 msgid ""
 "\n"
@@ -6925,344 +6163,146 @@ msgstr ""
 "\n"
 "Liste de libraire de la section « %s » contenant %lu entrées:\n"
 
-#: readelf.c:12125
+#: readelf.c:11835
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr "     Librarie             Horodatage          Checksum   Version Fanions"
 
-#: readelf.c:12175
+#: readelf.c:11884
 msgid "NT_AUXV (auxiliary vector)"
 msgstr "NT_AUXV (vecteur auxiliaire)"
 
-#: readelf.c:12177
+#: readelf.c:11886
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr "NT_PRSTATUS (structure prstatus)"
 
-#: readelf.c:12179
+#: readelf.c:11888
 msgid "NT_FPREGSET (floating point registers)"
 msgstr "NT_FPREGSET (régistres en virgule flottante)"
 
-#: readelf.c:12181
+#: readelf.c:11890
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr "NT_PRPSINFO (structure prpsinfo)"
 
-#: readelf.c:12183
+#: readelf.c:11892
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr "NT_TASKSTRUCT (structure de taches)"
 
-#: readelf.c:12185
+#: readelf.c:11894
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr "NT_PRXFPREG (structure user_xfpregs)"
 
-#: readelf.c:12187
+#: readelf.c:11896
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr "NT_PPC_VMX (registres ppc Altivec)"
 
-#: readelf.c:12189
+#: readelf.c:11898
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr "NT_PPC_VSX (registres ppc VSX)"
 
-#: readelf.c:12191
+#: readelf.c:11900
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr "NT_X86_XSTATE (état étendu x86 XSAVE)"
 
-#: readelf.c:12193
+#: readelf.c:11902
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr "NT_S390_HIGH_GPRS (moitiés supérieures des registres du s390)"
 
-#: readelf.c:12195
+#: readelf.c:11904
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr "NT_S390_TIMER (registre du timer du s390)"
 
-#: readelf.c:12197
+#: readelf.c:11906
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr "NT_S390_TODCMP (registre du comparateur TOD du s390)"
 
-#: readelf.c:12199
+#: readelf.c:11908
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr "NT_S390_TODPREG (registre programmable du TOD du s390)"
 
-#: readelf.c:12201
+#: readelf.c:11910
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr "NT_S390_CTRS (registres de contrôle du s390)"
 
-#: readelf.c:12203
+#: readelf.c:11912
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr "NT_S390_PREFIX (registre de préfixe du s390)"
 
-#: readelf.c:12205
+#: readelf.c:11914
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr "NT_PSTATUS (structure pstatus)"
 
-#: readelf.c:12207
+#: readelf.c:11916
 msgid "NT_FPREGS (floating point registers)"
 msgstr "NT_FPREGS (registres en virgule flottante)"
 
-#: readelf.c:12209
+#: readelf.c:11918
 msgid "NT_PSINFO (psinfo structure)"
 msgstr "NT_PSINFO (structure psinfo)"
 
-#: readelf.c:12211
+#: readelf.c:11920
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr "NT_LWPSTATUS (structure lwpstatus_t)"
 
-#: readelf.c:12213
+#: readelf.c:11922
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr "NT_LWPSINFO (structure lwpsinfo_t)"
 
-#: readelf.c:12215
+#: readelf.c:11924
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr "NT_WIN32PSTATUS (structure win32_pstatus)"
 
-#: readelf.c:12223
+#: readelf.c:11932
 msgid "NT_VERSION (version)"
 msgstr "NT_VERSION (version)"
 
-#: readelf.c:12225
+#: readelf.c:11934
 msgid "NT_ARCH (architecture)"
 msgstr "NT_ARCH (architecture)"
 
-#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
-#: readelf.c:12467
+#: readelf.c:11939 readelf.c:11962 readelf.c:11984
 #, c-format
 msgid "Unknown note type: (0x%08x)"
 msgstr "Type de note inconnu: (0x%08x)"
 
-#: readelf.c:12242
+#: readelf.c:11951
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr "NT_GNU_ABI_TAG (étiquette de version ABI)"
 
-#: readelf.c:12244
+#: readelf.c:11953
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
 msgstr "NT_GNU_HWCAP (information HWCAP du logiciel fournie par le DSO)"
 
-#: readelf.c:12246
+#: readelf.c:11955
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
 msgstr "NT_GNU_BUILD_ID (chaîne de bits du ID de construction unique)"
 
-#: readelf.c:12248
+#: readelf.c:11957
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr "NT_GNU_GOLD_VERSION (version d'or)"
 
-#: readelf.c:12266
-#, c-format
-msgid "    Build ID: "
-msgstr "    ID construction: "
-
-#: readelf.c:12269 readelf.c:12425
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: readelf.c:12305
-#, c-format
-msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
-msgstr "    OS: %s, ABI: %ld.%ld.%ld\n"
-
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12322
+#: readelf.c:11974
 msgid "NetBSD procinfo structure"
 msgstr "structure proinfo NetBSD"
 
-#: readelf.c:12349 readelf.c:12363
+#: readelf.c:12001 readelf.c:12015
 msgid "PT_GETREGS (reg structure)"
 msgstr "PT_GETREGS (structure reg)"
 
-#: readelf.c:12351 readelf.c:12365
+#: readelf.c:12003 readelf.c:12017
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr "PT_GETFPPREGS (structure fpreg)"
 
-#: readelf.c:12371
+#: readelf.c:12023
 #, c-format
 msgid "PT_FIRSTMACH+%d"
 msgstr "PT_FIRSTMACH+%d"
 
-#: readelf.c:12384
-msgid "NT_STAPSDT (SystemTap probe descriptors)"
-msgstr "NT_STAPSDT (descripteurs de sonde SystemTap)"
-
-#: readelf.c:12417
-#, c-format
-msgid "    Provider: %s\n"
-msgstr "    Fournisseur: %s\n"
-
-#: readelf.c:12418
-#, c-format
-msgid "    Name: %s\n"
-msgstr "    Nom: %s\n"
-
-#: readelf.c:12419
-#, c-format
-msgid "    Location: "
-msgstr "    Emplacement: "
-
-#: readelf.c:12421
-#, c-format
-msgid ", Base: "
-msgstr ", Base: "
-
-#: readelf.c:12423
-#, c-format
-msgid ", Semaphore: "
-msgstr ", Semaphore: "
-
-#: readelf.c:12426
-#, c-format
-msgid "    Arguments: %s\n"
-msgstr "    Arguments: %s\n"
-
-#: readelf.c:12439
-msgid "NT_VMS_MHD (module header)"
-msgstr "NT_VMS_MHD (en-tête de module)"
-
-#: readelf.c:12441
-msgid "NT_VMS_LNM (language name)"
-msgstr "NT_VMS_LNM (nom du langage)"
-
-#: readelf.c:12443
-msgid "NT_VMS_SRC (source files)"
-msgstr "NT_VMS_SRC (fichiers source)"
-
-#: readelf.c:12445
-msgid "NT_VMS_TITLE"
-msgstr "NT_VMS_TITLE"
-
-#: readelf.c:12447
-msgid "NT_VMS_EIDC (consistency check)"
-msgstr "NT_VMS_EIDC (vérification de cohérence)"
-
-#: readelf.c:12449
-msgid "NT_VMS_FPMODE (FP mode)"
-msgstr "NT_VMS_FPMODE (mode FP)"
-
-#: readelf.c:12451
-msgid "NT_VMS_LINKTIME"
-msgstr "NT_VMS_LINKTIME"
-
-#: readelf.c:12453
-msgid "NT_VMS_IMGNAM (image name)"
-msgstr "NT_VMS_IMGNAM (nom de l'image)"
-
-#: readelf.c:12455
-msgid "NT_VMS_IMGID (image id)"
-msgstr "NT_VMS_IMGID (id de l'image)"
-
-#: readelf.c:12457
-msgid "NT_VMS_LINKID (link id)"
-msgstr "NT_VMS_LINKID (id du lien)"
-
-#: readelf.c:12459
-msgid "NT_VMS_IMGBID (build id)"
-msgstr "NT_VMS_IMGBID (id de construction)"
-
-#: readelf.c:12461
-msgid "NT_VMS_GSTNAM (sym table name)"
-msgstr "NT_VMS_GSTNAM (nom de la table des symboles)"
-
-#: readelf.c:12463
-msgid "NT_VMS_ORIG_DYN"
-msgstr "NT_VMS_ORIG_DYN"
-
-#: readelf.c:12465
-msgid "NT_VMS_PATCHTIME"
-msgstr "NT_VMS_PATCHTIME"
-
-#: readelf.c:12481
-#, c-format
-msgid "    Creation date  : %.17s\n"
-msgstr "    Date création  : %.17s\n"
-
-#: readelf.c:12482
-#, c-format
-msgid "    Last patch date: %.17s\n"
-msgstr "    Date dernier correctif: %.17s\n"
-
-#: readelf.c:12483
-#, c-format
-msgid "    Module name    : %s\n"
-msgstr "    Nom du module  : %s\n"
-
-#: readelf.c:12484
-#, c-format
-msgid "    Module version : %s\n"
-msgstr "    Version du module: %s\n"
-
-#: readelf.c:12487
-#, c-format
-msgid "    Invalid size\n"
-msgstr "    Taille invalide\n"
-
-#: readelf.c:12490
-#, c-format
-msgid "   Language: %s\n"
-msgstr "   Langage: %s\n"
-
-#: readelf.c:12494
-msgid "   FP mode: 0x%016"
-msgstr "   Mode FP: 0x%016"
-
-#: readelf.c:12498
-#, c-format
-msgid "   Link time: "
-msgstr "   Heure du lien: "
-
-#: readelf.c:12504
-#, c-format
-msgid "   Patch time: "
-msgstr "   Heure correctif: "
-
-#: readelf.c:12510
-#, c-format
-msgid "   Major id: %u,  minor id: %u\n"
-msgstr "   Id majeur: %u,  id mineur: %u\n"
-
-#: readelf.c:12513
-#, c-format
-msgid "   Manip date  : "
-msgstr "   Date manip : "
-
-#: readelf.c:12516
-msgid ""
-"\n"
-"   Link flags  : 0x%016"
-msgstr ""
-"\n"
-"   Fanions de lien : 0x%016"
-
-#: readelf.c:12519
-#, c-format
-msgid "   Header flags: 0x%08x\n"
-msgstr "   Fanions en-tête: 0x%08x\n"
-
-#: readelf.c:12521
-#, c-format
-msgid "   Image id    : %s\n"
-msgstr "   Id image    : %s\n"
-
-#: readelf.c:12525
-#, c-format
-msgid "    Image name: %s\n"
-msgstr "    Nom image : %s\n"
-
-#: readelf.c:12528
-#, c-format
-msgid "    Global symbol table name: %s\n"
-msgstr "    Nom table symboles globale: %s\n"
-
-#: readelf.c:12531
-#, c-format
-msgid "    Image id: %s\n"
-msgstr "    Id image: %s\n"
-
-#: readelf.c:12534
-#, c-format
-msgid "    Linker id: %s\n"
-msgstr "    Id lieur: %s\n"
-
-#: readelf.c:12609
+#: readelf.c:12080
 msgid "notes"
 msgstr "notes"
 
-#: readelf.c:12615
+#: readelf.c:12086
 #, c-format
 msgid ""
 "\n"
@@ -7271,35 +6311,27 @@ msgstr ""
 "\n"
 "Notes au décalage 0x%08lx de longueur 0x%08lx:\n"
 
-#: readelf.c:12617
+#: readelf.c:12088
 #, c-format
-msgid "  %-20s %10s\tDescription\n"
-msgstr "  %-20s %10s\tDescription\n"
-
-#: readelf.c:12617
-msgid "Owner"
-msgstr "Propriétaire"
-
-#: readelf.c:12617
-msgid "Data size"
-msgstr "Taille des données"
+msgid "  Owner\t\tData size\tDescription\n"
+msgstr "  Propriétaire\t\tTaille de données\tDescription\n"
 
-#: readelf.c:12655 readelf.c:12668
+#: readelf.c:12108 readelf.c:12121
 #, c-format
 msgid "corrupt note found at offset %lx into core notes\n"
 msgstr "note corrompue repérée au décalage %lx dans les notes du core\n"
 
-#: readelf.c:12657 readelf.c:12670
+#: readelf.c:12110 readelf.c:12123
 #, c-format
 msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
 msgstr " type: %lx, taille des noms: %08lx, taille de descriptions: %08lx\n"
 
-#: readelf.c:12766
+#: readelf.c:12219
 #, c-format
 msgid "No note segments present in the core file.\n"
 msgstr "Aucun note de segment présent dans le fichier core.\n"
 
-#: readelf.c:12853
+#: readelf.c:12306
 msgid ""
 "This instance of readelf has been built without support for a\n"
 "64 bit data type and so it cannot read 64 bit ELF files.\n"
@@ -7307,12 +6339,12 @@ msgstr ""
 "Cette instance de readelf a été contstruite sans soutien pour des\n"
 "types de données de 64 bits et ne peut donc lire des fichiers de 64 bits ELF.\n"
 
-#: readelf.c:12900
+#: readelf.c:12353
 #, c-format
 msgid "%s: Failed to read file header\n"
 msgstr "%s: échec de lecture de l'en-tête du fichier\n"
 
-#: readelf.c:12914
+#: readelf.c:12366
 #, c-format
 msgid ""
 "\n"
@@ -7321,47 +6353,89 @@ msgstr ""
 "\n"
 "Fichier: %s\n"
 
-#: readelf.c:13086
+#: readelf.c:12615
+#, c-format
+msgid "%s: the archive index is empty\n"
+msgstr "%s: l'index de l'archive est vide\n"
+
+#: readelf.c:12623 readelf.c:12647
+#, c-format
+msgid "%s: failed to read archive index\n"
+msgstr "%s: échec de lecture de l'index de l'archive\n"
+
+#: readelf.c:12632
+#, c-format
+msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
+msgstr "%s: l'index de l'archive devrait avoir %ld entrées mais l'en-tête est trop petit\n"
+
+#: readelf.c:12640
+msgid "Out of memory whilst trying to read archive symbol index\n"
+msgstr "Mémoire épuisée lors de la lecture de l'index des symboles de l'archive\n"
+
+#: readelf.c:12658
+msgid "Out of memory whilst trying to convert the archive symbol index\n"
+msgstr "Mémoire épuisée lors de la conversion de l'index des symboles de l'archive\n"
+
+#: readelf.c:12670
+#, c-format
+msgid "%s: the archive has an index but no symbols\n"
+msgstr "%s: l'archive a un index mais pas de symbole\n"
+
+#: readelf.c:12677
+msgid "Out of memory whilst trying to read archive index symbol table\n"
+msgstr "Mémoire épuisée lors de la lecture de la table des symboles de l'index de l'archive\n"
+
+#: readelf.c:12683
+#, c-format
+msgid "%s: failed to read archive index symbol table\n"
+msgstr "%s: erreur de lecture de la table de symboles de l'index de l'archive\n"
+
+#: readelf.c:12707
+#, c-format
+msgid "%s has no archive index\n"
+msgstr "%s n'a pas d'index d'archive\n"
+
+#: readelf.c:12943
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr "%s: impossible de sortir l'index car il n'y en a pas\n"
 
-#: readelf.c:13092
+#: readelf.c:12949
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr "Index de l'archive %s: (%ld entrées, 0x%lx octets dans la table des symboles)\n"
 
-#: readelf.c:13110
+#: readelf.c:12967
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr "Le binaire %s contient:\n"
 
-#: readelf.c:13118
+#: readelf.c:12975
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr "%s: fin de la table des symboles atteinte avant la fin de l'index\n"
 
-#: readelf.c:13129
+#: readelf.c:12986
 #, c-format
 msgid "%s: symbols remain in the index symbol table, but without corresponding entries in the index table\n"
 msgstr "%s: des symboles de l'index de la table des symboles n'ont pas d'entrée correspondante dans la table de l'index\n"
 
-#: readelf.c:13134
+#: readelf.c:12991
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr "%s: échec du retour au début des fichiers objets dans l'archive\n"
 
-#: readelf.c:13217 readelf.c:13300
+#: readelf.c:13074 readelf.c:13150
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr "Fichier d'entrée %s n'est pas lisible.\n"
 
-#: readelf.c:13239
+#: readelf.c:13096
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr "%s: échec de repérage du membre de l'archive.\n"
 
-#: readelf.c:13318
+#: readelf.c:13168
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr "Le fichier %s n'est pas une archive donc son index ne peut pas être affiché.\n"
@@ -7650,7 +6724,7 @@ msgstr "nom de fichier requis pour la sortie de COFF"
 
 #: rescoff.c:715
 msgid "can't get BFD_RELOC_RVA relocation type"
-msgstr "ne peut obtenir le type de réadressage BFD_RELOC_RVA"
+msgstr "ne peut obtenir le type de la relocalisation BFD_RELOC_RVA"
 
 #: resrc.c:262 resrc.c:333
 #, c-format
@@ -7662,6 +6736,11 @@ msgstr "ne peut ouvrir un fichier temporaire « %s »: %s"
 msgid "can't redirect stdout: `%s': %s"
 msgstr "ne peut rediriger sur stdout: « %s »: %s"
 
+#: resrc.c:284
+#, c-format
+msgid "%s %s: %s"
+msgstr "%s %s: %s"
+
 #: resrc.c:329
 #, c-format
 msgid "can't execute `%s': %s"
@@ -7696,6 +6775,11 @@ msgstr "Utilisation de « %s »\n"
 msgid "preprocessing failed."
 msgstr "échec du pré-traitement."
 
+#: resrc.c:631
+#, c-format
+msgid "%s:%d: %s\n"
+msgstr "%s:%d: %s\n"
+
 #: resrc.c:639
 #, c-format
 msgid "%s: unexpected EOF"
@@ -7794,12 +6878,12 @@ msgstr "argument invalide pour --format: %s"
 msgid "Invalid radix: %s\n"
 msgstr "Base numérique invalide: %s\n"
 
-#: srconv.c:1733
+#: srconv.c:1732
 #, c-format
 msgid "Convert a COFF object file into a SYSROFF object file\n"
 msgstr "Convertir un fichier objet COFF en un fichier objet SYSROFF\n"
 
-#: srconv.c:1734
+#: srconv.c:1733
 #, c-format
 msgid ""
 " The options are:\n"
@@ -7818,7 +6902,7 @@ msgstr ""
 "  -h --help        afficher l'aide-mémoire\n"
 "  -V --version     afficher le nom et la version du logiciel\n"
 
-#: srconv.c:1880
+#: srconv.c:1879
 #, c-format
 msgid "unable to open output file %s"
 msgstr "incapable d'ouvrir le fichier de sortie %s"
@@ -7863,95 +6947,95 @@ msgstr "type de référence croisée non reconnue"
 msgid "missing index type"
 msgstr "type d'index manquant"
 
-#: stabs.c:2129
+#: stabs.c:2122
 msgid "unknown virtual character for baseclass"
 msgstr "caractère virtuel inconnu pour la classe de base"
 
-#: stabs.c:2147
+#: stabs.c:2140
 msgid "unknown visibility character for baseclass"
 msgstr "caractère de visibilité inconnu pour la classe de base"
 
-#: stabs.c:2337
+#: stabs.c:2326
 msgid "unnamed $vb type"
 msgstr "type $vb inconnu"
 
-#: stabs.c:2343
+#: stabs.c:2332
 msgid "unrecognized C++ abbreviation"
 msgstr "abréviation C++ inconnue"
 
-#: stabs.c:2419
+#: stabs.c:2408
 msgid "unknown visibility character for field"
 msgstr "caractère de visibilité inconnu pour le champ"
 
-#: stabs.c:2679
+#: stabs.c:2660
 msgid "const/volatile indicator missing"
 msgstr "indicateur de const/volatile manquant"
 
-#: stabs.c:2924
+#: stabs.c:2896
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr "Pas de mutilation pour \"n%s\"\n"
 
-#: stabs.c:3224
+#: stabs.c:3196
 msgid "Undefined N_EXCL"
 msgstr "N_EXCL indéfini"
 
-#: stabs.c:3304
+#: stabs.c:3276
 #, c-format
 msgid "Type file number %d out of range\n"
 msgstr "Nombre de type de fichier %d hors limite\n"
 
-#: stabs.c:3309
+#: stabs.c:3281
 #, c-format
 msgid "Type index number %d out of range\n"
 msgstr "Nombre de type index %d hors limite\n"
 
-#: stabs.c:3388
+#: stabs.c:3360
 #, c-format
 msgid "Unrecognized XCOFF type %d\n"
 msgstr "Type XCOFF non reconnu %d\n"
 
-#: stabs.c:3680
+#: stabs.c:3652
 #, c-format
 msgid "bad mangled name `%s'\n"
 msgstr "mauvais codage par mutilation du nom « %s »\n"
 
-#: stabs.c:3775
+#: stabs.c:3747
 #, c-format
 msgid "no argument types in mangled string\n"
 msgstr "aucun type d'argument dans la chaîne encodé par mutilation\n"
 
-#: stabs.c:5125
+#: stabs.c:5094
 #, c-format
 msgid "Demangled name is not a function\n"
 msgstr "nom démutilé n'est pas une fonction\n"
 
-#: stabs.c:5167
+#: stabs.c:5136
 #, c-format
 msgid "Unexpected type in v3 arglist demangling\n"
 msgstr "Type inattendu dans la arglist v3 en démutilation\n"
 
-#: stabs.c:5234
+#: stabs.c:5203
 #, c-format
 msgid "Unrecognized demangle component %d\n"
 msgstr "Composant de démutilation non reconnu %d\n"
 
-#: stabs.c:5286
+#: stabs.c:5255
 #, c-format
 msgid "Failed to print demangled template\n"
 msgstr "Échec d'affichage du modèle de démutilation\n"
 
-#: stabs.c:5366
+#: stabs.c:5335
 #, c-format
 msgid "Couldn't get demangled builtin type\n"
 msgstr "N'a pu obtenir le type de démutilation construit\n"
 
-#: stabs.c:5415
+#: stabs.c:5384
 #, c-format
 msgid "Unexpected demangled varargs\n"
 msgstr "Varargs inattendu de démutilation\n"
 
-#: stabs.c:5422
+#: stabs.c:5391
 #, c-format
 msgid "Unrecognized demangled builtin type\n"
 msgstr "type de construit de démutilation non reconnu\n"
@@ -7966,12 +7050,12 @@ msgstr "argument en valeur entière invalide %s"
 msgid "invalid minimum string length %d"
 msgstr "longueur minimum de chaîne %d invalide"
 
-#: strings.c:651
+#: strings.c:647
 #, c-format
 msgid " Display printable strings in [file(s)] (stdin by default)\n"
 msgstr "Afficher les chaîne imprimables des [fichier] (stdin par défaut)\n"
 
-#: strings.c:652
+#: strings.c:648
 #, c-format
 msgid ""
 " The options are:\n"
@@ -8026,8 +7110,8 @@ msgstr "ne peut ouvrir le fichier d'entrée %s"
 
 #: version.c:36
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: version.c:37
 #, c-format
@@ -8042,8 +7126,8 @@ msgstr ""
 
 #: windmc.c:190
 #, c-format
-msgid "can't create %s file `%s' for output.\n"
-msgstr "ne peut créer le fichier « %s » « %s » pour la sortie.\n"
+msgid "can't create %s file ,%s' for output.\n"
+msgstr "ne peut créer le fichier %s «%s» pour la sortie.\n"
 
 #: windmc.c:198
 #, c-format
@@ -8061,7 +7145,7 @@ msgid ""
 "  -C --codepage_in=<val>       Set codepage when reading mc text file\n"
 "  -d --decimal_values          Print values to text files decimal\n"
 "  -e --extension=<extension>   Set header extension used on export header file\n"
-"  -F --target <target>         Specify output target for endianness.\n"
+"  -F --target <target>         Specify output target for endianess.\n"
 "  -h --headerdir=<directory>   Set the export directory for headers\n"
 "  -u --unicode_in              Read input file as UTF16 file\n"
 "  -U --unicode_out             Write binary messages as UFT16\n"
@@ -8111,8 +7195,8 @@ msgstr "%s: AVERTISSEMENT: "
 
 #: windmc.c:262
 #, c-format
-msgid "A codepage was specified switch `%s' and UTF16.\n"
-msgstr "Un codepage a été spécifié inverse « %s » et UTF16.\n"
+msgid "A codepage was specified switch ,%s' and UTF16.\n"
+msgstr "Un codepage a été spécifié inverse «%s» et UTF16.\n"
 
 #: windmc.c:263
 #, c-format
@@ -8125,8 +7209,8 @@ msgstr "tentative d'ajouter un mauvais langage."
 
 #: windmc.c:1116
 #, c-format
-msgid "unable to open file `%s' for input.\n"
-msgstr "impossible d'ouvrir le fichier « %s » en entrée.\n"
+msgid "unable to open file ,%s' for input.\n"
+msgstr "incapable d'ouvrir le fichier d'entrée «%s».\n"
 
 #: windmc.c:1124
 #, c-format
@@ -8188,7 +7272,6 @@ msgid ""
 "  -O --output-format=<format>  Specify output format\n"
 "  -F --target=<target>         Specify COFF target\n"
 "     --preprocessor=<program>  Program to use to preprocess rc file\n"
-"     --preprocessor-arg=<arg>  Additional preprocessor argument\n"
 "  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n"
 "  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n"
@@ -8206,23 +7289,21 @@ msgstr ""
 "  -O --output-format=<format>   spécifier le format de sortie\n"
 "  -F --target=<cible>           spécifier la cible COFF\n"
 "     --preprocessor=<programme> programme à utiliser pour pré-traiter le fichier rc\n"
-"     --preprocessor-arg=<arg>   argument supplémentaire à passer au pré processeur\n"
 "  -I --include-dir=<répertoire> inclure le répertoire lors du pré-traitement du fichier rc\n"
 "  -D --define SYM[=<val>]       définir le symbole lors du pré-traitement du fichier rc\n"
-"  -U --undefine <sym>           annuler le symbole lors du pré-traitement du fichier rc\n"
+"  -U --undefine <sym>           annuller le symbole lors du pré-traitement du fichier rc\n"
 "  -v --verbose                  utiliser le mode bavard\n"
-"  -c --codepage=<codepage>      indique le code de page par défaut\n"
 "  -l --language=<val>           initialiser le langage lors de la lecture du fichier rc\n"
 "     --use-temp-file            utiliser un fichier temporaire au lieu de la lecture via\n"
 "                                popen de la sortie du pré-processeur\n"
 "     --no-use-temp-file         utiliser popen (par défaut)\n"
 
-#: windres.c:679
+#: windres.c:678
 #, c-format
 msgid "     --yydebug                 Turn on parser debugging\n"
 msgstr "     --yydebug                 activer le mode de débug de l'analyseur syntaxique\n"
 
-#: windres.c:682
+#: windres.c:681
 #, c-format
 msgid ""
 "  -r                           Ignored for compatibility with rc\n"
@@ -8236,7 +7317,7 @@ msgstr ""
 "   -h --help                 afficher l'aide-mémoire\n"
 "   -V --version              afficher le nom et la version du logiciel\n"
 
-#: windres.c:687
+#: windres.c:686
 #, c-format
 msgid ""
 "FORMAT is one of rc, res, or coff, and is deduced from the file name\n"
@@ -8248,149 +7329,38 @@ msgstr ""
 "L'entrée par défaut se fait à partir de stdin, par défaut pour rc.\n"
 "La sortie par défaut est stdout, par défaut pour rc.\n"
 
-#: windres.c:850
+#: windres.c:847
 msgid "invalid codepage specified.\n"
 msgstr "mauvais codepage spécifié.\n"
 
-#: windres.c:865
+#: windres.c:862
 msgid "invalid option -f\n"
 msgstr "option invalide -f\n"
 
-#: windres.c:870
+#: windres.c:867
 msgid "No filename following the -fo option.\n"
 msgstr "Pas de nom de fichier après l'option -fo.\n"
 
-#: windres.c:959
+#: windres.c:938
 #, c-format
 msgid "Option -I is deprecated for setting the input format, please use -J instead.\n"
 msgstr "L'option -I est dépréciée pour fixer le format d'entrée, svp utiliser -J à la place.\n"
 
-#: windres.c:1072
+#: windres.c:1051
 msgid "no resources"
 msgstr "aucune ressource"
 
-#: wrstabs.c:354 wrstabs.c:1915
+#: wrstabs.c:353 wrstabs.c:1916
 #, c-format
 msgid "string_hash_lookup failed: %s"
 msgstr "échec de string_hash_lookup: %s"
 
-#: wrstabs.c:637
+#: wrstabs.c:636
 #, c-format
 msgid "stab_int_type: bad size %u"
 msgstr "stab_int_type: mauvaise taille %u"
 
-#: wrstabs.c:1393
+#: wrstabs.c:1394
 #, c-format
 msgid "%s: warning: unknown size for field `%s' in struct"
 msgstr "%s: AVERTISSEMENT: taille inconnue pour le champ « %s » dans le struct"
-
-#~ msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
-#~ msgstr "Usage: %s [options d'émulation] [--plugin <nom>] [-]{dmpqrstx}[abcfilNoPsSuvV] [nom-du-membre] [compteur] fichier-archive fichier...\n"
-
-#~ msgid "illegal option -- %c"
-#~ msgstr "option illégale -- %c"
-
-#~ msgid ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-
-#~ msgid "Usage: %s < input_file > output_file\n"
-#~ msgstr "Usage: %s <fichier-d-entrée> fichier-de-sortie\n"
-
-#~ msgid "Prints bytes from stdin in hex format.\n"
-#~ msgstr "Affiche les octets de stdin sous forme hexadécimale.\n"
-
-#~ msgid "   %d\t"
-#~ msgstr "   %d\t"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "  %d\t"
-#~ msgstr "  %d\t"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "./%s:[++]\n"
-#~ msgstr ""
-#~ "\n"
-#~ "./%s:[++]\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "%s/%s:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s/%s:\n"
-
-#~ msgid "%-35s  %11d  %#18lx\n"
-#~ msgstr "%-35s  %11d  %#18lx\n"
-
-#~ msgid "%-35s  %11d  %#18lx[%d]\n"
-#~ msgstr "%-35s  %11d  %#18lx[%d]\n"
-
-#~ msgid "%s  %11d  %#18lx\n"
-#~ msgstr "%s  %11d  %#18lx\n"
-
-#~ msgid "%s  %11d  %#18lx[%d]\n"
-#~ msgstr "%s  %11d  %#18lx[%d]\n"
-
-#~ msgid "   %ld      %s    [%s]\n"
-#~ msgstr "   %ld      %s    [%s]\n"
-
-#~ msgid "    %-18s %s\n"
-#~ msgstr "    %-18s %s\n"
-
-#~ msgid "Location lists in .debug_info section aren't in ascending order!\n"
-#~ msgstr "Liste de localisation dans la ssection .debug_info ne sont pas en ordre ascendant!\n"
-
-#~ msgid "target `%s' ignored."
-#~ msgstr "cible «%s» ignorée."
-
-#~ msgid "  Pg"
-#~ msgstr "  Pg"
-
-#~ msgid " (%ld)"
-#~ msgstr " (%ld)"
-
-#~ msgid "0x%02x "
-#~ msgstr "0x%02x "
-
-#~ msgid "  [reserved compact index %d]\n"
-#~ msgstr "  [index compact réservé %d]\n"
-
-#~ msgid "     vsp = vsp - %d"
-#~ msgstr "     vsp = vsp - %d"
-
-#~ msgid "     vsp = r%d"
-#~ msgstr "     vsp = r%d"
-
-#~ msgid "[unsupported two-byte opcode]"
-#~ msgstr "[opcode sur deux octets non supporté]"
-
-#~ msgid "  %*s %10s %*s\n"
-#~ msgstr "  %*s %10s %*s\n"
-
-#~ msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "  %*s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "%s %s: %s"
-#~ msgstr "%s %s: %s"
-
-#~ msgid "%s:%d: %s\n"
-#~ msgstr "%s:%d: %s\n"
diff --git a/binutils/po/ja.po b/binutils/po/ja.po
index 74a1bd733d..6de19a1e3e 100644
--- a/binutils/po/ja.po
+++ b/binutils/po/ja.po
@@ -5,10 +5,10 @@
 # Yasuaki Taniguchi <yasuakit@gmail.com>, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: binutils 2.21.53\n"
+"Project-Id-Version: binutils 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2011-10-19 22:45+0900\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2011-08-28 14:39+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: addr2line.c:81
+#: addr2line.c:80
 #, c-format
 msgid "Usage: %s [option(s)] [addr(s)]\n"
 msgstr "使用法: %s [option(s)] [addr(s)]\n"
 
-#: addr2line.c:82
+#: addr2line.c:81
 #, c-format
 msgid " Convert addresses into line number/file name pairs.\n"
 msgstr "アドレスを行番�/ファイル��組�変����。\n"
 
-#: addr2line.c:83
+#: addr2line.c:82
 #, c-format
 msgid " If no addresses are specified on the command line, they will be read from stdin\n"
 msgstr "コマンドライン�アドレス�指定�れ��場��標準入力�ら読��り��\n"
 
-#: addr2line.c:84
+#: addr2line.c:83
 #, c-format
 msgid ""
 " The options are:\n"
@@ -63,217 +63,212 @@ msgstr ""
 "  -v --version           プログラム��ージョンを表示�る\n"
 "\n"
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
-#: windmc.c:228 windres.c:695
+#: addr2line.c:100 ar.c:293 coffdump.c:469 dlltool.c:3926 dllwrap.c:524
+#: elfedit.c:1155 nlmconv.c:1113 objcopy.c:576 objcopy.c:611 readelf.c:3219
+#: size.c:99 srconv.c:1742 strings.c:663 sysdump.c:653 windmc.c:228
+#: windres.c:694
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 "�グを発見��ら <%s> �報告��下��。\n"
 "翻訳�関�る�グ�<translation-team-ja@lists.sourceforge.net>�報告������。\n"
 
-#: addr2line.c:271
+#: addr2line.c:262
 #, c-format
 msgid " at "
 msgstr ""
 
-#: addr2line.c:296
+#: addr2line.c:287
 #, c-format
 msgid " (inlined by) "
 msgstr ""
 
-#: addr2line.c:329
+#: addr2line.c:320
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr "%s: アーカイブ�らアドレスを�得����ん"
 
-#: addr2line.c:346
+#: addr2line.c:337
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr "%s: セクション %s �見��り��ん"
 
-#: addr2line.c:415 nm.c:1566 objdump.c:3423
+#: addr2line.c:406 nm.c:1563 objdump.c:3301
 #, c-format
 msgid "unknown demangling style `%s'"
 msgstr "��復元 (demangle) �方� `%s' ��明��"
 
-#: ar.c:238
+#: ar.c:215
 #, c-format
 msgid "no entry %s in archive\n"
 msgstr "エントリ %s �書庫中��り��ん\n"
 
-#: ar.c:254
+#: ar.c:233
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
-msgstr "使用法: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
+msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "使用法: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
 
-#: ar.c:260
+#: ar.c:235
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
-msgstr "使用法: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
+msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
+msgstr "使用法: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
 
-#: ar.c:266
+#: ar.c:240
 #, c-format
 msgid "       %s -M [<mri-script]\n"
 msgstr "       %s -M [<mri-script]\n"
 
-#: ar.c:267
+#: ar.c:241
 #, c-format
 msgid " commands:\n"
 msgstr " コマンド:\n"
 
-#: ar.c:268
+#: ar.c:242
 #, c-format
 msgid "  d            - delete file(s) from the archive\n"
 msgstr "  d            - 書庫�らファイルを削除�る\n"
 
-#: ar.c:269
+#: ar.c:243
 #, c-format
 msgid "  m[ab]        - move file(s) in the archive\n"
 msgstr "  m[ab]        - 書庫内�ファイルを移動�る\n"
 
-#: ar.c:270
+#: ar.c:244
 #, c-format
 msgid "  p            - print file(s) found in the archive\n"
 msgstr "  p            - 書庫内�ファイルを表示�る\n"
 
-#: ar.c:271
+#: ar.c:245
 #, c-format
 msgid "  q[f]         - quick append file(s) to the archive\n"
 msgstr "  q[f]         - 書庫�ファイルを素早�追加�る\n"
 
-#: ar.c:272
+#: ar.c:246
 #, c-format
 msgid "  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"
 msgstr "  r[ab][f][u]  - 書庫内�既存ファイルを置��る。存在���場��新��ファイルを挿入�る\n"
 
-#: ar.c:273
+#: ar.c:247
 #, c-format
 msgid "  s            - act as ranlib\n"
 msgstr "  s            - ranlib ���動作�る\n"
 
-#: ar.c:274
+#: ar.c:248
 #, c-format
 msgid "  t            - display contents of archive\n"
 msgstr "  t            - 書庫�内容を表示�る\n"
 
-#: ar.c:275
+#: ar.c:249
 #, c-format
 msgid "  x[o]         - extract file(s) from the archive\n"
 msgstr "  x[o]         - 書庫�らファイルを抽出�る\n"
 
-#: ar.c:276
+#: ar.c:250
 #, c-format
 msgid " command specific modifiers:\n"
 msgstr " コマンド�関係��修飾�:\n"
 
-#: ar.c:277
+#: ar.c:251
 #, c-format
 msgid "  [a]          - put file(s) after [member-name]\n"
 msgstr "  [a]          - [member-name] �後�ファイルを�置�る\n"
 
-#: ar.c:278
+#: ar.c:252
 #, c-format
 msgid "  [b]          - put file(s) before [member-name] (same as [i])\n"
 msgstr "  [b]          - [member-name] ���ファイルを�置�る ([i] ���)\n"
 
-#: ar.c:279
+#: ar.c:253
 #, c-format
 msgid "  [D]          - use zero for timestamps and uids/gids\n"
 msgstr "  [D]          - 日時�uid�gid � 0 (ゼロ) を使用�る\n"
 
-#: ar.c:280
+#: ar.c:254
 #, c-format
 msgid "  [N]          - use instance [count] of name\n"
 msgstr "  [N]          - ��インスタンス� [count] 番目�も�を使�\n"
 
-#: ar.c:281
+#: ar.c:255
 #, c-format
 msgid "  [f]          - truncate inserted file names\n"
 msgstr "  [f]          - 挿入�れ�ファイル�を切り詰�る\n"
 
-#: ar.c:282
+#: ar.c:256
 #, c-format
 msgid "  [P]          - use full path names when matching\n"
 msgstr "  [P]          - ���一致を調�る際�完全パスを使�\n"
 
-#: ar.c:283
+#: ar.c:257
 #, c-format
 msgid "  [o]          - preserve original dates\n"
 msgstr "  [o]          - 本��日時を���る\n"
 
-#: ar.c:284
+#: ar.c:258
 #, c-format
 msgid "  [u]          - only replace files that are newer than current archive contents\n"
 msgstr "  [u]          - �在�書庫�入���るも�より新��ファイル��を置��る\n"
 
-#: ar.c:285
+#: ar.c:259
 #, c-format
 msgid " generic modifiers:\n"
 msgstr " 一般的�修飾�:\n"
 
-#: ar.c:286
+#: ar.c:260
 #, c-format
 msgid "  [c]          - do not warn if the library had to be created\n"
 msgstr "  [c]          - ライブラリファイルを作��る必���る���も警告���\n"
 
-#: ar.c:287
+#: ar.c:261
 #, c-format
 msgid "  [s]          - create an archive index (cf. ranlib)\n"
 msgstr "  [s]          - 書庫�索引を作��る (ranlib を�照)\n"
 
-#: ar.c:288
+#: ar.c:262
 #, c-format
 msgid "  [S]          - do not build a symbol table\n"
-msgstr "  [S]          - シンボル表を構築���\n"
+msgstr "  [S]          - シンボルテーブルを構築���\n"
 
-#: ar.c:289
+#: ar.c:263
 #, c-format
 msgid "  [T]          - make a thin archive\n"
 msgstr "  [T]          - 薄�書庫を作��る\n"
 
-#: ar.c:290
+#: ar.c:264
 #, c-format
 msgid "  [v]          - be verbose\n"
 msgstr "  [v]          - 冗長�表示を行�\n"
 
-#: ar.c:291
+#: ar.c:265
 #, c-format
 msgid "  [V]          - display the version number\n"
 msgstr "  [V]          - �ージョン情報を表示�る\n"
 
-#: ar.c:292
+#: ar.c:266
 #, c-format
 msgid "  @<file>      - read options from <file>\n"
 msgstr "  @<file>      -  <file> �らオプションを読�込む\n"
 
-#: ar.c:293
-#, c-format
-msgid "  --target=BFDNAME - specify the target object format as BFDNAME\n"
-msgstr "  --target=BFDNAME - ターゲット�オブジェクト形�を BFDNAME ���指定�る\n"
-
-#: ar.c:295
+#: ar.c:268
 #, c-format
 msgid " optional:\n"
 msgstr " 任�指定:\n"
 
-#: ar.c:296
+#: ar.c:269
 #, c-format
 msgid "  --plugin <p> - load the specified plugin\n"
 msgstr "  --plugin <p> - 指定��プラグインを読�込む\n"
 
-#: ar.c:317
+#: ar.c:276
 #, c-format
 msgid "Usage: %s [options] archive\n"
 msgstr "使用法: %s [options] archive\n"
 
-#: ar.c:318
+#: ar.c:277
 #, c-format
 msgid " Generate an index to speed access to archives\n"
 msgstr " アクセス速度を�上��る���書庫�索引を生����\n"
 
-#: ar.c:319
+#: ar.c:278
 #, c-format
 msgid ""
 " The options are:\n"
@@ -282,12 +277,12 @@ msgstr ""
 " オプション�以下�通り��:\n"
 "  @<file>                      <file> �らオプションを読�込む\n"
 
-#: ar.c:322
+#: ar.c:281
 #, c-format
 msgid "  --plugin <name>              Load the specified plugin\n"
 msgstr "  --plugin <name>              指定��プラグインを読�込む\n"
 
-#: ar.c:325
+#: ar.c:284
 #, c-format
 msgid ""
 "  -t                           Update the archive's symbol map timestamp\n"
@@ -298,70 +293,86 @@ msgstr ""
 "  -h --help                    ��ヘルプメッセージを表示�る\n"
 "  -v --version                 �ージョン情報を表示�る\n"
 
-#: ar.c:449
+#: ar.c:481 nm.c:1636
+#, c-format
+msgid "sorry - this program has been built without plugin support\n"
+msgstr "��プログラム�プラグインサ�ート���作��れ����\n"
+
+#: ar.c:508
 msgid "two different operation options specified"
 msgstr "二��異����作オプション�指定�れ���"
 
-#: ar.c:538 nm.c:1639
+#: ar.c:589
 #, c-format
-msgid "sorry - this program has been built without plugin support\n"
-msgstr "��プログラム�プラグインサ�ート���作��れ����\n"
+msgid "illegal option -- %c"
+msgstr "�正�オプション�� -- %c"
 
-#: ar.c:693
+#: ar.c:632
 msgid "no operation specified"
 msgstr "�作�指定�れ����ん"
 
-#: ar.c:696
+#: ar.c:635
 msgid "`u' is only meaningful with the `r' option."
 msgstr "`u' � `r' オプション�併��使用�������味��り��。"
 
-#: ar.c:699
+#: ar.c:638
 msgid "`u' is not meaningful with the `D' option."
 msgstr "`u' � `D' オプション�併��使用��も�味��り��ん。"
 
-#: ar.c:707
+#: ar.c:646
 msgid "`N' is only meaningful with the `x' and `d' options."
 msgstr "`N' � `x' �よ� `d' オプション�併��使用�������味��り��。"
 
-#: ar.c:710
+#: ar.c:649
 msgid "Value for `N' must be positive."
 msgstr "`N' �値�正���れ�����ん。"
 
-#: ar.c:724
+#: ar.c:661
 msgid "`x' cannot be used on thin archives."
 msgstr "薄�書庫�対�� `x' を使用����ん。"
 
-#: ar.c:765
+#: ar.c:702
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr "内部エラー -- ��オプション�実装�れ����ん"
 
-#: ar.c:834
+#: ar.c:771
 #, c-format
 msgid "creating %s"
 msgstr "%s を作������"
 
-#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
+#: ar.c:820 ar.c:875 ar.c:1203 objcopy.c:2052
 #, c-format
 msgid "internal stat error on %s"
 msgstr "内部状態エラー� %s �発生����"
 
-#: ar.c:902 ar.c:970
+#: ar.c:824
+#, c-format
+msgid ""
+"\n"
+"<%s>\n"
+"\n"
+msgstr ""
+"\n"
+"<%s>\n"
+"\n"
+
+#: ar.c:840 ar.c:908
 #, c-format
 msgid "%s is not a valid archive"
 msgstr "%s �有効�書庫���り��ん"
 
-#: ar.c:1171
+#: ar.c:1108
 #, c-format
 msgid "No member named `%s'\n"
 msgstr "`%s' ������メン���り��ん\n"
 
-#: ar.c:1221
+#: ar.c:1158
 #, c-format
 msgid "no entry %s in archive %s!"
 msgstr "項目 %s �書庫 %s �存在���ん!"
 
-#: ar.c:1360
+#: ar.c:1297
 #, c-format
 msgid "%s: no archive map to update"
 msgstr "%s: 更新���書庫�マップ��り��ん"
@@ -421,13 +432,23 @@ msgstr "�在開�れ��る書庫� %s ��\n"
 msgid "%s: no open archive\n"
 msgstr "%s: 開���る書庫��り��ん\n"
 
-#: binemul.c:39
+#: bin2c.c:59
+#, c-format
+msgid "Usage: %s < input_file > output_file\n"
+msgstr "使用法: %s < input_file > output_file\n"
+
+#: bin2c.c:60
+#, c-format
+msgid "Prints bytes from stdin in hex format.\n"
+msgstr "標準入力�ら読�込ん��イトを�六進数�表示���。\n"
+
+#: binemul.c:38
 #, c-format
 msgid "  No emulation specific options\n"
 msgstr "  エミュレーション�関係��オプション��り��ん\n"
 
 #. Macros for common output.
-#: binemul.h:49
+#: binemul.h:46
 #, c-format
 msgid " emulation options: \n"
 msgstr " エミュレーション�関係��オプション: \n"
@@ -467,47 +488,42 @@ msgstr "%s: サ�ート�れ��るアーキテク�ャ:"
 msgid "BFD header file version %s\n"
 msgstr "BFD ヘッダファイル�ージョン %s\n"
 
-#: bucomm.c:559
+#: bucomm.c:556
 #, c-format
 msgid "%s: bad number: %s"
 msgstr "%s: 誤��番���: %s"
 
-#: bucomm.c:576 strings.c:409
+#: bucomm.c:573 strings.c:409
 #, c-format
 msgid "'%s': No such file"
 msgstr "'%s': ��よ��ファイル��り��ん"
 
-#: bucomm.c:578 strings.c:411
+#: bucomm.c:575 strings.c:411
 #, c-format
 msgid "Warning: could not locate '%s'.  reason: %s"
 msgstr "警告: '%s' を�置����ん。  �由: %s"
 
-#: bucomm.c:582
+#: bucomm.c:579
 #, c-format
 msgid "Warning: '%s' is not an ordinary file"
 msgstr "警告: '%s' �正常�ファイル���り��ん"
 
-#: bucomm.c:584
-#, c-format
-msgid "Warning: '%s' has negative size, probably it is too large"
-msgstr "警告: '%s' �負�サイズ��。��ら�大�����"
-
-#: coffdump.c:107
+#: coffdump.c:106
 #, c-format
 msgid "#lines %d "
 msgstr "#行 %d "
 
-#: coffdump.c:461 sysdump.c:646
+#: coffdump.c:460 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr "使用法: %s [option(s)] in-file\n"
 
-#: coffdump.c:462
+#: coffdump.c:461
 #, c-format
-msgid " Print a human readable interpretation of a COFF object file\n"
-msgstr "COFF オブジェクトファイルを解釈�人間�読�や��形��表示���。\n"
+msgid " Print a human readable interpretation of a SYSROFF object file\n"
+msgstr "SYSROFF オブジェクトファイル�解釈�人間�読�や��形��表示���\n"
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid ""
 " The options are:\n"
@@ -522,550 +538,550 @@ msgstr ""
 "  -v --version           プログラム��ージョンを表示�る\n"
 "\n"
 
-#: coffdump.c:532 srconv.c:1833 sysdump.c:710
+#: coffdump.c:531 srconv.c:1832 sysdump.c:710
 msgid "no input file specified"
 msgstr "入力ファイル�指定�れ����ん"
 
-#: cxxfilt.c:119 nm.c:269 objdump.c:281
+#: cxxfilt.c:119 nm.c:269 objdump.c:256
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "�グを発見��ら <%s> �報告��下��。\n"
 "翻訳�関�る�グ�<translation-team-ja@lists.sourceforge.net>�報告������。\n"
 
-#: debug.c:648
+#: debug.c:647
 msgid "debug_add_to_current_namespace: no current file"
 msgstr "debug_add_to_current_namespace: �在�ファイル��り��ん"
 
-#: debug.c:727
+#: debug.c:726
 msgid "debug_start_source: no debug_set_filename call"
 msgstr "debug_start_source: debug_set_filename 呼�出���り��ん"
 
-#: debug.c:781
+#: debug.c:782
 msgid "debug_record_function: no debug_set_filename call"
 msgstr "debug_record_function: debug_set_filename 呼�出���り��ん"
 
-#: debug.c:833
+#: debug.c:834
 msgid "debug_record_parameter: no current function"
 msgstr "debug_record_parameter: �在�関数��り��ん"
 
-#: debug.c:865
+#: debug.c:866
 msgid "debug_end_function: no current function"
 msgstr "debug_end_function: �在�関数��り��ん"
 
-#: debug.c:871
+#: debug.c:872
 msgid "debug_end_function: some blocks were not closed"
 msgstr "debug_end_function: 閉�られ����ブロック��り��"
 
-#: debug.c:899
+#: debug.c:900
 msgid "debug_start_block: no current block"
 msgstr "debug_start_block: �在�ブロック��り��ん"
 
-#: debug.c:935
+#: debug.c:936
 msgid "debug_end_block: no current block"
 msgstr "debug_end_block: �在�ブロック��り��ん"
 
-#: debug.c:942
+#: debug.c:943
 msgid "debug_end_block: attempt to close top level block"
 msgstr "debug_end_block: トップレベルブロックを閉�よ������"
 
-#: debug.c:965
+#: debug.c:966
 msgid "debug_record_line: no current unit"
 msgstr "debug_record_line: �在�����り��ん"
 
 #. FIXME
-#: debug.c:1018
+#: debug.c:1019
 msgid "debug_start_common_block: not implemented"
 msgstr "debug_start_common_block: 実装�れ����ん"
 
 #. FIXME
-#: debug.c:1029
+#: debug.c:1030
 msgid "debug_end_common_block: not implemented"
 msgstr "debug_end_common_block: 実装�れ����ん"
 
 #. FIXME.
-#: debug.c:1113
+#: debug.c:1114
 msgid "debug_record_label: not implemented"
 msgstr "debug_record_label: 実装�れ����ん"
 
-#: debug.c:1135
+#: debug.c:1136
 msgid "debug_record_variable: no current file"
 msgstr "debug_record_variable: �在�ファイル��り��ん"
 
-#: debug.c:1663
+#: debug.c:1664
 msgid "debug_make_undefined_type: unsupported kind"
 msgstr "debug_make_undefined_type: サ�ート�れ����種類��"
 
-#: debug.c:1840
+#: debug.c:1841
 msgid "debug_name_type: no current file"
 msgstr "debug_name_type: �在�ファイル��り��ん"
 
-#: debug.c:1885
+#: debug.c:1886
 msgid "debug_tag_type: no current file"
 msgstr "debug_tag_type: �在�ファイル��り��ん"
 
-#: debug.c:1893
+#: debug.c:1894
 msgid "debug_tag_type: extra tag attempted"
 msgstr "debug_tag_type: 余分�タグ�試�れ���"
 
-#: debug.c:1930
+#: debug.c:1931
 #, c-format
 msgid "Warning: changing type size from %d to %d\n"
 msgstr "警告: 型�サイズを %d �ら %d �変更���\n"
 
-#: debug.c:1952
+#: debug.c:1953
 msgid "debug_find_named_type: no current compilation unit"
 msgstr "debug_find_named_type: �在�コンパイル����り��ん"
 
-#: debug.c:2055
+#: debug.c:2056
 #, c-format
 msgid "debug_get_real_type: circular debug information for %s\n"
 msgstr "debug_get_real_type: %s �デ�ッグ情報�循環�����\n"
 
-#: debug.c:2482
+#: debug.c:2483
 msgid "debug_write_type: illegal type encountered"
 msgstr "debug_write_type: �正�型�������"
 
-#: dlltool.c:902 dlltool.c:928 dlltool.c:959
+#: dlltool.c:901 dlltool.c:927 dlltool.c:958
 #, c-format
 msgid "Internal error: Unknown machine type: %d"
 msgstr "内部エラー: �明�マシン型��: %d"
 
-#: dlltool.c:1000
+#: dlltool.c:999
 #, c-format
 msgid "Can't open def file: %s"
 msgstr "定義ファイルを開���ん: %s"
 
-#: dlltool.c:1005
+#: dlltool.c:1004
 #, c-format
 msgid "Processing def file: %s"
 msgstr "定義ファイルを処������: %s"
 
-#: dlltool.c:1009
+#: dlltool.c:1008
 msgid "Processed def file"
 msgstr "定義ファイルを処�����"
 
-#: dlltool.c:1033
+#: dlltool.c:1032
 #, c-format
 msgid "Syntax error in def file %s:%d"
 msgstr "定義ファイル %s �構文エラー�発生����:%d"
 
-#: dlltool.c:1070
+#: dlltool.c:1069
 #, c-format
 msgid "%s: Path components stripped from image name, '%s'."
 msgstr "%s: イメージ� '%s' �らパス��素��り除�れ���。"
 
-#: dlltool.c:1088
+#: dlltool.c:1087
 #, c-format
 msgid "NAME: %s base: %x"
 msgstr "NAME: %s ベース: %x"
 
-#: dlltool.c:1091 dlltool.c:1112
+#: dlltool.c:1090 dlltool.c:1106
 msgid "Can't have LIBRARY and NAME"
 msgstr "LIBRARY や NAME を����ん"
 
-#: dlltool.c:1109
+#: dlltool.c:1103
 #, c-format
 msgid "LIBRARY: %s base: %x"
 msgstr "LIBRARY: %s ベース: %x"
 
-#: dlltool.c:1354 resrc.c:293
+#: dlltool.c:1342 resrc.c:293
 #, c-format
 msgid "wait: %s"
 msgstr "wait: %s"
 
-#: dlltool.c:1359 dllwrap.c:422 resrc.c:298
+#: dlltool.c:1347 dllwrap.c:422 resrc.c:298
 #, c-format
 msgid "subprocess got fatal signal %d"
 msgstr "�プロセス�致命的�シグナルを %d ���り���"
 
-#: dlltool.c:1365 dllwrap.c:429 resrc.c:305
+#: dlltool.c:1353 dllwrap.c:429 resrc.c:305
 #, c-format
 msgid "%s exited with status %d"
 msgstr "%s �ステータス %d �終了����"
 
-#: dlltool.c:1396
+#: dlltool.c:1384
 #, c-format
 msgid "Sucking in info from %s section in %s"
 msgstr "%2$s 内� %1$s セクション�ら情報を�り込ん����"
 
-#: dlltool.c:1536
+#: dlltool.c:1524
 #, c-format
 msgid "Excluding symbol: %s"
 msgstr "シンボルを除外�����: %s"
 
-#: dlltool.c:1625 dlltool.c:1636 nm.c:1012 nm.c:1023
+#: dlltool.c:1613 dlltool.c:1624 nm.c:1010 nm.c:1021
 #, c-format
 msgid "%s: no symbols"
 msgstr "%s: シンボル��り��ん"
 
 #. FIXME: we ought to read in and block out the base relocations.
-#: dlltool.c:1662
+#: dlltool.c:1650
 #, c-format
 msgid "Done reading %s"
 msgstr "%s �読�り�完了����"
 
-#: dlltool.c:1672
+#: dlltool.c:1660
 #, c-format
 msgid "Unable to open object file: %s: %s"
 msgstr "オブジェクトファイルを開���ん: %s: %s"
 
-#: dlltool.c:1675
+#: dlltool.c:1663
 #, c-format
 msgid "Scanning object file %s"
 msgstr "オブジェクトファイル %s を走査�����"
 
-#: dlltool.c:1690
+#: dlltool.c:1678
 #, c-format
 msgid "Cannot produce mcore-elf dll from archive file: %s"
 msgstr "書庫ファイル�ら mcore-elf dll を生�����ん: %s"
 
-#: dlltool.c:1792
+#: dlltool.c:1780
 msgid "Adding exports to output file"
 msgstr "出力ファイル�エクス�ートを追加�����"
 
-#: dlltool.c:1844
+#: dlltool.c:1832
 msgid "Added exports to output file"
 msgstr "出力ファイル�エクス�ートを追加����"
 
-#: dlltool.c:1986
+#: dlltool.c:1974
 #, c-format
 msgid "Generating export file: %s"
 msgstr "エクス�ートファイルを生����: %s"
 
-#: dlltool.c:1991
+#: dlltool.c:1979
 #, c-format
 msgid "Unable to open temporary assembler file: %s"
 msgstr "一時アセンブリファイルを開���ん: %s"
 
-#: dlltool.c:1994
+#: dlltool.c:1982
 #, c-format
 msgid "Opened temporary file: %s"
 msgstr "一時ファイルを開����: %s"
 
-#: dlltool.c:2171
+#: dlltool.c:2159
 msgid "failed to read the number of entries from base file"
 msgstr "ベースファイル�ら項目数を読�込む��失敗����"
 
-#: dlltool.c:2219
+#: dlltool.c:2207
 msgid "Generated exports file"
 msgstr "エクス�ートファイルを生�����"
 
-#: dlltool.c:2428
+#: dlltool.c:2416
 #, c-format
 msgid "bfd_open failed open stub file: %s: %s"
 msgstr "bfd_open �スタブファイルを開���ん���: %s: %s"
 
-#: dlltool.c:2432
+#: dlltool.c:2420
 #, c-format
 msgid "Creating stub file: %s"
 msgstr "スタブファイルを作������: %s"
 
-#: dlltool.c:2894
+#: dlltool.c:2882
 #, c-format
 msgid "bfd_open failed reopen stub file: %s: %s"
 msgstr "bfd_open �スタブファイルを開���ん���: %s: %s"
 
-#: dlltool.c:2908 dlltool.c:2984
+#: dlltool.c:2896 dlltool.c:2972
 #, c-format
 msgid "failed to open temporary head file: %s"
 msgstr "一時 head ファイルを開���ん: %s"
 
-#: dlltool.c:2970 dlltool.c:3050
+#: dlltool.c:2958 dlltool.c:3038
 #, c-format
 msgid "failed to open temporary head file: %s: %s"
 msgstr "一時 head ファイルを開���ん: %s: %s"
 
-#: dlltool.c:3064
+#: dlltool.c:3052
 #, c-format
 msgid "failed to open temporary tail file: %s"
 msgstr "一時 tail ファイルを開���ん: %s"
 
-#: dlltool.c:3121
+#: dlltool.c:3109
 #, c-format
 msgid "failed to open temporary tail file: %s: %s"
 msgstr "一時 tail ファイルを開���ん: %s: %s"
 
-#: dlltool.c:3143
+#: dlltool.c:3131
 #, c-format
 msgid "Can't create .lib file: %s: %s"
 msgstr ".lib ファイルを作�����ん: %s: %s"
 
-#: dlltool.c:3147
+#: dlltool.c:3135
 #, c-format
 msgid "Creating library file: %s"
 msgstr "ライブラリファイルを作������: %s"
 
-#: dlltool.c:3239 dlltool.c:3245
+#: dlltool.c:3227 dlltool.c:3233
 #, c-format
 msgid "cannot delete %s: %s"
 msgstr "%s を削除����ん: %s"
 
-#: dlltool.c:3250
+#: dlltool.c:3238
 msgid "Created lib file"
 msgstr "lib ファイルを作�����"
 
-#: dlltool.c:3462
+#: dlltool.c:3450
 #, c-format
 msgid "Can't open .lib file: %s: %s"
 msgstr ".lib ファイルを開���ん: %s: %s"
 
-#: dlltool.c:3470 dlltool.c:3492
+#: dlltool.c:3458 dlltool.c:3480
 #, c-format
 msgid "%s is not a library"
 msgstr "%s �ライブラリ���り��ん"
 
-#: dlltool.c:3510
+#: dlltool.c:3498
 #, c-format
 msgid "Import library `%s' specifies two or more dlls"
 msgstr "イン�ートライブラリ `%s' �2個以上� dll を指定�����"
 
-#: dlltool.c:3521
+#: dlltool.c:3509
 #, c-format
 msgid "Unable to determine dll name for `%s' (not an import library?)"
 msgstr "`%s' �対�る dll �を決定����ん (イン�ートライブラリ��無�?)"
 
-#: dlltool.c:3745
+#: dlltool.c:3733
 #, c-format
 msgid "Warning, ignoring duplicate EXPORT %s %d,%d"
 msgstr "警告��複�� EXPORT %s %d,%d を無視���"
 
-#: dlltool.c:3751
+#: dlltool.c:3739
 #, c-format
 msgid "Error, duplicate EXPORT with ordinals: %s"
 msgstr "エラー��数付� EXPORT ��複�����: %s"
 
-#: dlltool.c:3856
+#: dlltool.c:3844
 msgid "Processing definitions"
 msgstr "定義を処������"
 
-#: dlltool.c:3888
+#: dlltool.c:3876
 msgid "Processed definitions"
 msgstr "定義を処�����"
 
 #. xgetext:c-format
-#: dlltool.c:3895 dllwrap.c:483
+#: dlltool.c:3883 dllwrap.c:483
 #, c-format
 msgid "Usage %s <option(s)> <object-file(s)>\n"
 msgstr "使用法: %s <option(s)> <object-file(s)>\n"
 
 #. xgetext:c-format
-#: dlltool.c:3897
+#: dlltool.c:3885
 #, c-format
 msgid "   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"
 msgstr "   -m --machine <machine>    <machine> 用 DLL を作��る。  [default: %s]\n"
 
-#: dlltool.c:3898
+#: dlltool.c:3886
 #, c-format
 msgid "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 msgstr "        �能� <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 
-#: dlltool.c:3899
+#: dlltool.c:3887
 #, c-format
 msgid "   -e --output-exp <outname> Generate an export file.\n"
 msgstr "   -e --output-exp <outname> エクス�ートファイルを生��る\n"
 
-#: dlltool.c:3900
+#: dlltool.c:3888
 #, c-format
 msgid "   -l --output-lib <outname> Generate an interface library.\n"
 msgstr "   -l --output-lib <outname> インターフェースライブラリを生��る\n"
 
-#: dlltool.c:3901
+#: dlltool.c:3889
 #, c-format
 msgid "   -y --output-delaylib <outname> Create a delay-import library.\n"
 msgstr "   -y --output-delaylib <outname> �延イン�ートライブラリを生��る\n"
 
-#: dlltool.c:3902
+#: dlltool.c:3890
 #, c-format
 msgid "   -a --add-indirect         Add dll indirects to export file.\n"
 msgstr "   -a --add-indirect         エクス�ートファイル�間接 dll を追加�る\n"
 
-#: dlltool.c:3903
+#: dlltool.c:3891
 #, c-format
 msgid "   -D --dllname <name>       Name of input dll to put into interface lib.\n"
 msgstr "   -D --dllname <name>       インターフェースライブラリ�入れる入力 DLL ���\n"
 
-#: dlltool.c:3904
+#: dlltool.c:3892
 #, c-format
 msgid "   -d --input-def <deffile>  Name of .def file to be read in.\n"
 msgstr "   -d --input-def <deffile>  読�込�れる .def ファイル���\n"
 
-#: dlltool.c:3905
+#: dlltool.c:3893
 #, c-format
 msgid "   -z --output-def <deffile> Name of .def file to be created.\n"
 msgstr "   -z --output-def <deffile> 作��れる .def ファイル���\n"
 
-#: dlltool.c:3906
+#: dlltool.c:3894
 #, c-format
 msgid "      --export-all-symbols   Export all symbols to .def\n"
 msgstr "      --export-all-symbols   .def �全��シンボルをエクス�ート�る\n"
 
-#: dlltool.c:3907
+#: dlltool.c:3895
 #, c-format
 msgid "      --no-export-all-symbols  Only export listed symbols\n"
 msgstr "      --no-export-all-symbols  リスト�れ�シンボル��をエクス�ート�る\n"
 
-#: dlltool.c:3908
+#: dlltool.c:3896
 #, c-format
 msgid "      --exclude-symbols <list> Don't export <list>\n"
 msgstr "      --exclude-symbols <list> <list> をエクス�ート���\n"
 
-#: dlltool.c:3909
+#: dlltool.c:3897
 #, c-format
 msgid "      --no-default-excludes  Clear default exclude symbols\n"
 msgstr "      --no-default-excludes  デフォルト�除外�れるシンボルを無��\n"
 
-#: dlltool.c:3910
+#: dlltool.c:3898
 #, c-format
 msgid "   -b --base-file <basefile> Read linker generated base file.\n"
 msgstr "   -b --base-file <basefile> リンカ�生���ベースファイルを読�込む\n"
 
-#: dlltool.c:3911
+#: dlltool.c:3899
 #, c-format
 msgid "   -x --no-idata4            Don't generate idata$4 section.\n"
 msgstr "   -x --no-idata4            idata$4 セクションを生����\n"
 
-#: dlltool.c:3912
+#: dlltool.c:3900
 #, c-format
 msgid "   -c --no-idata5            Don't generate idata$5 section.\n"
 msgstr "   -c --no-idata5            idata$5 セクションを生����\n"
 
-#: dlltool.c:3913
+#: dlltool.c:3901
 #, c-format
 msgid "      --use-nul-prefixed-import-tables Use zero prefixed idata$4 and idata$5.\n"
 msgstr "      --use-nul-prefixed-import-tables idata$4 �よ� idata$5 �接頭辞を付���\n"
 
-#: dlltool.c:3914
+#: dlltool.c:3902
 #, c-format
 msgid "   -U --add-underscore       Add underscores to all symbols in interface library.\n"
 msgstr "   -U --add-underscore       インターフェースライブラリ内�全��シンボル�下線 (_) を付�る\n"
 
-#: dlltool.c:3915
+#: dlltool.c:3903
 #, c-format
 msgid "      --add-stdcall-underscore Add underscores to stdcall symbols in interface library.\n"
 msgstr "      --add-stdcall-underscore インターフェースライブラリ内� stdcall シンボル�下線 (_) を付�る\n"
 
-#: dlltool.c:3916
+#: dlltool.c:3904
 #, c-format
 msgid "      --no-leading-underscore All symbols shouldn't be prefixed by an underscore.\n"
 msgstr "      --no-leading-underscore ����シンボル�先頭�下線 (_) �付�������る\n"
 
-#: dlltool.c:3917
+#: dlltool.c:3905
 #, c-format
 msgid "      --leading-underscore   All symbols should be prefixed by an underscore.\n"
 msgstr "      --leading-underscore   ����シンボル�先頭�下線 (_) �付���る��る\n"
 
-#: dlltool.c:3918
+#: dlltool.c:3906
 #, c-format
 msgid "   -k --kill-at              Kill @<n> from exported names.\n"
 msgstr "   -k --kill-at              エクス�ート�れ����ら @<n> を�り除�\n"
 
-#: dlltool.c:3919
+#: dlltool.c:3907
 #, c-format
 msgid "   -A --add-stdcall-alias    Add aliases without @<n>.\n"
 msgstr "   -A --add-stdcall-alias    @<n> 無��エイリアスを追加�る\n"
 
-#: dlltool.c:3920
+#: dlltool.c:3908
 #, c-format
 msgid "   -p --ext-prefix-alias <prefix> Add aliases with <prefix>.\n"
 msgstr "   -p --ext-prefix-alias <prefix> <prefix> を接頭辞���付��エイリアスを加�る\n"
 
-#: dlltool.c:3921
+#: dlltool.c:3909
 #, c-format
 msgid "   -S --as <name>            Use <name> for assembler.\n"
 msgstr "   -S --as <name>            アセンブラ��� <name> を使用�る\n"
 
-#: dlltool.c:3922
+#: dlltool.c:3910
 #, c-format
 msgid "   -f --as-flags <flags>     Pass <flags> to the assembler.\n"
 msgstr "   -f --as-flags <flags>     アセンブラ� <flags> を渡�\n"
 
-#: dlltool.c:3923
+#: dlltool.c:3911
 #, c-format
 msgid "   -C --compat-implib        Create backward compatible import library.\n"
 msgstr "   -C --compat-implib        後方互�性��るイン�ートライブラリを作��る\n"
 
-#: dlltool.c:3924
+#: dlltool.c:3912
 #, c-format
 msgid "   -n --no-delete            Keep temp files (repeat for extra preservation).\n"
 msgstr "   -n --no-delete            一時ファイルを消去��� (余分�も�も�存�る�ら繰り返���)\n"
 
-#: dlltool.c:3925
+#: dlltool.c:3913
 #, c-format
 msgid "   -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
 msgstr "   -t --temp-prefix <prefix> 一時ファイル�を生��る��� <prefix> 接頭辞を使用�る\n"
 
-#: dlltool.c:3926
+#: dlltool.c:3914
 #, c-format
 msgid "   -I --identify <implib>    Report the name of the DLL associated with <implib>.\n"
 msgstr "   -I --identify <implib>    <implib> �関連��られ� DLL �を報告�る\n"
 
-#: dlltool.c:3927
+#: dlltool.c:3915
 #, c-format
 msgid "      --identify-strict      Causes --identify to report error when multiple DLLs.\n"
 msgstr "      --identify-strict      複数� DLL ��る��� --identify �エラーを報告�るよ���る\n"
 
-#: dlltool.c:3928
+#: dlltool.c:3916
 #, c-format
 msgid "   -v --verbose              Be verbose.\n"
 msgstr "   -v --verbose              冗長�表示を行�\n"
 
-#: dlltool.c:3929
+#: dlltool.c:3917
 #, c-format
 msgid "   -V --version              Display the program version.\n"
 msgstr "   -V --version              プログラム��ージョンを表示�る\n"
 
-#: dlltool.c:3930
+#: dlltool.c:3918
 #, c-format
 msgid "   -h --help                 Display this information.\n"
 msgstr "   -h --help                 ��情報を表示�る\n"
 
-#: dlltool.c:3931
+#: dlltool.c:3919
 #, c-format
 msgid "   @<file>                   Read options from <file>.\n"
 msgstr "   @<file>                   <file> �らオプションを読�込む\n"
 
-#: dlltool.c:3933
+#: dlltool.c:3921
 #, c-format
 msgid "   -M --mcore-elf <outname>  Process mcore-elf object files into <outname>.\n"
 msgstr "   -M --mcore-elf <outname>  <outname> � mcore-elf オブジェクトファイルを処��る\n"
 
-#: dlltool.c:3934
+#: dlltool.c:3922
 #, c-format
 msgid "   -L --linker <name>        Use <name> as the linker.\n"
 msgstr "   -L --linker <name>        リンカ��� <name> を使用�る\n"
 
-#: dlltool.c:3935
+#: dlltool.c:3923
 #, c-format
 msgid "   -F --linker-flags <flags> Pass <flags> to the linker.\n"
 msgstr "   -F --linker-flags <flags> <flags> をリンカ�渡�\n"
 
-#: dlltool.c:4082
+#: dlltool.c:4070
 #, c-format
 msgid "Path components stripped from dllname, '%s'."
 msgstr "DLL �'%s' �らパス��素��り除�れ���"
 
-#: dlltool.c:4130
+#: dlltool.c:4118
 #, c-format
 msgid "Unable to open base-file: %s"
 msgstr "ベースファイルを開���ん: %s"
 
-#: dlltool.c:4165
+#: dlltool.c:4153
 #, c-format
 msgid "Machine '%s' not supported"
 msgstr "マシン '%s' �サ�ート�れ����ん"
 
-#: dlltool.c:4245
+#: dlltool.c:4232
 #, c-format
 msgid "Warning, machine type (%d) not supported for delayimport."
 msgstr "警告�マシン型 (%d) ���延イン�ート�サ�ート�れ����ん"
 
-#: dlltool.c:4313 dllwrap.c:213
+#: dlltool.c:4300 dllwrap.c:213
 #, c-format
 msgid "Tried file: %s"
 msgstr "試��ファイル: %s"
 
-#: dlltool.c:4320 dllwrap.c:220
+#: dlltool.c:4307 dllwrap.c:220
 #, c-format
 msgid "Using file: %s"
 msgstr "使用�るファイル: %s"
@@ -1322,16 +1338,22 @@ msgstr "DRIVER �        : %s\n"
 msgid "DRIVER options  : %s\n"
 msgstr "DRIVER オプション: %s\n"
 
-#: dwarf.c:256 dwarf.c:3019
+#: dwarf.c:112 dwarf.c:161 elfedit.c:123 elfedit.c:167 elfedit.c:195
+#: elfedit.c:227 readelf.c:368 readelf.c:536
+#, c-format
+msgid "Unhandled data length: %d\n"
+msgstr "�り扱�れ����データ長: %d\n"
+
+#: dwarf.c:312 dwarf.c:2890
 msgid "badly formed extended line op encountered!\n"
-msgstr "�正�形��拡張行命令コード�������!\n"
+msgstr "�正�形��拡張行オペコード�������!\n"
 
-#: dwarf.c:263
+#: dwarf.c:319
 #, c-format
 msgid "  Extended opcode %d: "
-msgstr "  拡張命令コード %d: "
+msgstr "  拡張オペコード %d: "
 
-#: dwarf.c:268
+#: dwarf.c:324
 #, c-format
 msgid ""
 "End of Sequence\n"
@@ -1340,193 +1362,192 @@ msgstr ""
 "列�終り\n"
 "\n"
 
-#: dwarf.c:274
+#: dwarf.c:330
 #, c-format
-msgid "set Address to 0x%s\n"
-msgstr "設定アドレス 0x%s\n"
+msgid "set Address to 0x%lx\n"
+msgstr "設定アドレス 0x%lx\n"
 
-#: dwarf.c:280
+#: dwarf.c:336
 #, c-format
 msgid "  define new File Table entry\n"
-msgstr "  新��ファイル表エントリ�定義\n"
+msgstr "  新��ファイルテーブルエントリ�定義\n"
 
-#: dwarf.c:281 dwarf.c:2548
+#: dwarf.c:337 dwarf.c:2431
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
 msgstr "  Entry\tDir\t時刻\tサイズ\t��\n"
 
-#: dwarf.c:295
+#: dwarf.c:339
 #, c-format
-msgid "set Discriminator to %s\n"
-msgstr ""
+msgid "   %d\t"
+msgstr "   %d\t"
 
-#: dwarf.c:356
+#: dwarf.c:342 dwarf.c:344 dwarf.c:346 dwarf.c:2443 dwarf.c:2445 dwarf.c:2447
 #, c-format
-msgid "(%s"
-msgstr "(%s"
+msgid "%lu\t"
+msgstr "%lu\t"
 
-#: dwarf.c:360
+#: dwarf.c:347
 #, c-format
-msgid ",%s"
-msgstr ",%s"
+msgid ""
+"%s\n"
+"\n"
+msgstr ""
+"%s\n"
+"\n"
 
-#: dwarf.c:364
+#: dwarf.c:351
 #, c-format
-msgid ",%s)\n"
-msgstr ",%s)\n"
+msgid "set Discriminator to %lu\n"
+msgstr ""
 
 #. The test against DW_LNW_hi_user is redundant due to
 #. the limited range of the unsigned char data type used
 #. for op_code.
 #. && op_code <= DW_LNE_hi_user
-#: dwarf.c:387
-#, c-format
-msgid "user defined: "
-msgstr "ユーザー定義: "
-
-#: dwarf.c:389
+#: dwarf.c:393
 #, c-format
-msgid "UNKNOWN: "
-msgstr "�明: "
+msgid "user defined: length %d\n"
+msgstr "ユーザ定義: 長� %d\n"
 
-#: dwarf.c:390
+#: dwarf.c:395 dwarf.c:2922
 #, c-format
-msgid "length %d ["
-msgstr "長� %d ["
+msgid "UNKNOWN: length %d\n"
+msgstr "�明: 長� %d\n"
 
-#: dwarf.c:407
+#: dwarf.c:408
 msgid "<no .debug_str section>"
 msgstr "<.debug_str セクション��り��ん>"
 
-#: dwarf.c:413
+#: dwarf.c:414
 #, c-format
-msgid "DW_FORM_strp offset too big: %s\n"
-msgstr "DW_FORM_strp オフセット�大�����: %s\n"
+msgid "DW_FORM_strp offset too big: %lx\n"
+msgstr "DW_FORM_strp オフセット�大�����: %lx\n"
 
 #: dwarf.c:415
 msgid "<offset is too big>"
 msgstr "<オフセット�大�����>"
 
-#: dwarf.c:655
+#: dwarf.c:654
 #, c-format
 msgid "Unknown TAG value: %lx"
 msgstr "�明� TAG 値: %lx"
 
-#: dwarf.c:696
+#: dwarf.c:695
 #, c-format
 msgid "Unknown FORM value: %lx"
 msgstr "�明� FORM 値: %lx"
 
-#: dwarf.c:705
+#: dwarf.c:704
 #, c-format
-msgid " %s byte block: "
-msgstr " %s �イトブロック: "
+msgid " %lu byte block: "
+msgstr " %lu �イトブロック: "
 
-#: dwarf.c:1050
+#: dwarf.c:1037
 #, c-format
 msgid "(DW_OP_call_ref in frame info)"
-msgstr "(フレーム情報内� DW_OP_call_ref)"
+msgstr ""
 
-#: dwarf.c:1122
+#: dwarf.c:1109
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
-msgstr "(フレーム情報内� DW_OP_GNU_implicit_pointer)"
+msgstr ""
 
-#: dwarf.c:1229
+#: dwarf.c:1167
 #, c-format
 msgid "(User defined location op)"
-msgstr "(ユーザ定義�置命令)"
+msgstr "(ユーザ定義 location op)"
 
-#: dwarf.c:1231
+#: dwarf.c:1169
 #, c-format
 msgid "(Unknown location op)"
-msgstr "(�明��置命令)"
+msgstr "(�明� location op)"
 
-#: dwarf.c:1278
+#: dwarf.c:1217
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr "内部エラー: DWARF �ージョン� 2�3 ��� 4 ���り��ん。\n"
 
-#: dwarf.c:1384
-msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
-msgstr "sizeof(dwarf_vma) != 8 �時� DW_FORM_data8 �サ�ート�れ��ん\n"
+#: dwarf.c:1323
+msgid "DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"
+msgstr "sizeof (unsigned long) != 8 �時� DW_FORM_data8 �サ�ート�れ��ん\n"
 
-#: dwarf.c:1434
+#: dwarf.c:1373
 #, c-format
-msgid " (indirect string, offset: 0x%s): %s"
-msgstr " (間接文字列�オフセット: 0x%s): %s"
+msgid " (indirect string, offset: 0x%lx): %s"
+msgstr " (間接文字列�オフセット: 0x%lx): %s"
 
-#: dwarf.c:1459
+#: dwarf.c:1397
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr "�識����形�: %lu\n"
 
-#: dwarf.c:1552
+#: dwarf.c:1485
 #, c-format
 msgid "(not inlined)"
-msgstr "(� inline 化)"
+msgstr "(� inline)"
 
-#: dwarf.c:1555
+#: dwarf.c:1488
 #, c-format
 msgid "(inlined)"
 msgstr "(inline 化)"
 
-#: dwarf.c:1558
+#: dwarf.c:1491
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr "(inline 宣言�れ��無視�れ�)"
 
-#: dwarf.c:1561
+#: dwarf.c:1494
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr "(inline 宣言�れ inline 化)"
 
-#: dwarf.c:1564
+#: dwarf.c:1497
 #, c-format
-msgid "  (Unknown inline attribute value: %s)"
-msgstr "  (�明� inline 属性値: %s)"
+msgid "  (Unknown inline attribute value: %lx)"
+msgstr "  (�明� inline 属性値: %lx)"
 
-#: dwarf.c:1735
+#: dwarf.c:1662
 #, c-format
 msgid "(location list)"
 msgstr "(location list)"
 
-#: dwarf.c:1756 dwarf.c:3722
+#: dwarf.c:1683 dwarf.c:3563
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr " [DW_AT_frame_base 無�]"
 
-#: dwarf.c:1771
+#: dwarf.c:1698
 #, c-format
-msgid "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
-msgstr "オフセット %2$lx ��る DIE � DW_AT_import 属性�値���使用�れ��るオフセット %1$s �大�����。\n"
+msgid "Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
+msgstr ""
 
-#: dwarf.c:1971
+#: dwarf.c:1889
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr "�明� AT 値: %lx"
 
-#: dwarf.c:2042
+#: dwarf.c:1960
 #, c-format
-msgid "Reserved length value (0x%s) found in section %s\n"
-msgstr "セクション %2$s 内�予約�れ�長��値 (%1$s) �見��り���\n"
+msgid "Reserved length value (%lx) found in section %s\n"
+msgstr "セクション %2$s 内�予約�れ�長��値 (%1$lx) �見��り���\n"
 
-#: dwarf.c:2054
+#: dwarf.c:1971
 #, c-format
-msgid "Corrupt unit length (0x%s) found in section %s\n"
-msgstr "%2$s セクション内�壊れ�ユニット長 (%1$s) �見��り���\n"
+msgid "Corrupt unit length (%lx) found in section %s\n"
+msgstr "%2$s セクション内�壊れ�ユニット長 (%1$lx) �見��り���\n"
 
-#: dwarf.c:2062
+#: dwarf.c:1978
 #, c-format
 msgid "No comp units in %s section ?"
-msgstr "%s セクション�コンパイル����り��んよ ?"
+msgstr ""
 
-#: dwarf.c:2071
+#: dwarf.c:1987
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr "%u 個�エントリを��デ�ッグ情報�列�����分�メモリ��り��ん"
 
-#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
-#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
+#: dwarf.c:1995 dwarf.c:3158 dwarf.c:3252 dwarf.c:3326 dwarf.c:3443
+#: dwarf.c:3598 dwarf.c:3667 dwarf.c:3862
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
@@ -1535,86 +1556,86 @@ msgstr ""
 "%s セクション�内容:\n"
 "\n"
 
-#: dwarf.c:2088
+#: dwarf.c:2003
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr "%s セクション��置を特定����ん!\n"
 
-#: dwarf.c:2169
+#: dwarf.c:2084
 #, c-format
-msgid "  Compilation Unit @ offset 0x%s:\n"
-msgstr "  コンパイル�� @ オフセット 0x%s:\n"
+msgid "  Compilation Unit @ offset 0x%lx:\n"
+msgstr "  コンパイル�� @ オフセット 0x%lx:\n"
 
-#: dwarf.c:2171
+#: dwarf.c:2085
 #, c-format
-msgid "   Length:        0x%s (%s)\n"
-msgstr "   長�:        0x%s (%s)\n"
+msgid "   Length:        0x%lx (%s)\n"
+msgstr "   長�:        0x%lx (%s)\n"
 
-#: dwarf.c:2174
+#: dwarf.c:2087
 #, c-format
 msgid "   Version:       %d\n"
 msgstr "   �ージョン:    %d\n"
 
-#: dwarf.c:2175
+#: dwarf.c:2088
 #, c-format
-msgid "   Abbrev Offset: %s\n"
-msgstr "   �略オフセット: %s\n"
+msgid "   Abbrev Offset: %ld\n"
+msgstr "   �略 offset:   %ld\n"
 
-#: dwarf.c:2177
+#: dwarf.c:2089
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr "   �インタサイズ:%d\n"
 
-#: dwarf.c:2181
+#: dwarf.c:2093
 #, c-format
 msgid "   Signature:     "
 msgstr "   シグ��ャ:     "
 
-#: dwarf.c:2185
+#: dwarf.c:2097
 #, c-format
-msgid "   Type Offset:   0x%s\n"
-msgstr "   型オフセット:   0x%s\n"
+msgid "   Type Offset:   0x%lx\n"
+msgstr "   型オフセット:   0x%lx\n"
 
-#: dwarf.c:2193
+#: dwarf.c:2104
 #, c-format
-msgid "Debug info is corrupted, length of CU at %s extends beyond end of section (length = %s)\n"
-msgstr "デ�ッグ情報�壊れ����。 %s ��る CU �長��セクション (長� = %s) �終端を超�����\n"
+msgid "Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"
+msgstr "デ�ッグ情報�壊れ����。 %lx ��る CU �長��セクション (長� = %lx) �終端を超�����\n"
 
-#: dwarf.c:2206
+#: dwarf.c:2115
 #, c-format
-msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
-msgstr "オフセット %s ��る CU �壊れ��る��サ�ート����ージョン番���: %d\n"
+msgid "CU at offset %lx contains corrupt or unsupported version number: %d.\n"
+msgstr "オフセット %lx ��る CU �壊れ��る��サ�ート����ージョン番���: %d\n"
 
-#: dwarf.c:2217
+#: dwarf.c:2125
 #, c-format
 msgid "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"
 msgstr "デ�ッグ情報�壊れ����。�略オフセット (%lx) ��略セクションサイズ (%lx) より大����\n"
 
-#: dwarf.c:2267
+#: dwarf.c:2172
 #, c-format
 msgid "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr ".debug_info セクション内オフセット %lx �誤�� end-of-siblings マーカー�検出�れ���\n"
 
-#: dwarf.c:2271
+#: dwarf.c:2176
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr "�れ以��誤�� end-of-sibling マーカー�関�る警告�抑止�れ��\n"
 
-#: dwarf.c:2290
+#: dwarf.c:2183
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr " <%d><%lx>: �略番�: %lu"
 
-#: dwarf.c:2294
-#, c-format
-msgid " <%d><%lx>: ...\n"
-msgstr " <%d><%lx>: ...\n"
-
-#: dwarf.c:2313
+#: dwarf.c:2200
 #, c-format
 msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
 msgstr "オフセット %lx ��る DIE �存在����略番� %lu を�照�����\n"
 
-#: dwarf.c:2415
+#: dwarf.c:2206
+#, c-format
+msgid " (%s)\n"
+msgstr " (%s)\n"
+
+#: dwarf.c:2298
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
@@ -1623,70 +1644,70 @@ msgstr ""
 "セクション %s �デ�ッグ内容�生ダンプ:\n"
 "\n"
 
-#: dwarf.c:2453
+#: dwarf.c:2336
 #, c-format
 msgid "The information in section %s appears to be corrupt - the section is too small\n"
 msgstr "セクション %s 内�情報�壊れ��るよ��� - セクション�������\n"
 
-#: dwarf.c:2465 dwarf.c:2833
+#: dwarf.c:2348 dwarf.c:2701
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr "�在�����DWARF �ージョン 2, 3 �よ� 4 ��行情報をサ�ート�����。\n"
 
-#: dwarf.c:2479 dwarf.c:2848
+#: dwarf.c:2362 dwarf.c:2716
 msgid "Invalid maximum operations per insn.\n"
-msgstr "命令���最大�作数�無効��。\n"
+msgstr ""
 
-#: dwarf.c:2498
+#: dwarf.c:2381
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr "  オフセット:                  0x%lx\n"
 
-#: dwarf.c:2499
+#: dwarf.c:2382
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr "  長�:                        %ld\n"
 
-#: dwarf.c:2500
+#: dwarf.c:2383
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr "  DWARF �ージョン:            %d\n"
 
-#: dwarf.c:2501
+#: dwarf.c:2384
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr "  Prologue �長�:             %d\n"
 
-#: dwarf.c:2502
+#: dwarf.c:2385
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr "  最�命令長:                  %d\n"
 
-#: dwarf.c:2504
+#: dwarf.c:2387
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr "  命令���最大�作数:        %d\n"
 
-#: dwarf.c:2505
+#: dwarf.c:2388
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr "  'is_stmt' ��期値:          %d\n"
 
-#: dwarf.c:2506
+#: dwarf.c:2389
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr "  Line ベース:                 %d\n"
 
-#: dwarf.c:2507
+#: dwarf.c:2390
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr "  Line 範囲:                   %d\n"
 
-#: dwarf.c:2508
+#: dwarf.c:2391
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr "  オペコードベース:            %d\n"
 
-#: dwarf.c:2517
+#: dwarf.c:2400
 #, c-format
 msgid ""
 "\n"
@@ -1695,148 +1716,163 @@ msgstr ""
 "\n"
 " オペコード:\n"
 
-#: dwarf.c:2520
+#: dwarf.c:2403
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr "  オペコード %d � %d 個�引数を����\n"
 
-#: dwarf.c:2526
+#: dwarf.c:2409
 #, c-format
 msgid ""
 "\n"
 " The Directory Table is empty.\n"
 msgstr ""
 "\n"
-" ディレクトリー表�空��。\n"
+" ディレクトリテーブル�空��。\n"
 
-#: dwarf.c:2529
+#: dwarf.c:2412
 #, c-format
 msgid ""
 "\n"
 " The Directory Table:\n"
 msgstr ""
 "\n"
-" ディレクトリー表:\n"
+" ディレクトリテーブル:\n"
+
+#: dwarf.c:2416
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
 
-#: dwarf.c:2544
+#: dwarf.c:2427
 #, c-format
 msgid ""
 "\n"
 " The File Name Table is empty.\n"
 msgstr ""
 "\n"
-" ファイル�表�空��。\n"
+" ファイル�テーブル�空��。\n"
 
-#: dwarf.c:2547
+#: dwarf.c:2430
 #, c-format
 msgid ""
 "\n"
 " The File Name Table:\n"
 msgstr ""
 "\n"
-" ファイル�表:\n"
+" ファイル�テーブル:\n"
+
+#: dwarf.c:2438
+#, c-format
+msgid "  %d\t"
+msgstr "  %d\t"
+
+#: dwarf.c:2449
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
 
 #. Now display the statements.
-#: dwarf.c:2577
+#: dwarf.c:2457
 #, c-format
 msgid ""
 "\n"
 " Line Number Statements:\n"
 msgstr ""
 "\n"
-" 行番�文:\n"
+" 行番�ステートメント:\n"
 
-#: dwarf.c:2596
+#: dwarf.c:2476
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s"
-msgstr "  特殊命令コード %d: アドレスを %s 分進� 0x%s ���"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx"
+msgstr "  特殊オペコード %d: アドレスを %lu 分進� 0x%lx ���"
 
-#: dwarf.c:2610
+#: dwarf.c:2488
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
-msgstr "  特殊命令コード %d: アドレスを %s 分進� 0x%s[%d] ���"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx[%d]"
+msgstr "  特殊オペコード %d: アドレスを %lu 分進� 0x%lx[%d] ���"
 
-#: dwarf.c:2618
+#: dwarf.c:2494
 #, c-format
-msgid " and Line by %s to %d\n"
-msgstr " 行を %s 分進� %d ����\n"
+msgid " and Line by %d to %d\n"
+msgstr " 行を %d 分進� %d ����\n"
 
-#: dwarf.c:2628
+#: dwarf.c:2504
 #, c-format
 msgid "  Copy\n"
 msgstr "  コピー\n"
 
-#: dwarf.c:2638
+#: dwarf.c:2514
 #, c-format
-msgid "  Advance PC by %s to 0x%s\n"
-msgstr "  PC を %s 分進� 0x%s ����\n"
+msgid "  Advance PC by %lu to 0x%lx\n"
+msgstr "  PC を %lu 分進� 0x%lx ����\n"
 
-#: dwarf.c:2651
+#: dwarf.c:2526
 #, c-format
-msgid "  Advance PC by %s to 0x%s[%d]\n"
-msgstr "  PC を %s 分進� 0x%s[%d] ����\n"
+msgid "  Advance PC by %lu to 0x%lx[%d]\n"
+msgstr "  PC を %lu 分進� 0x%lx[%d] ����\n"
 
-#: dwarf.c:2662
+#: dwarf.c:2536
 #, c-format
-msgid "  Advance Line by %s to %d\n"
-msgstr "  行を %s 進� %d ����\n"
+msgid "  Advance Line by %d to %d\n"
+msgstr "  行を %d 進� %d ����\n"
 
-#: dwarf.c:2670
+#: dwarf.c:2543
 #, c-format
-msgid "  Set File Name to entry %s in the File Name Table\n"
-msgstr "  エントリ %s �ファイル�をファイル�表�設定���\n"
+msgid "  Set File Name to entry %d in the File Name Table\n"
+msgstr "  エントリ %d �ファイル�をファイル�テーブル�設定���\n"
 
-#: dwarf.c:2678
+#: dwarf.c:2551
 #, c-format
-msgid "  Set column to %s\n"
-msgstr "  列幅を %s �設定���\n"
+msgid "  Set column to %lu\n"
+msgstr "  列幅を %lu �設定���\n"
 
-#: dwarf.c:2686
+#: dwarf.c:2558
 #, c-format
-msgid "  Set is_stmt to %s\n"
-msgstr "  is_stmt を %s �設定���\n"
+msgid "  Set is_stmt to %d\n"
+msgstr "  is_stmt を %d �設定���\n"
 
-#: dwarf.c:2691
+#: dwarf.c:2563
 #, c-format
 msgid "  Set basic block\n"
 msgstr "  基本ブロックを設定\n"
 
-#: dwarf.c:2701
+#: dwarf.c:2573
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s\n"
-msgstr "  PC を定数 %s 分進� 0x%s ����\n"
+msgid "  Advance PC by constant %lu to 0x%lx\n"
+msgstr "  PC を定数 %lu 分進� 0x%lx ����\n"
 
-#: dwarf.c:2714
+#: dwarf.c:2585
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s[%d]\n"
-msgstr "  PC を定数 %s 分進� 0x%s[%d] ����\n"
+msgid "  Advance PC by constant %lu to 0x%lx[%d]\n"
+msgstr "  PC を定数 %lu 分進� 0x%lx[%d] ����\n"
 
-#: dwarf.c:2726
+#: dwarf.c:2596
 #, c-format
-msgid "  Advance PC by fixed size amount %s to 0x%s\n"
-msgstr "  PC を固定サイズ %s 分進� 0x%s ����\n"
+msgid "  Advance PC by fixed size amount %lu to 0x%lx\n"
+msgstr "  PC を固定サイズ %lu 分進� 0x%lx ����\n"
 
-#: dwarf.c:2732
+#: dwarf.c:2601
 #, c-format
 msgid "  Set prologue_end to true\n"
 msgstr "  prologue_end を true �設定���\n"
 
-#: dwarf.c:2736
+#: dwarf.c:2605
 #, c-format
 msgid "  Set epilogue_begin to true\n"
 msgstr "  epilogue_begin を true �設定���\n"
 
-#: dwarf.c:2742
+#: dwarf.c:2611 dwarf.c:3027
 #, c-format
-msgid "  Set ISA to %s\n"
-msgstr "  ISA を %s �設定���\n"
+msgid "  Set ISA to %lu\n"
+msgstr "  ISA を %lu �設定���\n"
 
-#: dwarf.c:2746 dwarf.c:3160
+#: dwarf.c:2615 dwarf.c:3031
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr "  �明�被演算�付��オペコード %d : "
 
-#: dwarf.c:2780
+#: dwarf.c:2648
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
@@ -1845,65 +1881,100 @@ msgstr ""
 "セクション %s �デ�ッグ内容�デコード��ダンプ:\n"
 "\n"
 
-#: dwarf.c:2821
+#: dwarf.c:2689
 msgid "The line info appears to be corrupt - the section is too small\n"
 msgstr "行情報�壊れ��るよ��� - ��セクション�������\n"
 
-#: dwarf.c:2953
+#: dwarf.c:2821
 #, c-format
 msgid "CU: %s:\n"
 msgstr "CU: %s:\n"
 
-#: dwarf.c:2954 dwarf.c:2964
+#: dwarf.c:2822 dwarf.c:2835
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr "ファイル�                           行番�         開始アドレス\n"
 
-#: dwarf.c:2959
+#: dwarf.c:2828
 #, c-format
 msgid "CU: %s/%s:\n"
 msgstr "CU: %s/%s:\n"
 
-#: dwarf.c:3051
+#: dwarf.c:2833 dwarf.c:2918
 #, c-format
-msgid "UNKNOWN: length %d\n"
-msgstr "�明: 長� %d\n"
+msgid "%s:\n"
+msgstr "%s:\n"
 
-#: dwarf.c:3156
+#. If directory index is 0, that means current directory.
+#: dwarf.c:2964
 #, c-format
-msgid "  Set ISA to %lu\n"
-msgstr "  ISA を %lu �設定���\n"
+msgid ""
+"\n"
+"./%s:[++]\n"
+msgstr ""
+"\n"
+"./%s:[++]\n"
 
-#: dwarf.c:3322 dwarf.c:3872
+#. The directory index starts counting at 1.
+#: dwarf.c:2970
+#, c-format
+msgid ""
+"\n"
+"%s/%s:\n"
+msgstr ""
+"\n"
+"%s/%s:\n"
+
+#: dwarf.c:3070
+#, c-format
+msgid "%-35s  %11d  %#18lx\n"
+msgstr "%-35s  %11d  %#18lx\n"
+
+#: dwarf.c:3074
+#, c-format
+msgid "%-35s  %11d  %#18lx[%d]\n"
+msgstr "%-35s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3082
+#, c-format
+msgid "%s  %11d  %#18lx\n"
+msgstr "%s  %11d  %#18lx\n"
+
+#: dwarf.c:3086
+#, c-format
+msgid "%s  %11d  %#18lx[%d]\n"
+msgstr "%s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3192 dwarf.c:3712
 #, c-format
 msgid ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
 msgstr "%2$s セクション内オフセット 0x%1$lx � .debug_info � CU ヘッダを指�����ん。\n"
 
-#: dwarf.c:3336
+#: dwarf.c:3206
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr "DWARF 2 �よ� 3 � pubnames ���在サ�ート�れ����\n"
 
-#: dwarf.c:3343
+#: dwarf.c:3213
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr "  長�:                                %ld\n"
 
-#: dwarf.c:3345
+#: dwarf.c:3215
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr "  �ージョン:                          %d\n"
 
-#: dwarf.c:3347
+#: dwarf.c:3217
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr "  .debug_info セクション�オフセット:     0x%lx\n"
 
-#: dwarf.c:3349
+#: dwarf.c:3219
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr "  .debug_info セクション領域サイズ:    %ld\n"
 
-#: dwarf.c:3352
+#: dwarf.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -1912,45 +1983,55 @@ msgstr ""
 "\n"
 "    オフセット\t��\n"
 
-#: dwarf.c:3403
+#: dwarf.c:3273
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
 msgstr " DW_MACINFO_start_file - 行番�: %d ファイル番�: %d\n"
 
-#: dwarf.c:3409
+#: dwarf.c:3279
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr " DW_MACINFO_end_file\n"
 
-#: dwarf.c:3417
+#: dwarf.c:3287
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_define - 行番� : %d マクロ : %s\n"
 
-#: dwarf.c:3426
+#: dwarf.c:3296
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
 msgstr " DW_MACINFO_undef - 行番� : %d マクロ : %s\n"
 
-#: dwarf.c:3438
+#: dwarf.c:3308
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
 msgstr " DW_MACINFO_vendor_ext - 定数 : %d 文字列 : %s\n"
 
-#: dwarf.c:3467
+#: dwarf.c:3337
 #, c-format
 msgid "  Number TAG\n"
 msgstr "  番� TAG\n"
 
-#: dwarf.c:3476
+#: dwarf.c:3343
+#, c-format
+msgid "   %ld      %s    [%s]\n"
+msgstr "   %ld      %s    [%s]\n"
+
+#: dwarf.c:3346
 msgid "has children"
 msgstr "��り"
 
-#: dwarf.c:3476
+#: dwarf.c:3346
 msgid "no children"
 msgstr "���"
 
-#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
+#: dwarf.c:3349
+#, c-format
+msgid "    %-18s %s\n"
+msgstr "    %-18s %s\n"
+
+#: dwarf.c:3382 dwarf.c:3594 dwarf.c:3819
 #, c-format
 msgid ""
 "\n"
@@ -1959,102 +2040,107 @@ msgstr ""
 "\n"
 "%s セクション�空��。\n"
 
-#: dwarf.c:3533 dwarf.c:3987
+#: dwarf.c:3388 dwarf.c:3825
 #, c-format
 msgid "Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"
 msgstr ".debug_info �ロード/構文解��出���ん。���� %s セクションを解釈����ん。\n"
 
-#: dwarf.c:3577
+#. FIXME: Should we handle this case?
+#: dwarf.c:3432
+msgid "Location lists in .debug_info section aren't in ascending order!\n"
+msgstr ".debug_info セクション��置リスト�昇順���り��ん!\n"
+
+#: dwarf.c:3435
 msgid "No location lists in .debug_info section!\n"
 msgstr ".debug_info セクション��置リスト��り��ん!\n"
 
-#: dwarf.c:3582
+#: dwarf.c:3440
 #, c-format
-msgid "Location lists in %s section start at 0x%s\n"
-msgstr "%s セクション��置リスト� 0x%s �ら開始���\n"
+msgid "Location lists in %s section start at 0x%lx\n"
+msgstr "%s セクション��置リスト� 0x%lx �ら開始���\n"
 
-#: dwarf.c:3589
+#: dwarf.c:3444
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr "    オフセット 開始   終了     Expression\n"
 
-#: dwarf.c:3638
+#: dwarf.c:3479
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr ".debug_loc セクション内�穴 [0x%lx - 0x%lx] ��り��。\n"
 
-#: dwarf.c:3642
+#: dwarf.c:3483
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr ".debug_loc セクション���り����る部分 [0x%lx - 0x%lx] ��り��\n"
 
-#: dwarf.c:3650
+#: dwarf.c:3491
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr "オフセット 0x%lx � .debug_loc セクションサイズより大����。\n"
 
-#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
+#: dwarf.c:3500 dwarf.c:3535 dwarf.c:3545
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr "オフセット 0x%lx �ら始�る�置リスト�終端�れ����ん。\n"
 
-#: dwarf.c:3678 dwarf.c:4075
+#: dwarf.c:3519 dwarf.c:3913
 #, c-format
 msgid "<End of list>\n"
 msgstr "<リスト�終端>\n"
 
-#: dwarf.c:3688
+#: dwarf.c:3529
 #, c-format
 msgid "(base address)\n"
 msgstr "(ベースアドレス)\n"
 
-#: dwarf.c:3725
+#: dwarf.c:3566
 msgid " (start == end)"
 msgstr " (開始 == 終了)"
 
-#: dwarf.c:3727
+#: dwarf.c:3568
 msgid " (start > end)"
 msgstr " (開始 > 終了)"
 
-#: dwarf.c:3737
+#: dwarf.c:3578
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr "セクション %2$s �末端� %1$ld �イト�未使用部分��り��\n"
 
-#: dwarf.c:3883
+#: dwarf.c:3723
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr "�在���� DWARF 2 �よ� 3 arange ��サ�ート�れ����\n"
 
-#: dwarf.c:3887
+#: dwarf.c:3727
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr "  長�:                     %ld\n"
 
-#: dwarf.c:3889
+#: dwarf.c:3728
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr "  �ージョン:               %d\n"
 
-#: dwarf.c:3890
+#: dwarf.c:3729
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr "  .debug_info 内��オフセット: %lx\n"
 
-#: dwarf.c:3892
+#: dwarf.c:3730
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr "  �インタサイズ:           %d\n"
 
-#: dwarf.c:3893
+#: dwarf.c:3731
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr "  セグメントサイズ:         %d\n"
 
-#: dwarf.c:3902
+#: dwarf.c:3740
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr "�インタサイズ + セグメントサイズ�2���乗数���り��ん。\n"
 
-#: dwarf.c:3907
+#: dwarf.c:3745
 #, c-format
 msgid ""
 "\n"
@@ -2063,7 +2149,7 @@ msgstr ""
 "\n"
 "    アドレス           長�\n"
 
-#: dwarf.c:3909
+#: dwarf.c:3747
 #, c-format
 msgid ""
 "\n"
@@ -2072,385 +2158,260 @@ msgstr ""
 "\n"
 "    アドレス   長�\n"
 
-#: dwarf.c:3997
+#: dwarf.c:3835
 msgid "No range lists in .debug_info section!\n"
 msgstr ".debug_info セクション�範囲リスト��り��ん!\n"
 
-#: dwarf.c:4021
+#: dwarf.c:3859
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr "%s セクション�範囲リスト� 0x%lx �ら開始���\n"
 
-#: dwarf.c:4025
+#: dwarf.c:3863
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr "    オフセット 開始   終了\n"
 
-#: dwarf.c:4046
+#: dwarf.c:3884
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr "%3$s セクション�穴 [0x%1$lx - 0x%2$lx] ��り��。\n"
 
-#: dwarf.c:4050
+#: dwarf.c:3888
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr "%3$s セクション���り����る部分 [0x%1$lx - 0x%2$lx] ��り��。\n"
 
-#: dwarf.c:4093
+#: dwarf.c:3931
 msgid "(start == end)"
 msgstr "(開始 == 終了)"
 
-#: dwarf.c:4095
+#: dwarf.c:3933
 msgid "(start > end)"
 msgstr "(開始 > 終了)"
 
-#: dwarf.c:4347
+#: dwarf.c:4185
 msgid "bad register: "
 msgstr "間���レジスタ: "
 
-#. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4350 dwarf.c:5159
+#: dwarf.c:4188
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr "%s セクション�内容:\n"
 
-#: dwarf.c:5120
+#: dwarf.c:4962
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr "  DW_CFA_??? (ユーザ定義フレーム呼�出��作: %#x)\n"
 
-#: dwarf.c:5122
+#: dwarf.c:4964
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr "サ�ート�れ������明� Dwarf フレーム呼�出�命令番�: %#x\n"
 
-#: dwarf.c:5163
-#, c-format
-msgid "Truncated header in the %s section.\n"
-msgstr "グループセクション %s 内�切り詰�られ�ヘッダ��\n"
-
-#: dwarf.c:5168
+#: dwarf.c:4989
 #, c-format
-msgid "Version %ld\n"
-msgstr "�ージョン %ld\n"
-
-#: dwarf.c:5175
-msgid "The address table data in version 3 may be wrong.\n"
-msgstr "�ージョン 3 ��アドレス表データ�間����る�も�れ��ん。\n"
-
-#: dwarf.c:5178
-msgid "Version 4 does not support case insensitive lookups.\n"
-msgstr "�ージョン 4 ��大文字��文字を区別���検索�サ�ート�れ��ん。\n"
+msgid "Displaying the debug contents of section %s is not yet supported.\n"
+msgstr "セクション %s �デ�ッグ内容�表示���サ�ート�れ����ん。\n"
 
-#: dwarf.c:5183
+#: dwarf.c:5031 elfedit.c:74
 #, c-format
-msgid "Unsupported version %lu.\n"
-msgstr "�ージョン %lu �サ�ート�れ����ん。\n"
+msgid "%s: Error: "
+msgstr "%s: エラー: "
 
-#: dwarf.c:5199
+#: dwarf.c:5042
 #, c-format
-msgid "Corrupt header in the %s section.\n"
-msgstr "グループセクション %s 内�破���ヘッダ��。\n"
+msgid "%s: Warning: "
+msgstr "%s: 警告: "
 
-#: dwarf.c:5214
+#: dwarf.c:5145 dwarf.c:5215
 #, c-format
-msgid ""
-"\n"
-"CU table:\n"
-msgstr ""
-"\n"
-"CU 表:\n"
+msgid "Unrecognized debug option '%s'\n"
+msgstr "�識����デ�ッグオプション '%s' ��\n"
 
-#: dwarf.c:5220
+#: elfedit.c:243
 #, c-format
-msgid "[%3u] 0x%lx - 0x%lx\n"
-msgstr "[%3u] 0x%lx - 0x%lx\n"
+msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
+msgstr "%s: ELF ファイル���り��ん - 開始��るマジック�イト�異�り��\n"
 
-#: dwarf.c:5225
+#: elfedit.c:251
 #, c-format
-msgid ""
-"\n"
-"TU table:\n"
-msgstr ""
-"\n"
-"TU 表:\n"
+msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
+msgstr "%s: サ�ート�れ�� EI_VERSION ��: %d � %d ���り��ん\n"
 
-#: dwarf.c:5232
+#: elfedit.c:267
 #, c-format
-msgid "[%3u] 0x%lx 0x%lx "
-msgstr "[%3u] 0x%lx 0x%lx "
+msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
+msgstr "%s: 一致��� EI_CLASS ��: %d � %d ���り��ん\n"
 
-#: dwarf.c:5239
+#: elfedit.c:278
 #, c-format
-msgid ""
-"\n"
-"Address table:\n"
-msgstr ""
-"\n"
-"アドレス表:\n"
+msgid "%s: Unmatched e_machine: %d is not %d\n"
+msgstr "%s: 一致��� e_machine ��: %d � %d ���り��ん\n"
 
-#: dwarf.c:5248
+#: elfedit.c:289
 #, c-format
-msgid "%lu\n"
-msgstr "%lu\n"
+msgid "%s: Unmatched e_type: %d is not %d\n"
+msgstr "%s: 一致��� e_type ��: %d � %d ���り��ん\n"
 
-#: dwarf.c:5251
+#: elfedit.c:300
 #, c-format
-msgid ""
-"\n"
-"Symbol table:\n"
-msgstr ""
-"\n"
-"シンボル表:\n"
+msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
+msgstr "%s: 一致��� EI_OSABI ��: %d � %d ���り��ん\n"
 
-#: dwarf.c:5285
+#: elfedit.c:333
 #, c-format
-msgid "Displaying the debug contents of section %s is not yet supported.\n"
-msgstr "セクション %s �デ�ッグ内容�表示���サ�ート�れ����ん。\n"
+msgid "%s: Failed to update ELF header: %s\n"
+msgstr "%s: ELF ヘッダ�更新�失敗����: %s\n"
 
-#: dwarf.c:5421 dwarf.c:5491
+#: elfedit.c:366
 #, c-format
-msgid "Unrecognized debug option '%s'\n"
-msgstr "�識����デ�ッグオプション '%s' ��\n"
+msgid "Unsupported EI_CLASS: %d\n"
+msgstr "サ�ート�れ�� EI_CLASS ��: %d\n"
 
-#: elfcomm.c:39
-#, c-format
-msgid "%s: Error: "
-msgstr "%s: エラー: "
+#: elfedit.c:399
+msgid ""
+"This executable has been built without support for a\n"
+"64 bit data type and so it cannot process 64 bit ELF files.\n"
+msgstr ""
+"��実行ファイル� 64 ビットサ�ート無��コンパイル�れ��る��\n"
+"64 ビット ELF ファイルを処�����ん。\n"
 
-#: elfcomm.c:50
+#: elfedit.c:440
 #, c-format
-msgid "%s: Warning: "
-msgstr "%s: 警告: "
+msgid "%s: Failed to read ELF header\n"
+msgstr "%s: ELF ヘッダ�読�込��失敗����\n"
 
-#: elfcomm.c:82 elfcomm.c:117 elfcomm.c:167 elfcomm.c:216
+#: elfedit.c:447
 #, c-format
-msgid "Unhandled data length: %d\n"
-msgstr "�り扱�れ����データ長: %d\n"
+msgid "%s: Failed to seek to ELF header\n"
+msgstr "%s: ELF ヘッダ�探査 (seek) �失敗����\n"
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
-#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
-#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
-#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
-#: readelf.c:11866 readelf.c:12685
+#: elfedit.c:477 elfedit.c:491 elfedit.c:776 readelf.c:3674 readelf.c:3978
+#: readelf.c:4021 readelf.c:4093 readelf.c:4171 readelf.c:4936 readelf.c:4960
+#: readelf.c:7057 readelf.c:7103 readelf.c:7304 readelf.c:8494 readelf.c:8508
+#: readelf.c:9033 readelf.c:9049 readelf.c:9092 readelf.c:9117 readelf.c:11385
+#: readelf.c:11577 readelf.c:12138 readelf.c:12515 readelf.c:12529
+#: readelf.c:12891
 msgid "Out of memory\n"
 msgstr "メモリ�足り��ん\n"
 
-#: elfcomm.c:312
+#: elfedit.c:543 readelf.c:12581
 #, c-format
 msgid "%s: failed to seek to first archive header\n"
 msgstr "%s: 最��書庫ヘッダ��探査 (seek) �失敗����\n"
 
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
+#: elfedit.c:553 elfedit.c:741 elfedit.c:845 readelf.c:12590 readelf.c:12858
+#: readelf.c:13026
 #, c-format
 msgid "%s: failed to read archive header\n"
 msgstr "%s: 書庫ヘッダ�読�込��失敗����\n"
 
-#: elfcomm.c:347
-#, c-format
-msgid "%s: the archive index is empty\n"
-msgstr "%s: 書庫�索引�空��\n"
-
-#: elfcomm.c:355 elfcomm.c:381
-#, c-format
-msgid "%s: failed to read archive index\n"
-msgstr "%s: 書庫索引�読�込��失敗����\n"
-
-#: elfcomm.c:365
-#, c-format
-msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
-msgstr "%s: 書庫�索引�ら� %ld 個�エントリ��る������ヘッダ�サイズ�������\n"
-
-#: elfcomm.c:373
-msgid "Out of memory whilst trying to read archive symbol index\n"
-msgstr "書庫�シンボル索引�読�込�を試���る最中�メモリ��足����\n"
-
-#: elfcomm.c:392
-msgid "Out of memory whilst trying to convert the archive symbol index\n"
-msgstr "書庫�シンボル索引�変�を試���る最中�メモリ��足����\n"
-
-#: elfcomm.c:405
-#, c-format
-msgid "%s: the archive has an index but no symbols\n"
-msgstr "%s: 書庫�索引��り����シンボル��り��ん\n"
-
-#: elfcomm.c:413
-msgid "Out of memory whilst trying to read archive index symbol table\n"
-msgstr "書庫�シンボル表索引�読�込�を試���る最中�メモリ��足����\n"
-
-#: elfcomm.c:419
-#, c-format
-msgid "%s: failed to read archive index symbol table\n"
-msgstr "%s: 書庫�シンボル表索引�読�込��失敗����\n"
-
-#: elfcomm.c:428
+#: elfedit.c:568 readelf.c:12691
 #, c-format
 msgid "%s: failed to skip archive symbol table\n"
 msgstr "%s: 書庫シンボル表�スキップ�失敗����\n"
 
-#: elfcomm.c:440
+#: elfedit.c:579 readelf.c:12702
 #, c-format
 msgid "%s: failed to read archive header following archive index\n"
 msgstr "%s: 書庫索引�後�続�書庫ヘッダ�読�込��失敗����\n"
 
-#: elfcomm.c:446
-#, c-format
-msgid "%s has no archive index\n"
-msgstr "%s ��書庫�索引��り��ん\n"
-
-#: elfcomm.c:457
+#: elfedit.c:594 readelf.c:12718
 msgid "Out of memory reading long symbol names in archive\n"
 msgstr "書庫内�長�シンボル��読�込�中�メモリ�足り���り���\n"
 
-#: elfcomm.c:465
+#: elfedit.c:602 readelf.c:12726
 #, c-format
 msgid "%s: failed to read long symbol name string table\n"
 msgstr "%s: 長�シンボル�文字列表�読�込��失敗����\n"
 
-#: elfcomm.c:605
+#: elfedit.c:734 readelf.c:12852
 #, c-format
 msgid "%s: failed to seek to next file name\n"
 msgstr "%s: 次�ファイル��探査 (seek) �失敗����\n"
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
+#: elfedit.c:747 elfedit.c:852 readelf.c:12863 readelf.c:13032
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr "%s: 有効�書庫ヘッダを見��られ��ん���\n"
 
-#: elfedit.c:73
-#, c-format
-msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
-msgstr "%s: ELF ファイル���り��ん - 開始��るマジック�イト�異�り��\n"
-
-#: elfedit.c:81
-#, c-format
-msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
-msgstr "%s: サ�ート�れ�� EI_VERSION ��: %d � %d ���り��ん\n"
-
-#: elfedit.c:97
-#, c-format
-msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
-msgstr "%s: 一致��� EI_CLASS ��: %d � %d ���り��ん\n"
-
-#: elfedit.c:108
-#, c-format
-msgid "%s: Unmatched e_machine: %d is not %d\n"
-msgstr "%s: 一致��� e_machine ��: %d � %d ���り��ん\n"
-
-#: elfedit.c:119
-#, c-format
-msgid "%s: Unmatched e_type: %d is not %d\n"
-msgstr "%s: 一致��� e_type ��: %d � %d ���り��ん\n"
-
-#: elfedit.c:130
-#, c-format
-msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
-msgstr "%s: 一致��� EI_OSABI ��: %d � %d ���り��ん\n"
-
-#: elfedit.c:163
-#, c-format
-msgid "%s: Failed to update ELF header: %s\n"
-msgstr "%s: ELF ヘッダ�更新�失敗����: %s\n"
-
-#: elfedit.c:196
-#, c-format
-msgid "Unsupported EI_CLASS: %d\n"
-msgstr "サ�ート�れ�� EI_CLASS ��: %d\n"
-
-#: elfedit.c:229
-msgid ""
-"This executable has been built without support for a\n"
-"64 bit data type and so it cannot process 64 bit ELF files.\n"
-msgstr ""
-"��実行ファイル� 64 ビットサ�ート無��コンパイル�れ��る��\n"
-"64 ビット ELF ファイルを処�����ん。\n"
-
-#: elfedit.c:270
-#, c-format
-msgid "%s: Failed to read ELF header\n"
-msgstr "%s: ELF ヘッダ�読�込��失敗����\n"
-
-#: elfedit.c:277
-#, c-format
-msgid "%s: Failed to seek to ELF header\n"
-msgstr "%s: ELF ヘッダ�探査 (seek) �失敗����\n"
-
-#: elfedit.c:331 readelf.c:13161
+#: elfedit.c:836 readelf.c:13018
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
 msgstr "%s: 次�書庫ヘッダ��探査 (seek) �失敗����\n"
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
+#: elfedit.c:867 elfedit.c:876 readelf.c:13046 readelf.c:13055
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr "%s: 誤��書庫ファイル���\n"
 
-#: elfedit.c:391 elfedit.c:483
+#: elfedit.c:896 elfedit.c:988
 #, c-format
 msgid "Input file '%s' is not readable\n"
 msgstr "入力ファイル '%s' �読�込��能���り��ん\n"
 
-#: elfedit.c:415
+#: elfedit.c:920
 #, c-format
 msgid "%s: failed to seek to archive member\n"
 msgstr "%s: 書庫�メン��探査 (seek) �失敗����\n"
 
-#: elfedit.c:454 readelf.c:13284
+#: elfedit.c:959 readelf.c:13134
 #, c-format
 msgid "'%s': No such file\n"
 msgstr "'%s': ��よ��ファイル��り��ん\n"
 
-#: elfedit.c:456 readelf.c:13286
+#: elfedit.c:961 readelf.c:13136
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr "'%s' を�置����ん���。システムエラーメッセージ: %s\n"
 
-#: elfedit.c:463 readelf.c:13293
+#: elfedit.c:968 readelf.c:13143
 #, c-format
 msgid "'%s' is not an ordinary file\n"
 msgstr "'%s' �正常�ファイル���り��ん\n"
 
-#: elfedit.c:489 readelf.c:13306
+#: elfedit.c:994 readelf.c:13156
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr "%s: ファイル�マジック番��読�出��失敗����\n"
 
-#: elfedit.c:547
+#: elfedit.c:1052
 #, c-format
 msgid "Unknown OSABI: %s\n"
 msgstr "�明� OSABI ��: %s\n"
 
-#: elfedit.c:566
+#: elfedit.c:1071
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr "�明�マシン型��: %s\n"
 
-#: elfedit.c:584
+#: elfedit.c:1089
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr "�明�マシン型��: %d\n"
 
-#: elfedit.c:603
+#: elfedit.c:1108
 #, c-format
 msgid "Unknown type: %s\n"
 msgstr "�明�型��: %s\n"
 
-#: elfedit.c:634
+#: elfedit.c:1139
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr "使用法: %s <option(s)> elffile(s)\n"
 
-#: elfedit.c:636
+#: elfedit.c:1141
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr "ELF ファイル� ELF ヘッダを更新���\n"
 
-#: elfedit.c:637 objcopy.c:475 objcopy.c:585
+#: elfedit.c:1142 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
 msgstr " オプション:\n"
 
-#: elfedit.c:638
+#: elfedit.c:1143
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -2471,26 +2432,31 @@ msgstr ""
 "  -h --help                   ��情報を表示�る\n"
 "  -v --version                %s ��ージョン情報を表示�る\n"
 
-#: emul_aix.c:45
+#: emul_aix.c:43
 #, c-format
 msgid "  [-g]         - 32 bit small archive\n"
 msgstr "  [-g]         - 32 ビット����書庫を作��る\n"
 
-#: emul_aix.c:46
+#: emul_aix.c:44
 #, c-format
 msgid "  [-X32]       - ignores 64 bit objects\n"
 msgstr "  [-X32]       - 64 ビットオブジェクトを無視�る\n"
 
-#: emul_aix.c:47
+#: emul_aix.c:45
 #, c-format
 msgid "  [-X64]       - ignores 32 bit objects\n"
 msgstr "  [-X64]       - 32 ビットオブジェクトを無視�る\n"
 
-#: emul_aix.c:48
+#: emul_aix.c:46
 #, c-format
 msgid "  [-X32_64]    - accepts 32 and 64 bit objects\n"
 msgstr "  [-X32_64]    - 32 �よ� 64 ビットオブジェクトを�容�る\n"
 
+#: emul_aix.c:99 emul_aix.c:109 emul_aix.c:119 emul_aix.c:129
+#, c-format
+msgid "target `%s' ignored."
+msgstr "ターゲット `%s' �無視�れ���。"
+
 #: ieee.c:311
 msgid "unexpected end of debugging information"
 msgstr "デ�ッグ情報�予期���所�終������"
@@ -2712,17 +2678,17 @@ msgstr "IEEE 数値�オー�ーフロー����: 0x"
 msgid "IEEE string length overflow: %u\n"
 msgstr "IEEE 文字列長�オー�ーフロー����: %u\n"
 
-#: ieee.c:5213
+#: ieee.c:5210
 #, c-format
 msgid "IEEE unsupported integer type size %u\n"
 msgstr "IEEE �整数型サイズ %u をサ�ート�����ん\n"
 
-#: ieee.c:5247
+#: ieee.c:5244
 #, c-format
 msgid "IEEE unsupported float type size %u\n"
 msgstr "IEEE �浮動�数型サイズ %u をサ�ート�����ん\n"
 
-#: ieee.c:5281
+#: ieee.c:5278
 #, c-format
 msgid "IEEE unsupported complex type size %u\n"
 msgstr "IEEE �複素数型サイズ %u をサ�ート�����ん\n"
@@ -2731,120 +2697,120 @@ msgstr "IEEE �複素数型サイズ %u をサ�ート�����ん\n"
 msgid "Duplicate symbol entered into keyword list."
 msgstr "�複��シンボル�キーワードシンボル�入れられ���。"
 
-#: nlmconv.c:274 srconv.c:1824
+#: nlmconv.c:273 srconv.c:1823
 msgid "input and output files must be different"
 msgstr "入力�出力�異�るファイル���れ��り��ん"
 
-#: nlmconv.c:321
+#: nlmconv.c:320
 msgid "input file named both on command line and with INPUT"
 msgstr "入力ファイル��コマンドライン� INPUT �両方�与�られ���"
 
-#: nlmconv.c:330
+#: nlmconv.c:329
 msgid "no input file"
 msgstr "入力ファイル��り��ん"
 
-#: nlmconv.c:360
+#: nlmconv.c:359
 msgid "no name for output file"
 msgstr "出力ファイル用�����り��ん"
 
-#: nlmconv.c:374
+#: nlmconv.c:373
 msgid "warning: input and output formats are not compatible"
 msgstr "警告: 入力�出力�形��互�性��り��ん"
 
-#: nlmconv.c:404
+#: nlmconv.c:403
 msgid "make .bss section"
 msgstr ".bss セクション�作�"
 
-#: nlmconv.c:414
+#: nlmconv.c:413
 msgid "make .nlmsections section"
 msgstr ".nlmsections セクション�作�"
 
-#: nlmconv.c:442
+#: nlmconv.c:441
 msgid "set .bss vma"
 msgstr ".bss vma を設定"
 
-#: nlmconv.c:449
+#: nlmconv.c:448
 msgid "set .data size"
 msgstr ".data size を設定"
 
-#: nlmconv.c:629
+#: nlmconv.c:628
 #, c-format
 msgid "warning: symbol %s imported but not in import list"
 msgstr "警告: シンボル %s � import �れ���� import リスト��り��ん"
 
-#: nlmconv.c:649
+#: nlmconv.c:648
 msgid "set start address"
 msgstr "開始アドレスを設定"
 
-#: nlmconv.c:698
+#: nlmconv.c:697
 #, c-format
 msgid "warning: START procedure %s not defined"
 msgstr "警告: START プロシージャ %s �定義�れ����ん"
 
-#: nlmconv.c:700
+#: nlmconv.c:699
 #, c-format
 msgid "warning: EXIT procedure %s not defined"
 msgstr "警告: EXIT プロシージャ %s �定義�れ����ん"
 
-#: nlmconv.c:702
+#: nlmconv.c:701
 #, c-format
 msgid "warning: CHECK procedure %s not defined"
 msgstr "警告: CHECK プロシージャ %s �定義�れ����ん"
 
-#: nlmconv.c:722 nlmconv.c:908
+#: nlmconv.c:721 nlmconv.c:907
 msgid "custom section"
 msgstr "カスタムセクション"
 
-#: nlmconv.c:742 nlmconv.c:937
+#: nlmconv.c:741 nlmconv.c:936
 msgid "help section"
 msgstr "ヘルプセクション"
 
-#: nlmconv.c:764 nlmconv.c:955
+#: nlmconv.c:763 nlmconv.c:954
 msgid "message section"
 msgstr "メッセージセクション"
 
-#: nlmconv.c:779 nlmconv.c:988
+#: nlmconv.c:778 nlmconv.c:987
 msgid "module section"
 msgstr "モジュールセクション"
 
-#: nlmconv.c:798 nlmconv.c:1004
+#: nlmconv.c:797 nlmconv.c:1003
 msgid "rpc section"
 msgstr "rpc セクション"
 
 #. There is no place to record this information.
-#: nlmconv.c:834
+#: nlmconv.c:833
 #, c-format
 msgid "%s: warning: shared libraries can not have uninitialized data"
 msgstr "%s: 警告: 共有ライブラリ�未�期化データを���������ん"
 
-#: nlmconv.c:855 nlmconv.c:1023
+#: nlmconv.c:854 nlmconv.c:1022
 msgid "shared section"
 msgstr "共有セクション"
 
-#: nlmconv.c:863
+#: nlmconv.c:862
 msgid "warning: No version number given"
 msgstr "警告: �ージョン番��与�られ����ん"
 
-#: nlmconv.c:903 nlmconv.c:932 nlmconv.c:950 nlmconv.c:999 nlmconv.c:1018
+#: nlmconv.c:902 nlmconv.c:931 nlmconv.c:949 nlmconv.c:998 nlmconv.c:1017
 #, c-format
 msgid "%s: read: %s"
 msgstr "%s: 読込�: %s"
 
-#: nlmconv.c:925
+#: nlmconv.c:924
 msgid "warning: FULLMAP is not supported; try ld -M"
 msgstr "警告: FULLMAP �サ�ート�れ����ん。 ld -M を試������"
 
-#: nlmconv.c:1101
+#: nlmconv.c:1100
 #, c-format
 msgid "Usage: %s [option(s)] [in-file [out-file]]\n"
 msgstr "使用法: %s [option(s)] [in-file [out-file]]\n"
 
-#: nlmconv.c:1102
+#: nlmconv.c:1101
 #, c-format
 msgid " Convert an object file into a NetWare Loadable Module\n"
 msgstr " オブジェクトファイルを NetWare ローダブルモジュール�変����\n"
 
-#: nlmconv.c:1103
+#: nlmconv.c:1102
 #, c-format
 msgid ""
 " The options are:\n"
@@ -2867,64 +2833,64 @@ msgstr ""
 "  -h --help                     ��情報を表示�る\n"
 "  -v --version                  プログラム��ージョンを表示�る\n"
 
-#: nlmconv.c:1144
+#: nlmconv.c:1143
 #, c-format
 msgid "support not compiled in for %s"
 msgstr "%s �対�るサ�ート�コンパイル時�組�込�れ����ん"
 
-#: nlmconv.c:1181
+#: nlmconv.c:1180
 msgid "make section"
 msgstr "make セクション"
 
-#: nlmconv.c:1195
+#: nlmconv.c:1194
 msgid "set section size"
 msgstr "セクションサイズを設定"
 
-#: nlmconv.c:1201
+#: nlmconv.c:1200
 msgid "set section alignment"
 msgstr "セクション�列を設定"
 
-#: nlmconv.c:1205
+#: nlmconv.c:1204
 msgid "set section flags"
 msgstr "セクションフラグを設定"
 
-#: nlmconv.c:1216
+#: nlmconv.c:1215
 msgid "set .nlmsections size"
 msgstr ".nlmsections サイズを設定"
 
-#: nlmconv.c:1297 nlmconv.c:1305 nlmconv.c:1314 nlmconv.c:1319
+#: nlmconv.c:1296 nlmconv.c:1304 nlmconv.c:1313 nlmconv.c:1318
 msgid "set .nlmsection contents"
 msgstr ".nlmsection �内容を設定"
 
-#: nlmconv.c:1796
+#: nlmconv.c:1795
 msgid "stub section sizes"
 msgstr "スタブセクションサイズ"
 
-#: nlmconv.c:1843
+#: nlmconv.c:1842
 msgid "writing stub"
 msgstr "スタブ�書込�中"
 
-#: nlmconv.c:1927
+#: nlmconv.c:1926
 #, c-format
 msgid "unresolved PC relative reloc against %s"
 msgstr "%s �対�る PC 関連��置を解決����ん"
 
-#: nlmconv.c:1991
+#: nlmconv.c:1990
 #, c-format
 msgid "overflow when adjusting relocation against %s"
 msgstr "%s �対�る��置を調整中�オー�ーフロー����"
 
-#: nlmconv.c:2118
+#: nlmconv.c:2117
 #, c-format
 msgid "%s: execution of %s failed: "
 msgstr "%s: %s �実行�失敗����: "
 
-#: nlmconv.c:2133
+#: nlmconv.c:2132
 #, c-format
 msgid "Execution of %s failed"
 msgstr "%s �実行�失敗����"
 
-#: nm.c:225 size.c:78 strings.c:650
+#: nm.c:225 size.c:78 strings.c:646
 #, c-format
 msgid "Usage: %s [option(s)] [file(s)]\n"
 msgstr "使用法: %s [option(s)] [file(s)]\n"
@@ -3029,17 +2995,17 @@ msgstr "%s: 無効�基数��"
 msgid "%s: invalid output format"
 msgstr "%s: 無効�出力形���"
 
-#: nm.c:346 readelf.c:8546 readelf.c:8591
+#: nm.c:346 readelf.c:8259 readelf.c:8304
 #, c-format
 msgid "<processor specific>: %d"
 msgstr "<プロセッサ固有>: %d"
 
-#: nm.c:348 readelf.c:8555 readelf.c:8609
+#: nm.c:348 readelf.c:8268 readelf.c:8322
 #, c-format
 msgid "<OS specific>: %d"
 msgstr "<OS 固有>: %d"
 
-#: nm.c:350 readelf.c:8558 readelf.c:8612
+#: nm.c:350 readelf.c:8271 readelf.c:8325
 #, c-format
 msgid "<unknown>: %d"
 msgstr "<�明>: %d"
@@ -3053,7 +3019,7 @@ msgstr ""
 "\n"
 "書庫索引:\n"
 
-#: nm.c:1254
+#: nm.c:1251
 #, c-format
 msgid ""
 "\n"
@@ -3066,7 +3032,7 @@ msgstr ""
 "%s �ら�未定義シンボル:\n"
 "\n"
 
-#: nm.c:1256
+#: nm.c:1253
 #, c-format
 msgid ""
 "\n"
@@ -3079,7 +3045,7 @@ msgstr ""
 "%s �ら�シンボル:\n"
 "\n"
 
-#: nm.c:1258 nm.c:1309
+#: nm.c:1255 nm.c:1306
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  Section\n"
@@ -3088,7 +3054,7 @@ msgstr ""
 "��                  値      クラス       型         サイズ     行 セクション\n"
 "\n"
 
-#: nm.c:1261 nm.c:1312
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         Size             Line  Section\n"
@@ -3097,7 +3063,7 @@ msgstr ""
 "��            値             クラス       型         サイズ             行 セクション\n"
 "\n"
 
-#: nm.c:1305
+#: nm.c:1302
 #, c-format
 msgid ""
 "\n"
@@ -3110,7 +3076,7 @@ msgstr ""
 "%s[%s] �ら�未定義シンボル:\n"
 "\n"
 
-#: nm.c:1307
+#: nm.c:1304
 #, c-format
 msgid ""
 "\n"
@@ -3123,29 +3089,29 @@ msgstr ""
 "%s[%s] �ら�シンボル:\n"
 "\n"
 
-#: nm.c:1399
+#: nm.c:1396
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr "表示幅��期化�れ����ん (%d)"
 
-#: nm.c:1627
+#: nm.c:1624
 msgid "Only -X 32_64 is supported"
 msgstr "-X 32_64 ��サ�ート�れ����"
 
-#: nm.c:1656
+#: nm.c:1653
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr "--size-sort �よ� --undefined-only オプションを�時�使用�����。"
 
-#: nm.c:1657
+#: nm.c:1654
 msgid "will produce no output, since undefined symbols have no size."
 msgstr "未定義シンボル�サイズ� 0 ���何も出力���ん。"
 
-#: nm.c:1685
+#: nm.c:1682
 #, c-format
 msgid "data size %ld"
 msgstr "データサイズ %ld"
 
-#: objcopy.c:473 srconv.c:1732
+#: objcopy.c:473 srconv.c:1731
 #, c-format
 msgid "Usage: %s [option(s)] in-file [out-file]\n"
 msgstr "使用法: %s [option(s)] in-file [out-file]\n"
@@ -3426,7 +3392,7 @@ msgstr "サ�ート�れるフラグ: %s"
 msgid "cannot open '%s': %s"
 msgstr "'%s' を開���ん: %s"
 
-#: objcopy.c:764 objcopy.c:3392
+#: objcopy.c:764 objcopy.c:3389
 #, c-format
 msgid "%s: fread failed"
 msgstr "%s: fread(3) �失敗����"
@@ -3481,295 +3447,294 @@ msgstr "stat(2) � `%s' �サイズ���負�値を返����"
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr "`%s' [�明] �ら `%s' [�明] �コピー���\n"
 
-#: objcopy.c:1429
+#: objcopy.c:1427
 msgid "Unable to change endianness of input file(s)"
 msgstr "入力ファイル�エンディアンを変更����ん"
 
-#: objcopy.c:1438
+#: objcopy.c:1436
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr "`%s' [%s] �ら `%s' [%s] �コピー���\n"
 
-#: objcopy.c:1487
+#: objcopy.c:1485
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr "入力ファイル `%s' ��イナリアーキテク�ャパラメータを無視���。"
 
-#: objcopy.c:1495
+#: objcopy.c:1493
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr "入力ファイル `%s' �形�を�識����ん"
 
-#: objcopy.c:1498
+#: objcopy.c:1496
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr "出力ファイル�アーキテク�ャ `%s' を表��������ん"
 
-#: objcopy.c:1561
+#: objcopy.c:1559
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr "警告: ファイル引数 (0x%s) > セクション引数 (0x%s)"
 
-#: objcopy.c:1620
+#: objcopy.c:1618
 #, c-format
 msgid "can't add section '%s'"
 msgstr "セクション '%s' を追加����ん"
 
-#: objcopy.c:1634
+#: objcopy.c:1632
 #, c-format
 msgid "can't create section `%s'"
 msgstr "セクション `%s' を作�����ん"
 
-#: objcopy.c:1680
+#: objcopy.c:1678
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr "デ�ッグリンクセクション `%s' を作�����ん"
 
-#: objcopy.c:1773
+#: objcopy.c:1771
 msgid "Can't fill gap after section"
 msgstr "セクション後�隙間を埋�られ��ん"
 
-#: objcopy.c:1797
+#: objcopy.c:1795
 msgid "can't add padding"
 msgstr "隙間詰�を追加����ん"
 
-#: objcopy.c:1888
+#: objcopy.c:1886
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr "デ�ッグリンクセクション `%s' を埋�られ��ん"
 
-#: objcopy.c:1951
+#: objcopy.c:1949
 msgid "error copying private BFD data"
 msgstr "プライベート BFD データをコピー中�エラー�発生����data"
 
-#: objcopy.c:1962
+#: objcopy.c:1960
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr "��ターゲット� %lu 代替マシンコードをサ�ート���ん"
 
-#: objcopy.c:1966
+#: objcopy.c:1964
 msgid "treating that number as an absolute e_machine value instead"
 msgstr "��番�を代�り�絶対的� e_machine 値���扱���"
 
-#: objcopy.c:1970
+#: objcopy.c:1968
 msgid "ignoring the alternative value"
 msgstr "代替�値を無視�����"
 
-#: objcopy.c:2002 objcopy.c:2038
+#: objcopy.c:2000 objcopy.c:2035
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr "書庫コピー����一時ディレクトリを作�����ん (エラー: %s)"
 
-#: objcopy.c:2068
+#: objcopy.c:2096
 msgid "Unable to recognise the format of file"
 msgstr "ファイル�形�を�識����ん"
 
-#: objcopy.c:2195
+#: objcopy.c:2194
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr "エラー: 入力ファイル '%s' �空��"
 
-#: objcopy.c:2339
+#: objcopy.c:2338
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr "セクション %s ���変更�複数回行�れ����"
 
-#: objcopy.c:2390
+#: objcopy.c:2389
 msgid "error in private header data"
 msgstr "プライベートヘッダデータ�エラー��り��"
 
-#: objcopy.c:2468
+#: objcopy.c:2467
 msgid "failed to create output section"
 msgstr "出力セクション�作��失敗����"
 
-#: objcopy.c:2482
+#: objcopy.c:2481
 msgid "failed to set size"
 msgstr "サイズ�設定�失敗����"
 
-#: objcopy.c:2496
+#: objcopy.c:2495
 msgid "failed to set vma"
 msgstr "vma �設定�失敗����"
 
-#: objcopy.c:2521
+#: objcopy.c:2520
 msgid "failed to set alignment"
 msgstr "整列�設定�失敗����"
 
-#: objcopy.c:2555
+#: objcopy.c:2554
 msgid "failed to copy private data"
 msgstr "プライベートデータ�コピー�失敗����"
 
-#: objcopy.c:2637
+#: objcopy.c:2636
 msgid "relocation count is negative"
 msgstr "��置数�負�値��"
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2698
+#: objcopy.c:2697
 #, c-format
 msgid "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr "�イト順を逆�����ん: セクション %s �長�� %d �割り切れ��れ�����ん"
 
-#: objcopy.c:2884
+#: objcopy.c:2883
 msgid "can't create debugging section"
 msgstr "デ�ッグセクションを作�����ん"
 
-#: objcopy.c:2897
+#: objcopy.c:2896
 msgid "can't set debugging section contents"
 msgstr "デ�ッグセクション�内容を設定����ん"
 
-#: objcopy.c:2905
+#: objcopy.c:2904
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr "%s �対��デ�ッグ情報を書�込む方法�分�り��ん"
 
-#: objcopy.c:3048
+#: objcopy.c:3046
 msgid "could not create temporary file to hold stripped copy"
 msgstr "�り除�れ�コピーを���る一時ファイル�作��失敗����"
 
-#: objcopy.c:3120
+#: objcopy.c:3118
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr "%s: PE �システム内�誤���ージョン��り��"
 
-#: objcopy.c:3150
+#: objcopy.c:3148
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr "�明� PE �システム: %s"
 
-#: objcopy.c:3212
+#: objcopy.c:3209
 msgid "byte number must be non-negative"
 msgstr "�イト数��負���れ��り��ん"
 
-#: objcopy.c:3218
+#: objcopy.c:3215
 #, c-format
 msgid "architecture %s unknown"
 msgstr "アーキテク�ャ %s ��明��"
 
-#: objcopy.c:3226
+#: objcopy.c:3223
 msgid "interleave must be positive"
 msgstr "interleave �正�数値���れ�����ん"
 
-#: objcopy.c:3235
+#: objcopy.c:3232
 msgid "interleave width must be positive"
 msgstr "interleave 幅�正�数値���れ�����ん"
 
-#: objcopy.c:3255 objcopy.c:3263
+#: objcopy.c:3252 objcopy.c:3260
 #, c-format
 msgid "%s both copied and removed"
 msgstr "%s コピー�削除�両方�指定�れ���"
 
-#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
-#: objcopy.c:3609 objcopy.c:3629
+#: objcopy.c:3359 objcopy.c:3439 objcopy.c:3547 objcopy.c:3578 objcopy.c:3602
+#: objcopy.c:3606 objcopy.c:3626
 #, c-format
 msgid "bad format for %s"
 msgstr "%s 用�����正�形���"
 
-#: objcopy.c:3374
+#: objcopy.c:3371
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr "開��������ん: %s: %s"
 
-#: objcopy.c:3519
+#: objcopy.c:3516
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr "警告: 0x%s �ら 0x%x ���隙間�埋�込�を切り詰���"
 
-#: objcopy.c:3680
+#: objcopy.c:3677
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr "長�セクション��扱��対�る�明�オプション '%s' ��"
 
-#: objcopy.c:3698
+#: objcopy.c:3695
 msgid "unable to parse alternative machine code"
 msgstr "代替マシンコードを解�����ん"
 
-#: objcopy.c:3743
+#: objcopy.c:3740
 msgid "number of bytes to reverse must be positive and even"
 msgstr "逆��る�イト数�正��数���れ�����ん"
 
-#: objcopy.c:3746
+#: objcopy.c:3743
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr "警告: ���る --reverse-bytes �値 %d �無視�����"
 
-#: objcopy.c:3761
+#: objcopy.c:3758
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr "%s: --heap �対�る無効�予約値��"
 
-#: objcopy.c:3767
+#: objcopy.c:3764
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr "%s: --heap �対�る無効�確定値��"
 
-#: objcopy.c:3792
+#: objcopy.c:3789
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr "%s: --stack �対�る無効�予約値��"
 
-#: objcopy.c:3798
+#: objcopy.c:3795
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr "%s: --stack �対�る無効�確定値��"
 
-#: objcopy.c:3827
+#: objcopy.c:3824
 msgid "interleave start byte must be set with --byte"
 msgstr "interleave �開始�イトを --byte �設定���れ�����ん"
 
-#: objcopy.c:3830
+#: objcopy.c:3827
 msgid "byte number must be less than interleave"
 msgstr "�イト数� interleave 未満���れ��り��ん"
 
-#: objcopy.c:3833
+#: objcopy.c:3830
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr ""
 
-#: objcopy.c:3860
+#: objcopy.c:3857
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr "�明�入力 EFI ターゲット��: %s"
 
-#: objcopy.c:3891
+#: objcopy.c:3888
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr "�明�出力 EFI ターゲット��: %s"
 
-#: objcopy.c:3904
+#: objcopy.c:3901
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr "警告: '%s' を�置����ん。システムエラーメッセージ: %s"
 
-#: objcopy.c:3916
+#: objcopy.c:3912
 #, c-format
 msgid "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr "警告: '%s' をコピー中�一時ファイルを作�����ん��� (エラー: %s)"
 
-#: objcopy.c:3944 objcopy.c:3958
+#: objcopy.c:3956 objcopy.c:3970
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr "%s %s%c0x%s �使�れる����り��ん"
 
-#: objdump.c:201
+#: objdump.c:190
 #, c-format
 msgid "Usage: %s <option(s)> <file(s)>\n"
 msgstr "使用法: %s <option(s)> <file(s)>\n"
 
-#: objdump.c:202
+#: objdump.c:191
 #, c-format
 msgid " Display information from object <file(s)>.\n"
 msgstr " オブジェクトファイル <file(s)> �情報を表示�る\n"
 
-#: objdump.c:203
+#: objdump.c:192
 #, c-format
 msgid " At least one of the following switches must be given:\n"
 msgstr " 下記�スイッ��中�最低一��指定���れ�����ん:\n"
 
-#: objdump.c:204
+#: objdump.c:193
 #, c-format
 msgid ""
 "  -a, --archive-headers    Display archive header information\n"
 "  -f, --file-headers       Display the contents of the overall file header\n"
 "  -p, --private-headers    Display object format specific file header contents\n"
-"  -P, --private=OPT,OPT... Display object format specific contents\n"
 "  -h, --[section-]headers  Display the contents of the section headers\n"
 "  -x, --all-headers        Display the contents of all headers\n"
 "  -d, --disassemble        Display assembler contents of executable sections\n"
@@ -3782,7 +3747,7 @@ msgid ""
 "  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Display DWARF info in the file\n"
 "  -t, --syms               Display the contents of the symbol table(s)\n"
 "  -T, --dynamic-syms       Display the contents of the dynamic symbol table\n"
@@ -3796,7 +3761,6 @@ msgstr ""
 "  -a, --archive-headers    書庫ヘッダ情報を表示�る\n"
 "  -f, --file-headers       全��ファイルヘッダ�内容を表示�る\n"
 "  -p, --private-headers    オブジェクト形�特有�ファイルヘッダ�内容を表示�る\n"
-"  -P, --private=OPT,OPT... オブジェクト形�特有�内容を表示�る\n"
 "  -h, --[section-]headers  セクションヘッダ�中身を表示�る\n"
 "  -x, --all-headers        全��ヘッダ�中身を表示�る\n"
 "  -d, --disassemble        実行�能セクション�アセンブラを表示�る\n"
@@ -3806,10 +3770,10 @@ msgstr ""
 "  -g, --debugging          オブジェクトファイル�デ�ッグ情報を表示�る\n"
 "  -e, --debugging-tags     ctags 形�を使用��デ�ッグ情報を表示�る\n"
 "  -G, --stabs              ファイル内�全��スタブ情報を (生�形��) 表示�る\n"
-"  -W[lLiaprmfFsoRt] ���\n"
+"  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           ファイル� DWARF 情報を表示�る\n"
 "  -t, --syms               シンボル表�内容を表示�る\n"
 "  -T, --dynamic-syms       動的シンボル表�内容を表示�る\n"
@@ -3821,7 +3785,7 @@ msgstr ""
 "                             表示�る\n"
 "  -H, --help               ��情報を表示�る\n"
 
-#: objdump.c:236
+#: objdump.c:222
 #, c-format
 msgid ""
 "\n"
@@ -3830,7 +3794,7 @@ msgstr ""
 "\n"
 " 以下�スイッ��オプション��:\n"
 
-#: objdump.c:237
+#: objdump.c:223
 #, c-format
 msgid ""
 "  -b, --target=BFDNAME           Specify the target object format as BFDNAME\n"
@@ -3853,11 +3817,12 @@ msgid ""
 "      --stop-address=ADDR        Only process data whose address is <= ADDR\n"
 "      --prefix-addresses         Print complete address alongside disassembly\n"
 "      --[no-]show-raw-insn       Display hex alongside symbolic disassembly\n"
-"      --insn-width=WIDTH         Display WIDTH bytes on a single line for -d\n"
+"      --insn-width=WIDTH         Display WIDTH bytes on a signle line for -d\n"
 "      --adjust-vma=OFFSET        Add OFFSET to all displayed section addresses\n"
 "      --special-syms             Include special symbols in symbol dumps\n"
 "      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
+"\n"
 msgstr ""
 "  -b, --target=BFDNAME           ターゲット�オブジェクト形�を BFDNAME �指定�る\n"
 "  -m, --architecture=MACHINE     ターゲット�アーキテク�ャを MACHINE �指定�る\n"
@@ -3877,76 +3842,61 @@ msgstr ""
 "  -z, --disassemble-zeroes       逆アセンブル時� 0 ���ブロックをスキップ���\n"
 "      --start-address=ADDR       アドレス� ADDR 以上�データ��処��る\n"
 "      --stop-address=ADDR        アドレス� ADDR 以下�データ��処��る\n"
-"      --prefix-addresses         逆アセンブル時�完全�アドレスを併��表示�る\n"
-"      --[no-]show-raw-insn       シンボルを使用��逆アセンブル時��六進数を併��表示�る\n"
-"      --insn-width=WIDTH         -d を使用時�一行�幅を WIDTH �表示�る\n"
-"      --adjust-vma=OFFSET        ����セクションアドレスを表示�る時� OFFSET を加�る\n"
+"      --prefix-addresses         Print complete address alongside disassembly\n"
+"      --[no-]show-raw-insn       Display hex alongside symbolic disassembly\n"
+"      --insn-width=WIDTH         Display WIDTH bytes on a signle line for -d\n"
+"      --adjust-vma=OFFSET        Add OFFSET to all displayed section addresses\n"
 "      --special-syms             シンボルダンプ時�特殊シンボルを��る\n"
-"      --prefix=PREFIX            -S を使用時�絶対パス� PREFIX を加�る\n"
-"      --prefix-strip=LEVEL       -S を使用時�ディレクトリ��先頭�ら LEVEL 階層分�り除�\n"
-
-#: objdump.c:263
-#, c-format
-msgid ""
-"      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"      --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                             or deeper\n"
-"\n"
-msgstr ""
-"      --dwarf-depth=N        N 以上�深�� DIE を表示���\n"
-"      --dwarf-start=N        N 以上�深�� DIE を表示�る\n"
-"\n"
-
-#: objdump.c:275
-#, c-format
-msgid ""
-"\n"
-"Options supported for -P/--private switch:\n"
-msgstr ""
+"      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
+"      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
 "\n"
-"-P/--private スイッ��サ�ート�れるオプション:\n"
 
-#: objdump.c:426
+#: objdump.c:396
 #, c-format
 msgid "section '%s' mentioned in a -j option, but not found in any input file"
 msgstr "セクション '%s' � -j オプション�指定�れ������入力ファイル�も�り��ん"
 
-#: objdump.c:530
+#: objdump.c:500
 #, c-format
 msgid "Sections:\n"
 msgstr "セクション:\n"
 
-#: objdump.c:533 objdump.c:537
+#: objdump.c:503 objdump.c:507
 #, c-format
 msgid "Idx Name          Size      VMA       LMA       File off  Algn"
 msgstr "索引�          サイズ      VMA       LMA       File off  Algn"
 
-#: objdump.c:539
+#: objdump.c:509
 #, c-format
 msgid "Idx Name          Size      VMA               LMA               File off  Algn"
 msgstr "索引�          サイズ      VMA               LMA               File off  Algn"
 
-#: objdump.c:543
+#: objdump.c:513
 #, c-format
 msgid "  Flags"
 msgstr " フラグ"
 
-#: objdump.c:586
+#: objdump.c:515
+#, c-format
+msgid "  Pg"
+msgstr "  Pg"
+
+#: objdump.c:558
 #, c-format
 msgid "%s: not a dynamic object"
 msgstr "%s: 動的オブジェクト���り��ん"
 
-#: objdump.c:1012 objdump.c:1036
+#: objdump.c:984 objdump.c:1008
 #, c-format
 msgid " (File Offset: 0x%lx)"
 msgstr " (ファイルオフセット: 0x%lx)"
 
-#: objdump.c:1662
+#: objdump.c:1634
 #, c-format
 msgid "disassemble_fn returned length %d"
 msgstr "disassemble_fn �長� %d を返����"
 
-#: objdump.c:1967
+#: objdump.c:1939
 #, c-format
 msgid ""
 "\n"
@@ -3955,17 +3905,17 @@ msgstr ""
 "\n"
 "セクション %s �逆アセンブル:\n"
 
-#: objdump.c:2143
+#: objdump.c:2115
 #, c-format
 msgid "can't use supplied machine %s"
 msgstr "与�られ�マシン %s を使用����ん"
 
-#: objdump.c:2162
+#: objdump.c:2134
 #, c-format
 msgid "can't disassemble for architecture %s\n"
 msgstr "アーキテク�ャ %s 用�逆アセンブル����ん\n"
 
-#: objdump.c:2242 objdump.c:2265
+#: objdump.c:2214 objdump.c:2237
 #, c-format
 msgid ""
 "\n"
@@ -3974,7 +3924,7 @@ msgstr ""
 "\n"
 "セクション '%s' �内容を�得����ん。\n"
 
-#: objdump.c:2406
+#: objdump.c:2378
 #, c-format
 msgid ""
 "No %s section present\n"
@@ -3983,12 +3933,12 @@ msgstr ""
 "%s セクション��り��ん\n"
 "\n"
 
-#: objdump.c:2415
+#: objdump.c:2387
 #, c-format
 msgid "reading %s section of %s failed: %s"
 msgstr "%2$s � %1$s セクション�読�込��失敗����: %3$s"
 
-#: objdump.c:2459
+#: objdump.c:2431
 #, c-format
 msgid ""
 "Contents of %s section:\n"
@@ -3997,17 +3947,17 @@ msgstr ""
 "%s セクション�内容:\n"
 "\n"
 
-#: objdump.c:2590
+#: objdump.c:2562
 #, c-format
 msgid "architecture: %s, "
 msgstr "アーキテク�ャ: %s, "
 
-#: objdump.c:2593
+#: objdump.c:2565
 #, c-format
 msgid "flags 0x%08x:\n"
 msgstr "フラグ 0x%08x:\n"
 
-#: objdump.c:2607
+#: objdump.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -4016,45 +3966,36 @@ msgstr ""
 "\n"
 "開始アドレス 0x"
 
-#: objdump.c:2633
-msgid "option -P/--private not supported by this file"
-msgstr "��ファイル��オプション -P/--private �サ�ート�れ����ん"
-
-#: objdump.c:2657
-#, c-format
-msgid "target specific dump '%s' not supported"
-msgstr "ターゲット特有�ダンプ '%s' �サ�ート�れ����ん"
-
-#: objdump.c:2721
+#: objdump.c:2642
 #, c-format
 msgid "Contents of section %s:"
 msgstr "セクション %s �内容:"
 
-#: objdump.c:2723
+#: objdump.c:2644
 #, c-format
 msgid "  (Starting at file offset: 0x%lx)"
 msgstr "  (開始ファイルオフセット: 0x%lx)"
 
-#: objdump.c:2729
+#: objdump.c:2650
 msgid "Reading section failed"
 msgstr "セクション�読�込��失敗����"
 
-#: objdump.c:2832
+#: objdump.c:2753
 #, c-format
 msgid "no symbols\n"
 msgstr "シンボル��り��ん\n"
 
-#: objdump.c:2839
+#: objdump.c:2760
 #, c-format
 msgid "no information for symbol number %ld\n"
 msgstr "シンボル番� %ld �関�る情報��り��ん\n"
 
-#: objdump.c:2842
+#: objdump.c:2763
 #, c-format
 msgid "could not determine the type of symbol number %ld\n"
 msgstr "シンボル番� %ld �型を決定����ん���\n"
 
-#: objdump.c:3163
+#: objdump.c:3043
 #, c-format
 msgid ""
 "\n"
@@ -4063,732 +4004,41 @@ msgstr ""
 "\n"
 "%s:     ファイル形� %s\n"
 
-#: objdump.c:3223
+#: objdump.c:3101
 #, c-format
 msgid "%s: printing debugging information failed"
 msgstr "%s: デ�ッグ情報�出力�失敗����"
 
-#: objdump.c:3327
+#: objdump.c:3205
 #, c-format
 msgid "In archive %s:\n"
 msgstr "書庫 %s 内:\n"
 
-#: objdump.c:3438
+#: objdump.c:3316
 msgid "error: the start address should be before the end address"
 msgstr "エラー: 開始アドレス�終了アドレスより����れ�����ん"
 
-#: objdump.c:3443
+#: objdump.c:3321
 msgid "error: the stop address should be after the start address"
 msgstr "エラー: �止アドレス�開始アドレスより後���れ�����ん"
 
-#: objdump.c:3455
+#: objdump.c:3333
 msgid "error: prefix strip must be non-negative"
 msgstr "エラー: prefix strip ��負�値���れ�����ん"
 
-#: objdump.c:3460
+#: objdump.c:3338
 msgid "error: instruction width must be positive"
 msgstr "エラー: 命令幅�正�数値���れ�����ん"
 
-#: objdump.c:3469
+#: objdump.c:3347
 msgid "unrecognized -E option"
 msgstr "-E �オプションを�識����ん"
 
-#: objdump.c:3480
+#: objdump.c:3358
 #, c-format
 msgid "unrecognized --endian type `%s'"
 msgstr "--endian タイプ `%s' を�識����ん"
 
-#: od-xcoff.c:75
-#, c-format
-msgid ""
-"For XCOFF files:\n"
-"  header      Display the file header\n"
-"  aout        Display the auxiliary header\n"
-"  sections    Display the section headers\n"
-"  syms        Display the symbols table\n"
-"  relocs      Display the relocation entries\n"
-"  lineno      Display the line number entries\n"
-"  loader      Display loader section\n"
-"  except      Display exception table\n"
-"  typchk      Display type-check section\n"
-"  traceback   Display traceback tags\n"
-"  toc         Display toc symbols\n"
-msgstr ""
-"XCOFF ファイル用:\n"
-"  header      ファイルヘッダを表示�る\n"
-"  aout        補助ヘッダを表示�る\n"
-"  sections    セクションヘッダを表示�る\n"
-"  syms        シンボル表を表示�る\n"
-"  relocs      ��置エントリを表示�る\n"
-"  lineno      行番�エントリを表示�る\n"
-"  loader      ローダーセクションを表示�る\n"
-"  except      例外表を表示�る\n"
-"  typchk      型検査セクションを表示�る\n"
-"  traceback   トレース�ックタグを表示�る\n"
-"  toc         toc シンボルを表示�る\n"
-
-#: od-xcoff.c:416
-#, c-format
-msgid "  nbr sections:  %d\n"
-msgstr "  セクション数:  %d\n"
-
-#: od-xcoff.c:417
-#, c-format
-msgid "  time and date: 0x%08x  - "
-msgstr "  時刻�よ�日付: 0x%08x  - "
-
-#: od-xcoff.c:419
-#, c-format
-msgid "not set\n"
-msgstr "設定�れ����ん\n"
-
-#: od-xcoff.c:426
-#, c-format
-msgid "  symbols off:   0x%08x\n"
-msgstr "  シンボルオフセット:   0x%08x\n"
-
-#: od-xcoff.c:427
-#, c-format
-msgid "  nbr symbols:   %d\n"
-msgstr "  シンボル数:   %d\n"
-
-#: od-xcoff.c:428
-#, c-format
-msgid "  opt hdr sz:    %d\n"
-msgstr "  オプションヘッダサイズ:    %d\n"
-
-#: od-xcoff.c:429
-#, c-format
-msgid "  flags:         0x%04x "
-msgstr "  フラグ:         0x%04x "
-
-#: od-xcoff.c:443
-#, c-format
-msgid "Auxiliary header:\n"
-msgstr "補助ヘッダ:\n"
-
-#: od-xcoff.c:446
-#, c-format
-msgid "  No aux header\n"
-msgstr "  補助ヘッダ��り��ん\n"
-
-#: od-xcoff.c:451
-#, c-format
-msgid "warning: optionnal header size too large (> %d)\n"
-msgstr "警告: オプションヘッダ�サイズ�大����� (%d より大��)\n"
-
-#: od-xcoff.c:457
-msgid "cannot read auxhdr"
-msgstr "補助ヘッダを読�込���ん"
-
-#: od-xcoff.c:462
-#, c-format
-msgid "  o_mflag (magic): 0x%04x 0%04o\n"
-msgstr "  o_mflag (magic): 0x%04x 0%04o\n"
-
-#: od-xcoff.c:463
-#, c-format
-msgid "  o_vstamp:        0x%04x\n"
-msgstr "  o_vstamp:        0x%04x\n"
-
-#: od-xcoff.c:465
-#, c-format
-msgid "  o_tsize:         0x%08x\n"
-msgstr "  o_tsize:         0x%08x\n"
-
-#: od-xcoff.c:467
-#, c-format
-msgid "  o_dsize:         0x%08x\n"
-msgstr "  o_dsize:         0x%08x\n"
-
-#: od-xcoff.c:469
-#, c-format
-msgid "  o_entry:         0x%08x\n"
-msgstr "  o_entry:         0x%08x\n"
-
-#: od-xcoff.c:471
-#, c-format
-msgid "  o_text_start:    0x%08x\n"
-msgstr "  o_text_start:    0x%08x\n"
-
-#: od-xcoff.c:473
-#, c-format
-msgid "  o_data_start:    0x%08x\n"
-msgstr "  o_data_start:    0x%08x\n"
-
-#: od-xcoff.c:477
-#, c-format
-msgid "  o_toc:           0x%08x\n"
-msgstr "  o_toc:           0x%08x\n"
-
-#: od-xcoff.c:479
-#, c-format
-msgid "  o_snentry:       0x%04x\n"
-msgstr "  o_snentry:       0x%04x\n"
-
-#: od-xcoff.c:481
-#, c-format
-msgid "  o_sntext:        0x%04x\n"
-msgstr "  o_sntext:        0x%04x\n"
-
-#: od-xcoff.c:483
-#, c-format
-msgid "  o_sndata:        0x%04x\n"
-msgstr "  o_sndata:        0x%04x\n"
-
-#: od-xcoff.c:485
-#, c-format
-msgid "  o_sntoc:         0x%04x\n"
-msgstr "  o_sntoc:         0x%04x\n"
-
-#: od-xcoff.c:487
-#, c-format
-msgid "  o_snloader:      0x%04x\n"
-msgstr "  o_snloader:      0x%04x\n"
-
-#: od-xcoff.c:489
-#, c-format
-msgid "  o_snbss:         0x%04x\n"
-msgstr "  o_snbss:         0x%04x\n"
-
-#: od-xcoff.c:491
-#, c-format
-msgid "  o_algntext:      %u\n"
-msgstr "  o_algntext:      %u\n"
-
-#: od-xcoff.c:493
-#, c-format
-msgid "  o_algndata:      %u\n"
-msgstr "  o_algndata:      %u\n"
-
-#: od-xcoff.c:495
-#, c-format
-msgid "  o_modtype:       0x%04x"
-msgstr "  o_modtype:       0x%04x"
-
-#: od-xcoff.c:500
-#, c-format
-msgid "  o_cputype:       0x%04x\n"
-msgstr "  o_cputype:       0x%04x\n"
-
-#: od-xcoff.c:502
-#, c-format
-msgid "  o_maxstack:      0x%08x\n"
-msgstr "  o_maxstack:      0x%08x\n"
-
-#: od-xcoff.c:504
-#, c-format
-msgid "  o_maxdata:       0x%08x\n"
-msgstr "  o_maxdata:       0x%08x\n"
-
-#: od-xcoff.c:507
-#, c-format
-msgid "  o_debugger:      0x%08x\n"
-msgstr "  o_debugger:      0x%08x\n"
-
-#: od-xcoff.c:521
-#, c-format
-msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
-msgstr "セクションヘッダ (%u+%u=0x%08x �ら 0x%08x):\n"
-
-#: od-xcoff.c:526
-#, c-format
-msgid "  No section header\n"
-msgstr "セクションヘッダ��り��ん\n"
-
-#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
-msgid "cannot read section header"
-msgstr "セクションヘッダを読�込���ん"
-
-#: od-xcoff.c:534
-#, c-format
-msgid " # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-msgstr " # ��     paddr    vaddr    サイズ   scnptr   relptr   lnnoptr  nrel  nlnno\n"
-
-#: od-xcoff.c:546
-#, c-format
-msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-msgstr "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-
-#: od-xcoff.c:557
-#, c-format
-msgid "            Flags: %08x "
-msgstr "            フラグ: %08x "
-
-#: od-xcoff.c:565
-#, c-format
-msgid "overflow - nreloc: %u, nlnno: %u\n"
-msgstr "overflow - nreloc: %u, nlnno: %u\n"
-
-#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
-msgid "cannot read section headers"
-msgstr "セクションヘッダを読�込���ん"
-
-#: od-xcoff.c:650
-msgid "cannot read strings table len"
-msgstr "文字列表長を読�込���ん"
-
-#: od-xcoff.c:664
-msgid "cannot read strings table"
-msgstr "文字列表を読�込���ん"
-
-#: od-xcoff.c:672
-msgid "cannot read symbol table"
-msgstr "シンボル表を読�込���ん"
-
-#: od-xcoff.c:687
-msgid "cannot read symbol entry"
-msgstr "シンボルエントリを読�込���ん"
-
-#: od-xcoff.c:722
-msgid "cannot read symbol aux entry"
-msgstr "シンボル補助エントリを読�込���ん"
-
-#: od-xcoff.c:744
-#, c-format
-msgid "Symbols table (strtable at 0x%08x)"
-msgstr "シンボル表 (strtable �置 0x%08x)"
-
-#: od-xcoff.c:749
-#, c-format
-msgid ""
-":\n"
-"  No symbols\n"
-msgstr ""
-":\n"
-"  シンボル��り��ん\n"
-
-#: od-xcoff.c:755
-#, c-format
-msgid " (no strings):\n"
-msgstr " (文字列��り��ん):\n"
-
-#: od-xcoff.c:757
-#, c-format
-msgid " (strings size: %08x):\n"
-msgstr " (文字列サイズ: %08x):\n"
-
-#: od-xcoff.c:770
-#, c-format
-msgid "  # sc         value    section  type aux name/off\n"
-msgstr "  # sc         値       section  型   aux name/off\n"
-
-#: od-xcoff.c:821
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-
-#: od-xcoff.c:827
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u\n"
-
-#. Function aux entry.
-#: od-xcoff.c:837
-#, c-format
-msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-msgstr "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-
-#: od-xcoff.c:856
-#, c-format
-msgid "  scnsym: %-8u"
-msgstr "  scnsym: %-8u"
-
-#: od-xcoff.c:858
-#, c-format
-msgid "  scnlen: %08x"
-msgstr "  scnlen: %08x"
-
-#: od-xcoff.c:859
-#, c-format
-msgid " h: parm=%08x sn=%04x al: 2**%u"
-msgstr " h: parm=%08x sn=%04x al: 2**%u"
-
-#: od-xcoff.c:863
-#, c-format
-msgid " typ: "
-msgstr " typ: "
-
-#: od-xcoff.c:865
-#, c-format
-msgid " cl: "
-msgstr " cl: "
-
-#: od-xcoff.c:878
-#, c-format
-msgid " ftype: %02x "
-msgstr " ftype: %02x "
-
-#: od-xcoff.c:881
-#, c-format
-msgid "fname: %.14s"
-msgstr "fname: %.14s"
-
-#: od-xcoff.c:887
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: od-xcoff.c:889
-#, c-format
-msgid "offset: %08x"
-msgstr "オフセット: %08x"
-
-#: od-xcoff.c:896
-#, c-format
-msgid "  lnno: %u\n"
-msgstr "  lnno: %u\n"
-
-#: od-xcoff.c:931
-#, c-format
-msgid "Relocations for %s (%u)\n"
-msgstr "%s (%u) 用���置\n"
-
-#: od-xcoff.c:934
-msgid "cannot read relocations"
-msgstr "��置を読�込���ん"
-
-#: od-xcoff.c:937
-#, c-format
-msgid "vaddr    sgn mod sz type  symndx symbol\n"
-msgstr "vaddr    sgn mod sz type  symndx symbol\n"
-
-#: od-xcoff.c:946
-msgid "cannot read relocation entry"
-msgstr "��置エントリを読�込���ん"
-
-#: od-xcoff.c:950
-#, c-format
-msgid "%08x  %c   %c  %-2u "
-msgstr "%08x  %c   %c  %-2u "
-
-#: od-xcoff.c:986
-#, c-format
-msgid "Line numbers for %s (%u)\n"
-msgstr "%s (%u) �行番�\n"
-
-#: od-xcoff.c:989
-msgid "cannot read line numbers"
-msgstr "行番�を読�込���ん"
-
-#: od-xcoff.c:992
-#, c-format
-msgid "lineno  symndx/paddr\n"
-msgstr "行番�  symndx/paddr\n"
-
-#: od-xcoff.c:1000
-msgid "cannot read line number entry"
-msgstr "行番�エントリを読�込���ん"
-
-#: od-xcoff.c:1004
-#, c-format
-msgid " %-6u "
-msgstr " %-6u "
-
-#: od-xcoff.c:1043
-#, c-format
-msgid "no .loader section in file\n"
-msgstr "��ファイル�� .loader セクション��り��ん\n"
-
-#: od-xcoff.c:1049
-#, c-format
-msgid "section .loader is too short\n"
-msgstr ".loader セクション�短����\n"
-
-#: od-xcoff.c:1056
-#, c-format
-msgid "Loader header:\n"
-msgstr "ローダヘッダ:\n"
-
-#: od-xcoff.c:1058
-#, c-format
-msgid "  version:           %u\n"
-msgstr "  �ージョン:           %u\n"
-
-#: od-xcoff.c:1061
-#, c-format
-msgid " Unhandled version\n"
-msgstr " 扱����ージョン��\n"
-
-#: od-xcoff.c:1066
-#, c-format
-msgid "  nbr symbols:       %u\n"
-msgstr "  シンボル数:       %u\n"
-
-#: od-xcoff.c:1068
-#, c-format
-msgid "  nbr relocs:        %u\n"
-msgstr "  ��置数:        %u\n"
-
-#: od-xcoff.c:1069
-#, c-format
-msgid "  import strtab len: %u\n"
-msgstr "  イン�ート文字列表: %u\n"
-
-#: od-xcoff.c:1072
-#, c-format
-msgid "  nbr import files:  %u\n"
-msgstr "  イン�ートファイル数:  %u\n"
-
-#: od-xcoff.c:1074
-#, c-format
-msgid "  import file off:   %u\n"
-msgstr "  イン�ートファイルオフセット:   %u\n"
-
-#: od-xcoff.c:1076
-#, c-format
-msgid "  string table len:  %u\n"
-msgstr "  文字列表長:  %u\n"
-
-#: od-xcoff.c:1078
-#, c-format
-msgid "  string table off:  %u\n"
-msgstr "  文字列表オフセット:  %u\n"
-
-#: od-xcoff.c:1081
-#, c-format
-msgid "Dynamic symbols:\n"
-msgstr "動的シンボル:\n"
-
-#: od-xcoff.c:1082
-#, c-format
-msgid "     # value     sc IFEW ty class file  pa name\n"
-msgstr "     # value     sc IFEW ty class file  pa name\n"
-
-#: od-xcoff.c:1087
-#, c-format
-msgid "  %4u %08x %3u "
-msgstr "  %4u %08x %3u "
-
-#: od-xcoff.c:1100
-#, c-format
-msgid " %3u %3u "
-msgstr " %3u %3u "
-
-#: od-xcoff.c:1109
-#, c-format
-msgid "(bad offset: %u)"
-msgstr "(間���オフセット: %u)"
-
-#: od-xcoff.c:1116
-#, c-format
-msgid "Dynamic relocs:\n"
-msgstr "動的��置:\n"
-
-#: od-xcoff.c:1117
-#, c-format
-msgid "  vaddr    sec    sz typ   sym\n"
-msgstr "  vaddr    sec    sz typ   sym\n"
-
-#: od-xcoff.c:1129
-#, c-format
-msgid "  %08x %3u %c%c %2u "
-msgstr "  %08x %3u %c%c %2u "
-
-#: od-xcoff.c:1140
-#, c-format
-msgid ".text"
-msgstr ".text"
-
-#: od-xcoff.c:1143
-#, c-format
-msgid ".data"
-msgstr ".data"
-
-#: od-xcoff.c:1146
-#, c-format
-msgid ".bss"
-msgstr ".bss"
-
-#: od-xcoff.c:1149
-#, c-format
-msgid "%u"
-msgstr "%u"
-
-#: od-xcoff.c:1155
-#, c-format
-msgid "Import files:\n"
-msgstr "イン�ートファイル:\n"
-
-#: od-xcoff.c:1187
-#, c-format
-msgid "no .except section in file\n"
-msgstr "ファイル� .except セクション��り��ん\n"
-
-#: od-xcoff.c:1195
-#, c-format
-msgid "Exception table:\n"
-msgstr "例外表:\n"
-
-#: od-xcoff.c:1196
-#, c-format
-msgid "lang reason sym/addr\n"
-msgstr "lang reason sym/addr\n"
-
-#: od-xcoff.c:1204
-#, c-format
-msgid "  %02x     %02x "
-msgstr "  %02x     %02x "
-
-#: od-xcoff.c:1209
-#, c-format
-msgid "@%08x"
-msgstr "@%08x"
-
-#: od-xcoff.c:1229
-#, c-format
-msgid "no .typchk section in file\n"
-msgstr "ファイル� .typchk セクション��り��ん\n"
-
-#: od-xcoff.c:1236
-#, c-format
-msgid "Type-check section:\n"
-msgstr "型検査セクション:\n"
-
-#: od-xcoff.c:1237
-#, c-format
-msgid "offset    len  lang-id general-hash language-hash\n"
-msgstr "offset    len  lang-id general-hash language-hash\n"
-
-#: od-xcoff.c:1282
-#, c-format
-msgid " address beyond section size\n"
-msgstr "アドレス�セクション長を超�����\n"
-
-#: od-xcoff.c:1292
-#, c-format
-msgid " tags at %08x\n"
-msgstr " タグ�置 %08x\n"
-
-#: od-xcoff.c:1299
-#, c-format
-msgid " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-msgstr " �ージョン: %u, 言語: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-
-#: od-xcoff.c:1306
-#, c-format
-msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-msgstr " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-
-#: od-xcoff.c:1312
-#, c-format
-msgid " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-msgstr " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-
-#: od-xcoff.c:1318
-#, c-format
-msgid " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-msgstr " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-
-#: od-xcoff.c:1324
-#, c-format
-msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-msgstr " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-
-#: od-xcoff.c:1337
-#, c-format
-msgid " parminfo: 0x%08x\n"
-msgstr " parminfo: 0x%08x\n"
-
-#: od-xcoff.c:1348
-#, c-format
-msgid " tb_offset: 0x%08x (start=0x%08x)\n"
-msgstr " tb_offset: 0x%08x (start=0x%08x)\n"
-
-#: od-xcoff.c:1359
-#, c-format
-msgid " hand_mask_offset: 0x%08x\n"
-msgstr " hand_mask_offset: 0x%08x\n"
-
-#: od-xcoff.c:1370
-#, c-format
-msgid " number of CTL anchors: %u\n"
-msgstr "CTL アンカー�数: %u\n"
-
-#: od-xcoff.c:1375
-#, c-format
-msgid "  CTL[%u]: %08x\n"
-msgstr "  CTL[%u]: %08x\n"
-
-#: od-xcoff.c:1389
-#, c-format
-msgid " Name (len: %u): "
-msgstr " �� (長�: %u): "
-
-#: od-xcoff.c:1392
-#, c-format
-msgid "[truncated]\n"
-msgstr "[切り詰�られ���]\n"
-
-#: od-xcoff.c:1407
-#, c-format
-msgid " alloca reg: %u\n"
-msgstr ""
-
-#: od-xcoff.c:1411
-#, c-format
-msgid " (end of tags at %08x)\n"
-msgstr " (%08x �タグ�終了����)\n"
-
-#: od-xcoff.c:1414
-#, c-format
-msgid " no tags found\n"
-msgstr " タグ�見��り��ん\n"
-
-#: od-xcoff.c:1418
-#, c-format
-msgid " Truncated .text section\n"
-msgstr " 切り詰�られ� .text セクション��\n"
-
-#: od-xcoff.c:1503
-#, c-format
-msgid "TOC:\n"
-msgstr "TOC:\n"
-
-#: od-xcoff.c:1546
-#, c-format
-msgid "Nbr entries: %-8u Size: %08x (%u)\n"
-msgstr "エントリ数: %-8u サイズ: %08x (%u)\n"
-
-#: od-xcoff.c:1630
-msgid "cannot read header"
-msgstr "ヘッダを読�込���ん"
-
-#: od-xcoff.c:1638
-#, c-format
-msgid "File header:\n"
-msgstr "ファイルヘッダ:\n"
-
-#: od-xcoff.c:1639
-#, c-format
-msgid "  magic:         0x%04x (0%04o)  "
-msgstr "  マジック番�:         0x%04x (0%04o)  "
-
-#: od-xcoff.c:1643
-#, c-format
-msgid "(WRMAGIC: writable text segments)"
-msgstr "(WRMAGIC: 書�込��能� text セグメント��)"
-
-#: od-xcoff.c:1646
-#, c-format
-msgid "(ROMAGIC: readonly sharablee text segments)"
-msgstr "(ROMAGIC: 読��り専用共有 text セグメント��)"
-
-#: od-xcoff.c:1649
-#, c-format
-msgid "(TOCMAGIC: readonly text segments and TOC)"
-msgstr "(TOCMAGIC: 読�込�専用 text セグメント�よ� TOC ��)"
-
-#: od-xcoff.c:1652
-#, c-format
-msgid "unknown magic"
-msgstr "�明�マジック番���"
-
-#: od-xcoff.c:1659
-#, c-format
-msgid "  Unhandled magic\n"
-msgstr "  �り扱���マジック番���\n"
-
 #: rclex.c:197
 msgid "invalid value specified for pragma code_page.\n"
 msgstr "pragma code_page �対��無効�値�指定�れ���。\n"
@@ -4828,231 +4078,231 @@ msgstr "%s: �識�れ�デ�ッグ情報��り��ん"
 msgid "Last stabs entries before error:\n"
 msgstr "エラー�直��スタブエントリ:\n"
 
-#: readelf.c:265
+#: readelf.c:268
 msgid "<none>"
 msgstr "<無�>"
 
-#: readelf.c:266
+#: readelf.c:269
 msgid "<no-name>"
 msgstr "<��無�>"
 
-#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
-#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
-#: readelf.c:12153
+#: readelf.c:270 readelf.c:5047 readelf.c:5557 readelf.c:7794 readelf.c:7912
+#: readelf.c:8865 readelf.c:8945 readelf.c:8998 readelf.c:11860
+#: readelf.c:11863
 msgid "<corrupt>"
 msgstr "<破�>"
 
-#: readelf.c:300
+#: readelf.c:308
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr "%2$s � 0x%1$lx ��探査 (seek) ����ん\n"
 
-#: readelf.c:315
+#: readelf.c:323
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr " %2$s ���� 0x%1$lx �イト�メモリを確�中�メモリ��足����\n"
 
-#: readelf.c:325
+#: readelf.c:333
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr "%2$s � 0x%1$lx �イトを読�込���ん\n"
 
-#: readelf.c:625
+#: readelf.c:697
 msgid "Don't know about relocations on this machine architecture\n"
 msgstr "��マシンアーキテク�ャ����置����解�����ん\n"
 
-#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+#: readelf.c:718 readelf.c:748 readelf.c:816 readelf.c:845
 msgid "relocs"
 msgstr "��置"
 
-#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
+#: readelf.c:730 readelf.c:760 readelf.c:827 readelf.c:856
 msgid "out of memory parsing relocs\n"
 msgstr "��置を解�中�メモリ��足����\n"
 
-#: readelf.c:889
+#: readelf.c:961
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr " オフセット 情報    型                  シンボル値  シンボル� + 加数\n"
 
-#: readelf.c:891
+#: readelf.c:963
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr " オフセット 情報    型              シンボル値 シンボル� + 加数\n"
 
-#: readelf.c:896
+#: readelf.c:968
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr " オフセット 情報    型                  シンボル値  シンボル�\n"
 
-#: readelf.c:898
+#: readelf.c:970
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr " オフセット 情報    型              シンボル値 シンボル�\n"
 
-#: readelf.c:906
+#: readelf.c:978
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend\n"
 msgstr "    オフセット         情報             型                 シンボル値      シンボル� + 加数\n"
 
-#: readelf.c:908
+#: readelf.c:980
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name + Addend\n"
 msgstr "  オフセット      情報           型             シンボル値    シンボル� + 加数\n"
 
-#: readelf.c:913
+#: readelf.c:985
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name\n"
 msgstr "    オフセット         情報             型                 シンボル値      シンボル�\n"
 
-#: readelf.c:915
+#: readelf.c:987
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr "  オフセット      情報           型             シンボル値    シンボル�\n"
 
-#: readelf.c:1219 readelf.c:1378 readelf.c:1386
+#: readelf.c:1291 readelf.c:1448 readelf.c:1456
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr "�識����ん: %-7lx"
 
-#: readelf.c:1244
+#: readelf.c:1316
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr "<�明�加数: %lx>"
 
-#: readelf.c:1251
+#: readelf.c:1323
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr "誤��シンボル索引: %08lx"
 
-#: readelf.c:1336
+#: readelf.c:1406
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr "<文字列表索引: %3ld>"
 
-#: readelf.c:1338
+#: readelf.c:1408
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr "<破���文字列表索引: %3ld>"
 
-#: readelf.c:1731
+#: readelf.c:1801
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr "プロセッサ固有: %lx"
 
-#: readelf.c:1755
+#: readelf.c:1825
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr "オペレーティングシステム固有: %lx"
 
-#: readelf.c:1759 readelf.c:2821
+#: readelf.c:1829 readelf.c:2875
 #, c-format
 msgid "<unknown>: %lx"
 msgstr "<�明>: %lx"
 
-#: readelf.c:1772
+#: readelf.c:1842
 msgid "NONE (None)"
 msgstr "NONE (無�)"
 
-#: readelf.c:1773
+#: readelf.c:1843
 msgid "REL (Relocatable file)"
 msgstr "REL (��置�能ファイル)"
 
-#: readelf.c:1774
+#: readelf.c:1844
 msgid "EXEC (Executable file)"
 msgstr "EXEC (実行�能ファイル)"
 
-#: readelf.c:1775
+#: readelf.c:1845
 msgid "DYN (Shared object file)"
 msgstr "DYN (共有オブジェクトファイル)"
 
-#: readelf.c:1776
+#: readelf.c:1846
 msgid "CORE (Core file)"
 msgstr "CORE (コアファイル)"
 
-#: readelf.c:1780
+#: readelf.c:1850
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr "プロセッサ固有: (%x)"
 
-#: readelf.c:1782
+#: readelf.c:1852
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr "OS 固有: (%x)"
 
-#: readelf.c:1784 readelf.c:3068
+#: readelf.c:1854 readelf.c:3122
 #, c-format
 msgid "<unknown>: %x"
 msgstr "<�明>: %x"
 
-#: readelf.c:1796
+#: readelf.c:1866
 msgid "None"
 msgstr "��"
 
-#: readelf.c:1964
+#: readelf.c:2034
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr "<�明>: 0x%x"
 
-#: readelf.c:2150
+#: readelf.c:2220
 msgid ", <unknown>"
 msgstr ", <�明>"
 
-#: readelf.c:2236 readelf.c:7428
+#: readelf.c:2291 readelf.c:7145
 msgid "unknown"
 msgstr "�明"
 
-#: readelf.c:2237
+#: readelf.c:2292
 msgid "unknown mac"
 msgstr "�明� mac"
 
-#: readelf.c:2301
+#: readelf.c:2356
 msgid ", relocatable"
 msgstr ", ��置�能"
 
-#: readelf.c:2304
+#: readelf.c:2359
 msgid ", relocatable-lib"
 msgstr ", ��置�能ライブラリ"
 
-#: readelf.c:2327
+#: readelf.c:2382
 msgid ", unknown v850 architecture variant"
 msgstr ", �明� v850 アーキテク�ャ�変種"
 
-#: readelf.c:2384
+#: readelf.c:2438
 msgid ", unknown CPU"
 msgstr ", �明� CPU"
 
-#: readelf.c:2399
+#: readelf.c:2453
 msgid ", unknown ABI"
 msgstr ", �明� ABI"
 
-#: readelf.c:2419 readelf.c:2453
+#: readelf.c:2473 readelf.c:2507
 msgid ", unknown ISA"
 msgstr ", �明� ISA"
 
-#: readelf.c:2626
+#: readelf.c:2680
 msgid "Standalone App"
 msgstr "独立アプリケーション"
 
-#: readelf.c:2635
+#: readelf.c:2689
 msgid "Bare-metal C6000"
 msgstr "ベアメタル C6000"
 
-#: readelf.c:2645 readelf.c:3431 readelf.c:3447
+#: readelf.c:2699 readelf.c:3462 readelf.c:3478
 #, c-format
 msgid "<unknown: %x>"
 msgstr "<�明: %x>"
 
-#: readelf.c:3123
+#: readelf.c:3172
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr "使用法: readelf <option(s)> elf-file(s)\n"
 
-#: readelf.c:3124
+#: readelf.c:3173
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr " ELF 形��ファイル�内容�関�る情報を表示���\n"
 
-#: readelf.c:3125
+#: readelf.c:3174
 #, c-format
 msgid ""
 " Options are:\n"
@@ -5085,7 +4335,7 @@ msgid ""
 "  -w[lLiaprmfFsoRt] or\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 " オプション:\n"
@@ -5101,9 +4351,9 @@ msgstr ""
 "  -s --syms              シンボル表を表示�る\n"
 "     --symbols           --syms �別�\n"
 "  --dyn-syms             動的シンボル表を表示�る\n"
-"  -n --notes             core 備考を表示�る (存在�る場�)\n"
+"  -n --notes             Display the core notes (if present)\n"
 "  -r --relocs            ��置を表示�る (存在�る場�)\n"
-"  -u --unwind            巻�戻� (unwind) 情報を表示�る (存在�る場�)\n"
+"  -u --unwind            Display the unwind info (if present)\n"
 "  -d --dynamic           動的セクションを表示�る (存在�る場�)\n"
 "  -V --version-info      �ージョンセクションを表示�る (存在�る場�)\n"
 "  -A --arch-specific     アーキテク�ャ固有情報を表示�る (�る物全�)\n"
@@ -5121,17 +4371,7 @@ msgstr ""
 "               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         DWARF2 デ�ッグセクション�内容を表示�る\n"
 
-#: readelf.c:3157
-#, c-format
-msgid ""
-"  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"  --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                         or deeper\n"
-msgstr ""
-"  --dwarf-depth=N        N 以上�深�� DIE を表示���\n"
-"  --dwarf-start=N        N 以上�深�� DIE を表示�る\n"
-
-#: readelf.c:3162
+#: readelf.c:3207
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
@@ -5140,7 +4380,7 @@ msgstr ""
 "  -i --instruction-dump=<number|name>\n"
 "                         セクション <number|name> �内容を逆アセンブル�る\n"
 
-#: readelf.c:3166
+#: readelf.c:3211
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -5155,96 +4395,96 @@ msgstr ""
 "  -H --help              ��情報を表示�る\n"
 "  -v --version           readelf ��ージョン番�を表示�る\n"
 
-#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
+#: readelf.c:3240 readelf.c:3269 readelf.c:3273 readelf.c:13224
 msgid "Out of memory allocating dump request table.\n"
 msgstr "ダンプ�求表�メモリを確�中�メモリ�足り���り���\n"
 
-#: readelf.c:3400
+#: readelf.c:3431
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr "無効�オプション '-%c'\n"
 
-#: readelf.c:3415
+#: readelf.c:3446
 msgid "Nothing to do.\n"
 msgstr "行����事��り��ん。\n"
 
-#: readelf.c:3427 readelf.c:3443 readelf.c:8013
+#: readelf.c:3458 readelf.c:3474 readelf.c:7730
 msgid "none"
 msgstr "��"
 
-#: readelf.c:3444
+#: readelf.c:3475
 msgid "2's complement, little endian"
 msgstr "2 �補数�リトルエンディアン"
 
-#: readelf.c:3445
+#: readelf.c:3476
 msgid "2's complement, big endian"
 msgstr "2 �補数�ビッグエンディアン"
 
-#: readelf.c:3463
+#: readelf.c:3494
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
 msgstr "ELF ファイル���り��ん - 始点��るマジック番��異�り��\n"
 
-#: readelf.c:3473
+#: readelf.c:3504
 #, c-format
 msgid "ELF Header:\n"
 msgstr "ELF ヘッダ:\n"
 
-#: readelf.c:3474
+#: readelf.c:3505
 #, c-format
 msgid "  Magic:   "
 msgstr "  マジック:  "
 
-#: readelf.c:3478
+#: readelf.c:3509
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr "  クラス:                            %s\n"
 
-#: readelf.c:3480
+#: readelf.c:3511
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr "  データ:                            %s\n"
 
-#: readelf.c:3482
+#: readelf.c:3513
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr "  �ージョン:                        %d %s\n"
 
-#: readelf.c:3487
+#: readelf.c:3518
 #, c-format
 msgid "<unknown: %lx>"
 msgstr "<�明: %lx>"
 
-#: readelf.c:3489
+#: readelf.c:3520
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr "  OS/ABI:                            %s\n"
 
-#: readelf.c:3491
+#: readelf.c:3522
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr "  ABI �ージョン:                    %d\n"
 
-#: readelf.c:3493
+#: readelf.c:3524
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr "  åž‹:                                %s\n"
 
-#: readelf.c:3495
+#: readelf.c:3526
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr "  マシン:                            %s\n"
 
-#: readelf.c:3497
+#: readelf.c:3528
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr "  �ージョン:                        0x%lx\n"
 
-#: readelf.c:3500
+#: readelf.c:3531
 #, c-format
 msgid "  Entry point address:               "
 msgstr "  エントリ�イントアドレス:          "
 
-#: readelf.c:3502
+#: readelf.c:3533
 #, c-format
 msgid ""
 "\n"
@@ -5253,7 +4493,7 @@ msgstr ""
 "\n"
 "  プログラム�開始ヘッダ:            "
 
-#: readelf.c:3504
+#: readelf.c:3535
 #, c-format
 msgid ""
 " (bytes into file)\n"
@@ -5262,60 +4502,61 @@ msgstr ""
 " (�イト)\n"
 "  セクションヘッダ始点:              "
 
-#: readelf.c:3506
+#: readelf.c:3537
 #, c-format
 msgid " (bytes into file)\n"
 msgstr " (�イト)\n"
 
-#: readelf.c:3508
+#: readelf.c:3539
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr "  フラグ:                            0x%lx%s\n"
 
-#: readelf.c:3511
+#: readelf.c:3542
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr "  ��ヘッダ�サイズ:                %ld (�イト)\n"
 
-#: readelf.c:3513
+#: readelf.c:3544
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr "  プログラムヘッダサイズ:            %ld (�イト)\n"
 
-#: readelf.c:3515
+#: readelf.c:3546
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr "  プログラムヘッダ数:                %ld"
 
-#: readelf.c:3522
+#: readelf.c:3551
+#, c-format
+msgid " (%ld)"
+msgstr " (%ld)"
+
+#: readelf.c:3553
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr "  セクションヘッダ:                  %ld (�イト)\n"
 
-#: readelf.c:3524
+#: readelf.c:3555
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr "  セクションヘッダサイズ:            %ld"
 
-#: readelf.c:3529
+#: readelf.c:3560
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr "  セクションヘッダ文字列表索引:      %ld"
 
-#: readelf.c:3536
+#: readelf.c:3567
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr " <破�: 範囲外>"
 
-#: readelf.c:3570 readelf.c:3604
+#: readelf.c:3601 readelf.c:3635
 msgid "program headers"
 msgstr "プログラムヘッダ"
 
-#: readelf.c:3671
-msgid "possibly corrupt ELF header - it has a non-zero program header offset, but no program headers"
-msgstr "ELF ヘッダ���ら�壊れ���� - 0 ���ヘッダオフセット��り����プログラムヘッダ��り��ん"
-
-#: readelf.c:3674
+#: readelf.c:3701
 #, c-format
 msgid ""
 "\n"
@@ -5324,7 +4565,7 @@ msgstr ""
 "\n"
 "��ファイル��プログラムヘッダ��り��ん。\n"
 
-#: readelf.c:3680
+#: readelf.c:3707
 #, c-format
 msgid ""
 "\n"
@@ -5333,12 +4574,12 @@ msgstr ""
 "\n"
 "Elf ファイルタイプ� %s ��\n"
 
-#: readelf.c:3681
+#: readelf.c:3708
 #, c-format
 msgid "Entry point "
 msgstr "エントリ�イント "
 
-#: readelf.c:3683
+#: readelf.c:3710
 #, c-format
 msgid ""
 "\n"
@@ -5347,7 +4588,7 @@ msgstr ""
 "\n"
 "%d 個�プログラムヘッダ�始点オフセット "
 
-#: readelf.c:3695 readelf.c:3697
+#: readelf.c:3722 readelf.c:3724
 #, c-format
 msgid ""
 "\n"
@@ -5356,55 +4597,55 @@ msgstr ""
 "\n"
 "プログラムヘッダ:\n"
 
-#: readelf.c:3701
+#: readelf.c:3728
 #, c-format
 msgid "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr "  タイプ       オフセット 仮想Addr   物�Addr   FileSiz MemSiz  Flg Align\n"
 
-#: readelf.c:3704
+#: readelf.c:3731
 #, c-format
 msgid "  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
-msgstr "  タイプ         Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
+msgstr ""
 
-#: readelf.c:3708
+#: readelf.c:3735
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr "  タイプ        オフセット          仮想Addr           物�Addr\n"
 
-#: readelf.c:3710
+#: readelf.c:3737
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
-msgstr "            ファイルサイズ        メモリサイズ         フラグ 整列\n"
+msgstr "            ファイルサイズ        メモリサイズ         フラグ アライン\n"
 
-#: readelf.c:3803
+#: readelf.c:3830
 msgid "more than one dynamic segment\n"
 msgstr "複数�動的セグメント\n"
 
-#: readelf.c:3822
+#: readelf.c:3849
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr "動的セグメント�内 .dynamic セクション��り��ん\n"
 
-#: readelf.c:3837
+#: readelf.c:3864
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr "動的セグメント内� .dynamic セクション���れ����ん\n"
 
-#: readelf.c:3840
+#: readelf.c:3867
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr ".dynamic セクション�動的セグメント�最��セクション���り��ん\n"
 
-#: readelf.c:3848
+#: readelf.c:3875
 msgid "Unable to find program interpreter name\n"
 msgstr "プログラムインタプリタ��見��り��ん\n"
 
-#: readelf.c:3855
+#: readelf.c:3882
 msgid "Internal error: failed to create format string to display program interpreter\n"
 msgstr "内部エラー: プログラムインタプリタを表示�る���書�文字列作��失敗����\n"
 
-#: readelf.c:3859
+#: readelf.c:3886
 msgid "Unable to read program interpreter name\n"
 msgstr "プログラムインタプリタ�を読�込���ん\n"
 
-#: readelf.c:3862
+#: readelf.c:3889
 #, c-format
 msgid ""
 "\n"
@@ -5413,7 +4654,7 @@ msgstr ""
 "\n"
 "      [�求�れるプログラムインタプリタ: %s]"
 
-#: readelf.c:3874
+#: readelf.c:3901
 #, c-format
 msgid ""
 "\n"
@@ -5422,50 +4663,46 @@ msgstr ""
 "\n"
 " セグメントマッピング��セクション:\n"
 
-#: readelf.c:3875
+#: readelf.c:3902
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr "  セグメントセクション...\n"
 
-#: readelf.c:3911
+#: readelf.c:3938
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr "プログラムヘッダ無��仮想アドレスを解釈����ん。\n"
 
-#: readelf.c:3927
+#: readelf.c:3954
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr "仮想アドレス 0x%lx ��� PT_LOAD セグメント�も�置�����ん。\n"
 
-#: readelf.c:3942 readelf.c:3985
+#: readelf.c:3969 readelf.c:4012
 msgid "section headers"
 msgstr "セクションヘッダ"
 
-#: readelf.c:4032 readelf.c:4107
+#: readelf.c:4059 readelf.c:4134
 msgid "sh_entsize is zero\n"
 msgstr "sh_entsize � 0 ��\n"
 
-#: readelf.c:4040 readelf.c:4115
+#: readelf.c:4067 readelf.c:4142
 msgid "Invalid sh_entsize\n"
 msgstr "無効� sh_entsize ��\n"
 
-#: readelf.c:4045 readelf.c:4120
+#: readelf.c:4072 readelf.c:4147
 msgid "symbols"
 msgstr "シンボル"
 
-#: readelf.c:4057 readelf.c:4132
+#: readelf.c:4084 readelf.c:4159
 msgid "symtab shndx"
-msgstr "symtab shndx"
+msgstr ""
 
-#: readelf.c:4392
+#: readelf.c:4419
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr "UNKNOWN (%*.*lx)"
 
-#: readelf.c:4414
-msgid "possibly corrupt ELF file header - it has a non-zero section header offset, but no section headers\n"
-msgstr "ELF ファイルヘッダ�壊れ��るよ��� - 0 ���セクションヘッダオフセット��り����セクションヘッダ��り��ん\n"
-
-#: readelf.c:4417
+#: readelf.c:4440 readelf.c:4920
 #, c-format
 msgid ""
 "\n"
@@ -5474,38 +4711,38 @@ msgstr ""
 "\n"
 "��ファイル��セクション��り��ん。\n"
 
-#: readelf.c:4423
+#: readelf.c:4446
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr "%d 個�セクションヘッダ�始点オフセット 0x%lx:\n"
 
-#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
-#: readelf.c:7036 readelf.c:9132
+#: readelf.c:4467 readelf.c:5043 readelf.c:5454 readelf.c:5760 readelf.c:6173
+#: readelf.c:6754 readelf.c:8843
 msgid "string table"
 msgstr "文字列表"
 
-#: readelf.c:4511
+#: readelf.c:4534
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr "セクション %d �無効� sh_entsize %lx (予期�れる�� %lx) ��\n"
 
-#: readelf.c:4531
+#: readelf.c:4554
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr "ファイル�複数�動的シンボルテーブルを�ん����\n"
 
-#: readelf.c:4544
+#: readelf.c:4567
 msgid "File contains multiple dynamic string tables\n"
 msgstr "ファイル�複数�動的文字列テーブルを�ん����\n"
 
-#: readelf.c:4550
+#: readelf.c:4573
 msgid "dynamic strings"
 msgstr "動的文字列"
 
-#: readelf.c:4557
+#: readelf.c:4580
 msgid "File contains multiple symtab shndx tables\n"
-msgstr "ファイル�複数� symtab shndx 表��り��\n"
+msgstr ""
 
-#: readelf.c:4627
+#: readelf.c:4648
 #, c-format
 msgid ""
 "\n"
@@ -5514,7 +4751,7 @@ msgstr ""
 "\n"
 "セクションヘッダ:\n"
 
-#: readelf.c:4629
+#: readelf.c:4650
 #, c-format
 msgid ""
 "\n"
@@ -5523,62 +4760,62 @@ msgstr ""
 "\n"
 "セクションヘッダ:\n"
 
-#: readelf.c:4635 readelf.c:4646 readelf.c:4657
+#: readelf.c:4656 readelf.c:4667 readelf.c:4678
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr "  [番] ��\n"
 
-#: readelf.c:4636
+#: readelf.c:4657
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr "       型              アドレス Off    サイズ ES   Lk Inf Al\n"
 
-#: readelf.c:4640
+#: readelf.c:4661
 #, c-format
 msgid "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [番] ��              タイプ          アドレス Off    サイズ ES Flg Lk Inf Al\n"
 
-#: readelf.c:4647
+#: readelf.c:4668
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr "       型              アドレス         Off    サイズ ES   Lk Inf Al\n"
 
-#: readelf.c:4651
+#: readelf.c:4672
 #, c-format
 msgid "  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [番] ��              型              アドレス         Off    サイズ ES Flg Lk Inf Al\n"
 
-#: readelf.c:4658
+#: readelf.c:4679
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr "       型                アドレス         オフセット        リンク\n"
 
-#: readelf.c:4659
+#: readelf.c:4680
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr "       サイズ            EntSize          情報              整列\n"
 
-#: readelf.c:4663
+#: readelf.c:4684
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr "  [番] ��              タイプ           アドレス          オフセット\n"
 
-#: readelf.c:4664
+#: readelf.c:4685
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr "       サイズ            EntSize          フラグ Link  情報  整列\n"
 
-#: readelf.c:4669
+#: readelf.c:4690
 #, c-format
 msgid "       Flags\n"
 msgstr "       フラグ\n"
 
-#: readelf.c:4748
+#: readelf.c:4769
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr "セクション %u: sh_link �値 %u �セクション数より大����\n"
 
-#: readelf.c:4847
+#: readelf.c:4868
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5591,7 +4828,7 @@ msgstr ""
 "  I (情報), L (リンク順), G (グループ), T (TLS), E (排他), x (�明)\n"
 "  O (追加� OS 処��必�) o (OS 固有), p (プロセッサ固有)\n"
 
-#: readelf.c:4852
+#: readelf.c:4873
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5604,25 +4841,16 @@ msgstr ""
 "  I (情報), L (リンク順), G (グループ), T (TLS), E (排他), x (�明)\n"
 "  O (追加� OS 処��必�) o (OS 固有), p (プロセッサ固有)\n"
 
-#: readelf.c:4874
+#: readelf.c:4895
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr "[<�明>: 0x%x] "
 
-#: readelf.c:4899
-#, c-format
-msgid ""
-"\n"
-"There are no sections to group in this file.\n"
-msgstr ""
-"\n"
-"��ファイル��グループ化�るセクション��り��ん。\n"
-
-#: readelf.c:4906
+#: readelf.c:4927
 msgid "Section headers are not available!\n"
 msgstr "セクションヘッダ�利用����ん!\n"
 
-#: readelf.c:4930
+#: readelf.c:4951
 #, c-format
 msgid ""
 "\n"
@@ -5631,26 +4859,26 @@ msgstr ""
 "\n"
 "��ファイル��セクショングループ��り��ん。\n"
 
-#: readelf.c:4967
+#: readelf.c:4988
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
 msgstr "グループセクション `%s' 内�誤�� sh_link ��\n"
 
-#: readelf.c:4981
+#: readelf.c:5002
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr "グループセクション `%s' 内�破���ヘッダ��\n"
 
-#: readelf.c:4992
+#: readelf.c:5013
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr "グループセクション `%s' 内�誤�� sh_info ��\n"
 
-#: readelf.c:5031
+#: readelf.c:5052
 msgid "section data"
 msgstr "セクションデータ"
 
-#: readelf.c:5040
+#: readelf.c:5061
 #, c-format
 msgid ""
 "\n"
@@ -5659,47 +4887,47 @@ msgstr ""
 "\n"
 "%s グループセクション [%5u] `%s' [%s] � %u 個�セクションを����:\n"
 
-#: readelf.c:5043
+#: readelf.c:5064
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr "   [索引]     ��\n"
 
-#: readelf.c:5057
+#: readelf.c:5078
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr "グループセクション [%2$5u] �セクション [%1$5u]  > 最大セクション [%3$5u] ��\n"
 
-#: readelf.c:5066
+#: readelf.c:5087
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr "グループセクション [%2$5u] �セクション [%1$5u] �既�グループセクション [%3$5u] �属�����\n"
 
-#: readelf.c:5079
+#: readelf.c:5100
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr "グループセクション [%5u] �セクション 0 ��り��\n"
 
-#: readelf.c:5146
+#: readelf.c:5167
 msgid "dynamic section image fixups"
 msgstr "動的セクションイメージ修正"
 
-#: readelf.c:5158
+#: readelf.c:5179
 #, c-format
 msgid ""
 "\n"
 "Image fixups for needed library #%d: %s - ident: %lx\n"
 msgstr ""
 
-#: readelf.c:5161
+#: readelf.c:5182
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr ""
 
-#: readelf.c:5193
+#: readelf.c:5214
 msgid "dynamic section image relas"
 msgstr ""
 
-#: readelf.c:5197
+#: readelf.c:5218
 #, c-format
 msgid ""
 "\n"
@@ -5708,16 +4936,16 @@ msgstr ""
 "\n"
 "イメージ��置\n"
 
-#: readelf.c:5199
+#: readelf.c:5220
 #, c-format
 msgid "Seg Offset   Type                            Addend            Seg Sym Off\n"
-msgstr "Seg Offset   åž‹                              Addend            Seg Sym Off\n"
+msgstr ""
 
-#: readelf.c:5254
+#: readelf.c:5275
 msgid "dynamic string section"
 msgstr "動的文字列セクション"
 
-#: readelf.c:5355
+#: readelf.c:5376
 #, c-format
 msgid ""
 "\n"
@@ -5726,7 +4954,7 @@ msgstr ""
 "\n"
 "オフセット0x%2$lx ��る '%1$s' ��置セクション� %3$ld �イト�構��れ����:\n"
 
-#: readelf.c:5370
+#: readelf.c:5391
 #, c-format
 msgid ""
 "\n"
@@ -5735,7 +4963,7 @@ msgstr ""
 "\n"
 "��ファイル��動的��置��り��ん。\n"
 
-#: readelf.c:5394
+#: readelf.c:5415
 #, c-format
 msgid ""
 "\n"
@@ -5744,17 +4972,17 @@ msgstr ""
 "\n"
 "��置セクション "
 
-#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#: readelf.c:5420 readelf.c:5836 readelf.c:5851 readelf.c:6188
 #, c-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: readelf.c:5401 readelf.c:5832 readelf.c:6169
+#: readelf.c:5422 readelf.c:5853 readelf.c:6190
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr " (オフセット 0x%lx) � %lu 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:5452
+#: readelf.c:5473
 #, c-format
 msgid ""
 "\n"
@@ -5763,21 +4991,21 @@ msgstr ""
 "\n"
 "��ファイル����置�れるも���り��ん。\n"
 
-#: readelf.c:5590
+#: readelf.c:5611
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr "\t�明��ージョン��。\n"
 
-#: readelf.c:5643 readelf.c:6016
+#: readelf.c:5664 readelf.c:6037
 msgid "unwind table"
 msgstr "巻�戻� (unwind) 表"
 
-#: readelf.c:5685 readelf.c:6098 readelf.c:6358
+#: readelf.c:5706 readelf.c:6119 readelf.c:6365
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr "所期�����置型 %s をスキップ�����\n"
 
-#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
+#: readelf.c:5768 readelf.c:6181 readelf.c:6762 readelf.c:6808
 #, c-format
 msgid ""
 "\n"
@@ -5786,18 +5014,18 @@ msgstr ""
 "\n"
 "��ファイル��スタック巻�戻� (unwind) セクション��り��ん。\n"
 
-#: readelf.c:5810
+#: readelf.c:5831
 #, c-format
 msgid ""
 "\n"
 "Could not find unwind info section for "
 msgstr ""
 
-#: readelf.c:5823
+#: readelf.c:5844
 msgid "unwind info"
 msgstr "巻�戻� (unwind) 情報"
 
-#: readelf.c:5825 readelf.c:6166
+#: readelf.c:5846 readelf.c:6187
 #, c-format
 msgid ""
 "\n"
@@ -5806,110 +5034,106 @@ msgstr ""
 "\n"
 "巻�戻� (unwind) セクション "
 
-#: readelf.c:6275
+#: readelf.c:6296
 msgid "unwind data"
 msgstr "巻�戻� (unwind) データ"
 
-#: readelf.c:6329
+#: readelf.c:6350
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
 msgstr "オフセット 0x%lx ��る予期�����置をスキップ�����\n"
 
-#: readelf.c:6433
+#: readelf.c:6426
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr "[切り詰�られ�オペコード]\n"
 
-#: readelf.c:6477 readelf.c:6677
+#: readelf.c:6429
 #, c-format
-msgid "Refuse to unwind"
-msgstr "巻�戻� (unwind) 拒�"
+msgid "0x%02x "
+msgstr "0x%02x "
 
-#: readelf.c:6500
+#: readelf.c:6451
 #, c-format
-msgid "     [Reserved]"
-msgstr "     [予約]"
+msgid "  Personality routine: "
+msgstr ""
 
-#: readelf.c:6528
+#: readelf.c:6469
 #, c-format
-msgid "     finish"
-msgstr "     終了"
+msgid "  [Truncated data]\n"
+msgstr "  [切り詰�られ�データ]\n"
 
-#: readelf.c:6533 readelf.c:6619
+#: readelf.c:6484
 #, c-format
-msgid "[Spare]"
+msgid "  [reserved compact index %d]\n"
 msgstr ""
 
-#: readelf.c:6640 readelf.c:6774
+#: readelf.c:6488
 #, c-format
-msgid "     [unsupported opcode]"
-msgstr "     [サ�ート�れ��オペコード]"
+msgid "  Compact model %d\n"
+msgstr ""
 
-#: readelf.c:6666
+#: readelf.c:6515
 #, c-format
 msgid "  0x%02x "
 msgstr "  0x%02x "
 
-#: readelf.c:6671
+#: readelf.c:6520
 #, c-format
-msgid "     sp = sp + %d"
-msgstr "     sp = sp + %d"
+msgid "     vsp = vsp + %d"
+msgstr "     vsp = vsp + %d"
 
-#: readelf.c:6724
+#: readelf.c:6525
 #, c-format
-msgid "pop frame {"
-msgstr ""
+msgid "     vsp = vsp - %d"
+msgstr "     vsp = vsp - %d"
 
-#: readelf.c:6735
-msgid "[pad]"
-msgstr ""
-
-#: readelf.c:6763
+#: readelf.c:6531
 #, c-format
-msgid "sp = sp + %ld"
-msgstr "sp = sp + %ld"
+msgid "Refuse to unwind"
+msgstr "巻�戻� (unwind) 拒�"
 
-#: readelf.c:6821
+#: readelf.c:6554
 #, c-format
-msgid "  Personality routine: "
-msgstr ""
+msgid "     [Reserved]"
+msgstr "     [予約]"
 
-#: readelf.c:6839
+#: readelf.c:6556
 #, c-format
-msgid "  [Truncated data]\n"
-msgstr "  [切り詰�られ�データ]\n"
+msgid "     vsp = r%d"
+msgstr "     vsp = r%d"
 
-#: readelf.c:6854
+#: readelf.c:6581
 #, c-format
-msgid "  Compact model %d\n"
-msgstr ""
+msgid "     finish"
+msgstr "     終了"
 
-#: readelf.c:6890
+#: readelf.c:6586
 #, c-format
-msgid "  Restore stack from frame pointer\n"
+msgid "[Spare]"
 msgstr ""
 
-#: readelf.c:6892
+#: readelf.c:6620
 #, c-format
-msgid "  Stack increment %d\n"
-msgstr ""
+msgid "vsp = vsp + %ld"
+msgstr "vsp = vsp + %ld"
 
-#: readelf.c:6893
+#: readelf.c:6627
 #, c-format
-msgid "  Registers restored: "
-msgstr ""
+msgid "[unsupported two-byte opcode]"
+msgstr "[サ�ート�れ��2�イト�オペコード]"
 
-#: readelf.c:6898
+#: readelf.c:6631
 #, c-format
-msgid "  Return register: %s\n"
-msgstr "  戻りレジスタ: %s\n"
+msgid "     [unsupported opcode]"
+msgstr "     [サ�ート�れ��オペコード]"
 
-#: readelf.c:6981
+#: readelf.c:6715
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr "0x%lx を�む .ARM.extab セクションを�置����ん\n"
 
-#: readelf.c:7050
+#: readelf.c:6768
 #, c-format
 msgid ""
 "\n"
@@ -5918,31 +5142,31 @@ msgstr ""
 "\n"
 "オフセット 0x%2$lx ��る巻�戻�表索引 '%1$s' � %3$lu 個�エントリ�構��れ����:\n"
 
-#: readelf.c:7102
+#: readelf.c:6819
 #, c-format
 msgid "NONE\n"
-msgstr "NONE\n"
+msgstr ""
 
-#: readelf.c:7128
+#: readelf.c:6845
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr "インターフェース�ージョン: %s\n"
 
-#: readelf.c:7130
+#: readelf.c:6847
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr "<破�: %ld>\n"
 
-#: readelf.c:7143
+#: readelf.c:6860
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr "タイムスタンプ: %s\n"
 
-#: readelf.c:7320 readelf.c:7366
+#: readelf.c:7037 readelf.c:7083
 msgid "dynamic section"
 msgstr "動的セクション"
 
-#: readelf.c:7444
+#: readelf.c:7161
 #, c-format
 msgid ""
 "\n"
@@ -5951,31 +5175,31 @@ msgstr ""
 "\n"
 "��ファイル��動的セクション��り��ん。\n"
 
-#: readelf.c:7482
+#: readelf.c:7199
 msgid "Unable to seek to end of file!\n"
 msgstr "ファイル終端 (EOF) ��探査 (seek) ����ん!\n"
 
-#: readelf.c:7495
+#: readelf.c:7212
 msgid "Unable to determine the number of symbols to load\n"
 msgstr "ロード���シンボル�数を決定����ん\n"
 
-#: readelf.c:7530
+#: readelf.c:7247
 msgid "Unable to seek to end of file\n"
 msgstr "ファイル末尾� seek ����ん\n"
 
-#: readelf.c:7537
+#: readelf.c:7254
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr "動的文字列テーブル�長�を決定����ん\n"
 
-#: readelf.c:7543
+#: readelf.c:7260
 msgid "dynamic string table"
 msgstr "動的文字列表"
 
-#: readelf.c:7580
+#: readelf.c:7297
 msgid "symbol information"
 msgstr "シンボル情報"
 
-#: readelf.c:7605
+#: readelf.c:7322
 #, c-format
 msgid ""
 "\n"
@@ -5984,86 +5208,86 @@ msgstr ""
 "\n"
 "オフセット 0x%lx ��る動的セクション� %u 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:7608
+#: readelf.c:7325
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr " タグ        タイプ                       ��/値\n"
 
-#: readelf.c:7644
+#: readelf.c:7361
 #, c-format
 msgid "Auxiliary library"
 msgstr "補助ライブラリ"
 
-#: readelf.c:7648
+#: readelf.c:7365
 #, c-format
 msgid "Filter library"
 msgstr "フィルタライブラリ"
 
-#: readelf.c:7652
+#: readelf.c:7369
 #, c-format
 msgid "Configuration file"
 msgstr "設定ファイル"
 
-#: readelf.c:7656
+#: readelf.c:7373
 #, c-format
 msgid "Dependency audit library"
 msgstr "�存関係監査ライブラリ"
 
-#: readelf.c:7660
+#: readelf.c:7377
 #, c-format
 msgid "Audit library"
 msgstr "監査ライブラリ"
 
-#: readelf.c:7678 readelf.c:7706 readelf.c:7734
+#: readelf.c:7395 readelf.c:7423 readelf.c:7451
 #, c-format
 msgid "Flags:"
 msgstr "フラグ:"
 
-#: readelf.c:7681 readelf.c:7709 readelf.c:7736
+#: readelf.c:7398 readelf.c:7426 readelf.c:7453
 #, c-format
 msgid " None\n"
 msgstr " 無�\n"
 
-#: readelf.c:7857
+#: readelf.c:7574
 #, c-format
 msgid "Shared library: [%s]"
 msgstr "共有ライブラリ: [%s]"
 
-#: readelf.c:7860
+#: readelf.c:7577
 #, c-format
 msgid " program interpreter"
 msgstr " プログラムインタプリタ"
 
-#: readelf.c:7864
+#: readelf.c:7581
 #, c-format
 msgid "Library soname: [%s]"
 msgstr "ライブラリ� soname: [%s]"
 
-#: readelf.c:7868
+#: readelf.c:7585
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr "ライブラリ� rpath: [%s]"
 
-#: readelf.c:7872
+#: readelf.c:7589
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr "ライブラリ� runpath: [%s]"
 
-#: readelf.c:7905
+#: readelf.c:7622
 #, c-format
 msgid " (bytes)\n"
 msgstr " (�イト)\n"
 
-#: readelf.c:7935
+#: readelf.c:7652
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr "���オブジェクト: [%s]\n"
 
-#: readelf.c:8035
+#: readelf.c:7752
 msgid "| <unknown>"
 msgstr "| <�明>"
 
-#: readelf.c:8068
+#: readelf.c:7785
 #, c-format
 msgid ""
 "\n"
@@ -6072,61 +5296,61 @@ msgstr ""
 "\n"
 "�ージョン定義セクション '%s' � %u 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:8071
+#: readelf.c:7788
 #, c-format
 msgid "  Addr: 0x"
 msgstr "  アドレス: 0x"
 
-#: readelf.c:8073 readelf.c:8191 readelf.c:8332
+#: readelf.c:7790 readelf.c:7908 readelf.c:8046
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr " オフセット: %#08lx  リンク: %u (%s)\n"
 
-#: readelf.c:8081
+#: readelf.c:7798
 msgid "version definition section"
 msgstr "�ージョン定義セクション"
 
-#: readelf.c:8114
+#: readelf.c:7831
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr "  %#06x: Rev: %d  フラグ: %s"
 
-#: readelf.c:8117
+#: readelf.c:7834
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr "  索引: %d  Cnt: %d  "
 
-#: readelf.c:8133
+#: readelf.c:7850
 #, c-format
 msgid "Name: %s\n"
 msgstr "��: %s\n"
 
-#: readelf.c:8135
+#: readelf.c:7852
 #, c-format
 msgid "Name index: %ld\n"
 msgstr "��索引: %ld\n"
 
-#: readelf.c:8157
+#: readelf.c:7874
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr "  %#06x: 親 %d: %s\n"
 
-#: readelf.c:8160
+#: readelf.c:7877
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr "  %#06x: 親 %d, ��索引: %ld\n"
 
-#: readelf.c:8165
+#: readelf.c:7882
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr "  セクション終了後��ージョン定義補助\n"
 
-#: readelf.c:8171
+#: readelf.c:7888
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr "  セクション終了後��ージョン定義\n"
 
-#: readelf.c:8186
+#: readelf.c:7903
 #, c-format
 msgid ""
 "\n"
@@ -6135,65 +5359,65 @@ msgstr ""
 "\n"
 "必��ージョンセクション '%s' � %u 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:8189
+#: readelf.c:7906
 #, c-format
 msgid " Addr: 0x"
 msgstr " アドレス: 0x"
 
-#: readelf.c:8200
+#: readelf.c:7917
 msgid "version need section"
 msgstr "必��ージョンセクション"
 
-#: readelf.c:8228
+#: readelf.c:7945
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr "  %#06x: �ージョン: %d"
 
-#: readelf.c:8231
+#: readelf.c:7948
 #, c-format
 msgid "  File: %s"
 msgstr "  ファイル: %s"
 
-#: readelf.c:8233
+#: readelf.c:7950
 #, c-format
 msgid "  File: %lx"
 msgstr "  ファイル: %lx"
 
-#: readelf.c:8235
+#: readelf.c:7952
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr "  個数: %d\n"
 
-#: readelf.c:8260
+#: readelf.c:7977
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr "  %#06x:   ��: %s"
 
-#: readelf.c:8263
+#: readelf.c:7980
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr "  %#06x:     ��索引: %lx"
 
-#: readelf.c:8266
+#: readelf.c:7983
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr " フラグ: %s  �ージョン: %d\n"
 
-#: readelf.c:8278
+#: readelf.c:7995
 #, c-format
 msgid "  Version need aux past end of section\n"
 msgstr "  セクション終了後�必��ージョン補助\n"
 
-#: readelf.c:8283
+#: readelf.c:8000
 #, c-format
 msgid "  Version need past end of section\n"
 msgstr "  セクション終了後�必��ージョン\n"
 
-#: readelf.c:8320
+#: readelf.c:8037
 msgid "version string table"
 msgstr "�ージョン文字列表"
 
-#: readelf.c:8327
+#: readelf.c:8041
 #, c-format
 msgid ""
 "\n"
@@ -6202,48 +5426,48 @@ msgstr ""
 "\n"
 "�ージョンシンボルセクション '%s' � %d 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:8330
+#: readelf.c:8044
 #, c-format
 msgid " Addr: "
 msgstr " アドレス: "
 
-#: readelf.c:8341
+#: readelf.c:8055
 msgid "version symbol data"
 msgstr "�ージョンシンボルデータ"
 
-#: readelf.c:8369
+#: readelf.c:8082
 msgid "   0 (*local*)    "
 msgstr "   0 (*局 所*)    "
 
-#: readelf.c:8373
+#: readelf.c:8086
 msgid "   1 (*global*)   "
 msgstr "   1 (*大 域*)    "
 
-#: readelf.c:8386
+#: readelf.c:8099
 msgid "invalid index into symbol array\n"
-msgstr "シンボル�列�無効�添�字��\n"
+msgstr ""
 
-#: readelf.c:8420 readelf.c:9199
+#: readelf.c:8133 readelf.c:8910
 msgid "version need"
 msgstr "必��ージョン"
 
-#: readelf.c:8430
+#: readelf.c:8143
 msgid "version need aux (2)"
 msgstr "必��ージョン補助 (2)"
 
-#: readelf.c:8445 readelf.c:8500
+#: readelf.c:8158 readelf.c:8213
 msgid "*invalid*"
 msgstr "*無効*"
 
-#: readelf.c:8475 readelf.c:9264
+#: readelf.c:8188 readelf.c:8975
 msgid "version def"
 msgstr "�ージョン定義"
 
-#: readelf.c:8495 readelf.c:9279
+#: readelf.c:8208 readelf.c:8990
 msgid "version def aux"
 msgstr "�ージョン定義補助"
 
-#: readelf.c:8529
+#: readelf.c:8242
 #, c-format
 msgid ""
 "\n"
@@ -6252,37 +5476,37 @@ msgstr ""
 "\n"
 "��ファイル�ら��ージョン情報�見��り��ん。\n"
 
-#: readelf.c:8728
+#: readelf.c:8441
 #, c-format
 msgid "<other>: %x"
 msgstr "<��他>: %x"
 
-#: readelf.c:8789
+#: readelf.c:8500
 msgid "Unable to read in dynamic data\n"
 msgstr "動的データを読込���ん\n"
 
-#: readelf.c:8839
+#: readelf.c:8550
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr " <破�: %14ld>"
 
-#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
+#: readelf.c:8593 readelf.c:8645 readelf.c:8669 readelf.c:8699 readelf.c:8723
 msgid "Unable to seek to start of dynamic information\n"
 msgstr "動的情報�開始�置��探査 (seek) ����ん\n"
 
-#: readelf.c:8888 readelf.c:8940
+#: readelf.c:8599 readelf.c:8651
 msgid "Failed to read in number of buckets\n"
 msgstr "�ケット数�読込��失敗����\n"
 
-#: readelf.c:8894
+#: readelf.c:8605
 msgid "Failed to read in number of chains\n"
 msgstr "�ェイン数�読込��失敗����\n"
 
-#: readelf.c:8996
+#: readelf.c:8707
 msgid "Failed to determine last chain length\n"
 msgstr "最後��ェイン長�決定�失敗����\n"
 
-#: readelf.c:9040
+#: readelf.c:8751
 #, c-format
 msgid ""
 "\n"
@@ -6291,17 +5515,17 @@ msgstr ""
 "\n"
 "イメージ�シンボル表:\n"
 
-#: readelf.c:9042 readelf.c:9060
+#: readelf.c:8753 readelf.c:8771
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
 msgstr " bucket数:    値   サイズ  タイプ  Bind Vis      索引�\n"
 
-#: readelf.c:9044 readelf.c:9062
+#: readelf.c:8755 readelf.c:8773
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
 msgstr " bucket数:    値            サイズ  タイプ  Bind Vis      索引�\n"
 
-#: readelf.c:9058
+#: readelf.c:8769
 #, c-format
 msgid ""
 "\n"
@@ -6310,7 +5534,7 @@ msgstr ""
 "\n"
 "イメージ� `.gnu.hash' �シンボル表:\n"
 
-#: readelf.c:9101
+#: readelf.c:8812
 #, c-format
 msgid ""
 "\n"
@@ -6319,7 +5543,7 @@ msgstr ""
 "\n"
 "シンボル表 '%s' � sh_entsize � 0 ��!\n"
 
-#: readelf.c:9106
+#: readelf.c:8817
 #, c-format
 msgid ""
 "\n"
@@ -6328,29 +5552,29 @@ msgstr ""
 "\n"
 "シンボルテーブル '%s' � %lu 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:9111
+#: readelf.c:8822
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr "  番�:      値 サイズ タイプ  Bind   Vis      索引�\n"
 
-#: readelf.c:9113
+#: readelf.c:8824
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr "  番�:      値         サイズ タイプ  Bind   Vis      索引�\n"
 
-#: readelf.c:9170
+#: readelf.c:8881
 msgid "version data"
 msgstr "�ージョンデータ"
 
-#: readelf.c:9212
+#: readelf.c:8923
 msgid "version need aux (3)"
 msgstr "必��ージョン補助 (3)"
 
-#: readelf.c:9239
+#: readelf.c:8950
 msgid "bad dynamic symbol\n"
 msgstr "誤��動的シンボル\n"
 
-#: readelf.c:9303
+#: readelf.c:9014
 #, c-format
 msgid ""
 "\n"
@@ -6359,7 +5583,7 @@ msgstr ""
 "\n"
 "動的シンボル情報�表示用シンボル����利用����ん。\n"
 
-#: readelf.c:9315
+#: readelf.c:9026
 #, c-format
 msgid ""
 "\n"
@@ -6368,12 +5592,12 @@ msgstr ""
 "\n"
 "�ケットリスト長�度数分布 (全 %lu 個��ケット):\n"
 
-#: readelf.c:9317 readelf.c:9387
+#: readelf.c:9028 readelf.c:9098
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr "   長�  個数        �有率      範囲\n"
 
-#: readelf.c:9385
+#: readelf.c:9096
 #, c-format
 msgid ""
 "\n"
@@ -6382,7 +5606,7 @@ msgstr ""
 "\n"
 "`.gnu.hash' �ケットリスト長�度数分布 (全 %lu 個��ケット):\n"
 
-#: readelf.c:9451
+#: readelf.c:9162
 #, c-format
 msgid ""
 "\n"
@@ -6391,41 +5615,41 @@ msgstr ""
 "\n"
 "オフセット 0x%lx �動的情報セグメント� %d 個�エントリ�ら構��れ����:\n"
 
-#: readelf.c:9454
+#: readelf.c:9165
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr "番�: ��                           境界��    フラグ\n"
 
-#: readelf.c:9463
+#: readelf.c:9174
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr "<破�: %19ld>"
 
-#: readelf.c:9545
+#: readelf.c:9256
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
 msgstr "SYM_DIFF ��置後�処��れ���� MN10300 ��置型�見��り���"
 
-#: readelf.c:9705
+#: readelf.c:9416
 #, c-format
 msgid "Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"
 msgstr "マシン番� %d � DWARF セクション内�使用�れる 32ビット��置型�関�る知識��り��ん。\n"
 
-#: readelf.c:10009
+#: readelf.c:9720
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
 msgstr "セクション %2$s �サ�ート�れ������置型 %1$d を�用����ん\n"
 
-#: readelf.c:10017
+#: readelf.c:9728
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
 msgstr "セクション %2$s 内��る無効���置オフセット 0x%1$lx　をスキップ�����\n"
 
-#: readelf.c:10041
+#: readelf.c:9752
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
 msgstr "セクション %3$s � %2$ld 番目���置��る予期���シンボル型 %1$s をスキップ�����\n"
 
-#: readelf.c:10087
+#: readelf.c:9798
 #, c-format
 msgid ""
 "\n"
@@ -6434,7 +5658,7 @@ msgstr ""
 "\n"
 "セクション %s �アセンブリダンプ\n"
 
-#: readelf.c:10108
+#: readelf.c:9819
 #, c-format
 msgid ""
 "\n"
@@ -6443,11 +5667,11 @@ msgstr ""
 "\n"
 "セクション '%s' �ダンプ��るデータを������ん。\n"
 
-#: readelf.c:10114
+#: readelf.c:9825
 msgid "section contents"
 msgstr "セクション�内容"
 
-#: readelf.c:10133
+#: readelf.c:9844
 #, c-format
 msgid ""
 "\n"
@@ -6456,17 +5680,17 @@ msgstr ""
 "\n"
 "セクション '%s' �文字列ダンプ:\n"
 
-#: readelf.c:10151
+#: readelf.c:9862
 #, c-format
 msgid "  Note: This section has relocations against it, but these have NOT been applied to this dump.\n"
-msgstr "  備考: ��セクション���置��り������ダンプ���用�れ����ん。\n"
+msgstr ""
 
-#: readelf.c:10182
+#: readelf.c:9893
 #, c-format
 msgid "  No strings found in this section."
 msgstr "  ��セクション内��文字列�見��り��ん���。"
 
-#: readelf.c:10204
+#: readelf.c:9915
 #, c-format
 msgid ""
 "\n"
@@ -6475,17 +5699,17 @@ msgstr ""
 "\n"
 "セクション '%s' � �六進数ダンプ:\n"
 
-#: readelf.c:10228
+#: readelf.c:9939
 #, c-format
 msgid " NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"
-msgstr " 備考: ��セクション����置��り������ダンプ���用�れ����ん。\n"
+msgstr ""
 
-#: readelf.c:10362
+#: readelf.c:10073
 #, c-format
 msgid "%s section data"
 msgstr "%s セクションデータ"
 
-#: readelf.c:10427
+#: readelf.c:10138
 #, c-format
 msgid ""
 "\n"
@@ -6498,246 +5722,246 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10436
+#: readelf.c:10147
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
 msgstr "セクション '%s' � NOBITS 型�� - 内容�信頼����ん\n"
 
-#: readelf.c:10472
+#: readelf.c:10183
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr "�識������ッグセクション��: %s\n"
 
-#: readelf.c:10500
+#: readelf.c:10211
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr "セクション '%s' �存在�����ダンプ�れ��ん���!\n"
 
-#: readelf.c:10541
+#: readelf.c:10252
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr "セクション %d �存在�����ダンプ�れ��ん���!\n"
 
-#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
+#: readelf.c:10430 readelf.c:10444 readelf.c:10463 readelf.c:10781
 #, c-format
 msgid "None\n"
 msgstr "��\n"
 
-#: readelf.c:10720
+#: readelf.c:10431
 #, c-format
 msgid "Application\n"
-msgstr "アプリケーション\n"
+msgstr ""
 
-#: readelf.c:10721
+#: readelf.c:10432
 #, c-format
 msgid "Realtime\n"
-msgstr "リアルタイム\n"
+msgstr ""
 
-#: readelf.c:10722
+#: readelf.c:10433
 #, c-format
 msgid "Microcontroller\n"
-msgstr "マイクロコントローラ\n"
+msgstr ""
 
-#: readelf.c:10723
+#: readelf.c:10434
 #, c-format
 msgid "Application or Realtime\n"
-msgstr "アプリケーション���リアルタイム\n"
+msgstr ""
 
-#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
-#: readelf.c:11217 readelf.c:11238
+#: readelf.c:10445 readelf.c:10465 readelf.c:10835 readelf.c:10853
+#: readelf.c:10928 readelf.c:10949
 #, c-format
 msgid "8-byte\n"
 msgstr "8-�イト\n"
 
-#: readelf.c:10735 readelf.c:11220 readelf.c:11241
+#: readelf.c:10446 readelf.c:10931 readelf.c:10952
 #, c-format
 msgid "4-byte\n"
 msgstr "4-�イト\n"
 
-#: readelf.c:10739 readelf.c:10758
+#: readelf.c:10450 readelf.c:10469
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr "8-�イト�よ� %d-�イト���拡張\n"
 
-#: readelf.c:10753
+#: readelf.c:10464
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr "末端� SP を除� 8-�イト\n"
 
-#: readelf.c:10769 readelf.c:10859 readelf.c:11256
+#: readelf.c:10480 readelf.c:10570 readelf.c:10967
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr "フラグ = %d, ベンダー = %s\n"
 
-#: readelf.c:10775
+#: readelf.c:10486
 #, c-format
 msgid "True\n"
 msgstr ""
 
-#: readelf.c:10904 readelf.c:11008
+#: readelf.c:10615 readelf.c:10719
 #, c-format
 msgid "Hard or soft float\n"
 msgstr "�ードウェア���ソフトウェア浮動�数\n"
 
-#: readelf.c:10907
+#: readelf.c:10618
 #, c-format
 msgid "Hard float\n"
 msgstr "�ードウェア浮動�数\n"
 
-#: readelf.c:10910 readelf.c:11017
+#: readelf.c:10621 readelf.c:10728
 #, c-format
 msgid "Soft float\n"
 msgstr "ソフトウェア浮動�数\n"
 
-#: readelf.c:10913
+#: readelf.c:10624
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr "�精度�ードウェア浮動�数\n"
 
-#: readelf.c:10930 readelf.c:10956
+#: readelf.c:10641 readelf.c:10667
 #, c-format
 msgid "Any\n"
 msgstr ""
 
-#: readelf.c:10933
+#: readelf.c:10644
 #, c-format
 msgid "Generic\n"
 msgstr ""
 
-#: readelf.c:10962
+#: readelf.c:10673
 #, c-format
 msgid "Memory\n"
-msgstr "メモリ\n"
+msgstr ""
 
-#: readelf.c:11011
+#: readelf.c:10722
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr "�ードウェア浮動�数 (�精度)\n"
 
-#: readelf.c:11014
+#: readelf.c:10725
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr "�ードウェア浮動�数 (�精度)\n"
 
-#: readelf.c:11020
+#: readelf.c:10731
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr "�ードウェア浮動�数 (MIPS32r2 64-bit FPU)\n"
 
-#: readelf.c:11103
+#: readelf.c:10814
 #, c-format
 msgid "Not used\n"
 msgstr "未使用\n"
 
-#: readelf.c:11106
+#: readelf.c:10817
 #, c-format
 msgid "2 bytes\n"
 msgstr "2 �イト\n"
 
-#: readelf.c:11109
+#: readelf.c:10820
 #, c-format
 msgid "4 bytes\n"
 msgstr "4 �イト\n"
 
-#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
+#: readelf.c:10838 readelf.c:10856 readelf.c:10934 readelf.c:10955
 #, c-format
 msgid "16-byte\n"
 msgstr "16-�イト\n"
 
-#: readelf.c:11160
+#: readelf.c:10871
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr "DSBT アドレス�使用�れ����ん\n"
 
-#: readelf.c:11163
+#: readelf.c:10874
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr "DSBT アドレス�使用�れ����\n"
 
-#: readelf.c:11178
+#: readelf.c:10889
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr "データアドレス��置�存��\n"
 
-#: readelf.c:11181
+#: readelf.c:10892
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr "データアドレス��置��存�� GOT � DP �近���り��\n"
 
-#: readelf.c:11184
+#: readelf.c:10895
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr "データアドレス��置��存��GOT � DP �����り��\n"
 
-#: readelf.c:11199
+#: readelf.c:10910
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr "コードアドレス��置�存��\n"
 
-#: readelf.c:11202
+#: readelf.c:10913
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr "コードアドレス��置��存��\n"
 
-#: readelf.c:11308
+#: readelf.c:11019
 msgid "attributes"
 msgstr "属性"
 
-#: readelf.c:11329
+#: readelf.c:11040
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr "エラー: 誤��セクション長 (%d > %d)\n"
 
-#: readelf.c:11335
+#: readelf.c:11046
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr "属性セクション: %s\n"
 
-#: readelf.c:11360
+#: readelf.c:11071
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr "エラー: 誤���セクション長 (%d > %d)\n"
 
-#: readelf.c:11372
+#: readelf.c:11083
 #, c-format
 msgid "File Attributes\n"
 msgstr "ファイル属性\n"
 
-#: readelf.c:11375
+#: readelf.c:11086
 #, c-format
 msgid "Section Attributes:"
 msgstr "セクション属性:"
 
-#: readelf.c:11378
+#: readelf.c:11089
 #, c-format
 msgid "Symbol Attributes:"
 msgstr "シンボル属性:"
 
-#: readelf.c:11393
+#: readelf.c:11104
 #, c-format
 msgid "Unknown tag: %d\n"
 msgstr "�明�タグ: %d\n"
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11412
+#: readelf.c:11123
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr "  �明�セクションコンテキスト\n"
 
-#: readelf.c:11419
+#: readelf.c:11130
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr "�明�形� '%c'\n"
 
-#: readelf.c:11463 readelf.c:11485
+#: readelf.c:11174 readelf.c:11196
 msgid "<unknown>"
 msgstr "<�明>"
 
-#: readelf.c:11580 readelf.c:12102
+#: readelf.c:11291 readelf.c:11813
 msgid "liblist"
 msgstr "ライブラリリスト"
 
-#: readelf.c:11583
+#: readelf.c:11294
 #, c-format
 msgid ""
 "\n"
@@ -6746,24 +5970,24 @@ msgstr ""
 "\n"
 "セクション '.liblist' � %lu 個�エントリ�構��れ����:\n"
 
-#: readelf.c:11585
+#: readelf.c:11296
 msgid "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr "     ライブラリ           タイムスタンプ      Checksum   �ージョンフラグ\n"
 
-#: readelf.c:11611
+#: readelf.c:11322
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr "<破�: %9ld>"
 
-#: readelf.c:11616
+#: readelf.c:11327
 msgid " NONE"
 msgstr ""
 
-#: readelf.c:11667
+#: readelf.c:11378
 msgid "options"
 msgstr "オプション"
 
-#: readelf.c:11698
+#: readelf.c:11409
 #, c-format
 msgid ""
 "\n"
@@ -6772,15 +5996,15 @@ msgstr ""
 "\n"
 "セクション '%s' � %d 個�エントリ�構��れ����:\n"
 
-#: readelf.c:11859
+#: readelf.c:11570
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr "動的シンボルテーブル�無�競�リスト�見��り���\n"
 
-#: readelf.c:11876 readelf.c:11891
+#: readelf.c:11587 readelf.c:11602
 msgid "conflict"
 msgstr "競�"
 
-#: readelf.c:11901
+#: readelf.c:11612
 #, c-format
 msgid ""
 "\n"
@@ -6789,20 +6013,20 @@ msgstr ""
 "\n"
 "セクション '.conflict' � %lu 個�エントリ�構��れ����:\n"
 
-#: readelf.c:11903
+#: readelf.c:11614
 msgid "  Num:    Index       Value  Name"
 msgstr " 番�:    索引        値     ��"
 
-#: readelf.c:11915 readelf.c:11995 readelf.c:12063
+#: readelf.c:11626 readelf.c:11706 readelf.c:11774
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr "<破�: %14ld>"
 
-#: readelf.c:11936
+#: readelf.c:11647
 msgid "GOT"
 msgstr "GOT"
 
-#: readelf.c:11937
+#: readelf.c:11648
 #, c-format
 msgid ""
 "\n"
@@ -6811,76 +6035,86 @@ msgstr ""
 "\n"
 "主 GOT:\n"
 
-#: readelf.c:11938
+#: readelf.c:11649
 #, c-format
 msgid " Canonical gp value: "
 msgstr " 正準 GP 値: "
 
-#: readelf.c:11942 readelf.c:12034
+#: readelf.c:11653 readelf.c:11745
 #, c-format
 msgid " Reserved entries:\n"
 msgstr "予約�れ�エントリ:\n"
 
-#: readelf.c:11943
+#: readelf.c:11654
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr ""
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
-#: readelf.c:12045
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688 readelf.c:11747
+#: readelf.c:11756
 msgid "Address"
-msgstr "アドレス"
+msgstr ""
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688
 msgid "Access"
 msgstr ""
 
-#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
-#: readelf.c:12046
+#: readelf.c:11656 readelf.c:11673 readelf.c:11689 readelf.c:11747
+#: readelf.c:11757
 msgid "Initial"
 msgstr ""
 
-#: readelf.c:11947
+#: readelf.c:11658
 #, c-format
 msgid " Lazy resolver\n"
 msgstr ""
 
-#: readelf.c:11953
+#: readelf.c:11664
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr " モジュール�インタ (GNU 拡張)\n"
 
-#: readelf.c:11959
+#: readelf.c:11670
 #, c-format
 msgid " Local entries:\n"
 msgstr "局所エントリ:\n"
 
-#: readelf.c:11975
+#: readelf.c:11671
+#, c-format
+msgid "  %*s %10s %*s\n"
+msgstr "  %*s %10s %*s\n"
+
+#: readelf.c:11686
 #, c-format
 msgid " Global entries:\n"
 msgstr "大域エントリ:\n"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11687
+#, c-format
+msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11690 readelf.c:11758
 msgid "Sym.Val."
 msgstr "シンボル値"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Type"
 msgstr "åž‹"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Ndx"
 msgstr ""
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Name"
 msgstr "��"
 
-#: readelf.c:12032
+#: readelf.c:11743
 msgid "PLT GOT"
 msgstr "PLT GOT"
 
-#: readelf.c:12033
+#: readelf.c:11744
 #, c-format
 msgid ""
 "\n"
@@ -6891,31 +6125,36 @@ msgstr ""
 "PLT GOT:\n"
 "\n"
 
-#: readelf.c:12035
+#: readelf.c:11746
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr ""
 
-#: readelf.c:12038
+#: readelf.c:11749
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr ""
 
-#: readelf.c:12040
+#: readelf.c:11751
 #, c-format
 msgid " Module pointer\n"
 msgstr ""
 
-#: readelf.c:12043
+#: readelf.c:11754
 #, c-format
 msgid " Entries:\n"
 msgstr "エントリ:\n"
 
-#: readelf.c:12110
+#: readelf.c:11755
+#, c-format
+msgid "  %*s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11821
 msgid "liblist string table"
 msgstr "liblist 文字列テーブル"
 
-#: readelf.c:12121
+#: readelf.c:11831
 #, c-format
 msgid ""
 "\n"
@@ -6924,381 +6163,175 @@ msgstr ""
 "\n"
 "ライブラリ一覧セクション '%s' � %lu 個�エントリ�構��れ����:\n"
 
-#: readelf.c:12125
+#: readelf.c:11835
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr "     ライブラリ           タイムスタンプ      Checksum   �ージョンフラグ"
 
-#: readelf.c:12175
+#: readelf.c:11884
 msgid "NT_AUXV (auxiliary vector)"
 msgstr "NT_AUXV (補助ベクタ)"
 
-#: readelf.c:12177
+#: readelf.c:11886
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr "NT_PRSTATUS (prstatus 構造体)"
 
-#: readelf.c:12179
+#: readelf.c:11888
 msgid "NT_FPREGSET (floating point registers)"
 msgstr "NT_FPREGSET (浮動�数点レジスタ)"
 
-#: readelf.c:12181
+#: readelf.c:11890
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr "NT_PRPSINFO (prpsinfo 構造体)"
 
-#: readelf.c:12183
+#: readelf.c:11892
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr "NT_TASKSTRUCT (task 構造体)"
 
-#: readelf.c:12185
+#: readelf.c:11894
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr "NT_PRXFPREG (user_xfpregs 構造体)"
 
-#: readelf.c:12187
+#: readelf.c:11896
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr "NT_PPC_VMX (ppc Altivec レジスタ)"
 
-#: readelf.c:12189
+#: readelf.c:11898
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr "NT_PPC_VSX (ppc VSX レジスタ)"
 
-#: readelf.c:12191
+#: readelf.c:11900
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr "NT_X86_XSTATE (x86 XSAVE 拡張状態)"
 
-#: readelf.c:12193
+#: readelf.c:11902
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr ""
 
-#: readelf.c:12195
+#: readelf.c:11904
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr "NT_S390_TIMER (s390 タイマーレジスタ)"
 
-#: readelf.c:12197
+#: readelf.c:11906
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr "NT_S390_TODCMP (s390 TOD 比較レジスタ)"
 
-#: readelf.c:12199
+#: readelf.c:11908
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr "NT_S390_TODPREG (s390 TOD プログラム�能レジスタ)"
 
-#: readelf.c:12201
+#: readelf.c:11910
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr "NT_S390_CTRS (s390 制御レジスタ)"
 
-#: readelf.c:12203
+#: readelf.c:11912
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr ""
 
-#: readelf.c:12205
+#: readelf.c:11914
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr "NT_PSTATUS (pstatus 構造体)"
 
-#: readelf.c:12207
+#: readelf.c:11916
 msgid "NT_FPREGS (floating point registers)"
 msgstr "NT_FPREGS (浮動�数点レジスタ)"
 
-#: readelf.c:12209
+#: readelf.c:11918
 msgid "NT_PSINFO (psinfo structure)"
 msgstr "NT_PSINFO (psinfo 構造体)"
 
-#: readelf.c:12211
+#: readelf.c:11920
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr "NT_LWPSTATUS (lwpstatus_t 構造体)"
 
-#: readelf.c:12213
+#: readelf.c:11922
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr "NT_LWPSINFO (lwpsinfo_t 構造体)"
 
-#: readelf.c:12215
+#: readelf.c:11924
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr "NT_WIN32PSTATUS (win32_pstatus 構造体)"
 
-#: readelf.c:12223
+#: readelf.c:11932
 msgid "NT_VERSION (version)"
 msgstr "NT_VERSION (�ージョン)"
 
-#: readelf.c:12225
+#: readelf.c:11934
 msgid "NT_ARCH (architecture)"
 msgstr "NT_ARCH (アーキテク�ャ)"
 
-#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
-#: readelf.c:12467
+#: readelf.c:11939 readelf.c:11962 readelf.c:11984
 #, c-format
 msgid "Unknown note type: (0x%08x)"
-msgstr "�明�備考タイプ: (0x%08x)"
+msgstr "�明� note タイプ: (0x%08x)"
 
-#: readelf.c:12242
+#: readelf.c:11951
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr "NT_GNU_ABI_TAG (ABI �ージョンタグ)"
 
-#: readelf.c:12244
+#: readelf.c:11953
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
-msgstr "NT_GNU_HWCAP (DSO ��用�れるソフトウェア HWCAP 情報)"
+msgstr ""
 
-#: readelf.c:12246
+#: readelf.c:11955
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
-msgstr "NT_GNU_BUILD_ID (一��ビルドID ビット列)"
+msgstr ""
 
-#: readelf.c:12248
+#: readelf.c:11957
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr "NT_GNU_GOLD_VERSION (gold �ージョン)"
 
-#: readelf.c:12266
-#, c-format
-msgid "    Build ID: "
-msgstr "    ビルドID: "
-
-#: readelf.c:12269 readelf.c:12425
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: readelf.c:12305
-#, c-format
-msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
-msgstr "    OS: %s, ABI: %ld.%ld.%ld\n"
-
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12322
+#: readelf.c:11974
 msgid "NetBSD procinfo structure"
 msgstr "NetBSD procinfo 構造体"
 
-#: readelf.c:12349 readelf.c:12363
+#: readelf.c:12001 readelf.c:12015
 msgid "PT_GETREGS (reg structure)"
 msgstr "PT_GETREGS (reg 構造体)"
 
-#: readelf.c:12351 readelf.c:12365
+#: readelf.c:12003 readelf.c:12017
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr "PT_GETFPREGS (fpreg 構造体)"
 
-#: readelf.c:12371
+#: readelf.c:12023
 #, c-format
 msgid "PT_FIRSTMACH+%d"
 msgstr "PT_FIRSTMACH+%d"
 
-#: readelf.c:12384
-msgid "NT_STAPSDT (SystemTap probe descriptors)"
-msgstr ""
-
-#: readelf.c:12417
-#, c-format
-msgid "    Provider: %s\n"
-msgstr "    Provider: %s\n"
-
-#: readelf.c:12418
-#, c-format
-msgid "    Name: %s\n"
-msgstr "    ��: %s\n"
-
-#: readelf.c:12419
-#, c-format
-msgid "    Location: "
-msgstr "    �置: "
-
-#: readelf.c:12421
-#, c-format
-msgid ", Base: "
-msgstr ", 基底: "
-
-#: readelf.c:12423
-#, c-format
-msgid ", Semaphore: "
-msgstr ", セマフォ: "
-
-#: readelf.c:12426
-#, c-format
-msgid "    Arguments: %s\n"
-msgstr "    引数: %s\n"
-
-#: readelf.c:12439
-msgid "NT_VMS_MHD (module header)"
-msgstr "NT_VMS_MHD (モジュールヘッダ)"
-
-#: readelf.c:12441
-msgid "NT_VMS_LNM (language name)"
-msgstr "NT_VMS_LNM (言語�)"
-
-#: readelf.c:12443
-msgid "NT_VMS_SRC (source files)"
-msgstr "NT_VMS_SRC (ソースファイル)"
-
-#: readelf.c:12445
-msgid "NT_VMS_TITLE"
-msgstr "NT_VMS_TITLE"
-
-#: readelf.c:12447
-msgid "NT_VMS_EIDC (consistency check)"
-msgstr "NT_VMS_EIDC (一貫性検査)"
-
-#: readelf.c:12449
-msgid "NT_VMS_FPMODE (FP mode)"
-msgstr "NT_VMS_FPMODE (浮動�数モード)"
-
-#: readelf.c:12451
-msgid "NT_VMS_LINKTIME"
-msgstr "NT_VMS_LINKTIME"
-
-#: readelf.c:12453
-msgid "NT_VMS_IMGNAM (image name)"
-msgstr "NT_VMS_IMGNAM (イメージ�)"
-
-#: readelf.c:12455
-msgid "NT_VMS_IMGID (image id)"
-msgstr "NT_VMS_IMGID (イメージID)"
-
-#: readelf.c:12457
-msgid "NT_VMS_LINKID (link id)"
-msgstr "NT_VMS_LINKID (リンクID)"
-
-#: readelf.c:12459
-msgid "NT_VMS_IMGBID (build id)"
-msgstr "NT_VMS_IMGBID (ビルドID)"
-
-#: readelf.c:12461
-msgid "NT_VMS_GSTNAM (sym table name)"
-msgstr "NT_VMS_GSTNAM (シンボル表�)"
-
-#: readelf.c:12463
-msgid "NT_VMS_ORIG_DYN"
-msgstr "NT_VMS_ORIG_DYN"
-
-#: readelf.c:12465
-msgid "NT_VMS_PATCHTIME"
-msgstr "NT_VMS_PATCHTIME"
-
-#: readelf.c:12481
-#, c-format
-msgid "    Creation date  : %.17s\n"
-msgstr "    作�日 : %.17s\n"
-
-#: readelf.c:12482
-#, c-format
-msgid "    Last patch date: %.17s\n"
-msgstr "    最終パッ��用日: %.17s\n"
-
-#: readelf.c:12483
-#, c-format
-msgid "    Module name    : %s\n"
-msgstr "    モジュール�   : %s\n"
-
-#: readelf.c:12484
-#, c-format
-msgid "    Module version : %s\n"
-msgstr "    モジュール�ージョン : %s\n"
-
-#: readelf.c:12487
-#, c-format
-msgid "    Invalid size\n"
-msgstr "    無効�サイズ��\n"
-
-#: readelf.c:12490
-#, c-format
-msgid "   Language: %s\n"
-msgstr "   言語: %s\n"
-
-#: readelf.c:12494
-msgid "   FP mode: 0x%016"
-msgstr "   浮動�数モード: 0x%016"
-
-#: readelf.c:12498
-#, c-format
-msgid "   Link time: "
-msgstr "   リンク時間: "
-
-#: readelf.c:12504
-#, c-format
-msgid "   Patch time: "
-msgstr "   パッ�時間: "
-
-#: readelf.c:12510
-#, c-format
-msgid "   Major id: %u,  minor id: %u\n"
-msgstr "   Major id: %u,  minor id: %u\n"
-
-#: readelf.c:12513
-#, c-format
-msgid "   Manip date  : "
-msgstr "   �作日      : "
-
-#: readelf.c:12516
-msgid ""
-"\n"
-"   Link flags  : 0x%016"
-msgstr ""
-"\n"
-"   リンクフラグ: 0x%016"
-
-#: readelf.c:12519
-#, c-format
-msgid "   Header flags: 0x%08x\n"
-msgstr "   ヘッダフラグ: 0x%08x\n"
-
-#: readelf.c:12521
-#, c-format
-msgid "   Image id    : %s\n"
-msgstr "   イメージID  : %s\n"
-
-#: readelf.c:12525
-#, c-format
-msgid "    Image name: %s\n"
-msgstr "    イメージ�: %s\n"
-
-#: readelf.c:12528
-#, c-format
-msgid "    Global symbol table name: %s\n"
-msgstr "    大域シンボル表�: %s\n"
-
-#: readelf.c:12531
-#, c-format
-msgid "    Image id: %s\n"
-msgstr "    イメージID: %s\n"
-
-#: readelf.c:12534
-#, c-format
-msgid "    Linker id: %s\n"
-msgstr "    リンカID : %s\n"
-
-#: readelf.c:12609
+#: readelf.c:12080
 msgid "notes"
-msgstr "備考"
+msgstr ""
 
-#: readelf.c:12615
+#: readelf.c:12086
 #, c-format
 msgid ""
 "\n"
 "Notes at offset 0x%08lx with length 0x%08lx:\n"
 msgstr ""
 "\n"
-"オフセット 0x%08lx, 長� 0x%08lx �備考:\n"
+"オフセット 0x%08lx, 長� 0x%08lx � note:\n"
 
-#: readelf.c:12617
+#: readelf.c:12088
 #, c-format
-msgid "  %-20s %10s\tDescription\n"
-msgstr "  %-20s %10s\t説明\n"
-
-#: readelf.c:12617
-msgid "Owner"
-msgstr "所有者"
-
-#: readelf.c:12617
-msgid "Data size"
-msgstr "データサイズ"
+msgid "  Owner\t\tData size\tDescription\n"
+msgstr " 所有者\t\tデータサイズ\t説明\n"
 
-#: readelf.c:12655 readelf.c:12668
+#: readelf.c:12108 readelf.c:12121
 #, c-format
 msgid "corrupt note found at offset %lx into core notes\n"
-msgstr "core 備考�オフセット %lx �破���備考�見��り���\n"
+msgstr ""
 
-#: readelf.c:12657 readelf.c:12670
+#: readelf.c:12110 readelf.c:12123
 #, c-format
 msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
-msgstr " タイプ: %lx, ���サイズ: %08lx, 説明�サイズ: %08lx\n"
+msgstr ""
 
-#: readelf.c:12766
+#: readelf.c:12219
 #, c-format
 msgid "No note segments present in the core file.\n"
-msgstr "��coreファイル�備考セグメント�有り��ん。\n"
+msgstr "��コアファイル� note セグメント�有り��ん。\n"
 
-#: readelf.c:12853
+#: readelf.c:12306
 msgid ""
 "This instance of readelf has been built without support for a\n"
 "64 bit data type and so it cannot read 64 bit ELF files.\n"
@@ -7306,12 +6339,12 @@ msgstr ""
 "�� readelf �実体� 64 ビットデータ型サ�ート無��構築�れ��り�\n"
 "64 ビット ELF ファイルを読�込���ん。\n"
 
-#: readelf.c:12900
+#: readelf.c:12353
 #, c-format
 msgid "%s: Failed to read file header\n"
 msgstr "%s: ファイルヘッダ�読込��失敗����\n"
 
-#: readelf.c:12914
+#: readelf.c:12366
 #, c-format
 msgid ""
 "\n"
@@ -7320,47 +6353,89 @@ msgstr ""
 "\n"
 "ファイル: %s\n"
 
-#: readelf.c:13086
+#: readelf.c:12615
+#, c-format
+msgid "%s: the archive index is empty\n"
+msgstr "%s: 書庫�索引�空��\n"
+
+#: readelf.c:12623 readelf.c:12647
+#, c-format
+msgid "%s: failed to read archive index\n"
+msgstr "%s: 書庫索引�読�込��失敗����\n"
+
+#: readelf.c:12632
+#, c-format
+msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
+msgstr "%s: 書庫�索引�ら� %ld 個�エントリ��る������ヘッダ�サイズ�������\n"
+
+#: readelf.c:12640
+msgid "Out of memory whilst trying to read archive symbol index\n"
+msgstr "書庫�シンボル索引�読�込�を試���る最中�メモリ��足����\n"
+
+#: readelf.c:12658
+msgid "Out of memory whilst trying to convert the archive symbol index\n"
+msgstr "書庫�シンボル索引�変�を試���る最中�メモリ��足����\n"
+
+#: readelf.c:12670
+#, c-format
+msgid "%s: the archive has an index but no symbols\n"
+msgstr "%s: 書庫�索引��り����シンボル��り��ん\n"
+
+#: readelf.c:12677
+msgid "Out of memory whilst trying to read archive index symbol table\n"
+msgstr "書庫�シンボル表索引�読�込�を試���る最中�メモリ��足����\n"
+
+#: readelf.c:12683
+#, c-format
+msgid "%s: failed to read archive index symbol table\n"
+msgstr "%s: 書庫�シンボル表索引�読�込��失敗����\n"
+
+#: readelf.c:12707
+#, c-format
+msgid "%s has no archive index\n"
+msgstr "%s ��書庫�索引��り��ん\n"
+
+#: readelf.c:12943
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr "%s: 索引�無����索引�ダンプを行����出���ん\n"
 
-#: readelf.c:13092
+#: readelf.c:12949
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr "書庫 %s �索引: (%ld 個�エントリ, シンボル表�サイズ 0x%lx �イト)\n"
 
-#: readelf.c:13110
+#: readelf.c:12967
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr "�イナリ %s �内容:\n"
 
-#: readelf.c:13118
+#: readelf.c:12975
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr "%s: 索引�終了��シンボル表�終了�到�����\n"
 
-#: readelf.c:13129
+#: readelf.c:12986
 #, c-format
 msgid "%s: symbols remain in the index symbol table, but without corresponding entries in the index table\n"
 msgstr "%s: シンボル表索引�シンボル�残�������索引表�関連��エントリ��り��ん\n"
 
-#: readelf.c:13134
+#: readelf.c:12991
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr "%s: 書庫内�オブジェクトファイル�開始�置��戻り方��走査 (seek back) �失敗����\n"
 
-#: readelf.c:13217 readelf.c:13300
+#: readelf.c:13074 readelf.c:13150
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr "入力ファイル '%s' �読�込���ん。\n"
 
-#: readelf.c:13239
+#: readelf.c:13096
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr "%s: 書庫�メン��探査 (seek) �失敗����。\n"
 
-#: readelf.c:13318
+#: readelf.c:13168
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr "ファイル %s �書庫������索引を表示����ん。\n"
@@ -7661,6 +6736,11 @@ msgstr "一時ファイルを開���ん `%s': %s"
 msgid "can't redirect stdout: `%s': %s"
 msgstr "標準出力�リダイレクト����ん: `%s': %s"
 
+#: resrc.c:284
+#, c-format
+msgid "%s %s: %s"
+msgstr "%s %s: %s"
+
 #: resrc.c:329
 #, c-format
 msgid "can't execute `%s': %s"
@@ -7695,6 +6775,11 @@ msgstr "`%s' を使���\n"
 msgid "preprocessing failed."
 msgstr "�処��失敗����。"
 
+#: resrc.c:631
+#, c-format
+msgid "%s:%d: %s\n"
+msgstr "%s:%d: %s\n"
+
 #: resrc.c:639
 #, c-format
 msgid "%s: unexpected EOF"
@@ -7793,12 +6878,12 @@ msgstr "--format �対�る無効�基数��: %s"
 msgid "Invalid radix: %s\n"
 msgstr "無効�基数��: %s\n"
 
-#: srconv.c:1733
+#: srconv.c:1732
 #, c-format
 msgid "Convert a COFF object file into a SYSROFF object file\n"
 msgstr "COFF オブジェクトファイルを SYSROFF オブジェクトファイル�変����\n"
 
-#: srconv.c:1734
+#: srconv.c:1733
 #, c-format
 msgid ""
 " The options are:\n"
@@ -7817,7 +6902,7 @@ msgstr ""
 "  -h --help        ��情報を表示�る\n"
 "  -v --version     プログラム��ージョン番�を表示�る\n"
 
-#: srconv.c:1880
+#: srconv.c:1879
 #, c-format
 msgid "unable to open output file %s"
 msgstr "出力ファイル %s を開���ん"
@@ -7862,95 +6947,95 @@ msgstr "相互�照型を�識����ん"
 msgid "missing index type"
 msgstr "インデックス型を欠�����"
 
-#: stabs.c:2129
+#: stabs.c:2122
 msgid "unknown virtual character for baseclass"
 msgstr "基底クラス用仮想文字��明��"
 
-#: stabs.c:2147
+#: stabs.c:2140
 msgid "unknown visibility character for baseclass"
 msgstr "基底クラス用�視性文字��明��"
 
-#: stabs.c:2337
+#: stabs.c:2326
 msgid "unnamed $vb type"
 msgstr "$vb 型�����り��ん"
 
-#: stabs.c:2343
+#: stabs.c:2332
 msgid "unrecognized C++ abbreviation"
 msgstr "C++ �略�を�識����ん"
 
-#: stabs.c:2419
+#: stabs.c:2408
 msgid "unknown visibility character for field"
 msgstr "フィールド用��視性文字��明��"
 
-#: stabs.c:2679
+#: stabs.c:2660
 msgid "const/volatile indicator missing"
 msgstr "const/volatile 指示�を欠�����"
 
-#: stabs.c:2924
+#: stabs.c:2896
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr "\"%s\" ����変形(mangling) ��り��ん\n"
 
-#: stabs.c:3224
+#: stabs.c:3196
 msgid "Undefined N_EXCL"
 msgstr "N_EXCL �未定義��"
 
-#: stabs.c:3304
+#: stabs.c:3276
 #, c-format
 msgid "Type file number %d out of range\n"
 msgstr "ファイル番�型 %d �範囲外��\n"
 
-#: stabs.c:3309
+#: stabs.c:3281
 #, c-format
 msgid "Type index number %d out of range\n"
 msgstr "インデックス番�型 %d �範囲外��\n"
 
-#: stabs.c:3388
+#: stabs.c:3360
 #, c-format
 msgid "Unrecognized XCOFF type %d\n"
 msgstr "XCOFF タイプ %d を�識����ん\n"
 
-#: stabs.c:3680
+#: stabs.c:3652
 #, c-format
 msgid "bad mangled name `%s'\n"
 msgstr "誤��変形 (mangle) � `%s' ��\n"
 
-#: stabs.c:3775
+#: stabs.c:3747
 #, c-format
 msgid "no argument types in mangled string\n"
 msgstr "変形 (mangle) �れ�文字列�引数�型��り��ん\n"
 
-#: stabs.c:5125
+#: stabs.c:5094
 #, c-format
 msgid "Demangled name is not a function\n"
 msgstr "復元 (demangle) �れ����関数���り��ん\n"
 
-#: stabs.c:5167
+#: stabs.c:5136
 #, c-format
 msgid "Unexpected type in v3 arglist demangling\n"
 msgstr "v3 引数リスト�復元 (demangle) 内�予期���型��\n"
 
-#: stabs.c:5234
+#: stabs.c:5203
 #, c-format
 msgid "Unrecognized demangle component %d\n"
 msgstr "��復元 (demangle) コン�ー�ント %d を�識����ん\n"
 
-#: stabs.c:5286
+#: stabs.c:5255
 #, c-format
 msgid "Failed to print demangled template\n"
 msgstr "��復元��テンプレート�表示�失敗����\n"
 
-#: stabs.c:5366
+#: stabs.c:5335
 #, c-format
 msgid "Couldn't get demangled builtin type\n"
 msgstr "��復元 (demangle) �れ�組�込�型を�得����ん���\n"
 
-#: stabs.c:5415
+#: stabs.c:5384
 #, c-format
 msgid "Unexpected demangled varargs\n"
 msgstr "予期�����復元 (demangle) �れ� varargs ��\n"
 
-#: stabs.c:5422
+#: stabs.c:5391
 #, c-format
 msgid "Unrecognized demangled builtin type\n"
 msgstr "�識������復元 (demangle) �れ�組�込�型��\n"
@@ -7965,12 +7050,12 @@ msgstr "無効�整数引数 %s ��"
 msgid "invalid minimum string length %d"
 msgstr "無効�最�文字列長 %d ��"
 
-#: strings.c:651
+#: strings.c:647
 #, c-format
 msgid " Display printable strings in [file(s)] (stdin by default)\n"
 msgstr "[file(s)] (デフォルト�標準入力) 内�表示�能�文字列を表示���\n"
 
-#: strings.c:652
+#: strings.c:648
 #, c-format
 msgid ""
 " The options are:\n"
@@ -8024,8 +7109,8 @@ msgstr "入力ファイル %s を開���ん"
 
 #: version.c:36
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: version.c:37
 #, c-format
@@ -8040,8 +7125,8 @@ msgstr ""
 
 #: windmc.c:190
 #, c-format
-msgid "can't create %s file `%s' for output.\n"
-msgstr "%s ファイル `%s' を出力用�作�����ん。\n"
+msgid "can't create %s file ,%s' for output.\n"
+msgstr "%s ファイル ,%s' を出力用�開���ん。\n"
 
 #: windmc.c:198
 #, c-format
@@ -8059,7 +7144,7 @@ msgid ""
 "  -C --codepage_in=<val>       Set codepage when reading mc text file\n"
 "  -d --decimal_values          Print values to text files decimal\n"
 "  -e --extension=<extension>   Set header extension used on export header file\n"
-"  -F --target <target>         Specify output target for endianness.\n"
+"  -F --target <target>         Specify output target for endianess.\n"
 "  -h --headerdir=<directory>   Set the export directory for headers\n"
 "  -u --unicode_in              Read input file as UTF16 file\n"
 "  -U --unicode_out             Write binary messages as UFT16\n"
@@ -8071,26 +7156,25 @@ msgid ""
 "  -x --xdbg=<directory>        Where to create the .dbg C include file\n"
 "                               that maps message ID's to their symbolic name.\n"
 msgstr ""
-"オプション:\n"
+" The options are:\n"
 "  -a --ascii_in                入力ファイルを ASCII ファイル���読�込む\n"
 "  -A --ascii_out               �イナリメッセージを ASCII ���書�込む\n"
-"  -b --binprefix               一�性を����� .bin ファイル��接頭辞���\n"
-"                                   .mc � filename_ を付加�る\n"
+"  -b --binprefix               .bin filename is prefixed by .mc filename_ for uniqueness.\n"
 "  -c --customflag              メッセージ�カスタムフラグを設定�る\n"
 "  -C --codepage_in=<val>       mc テキストファイル読�込�時�コードページを設定�る\n"
-"  -d --decimal_values          テキストファイル�書�込む値を�進数�表�\n"
-"  -e --extension=<extension>   エクス�ートヘッダファイル�使用�れる拡張�を設定�る\n"
-"  -F --target <target>         出力ターゲット�エンディアンを指定�る\n"
-"  -h --headerdir=<directory>   ヘッダ�エクス�ートディレクトリーを設定�る\n"
-"  -u --unicode_in              入力ファイルを UTF16 ファイル���読�込む\n"
-"  -U --unicode_out             �イナリメッセージを UFT16 ���書�込む\n"
-"  -m --maxlength=<val>         メッセージ長�最大許容値を設定�る\n"
-"  -n --nullterminate           文字列�区切り��� 0 を自動的�追加�る\n"
-"  -o --hresult_use             状態コード定義�代�り� HRESULT 定義を使用�る\n"
-"  -O --codepage_out=<val>      テキストファイルを書�込む時�コードページを設定�る\n"
-"  -r --rcdir=<directory>       rc ファイル�エクス�ートディレクトリーを設定�る\n"
-"  -x --xdbg=<directory>        メッセージID �シンボル�を対応付�る��� .dbg C\n"
-"                                 インクルードファイルを作��る場所を指定�る\n"
+"  -d --decimal_values          Print values to text files decimal\n"
+"  -e --extension=<extension>   Set header extension used on export header file\n"
+"  -F --target <target>         Specify output target for endianess.\n"
+"  -h --headerdir=<directory>   Set the export directory for headers\n"
+"  -u --unicode_in              Read input file as UTF16 file\n"
+"  -U --unicode_out             Write binary messages as UFT16\n"
+"  -m --maxlength=<val>         Set the maximal allowed message length\n"
+"  -n --nullterminate           Automatic add a zero termination to strings\n"
+"  -o --hresult_use             Use HRESULT definition instead of status code definition\n"
+"  -O --codepage_out=<val>      Set codepage used for writing text file\n"
+"  -r --rcdir=<directory>       Set the export directory for rc files\n"
+"  -x --xdbg=<directory>        Where to create the .dbg C include file\n"
+"                               that maps message ID's to their symbolic name.\n"
 
 #: windmc.c:220
 #, c-format
@@ -8110,8 +7194,8 @@ msgstr "%s: 警告: "
 
 #: windmc.c:262
 #, c-format
-msgid "A codepage was specified switch `%s' and UTF16.\n"
-msgstr "コードページ�スイッ� `%s' �よ� UTF16 ��指定�れ����。\n"
+msgid "A codepage was specified switch ,%s' and UTF16.\n"
+msgstr "コードページ�スイッ� ,%s' �よ� UTF16 ��指定�れ����。\n"
 
 #: windmc.c:263
 #, c-format
@@ -8124,8 +7208,8 @@ msgstr "�正�言語を加�よ�������。"
 
 #: windmc.c:1116
 #, c-format
-msgid "unable to open file `%s' for input.\n"
-msgstr "ファイル `%s' を入力���開��������ん。\n"
+msgid "unable to open file ,%s' for input.\n"
+msgstr "ファイル ,%s' を入力���開��������ん。\n"
 
 #: windmc.c:1124
 #, c-format
@@ -8187,7 +7271,6 @@ msgid ""
 "  -O --output-format=<format>  Specify output format\n"
 "  -F --target=<target>         Specify COFF target\n"
 "     --preprocessor=<program>  Program to use to preprocess rc file\n"
-"     --preprocessor-arg=<arg>  Additional preprocessor argument\n"
 "  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n"
 "  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n"
@@ -8199,30 +7282,28 @@ msgid ""
 "     --no-use-temp-file        Use popen (default)\n"
 msgstr ""
 "オプション:\n"
-"  -i --input=<file>            入力ファイル�を file ��る\n"
-"  -o --output=<file>           出力ファイル�を file ��る\n"
-"  -J --input-format=<format>   入力形�を format �指定�る\n"
-"  -O --output-format=<format>  出力形�を format �指定�る\n"
-"  -F --target=<target>         COFF ターゲットを target �指定�る\n"
-"     --preprocessor=<program>  rc ファイルを�処��る���使用�るプログラム\n"
-"     --preprocessor-arg=<arg>  �処�系�追加�渡�引数を指定�る\n"
-"  -I --include-dir=<dir>       rc ファイルを�処��る時� dir をディレクトリー\n"
-"                                 ���る\n"
+"  -i --input=<file>            入力ファイル�\n"
+"  -o --output=<file>           出力ファイル�\n"
+"  -J --input-format=<format>   入力形�を指定�る\n"
+"  -O --output-format=<format>  出力形�を指定�る\n"
+"  -F --target=<target>         COFF ターゲットを指定�る\n"
+"     --preprocessor=<program>  Program to use to preprocess rc file\n"
+"  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    rc ファイルを�処��る際� SYM を定義�る\n"
-"  -U --undefine <sym>          rc ファイルを�処��る際� SYM を未定義��る\n"
+"  -U --undefine <sym>          rc ファイルを�処��る際� SYM を�定義��る\n"
 "  -v --verbose                 冗長 - 実行���る��を表示�る\n"
 "  -c --codepage=<codepage>     デフォルトコードページを指定�る\n"
 "  -l --language=<val>          rc ファイルを読�出����言語を設定�る\n"
-"     --use-temp-file           �処�系�出力を読�込む時� popen �代�り�一時\n"
-"                                 ファイルを使用�る\n"
+"     --use-temp-file           Use a temporary file instead of popen to read\n"
+"                               the preprocessor output\n"
 "     --no-use-temp-file        popen を使用�る (デフォルト)\n"
 
-#: windres.c:679
+#: windres.c:678
 #, c-format
 msgid "     --yydebug                 Turn on parser debugging\n"
 msgstr "     --yydebug                 構文解��デ�ッグを有効��る\n"
 
-#: windres.c:682
+#: windres.c:681
 #, c-format
 msgid ""
 "  -r                           Ignored for compatibility with rc\n"
@@ -8235,7 +7316,7 @@ msgstr ""
 "  -h --help                    ��ヘルプメッセージを表示�る\n"
 "  -V --version                 �ージョン情報を表示�る\n"
 
-#: windres.c:687
+#: windres.c:686
 #, c-format
 msgid ""
 "FORMAT is one of rc, res, or coff, and is deduced from the file name\n"
@@ -8247,150 +7328,42 @@ msgstr ""
 "使用�れ�rc 形��デフォルト��り��。出力ファイル�指定�れ��れ�\n"
 "標準出力�使用�れ�rc 形��デフォルト��り��。\n"
 
-#: windres.c:850
+#: windres.c:847
 msgid "invalid codepage specified.\n"
 msgstr "無効�コードページ�指定�れ����。\n"
 
-#: windres.c:865
+#: windres.c:862
 msgid "invalid option -f\n"
 msgstr "無効�オプション -f ��\n"
 
-#: windres.c:870
+#: windres.c:867
 msgid "No filename following the -fo option.\n"
 msgstr "-fo オプション�後�ファイル��続�����ん。\n"
 
-#: windres.c:959
+#: windres.c:938
 #, c-format
 msgid "Option -I is deprecated for setting the input format, please use -J instead.\n"
 msgstr "オプション -I �入力形��指定����廃止�れ��。代�り� -J を使用������。\n"
 
-#: windres.c:1072
+#: windres.c:1051
 msgid "no resources"
 msgstr "リソース��り��ん"
 
-#: wrstabs.c:354 wrstabs.c:1915
+#: wrstabs.c:353 wrstabs.c:1916
 #, c-format
 msgid "string_hash_lookup failed: %s"
 msgstr "string_hash_lookup �失敗����: %s"
 
-#: wrstabs.c:637
+#: wrstabs.c:636
 #, c-format
 msgid "stab_int_type: bad size %u"
 msgstr "stab_int_type: �正�サイズ %u ��"
 
-#: wrstabs.c:1393
+#: wrstabs.c:1394
 #, c-format
 msgid "%s: warning: unknown size for field `%s' in struct"
 msgstr "%s: 警告: 構造体�フィールド `%s' �サイズ��明��"
 
-#~ msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
-#~ msgstr "使用法: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
-
-#~ msgid "illegal option -- %c"
-#~ msgstr "�正�オプション�� -- %c"
-
-#~ msgid ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-
-#~ msgid "Usage: %s < input_file > output_file\n"
-#~ msgstr "使用法: %s < input_file > output_file\n"
-
-#~ msgid "Prints bytes from stdin in hex format.\n"
-#~ msgstr "標準入力�ら読�込ん��イトを�六進数�表示���。\n"
-
-#~ msgid "   %d\t"
-#~ msgstr "   %d\t"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "  %d\t"
-#~ msgstr "  %d\t"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "./%s:[++]\n"
-#~ msgstr ""
-#~ "\n"
-#~ "./%s:[++]\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "%s/%s:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s/%s:\n"
-
-#~ msgid "%-35s  %11d  %#18lx\n"
-#~ msgstr "%-35s  %11d  %#18lx\n"
-
-#~ msgid "%-35s  %11d  %#18lx[%d]\n"
-#~ msgstr "%-35s  %11d  %#18lx[%d]\n"
-
-#~ msgid "%s  %11d  %#18lx\n"
-#~ msgstr "%s  %11d  %#18lx\n"
-
-#~ msgid "%s  %11d  %#18lx[%d]\n"
-#~ msgstr "%s  %11d  %#18lx[%d]\n"
-
-#~ msgid "   %ld      %s    [%s]\n"
-#~ msgstr "   %ld      %s    [%s]\n"
-
-#~ msgid "    %-18s %s\n"
-#~ msgstr "    %-18s %s\n"
-
-#~ msgid "Location lists in .debug_info section aren't in ascending order!\n"
-#~ msgstr ".debug_info セクション��置リスト�昇順���り��ん!\n"
-
-#~ msgid "target `%s' ignored."
-#~ msgstr "ターゲット `%s' �無視�れ���。"
-
-#~ msgid "  Pg"
-#~ msgstr "  Pg"
-
-#~ msgid " (%ld)"
-#~ msgstr " (%ld)"
-
-#~ msgid "0x%02x "
-#~ msgstr "0x%02x "
-
-#~ msgid "     vsp = vsp - %d"
-#~ msgstr "     vsp = vsp - %d"
-
-#~ msgid "     vsp = r%d"
-#~ msgstr "     vsp = r%d"
-
-#~ msgid "[unsupported two-byte opcode]"
-#~ msgstr "[サ�ート�れ��2�イト�オペコード]"
-
-#~ msgid "  %*s %10s %*s\n"
-#~ msgstr "  %*s %10s %*s\n"
-
-#~ msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "  %*s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "%s %s: %s"
-#~ msgstr "%s %s: %s"
-
-#~ msgid "%s:%d: %s\n"
-#~ msgstr "%s:%d: %s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Can't uncompress section '%s'.\n"
@@ -8751,6 +7724,9 @@ msgstr "%s: 警告: 構造体�フィールド `%s' �サイズ��明��
 #~ msgid "unexpected dialog signature %d"
 #~ msgstr "予期���ダイアログ識別番� %d"
 
+#~ msgid "can't read resource section"
+#~ msgstr "リソースセクションを読込���ん"
+
 #~ msgid ""
 #~ "Usage: %s [-A | --format=sysv | -B | --format=berkeley]\n"
 #~ "       [-o | --radix=8 | -d | --radix=10 | -h | --radix=16]\n"
diff --git a/binutils/po/ru.po b/binutils/po/ru.po
index a9b5bd246b..c48b614dff 100644
--- a/binutils/po/ru.po
+++ b/binutils/po/ru.po
@@ -3,39 +3,37 @@
 # This file is distributed under the same license as the binutils package.
 #
 # Pavel Maryanov <acid_jack@ukr.net>, 2003, 2005, 2006, 2008, 2010.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2012.
-# Pavel Maryanov <acid@jack.kiev.ua>, 2010, 2011.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
+# Pavel Maryanov <acid@jack.kiev.ua>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: binutils 2.21.53\n"
+"Project-Id-Version: binutils 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2012-01-03 11:07+0400\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2010-11-16 10:06+0200\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.0\n"
 
-#: addr2line.c:81
+#: addr2line.c:80
 #, c-format
 msgid "Usage: %s [option(s)] [addr(s)]\n"
 msgstr "И�пользование: %s [параметры] [адре�(а)]\n"
 
-#: addr2line.c:82
+#: addr2line.c:81
 #, c-format
 msgid " Convert addresses into line number/file name pairs.\n"
 msgstr " Конвертирует адре�а в пары номер_�троки/им�_файла.\n"
 
-#: addr2line.c:83
+#: addr2line.c:82
 #, c-format
 msgid " If no addresses are specified on the command line, they will be read from stdin\n"
 msgstr " Е�ли адре�а не указаны в командной �троке, они будут прочитаны из stdin\n"
 
-#: addr2line.c:84
+#: addr2line.c:83
 #, c-format
 msgid ""
 " The options are:\n"
@@ -69,219 +67,214 @@ msgstr ""
 "  -v --version           показать вер�ию программы\n"
 "\n"
 
-#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938
-#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611
-#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653
-#: windmc.c:228 windres.c:695
+#: addr2line.c:100 ar.c:293 coffdump.c:469 dlltool.c:3926 dllwrap.c:524
+#: elfedit.c:1155 nlmconv.c:1113 objcopy.c:576 objcopy.c:611 readelf.c:3219
+#: size.c:99 srconv.c:1742 strings.c:663 sysdump.c:653 windmc.c:228
+#: windres.c:694
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Отчёты об ошибках отправл�йте в %s\n"
 
-#: addr2line.c:271
+#: addr2line.c:262
 #, c-format
 msgid " at "
 msgstr " у "
 
-#: addr2line.c:296
+#: addr2line.c:287
 #, c-format
 msgid " (inlined by) "
 msgstr " (внутри�трочный) "
 
-#: addr2line.c:329
+#: addr2line.c:320
 #, c-format
 msgid "%s: cannot get addresses from archive"
 msgstr "%s: невозможно получить адре�а из архива"
 
-#: addr2line.c:346
+#: addr2line.c:337
 #, c-format
 msgid "%s: cannot find section %s"
 msgstr "%s: невозможно найти раздел %s"
 
-#: addr2line.c:415 nm.c:1566 objdump.c:3423
+#: addr2line.c:406 nm.c:1563 objdump.c:3301
 #, c-format
 msgid "unknown demangling style `%s'"
-msgstr "неизве�тный �тиль декодировани� «%s»"
+msgstr "неизве�тный �тиль декодировани� `%s'"
 
-#: ar.c:238
+#: ar.c:215
 #, c-format
 msgid "no entry %s in archive\n"
 msgstr "в архиве нет пункта %s\n"
 
-#: ar.c:254
+#: ar.c:233
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...\n"
+msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
 msgstr ""
-"И�пользование: %s [параметры �мул�ции] [-]{dmpqrstx}[abcDfilMNoPsSTuvV]\n"
-"               [--plugin <им�>] [им�_члена] [�чётчик] файл_архива файл…\n"
+"И�пользование: %s [параметры �мул�ции] [--plugin <название>] [-]{dmpqrstx}\n"
+"                  [abcfilNoPsSuvV] [им�_члена] [�чет] файл_архива файл...\n"
 
-#: ar.c:260
+#: ar.c:235
 #, c-format
-msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] [count] archive-file file...\n"
+msgid "Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
 msgstr ""
-"И�пользование: %s [параметры �мул�ции] [-]{dmpqrstx}[abcDfilMNoPsSTuvV]\n"
-"               [им�_члена] [�чётчик] файл_архива файл…\n"
+"И�пользование: %s [параметры �мул�ции] [-]{dmpqrstx}[abcfilNoPsSuvV] [им�_члена]\n"
+"                      [�чет] файл_архива файл...\n"
 
-#: ar.c:266
+#: ar.c:240
 #, c-format
 msgid "       %s -M [<mri-script]\n"
 msgstr "       %s -M [<mri-�крипт]\n"
 
-#: ar.c:267
+#: ar.c:241
 #, c-format
 msgid " commands:\n"
 msgstr " команды:\n"
 
-#: ar.c:268
+#: ar.c:242
 #, c-format
 msgid "  d            - delete file(s) from the archive\n"
 msgstr "  d            - удаление файлов из архива\n"
 
-#: ar.c:269
+#: ar.c:243
 #, c-format
 msgid "  m[ab]        - move file(s) in the archive\n"
 msgstr "  m[ab]        - перемещение файлов в архив\n"
 
-#: ar.c:270
+#: ar.c:244
 #, c-format
 msgid "  p            - print file(s) found in the archive\n"
 msgstr "  p            - вывод файлов, найденных в архиве\n"
 
-#: ar.c:271
+#: ar.c:245
 #, c-format
 msgid "  q[f]         - quick append file(s) to the archive\n"
 msgstr "  q[f]         - бы�трое добавление файлов в архив\n"
 
-#: ar.c:272
+#: ar.c:246
 #, c-format
 msgid "  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"
 msgstr "  r[ab][f][u]  - замена �уще�твующих или в�тавка новых файлов в архив\n"
 
-#: ar.c:273
+#: ar.c:247
 #, c-format
 msgid "  s            - act as ranlib\n"
 msgstr "  s          -   дей�твовать как ranlib\n"
 
-#: ar.c:274
+#: ar.c:248
 #, c-format
 msgid "  t            - display contents of archive\n"
 msgstr "  t            - отображение �одержимого архива\n"
 
-#: ar.c:275
+#: ar.c:249
 #, c-format
 msgid "  x[o]         - extract file(s) from the archive\n"
 msgstr "  x[o]         - извлечение файлов из архива\n"
 
-#: ar.c:276
+#: ar.c:250
 #, c-format
 msgid " command specific modifiers:\n"
 msgstr " о�обые модификаторы дл� команд:\n"
 
-#: ar.c:277
+#: ar.c:251
 #, c-format
 msgid "  [a]          - put file(s) after [member-name]\n"
 msgstr "  [a]          - размещение файлов по�ле [имени_члена]\n"
 
-#: ar.c:278
+#: ar.c:252
 #, c-format
 msgid "  [b]          - put file(s) before [member-name] (same as [i])\n"
 msgstr "  [b]          - размещение файлов до [имени_члена] (то же, что и [i])\n"
 
-#: ar.c:279
+#: ar.c:253
 #, c-format
 msgid "  [D]          - use zero for timestamps and uids/gids\n"
 msgstr "  [D]          - и�пользование нул� дл� отметок времени и uids/gids\n"
 
-#: ar.c:280
+#: ar.c:254
 #, c-format
 msgid "  [N]          - use instance [count] of name\n"
 msgstr "  [N]          - и�пользование [�чета], как варианта имени\n"
 
-#: ar.c:281
+#: ar.c:255
 #, c-format
 msgid "  [f]          - truncate inserted file names\n"
 msgstr "  [f]          - обрезание имен в�тавленных файлов\n"
 
-#: ar.c:282
+#: ar.c:256
 #, c-format
 msgid "  [P]          - use full path names when matching\n"
 msgstr "  [P]          - и�пользование полных путевых имен при �опо�тавлении\n"
 
-#: ar.c:283
+#: ar.c:257
 #, c-format
 msgid "  [o]          - preserve original dates\n"
 msgstr "  [o]          - �охранение и�ходных дат\n"
 
-#: ar.c:284
+#: ar.c:258
 #, c-format
 msgid "  [u]          - only replace files that are newer than current archive contents\n"
 msgstr "  [u]          - замена только файлов более новых, чем текущее �одержимое архива\n"
 
-#: ar.c:285
+#: ar.c:259
 #, c-format
 msgid " generic modifiers:\n"
 msgstr " обычные модификаторы:\n"
 
-#: ar.c:286
+#: ar.c:260
 #, c-format
 msgid "  [c]          - do not warn if the library had to be created\n"
 msgstr "  [c]          - не предупреждать, е�ли должна быть �оздана библиотека\n"
 
-#: ar.c:287
+#: ar.c:261
 #, c-format
 msgid "  [s]          - create an archive index (cf. ranlib)\n"
 msgstr "  [s]          - �оздание индек�а архива (cf. ranlib)\n"
 
-#: ar.c:288
+#: ar.c:262
 #, c-format
 msgid "  [S]          - do not build a symbol table\n"
 msgstr "  [S]          - не �оздавать таблицу �имволов\n"
 
-#: ar.c:289
+#: ar.c:263
 #, c-format
 msgid "  [T]          - make a thin archive\n"
 msgstr "  [T]          - �оздание полупу�того архива\n"
 
-#: ar.c:290
+#: ar.c:264
 #, c-format
 msgid "  [v]          - be verbose\n"
 msgstr "  [v]          - подробный режим\n"
 
-#: ar.c:291
+#: ar.c:265
 #, c-format
 msgid "  [V]          - display the version number\n"
 msgstr "  [V]          - вывод номера вер�ии\n"
 
-#: ar.c:292
+#: ar.c:266
 #, c-format
 msgid "  @<file>      - read options from <file>\n"
-msgstr "  @<файл>      - читать параметры из <файла>\n"
-
-#: ar.c:293
-#, c-format
-msgid "  --target=BFDNAME - specify the target object format as BFDNAME\n"
-msgstr "  --target=BFDNAME - назначить форматом объекта назначени� BFDNAME\n"
+msgstr "  @<file>      - читать параметры из <файла>\n"
 
-#: ar.c:295
+#: ar.c:268
 #, c-format
 msgid " optional:\n"
 msgstr " необ�зательные:\n"
 
-#: ar.c:296
+#: ar.c:269
 #, c-format
 msgid "  --plugin <p> - load the specified plugin\n"
 msgstr "  --plugin <p> - загрузить указанный модуль\n"
 
-#: ar.c:317
+#: ar.c:276
 #, c-format
 msgid "Usage: %s [options] archive\n"
 msgstr "И�пользование: %s [параметры] архив\n"
 
-#: ar.c:318
+#: ar.c:277
 #, c-format
 msgid " Generate an index to speed access to archives\n"
 msgstr " Создает индек� дл� увеличени� �коро�ти до�тупа к архивам\n"
 
-#: ar.c:319
+#: ar.c:278
 #, c-format
 msgid ""
 " The options are:\n"
@@ -290,12 +283,12 @@ msgstr ""
 " Параметры:\n"
 "   @<файл>                   читать параметры из <файла>\n"
 
-#: ar.c:322
+#: ar.c:281
 #, c-format
 msgid "  --plugin <name>              Load the specified plugin\n"
 msgstr "  --plugin <название>        загрузить указанный модуль\n"
 
-#: ar.c:325
+#: ar.c:284
 #, c-format
 msgid ""
 "  -t                           Update the archive's symbol map timestamp\n"
@@ -306,70 +299,86 @@ msgstr ""
 "  -h --help                  показать �то �правочное �ообщение\n"
 "  -V --version               показать информацию о вер�ии\n"
 
-#: ar.c:449
+#: ar.c:481 nm.c:1636
+#, c-format
+msgid "sorry - this program has been built without plugin support\n"
+msgstr "увы - �та программа была �обрана без поддержки модулей\n"
+
+#: ar.c:508
 msgid "two different operation options specified"
 msgstr "указаны параметры дл� двух различных операций"
 
-#: ar.c:538 nm.c:1639
+#: ar.c:589
 #, c-format
-msgid "sorry - this program has been built without plugin support\n"
-msgstr "увы — �та программа была �обрана без поддержки модулей\n"
+msgid "illegal option -- %c"
+msgstr "неверный параметр -- %c"
 
-#: ar.c:693
+#: ar.c:632
 msgid "no operation specified"
 msgstr "операци� не указана"
 
-#: ar.c:696
+#: ar.c:635
 msgid "`u' is only meaningful with the `r' option."
 msgstr "«u» имеет значение только � параметром «r»."
 
-#: ar.c:699
+#: ar.c:638
 msgid "`u' is not meaningful with the `D' option."
 msgstr "«u» не имеет �мы�ла � параметром «D»."
 
-#: ar.c:707
+#: ar.c:646
 msgid "`N' is only meaningful with the `x' and `d' options."
 msgstr "«N» имеет значение только � параметрами «x» и «d»."
 
-#: ar.c:710
+#: ar.c:649
 msgid "Value for `N' must be positive."
 msgstr "Значение дл� «N» должно быть положительным."
 
-#: ar.c:724
+#: ar.c:661
 msgid "`x' cannot be used on thin archives."
 msgstr "«x» нельз� и�пользовать дл� полупу�того архива."
 
-#: ar.c:765
+#: ar.c:702
 #, c-format
 msgid "internal error -- this option not implemented"
 msgstr "внутренн�� ошибка — �тот параметр не реализован"
 
-#: ar.c:834
+#: ar.c:771
 #, c-format
 msgid "creating %s"
 msgstr "�оздаёт�� %s"
 
-#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055
+#: ar.c:820 ar.c:875 ar.c:1203 objcopy.c:2052
 #, c-format
 msgid "internal stat error on %s"
 msgstr "внутренн�� ошибка stat на %s"
 
-#: ar.c:902 ar.c:970
+#: ar.c:824
+#, c-format
+msgid ""
+"\n"
+"<%s>\n"
+"\n"
+msgstr ""
+"\n"
+"<%s>\n"
+"\n"
+
+#: ar.c:840 ar.c:908
 #, c-format
 msgid "%s is not a valid archive"
 msgstr "%s не �вл�ет�� верным архивом"
 
-#: ar.c:1171
+#: ar.c:1108
 #, c-format
 msgid "No member named `%s'\n"
-msgstr "�ет члена � именем «%s»\n"
+msgstr "�ет члена � именем `%s'\n"
 
-#: ar.c:1221
+#: ar.c:1158
 #, c-format
 msgid "no entry %s in archive %s!"
 msgstr "пункта %s нет в архиве %s!"
 
-#: ar.c:1360
+#: ar.c:1297
 #, c-format
 msgid "%s: no archive map to update"
 msgstr "%s: нет карты архива дл� обновлени�"
@@ -422,20 +431,30 @@ msgstr "%s: невозможно найти файл модул� %s\n"
 #: arsup.c:425
 #, c-format
 msgid "Current open archive is %s\n"
-msgstr "Текущий открытый архив — %s\n"
+msgstr "Текущий открытый архив - %s\n"
 
 #: arsup.c:449
 #, c-format
 msgid "%s: no open archive\n"
 msgstr "%s: нет открытого архива\n"
 
-#: binemul.c:39
+#: bin2c.c:59
+#, c-format
+msgid "Usage: %s < input_file > output_file\n"
+msgstr "И�пользование: %s < входной_файл > выходной_файл\n"
+
+#: bin2c.c:60
+#, c-format
+msgid "Prints bytes from stdin in hex format.\n"
+msgstr "Выводит в ше�тнадцатеричном формате байты �о �тандартного ввода.\n"
+
+#: binemul.c:38
 #, c-format
 msgid "  No emulation specific options\n"
 msgstr "  �ет параметров �мул�ции\n"
 
 #. Macros for common output.
-#: binemul.h:49
+#: binemul.h:46
 #, c-format
 msgid " emulation options: \n"
 msgstr " параметры �мул�ции: \n"
@@ -443,7 +462,7 @@ msgstr " параметры �мул�ции: \n"
 #: bucomm.c:163
 #, c-format
 msgid "can't set BFD default target to `%s': %s"
-msgstr "невозможно у�тановить цель BFD по умолчанию на «%s»: %s"
+msgstr "невозможно у�тановить цель BFD по умолчанию на `%s': %s"
 
 #: bucomm.c:175
 #, c-format
@@ -475,47 +494,42 @@ msgstr "%s: поддерживаемые архитектуры:"
 msgid "BFD header file version %s\n"
 msgstr "Файл заголовка BFD вер�и� %s\n"
 
-#: bucomm.c:559
+#: bucomm.c:556
 #, c-format
 msgid "%s: bad number: %s"
 msgstr "%s: плохое чи�ло: %s"
 
-#: bucomm.c:576 strings.c:409
+#: bucomm.c:573 strings.c:409
 #, c-format
 msgid "'%s': No such file"
 msgstr "'%s': �ет такого файла"
 
-#: bucomm.c:578 strings.c:411
+#: bucomm.c:575 strings.c:411
 #, c-format
 msgid "Warning: could not locate '%s'.  reason: %s"
 msgstr "Предупреждение: невозможно найти '%s'. Причина: %s"
 
-#: bucomm.c:582
+#: bucomm.c:579
 #, c-format
 msgid "Warning: '%s' is not an ordinary file"
 msgstr "Предупреждение: '%s' не �вл�ет�� обычным файлом"
 
-#: bucomm.c:584
-#, c-format
-msgid "Warning: '%s' has negative size, probably it is too large"
-msgstr "Предупреждение: «%s» имеет отрицательный размер, веро�тно он �лишком большой"
-
-#: coffdump.c:107
+#: coffdump.c:106
 #, c-format
 msgid "#lines %d "
 msgstr "#�троки %d "
 
-#: coffdump.c:461 sysdump.c:646
+#: coffdump.c:460 sysdump.c:646
 #, c-format
 msgid "Usage: %s [option(s)] in-file\n"
 msgstr "И�пользование: %s [параметры] in-файл\n"
 
-#: coffdump.c:462
+#: coffdump.c:461
 #, c-format
-msgid " Print a human readable interpretation of a COFF object file\n"
-msgstr " Вывод удобочитаемой дл� человека интерпретации объектного файла COFF\n"
+msgid " Print a human readable interpretation of a SYSROFF object file\n"
+msgstr " Вывод удобочитаемой дл� человека интерпретации объектного файла SYSROFF\n"
 
-#: coffdump.c:463
+#: coffdump.c:462
 #, c-format
 msgid ""
 " The options are:\n"
@@ -524,554 +538,554 @@ msgid ""
 "  -v --version           Display the program's version\n"
 "\n"
 msgstr ""
-" Параметры:\n"
+"? Параметры:\n"
 "  @<файл>                читать параметры из <файла>\n"
 "  -h --help              показать �ту информацию\n"
 "  -v --version           показать вер�ию программы\n"
 "\n"
 
-#: coffdump.c:532 srconv.c:1833 sysdump.c:710
+#: coffdump.c:531 srconv.c:1832 sysdump.c:710
 msgid "no input file specified"
 msgstr "не указан входной файл"
 
-#: cxxfilt.c:119 nm.c:269 objdump.c:281
+#: cxxfilt.c:119 nm.c:269 objdump.c:256
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Отчёты об ошибках отправл�йте в %s\n"
 
-#: debug.c:648
+#: debug.c:647
 msgid "debug_add_to_current_namespace: no current file"
 msgstr "debug_add_to_current_namespace: нет текущего файла"
 
-#: debug.c:727
+#: debug.c:726
 msgid "debug_start_source: no debug_set_filename call"
 msgstr "debug_start_source: нет вызова debug_set_filename"
 
-#: debug.c:781
+#: debug.c:782
 msgid "debug_record_function: no debug_set_filename call"
 msgstr "debug_record_function: нет вызова debug_set_filename"
 
-#: debug.c:833
+#: debug.c:834
 msgid "debug_record_parameter: no current function"
 msgstr "debug_record_parameter: нет текущей функции"
 
-#: debug.c:865
+#: debug.c:866
 msgid "debug_end_function: no current function"
 msgstr "debug_end_function: нет текущей функции"
 
-#: debug.c:871
+#: debug.c:872
 msgid "debug_end_function: some blocks were not closed"
 msgstr "debug_end_function: некоторые блоки не были закрыты"
 
-#: debug.c:899
+#: debug.c:900
 msgid "debug_start_block: no current block"
 msgstr "debug_start_block: нет текущего блока"
 
-#: debug.c:935
+#: debug.c:936
 msgid "debug_end_block: no current block"
 msgstr "debug_end_block: нет текущего блока"
 
-#: debug.c:942
+#: debug.c:943
 msgid "debug_end_block: attempt to close top level block"
 msgstr "debug_end_block: попытка закрыть блок верхнего уровн�"
 
-#: debug.c:965
+#: debug.c:966
 msgid "debug_record_line: no current unit"
 msgstr "debug_record_line: нет текущего модул�"
 
 #. FIXME
-#: debug.c:1018
+#: debug.c:1019
 msgid "debug_start_common_block: not implemented"
 msgstr "debug_start_common_block: не выполнен"
 
 #. FIXME
-#: debug.c:1029
+#: debug.c:1030
 msgid "debug_end_common_block: not implemented"
 msgstr "debug_end_common_block: не выполнен"
 
 #. FIXME.
-#: debug.c:1113
+#: debug.c:1114
 msgid "debug_record_label: not implemented"
 msgstr "debug_record_label: не выполнен"
 
-#: debug.c:1135
+#: debug.c:1136
 msgid "debug_record_variable: no current file"
 msgstr "debug_record_variable: нет текущего файла"
 
-#: debug.c:1663
+#: debug.c:1664
 msgid "debug_make_undefined_type: unsupported kind"
 msgstr "debug_make_undefined_type: неподдерживаемый тип"
 
-#: debug.c:1840
+#: debug.c:1841
 msgid "debug_name_type: no current file"
 msgstr "debug_name_type: нет текущего файла"
 
-#: debug.c:1885
+#: debug.c:1886
 msgid "debug_tag_type: no current file"
 msgstr "debug_tag_type: нет текущего файла"
 
-#: debug.c:1893
+#: debug.c:1894
 msgid "debug_tag_type: extra tag attempted"
 msgstr "debug_tag_type: опробован дополнительный тег"
 
-#: debug.c:1930
+#: debug.c:1931
 #, c-format
 msgid "Warning: changing type size from %d to %d\n"
 msgstr "Предупреждение: измен�ет�� размер типа � %d на %d\n"
 
-#: debug.c:1952
+#: debug.c:1953
 msgid "debug_find_named_type: no current compilation unit"
 msgstr "debug_find_named_type: нет текущего модул� компил�ции"
 
-#: debug.c:2055
+#: debug.c:2056
 #, c-format
 msgid "debug_get_real_type: circular debug information for %s\n"
 msgstr "debug_get_real_type: циркул�рна� отладочна� информаци� дл� %s\n"
 
-#: debug.c:2482
+#: debug.c:2483
 msgid "debug_write_type: illegal type encountered"
 msgstr "debug_write_type: в�тречен неверный тип"
 
-#: dlltool.c:902 dlltool.c:928 dlltool.c:959
+#: dlltool.c:901 dlltool.c:927 dlltool.c:958
 #, c-format
 msgid "Internal error: Unknown machine type: %d"
 msgstr "Внутренн�� ошибка: �еизве�тный тип машины: %d"
 
-#: dlltool.c:1000
+#: dlltool.c:999
 #, c-format
 msgid "Can't open def file: %s"
 msgstr "�евозможно открыть файл def: %s"
 
-#: dlltool.c:1005
+#: dlltool.c:1004
 #, c-format
 msgid "Processing def file: %s"
 msgstr "Обрабатывает�� файл def: %s"
 
-#: dlltool.c:1009
+#: dlltool.c:1008
 msgid "Processed def file"
 msgstr "Обработан файл def"
 
-#: dlltool.c:1033
+#: dlltool.c:1032
 #, c-format
 msgid "Syntax error in def file %s:%d"
 msgstr "Ошибка �интак�и�а в файле def %s:%d"
 
-#: dlltool.c:1070
+#: dlltool.c:1069
 #, c-format
 msgid "%s: Path components stripped from image name, '%s'."
 msgstr "%s: Компоненты пути, извлеченные из имени изображени�, '%s'."
 
-#: dlltool.c:1088
+#: dlltool.c:1087
 #, c-format
 msgid "NAME: %s base: %x"
 msgstr "NAME: %s base: %x"
 
-#: dlltool.c:1091 dlltool.c:1112
+#: dlltool.c:1090 dlltool.c:1106
 msgid "Can't have LIBRARY and NAME"
 msgstr "�евозможно иметь LIBRARY и NAME"
 
-#: dlltool.c:1109
+#: dlltool.c:1103
 #, c-format
 msgid "LIBRARY: %s base: %x"
 msgstr "LIBRARY: %s base: %x"
 
-#: dlltool.c:1354 resrc.c:293
+#: dlltool.c:1342 resrc.c:293
 #, c-format
 msgid "wait: %s"
 msgstr "ожидание: %s"
 
-#: dlltool.c:1359 dllwrap.c:422 resrc.c:298
+#: dlltool.c:1347 dllwrap.c:422 resrc.c:298
 #, c-format
 msgid "subprocess got fatal signal %d"
 msgstr "подпроце�� получил фатальный �игнал %d"
 
-#: dlltool.c:1365 dllwrap.c:429 resrc.c:305
+#: dlltool.c:1353 dllwrap.c:429 resrc.c:305
 #, c-format
 msgid "%s exited with status %d"
 msgstr "%s завершен �о �тату�ом %d"
 
-#: dlltool.c:1396
+#: dlltool.c:1384
 #, c-format
 msgid "Sucking in info from %s section in %s"
 msgstr "В�а�ывает�� информаци� из раздела %s в %s"
 
-#: dlltool.c:1536
+#: dlltool.c:1524
 #, c-format
 msgid "Excluding symbol: %s"
 msgstr "Символ и�ключени�: %s"
 
-#: dlltool.c:1625 dlltool.c:1636 nm.c:1012 nm.c:1023
+#: dlltool.c:1613 dlltool.c:1624 nm.c:1010 nm.c:1021
 #, c-format
 msgid "%s: no symbols"
 msgstr "%s: нет �имволов"
 
 #. FIXME: we ought to read in and block out the base relocations.
-#: dlltool.c:1662
+#: dlltool.c:1650
 #, c-format
 msgid "Done reading %s"
 msgstr "Чтение выполнено %s"
 
-#: dlltool.c:1672
+#: dlltool.c:1660
 #, c-format
 msgid "Unable to open object file: %s: %s"
 msgstr "�е удало�ь открыть объектный файл: %s: %s"
 
-#: dlltool.c:1675
+#: dlltool.c:1663
 #, c-format
 msgid "Scanning object file %s"
 msgstr "Сканирует�� объектный файл %s"
 
-#: dlltool.c:1690
+#: dlltool.c:1678
 #, c-format
 msgid "Cannot produce mcore-elf dll from archive file: %s"
 msgstr "�евозможно �формировать mcore-elf dll из файла архива: %s"
 
-#: dlltool.c:1792
+#: dlltool.c:1780
 msgid "Adding exports to output file"
 msgstr "Эк�портные данные добавл�ют�� в выходной файл"
 
-#: dlltool.c:1844
+#: dlltool.c:1832
 msgid "Added exports to output file"
 msgstr "Эк�портные данные добавлены в выходной файл"
 
-#: dlltool.c:1986
+#: dlltool.c:1974
 #, c-format
 msgid "Generating export file: %s"
 msgstr "Генерирует�� файл �к�порта: %s"
 
-#: dlltool.c:1991
+#: dlltool.c:1979
 #, c-format
 msgid "Unable to open temporary assembler file: %s"
 msgstr "�евозможно открыть временный файл а��емблера: %s"
 
-#: dlltool.c:1994
+#: dlltool.c:1982
 #, c-format
 msgid "Opened temporary file: %s"
 msgstr "Открытый временный файл: %s"
 
-#: dlltool.c:2171
+#: dlltool.c:2159
 msgid "failed to read the number of entries from base file"
 msgstr "не удало�ь прочитать чи�ло обла�тей из базового файла"
 
-#: dlltool.c:2219
+#: dlltool.c:2207
 msgid "Generated exports file"
 msgstr "Сгенерирован файл �к�порта"
 
-#: dlltool.c:2428
+#: dlltool.c:2416
 #, c-format
 msgid "bfd_open failed open stub file: %s: %s"
 msgstr "bfd_open не �мог открыть файл stub: %s: %s"
 
-#: dlltool.c:2432
+#: dlltool.c:2420
 #, c-format
 msgid "Creating stub file: %s"
 msgstr "Создает�� файл stub: %s"
 
-#: dlltool.c:2894
+#: dlltool.c:2882
 #, c-format
 msgid "bfd_open failed reopen stub file: %s: %s"
 msgstr "bfd_open не �мог переоткрыть файл stub: %s: %s"
 
-#: dlltool.c:2908 dlltool.c:2984
+#: dlltool.c:2896 dlltool.c:2972
 #, c-format
 msgid "failed to open temporary head file: %s"
 msgstr "�бой при открытии временного головного файла: %s"
 
-#: dlltool.c:2970 dlltool.c:3050
+#: dlltool.c:2958 dlltool.c:3038
 #, c-format
 msgid "failed to open temporary head file: %s: %s"
 msgstr "�бой при открытии временного головного файла: %s: %s"
 
-#: dlltool.c:3064
+#: dlltool.c:3052
 #, c-format
 msgid "failed to open temporary tail file: %s"
 msgstr "�бой при открытии временного конечного файла: %s"
 
-#: dlltool.c:3121
+#: dlltool.c:3109
 #, c-format
 msgid "failed to open temporary tail file: %s: %s"
 msgstr "�бой при открытии временного конечного файла: %s: %s"
 
-#: dlltool.c:3143
+#: dlltool.c:3131
 #, c-format
 msgid "Can't create .lib file: %s: %s"
 msgstr "�е удало�ь �оздать файл .lib: %s: %s"
 
-#: dlltool.c:3147
+#: dlltool.c:3135
 #, c-format
 msgid "Creating library file: %s"
 msgstr "Создаёт�� файл библиотеки: %s"
 
-#: dlltool.c:3239 dlltool.c:3245
+#: dlltool.c:3227 dlltool.c:3233
 #, c-format
 msgid "cannot delete %s: %s"
 msgstr "невозможно удалить %s: %s"
 
-#: dlltool.c:3250
+#: dlltool.c:3238
 msgid "Created lib file"
 msgstr "Создан lib-файл"
 
-#: dlltool.c:3462
+#: dlltool.c:3450
 #, c-format
 msgid "Can't open .lib file: %s: %s"
 msgstr "�е удало�ь открыть файл .lib: %s: %s"
 
-#: dlltool.c:3470 dlltool.c:3492
+#: dlltool.c:3458 dlltool.c:3480
 #, c-format
 msgid "%s is not a library"
 msgstr "%s не �вл�ет�� библиотекой"
 
-#: dlltool.c:3510
+#: dlltool.c:3498
 #, c-format
 msgid "Import library `%s' specifies two or more dlls"
-msgstr "Библиотека импорта «%s» указывает на две или более dll"
+msgstr "Библиотека импорта `%s' указывает на две или более dll"
 
-#: dlltool.c:3521
+#: dlltool.c:3509
 #, c-format
 msgid "Unable to determine dll name for `%s' (not an import library?)"
-msgstr "�е удало�ь определить им� dll дл�«%s» (не библиотека импорта?)"
+msgstr "�е удало�ь определить им� dll дл�`%s' (не библиотека импорта?)"
 
-#: dlltool.c:3745
+#: dlltool.c:3733
 #, c-format
 msgid "Warning, ignoring duplicate EXPORT %s %d,%d"
 msgstr "Предупреждение, пропу�кает�� повтор�ющий�� EXPORT %s %d,%d"
 
-#: dlltool.c:3751
+#: dlltool.c:3739
 #, c-format
 msgid "Error, duplicate EXPORT with ordinals: %s"
 msgstr "Ошибка, EXPORT повтор�ет�� � пор�дковыми чи�лительными: %s"
 
-#: dlltool.c:3856
+#: dlltool.c:3844
 msgid "Processing definitions"
 msgstr "Обрабатывают�� опи�ани�"
 
-#: dlltool.c:3888
+#: dlltool.c:3876
 msgid "Processed definitions"
 msgstr "Опи�ани� обработаны"
 
 #. xgetext:c-format
-#: dlltool.c:3895 dllwrap.c:483
+#: dlltool.c:3883 dllwrap.c:483
 #, c-format
 msgid "Usage %s <option(s)> <object-file(s)>\n"
 msgstr "И�пользование %s <параметры> <объектные_файлы>\n"
 
 #. xgetext:c-format
-#: dlltool.c:3897
+#: dlltool.c:3885
 #, c-format
 msgid "   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"
 msgstr "   -m --machine <машина>     Создание как DLL дл� <машины>.  [по умолчанию: %s]\n"
 
-#: dlltool.c:3898
+#: dlltool.c:3886
 #, c-format
 msgid "        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 msgstr "        возможно <машина>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"
 
-#: dlltool.c:3899
+#: dlltool.c:3887
 #, c-format
 msgid "   -e --output-exp <outname> Generate an export file.\n"
 msgstr "   -e --output-exp <вых_им�> Создание файла �к�порта.\n"
 
-#: dlltool.c:3900
+#: dlltool.c:3888
 #, c-format
 msgid "   -l --output-lib <outname> Generate an interface library.\n"
 msgstr "   -l --output-lib <вых_им�> Создание библиотеки интерфей�а.\n"
 
-#: dlltool.c:3901
+#: dlltool.c:3889
 #, c-format
 msgid "   -y --output-delaylib <outname> Create a delay-import library.\n"
 msgstr "   -y --output-delaylib <вых_им�> Создание библиотеки отложенного импорта.\n"
 
-#: dlltool.c:3902
+#: dlltool.c:3890
 #, c-format
 msgid "   -a --add-indirect         Add dll indirects to export file.\n"
 msgstr "   -a --add-indirect         Добавление непр�мых dll в файл �к�порта.\n"
 
-#: dlltool.c:3903
+#: dlltool.c:3891
 #, c-format
 msgid "   -D --dllname <name>       Name of input dll to put into interface lib.\n"
 msgstr "   -D --dllname <им�>        Им� входной dll дл� помещени� в библиотеку интерфей�а.\n"
 
-#: dlltool.c:3904
+#: dlltool.c:3892
 #, c-format
 msgid "   -d --input-def <deffile>  Name of .def file to be read in.\n"
 msgstr "   -d --input-def <def-файл> Им� файла .def дл� �читывани�.\n"
 
-#: dlltool.c:3905
+#: dlltool.c:3893
 #, c-format
 msgid "   -z --output-def <deffile> Name of .def file to be created.\n"
 msgstr "   -z --output-def <def-файл> Им� �оздаваемого файла .def.\n"
 
-#: dlltool.c:3906
+#: dlltool.c:3894
 #, c-format
 msgid "      --export-all-symbols   Export all symbols to .def\n"
 msgstr "      --export-all-symbols   Эк�порт в�ех �имволов в .def\n"
 
-#: dlltool.c:3907
+#: dlltool.c:3895
 #, c-format
 msgid "      --no-export-all-symbols  Only export listed symbols\n"
 msgstr "      --no-export-all-symbols  Эк�порт только перечи�ленных �имволов\n"
 
-#: dlltool.c:3908
+#: dlltool.c:3896
 #, c-format
 msgid "      --exclude-symbols <list> Don't export <list>\n"
 msgstr "      --exclude-symbols <�пи�ок> �е �к�портировать <�пи�ок>\n"
 
-#: dlltool.c:3909
+#: dlltool.c:3897
 #, c-format
 msgid "      --no-default-excludes  Clear default exclude symbols\n"
 msgstr "      --no-default-excludes  Очи�тка �имволов и�ключени� по умолчанию\n"
 
-#: dlltool.c:3910
+#: dlltool.c:3898
 #, c-format
 msgid "   -b --base-file <basefile> Read linker generated base file.\n"
 msgstr "   -b --base-file <base-файл> Чтение �озданного компоновщиком base-файла.\n"
 
-#: dlltool.c:3911
+#: dlltool.c:3899
 #, c-format
 msgid "   -x --no-idata4            Don't generate idata$4 section.\n"
 msgstr "   -x --no-idata4            �е �оздавать раздел idata$4.\n"
 
-#: dlltool.c:3912
+#: dlltool.c:3900
 #, c-format
 msgid "   -c --no-idata5            Don't generate idata$5 section.\n"
 msgstr "   -c --no-idata5            не �оздавать раздел idata$5.\n"
 
-#: dlltool.c:3913
+#: dlltool.c:3901
 #, c-format
 msgid "      --use-nul-prefixed-import-tables Use zero prefixed idata$4 and idata$5.\n"
 msgstr "      --use-nul-prefixed-import-tables И�пользовать ноль перед idata$4 и idata$5.\n"
 
-#: dlltool.c:3914
+#: dlltool.c:3902
 #, c-format
 msgid "   -U --add-underscore       Add underscores to all symbols in interface library.\n"
 msgstr "   -U --add-underscore       добавл�ть �имволы подчёркивани� во в�е �имволы библиотеки интерфей�а.\n"
 
-#: dlltool.c:3915
+#: dlltool.c:3903
 #, c-format
 msgid "      --add-stdcall-underscore Add underscores to stdcall symbols in interface library.\n"
 msgstr "      --add-stdcall-underscore добавл�ть �имволы подчёркивани� в �имволы stdcall библиотеки интерфей�а.\n"
 
-#: dlltool.c:3916
+#: dlltool.c:3904
 #, c-format
 msgid "      --no-leading-underscore All symbols shouldn't be prefixed by an underscore.\n"
 msgstr "      --no-leading-underscore В�е �имволы не должны начинать�� � подчёркивани�.\n"
 
-#: dlltool.c:3917
+#: dlltool.c:3905
 #, c-format
 msgid "      --leading-underscore   All symbols should be prefixed by an underscore.\n"
 msgstr "      --leading-underscore   В�е �имволы должны начинать�� � подчёркивани�.\n"
 
-#: dlltool.c:3918
+#: dlltool.c:3906
 #, c-format
 msgid "   -k --kill-at              Kill @<n> from exported names.\n"
 msgstr "   -k --kill-at              Удаление @<n> из �к�портированных имен.\n"
 
-#: dlltool.c:3919
+#: dlltool.c:3907
 #, c-format
 msgid "   -A --add-stdcall-alias    Add aliases without @<n>.\n"
 msgstr "   -A --add-stdcall-alias    Добавление алиа�ов без @<n>.\n"
 
-#: dlltool.c:3920
+#: dlltool.c:3908
 #, c-format
 msgid "   -p --ext-prefix-alias <prefix> Add aliases with <prefix>.\n"
 msgstr "   -p --ext-prefix-alias <префик�> Добавление алиа�ов � <префик�ом>.\n"
 
-#: dlltool.c:3921
+#: dlltool.c:3909
 #, c-format
 msgid "   -S --as <name>            Use <name> for assembler.\n"
 msgstr "   -S --as <им�>             И�пользование <имени> дл� а��емблера.\n"
 
-#: dlltool.c:3922
+#: dlltool.c:3910
 #, c-format
 msgid "   -f --as-flags <flags>     Pass <flags> to the assembler.\n"
 msgstr "   -f --as-flags <флаги>     Передача <флагов> в а��емблер.\n"
 
-#: dlltool.c:3923
+#: dlltool.c:3911
 #, c-format
 msgid "   -C --compat-implib        Create backward compatible import library.\n"
 msgstr "   -C --compat-implib        Создание библиотеки импорта � обратной �овме�тимо�тью.\n"
 
-#: dlltool.c:3924
+#: dlltool.c:3912
 #, c-format
 msgid "   -n --no-delete            Keep temp files (repeat for extra preservation).\n"
 msgstr "   -n --no-delete            О�тавл�ть временные файлы (повтор дл� доп. защиты).\n"
 
-#: dlltool.c:3925
+#: dlltool.c:3913
 #, c-format
 msgid "   -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
 msgstr "   -t --temp-prefix <префик�> И�пользование <префик�а> дл� �оздани� имен временных файлов.\n"
 
-#: dlltool.c:3926
+#: dlltool.c:3914
 #, c-format
 msgid "   -I --identify <implib>    Report the name of the DLL associated with <implib>.\n"
 msgstr "   -I --identify <implib>    Сообщить им� DLL, а��оциированной � <implib>.\n"
 
-#: dlltool.c:3927
+#: dlltool.c:3915
 #, c-format
 msgid "      --identify-strict      Causes --identify to report error when multiple DLLs.\n"
 msgstr "      --identify-strict      За�тавл�ет --identify выдавать ошибку при не�кольких DLL.\n"
 
-#: dlltool.c:3928
+#: dlltool.c:3916
 #, c-format
 msgid "   -v --verbose              Be verbose.\n"
 msgstr "   -v --verbose              Подробный режим.\n"
 
-#: dlltool.c:3929
+#: dlltool.c:3917
 #, c-format
 msgid "   -V --version              Display the program version.\n"
 msgstr "   -V --version              Вывод вер�ии программы.\n"
 
-#: dlltool.c:3930
+#: dlltool.c:3918
 #, c-format
 msgid "   -h --help                 Display this information.\n"
 msgstr "   -h --help                 Вывод �той информации.\n"
 
-#: dlltool.c:3931
+#: dlltool.c:3919
 #, c-format
 msgid "   @<file>                   Read options from <file>.\n"
 msgstr "   @<файл>                   Читать параметры из <файла>.\n"
 
-#: dlltool.c:3933
+#: dlltool.c:3921
 #, c-format
 msgid "   -M --mcore-elf <outname>  Process mcore-elf object files into <outname>.\n"
 msgstr "   -M --mcore-elf <вых_им�>  Обработка объектного файла mcore-elf в <вых_им�>.\n"
 
-#: dlltool.c:3934
+#: dlltool.c:3922
 #, c-format
 msgid "   -L --linker <name>        Use <name> as the linker.\n"
 msgstr "   -L --linker <им�>         И�пользование <имени> в каче�тве компоновщика.\n"
 
-#: dlltool.c:3935
+#: dlltool.c:3923
 #, c-format
 msgid "   -F --linker-flags <flags> Pass <flags> to the linker.\n"
 msgstr "   -F --linker-flags <флаги> Передача <флагов> компоновщику.\n"
 
-#: dlltool.c:4082
+#: dlltool.c:4070
 #, c-format
 msgid "Path components stripped from dllname, '%s'."
 msgstr "Компоненты пути, извлеченные из имени dll, '%s'."
 
-#: dlltool.c:4130
+#: dlltool.c:4118
 #, c-format
 msgid "Unable to open base-file: %s"
 msgstr "�евозможно открыть base-файл: %s"
 
-#: dlltool.c:4165
+#: dlltool.c:4153
 #, c-format
 msgid "Machine '%s' not supported"
 msgstr "Машина '%s' не поддерживает��"
 
-#: dlltool.c:4245
+#: dlltool.c:4232
 #, c-format
 msgid "Warning, machine type (%d) not supported for delayimport."
 msgstr "Предупреждение, тип машины (%d) не поддерживает�� дл� delayimport."
 
-#: dlltool.c:4313 dllwrap.c:213
+#: dlltool.c:4300 dllwrap.c:213
 #, c-format
 msgid "Tried file: %s"
 msgstr "Опробованный файл: %s"
 
-#: dlltool.c:4320 dllwrap.c:220
+#: dlltool.c:4307 dllwrap.c:220
 #, c-format
 msgid "Using file: %s"
 msgstr "И�пользует�� файл: %s"
@@ -1328,16 +1342,22 @@ msgstr "DRIVER им�      : %s\n"
 msgid "DRIVER options  : %s\n"
 msgstr "DRIVER параметры    : %s\n"
 
-#: dwarf.c:256 dwarf.c:3019
+#: dwarf.c:112 dwarf.c:161 elfedit.c:123 elfedit.c:167 elfedit.c:195
+#: elfedit.c:227 readelf.c:368 readelf.c:536
+#, c-format
+msgid "Unhandled data length: %d\n"
+msgstr "Длина необрабатываемых данных: %d\n"
+
+#: dwarf.c:312 dwarf.c:2890
 msgid "badly formed extended line op encountered!\n"
 msgstr "в�тречен неверно �формированный ра�ширенный line-up!\n"
 
-#: dwarf.c:263
+#: dwarf.c:319
 #, c-format
 msgid "  Extended opcode %d: "
 msgstr "  Ра�ширенный код операции %d: "
 
-#: dwarf.c:268
+#: dwarf.c:324
 #, c-format
 msgid ""
 "End of Sequence\n"
@@ -1346,193 +1366,192 @@ msgstr ""
 "Конец по�ледовательно�ти\n"
 "\n"
 
-#: dwarf.c:274
+#: dwarf.c:330
 #, c-format
-msgid "set Address to 0x%s\n"
-msgstr "у�тановка адре�а равным 0x%s\n"
+msgid "set Address to 0x%lx\n"
+msgstr "у�тановка адре�а в 0x%lx\n"
 
-#: dwarf.c:280
+#: dwarf.c:336
 #, c-format
 msgid "  define new File Table entry\n"
 msgstr "  определение нового пункта Таблицы файлов\n"
 
-#: dwarf.c:281 dwarf.c:2548
+#: dwarf.c:337 dwarf.c:2431
 #, c-format
 msgid "  Entry\tDir\tTime\tSize\tName\n"
 msgstr "  Пункт\tКаталог\tВрем�\tРазмер\tИм�\n"
 
-#: dwarf.c:295
+#: dwarf.c:339
 #, c-format
-msgid "set Discriminator to %s\n"
-msgstr "у�тановка Discriminator равным %s\n"
+msgid "   %d\t"
+msgstr "   %d\t"
 
-#: dwarf.c:356
+#: dwarf.c:342 dwarf.c:344 dwarf.c:346 dwarf.c:2443 dwarf.c:2445 dwarf.c:2447
 #, c-format
-msgid "(%s"
-msgstr "(%s"
+msgid "%lu\t"
+msgstr "%lu\t"
 
-#: dwarf.c:360
+#: dwarf.c:347
 #, c-format
-msgid ",%s"
-msgstr ",%s"
+msgid ""
+"%s\n"
+"\n"
+msgstr ""
+"%s\n"
+"\n"
 
-#: dwarf.c:364
+#: dwarf.c:351
 #, c-format
-msgid ",%s)\n"
-msgstr ",%s)\n"
+msgid "set Discriminator to %lu\n"
+msgstr "у�тановить Discriminator равным %lu\n"
 
 #. The test against DW_LNW_hi_user is redundant due to
 #. the limited range of the unsigned char data type used
 #. for op_code.
 #. && op_code <= DW_LNE_hi_user
-#: dwarf.c:387
+#: dwarf.c:393
 #, c-format
-msgid "user defined: "
-msgstr "задано пользователем: "
+msgid "user defined: length %d\n"
+msgstr "задано пользователем: длина %d\n"
 
-#: dwarf.c:389
+#: dwarf.c:395 dwarf.c:2922
 #, c-format
-msgid "UNKNOWN: "
-msgstr "�ЕИЗВЕСТ�О: "
-
-#: dwarf.c:390
-#, c-format
-msgid "length %d ["
-msgstr "длина %d ["
+msgid "UNKNOWN: length %d\n"
+msgstr "�ЕИЗВЕСТ�ЫЙ: длина %d\n"
 
-#: dwarf.c:407
+#: dwarf.c:408
 msgid "<no .debug_str section>"
 msgstr "<нет раздела .debug_str>"
 
-#: dwarf.c:413
+#: dwarf.c:414
 #, c-format
-msgid "DW_FORM_strp offset too big: %s\n"
-msgstr "Смещение DW_FORM_strp �лишком большое: %s\n"
+msgid "DW_FORM_strp offset too big: %lx\n"
+msgstr "Смещение DW_FORM_strp �лишком большое: %lx\n"
 
 #: dwarf.c:415
 msgid "<offset is too big>"
 msgstr "<�мещение �лишком велико>"
 
-#: dwarf.c:655
+#: dwarf.c:654
 #, c-format
 msgid "Unknown TAG value: %lx"
 msgstr "�еизве�тное значение TAG: %lx"
 
-#: dwarf.c:696
+#: dwarf.c:695
 #, c-format
 msgid "Unknown FORM value: %lx"
 msgstr "�еизве�тное значение FORM: %lx"
 
-#: dwarf.c:705
+#: dwarf.c:704
 #, c-format
-msgid " %s byte block: "
-msgstr " %s-байтовый блок: "
+msgid " %lu byte block: "
+msgstr " %lu-байтовый блок: "
 
-#: dwarf.c:1050
+#: dwarf.c:1037
 #, c-format
 msgid "(DW_OP_call_ref in frame info)"
 msgstr "(DW_OP_call_ref в информации кадра)"
 
-#: dwarf.c:1122
+#: dwarf.c:1109
 #, c-format
 msgid "(DW_OP_GNU_implicit_pointer in frame info)"
 msgstr "(DW_OP_GNU_implicit_pointer в информации кадра)"
 
-#: dwarf.c:1229
+#: dwarf.c:1167
 #, c-format
 msgid "(User defined location op)"
 msgstr "(Определенное пользователем размещение операции)"
 
-#: dwarf.c:1231
+#: dwarf.c:1169
 #, c-format
 msgid "(Unknown location op)"
 msgstr "(�еизве�тное размещение операции)"
 
-#: dwarf.c:1278
+#: dwarf.c:1217
 msgid "Internal error: DWARF version is not 2, 3 or 4.\n"
 msgstr "Внутренн�� ошибка: номер вер�ии DWARF не 2, 3 или 4.\n"
 
-#: dwarf.c:1384
-msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n"
-msgstr "DW_FORM_data8 не поддерживает��, е�ли sizeof (dwarf_vma) != 8\n"
+#: dwarf.c:1323
+msgid "DW_FORM_data8 is unsupported when sizeof (unsigned long) != 8\n"
+msgstr "DW_FORM_data8 не поддерживает��, когда sizeof (длинное целое чи�ло без знака) != 8\n"
 
-#: dwarf.c:1434
+#: dwarf.c:1373
 #, c-format
-msgid " (indirect string, offset: 0x%s): %s"
-msgstr " (ко�венна� �трока, �мещение: 0x%s): %s"
+msgid " (indirect string, offset: 0x%lx): %s"
+msgstr " (ко�венна� �трока, �мещение: 0x%lx): %s"
 
-#: dwarf.c:1459
+#: dwarf.c:1397
 #, c-format
 msgid "Unrecognized form: %lu\n"
 msgstr "�ера�познанна� форма: %lu\n"
 
-#: dwarf.c:1552
+#: dwarf.c:1485
 #, c-format
 msgid "(not inlined)"
 msgstr "(не внутри�трочный)"
 
-#: dwarf.c:1555
+#: dwarf.c:1488
 #, c-format
 msgid "(inlined)"
 msgstr "(внутри�трочный)"
 
-#: dwarf.c:1558
+#: dwarf.c:1491
 #, c-format
 msgid "(declared as inline but ignored)"
 msgstr "(объ�влен как внутри�трочный, но пропущен)"
 
-#: dwarf.c:1561
+#: dwarf.c:1494
 #, c-format
 msgid "(declared as inline and inlined)"
 msgstr "(объ�влен как внутри�трочный, так и е�ть)"
 
-#: dwarf.c:1564
+#: dwarf.c:1497
 #, c-format
-msgid "  (Unknown inline attribute value: %s)"
-msgstr "  (�еизве�тное значение внутри�трочного атрибута: %s)"
+msgid "  (Unknown inline attribute value: %lx)"
+msgstr "  (�еизве�тное значение внутри�трочного атрибута: %lx)"
 
-#: dwarf.c:1735
+#: dwarf.c:1662
 #, c-format
 msgid "(location list)"
 msgstr "(�пи�ок ме�тоположени�)"
 
-#: dwarf.c:1756 dwarf.c:3722
+#: dwarf.c:1683 dwarf.c:3563
 #, c-format
 msgid " [without DW_AT_frame_base]"
 msgstr " [без DW_AT_frame_base]"
 
-#: dwarf.c:1771
+#: dwarf.c:1698
 #, c-format
-msgid "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
-msgstr "Смещение %s, и�пользуемое как значение атрибута DW_AT_import в DIE по �мещению %lx, �лишком большое.\n"
+msgid "Offset %lx used as value for DW_AT_import attribute of DIE at offset %lx is too big.\n"
+msgstr "Смещение %lx, и�пользуемое как значение атрибута DW_AT_import в DIE по адре�у %lx, �лишком большое is too big.\n"
 
-#: dwarf.c:1971
+#: dwarf.c:1889
 #, c-format
 msgid "Unknown AT value: %lx"
 msgstr "�еизве�тное значение AT: %lx"
 
-#: dwarf.c:2042
+#: dwarf.c:1960
 #, c-format
-msgid "Reserved length value (0x%s) found in section %s\n"
-msgstr "�айдено зарезервированное значение длины (0x%s) в разделе %s\n"
+msgid "Reserved length value (%lx) found in section %s\n"
+msgstr "�айдено зарезервированное значение длины (%lx) в разделе %s\n"
 
-#: dwarf.c:2054
+#: dwarf.c:1971
 #, c-format
-msgid "Corrupt unit length (0x%s) found in section %s\n"
-msgstr "�айдено повреждение длины модул� (0x%s) в разделе %s\n"
+msgid "Corrupt unit length (%lx) found in section %s\n"
+msgstr "�айдено повреждение длины модул� (%lx) в разделе %s\n"
 
-#: dwarf.c:2062
+#: dwarf.c:1978
 #, c-format
 msgid "No comp units in %s section ?"
 msgstr "В разделе %s нет �лементов comp?"
 
-#: dwarf.c:2071
+#: dwarf.c:1987
 #, c-format
 msgid "Not enough memory for a debug info array of %u entries"
 msgstr "�едо�таточно пам�ти дл� ма��ива � отладочной информацией из %u �лементов"
 
-#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588
-#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024
+#: dwarf.c:1995 dwarf.c:3158 dwarf.c:3252 dwarf.c:3326 dwarf.c:3443
+#: dwarf.c:3598 dwarf.c:3667 dwarf.c:3862
 #, c-format
 msgid ""
 "Contents of the %s section:\n"
@@ -1541,86 +1560,86 @@ msgstr ""
 "Содержимое раздела %s:\n"
 "\n"
 
-#: dwarf.c:2088
+#: dwarf.c:2003
 #, c-format
 msgid "Unable to locate %s section!\n"
 msgstr "�евозможно определить размещение раздела %s!\n"
 
-#: dwarf.c:2169
+#: dwarf.c:2084
 #, c-format
-msgid "  Compilation Unit @ offset 0x%s:\n"
-msgstr "  Единица компил�ции @ �мещение 0x%s:\n"
+msgid "  Compilation Unit @ offset 0x%lx:\n"
+msgstr "  Единица компил�ции @ �мещение 0x%lx:\n"
 
-#: dwarf.c:2171
+#: dwarf.c:2085
 #, c-format
-msgid "   Length:        0x%s (%s)\n"
-msgstr "   Длина:         0x%s (%s)\n"
+msgid "   Length:        0x%lx (%s)\n"
+msgstr "   Длина:         0x%lx (%s)\n"
 
-#: dwarf.c:2174
+#: dwarf.c:2087
 #, c-format
 msgid "   Version:       %d\n"
 msgstr "   Вер�и�:        %d\n"
 
-#: dwarf.c:2175
+#: dwarf.c:2088
 #, c-format
-msgid "   Abbrev Offset: %s\n"
-msgstr "   Смещ. аббрев:  %s\n"
+msgid "   Abbrev Offset: %ld\n"
+msgstr "   Смещ. аббрев:  %ld\n"
 
-#: dwarf.c:2177
+#: dwarf.c:2089
 #, c-format
 msgid "   Pointer Size:  %d\n"
 msgstr "   Разм. указат:  %d\n"
 
-#: dwarf.c:2181
+#: dwarf.c:2093
 #, c-format
 msgid "   Signature:     "
 msgstr "   Подпи�ь:     "
 
-#: dwarf.c:2185
+#: dwarf.c:2097
 #, c-format
-msgid "   Type Offset:   0x%s\n"
-msgstr "   Tип �мещени�:   0x%s\n"
+msgid "   Type Offset:   0x%lx\n"
+msgstr "   Tип �мещени�:   0x%lx\n"
 
-#: dwarf.c:2193
+#: dwarf.c:2104
 #, c-format
-msgid "Debug info is corrupted, length of CU at %s extends beyond end of section (length = %s)\n"
-msgstr "Данные отладки повреждены, � длиной CU по адре�у %s они выход�т за границу раздела (длина = %s)\n"
+msgid "Debug info is corrupted, length of CU at %lx extends beyond end of section (length = %lx)\n"
+msgstr "Данные отладки повреждены, � длиной CU по адре�у %lx они выход�т за границу раздела (длина = %lx)\n"
 
-#: dwarf.c:2206
+#: dwarf.c:2115
 #, c-format
-msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n"
-msgstr "CU по �мещению %s �одержит повреждённый или не поддерживаемый номер вер�ии: %d.\n"
+msgid "CU at offset %lx contains corrupt or unsupported version number: %d.\n"
+msgstr "CU по адре�у %lx �одержит повреждённый или не поддерживаемый номер вер�ии: %d.\n"
 
-#: dwarf.c:2217
+#: dwarf.c:2125
 #, c-format
 msgid "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"
 msgstr "Данные отладки повреждены, �мещение аббревиатуры (%lx) больше размера раздела аббревиатуры (%lx)\n"
 
-#: dwarf.c:2267
+#: dwarf.c:2172
 #, c-format
 msgid "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n"
 msgstr "Обнаружен фиктивный маркер конца род�твенных узлов по адре�у %lx в разделе .debug_info\n"
 
-#: dwarf.c:2271
+#: dwarf.c:2176
 msgid "Further warnings about bogus end-of-sibling markers suppressed\n"
 msgstr "Повторные предупреждени� о фиктивных маркерах конца род�твенных узлов показывать�� не будут\n"
 
-#: dwarf.c:2290
+#: dwarf.c:2183
 #, c-format
 msgid " <%d><%lx>: Abbrev Number: %lu"
 msgstr " <%d><%lx>: номер аббревиатуры: %lu"
 
-#: dwarf.c:2294
+#: dwarf.c:2200
 #, c-format
-msgid " <%d><%lx>: ...\n"
-msgstr " <%d><%lx>: …\n"
+msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
+msgstr "DIE по адре�у %lx ��ылает�� на аббревиатуру � номером %lu, котора� не �уще�твует\n"
 
-#: dwarf.c:2313
+#: dwarf.c:2206
 #, c-format
-msgid "DIE at offset %lx refers to abbreviation number %lu which does not exist\n"
-msgstr "DIE по �мещению %lx ��ылает�� на аббревиатуру � номером %lu, котора� не �уще�твует\n"
+msgid " (%s)\n"
+msgstr " (%s)\n"
 
-#: dwarf.c:2415
+#: dwarf.c:2298
 #, c-format
 msgid ""
 "Raw dump of debug contents of section %s:\n"
@@ -1629,70 +1648,70 @@ msgstr ""
 "Сырой дамп дл� отладки �одержимого раздела %s:\n"
 "\n"
 
-#: dwarf.c:2453
+#: dwarf.c:2336
 #, c-format
 msgid "The information in section %s appears to be corrupt - the section is too small\n"
-msgstr "Похоже, что информаци� в разделе %s повреждена — раздел �лишком мал\n"
+msgstr "Похоже, что информаци� в разделе %s повреждена - раздел �лишком мал\n"
 
-#: dwarf.c:2465 dwarf.c:2833
+#: dwarf.c:2348 dwarf.c:2701
 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n"
 msgstr "Сейча� поддерживают�� �троки инфо только дл� DWARF вер�ии 2, 3 и 4.\n"
 
-#: dwarf.c:2479 dwarf.c:2848
+#: dwarf.c:2362 dwarf.c:2716
 msgid "Invalid maximum operations per insn.\n"
 msgstr "�еверное мак�имальное количе�тво операций на ин�трукцию.\n"
 
-#: dwarf.c:2498
+#: dwarf.c:2381
 #, c-format
 msgid "  Offset:                      0x%lx\n"
 msgstr "  Смещение:                    0x%lx\n"
 
-#: dwarf.c:2499
+#: dwarf.c:2382
 #, c-format
 msgid "  Length:                      %ld\n"
 msgstr "  Длина:                       %ld\n"
 
-#: dwarf.c:2500
+#: dwarf.c:2383
 #, c-format
 msgid "  DWARF Version:               %d\n"
 msgstr "  Вер�и� DWARF:                %d\n"
 
-#: dwarf.c:2501
+#: dwarf.c:2384
 #, c-format
 msgid "  Prologue Length:             %d\n"
 msgstr "  Длина пролога:               %d\n"
 
-#: dwarf.c:2502
+#: dwarf.c:2385
 #, c-format
 msgid "  Minimum Instruction Length:  %d\n"
 msgstr "  Миним. длина ин�трукции:     %d\n"
 
-#: dwarf.c:2504
+#: dwarf.c:2387
 #, c-format
 msgid "  Maximum Ops per Instruction: %d\n"
 msgstr "  Мак�им. кол-во операций на ин�трукцию: %d\n"
 
-#: dwarf.c:2505
+#: dwarf.c:2388
 #, c-format
 msgid "  Initial value of 'is_stmt':  %d\n"
 msgstr "  �ач. значение 'is_stmt':     %d\n"
 
-#: dwarf.c:2506
+#: dwarf.c:2389
 #, c-format
 msgid "  Line Base:                   %d\n"
 msgstr "  О�нование �троки:            %d\n"
 
-#: dwarf.c:2507
+#: dwarf.c:2390
 #, c-format
 msgid "  Line Range:                  %d\n"
 msgstr "  Диапазон �троки:             %d\n"
 
-#: dwarf.c:2508
+#: dwarf.c:2391
 #, c-format
 msgid "  Opcode Base:                 %d\n"
 msgstr "  О�нование кода операции:     %d\n"
 
-#: dwarf.c:2517
+#: dwarf.c:2400
 #, c-format
 msgid ""
 "\n"
@@ -1701,12 +1720,12 @@ msgstr ""
 "\n"
 " Коды операций:\n"
 
-#: dwarf.c:2520
+#: dwarf.c:2403
 #, c-format
 msgid "  Opcode %d has %d args\n"
 msgstr "  Код операции %d �одержит %d аргументов\n"
 
-#: dwarf.c:2526
+#: dwarf.c:2409
 #, c-format
 msgid ""
 "\n"
@@ -1715,7 +1734,7 @@ msgstr ""
 "\n"
 " Таблица каталогов пу�та.\n"
 
-#: dwarf.c:2529
+#: dwarf.c:2412
 #, c-format
 msgid ""
 "\n"
@@ -1724,7 +1743,12 @@ msgstr ""
 "\n"
 " Таблица каталогов:\n"
 
-#: dwarf.c:2544
+#: dwarf.c:2416
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#: dwarf.c:2427
 #, c-format
 msgid ""
 "\n"
@@ -1733,7 +1757,7 @@ msgstr ""
 "\n"
 " Таблица имен файлов пу�та.\n"
 
-#: dwarf.c:2547
+#: dwarf.c:2430
 #, c-format
 msgid ""
 "\n"
@@ -1742,8 +1766,18 @@ msgstr ""
 "\n"
 " Таблица имен файлов:\n"
 
+#: dwarf.c:2438
+#, c-format
+msgid "  %d\t"
+msgstr "  %d\t"
+
+#: dwarf.c:2449
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
 #. Now display the statements.
-#: dwarf.c:2577
+#: dwarf.c:2457
 #, c-format
 msgid ""
 "\n"
@@ -1752,97 +1786,97 @@ msgstr ""
 "\n"
 " Операторы номера �троки:\n"
 
-#: dwarf.c:2596
+#: dwarf.c:2476
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s"
-msgstr "  Специальный код операции %d: продвижение адре�а на %s в 0x%s"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx"
+msgstr "  Специальный код операции %d: продвижение адре�а на %lu в 0x%lx"
 
-#: dwarf.c:2610
+#: dwarf.c:2488
 #, c-format
-msgid "  Special opcode %d: advance Address by %s to 0x%s[%d]"
-msgstr "  Специальный код операции %d: продвижение адре�а на %s в 0x%s[%d]"
+msgid "  Special opcode %d: advance Address by %lu to 0x%lx[%d]"
+msgstr "  Специальный код операции %d: продвижение адре�а на %lu в 0x%lx[%d]"
 
-#: dwarf.c:2618
+#: dwarf.c:2494
 #, c-format
-msgid " and Line by %s to %d\n"
-msgstr " и �троки на %s в %d\n"
+msgid " and Line by %d to %d\n"
+msgstr " и �троки на %d в %d\n"
 
-#: dwarf.c:2628
+#: dwarf.c:2504
 #, c-format
 msgid "  Copy\n"
 msgstr "  Копи�\n"
 
-#: dwarf.c:2638
+#: dwarf.c:2514
 #, c-format
-msgid "  Advance PC by %s to 0x%s\n"
-msgstr "  Продвижение �чётчика команд на %s в 0x%s\n"
+msgid "  Advance PC by %lu to 0x%lx\n"
+msgstr "  Продвижение �чётчика команд на %lu в 0x%lx\n"
 
-#: dwarf.c:2651
+#: dwarf.c:2526
 #, c-format
-msgid "  Advance PC by %s to 0x%s[%d]\n"
-msgstr "  Продвижение �чётчика команд на %s в 0x%s[%d]\n"
+msgid "  Advance PC by %lu to 0x%lx[%d]\n"
+msgstr "  Продвижение �чётчика команд на %lu в 0x%lx[%d]\n"
 
-#: dwarf.c:2662
+#: dwarf.c:2536
 #, c-format
-msgid "  Advance Line by %s to %d\n"
-msgstr "  Продвижение �троки на %s в %d\n"
+msgid "  Advance Line by %d to %d\n"
+msgstr "  Продвижение �троки на %d в %d\n"
 
-#: dwarf.c:2670
+#: dwarf.c:2543
 #, c-format
-msgid "  Set File Name to entry %s in the File Name Table\n"
-msgstr "  У�тановка имени файла в пункт %s в таблице имён файлов\n"
+msgid "  Set File Name to entry %d in the File Name Table\n"
+msgstr "  У�тановка имени файла в пункт %d в таблице имен файлов\n"
 
-#: dwarf.c:2678
+#: dwarf.c:2551
 #, c-format
-msgid "  Set column to %s\n"
-msgstr "  У�тановка �толбца равным %s\n"
+msgid "  Set column to %lu\n"
+msgstr "  У�тановка �толбца в %lu\n"
 
-#: dwarf.c:2686
+#: dwarf.c:2558
 #, c-format
-msgid "  Set is_stmt to %s\n"
-msgstr "  У�тановка is_stmt равным %s\n"
+msgid "  Set is_stmt to %d\n"
+msgstr "  У�тановка is_stmt в %d\n"
 
-#: dwarf.c:2691
+#: dwarf.c:2563
 #, c-format
 msgid "  Set basic block\n"
 msgstr "  У�тановка базового блока\n"
 
-#: dwarf.c:2701
+#: dwarf.c:2573
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s\n"
-msgstr "  Продвижение �чётчика команд на по�то�нную %s в 0x%s\n"
+msgid "  Advance PC by constant %lu to 0x%lx\n"
+msgstr "  Продвижение �чётчика команд на по�то�нную %lu в 0x%lx\n"
 
-#: dwarf.c:2714
+#: dwarf.c:2585
 #, c-format
-msgid "  Advance PC by constant %s to 0x%s[%d]\n"
-msgstr "  Продвижение �чётчика команд на по�то�нную %s в 0x%s[%d]\n"
+msgid "  Advance PC by constant %lu to 0x%lx[%d]\n"
+msgstr "  Продвижение �чётчика команд на по�то�нную %lu в 0x%lx[%d]\n"
 
-#: dwarf.c:2726
+#: dwarf.c:2596
 #, c-format
-msgid "  Advance PC by fixed size amount %s to 0x%s\n"
-msgstr "  Продвижение �чётчика команд на величину фик�ированного размера %s в 0x%s\n"
+msgid "  Advance PC by fixed size amount %lu to 0x%lx\n"
+msgstr "  Продвижение �чётчика команд на величину фик�ированного размера %lu в 0x%lx\n"
 
-#: dwarf.c:2732
+#: dwarf.c:2601
 #, c-format
 msgid "  Set prologue_end to true\n"
-msgstr "  У�тановка prologue_end в «и�тина»\n"
+msgstr "  У�тановка prologue_end в `и�тина'\n"
 
-#: dwarf.c:2736
+#: dwarf.c:2605
 #, c-format
 msgid "  Set epilogue_begin to true\n"
-msgstr "  У�тановка epilogue_begin в «и�тина»\n"
+msgstr "  У�тановка epilogue_begin в `и�тина'\n"
 
-#: dwarf.c:2742
+#: dwarf.c:2611 dwarf.c:3027
 #, c-format
-msgid "  Set ISA to %s\n"
-msgstr "  У�тановка ISA в %s\n"
+msgid "  Set ISA to %lu\n"
+msgstr "  У�тановка ISA в %lu\n"
 
-#: dwarf.c:2746 dwarf.c:3160
+#: dwarf.c:2615 dwarf.c:3031
 #, c-format
 msgid "  Unknown opcode %d with operands: "
 msgstr "  �еизве�тный код операции %d � операндами: "
 
-#: dwarf.c:2780
+#: dwarf.c:2648
 #, c-format
 msgid ""
 "Decoded dump of debug contents of section %s:\n"
@@ -1851,65 +1885,100 @@ msgstr ""
 "Декодированный дамп дл� отладки �одержимого раздела %s:\n"
 "\n"
 
-#: dwarf.c:2821
+#: dwarf.c:2689
 msgid "The line info appears to be corrupt - the section is too small\n"
-msgstr "Похоже, что информаци� о �троке повреждена — раздел �лишком мал\n"
+msgstr "Похоже, что �трока инфо повреждена - раздел �лишком мал\n"
 
-#: dwarf.c:2953
+#: dwarf.c:2821
 #, c-format
 msgid "CU: %s:\n"
 msgstr "CU: %s:\n"
 
-#: dwarf.c:2954 dwarf.c:2964
+#: dwarf.c:2822 dwarf.c:2835
 #, c-format
 msgid "File name                            Line number    Starting address\n"
 msgstr "Им� файла                            �омер �троки   �ачальный адре�\n"
 
-#: dwarf.c:2959
+#: dwarf.c:2828
 #, c-format
 msgid "CU: %s/%s:\n"
 msgstr "CU: %s/%s:\n"
 
-#: dwarf.c:3051
+#: dwarf.c:2833 dwarf.c:2918
 #, c-format
-msgid "UNKNOWN: length %d\n"
-msgstr "�ЕИЗВЕСТ�ЫЙ: длина %d\n"
+msgid "%s:\n"
+msgstr "%s:\n"
 
-#: dwarf.c:3156
+#. If directory index is 0, that means current directory.
+#: dwarf.c:2964
 #, c-format
-msgid "  Set ISA to %lu\n"
-msgstr "  У�тановка ISA в %lu\n"
+msgid ""
+"\n"
+"./%s:[++]\n"
+msgstr ""
+"\n"
+"./%s:[++]\n"
 
-#: dwarf.c:3322 dwarf.c:3872
+#. The directory index starts counting at 1.
+#: dwarf.c:2970
+#, c-format
+msgid ""
+"\n"
+"%s/%s:\n"
+msgstr ""
+"\n"
+"%s/%s:\n"
+
+#: dwarf.c:3070
+#, c-format
+msgid "%-35s  %11d  %#18lx\n"
+msgstr "%-35s  %11d  %#18lx\n"
+
+#: dwarf.c:3074
+#, c-format
+msgid "%-35s  %11d  %#18lx[%d]\n"
+msgstr "%-35s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3082
+#, c-format
+msgid "%s  %11d  %#18lx\n"
+msgstr "%s  %11d  %#18lx\n"
+
+#: dwarf.c:3086
+#, c-format
+msgid "%s  %11d  %#18lx[%d]\n"
+msgstr "%s  %11d  %#18lx[%d]\n"
+
+#: dwarf.c:3192 dwarf.c:3712
 #, c-format
 msgid ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n"
 msgstr "Смещение .debug_info 0x%lx в разделе %s не указывает на заголовок CU.\n"
 
-#: dwarf.c:3336
+#: dwarf.c:3206
 msgid "Only DWARF 2 and 3 pubnames are currently supported\n"
 msgstr "Сейча� поддерживают�� pubname только дл� DWARF вер�ии 2 и 3\n"
 
-#: dwarf.c:3343
+#: dwarf.c:3213
 #, c-format
 msgid "  Length:                              %ld\n"
 msgstr "  Длина:                               %ld\n"
 
-#: dwarf.c:3345
+#: dwarf.c:3215
 #, c-format
 msgid "  Version:                             %d\n"
 msgstr "  Вер�и�:                              %d\n"
 
-#: dwarf.c:3347
+#: dwarf.c:3217
 #, c-format
 msgid "  Offset into .debug_info section:     0x%lx\n"
 msgstr "  Смещение в раздел .debug_info:       0x%lx\n"
 
-#: dwarf.c:3349
+#: dwarf.c:3219
 #, c-format
 msgid "  Size of area in .debug_info section: %ld\n"
 msgstr "  Разм. обла�ти в разделе .debug_info: %ld\n"
 
-#: dwarf.c:3352
+#: dwarf.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -1918,45 +1987,55 @@ msgstr ""
 "\n"
 "    Смещение\tИм�\n"
 
-#: dwarf.c:3403
+#: dwarf.c:3273
 #, c-format
 msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n"
-msgstr " DW_MACINFO_start_file — номер_�троки: %d номер_файла: %d\n"
+msgstr " DW_MACINFO_start_file - номер_�троки: %d номер_файла: %d\n"
 
-#: dwarf.c:3409
+#: dwarf.c:3279
 #, c-format
 msgid " DW_MACINFO_end_file\n"
 msgstr " DW_MACINFO_end_file\n"
 
-#: dwarf.c:3417
+#: dwarf.c:3287
 #, c-format
 msgid " DW_MACINFO_define - lineno : %d macro : %s\n"
-msgstr " DW_MACINFO_define — номер_�троки : %d макро : %s\n"
+msgstr " DW_MACINFO_define - номер_�троки : %d макро : %s\n"
 
-#: dwarf.c:3426
+#: dwarf.c:3296
 #, c-format
 msgid " DW_MACINFO_undef - lineno : %d macro : %s\n"
-msgstr " DW_MACINFO_undef — номер_�троки : %d макро : %s\n"
+msgstr " DW_MACINFO_undef - номер_�троки : %d макро : %s\n"
 
-#: dwarf.c:3438
+#: dwarf.c:3308
 #, c-format
 msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n"
-msgstr " DW_MACINFO_vendor_ext — кон�танта : %d �трока : %s\n"
+msgstr " DW_MACINFO_vendor_ext - кон�танта : %d �трока : %s\n"
 
-#: dwarf.c:3467
+#: dwarf.c:3337
 #, c-format
 msgid "  Number TAG\n"
 msgstr "  Чи�ло TAG\n"
 
-#: dwarf.c:3476
+#: dwarf.c:3343
+#, c-format
+msgid "   %ld      %s    [%s]\n"
+msgstr "   %ld      %s    [%s]\n"
+
+#: dwarf.c:3346
 msgid "has children"
 msgstr "имеет потомков"
 
-#: dwarf.c:3476
+#: dwarf.c:3346
 msgid "no children"
 msgstr "нет потомков"
 
-#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981
+#: dwarf.c:3349
+#, c-format
+msgid "    %-18s %s\n"
+msgstr "    %-18s %s\n"
+
+#: dwarf.c:3382 dwarf.c:3594 dwarf.c:3819
 #, c-format
 msgid ""
 "\n"
@@ -1965,102 +2044,107 @@ msgstr ""
 "\n"
 "Раздел %s пу�т.\n"
 
-#: dwarf.c:3533 dwarf.c:3987
+#: dwarf.c:3388 dwarf.c:3825
 #, c-format
 msgid "Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"
 msgstr "�е удало�ь загрузить/проанализировать раздел .debug_info, по�тому невозможно проинтерпретировать раздел %s.\n"
 
-#: dwarf.c:3577
+#. FIXME: Should we handle this case?
+#: dwarf.c:3432
+msgid "Location lists in .debug_info section aren't in ascending order!\n"
+msgstr "Спи�ки ме�тоположений в разделе .debug_info не упор�дочены по возра�танию!\n"
+
+#: dwarf.c:3435
 msgid "No location lists in .debug_info section!\n"
 msgstr "В разделе .debug_info нет �пи�ков ме�тоположений!\n"
 
-#: dwarf.c:3582
+#: dwarf.c:3440
 #, c-format
-msgid "Location lists in %s section start at 0x%s\n"
-msgstr "Спи�ки ме�тоположений в разделе %s начинают�� � 0x%s\n"
+msgid "Location lists in %s section start at 0x%lx\n"
+msgstr "Спи�ки ме�тоположений в разделе %s начинают�� � 0x%lx\n"
 
-#: dwarf.c:3589
+#: dwarf.c:3444
 #, c-format
 msgid "    Offset   Begin    End      Expression\n"
 msgstr "    Смещ.    �ачало   Конец    Ра�ширение\n"
 
-#: dwarf.c:3638
+#: dwarf.c:3479
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "В разделе .debug_loc при�ут�твует дыра [0x%lx - 0x%lx].\n"
 
-#: dwarf.c:3642
+#: dwarf.c:3483
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n"
 msgstr "В разделе .debug_loc при�ут�твует перекрытие [0x%lx - 0x%lx].\n"
 
-#: dwarf.c:3650
+#: dwarf.c:3491
 #, c-format
 msgid "Offset 0x%lx is bigger than .debug_loc section size.\n"
 msgstr "Смещение 0x%lx больше, чем размер раздела .debug_loc.\n"
 
-#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704
+#: dwarf.c:3500 dwarf.c:3535 dwarf.c:3545
 #, c-format
 msgid "Location list starting at offset 0x%lx is not terminated.\n"
 msgstr "Спи�ок ме�тоположений, начина� �о �мещени� 0x%lx, не завершён.\n"
 
-#: dwarf.c:3678 dwarf.c:4075
+#: dwarf.c:3519 dwarf.c:3913
 #, c-format
 msgid "<End of list>\n"
 msgstr "<Конец �пи�ка>\n"
 
-#: dwarf.c:3688
+#: dwarf.c:3529
 #, c-format
 msgid "(base address)\n"
 msgstr "(начальный адре�)\n"
 
-#: dwarf.c:3725
+#: dwarf.c:3566
 msgid " (start == end)"
 msgstr " (начало == конец)"
 
-#: dwarf.c:3727
+#: dwarf.c:3568
 msgid " (start > end)"
 msgstr " (начало > конец)"
 
-#: dwarf.c:3737
+#: dwarf.c:3578
 #, c-format
 msgid "There are %ld unused bytes at the end of section %s\n"
 msgstr "В разделе %2$s е�ть %1$ld неи�пользуемых байт\n"
 
-#: dwarf.c:3883
+#: dwarf.c:3723
 msgid "Only DWARF 2 and 3 aranges are currently supported.\n"
 msgstr "Сейча� поддерживают�� aganges только дл� DWARF вер�ии 2 и 3.\n"
 
-#: dwarf.c:3887
+#: dwarf.c:3727
 #, c-format
 msgid "  Length:                   %ld\n"
 msgstr "  Длина:                    %ld\n"
 
-#: dwarf.c:3889
+#: dwarf.c:3728
 #, c-format
 msgid "  Version:                  %d\n"
 msgstr "  Вер�и�:                   %d\n"
 
-#: dwarf.c:3890
+#: dwarf.c:3729
 #, c-format
 msgid "  Offset into .debug_info:  0x%lx\n"
 msgstr "  Смещение в .debug_info:   0x%lx\n"
 
-#: dwarf.c:3892
+#: dwarf.c:3730
 #, c-format
 msgid "  Pointer Size:             %d\n"
 msgstr "  Разм. указат:             %d\n"
 
-#: dwarf.c:3893
+#: dwarf.c:3731
 #, c-format
 msgid "  Segment Size:             %d\n"
 msgstr "  Разм. �егм.:              %d\n"
 
-#: dwarf.c:3902
+#: dwarf.c:3740
 msgid "Pointer size + Segment size is not a power of two.\n"
 msgstr "Размер указател� + размер �егмента не возвод�т�� в квадрат.\n"
 
-#: dwarf.c:3907
+#: dwarf.c:3745
 #, c-format
 msgid ""
 "\n"
@@ -2069,7 +2153,7 @@ msgstr ""
 "\n"
 "    �дре�              Длина\n"
 
-#: dwarf.c:3909
+#: dwarf.c:3747
 #, c-format
 msgid ""
 "\n"
@@ -2078,386 +2162,260 @@ msgstr ""
 "\n"
 "    �дре�      Длина\n"
 
-#: dwarf.c:3997
+#: dwarf.c:3835
 msgid "No range lists in .debug_info section!\n"
 msgstr "В разделе .debug_info нет �пи�ков диапазонов!\n"
 
-#: dwarf.c:4021
+#: dwarf.c:3859
 #, c-format
 msgid "Range lists in %s section start at 0x%lx\n"
 msgstr "Спи�ки диапазонов в разделе %s начинают�� � 0x%lx\n"
 
-#: dwarf.c:4025
+#: dwarf.c:3863
 #, c-format
 msgid "    Offset   Begin    End\n"
 msgstr "    Смещ.    �ачало   Конец\n"
 
-#: dwarf.c:4046
+#: dwarf.c:3884
 #, c-format
 msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Дыра [0x%lx - 0x%lx] в разделе %s.\n"
 
-#: dwarf.c:4050
+#: dwarf.c:3888
 #, c-format
 msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n"
 msgstr "Перекрытие [0x%lx - 0x%lx] в разделе %s.\n"
 
-#: dwarf.c:4093
+#: dwarf.c:3931
 msgid "(start == end)"
 msgstr "(начало == конец)"
 
-#: dwarf.c:4095
+#: dwarf.c:3933
 msgid "(start > end)"
 msgstr "(начало > конец)"
 
-#: dwarf.c:4347
+#: dwarf.c:4185
 msgid "bad register: "
 msgstr "неверный реги�тр: "
 
-#. The documentation for the format of this file is in gdb/dwarf2read.c.
-#: dwarf.c:4350 dwarf.c:5159
+#: dwarf.c:4188
 #, c-format
 msgid "Contents of the %s section:\n"
 msgstr "Содержимое раздела %s:\n"
 
-#: dwarf.c:5120
+#: dwarf.c:4962
 #, c-format
 msgid "  DW_CFA_??? (User defined call frame op: %#x)\n"
 msgstr "  DW_CFA_??? (Определённа� пользователем оператор кадра вызова: %#x)\n"
 
-#: dwarf.c:5122
+#: dwarf.c:4964
 #, c-format
 msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n"
 msgstr "неподдерживаемый или неизве�тный номер ин�трукции кадра вызова Dwarf: %#x\n"
 
-#: dwarf.c:5163
+#: dwarf.c:4989
 #, c-format
-msgid "Truncated header in the %s section.\n"
-msgstr "Обрезанный заголовок в разделе %s.\n"
-
-#: dwarf.c:5168
-#, c-format
-msgid "Version %ld\n"
-msgstr "Вер�и� %ld\n"
-
-#: dwarf.c:5175
-msgid "The address table data in version 3 may be wrong.\n"
-msgstr "В вер�ии 3 данные в таблице адре�ов могут быть неверны.\n"
-
-#: dwarf.c:5178
-msgid "Version 4 does not support case insensitive lookups.\n"
-msgstr "В вер�ии 4 от�ут�твует реги�тронезави�имый пои�к.\n"
+msgid "Displaying the debug contents of section %s is not yet supported.\n"
+msgstr "Отображение отладочной информации раздела %s еще не поддерживает��.\n"
 
-#: dwarf.c:5183
+#: dwarf.c:5031 elfedit.c:74
 #, c-format
-msgid "Unsupported version %lu.\n"
-msgstr "�еподдерживаема� вер�и� %lu.\n"
+msgid "%s: Error: "
+msgstr "%s: Ошибка: "
 
-#: dwarf.c:5199
+#: dwarf.c:5042
 #, c-format
-msgid "Corrupt header in the %s section.\n"
-msgstr "Повреждённый заголовок в разделе %s.\n"
+msgid "%s: Warning: "
+msgstr "%s: Предупреждение: "
 
-#: dwarf.c:5214
+#: dwarf.c:5145 dwarf.c:5215
 #, c-format
-msgid ""
-"\n"
-"CU table:\n"
-msgstr ""
-"\n"
-"Таблица CU:\n"
+msgid "Unrecognized debug option '%s'\n"
+msgstr "�ера�познанный параметр отладки «%s»\n"
 
-#: dwarf.c:5220
+#: elfedit.c:243
 #, c-format
-msgid "[%3u] 0x%lx - 0x%lx\n"
-msgstr "[%3u] 0x%lx - 0x%lx\n"
+msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
+msgstr "%s: не ELF-файл - он �одержит неверные magic-байты в начале\n"
 
-#: dwarf.c:5225
+#: elfedit.c:251
 #, c-format
-msgid ""
-"\n"
-"TU table:\n"
-msgstr ""
-"\n"
-"Таблица TU:\n"
+msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
+msgstr "%s: неподдерживаема� EI_VERSION: %d не равно %d\n"
 
-#: dwarf.c:5232
+#: elfedit.c:267
 #, c-format
-msgid "[%3u] 0x%lx 0x%lx "
-msgstr "[%3u] 0x%lx 0x%lx "
+msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
+msgstr "%s: не�овпадение EI_CLASS: %d не равно %d\n"
 
-#: dwarf.c:5239
+#: elfedit.c:278
 #, c-format
-msgid ""
-"\n"
-"Address table:\n"
-msgstr ""
-"\n"
-"Таблица адре�ов:\n"
+msgid "%s: Unmatched e_machine: %d is not %d\n"
+msgstr "%s: не�овпадение e_machine: %d не равно %d\n"
 
-#: dwarf.c:5248
+#: elfedit.c:289
 #, c-format
-msgid "%lu\n"
-msgstr "%lu\n"
+msgid "%s: Unmatched e_type: %d is not %d\n"
+msgstr "%s: не�овпадение e_type: %d не равно %d\n"
 
-#: dwarf.c:5251
+#: elfedit.c:300
 #, c-format
-msgid ""
-"\n"
-"Symbol table:\n"
-msgstr ""
-"\n"
-"Таблица �имволов:\n"
+msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
+msgstr "%s: не�овпадение EI_OSABI: %d не равно %d\n"
 
-#: dwarf.c:5285
+#: elfedit.c:333
 #, c-format
-msgid "Displaying the debug contents of section %s is not yet supported.\n"
-msgstr "Отображение отладочной информации раздела %s еще не поддерживает��.\n"
+msgid "%s: Failed to update ELF header: %s\n"
+msgstr "%s: не удало�ь обновить заголовок ELF: %s\n"
 
-#: dwarf.c:5421 dwarf.c:5491
+#: elfedit.c:366
 #, c-format
-msgid "Unrecognized debug option '%s'\n"
-msgstr "�ера�познанный параметр отладки «%s»\n"
+msgid "Unsupported EI_CLASS: %d\n"
+msgstr "�еподдерживаемый EI_CLASS: %d\n"
 
-#: elfcomm.c:39
-#, c-format
-msgid "%s: Error: "
-msgstr "%s: Ошибка: "
+#: elfedit.c:399
+msgid ""
+"This executable has been built without support for a\n"
+"64 bit data type and so it cannot process 64 bit ELF files.\n"
+msgstr ""
+"Данный и�полн�емые файл был �обран без поддержки 64-битного типа\n"
+"данных, и по�тому не может обрабатывать 64-битные файлы ELF.\n"
 
-#: elfcomm.c:50
+#: elfedit.c:440
 #, c-format
-msgid "%s: Warning: "
-msgstr "%s: Предупреждение: "
+msgid "%s: Failed to read ELF header\n"
+msgstr "%s: �е удало�ь прочитать заголовок ELF\n"
 
-#: elfcomm.c:82 elfcomm.c:117 elfcomm.c:167 elfcomm.c:216
+#: elfedit.c:447
 #, c-format
-msgid "Unhandled data length: %d\n"
-msgstr "Длина необрабатываемых данных: %d\n"
+msgid "%s: Failed to seek to ELF header\n"
+msgstr "%s: не удало�ь переме�тить�� к заголовку ELF\n"
 
-#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951
-#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939
-#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797
-#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674
-#: readelf.c:11866 readelf.c:12685
+#: elfedit.c:477 elfedit.c:491 elfedit.c:776 readelf.c:3674 readelf.c:3978
+#: readelf.c:4021 readelf.c:4093 readelf.c:4171 readelf.c:4936 readelf.c:4960
+#: readelf.c:7057 readelf.c:7103 readelf.c:7304 readelf.c:8494 readelf.c:8508
+#: readelf.c:9033 readelf.c:9049 readelf.c:9092 readelf.c:9117 readelf.c:11385
+#: readelf.c:11577 readelf.c:12138 readelf.c:12515 readelf.c:12529
+#: readelf.c:12891
 msgid "Out of memory\n"
 msgstr "�ехватка пам�ти\n"
 
-#: elfcomm.c:312
+#: elfedit.c:543 readelf.c:12581
 #, c-format
 msgid "%s: failed to seek to first archive header\n"
 msgstr "%s: не удало�ь перейти на первый заголовок архива\n"
 
-#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169
+#: elfedit.c:553 elfedit.c:741 elfedit.c:845 readelf.c:12590 readelf.c:12858
+#: readelf.c:13026
 #, c-format
 msgid "%s: failed to read archive header\n"
 msgstr "%s: �бой при чтении заголовка архива\n"
 
-#: elfcomm.c:347
-#, c-format
-msgid "%s: the archive index is empty\n"
-msgstr "%s: пу�той индек� архива\n"
-
-#: elfcomm.c:355 elfcomm.c:381
-#, c-format
-msgid "%s: failed to read archive index\n"
-msgstr "%s: �бой при чтении заголовка архива\n"
-
-#: elfcomm.c:365
-#, c-format
-msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
-msgstr "%s: предполагало�ь, что индек� архива будет иметь %ld �лементов, но дл� �того указан �лишком маленький размер в заголовке\n"
-
-#: elfcomm.c:373
-msgid "Out of memory whilst trying to read archive symbol index\n"
-msgstr "�е хватает пам�ти дл� чтени� индек�а �имволов архива\n"
-
-#: elfcomm.c:392
-msgid "Out of memory whilst trying to convert the archive symbol index\n"
-msgstr "�е хватает пам�ти дл� преобразовани� индек�а �имволов архива\n"
-
-#: elfcomm.c:405
-#, c-format
-msgid "%s: the archive has an index but no symbols\n"
-msgstr "%s: в архиве е�ть индек�, но нет �имволов\n"
-
-#
-#: elfcomm.c:413
-msgid "Out of memory whilst trying to read archive index symbol table\n"
-msgstr "�е хватает пам�ти дл� чтени� индек�а таблицы �имволов архива.\n"
-
-#: elfcomm.c:419
-#, c-format
-msgid "%s: failed to read archive index symbol table\n"
-msgstr "%s: �бой при чтении таблицы �имволов архива\n"
-
-#: elfcomm.c:428
+#: elfedit.c:568 readelf.c:12691
 #, c-format
 msgid "%s: failed to skip archive symbol table\n"
 msgstr "%s: �бой при пропу�ке таблицы �имволов архива\n"
 
-#: elfcomm.c:440
+#: elfedit.c:579 readelf.c:12702
 #, c-format
 msgid "%s: failed to read archive header following archive index\n"
 msgstr "%s: �бой при чтении заголовка архива по�ле индек�а архива\n"
 
-#: elfcomm.c:446
-#, c-format
-msgid "%s has no archive index\n"
-msgstr "%s: от�ут�твует индек� архива\n"
-
-#: elfcomm.c:457
+#: elfedit.c:594 readelf.c:12718
 msgid "Out of memory reading long symbol names in archive\n"
 msgstr "�е хватает пам�ти дл� чтени� длинных �имвольных имён в архиве\n"
 
-#: elfcomm.c:465
+#: elfedit.c:602 readelf.c:12726
 #, c-format
 msgid "%s: failed to read long symbol name string table\n"
 msgstr "%s: не удало�ь прочитать таблицу �трок длинных �имвольных имён\n"
 
-#: elfcomm.c:605
+#: elfedit.c:734 readelf.c:12852
 #, c-format
 msgid "%s: failed to seek to next file name\n"
 msgstr "%s: не удало�ь перейти к �ледующему имени файла\n"
 
-#: elfcomm.c:616 elfedit.c:347 readelf.c:13175
+#: elfedit.c:747 elfedit.c:852 readelf.c:12863 readelf.c:13032
 #, c-format
 msgid "%s: did not find a valid archive header\n"
 msgstr "%s: не удало�ь найти правильный заголовок архива\n"
 
-#: elfedit.c:73
-#, c-format
-msgid "%s: Not an ELF file - wrong magic bytes at the start\n"
-msgstr "%s: не ELF-файл — он �одержит неверные magic-байты в начале\n"
-
-#: elfedit.c:81
-#, c-format
-msgid "%s: Unsupported EI_VERSION: %d is not %d\n"
-msgstr "%s: неподдерживаема� EI_VERSION: %d не равно %d\n"
-
-#: elfedit.c:97
-#, c-format
-msgid "%s: Unmatched EI_CLASS: %d is not %d\n"
-msgstr "%s: не�овпадение EI_CLASS: %d не равно %d\n"
-
-#: elfedit.c:108
-#, c-format
-msgid "%s: Unmatched e_machine: %d is not %d\n"
-msgstr "%s: не�овпадение e_machine: %d не равно %d\n"
-
-#: elfedit.c:119
-#, c-format
-msgid "%s: Unmatched e_type: %d is not %d\n"
-msgstr "%s: не�овпадение e_type: %d не равно %d\n"
-
-#: elfedit.c:130
-#, c-format
-msgid "%s: Unmatched EI_OSABI: %d is not %d\n"
-msgstr "%s: не�овпадение EI_OSABI: %d не равно %d\n"
-
-#: elfedit.c:163
-#, c-format
-msgid "%s: Failed to update ELF header: %s\n"
-msgstr "%s: не удало�ь обновить заголовок ELF: %s\n"
-
-#: elfedit.c:196
-#, c-format
-msgid "Unsupported EI_CLASS: %d\n"
-msgstr "�еподдерживаемый EI_CLASS: %d\n"
-
-#: elfedit.c:229
-msgid ""
-"This executable has been built without support for a\n"
-"64 bit data type and so it cannot process 64 bit ELF files.\n"
-msgstr ""
-"Данный и�полн�емые файл был �обран без поддержки 64-битного типа\n"
-"данных, и по�тому не может обрабатывать 64-битные файлы ELF.\n"
-
-#: elfedit.c:270
-#, c-format
-msgid "%s: Failed to read ELF header\n"
-msgstr "%s: �е удало�ь прочитать заголовок ELF\n"
-
-#: elfedit.c:277
-#, c-format
-msgid "%s: Failed to seek to ELF header\n"
-msgstr "%s: не удало�ь переме�тить�� к заголовку ELF\n"
-
-#: elfedit.c:331 readelf.c:13161
+#: elfedit.c:836 readelf.c:13018
 #, c-format
 msgid "%s: failed to seek to next archive header\n"
 msgstr "%s: �бой при переходе к �ледующему заголовку архива\n"
 
-#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198
+#: elfedit.c:867 elfedit.c:876 readelf.c:13046 readelf.c:13055
 #, c-format
 msgid "%s: bad archive file name\n"
 msgstr "%s: неверное им� файла архива\n"
 
-#: elfedit.c:391 elfedit.c:483
+#: elfedit.c:896 elfedit.c:988
 #, c-format
 msgid "Input file '%s' is not readable\n"
 msgstr "Входной файл '%s' �вл�ет�� нечитаемым\n"
 
-#: elfedit.c:415
+#: elfedit.c:920
 #, c-format
 msgid "%s: failed to seek to archive member\n"
 msgstr "%s: не удало�ь перейти к члену архива\n"
 
-#: elfedit.c:454 readelf.c:13284
+#: elfedit.c:959 readelf.c:13134
 #, c-format
 msgid "'%s': No such file\n"
 msgstr "'%s': �ет такого файла\n"
 
-#: elfedit.c:456 readelf.c:13286
+#: elfedit.c:961 readelf.c:13136
 #, c-format
 msgid "Could not locate '%s'.  System error message: %s\n"
 msgstr "�евозможно найти '%s'. Си�темное �ообщение об ошибке: %s\n"
 
-#: elfedit.c:463 readelf.c:13293
+#: elfedit.c:968 readelf.c:13143
 #, c-format
 msgid "'%s' is not an ordinary file\n"
 msgstr "%s не �вл�ет�� обычным файлом\n"
 
-#: elfedit.c:489 readelf.c:13306
+#: elfedit.c:994 readelf.c:13156
 #, c-format
 msgid "%s: Failed to read file's magic number\n"
 msgstr "%s: не удало�ь прочитать идентификатор (magic number) файла\n"
 
-#: elfedit.c:547
+#: elfedit.c:1052
 #, c-format
 msgid "Unknown OSABI: %s\n"
 msgstr "�еизве�тное значение OSABI: %s\n"
 
-#: elfedit.c:566
+#: elfedit.c:1071
 #, c-format
 msgid "Unknown machine type: %s\n"
 msgstr "�еизве�тный тип машины: %s\n"
 
-#: elfedit.c:584
+#: elfedit.c:1089
 #, c-format
 msgid "Unknown machine type: %d\n"
 msgstr "�еизве�тный тип машины: %d\n"
 
-#: elfedit.c:603
+#: elfedit.c:1108
 #, c-format
 msgid "Unknown type: %s\n"
 msgstr "�еизве�тный тип: %s\n"
 
-#: elfedit.c:634
+#: elfedit.c:1139
 #, c-format
 msgid "Usage: %s <option(s)> elffile(s)\n"
 msgstr "И�пользование: %s <параметр(ы)> elf-файл(ы)\n"
 
-#: elfedit.c:636
+#: elfedit.c:1141
 #, c-format
 msgid " Update the ELF header of ELF files\n"
 msgstr " Обновление заголовка ELF в файлах ELF\n"
 
-#: elfedit.c:637 objcopy.c:475 objcopy.c:585
+#: elfedit.c:1142 objcopy.c:475 objcopy.c:585
 #, c-format
 msgid " The options are:\n"
 msgstr " Параметры:\n"
 
-#: elfedit.c:638
+#: elfedit.c:1143
 #, c-format
 msgid ""
 "  --input-mach <machine>      Set input machine type to <machine>\n"
@@ -2478,26 +2436,31 @@ msgstr ""
 "  -h --help                   Показать �ту �правку\n"
 "  -v --version                Показать вер�ию %s\n"
 
-#: emul_aix.c:45
+#: emul_aix.c:43
 #, c-format
 msgid "  [-g]         - 32 bit small archive\n"
 msgstr "  [-g]         - 32-битный маленький архив\n"
 
-#: emul_aix.c:46
+#: emul_aix.c:44
 #, c-format
 msgid "  [-X32]       - ignores 64 bit objects\n"
 msgstr "  [-X32]       - пропу�кает 64-битные объекты\n"
 
-#: emul_aix.c:47
+#: emul_aix.c:45
 #, c-format
 msgid "  [-X64]       - ignores 32 bit objects\n"
 msgstr "  [-X64]       - пропу�кает 32-битные объекты\n"
 
-#: emul_aix.c:48
+#: emul_aix.c:46
 #, c-format
 msgid "  [-X32_64]    - accepts 32 and 64 bit objects\n"
 msgstr "  [-X32_64]    - допу�кает 32- и 64-битные объекты\n"
 
+#: emul_aix.c:99 emul_aix.c:109 emul_aix.c:119 emul_aix.c:129
+#, c-format
+msgid "target `%s' ignored."
+msgstr "цель %s игнорирует��."
+
 #: ieee.c:311
 msgid "unexpected end of debugging information"
 msgstr "неожиданное окончание отладочной информации"
@@ -2719,17 +2682,17 @@ msgstr "чи�ловое переполнение IEEE: 0x"
 msgid "IEEE string length overflow: %u\n"
 msgstr "переполнение длины �троки IEEE: %u\n"
 
-#: ieee.c:5213
+#: ieee.c:5210
 #, c-format
 msgid "IEEE unsupported integer type size %u\n"
 msgstr "неподдерживаемый размер целого типа IEEE %u\n"
 
-#: ieee.c:5247
+#: ieee.c:5244
 #, c-format
 msgid "IEEE unsupported float type size %u\n"
 msgstr "неподдерживаемый размер типа � плавающей зап�той IEEE %u\n"
 
-#: ieee.c:5281
+#: ieee.c:5278
 #, c-format
 msgid "IEEE unsupported complex type size %u\n"
 msgstr "неподдерживаемый размер комплек�ного типа IEEE%u\n"
@@ -2738,120 +2701,120 @@ msgstr "неподдерживаемый размер комплекÑ�ного Ñ
 msgid "Duplicate symbol entered into keyword list."
 msgstr "В �пи�ке ключевых �лов введён повтор�ющий�� �имвол."
 
-#: nlmconv.c:274 srconv.c:1824
+#: nlmconv.c:273 srconv.c:1823
 msgid "input and output files must be different"
 msgstr "входной и выходной файлы должны быть различными"
 
-#: nlmconv.c:321
+#: nlmconv.c:320
 msgid "input file named both on command line and with INPUT"
 msgstr "входной файл назван в командной �троке и в INPUT"
 
-#: nlmconv.c:330
+#: nlmconv.c:329
 msgid "no input file"
 msgstr "нет входного файла"
 
-#: nlmconv.c:360
+#: nlmconv.c:359
 msgid "no name for output file"
 msgstr "нет имени дл� выходного файла"
 
-#: nlmconv.c:374
+#: nlmconv.c:373
 msgid "warning: input and output formats are not compatible"
 msgstr "предупреждение: входной и выходной форматы не �овме�тимы"
 
-#: nlmconv.c:404
+#: nlmconv.c:403
 msgid "make .bss section"
 msgstr "�оздание раздела .bss"
 
-#: nlmconv.c:414
+#: nlmconv.c:413
 msgid "make .nlmsections section"
 msgstr "�оздание раздела .nlmsections"
 
-#: nlmconv.c:442
+#: nlmconv.c:441
 msgid "set .bss vma"
 msgstr "у�тановка .bss vma"
 
-#: nlmconv.c:449
+#: nlmconv.c:448
 msgid "set .data size"
 msgstr "у�тановка размера .data"
 
-#: nlmconv.c:629
+#: nlmconv.c:628
 #, c-format
 msgid "warning: symbol %s imported but not in import list"
 msgstr "предупреждение: �имвол %s импортирован, но его нет в �пи�ке импорта"
 
-#: nlmconv.c:649
+#: nlmconv.c:648
 msgid "set start address"
 msgstr "у�тановка начального адре�а"
 
-#: nlmconv.c:698
+#: nlmconv.c:697
 #, c-format
 msgid "warning: START procedure %s not defined"
 msgstr "предупреждение: START-процедура %s не определена"
 
-#: nlmconv.c:700
+#: nlmconv.c:699
 #, c-format
 msgid "warning: EXIT procedure %s not defined"
 msgstr "предупреждение: EXIT-процедура %s не определена"
 
-#: nlmconv.c:702
+#: nlmconv.c:701
 #, c-format
 msgid "warning: CHECK procedure %s not defined"
 msgstr "предупреждение: CHECK-процедура %s не определена"
 
-#: nlmconv.c:722 nlmconv.c:908
+#: nlmconv.c:721 nlmconv.c:907
 msgid "custom section"
 msgstr "раздел custom"
 
-#: nlmconv.c:742 nlmconv.c:937
+#: nlmconv.c:741 nlmconv.c:936
 msgid "help section"
 msgstr "раздел help"
 
-#: nlmconv.c:764 nlmconv.c:955
+#: nlmconv.c:763 nlmconv.c:954
 msgid "message section"
 msgstr "раздел message"
 
-#: nlmconv.c:779 nlmconv.c:988
+#: nlmconv.c:778 nlmconv.c:987
 msgid "module section"
 msgstr "раздел module"
 
-#: nlmconv.c:798 nlmconv.c:1004
+#: nlmconv.c:797 nlmconv.c:1003
 msgid "rpc section"
 msgstr "раздел rpc"
 
 #. There is no place to record this information.
-#: nlmconv.c:834
+#: nlmconv.c:833
 #, c-format
 msgid "%s: warning: shared libraries can not have uninitialized data"
 msgstr "%s: предупреждение: �овме�тно и�пользуемые библиотеки не могут иметь неинициализированные данные"
 
-#: nlmconv.c:855 nlmconv.c:1023
+#: nlmconv.c:854 nlmconv.c:1022
 msgid "shared section"
 msgstr "раздел shared"
 
-#: nlmconv.c:863
+#: nlmconv.c:862
 msgid "warning: No version number given"
 msgstr "предупреждение: �е указан номер вер�ии"
 
-#: nlmconv.c:903 nlmconv.c:932 nlmconv.c:950 nlmconv.c:999 nlmconv.c:1018
+#: nlmconv.c:902 nlmconv.c:931 nlmconv.c:949 nlmconv.c:998 nlmconv.c:1017
 #, c-format
 msgid "%s: read: %s"
 msgstr "%s: чтение: %s"
 
-#: nlmconv.c:925
+#: nlmconv.c:924
 msgid "warning: FULLMAP is not supported; try ld -M"
 msgstr "предупреждение: FULLMAP не поддерживает��; попробуйте ld -M"
 
-#: nlmconv.c:1101
+#: nlmconv.c:1100
 #, c-format
 msgid "Usage: %s [option(s)] [in-file [out-file]]\n"
 msgstr "И�пользование: %s [параметры] [in-файл [out-файл]]\n"
 
-#: nlmconv.c:1102
+#: nlmconv.c:1101
 #, c-format
 msgid " Convert an object file into a NetWare Loadable Module\n"
 msgstr " Конвертирует объектный файл в загружаемый модуль �и�темы NetWare\n"
 
-#: nlmconv.c:1103
+#: nlmconv.c:1102
 #, c-format
 msgid ""
 " The options are:\n"
@@ -2874,64 +2837,64 @@ msgstr ""
 "  -h --help                     показать �ту информацию\n"
 "  -v --version                  показать вер�ию программы\n"
 
-#: nlmconv.c:1144
+#: nlmconv.c:1143
 #, c-format
 msgid "support not compiled in for %s"
 msgstr "откомпилирован без поддержки %s"
 
-#: nlmconv.c:1181
+#: nlmconv.c:1180
 msgid "make section"
 msgstr "раздел make"
 
-#: nlmconv.c:1195
+#: nlmconv.c:1194
 msgid "set section size"
 msgstr "у�тановка размера раздела"
 
-#: nlmconv.c:1201
+#: nlmconv.c:1200
 msgid "set section alignment"
 msgstr "у�тановка ориентации раздела"
 
-#: nlmconv.c:1205
+#: nlmconv.c:1204
 msgid "set section flags"
 msgstr "у�тановка флагов раздела"
 
-#: nlmconv.c:1216
+#: nlmconv.c:1215
 msgid "set .nlmsections size"
 msgstr "у�тановка размера .nlmsections"
 
-#: nlmconv.c:1297 nlmconv.c:1305 nlmconv.c:1314 nlmconv.c:1319
+#: nlmconv.c:1296 nlmconv.c:1304 nlmconv.c:1313 nlmconv.c:1318
 msgid "set .nlmsection contents"
 msgstr "у�тановка �одержимого .nlmsections"
 
-#: nlmconv.c:1796
+#: nlmconv.c:1795
 msgid "stub section sizes"
 msgstr "размеры раздела заглушки"
 
-#: nlmconv.c:1843
+#: nlmconv.c:1842
 msgid "writing stub"
 msgstr "запи�ывает�� заглушка"
 
-#: nlmconv.c:1927
+#: nlmconv.c:1926
 #, c-format
 msgid "unresolved PC relative reloc against %s"
 msgstr "нера�познанное отно�ительное перемещение по �четчику команд в %s"
 
-#: nlmconv.c:1991
+#: nlmconv.c:1990
 #, c-format
 msgid "overflow when adjusting relocation against %s"
 msgstr "переполнение при регулировке перемещени� в %s"
 
-#: nlmconv.c:2118
+#: nlmconv.c:2117
 #, c-format
 msgid "%s: execution of %s failed: "
 msgstr "%s: выполнение %s завершило�ь неудачей: "
 
-#: nlmconv.c:2133
+#: nlmconv.c:2132
 #, c-format
 msgid "Execution of %s failed"
 msgstr "Выполнение %s завершило�ь неудачей"
 
-#: nm.c:225 size.c:78 strings.c:650
+#: nm.c:225 size.c:78 strings.c:646
 #, c-format
 msgid "Usage: %s [option(s)] [file(s)]\n"
 msgstr "И�пользование: %s [параметры] [файл(ы)]\n"
@@ -3038,17 +3001,17 @@ msgstr "%s: неверное о�нование"
 msgid "%s: invalid output format"
 msgstr "%s: неверный выходной формат"
 
-#: nm.c:346 readelf.c:8546 readelf.c:8591
+#: nm.c:346 readelf.c:8259 readelf.c:8304
 #, c-format
 msgid "<processor specific>: %d"
 msgstr "<�пецифичный дл� проце��ора>: %d"
 
-#: nm.c:348 readelf.c:8555 readelf.c:8609
+#: nm.c:348 readelf.c:8268 readelf.c:8322
 #, c-format
 msgid "<OS specific>: %d"
 msgstr "<�пецифичный дл� ОС>: %d"
 
-#: nm.c:350 readelf.c:8558 readelf.c:8612
+#: nm.c:350 readelf.c:8271 readelf.c:8325
 #, c-format
 msgid "<unknown>: %d"
 msgstr "<неизве�тный>: %d"
@@ -3062,7 +3025,7 @@ msgstr ""
 "\n"
 "Индек� архива:\n"
 
-#: nm.c:1254
+#: nm.c:1251
 #, c-format
 msgid ""
 "\n"
@@ -3075,7 +3038,7 @@ msgstr ""
 "�еопределенные �имволы из %s:\n"
 "\n"
 
-#: nm.c:1256
+#: nm.c:1253
 #, c-format
 msgid ""
 "\n"
@@ -3088,7 +3051,7 @@ msgstr ""
 "Символы из %s:\n"
 "\n"
 
-#: nm.c:1258 nm.c:1309
+#: nm.c:1255 nm.c:1306
 #, c-format
 msgid ""
 "Name                  Value   Class        Type         Size     Line  Section\n"
@@ -3097,7 +3060,7 @@ msgstr ""
 "Им�                   Знач.   Кла��        Тип          Размер   Строка Раздел\n"
 "\n"
 
-#: nm.c:1261 nm.c:1312
+#: nm.c:1258 nm.c:1309
 #, c-format
 msgid ""
 "Name                  Value           Class        Type         Size             Line  Section\n"
@@ -3106,7 +3069,7 @@ msgstr ""
 "Им�                   Знач.           Кла��        Тип          Размер           Строка Раздел\n"
 "\n"
 
-#: nm.c:1305
+#: nm.c:1302
 #, c-format
 msgid ""
 "\n"
@@ -3119,7 +3082,7 @@ msgstr ""
 "�еопределенные �имволы из %s[%s]:\n"
 "\n"
 
-#: nm.c:1307
+#: nm.c:1304
 #, c-format
 msgid ""
 "\n"
@@ -3132,29 +3095,29 @@ msgstr ""
 "Символы из %s[%s]:\n"
 "\n"
 
-#: nm.c:1399
+#: nm.c:1396
 #, c-format
 msgid "Print width has not been initialized (%d)"
 msgstr "Ширина печати не была инициализирована (%d)"
 
-#: nm.c:1627
+#: nm.c:1624
 msgid "Only -X 32_64 is supported"
 msgstr "Поддерживает�� только -X 32_64"
 
-#: nm.c:1656
+#: nm.c:1653
 msgid "Using the --size-sort and --undefined-only options together"
 msgstr "И�пользование вме�те параметров --size-sort и --undefined-only"
 
-#: nm.c:1657
+#: nm.c:1654
 msgid "will produce no output, since undefined symbols have no size."
 msgstr "не да�т выходных данных, т.к. неопределенные �имволы не имеют размера."
 
-#: nm.c:1685
+#: nm.c:1682
 #, c-format
 msgid "data size %ld"
 msgstr "размер данных %ld"
 
-#: objcopy.c:473 srconv.c:1732
+#: objcopy.c:473 srconv.c:1731
 #, c-format
 msgid "Usage: %s [option(s)] in-file [out-file]\n"
 msgstr "И�пользование: %s [параметры] in-файл [out-файл]\n"
@@ -3461,7 +3424,7 @@ msgstr ""
 #: objcopy.c:659
 #, c-format
 msgid "unrecognized section flag `%s'"
-msgstr "нера�познанный флаг раздела «%s»"
+msgstr "нера�познанный флаг раздела `%s'"
 
 #: objcopy.c:660
 #, c-format
@@ -3473,7 +3436,7 @@ msgstr "неподдерживаемые флаги: %s"
 msgid "cannot open '%s': %s"
 msgstr "не удаёт�� открыть «%s»: %s"
 
-#: objcopy.c:764 objcopy.c:3392
+#: objcopy.c:764 objcopy.c:3389
 #, c-format
 msgid "%s: fread failed"
 msgstr "%s: ошибка fread"
@@ -3528,297 +3491,296 @@ msgstr "stat возвратил отрицательный размер длÑ� Â
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr "копирование из «%s» [неизв.] в «%s» [неизв.]\n"
 
-#: objcopy.c:1429
+#: objcopy.c:1427
 msgid "Unable to change endianness of input file(s)"
 msgstr "�е удаёт�� изменить endianness входного файла"
 
-#: objcopy.c:1438
+#: objcopy.c:1436
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr "копирование из «%s» [%s] в «%s» [%s]\n"
 
-#: objcopy.c:1487
+#: objcopy.c:1485
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr "Дл� входного файла «%s» игнорирует�� параметр двоичной архитектуры."
 
-#: objcopy.c:1495
+#: objcopy.c:1493
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
-msgstr "�евозможно определить формат входного файла «%s»"
+msgstr "�евозможно определить формат входного файла `%s'"
 
-#: objcopy.c:1498
+#: objcopy.c:1496
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
-msgstr "Выходной файл не может предо�тавить архитектуру «%s»"
+msgstr "Выходной файл не может предо�тавить архитектуру `%s'"
 
-#: objcopy.c:1561
+#: objcopy.c:1559
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr "предупреждение: выравнивание файла (0x%s) > выравнивани� раздела (0x%s)"
 
-#: objcopy.c:1620
+#: objcopy.c:1618
 #, c-format
 msgid "can't add section '%s'"
-msgstr "не удало�ь добавить раздел «%s»"
+msgstr "не удало�ь добавить раздел `%s'"
 
-#: objcopy.c:1634
+#: objcopy.c:1632
 #, c-format
 msgid "can't create section `%s'"
-msgstr "не удало�ь �оздать раздел «%s»"
+msgstr "не удало�ь �оздать раздел `%s'"
 
-#: objcopy.c:1680
+#: objcopy.c:1678
 #, c-format
 msgid "cannot create debug link section `%s'"
-msgstr "не удало�ь �оздать отладочный раздел ��ылок «%s»"
+msgstr "не удало�ь �оздать отладочный раздел ��ылок %s"
 
-#: objcopy.c:1773
+#: objcopy.c:1771
 msgid "Can't fill gap after section"
 msgstr "�е удало�ь заполнить промежуток по�ле раздела"
 
-#: objcopy.c:1797
+#: objcopy.c:1795
 msgid "can't add padding"
 msgstr "не удало�ь добавить заполнение"
 
-#: objcopy.c:1888
+#: objcopy.c:1886
 #, c-format
 msgid "cannot fill debug link section `%s'"
-msgstr "не удало�ь заполнить отладочный раздел ��ылок «%s»"
+msgstr "не удало�ь заполнить отладочный раздел ��ылок %s"
 
-#: objcopy.c:1951
+#: objcopy.c:1949
 msgid "error copying private BFD data"
 msgstr "ошибка копировани� ча�тных данных BFD"
 
-#: objcopy.c:1962
+#: objcopy.c:1960
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr "�та цель не поддерживает альтернативные машинные коды %lu"
 
-#: objcopy.c:1966
+#: objcopy.c:1964
 msgid "treating that number as an absolute e_machine value instead"
 msgstr "�читает��, что чи�ло �вл�ет�� аб�олютным значением e_machine"
 
-#: objcopy.c:1970
+#: objcopy.c:1968
 msgid "ignoring the alternative value"
 msgstr "игнорирует�� альтернативное значение"
 
-#: objcopy.c:2002 objcopy.c:2038
+#: objcopy.c:2000 objcopy.c:2035
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr "невозможно �оздать временный каталог дл� копировани� архива (ошибка: %s)"
 
-#: objcopy.c:2068
+#: objcopy.c:2096
 msgid "Unable to recognise the format of file"
 msgstr "�евозможно определить формат файла"
 
-#: objcopy.c:2195
+#: objcopy.c:2194
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr "ошибка: входной файл '%s' пу�т"
 
-#: objcopy.c:2339
+#: objcopy.c:2338
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr "Многократные переименовани� раздела %s"
 
-#: objcopy.c:2390
+#: objcopy.c:2389
 msgid "error in private header data"
 msgstr "ошибка в заголовке ча�тных данных"
 
-#: objcopy.c:2468
+#: objcopy.c:2467
 msgid "failed to create output section"
 msgstr "не удало�ь �оздать выходной раздел"
 
-#: objcopy.c:2482
+#: objcopy.c:2481
 msgid "failed to set size"
 msgstr "не удало�ь задать размер"
 
-#: objcopy.c:2496
+#: objcopy.c:2495
 msgid "failed to set vma"
 msgstr "не удало�ь задать vma"
 
-#: objcopy.c:2521
+#: objcopy.c:2520
 msgid "failed to set alignment"
 msgstr "не удало�ь задать выравнивание"
 
-#: objcopy.c:2555
+#: objcopy.c:2554
 msgid "failed to copy private data"
 msgstr "не удало�ь �копировать ча�тные данные"
 
-#: objcopy.c:2637
+#: objcopy.c:2636
 msgid "relocation count is negative"
 msgstr "отрицательное значение �чётчика перемещений"
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:2698
+#: objcopy.c:2697
 #, c-format
 msgid "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr "невозможно перевернуть байты: длина раздела %s должна без о�татка делить�� на %d"
 
-#: objcopy.c:2884
+#: objcopy.c:2883
 msgid "can't create debugging section"
 msgstr "невозможно �оздать отладочный раздел"
 
-#: objcopy.c:2897
+#: objcopy.c:2896
 msgid "can't set debugging section contents"
 msgstr "невозможно задать �одержимое отладочного раздела"
 
-#: objcopy.c:2905
+#: objcopy.c:2904
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr "неизве�тно, как запи�ать отладочную информацию дл� %s"
 
-#: objcopy.c:3048
+#: objcopy.c:3046
 msgid "could not create temporary file to hold stripped copy"
 msgstr "невозможно �оздать временный файл дл� хранени� урезанной копии"
 
-#: objcopy.c:3120
+#: objcopy.c:3118
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr "%s: неверна� вер�и� в под�и�теме PE"
 
-#: objcopy.c:3150
+#: objcopy.c:3148
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr "неизве�тна� под�и�тема PE: %s"
 
-#: objcopy.c:3212
+#: objcopy.c:3209
 msgid "byte number must be non-negative"
 msgstr "номер байта должен быть неотрицательным"
 
-#: objcopy.c:3218
+#: objcopy.c:3215
 #, c-format
 msgid "architecture %s unknown"
 msgstr "архитектура %s неизве�тна"
 
-#: objcopy.c:3226
+#: objcopy.c:3223
 msgid "interleave must be positive"
 msgstr "чередование должно быть положительным"
 
-#: objcopy.c:3235
+#: objcopy.c:3232
 msgid "interleave width must be positive"
 msgstr "ширина чередовани� должна быть положительной"
 
-#: objcopy.c:3255 objcopy.c:3263
+#: objcopy.c:3252 objcopy.c:3260
 #, c-format
 msgid "%s both copied and removed"
 msgstr "оба %s �копированы и удалены"
 
-#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605
-#: objcopy.c:3609 objcopy.c:3629
+#: objcopy.c:3359 objcopy.c:3439 objcopy.c:3547 objcopy.c:3578 objcopy.c:3602
+#: objcopy.c:3606 objcopy.c:3626
 #, c-format
 msgid "bad format for %s"
 msgstr "плохой формат дл� %s"
 
-#: objcopy.c:3374
+#: objcopy.c:3371
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr "невозможно открыть: %s: %s"
 
-#: objcopy.c:3519
+#: objcopy.c:3516
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr "Предупреждение: обрезает�� заполнение промежутка от 0x%s до 0x%x"
 
-#: objcopy.c:3680
+#: objcopy.c:3677
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr "неизве�тный параметр длинных имён раздела '%s'"
 
 #
-#: objcopy.c:3698
+#: objcopy.c:3695
 msgid "unable to parse alternative machine code"
 msgstr "невозможно проанализировать альтернативный код машины"
 
 #
-#: objcopy.c:3743
+#: objcopy.c:3740
 msgid "number of bytes to reverse must be positive and even"
 msgstr "количе�тво байтов дл� переворачивани� должно быть положительным и чётным"
 
-#: objcopy.c:3746
+#: objcopy.c:3743
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr "Предупреждение: игнорирует�� значение %d предыдущего --reverse-bytes"
 
-#: objcopy.c:3761
+#: objcopy.c:3758
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr "%s: неверное обратное значение дл� --heap"
 
-#: objcopy.c:3767
+#: objcopy.c:3764
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr "%s: неверное фик�ированное значение дл� --heap"
 
-#: objcopy.c:3792
+#: objcopy.c:3789
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr "%s: неверное обратное значение дл� --stack"
 
-#: objcopy.c:3798
+#: objcopy.c:3795
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr "%s: неверное фик�ированное значение дл� --stack"
 
-#: objcopy.c:3827
+#: objcopy.c:3824
 msgid "interleave start byte must be set with --byte"
 msgstr "должен быть задан начальный байт чередовани� � помощью --byte"
 
-#: objcopy.c:3830
+#: objcopy.c:3827
 msgid "byte number must be less than interleave"
 msgstr "номер байта должен быть меньше чередовани�"
 
-#: objcopy.c:3833
+#: objcopy.c:3830
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr "ширина чередовани� должна быть меньше или равна чередованию - byte`"
 
-#: objcopy.c:3860
+#: objcopy.c:3857
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr "неизве�тна� входна� цель EFI: %s"
 
-#: objcopy.c:3891
+#: objcopy.c:3888
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr "неизве�тна� выходна� цель EFI: %s"
 
-#: objcopy.c:3904
+#: objcopy.c:3901
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr "предупреждение: невозможно найти '%s'. Си�темное �ообщение об ошибке: %s"
 
-#: objcopy.c:3916
+#: objcopy.c:3912
 #, c-format
 msgid "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr "предупреждение: не удаёт�� �оздать временный файл во врем� копировани� '%s', (ошибка: %s)"
 
-#: objcopy.c:3944 objcopy.c:3958
+#: objcopy.c:3956 objcopy.c:3970
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr "%s %s%c0x%s никогда не и�пользует��"
 
-#: objdump.c:201
+#: objdump.c:190
 #, c-format
 msgid "Usage: %s <option(s)> <file(s)>\n"
 msgstr "И�пользование: %s <параметры> <файл(ы)>\n"
 
-#: objdump.c:202
+#: objdump.c:191
 #, c-format
 msgid " Display information from object <file(s)>.\n"
 msgstr " Отображает информацию из объекта <файл(ы)>.\n"
 
-#: objdump.c:203
+#: objdump.c:192
 #, c-format
 msgid " At least one of the following switches must be given:\n"
 msgstr " Должен быть указан по крайней мере один из �ледующих ключей:\n"
 
-#: objdump.c:204
+#: objdump.c:193
 #, c-format
 msgid ""
 "  -a, --archive-headers    Display archive header information\n"
 "  -f, --file-headers       Display the contents of the overall file header\n"
 "  -p, --private-headers    Display object format specific file header contents\n"
-"  -P, --private=OPT,OPT... Display object format specific contents\n"
 "  -h, --[section-]headers  Display the contents of the section headers\n"
 "  -x, --all-headers        Display the contents of all headers\n"
 "  -d, --disassemble        Display assembler contents of executable sections\n"
@@ -3831,7 +3793,7 @@ msgid ""
 "  -W[lLiaprmfFsoRt] or\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           Display DWARF info in the file\n"
 "  -t, --syms               Display the contents of the symbol table(s)\n"
 "  -T, --dynamic-syms       Display the contents of the dynamic symbol table\n"
@@ -3846,7 +3808,6 @@ msgstr ""
 "  -f, --file-headers       показать �одержимое заголовка в�его файла\n"
 "  -p, --private-headers    показать �одержимое заголовка файла, �пецифичного\n"
 "                           дл� формата объекта\n"
-"  -P, --private=OPT,OPT…   показать �одержимое, отно��щее�� к формату объекта\n"
 "  -h, --[section-]headers  показать �одержимое заголовков разделов\n"
 "  -x, --all-headers        показать �одержимое в�ех заголовков\n"
 "  -d, --disassemble        показать �одержимое и�полн�емых разделов\n"
@@ -3863,7 +3824,7 @@ msgstr ""
 "  -W[lLiaprmfFsoRt] или\n"
 "  --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "          =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"          =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"          =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                           показать информацию DWARF из файла\n"
 "  -t, --syms               показать �одержимое таблиц(ы) �имволов\n"
 "  -T, --dynamic-syms       показать �одержимое таблицы динамиче�ких �имволов\n"
@@ -3875,7 +3836,7 @@ msgstr ""
 "                           и архитектур\n"
 "  -H, --help               показать �ту �правку\n"
 
-#: objdump.c:236
+#: objdump.c:222
 #, c-format
 msgid ""
 "\n"
@@ -3884,7 +3845,7 @@ msgstr ""
 "\n"
 " Следующие ключи �вл�ют�� необ�зательными:\n"
 
-#: objdump.c:237
+#: objdump.c:223
 #, c-format
 msgid ""
 "  -b, --target=BFDNAME           Specify the target object format as BFDNAME\n"
@@ -3912,6 +3873,7 @@ msgid ""
 "      --special-syms             Include special symbols in symbol dumps\n"
 "      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n"
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
+"\n"
 msgstr ""
 "  -b, --target=BFD-ИМЯ           указать целевой формат объекта как BFD-ИМЯ\n"
 "  -m, --architecture=М�ШИ��      указать целевую архитектуру как М�ШИ��\n"
@@ -3924,15 +3886,14 @@ msgstr ""
 "      --file-start-context       включить контек�т из начала файла (� -S)\n"
 "  -I, --include=К�Т              добавить К�Талог в �пи�ок пои�ка и�ходных\n"
 "                                 файлов\n"
-"  -l, --line-numbers             включить номера �трок и имена файлов при\n"
+"  -l, --line-numbers             включить номера �трок и имена файлов на\n"
 "                                 выводе\n"
-"  -F, --file-offsets             показывать файловые �мещени�\n"
 "  -C, --demangle[=СТИЛЬ]         декодировать �корректированные/обработанные\n"
 "                                 имена �имволов\n"
 "                                 СТИЛЬ, е�ли указан, может быть auto, gnu,\n"
 "                                 lucid, arm, hp, edg, gnu-v3, java\n"
 "                                 или gnat\n"
-"  -w, --wide                     форматировать вывод в более чем 80 колонок\n"
+"  -w, --wide                     форматировать вывод дл� более, чем 80 колонок\n"
 "  -z, --disassemble-zeroes       не пропу�кать блоки нулей при\n"
 "                                 диза��емблировании\n"
 "      --start-address=�ДРЕС      обработать только данные, адре�\n"
@@ -3947,71 +3908,55 @@ msgstr ""
 "                                 разделов\n"
 "      --special-syms             включить �пециальные �имволы в дампы �имволов\n"
 "      --prefix=ПРЕФИКС           добавить ПРЕФИКС к аб�олютному пути дл� -S\n"
-"      --prefix-strip=УРОВЕ�Ь     удалить начальные имена каталогов дл� -S\n"
-
-#: objdump.c:263
-#, c-format
-msgid ""
-"      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"      --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                             or deeper\n"
-"\n"
-msgstr ""
-"      --dwarf-depth=N            не показывать DIE по�ле N вложений или более\n"
-"      --dwarf-start=N            показывать DIE начина� � N, � тем же кол-вом\n"
-"                             вложений или глубже\n"
+"      --prefix-strip=УРОВЕ�Ь     Удалить начальные каталоги дл� -S\n"
 "\n"
 
-#: objdump.c:275
-#, c-format
-msgid ""
-"\n"
-"Options supported for -P/--private switch:\n"
-msgstr ""
-"\n"
-"Значени�, поддерживаемые параметром -P/--private:\n"
-
-#: objdump.c:426
+#: objdump.c:396
 #, c-format
 msgid "section '%s' mentioned in a -j option, but not found in any input file"
 msgstr "раздел «%s» передан в параметре -j, но не найден во входных файлах"
 
-#: objdump.c:530
+#: objdump.c:500
 #, c-format
 msgid "Sections:\n"
 msgstr "Разделы:\n"
 
-#: objdump.c:533 objdump.c:537
+#: objdump.c:503 objdump.c:507
 #, c-format
 msgid "Idx Name          Size      VMA       LMA       File off  Algn"
 msgstr "Инд Им�           Размер    VMA       LMA       Файл      Вырав"
 
-#: objdump.c:539
+#: objdump.c:509
 #, c-format
 msgid "Idx Name          Size      VMA               LMA               File off  Algn"
 msgstr "Инд Им�           Размер    VMA               LMA               Файл      Вырав"
 
-#: objdump.c:543
+#: objdump.c:513
 #, c-format
 msgid "  Flags"
 msgstr "  Флаги"
 
-#: objdump.c:586
+#: objdump.c:515
+#, c-format
+msgid "  Pg"
+msgstr "  Стр"
+
+#: objdump.c:558
 #, c-format
 msgid "%s: not a dynamic object"
 msgstr "%s: не динамиче�кий объект"
 
-#: objdump.c:1012 objdump.c:1036
+#: objdump.c:984 objdump.c:1008
 #, c-format
 msgid " (File Offset: 0x%lx)"
 msgstr " (файловое �мещение: 0x%lx)"
 
-#: objdump.c:1662
+#: objdump.c:1634
 #, c-format
 msgid "disassemble_fn returned length %d"
 msgstr "disassemble_fn вернула длину %d"
 
-#: objdump.c:1967
+#: objdump.c:1939
 #, c-format
 msgid ""
 "\n"
@@ -4020,17 +3965,17 @@ msgstr ""
 "\n"
 "Диза��емблирование раздела %s:\n"
 
-#: objdump.c:2143
+#: objdump.c:2115
 #, c-format
 msgid "can't use supplied machine %s"
 msgstr "невозможно и�пользовать пред�тавленную машину %s"
 
-#: objdump.c:2162
+#: objdump.c:2134
 #, c-format
 msgid "can't disassemble for architecture %s\n"
 msgstr "невозможно выполнить диза��емблирование дл� архитектуры %s\n"
 
-#: objdump.c:2242 objdump.c:2265
+#: objdump.c:2214 objdump.c:2237
 #, c-format
 msgid ""
 "\n"
@@ -4039,7 +3984,7 @@ msgstr ""
 "\n"
 "�евозможно получить �одержимое раздела «%s».\n"
 
-#: objdump.c:2406
+#: objdump.c:2378
 #, c-format
 msgid ""
 "No %s section present\n"
@@ -4048,12 +3993,12 @@ msgstr ""
 "Раздел %s от�ут�твует\n"
 "\n"
 
-#: objdump.c:2415
+#: objdump.c:2387
 #, c-format
 msgid "reading %s section of %s failed: %s"
 msgstr "ошибка при чтении %s раздела %s: %s"
 
-#: objdump.c:2459
+#: objdump.c:2431
 #, c-format
 msgid ""
 "Contents of %s section:\n"
@@ -4062,17 +4007,17 @@ msgstr ""
 "Содержимое раздела %s:\n"
 "\n"
 
-#: objdump.c:2590
+#: objdump.c:2562
 #, c-format
 msgid "architecture: %s, "
 msgstr "архитектура: %s, "
 
-#: objdump.c:2593
+#: objdump.c:2565
 #, c-format
 msgid "flags 0x%08x:\n"
 msgstr "флаги 0x%08x:\n"
 
-#: objdump.c:2607
+#: objdump.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -4081,45 +4026,36 @@ msgstr ""
 "\n"
 "начальный адре� 0x"
 
-#: objdump.c:2633
-msgid "option -P/--private not supported by this file"
-msgstr "параметр -P/--private не поддерживает�� дл� �того файла"
-
-#: objdump.c:2657
-#, c-format
-msgid "target specific dump '%s' not supported"
-msgstr "�пециальный дамп цели «%s» не поддерживает��"
-
-#: objdump.c:2721
+#: objdump.c:2642
 #, c-format
 msgid "Contents of section %s:"
 msgstr "Содержимое раздела %s:"
 
-#: objdump.c:2723
+#: objdump.c:2644
 #, c-format
 msgid "  (Starting at file offset: 0x%lx)"
 msgstr "  (�ачинает�� по файловому �мещению: 0x%lx)"
 
-#: objdump.c:2729
+#: objdump.c:2650
 msgid "Reading section failed"
 msgstr "Ошибка при чтении раздела"
 
-#: objdump.c:2832
+#: objdump.c:2753
 #, c-format
 msgid "no symbols\n"
 msgstr "нет �имволов\n"
 
-#: objdump.c:2839
+#: objdump.c:2760
 #, c-format
 msgid "no information for symbol number %ld\n"
 msgstr "нет информации о �имволе номер %ld\n"
 
-#: objdump.c:2842
+#: objdump.c:2763
 #, c-format
 msgid "could not determine the type of symbol number %ld\n"
 msgstr "невозможно определить тип �имвола номер %ld\n"
 
-#: objdump.c:3163
+#: objdump.c:3043
 #, c-format
 msgid ""
 "\n"
@@ -4128,731 +4064,40 @@ msgstr ""
 "\n"
 "%s:     формат файла %s\n"
 
-#: objdump.c:3223
+#: objdump.c:3101
 #, c-format
 msgid "%s: printing debugging information failed"
 msgstr "%s: вывод отладочной информации завершил�� неудачей"
 
-#: objdump.c:3327
+#: objdump.c:3205
 #, c-format
 msgid "In archive %s:\n"
 msgstr "В архиве %s:\n"
 
-#: objdump.c:3438
+#: objdump.c:3316
 msgid "error: the start address should be before the end address"
 msgstr "ошибка: начальный адре� должен быть перед конечным адре�ом"
 
-#: objdump.c:3443
+#: objdump.c:3321
 msgid "error: the stop address should be after the start address"
 msgstr "ошибка: конечный адре� должен быть по�ле начального адре�а"
 
-#: objdump.c:3455
+#: objdump.c:3333
 msgid "error: prefix strip must be non-negative"
 msgstr "ошибка: удал�емый префик� должен быть неотрицательным"
 
-#: objdump.c:3460
+#: objdump.c:3338
 msgid "error: instruction width must be positive"
 msgstr "ошибка: значение ширины ин�трукции должно быть положительным"
 
-#: objdump.c:3469
+#: objdump.c:3347
 msgid "unrecognized -E option"
 msgstr "нера�познанный параметр -E"
 
-#: objdump.c:3480
+#: objdump.c:3358
 #, c-format
 msgid "unrecognized --endian type `%s'"
-msgstr "нера�познанный --endian тип «%s»"
-
-#: od-xcoff.c:75
-#, c-format
-msgid ""
-"For XCOFF files:\n"
-"  header      Display the file header\n"
-"  aout        Display the auxiliary header\n"
-"  sections    Display the section headers\n"
-"  syms        Display the symbols table\n"
-"  relocs      Display the relocation entries\n"
-"  lineno      Display the line number entries\n"
-"  loader      Display loader section\n"
-"  except      Display exception table\n"
-"  typchk      Display type-check section\n"
-"  traceback   Display traceback tags\n"
-"  toc         Display toc symbols\n"
-msgstr ""
-"Дл� файлов XCOFF:\n"
-"  header      показать файловый заголовок\n"
-"  aout        показать в�помогательный заголовок\n"
-"  sections    показать заголовки разделов\n"
-"  syms        показать таблицу �имволов\n"
-"  relocs      показать �лементы перемещений\n"
-"  lineno      показать �лементы номеров �трок\n"
-"  loader      показать таблицу загрузчика\n"
-"  except      показать таблицу и�ключений\n"
-"  typchk      показать раздел type-check\n"
-"  traceback   показать теги обратной тра��ировки\n"
-"  toc         показать �имволы toc\n"
-
-#: od-xcoff.c:416
-#, c-format
-msgid "  nbr sections:  %d\n"
-msgstr "  разделы nbr:  %d\n"
-
-#: od-xcoff.c:417
-#, c-format
-msgid "  time and date: 0x%08x  - "
-msgstr "  врем� и дата: 0x%08x  - "
-
-#: od-xcoff.c:419
-#, c-format
-msgid "not set\n"
-msgstr "не задано\n"
-
-#: od-xcoff.c:426
-#, c-format
-msgid "  symbols off:   0x%08x\n"
-msgstr "  �мещени� �имволов:   0x%08x\n"
-
-#: od-xcoff.c:427
-#, c-format
-msgid "  nbr symbols:   %d\n"
-msgstr "  �имволы nbr:   %d\n"
-
-#: od-xcoff.c:428
-#, c-format
-msgid "  opt hdr sz:    %d\n"
-msgstr "  opt hdr sz:    %d\n"
-
-#: od-xcoff.c:429
-#, c-format
-msgid "  flags:         0x%04x "
-msgstr "  флаги:         0x%04x "
-
-#: od-xcoff.c:443
-#, c-format
-msgid "Auxiliary header:\n"
-msgstr "В�помогательный заголовок:\n"
-
-#: od-xcoff.c:446
-#, c-format
-msgid "  No aux header\n"
-msgstr "  �ет в�пм. заголовка\n"
-
-#: od-xcoff.c:451
-#, c-format
-msgid "warning: optionnal header size too large (> %d)\n"
-msgstr "предупреждение: размер необ�зательного заголовка �лишком большой (> %d)\n"
-
-#: od-xcoff.c:457
-msgid "cannot read auxhdr"
-msgstr "не удало�ь прочитать auxhdr"
-
-#: od-xcoff.c:462
-#, c-format
-msgid "  o_mflag (magic): 0x%04x 0%04o\n"
-msgstr "  o_mflag (�пец): 0x%04x 0%04o\n"
-
-#: od-xcoff.c:463
-#, c-format
-msgid "  o_vstamp:        0x%04x\n"
-msgstr "  o_vstamp:        0x%04x\n"
-
-#: od-xcoff.c:465
-#, c-format
-msgid "  o_tsize:         0x%08x\n"
-msgstr "  o_tsize:         0x%08x\n"
-
-#: od-xcoff.c:467
-#, c-format
-msgid "  o_dsize:         0x%08x\n"
-msgstr "  o_dsize:         0x%08x\n"
-
-#: od-xcoff.c:469
-#, c-format
-msgid "  o_entry:         0x%08x\n"
-msgstr "  o_entry:         0x%08x\n"
-
-#: od-xcoff.c:471
-#, c-format
-msgid "  o_text_start:    0x%08x\n"
-msgstr "  o_text_start:    0x%08x\n"
-
-#: od-xcoff.c:473
-#, c-format
-msgid "  o_data_start:    0x%08x\n"
-msgstr "  o_data_start:    0x%08x\n"
-
-#: od-xcoff.c:477
-#, c-format
-msgid "  o_toc:           0x%08x\n"
-msgstr "  o_toc:           0x%08x\n"
-
-#: od-xcoff.c:479
-#, c-format
-msgid "  o_snentry:       0x%04x\n"
-msgstr "  o_snentry:       0x%04x\n"
-
-#: od-xcoff.c:481
-#, c-format
-msgid "  o_sntext:        0x%04x\n"
-msgstr "  o_sntext:        0x%04x\n"
-
-#: od-xcoff.c:483
-#, c-format
-msgid "  o_sndata:        0x%04x\n"
-msgstr "  o_sndata:        0x%04x\n"
-
-#: od-xcoff.c:485
-#, c-format
-msgid "  o_sntoc:         0x%04x\n"
-msgstr "  o_sntoc:         0x%04x\n"
-
-#: od-xcoff.c:487
-#, c-format
-msgid "  o_snloader:      0x%04x\n"
-msgstr "  o_snloader:      0x%04x\n"
-
-#: od-xcoff.c:489
-#, c-format
-msgid "  o_snbss:         0x%04x\n"
-msgstr "  o_snbss:         0x%04x\n"
-
-#: od-xcoff.c:491
-#, c-format
-msgid "  o_algntext:      %u\n"
-msgstr "  o_algntext:      %u\n"
-
-#: od-xcoff.c:493
-#, c-format
-msgid "  o_algndata:      %u\n"
-msgstr "  o_algndata:      %u\n"
-
-#: od-xcoff.c:495
-#, c-format
-msgid "  o_modtype:       0x%04x"
-msgstr "  o_modtype:       0x%04x"
-
-#: od-xcoff.c:500
-#, c-format
-msgid "  o_cputype:       0x%04x\n"
-msgstr "  o_cputype:       0x%04x\n"
-
-#: od-xcoff.c:502
-#, c-format
-msgid "  o_maxstack:      0x%08x\n"
-msgstr "  o_maxstack:      0x%08x\n"
-
-#: od-xcoff.c:504
-#, c-format
-msgid "  o_maxdata:       0x%08x\n"
-msgstr "  o_maxdata:       0x%08x\n"
-
-#: od-xcoff.c:507
-#, c-format
-msgid "  o_debugger:      0x%08x\n"
-msgstr "  o_debugger:      0x%08x\n"
-
-#: od-xcoff.c:521
-#, c-format
-msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n"
-msgstr "Заголовки разделов (� %u+%u=0x%08x по 0x%08x):\n"
-
-#: od-xcoff.c:526
-#, c-format
-msgid "  No section header\n"
-msgstr "  �ет заголовка раздела\n"
-
-#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598
-msgid "cannot read section header"
-msgstr "не удало�ь прочитать заголовок раздела"
-
-#: od-xcoff.c:534
-#, c-format
-msgid " # Name     paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-msgstr " # Им�      paddr    vaddr    size     scnptr   relptr   lnnoptr  nrel  nlnno\n"
-
-#: od-xcoff.c:546
-#, c-format
-msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-msgstr "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n"
-
-#: od-xcoff.c:557
-#, c-format
-msgid "            Flags: %08x "
-msgstr "            Флаги: %08x "
-
-#: od-xcoff.c:565
-#, c-format
-msgid "overflow - nreloc: %u, nlnno: %u\n"
-msgstr "переполнение — nreloc: %u, nlnno: %u\n"
-
-#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974
-msgid "cannot read section headers"
-msgstr "не удало�ь прочитать заголовки разделов"
-
-#: od-xcoff.c:650
-msgid "cannot read strings table len"
-msgstr "не удало�ь прочитать длину таблицы �трок"
-
-#: od-xcoff.c:664
-msgid "cannot read strings table"
-msgstr "не удало�ь прочитать таблицу �трок"
-
-#: od-xcoff.c:672
-msgid "cannot read symbol table"
-msgstr "не удало�ь прочитать таблицу �имволов"
-
-#: od-xcoff.c:687
-msgid "cannot read symbol entry"
-msgstr "не удало�ь прочитать �имвольный �лемент"
-
-#: od-xcoff.c:722
-msgid "cannot read symbol aux entry"
-msgstr "не удало�ь прочитать �лемент aux"
-
-#: od-xcoff.c:744
-#, c-format
-msgid "Symbols table (strtable at 0x%08x)"
-msgstr "Таблица �имволов (strtable начина� � 0x%08x)"
-
-#: od-xcoff.c:749
-#, c-format
-msgid ""
-":\n"
-"  No symbols\n"
-msgstr ""
-":\n"
-"  �ет �имволов\n"
-
-#: od-xcoff.c:755
-#, c-format
-msgid " (no strings):\n"
-msgstr " (нет �трок):\n"
-
-#: od-xcoff.c:757
-#, c-format
-msgid " (strings size: %08x):\n"
-msgstr " (размер �трок: %08x):\n"
-
-#: od-xcoff.c:770
-#, c-format
-msgid "  # sc         value    section  type aux name/off\n"
-msgstr "  # sc         знач     раздел   тип  aux им�/�мещ\n"
-
-#: od-xcoff.c:821
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u  nlinno: %-6u\n"
-
-#: od-xcoff.c:827
-#, c-format
-msgid "  scnlen: %08x  nreloc: %-6u\n"
-msgstr "  scnlen: %08x  nreloc: %-6u\n"
-
-#. Function aux entry.
-#: od-xcoff.c:837
-#, c-format
-msgid "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-msgstr "  exptr: %08x fsize: %08x lnnoptr: %08x endndx: %u\n"
-
-#: od-xcoff.c:856
-#, c-format
-msgid "  scnsym: %-8u"
-msgstr "  scnsym: %-8u"
-
-#: od-xcoff.c:858
-#, c-format
-msgid "  scnlen: %08x"
-msgstr "  scnlen: %08x"
-
-#: od-xcoff.c:859
-#, c-format
-msgid " h: parm=%08x sn=%04x al: 2**%u"
-msgstr " h: parm=%08x sn=%04x al: 2**%u"
-
-#: od-xcoff.c:863
-#, c-format
-msgid " typ: "
-msgstr " typ: "
-
-#: od-xcoff.c:865
-#, c-format
-msgid " cl: "
-msgstr " cl: "
-
-#: od-xcoff.c:878
-#, c-format
-msgid " ftype: %02x "
-msgstr " ftype: %02x "
-
-#: od-xcoff.c:881
-#, c-format
-msgid "fname: %.14s"
-msgstr "fname: %.14s"
-
-#: od-xcoff.c:887
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: od-xcoff.c:889
-#, c-format
-msgid "offset: %08x"
-msgstr "�мещение: %08x"
-
-#: od-xcoff.c:896
-#, c-format
-msgid "  lnno: %u\n"
-msgstr "  lnno: %u\n"
-
-#: od-xcoff.c:931
-#, c-format
-msgid "Relocations for %s (%u)\n"
-msgstr "Перемещени� дл� %s (%u)\n"
-
-#: od-xcoff.c:934
-msgid "cannot read relocations"
-msgstr "не удало�ь прочитать перемещени�"
-
-#: od-xcoff.c:937
-#, c-format
-msgid "vaddr    sgn mod sz type  symndx symbol\n"
-msgstr "vaddr    sgn mod sz тип   symndx �имвол\n"
-
-#: od-xcoff.c:946
-msgid "cannot read relocation entry"
-msgstr "не удало�ь прочитать �лемент перемещени�"
-
-#: od-xcoff.c:950
-#, c-format
-msgid "%08x  %c   %c  %-2u "
-msgstr "%08x  %c   %c  %-2u "
-
-#: od-xcoff.c:986
-#, c-format
-msgid "Line numbers for %s (%u)\n"
-msgstr "�омера �трок дл� %s (%u)\n"
-
-#: od-xcoff.c:989
-msgid "cannot read line numbers"
-msgstr "не удало�ь прочитать номера �трок"
-
-#: od-xcoff.c:992
-#, c-format
-msgid "lineno  symndx/paddr\n"
-msgstr "lineno  symndx/paddr\n"
-
-#: od-xcoff.c:1000
-msgid "cannot read line number entry"
-msgstr "не удало�ь прочитать �лемент номера �троки"
-
-#: od-xcoff.c:1004
-#, c-format
-msgid " %-6u "
-msgstr " %-6u "
-
-#: od-xcoff.c:1043
-#, c-format
-msgid "no .loader section in file\n"
-msgstr "в файле нет раздела .loader\n"
-
-#: od-xcoff.c:1049
-#, c-format
-msgid "section .loader is too short\n"
-msgstr "раздел .loader �лишком короткий\n"
-
-#: od-xcoff.c:1056
-#, c-format
-msgid "Loader header:\n"
-msgstr "Заголовок загрузчика:\n"
-
-#: od-xcoff.c:1058
-#, c-format
-msgid "  version:           %u\n"
-msgstr "  вер�и�:            %u\n"
-
-#: od-xcoff.c:1061
-#, c-format
-msgid " Unhandled version\n"
-msgstr " �еобработанна� вер�и�\n"
-
-#: od-xcoff.c:1066
-#, c-format
-msgid "  nbr symbols:       %u\n"
-msgstr "  nbr �имволов:      %u\n"
-
-#: od-xcoff.c:1068
-#, c-format
-msgid "  nbr relocs:        %u\n"
-msgstr "  nbr relocs:        %u\n"
-
-#: od-xcoff.c:1069
-#, c-format
-msgid "  import strtab len: %u\n"
-msgstr "  import strtab len: %u\n"
-
-#: od-xcoff.c:1072
-#, c-format
-msgid "  nbr import files:  %u\n"
-msgstr "  nbr файл. импорта: %u\n"
-
-#: od-xcoff.c:1074
-#, c-format
-msgid "  import file off:   %u\n"
-msgstr "  �мещ. файла имп:   %u\n"
-
-#: od-xcoff.c:1076
-#, c-format
-msgid "  string table len:  %u\n"
-msgstr "  длина табл. �трок: %u\n"
-
-#: od-xcoff.c:1078
-#, c-format
-msgid "  string table off:  %u\n"
-msgstr "  �мещ. табл. �трок: %u\n"
-
-#: od-xcoff.c:1081
-#, c-format
-msgid "Dynamic symbols:\n"
-msgstr "Динамиче�кие �имволы:\n"
-
-#: od-xcoff.c:1082
-#, c-format
-msgid "     # value     sc IFEW ty class file  pa name\n"
-msgstr "     # значение  sc IFEW ty кла�� файл  pa им�\n"
-
-#: od-xcoff.c:1087
-#, c-format
-msgid "  %4u %08x %3u "
-msgstr "  %4u %08x %3u "
-
-#: od-xcoff.c:1100
-#, c-format
-msgid " %3u %3u "
-msgstr " %3u %3u "
-
-#: od-xcoff.c:1109
-#, c-format
-msgid "(bad offset: %u)"
-msgstr "(неверное �мещение: %u)"
-
-#: od-xcoff.c:1116
-#, c-format
-msgid "Dynamic relocs:\n"
-msgstr "Динамиче�кие перемещ.:\n"
-
-#: od-xcoff.c:1117
-#, c-format
-msgid "  vaddr    sec    sz typ   sym\n"
-msgstr "  vaddr    sec    sz typ   sym\n"
-
-#: od-xcoff.c:1129
-#, c-format
-msgid "  %08x %3u %c%c %2u "
-msgstr "  %08x %3u %c%c %2u "
-
-#: od-xcoff.c:1140
-#, c-format
-msgid ".text"
-msgstr ".text"
-
-#: od-xcoff.c:1143
-#, c-format
-msgid ".data"
-msgstr ".data"
-
-#: od-xcoff.c:1146
-#, c-format
-msgid ".bss"
-msgstr ".bss"
-
-#: od-xcoff.c:1149
-#, c-format
-msgid "%u"
-msgstr "%u"
-
-#: od-xcoff.c:1155
-#, c-format
-msgid "Import files:\n"
-msgstr "Файлы импорта:\n"
-
-#: od-xcoff.c:1187
-#, c-format
-msgid "no .except section in file\n"
-msgstr "в файле нет раздела .except\n"
-
-#: od-xcoff.c:1195
-#, c-format
-msgid "Exception table:\n"
-msgstr "Таблица и�ключений:\n"
-
-#: od-xcoff.c:1196
-#, c-format
-msgid "lang reason sym/addr\n"
-msgstr "lang reason sym/addr\n"
-
-#: od-xcoff.c:1204
-#, c-format
-msgid "  %02x     %02x "
-msgstr "  %02x     %02x "
-
-#: od-xcoff.c:1209
-#, c-format
-msgid "@%08x"
-msgstr "@%08x"
-
-#: od-xcoff.c:1229
-#, c-format
-msgid "no .typchk section in file\n"
-msgstr "в файле нет раздела .typchk\n"
-
-#: od-xcoff.c:1236
-#, c-format
-msgid "Type-check section:\n"
-msgstr "Раздел type-check:\n"
-
-#: od-xcoff.c:1237
-#, c-format
-msgid "offset    len  lang-id general-hash language-hash\n"
-msgstr "�мещение  len  lang-id general-hash language-hash\n"
-
-#: od-xcoff.c:1282
-#, c-format
-msgid " address beyond section size\n"
-msgstr " адре� вне размеров раздела\n"
-
-#: od-xcoff.c:1292
-#, c-format
-msgid " tags at %08x\n"
-msgstr " теги от %08x\n"
-
-#: od-xcoff.c:1299
-#, c-format
-msgid " version: %u, lang: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-msgstr " вер�и�: %u, �зык: %u, global_link: %u, is_eprol: %u, has_tboff: %u, int_proc: %u\n"
-
-#: od-xcoff.c:1306
-#, c-format
-msgid " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-msgstr " has_ctl: %u, tocless: %u, fp_pres: %u, log_abort: %u, int_hndl: %u\n"
-
-#: od-xcoff.c:1312
-#, c-format
-msgid " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-msgstr " name_pres: %u, uses_alloca: %u, cl_dis_inv: %u, saves_cr: %u, saves_lr: %u\n"
-
-#: od-xcoff.c:1318
-#, c-format
-msgid " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-msgstr " stores_bc: %u, fixup: %u, fpr_saved: %-2u, spare3: %u, gpr_saved: %-2u\n"
-
-#: od-xcoff.c:1324
-#, c-format
-msgid " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-msgstr " fixparms: %-3u  floatparms: %-3u  parm_on_stk: %u\n"
-
-#: od-xcoff.c:1337
-#, c-format
-msgid " parminfo: 0x%08x\n"
-msgstr " parminfo: 0x%08x\n"
-
-#: od-xcoff.c:1348
-#, c-format
-msgid " tb_offset: 0x%08x (start=0x%08x)\n"
-msgstr " tb_offset: 0x%08x (start=0x%08x)\n"
-
-#: od-xcoff.c:1359
-#, c-format
-msgid " hand_mask_offset: 0x%08x\n"
-msgstr " hand_mask_offset: 0x%08x\n"
-
-#: od-xcoff.c:1370
-#, c-format
-msgid " number of CTL anchors: %u\n"
-msgstr " количе�тво �корей CTL: %u\n"
-
-#: od-xcoff.c:1375
-#, c-format
-msgid "  CTL[%u]: %08x\n"
-msgstr "  CTL[%u]: %08x\n"
-
-#: od-xcoff.c:1389
-#, c-format
-msgid " Name (len: %u): "
-msgstr " Им� (длина: %u): "
-
-#: od-xcoff.c:1392
-#, c-format
-msgid "[truncated]\n"
-msgstr "[обрезано]\n"
-
-#: od-xcoff.c:1407
-#, c-format
-msgid " alloca reg: %u\n"
-msgstr " alloca reg: %u\n"
-
-#: od-xcoff.c:1411
-#, c-format
-msgid " (end of tags at %08x)\n"
-msgstr " (конец тегов от %08x)\n"
-
-#: od-xcoff.c:1414
-#, c-format
-msgid " no tags found\n"
-msgstr " теги не найдены\n"
-
-#: od-xcoff.c:1418
-#, c-format
-msgid " Truncated .text section\n"
-msgstr " Раздел .text обрезан\n"
-
-#: od-xcoff.c:1503
-#, c-format
-msgid "TOC:\n"
-msgstr "TOC:\n"
-
-#: od-xcoff.c:1546
-#, c-format
-msgid "Nbr entries: %-8u Size: %08x (%u)\n"
-msgstr "Nbr �лементов: %-8u Размер: %08x (%u)\n"
-
-#: od-xcoff.c:1630
-msgid "cannot read header"
-msgstr "не удало�ь прочитать заголовок"
-
-#: od-xcoff.c:1638
-#, c-format
-msgid "File header:\n"
-msgstr "Файловый заголовок:\n"
-
-#: od-xcoff.c:1639
-#, c-format
-msgid "  magic:         0x%04x (0%04o)  "
-msgstr "  �пец.:         0x%04x (0%04o)  "
-
-#: od-xcoff.c:1643
-#, c-format
-msgid "(WRMAGIC: writable text segments)"
-msgstr "(З�ПСПЕЦ: тек�товые �егменты до�тупны на запи�ь)"
-
-#: od-xcoff.c:1646
-#, c-format
-msgid "(ROMAGIC: readonly sharablee text segments)"
-msgstr "(ЧТЕСПЕЦ: общие тек�товые �егменты до�тупны только на чтение)"
-
-#: od-xcoff.c:1649
-#, c-format
-msgid "(TOCMAGIC: readonly text segments and TOC)"
-msgstr "(TOCСПЕЦ: тек�товые �егменты и TOC до�тупны только на чтение)"
-
-#: od-xcoff.c:1652
-#, c-format
-msgid "unknown magic"
-msgstr "неизве�тный опознавательный (�пец.) номер"
-
-#: od-xcoff.c:1659
-#, c-format
-msgid "  Unhandled magic\n"
-msgstr "  �еобработанный �пец. (magic) номер\n"
+msgstr "нера�познанный --endian тип `%s'"
 
 #: rclex.c:197
 msgid "invalid value specified for pragma code_page.\n"
@@ -4861,7 +4106,7 @@ msgstr "длÑ� директивы code_page указано недопуÑ�тимÐ
 #: rdcoff.c:198
 #, c-format
 msgid "parse_coff_type: Bad type code 0x%x"
-msgstr "parse_coff_type: неправильный код типа 0x%x"
+msgstr "parse_coff_type: Плохой код типа 0x%x"
 
 #: rdcoff.c:406 rdcoff.c:511 rdcoff.c:699
 #, c-format
@@ -4893,234 +4138,234 @@ msgstr "%s: нет раÑ�познанной отладочной информаÑ
 msgid "Last stabs entries before error:\n"
 msgstr "По�ледние пункты stabs перед ошибкой:\n"
 
-#: readelf.c:265
+#: readelf.c:268
 msgid "<none>"
 msgstr "<нет>"
 
-#: readelf.c:266
+#: readelf.c:269
 msgid "<no-name>"
 msgstr "<нет-имени>"
 
-#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195
-#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150
-#: readelf.c:12153
+#: readelf.c:270 readelf.c:5047 readelf.c:5557 readelf.c:7794 readelf.c:7912
+#: readelf.c:8865 readelf.c:8945 readelf.c:8998 readelf.c:11860
+#: readelf.c:11863
 msgid "<corrupt>"
 msgstr "<повреждено>"
 
-#: readelf.c:300
+#: readelf.c:308
 #, c-format
 msgid "Unable to seek to 0x%lx for %s\n"
 msgstr "�евозможно найти 0x%lx дл� %s\n"
 
-#: readelf.c:315
+#: readelf.c:323
 #, c-format
 msgid "Out of memory allocating 0x%lx bytes for %s\n"
 msgstr "�ехватка пам�ти при ра�пределении 0x%lx байт дл� %s\n"
 
-#: readelf.c:325
+#: readelf.c:333
 #, c-format
 msgid "Unable to read in 0x%lx bytes of %s\n"
 msgstr "�евозможно прочитать 0x%lx байт из %s\n"
 
-#: readelf.c:625
+#: readelf.c:697
 msgid "Don't know about relocations on this machine architecture\n"
 msgstr "�еизве�тно о перемещени�х дл� �той архитектуры машины\n"
 
-#: readelf.c:646 readelf.c:676 readelf.c:744 readelf.c:773
+#: readelf.c:718 readelf.c:748 readelf.c:816 readelf.c:845
 msgid "relocs"
 msgstr "перемещени�"
 
 #
-#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784
+#: readelf.c:730 readelf.c:760 readelf.c:827 readelf.c:856
 msgid "out of memory parsing relocs\n"
 msgstr "нехватка пам�ти при анализе перемещений\n"
 
-#: readelf.c:889
+#: readelf.c:961
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name + Addend\n"
 msgstr " Смещение   Инфо    Тип                 Знач.�имв.  Им� �имвола + Addend\n"
 
-#: readelf.c:891
+#: readelf.c:963
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name + Addend\n"
 msgstr " Смещение   Инфо    Тип             Знач.�имв  Им� �имв. + Addend\n"
 
-#: readelf.c:896
+#: readelf.c:968
 #, c-format
 msgid " Offset     Info    Type                Sym. Value  Symbol's Name\n"
 msgstr " Смещение   Инфо    Тип                 Знач.�имв   Им� �имвола\n"
 
-#: readelf.c:898
+#: readelf.c:970
 #, c-format
 msgid " Offset     Info    Type            Sym.Value  Sym. Name\n"
 msgstr " Смещение   Инфо    Тип             Знач.�имв  Им� �имв.\n"
 
-#: readelf.c:906
+#: readelf.c:978
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend\n"
 msgstr "    Смещение           Инфо             Тип                Значение �имв.  Им� �имвола + Addend\n"
 
-#: readelf.c:908
+#: readelf.c:980
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name + Addend\n"
 msgstr "  Смещение        Инфо           Тип            Знач.�имв.    Им� �имв. + Addend\n"
 
-#: readelf.c:913
+#: readelf.c:985
 #, c-format
 msgid "    Offset             Info             Type               Symbol's Value  Symbol's Name\n"
 msgstr "    Смещение           Инфо             Тип                Значение �имв.  Им� �имвола\n"
 
-#: readelf.c:915
+#: readelf.c:987
 #, c-format
 msgid "  Offset          Info           Type           Sym. Value    Sym. Name\n"
 msgstr "  Смещение        Инфо           Тип            Знач.�имв.    Им� �имв.\n"
 
-#: readelf.c:1219 readelf.c:1378 readelf.c:1386
+#: readelf.c:1291 readelf.c:1448 readelf.c:1456
 #, c-format
 msgid "unrecognized: %-7lx"
 msgstr "нера�познанный: %-7lx"
 
-#: readelf.c:1244
+#: readelf.c:1316
 #, c-format
 msgid "<unknown addend: %lx>"
 msgstr "<неизве�тный addend: %lx>"
 
-#: readelf.c:1251
+#: readelf.c:1323
 #, c-format
 msgid " bad symbol index: %08lx"
 msgstr " неправильный индек� �имвола: %08lx"
 
-#: readelf.c:1336
+#: readelf.c:1406
 #, c-format
 msgid "<string table index: %3ld>"
 msgstr "<индек� таблицы �трок: %3ld>"
 
-#: readelf.c:1338
+#: readelf.c:1408
 #, c-format
 msgid "<corrupt string table index: %3ld>"
 msgstr "<поврежден индек� таблицы �трок: %3ld>"
 
-#: readelf.c:1731
+#: readelf.c:1801
 #, c-format
 msgid "Processor Specific: %lx"
 msgstr "Специфичный дл� проце��ора: %lx"
 
-#: readelf.c:1755
+#: readelf.c:1825
 #, c-format
 msgid "Operating System specific: %lx"
 msgstr "Специфичный дл� операционной �и�темы: %lx"
 
-#: readelf.c:1759 readelf.c:2821
+#: readelf.c:1829 readelf.c:2875
 #, c-format
 msgid "<unknown>: %lx"
 msgstr "<неизве�тный>: %lx"
 
-#: readelf.c:1772
+#: readelf.c:1842
 msgid "NONE (None)"
 msgstr "�ЕТ (�ет)"
 
-#: readelf.c:1773
+#: readelf.c:1843
 msgid "REL (Relocatable file)"
 msgstr "REL (Перемещаемый файл)"
 
-#: readelf.c:1774
+#: readelf.c:1844
 msgid "EXEC (Executable file)"
 msgstr "EXEC (И�полн�емый файл)"
 
-#: readelf.c:1775
+#: readelf.c:1845
 msgid "DYN (Shared object file)"
 msgstr "DYN (Совм. и�п. объектный файл)"
 
-#: readelf.c:1776
+#: readelf.c:1846
 msgid "CORE (Core file)"
 msgstr "CORE (О�новной файл)"
 
-#: readelf.c:1780
+#: readelf.c:1850
 #, c-format
 msgid "Processor Specific: (%x)"
 msgstr "Специфичный дл� проце��ора: (%x)"
 
-#: readelf.c:1782
+#: readelf.c:1852
 #, c-format
 msgid "OS Specific: (%x)"
 msgstr "Специфичный дл� ОС: (%x)"
 
-#: readelf.c:1784 readelf.c:3068
+#: readelf.c:1854 readelf.c:3122
 #, c-format
 msgid "<unknown>: %x"
 msgstr "<неизве�тный>: %x"
 
-#: readelf.c:1796
+#: readelf.c:1866
 msgid "None"
 msgstr "�ет"
 
-#: readelf.c:1964
+#: readelf.c:2034
 #, c-format
 msgid "<unknown>: 0x%x"
 msgstr "<неизве�тный>: 0x%x"
 
-#: readelf.c:2150
+#: readelf.c:2220
 msgid ", <unknown>"
 msgstr ", <неизве�тный>"
 
 #
-#: readelf.c:2236 readelf.c:7428
+#: readelf.c:2291 readelf.c:7145
 msgid "unknown"
 msgstr "неизве�тный"
 
 #
-#: readelf.c:2237
+#: readelf.c:2292
 msgid "unknown mac"
 msgstr "неизве�тна� машина"
 
-#: readelf.c:2301
+#: readelf.c:2356
 msgid ", relocatable"
 msgstr ", перемещаемый"
 
-#: readelf.c:2304
+#: readelf.c:2359
 msgid ", relocatable-lib"
 msgstr ", перемещаема�-библиотека"
 
-#: readelf.c:2327
+#: readelf.c:2382
 msgid ", unknown v850 architecture variant"
 msgstr ", неизве�тный вариант архитектуры v850"
 
-#: readelf.c:2384
+#: readelf.c:2438
 msgid ", unknown CPU"
 msgstr ", неизве�тный ЦП"
 
-#: readelf.c:2399
+#: readelf.c:2453
 msgid ", unknown ABI"
 msgstr ", неизве�тный ABI"
 
-#: readelf.c:2419 readelf.c:2453
+#: readelf.c:2473 readelf.c:2507
 msgid ", unknown ISA"
 msgstr ", неизве�тный ISA"
 
-#: readelf.c:2626
+#: readelf.c:2680
 msgid "Standalone App"
 msgstr "Изолированное приложение"
 
-#: readelf.c:2635
+#: readelf.c:2689
 msgid "Bare-metal C6000"
 msgstr "Bare-metal C6000"
 
-#: readelf.c:2645 readelf.c:3431 readelf.c:3447
+#: readelf.c:2699 readelf.c:3462 readelf.c:3478
 #, c-format
 msgid "<unknown: %x>"
 msgstr "<неизве�тный: %x>"
 
-#: readelf.c:3123
+#: readelf.c:3172
 #, c-format
 msgid "Usage: readelf <option(s)> elf-file(s)\n"
 msgstr "И�пользование: readelf <параметры> elf-файл(ы)\n"
 
-#: readelf.c:3124
+#: readelf.c:3173
 #, c-format
 msgid " Display information about the contents of ELF format files\n"
 msgstr " Отображает информацию о �одержимом файлов в формате ELF\n"
 
-#: readelf.c:3125
+#: readelf.c:3174
 #, c-format
 msgid ""
 " Options are:\n"
@@ -5153,7 +4398,7 @@ msgid ""
 "  -w[lLiaprmfFsoRt] or\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n"
 "               =frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         Display the contents of DWARF2 debug sections\n"
 msgstr ""
 " Параметры:\n"
@@ -5188,24 +4433,13 @@ msgstr ""
 "  -R --relocated-dump=<номер|им�>\n"
 "                         дамп �одержимого раздела � <номером|именем> в\n"
 "                         в виде перемещённых байт\n"
-"  -w[lLiaprmfFsoRt] или\n"
+"  -w[liaprmfFsoRt] или\n"
 "  --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,\n"
 "               =frames,=frames-interp,=str,=loc,=Ranges,=pubtypes,\n"
-"               =gdb_index,=trace_info,=trace_abbrev,=trace_aranges]\n"
+"               =trace_info,=trace_abbrev,=trace_aranges]\n"
 "                         показать �одержимое отладочных разделов DWARF2\n"
 
-#: readelf.c:3157
-#, c-format
-msgid ""
-"  --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
-"  --dwarf-start=N        Display DIEs starting with N, at the same depth\n"
-"                         or deeper\n"
-msgstr ""
-"  --dwarf-depth=N            не показывать DIE по�ле N вложений или более\n"
-"      --dwarf-start=N            показывать DIE начина� � N, � тем же кол-вом\n"
-"                             вложений или глубже\n"
-
-#: readelf.c:3162
+#: readelf.c:3207
 #, c-format
 msgid ""
 "  -i --instruction-dump=<number|name>\n"
@@ -5215,7 +4449,7 @@ msgstr ""
 "                         диза��емблировать �одержимое раздела �\n"
 "                         <номером|именем>\n"
 
-#: readelf.c:3166
+#: readelf.c:3211
 #, c-format
 msgid ""
 "  -I --histogram         Display histogram of bucket list lengths\n"
@@ -5231,96 +4465,96 @@ msgstr ""
 "  -v --version           показать номер вер�ии readelf\n"
 
 #
-#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374
+#: readelf.c:3240 readelf.c:3269 readelf.c:3273 readelf.c:13224
 msgid "Out of memory allocating dump request table.\n"
 msgstr "�ехватка пам�ти при размещении дампа таблицы запро�а.\n"
 
-#: readelf.c:3400
+#: readelf.c:3431
 #, c-format
 msgid "Invalid option '-%c'\n"
 msgstr "�едопу�тимый параметр «-%c»\n"
 
-#: readelf.c:3415
+#: readelf.c:3446
 msgid "Nothing to do.\n"
 msgstr "�ечего выполн�ть.\n"
 
-#: readelf.c:3427 readelf.c:3443 readelf.c:8013
+#: readelf.c:3458 readelf.c:3474 readelf.c:7730
 msgid "none"
 msgstr "нет"
 
-#: readelf.c:3444
+#: readelf.c:3475
 msgid "2's complement, little endian"
 msgstr "дополнение до 2, little endian"
 
-#: readelf.c:3445
+#: readelf.c:3476
 msgid "2's complement, big endian"
 msgstr "дополнение до 2, big endian"
 
-#: readelf.c:3463
+#: readelf.c:3494
 msgid "Not an ELF file - it has the wrong magic bytes at the start\n"
-msgstr "�е ELF-файл — он �одержит неверные magic-байты в начале\n"
+msgstr "�е ELF-файл - он �одержит неверные magic-байты в начале\n"
 
-#: readelf.c:3473
+#: readelf.c:3504
 #, c-format
 msgid "ELF Header:\n"
 msgstr "Заголовок ELF:\n"
 
-#: readelf.c:3474
+#: readelf.c:3505
 #, c-format
 msgid "  Magic:   "
 msgstr "  Magic:   "
 
-#: readelf.c:3478
+#: readelf.c:3509
 #, c-format
 msgid "  Class:                             %s\n"
 msgstr "  Кла��:                             %s\n"
 
-#: readelf.c:3480
+#: readelf.c:3511
 #, c-format
 msgid "  Data:                              %s\n"
 msgstr "  Данные:                            %s\n"
 
-#: readelf.c:3482
+#: readelf.c:3513
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr "  Вер�и�:                            %d %s\n"
 
-#: readelf.c:3487
+#: readelf.c:3518
 #, c-format
 msgid "<unknown: %lx>"
 msgstr "<неизве�тный: %lx>"
 
-#: readelf.c:3489
+#: readelf.c:3520
 #, c-format
 msgid "  OS/ABI:                            %s\n"
 msgstr "  OS/ABI:                            %s\n"
 
-#: readelf.c:3491
+#: readelf.c:3522
 #, c-format
 msgid "  ABI Version:                       %d\n"
 msgstr "  Вер�и� ABI:                        %d\n"
 
-#: readelf.c:3493
+#: readelf.c:3524
 #, c-format
 msgid "  Type:                              %s\n"
 msgstr "  Тип:                               %s\n"
 
-#: readelf.c:3495
+#: readelf.c:3526
 #, c-format
 msgid "  Machine:                           %s\n"
 msgstr "  Машина:                            %s\n"
 
-#: readelf.c:3497
+#: readelf.c:3528
 #, c-format
 msgid "  Version:                           0x%lx\n"
 msgstr "  Вер�и�:                            0x%lx\n"
 
-#: readelf.c:3500
+#: readelf.c:3531
 #, c-format
 msgid "  Entry point address:               "
 msgstr "  �дре� точки входа:               "
 
-#: readelf.c:3502
+#: readelf.c:3533
 #, c-format
 msgid ""
 "\n"
@@ -5329,7 +4563,7 @@ msgstr ""
 "\n"
 "  �ачало заголовков программы:          "
 
-#: readelf.c:3504
+#: readelf.c:3535
 #, c-format
 msgid ""
 " (bytes into file)\n"
@@ -5338,60 +4572,61 @@ msgstr ""
 " (байт в файле)\n"
 "  �ачало заголовков программы:          "
 
-#: readelf.c:3506
+#: readelf.c:3537
 #, c-format
 msgid " (bytes into file)\n"
 msgstr " (байт в файле)\n"
 
-#: readelf.c:3508
+#: readelf.c:3539
 #, c-format
 msgid "  Flags:                             0x%lx%s\n"
 msgstr "  Флаги:                             0x%lx%s\n"
 
-#: readelf.c:3511
+#: readelf.c:3542
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr "  Размер �того заголовка:            %ld (байт)\n"
 
-#: readelf.c:3513
+#: readelf.c:3544
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr "  Размер заголовков программы:       %ld (байт)\n"
 
-#: readelf.c:3515
+#: readelf.c:3546
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr "  Чи�ло заголовков программы:        %ld"
 
-#: readelf.c:3522
+#: readelf.c:3551
+#, c-format
+msgid " (%ld)"
+msgstr " (%ld)"
+
+#: readelf.c:3553
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr "  Размер заголовков раздела:         %ld (байт)\n"
 
-#: readelf.c:3524
+#: readelf.c:3555
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr "  Чи�ло заголовков раздела:          %ld"
 
-#: readelf.c:3529
+#: readelf.c:3560
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr "  Индек� табл. �трок загол. раздела: %ld"
 
-#: readelf.c:3536
+#: readelf.c:3567
 #, c-format
 msgid " <corrupt: out of range>"
 msgstr " <повреждён: вне диапазона>"
 
-#: readelf.c:3570 readelf.c:3604
+#: readelf.c:3601 readelf.c:3635
 msgid "program headers"
 msgstr "заголовки программы"
 
-#: readelf.c:3671
-msgid "possibly corrupt ELF header - it has a non-zero program header offset, but no program headers"
-msgstr "заголовок ELF, возможно, повреждён — он �одержит ненулевое �мещение заголовка программы при от�ут�твии программных заголовков"
-
-#: readelf.c:3674
+#: readelf.c:3701
 #, c-format
 msgid ""
 "\n"
@@ -5400,21 +4635,21 @@ msgstr ""
 "\n"
 "В �том файле нет заголовков программы.\n"
 
-#: readelf.c:3680
+#: readelf.c:3707
 #, c-format
 msgid ""
 "\n"
 "Elf file type is %s\n"
 msgstr ""
 "\n"
-"Тип файла ELF — %s\n"
+"Тип elf-файла - %s\n"
 
-#: readelf.c:3681
+#: readelf.c:3708
 #, c-format
 msgid "Entry point "
 msgstr "Точка входа "
 
-#: readelf.c:3683
+#: readelf.c:3710
 #, c-format
 msgid ""
 "\n"
@@ -5423,7 +4658,7 @@ msgstr ""
 "\n"
 "Имеет�� %d заголовков программы, начина� �о �мещени� "
 
-#: readelf.c:3695 readelf.c:3697
+#: readelf.c:3722 readelf.c:3724
 #, c-format
 msgid ""
 "\n"
@@ -5432,59 +4667,59 @@ msgstr ""
 "\n"
 "Заголовки программы:\n"
 
-#: readelf.c:3701
+#: readelf.c:3728
 #, c-format
 msgid "  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align\n"
 msgstr "  Тип            Смещ.    Вирт.адр   Физ.адр    Рзм.фйл Рзм.пм  Флг Выравн\n"
 
-#: readelf.c:3704
+#: readelf.c:3731
 #, c-format
 msgid "  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align\n"
 msgstr "  Тип            Смещ.    Вирт.адр           Физ.адр            Рзм.фйл  Рзм.пм   Флг Выравн\n"
 
-#: readelf.c:3708
+#: readelf.c:3735
 #, c-format
 msgid "  Type           Offset             VirtAddr           PhysAddr\n"
 msgstr "  Тип            Смещ.              Вирт.адр           Физ.адр\n"
 
-#: readelf.c:3710
+#: readelf.c:3737
 #, c-format
 msgid "                 FileSiz            MemSiz              Flags  Align\n"
 msgstr "                 Рзм.фйл            Рзм.пм              Флаги  Выравн\n"
 
-#: readelf.c:3803
+#: readelf.c:3830
 msgid "more than one dynamic segment\n"
 msgstr "более одного динамиче�кого �егмента\n"
 
 #
-#: readelf.c:3822
+#: readelf.c:3849
 msgid "no .dynamic section in the dynamic segment\n"
 msgstr "в динамиче�ком �егменте нет раздела .dynamic\n"
 
 #
-#: readelf.c:3837
+#: readelf.c:3864
 msgid "the .dynamic section is not contained within the dynamic segment\n"
 msgstr "в динамиче�ком �егменте не �одержит�� раздел .dynamic\n"
 
 #
-#: readelf.c:3840
+#: readelf.c:3867
 msgid "the .dynamic section is not the first section in the dynamic segment.\n"
 msgstr "раздел .dynamic не �вл�ет�� первым разделом динамиче�кого �егмента.\n"
 
-#: readelf.c:3848
+#: readelf.c:3875
 msgid "Unable to find program interpreter name\n"
 msgstr "�евозможно найти им� интерпретатора программы\n"
 
-#: readelf.c:3855
+#: readelf.c:3882
 msgid "Internal error: failed to create format string to display program interpreter\n"
 msgstr "Внутренн�� ошибка: не удало�ь �оздать �троку формата дл� отображени� интерпретатора программы\n"
 
 #
-#: readelf.c:3859
+#: readelf.c:3886
 msgid "Unable to read program interpreter name\n"
 msgstr "�евозможно прочитать им� интерпретатора программы\n"
 
-#: readelf.c:3862
+#: readelf.c:3889
 #, c-format
 msgid ""
 "\n"
@@ -5493,7 +4728,7 @@ msgstr ""
 "\n"
 "      [Запрашиваемый интерпретатор программы: %s]"
 
-#: readelf.c:3874
+#: readelf.c:3901
 #, c-format
 msgid ""
 "\n"
@@ -5502,50 +4737,46 @@ msgstr ""
 "\n"
 " Соответ�твие раздел-�егмент:\n"
 
-#: readelf.c:3875
+#: readelf.c:3902
 #, c-format
 msgid "  Segment Sections...\n"
 msgstr "  Сегмент Разделы...\n"
 
-#: readelf.c:3911
+#: readelf.c:3938
 msgid "Cannot interpret virtual addresses without program headers.\n"
 msgstr "�евозможно интерпретировать виртуальные адре�а без заголовков программы.\n"
 
-#: readelf.c:3927
+#: readelf.c:3954
 #, c-format
 msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n"
 msgstr "Виртуальный адре� 0x%lx не размещен в каком-либо �егменте PT_LOAD.\n"
 
-#: readelf.c:3942 readelf.c:3985
+#: readelf.c:3969 readelf.c:4012
 msgid "section headers"
 msgstr "заголовки разделов"
 
-#: readelf.c:4032 readelf.c:4107
+#: readelf.c:4059 readelf.c:4134
 msgid "sh_entsize is zero\n"
 msgstr "значение sh_entsize равно нулю\n"
 
-#: readelf.c:4040 readelf.c:4115
+#: readelf.c:4067 readelf.c:4142
 msgid "Invalid sh_entsize\n"
 msgstr "�еверное значение sh_entsize\n"
 
-#: readelf.c:4045 readelf.c:4120
+#: readelf.c:4072 readelf.c:4147
 msgid "symbols"
 msgstr "�имволы"
 
-#: readelf.c:4057 readelf.c:4132
+#: readelf.c:4084 readelf.c:4159
 msgid "symtab shndx"
 msgstr "symtab shndx"
 
-#: readelf.c:4392
+#: readelf.c:4419
 #, c-format
 msgid "UNKNOWN (%*.*lx)"
 msgstr "�ЕИЗВЕСТ�О (%*.*lx)"
 
-#: readelf.c:4414
-msgid "possibly corrupt ELF file header - it has a non-zero section header offset, but no section headers\n"
-msgstr "заголовок ELF, возможно, повреждён — он �одержит ненулевое �мещение заголовка раздела при от�ут�твии заголовков разделов\n"
-
-#: readelf.c:4417
+#: readelf.c:4440 readelf.c:4920
 #, c-format
 msgid ""
 "\n"
@@ -5554,38 +4785,38 @@ msgstr ""
 "\n"
 "В �том файле нет разделов.\n"
 
-#: readelf.c:4423
+#: readelf.c:4446
 #, c-format
 msgid "There are %d section headers, starting at offset 0x%lx:\n"
 msgstr "Имеет�� %d заголовков раздела, начина� �о �мещени� 0x%lx:\n"
 
-#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152
-#: readelf.c:7036 readelf.c:9132
+#: readelf.c:4467 readelf.c:5043 readelf.c:5454 readelf.c:5760 readelf.c:6173
+#: readelf.c:6754 readelf.c:8843
 msgid "string table"
 msgstr "таблица �трок"
 
-#: readelf.c:4511
+#: readelf.c:4534
 #, c-format
 msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n"
 msgstr "Раздел %d �одержит неверный sh_entsize %lx (ожидало�ь %lx)\n"
 
-#: readelf.c:4531
+#: readelf.c:4554
 msgid "File contains multiple dynamic symbol tables\n"
 msgstr "Файл �одержит не�колько таблиц динамиче�ких �имволов\n"
 
-#: readelf.c:4544
+#: readelf.c:4567
 msgid "File contains multiple dynamic string tables\n"
 msgstr "Файл �одержит не�колько таблиц динамиче�ких �трок\n"
 
-#: readelf.c:4550
+#: readelf.c:4573
 msgid "dynamic strings"
 msgstr "динамиче�кие �троки"
 
-#: readelf.c:4557
+#: readelf.c:4580
 msgid "File contains multiple symtab shndx tables\n"
 msgstr "Файл �одержит не�колько таблиц symtab shndx\n"
 
-#: readelf.c:4627
+#: readelf.c:4648
 #, c-format
 msgid ""
 "\n"
@@ -5594,7 +4825,7 @@ msgstr ""
 "\n"
 "Заголовки разделов:\n"
 
-#: readelf.c:4629
+#: readelf.c:4650
 #, c-format
 msgid ""
 "\n"
@@ -5603,62 +4834,62 @@ msgstr ""
 "\n"
 "Заголовок раздела:\n"
 
-#: readelf.c:4635 readelf.c:4646 readelf.c:4657
+#: readelf.c:4656 readelf.c:4667 readelf.c:4678
 #, c-format
 msgid "  [Nr] Name\n"
 msgstr "  [Nr] Им�\n"
 
-#: readelf.c:4636
+#: readelf.c:4657
 #, c-format
 msgid "       Type            Addr     Off    Size   ES   Lk Inf Al\n"
 msgstr "       Тип             �дре�    Смещ   Разм   ES   С� Инф Al\n"
 
-#: readelf.c:4640
+#: readelf.c:4661
 #, c-format
 msgid "  [Nr] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [�м] Им�               Тип             �дре�    Смещ   Разм   ES Флг С� Инф Al\n"
 
-#: readelf.c:4647
+#: readelf.c:4668
 #, c-format
 msgid "       Type            Address          Off    Size   ES   Lk Inf Al\n"
 msgstr "       Тип             �дре�            Смещ   Разм   ES   С� Инф Al\n"
 
-#: readelf.c:4651
+#: readelf.c:4672
 #, c-format
 msgid "  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al\n"
 msgstr "  [�м] Им�               Тип             �дре�            Смещ   Разм   ES Флг Лк Инф Al\n"
 
-#: readelf.c:4658
+#: readelf.c:4679
 #, c-format
 msgid "       Type              Address          Offset            Link\n"
 msgstr "       Тип               �дре�            Смещение          С�ылка\n"
 
-#: readelf.c:4659
+#: readelf.c:4680
 #, c-format
 msgid "       Size              EntSize          Info              Align\n"
 msgstr "       Размер            Разм.Ent         Инфо              Выравн\n"
 
-#: readelf.c:4663
+#: readelf.c:4684
 #, c-format
 msgid "  [Nr] Name              Type             Address           Offset\n"
 msgstr "  [�м] Им�               Тип              �дре�             Смещение\n"
 
-#: readelf.c:4664
+#: readelf.c:4685
 #, c-format
 msgid "       Size              EntSize          Flags  Link  Info  Align\n"
 msgstr "       Размер            Разм.Ent         Флаги  С�ылк Инфо  Выравн\n"
 
-#: readelf.c:4669
+#: readelf.c:4690
 #, c-format
 msgid "       Flags\n"
 msgstr "       Флаги\n"
 
-#: readelf.c:4748
+#: readelf.c:4769
 #, c-format
 msgid "section %u: sh_link value of %u is larger than the number of sections\n"
 msgstr "раздел %u: размер sh_link у %u больше чем количе�тво разделов\n"
 
-#: readelf.c:4847
+#: readelf.c:4868
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5671,7 +4902,7 @@ msgstr ""
 "  I (инфо), L (пор�док ��ылок), G (группа), T (TLS), E (и�ключён), x (неизв.)\n"
 "  O (треб. доп. обработка ОС) o (�пецифич. дл� ОС), p (�пециф. дл� проце��ора)\n"
 
-#: readelf.c:4852
+#: readelf.c:4873
 #, c-format
 msgid ""
 "Key to Flags:\n"
@@ -5684,25 +4915,16 @@ msgstr ""
 "  I (инфо), L (пор�док ��ылок), G (группа), T (TLS), E (и�ключён), x (неизв.)\n"
 "  O (треб. доп. обработка ОС) o (�пецифич. дл� ОС), p (�пециф. дл� проце��ора)\n"
 
-#: readelf.c:4874
+#: readelf.c:4895
 #, c-format
 msgid "[<unknown>: 0x%x] "
 msgstr "[<неизве�тный>: 0x%x] "
 
-#: readelf.c:4899
-#, c-format
-msgid ""
-"\n"
-"There are no sections to group in this file.\n"
-msgstr ""
-"\n"
-"В �том файле нет разделов дл� группировки.\n"
-
-#: readelf.c:4906
+#: readelf.c:4927
 msgid "Section headers are not available!\n"
 msgstr "�едо�тупны заголовки раздела!\n"
 
-#: readelf.c:4930
+#: readelf.c:4951
 #, c-format
 msgid ""
 "\n"
@@ -5711,26 +4933,26 @@ msgstr ""
 "\n"
 "В �том файле нет групп разделов.\n"
 
-#: readelf.c:4967
+#: readelf.c:4988
 #, c-format
 msgid "Bad sh_link in group section `%s'\n"
-msgstr "�еверный sh_link в разделе групп «%s»\n"
+msgstr "�еверный sh_link в разделе групп `%s'\n"
 
-#: readelf.c:4981
+#: readelf.c:5002
 #, c-format
 msgid "Corrupt header in group section `%s'\n"
 msgstr "Повреждённый заголовок в разделе групп «%s»\n"
 
-#: readelf.c:4992
+#: readelf.c:5013
 #, c-format
 msgid "Bad sh_info in group section `%s'\n"
 msgstr "�еверный sh_info в разделе групп «%s»\n"
 
-#: readelf.c:5031
+#: readelf.c:5052
 msgid "section data"
 msgstr "данные раздела"
 
-#: readelf.c:5040
+#: readelf.c:5061
 #, c-format
 msgid ""
 "\n"
@@ -5739,49 +4961,49 @@ msgstr ""
 "\n"
 "%s раздел групп [%5u] «%s» [%s] �одержит %u �лементов:\n"
 
-#: readelf.c:5043
+#: readelf.c:5064
 #, c-format
 msgid "   [Index]    Name\n"
 msgstr "   [Индек�]   Им�\n"
 
-#: readelf.c:5057
+#: readelf.c:5078
 #, c-format
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr "раздел [%5u] уже находит�� в разделе групп [%5u] > мак�имальный раздел [%5u]\n"
 
-#: readelf.c:5066
+#: readelf.c:5087
 #, c-format
 msgid "section [%5u] in group section [%5u] already in group section [%5u]\n"
 msgstr "раздел [%5u] из раздела групп [%5u] уже находит�� в разделе групп [%5u]\n"
 
-#: readelf.c:5079
+#: readelf.c:5100
 #, c-format
 msgid "section 0 in group section [%5u]\n"
 msgstr "раздел 0 в разделе групп [%5u]\n"
 
-#: readelf.c:5146
+#: readelf.c:5167
 msgid "dynamic section image fixups"
 msgstr "динамиче�кий раздел адре�ных прив�зок образа"
 
-#: readelf.c:5158
+#: readelf.c:5179
 #, c-format
 msgid ""
 "\n"
 "Image fixups for needed library #%d: %s - ident: %lx\n"
 msgstr ""
 "\n"
-"�дре�ные прив�зки образа дл� необходимой библиотеки #%d: %s - ident: %lx\n"
+"�дре�ные прив�зки образа дл� необходимой библиотеки #%d: %s - идент.: %lx\n"
 
-#: readelf.c:5161
+#: readelf.c:5182
 #, c-format
 msgid "Seg Offset           Type                             SymVec DataType\n"
 msgstr "Сег Смещение         Тип                              СимВек ТипДанн\n"
 
-#: readelf.c:5193
+#: readelf.c:5214
 msgid "dynamic section image relas"
 msgstr "динамиче�кий раздел перемещений образа"
 
-#: readelf.c:5197
+#: readelf.c:5218
 #, c-format
 msgid ""
 "\n"
@@ -5790,16 +5012,16 @@ msgstr ""
 "\n"
 "перемещени� образа\n"
 
-#: readelf.c:5199
+#: readelf.c:5220
 #, c-format
 msgid "Seg Offset   Type                            Addend            Seg Sym Off\n"
 msgstr "Сег Смещение Тип                             Добавление        Сег Сим Сме\n"
 
-#: readelf.c:5254
+#: readelf.c:5275
 msgid "dynamic string section"
 msgstr "динамиче�кий раздел �трок"
 
-#: readelf.c:5355
+#: readelf.c:5376
 #, c-format
 msgid ""
 "\n"
@@ -5808,7 +5030,7 @@ msgstr ""
 "\n"
 "'%s' раздел перемещени� �о �мещением 0x%lx �одержит %ld байт:\n"
 
-#: readelf.c:5370
+#: readelf.c:5391
 #, c-format
 msgid ""
 "\n"
@@ -5817,7 +5039,7 @@ msgstr ""
 "\n"
 "В �том файле нет динамиче�ких перемещений.\n"
 
-#: readelf.c:5394
+#: readelf.c:5415
 #, c-format
 msgid ""
 "\n"
@@ -5826,17 +5048,17 @@ msgstr ""
 "\n"
 "Раздел перемещени� "
 
-#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167
+#: readelf.c:5420 readelf.c:5836 readelf.c:5851 readelf.c:6188
 #, c-format
 msgid "'%s'"
 msgstr "'%s'"
 
-#: readelf.c:5401 readelf.c:5832 readelf.c:6169
+#: readelf.c:5422 readelf.c:5853 readelf.c:6190
 #, c-format
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr " �о �мещением 0x%lx �одержит %lu пунктов:\n"
 
-#: readelf.c:5452
+#: readelf.c:5473
 #, c-format
 msgid ""
 "\n"
@@ -5845,21 +5067,21 @@ msgstr ""
 "\n"
 "В �том файле нет перемещений.\n"
 
-#: readelf.c:5590
+#: readelf.c:5611
 #, c-format
 msgid "\tUnknown version.\n"
 msgstr "\t�еизве�тна� вер�и�.\n"
 
-#: readelf.c:5643 readelf.c:6016
+#: readelf.c:5664 readelf.c:6037
 msgid "unwind table"
 msgstr "развернута� таблица"
 
-#: readelf.c:5685 readelf.c:6098 readelf.c:6358
+#: readelf.c:5706 readelf.c:6119 readelf.c:6365
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr "Пропу�кает�� неожиданный тип перемещени� %s\n"
 
-#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091
+#: readelf.c:5768 readelf.c:6181 readelf.c:6762 readelf.c:6808
 #, c-format
 msgid ""
 "\n"
@@ -5868,7 +5090,7 @@ msgstr ""
 "\n"
 "В �том файле нет развернутых разделов.\n"
 
-#: readelf.c:5810
+#: readelf.c:5831
 #, c-format
 msgid ""
 "\n"
@@ -5877,11 +5099,11 @@ msgstr ""
 "\n"
 "�евозможно было найти раздел � развернутой информацией дл� "
 
-#: readelf.c:5823
+#: readelf.c:5844
 msgid "unwind info"
 msgstr "развернута� информаци�"
 
-#: readelf.c:5825 readelf.c:6166
+#: readelf.c:5846 readelf.c:6187
 #, c-format
 msgid ""
 "\n"
@@ -5890,110 +5112,106 @@ msgstr ""
 "\n"
 "Развернутый раздел "
 
-#: readelf.c:6275
+#: readelf.c:6296
 msgid "unwind data"
 msgstr "развёрнутые данные"
 
-#: readelf.c:6329
+#: readelf.c:6350
 #, c-format
 msgid "Skipping unexpected relocation at offset 0x%lx\n"
 msgstr "Пропу�кает�� неожиданное перемещение �о �мещением 0x%lx\n"
 
-#: readelf.c:6433
+#: readelf.c:6426
 #, c-format
 msgid "[Truncated opcode]\n"
 msgstr "[Обрезанный код операции]\n"
 
-#: readelf.c:6477 readelf.c:6677
+#: readelf.c:6429
 #, c-format
-msgid "Refuse to unwind"
-msgstr "Октаз от развёртывани�"
+msgid "0x%02x "
+msgstr "0x%02x "
 
-#: readelf.c:6500
+#: readelf.c:6451
 #, c-format
-msgid "     [Reserved]"
-msgstr "     [Зарезервировано]"
+msgid "  Personality routine: "
+msgstr "  Пер�онализационна� процедура: "
 
-#: readelf.c:6528
+#: readelf.c:6469
 #, c-format
-msgid "     finish"
-msgstr "     конец"
+msgid "  [Truncated data]\n"
+msgstr "  [Обрезанные данные]\n"
 
-#: readelf.c:6533 readelf.c:6619
+#: readelf.c:6484
 #, c-format
-msgid "[Spare]"
-msgstr "[Запа�]"
+msgid "  [reserved compact index %d]\n"
+msgstr "  [зарезервированный компактный индек� %d]\n"
 
-#: readelf.c:6640 readelf.c:6774
+#: readelf.c:6488
 #, c-format
-msgid "     [unsupported opcode]"
-msgstr "     [неподдерживаемый код операции]"
+msgid "  Compact model %d\n"
+msgstr "  Компактна� модель %d\n"
 
-#: readelf.c:6666
+#: readelf.c:6515
 #, c-format
 msgid "  0x%02x "
 msgstr "  0x%02x "
 
-#: readelf.c:6671
+#: readelf.c:6520
 #, c-format
-msgid "     sp = sp + %d"
-msgstr "     sp = sp + %d"
+msgid "     vsp = vsp + %d"
+msgstr "     vsp = vsp + %d"
 
-#: readelf.c:6724
+#: readelf.c:6525
 #, c-format
-msgid "pop frame {"
-msgstr "pop frame {"
+msgid "     vsp = vsp - %d"
+msgstr "     vsp = vsp - %d"
 
-#: readelf.c:6735
-msgid "[pad]"
-msgstr "[заполнитель]"
-
-#: readelf.c:6763
+#: readelf.c:6531
 #, c-format
-msgid "sp = sp + %ld"
-msgstr "sp = sp + %ld"
+msgid "Refuse to unwind"
+msgstr "Октаз от развёртывани�"
 
-#: readelf.c:6821
+#: readelf.c:6554
 #, c-format
-msgid "  Personality routine: "
-msgstr "  Пер�онализационна� процедура: "
+msgid "     [Reserved]"
+msgstr "     [Зарезервировано]"
 
-#: readelf.c:6839
+#: readelf.c:6556
 #, c-format
-msgid "  [Truncated data]\n"
-msgstr "  [Обрезанные данные]\n"
+msgid "     vsp = r%d"
+msgstr "     vsp = r%d"
 
-#: readelf.c:6854
+#: readelf.c:6581
 #, c-format
-msgid "  Compact model %d\n"
-msgstr "  Компактна� модель %d\n"
+msgid "     finish"
+msgstr "     конец"
 
-#: readelf.c:6890
+#: readelf.c:6586
 #, c-format
-msgid "  Restore stack from frame pointer\n"
-msgstr "  Во��тановление �тека из указател� фрейма\n"
+msgid "[Spare]"
+msgstr "[Запа�]"
 
-#: readelf.c:6892
+#: readelf.c:6620
 #, c-format
-msgid "  Stack increment %d\n"
-msgstr "  Увеличение �тека %d\n"
+msgid "vsp = vsp + %ld"
+msgstr "vsp = vsp + %ld"
 
-#: readelf.c:6893
+#: readelf.c:6627
 #, c-format
-msgid "  Registers restored: "
-msgstr "  Реги�тры во��тановлены: "
+msgid "[unsupported two-byte opcode]"
+msgstr "[неподдерживаемый двух байтный код операции]"
 
-#: readelf.c:6898
+#: readelf.c:6631
 #, c-format
-msgid "  Return register: %s\n"
-msgstr "  Возвращаемый реги�тр: %s\n"
+msgid "     [unsupported opcode]"
+msgstr "     [неподдерживаемый код операции]"
 
-#: readelf.c:6981
+#: readelf.c:6715
 #, c-format
 msgid "Could not locate .ARM.extab section containing 0x%lx.\n"
 msgstr "�е удало�ь обнаружить раздел .ARM.extab, �одержащий 0x%lx.\n"
 
-#: readelf.c:7050
+#: readelf.c:6768
 #, c-format
 msgid ""
 "\n"
@@ -6002,31 +5220,31 @@ msgstr ""
 "\n"
 "Таблица индек�ов «%s» развёртывани� �о �мещением 0x%lx �одержит %lu �лементов:\n"
 
-#: readelf.c:7102
+#: readelf.c:6819
 #, c-format
 msgid "NONE\n"
 msgstr "�ЕТ\n"
 
-#: readelf.c:7128
+#: readelf.c:6845
 #, c-format
 msgid "Interface Version: %s\n"
 msgstr "Вер�и� интерфей�а: %s\n"
 
-#: readelf.c:7130
+#: readelf.c:6847
 #, c-format
 msgid "<corrupt: %ld>\n"
 msgstr "<повреждён: %ld>\n"
 
-#: readelf.c:7143
+#: readelf.c:6860
 #, c-format
 msgid "Time Stamp: %s\n"
 msgstr "Врем�: %s\n"
 
-#: readelf.c:7320 readelf.c:7366
+#: readelf.c:7037 readelf.c:7083
 msgid "dynamic section"
 msgstr "динамиче�кий раздел"
 
-#: readelf.c:7444
+#: readelf.c:7161
 #, c-format
 msgid ""
 "\n"
@@ -6036,31 +5254,31 @@ msgstr ""
 "В �том файле нет динамиче�кого раздела.\n"
 
 #
-#: readelf.c:7482
+#: readelf.c:7199
 msgid "Unable to seek to end of file!\n"
 msgstr "�евозможно выполнить пои�к до конца файла!\n"
 
-#: readelf.c:7495
+#: readelf.c:7212
 msgid "Unable to determine the number of symbols to load\n"
 msgstr "�евозможно определить чи�ло загружаемых �имволов\n"
 
-#: readelf.c:7530
+#: readelf.c:7247
 msgid "Unable to seek to end of file\n"
 msgstr "�евозможно выполнить пои�к до конца файла\n"
 
-#: readelf.c:7537
+#: readelf.c:7254
 msgid "Unable to determine the length of the dynamic string table\n"
 msgstr "�евозможно определить длину таблицы динамиче�ких �трок\n"
 
-#: readelf.c:7543
+#: readelf.c:7260
 msgid "dynamic string table"
 msgstr "таблица динамиче�ких �трок"
 
-#: readelf.c:7580
+#: readelf.c:7297
 msgid "symbol information"
 msgstr "информаци� о �имволе"
 
-#: readelf.c:7605
+#: readelf.c:7322
 #, c-format
 msgid ""
 "\n"
@@ -6069,86 +5287,86 @@ msgstr ""
 "\n"
 "Динамиче�кий раздел �о �мещением 0x%lx �одержит %u �лементов:\n"
 
-#: readelf.c:7608
+#: readelf.c:7325
 #, c-format
 msgid "  Tag        Type                         Name/Value\n"
 msgstr "  Тег        Тип                          Им�/Знач\n"
 
-#: readelf.c:7644
+#: readelf.c:7361
 #, c-format
 msgid "Auxiliary library"
 msgstr "В�помогательна� библиотека"
 
-#: readelf.c:7648
+#: readelf.c:7365
 #, c-format
 msgid "Filter library"
 msgstr "Библиотека фильтров"
 
-#: readelf.c:7652
+#: readelf.c:7369
 #, c-format
 msgid "Configuration file"
 msgstr "Файл на�тройки"
 
-#: readelf.c:7656
+#: readelf.c:7373
 #, c-format
 msgid "Dependency audit library"
 msgstr "Библиотека аудита зави�имо�тей"
 
-#: readelf.c:7660
+#: readelf.c:7377
 #, c-format
 msgid "Audit library"
 msgstr "Библиотека аудита"
 
-#: readelf.c:7678 readelf.c:7706 readelf.c:7734
+#: readelf.c:7395 readelf.c:7423 readelf.c:7451
 #, c-format
 msgid "Flags:"
 msgstr "Флаги:"
 
-#: readelf.c:7681 readelf.c:7709 readelf.c:7736
+#: readelf.c:7398 readelf.c:7426 readelf.c:7453
 #, c-format
 msgid " None\n"
 msgstr " �ет\n"
 
-#: readelf.c:7857
+#: readelf.c:7574
 #, c-format
 msgid "Shared library: [%s]"
 msgstr "Совм. и�п. библиотека: [%s]"
 
-#: readelf.c:7860
+#: readelf.c:7577
 #, c-format
 msgid " program interpreter"
 msgstr " интерпретатор программы"
 
-#: readelf.c:7864
+#: readelf.c:7581
 #, c-format
 msgid "Library soname: [%s]"
 msgstr "Библиотека soname: [%s]"
 
-#: readelf.c:7868
+#: readelf.c:7585
 #, c-format
 msgid "Library rpath: [%s]"
 msgstr "Библиотека rpath: [%s]"
 
-#: readelf.c:7872
+#: readelf.c:7589
 #, c-format
 msgid "Library runpath: [%s]"
 msgstr "Библиотека runpath: [%s]"
 
-#: readelf.c:7905
+#: readelf.c:7622
 #, c-format
 msgid " (bytes)\n"
 msgstr " (байт)\n"
 
-#: readelf.c:7935
+#: readelf.c:7652
 #, c-format
 msgid "Not needed object: [%s]\n"
 msgstr "�енужный объект: [%s]\n"
 
-#: readelf.c:8035
+#: readelf.c:7752
 msgid "| <unknown>"
 msgstr "| <неизве�тный>"
 
-#: readelf.c:8068
+#: readelf.c:7785
 #, c-format
 msgid ""
 "\n"
@@ -6157,61 +5375,61 @@ msgstr ""
 "\n"
 "Раздел опи�ани� вер�ии '%s' �одержит %u �лементов:\n"
 
-#: readelf.c:8071
+#: readelf.c:7788
 #, c-format
 msgid "  Addr: 0x"
 msgstr "  �дре�: 0x"
 
-#: readelf.c:8073 readelf.c:8191 readelf.c:8332
+#: readelf.c:7790 readelf.c:7908 readelf.c:8046
 #, c-format
 msgid "  Offset: %#08lx  Link: %u (%s)\n"
 msgstr "  Смещение: %#08lx  С�ылка: %u (%s)\n"
 
-#: readelf.c:8081
+#: readelf.c:7798
 msgid "version definition section"
 msgstr "раздел опи�ани� вер�ии"
 
-#: readelf.c:8114
+#: readelf.c:7831
 #, c-format
 msgid "  %#06x: Rev: %d  Flags: %s"
 msgstr "  %#06x: Ревизи�: %d  Флаги: %s"
 
-#: readelf.c:8117
+#: readelf.c:7834
 #, c-format
 msgid "  Index: %d  Cnt: %d  "
 msgstr "  Индек�: %d  Счетчик: %d  "
 
-#: readelf.c:8133
+#: readelf.c:7850
 #, c-format
 msgid "Name: %s\n"
 msgstr "Им�: %s\n"
 
-#: readelf.c:8135
+#: readelf.c:7852
 #, c-format
 msgid "Name index: %ld\n"
 msgstr "Индек� имени: %ld\n"
 
-#: readelf.c:8157
+#: readelf.c:7874
 #, c-format
 msgid "  %#06x: Parent %d: %s\n"
 msgstr "  %#06x: Родитель %d: %s\n"
 
-#: readelf.c:8160
+#: readelf.c:7877
 #, c-format
 msgid "  %#06x: Parent %d, name index: %ld\n"
 msgstr "  %#06x: Родитель %d, индек� имени: %ld\n"
 
-#: readelf.c:8165
+#: readelf.c:7882
 #, c-format
 msgid "  Version def aux past end of section\n"
 msgstr "  Вер�и� def aux past end раздела\n"
 
-#: readelf.c:8171
+#: readelf.c:7888
 #, c-format
 msgid "  Version definition past end of section\n"
 msgstr "  Вер�и� definition past end раздела\n"
 
-#: readelf.c:8186
+#: readelf.c:7903
 #, c-format
 msgid ""
 "\n"
@@ -6220,65 +5438,65 @@ msgstr ""
 "\n"
 "Раздел зави�имо�тей вер�ии '%s', �одержащий %u �лементов:\n"
 
-#: readelf.c:8189
+#: readelf.c:7906
 #, c-format
 msgid " Addr: 0x"
 msgstr " �дре�: 0x"
 
-#: readelf.c:8200
+#: readelf.c:7917
 msgid "version need section"
 msgstr "раздел зави�имо�тей вер�ии"
 
-#: readelf.c:8228
+#: readelf.c:7945
 #, c-format
 msgid "  %#06x: Version: %d"
 msgstr "  %#06x: Вер�и�: %d"
 
-#: readelf.c:8231
+#: readelf.c:7948
 #, c-format
 msgid "  File: %s"
 msgstr "  Файл: %s"
 
-#: readelf.c:8233
+#: readelf.c:7950
 #, c-format
 msgid "  File: %lx"
 msgstr "  Файл: %lx"
 
-#: readelf.c:8235
+#: readelf.c:7952
 #, c-format
 msgid "  Cnt: %d\n"
 msgstr "  Счетчик: %d\n"
 
-#: readelf.c:8260
+#: readelf.c:7977
 #, c-format
 msgid "  %#06x:   Name: %s"
 msgstr "  %#06x:   Им�: %s"
 
-#: readelf.c:8263
+#: readelf.c:7980
 #, c-format
 msgid "  %#06x:   Name index: %lx"
 msgstr "  %#06x:   Индек� имени: %lx"
 
-#: readelf.c:8266
+#: readelf.c:7983
 #, c-format
 msgid "  Flags: %s  Version: %d\n"
 msgstr "  Флаги: %s  Вер�и�: %d\n"
 
-#: readelf.c:8278
+#: readelf.c:7995
 #, c-format
 msgid "  Version need aux past end of section\n"
 msgstr "  Вер�и� need aux past end раздела\n"
 
-#: readelf.c:8283
+#: readelf.c:8000
 #, c-format
 msgid "  Version need past end of section\n"
 msgstr "  Вер�и� need aux past end раздела\n"
 
-#: readelf.c:8320
+#: readelf.c:8037
 msgid "version string table"
 msgstr "таблица �трок вер�ии"
 
-#: readelf.c:8327
+#: readelf.c:8041
 #, c-format
 msgid ""
 "\n"
@@ -6287,48 +5505,48 @@ msgstr ""
 "\n"
 "Раздел �имволов вер�ии '%s' �одержит %d �лементов:\n"
 
-#: readelf.c:8330
+#: readelf.c:8044
 #, c-format
 msgid " Addr: "
 msgstr " �дре�: "
 
-#: readelf.c:8341
+#: readelf.c:8055
 msgid "version symbol data"
 msgstr "данные �имвола вер�ии"
 
-#: readelf.c:8369
+#: readelf.c:8082
 msgid "   0 (*local*)    "
 msgstr "   0 (*локальный*)    "
 
-#: readelf.c:8373
+#: readelf.c:8086
 msgid "   1 (*global*)   "
 msgstr "   1 (*глобальный*)   "
 
-#: readelf.c:8386
+#: readelf.c:8099
 msgid "invalid index into symbol array\n"
 msgstr "некорректный индек� в �имвольный ма��ив\n"
 
-#: readelf.c:8420 readelf.c:9199
+#: readelf.c:8133 readelf.c:8910
 msgid "version need"
 msgstr "зави�имо�ть вер�ии"
 
-#: readelf.c:8430
+#: readelf.c:8143
 msgid "version need aux (2)"
 msgstr "зави�имо�ть вер�ии aux (2)"
 
-#: readelf.c:8445 readelf.c:8500
+#: readelf.c:8158 readelf.c:8213
 msgid "*invalid*"
 msgstr "*неверно*"
 
-#: readelf.c:8475 readelf.c:9264
+#: readelf.c:8188 readelf.c:8975
 msgid "version def"
 msgstr "опи�ание вер�ии"
 
-#: readelf.c:8495 readelf.c:9279
+#: readelf.c:8208 readelf.c:8990
 msgid "version def aux"
 msgstr "опи�ание вер�ии aux"
 
-#: readelf.c:8529
+#: readelf.c:8242
 #, c-format
 msgid ""
 "\n"
@@ -6337,39 +5555,39 @@ msgstr ""
 "\n"
 "В �том файле не найдена информаци� о вер�ии.\n"
 
-#: readelf.c:8728
+#: readelf.c:8441
 #, c-format
 msgid "<other>: %x"
 msgstr "<другой>: %x"
 
-#: readelf.c:8789
+#: readelf.c:8500
 msgid "Unable to read in dynamic data\n"
 msgstr "�евозможно �читать динамиче�кие данные\n"
 
-#: readelf.c:8839
+#: readelf.c:8550
 #, c-format
 msgid " <corrupt: %14ld>"
 msgstr " <повреждён: %14ld>"
 
 #
-#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012
+#: readelf.c:8593 readelf.c:8645 readelf.c:8669 readelf.c:8699 readelf.c:8723
 msgid "Unable to seek to start of dynamic information\n"
 msgstr "�евозможно выполнить пои�к до начала динамиче�ких данных\n"
 
-#: readelf.c:8888 readelf.c:8940
+#: readelf.c:8599 readelf.c:8651
 msgid "Failed to read in number of buckets\n"
 msgstr "Сбой при �читывании чи�ла обла�тей пам�ти\n"
 
-#: readelf.c:8894
+#: readelf.c:8605
 msgid "Failed to read in number of chains\n"
 msgstr "Сбой при �читывании чи�ла цепочек\n"
 
 #
-#: readelf.c:8996
+#: readelf.c:8707
 msgid "Failed to determine last chain length\n"
 msgstr "�е удало�ь определить длину по�ледней цепочки\n"
 
-#: readelf.c:9040
+#: readelf.c:8751
 #, c-format
 msgid ""
 "\n"
@@ -6378,26 +5596,26 @@ msgstr ""
 "\n"
 "Таблица �имволов дл� изображени�:\n"
 
-#: readelf.c:9042 readelf.c:9060
+#: readelf.c:8753 readelf.c:8771
 #, c-format
 msgid "  Num Buc:    Value  Size   Type   Bind Vis      Ndx Name\n"
 msgstr "  Обла�ти:    Знач   Размер Тип    Св�з  Vis     Индек� имени\n"
 
-#: readelf.c:9044 readelf.c:9062
+#: readelf.c:8755 readelf.c:8773
 #, c-format
 msgid "  Num Buc:    Value          Size   Type   Bind Vis      Ndx Name\n"
 msgstr "  Обла�ти:    Знач           Размер Тип    Св�з Vis     Индек� имени\n"
 
-#: readelf.c:9058
+#: readelf.c:8769
 #, c-format
 msgid ""
 "\n"
 "Symbol table of `.gnu.hash' for image:\n"
 msgstr ""
 "\n"
-"Таблица �имволов «.gnu.hash» образа:\n"
+"Таблица �имволов .gnu.hash образа:\n"
 
-#: readelf.c:9101
+#: readelf.c:8812
 #, c-format
 msgid ""
 "\n"
@@ -6406,7 +5624,7 @@ msgstr ""
 "\n"
 "Таблица �имволов «%s» �одержит sh_entsize равно нулю!\n"
 
-#: readelf.c:9106
+#: readelf.c:8817
 #, c-format
 msgid ""
 "\n"
@@ -6415,30 +5633,30 @@ msgstr ""
 "\n"
 "Таблица �имволов «%s» �одержит %lu �лементов:\n"
 
-#: readelf.c:9111
+#: readelf.c:8822
 #, c-format
 msgid "   Num:    Value  Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Чи�:    Знач   Разм Тип     Св�з   Vis      Индек� имени\n"
 
-#: readelf.c:9113
+#: readelf.c:8824
 #, c-format
 msgid "   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"
 msgstr "   Чи�:    Знач           Разм Тип     Св�з   Vis      Индек� имени\n"
 
-#: readelf.c:9170
+#: readelf.c:8881
 msgid "version data"
 msgstr "данные вер�ии"
 
-#: readelf.c:9212
+#: readelf.c:8923
 msgid "version need aux (3)"
 msgstr "зави�имо�ть вер�ии aux (3)"
 
 #
-#: readelf.c:9239
+#: readelf.c:8950
 msgid "bad dynamic symbol\n"
 msgstr "неверный динамиче�кий �имвол\n"
 
-#: readelf.c:9303
+#: readelf.c:9014
 #, c-format
 msgid ""
 "\n"
@@ -6447,7 +5665,7 @@ msgstr ""
 "\n"
 "Информаци� динамиче�кого �имвола не до�тупна дл� отображени� �имволов.\n"
 
-#: readelf.c:9315
+#: readelf.c:9026
 #, c-format
 msgid ""
 "\n"
@@ -6456,21 +5674,21 @@ msgstr ""
 "\n"
 "Ги�тограмма дл� длины �пи�ка обла�тей пам�ти (в�его %lu обла�тей):\n"
 
-#: readelf.c:9317 readelf.c:9387
+#: readelf.c:9028 readelf.c:9098
 #, c-format
 msgid " Length  Number     %% of total  Coverage\n"
 msgstr " Длина Чи�ло        %% от в�его  Охват\n"
 
-#: readelf.c:9385
+#: readelf.c:9096
 #, c-format
 msgid ""
 "\n"
 "Histogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"
 msgstr ""
 "\n"
-"Ги�тограмма дл� длины �пи�ка обла�тей пам�ти «.gnu.hash» (в�его %lu обла�тей):\n"
+"Ги�тограмма дл� длины �пи�ка обла�тей пам�ти `.gnu.hash' (в�его %lu обла�тей):\n"
 
-#: readelf.c:9451
+#: readelf.c:9162
 #, c-format
 msgid ""
 "\n"
@@ -6479,41 +5697,41 @@ msgstr ""
 "\n"
 "Сегмент динамиче�кой информации �о �мещением 0x%lx �одержит %d �лементов:\n"
 
-#: readelf.c:9454
+#: readelf.c:9165
 #, c-format
 msgid " Num: Name                           BoundTo     Flags\n"
 msgstr " Чи�: Им�                            Граница     Флаги\n"
 
-#: readelf.c:9463
+#: readelf.c:9174
 #, c-format
 msgid "<corrupt: %19ld>"
 msgstr "<повреждён: %19ld>"
 
-#: readelf.c:9545
+#: readelf.c:9256
 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc"
 msgstr "Обнаружен необработанный перемещаемый тип MN10300 по�ле перемещени� SYM_DIFF"
 
-#: readelf.c:9705
+#: readelf.c:9416
 #, c-format
 msgid "Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"
 msgstr "От�ут�твуют данные по 32-битным перемещаемым типам в разделах DWARF машины � номером %d\n"
 
-#: readelf.c:10009
+#: readelf.c:9720
 #, c-format
 msgid "unable to apply unsupported reloc type %d to section %s\n"
 msgstr "не удало�ь применить неподдерживаемый перемещаемый тип %d к разделу %s\n"
 
-#: readelf.c:10017
+#: readelf.c:9728
 #, c-format
 msgid "skipping invalid relocation offset 0x%lx in section %s\n"
 msgstr "пропу�кает�� неверное �мещение перемещени� 0x%lx в разделе %s\n"
 
-#: readelf.c:10041
+#: readelf.c:9752
 #, c-format
 msgid "skipping unexpected symbol type %s in %ld'th relocation in section %s\n"
 msgstr "пропу�кает�� неожиданный тип �имвола %s в %ld-м перемещении в разделе %s\n"
 
-#: readelf.c:10087
+#: readelf.c:9798
 #, c-format
 msgid ""
 "\n"
@@ -6522,7 +5740,7 @@ msgstr ""
 "\n"
 "Сборочный дамп раздела %s\n"
 
-#: readelf.c:10108
+#: readelf.c:9819
 #, c-format
 msgid ""
 "\n"
@@ -6531,11 +5749,11 @@ msgstr ""
 "\n"
 "Раздел '%s' не �одержит данных дл� дампа.\n"
 
-#: readelf.c:10114
+#: readelf.c:9825
 msgid "section contents"
 msgstr "�одержимое раздела"
 
-#: readelf.c:10133
+#: readelf.c:9844
 #, c-format
 msgid ""
 "\n"
@@ -6544,17 +5762,17 @@ msgstr ""
 "\n"
 "Строковый дамп раздела '%s':\n"
 
-#: readelf.c:10151
+#: readelf.c:9862
 #, c-format
 msgid "  Note: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr "  Замечание: в �том разделе е�ть перемещени�, но они �Е были применены к �тому дампу.\n"
 
-#: readelf.c:10182
+#: readelf.c:9893
 #, c-format
 msgid "  No strings found in this section."
 msgstr "  В �том разделе не найдены �троки."
 
-#: readelf.c:10204
+#: readelf.c:9915
 #, c-format
 msgid ""
 "\n"
@@ -6563,17 +5781,17 @@ msgstr ""
 "\n"
 "Hex-дамп раздела '%s':\n"
 
-#: readelf.c:10228
+#: readelf.c:9939
 #, c-format
 msgid " NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"
 msgstr " ПРИМЕЧ��ИЕ: в �том разделе е�ть перемещени�, но они �Е были применены к �тому дампу.\n"
 
-#: readelf.c:10362
+#: readelf.c:10073
 #, c-format
 msgid "%s section data"
 msgstr "данные раздела %s"
 
-#: readelf.c:10427
+#: readelf.c:10138
 #, c-format
 msgid ""
 "\n"
@@ -6586,246 +5804,246 @@ msgstr ""
 #. which has the NOBITS type - the bits in the file will be random.
 #. This can happen when a file containing a .eh_frame section is
 #. stripped with the --only-keep-debug command line option.
-#: readelf.c:10436
+#: readelf.c:10147
 #, c-format
 msgid "section '%s' has the NOBITS type - its contents are unreliable.\n"
-msgstr "раздел «%s» имеет тип NOBITS — его �одержимое недо�товерно.\n"
+msgstr "раздел '%s' имеет тип NOBITS -- его �одержимое недо�товерно.\n"
 
-#: readelf.c:10472
+#: readelf.c:10183
 #, c-format
 msgid "Unrecognized debug section: %s\n"
 msgstr "�ера�познанный раздел отладки: %s\n"
 
-#: readelf.c:10500
+#: readelf.c:10211
 #, c-format
 msgid "Section '%s' was not dumped because it does not exist!\n"
 msgstr "Дл� раздела '%s' дамп не был выполнен, потому что он не �уще�твует!\n"
 
-#: readelf.c:10541
+#: readelf.c:10252
 #, c-format
 msgid "Section %d was not dumped because it does not exist!\n"
 msgstr "Дл� раздела %d дамп не был выполнен, потому что он не �уще�твует!\n"
 
-#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070
+#: readelf.c:10430 readelf.c:10444 readelf.c:10463 readelf.c:10781
 #, c-format
 msgid "None\n"
 msgstr "�ет\n"
 
-#: readelf.c:10720
+#: readelf.c:10431
 #, c-format
 msgid "Application\n"
 msgstr "Приложение\n"
 
-#: readelf.c:10721
+#: readelf.c:10432
 #, c-format
 msgid "Realtime\n"
 msgstr "В реальном времени\n"
 
-#: readelf.c:10722
+#: readelf.c:10433
 #, c-format
 msgid "Microcontroller\n"
 msgstr "Микроконтроллер\n"
 
-#: readelf.c:10723
+#: readelf.c:10434
 #, c-format
 msgid "Application or Realtime\n"
 msgstr "Приложение или в реальном времени\n"
 
-#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142
-#: readelf.c:11217 readelf.c:11238
+#: readelf.c:10445 readelf.c:10465 readelf.c:10835 readelf.c:10853
+#: readelf.c:10928 readelf.c:10949
 #, c-format
 msgid "8-byte\n"
 msgstr "8-байтовый\n"
 
-#: readelf.c:10735 readelf.c:11220 readelf.c:11241
+#: readelf.c:10446 readelf.c:10931 readelf.c:10952
 #, c-format
 msgid "4-byte\n"
 msgstr "4-байтовый\n"
 
-#: readelf.c:10739 readelf.c:10758
+#: readelf.c:10450 readelf.c:10469
 #, c-format
 msgid "8-byte and up to %d-byte extended\n"
 msgstr "8-байтовый и ра�шир�емый до %d байт\n"
 
-#: readelf.c:10753
+#: readelf.c:10464
 #, c-format
 msgid "8-byte, except leaf SP\n"
 msgstr "8-байтовый, за и�ключением ответвлени� SP\n"
 
-#: readelf.c:10769 readelf.c:10859 readelf.c:11256
+#: readelf.c:10480 readelf.c:10570 readelf.c:10967
 #, c-format
 msgid "flag = %d, vendor = %s\n"
 msgstr "флаг = %d, производитель = %s\n"
 
-#: readelf.c:10775
+#: readelf.c:10486
 #, c-format
 msgid "True\n"
 msgstr "Верно\n"
 
-#: readelf.c:10904 readelf.c:11008
+#: readelf.c:10615 readelf.c:10719
 #, c-format
 msgid "Hard or soft float\n"
 msgstr "�ппаратна� или программна� плавающа� точка\n"
 
-#: readelf.c:10907
+#: readelf.c:10618
 #, c-format
 msgid "Hard float\n"
 msgstr "�ппаратна� плавающа� точка\n"
 
-#: readelf.c:10910 readelf.c:11017
+#: readelf.c:10621 readelf.c:10728
 #, c-format
 msgid "Soft float\n"
 msgstr "Программна� плавающа� точка\n"
 
-#: readelf.c:10913
+#: readelf.c:10624
 #, c-format
 msgid "Single-precision hard float\n"
 msgstr "�ппаратна� плавающа� точка одинарной точно�ти\n"
 
-#: readelf.c:10930 readelf.c:10956
+#: readelf.c:10641 readelf.c:10667
 #, c-format
 msgid "Any\n"
 msgstr "Любой\n"
 
-#: readelf.c:10933
+#: readelf.c:10644
 #, c-format
 msgid "Generic\n"
 msgstr "Общий\n"
 
-#: readelf.c:10962
+#: readelf.c:10673
 #, c-format
 msgid "Memory\n"
 msgstr "Пам�ть\n"
 
-#: readelf.c:11011
+#: readelf.c:10722
 #, c-format
 msgid "Hard float (double precision)\n"
 msgstr "�ппаратна� плавающа� точка (двойна� точно�ть)\n"
 
-#: readelf.c:11014
+#: readelf.c:10725
 #, c-format
 msgid "Hard float (single precision)\n"
 msgstr "�ппаратна� плавающа� точка (одинарна� точно�ть)\n"
 
-#: readelf.c:11020
+#: readelf.c:10731
 #, c-format
 msgid "Hard float (MIPS32r2 64-bit FPU)\n"
 msgstr "�ппаратна� плавающа� точка (64-битный �опроце��ор MIPS32r2)\n"
 
-#: readelf.c:11103
+#: readelf.c:10814
 #, c-format
 msgid "Not used\n"
 msgstr "�е и�пользует��\n"
 
-#: readelf.c:11106
+#: readelf.c:10817
 #, c-format
 msgid "2 bytes\n"
 msgstr "2 байта\n"
 
-#: readelf.c:11109
+#: readelf.c:10820
 #, c-format
 msgid "4 bytes\n"
 msgstr "4 байта\n"
 
-#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244
+#: readelf.c:10838 readelf.c:10856 readelf.c:10934 readelf.c:10955
 #, c-format
 msgid "16-byte\n"
 msgstr "16-байтовый\n"
 
-#: readelf.c:11160
+#: readelf.c:10871
 #, c-format
 msgid "DSBT addressing not used\n"
 msgstr "�дре�аци� DSBT не и�пользует��\n"
 
-#: readelf.c:11163
+#: readelf.c:10874
 #, c-format
 msgid "DSBT addressing used\n"
 msgstr "И�пользует�� адре�аци� DSBT\n"
 
-#: readelf.c:11178
+#: readelf.c:10889
 #, c-format
 msgid "Data addressing position-dependent\n"
 msgstr "�дре�аци� данных зави�ит от положени�\n"
 
-#: readelf.c:11181
+#: readelf.c:10892
 #, c-format
 msgid "Data addressing position-independent, GOT near DP\n"
 msgstr "�дре�аци� данных не зави�ит от положени�, GOT р�дом � DP\n"
 
-#: readelf.c:11184
+#: readelf.c:10895
 #, c-format
 msgid "Data addressing position-independent, GOT far from DP\n"
 msgstr "�дре�аци� данных не зави�ит от положени�, GOT далеко от DP\n"
 
-#: readelf.c:11199
+#: readelf.c:10910
 #, c-format
 msgid "Code addressing position-dependent\n"
 msgstr "�дре�аци� кода зави�ит от положени�\n"
 
-#: readelf.c:11202
+#: readelf.c:10913
 #, c-format
 msgid "Code addressing position-independent\n"
 msgstr "�дре�аци� кода не зави�ит от положени�\n"
 
-#: readelf.c:11308
+#: readelf.c:11019
 msgid "attributes"
 msgstr "атрибуты"
 
-#: readelf.c:11329
+#: readelf.c:11040
 #, c-format
 msgid "ERROR: Bad section length (%d > %d)\n"
 msgstr "ОШИБК�: �еверна� длина раздела (%d > %d)\n"
 
-#: readelf.c:11335
+#: readelf.c:11046
 #, c-format
 msgid "Attribute Section: %s\n"
 msgstr "Раздел атрибутов: %s\n"
 
-#: readelf.c:11360
+#: readelf.c:11071
 #, c-format
 msgid "ERROR: Bad subsection length (%d > %d)\n"
 msgstr "ОШИБК�: �еверна� длина подраздела (%d > %d)\n"
 
-#: readelf.c:11372
+#: readelf.c:11083
 #, c-format
 msgid "File Attributes\n"
 msgstr "�трибуты файлов\n"
 
-#: readelf.c:11375
+#: readelf.c:11086
 #, c-format
 msgid "Section Attributes:"
 msgstr "�трибуты раздела:"
 
-#: readelf.c:11378
+#: readelf.c:11089
 #, c-format
 msgid "Symbol Attributes:"
 msgstr "�трибуты �имвола:"
 
-#: readelf.c:11393
+#: readelf.c:11104
 #, c-format
 msgid "Unknown tag: %d\n"
-msgstr "�еизве�тный тег: %d\n"
+msgstr "�еизве�тна� метка: %d\n"
 
 #. ??? Do something sensible, like dump hex.
-#: readelf.c:11412
+#: readelf.c:11123
 #, c-format
 msgid "  Unknown section contexts\n"
 msgstr "  �еизве�тные контек�ты раздела\n"
 
-#: readelf.c:11419
+#: readelf.c:11130
 #, c-format
 msgid "Unknown format '%c'\n"
 msgstr "�еизве�тный формат «%c»\n"
 
-#: readelf.c:11463 readelf.c:11485
+#: readelf.c:11174 readelf.c:11196
 msgid "<unknown>"
 msgstr "<неизве�тный>"
 
-#: readelf.c:11580 readelf.c:12102
+#: readelf.c:11291 readelf.c:11813
 msgid "liblist"
 msgstr "liblist"
 
-#: readelf.c:11583
+#: readelf.c:11294
 #, c-format
 msgid ""
 "\n"
@@ -6834,24 +6052,24 @@ msgstr ""
 "\n"
 "Раздел «.liblist» �одержит %lu �лементов:\n"
 
-#: readelf.c:11585
+#: readelf.c:11296
 msgid "     Library              Time Stamp          Checksum   Version Flags\n"
 msgstr "     Библиотека           Врем�               Конт.�умма Вер�и�  Флаги\n"
 
-#: readelf.c:11611
+#: readelf.c:11322
 #, c-format
 msgid "<corrupt: %9ld>"
 msgstr "<повреждён: %9ld>"
 
-#: readelf.c:11616
+#: readelf.c:11327
 msgid " NONE"
 msgstr " �ЕТ"
 
-#: readelf.c:11667
+#: readelf.c:11378
 msgid "options"
 msgstr "параметры"
 
-#: readelf.c:11698
+#: readelf.c:11409
 #, c-format
 msgid ""
 "\n"
@@ -6861,15 +6079,15 @@ msgstr ""
 "Раздел '%s' �одержит %d �лементов:\n"
 
 #
-#: readelf.c:11859
+#: readelf.c:11570
 msgid "conflict list found without a dynamic symbol table\n"
 msgstr "�пи�ок конфликтов найден без таблицы динамиче�ких �имволов\n"
 
-#: readelf.c:11876 readelf.c:11891
+#: readelf.c:11587 readelf.c:11602
 msgid "conflict"
 msgstr "конфликт"
 
-#: readelf.c:11901
+#: readelf.c:11612
 #, c-format
 msgid ""
 "\n"
@@ -6878,20 +6096,20 @@ msgstr ""
 "\n"
 "Раздел '.conflict' �одержит %lu �лементов:\n"
 
-#: readelf.c:11903
+#: readelf.c:11614
 msgid "  Num:    Index       Value  Name"
 msgstr "  �ом:    Индек�      Знач.  Им�"
 
-#: readelf.c:11915 readelf.c:11995 readelf.c:12063
+#: readelf.c:11626 readelf.c:11706 readelf.c:11774
 #, c-format
 msgid "<corrupt: %14ld>"
 msgstr "<повреждён: %14ld>"
 
-#: readelf.c:11936
+#: readelf.c:11647
 msgid "GOT"
 msgstr "GOT"
 
-#: readelf.c:11937
+#: readelf.c:11648
 #, c-format
 msgid ""
 "\n"
@@ -6900,76 +6118,86 @@ msgstr ""
 "\n"
 "Первична� GOT:\n"
 
-#: readelf.c:11938
+#: readelf.c:11649
 #, c-format
 msgid " Canonical gp value: "
 msgstr " Канониче�кое значение gp: "
 
-#: readelf.c:11942 readelf.c:12034
+#: readelf.c:11653 readelf.c:11745
 #, c-format
 msgid " Reserved entries:\n"
 msgstr " Зарезервированные �лементы:\n"
 
-#: readelf.c:11943
+#: readelf.c:11654
 #, c-format
 msgid "  %*s %10s %*s Purpose\n"
 msgstr "  %*s %10s %*s Цель\n"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036
-#: readelf.c:12045
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688 readelf.c:11747
+#: readelf.c:11756
 msgid "Address"
 msgstr "�дре�"
 
-#: readelf.c:11944 readelf.c:11961 readelf.c:11977
+#: readelf.c:11655 readelf.c:11672 readelf.c:11688
 msgid "Access"
 msgstr "До�туп"
 
-#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036
-#: readelf.c:12046
+#: readelf.c:11656 readelf.c:11673 readelf.c:11689 readelf.c:11747
+#: readelf.c:11757
 msgid "Initial"
 msgstr "�ачальный"
 
-#: readelf.c:11947
+#: readelf.c:11658
 #, c-format
 msgid " Lazy resolver\n"
 msgstr " Откладывающий решатель\n"
 
-#: readelf.c:11953
+#: readelf.c:11664
 #, c-format
 msgid " Module pointer (GNU extension)\n"
 msgstr " Модульный указатель (ра�ширение GNU)\n"
 
-#: readelf.c:11959
+#: readelf.c:11670
 #, c-format
 msgid " Local entries:\n"
 msgstr " Локальные �лементы:\n"
 
-#: readelf.c:11975
+#: readelf.c:11671
+#, c-format
+msgid "  %*s %10s %*s\n"
+msgstr "  %*s %10s %*s\n"
+
+#: readelf.c:11686
 #, c-format
 msgid " Global entries:\n"
 msgstr " Глобальные �лементы:\n"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11687
+#, c-format
+msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11690 readelf.c:11758
 msgid "Sym.Val."
 msgstr "Сим.Знач."
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Type"
 msgstr "Тип"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Ndx"
 msgstr "Ndx"
 
-#: readelf.c:11979 readelf.c:12047
+#: readelf.c:11690 readelf.c:11758
 msgid "Name"
 msgstr "Им�"
 
-#: readelf.c:12032
+#: readelf.c:11743
 msgid "PLT GOT"
 msgstr "PLT GOT"
 
-#: readelf.c:12033
+#: readelf.c:11744
 #, c-format
 msgid ""
 "\n"
@@ -6980,31 +6208,36 @@ msgstr ""
 "PLT GOT:\n"
 "\n"
 
-#: readelf.c:12035
+#: readelf.c:11746
 #, c-format
 msgid "  %*s %*s Purpose\n"
 msgstr "  %*s %*s Цель\n"
 
-#: readelf.c:12038
+#: readelf.c:11749
 #, c-format
 msgid " PLT lazy resolver\n"
 msgstr " откладывающий решатель PLT\n"
 
-#: readelf.c:12040
+#: readelf.c:11751
 #, c-format
 msgid " Module pointer\n"
 msgstr " Модульный указатель\n"
 
-#: readelf.c:12043
+#: readelf.c:11754
 #, c-format
 msgid " Entries:\n"
 msgstr " Элементы:\n"
 
-#: readelf.c:12110
+#: readelf.c:11755
+#, c-format
+msgid "  %*s %*s %*s %-7s %3s %s\n"
+msgstr "  %*s %*s %*s %-7s %3s %s\n"
+
+#: readelf.c:11821
 msgid "liblist string table"
 msgstr "таблица �трок liblist"
 
-#: readelf.c:12121
+#: readelf.c:11831
 #, c-format
 msgid ""
 "\n"
@@ -7013,344 +6246,146 @@ msgstr ""
 "\n"
 "Раздел �пи�ка библиотек '%s' �одержит %lu �лементов:\n"
 
-#: readelf.c:12125
+#: readelf.c:11835
 msgid "     Library              Time Stamp          Checksum   Version Flags"
 msgstr "     Библиотека           Врем�               Конт.�умма Вер�и�  Флаги"
 
-#: readelf.c:12175
+#: readelf.c:11884
 msgid "NT_AUXV (auxiliary vector)"
 msgstr "NT_AUXV (в�помогательный вектор)"
 
-#: readelf.c:12177
+#: readelf.c:11886
 msgid "NT_PRSTATUS (prstatus structure)"
 msgstr "NT_PRSTATUS (�труктура prstatus)"
 
-#: readelf.c:12179
+#: readelf.c:11888
 msgid "NT_FPREGSET (floating point registers)"
 msgstr "NT_FPREGSET (реги�тры � плавающей точкой)"
 
-#: readelf.c:12181
+#: readelf.c:11890
 msgid "NT_PRPSINFO (prpsinfo structure)"
 msgstr "NT_PRPSINFO (�труктура prpsinfo)"
 
-#: readelf.c:12183
+#: readelf.c:11892
 msgid "NT_TASKSTRUCT (task structure)"
 msgstr "NT_TASKSTRUCT (�труктура task)"
 
-#: readelf.c:12185
+#: readelf.c:11894
 msgid "NT_PRXFPREG (user_xfpregs structure)"
 msgstr "NT_PRXFPREG (�труктура user_xfpregs)"
 
-#: readelf.c:12187
+#: readelf.c:11896
 msgid "NT_PPC_VMX (ppc Altivec registers)"
 msgstr "NT_PPC_VMX (реги�тры Altivec в ppc)"
 
-#: readelf.c:12189
+#: readelf.c:11898
 msgid "NT_PPC_VSX (ppc VSX registers)"
 msgstr "NT_PPC_VSX (реги�тры VSX в ppc)"
 
-#: readelf.c:12191
+#: readelf.c:11900
 msgid "NT_X86_XSTATE (x86 XSAVE extended state)"
 msgstr "NT_X86_XSTATE (ра�ширенное �о�то�ние x86 XSAVE)"
 
-#: readelf.c:12193
+#: readelf.c:11902
 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)"
 msgstr "NT_S390_HIGH_GPRS (верхние половинки реги�тров s390)"
 
-#: readelf.c:12195
+#: readelf.c:11904
 msgid "NT_S390_TIMER (s390 timer register)"
 msgstr "NT_S390_TIMER (реги�тр таймера s390)"
 
-#: readelf.c:12197
+#: readelf.c:11906
 msgid "NT_S390_TODCMP (s390 TOD comparator register)"
 msgstr "NT_S390_TODCMP (реги�тр �равнивател� s390 TOD)"
 
-#: readelf.c:12199
+#: readelf.c:11908
 msgid "NT_S390_TODPREG (s390 TOD programmable register)"
 msgstr "NT_S390_TODPREG (программируемый реги�тр s390 TOD)"
 
-#: readelf.c:12201
+#: readelf.c:11910
 msgid "NT_S390_CTRS (s390 control registers)"
 msgstr "NT_S390_CTRS (управл�ющие реги�тры s390)"
 
-#: readelf.c:12203
+#: readelf.c:11912
 msgid "NT_S390_PREFIX (s390 prefix register)"
 msgstr "NT_S390_PREFIX (реги�тр префик�а s390)"
 
-#: readelf.c:12205
+#: readelf.c:11914
 msgid "NT_PSTATUS (pstatus structure)"
 msgstr "NT_PSTATUS (�труктура pstatus)"
 
-#: readelf.c:12207
+#: readelf.c:11916
 msgid "NT_FPREGS (floating point registers)"
 msgstr "NT_FPREGS (реги�тры � плавающей точкой)"
 
-#: readelf.c:12209
+#: readelf.c:11918
 msgid "NT_PSINFO (psinfo structure)"
 msgstr "NT_PSINFO (�труктура psinfo)"
 
-#: readelf.c:12211
+#: readelf.c:11920
 msgid "NT_LWPSTATUS (lwpstatus_t structure)"
 msgstr "NT_LWPSTATUS (�труктура lwpstatus_t)"
 
-#: readelf.c:12213
+#: readelf.c:11922
 msgid "NT_LWPSINFO (lwpsinfo_t structure)"
 msgstr "NT_LWPSINFO (�труктура lwpsinfo_t)"
 
-#: readelf.c:12215
+#: readelf.c:11924
 msgid "NT_WIN32PSTATUS (win32_pstatus structure)"
 msgstr "NT_WIN32PSTATUS (�труктура win32_pstatus)"
 
-#: readelf.c:12223
+#: readelf.c:11932
 msgid "NT_VERSION (version)"
 msgstr "NT_VERSION (вер�и�)"
 
-#: readelf.c:12225
+#: readelf.c:11934
 msgid "NT_ARCH (architecture)"
 msgstr "NT_ARCH (архитектура)"
 
-#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390
-#: readelf.c:12467
+#: readelf.c:11939 readelf.c:11962 readelf.c:11984
 #, c-format
 msgid "Unknown note type: (0x%08x)"
 msgstr "�еизве�тный тип комментари�: (0x%08x)"
 
-#: readelf.c:12242
+#: readelf.c:11951
 msgid "NT_GNU_ABI_TAG (ABI version tag)"
 msgstr "NT_GNU_ABI_TAG (метка вер�ии ABI)"
 
-#: readelf.c:12244
+#: readelf.c:11953
 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"
 msgstr "NT_GNU_HWCAP (задаваема� DSO информаци� HWCAP о ПО)"
 
-#: readelf.c:12246
+#: readelf.c:11955
 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)"
 msgstr "NT_GNU_BUILD_ID (уникальный ID битовой �троки �борки)"
 
-#: readelf.c:12248
+#: readelf.c:11957
 msgid "NT_GNU_GOLD_VERSION (gold version)"
 msgstr "NT_GNU_GOLD_VERSION (вер�и� gold)"
 
-#: readelf.c:12266
-#, c-format
-msgid "    Build ID: "
-msgstr "    ID �борки: "
-
-#: readelf.c:12269 readelf.c:12425
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: readelf.c:12305
-#, c-format
-msgid "    OS: %s, ABI: %ld.%ld.%ld\n"
-msgstr "    ОС: %s, ABI: %ld.%ld.%ld\n"
-
 #. NetBSD core "procinfo" structure.
-#: readelf.c:12322
+#: readelf.c:11974
 msgid "NetBSD procinfo structure"
 msgstr "Структура procinfo NetBSD"
 
-#: readelf.c:12349 readelf.c:12363
+#: readelf.c:12001 readelf.c:12015
 msgid "PT_GETREGS (reg structure)"
 msgstr "PT_GETREGS (�труктура reg)"
 
-#: readelf.c:12351 readelf.c:12365
+#: readelf.c:12003 readelf.c:12017
 msgid "PT_GETFPREGS (fpreg structure)"
 msgstr "PT_GETFPREGS (�труктура fpreg)"
 
-#: readelf.c:12371
+#: readelf.c:12023
 #, c-format
 msgid "PT_FIRSTMACH+%d"
 msgstr "PT_FIRSTMACH+%d"
 
-#: readelf.c:12384
-msgid "NT_STAPSDT (SystemTap probe descriptors)"
-msgstr "NT_STAPSDT (де�крипторы те�тов SystemTap)"
-
-#: readelf.c:12417
-#, c-format
-msgid "    Provider: %s\n"
-msgstr "    По�тавщик: %s\n"
-
-#: readelf.c:12418
-#, c-format
-msgid "    Name: %s\n"
-msgstr "    Им�: %s\n"
-
-#: readelf.c:12419
-#, c-format
-msgid "    Location: "
-msgstr "    Ра�положение: "
-
-#: readelf.c:12421
-#, c-format
-msgid ", Base: "
-msgstr ", О�нование: "
-
-#: readelf.c:12423
-#, c-format
-msgid ", Semaphore: "
-msgstr ", Семафор: "
-
-#: readelf.c:12426
-#, c-format
-msgid "    Arguments: %s\n"
-msgstr "    �ргументы: %s\n"
-
-#: readelf.c:12439
-msgid "NT_VMS_MHD (module header)"
-msgstr "NT_VMS_MHD (заголовок модул�)"
-
-#: readelf.c:12441
-msgid "NT_VMS_LNM (language name)"
-msgstr "NT_VMS_LNM (название �зыка)"
-
-#: readelf.c:12443
-msgid "NT_VMS_SRC (source files)"
-msgstr "NT_VMS_SRC (и�ходные файлы)"
-
-#: readelf.c:12445
-msgid "NT_VMS_TITLE"
-msgstr "NT_VMS_TITLE"
-
-#: readelf.c:12447
-msgid "NT_VMS_EIDC (consistency check)"
-msgstr "NT_VMS_EIDC (проверка цело�тно�ти)"
-
-#: readelf.c:12449
-msgid "NT_VMS_FPMODE (FP mode)"
-msgstr "NT_VMS_FPMODE (режим FP)"
-
-#: readelf.c:12451
-msgid "NT_VMS_LINKTIME"
-msgstr "NT_VMS_LINKTIME"
-
-#: readelf.c:12453
-msgid "NT_VMS_IMGNAM (image name)"
-msgstr "NT_VMS_IMGNAM (им� образа)"
-
-#: readelf.c:12455
-msgid "NT_VMS_IMGID (image id)"
-msgstr "NT_VMS_IMGID (id образа)"
-
-#: readelf.c:12457
-msgid "NT_VMS_LINKID (link id)"
-msgstr "NT_VMS_LINKID (id компоновки)"
-
-#: readelf.c:12459
-msgid "NT_VMS_IMGBID (build id)"
-msgstr "NT_VMS_IMGBID (id �борки)"
-
-#: readelf.c:12461
-msgid "NT_VMS_GSTNAM (sym table name)"
-msgstr "NT_VMS_GSTNAM (им� таблицы �имволов)"
-
-#: readelf.c:12463
-msgid "NT_VMS_ORIG_DYN"
-msgstr "NT_VMS_ORIG_DYN"
-
-#: readelf.c:12465
-msgid "NT_VMS_PATCHTIME"
-msgstr "NT_VMS_PATCHTIME"
-
-#: readelf.c:12481
-#, c-format
-msgid "    Creation date  : %.17s\n"
-msgstr "    Дата �оздани�  : %.17s\n"
-
-#: readelf.c:12482
-#, c-format
-msgid "    Last patch date: %.17s\n"
-msgstr "    Дата по�л. зап.: %.17s\n"
-
-#: readelf.c:12483
-#, c-format
-msgid "    Module name    : %s\n"
-msgstr "    Им� модул�    :  %s\n"
-
-#: readelf.c:12484
-#, c-format
-msgid "    Module version : %s\n"
-msgstr "    Вер�и� модул� :  %s\n"
-
-#: readelf.c:12487
-#, c-format
-msgid "    Invalid size\n"
-msgstr "    �еверный размер\n"
-
-#: readelf.c:12490
-#, c-format
-msgid "   Language: %s\n"
-msgstr "   Язык:     %s\n"
-
-#: readelf.c:12494
-msgid "   FP mode: 0x%016"
-msgstr "   Реж. FP: 0x%016"
-
-#: readelf.c:12498
-#, c-format
-msgid "   Link time: "
-msgstr "   Врем� компоновки: "
-
-#: readelf.c:12504
-#, c-format
-msgid "   Patch time: "
-msgstr "   Врем� заплаты: "
-
-#: readelf.c:12510
-#, c-format
-msgid "   Major id: %u,  minor id: %u\n"
-msgstr "   О�новной id: %u, в�помогательный id: %u\n"
-
-#: readelf.c:12513
-#, c-format
-msgid "   Manip date  : "
-msgstr "   Дата измен. : "
-
-#: readelf.c:12516
-msgid ""
-"\n"
-"   Link flags  : 0x%016"
-msgstr ""
-"\n"
-"   Флаги компоновки  : 0x%016"
-
-#: readelf.c:12519
-#, c-format
-msgid "   Header flags: 0x%08x\n"
-msgstr "   Флаги заголовка: 0x%08x\n"
-
-#: readelf.c:12521
-#, c-format
-msgid "   Image id    : %s\n"
-msgstr "   id образа   : %s\n"
-
-#: readelf.c:12525
-#, c-format
-msgid "    Image name: %s\n"
-msgstr "    Им� образа: %s\n"
-
-#: readelf.c:12528
-#, c-format
-msgid "    Global symbol table name: %s\n"
-msgstr "    Им� глобальной таблицы �имволов: %s\n"
-
-#: readelf.c:12531
-#, c-format
-msgid "    Image id: %s\n"
-msgstr "    id образа: %s\n"
-
-#: readelf.c:12534
-#, c-format
-msgid "    Linker id: %s\n"
-msgstr "    id компоновщика: %s\n"
-
-#: readelf.c:12609
+#: readelf.c:12080
 msgid "notes"
 msgstr "комментарии"
 
-#: readelf.c:12615
+#: readelf.c:12086
 #, c-format
 msgid ""
 "\n"
@@ -7359,35 +6394,27 @@ msgstr ""
 "\n"
 "Комментарии �о �мещением 0x%08lx длиной 0x%08lx:\n"
 
-#: readelf.c:12617
+#: readelf.c:12088
 #, c-format
-msgid "  %-20s %10s\tDescription\n"
-msgstr "  %-20s %10s\tОпи�ание\n"
+msgid "  Owner\t\tData size\tDescription\n"
+msgstr "  Владелец\t\tРазмер данных\tОпи�ание\n"
 
-#: readelf.c:12617
-msgid "Owner"
-msgstr "Владелец"
-
-#: readelf.c:12617
-msgid "Data size"
-msgstr "Размер данных"
-
-#: readelf.c:12655 readelf.c:12668
+#: readelf.c:12108 readelf.c:12121
 #, c-format
 msgid "corrupt note found at offset %lx into core notes\n"
 msgstr "найден повреждённый комментарий �о �мещением %lx в хранилище комментариев\n"
 
-#: readelf.c:12657 readelf.c:12670
+#: readelf.c:12110 readelf.c:12123
 #, c-format
 msgid " type: %lx, namesize: %08lx, descsize: %08lx\n"
 msgstr " тип: %lx, разм_имени: %08lx, разм_опи�: %08lx\n"
 
-#: readelf.c:12766
+#: readelf.c:12219
 #, c-format
 msgid "No note segments present in the core file.\n"
 msgstr "В файле �одержимого от�ут�твуют �егменты комментариев.\n"
 
-#: readelf.c:12853
+#: readelf.c:12306
 msgid ""
 "This instance of readelf has been built without support for a\n"
 "64 bit data type and so it cannot read 64 bit ELF files.\n"
@@ -7395,12 +6422,12 @@ msgstr ""
 "Эта вер�и� readelf была �обрана без поддержки 64-битного типа\n"
 "данных, и по�тому она не может читать 64-битные файлы ELF.\n"
 
-#: readelf.c:12900
+#: readelf.c:12353
 #, c-format
 msgid "%s: Failed to read file header\n"
 msgstr "%s: Сбой при чтении заголовка файла\n"
 
-#: readelf.c:12914
+#: readelf.c:12366
 #, c-format
 msgid ""
 "\n"
@@ -7409,47 +6436,90 @@ msgstr ""
 "\n"
 "Файл: %s\n"
 
-#: readelf.c:13086
+#: readelf.c:12615
+#, c-format
+msgid "%s: the archive index is empty\n"
+msgstr "%s: пу�той индек� архива\n"
+
+#: readelf.c:12623 readelf.c:12647
+#, c-format
+msgid "%s: failed to read archive index\n"
+msgstr "%s: �бой при чтении заголовка архива\n"
+
+#: readelf.c:12632
+#, c-format
+msgid "%s: the archive index is supposed to have %ld entries, but the size in the header is too small\n"
+msgstr "%s: предполагало�ь, что индек� архива будет иметь %ld �лементов, но дл� �того указан �лишком маленький размер в заголовке\n"
+
+#: readelf.c:12640
+msgid "Out of memory whilst trying to read archive symbol index\n"
+msgstr "�е хватает пам�ти дл� чтени� индек�а �имволов архива\n"
+
+#: readelf.c:12658
+msgid "Out of memory whilst trying to convert the archive symbol index\n"
+msgstr "�е хватает пам�ти дл� преобразовани� индек�а �имволов архива\n"
+
+#: readelf.c:12670
+#, c-format
+msgid "%s: the archive has an index but no symbols\n"
+msgstr "%s: в архиве е�ть индек�, но нет �имволов\n"
+
+#
+#: readelf.c:12677
+msgid "Out of memory whilst trying to read archive index symbol table\n"
+msgstr "�е хватает пам�ти дл� чтени� индек�а таблицы �имволов архива.\n"
+
+#: readelf.c:12683
+#, c-format
+msgid "%s: failed to read archive index symbol table\n"
+msgstr "%s: �бой при чтении таблицы �имволов архива\n"
+
+#: readelf.c:12707
+#, c-format
+msgid "%s has no archive index\n"
+msgstr "%s: от�ут�твует индек� архива\n"
+
+#: readelf.c:12943
 #, c-format
 msgid "%s: unable to dump the index as none was found\n"
 msgstr "%s: не удало�ь �оздать дамп индек�а, так как он не был найден\n"
 
-#: readelf.c:13092
+#: readelf.c:12949
 #, c-format
 msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"
 msgstr "Индек� архива %s: (%ld �лементов, 0x%lx байт в таблице �имволов)\n"
 
-#: readelf.c:13110
+#: readelf.c:12967
 #, c-format
 msgid "Binary %s contains:\n"
 msgstr "Двоичный %s �одержит:\n"
 
-#: readelf.c:13118
+#: readelf.c:12975
 #, c-format
 msgid "%s: end of the symbol table reached before the end of the index\n"
 msgstr "%s: до�тигнут конец таблицы �имволов раньше окончани� индек�а\n"
 
-#: readelf.c:13129
+#: readelf.c:12986
 #, c-format
 msgid "%s: symbols remain in the index symbol table, but without corresponding entries in the index table\n"
 msgstr "%s: в индек�е таблицы �имволов о�тали�ь �имволы, у которых нет �оответ�твующих �лементов в таблице индек�ов\n"
 
-#: readelf.c:13134
+#: readelf.c:12991
 #, c-format
 msgid "%s: failed to seek back to start of object files in the archive\n"
 msgstr "%s: не удало�ь перейти обратно в начало объектных файлов в архиве\n"
 
-#: readelf.c:13217 readelf.c:13300
+#: readelf.c:13074 readelf.c:13150
 #, c-format
 msgid "Input file '%s' is not readable.\n"
 msgstr "Входной файл '%s' �вл�ет�� нечитаемым.\n"
 
-#: readelf.c:13239
+#: readelf.c:13096
 #, c-format
 msgid "%s: failed to seek to archive member.\n"
 msgstr "%s: не удало�ь перейти к члену архива.\n"
 
-#: readelf.c:13318
+#: readelf.c:13168
 #, c-format
 msgid "File %s is not an archive so its index cannot be displayed.\n"
 msgstr "Файл %s не �вл�ет�� архивом, так как его индек� невозможно отобразить.\n"
@@ -7477,7 +6547,7 @@ msgstr "%s: недо�таточно двоичных данных"
 
 #: resbin.c:136
 msgid "null terminated unicode string"
-msgstr "юникодна� �трока, завершённа� null"
+msgstr "�трока unicode, завершенна� `0'"
 
 #: resbin.c:163 resbin.c:169
 msgid "resource ID"
@@ -7743,27 +6813,32 @@ msgstr "невозможно получить тип перемещени� BFD_
 #: resrc.c:262 resrc.c:333
 #, c-format
 msgid "can't open temporary file `%s': %s"
-msgstr "невозможно открыть временный файл «%s»: %s"
+msgstr "невозможно открыть временный файл `%s': %s"
 
 #: resrc.c:268
 #, c-format
 msgid "can't redirect stdout: `%s': %s"
-msgstr "невозможно перенаправить stdout: «%s»: %s"
+msgstr "невозможно перенаправить stdout: `%s': %s"
+
+#: resrc.c:284
+#, c-format
+msgid "%s %s: %s"
+msgstr "%s %s: %s"
 
 #: resrc.c:329
 #, c-format
 msgid "can't execute `%s': %s"
-msgstr "невозможно выполнить «%s»: %s"
+msgstr "невозможно выполнить `%s': %s"
 
 #: resrc.c:338
 #, c-format
 msgid "Using temporary file `%s' to read preprocessor output\n"
-msgstr "И�пользует�� временный файл «%s» дл� чтени� выходных данных препроце��ора\n"
+msgstr "И�пользует�� временный файл `%s' дл� чтени� выходных данных препроце��ора\n"
 
 #: resrc.c:345
 #, c-format
 msgid "can't popen `%s': %s"
-msgstr "невозможно popen «%s»: %s"
+msgstr "невозможно popen `%s': %s"
 
 #: resrc.c:347
 #, c-format
@@ -7773,17 +6848,22 @@ msgstr "И�пользует�� popen дл� чтени� выходных да
 #: resrc.c:413
 #, c-format
 msgid "Tried `%s'\n"
-msgstr "Опробован «%s»\n"
+msgstr "Опробован `%s'\n"
 
 #: resrc.c:424
 #, c-format
 msgid "Using `%s'\n"
-msgstr "И�пользует�� «%s»\n"
+msgstr "И�пользует�� `%s'\n"
 
 #: resrc.c:608
 msgid "preprocessing failed."
 msgstr "предварительный анализ завершил�� неудачно."
 
+#: resrc.c:631
+#, c-format
+msgid "%s:%d: %s\n"
+msgstr "%s:%d: %s\n"
+
 #: resrc.c:639
 #, c-format
 msgid "%s: unexpected EOF"
@@ -7797,12 +6877,12 @@ msgstr "%s: при чтении %lu было возвращено %lu"
 #: resrc.c:727 resrc.c:1502
 #, c-format
 msgid "stat failed on bitmap file `%s': %s"
-msgstr "�бой stat дл� файла битового образа «%s»: %s"
+msgstr "�бой stat дл� файла битового образа `%s': %s"
 
 #: resrc.c:778
 #, c-format
 msgid "cursor file `%s' does not contain cursor data"
-msgstr "файл кур�ора «%s» не �одержит данных кур�ора"
+msgstr "файл кур�ора `%s' не �одержит данных кур�ора"
 
 #: resrc.c:810 resrc.c:1210
 #, c-format
@@ -7820,22 +6900,22 @@ msgstr "дл� управлени� данными требует�� DIALOGEX"
 #: resrc.c:966
 #, c-format
 msgid "stat failed on font file `%s': %s"
-msgstr "�бой stat дл� файла шрифта «%s»: %s"
+msgstr "�бой stat дл� файла шрифта `%s': %s"
 
 #: resrc.c:1179
 #, c-format
 msgid "icon file `%s' does not contain icon data"
-msgstr "файл значка «%s» не �одержит данных значка"
+msgstr "файл значка `%s' не �одержит данных значка"
 
 #: resrc.c:1724 resrc.c:1759
 #, c-format
 msgid "stat failed on file `%s': %s"
-msgstr "�бой stat дл� файла «%s»: %s"
+msgstr "�бой stat дл� файла `%s': %s"
 
 #: resrc.c:1940
 #, c-format
 msgid "can't open `%s' for output: %s"
-msgstr "невозможно открыть «%s» дл� вывода данных: %s"
+msgstr "невозможно открыть `%s' дл� вывода данных: %s"
 
 #: size.c:79
 #, c-format
@@ -7883,12 +6963,12 @@ msgstr "неверный аргумент --format: %s"
 msgid "Invalid radix: %s\n"
 msgstr "�еверное о�нование: %s\n"
 
-#: srconv.c:1733
+#: srconv.c:1732
 #, c-format
 msgid "Convert a COFF object file into a SYSROFF object file\n"
 msgstr "Преобразовывает объектный файл COFF в объектный файл SYSROFF\n"
 
-#: srconv.c:1734
+#: srconv.c:1733
 #, c-format
 msgid ""
 " The options are:\n"
@@ -7900,14 +6980,14 @@ msgid ""
 "  -v --version     Print the program's version number\n"
 msgstr ""
 " Параметры:\n"
-"  -q --quick       (у�тарел — игнорирует��)\n"
+"  -q --quick       (у�тарел - игнорирует��)\n"
 "  -n --noprescan   не выполн�ть �канирование дл� преобразовани� commons в defs\n"
 "  -d --debug       показать информацию о том, что выполн�ет��\n"
 "  @<файл>          читать параметры из <файла>\n"
 "  -h --help        показать �ту информацию\n"
 "  -v --version     показать вер�ию программы\n"
 
-#: srconv.c:1880
+#: srconv.c:1879
 #, c-format
 msgid "unable to open output file %s"
 msgstr "невозможно открыть выходной файл %s"
@@ -7952,95 +7032,95 @@ msgstr "нераÑ�познанный тип перекреÑ�тной Ñ�Ñ�ылкÐ
 msgid "missing index type"
 msgstr "от�ут�твует индек�ный тип"
 
-#: stabs.c:2129
+#: stabs.c:2122
 msgid "unknown virtual character for baseclass"
 msgstr "неизве�тный виртуальный �имвол дл� baseclass"
 
-#: stabs.c:2147
+#: stabs.c:2140
 msgid "unknown visibility character for baseclass"
 msgstr "неизве�тный �имвол видимо�ти дл� baseclass"
 
-#: stabs.c:2337
+#: stabs.c:2326
 msgid "unnamed $vb type"
 msgstr "безым�нный тип $vb"
 
-#: stabs.c:2343
+#: stabs.c:2332
 msgid "unrecognized C++ abbreviation"
 msgstr "нера�познанна� аббревиатура C++"
 
-#: stabs.c:2419
+#: stabs.c:2408
 msgid "unknown visibility character for field"
 msgstr "неизве�тный �имвол видимо�ти дл� field"
 
-#: stabs.c:2679
+#: stabs.c:2660
 msgid "const/volatile indicator missing"
 msgstr "от�ут�твует индикатор по�то�нной/переменной"
 
-#: stabs.c:2924
+#: stabs.c:2896
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr "�ет кодировани� дл� \"%s\"\n"
 
-#: stabs.c:3224
+#: stabs.c:3196
 msgid "Undefined N_EXCL"
 msgstr "�еопределенный N_EXCL"
 
-#: stabs.c:3304
+#: stabs.c:3276
 #, c-format
 msgid "Type file number %d out of range\n"
 msgstr "�омер файла типа %d за пределами диапазона\n"
 
-#: stabs.c:3309
+#: stabs.c:3281
 #, c-format
 msgid "Type index number %d out of range\n"
 msgstr "�омер индек�а типа %d за пределами диапазона\n"
 
-#: stabs.c:3388
+#: stabs.c:3360
 #, c-format
 msgid "Unrecognized XCOFF type %d\n"
 msgstr "�ера�познанный тип XCOFF %d\n"
 
-#: stabs.c:3680
+#: stabs.c:3652
 #, c-format
 msgid "bad mangled name `%s'\n"
-msgstr "плохое �корректированное им� «%s»\n"
+msgstr "плохое �корректированное им� `%s'\n"
 
-#: stabs.c:3775
+#: stabs.c:3747
 #, c-format
 msgid "no argument types in mangled string\n"
 msgstr "нет типов аргументов в �корректированной �троке\n"
 
-#: stabs.c:5125
+#: stabs.c:5094
 #, c-format
 msgid "Demangled name is not a function\n"
 msgstr "Декодированное им� не �вл�ет�� функцией\n"
 
-#: stabs.c:5167
+#: stabs.c:5136
 #, c-format
 msgid "Unexpected type in v3 arglist demangling\n"
 msgstr "�еожиданный тип при декодировании v3 arglist\n"
 
-#: stabs.c:5234
+#: stabs.c:5203
 #, c-format
 msgid "Unrecognized demangle component %d\n"
 msgstr "�ера�познанный компонент декодировани� %d\n"
 
-#: stabs.c:5286
+#: stabs.c:5255
 #, c-format
 msgid "Failed to print demangled template\n"
 msgstr "Сбой вывода декодированного шаблона\n"
 
-#: stabs.c:5366
+#: stabs.c:5335
 #, c-format
 msgid "Couldn't get demangled builtin type\n"
 msgstr "�евозможно получить декодированный в�троенный тип\n"
 
-#: stabs.c:5415
+#: stabs.c:5384
 #, c-format
 msgid "Unexpected demangled varargs\n"
 msgstr "�еожиданный декодированный varargs\n"
 
-#: stabs.c:5422
+#: stabs.c:5391
 #, c-format
 msgid "Unrecognized demangled builtin type\n"
 msgstr "�еожиданный декодированный в�троенный тип\n"
@@ -8055,12 +7135,12 @@ msgstr "неверный целочи�ленный аргумент %s"
 msgid "invalid minimum string length %d"
 msgstr "неверна� минимальна� длина (%d) �троки"
 
-#: strings.c:651
+#: strings.c:647
 #, c-format
 msgid " Display printable strings in [file(s)] (stdin by default)\n"
 msgstr " Выводит пригодные дл� печати �троки в [файл(ах)] (по умолчанию stdin)\n"
 
-#: strings.c:652
+#: strings.c:648
 #, c-format
 msgid ""
 " The options are:\n"
@@ -8114,8 +7194,8 @@ msgstr "невозможно открыть входной файл %s"
 
 #: version.c:36
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: version.c:37
 #, c-format
@@ -8131,8 +7211,8 @@ msgstr ""
 
 #: windmc.c:190
 #, c-format
-msgid "can't create %s file `%s' for output.\n"
-msgstr "не удало�ь �оздать файл %s, «%s» дл� вывода данных.\n"
+msgid "can't create %s file ,%s' for output.\n"
+msgstr "не удало�ь �оздать файл %s, '%s' дл� вывода данных.\n"
 
 #: windmc.c:198
 #, c-format
@@ -8150,7 +7230,7 @@ msgid ""
 "  -C --codepage_in=<val>       Set codepage when reading mc text file\n"
 "  -d --decimal_values          Print values to text files decimal\n"
 "  -e --extension=<extension>   Set header extension used on export header file\n"
-"  -F --target <target>         Specify output target for endianness.\n"
+"  -F --target <target>         Specify output target for endianess.\n"
 "  -h --headerdir=<directory>   Set the export directory for headers\n"
 "  -u --unicode_in              Read input file as UTF16 file\n"
 "  -U --unicode_out             Write binary messages as UFT16\n"
@@ -8170,7 +7250,7 @@ msgstr ""
 "  -C --codepage_in=<знач>      у�тановить кодировку при чтении тек�тового mc-файла\n"
 "  -d --decimal_values          выве�ти значени� в тек�товый файл в де��тичном виде\n"
 "  -e --extension=<ра�ширение>  у�тановить ра�ширение дл� заголовка, и�пользуемое в файле �к�порта заголовка\n"
-"  -F --target <цель>           указать выходную цель дл� пор�дка �ледовани� байт.\n"
+"  -F --target <цель>           указать выходную цель дл� endianess.\n"
 "  -h --headerdir=<каталог>     у�тановить каталог дл� �к�порта заголовков\n"
 "  -u --unicode_in              читать входной файл как файл UTF16\n"
 "  -U --unicode_out             запи�ывать двоичные �ообщени� в формате UFT16\n"
@@ -8201,8 +7281,8 @@ msgstr "%s: предупреждение: "
 
 #: windmc.c:262
 #, c-format
-msgid "A codepage was specified switch `%s' and UTF16.\n"
-msgstr "Дл� кодировки был указан ключ «%s» и UTF16.\n"
+msgid "A codepage was specified switch ,%s' and UTF16.\n"
+msgstr "Дл� кодировки был указан ключ '%s' и UTF16.\n"
 
 #: windmc.c:263
 #, c-format
@@ -8215,8 +7295,8 @@ msgstr "попробуйте добавить �зык."
 
 #: windmc.c:1116
 #, c-format
-msgid "unable to open file `%s' for input.\n"
-msgstr "невозможно открыть файл «%s» дл� ввода.\n"
+msgid "unable to open file ,%s' for input.\n"
+msgstr "невозможно открыть выходной файл '%s' дл� ввода.\n"
 
 #: windmc.c:1124
 #, c-format
@@ -8230,7 +7310,7 @@ msgstr "входной файл не в кодировке UFT16.\n"
 #: windres.c:216
 #, c-format
 msgid "can't open %s `%s': %s"
-msgstr "невозможно открыть %s «%s»: %s"
+msgstr "невозможно открыть %s `%s': %s"
 
 #: windres.c:390
 #, c-format
@@ -8250,7 +7330,7 @@ msgstr ": повтор�ющее�� значение\n"
 #: windres.c:563
 #, c-format
 msgid "unknown format type `%s'"
-msgstr "неизве�тный тип формата «%s»"
+msgstr "неизве�тный тип формата `%s'"
 
 #: windres.c:564
 #, c-format
@@ -8278,7 +7358,6 @@ msgid ""
 "  -O --output-format=<format>  Specify output format\n"
 "  -F --target=<target>         Specify COFF target\n"
 "     --preprocessor=<program>  Program to use to preprocess rc file\n"
-"     --preprocessor-arg=<arg>  Additional preprocessor argument\n"
 "  -I --include-dir=<dir>       Include directory when preprocessing rc file\n"
 "  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n"
 "  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n"
@@ -8296,7 +7375,6 @@ msgstr ""
 "  -O --output-format=<формат>  указать выходной формат\n"
 "  -F --target=<цель>           указать цель COFF\n"
 "     --preprocessor=<прогр>    программа дл� предварительной обработки rc-файла\n"
-"     --preprocessor-arg=<арг>  дополнительный аргумент препроце��ора\n"
 "  -I --include-dir=<кат>       включать каталог при предварительной обработке rc-файла\n"
 "  -D --define <sym>[=<знач>]   определить SYM предварительной обработке rc-файла\n"
 "  -U --undefine <sym>          отменить определение SYM при предварительной обработке rc-файла\n"
@@ -8307,12 +7385,12 @@ msgstr ""
 "                               дл� чтени� выходных данных препроце��ора\n"
 "     --no-use-temp-file        и�пользовать popen (по умолчанию)\n"
 
-#: windres.c:679
+#: windres.c:678
 #, c-format
 msgid "     --yydebug                 Turn on parser debugging\n"
 msgstr "     --yydebug                 Включение отладки анализатора\n"
 
-#: windres.c:682
+#: windres.c:681
 #, c-format
 msgid ""
 "  -r                           Ignored for compatibility with rc\n"
@@ -8325,7 +7403,7 @@ msgstr ""
 "  -h --help                    показать �ту �правку\n"
 "  -V --version                 показать информацию о вер�ии\n"
 
-#: windres.c:687
+#: windres.c:686
 #, c-format
 msgid ""
 "FORMAT is one of rc, res, or coff, and is deduced from the file name\n"
@@ -8338,154 +7416,41 @@ msgstr ""
 "и�пользует�� std-out, по умолчанию rc.\n"
 
 #
-#: windres.c:850
+#: windres.c:847
 msgid "invalid codepage specified.\n"
 msgstr "указана недопу�тима� кодировка.\n"
 
-#: windres.c:865
+#: windres.c:862
 msgid "invalid option -f\n"
 msgstr "недопу�тимый параметр -f\n"
 
-#: windres.c:870
+#: windres.c:867
 msgid "No filename following the -fo option.\n"
 msgstr "�ет имени файла по�ле параметры -fo.\n"
 
-#: windres.c:959
+#: windres.c:938
 #, c-format
 msgid "Option -I is deprecated for setting the input format, please use -J instead.\n"
 msgstr "Параметр -I крайне не рекомендует�� дл� у�тановки входного формата. Лучше и�пользовать -J.\n"
 
-#: windres.c:1072
+#: windres.c:1051
 msgid "no resources"
 msgstr "нет ре�ур�ов"
 
-#: wrstabs.c:354 wrstabs.c:1915
+#: wrstabs.c:353 wrstabs.c:1916
 #, c-format
 msgid "string_hash_lookup failed: %s"
 msgstr "string_hash_lookup завершил�� неудачей: %s"
 
-#: wrstabs.c:637
+#: wrstabs.c:636
 #, c-format
 msgid "stab_int_type: bad size %u"
 msgstr "stab_int_type: неверный размер %u"
 
-#: wrstabs.c:1393
+#: wrstabs.c:1394
 #, c-format
 msgid "%s: warning: unknown size for field `%s' in struct"
-msgstr "%s: предупреждение: неизве�тный размер пол� «%s» в struct"
-
-#~ msgid "Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"
-#~ msgstr ""
-#~ "И�пользование: %s [параметры �мул�ции] [--plugin <название>] [-]{dmpqrstx}\n"
-#~ "                  [abcfilNoPsSuvV] [им�_члена] [�чет] файл_архива файл...\n"
-
-#~ msgid "illegal option -- %c"
-#~ msgstr "неверный параметр -- %c"
-
-#~ msgid ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<%s>\n"
-#~ "\n"
-
-#~ msgid "Usage: %s < input_file > output_file\n"
-#~ msgstr "И�пользование: %s < входной_файл > выходной_файл\n"
-
-#~ msgid "Prints bytes from stdin in hex format.\n"
-#~ msgstr "Выводит в ше�тнадцатеричном формате байты �о �тандартного ввода.\n"
-
-#~ msgid "   %d\t"
-#~ msgstr "   %d\t"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "  %d\t"
-#~ msgstr "  %d\t"
-
-#~ msgid "%s:\n"
-#~ msgstr "%s:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "./%s:[++]\n"
-#~ msgstr ""
-#~ "\n"
-#~ "./%s:[++]\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "%s/%s:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s/%s:\n"
-
-#~ msgid "%-35s  %11d  %#18lx\n"
-#~ msgstr "%-35s  %11d  %#18lx\n"
-
-#~ msgid "%-35s  %11d  %#18lx[%d]\n"
-#~ msgstr "%-35s  %11d  %#18lx[%d]\n"
-
-#~ msgid "%s  %11d  %#18lx\n"
-#~ msgstr "%s  %11d  %#18lx\n"
-
-#~ msgid "%s  %11d  %#18lx[%d]\n"
-#~ msgstr "%s  %11d  %#18lx[%d]\n"
-
-#~ msgid "   %ld      %s    [%s]\n"
-#~ msgstr "   %ld      %s    [%s]\n"
-
-#~ msgid "    %-18s %s\n"
-#~ msgstr "    %-18s %s\n"
-
-#~ msgid "Location lists in .debug_info section aren't in ascending order!\n"
-#~ msgstr "Спи�ки ме�тоположений в разделе .debug_info не упор�дочены по возра�танию!\n"
-
-#~ msgid "target `%s' ignored."
-#~ msgstr "цель %s игнорирует��."
-
-#~ msgid "  Pg"
-#~ msgstr "  Стр"
-
-#~ msgid " (%ld)"
-#~ msgstr " (%ld)"
-
-#~ msgid "0x%02x "
-#~ msgstr "0x%02x "
-
-#~ msgid "  [reserved compact index %d]\n"
-#~ msgstr "  [зарезервированный компактный индек� %d]\n"
-
-#~ msgid "     vsp = vsp - %d"
-#~ msgstr "     vsp = vsp - %d"
-
-#~ msgid "     vsp = r%d"
-#~ msgstr "     vsp = r%d"
-
-#~ msgid "[unsupported two-byte opcode]"
-#~ msgstr "[неподдерживаемый двух байтный код операции]"
-
-#~ msgid "  %*s %10s %*s\n"
-#~ msgstr "  %*s %10s %*s\n"
-
-#~ msgid "  %*s %10s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %10s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "  %*s %*s %*s %-7s %3s %s\n"
-#~ msgstr "  %*s %*s %*s %-7s %3s %s\n"
-
-#~ msgid "%s %s: %s"
-#~ msgstr "%s %s: %s"
-
-#~ msgid "%s:%d: %s\n"
-#~ msgstr "%s:%d: %s\n"
+msgstr "%s: предупреждение: неизве�тный размер пол� `%s' в struct"
 
 #~ msgid ""
 #~ "\n"
diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index e80cbc6078..8caa3ef94d 100644
--- a/binutils/rcparse.y
+++ b/binutils/rcparse.y
@@ -1,6 +1,6 @@
 %{ /* rcparse.y -- parser for Windows rc files
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008,
-   2011  Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008
+   Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Extended by Kai Tietz, Onevision.
 
@@ -79,7 +79,6 @@ static const rc_res_id res_null_text = { 1, {{0, &null_unichar}}};
   rc_rcdata_item *rcdata_item;
   rc_fixed_versioninfo *fixver;
   rc_ver_info *verinfo;
-  rc_ver_stringtable *verstringtable;
   rc_ver_stringinfo *verstring;
   rc_ver_varinfo *vervar;
   rc_toolbar_item *toobar_item;
@@ -151,7 +150,6 @@ static const rc_res_id res_null_text = { 1, {{0, &null_unichar}}};
 %type <rcdata_item> opt_control_data
 %type <fixver> fixedverinfo
 %type <verinfo> verblocks
-%type <verstringtable> verstringtables
 %type <verstring> vervals
 %type <vervar> vertrans
 %type <toobar_item> toolbar_data
@@ -164,7 +162,7 @@ static const rc_res_id res_null_text = { 1, {{0, &null_unichar}}};
 %type <s> file_name
 %type <uni> res_unicode_string resname res_unicode_string_concat
 %type <ss> sizedstring
-%type <suni> sizedunistring res_unicode_sizedstring res_unicode_sizedstring_concat
+%type <suni> sizedunistring
 %type <i> sizednumexpr sizedposnumexpr
 
 %left '|'
@@ -1260,20 +1258,20 @@ rcdata_data:
 
 stringtable:
 	  STRINGTABLE suboptions BEG 
-	    { sub_res_info = $2; rcparse_rcdata (); }
-	    string_data END { rcparse_normal (); }
+	    { sub_res_info = $2; }
+	    string_data END
 	;
 
 string_data:
 	  /* empty */
-	| string_data numexpr res_unicode_sizedstring_concat
+	| string_data numexpr res_unicode_string_concat
 	  {
-	    define_stringtable (&sub_res_info, $2, $3.s, $3.length);
+	    define_stringtable (&sub_res_info, $2, $3);
 	    rcparse_discard_strings ();
 	  }
-	| string_data numexpr ',' res_unicode_sizedstring_concat
+	| string_data numexpr ',' res_unicode_string_concat
 	  {
-	    define_stringtable (&sub_res_info, $2, $4.s, $4.length);
+	    define_stringtable (&sub_res_info, $2, $4);
 	    rcparse_discard_strings ();
 	  }
 	| string_data error
@@ -1473,9 +1471,9 @@ verblocks:
 	  {
 	    $$ = NULL;
 	  }
-	| verblocks BLOCKSTRINGFILEINFO BEG verstringtables END
+	| verblocks BLOCKSTRINGFILEINFO BEG BLOCK BEG vervals END END
 	  {
-	    $$ = append_ver_stringfileinfo ($1, $4);
+	    $$ = append_ver_stringfileinfo ($1, $4, $6);
 	  }
 	| verblocks BLOCKVARFILEINFO BEG VALUE res_unicode_string_concat vertrans END
 	  {
@@ -1483,17 +1481,6 @@ verblocks:
 	  }
 	;
 
-verstringtables:
-      /* empty */
-	  {
-	    $$ = NULL;
-	  }
-	| verstringtables BLOCK BEG vervals END
-	  {
-	    $$ = append_ver_stringtable ($1, $2, $4);
-	  }
-	;
-
 vervals:
 	  /* empty */
 	  {
@@ -1718,43 +1705,6 @@ res_unicode_string:
 	  }
 	;
 
-res_unicode_sizedstring:
-	  sizedunistring
-	  {
-	    $$ = $1;
-	  }
-	| sizedstring
-	  {
-	    unichar *h = NULL;
-	    rc_uint_type l = 0;
-	    unicode_from_ascii_len (&l, &h, $1.s, $1.length);
-	    $$.s = h;
-	    $$.length = l;
-	  }
-	;
-
-/* Concat string */
-res_unicode_sizedstring_concat:
-	  res_unicode_sizedstring
-	  {
-	    $$ = $1;
-	  }
-	|
-	  res_unicode_sizedstring_concat res_unicode_sizedstring
-	  {
-	    rc_uint_type l1 = $1.length;
-	    rc_uint_type l2 = $2.length;
-	    unichar *h = (unichar *) res_alloc ((l1 + l2 + 1) * sizeof (unichar));
-	    if (l1 != 0)
-	      memcpy (h, $1.s, l1 * sizeof (unichar));
-	    if (l2 != 0)
-	      memcpy (h + l1, $2.s, l2  * sizeof (unichar));
-	    h[l1 + l2] = 0;
-	    $$.length = l1 + l2;
-	    $$.s = h;
-	  }
-	;
-
 sizedstring:
 	  SIZEDSTRING
 	  {
diff --git a/binutils/readelf.c b/binutils/readelf.c
index f42039e762..9e13190b4e 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1,6 +1,6 @@
 /* readelf.c -- display contents of an ELF format file
    Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010, 2011, 2012
+   2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
@@ -42,8 +42,10 @@
   ELF file than is provided by objdump.  In particular it can display DWARF
   debugging information which (at the moment) objdump cannot.  */
 
+#include "config.h"
 #include "sysdep.h"
 #include <assert.h>
+#include <sys/stat.h>
 #include <time.h>
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>
@@ -101,7 +103,6 @@
 #include "elf/d10v.h"
 #include "elf/d30v.h"
 #include "elf/dlx.h"
-#include "elf/epiphany.h"
 #include "elf/fr30.h"
 #include "elf/frv.h"
 #include "elf/h8.h"
@@ -132,7 +133,6 @@
 #include "elf/pj.h"
 #include "elf/ppc.h"
 #include "elf/ppc64.h"
-#include "elf/rl78.h"
 #include "elf/rx.h"
 #include "elf/s390.h"
 #include "elf/score.h"
@@ -271,9 +271,9 @@ print_mode;
 
 #define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order!  */
 
-#define GET_ELF_SYMBOLS(file, section, sym_count)			\
-  (is_32bit_elf ? get_32bit_elf_symbols (file, section, sym_count)	\
-   : get_64bit_elf_symbols (file, section, sym_count))
+#define GET_ELF_SYMBOLS(file, section)			\
+  (is_32bit_elf ? get_32bit_elf_symbols (file, section)	\
+   : get_64bit_elf_symbols (file, section))
 
 #define VALID_DYNAMIC_NAME(offset)	((dynamic_strings != NULL) && (offset < dynamic_strings_length))
 /* GET_DYNAMIC_NAME asssumes that VALID_DYNAMIC_NAME has
@@ -552,7 +552,6 @@ guess_is_rela (unsigned int e_machine)
       /* Targets that use RELA relocations.  */
     case EM_68K:
     case EM_860:
-    case EM_ADAPTEVA_EPIPHANY:
     case EM_ALPHA:
     case EM_ALTERA_NIOS2:
     case EM_AVR:
@@ -592,7 +591,6 @@ guess_is_rela (unsigned int e_machine)
     case EM_NIOS32:
     case EM_PPC64:
     case EM_PPC:
-    case EM_RL78:
     case EM_RX:
     case EM_S390:
     case EM_S390_OLD:
@@ -656,7 +654,7 @@ slurp_rela_relocs (FILE * file,
       Elf32_External_Rela * erelas;
 
       erelas = (Elf32_External_Rela *) get_data (NULL, file, rel_offset, 1,
-                                                 rel_size, _("32-bit relocation data"));
+                                                 rel_size, _("relocs"));
       if (!erelas)
 	return 0;
 
@@ -686,7 +684,7 @@ slurp_rela_relocs (FILE * file,
       Elf64_External_Rela * erelas;
 
       erelas = (Elf64_External_Rela *) get_data (NULL, file, rel_offset, 1,
-                                                 rel_size, _("64-bit relocation data"));
+                                                 rel_size, _("relocs"));
       if (!erelas)
 	return 0;
 
@@ -754,7 +752,7 @@ slurp_rel_relocs (FILE * file,
       Elf32_External_Rel * erels;
 
       erels = (Elf32_External_Rel *) get_data (NULL, file, rel_offset, 1,
-                                               rel_size, _("32-bit relocation data"));
+                                               rel_size, _("relocs"));
       if (!erels)
 	return 0;
 
@@ -783,7 +781,7 @@ slurp_rel_relocs (FILE * file,
       Elf64_External_Rel * erels;
 
       erels = (Elf64_External_Rel *) get_data (NULL, file, rel_offset, 1,
-                                               rel_size, _("64-bit relocation data"));
+                                               rel_size, _("relocs"));
       if (!erels)
 	return 0;
 
@@ -1170,10 +1168,6 @@ dump_relocations (FILE * file,
 	  rtype = elf_vax_reloc_type (type);
 	  break;
 
-	case EM_ADAPTEVA_EPIPHANY:
-	  rtype = elf_epiphany_reloc_type (type);
-	  break;
-
 	case EM_IP2K:
 	case EM_IP2K_OLD:
 	  rtype = elf_ip2k_reloc_type (type);
@@ -1219,10 +1213,6 @@ dump_relocations (FILE * file,
 	  rtype = elf_microblaze_reloc_type (type);
 	  break;
 
-	case EM_RL78:
-	  rtype = elf_rl78_reloc_type (type);
-	  break;
-
 	case EM_RX:
 	  rtype = elf_rx_reloc_type (type);
 	  break;
@@ -1921,7 +1911,6 @@ get_machine_name (unsigned e_machine)
     case EM_OR32:		return "OpenRISC";
     case EM_ARC_A5:		return "ARC International ARCompact processor";
     case EM_CRX:		return "National Semiconductor CRX microprocessor";
-    case EM_ADAPTEVA_EPIPHANY:	return "Adapteva EPIPHANY";
     case EM_DLX:		return "OpenDLX";
     case EM_IP2K_OLD:
     case EM_IP2K:		return "Ubicom IP2xxx 8-bit microcontrollers";
@@ -1982,7 +1971,6 @@ get_machine_name (unsigned e_machine)
     case EM_CR16_OLD:		return "National Semiconductor's CR16";
     case EM_MICROBLAZE:		return "Xilinx MicroBlaze";
     case EM_MICROBLAZE_OLD:	return "Xilinx MicroBlaze";
-    case EM_RL78:		return "Renesas RL78";
     case EM_RX:			return "Renesas RX";
     case EM_METAG:		return "Imagination Technologies META processor architecture";
     case EM_MCST_ELBRUS:	return "MCST Elbrus general purpose hardware architecture";
@@ -2607,19 +2595,14 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
 	    strcat (buf, ", 64-bit doubles");
 	  if (e_flags & E_FLAG_RX_DSP)
 	    strcat (buf, ", dsp");
-	  if (e_flags & E_FLAG_RX_PID)
-	    strcat (buf, ", pid");	  
-	  break;
 
 	case EM_S390:
 	  if (e_flags & EF_S390_HIGH_GPRS)
 	    strcat (buf, ", highgprs");
-	  break;
 
 	case EM_TI_C6000:
 	  if ((e_flags & EF_C6000_REL))
 	    strcat (buf, ", relocatable module");
-	  break;
 	}
     }
 
@@ -3185,7 +3168,7 @@ usage (FILE * stream)
   -u --unwind            Display the unwind info (if present)\n\
   -d --dynamic           Display the dynamic section (if present)\n\
   -V --version-info      Display the version sections (if present)\n\
-  -A --arch-specific     Display architecture specific information (if any)\n\
+  -A --arch-specific     Display architecture specific information (if any).\n\
   -c --archive-index     Display the symbol/file index in an archive\n\
   -D --use-dynamic       Use the dynamic section info when displaying symbols\n\
   -x --hex-dump=<number|name>\n\
@@ -3807,7 +3790,7 @@ process_program_headers (FILE * file)
 		printf ("0x%6.6lx", (unsigned long) segment->p_memsz);
 	      else
 		{
-		  print_vma (segment->p_memsz, FULL_HEX);
+		  print_vma (segment->p_offset, FULL_HEX);
 		}
 
 	      printf (" %c%c%c ",
@@ -4062,13 +4045,11 @@ get_64bit_section_headers (FILE * file, unsigned int num)
 }
 
 static Elf_Internal_Sym *
-get_32bit_elf_symbols (FILE * file,
-		       Elf_Internal_Shdr * section,
-		       unsigned long * num_syms_return)
+get_32bit_elf_symbols (FILE * file, Elf_Internal_Shdr * section)
 {
-  unsigned long number = 0;
+  unsigned long number;
   Elf32_External_Sym * esyms = NULL;
-  Elf_External_Sym_Shndx * shndx = NULL;
+  Elf_External_Sym_Shndx * shndx;
   Elf_Internal_Sym * isyms = NULL;
   Elf_Internal_Sym * psym;
   unsigned int j;
@@ -4077,7 +4058,7 @@ get_32bit_elf_symbols (FILE * file,
   if (section->sh_entsize == 0)
     {
       error (_("sh_entsize is zero\n"));
-      goto exit_point;
+      return NULL;
     }
 
   number = section->sh_size / section->sh_entsize;
@@ -4085,13 +4066,13 @@ get_32bit_elf_symbols (FILE * file,
   if (number * sizeof (Elf32_External_Sym) > section->sh_size + 1)
     {
       error (_("Invalid sh_entsize\n"));
-      goto exit_point;
+      return NULL;
     }
 
   esyms = (Elf32_External_Sym *) get_data (NULL, file, section->sh_offset, 1,
                                            section->sh_size, _("symbols"));
   if (esyms == NULL)
-    goto exit_point;
+    return NULL;
 
   shndx = NULL;
   if (symtab_shndx_hdr != NULL
@@ -4101,7 +4082,7 @@ get_32bit_elf_symbols (FILE * file,
       shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file,
                                                    symtab_shndx_hdr->sh_offset,
                                                    1, symtab_shndx_hdr->sh_size,
-                                                   _("symbol table section indicies"));
+                                                   _("symtab shndx"));
       if (shndx == NULL)
 	goto exit_point;
     }
@@ -4130,26 +4111,21 @@ get_32bit_elf_symbols (FILE * file,
     }
 
  exit_point:
-  if (shndx != NULL)
+  if (shndx)
     free (shndx);
-  if (esyms != NULL)
+  if (esyms)
     free (esyms);
 
-  if (num_syms_return != NULL)
-    * num_syms_return = isyms == NULL ? 0 : number;
-
   return isyms;
 }
 
 static Elf_Internal_Sym *
-get_64bit_elf_symbols (FILE * file,
-		       Elf_Internal_Shdr * section,
-		       unsigned long * num_syms_return)
+get_64bit_elf_symbols (FILE * file, Elf_Internal_Shdr * section)
 {
-  unsigned long number = 0;
-  Elf64_External_Sym * esyms = NULL;
-  Elf_External_Sym_Shndx * shndx = NULL;
-  Elf_Internal_Sym * isyms = NULL;
+  unsigned long number;
+  Elf64_External_Sym * esyms;
+  Elf_External_Sym_Shndx * shndx;
+  Elf_Internal_Sym * isyms;
   Elf_Internal_Sym * psym;
   unsigned int j;
 
@@ -4157,7 +4133,7 @@ get_64bit_elf_symbols (FILE * file,
   if (section->sh_entsize == 0)
     {
       error (_("sh_entsize is zero\n"));
-      goto exit_point;
+      return NULL;
     }
 
   number = section->sh_size / section->sh_entsize;
@@ -4165,14 +4141,15 @@ get_64bit_elf_symbols (FILE * file,
   if (number * sizeof (Elf64_External_Sym) > section->sh_size + 1)
     {
       error (_("Invalid sh_entsize\n"));
-      goto exit_point;
+      return NULL;
     }
 
   esyms = (Elf64_External_Sym *) get_data (NULL, file, section->sh_offset, 1,
                                            section->sh_size, _("symbols"));
   if (!esyms)
-    goto exit_point;
+    return NULL;
 
+  shndx = NULL;
   if (symtab_shndx_hdr != NULL
       && (symtab_shndx_hdr->sh_link
 	  == (unsigned long) (section - section_headers)))
@@ -4180,9 +4157,12 @@ get_64bit_elf_symbols (FILE * file,
       shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file,
                                                    symtab_shndx_hdr->sh_offset,
                                                    1, symtab_shndx_hdr->sh_size,
-                                                   _("symbol table section indicies"));
-      if (shndx == NULL)
-	goto exit_point;
+                                                   _("symtab shndx"));
+      if (!shndx)
+	{
+	  free (esyms);
+	  return NULL;
+	}
     }
 
   isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym));
@@ -4190,34 +4170,32 @@ get_64bit_elf_symbols (FILE * file,
   if (isyms == NULL)
     {
       error (_("Out of memory\n"));
-      goto exit_point;
+      if (shndx)
+	free (shndx);
+      free (esyms);
+      return NULL;
     }
 
-  for (j = 0, psym = isyms; j < number; j++, psym++)
+  for (j = 0, psym = isyms;
+       j < number;
+       j++, psym++)
     {
       psym->st_name  = BYTE_GET (esyms[j].st_name);
       psym->st_info  = BYTE_GET (esyms[j].st_info);
       psym->st_other = BYTE_GET (esyms[j].st_other);
       psym->st_shndx = BYTE_GET (esyms[j].st_shndx);
-
       if (psym->st_shndx == (SHN_XINDEX & 0xffff) && shndx != NULL)
 	psym->st_shndx
 	  = byte_get ((unsigned char *) &shndx[j], sizeof (shndx[j]));
       else if (psym->st_shndx >= (SHN_LORESERVE & 0xffff))
 	psym->st_shndx += SHN_LORESERVE - (SHN_LORESERVE & 0xffff);
-
       psym->st_value = BYTE_GET (esyms[j].st_value);
       psym->st_size  = BYTE_GET (esyms[j].st_size);
     }
 
- exit_point:
-  if (shndx != NULL)
+  if (shndx)
     free (shndx);
-  if (esyms != NULL)
-    free (esyms);
-
-  if (num_syms_return != NULL)
-    * num_syms_return = isyms == NULL ? 0 : number;
+  free (esyms);
 
   return isyms;
 }
@@ -4585,7 +4563,8 @@ process_section_headers (FILE * file)
 	    }
 
 	  CHECK_ENTSIZE (section, i, Sym);
-	  dynamic_symbols = GET_ELF_SYMBOLS (file, section, & num_dynamic_syms);
+	  num_dynamic_syms = section->sh_size / section->sh_entsize;
+	  dynamic_symbols = GET_ELF_SYMBOLS (file, section);
 	}
       else if (section->sh_type == SHT_STRTAB
 	       && streq (name, ".dynstr"))
@@ -4940,7 +4919,6 @@ process_section_groups (FILE * file)
   Elf_Internal_Shdr * symtab_sec;
   Elf_Internal_Shdr * strtab_sec;
   Elf_Internal_Sym * symtab;
-  unsigned long num_syms;
   char * strtab;
   size_t strtab_size;
 
@@ -4959,8 +4937,7 @@ process_section_groups (FILE * file)
   if (section_headers == NULL)
     {
       error (_("Section headers are not available!\n"));
-      /* PR 13622: This can happen with a corrupt ELF header.  */
-      return 0;
+      abort ();
     }
 
   section_headers_groups = (struct group **) calloc (elf_header.e_shnum,
@@ -4999,7 +4976,6 @@ process_section_groups (FILE * file)
   symtab_sec = NULL;
   strtab_sec = NULL;
   symtab = NULL;
-  num_syms = 0;
   strtab = NULL;
   strtab_size = 0;
   for (i = 0, section = section_headers, group = section_groups;
@@ -5030,7 +5006,7 @@ process_section_groups (FILE * file)
 	      symtab_sec = sec;
 	      if (symtab)
 		free (symtab);
-	      symtab = GET_ELF_SYMBOLS (file, symtab_sec, & num_syms);
+	      symtab = GET_ELF_SYMBOLS (file, symtab_sec);
 	    }
 
 	  if (symtab == NULL)
@@ -5039,12 +5015,6 @@ process_section_groups (FILE * file)
 	      continue;
 	    }
 
-	  if (section->sh_info >= num_syms)
-	    {
-	      error (_("Bad sh_info in group section `%s'\n"), name);
-	      continue;
-	    }
-
 	  sym = symtab + section->sh_info;
 
 	  if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
@@ -5255,7 +5225,7 @@ dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela)
 
   imrs = get_data (NULL, file, dynamic_addr + imgrela->img_rela_off,
 		   1, imgrela->img_rela_cnt * sizeof (*imrs),
-		   _("dynamic section image relocations"));
+		   _("dynamic section image relas"));
   if (!imrs)
     return;
 
@@ -5461,7 +5431,7 @@ process_relocs (FILE * file)
 	      if (string_table == NULL)
 		printf ("%d", section->sh_name);
 	      else
-		printf ("'%s'", SECTION_NAME (section));
+		printf (_("'%s'"), SECTION_NAME (section));
 
 	      printf (_(" at offset 0x%lx contains %lu entries:\n"),
 		 rel_offset, (unsigned long) (rel_size / section->sh_entsize));
@@ -5482,7 +5452,8 @@ process_relocs (FILE * file)
 		      && symsec->sh_type != SHT_DYNSYM)
                     continue;
 
-		  symtab = GET_ELF_SYMBOLS (file, symsec, & nsyms);
+		  nsyms = symsec->sh_size / symsec->sh_entsize;
+		  symtab = GET_ELF_SYMBOLS (file, symsec);
 
 		  if (symtab == NULL)
 		    continue;
@@ -5594,7 +5565,6 @@ find_symbol_for_address (Elf_Internal_Sym * symtab,
 	    break;
 	}
     }
-
   if (best)
     {
       *symname = (best->st_name >= strtab_size
@@ -5602,7 +5572,6 @@ find_symbol_for_address (Elf_Internal_Sym * symtab,
       *offset = dist;
       return;
     }
-
   *symname = NULL;
   *offset = addr.offset;
 }
@@ -5780,7 +5749,7 @@ slurp_ia64_unwind_table (FILE * file,
   return 1;
 }
 
-static void
+static int
 ia64_process_unwind (FILE * file)
 {
   Elf_Internal_Shdr * sec;
@@ -5796,7 +5765,8 @@ ia64_process_unwind (FILE * file)
       if (sec->sh_type == SHT_SYMTAB
 	  && sec->sh_link < elf_header.e_shnum)
 	{
-	  aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms);
+	  aux.nsyms = sec->sh_size / sec->sh_entsize;
+	  aux.symtab = GET_ELF_SYMBOLS (file, sec);
 
 	  strsec = section_headers + sec->sh_link;
 	  assert (aux.strtab == NULL);
@@ -5917,6 +5887,8 @@ ia64_process_unwind (FILE * file)
     free (aux.symtab);
   if (aux.strtab)
     free ((char *) aux.strtab);
+
+  return 1;
 }
 
 struct hppa_unw_table_entry
@@ -6188,7 +6160,7 @@ slurp_hppa_unwind_table (FILE * file,
   return 1;
 }
 
-static void
+static int
 hppa_process_unwind (FILE * file)
 {
   struct hppa_unw_aux_info aux;
@@ -6197,17 +6169,18 @@ hppa_process_unwind (FILE * file)
   Elf_Internal_Shdr * sec;
   unsigned long i;
 
-  if (string_table == NULL)
-    return;
-
   memset (& aux, 0, sizeof (aux));
 
+  if (string_table == NULL)
+    return 1;
+
   for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec)
     {
       if (sec->sh_type == SHT_SYMTAB
 	  && sec->sh_link < elf_header.e_shnum)
 	{
-	  aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms);
+	  aux.nsyms = sec->sh_size / sec->sh_entsize;
+	  aux.symtab = GET_ELF_SYMBOLS (file, sec);
 
 	  strsec = section_headers + sec->sh_link;
 	  assert (aux.strtab == NULL);
@@ -6248,25 +6221,30 @@ hppa_process_unwind (FILE * file)
     free (aux.symtab);
   if (aux.strtab)
     free ((char *) aux.strtab);
+
+  return 1;
 }
 
 struct arm_section
 {
-  unsigned char *      data;		/* The unwind data.  */
-  Elf_Internal_Shdr *  sec;		/* The cached unwind section header.  */
-  Elf_Internal_Rela *  rela;		/* The cached relocations for this section.  */
-  unsigned long        nrelas;		/* The number of relocations.  */
-  unsigned int         rel_type;	/* REL or RELA ?  */
-  Elf_Internal_Rela *  next_rela;	/* Cyclic pointer to the next reloc to process.  */
+  unsigned char *data;
+
+  Elf_Internal_Shdr *sec;
+  Elf_Internal_Rela *rela;
+  unsigned long nrelas;
+  unsigned int rel_type;
+
+  Elf_Internal_Rela *next_rela;
 };
 
 struct arm_unw_aux_info
 {
-  FILE *              file;		/* The file containing the unwind sections.  */
-  Elf_Internal_Sym *  symtab;		/* The file's symbol table.  */
-  unsigned long       nsyms;		/* Number of symbols.  */
-  char *              strtab;		/* The file's string table.  */
-  unsigned long       strtab_size;	/* Size of string table.  */
+  FILE *file;
+
+  Elf_Internal_Sym *symtab;	/* The symbol table.  */
+  unsigned long nsyms;		/* Number of symbols.  */
+  char *strtab;			/* The string table.  */
+  unsigned long strtab_size;	/* Size of string table.  */
 };
 
 static const char *
@@ -6308,25 +6286,11 @@ arm_free_section (struct arm_section *arm_sec)
     free (arm_sec->rela);
 }
 
-/* 1) If SEC does not match the one cached in ARM_SEC, then free the current
-      cached section and install SEC instead.
-   2) Locate the 32-bit word at WORD_OFFSET in unwind section SEC
-      and return its valued in * WORDP, relocating if necessary.
-   3) Update the NEXT_RELA field in ARM_SEC and store the section index and
-      relocation's offset in ADDR.
-   4) If SYM_NAME is non-NULL and a relocation was applied, record the offset
-      into the string table of the symbol associated with the reloc.  If no
-      reloc was applied store -1 there.
-   5) Return TRUE upon success, FALSE otherwise.  */
-
-static bfd_boolean
-get_unwind_section_word (struct arm_unw_aux_info *  aux,
-			 struct arm_section *       arm_sec,
-			 Elf_Internal_Shdr *        sec,
-			 bfd_vma 		    word_offset,
-			 unsigned int *             wordp,
-			 struct absaddr *           addr,
-			 bfd_vma *		    sym_name)
+static int
+arm_section_get_word (struct arm_unw_aux_info *aux,
+		      struct arm_section *arm_sec,
+		      Elf_Internal_Shdr *sec, bfd_vma word_offset,
+		      unsigned int *wordp, struct absaddr *addr)
 {
   Elf_Internal_Rela *rp;
   Elf_Internal_Sym *sym;
@@ -6337,10 +6301,6 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
   addr->section = SHN_UNDEF;
   addr->offset = 0;
 
-  if (sym_name != NULL)
-    *sym_name = (bfd_vma) -1;
-
-  /* If necessary, update the section cache.  */
   if (sec != arm_sec->sec)
     {
       Elf_Internal_Shdr *relsec;
@@ -6361,13 +6321,12 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
 	      || section_headers + relsec->sh_info != sec)
 	    continue;
 
-	  arm_sec->rel_type = relsec->sh_type;
 	  if (relsec->sh_type == SHT_REL)
 	    {
 	      if (!slurp_rel_relocs (aux->file, relsec->sh_offset,
 				     relsec->sh_size,
 				     & arm_sec->rela, & arm_sec->nrelas))
-		return FALSE;
+		return 0;
 	      break;
 	    }
 	  else if (relsec->sh_type == SHT_RELA)
@@ -6375,25 +6334,19 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
 	      if (!slurp_rela_relocs (aux->file, relsec->sh_offset,
 				      relsec->sh_size,
 				      & arm_sec->rela, & arm_sec->nrelas))
-		return FALSE;
+		return 0;
 	      break;
 	    }
-	  else
-	    warn (_("unexpected relocation type (%d) for section %d"),
-		  relsec->sh_type, relsec->sh_info);
 	}
 
       arm_sec->next_rela = arm_sec->rela;
     }
 
-  /* If there is no unwind data we can do nothing.  */
   if (arm_sec->data == NULL)
-    return FALSE;
+    return 0;
 
-  /* Get the word at the required offset.  */
   word = byte_get (arm_sec->data + word_offset, 4);
 
-  /* Look through the relocs to find the one that applies to the provided offset.  */
   wrapped = FALSE;
   for (rp = arm_sec->next_rela; rp != arm_sec->rela + arm_sec->nrelas; rp++)
     {
@@ -6417,6 +6370,31 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
       if (rp->r_offset < word_offset)
 	continue;
 
+      switch (elf_header.e_machine)
+	{
+	case EM_ARM:
+	  relname = elf_arm_reloc_type (ELF32_R_TYPE (rp->r_info));
+	  break;
+
+	case EM_TI_C6000:
+	  relname = elf_tic6x_reloc_type (ELF32_R_TYPE (rp->r_info));
+	  break;
+
+	default:
+	    abort();
+	}
+
+      if (streq (relname, "R_ARM_NONE")
+	  || streq (relname, "R_C6000_NONE"))
+	continue;
+
+      if (!(streq (relname, "R_ARM_PREL31")
+	    || streq (relname, "R_C6000_PREL31")))
+	{
+	  warn (_("Skipping unexpected relocation type %s\n"), relname);
+	  continue;
+	}
+
       sym = aux->symtab + ELF32_R_SYM (rp->r_info);
 
       if (arm_sec->rel_type == SHT_REL)
@@ -6425,67 +6403,31 @@ get_unwind_section_word (struct arm_unw_aux_info *  aux,
 	  if (offset & 0x40000000)
 	    offset |= ~ (bfd_vma) 0x7fffffff;
 	}
-      else if (arm_sec->rel_type == SHT_RELA)
-	offset = rp->r_addend;
       else
-	abort ();
+	offset = rp->r_addend;
 
       offset += sym->st_value;
       prelval = offset - (arm_sec->sec->sh_addr + rp->r_offset);
 
-      /* Check that we are processing the expected reloc type.  */
-      if (elf_header.e_machine == EM_ARM)
-	{
-	  relname = elf_arm_reloc_type (ELF32_R_TYPE (rp->r_info));
-
-	  if (streq (relname, "R_ARM_NONE"))
-	      continue;
-	  
-	  if (! streq (relname, "R_ARM_PREL31"))
-	    {
-	      warn (_("Skipping unexpected relocation type %s\n"), relname);
-	      continue;
-	    }
-	}
-      else if (elf_header.e_machine == EM_TI_C6000)
-	{
-	  relname = elf_tic6x_reloc_type (ELF32_R_TYPE (rp->r_info));
-	  
-	  if (streq (relname, "R_C6000_NONE"))
-	    continue;
-
-	  if (! streq (relname, "R_C6000_PREL31"))
-	    {
-	      warn (_("Skipping unexpected relocation type %s\n"), relname);
-	      continue;
-	    }
-
-	  prelval >>= 1;
-	}
-      else
-	/* This function currently only supports ARM and TI unwinders.  */
-	abort ();
+      if (streq (relname, "R_C6000_PREL31"))
+	prelval >>= 1;
 
       word = (word & ~ (bfd_vma) 0x7fffffff) | (prelval & 0x7fffffff);
       addr->section = sym->st_shndx;
       addr->offset = offset;
-      if (sym_name)
-	* sym_name = sym->st_name;
       break;
     }
 
   *wordp = word;
   arm_sec->next_rela = rp;
 
-  return TRUE;
+  return 1;
 }
 
-static const char *tic6x_unwind_regnames[16] =
-{
-  "A15", "B15", "B14", "B13", "B12", "B11", "B10", "B3", 
-  "A14", "A13", "A12", "A11", "A10", 
-  "[invalid reg 13]", "[invalid reg 14]", "[invalid reg 15]"
-};
+static const char *tic6x_unwind_regnames[16] = {
+    "A15", "B15", "B14", "B13", "B12", "B11", "B10", "B3", 
+    "A14", "A13", "A12", "A11", "A10", 
+    "[invalid reg 13]", "[invalid reg 14]", "[invalid reg 15]"};
 
 static void
 decode_tic6x_unwind_regmask (unsigned int mask)
@@ -6507,8 +6449,8 @@ decode_tic6x_unwind_regmask (unsigned int mask)
   if (remaining == 0 && more_words)				\
     {								\
       data_offset += 4;						\
-      if (! get_unwind_section_word (aux, data_arm_sec, data_sec,	\
-				     data_offset, & word, & addr, NULL))	\
+      if (!arm_section_get_word (aux, data_arm_sec, data_sec,	\
+				 data_offset, &word, &addr))	\
 	return;							\
       remaining = 4;						\
       more_words--;						\
@@ -6612,7 +6554,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux,
 	    }
 	  if (op & 0x08)
 	    {
-	      if (!first)
+	      if (first)
 		printf (", ");
 	      printf ("r14");
 	    }
@@ -6757,12 +6699,12 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux,
       op = word >> 24;
       word <<= 8;
 
-      printf ("  0x%02x ", op);
+      printf (_("  0x%02x "), op);
 
       if ((op & 0xc0) == 0x00)
 	{
 	  int offset = ((op & 0x3f) << 3) + 8;
-	  printf ("     sp = sp + %d", offset);
+	  printf (_("     sp = sp + %d"), offset);
 	}
       else if ((op & 0xc0) == 0x80)
 	{
@@ -6787,8 +6729,7 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux,
 	  unsigned int nregs;
 	  unsigned int i;
 	  const char *name;
-	  struct
-	  {
+	  struct {
 	      unsigned int offset;
 	      unsigned int reg;
 	  } regpos[16];
@@ -6845,7 +6786,6 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux,
 	  unsigned char buf[9];
 	  unsigned int i, len;
 	  unsigned long offset;
-
 	  for (i = 0; i < sizeof (buf); i++)
 	    {
 	      GET_OP (buf[i]);
@@ -6874,7 +6814,7 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux,
 }
 
 static bfd_vma
-arm_expand_prel31 (bfd_vma word, bfd_vma where)
+expand_prel31 (bfd_vma word, bfd_vma where)
 {
   bfd_vma offset;
 
@@ -6889,29 +6829,21 @@ arm_expand_prel31 (bfd_vma word, bfd_vma where)
 }
 
 static void
-decode_arm_unwind (struct arm_unw_aux_info *  aux,
-		   unsigned int               word,
-		   unsigned int               remaining,
-		   bfd_vma                    data_offset,
-		   Elf_Internal_Shdr *        data_sec,
-		   struct arm_section *       data_arm_sec)
+decode_arm_unwind (struct arm_unw_aux_info *aux,
+		   unsigned int word, unsigned int remaining,
+		   bfd_vma data_offset, Elf_Internal_Shdr *data_sec,
+		   struct arm_section *data_arm_sec)
 {
   int per_index;
   unsigned int more_words = 0;
   struct absaddr addr;
-  bfd_vma sym_name = (bfd_vma) -1;
 
   if (remaining == 0)
     {
-      /* Fetch the first word.
-	 Note - when decoding an object file the address extracted
-	 here will always be 0.  So we also pass in the sym_name
-	 parameter so that we can find the symbol associated with
-	 the personality routine.  */
-      if (! get_unwind_section_word (aux, data_arm_sec, data_sec, data_offset,
-				     & word, & addr, & sym_name))
+      /* Fetch the first word.  */
+      if (!arm_section_get_word (aux, data_arm_sec, data_sec, data_offset,
+				 &word, &addr))
 	return;
-
       remaining = 4;
     }
 
@@ -6921,23 +6853,9 @@ decode_arm_unwind (struct arm_unw_aux_info *  aux,
       bfd_vma fn;
       const char *procname;
 
-      fn = arm_expand_prel31 (word, data_sec->sh_addr + data_offset);
+      fn = expand_prel31 (word, data_sec->sh_addr + data_offset);
       printf (_("  Personality routine: "));
-      if (fn == 0
-	  && addr.section == SHN_UNDEF && addr.offset == 0
-	  && sym_name != (bfd_vma) -1 && sym_name < aux->strtab_size)
-	{
-	  procname = aux->strtab + sym_name;
-	  print_vma (fn, PREFIX_HEX);
-	  if (procname)
-	    {
-	      fputs (" <", stdout);
-	      fputs (procname, stdout);
-	      fputc ('>', stdout);
-	    }
-	}
-      else
-	procname = arm_print_vma_and_name (aux, fn, addr);
+      procname = arm_print_vma_and_name (aux, fn, addr);
       fputc ('\n', stdout);
 
       /* The GCC personality routines use the standard compact
@@ -6967,20 +6885,9 @@ decode_arm_unwind (struct arm_unw_aux_info *  aux,
     }
   else
     {
-      /* ARM EHABI Section 6.3:
-	 
-	 An exception-handling table entry for the compact model looks like:
-	 
-           31 30-28 27-24 23-0
-	   -- ----- ----- ----
-            1   0   index Data for personalityRoutine[index]    */
-
-      if (elf_header.e_machine == EM_ARM
-	  && (word & 0x70000000))
-	warn (_("Corrupt ARM compact model table entry: %x \n"), word);
-
+      
       per_index = (word >> 24) & 0x7f;
-      printf (_("  Compact model index: %d\n"), per_index);
+      printf (_("  Compact model %d\n"), per_index);
       if (per_index == 0)
 	{
 	  more_words = 0;
@@ -7004,17 +6911,14 @@ decode_arm_unwind (struct arm_unw_aux_info *  aux,
 				      data_offset, data_sec, data_arm_sec);
 	}
       else
-	{
-	  warn (_("Unknown ARM compact model index encountered\n"));
-	  printf (_("  [reserved]\n"));
-	}
+	printf ("  [reserved]\n");
       break;
 
     case EM_TI_C6000:
       if (per_index < 3)
 	{
 	  decode_tic6x_unwind_bytecode (aux, word, remaining, more_words,
-					data_offset, data_sec, data_arm_sec);
+				      data_offset, data_sec, data_arm_sec);
 	}
       else if (per_index < 5)
 	{
@@ -7031,12 +6935,11 @@ decode_arm_unwind (struct arm_unw_aux_info *  aux,
 		  tic6x_unwind_regnames[word & 0xf]);
 	}
       else
-	printf (_("  [reserved (%d)]\n"), per_index);
+	printf ("  [reserved]\n");
       break;
 
     default:
-      error (_("Unsupported architecture type %d encountered when decoding unwind table"),
-	     elf_header.e_machine);
+      abort ();
     }
 
   /* Decode the descriptors.  Not implemented.  */
@@ -7060,25 +6963,19 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
 
       fputc ('\n', stdout);
 
-      if (! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec,
-				     8 * i, & exidx_fn, & fn_addr, NULL)
-	  || ! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec,
-					8 * i + 4, & exidx_entry, & entry_addr, NULL))
+      if (!arm_section_get_word (aux, &exidx_arm_sec, exidx_sec,
+				 8 * i, &exidx_fn, &fn_addr)
+	  || !arm_section_get_word (aux, &exidx_arm_sec, exidx_sec,
+				    8 * i + 4, &exidx_entry, &entry_addr))
 	{
-	  arm_free_section (& exidx_arm_sec);
-	  arm_free_section (& extab_arm_sec);
+	  arm_free_section (&exidx_arm_sec);
+	  arm_free_section (&extab_arm_sec);
 	  return;
 	}
 
-      /* ARM EHABI, Section 5:
-	 An index table entry consists of 2 words.
-         The first word contains a prel31 offset to the start of a function, with bit 31 clear.  */
-      if (exidx_fn & 0x80000000)
-	warn (_("corrupt index table entry: %x\n"), exidx_fn);
-
-      fn = arm_expand_prel31 (exidx_fn, exidx_sec->sh_addr + 8 * i);
+      fn = expand_prel31 (exidx_fn, exidx_sec->sh_addr + 8 * i);
 
-      arm_print_vma_and_name (aux, fn, fn_addr);
+      arm_print_vma_and_name (aux, fn, entry_addr);
       fputs (": ", stdout);
 
       if (exidx_entry == 1)
@@ -7098,7 +6995,7 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
 	  Elf_Internal_Shdr *table_sec;
 
 	  fputs ("@", stdout);
-	  table = arm_expand_prel31 (exidx_entry, exidx_sec->sh_addr + 8 * i + 4);
+	  table = expand_prel31 (exidx_entry, exidx_sec->sh_addr + 8 * i + 4);
 	  print_vma (table, PREFIX_HEX);
 	  printf ("\n");
 
@@ -7133,8 +7030,7 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec)
 }
 
 /* Used for both ARM and C6X unwinding tables.  */
-
-static void
+static int
 arm_process_unwind (FILE *file)
 {
   struct arm_unw_aux_info aux;
@@ -7144,6 +7040,9 @@ arm_process_unwind (FILE *file)
   unsigned long i;
   unsigned int sec_type;
 
+  memset (& aux, 0, sizeof (aux));
+  aux.file = file;
+
   switch (elf_header.e_machine)
     {
     case EM_ARM:
@@ -7154,23 +7053,19 @@ arm_process_unwind (FILE *file)
       sec_type = SHT_C6000_UNWIND;
       break;
 
-    default: 
-      error (_("Unsupported architecture type %d encountered when processing unwind table"),
-	     elf_header.e_machine);
-      return;
+    default:
+	abort();
     }
 
   if (string_table == NULL)
-    return;
-
-  memset (& aux, 0, sizeof (aux));
-  aux.file = file;
+    return 1;
 
   for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec)
     {
       if (sec->sh_type == SHT_SYMTAB && sec->sh_link < elf_header.e_shnum)
 	{
-	  aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms);
+	  aux.nsyms = sec->sh_size / sec->sh_entsize;
+	  aux.symtab = GET_ELF_SYMBOLS (file, sec);
 
 	  strsec = section_headers + sec->sh_link;
 	  assert (aux.strtab == NULL);
@@ -7182,35 +7077,37 @@ arm_process_unwind (FILE *file)
 	unwsec = sec;
     }
 
-  if (unwsec == NULL)
+  if (!unwsec)
     printf (_("\nThere are no unwind sections in this file.\n"));
-  else
-    for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec)
-      {
-	if (sec->sh_type == sec_type)
-	  {
-	    printf (_("\nUnwind table index '%s' at offset 0x%lx contains %lu entries:\n"),
-		    SECTION_NAME (sec),
-		    (unsigned long) sec->sh_offset,
-		    (unsigned long) (sec->sh_size / (2 * eh_addr_size)));
 
-	    dump_arm_unwind (&aux, sec);
-	  }
-      }
+  for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec)
+    {
+      if (sec->sh_type == sec_type)
+	{
+	  printf (_("\nUnwind table index '%s' at offset 0x%lx contains %lu entries:\n"),
+		  SECTION_NAME (sec),
+		  (unsigned long) sec->sh_offset,
+		  (unsigned long) (sec->sh_size / (2 * eh_addr_size)));
+
+	  dump_arm_unwind (&aux, sec);
+	}
+    }
 
   if (aux.symtab)
     free (aux.symtab);
   if (aux.strtab)
     free ((char *) aux.strtab);
+
+  return 1;
 }
 
-static void
+static int
 process_unwind (FILE * file)
 {
   struct unwind_handler
   {
     int machtype;
-    void (* handler)(FILE *);
+    int (* handler)(FILE *);
   } handlers[] =
   {
     { EM_ARM, arm_process_unwind },
@@ -7222,14 +7119,14 @@ process_unwind (FILE * file)
   int i;
 
   if (!do_unwind)
-    return;
+    return 1;
 
   for (i = 0; handlers[i].handler != NULL; i++)
     if (elf_header.e_machine == handlers[i].machtype)
       return handlers[i].handler (file);
 
-  printf (_("\nThe decoding of unwind sections for machine type %s is not currently supported.\n"),
-	  get_machine_name (elf_header.e_machine));
+  printf (_("\nThere are no unwind sections in this file.\n"));
+  return 1;
 }
 
 static void
@@ -7239,7 +7136,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
     {
     case DT_MIPS_FLAGS:
       if (entry->d_un.d_val == 0)
-	printf (_("NONE"));
+	printf (_("NONE\n"));
       else
 	{
 	  static const char * opts[] =
@@ -7259,14 +7156,15 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
 		printf ("%s%s", first ? "" : " ", opts[cnt]);
 		first = 0;
 	      }
+	  puts ("");
 	}
       break;
 
     case DT_MIPS_IVERSION:
       if (VALID_DYNAMIC_NAME (entry->d_un.d_val))
-	printf (_("Interface Version: %s"), GET_DYNAMIC_NAME (entry->d_un.d_val));
+	printf (_("Interface Version: %s\n"), GET_DYNAMIC_NAME (entry->d_un.d_val));
       else
-	printf (_("<corrupt: %" BFD_VMA_FMT "d>"), entry->d_un.d_ptr);
+	printf (_("<corrupt: %ld>\n"), (long) entry->d_un.d_ptr);
       break;
 
     case DT_MIPS_TIME_STAMP:
@@ -7279,7 +7177,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
 	snprintf (timebuf, sizeof (timebuf), "%04u-%02u-%02uT%02u:%02u:%02u",
 		  tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
 		  tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-	printf (_("Time Stamp: %s"), timebuf);
+	printf (_("Time Stamp: %s\n"), timebuf);
       }
       break;
 
@@ -7296,13 +7194,12 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
     case DT_MIPS_DELTA_SYM_NO:
     case DT_MIPS_DELTA_CLASSSYM_NO:
     case DT_MIPS_COMPACT_SIZE:
-      print_vma (entry->d_un.d_ptr, DEC);
+      printf ("%ld\n", (long) entry->d_un.d_ptr);
       break;
 
     default:
-      print_vma (entry->d_un.d_ptr, PREFIX_HEX);
+      printf ("%#lx\n", (unsigned long) entry->d_un.d_ptr);
     }
-    putchar ('\n');
 }
 
 static void
@@ -7629,12 +7526,14 @@ process_dynamic_section (FILE * file)
 	  else
 	    section.sh_entsize = sizeof (Elf64_External_Sym);
 
-	  dynamic_symbols = GET_ELF_SYMBOLS (file, &section, & num_dynamic_syms);
+	  num_dynamic_syms = section.sh_size / section.sh_entsize;
 	  if (num_dynamic_syms < 1)
 	    {
 	      error (_("Unable to determine the number of symbols to load\n"));
 	      continue;
 	    }
+
+	  dynamic_symbols = GET_ELF_SYMBOLS (file, &section);
 	}
     }
 
@@ -8335,7 +8234,7 @@ process_version_sections (FILE * file)
 	    eneed = (Elf_External_Verneed *) get_data (NULL, file,
                                                        section->sh_offset, 1,
                                                        section->sh_size,
-                                                       _("Version Needs section"));
+                                                       _("version need section"));
 	    if (!eneed)
 	      break;
 	    endbuf = (char *) eneed + section->sh_size;
@@ -8412,15 +8311,13 @@ process_version_sections (FILE * file)
 		    isum   += aux.vna_next;
 		    vstart += aux.vna_next;
 		  }
-
 		if (j < ent.vn_cnt)
-		  warn (_("Missing Version Needs auxillary information\n"));
+		  printf (_("  Version need aux past end of section\n"));
 
 		idx += ent.vn_next;
 	      }
-
 	    if (cnt < section->sh_info)
-	      warn (_("Missing Version Needs information\n"));
+	      printf (_("  Version need past end of section\n"));
 
 	    free (eneed);
 	  }
@@ -8436,7 +8333,6 @@ process_version_sections (FILE * file)
 	    char * strtab;
 	    Elf_Internal_Sym * symbols;
 	    Elf_Internal_Shdr * string_sec;
-	    unsigned long num_syms;
 	    long off;
 
 	    if (section->sh_link >= elf_header.e_shnum)
@@ -8450,7 +8346,7 @@ process_version_sections (FILE * file)
 
 	    found = 1;
 
-	    symbols = GET_ELF_SYMBOLS (file, link_section, & num_syms);
+	    symbols = GET_ELF_SYMBOLS (file, link_section);
 	    if (symbols == NULL)
 	      break;
 
@@ -8519,8 +8415,10 @@ process_version_sections (FILE * file)
 				   data[cnt + j] & VERSYM_HIDDEN ? 'h' : ' ');
 
 		      /* If this index value is greater than the size of the symbols
-		         array, break to avoid an out-of-bounds read.  */
-		      if ((unsigned long)(cnt + j) >= num_syms)
+		         array, break to avoid an out-of-bounds read,  */
+		      if ((unsigned long)(cnt + j) >=
+		         ((unsigned long)link_section->sh_size /
+			  (unsigned long)link_section->sh_entsize))
 		        {
 		          warn (_("invalid index into symbol array\n"));
 		          break;
@@ -8755,7 +8653,6 @@ get_symbol_type (unsigned int type)
 
 	  if (type == STT_GNU_IFUNC
 	      && (elf_header.e_ident[EI_OSABI] == ELFOSABI_GNU
-		  || elf_header.e_ident[EI_OSABI] == ELFOSABI_FREEBSD
 		  /* GNU is still using the default value 0.  */
 		  || elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE))
 	    return "IFUNC";
@@ -9253,7 +9150,6 @@ process_symbol_table (FILE * file)
 	  unsigned long int strtab_size = 0;
 	  Elf_Internal_Sym * symtab;
 	  Elf_Internal_Sym * psym;
-	  unsigned long num_syms;
 
 	  if ((section->sh_type != SHT_SYMTAB
 	       && section->sh_type != SHT_DYNSYM)
@@ -9277,7 +9173,7 @@ process_symbol_table (FILE * file)
 	  else
 	    printf (_("   Num:    Value          Size Type    Bind   Vis      Ndx Name\n"));
 
-	  symtab = GET_ELF_SYMBOLS (file, section, & num_syms);
+	  symtab = GET_ELF_SYMBOLS (file, section);
 	  if (symtab == NULL)
 	    continue;
 
@@ -9298,7 +9194,9 @@ process_symbol_table (FILE * file)
 	      strtab_size = strtab != NULL ? string_sec->sh_size : 0;
 	    }
 
-	  for (si = 0, psym = symtab; si < num_syms; si++, psym++)
+	  for (si = 0, psym = symtab;
+	       si < section->sh_size / section->sh_entsize;
+	       si++, psym++)
 	    {
 	      printf ("%6d: ", si);
 	      print_vma (psym->st_value, LONG_HEX);
@@ -9771,8 +9669,6 @@ is_32bit_abs_reloc (unsigned int reloc_type)
     case EM_AVR_OLD:
     case EM_AVR:
       return reloc_type == 1;
-    case EM_ADAPTEVA_EPIPHANY:
-      return reloc_type == 3;
     case EM_BLACKFIN:
       return reloc_type == 0x12; /* R_byte4_data.  */
     case EM_CRIS:
@@ -9852,8 +9748,6 @@ is_32bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 1; /* R_PPC64_ADDR32.  */
     case EM_PPC:
       return reloc_type == 1; /* R_PPC_ADDR32.  */
-    case EM_RL78:
-      return reloc_type == 1; /* R_RL78_DIR32.  */
     case EM_RX:
       return reloc_type == 1; /* R_RX_DIR32.  */
     case EM_S370:
@@ -9915,8 +9809,6 @@ is_32bit_pcrel_reloc (unsigned int reloc_type)
       return reloc_type == 2;  /* R_386_PC32.  */
     case EM_68K:
       return reloc_type == 4;  /* R_68K_PC32.  */
-    case EM_ADAPTEVA_EPIPHANY:
-      return reloc_type == 6;
     case EM_ALPHA:
       return reloc_type == 10; /* R_ALPHA_SREL32.  */
     case EM_ARM:
@@ -10058,8 +9950,6 @@ is_16bit_abs_reloc (unsigned int reloc_type)
     case EM_AVR_OLD:
     case EM_AVR:
       return reloc_type == 4; /* R_AVR_16.  */
-    case EM_ADAPTEVA_EPIPHANY:
-      return reloc_type == 5;
     case EM_CYGNUS_D10V:
     case EM_D10V:
       return reloc_type == 3; /* R_D10V_16.  */
@@ -10084,9 +9974,6 @@ is_16bit_abs_reloc (unsigned int reloc_type)
     case EM_XC16X:
     case EM_C166:
       return reloc_type == 2; /* R_XC16C_ABS_16.  */
-    case EM_CYGNUS_MN10300:
-    case EM_MN10300:
-      return reloc_type == 2; /* R_MN10300_16.  */
     default:
       return FALSE;
     }
@@ -10108,7 +9995,6 @@ is_none_reloc (unsigned int reloc_type)
     case EM_MIPS:    /* R_MIPS_NONE.  */
     case EM_PARISC:  /* R_PARISC_NONE.  */
     case EM_ALPHA:   /* R_ALPHA_NONE.  */
-    case EM_ADAPTEVA_EPIPHANY:
     case EM_PPC:     /* R_PPC_NONE.  */
     case EM_PPC64:   /* R_PPC64_NONE.  */
     case EM_ARM:     /* R_ARM_NONE.  */
@@ -10166,7 +10052,6 @@ apply_relocations (void * file,
       Elf_Internal_Rela * rp;
       Elf_Internal_Shdr * symsec;
       Elf_Internal_Sym * symtab;
-      unsigned long num_syms;
       Elf_Internal_Sym * sym;
 
       if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL)
@@ -10196,7 +10081,7 @@ apply_relocations (void * file,
 	is_rela = FALSE;
 
       symsec = section_headers + relsec->sh_link;
-      symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec, & num_syms);
+      symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec);
 
       for (rp = relocs; rp < relocs + num_relocs; ++rp)
 	{
@@ -10204,7 +10089,6 @@ apply_relocations (void * file,
 	  unsigned int    reloc_type;
 	  unsigned int    reloc_size;
 	  unsigned char * rloc;
-	  unsigned long   sym_index;
 
 	  reloc_type = get_reloc_type (rp->r_info);
 
@@ -10238,14 +10122,7 @@ apply_relocations (void * file,
 	      continue;
 	    }
 
-	  sym_index = (unsigned long) get_reloc_symindex (rp->r_info);
-	  if (sym_index >= num_syms)
-	    {
-	      warn (_("skipping invalid relocation symbol index 0x%lx in section %s\n"),
-		    sym_index, SECTION_NAME (section));
-	      continue;
-	    }
-	  sym = symtab + sym_index;
+	  sym = symtab + get_reloc_symindex (rp->r_info);
 
 	  /* If the reloc has a symbol associated with it,
 	     make sure that it is of an appropriate type.
@@ -11896,7 +11773,7 @@ process_mips_specific (FILE * file)
       elib = (Elf32_External_Lib *) get_data (NULL, file, liblist_offset,
                                               liblistno,
                                               sizeof (Elf32_External_Lib),
-                                              _("liblist section data"));
+                                              _("liblist"));
       if (elib)
 	{
 	  printf (_("\nSection '.liblist' contains %lu entries:\n"),
@@ -12252,8 +12129,7 @@ process_mips_specific (FILE * file)
 
       offset = offset_from_vma (file, pltgot, global_end - pltgot);
       data = (unsigned char *) get_data (NULL, file, offset,
-                                         global_end - pltgot, 1,
-					 _("Global Offset Table data"));
+                                         global_end - pltgot, 1, _("GOT"));
       if (data == NULL)
 	return 0;
 
@@ -12297,14 +12173,9 @@ process_mips_specific (FILE * file)
 
 	  printf (_(" Global entries:\n"));
 	  printf ("  %*s %10s %*s %*s %-7s %3s %s\n",
-		  addr_size * 2, _("Address"),
-		  _("Access"),
+		  addr_size * 2, _("Address"), _("Access"),
 		  addr_size * 2, _("Initial"),
-		  addr_size * 2, _("Sym.Val."),
-		  _("Type"),
-		  /* Note for translators: "Ndx" = abbreviated form of "Index".  */
-		  _("Ndx"), _("Name"));
-	  
+		  addr_size * 2, _("Sym.Val."), _("Type"), _("Ndx"), _("Name"));
 	  sym_width = (is_32bit_elf ? 80 : 160) - 28 - addr_size * 6 - 1;
 	  for (i = gotsym; i < symtabno; i++)
 	    {
@@ -12357,11 +12228,11 @@ process_mips_specific (FILE * file)
 
       offset = offset_from_vma (file, mips_pltgot, end - mips_pltgot);
       data = (unsigned char *) get_data (NULL, file, offset, end - mips_pltgot,
-                                         1, _("Procedure Linkage Table data"));
+                                         1, _("PLT GOT"));
       if (data == NULL)
 	return 0;
 
-      printf ("\nPLT GOT:\n\n");
+      printf (_("\nPLT GOT:\n\n"));
       printf (_(" Reserved entries:\n"));
       printf (_("  %*s %*s Purpose\n"),
 	      addr_size * 2, _("Address"), addr_size * 2, _("Initial"));
@@ -12430,7 +12301,7 @@ process_gnu_liblist (FILE * file)
 
 	  elib = (Elf32_External_Lib *)
               get_data (NULL, file, section->sh_offset, 1, section->sh_size,
-                        _("liblist section data"));
+                        _("liblist"));
 
 	  if (elib == NULL)
 	    break;
@@ -12598,7 +12469,7 @@ print_gnu_note (Elf_Internal_Note *pnote)
 	printf (_("    Build ID: "));
 	for (i = 0; i < pnote->descsz; ++i)
 	  printf ("%02x", pnote->descdata[i] & 0xff);
-	printf ("\n");
+	printf (_("\n"));
       }
       break;
 
@@ -12700,7 +12571,7 @@ get_netbsd_elfcore_note_type (unsigned e_type)
 	}
     }
 
-  snprintf (buff, sizeof (buff), "PT_FIRSTMACH+%d",
+  snprintf (buff, sizeof (buff), _("PT_FIRSTMACH+%d"),
 	    e_type - NT_NETBSDCORE_FIRSTMACH);
   return buff;
 }
@@ -12754,7 +12625,7 @@ print_stapsdt_note (Elf_Internal_Note *pnote)
   print_vma (base_addr, FULL_HEX);
   printf (_(", Semaphore: "));
   print_vma (semaphore, FULL_HEX);
-  printf ("\n");
+  printf (_("\n"));
   printf (_("    Arguments: %s\n"), arg_fmt);
 
   return data == data_end;
@@ -12774,13 +12645,13 @@ get_ia64_vms_note_type (unsigned e_type)
     case NT_VMS_SRC:
       return _("NT_VMS_SRC (source files)");
     case NT_VMS_TITLE:
-      return "NT_VMS_TITLE";
+      return _("NT_VMS_TITLE");
     case NT_VMS_EIDC:
       return _("NT_VMS_EIDC (consistency check)");
     case NT_VMS_FPMODE:
       return _("NT_VMS_FPMODE (FP mode)");
     case NT_VMS_LINKTIME:
-      return "NT_VMS_LINKTIME";
+      return _("NT_VMS_LINKTIME");
     case NT_VMS_IMGNAM:
       return _("NT_VMS_IMGNAM (image name)");
     case NT_VMS_IMGID:
@@ -12792,9 +12663,9 @@ get_ia64_vms_note_type (unsigned e_type)
     case NT_VMS_GSTNAM:
       return _("NT_VMS_GSTNAM (sym table name)");
     case NT_VMS_ORIG_DYN:
-      return "NT_VMS_ORIG_DYN";
+      return _("NT_VMS_ORIG_DYN");
     case NT_VMS_PATCHTIME:
-      return "NT_VMS_PATCHTIME";
+      return _("NT_VMS_PATCHTIME");
     default:
       snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type);
       return buff;
@@ -12823,8 +12694,7 @@ print_ia64_vms_note (Elf_Internal_Note * pnote)
       break;
 #ifdef BFD64
     case NT_VMS_FPMODE:
-      printf (_("   Floating Point mode: "));
-      printf ("0x%016" BFD_VMA_FMT "x\n",
+      printf (_("   FP mode: 0x%016" BFD_VMA_FMT "x\n"),
               (bfd_vma)byte_get ((unsigned char *)pnote->descdata, 8));
       break;
     case NT_VMS_LINKTIME:
@@ -12843,11 +12713,11 @@ print_ia64_vms_note (Elf_Internal_Note * pnote)
       printf (_("   Major id: %u,  minor id: %u\n"),
               (unsigned) byte_get ((unsigned char *)pnote->descdata, 4),
               (unsigned) byte_get ((unsigned char *)pnote->descdata + 4, 4));
-      printf (_("   Last modified  : "));
+      printf (_("   Manip date  : "));
       print_vms_time
         ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata + 8, 8));
-      printf (_("\n   Link flags  : "));
-      printf ("0x%016" BFD_VMA_FMT "x\n",
+      printf (_("\n"
+                "   Link flags  : 0x%016" BFD_VMA_FMT "x\n"),
               (bfd_vma)byte_get ((unsigned char *)pnote->descdata + 16, 8));
       printf (_("   Header flags: 0x%08x\n"),
               (unsigned)byte_get ((unsigned char *)pnote->descdata + 24, 4));
@@ -12995,7 +12865,7 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
       external = next;
 
       /* Prevent out-of-bounds indexing.  */
-      if (inote.namedata + inote.namesz > (char *) pnotes + length
+      if (inote.namedata + inote.namesz >= (char *) pnotes + length
 	  || inote.namedata + inote.namesz < inote.namedata)
         {
           warn (_("corrupt note found at offset %lx into core notes\n"),
@@ -13009,7 +12879,7 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length)
 	 one version of Linux (RedHat 6.0) generates corefiles that don't
 	 comply with the ELF spec by failing to include the null byte in
 	 namesz.  */
-      if (inote.namedata[inote.namesz - 1] != '\0')
+      if (inote.namedata[inote.namesz] != '\0')
 	{
 	  temp = (char *) malloc (inote.namesz + 1);
 
@@ -13072,7 +12942,7 @@ process_note_sections (FILE * file)
   int res = 1;
 
   for (i = 0, section = section_headers;
-       i < elf_header.e_shnum && section != NULL;
+       i < elf_header.e_shnum;
        i++, section++)
     if (section->sh_type == SHT_NOTE)
       res &= process_corefile_note_segment (file,
diff --git a/binutils/rename.c b/binutils/rename.c
index 5923a3f4ce..c07150c955 100644
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -22,6 +22,8 @@
 #include "bfd.h"
 #include "bucomm.h"
 
+#include <sys/stat.h>
+
 #ifdef HAVE_GOOD_UTIME_H
 #include <utime.h>
 #else /* ! HAVE_GOOD_UTIME_H */
diff --git a/binutils/resbin.c b/binutils/resbin.c
index b5dcd9b5f2..b3682f72ad 100644
--- a/binutils/resbin.c
+++ b/binutils/resbin.c
@@ -1,5 +1,5 @@
 /* resbin.c -- manipulate the Windows binary resource format.
-   Copyright 1997, 1998, 1999, 2002, 2003, 2005, 2006, 2007, 2009, 2010, 2011
+   Copyright 1997, 1998, 1999, 2002, 2003, 2005, 2006, 2007, 2009, 2010
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Rewritten by Kai Tietz, Onevision.
@@ -1027,7 +1027,7 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt
 
       if (ch == 'S')
 	{
-	  rc_ver_stringtable **ppvst;
+	  rc_ver_stringinfo **ppvs;
 
 	  vi->type = VERINFO_STRING;
 
@@ -1041,54 +1041,36 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt
 	  data += off;
 	  length -= off;
 
-	  /* It's convenient to round verlen to a 4 byte alignment,
-             since we round the subvariables in the loop.  */
-
-	  verlen = (verlen + 3) &~ 3;
-
-	  vi->u.string.stringtables = NULL;
-	  ppvst = &vi->u.string.stringtables;
-
-	  while (verlen > 0)
-	    {
-	      rc_ver_stringtable *vst;
-	      rc_uint_type stverlen;
-	      rc_ver_stringinfo **ppvs;
-
-	      if (length < 8)
-		toosmall (_("version stringtable"));
-
-	      vst = (rc_ver_stringtable *) res_alloc (sizeof (rc_ver_stringtable));
+	  get_version_header (wrbfd, data, length, (const char *) NULL,
+			      &vi->u.string.language, &verlen, &vallen,
+			      &type, &off);
 
-	      get_version_header (wrbfd, data, length, (const char *) NULL,
-				  &vst->language, &stverlen, &vallen, &type, &off);
+	  if (vallen != 0)
+	    fatal (_("unexpected version stringtable value length %ld"), (long) vallen);
 
-	      if (vallen != 0)
-		fatal (_("unexpected version stringtable value length %ld"), (long) vallen);
+	  data += off;
+	  length -= off;
+	  verlen -= off;
 
-	      data += off;
-	      length -= off;
-	      verlen -= off;
+	  vi->u.string.strings = NULL;
+	  ppvs = &vi->u.string.strings;
 
-	  stverlen = (stverlen + 3) &~ 3;
- 
-	  vst->strings = NULL;
-	  ppvs = &vst->strings;
+	  /* It's convenient to round verlen to a 4 byte alignment,
+             since we round the subvariables in the loop.  */
+	  verlen = (verlen + 3) &~ 3;
 
-	  while (stverlen > 0)
+	  while (verlen > 0)
 	    {
 	      rc_ver_stringinfo *vs;
-	      rc_uint_type sverlen, vslen, valoff;
-
-	      if (length < 8)
-		toosmall (_("version string"));
+	      rc_uint_type subverlen, vslen, valoff;
 
-	      vs = (rc_ver_stringinfo *) res_alloc (sizeof (rc_ver_stringinfo));
+	      vs = (rc_ver_stringinfo *) res_alloc (sizeof *vs);
 
-	      get_version_header (wrbfd, data, length, (const char *) NULL,
-				  &vs->key, &sverlen, &vallen, &type, &off);
+	      get_version_header (wrbfd, data, length,
+				  (const char *) NULL, &vs->key, &subverlen,
+				  &vallen, &type, &off);
 
-	      sverlen = (sverlen + 3) &~ 3;
+	      subverlen = (subverlen + 3) &~ 3;
 
 	      data += off;
 	      length -= off;
@@ -1097,26 +1079,22 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt
 	      valoff = vslen * 2 + 2;
 	      valoff = (valoff + 3) &~ 3;
 
-	      if (off + valoff != sverlen)
+	      if (off + valoff != subverlen)
 		fatal (_("unexpected version string length %ld != %ld + %ld"),
-		       (long) sverlen, (long) off, (long) valoff);
+		       (long) subverlen, (long) off, (long) valoff);
+
+	      vs->next = NULL;
+	      *ppvs = vs;
+	      ppvs = &vs->next;
 
 	      data += valoff;
 	      length -= valoff;
 
-	      if (stverlen < sverlen)
+	      if (verlen < subverlen)
 		fatal (_("unexpected version string length %ld < %ld"),
-		       (long) verlen, (long) sverlen);
-	      stverlen -= sverlen;
-
-	      vs->next = NULL;
-	      *ppvs = vs;
-	      ppvs = &vs->next;
-	    }
+		       (long) verlen, (long) subverlen);
 
-	  vst->next = NULL;
-	  *ppvst = vst;
-	  ppvst = &vst->next;
+	      verlen -= subverlen;
 	    }
 	}
       else if (ch == 'V')
@@ -2027,62 +2005,52 @@ res_to_bin_versioninfo (windres_bfd *wrbfd, rc_uint_type off,
 	  abort ();
 	case VERINFO_STRING:
 	  {
-	    const rc_ver_stringtable *vst;
+	    struct bin_ver_info bvsd;
+	    rc_uint_type vs_off;
+	    const rc_ver_stringinfo *vs;
 
 	    off = string_to_unicode_bin (wrbfd, off, "StringFileInfo");
+	    off += (4 - ((off - off_delta) & 3)) & 3;
+
+	    vs_off = off;
+
+	    off += BIN_VER_INFO_SIZE;
 
-	    if (!vi->u.string.stringtables)
-	      off += (4 - ((off - off_delta) & 3)) & 3;
+	    off = unicode_to_bin (wrbfd, off, vi->u.string.language);
 
-	    for (vst = vi->u.string.stringtables; vst != NULL; vst = vst->next)
+	    for (vs = vi->u.string.strings; vs != NULL; vs = vs->next)
 	      {
-		struct bin_ver_info bvst;
-		rc_uint_type vst_off;
-		const rc_ver_stringinfo *vs;
+		struct bin_ver_info bvss;
+		rc_uint_type vss_off,str_off;
 
 		off += (4 - ((off - off_delta) & 3)) & 3;
 
-		vst_off = off;
+		vss_off = off;
 		off += BIN_VER_INFO_SIZE;
 
-		off = unicode_to_bin (wrbfd, off, vst->language);
-
-		for (vs = vst->strings; vs != NULL; vs = vs->next)
-		  {
-		    struct bin_ver_info bvs;
-		    rc_uint_type vs_off, str_off;
+		off = unicode_to_bin (wrbfd, off, vs->key);
 
-		    off += (4 - ((off - off_delta) & 3)) & 3;
-
-		    vs_off = off;
-		    off += BIN_VER_INFO_SIZE;
-
-		    off = unicode_to_bin (wrbfd, off, vs->key);
-
-		    off += (4 - ((off - off_delta) & 3)) & 3;
-
-		    str_off = off;
-		    off = unicode_to_bin (wrbfd, off, vs->value);
-
-		    if (wrbfd)
-		      {
-			windres_put_16 (wrbfd, bvs.size, off - vs_off);
-			windres_put_16 (wrbfd, bvs.sig1, (off - str_off) / 2);
-			windres_put_16 (wrbfd, bvs.sig2, 1);
-			set_windres_bfd_content (wrbfd, &bvs, vs_off,
-						 BIN_VER_INFO_SIZE);
-		      }
-		  }
+		off += (4 - ((off - off_delta) & 3)) & 3;
 
+		str_off = off;
+		off = unicode_to_bin (wrbfd, off, vs->value);
 		if (wrbfd)
 		  {
-		    windres_put_16 (wrbfd, bvst.size, off - vst_off);
-		    windres_put_16 (wrbfd, bvst.sig1, 0);
-		    windres_put_16 (wrbfd, bvst.sig2, 1);
-		    set_windres_bfd_content (wrbfd, &bvst, vst_off,
-					     BIN_VER_INFO_SIZE);
+		    windres_put_16 (wrbfd, bvss.size, off - vss_off);
+		    windres_put_16 (wrbfd, bvss.sig1, (off - str_off) / 2);
+		    windres_put_16 (wrbfd, bvss.sig2, 1);
+		    set_windres_bfd_content (wrbfd, &bvss, vss_off,
+		    			     BIN_VER_INFO_SIZE);
 		  }
 	      }
+	    if (wrbfd)
+	      {
+		windres_put_16 (wrbfd, bvsd.size, off - vs_off);
+		windres_put_16 (wrbfd, bvsd.sig1, 0);
+		windres_put_16 (wrbfd, bvsd.sig2, 0);
+		set_windres_bfd_content (wrbfd, &bvsd, vs_off,
+					 BIN_VER_INFO_SIZE);
+	      }
 	    break;
 	  }
 
@@ -2132,9 +2100,9 @@ res_to_bin_versioninfo (windres_bfd *wrbfd, rc_uint_type off,
 
       if (wrbfd)
 	{
-	  windres_put_16 (wrbfd, bv.size, off - bv_off);
+	  windres_put_16 (wrbfd, bv.size, off-bv_off);
 	  windres_put_16 (wrbfd, bv.sig1, 0);
-	  windres_put_16 (wrbfd, bv.sig2, 1);
+	  windres_put_16 (wrbfd, bv.sig2, 0);
 	  set_windres_bfd_content (wrbfd, &bv, bv_off,
 	  			   BIN_VER_INFO_SIZE);
 	}
diff --git a/binutils/resrc.c b/binutils/resrc.c
index 9d1abbc94e..0a14ad23fb 100644
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -1,5 +1,5 @@
 /* resrc.c -- read and write Windows rc files.
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2011
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Rewritten by Kai Tietz, Onevision.
@@ -32,6 +32,11 @@
 #include "windres.h"
 
 #include <assert.h>
+#include <errno.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -1586,9 +1591,8 @@ define_rcdata_number (rc_uint_type val, int dword)
 
 void
 define_stringtable (const rc_res_res_info *resinfo,
-		    rc_uint_type stringid, const unichar *string, int len)
+		    rc_uint_type stringid, const unichar *string)
 {
-  unichar *h;
   rc_res_id id;
   rc_res_resource *r;
 
@@ -1612,12 +1616,9 @@ define_stringtable (const rc_res_res_info *resinfo,
 
       r->res_info = *resinfo;
     }
-  h = (unichar *) res_alloc ((len + 1) * sizeof (unichar));
-  if (len)
-    memcpy (h, string, len * sizeof (unichar));
-  h[len] = 0;
-  r->u.stringtable->strings[stringid & 0xf].length = (rc_uint_type) len;
-  r->u.stringtable->strings[stringid & 0xf].string = h;
+
+  r->u.stringtable->strings[stringid & 0xf].length = unichar_len (string);
+  r->u.stringtable->strings[stringid & 0xf].string = unichar_dup (string);
 }
 
 void
@@ -1802,15 +1803,16 @@ define_versioninfo (rc_res_id id, rc_uint_type language,
 /* Add string version info to a list of version information.  */
 
 rc_ver_info *
-append_ver_stringfileinfo (rc_ver_info *verinfo,
-			   rc_ver_stringtable *stringtables)
+append_ver_stringfileinfo (rc_ver_info *verinfo, const char *language,
+			   rc_ver_stringinfo *strings)
 {
   rc_ver_info *vi, **pp;
 
   vi = (rc_ver_info *) res_alloc (sizeof (rc_ver_info));
   vi->next = NULL;
   vi->type = VERINFO_STRING;
-  vi->u.string.stringtables = stringtables;
+  unicode_from_ascii ((rc_uint_type *) NULL, &vi->u.string.language, language);
+  vi->u.string.strings = strings;
 
   for (pp = &verinfo; *pp != NULL; pp = &(*pp)->next)
     ;
@@ -1819,25 +1821,6 @@ append_ver_stringfileinfo (rc_ver_info *verinfo,
   return verinfo;
 }
 
-rc_ver_stringtable *
-append_ver_stringtable (rc_ver_stringtable *stringtable,
-			const char *language,
-			rc_ver_stringinfo *strings)
-{
-  rc_ver_stringtable *vst, **pp;
-
-  vst = (rc_ver_stringtable *) res_alloc (sizeof (rc_ver_stringtable));
-  vst->next = NULL;
-  unicode_from_ascii ((rc_uint_type *) NULL, &vst->language, language);
-  vst->strings = strings;
-
-  for (pp = &stringtable; *pp != NULL; pp = &(*pp)->next)
-    ;
-  *pp = vst;
-
-  return stringtable;
-}
-
 /* Add variable version info to a list of version information.  */
 
 rc_ver_info *
@@ -2650,13 +2633,7 @@ write_rc_dialog_control (FILE *e, const rc_dialog_control *control)
       ci = NULL;
     }
 
-  /* For EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR don't dump text.  */
-  if ((control->text.named || control->text.u.id != 0)
-      && (!ci
-          || (ci->class != CTL_EDIT
-              && ci->class != CTL_COMBOBOX
-              && ci->class != CTL_LISTBOX
-              && ci->class != CTL_SCROLLBAR)))
+  if (control->text.named || control->text.u.id != 0)
     {
       fprintf (e, " ");
       res_id_print (e, control->text, 1);
@@ -3287,31 +3264,25 @@ write_rc_versioninfo (FILE *e, const rc_versioninfo *versioninfo)
 	{
 	case VERINFO_STRING:
 	  {
-	    const rc_ver_stringtable *vst;
 	    const rc_ver_stringinfo *vs;
 
 	    fprintf (e, "  BLOCK \"StringFileInfo\"\n");
 	    fprintf (e, "  BEGIN\n");
+	    fprintf (e, "    BLOCK ");
+	    unicode_print_quoted (e, vi->u.string.language, -1);
+	    fprintf (e, "\n");
+	    fprintf (e, "    BEGIN\n");
 
-	    for (vst = vi->u.string.stringtables; vst != NULL; vst = vst->next)
+	    for (vs = vi->u.string.strings; vs != NULL; vs = vs->next)
 	      {
-		fprintf (e, "    BLOCK ");
-		unicode_print_quoted (e, vst->language, -1);
-
+		fprintf (e, "      VALUE ");
+		unicode_print_quoted (e, vs->key, -1);
+		fprintf (e, ", ");
+		unicode_print_quoted (e, vs->value, -1);
 		fprintf (e, "\n");
-		fprintf (e, "    BEGIN\n");
-
-		for (vs = vst->strings; vs != NULL; vs = vs->next)
-		  {
-		    fprintf (e, "      VALUE ");
-		    unicode_print_quoted (e, vs->key, -1);
-		    fprintf (e, ", ");
-		    unicode_print_quoted (e, vs->value, -1);
-		    fprintf (e, "\n");
-		  }
-
-		fprintf (e, "    END\n");
 	      }
+
+	    fprintf (e, "    END\n");
 	    fprintf (e, "  END\n");
 	    break;
 	  }
diff --git a/binutils/strings.c b/binutils/strings.c
index 3eed63adad..4763512fb7 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -1,6 +1,6 @@
 /* strings -- print the strings of printable characters in files
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -65,6 +65,7 @@
 #include "getopt.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
+#include <sys/stat.h>
 #include "bucomm.h"
 
 #define STRING_ISGRAPHIC(c) \
diff --git a/binutils/sysdep.h b/binutils/sysdep.h
index 0e1d502fcd..e573637b8c 100644
--- a/binutils/sysdep.h
+++ b/binutils/sysdep.h
@@ -1,6 +1,6 @@
 /* sysdep.h -- handle host dependencies for binutils
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2012
+   2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -69,10 +69,6 @@ extern char *strrchr ();
 #endif
 #endif
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include "binary-io.h"
 
 #if !HAVE_DECL_STPCPY
diff --git a/binutils/sysdump.c b/binutils/sysdump.c
index 4d5d38dfc7..b9778a6ddb 100644
--- a/binutils/sysdump.c
+++ b/binutils/sysdump.c
@@ -1,6 +1,6 @@
 /* Sysroff object format dumper.
-   Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007,
-   2009, 2011  Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2009
+   Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -63,7 +63,7 @@ getCHARS (unsigned char *ptr, int *idx, int size, int max)
   int b = size;
 
   if (b >= max)
-    return _("*undefined*");
+    return "*undefined*";
 
   if (b == 0)
     {
@@ -134,7 +134,7 @@ fillup (unsigned char *ptr)
     sum += ptr[i];
 
   if ((sum & 0xff) != 0xff)
-    printf (_("SUM IS %x\n"), sum);
+    printf ("SUM IS %x\n", sum);
 
   if (dump)
     dh (ptr, size);
@@ -500,7 +500,7 @@ getone (int type)
       break;
 
     default:
-      printf (_("GOT A %x\n"), c);
+      printf ("GOT A %x\n", c);
       return 0;
       break;
     }
@@ -518,7 +518,7 @@ static void
 must (int x)
 {
   if (!getone (x))
-    printf (_("WANTED %x!!\n"), x);
+    printf ("WANTED %x!!\n", x);
 }
 
 static void
@@ -536,7 +536,7 @@ tab (int i, char *s)
 static void
 dump_symbol_info (void)
 {
-  tab (1, _("SYMBOL INFO"));
+  tab (1, "SYMBOL INFO");
 
   while (opt (IT_dsy_CODE))
     {
@@ -554,7 +554,7 @@ dump_symbol_info (void)
 static void
 derived_type (void)
 {
-  tab (1, _("DERIVED TYPE"));
+  tab (1, "DERIVED TYPE");
 
   while (1)
     {
@@ -611,7 +611,7 @@ module (void)
   int c = 0;
   int l = 0;
 
-  tab (1, _("MODULE***\n"));
+  tab (1, "MODULE***\n");
 
   do
     {
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index bc33a5b2f6..dd93b489fc 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,41 +1,956 @@
-2012-03-13  Hans-Peter Nilsson  <hp@axis.com>
+2011-09-28  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
-	PR binutils/3807
-	* binutils-all/objcopy.exp (localize-hidden-1): Correct xfailed
-	mips-targets.
+	Apply from mainline.
+	2011-09-28  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+	* binutils-all/elfedit-4.d: Give test a unique name.
 
-2012-02-25  Walter Lee  <walt@tilera.com>
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* binutils-all/objdump.exp (cpus_expected): Add tilegx.
+	PR binutils/13180
+	* binutils-all/group-6.d: New.
+	* binutils-all/group-6.s: Likewise.
 
-2012-02-14  Alan Modra  <amodra@gmail.com>
+	* binutils-all/objcopy.exp: Run group-6 for ELF targrts.
 
-	* binutils-all/dlltool.exp: Add setup_xfail.
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* binutils-all/dw2-decodedline.S: Always have whitespace before
-	directives.
-	* binutils-all/version.s: Likewise.
-	* binutils-all/objdump.exp (dw2-decodedline): Don't run for
-	hppa64*-*-hpux*, i370-*-*, i960-*-*.
+	* binutils-all/elfedit.exp: Run elfedit-4.
 
-2012-02-11  Kai Tietz  <ktietz@redhat.com>
+	* binutils-all/elfedit-4.d: New.
 
-	* binutils-all/version.def: New file.
-	* binutils-all/dlltool.exp: Add version-dll test.
+2011-06-30  Bernd Schmidt  <bernds@codesourcery.com>
 
-2012-02-02  Nick Clifton  <nickc@redhat.com>
+	* binutils-all/objcopy.exp (strip_test, strip_executable):
+	On ELF targets, test that OS/ABI is preserved.
+	(copy_setup): Do test on tic6x-*-uclinux.
 
-	* binutils-all/readelf.n: Add #pass to cope with targets that add
-	their own notes.
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
 
-2012-02-01  Nick Clifton  <nickc@redhat.com>
+	* binutils-all/elfedit-1.d: Updated for x32.
 
-	PR binutils/13482
-	* binutils-all/version.s: New test source file.
-	* binutils-all/readelf.n: New file: expected readelf output.
-	* binutils-all/readelf.exp: Add test of .note section contents.
+2011-05-18  Nick Clifton  <nickc@redhat.com>
 
-For older changes see ChangeLog-0411
+	PR binutils/12753
+	* lib/utils-lib.exp (run_dump_test): Allow nm as a program.
+	* binutils-all/nm.exp: Test running "nm -g" on an object file
+	containing a unique symbol.
+
+2011-05-13  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/objcopy.exp objcopy_text): Remove xfails for sh-rtems
+	and tic4x.
+
+2011-05-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12720
+	* binutils-all/ar.exp (delete_an_element): New.
+	(move_an_element): Likewise.
+	Run delete_an_element and move_an_element.
+
+2011-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/x86-64/compressed-1a.d: Adjust for change in output
+	format.
+
+2011-04-29  Hans-Peter Nilsson  <hp@axis.com>
+
+	* binutils-all/i386/compressed-1a.d: Adjust for change in output
+	format.
+
+2011-04-28  Tom Tromey  <tromey@redhat.com>
+
+	* binutils-all/objdump.W: Correct output.
+
+011-04-11  Kai Tietz
+
+	* binutils-all/windres/windres.exp: Add '// cpparg <option>' command
+	to rc file interpretation to specify addition pre-processor commands
+	as script option.
+	* binutils-all/windres/strtab3.rc: New.
+	* binutils-all/windres/strtab3.rsd: New.
+	* binutils-all/windres/README: Add note about cpparg script option.
+	argument
+
+2011-04-11  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/arm/simple.s: Fix assembly problems for COFF based
+	ARM toolchaisn by removing .type and .size directives.
+
+2011-04-07  Paul Carroll<pcarroll@codesourcery.com>
+
+	* binutils-all/arm/simple.s: Demo issue with objdump with
+	multiple input files
+	* binutils-all/arm/objdump.exp: added new ARM test case code
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* binutils-all/objcopy.exp (*arm*-*-coff): Change to arm*-*-coff.
+	(xscale-*-coff, thumb*-*-coff, thumb*-*-pe): Don't handle.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* lib/binutils-common.exp (is_elf_format): Accept tic6x*-*-uclinux*.
+
+2011-01-03  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* lib/binutils-common.exp (regexp_diff): Use "==" instead of "eq".
+
+2010-12-31  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* binutils-all/copy-2.d: Change "hppa" to "hppa*" in not-target list.
+	* binutils-all/copy-3.d: Add hppa*-*-hpux* to not-target list.
+	* binutils-all/objcopy.exp (reverse-bytes): xfail on 32-bit hpux.
+
+2010-12-31  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* binutils-all/readelf.exp: Handle MIPS FreeBSD targets.
+
+2010-12-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* lib/binutils-common.exp (regexp_diff): Implement inverse
+	matching, requested by `!'.
+
+2010-11-20  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* lib/binutils-common.exp (regexp_diff): New procedure.
+	* lib/utils-lib.exp (regexp_diff): Delete.
+
+2010-11-20  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* lib/binutils-common.exp: New file.
+	* lib/utils-lib.exp (load_common_lib): New function.  Load
+	binutils-common.exp.
+	(is_elf_format): Delete.
+
+2010-11-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/compress.exp: Replace binutils_assemble with
+	binutils_assemble_flags for --nocompress-debug-sections.
+
+2010-11-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/compress.exp: Pass --nocompress-debug-sections to
+	assembler for uncompressed debug sections.
+
+	* binutils-all/testranges.d: Also expect .zdebug in section name.
+
+2010-11-08  Thomas Schwinge  <thomas@schwinge.name>
+
+	* lib/utils-lib.exp (is_elf_format): Consider for *-*-gnu*, too.
+	* binutils-all/elfedit-2.d (target): Likewise.
+	* binutils-all/elfedit-3.d (target): Likewise.
+	* binutils-all/i386/i386.exp: Likewise.
+	* binutils-all/objcopy.exp: Likewise.
+	* binutils-all/strip-3.d (target): Likewise.
+
+2010-11-08  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/objdump.W: Adjust expected result for debug section
+	rename.
+
+2010-11-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/libdw2.out: Also accept MIPS_DWARF.
+
+2010-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/compress.exp: New.
+	* binutils-all/dw2-1.S: Likewise.
+	* binutils-all/dw2-2.S: Likewise.
+	* binutils-all/libdw2-compressed.out: Likewise.
+	* binutils-all/libdw2.out: Likewise.
+
+2010-10-22  Mark Mitchell  <mark@codesourcery.com>
+
+	* binutils-all/group-5.d: Expect ".group" for the name of group
+	sections.
+	* binutils-all/strip-2.d: Likewise.
+
+2010-10-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* binutils-all/m68k/objdump.exp: Add fnop test.
+	* binutils-all/m68k/fnop.s: New file.
+
+2010-09-29  Alan Modra  <amodra@gmail.com>
+
+	* lib/utils-lib.exp (is_elf_format): Merge with gas and ld versions.
+
+2010-09-23  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/ar.exp: Don't run unique_symbol on msp or hpux.
+	* binutils-all/copy-2.d: Update not-target list.
+	* binutils-all/note-1.d: Don't run on h8300.
+	* binutils-all/objcopy.exp: Don't run strip-10 on msp or hpux.
+	(objcopy_test): Remove h8300-rtems from xfails.
+
+2010-09-16  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/i386/i386.exp: Don't run on linuxaout.
+
+2010-09-10  Ben Gardiner  <bengardiner@nanometrics.ca>
+
+	* binutils-all/objcopy.exp: Add test of new --interleave-width
+	option.
+
+2010-09-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* binutils-all/objdump.W: Update DW_OP_reg5 expected output.
+
+2010-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/elfedit-3.d: New.
+
+	* binutils-all/elfedit.exp: Run elfedit-3.
+
+2010-07-19  Andreas Schwab  <schwab@redhat.com>
+
+	* binutils-all/readelf.s: Ignore "Key to Flags" contents.
+	* binutils-all/readelf.s-64: Likewise.
+	* binutils-all/i386/compressed-1b.d: Likewise.
+	* binutils-all/i386/compressed-1c.d: Likewise.
+	* binutils-all/x86-64/compressed-1b.d: Likewise.
+	* binutils-all/x86-64/compressed-1c.d: Likewise.
+
+2010-07-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/i386/compressed-1a.d: Fix a typo.
+	* binutils-all/i386/compressed-1b.d: Likewise.
+	* binutils-all/i386/compressed-1c.d: Likewise.
+	* binutils-all/x86-64/compressed-1a.d: Likewise.
+	* binutils-all/x86-64/compressed-1b.d: Likewise.
+	* binutils-all/x86-64/compressed-1c.d: Likewise.
+
+2010-07-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/default.exp (binutils_assemble): Use
+	default_binutils_assemble_flags.
+	(binutils_assemble_flags): New.
+
+	* lib/utils-lib.exp (default_binutils_assemble): Renamed to ...
+	(default_binutils_assemble_flags): This.  Add asflags and
+	pass it to target_assemble.
+	(run_dump_test): Support assembler flags.
+
+	* binutils-all/i386/compressed-1.s: New.
+	* binutils-all/i386/compressed-1a.d: Likewise.
+	* binutils-all/i386/compressed-1b.d: Likewise.
+	* binutils-all/i386/compressed-1c.d: Likewise.
+	* binutils-all/i386/i386.exp: Likewise.
+	* binutils-all/x86-64/compressed-1.s: Likewise.
+	* binutils-all/x86-64/compressed-1a.d: Likewise.
+	* binutils-all/x86-64/compressed-1b.d: Likewise.
+	* binutils-all/x86-64/compressed-1c.d: Likewise.
+	* binutils-all/x86-64/x86-64.exp: Likewise.
+
+2010-07-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/10531
+	PR gas/11789
+	* binutils-all/objdump.W: Remove bogus line debug info.
+
+2010-05-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/11600
+	* binutils-all/objcopy.exp: Run exclude-1a and exclude-1b for
+	ELF targets.
+
+	* binutils-all/exclude-1.s: New.
+	* binutils-all/exclude-1a.d: Likewise.
+	* binutils-all/exclude-1b.d: Likewise.
+
+2010-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/dlltool.exp: Add a missing `"'.
+
+2010-04-27  Kai Tietz  <kai.tietz@onevision.com>
+
+	* binutils-all/dlltool.exp: Allow test for
+	arm-wince-pe target.
+
+2010-03-30  Kai TIetz  <kai.tietz@onevision.com>
+
+	* binutils-all/objcopy.exp: Mark simple copy executable
+	as failing for all *-*-mingw32* targets.
+
+2010-03-26  Matt Rice  <ratmice@gmail.com>
+
+	* binutils-all/ar.exp (unique_symbol): New test.
+
+2010-02-18  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/group-5.s, * binutils-all/group-5.d: New test.
+	* binutils-all/objcopy.exp: Run it.
+
+2010-02-01  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* binutils-all/note-1.d: New.
+	* binutils-all/objcopy.exp: Add it.
+
+2010-01-30  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* binutils-all/windres/html.rc: Don't xfail x86_64-*-mingw*.
+	* binutils-all/windres/lang.rc: Likewise.
+	* binutils-all/windres/messagetable.rc: Likewise.
+	* binutils-all/windres/strtab1.rc: Likewise.
+	* binutils-all/windres/strtab2.rc: Likewise.
+	* binutils-all/windres/version.rc: Likewise.
+	* binutils-all/windres/version_cat.rc: Likewise.
+
+2010-01-19  Ian Lance Taylor  <iant@google.com>
+
+	* lib/utils-lib.exp (run_dump_test): Permit option values to use
+	$srcdir to refer to the source directory.
+	* binutils-all/add-section.d: New test.
+	* binutils-all/add-empty-section.d: New test.
+	* binutils-all/empty-file: New test input file.
+	* binutils-all/objcopy.exp: Run new tests.
+
+2010-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/elfedit-2.d: New.
+
+	* binutils-all/elfedit.exp: Run elfedit-2.
+
+2010-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/11131
+	* binutils-all/elfedit-1.d: New.
+	* binutils-all/elfedit.exp: Likewise.
+
+	* config/default.exp (ELFEDIT): New. Set if it doesn't exist.
+	(ELFEDITFLAGS): Likewise.
+
+	* lib/utils-lib.exp (run_dump_test): Support elfedit.
+
+2009-10-28  Kai Tietz <kai.tietz@onevision.com>
+
+	* binutils-all/dlltool.exp: Add tests for --no-leading-underscore
+	and --leading-underscore option for dlltool.
+
+2009-10-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* binutils-all/dlltool.exp: Add new test.
+	* binutils-all/alias-2.def: New file.
+
+2009-10-18  Vincent Rivière  <vincent.riviere@freesbee.fr>
+
+	* binutils-all/copy-2.d: Exclude more aout targets.
+	* binutils-all/copy-3.d: Likewise.
+
+2009-09-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/readelf.s: Tolerate some whitespace differences.
+	* binutils-all/readelf.s-64: Likewise.
+	* binutils-all/readelf.ss: Likewise.
+	* binutils-all/readelf.ss-64: Likewise.
+	* binutils-all/readelf.ss-mips: Likewise.
+	* binutils-all/readelf.ss-tmips: Likewise.
+	* binutils-all/strip-10.d: Likewise.
+
+2009-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/objdump.exp (cpus_expected): Add ms1.
+
+2009-09-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* binutils-all/testranges.s (.debug_info): Pad the only CU.
+
+2009-09-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* binutils-all/testranges.s: Replace all .long by .4byte.
+
+2009-09-04  DJ Delorie  <dj@redhat.com>
+
+	* binutils-all/objdump.exp: Add m16c and m32c to the list of
+	expected cpus.
+
+2009-09-02  Jie Zhang  <jie.zhang@analog.com>
+
+	* binutils-all/bfin/unknown-mode.s: New test.
+	* binutils-all/bfin/objdump.exp: New test.
+
+2009-08-17  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/strip-10.d: Accept "<OS specific>: 10" for the type
+	of the UNIQUE symbol.
+
+2009-08-07  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* binutils-all/testranges.s: Use %progbits.  Use ";#" for comments.
+
+2009-08-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10492
+	* binutils-all/objcopy.exp: Run strip-10.
+
+	* binutils-all/strip-10.d: New.
+	* binutils-all/unique.s: Likewise.
+
+2009-07-31  Daniel Gutson  <dgutson@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* binutils-all/arm/thumb2-cond.s: Use instructions instead of
+	.short.
+
+2009-07-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/testranges.s: Replace .value with .short.
+
+2009-07-16  Dave Korn  <dave.korn.cygwin@gmail.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/objcopy.exp: Run testranges and testranges-ia64
+	for ELF targets only.
+
+2009-07-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/objcopy.exp; Run testranges-ia64.
+
+	* binutils-all/testranges.d: Don't run for ia64.
+
+	* binutils-all/testranges-ia64.d: New.
+	* binutils-all/testranges-ia64.s: Likewise.
+
+2009-07-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* binutils-all/objcopy.exp (testranges): New test.
+	* binutils-all/testranges.d, binutils-all/testranges.s: New files.
+
+2009-06-25  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* binutils-all/objcopy.exp: Move XFAIL from objcopy_test to
+	copy_executable.
+
+2009-06-25  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* binutils-all/objcopy.exp: Always treat objcopy_test as XFAIL on
+	cygwin.
+
+2009-04-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/localize-hidden-1.s: Use "==" instead of ".set".
+	* binutils-all/localize-hidden-2.s: Likewise.
+
+2009-04-02  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* inutils-all/objcopy.exp (strip_executable):  Delete remote dest
+	file before downloading.
+	(strip_executable_with_saving_a_symbol):  Likewise.
+	(keep_debug_symbols_and_test_copy):  Likewise.
+
+2009-03-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* binutils-all/objdump.W, binutils-all/objdump.s: Don't match
+	literal "tmpdir/" in expected output.
+
+2009-03-11  Chris Demetriou  <cgd@google.com>
+
+	* binutils-all/ar.exp (deterministic_archive): New test.
+
+2009-03-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/9933
+	* binutils-all/copy-4.d: New.
+
+	* binutils-all/objcopy.exp: Run copy-4.
+
+2009-03-03  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* config/hppa.sed: Fix spelling.
+
+2009-03-02  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* binutils-all/localize-hidden-1.s: Change .equ to .set.
+	* binutils-all/localize-hidden-2.s: Likewise.
+
+2009-01-29  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/objdump.W: Do not assume that high and low PC
+	addresses will have been computed.
+
+2008-10-06  Tom Tromey  <tromey@redhat.com>
+
+	* binutils-all/objdump.W: Update.
+
+2008-10-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/group.s: Updated.
+	* binutils-all/group-2.s: Likewise.
+	* binutils-all/group-3.s: Likewise.
+	* binutils-all/group-4.s: Likewise.
+	* binutils-all/strip-7.d: Likewise.
+	* binutils-all/strip-9.d: Likewise.
+
+2008-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/group-4.s: New.
+	* binutils-all/strip-8.d: Likewise.
+	* binutils-all/strip-9.d: Likewise.
+
+	* binutils-all/objcopy.exp: Test objcopy on group-4.s.  Run
+	strip-8 and strip-9.
+
+2008-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/group-3.s: New.
+	* binutils-all/strip-6.d: Likewise.
+	* binutils-all/strip-7.d: Likewise.
+
+	* binutils-all/objcopy.exp: Test objcopy on group-3.s.  Run
+	strip-6 and strip-7.
+
+2008-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/group-2.s: New.
+	* binutils-all/strip-4.d: Likewise.
+	* binutils-all/strip-5.d: Likewise.
+
+	* binutils-all/objcopy.exp: Test objcopy on group-2.s.  Run
+	strip-4 and strip-5.
+
+2008-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/objdump.exp: Run compressed debug test only for ELF.
+
+2008-07-11  Hans-Peter Nilsson  <hp@axis.com>
+
+	* binutils-all/objdump.W: Generalize to adjust for targets with
+	non-byte-size instructions.
+
+2008-07-09  Craig Silverstein  <csilvers@google.com>
+
+	* binutils-all/objdump.exp: Add test for objdump -s on a file
+	with a compressed debug section.  Add test for objdump -W on a
+	file that contains a compressed debug section.
+	* binutils-all/readelf.exp: Call readelf_compressed_wa_test.
+	(readelf_compressed_wa_test): New function.
+	* binutils-all/dw2-compressed.S: New file.
+	* binutils-all/objdump.W: New file.
+	* binutils-all/objdump.s: New file.
+	* binutils-all/readelf.wa: New file.
+
+2008-07-08  Kai Tietz  <kai.tietz@onevision.com>
+
+	* binutils-all/objcopy.exp (copy_setup): Check if host-triplet
+	is target-triplet for execution tests.
+	(copy_executable): Likewise.
+	(strip_executable): Likewise.
+	(strip_executable_with_saving_a_symbol): Likewise.
+
+2008-05-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* binutils-all/objcopy.exp: Call KEEP_DEBUG_SYMBOLS_AND_TEST_COPY.
+	(keep_debug_symbols_and_test_copy): New function.
+	(test5, test6): New variables.
+
+2008-03-27  Cary Coutant <ccoutant@google.com>
+
+	* binutils-all/ar.exp: Add thin archive tests.
+
+2008-02-26  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/default.exp (gcc_gas_flag, dlltool_gas_flag): Define to
+	empty for testing an installed toolchain.
+
+2008-02-04  Bob Wilson  <bob.wilson@acm.org>
+
+	* binutils-all/objdump.exp (cpus_expected): Add xtensa.
+
+2007-10-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/windres/windres.exp: Don't xfail.
+
+2007-10-16  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/readelf.ss: Accept COMMON in readelf's output.
+	* binutils-all/readelf.ss-64: Likewise.
+	* binutils-all/readelf.ss-mips: Likewise.
+	* binutils-all/readelf.ss-tmips: Likewise.
+
+2007-08-30  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/dumptest.s: New test file.
+	* binutils-all/readelf.exp: Add test of readelf's -p switch.
+
+2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* binutils-all/ar.exp (long_filenames): Delete temporary files on
+	the host.
+	* binutils-all/arm/objdump.exp: Only check "which $OBJDUMP" if
+	host is local.
+	* binutils-all/objcopy.exp: Use ${srecfile} to get the name of the
+	srec file to be passed to binutils_run.
+	(objcopy_test_readelf): Use remote_exec.
+	* binutils-all/readelf.exp (readelf_find_size): Use remote_exec.
+	(readelf_test): Likewise.
+	(readelf_wi_test): Likewise.
+	* lib/utils-lib.exp (run_dump_test): Only check "which $binary" if
+	host is local.  Use remote_exec.  Use $tempfile not
+	tmpdir/bintest.o.
+
+2007-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/copy-2.d (not-target): Match *-*-*aout.
+	* binutils-all/copy-3.d (not-target): Likewise.
+	* binutils-all/objcopy.exp (objcopy_test): Remove extraneous
+	setup_xfail.
+	* windres/windres.exp: Return unsupported rather than fail if
+	windows.h not found.
+
+2007-07-05  Nick Clifton  <nickc@redhat.com>
+
+	* lib/utils-lib.exp: Update copyright notice to refer to GPLv3.
+	* config/default.exp, binutils-all/ar.exp,
+	binutils-all/dlltool.exp, binutils-all/nm.exp,
+	binutils-all/objcopy.exp, binutils-all/arm/objdump.exp,
+	binutils-all/hppa/objdump.exp, binutils-all/m68k/objdump.exp,
+	binutils-all/vax/objdump.exp, binutils-all/windres/windres.exp,
+	binutils-all/windres/msupdate: Likewise.
+
+2007-06-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/strip-3.d: Also strip .xtensa.info section.
+
+2007-05-24  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* binutils-all/windres/version_cat.rc: New.
+	* binutils-all/windres/version_cat.rsd: New.
+
+2007-05-23  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* binutils-all/windres/html.rc: New.
+	* binutils-all/windres/html.rsd: New.
+	* binutils-all/windres/html1.hm: New.
+	* binutils-all/windres/html2.hm: New.
+	* binutils-all/windres/messagetable.rc: New.
+	* binutils-all/windres/messagetable.rsd: New.
+	* binutils-all/windres/MSG00001.bin: New.
+	* binutils-all/windres/strtab2.rc: New.
+	* binutils-all/windres/strtab2.rsd: New.
+	* binutils-all/windres/version.rc: New.
+	* binutils-all/windres/version.rsd: New.
+	* binutils-all/windres/dialog.rsd: Fix expected results.
+
+2007-05-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* binutils-all/strip-3.d: Strip .pdr section.
+
+2007-05-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/objcopy.exp: Only run needed-by-reloc test for ELF.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/needed-by-reloc.s: Use .long rather than .4byte.
+
+2007-05-08  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* binutils-all/strip-3.d: Strip .ARM.attributes and .reginfo
+	sections.
+
+2007-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/objcopy.exp (copy_setup): Don't perror, use send_log.
+	(copy_executable): Return early if test2 is blank.
+	Return unsupported rather than unresolved if we can't run
+	executables.  Do test1 if we can compile.
+
+2007-04-24  Nathan Froyd  <froydnj@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+
+	* binutils-all/objcopy.exp: Add test for stripping a symbol
+	used in a relocation.
+	* binutils-all/needed-by-reloc.s: New file.
+
+2007-04-20  Nathan Froyd  <froydnj@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+	    Thomas de Lellis <tdel@windriver.com>
+
+	* binutils-all/objcopy.exp: Add test for --reverse-bytes.
+
+2007-04-21  Richard Earnshaw  <rearnsha@arm.com>
+
+	* binutils-all/readelf.exp (regexp_diff): Delete.
+
+2007-04-20  Richard Earnshaw  <rearnsha@arm.com>
+
+	* binutils-all/arm/thumb2-cond.s: Allow for tab expansion by the pty.
+	Rename the second test.
+
+2007-04-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/4348
+	* binutils-all/empty.s: New file.
+	* binutils-all/strip-3.d: Likewise.
+
+	* binutils-all/objcopy.exp: Run strip-3 for ELF target.
+
+2007-02-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* binutils-all/objcopy.exp: Skip for uclinux targets.
+
+2007-02-14  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/readelf.exp (readelf_wi_test): Fix unexpected
+	output failure message.
+
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* copy-3.d: Renamed target x86_64-*-mingw64 to x86_64-*-mingw*
+	* dlltool.exp: Dito
+	* lang.rc: Dito
+	* strtab1.rc: Dito
+	* windres.exp: Dito
+
+2006-09-20  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* binutils-all/copy-3.d: Add support for target x86_64-pc-mingw64.
+	* binutils-all/dlltool.exp: Likewise.
+	* binutils-all/objcopy.exp: Likewise.
+	* binutils-all/windres/windres.exp: Likewise.
+	* binutils-all/windres/lang.rc: xfail it as long as there is no windows.h.
+	* binutils-all/windres/strtab1.rc: Likewise.
+	* lib/utils-lib.exp: Adjust executable prefix detection (as .exe).
+
+2006-09-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3181
+	* binutils-all/objcopy.exp: Run strip-1 and strip-2 for ELF
+	targets.
+
+	* binutils-all/strip-1.d: New file.
+	* binutils-all/strip-2.d: Likewise.
+
+	* lib/utils-lib.exp (run_dump_test): Support strip.
+
+2006-08-15  Thiemo Seufer  <ths@mips.com>
+	    Nigel Stephens  <nigel@mips.com>
+	    David Ung  <davidu@mips.com>
+
+	* binutils-all/readelf.exp (readelf_test): Handle mips*-sde-elf*.
+
+2006-06-24  Richard Sandiford  <richard@codesourcery.com>
+
+	* binutils-all/localize-hidden-1.d: Use objdump --syms instead
+	of readelf.
+
+2006-06-23  Richard Sandiford  <richard@codesourcery.com>
+
+	* binutils-all/localize-hidden-1.s,
+	* binutils-all/localize-hidden-1.d,
+	* binutils-all/localize-hidden-2.s,
+	* binutils-all/localize-hidden-2.d: New tests.
+	* binutils-all/objcopy.exp: Run them.
+
+2006-06-06  Paul Brook  <paul@codesourcery.com>
+
+	* binutils-all/arm/objdump.exp: New file.
+	* binutils-all/arm/thumb2-cond.s: New test.
+
+2006-05-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/copy-3.d: Fix a typo.
+
+2006-05-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/copy-3.d: New.
+
+	* objcopy.exp: Run copy-3.
+
+2006-05-02  Dave Korn  <dave.korn@artimi.com>
+
+	* binutils-all/copy-1.d (name):  Correct spelling of 'setting'.
+	* binutils-all/copy-1.d (name):  Likewise.
+
+2006-05-02  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/copy-2.d: Change the name of the section whose
+	flags are changed to "foo" so that the test will work with PE
+	based targets.  Skip this test for AOUT based targeted.
+	* binutils-all/copytest.s: New file.
+
+2006-05-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/objcopy.exp: Run "copy-1" for ELF only.
+
+2006-05-01  Ben Elliston  <bje@au.ibm.com>
+
+	* binutils-all/objcopy.exp (objcopy_test_readelf): Remove stray ;
+
+2006-04-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2593
+	* binutils-all/copy-1.d: New file.
+	* binutils-all/copy-1.s: Likewise.
+	* binutils-all/copy-2.d: Likewise.
+
+	* binutils-all/objcopy.exp: Add run_dump_test "copy-1" and
+	run_dump_test "copy-2".
+
+	* lib/utils-lib.exp (run_dump_test): New.
+	(slurp_options): Likewise.
+	(regexp_diff): Likewise.
+	(file_contents): Likewise.
+	(verbose_eval): Likewise.
+
+2006-04-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2467
+	* binutils-all/objcopy.exp (strip_test): Also test "strip -g"
+	on archive.
+
+2006-04-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* lib/utils-lib.exp (default_binutils_run): Check exit status.
+
+2005-12-24  Ben Elliston  <bje@gnu.org>
+
+	* config/default.exp: Do not load the unneeded util-defs.exp.
+
+2005-11-15  Jan Beulich  <jbeulich@novell.com>
+
+	* config/default.exp (link_or_copy): New. Use it for setting
+	up assembler and linker for the compiler to use.
+
+2005-10-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/251
+	* binutils-all/group.s: New file.
+
+	* binutils-all/objcopy.exp (objcopy_test_readelf): New
+	procedure.
+	Use it to test ELF group.
+
+2005-10-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1487
+	* binutils-all/objcopy.exp (objcopy_test): New procedure.
+	Use it to test simple copy, ia64 link order and ELF unknown
+	section type.
+
+	* binutils-all/unknown.s: New file.
+
+2005-10-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/1321
+	* binutils-all/link-order.s: New.
+
+	* binutils-all/objcopy.exp: Check ia64 link order.
+
+2005-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* binutils-all/windres/escapex-2.rc: New file.
+	* binutils-all/windres/escapex-2.rsd: Generate.
+
+2005-08-26  Christian Groessler  <chris@groessler.org>
+
+	* binutils-all/objcopy.exp: Don't setup_xfail "z8*-*".
+
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/objcopy.exp: Remove a29k support.
+	* binutils-all/objdump.exp: Likewise, alliant and convex too.
+
+2005-05-07  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	binutils-all/ar.exp, binutils-all/dlltool.exp,
+	binutils-all/nm.exp, binutils-all/objcopy.exp,
+	binutils-all/objdump.exp, binutils-all/readelf.exp,
+	binutils-all/size.exp, binutils-all/hppa/objdump.exp,
+	binutils-all/m68k/objdump.exp, binutils-all/vax/objdump.exp,
+	binutils-all/windres/msupdate, binutils-all/windres/windres.exp,
+	config/default.exp, lib/utils-lib.exp
+
+2005-04-04  Jan-Benedict Glaw  <jbglaw@lug-owl.>
+
+	* binutils-all/vax/objdump.exp: Condense the two tests into one
+	and add a "-M entry:" for the second label.
+
+2005-03-29  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* binutils-all/vax: New directory.
+	* binutils-all/vax/objdump.exp: New script.  Test the -Mentry:
+	switch added to the VAX disassembler.
+	* binutils-all/vax/entrymask.s: New assembler source file.
+
+2005-03-08  Ben Elliston  <bje@au.ibm.com>
+
+	* config/default.exp: Remove send_user call for stray output.
+
+2005-01-04  Martin Koegler  <mkoegler@auto.tuwien.ac.at>
+
+	* binutils-all/testprog.c: Add prototype for printf() and make
+	type of "string" array be "char" in order to avoid compile time
+	warnings.
+
+2004-12-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/readelf.ss: Allow for both .rel and .rela sections.
+
+2004-11-04  Hans-Peter Nilsson  <hp@axis.com>
+
+	* binutils-all/objdump.exp (cpus_expected): Append cris.
+
+2004-10-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/dlltool.exp: Set XFAIL if $target_xfail is yes.
+
+2004-10-23  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* binutils-all/alias.def: New file.
+	* binutils-all/dlltool.exp: Two new -p tests.
+	* config/default.exp (dlltool_gas_flag): New variable.
+	Copy gas and lds executables into tmpdir/gas directory rather than
+	making symlinks which might not be supported by the host OS.
+	Attempt to handle the case where the host OS does not use the .exe
+	extension but the target OS does.
+	* lib/utils-lib.exp (exe_ext): New procedure.
+
+2004-07-12  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/dlltool.exp: Check that the -p switch is not
+	rejected.
+
+2004-07-09  Andreas Schwab  <schwab@suse.de>
+
+	* binutils-all/m68k/movem.s: New file.
+
+	* binutils-all/m68k/objdump.exp: New file.
+
+2004-05-15  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/readelf.ss: Allow for ARM mapping symbols.
+
+2004-05-12  Ben Elliston  <bje@au.ibm.com>
+
+	* binutils-all/ar.exp: Remove stray semicolons.
+	* binutils-all/dlltool.exp: Likewise.
+	* binutils-all/objcopy.exp: Likewise.
+	* binutils-all/readelf.exp: Likewise.
+	* binutils-all/windres/windres.exp: Likewise.
+	* lib/utils-lib.exp: Likewise.
+
+2004-04-14  Richard Sandiford  <rsandifo@redhat.com>
+
+	* binutils-all/readelf.ss-mips: Allow named section symbols.
+
+2004-03-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* binutils-all/objcopy.exp: Accept main as a data symbol as well.
+
+2004-02-27  Andreas Schwab  <schwab@suse.de>
+
+	* binutils-all/ar.exp (argument_parsing): New test.
+
+2004-02-20  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* binutils-all/objcopy.exp: Reorder arguments for POSIXLY_CORRECT
+	systems.
+
+For older changes see ChangeLog-9303
 
 Local Variables:
 mode: change-log
diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
index 1409d3cf62..5a19cf2733 100644
--- a/binutils/testsuite/binutils-all/dlltool.exp
+++ b/binutils/testsuite/binutils-all/dlltool.exp
@@ -53,21 +53,6 @@ if { "$target_xfail" == "yes" } {
     setup_xfail *-*
 }
 
-verbose "$DLLTOOL -l libversion.a --def $srcdir/$subdir/version.def" 1
-catch "exec $DLLTOOL -l libersion.a --def $srcdir/$subdir/version.def" err
-
-if ![string match "" $err] then {
-    send_log "$err\n"
-    verbose "$err" 1
-    fail "dlltool (version.dll)"
-} else {
-    pass "dlltool (version.dll)"
-}
-
-if { "$target_xfail" == "yes" } {
-    setup_xfail *-*
-}
-
 verbose "$DLLTOOL -p prefix --leading-underscore -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1
 catch "exec $DLLTOOL -p prefix --leading-underscore -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err
 
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 4dfb73c7b8..a22e98c90b 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -980,19 +980,6 @@ if [is_elf_format] {
 	}
     }
 
-    # The symbol table for some MIPS targets is sorted differently than
-    # the ELF canonical order, so the regexps in localize-hidden-1.d fail
-    # to match.  These tests must be matched to targets for which
-    # targ_defvec=bfd_elf32_bigmips_vec,
-    # targ_defvec=bfd_elf32_littlemips_vec,
-    # targ_defvec=bfd_elf32_nbigmips_vec or
-    # targ_defvec=bfd_elf32_nlittlemips_vec in config.bfd.  When syncing,
-    # don't forget that earlier case-matches trump later ones.
-    if { ![istarget "mips*-sde-elf*"] && ![istarget "mips64*-*-openbsd*"] } {
-	setup_xfail "mips*-*-irix5*" "mips*-*-irix6*" "mips*-*-elf*" \
-	    "mips*-*-rtems*" "mips*-*-windiss" "mips*-*-none" \
-	    "mips*-*-openbsd*" "mips*-*-chorus*"
-    }
     run_dump_test "localize-hidden-1"
     run_dump_test "testranges"
     run_dump_test "testranges-ia64"
diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index 267bcbd824..d5879aaa40 100644
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -1,5 +1,5 @@
 #   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-#   2003, 2004, 2007, 2008, 2009, 2011
+#   2003, 2004, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,11 +38,11 @@ set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"]
 set cpus_expected [list]
 lappend cpus_expected alpha arc arm cris
 lappend cpus_expected d10v d30v fr30 fr500 fr550 h8 hppa i386 i860 i960 ip2022
-lappend cpus_expected m16c m32c m32r m68hc11 m68hc12 m68k m88k MCore MicroBlaze
+lappend cpus_expected m16c m32c m32r m68hc11 m68hc12 m68k m88k MCore
 lappend cpus_expected mips mn10200 mn10300 ms1 msp ns32k pj powerpc pyramid
 lappend cpus_expected romp rs6000 s390 sh sparc
-lappend cpus_expected tahoe tic54x tic80 tilegx tms320c30 tms320c4x tms320c54x
-lappend cpus_expected v850 vax we32k x86-64 xscale xtensa z8k z8001 z8002
+lappend cpus_expected tahoe tic54x tic80 tms320c30 tms320c4x tms320c54x v850
+lappend cpus_expected vax we32k x86-64 xscale xtensa z8k z8001 z8002
 
 # Make sure the target CPU shows up in the list.
 lappend cpus_expected ${target_cpu}
@@ -202,46 +202,6 @@ if { ![is_elf_format] } then {
     }
 }
 
-# Test objdump -WL on a file that contains line information for multiple files and search directories.
-# Not supported on mcore, moxie and openrisc targets because they do not (yet) support the generation
-# of DWARF2 line debug information.
-
-if { ![is_elf_format]
-     || [istarget "hppa64*-*-hpux*"]
-     || [istarget "i370-*-*"]
-     || [istarget "i960-*-*"]
-     || [istarget "ia64*-*-*"]
-     || [istarget "mcore-*-*"]
-     || [istarget "moxie-*-*"]
-     || [istarget "openrisc-*-*"]
-     || [istarget "or32-*-*"]
-} then {
-    unsupported "objump decode line"
-} else {
-    if { ![binutils_assemble $srcdir/$subdir/dw2-decodedline.S tmpdir/dw2-decodedline.o] } then {
-	fail "objdump decoded line"
-    }
-
-    if [is_remote host] {
-	set decodedline_testfile [remote_download host tmpdir/dw2-decodedline.o]
-    } else {
-	set decodedline_testfile tmpdir/dw2-decodedline.o
-    }
-
-    set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -WL $decodedline_testfile" "" "/dev/null" "objdump.out"]
-
-    if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
-	fail "objdump -WL (reason: unexpected output)"
-	send_log $got
-	send_log "\n"
-    }
-
-    if { [regexp_diff objdump.out $srcdir/$subdir/objdump.WL] } then {
-	fail "objdump -WL"
-    } else {
-	pass "objdump -WL"
-    }
-}
 
 # Options which are not tested: -a -d -D -R -T -x -l --stabs
 # I don't see any generic way to test any of these other than -a.
diff --git a/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp
index e611cb2cdd..8b68aececd 100644
--- a/binutils/testsuite/binutils-all/readelf.exp
+++ b/binutils/testsuite/binutils-all/readelf.exp
@@ -1,4 +1,4 @@
-#   Copyright 1999, 2000, 2001, 2003, 2004, 2007, 2009, 2012
+#   Copyright 1999, 2000, 2001, 2003, 2004, 2007, 2009
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -337,18 +337,3 @@ readelf_wi_test
 readelf_compressed_wa_test
 
 readelf_dump_test
-
-# PR 13482 - Check for off-by-one errors when dumping .note sections.
-if {![binutils_assemble $srcdir/$subdir/version.s tmpdir/version.o]} then {
-    perror "could not assemble version note test file"
-    unresolved "readelf - failed to assemble"
-    return
-}
-
-if ![is_remote host] {
-    set tempfile tmpdir/version.o
-} else {
-    set tempfile [remote_download host tmpdir/version.o]
-}
-
-readelf_test -n $tempfile readelf.n  {}
diff --git a/binutils/testsuite/binutils-all/windres/version.rsd b/binutils/testsuite/binutils-all/windres/version.rsd
index 8ad479c122..85dd5d3528 100644
--- a/binutils/testsuite/binutils-all/windres/version.rsd
+++ b/binutils/testsuite/binutils-all/windres/version.rsd
@@ -1,3 +1,7 @@
+
+version.res:     file format binary
+
+Contents of section .data:
  0000 00000000 20000000 ffff0000 ffff0000  .... ...........
  0010 00000000 00000000 00000000 00000000  ................
  0020 ec020000 20000000 ffff1000 ffff0100  .... ...........
@@ -8,9 +12,9 @@
  0070 00000100 01000000 00000100 01000000  ................
  0080 3f000000 00000000 04000000 01000000  ?...............
  0090 00000000 00000000 00000000 4c020000  ............L...
- 00a0 01005300 74007200 69006e00 67004600  ..S.t.r.i.n.g.F.
+ 00a0 00005300 74007200 69006e00 67004600  ..S.t.r.i.n.g.F.
  00b0 69006c00 65004900 6e006600 6f000000  i.l.e.I.n.f.o...
- 00c0 28020000 01003000 34003000 37003000  (.....0.4.0.7.0.
+ 00c0 28020000 00003000 34003000 37003000  (.....0.4.0.7.0.
  00d0 34006500 34000000 32000900 01004300  4.e.4...2.....C.
  00e0 6f006d00 70006100 6e007900 4e006100  o.m.p.a.n.y.N.a.
  00f0 6d006500 00000000 62006900 6e007500  m.e.....b.i.n.u.
@@ -44,7 +48,7 @@
  02b0 72000000 34000800 01005000 72006f00  r...4.....P.r.o.
  02c0 64007500 63007400 56006500 72007300  d.u.c.t.V.e.r.s.
  02d0 69006f00 6e000000 31002e00 30002e00  i.o.n...1...0...
- 02e0 30002e00 31000000 44000000 01005600  0...1...D.....V.
+ 02e0 30002e00 31000000 44000000 00005600  0...1...D.....V.
  02f0 61007200 46006900 6c006500 49006e00  a.r.F.i.l.e.I.n.
  0300 66006f00 00000000 24000400 00005400  f.o.....$.....T.
  0310 72006100 6e007300 6c006100 74006900  r.a.n.s.l.a.t.i.
diff --git a/binutils/testsuite/binutils-all/windres/version_cat.rsd b/binutils/testsuite/binutils-all/windres/version_cat.rsd
index 4e57512136..85dd5d3528 100644
--- a/binutils/testsuite/binutils-all/windres/version_cat.rsd
+++ b/binutils/testsuite/binutils-all/windres/version_cat.rsd
@@ -12,9 +12,9 @@ Contents of section .data:
  0070 00000100 01000000 00000100 01000000  ................
  0080 3f000000 00000000 04000000 01000000  ?...............
  0090 00000000 00000000 00000000 4c020000  ............L...
- 00a0 01005300 74007200 69006e00 67004600  ..S.t.r.i.n.g.F.
+ 00a0 00005300 74007200 69006e00 67004600  ..S.t.r.i.n.g.F.
  00b0 69006c00 65004900 6e006600 6f000000  i.l.e.I.n.f.o...
- 00c0 28020000 01003000 34003000 37003000  (.....0.4.0.7.0.
+ 00c0 28020000 00003000 34003000 37003000  (.....0.4.0.7.0.
  00d0 34006500 34000000 32000900 01004300  4.e.4...2.....C.
  00e0 6f006d00 70006100 6e007900 4e006100  o.m.p.a.n.y.N.a.
  00f0 6d006500 00000000 62006900 6e007500  m.e.....b.i.n.u.
@@ -48,7 +48,7 @@ Contents of section .data:
  02b0 72000000 34000800 01005000 72006f00  r...4.....P.r.o.
  02c0 64007500 63007400 56006500 72007300  d.u.c.t.V.e.r.s.
  02d0 69006f00 6e000000 31002e00 30002e00  i.o.n...1...0...
- 02e0 30002e00 31000000 44000000 01005600  0...1...D.....V.
+ 02e0 30002e00 31000000 44000000 00005600  0...1...D.....V.
  02f0 61007200 46006900 6c006500 49006e00  a.r.F.i.l.e.I.n.
  0300 66006f00 00000000 24000400 00005400  f.o.....$.....T.
  0310 72006100 6e007300 6c006100 74006900  r.a.n.s.l.a.t.i.
diff --git a/binutils/version.c b/binutils/version.c
index aa92063290..47e2b31e33 100644
--- a/binutils/version.c
+++ b/binutils/version.c
@@ -1,6 +1,6 @@
 /* version.c -- binutils version information
    Copyright 1991, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -33,7 +33,7 @@ print_version (const char *name)
   /* This output is intended to follow the GNU standards document.  */
   /* xgettext:c-format */
   printf ("GNU %s %s\n", name, BFD_VERSION_STRING);
-  printf (_("Copyright 2012 Free Software Foundation, Inc.\n"));
+  printf (_("Copyright 2011 Free Software Foundation, Inc.\n"));
   printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
 the GNU General Public License version 3 or (at your option) any later version.\n\
diff --git a/binutils/windint.h b/binutils/windint.h
index 0a7589954c..eed8f790fa 100644
--- a/binutils/windint.h
+++ b/binutils/windint.h
@@ -944,18 +944,6 @@ struct __attribute__ ((__packed__)) bin_fixed_versioninfo
 };
 #define BIN_FIXED_VERSIONINFO_SIZE 52
 
-/* A list of string version information.  */
-
-typedef struct rc_ver_stringtable
-{
-  /* Next item.  */
-  struct rc_ver_stringtable *next;
-  /* Language.  */
-  unichar *language;
-  /* Strings.  */
-  struct rc_ver_stringinfo *strings;
-} rc_ver_stringtable;
-
 /* A list of variable version information.  */
 
 typedef struct rc_ver_info
@@ -969,8 +957,10 @@ typedef struct rc_ver_info
     /* StringFileInfo data.  */
     struct
     {
-      /* String tables.  */
-      struct rc_ver_stringtable *stringtables;
+      /* Language.  */
+      unichar *language;
+      /* Strings.  */
+      struct rc_ver_stringinfo *strings;
     } string;
     /* VarFileInfo data.  */
     struct
diff --git a/binutils/windres.c b/binutils/windres.c
index 7de73ef2f5..b30ced9740 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -1,6 +1,6 @@
 /* windres.c -- a program to manipulate Windows resources
    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-   2009, 2011, 2012 Free Software Foundation, Inc.
+   2009, 2011 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Rewritten by Kai Tietz, Onevision.
 
@@ -45,6 +45,7 @@
 #include "safe-ctype.h"
 #include "obstack.h"
 #include "windres.h"
+#include <sys/stat.h>
 
 /* Used by resrc.c at least.  */
 
diff --git a/binutils/windres.h b/binutils/windres.h
index bd6dd053e7..3e65886c81 100644
--- a/binutils/windres.h
+++ b/binutils/windres.h
@@ -1,5 +1,5 @@
 /* windres.h -- header file for windres program.
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2011
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
    Rewritten by Kai Tietz, Onevision.
@@ -104,13 +104,12 @@ extern void define_rcdata_file  (rc_res_id, const rc_res_res_info *, const char
 extern rc_rcdata_item *define_rcdata_string (const char *, rc_uint_type);
 extern rc_rcdata_item *define_rcdata_unistring (const unichar *, rc_uint_type);
 extern rc_rcdata_item *define_rcdata_number (rc_uint_type, int);
-extern void define_stringtable (const rc_res_res_info *, rc_uint_type, const unichar *, int);
+extern void define_stringtable (const rc_res_res_info *, rc_uint_type, const unichar *);
 extern void define_user_data (rc_res_id, rc_res_id, const rc_res_res_info *, rc_rcdata_item *);
 extern void define_toolbar (rc_res_id, rc_res_res_info *, rc_uint_type ,rc_uint_type ,rc_toolbar_item *);
 extern void define_user_file (rc_res_id, rc_res_id, const rc_res_res_info *, const char *);
 extern void define_versioninfo (rc_res_id, rc_uint_type, rc_fixed_versioninfo *, rc_ver_info *);
-extern rc_ver_info *append_ver_stringfileinfo (rc_ver_info *, rc_ver_stringtable *);
-extern rc_ver_stringtable *append_ver_stringtable (rc_ver_stringtable *, const char *, rc_ver_stringinfo *);
+extern rc_ver_info *append_ver_stringfileinfo (rc_ver_info *, const char *, rc_ver_stringinfo *);
 extern rc_ver_info *append_ver_varfileinfo (rc_ver_info *, const unichar *, rc_ver_varinfo *);
 extern rc_ver_stringinfo *append_verval (rc_ver_stringinfo *, const unichar *, const unichar *);
 extern rc_ver_varinfo *append_vertrans (rc_ver_varinfo *, rc_uint_type, rc_uint_type);
diff --git a/binutils/winduni.c b/binutils/winduni.c
index 76404cace9..572145effe 100644
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -194,94 +194,6 @@ unicode_from_ascii (rc_uint_type *length, unichar **unicode, const char *ascii)
   unicode_from_codepage (length, unicode, ascii, wind_current_codepage);
 }
 
-/* Convert an ASCII string with length A_LENGTH to a unicode string.  We just
-   copy it, expanding chars to shorts, rather than doing something intelligent.
-   This routine converts also \0 within a string.  */
-
-void
-unicode_from_ascii_len (rc_uint_type *length, unichar **unicode, const char *ascii, rc_uint_type a_length)
-{
-  char *tmp, *p;
-  rc_uint_type tlen, elen, idx = 0;
-
-  *unicode = NULL;
-
-  if (!a_length)
-    {
-      if (length)
-        *length = 0;
-      return;
-    }
-
-  /* Make sure we have zero terminated string.  */
-  p = tmp = (char *) alloca (a_length + 1);
-  memcpy (tmp, ascii, a_length);
-  tmp[a_length] = 0;
-
-  while (a_length > 0)
-    {
-      unichar *utmp, *up;
-
-      tlen = strlen (p);
-
-      if (tlen > a_length)
-        tlen = a_length;
-      if (*p == 0)
-        {
-	  /* Make room for one more character.  */
-	  utmp = (unichar *) res_alloc (sizeof (unichar) * (idx + 1));
-	  if (idx > 0)
-	    {
-	      memcpy (utmp, *unicode, idx * sizeof (unichar));
-	    }
-	  *unicode = utmp;
-	  utmp[idx++] = 0;
-	  --a_length;
-	  p++;
-	  continue;
-	}
-      utmp = NULL;
-      elen = 0;
-      elen = wind_MultiByteToWideChar (wind_current_codepage, p, NULL, 0);
-      if (elen)
-	{
-	  utmp = ((unichar *) res_alloc (elen + sizeof (unichar) * 2));
-	  wind_MultiByteToWideChar (wind_current_codepage, p, utmp, elen);
-	  elen /= sizeof (unichar);
-	  elen --;
-	}
-      else
-        {
-	  /* Make room for one more character.  */
-	  utmp = (unichar *) res_alloc (sizeof (unichar) * (idx + 1));
-	  if (idx > 0)
-	    {
-	      memcpy (utmp, *unicode, idx * sizeof (unichar));
-	    }
-	  *unicode = utmp;
-	  utmp[idx++] = ((unichar) *p) & 0xff;
-	  --a_length;
-	  p++;
-	  continue;
-	}
-      p += tlen;
-      a_length -= tlen;
-
-      up = (unichar *) res_alloc (sizeof (unichar) * (idx + elen));
-      if (idx > 0)
-	memcpy (up, *unicode, idx * sizeof (unichar));
-
-      *unicode = up;
-      if (elen)
-	memcpy (&up[idx], utmp, sizeof (unichar) * elen);
-
-      idx += elen;
-    }
-
-  if (length)
-    *length = idx;
-}
-
 /* Convert an unicode string to an ASCII string.  We just copy it,
    shrink shorts to chars, rather than doing something intelligent.
    Shorts with not within the char range are replaced by '_'.  */
diff --git a/binutils/winduni.h b/binutils/winduni.h
index 8b3a389eb5..878641535b 100644
--- a/binutils/winduni.h
+++ b/binutils/winduni.h
@@ -126,7 +126,6 @@ extern const local_iconv_map *wind_find_codepage_info (unsigned);
 
 /* Convert an Codepage string to a unicode string.  */
 extern void unicode_from_codepage (rc_uint_type *, unichar **, const char *, rc_uint_type);
-extern void unicode_from_ascii_len (rc_uint_type *, unichar **, const char *, rc_uint_type );
 
 /* Convert an unicode string to an codepage string.  */
 extern void codepage_from_unicode (rc_uint_type *, const unichar *, char **, rc_uint_type);
diff --git a/config.sub b/config.sub
index 78176a4402..f9fcdc8796 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-10-29'
+timestamp='2011-06-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -251,17 +251,13 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -295,7 +291,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rl78 | rx \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -361,7 +357,6 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -370,10 +365,8 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -407,7 +400,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -820,10 +813,6 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
diff --git a/config/ChangeLog b/config/ChangeLog
index 1087ad8ca9..cd8a7ef286 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,22 +1,3 @@
-2011-12-20  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* warnings.m4 (ACX_PROG_CC_WARNING_OPTS): Avoid leading dash in
-	expr call.
-
-2011-12-19  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* warnings.m4 (ACX_PROG_CC_WARNING_OPTS)
-	(ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Run the test without the
-	no- prefix.
-
-2011-12-18  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* acx.m4 (Test for GNAT): Update comment and add quotes in final test.
-
-2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* mh-interix (LIBGCC2_DEBUG_CFLAGS): Remove.
-
 2011-08-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* picflag.m4: New file.
diff --git a/config/acx.m4 b/config/acx.m4
index 9ff31eb85f..b559c03ebd 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -356,9 +356,9 @@ m4_define([AC_CHECK_HEADER],m4_defn([_AC_CHECK_HEADER_OLD]))
 ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR
 
 # Test for GNAT.
-# We require the gnatbind & gnatmake programs, as well as a compiler driver
-# that understands Ada.  We use the user's CC setting, already found, and
-# possibly add $1 to the command-line parameters.
+# We require the gnatbind program, and a compiler driver that
+# understands Ada.  We use the user's CC setting, already found,
+# and possibly add $1 to the command-line parameters.
 #
 # Sets the shell variable have_gnat to yes or no as appropriate, and
 # substitutes GNATBIND and GNATMAKE.
@@ -387,7 +387,7 @@ if test x"$errors" = x && test -f conftest.$ac_objext; then
 fi
 rm -f conftest.*])
 
-if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
+if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
   have_gnat=yes
 else
   have_gnat=no
diff --git a/config/mh-interix b/config/mh-interix
index 3be195b51e..67dff5c443 100644
--- a/config/mh-interix
+++ b/config/mh-interix
@@ -1,2 +1,7 @@
 # The shell may not be in /bin. 
 SHELL = sh
+
+# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
+# built without debugging information
+
+LIBGCC2_DEBUG_CFLAGS=
diff --git a/config/warnings.m4 b/config/warnings.m4
index b64b594e62..3801c856be 100644
--- a/config/warnings.m4
+++ b/config/warnings.m4
@@ -1,6 +1,6 @@
 # Autoconf include file defining macros related to compile-time warnings.
 
-# Copyright 2004, 2005, 2007, 2009, 2011 Free Software Foundation, Inc.
+# Copyright 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -28,13 +28,7 @@ AC_SUBST(acx_Var)dnl
 m4_expand_once([acx_Var=
 ],m4_quote(acx_Var=))dnl
 save_CFLAGS="$CFLAGS"
-for real_option in $1; do
-  # Do the check with the no- prefix removed since gcc silently
-  # accepts any -Wno-* option on purpose
-  case $real_option in
-    -Wno-*) option=-W`expr x$real_option : 'x-Wno-\(.*\)'` ;;
-    *) option=$real_option ;;
-  esac
+for option in $1; do
   AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option])
   AC_CACHE_CHECK([whether $CC supports $option], acx_Woption,
     [CFLAGS="$option"
@@ -43,14 +37,14 @@ for real_option in $1; do
       [AS_VAR_SET(acx_Woption, no)])
   ])
   AS_IF([test AS_VAR_GET(acx_Woption) = yes],
-        [acx_Var="$acx_Var${acx_Var:+ }$real_option"])
+        [acx_Var="$acx_Var${acx_Var:+ }$option"])
   AS_VAR_POPDEF([acx_Woption])dnl
 done
 CFLAGS="$save_CFLAGS"
 m4_popdef([acx_Var])dnl
 ])# ACX_PROG_CC_WARNING_OPTS
 
-# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC(WARNINGS, [VARIABLE = WARN_PEDANTIC])
+# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC(WARNINGS, [VARIABLE = WARN_PEDANTIC)
 #   Append to VARIABLE "-pedantic" + the argument, if the compiler is GCC
 #   and accepts all of those options simultaneously, otherwise to nothing.
 AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC],
@@ -59,14 +53,11 @@ m4_pushdef([acx_Var], [m4_default([$2], [WARN_PEDANTIC])])dnl
 AC_SUBST(acx_Var)dnl
 m4_expand_once([acx_Var=
 ],m4_quote(acx_Var=))dnl
-# Do the check with the no- prefix removed from the warning options
-# since gcc silently accepts any -Wno-* option on purpose
-m4_pushdef([acx_Woptions], [m4_bpatsubst([$1], [-Wno-], [-W])])dnl
-AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_]acx_Woptions)dnl
+AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl
 AS_IF([test "$GCC" = yes],
-[AC_CACHE_CHECK([whether $CC supports -pedantic ]acx_Woptions, acx_Pedantic,
+[AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic,
 [save_CFLAGS="$CFLAGS"
-CFLAGS="-pedantic acx_Woptions"
+CFLAGS="-pedantic $1"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
    [AS_VAR_SET(acx_Pedantic, yes)],
    [AS_VAR_SET(acx_Pedantic, no)])
@@ -75,7 +66,6 @@ AS_IF([test AS_VAR_GET(acx_Pedantic) = yes],
       [acx_Var="$acx_Var${acx_Var:+ }-pedantic $1"])
 ])
 AS_VAR_POPDEF([acx_Pedantic])dnl
-m4_popdef([acx_Woptions])dnl
 m4_popdef([acx_Var])dnl
 ])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC
 
diff --git a/configure b/configure
index e3fef4fc77..eb69f28d59 100755
--- a/configure
+++ b/configure
@@ -571,7 +571,6 @@ RAW_CXX_FOR_TARGET
 WINDMC_FOR_TARGET
 WINDRES_FOR_TARGET
 STRIP_FOR_TARGET
-READELF_FOR_TARGET
 RANLIB_FOR_TARGET
 OBJDUMP_FOR_TARGET
 NM_FOR_TARGET
@@ -586,7 +585,6 @@ GCJ_FOR_TARGET
 GCC_FOR_TARGET
 CXX_FOR_TARGET
 CC_FOR_TARGET
-READELF
 OBJDUMP
 OBJCOPY
 WINDMC
@@ -817,7 +815,6 @@ WINDRES
 WINDMC
 OBJCOPY
 OBJDUMP
-READELF
 CC_FOR_TARGET
 CXX_FOR_TARGET
 GCC_FOR_TARGET
@@ -832,7 +829,6 @@ LIPO_FOR_TARGET
 NM_FOR_TARGET
 OBJDUMP_FOR_TARGET
 RANLIB_FOR_TARGET
-READELF_FOR_TARGET
 STRIP_FOR_TARGET
 WINDRES_FOR_TARGET
 WINDMC_FOR_TARGET'
@@ -1581,7 +1577,6 @@ Some influential environment variables:
   WINDMC      WINDMC for the host
   OBJCOPY     OBJCOPY for the host
   OBJDUMP     OBJDUMP for the host
-  READELF     READELF for the host
   CC_FOR_TARGET
               CC for the target
   CXX_FOR_TARGET
@@ -1610,8 +1605,6 @@ Some influential environment variables:
               OBJDUMP for the target
   RANLIB_FOR_TARGET
               RANLIB for the target
-  READELF_FOR_TARGET
-              READELF for the target
   STRIP_FOR_TARGET
               STRIP for the target
   WINDRES_FOR_TARGET
@@ -2688,7 +2681,6 @@ target_libraries="target-libgcc \
 		target-libgloss \
 		target-newlib \
 		target-libgomp \
-		target-libitm \
 		target-libstdc++-v3 \
 		target-libmudflap \
 		target-libssp \
@@ -3054,7 +3046,7 @@ if test x$enable_libgomp = x ; then
 	;;
     *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
 	;;
-    *-*-solaris2* | *-*-hpux11*)
+    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
 	;;
     *-*-darwin* | *-*-aix*)
 	;;
@@ -3064,25 +3056,6 @@ if test x$enable_libgomp = x ; then
     esac
 fi
 
-# Disable libitm on unsupported systems.
-if test -d ${srcdir}/libitm; then
-    if test x$enable_libitm = x; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5
-$as_echo_n "checking for libitm support... " >&6; }
-	if (srcdir=${srcdir}/libitm; \
-		. ${srcdir}/configure.tgt; \
-		test -n "$UNSUPPORTED")
-	then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	    noconfigdirs="$noconfigdirs target-libitm"
-	else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	fi
-    fi
-fi
-
 # Disable libssp for some systems.
 case "${target}" in
   avr-*-*)
@@ -3092,10 +3065,6 @@ case "${target}" in
   powerpc-*-aix* | rs6000-*-aix*)
     noconfigdirs="$noconfigdirs target-libssp"
     ;;
-  rl78-*-*)
-    # Dereferencing -1 is a compile-time error
-    noconfigdirs="$noconfigdirs target-libssp"
-    ;;
 esac
 
 # Disable libstdc++-v3 for some systems.
@@ -3143,7 +3112,7 @@ case "${target}" in
     ;;
   m68k-*-*)
     ;;
-  mips*-*-rtems*)
+  mips-sgi-irix6.* | mips*-*-rtems*)
     ;;
   mips*-*-linux*)
     ;;
@@ -3259,6 +3228,13 @@ case "${target}" in
   rs6000-*-aix*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
+  mips*-*-irix6*)
+    # Linking libjava exceeds command-line length limits on at least
+    # IRIX 6.2, but not on IRIX 6.5.
+    # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
+    # <oldham@codesourcery.com>
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
   *-*-lynxos*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
@@ -3496,8 +3472,8 @@ case "${target}" in
     noconfigdirs="$noconfigdirs libgui itcl ld"
     ;;
   ia64*-*-*vms*)
-    # No ld support yet.
-    noconfigdirs="$noconfigdirs libgui itcl ld"
+    # No gdb or ld support yet.
+    noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"
     ;;
   i[3456789]86-w64-mingw*)
     ;;
@@ -4970,7 +4946,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5
 $as_echo "$acx_cv_cc_gcc_supports_ada" >&6; }
 
-if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
+if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
   have_gnat=yes
 else
   have_gnat=no
@@ -6866,6 +6842,18 @@ case "${enable_target_optspace}:${target}" in
     ;;
 esac
 
+# Default to using --with-stabs for certain targets.
+if test x${with_stabs} = x ; then
+  case "${target}" in
+  mips*-*-irix[56]*)
+    ;;
+  mips*-*-* | alpha*-*-osf*)
+    with_stabs=yes;
+    extra_host_args="${extra_host_args} --with-stabs"
+    ;;
+  esac
+fi
+
 # Some systems (e.g., one of the i386-aix systems the gas testers are
 # using) don't handle "\$" correctly, so don't use it here.
 tooldir='${exec_prefix}'/${target_noncanonical}
@@ -9600,147 +9588,6 @@ fi
 
 
 
-if test -n "$READELF"; then
-  ac_cv_prog_READELF=$READELF
-elif test -n "$ac_cv_prog_READELF"; then
-  READELF=$ac_cv_prog_READELF
-fi
-
-if test -n "$ac_cv_prog_READELF"; then
-  for ncn_progname in readelf; do
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_READELF+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF"; then
-  ac_cv_prog_READELF="$READELF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_READELF="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF=$ac_cv_prog_READELF
-if test -n "$READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  done
-fi
-
-for ncn_progname in readelf; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_READELF+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF"; then
-  ac_cv_prog_READELF="$READELF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_READELF="${ncn_tool_prefix}${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF=$ac_cv_prog_READELF
-if test -n "$READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-  if test -z "$ac_cv_prog_READELF" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_READELF+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF"; then
-  ac_cv_prog_READELF="$READELF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_READELF="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF=$ac_cv_prog_READELF
-if test -n "$READELF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
-$as_echo "$READELF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-  test -n "$ac_cv_prog_READELF" && break
-done
-
-if test -z "$ac_cv_prog_READELF" ; then
-  set dummy readelf
-  if test $build = $host ; then
-    READELF="$2"
-  else
-    READELF="${ncn_tool_prefix}$2"
-  fi
-fi
-
-
-
 
 
 
@@ -12580,236 +12427,6 @@ fi
 
 
 
-if test -z "$ac_cv_path_READELF_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readelf in $with_build_time_tools" >&5
-$as_echo_n "checking for readelf in $with_build_time_tools... " >&6; }
-    if test -x $with_build_time_tools/readelf; then
-      READELF_FOR_TARGET=`cd $with_build_time_tools && pwd`/readelf
-      ac_cv_path_READELF_FOR_TARGET=$READELF_FOR_TARGET
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_READELF_FOR_TARGET" >&5
-$as_echo "$ac_cv_path_READELF_FOR_TARGET" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    READELF_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=readelf`
-    test $READELF_FOR_TARGET = readelf && READELF_FOR_TARGET=
-    test -n "$READELF_FOR_TARGET" && ac_cv_path_READELF_FOR_TARGET=$READELF_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_READELF_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
-  # Extract the first word of "readelf", so it can be a program name with args.
-set dummy readelf; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_READELF_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $READELF_FOR_TARGET in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_READELF_FOR_TARGET="$READELF_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $gcc_cv_tool_dirs
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_READELF_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-READELF_FOR_TARGET=$ac_cv_path_READELF_FOR_TARGET
-if test -n "$READELF_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF_FOR_TARGET" >&5
-$as_echo "$READELF_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_READELF_FOR_TARGET" ; then
-
-
-if test -n "$READELF_FOR_TARGET"; then
-  ac_cv_prog_READELF_FOR_TARGET=$READELF_FOR_TARGET
-elif test -n "$ac_cv_prog_READELF_FOR_TARGET"; then
-  READELF_FOR_TARGET=$ac_cv_prog_READELF_FOR_TARGET
-fi
-
-if test -n "$ac_cv_prog_READELF_FOR_TARGET"; then
-  for ncn_progname in readelf; do
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_READELF_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF_FOR_TARGET"; then
-  ac_cv_prog_READELF_FOR_TARGET="$READELF_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_READELF_FOR_TARGET="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF_FOR_TARGET=$ac_cv_prog_READELF_FOR_TARGET
-if test -n "$READELF_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF_FOR_TARGET" >&5
-$as_echo "$READELF_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  done
-fi
-
-if test -z "$ac_cv_prog_READELF_FOR_TARGET" && test -n "$with_build_time_tools"; then
-  for ncn_progname in readelf; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
-$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_READELF_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      break
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_READELF_FOR_TARGET"; then
-  for ncn_progname in readelf; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_READELF_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF_FOR_TARGET"; then
-  ac_cv_prog_READELF_FOR_TARGET="$READELF_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_READELF_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF_FOR_TARGET=$ac_cv_prog_READELF_FOR_TARGET
-if test -n "$READELF_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF_FOR_TARGET" >&5
-$as_echo "$READELF_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-    if test -z "$ac_cv_prog_READELF_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_READELF_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$READELF_FOR_TARGET"; then
-  ac_cv_prog_READELF_FOR_TARGET="$READELF_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_READELF_FOR_TARGET="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-READELF_FOR_TARGET=$ac_cv_prog_READELF_FOR_TARGET
-if test -n "$READELF_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF_FOR_TARGET" >&5
-$as_echo "$READELF_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-    test -n "$ac_cv_prog_READELF_FOR_TARGET" && break
-  done
-fi
-
-if test -z "$ac_cv_prog_READELF_FOR_TARGET" ; then
-  set dummy readelf
-  if test $build = $target ; then
-    READELF_FOR_TARGET="$2"
-  else
-    READELF_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-else
-  READELF_FOR_TARGET="$ac_cv_prog_READELF_FOR_TARGET"
-fi
-
-else
-  READELF_FOR_TARGET=$ac_cv_path_READELF_FOR_TARGET
-fi
-
-
-
-
 if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strip in $with_build_time_tools" >&5
@@ -14134,48 +13751,6 @@ $as_echo "pre-installed" >&6; }
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target readelf" >&5
-$as_echo_n "checking where to find the target readelf... " >&6; }
-if test "x${build}" != "x${host}" ; then
-  if expr "x$READELF_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $READELF_FOR_TARGET`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
-$as_echo "pre-installed in $ac_dir" >&6; }
-  else
-    # Canadian cross, just use what we found
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
-$as_echo "pre-installed" >&6; }
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    READELF_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/readelf'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
-$as_echo "just compiled" >&6; }
-  elif expr "x$READELF_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $READELF_FOR_TARGET`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
-$as_echo "pre-installed in $ac_dir" >&6; }
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    READELF_FOR_TARGET='$(READELF)'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
-$as_echo "host tool" >&6; }
-  else
-    # We need a cross tool
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
-$as_echo "pre-installed" >&6; }
-  fi
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target strip" >&5
 $as_echo_n "checking where to find the target strip... " >&6; }
 if test "x${build}" != "x${host}" ; then
diff --git a/configure.ac b/configure.ac
index 386ec78b66..57350a54b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,7 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp li
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
 # If --enable-gold is used, "gold" may replace "ld".
-host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
+host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
@@ -154,7 +154,6 @@ target_libraries="target-libgcc \
 		target-libgloss \
 		target-newlib \
 		target-libgomp \
-		target-libitm \
 		target-libstdc++-v3 \
 		target-libmudflap \
 		target-libssp \
@@ -483,7 +482,7 @@ if test x$enable_libgomp = x ; then
 	;;
     *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
 	;;
-    *-*-solaris2* | *-*-hpux11*)
+    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
 	;;
     *-*-darwin* | *-*-aix*)
 	;;
@@ -493,22 +492,6 @@ if test x$enable_libgomp = x ; then
     esac
 fi
 
-# Disable libitm on unsupported systems.
-if test -d ${srcdir}/libitm; then
-    if test x$enable_libitm = x; then
-	AC_MSG_CHECKING([for libitm support])
-	if (srcdir=${srcdir}/libitm; \
-		. ${srcdir}/configure.tgt; \
-		test -n "$UNSUPPORTED")
-	then
-	    AC_MSG_RESULT([no])
-	    noconfigdirs="$noconfigdirs target-libitm"
-	else
-	    AC_MSG_RESULT([yes])
-	fi
-    fi
-fi
-
 # Disable libssp for some systems.
 case "${target}" in
   avr-*-*)
@@ -518,10 +501,6 @@ case "${target}" in
   powerpc-*-aix* | rs6000-*-aix*)
     noconfigdirs="$noconfigdirs target-libssp"
     ;;
-  rl78-*-*)
-    # Dereferencing -1 is a compile-time error
-    noconfigdirs="$noconfigdirs target-libssp"
-    ;;
 esac
 
 # Disable libstdc++-v3 for some systems.
@@ -569,7 +548,7 @@ case "${target}" in
     ;;
   m68k-*-*)
     ;;
-  mips*-*-rtems*)
+  mips-sgi-irix6.* | mips*-*-rtems*)
     ;;
   mips*-*-linux*)
     ;;
@@ -685,6 +664,13 @@ case "${target}" in
   rs6000-*-aix*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
+  mips*-*-irix6*)
+    # Linking libjava exceeds command-line length limits on at least
+    # IRIX 6.2, but not on IRIX 6.5.
+    # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
+    # <oldham@codesourcery.com>
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
   *-*-lynxos*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;; 
@@ -922,8 +908,8 @@ case "${target}" in
     noconfigdirs="$noconfigdirs libgui itcl ld"
     ;;
   ia64*-*-*vms*)
-    # No ld support yet.
-    noconfigdirs="$noconfigdirs libgui itcl ld"
+    # No gdb or ld support yet.
+    noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"
     ;;
   i[[3456789]]86-w64-mingw*)
     ;;
@@ -2324,6 +2310,18 @@ case "${enable_target_optspace}:${target}" in
     ;;
 esac
 
+# Default to using --with-stabs for certain targets.
+if test x${with_stabs} = x ; then
+  case "${target}" in
+  mips*-*-irix[[56]]*)
+    ;;
+  mips*-*-* | alpha*-*-osf*)
+    with_stabs=yes;
+    extra_host_args="${extra_host_args} --with-stabs"
+    ;;
+  esac
+fi
+
 # Some systems (e.g., one of the i386-aix systems the gas testers are
 # using) don't handle "\$" correctly, so don't use it here.
 tooldir='${exec_prefix}'/${target_noncanonical}
@@ -3044,7 +3042,6 @@ NCN_STRICT_CHECK_TOOLS(WINDRES, windres)
 NCN_STRICT_CHECK_TOOLS(WINDMC, windmc)
 NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy)
 NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump)
-NCN_STRICT_CHECK_TOOLS(READELF, readelf)
 AC_SUBST(CC)
 AC_SUBST(CXX)
 AC_SUBST(CFLAGS)
@@ -3078,7 +3075,6 @@ ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
 ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm)
 ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump)
 ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib)
-ACX_CHECK_INSTALLED_TARGET_TOOL(READELF_FOR_TARGET, readelf)
 ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
 ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
 ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc)
@@ -3108,7 +3104,6 @@ GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
 GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
 GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
 GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
-GCC_TARGET_TOOL(readelf, READELF_FOR_TARGET, READELF, [binutils/readelf])
 GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip-new])
 GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres])
 GCC_TARGET_TOOL(windmc, WINDMC_FOR_TARGET, WINDMC, [binutils/windmc])
diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index bd82d13b5d..0ab89be9e2 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,23 +1,3 @@
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* mt.opc (print_dollarhex): Trim values to 32 bits.
-
-2011-12-15  Nick Clifton  <nickc@redhat.com>
-
-	* frv.opc (parse_uhi16): Fix handling of %hi operator on 64-bit
-	hosts.
-
-2011-10-26  Joern Rennecke  <joern.rennecke@embecosm.com>
-
-	* epiphany.opc (parse_branch_addr): Fix type of valuep.
-	Cast value before printing it as a long.
-	(parse_postindex): Fix type of valuep.
-
-2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
-
-	* cpu/epiphany.cpu: New file.
-	* cpu/epiphany.opc: New file.
-
 2011-08-22  Nick Clifton  <nickc@redhat.com>
 
 	* fr30.cpu: Newly contributed file.
diff --git a/cpu/frv.opc b/cpu/frv.opc
index 869155d67a..f81cef0d60 100644
--- a/cpu/frv.opc
+++ b/cpu/frv.opc
@@ -1343,11 +1343,11 @@ parse_uhi16 (CGEN_CPU_DESC cd,
 	  if (errmsg == NULL
 	      && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
 	    {
- 	      /* If value is wider than 32 bits then be
- 		 careful about how we extract bits 16-31.  */
- 	      if (sizeof (value) > 4)
- 		value &= (((bfd_vma)1 << 16) << 16) - 1;
-
+	      /* If bfd_vma is wider than 32 bits, but we have a sign-
+		 or zero-extension, truncate it.  */
+	      if (value >= - ((bfd_vma)1 << 31)
+		  || value <= ((bfd_vma)1 << 31) - (bfd_vma)1)
+		value &= (((bfd_vma)1 << 16) << 16) - 1;
 	      value >>= 16;
 	    }
 	  *valuep = value;
diff --git a/cpu/mt.opc b/cpu/mt.opc
index d988cc25e9..3da6d0ea96 100644
--- a/cpu/mt.opc
+++ b/cpu/mt.opc
@@ -1,5 +1,5 @@
 /* Morpho Technologies mRISC opcode support, for GNU Binutils.  -*- C -*-
-   Copyright 2001, 2007, 2008, 2009, 2012 Free Software Foundation, Inc.
+   Copyright 2001, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    Contributed by Red Hat Inc; developed under contract from
    Morpho Technologies.
@@ -447,7 +447,7 @@ print_dollarhex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  info->fprintf_func (info->stream, "$%lx", value & 0xffffffff);
+  info->fprintf_func (info->stream, "$%lx", value);
 
   if (0)
     print_normal (cd, dis_info, value, attrs, pc, length);
diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog
index f606faad4d..94986c81cc 100644
--- a/elfcpp/ChangeLog
+++ b/elfcpp/ChangeLog
@@ -1,41 +1,3 @@
-2012-03-12  Cary Coutant  <ccoutant@google.com>
-
-	Update DWARF enums from ../include/dwarf2.h.
-	* dwarf.h (enum DW_TAG): Add new DWARF-4 tags.
-	(enum DW_FORM): Add new DWARF-4 and Fission extensions.
-	(enum DW_AT): New enum.
-	(enum DW_LINE_EXTENDED_OPS): Add new DWARF-4 opcode.
-	(enum DW_ENCODING): Add new DWARF-4 encoding.
-	(enum DW_OP): Add new DWARF-4 opcodes.
-	(enum DW_CHILDREN): New enum.
-	(enum DW_LANG): New enum.
-
-2012-01-27  Aleksandar Simeonov  <asimeonov@mips.com>
-
-	* mips.h: New file
-	* elfcpp.h (SHT_MIPS_REGINFO): New enums for processor-specific flags.
-	(SHF_MIPS_GPREL): Likewise.
-	(PT_MIPS_REGINFO, PT_MIPS_RTPROC, PT_MIPS_OPTIONS): Likewise.
-	(DT_MIPS_RLD_VERSION, DT_MIPS_TIME_STAMP, DT_MIPS_ICHECKSUM,
-	 DT_MIPS_IVERSION, DT_MIPS_FLAGS, DT_MIPS_BASE_ADDRESS, DT_MIPS_MSYM,
-	 DT_MIPS_CONFLICT, DT_MIPS_LIBLIST, DT_MIPS_LOCAL_GOTNO,
-	 DT_MIPS_CONFLICTNO, DT_MIPS_LIBLISTNO, DT_MIPS_SYMTABNO,
-	 DT_MIPS_UNREFEXTNO, DT_MIPS_GOTSYM, DT_MIPS_HIPAGENO, DT_MIPS_RLD_MAP,
-	 DT_MIPS_DELTA_CLASS, DT_MIPS_DELTA_CLASS_NO, DT_MIPS_DELTA_INSTANCE,
-	 DT_MIPS_DELTA_INSTANCE_NO, DT_MIPS_DELTA_RELOC, DT_MIPS_DELTA_RELOC_NO,
-	 DT_MIPS_DELTA_SYM, DT_MIPS_DELTA_SYM_NO, DT_MIPS_DELTA_CLASSSYM,
-	 DT_MIPS_DELTA_CLASSSYM_NO, DT_MIPS_CXX_FLAGS, DT_MIPS_PIXIE_INIT,
-	 DT_MIPS_SYMBOL_LIB, DT_MIPS_LOCALPAGE_GOTIDX, DT_MIPS_LOCAL_GOTIDX,
-	 DT_MIPS_HIDDEN_GOTIDX, DT_MIPS_PROTECTED_GOTIDX, DT_MIPS_OPTIONS,
-	 DT_MIPS_INTERFACE, DT_MIPS_DYNSTR_ALIGN, DT_MIPS_INTERFACE_SIZE,
-	 DT_MIPS_RLD_TEXT_RESOLVE_ADDR, DT_MIPS_PERF_SUFFIX,
-	 DT_MIPS_COMPACT_SIZE, DT_MIPS_GP_VALUE, DT_MIPS_AUX_DYNAMIC,
-	 DT_MIPS_PLTGOT, DT_MIPS_RWPLT): Likewise.
-
-2012-01-27  Ian Lance Taylor  <iant@google.com>
-
-	* elfcpp.h (STT_GNU_IFUNC): Add comment.
-
 2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
 	    Thomas Schwinge  <thomas@schwinge.name>
 
diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index a4e7a13ecd..d599c9750b 100644
--- a/elfcpp/dwarf.h
+++ b/elfcpp/dwarf.h
@@ -100,11 +100,6 @@ enum DW_TAG
   DW_TAG_condition = 0x3f,
   DW_TAG_shared_type = 0x40,
 
-  // DWARF4.
-  DW_TAG_type_unit = 0x41,
-  DW_TAG_rvalue_reference_type = 0x42,
-  DW_TAG_template_alias = 0x43,
-
   // SGI/MIPS extensions.
   DW_TAG_MIPS_loop = 0x4081,
 
@@ -152,226 +147,7 @@ enum DW_FORM
   DW_FORM_ref4 = 0x13,
   DW_FORM_ref8 = 0x14,
   DW_FORM_ref_udata = 0x15,
-  DW_FORM_indirect = 0x16,
-
-  // DWARF4.
-  DW_FORM_sec_offset = 0x17,
-  DW_FORM_exprloc = 0x18,
-  DW_FORM_flag_present = 0x19,
-  DW_FORM_ref_sig8 = 0x20,
-
-  // Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.
-  DW_FORM_GNU_ref_index = 0x1f00,
-  DW_FORM_GNU_addr_index = 0x1f01,
-  DW_FORM_GNU_str_index = 0x1f02
-};
-
-/* Attribute names and codes.  */
-enum DW_AT
-{
-  DW_AT_sibling = 0x01,
-  DW_AT_location = 0x02,
-  DW_AT_name = 0x03,
-  DW_AT_ordering = 0x09,
-  DW_AT_subscr_data = 0x0a,
-  DW_AT_byte_size = 0x0b,
-  DW_AT_bit_offset = 0x0c,
-  DW_AT_bit_size = 0x0d,
-  DW_AT_element_list = 0x0f,
-  DW_AT_stmt_list = 0x10,
-  DW_AT_low_pc = 0x11,
-  DW_AT_high_pc = 0x12,
-  DW_AT_language = 0x13,
-  DW_AT_member = 0x14,
-  DW_AT_discr = 0x15,
-  DW_AT_discr_value = 0x16,
-  DW_AT_visibility = 0x17,
-  DW_AT_import = 0x18,
-  DW_AT_string_length = 0x19,
-  DW_AT_common_reference = 0x1a,
-  DW_AT_comp_dir = 0x1b,
-  DW_AT_const_value = 0x1c,
-  DW_AT_containing_type = 0x1d,
-  DW_AT_default_value = 0x1e,
-  DW_AT_inline = 0x20,
-  DW_AT_is_optional = 0x21,
-  DW_AT_lower_bound = 0x22,
-  DW_AT_producer = 0x25,
-  DW_AT_prototyped = 0x27,
-  DW_AT_return_addr = 0x2a,
-  DW_AT_start_scope = 0x2c,
-  DW_AT_bit_stride = 0x2e,
-  DW_AT_upper_bound = 0x2f,
-  DW_AT_abstract_origin = 0x31,
-  DW_AT_accessibility = 0x32,
-  DW_AT_address_class = 0x33,
-  DW_AT_artificial = 0x34,
-  DW_AT_base_types = 0x35,
-  DW_AT_calling_convention = 0x36,
-  DW_AT_count = 0x37,
-  DW_AT_data_member_location = 0x38,
-  DW_AT_decl_column = 0x39,
-  DW_AT_decl_file = 0x3a,
-  DW_AT_decl_line = 0x3b,
-  DW_AT_declaration = 0x3c,
-  DW_AT_discr_list = 0x3d,
-  DW_AT_encoding = 0x3e,
-  DW_AT_external = 0x3f,
-  DW_AT_frame_base = 0x40,
-  DW_AT_friend = 0x41,
-  DW_AT_identifier_case = 0x42,
-  DW_AT_macro_info = 0x43,
-  DW_AT_namelist_items = 0x44,
-  DW_AT_priority = 0x45,
-  DW_AT_segment = 0x46,
-  DW_AT_specification = 0x47,
-  DW_AT_static_link = 0x48,
-  DW_AT_type = 0x49,
-  DW_AT_use_location = 0x4a,
-  DW_AT_variable_parameter = 0x4b,
-  DW_AT_virtuality = 0x4c,
-  DW_AT_vtable_elem_location = 0x4d,
-
-  // DWARF3.
-  DW_AT_allocated     = 0x4e,
-  DW_AT_associated    = 0x4f,
-  DW_AT_data_location = 0x50,
-  DW_AT_byte_stride   = 0x51,
-  DW_AT_entry_pc      = 0x52,
-  DW_AT_use_UTF8      = 0x53,
-  DW_AT_extension     = 0x54,
-  DW_AT_ranges        = 0x55,
-  DW_AT_trampoline    = 0x56,
-  DW_AT_call_column   = 0x57,
-  DW_AT_call_file     = 0x58,
-  DW_AT_call_line     = 0x59,
-  DW_AT_description   = 0x5a,
-  DW_AT_binary_scale  = 0x5b,
-  DW_AT_decimal_scale = 0x5c,
-  DW_AT_small         = 0x5d,
-  DW_AT_decimal_sign  = 0x5e,
-  DW_AT_digit_count   = 0x5f,
-  DW_AT_picture_string = 0x60,
-  DW_AT_mutable       = 0x61,
-  DW_AT_threads_scaled = 0x62,
-  DW_AT_explicit      = 0x63,
-  DW_AT_object_pointer = 0x64,
-  DW_AT_endianity     = 0x65,
-  DW_AT_elemental     = 0x66,
-  DW_AT_pure          = 0x67,
-  DW_AT_recursive     = 0x68,
-
-  // DWARF4.
-  DW_AT_signature       = 0x69,
-  DW_AT_main_subprogram = 0x6a,
-  DW_AT_data_bit_offset = 0x6b,
-  DW_AT_const_expr      = 0x6c,
-  DW_AT_enum_class      = 0x6d,
-  DW_AT_linkage_name    = 0x6e,
-
-  DW_AT_lo_user = 0x2000,
-  DW_AT_hi_user = 0x3fff,
-
-  // SGI/MIPS extensions.
-  DW_AT_MIPS_fde = 0x2001,
-  DW_AT_MIPS_loop_begin = 0x2002,
-  DW_AT_MIPS_tail_loop_begin = 0x2003,
-  DW_AT_MIPS_epilog_begin = 0x2004,
-  DW_AT_MIPS_loop_unroll_factor = 0x2005,
-  DW_AT_MIPS_software_pipeline_depth = 0x2006,
-  DW_AT_MIPS_linkage_name = 0x2007,
-  DW_AT_MIPS_stride = 0x2008,
-  DW_AT_MIPS_abstract_name = 0x2009,
-  DW_AT_MIPS_clone_origin = 0x200a,
-  DW_AT_MIPS_has_inlines = 0x200b,
-
-  // HP extensions.
-  DW_AT_HP_block_index         = 0x2000,
-  DW_AT_HP_unmodifiable        = 0x2001, // Same as DW_AT_MIPS_fde.
-  DW_AT_HP_prologue            = 0x2005, // Same as DW_AT_MIPS_loop_unroll.
-  DW_AT_HP_epilogue            = 0x2008, // Same as DW_AT_MIPS_stride.
-  DW_AT_HP_actuals_stmt_list   = 0x2010,
-  DW_AT_HP_proc_per_section    = 0x2011,
-  DW_AT_HP_raw_data_ptr        = 0x2012,
-  DW_AT_HP_pass_by_reference   = 0x2013,
-  DW_AT_HP_opt_level           = 0x2014,
-  DW_AT_HP_prof_version_id     = 0x2015,
-  DW_AT_HP_opt_flags           = 0x2016,
-  DW_AT_HP_cold_region_low_pc  = 0x2017,
-  DW_AT_HP_cold_region_high_pc = 0x2018,
-  DW_AT_HP_all_variables_modifiable = 0x2019,
-  DW_AT_HP_linkage_name        = 0x201a,
-  DW_AT_HP_prof_flags          = 0x201b,  // In comp unit of procs_info for -g.
-  DW_AT_HP_unit_name           = 0x201f,
-  DW_AT_HP_unit_size           = 0x2020,
-  DW_AT_HP_widened_byte_size   = 0x2021,
-  DW_AT_HP_definition_points   = 0x2022,
-  DW_AT_HP_default_location    = 0x2023,
-  DW_AT_HP_is_result_param     = 0x2029,
-
-  // GNU extensions.
-  DW_AT_sf_names   = 0x2101,
-  DW_AT_src_info   = 0x2102,
-  DW_AT_mac_info   = 0x2103,
-  DW_AT_src_coords = 0x2104,
-  DW_AT_body_begin = 0x2105,
-  DW_AT_body_end   = 0x2106,
-  DW_AT_GNU_vector = 0x2107,
-
-  // Thread-safety annotations.
-  // See http://gcc.gnu.org/wiki/ThreadSafetyAnnotation .
-  DW_AT_GNU_guarded_by    = 0x2108,
-  DW_AT_GNU_pt_guarded_by = 0x2109,
-  DW_AT_GNU_guarded       = 0x210a,
-  DW_AT_GNU_pt_guarded    = 0x210b,
-  DW_AT_GNU_locks_excluded = 0x210c,
-  DW_AT_GNU_exclusive_locks_required = 0x210d,
-  DW_AT_GNU_shared_locks_required = 0x210e,
-
-  // One-definition rule violation detection.
-  // See http://gcc.gnu.org/wiki/DwarfSeparateTypeInfo .
-  DW_AT_GNU_odr_signature = 0x210f,
-
-  // Template template argument name.
-  // See http://gcc.gnu.org/wiki/TemplateParmsDwarf .
-  DW_AT_GNU_template_name = 0x2110,
-
-  // The GNU call site extension.
-  // See http://www.dwarfstd.org/ShowIssue.php?issue=100909.2&type=open .
-  DW_AT_GNU_call_site_value = 0x2111,
-  DW_AT_GNU_call_site_data_value = 0x2112,
-  DW_AT_GNU_call_site_target = 0x2113,
-  DW_AT_GNU_call_site_target_clobbered = 0x2114,
-  DW_AT_GNU_tail_call = 0x2115,
-  DW_AT_GNU_all_tail_call_sites = 0x2116,
-  DW_AT_GNU_all_call_sites = 0x2117,
-  DW_AT_GNU_all_source_call_sites = 0x2118,
-  // Section offset into .debug_macro section.
-  DW_AT_GNU_macros = 0x2119,
-  // Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.
-  DW_AT_GNU_dwo_name = 0x2130,
-  DW_AT_GNU_dwo_id = 0x2131,
-  DW_AT_GNU_ref_base = 0x2132,
-  DW_AT_GNU_addr_base = 0x2133,
-  DW_AT_GNU_pubnames = 0x2134,
-  DW_AT_GNU_pubtypes = 0x2135,
-
-  // VMS extensions.
-  DW_AT_VMS_rtnbeg_pd_address = 0x2201,
-
-  // GNAT extensions.
-  // GNAT descriptive type.
-  // See http://gcc.gnu.org/wiki/DW_AT_GNAT_descriptive_type .
-  DW_AT_use_GNAT_descriptive_type = 0x2301,
-  DW_AT_GNAT_descriptive_type	= 0x2302,
-
-  // UPC extension.
-  DW_AT_upc_threads_scaled = 0x3210,
-
-  // PGI (STMicroelectronics) extensions.
-  DW_AT_PGI_lbase    = 0x3a00,
-  DW_AT_PGI_soffset  = 0x3a01,
-  DW_AT_PGI_lstride  = 0x3a02
+  DW_FORM_indirect = 0x16
 };
 
 // Frame unwind information.
@@ -427,8 +203,6 @@ enum DW_LINE_EXTENDED_OPS
   DW_LNE_end_sequence = 1,
   DW_LNE_set_address = 2,
   DW_LNE_define_file = 3,
-  // DWARF4.
-  DW_LNE_set_discriminator = 4,
   // HP extensions.
   DW_LNE_HP_negate_is_UV_update      = 0x11,
   DW_LNE_HP_push_context             = 0x12,
@@ -462,8 +236,6 @@ enum DW_ENCODING
   DW_ATE_signed_fixed                =0xd,
   DW_ATE_unsigned_fixed              =0xe,
   DW_ATE_decimal_float               =0xf,
-  // DWARF4.
-  DW_ATE_UTF                         =0x10,
   DW_ATE_lo_user                     =0x80,
   DW_ATE_hi_user                     =0xff
 };
@@ -625,9 +397,6 @@ enum DW_OP
   DW_OP_form_tls_address             =0x9b,
   DW_OP_call_frame_cfa               =0x9c,
   DW_OP_bit_piece                    =0x9d,
-  // DWARF4.
-  DW_OP_implicit_value               =0x9e,
-  DW_OP_stack_value                  =0x9f,
   DW_OP_lo_user                      =0xe0,
   DW_OP_hi_user                      =0xff,
   // GNU extensions
@@ -680,53 +449,6 @@ enum DW_CFA
   DW_CFA_GNU_negative_offset_extended = 0x2f
 };
 
-enum DW_CHILDREN
-{
-  DW_CHILDREN_no		     =0x00,
-  DW_CHILDREN_yes		     =0x01
-};
-
-// Source language names and codes.
-enum DW_LANG
-  {
-    DW_LANG_C89 = 0x0001,
-    DW_LANG_C = 0x0002,
-    DW_LANG_Ada83 = 0x0003,
-    DW_LANG_C_plus_plus = 0x0004,
-    DW_LANG_Cobol74 = 0x0005,
-    DW_LANG_Cobol85 = 0x0006,
-    DW_LANG_Fortran77 = 0x0007,
-    DW_LANG_Fortran90 = 0x0008,
-    DW_LANG_Pascal83 = 0x0009,
-    DW_LANG_Modula2 = 0x000a,
-    // DWARF 3.
-    DW_LANG_Java = 0x000b,
-    DW_LANG_C99 = 0x000c,
-    DW_LANG_Ada95 = 0x000d,
-    DW_LANG_Fortran95 = 0x000e,
-    DW_LANG_PLI = 0x000f,
-    DW_LANG_ObjC = 0x0010,
-    DW_LANG_ObjC_plus_plus = 0x0011,
-    DW_LANG_UPC = 0x0012,
-    DW_LANG_D = 0x0013,
-    // DWARF 4.
-    DW_LANG_Python = 0x0014,
-    // DWARF 5.
-    DW_LANG_Go = 0x0016,
-    DW_LANG_lo_user = 0x8000,	// Implementation-defined range start.
-    DW_LANG_hi_user = 0xffff,	// Implementation-defined range start.
-    // MIPS.
-    DW_LANG_Mips_Assembler = 0x8001,
-    // UPC.
-    DW_LANG_Upc = 0x8765,
-    // HP extensions.
-    DW_LANG_HP_Bliss     = 0x8003,
-    DW_LANG_HP_Basic91   = 0x8004,
-    DW_LANG_HP_Pascal91  = 0x8005,
-    DW_LANG_HP_IMacro    = 0x8006,
-    DW_LANG_HP_Assembler = 0x8007
-  };
-
 } // End namespace elfcpp.
 
 #endif // !defined(ELFCPP_DWARF_H)
diff --git a/elfcpp/elfcpp.h b/elfcpp/elfcpp.h
index e4f9f1fa73..7a70765327 100644
--- a/elfcpp/elfcpp.h
+++ b/elfcpp/elfcpp.h
@@ -1,7 +1,6 @@
 // elfcpp.h -- main header file for elfcpp    -*- C++ -*-
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
-// Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of elfcpp.
@@ -400,10 +399,6 @@ enum SHT
   // x86_64 unwind information.
   SHT_X86_64_UNWIND = 0x70000001,
 
-  //MIPS-specific section types.
-  // Register info section
-  SHT_MIPS_REGINFO = 0x70000006,
-
   // Link editor is to sort the entries in this section based on the
   // address specified in the associated symbol table entry.
   SHT_ORDERED = 0x7fffffff
@@ -438,9 +433,6 @@ enum SHF
   // is also set, or if relocations exist against the section.
   SHF_EXCLUDE = 0x80000000,
 
-  // Section with data that is GP relative addressable.
-  SHF_MIPS_GPREL = 0x10000000,
-
   // x86_64 specific large section.
   SHF_X86_64_LARGE = 0x10000000
 };
@@ -482,13 +474,7 @@ enum PT
   // Platform architecture compatibility information
   PT_ARM_ARCHEXT = 0x70000000,
   // Exception unwind tables
-  PT_ARM_EXIDX = 0x70000001,
-  // Register usage information.  Identifies one .reginfo section.
-  PT_MIPS_REGINFO =0x70000000,
-  // Runtime procedure table.
-  PT_MIPS_RTPROC = 0x70000001,
-  // .MIPS.options section.
-  PT_MIPS_OPTIONS = 0x70000002
+  PT_ARM_EXIDX = 0x70000001
 };
 
 // The valid bit flags found in the Phdr p_flags field.
@@ -527,12 +513,8 @@ enum STT
   STT_FILE = 4,
   STT_COMMON = 5,
   STT_TLS = 6,
-
-  // GNU extension: symbol value points to a function which is called
-  // at runtime to determine the final value of the symbol.
-  STT_GNU_IFUNC = 10,
-
   STT_LOOS = 10,
+  STT_GNU_IFUNC = 10,
   STT_HIOS = 12,
   STT_LOPROC = 13,
   STT_HIPROC = 15,
@@ -751,98 +733,6 @@ enum DT
   // symbol in the symbol table.
   DT_SPARC_REGISTER = 0x70000001,
 
-  // MIPS specific dynamic array tags.
-  // 32 bit version number for runtime linker interface.
-  DT_MIPS_RLD_VERSION = 0x70000001,
-  // Time stamp.
-  DT_MIPS_TIME_STAMP = 0x70000002,
-  // Checksum of external strings and common sizes.
-  DT_MIPS_ICHECKSUM = 0x70000003,
-  // Index of version string in string table.
-  DT_MIPS_IVERSION = 0x70000004,
-  // 32 bits of flags.
-  DT_MIPS_FLAGS = 0x70000005,
-  // Base address of the segment.
-  DT_MIPS_BASE_ADDRESS = 0x70000006,
-  // ???
-  DT_MIPS_MSYM = 0x70000007,
-  // Address of .conflict section.
-  DT_MIPS_CONFLICT = 0x70000008,
-  // Address of .liblist section.
-  DT_MIPS_LIBLIST = 0x70000009,
-  // Number of local global offset table entries.
-  DT_MIPS_LOCAL_GOTNO = 0x7000000a,
-  // Number of entries in the .conflict section.
-  DT_MIPS_CONFLICTNO = 0x7000000b,
-  // Number of entries in the .liblist section.
-  DT_MIPS_LIBLISTNO = 0x70000010,
-  // Number of entries in the .dynsym section.
-  DT_MIPS_SYMTABNO = 0x70000011,
-  // Index of first external dynamic symbol not referenced locally.
-  DT_MIPS_UNREFEXTNO = 0x70000012,
-  // Index of first dynamic symbol in global offset table.
-  DT_MIPS_GOTSYM = 0x70000013,
-  // Number of page table entries in global offset table.
-  DT_MIPS_HIPAGENO = 0x70000014,
-  // Address of run time loader map, used for debugging.
-  DT_MIPS_RLD_MAP = 0x70000016,
-  // Delta C++ class definition.
-  DT_MIPS_DELTA_CLASS = 0x70000017,
-  // Number of entries in DT_MIPS_DELTA_CLASS.
-  DT_MIPS_DELTA_CLASS_NO = 0x70000018,
-  // Delta C++ class instances.
-  DT_MIPS_DELTA_INSTANCE = 0x70000019,
-  // Number of entries in DT_MIPS_DELTA_INSTANCE.
-  DT_MIPS_DELTA_INSTANCE_NO = 0x7000001a,
-  // Delta relocations.
-  DT_MIPS_DELTA_RELOC = 0x7000001b,
-  // Number of entries in DT_MIPS_DELTA_RELOC.
-  DT_MIPS_DELTA_RELOC_NO = 0x7000001c,
-  // Delta symbols that Delta relocations refer to.
-  DT_MIPS_DELTA_SYM = 0x7000001d,
-  // Number of entries in DT_MIPS_DELTA_SYM.
-  DT_MIPS_DELTA_SYM_NO = 0x7000001e,
-  // Delta symbols that hold class declarations.
-  DT_MIPS_DELTA_CLASSSYM = 0x70000020,
-  // Number of entries in DT_MIPS_DELTA_CLASSSYM.
-  DT_MIPS_DELTA_CLASSSYM_NO = 0x70000021,
-  // Flags indicating information about C++ flavor.
-  DT_MIPS_CXX_FLAGS = 0x70000022,
-  // Pixie information (???).
-  DT_MIPS_PIXIE_INIT = 0x70000023,
-  // Address of .MIPS.symlib
-  DT_MIPS_SYMBOL_LIB = 0x70000024,
-  // The GOT index of the first PTE for a segment
-  DT_MIPS_LOCALPAGE_GOTIDX = 0x70000025,
-  // The GOT index of the first PTE for a local symbol
-  DT_MIPS_LOCAL_GOTIDX = 0x70000026,
-  // The GOT index of the first PTE for a hidden symbol
-  DT_MIPS_HIDDEN_GOTIDX = 0x70000027,
-  // The GOT index of the first PTE for a protected symbol
-  DT_MIPS_PROTECTED_GOTIDX = 0x70000028,
-  // Address of `.MIPS.options'.
-  DT_MIPS_OPTIONS = 0x70000029,
-  // Address of `.interface'.
-  DT_MIPS_INTERFACE = 0x7000002a,
-  // ???
-  DT_MIPS_DYNSTR_ALIGN = 0x7000002b,
-  // Size of the .interface section.
-  DT_MIPS_INTERFACE_SIZE = 0x7000002c,
-  // Size of rld_text_resolve function stored in the GOT.
-  DT_MIPS_RLD_TEXT_RESOLVE_ADDR = 0x7000002d,
-  // Default suffix of DSO to be added by rld on dlopen() calls.
-  DT_MIPS_PERF_SUFFIX = 0x7000002e,
-  // Size of compact relocation section (O32).
-  DT_MIPS_COMPACT_SIZE = 0x7000002f,
-  // GP value for auxiliary GOTs.
-  DT_MIPS_GP_VALUE = 0x70000030,
-  // Address of auxiliary .dynamic.
-  DT_MIPS_AUX_DYNAMIC = 0x70000031,
-  // Address of the base of the PLTGOT.
-  DT_MIPS_PLTGOT = 0x70000032,
-  // Points to the base of a writable PLT.
-  DT_MIPS_RWPLT = 0x70000034,
-
   DT_AUXILIARY = 0x7ffffffd,
   DT_USED = 0x7ffffffe,
   DT_FILTER = 0x7fffffff
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8fdde791f3..b29f95f7ae 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,451 +1,1704 @@
-2012-03-23  Maxim Kuvyrkov  <maxim@codesourcery.com>
+2011-11-15  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	* config/tc-mips.c (mips_cpu_info_table): Add entry for Broadcom XLP.
-	* doc/c-mips.texi: Mention XLP.
+	Apply mainline patches
+	2011-11-15  Maciej W. Rozycki  <macro@codesourcery.com>
+	* write.c (dump_section_relocs): Don't convert PC-relative relocs
+	that have an in-place addend narrower than the addresses used.
 
-2012-03-21  Thomas Schwinge  <thomas@codesourcery.com>
+2011-11-14  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	[SH] Support the .uaquad and .8byte directives also for non-sh64
-	configurations.
+	Apply mainline patches
+	2011-11-14  Maciej W. Rozycki  <macro@codesourcery.com>
+	* config/tc-mips.c (can_swap_branch_p): Exclude microMIPS
+	variant frags too.
 
-	* config/tc-sh.c (sh_cons_fix_new, md_apply_fix) [!HAVE_SH64]: Handle
-	BFD_RELOC_64.
-	* doc/c-sh64.texi (SH64 Machine Directives): Move .uaquad
-	description...
-	* doc/c-sh.texi (SH Machine Directives): ... here.
+2011-11-07  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
-2012-03-20  Nick Clifton  <nickc@redhat.com>
+	Apply mainline patches
+	2011-11-07  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+	* config/tc-arm.c (arm_cpus): Add cortex-a7 entry.
+	* doc/c-arm.texi (ARM Options): Add cortex-a7 to list of accepted
+	CPUs.
 
-	* config/tc-arm.c (do_vmrs): Accept priviledged mode VFP system
-	registers.
-	(do_vmsr): Likewise.
-	(arm_opcode_insns): Do not default to using the FPSCR register in
-	the VMRS and VMSR registers.
+2011-10-25  Alan Modra  <amodra@gmail.com>
 
-2012-03-16  Roland McGrath  <mcgrathr@google.com>
+	Apply mainline patches
+	2011-10-13  Alan Modra  <amodra@gmail.com>
+	* as.c (main): Define .gasversion. rather than __GAS_VERSION__.
+	* frags.h (bss_address_frag): Delete
+	(predefined_address_frag): New.
+	* frags.c (frag_init): Init predefined_address_frag.  Delete ref
+	to bss_address_frag.
+	* symbols.c (S_CAN_BE_REDEFINED): New function.
+	* symbols.h (S_CAN_BE_REDEFINED): Declare.
+	* read.c (assign_symbol): Use S_CAN_BE_REDEFINED.
 
-	* config/tc-i386.h [TE_NACL] (ELF_TARGET_FORMAT32, ELF_TARGET_FORMAT64):
-	Define for this case.
-	* configure.tgt (i386-*-nacl*): If ${cpu} is x86_64*, default to x32.
+	2011-10-12  Alan Modra  <amodra@gmail.com>
+	* symbols.c (local_symbol_make): Make global.
+	* symbols.h (local_symbol_make): Declare.
+	* as.c (main): Define __GAS_VERSION__.
 
-2012-03-16  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+2011-09-22  Tristan Gingold  <gingold@adacore.com>
 
-	* config/tc-arm.c (aeabi_set_public_attributes): Correct
-	handling of Tag_DIV_use.
+	* NEWS: Add marker for 2.22.
 
-2012-03-15  Thomas Schwinge  <thomas@codesourcery.com>
+2011-09-21  David S. Miller  <davem@davemloft.net>
 
-	* doc/as.texinfo (Bundle directives): Fix typo.
+	* config/tc-sparc.c (hwcap_allowed): New.
+	(struct sparc_arch): New field 'hwcap_allowed' containing a bitmask
+	of F_FOO flags which are enabled by the particular arch setting.
+	Add new options that provide explicit access to new instructions.
+	(md_parse_option): Only bump max_architecture if the requested one
+	is larger, or this is the first explicit request.
+	(get_hwcap_name): New function.
+	(sparc_ip): Validate that hwcaps used by an instruction have actually
+	been enabled.
+	* doc/c-sparc.texi: Document new sparc options.
 
-2012-03-14  Ryan Mansfield  <rmansfield@qnx.com>
-
-	* doc/as.texinfo (Bundle directives): Replace @defn with @dfn.
-
-2012-03-13  Roland McGrath  <mcgrathr@google.com>
-
-	* config/tc-arm.c (arm_frag_max_var): New function.
-	* config/tc-arm.h: Declare it.
-	(md_frag_max_var): New macro.
-
-	* config/tc-i386.c (i386_frag_max_var): New function.
-	* config/tc-i386.h: Declare it.
-	(md_frag_max_var): New macro.
-
-	* doc/as.texinfo (Bundle directives): New node.
-	(Pseudo Ops): Add it to the menu.
-	* NEWS: Mention new feature.
-	* read.c [md_frag_max_var] (HANDLE_BUNDLE): New macro.
-	[HANDLE_BUNDLE] (bundle_align_p2): New variable.
-	[HANDLE_BUNDLE] (bundle_lock_frchain, bundle_lock_frag): New variables.
-	[HANDLE_BUNDLE] (start_bundle, pending_bundle_size, finish_bundle):
-	New functions.
-	(assemble_one): New function if [HANDLE_BUNDLE], #define directly
-	to md_assembly if not.
-	(read_a_source_file): Call assemble_one in place of md_assemble.
-	(read_a_source_file) [HANDLE_BUNDLE]: Check for unterminated
-	.bundle_lock at end of processing.
-	[HANDLE_BUNDLE] (s_bundle_align_mode, s_bundle_lock, s_bundle_unlock):
-	New functions.
-	[HANDLE_BUNDLE] (potable): Add their entries.
-	* read.h: Declare new functions.
-
-2012-03-10  Edmar Wienskoski  <edmar@freescale.com>
-
-	* config/tc-ppc.c (md_show_usage): Document -me5500 and -me6500.
-	(ppc_handle_align): Add termination nop opcode for e500mc family.
-	* doc/as.texinfo: Document options -me5500 and -me6500.
-	* doc/c-ppc.texi: Likewise.
-
-2012-03-07  Nick Clifton  <nickc@redhat.com>
-
-	* config/tc-mn10300.c (other_registers): Add SSP and USP.
-	(md_assemble): Add support for TLS relocs.
-	(mn10300_parse_name): Likewise.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* config/tc-crx.c (check_range): Correct uint32_t misconceptions.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* config/tc-tic4x.c (tic4x_do_align): Remove ATTRIBUTE_UNUSED on
-	params.  Properly generate NOP pattern.  Comment reason for
-	subseg_text_p failure.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* config/tc-h8300.c (constant_fits_width_p): Trim constant to 32 bits
-	and sign extend before range tests.
-	(constant_fits_size_p): Similarly.
-	(get_specific): Trim X_add_number to 32 bits.
-	(fix_operand_size): Likewise, and use unsigned test for signed
-	ranges.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* config/tc-crx.c: Include bfd_stdint.h.
-	(getconstant): Remove irrelevant comment.  Don't fail due to
-	sign-extension of int mask.
-	(check_range): Rewrite using unsigned arithmetic throughout.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* tc-tilepro.c (emit_tilepro_instruction): Check if symbol is
-	non-local before checking sy_value.
-	* tc-tilegx.c (emit_tilegx_instruction): Ditto.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* tc-tilepro.c (O_tls_le): Define operator.
-	(O_tls_le_lo16): Ditto.
-	(O_tls_le_hi16): Ditto.
-	(O_tls_le_ha16): Ditto.
-	(O_tls_gd_call): Ditto.
-	(O_tls_gd_add): Ditto.
-	(O_tls_ie_load): Ditto.
-	(md_begin): Delete old operators; handle new operators.
-	(emit_tilepro_instruction): Ditto.
-	(md_apply_fix): Ditto.
-	* tc-tilegx.c (O_hw1_got): Delete operator.
-	(O_hw2_got): Ditto.
-	(O_hw3_got): Ditto.
-	(O_hw2_last_got): Ditto.
-	(O_hw1_tls_gd): Ditto.
-	(O_hw2_tls_gd): Ditto.
-	(O_hw3_tls_gd): Ditto.
-	(O_hw2_last_tls_gd): Ditto.
-	(O_hw1_tls_ie): Ditto.
-	(O_hw2_tls_ie): Ditto.
-	(O_hw3_tls_ie): Ditto.
-	(O_hw2_last_tls_ie): Ditto.
-	(O_hw0_tls_le): Define operator.
-	(O_hw0_last_tls_le): Ditto.
-	(O_hw1_last_tls_le): Ditto.
-	(O_tls_gd_call): Ditto.
-	(O_tls_gd_add): Ditto.
-	(O_tls_ie_load): Ditto.
-	(O_tls_add): Ditto.
-	(md_begin): Delete old operators; handle new operators.
-	(emit_tilegx_instruction): Ditto.
-	(md_apply_fix): Ditto.
-	* doc/c-tilegx.texi: Delete old operators; document new operators.
-	* doc/c-tilepro.texi: Ditto.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* tc-tilepro.c (apply_special_operator): delete cases for
-	got and tls operators.
-	(md_apply_fix): Ditto.
-	* tc-tilegx.c (md_begin): Set architecture and machine.
-	(tilegx_target_format): Handle big endian.
-	(OPTION_EB): Define.
-	(OPTION_EL): Define.
-	(md_longopts): Add entries for "EB" and "EL".
-	(md_parse_option): Handle OPTION_EB and OPTION_EL.
-	(md_show_usage): Add -EB and -EL.
-	(md_number_to_chars): New.
-	(apply_special_operator): delete cases for got and tls
-	operators.
-	(md_apply_fix): Ditto.
-	* tc-tilegx.h (TARGET_BYTES_BIG_ENDIAN): Guard definition with
-	ifndef.
-	(md_number_to_chars): Delete.
-	* configure.tgt (tilegx*be): Handle.
-	* doc/as.texinfo [TILE-Gx]: Document -EB and -EL.
-	* doc/c-tilegx.texi: Ditto.
-
-2012-02-21  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* config/tc-i386.c (check_hle): Use HLEPrefixNone, HLEPrefixLock,
-	HLEPrefixAny and HLEPrefixRelease.
-
-2012-02-21  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
-
-	* gas/config/tc-arm.h (DOUBLESLASH_LINE_COMMENTS): Define.
-
-2012-02-21  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* write.c (write_object_file): Add md_pre_output_hook.
-	* config/obj-macho.c (obj_mach_o_check_before_writing): New.
-	(obj_mach_o_pre_output_hook): New.
-	* config/obj-macho.h (md_pre_output_hook): Define.
-	(obj_mach_o_pre_output_hook): Declare.
-
-2012-02-21  Tristan Gingold  <gingold@adacore.com>
-
-	* config/tc-i386.h (OBJ_MACH_O): New section.
-	(TC_FORCE_RELOCATION): Use obj_mach_o_force_reloc.
-	(TC_FORCE_RELOCATION_SUB_SAME): New
-	(TC_FORCE_RELOCATION_SUB_LOCAL): New.
-	(TC_VALIDATE_FIX_SUB): New.
-	* frags.h (struct frag): OBJ_FRAG_TYPE, new field.
-	* symbols.c (colon): obj_frob_colon: New hook.
-	* write.c (write_object_file): md_pre_relax_hook, new
-	hook.
-	* config/obj-macho.c (obj_mach_o_frob_colon): New.
-	(obj_mach_o_frob_label): Record sub-section labels.
-	(obj_mach_o_frob_symbol): Rename from obj_macho_frob_symbol.
-	(obj_mach_o_set_subsections): New.
-	(obj_mach_o_pre_relax_hook): New.
-	(obj_mach_o_in_different_subsection): New.
-	(obj_mach_o_force_reloc_sub_same): New.
-	(obj_mach_o_force_reloc_sub_local): New.
-	(obj_mach_o_force_reloc): New.
-	* config/obj-macho.h (OBJ_SYMFIELD_TYPE): New.
-	(obj_frob_colon): New Define.
-	(obj_mach_o_frob_label): Renamed.
-	(obj_mach_o_frob_symbol): Renamed.
-	(OBJ_FRAG_TYPE): New.
-	(obj_mach_o_in_different_subsection, obj_mach_o_force_reloc,
-	 obj_mach_o_force_reloc_sub_same,
-	 obj_mach_o_force_reloc_sub_local): New declarations.
-
-2012-02-20  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* config/obj-macho.c (obj_mach_o_is_frame_section): New.
-	(obj_mach_o_allow_local_subtract): New.
-	* config/obj-macho.h (md_allow_local_subtract): Define.
-	(obj_mach_o_allow_local_subtract): Declare.
-
-2012-02-20  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* config/obj-macho.c (obj_mach_o_make_or_get_sect): In the absence of
-	canonical information, try to determine CODE and DEBUG section flags
-	from the mach-o section data.
+2011-09-21  David S. Miller  <davem@davemloft.net>
 
-2012-02-20  Nick Clifton  <nickc@redhat.com>
+	* config/tc-sparc.c (hwcap_seen): New bitmask, defined when
+	not TE_SOLARIS.
+	(sparc_ip): When not TE_SOLARIS, accumulate hwcap bits from
+	sparc_opcode->flags of instruction into hwcap_seen.
+	(sparc_md_end): Create Tag_GNU_Sparc_HWCAPS attribute if
+	hwcap_seen is non-zero and not TE_SOLARIS.
 
-	* cgen.c (gas_cgen_parse_operand): Do not set BSF_RELC flag on
-	local symbols.
+2011-09-19  Tristan Gingold  <gingold@adacore.com>
 
-2012-02-12  Iain Sandoe  <idsandoe@googlemail.com>
+	* config/tc-alpha.c (insert_operand): Call as_bad_value_out_of_range
+	instead of as_warn_out_of_range.
 
-	* config/obj-macho.c (obj_mach_o_indirect_symbol): Force promotion of
-	any local symbol used as an indirect.
+2011-09-08  Mark Fortescue <mark@mtfhpc.demon.co.uk>
 
-2012-02-10  Iain Sandoe  <idsandoe@googlemail.com>
+	* config/tc-sparc.c (sparc_ip): Handle 'i' + r<0..31>
+	in addition to 'i' + [goli]<0..7>.
 
-	* config/obj-macho.c (obj_mach_o_make_or_get_sect): Always fill in
-	stub size when provided.  (obj_mach_o_section): Flag that stub-size
-	has been provided.
+2011-09-08  Joern Rennecke <joern.rennecke@embecosm.com>
 
-2012-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+	* cgen.c (gas_cgen_pcrel_r_type): New function.
+	(gas_cgen_tc_gen_reloc): Check for GAS_CGEN_PCREL_R_TYPE.
+	* cgen.h (gas_cgen_pcrel_r_type): Declare.
 
-	* config/tc-i386.c (HLE_PREFIX): New.
-	(check_hle): Likewise.
-	(_i386_insn): Add have_hle.
-	(cpu_arch): Add .hle and .rtm.
-	(md_assemble): Call check_hle if i.have_hle isn't zero.
-	(parse_insn): Set i.have_hle to 1 for HLE prefix.
-	(output_jump): Support up to 2 byte opcode.
+2011-09-08  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR gas/13167
+	* dwarf2dbg.c (dwarf2_flush_pending_lines): Use symbol_temp_new_now.
+
+2011-09-05  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR gas/13024
+	* dwarf2dbg.c (pending_lines, pending_lines_tail): New variables.
+	(dwarf2_gen_line_info_1): Delete.
+	(dwarf2_push_line, dwarf2_flush_pending_lines): New functions.
+	(dwarf2_gen_line_info, dwarf2_emit_label): Use them.
+	(dwarf2_consume_line_info): Call dwarf2_flush_pending_lines.
+	(dwarf2_directive_loc): Push previous .locs instead of generating
+	them immediately.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-26  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (s_alpha_linkage): Simplify.  Add comments.
+
+2011-08-26  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (add_to_link_pool): Improve comment.
+	(s_alpha_fp_save): Fix indentation.
+
+2011-08-19  Nick Clifton  <nickc@redhat.com>
+
+	* doc/as.texinfo: Include c-xstormy16.texi.
+
+2011-08-18  Alan Modra  <amodra@gmail.com>
+
+	* write.c (resolve_reloc_expr_symbols): Convert local symbols
+	on relocs to section+offset.
+	(get_frag_for_reloc): New function.
+	(write_relocs): Merge sort fixup relocs with those from .reloc
+	directives.
+
+2011-08-10  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (can_swap_branch_p): Update the comment on
+	MIPS16 fixups.
+
+2011-08-09  Chao-ying Fu  <fu@mips.com>
+            Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* config/tc-mips.c (mips_cpu_info_table): Add "m14k" and
+	"m14kc".
+	* doc/c-mips.texi (MIPS architecture options): Add "m14k" and
+	"m14kc" to the list of -march options.
+
+2011-08-09  Chao-ying Fu  <fu@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (mips_set_options): Add ase_mcu.
+	(mips_opts): Initialise ase_mcu to -1.
+	(ISA_SUPPORTS_MCU_ASE): New macro.
+	(MIPS_CPU_ASE_MCU): Likewise.
+	(is_opcode_valid): Handle MCU.
+	(macro_build, macro): Likewise.
+	(validate_mips_insn, validate_micromips_insn): Likewise.
+	(mips_ip): Likewise.
+	(options): Add OPTION_MCU and OPTION_NO_MCU.
+	(md_longopts): Add mmcu and mno-mcu.
+	(md_parse_option): Handle OPTION_MCU and OPTION_NO_MCU.
+	(mips_after_parse_args): Handle MCU.
+	(s_mipsset): Likewise.
+	(md_show_usage): Handle MCU options.
 
-	* doc/c-i386.texi: Document hle/.hle and rtm/.rtm.
+	* doc/as.texinfo: Document -mmcu and -mno-mcu options.
+	* doc/c-mips.texi: Likewise, and document ".set mcu" and
+	".set nomcu" directives.
 
-2012-02-02  Tristan Gingold  <gingold@adacore.com>
+2011-08-09  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	* config/obj-macho.c (obj_mach_o_zerofill): Silent
-	uninitialized variable warning.
+	* config/tc-mips.c (gpr_mod_mask): Remove INSN2_MOD_GPR_MB,
+	INSN2_MOD_GPR_MC, INSN2_MOD_GPR_ME, INSN2_MOD_GPR_MG,
+	INSN2_MOD_GPR_MHI, INSN2_MOD_GPR_MJ, INSN2_MOD_GPR_MM,
+	INSN2_MOD_GPR_MN, INSN2_MOD_GPR_MP and INSN2_MOD_GPR_MQ opcode
+	register use checks.
+	(gpr_read_mask): Add INSN2_READ_GPR_MC, INSN2_READ_GPR_ME
+	INSN2_READ_GPR_MG, INSN2_READ_GPR_MJ, INSN2_READ_GPR_MMN,
+	INSN2_READ_GPR_MP and INSN2_READ_GPR_MQ opcode register use
+	checks.
+	(gpr_write_mask): Replace INSN2_WRITE_GPR_S opcode register
+	use flag with INSN_WRITE_GPR_S.  Add INSN2_WRITE_GPR_MB,
+	INSN2_WRITE_GPR_MHI, INSN2_WRITE_GPR_MJ and INSN2_WRITE_GPR_MP
+	opcode register use checks.
+	(can_swap_branch_p): Enable microMIPS branch swapping.
+	(append_insn): Likewise.
 
-2012-02-02  Nick Clifton  <nickc@redhat.com>
+2011-08-09  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	PR gas/13224
-	* config/obj-elf.c (obj_elf_parse_section_letters): Rename 'clone'
-	to 'is_clone' to avoid shadowing a gloabl.
-	(obj_elf_section): Likewise.
+	* config/tc-mips.c (RELAX_MICROMIPS_ENCODE): Remove forced 16-bit
+	branch size information.
+	(RELAX_MICROMIPS_U16BIT): Remove macro.
+	(RELAX_MICROMIPS_UNCOND): Adjust accordingly.
+	(RELAX_MICROMIPS_COMPACT, RELAX_MICROMIPS_LINK): Likewise.
+	(RELAX_MICROMIPS_RELAX32): Likewise.
+	(RELAX_MICROMIPS_TOOFAR16): Likewise.
+	(RELAX_MICROMIPS_MARK_TOOFAR16): Likewise.
+	(RELAX_MICROMIPS_CLEAR_TOOFAR16): Likewise.
+	(RELAX_MICROMIPS_TOOFAR32): Likewise.
+	(RELAX_MICROMIPS_MARK_TOOFAR32): Likewise.
+	(RELAX_MICROMIPS_CLEAR_TOOFAR32): Likewise.
+	(append_insn): Always check forced_insn_length for microMIPS
+	relaxation.  Adjust code for the removal of
+	RELAX_MICROMIPS_U16BIT.
+	(mips_ip) <'D', 'E'>: If forced_insn_length, then emit the
+	relocation straight away.
+	(relaxed_micromips_16bit_branch_length): Adjust code for the
+	removal of RELAX_MICROMIPS_U16BIT.
 
-2012-01-31  Paul Brook  <paul@codesourcery.com>
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
 
-	* doc/c-tic6x.c: Fix typo.
+	* config/obj-macho.c (obj_mach_o_section): New function.
+	(struct known_section): New type.
+	(known_sections): Declare.
+	(obj_mach_o_known_section): New function.
+	(obj_mach_o_common_parse): Ditto.
+	(obj_mach_o_comm): Ditto.
+	(obj_mach_o_subsections_via_symbols): Ditto.
+	(mach_o_pseudo_table): Add new pseudos.
+
+2011-08-06  Richard Henderson  <rth@redhat.com>
+
+	* dw2gencfi.c (all_fde_data): Export.
+	* dw2gencfi.h (all_fde_data): Declare.
+	* config/tc-alpha.c (alpha_elf_md_end): Don't convert legacy unwind
+	info to cfi unwind info if the user already has supplied some.
+
+2011-08-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (emit_nop): Delete.
+	(get_delay_slot_nop): New function.
+	(nops_for_insn_or_target): Use it.
+	(append_insn): Likewise.  When avoiding hazards, call add_fixed_insn
+	and insert_into_history directly.
+
+2011-08-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (delayed_branch_p, compact_branch_p)
+	(uncond_branch_p, branch_likely_p): New functions.
+	(insns_between, nops_for_insn_or_target, append_insn)
+	(macro_start): Use them.
+	(get_append_method): Likewise.  Remove redundant test.
 
-2012-01-26  Alexey Makhalov  <makhaloff@gmail.com>
+2011-08-05  David S. Miller  <davem@davemloft.net>
 
-	PR gas/13624
-	* app.c (app_push): Set 'add_newlines' to zero after saving.
+	* config/tc-sparc.c (v9a_asr_table): Add "cps".
+	(sparc_ip): Handle '4', '5' and '(' format codes.
 
-2012-01-24  DJ Delorie  <dj@redhat.com>
+2011-08-04  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* config/rl78-parse.y (NOT1): Add.
+	PR gas/13056
+	* output-file.c (output_file_close): Call bfd_cache_close_all
+	on error.
 
-2012-01-23  Roland McGrath  <mcgrathr@google.com>
+	* write.c (write_object_file): Revert the last change.
 
-	* configure.tgt (i386-*-nacl*): Match it.
-	* config/te-nacl.h: New file.
-	* config/tc-i386.h [TE_NACL] (ELF_TARGET_FORMAT): Define for this case.
-	* config/tc-i386.c [TE_NACL] (i386_comment_chars, PREFIX_SEPARATOR):
-	Use TE_GNU et al case for TE_NACL too.
-
-2012-01-20  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* config/tc-i386.c (_i386_insn): Replace disp32_encoding with
-	disp_encoding.
-	(md_assemble): Updated.
-	(output_branch): Likewise.
-	(parse_insn): Support .d8 suffix.
-	(build_modrm_byte): Fake zero displacement for .d8 and .d32
-	suffixes.
+2011-08-04  Alan Modra  <amodra@gmail.com>
 
-	* doc/c-i386.texi: Document .d8 suffix.
+	* write.c (write_object_file): Call set_symtab even if we had
+	errors.
 
-2012-01-17  Andrew Burgess  <aburgess@broadcom.com>
+2011-08-04  Tristan Gingold  <gingold@adacore.com>
 
-	* write.c (fix_new_internal): Don't mark used parameter as unused.
+	* config/obj-elf.c (obj_elf_section): Do not free name.
 
-2012-01-17  Alan Modra  <amodra@gmail.com>
+2011-08-03  James Greenhalgh  <james.greenhalgh@arm.com>
 
-	* as.c (parse_args): Update copyright message year.
+	* config/tc-arm.c (do_t_strexbh): New.
+	(insns): Update accordingly.
 
-2012-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* config/tc-i386.c (cpu_arch): Add ".vmfunc".
+	PR ld/13048
+	* config/tc-i386.c (handle_quad): Removed.
+	(md_pseudo_table): Remove "quad".
+	(tc_gen_reloc): Don't check BFD_RELOC_64 for disallow_64bit_reloc.
+	(x86_dwarf2_addr_size): New.
 
-	* doc/c-i386.texi: Document vmfunc.
+	* config/tc-i386.h (x86_dwarf2_addr_size): New.
+	(DWARF2_ADDR_SIZE): Likewise.
 
-2012-01-13  Tristan Gingold  <gingold@adacore.com>
+2011-08-01  Nick Clifton  <nickc@redhat.com>
 
-	* config/obj-macho.c (obj_mach_o_reorder_section_relocs): New.
-	* config/obj-macho.h (SET_SECTION_RELOCS): Define.
-	(obj_mach_o_reorder_section_relocs): Declare.
+	PR ld/12974
+	* config/tc-arm.c (literal_pool): Add locs field.
+	(add_to_lit_pool): Initialise the locs entry for the new literal.
+	(s_ltorg): Generate a DWARF2 line number entry for each emitted
+	literal pool entry.
 
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
+2011-08-01  Tristan Gingold  <gingold@adacore.com>
 
-	* config/obj-macho.c (obj_mach_o_set_indirect_symbols): Handle
-	absolute indirect symbols.
+	* write.c (write_relocs): Fix -Wshadow in DEBUG3 and DEBUG4.
 
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
+2011-08-01  Tristan Gingold  <gingold@adacore.com>
 
-	* config/obj-macho.c (obj_mach_o_set_vma_data): New type.
-	(obj_mach_o_set_section_vma): New.
-	(obj_mach_o_post_relax_hook): New.
-	* config/obj-macho.h (md_post_relax_hook): Define.
-	(obj_mach_o_post_relax_hook): Declare.
+	* frags.c (frag_grow): Simplify the code.
 
-2012-01-12  Iain Sandoe  <idsandoe@googlemail.com>
+2011-07-30  Richard Sandiford  <rdsandiford@googlemail.com>
 
-	* config/obj-macho.c (obj_mach_o_set_symbol_qualifier): Switch off
-	lazy when the symbol is private_extern.
-	(obj_mach_o_indirect_sym): New type.
-	(obj_mach_o_indirect_symbol): New.
-	(mach_o_pseudo_table): Use obj_mach_o_indirect_symbol.
-	(obj_macho_frob_label): Adjust to avoid adding bsyms for locals.
-	(obj_macho_frob_label): Likewise.  Adjust external and comm
-	symbol tests.
-	(obj_mach_o_set_indirect_symbols): New.
-	(obj_mach_o_frob_file_after_relocs): New.
-	*config/obj-macho.h (obj_frob_file_after_relocs): Define.
-	(obj_mach_o_frob_file_after_relocs): Declare.
+	* config/tc-mips.c (nops_for_vr4130): Revert previous commit.
 
-2012-01-12  Tristan Gingold  <gingold@adacore.com>
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	PR gas/13591
-	* config/obj-coff.h (sy_obj): Rename macro to avoid a name conflict.
+	* config/tc-mips.c: Adjust comments throughout.
+	(reglist_lookup): Reshape code.
+	(jmp_reloc_p, jalr_reloc_p): Reformat.
+	(got16_reloc_p, hi16_reloc_p, lo16_reloc_p): Handle microMIPS
+	relocations.
+	(gpr_mod_mask): Remove unused variable.
+	(gpr_read_mask, gpr_write_mask): Reshape code.
+	(fpr_read_mask, fpr_write_mask): Likewise.
+	(nops_for_vr4130): Ensure non-microMIPS mode.
+	(can_swap_branch_p): Correct pinfo2 reference.  Reshape code.
+	(append_insn): Skip Loongson 2F workaround in MIPS16 mode.  Use
+	the outermost operator of a compound relocation to determines
+	the relocated field.  Fix formatting.
+	(md_convert_frag): Reshape code.
 
-2012-01-10  Tristan Gingold  <gingold@adacore.com>
+2011-07-29  Tristan Gingold  <gingold@adacore.com>
 
-	* struc-symbol.h (struct symbol_flags): New struct, created from...
-	(struct symbol): ... this one.  Add sy_flags field, remove flag fields.
-	(struct local_symbol): Replace lsy_marker field by lsy_flags.
-	Adjust comment.
-	(local_symbol_resolved_p): Adjust.
-	(local_symbol_mark_resolved): Likewise.
-	* symbols.c (LOCAL_SYMBOL_CHECK): Adjust.
-	(local_symbol_make, local_symbol_convert, colon)
-	(symbol_clone_if_forward_ref, verify_symbol_chain)
-	(resolve_symbol_value, snapshot_symbol, S_GET_VALUE)
-	(S_IS_WEAKREFR, S_IS_WEAKREFD, S_IS_VOLATILE, S_IS_FORWARD_REF)
-	(S_SET_WEAKREFR, S_CLEAR_WEAKREFR, S_SET_WEAKREFD)
-	(S_CLEAR_WEAKREFD, S_SET_VOLATILE, S_CLEAR_VOLATILE)
-	(S_SET_FORWARD_REF, symbol_same_p, symbol_mark_used)
-	(symbol_clear_used, symbol_used_p, symbol_mark_used_in_reloc)
-	(symbol_clear_used_in_reloc, symbol_used_in_reloc_p)
-	(symbol_mark_mri_common, symbol_clear_mri_common)
-	(symbol_mri_common_p, symbol_mark_written, symbol_clear_written)
-	(symbol_written_p, symbol_mark_resolved, symbol_resolved_p)
-	(symbol_equated_reloc_p, dot_symbol_init)
-	(print_symbol_value_1): Adjust.
+	* frags.c (frag_var_init): New function.
+	(frag_var): Call frag_var_init to initialize.
+	(frag_variant): Ditto.
 
-2012-01-09  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* config/obj-macho.c (obj_mach_o_weak): Remove.
-	(obj_mach_o_common_parse): Set symbol qualifiers.
-	(LAZY, REFE): New macros.
-	(obj_mach_o_symbol_type): New enum.
-	(obj_mach_o_set_symbol_qualifier): New.
-	(obj_mach_o_sym_qual): New.
-	(mach_o_pseudo_table): Add symbol qualifiers, set indirect_symbol to
-	a dummy function.
-	(obj_mach_o_type_for_symbol): New.
-	(obj_macho_frob_label): New.
-	(obj_macho_frob_symbol): New.
-	* config/obj-macho.h (S_SET_ALIGN): Amend temorary var name.
-	(obj_frob_label, obj_macho_frob_label): Declare.
-	(obj_frob_symbol, obj_macho_frob_symbol): Declare.
-
-2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
-
-	* config/tc-mips.c (s_tls_rel_directive): Call mips_clear_insn_labels.
+2011-07-27  Nathan Sidwell  <nathan@codesourcery.com>
 
-2012-01-08  Andrew Pinski  <andrew.pinski@caviumnetworks.com>
+	* dwarf2dbg.c (out_debug_line): Ignore non-normal segments, with a
+	warning.
+	* doc/as.texinfo (Offset): Document .offset directive.
+
+2011-07-27  Tristan Gingold  <gingold@adacore.com>
+
+	* frags.c (frag_grow): Revert previous patch.
+
+2011-07-26  Kazuhiro Inaoka  <kazuhiro.inaoka.ud@renesas.com>
+
+	* config/tc-rx.c (md_convert_frag): Fix encoding of beq.a
+	synthetic instruction.
+
+2011-07-25  Tristan Gingold  <gingold@adacore.com>
+
+	* frags.c (frag_grow): Simplify the code.
+
+2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+            Chao-ying Fu  <fu@mips.com>
 	    Richard Sandiford  <rdsandiford@googlemail.com>
 
-	* config/tc-mips.c (mips_move_labels): Take the list of labels and
-	textness as parameters.
-	(mips_move_text_labels): New function.
-	(append_insn): Use it instead of mips_move_labels.
-	(mips_emit_delays, start_noreorder): Likewise.
-	(mips_align): Take the labels rather than just one label.
-	Move all labels to after the .align.
-	(s_align): Change the last argument to mips_align.
-	(s_cons): Likewise.
-	(s_float_cons): Likewise.
-	(s_gpword): Likewise.
-	(s_gpdword): Likewise.
-
-2012-01-06  Tristan Gingold  <gingold@adacore.com>
-
-	* config/tc-i386.c: Update copyright year.
-	(lex_got): Also defined for Mach-O.
-	Add a guard for non-ELF configuration.
-	(md_longopts): Also handle -64 for Mach-O.
+	* config/tc-mips.h (mips_segment_info): Add one bit for
+	microMIPS.
+	(TC_LABEL_IS_LOCAL): New macro.
+	(mips_label_is_local): New prototype.
+	* config/tc-mips.c (S0, S7): New macros.
+	(emit_branch_likely_macro): New variable.
+	(mips_set_options): Add micromips.
+	(mips_opts): Initialise micromips to -1.
+	(file_ase_micromips): New variable.
+	(CPU_HAS_MICROMIPS): New macro.
+	(hilo_interlocks): Set for microMIPS too.
+	(gpr_interlocks): Likewise.
+	(cop_interlocks): Likewise.
+	(cop_mem_interlocks): Likewise.
+	(HAVE_CODE_COMPRESSION): New macro.
+	(micromips_op_hash): New variable.
+	(micromips_nop16_insn, micromips_nop32_insn): New variables.
+	(NOP_INSN): Handle microMIPS ASE.
+	(mips32_to_micromips_reg_b_map): New macro.
+	(mips32_to_micromips_reg_c_map): Likewise.
+	(mips32_to_micromips_reg_d_map): Likewise.
+	(mips32_to_micromips_reg_e_map): Likewise.
+	(mips32_to_micromips_reg_f_map): Likewise.
+	(mips32_to_micromips_reg_g_map): Likewise.
+	(mips32_to_micromips_reg_l_map): Likewise.
+	(mips32_to_micromips_reg_n_map): Likewise.
+	(mips32_to_micromips_reg_h_map): New variable.
+	(mips32_to_micromips_reg_m_map): Likewise.
+	(mips32_to_micromips_reg_q_map): Likewise.
+	(micromips_to_32_reg_h_map): New variable.
+	(micromips_to_32_reg_i_map): Likewise.
+	(micromips_to_32_reg_m_map): Likewise.
+	(micromips_to_32_reg_q_map): Likewise.
+	(micromips_to_32_reg_b_map): New macro.
+	(micromips_to_32_reg_c_map): Likewise.
+	(micromips_to_32_reg_d_map): Likewise.
+	(micromips_to_32_reg_e_map): Likewise.
+	(micromips_to_32_reg_f_map): Likewise.
+	(micromips_to_32_reg_g_map): Likewise.
+	(micromips_to_32_reg_l_map): Likewise.
+	(micromips_to_32_reg_n_map): Likewise.
+	(micromips_imm_b_map, micromips_imm_c_map): New macros.
+	(RELAX_DELAY_SLOT_16BIT): New macro.
+	(RELAX_DELAY_SLOT_SIZE_FIRST): Likewise.
+	(RELAX_DELAY_SLOT_SIZE_SECOND): Likewise.
+	(RELAX_MICROMIPS_ENCODE, RELAX_MICROMIPS_P): New macros.
+	(RELAX_MICROMIPS_TYPE, RELAX_MICROMIPS_AT): Likewise.
+	(RELAX_MICROMIPS_U16BIT, RELAX_MICROMIPS_UNCOND): Likewise.
+	(RELAX_MICROMIPS_COMPACT, RELAX_MICROMIPS_LINK): Likewise.
+	(RELAX_MICROMIPS_RELAX32, RELAX_MICROMIPS_TOOFAR16): Likewise.
+	(RELAX_MICROMIPS_MARK_TOOFAR16): Likewise.
+	(RELAX_MICROMIPS_CLEAR_TOOFAR16): Likewise.
+	(RELAX_MICROMIPS_TOOFAR32): Likewise.
+	(RELAX_MICROMIPS_MARK_TOOFAR32): Likewise.
+	(RELAX_MICROMIPS_CLEAR_TOOFAR32): Likewise.
+	(INSERT_OPERAND, EXTRACT_OPERAND): Handle microMIPS ASE.
+	(mips_macro_warning): Add delay_slot_16bit_p, delay_slot_32bit_p,
+	fsize and insns.
+	(mips_mark_labels): New function.
+	(mips16_small, mips16_ext): Remove variables, replacing with...
+	(forced_insn_size): ... this.
+	(append_insn, mips16_ip): Update accordingly.
+	(micromips_insn_length): New function.
+	(insn_length): Return the length of microMIPS instructions.
+	(mips_record_mips16_mode): Rename to...
+	(mips_record_compressed_mode): ... this.  Handle microMIPS ASE.
+	(install_insn): Handle microMIPS ASE.
+	(reglist_lookup): New function.
+	(is_size_valid, is_delay_slot_valid): Likewise.
+	(md_begin): Handle microMIPS ASE.
+	(md_assemble): Likewise.  Update for append_insn interface change.
+	(micromips_reloc_p): New function.
+	(got16_reloc_p): Handle microMIPS ASE.
+	(hi16_reloc_p): Likewise.
+	(lo16_reloc_p): Likewise.
+	(jmp_reloc_p): New function.
+	(jalr_reloc_p): Likewise.
+	(matching_lo_reloc): Handle microMIPS ASE.
+	(insn_uses_reg, reg_needs_delay): Likewise.
+	(mips_move_labels): Likewise.
+	(mips16_mark_labels): Rename to...
+	(mips_compressed_mark_labels): ... this.  Handle microMIPS ASE.
+	(gpr_mod_mask): New function.
+	(gpr_read_mask, gpr_write_mask): Handle microMIPS ASE.
+	(fpr_read_mask, fpr_write_mask): Likewise.
+	(insns_between, nops_for_vr4130, nops_for_insn): Likewise.
+	(fix_loongson2f_nop, fix_loongson2f_jump): Likewise.
+	(MICROMIPS_LABEL_CHAR): New macro.
+	(micromips_target_label, micromips_target_name): New variables.
+	(micromips_label_name, micromips_label_expr): New functions.
+	(micromips_label_inc, micromips_add_label): Likewise.
+	(mips_label_is_local): Likewise.
+	(micromips_map_reloc): Likewise.
+	(can_swap_branch_p): Handle microMIPS ASE.
+	(append_insn): Add expansionp argument.  Handle microMIPS ASE.
+	(start_noreorder, end_noreorder): Handle microMIPS ASE.
+	(macro_start, macro_warning, macro_end): Likewise.
+	(brk_fmt, cop12_fmt, jalr_fmt, lui_fmt): New variables.
+	(mem12_fmt, mfhl_fmt, shft_fmt, trap_fmt): Likewise.
+	(BRK_FMT, COP12_FMT, JALR_FMT, LUI_FMT): New macros.
+	(MEM12_FMT, MFHL_FMT, SHFT_FMT, TRAP_FMT): Likewise.
+	(macro_build): Handle microMIPS ASE.  Update for append_insn
+	interface change.
+	(mips16_macro_build): Update for append_insn interface change.
+	(macro_build_jalr): Handle microMIPS ASE.
+	(macro_build_lui): Likewise.  Simplify.
+	(load_register): Handle microMIPS ASE.
+	(load_address): Likewise.
+	(move_register): Likewise.
+	(macro_build_branch_likely): New function.
+	(macro_build_branch_ccl): Likewise.
+	(macro_build_branch_rs): Likewise.
+	(macro_build_branch_rsrt): Likewise.
+	(macro): Handle microMIPS ASE.
+	(validate_micromips_insn): New function.
+	(expr_const_in_range): Likewise.
+	(mips_ip): Handle microMIPS ASE.
+	(options): Add OPTION_MICROMIPS and OPTION_NO_MICROMIPS.
+	(md_longopts): Add mmicromips and mno-micromips.
+	(md_parse_option): Handle OPTION_MICROMIPS and
+	OPTION_NO_MICROMIPS.
+	(mips_after_parse_args): Handle microMIPS ASE.
+	(md_pcrel_from): Handle microMIPS relocations.
+	(mips_force_relocation): Likewise.
+	(md_apply_fix): Likewise.
+	(mips_align): Handle microMIPS ASE.
+	(s_mipsset): Likewise.
+	(s_cpload, s_cpsetup, s_cpreturn): Use relocation wrappers.
+	(s_dtprel_internal): Likewise.
+	(s_gpword, s_gpdword): Likewise.
+	(s_insn): Handle microMIPS ASE.
+	(s_mips_stab): Likewise.
+	(relaxed_micromips_32bit_branch_length): New function.
+	(relaxed_micromips_16bit_branch_length): New function.
+	(md_estimate_size_before_relax): Handle microMIPS ASE.
+	(mips_fix_adjustable): Likewise.
+	(tc_gen_reloc): Handle microMIPS relocations.
+	(mips_relax_frag): Handle microMIPS ASE.
+	(md_convert_frag): Likewise.
+	(mips_frob_file_after_relocs): Likewise.
+	(mips_elf_final_processing): Likewise.
+	(mips_nop_opcode): Likewise.
+	(mips_handle_align): Likewise.
+	(md_show_usage): Handle microMIPS options.
+	* symbols.c (TC_LABEL_IS_LOCAL): New macro.
+	(S_IS_LOCAL): Add a TC_LABEL_IS_LOCAL check.
+
+	* doc/as.texinfo (Target MIPS options): Add -mmicromips and
+	-mno-micromips.
+	(-mmicromips, -mno-micromips): New options.
+	* doc/c-mips.texi (-mmicromips, -mno-micromips): New options.
+	(MIPS ISA): Document .set micromips and .set nomicromips.
+	(MIPS insn): Update for microMIPS support.
+
+2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (mips_ip): Make a copy of the instruction's
+	mnemonic and use it for further processing.
+
+2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (can_swap_branch_p): Adjust for the rename of
+	INSN_TRAP to INSN_NO_DELAY_SLOT.  Remove the check for INSN_SYNC
+	as well as explicit checks for ERET and DERET when scheduling
+	branch delay slots.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (cpu_arch): Add k1om.
+	(i386_align_code): Handle PROCESSOR_K1OM.
+	(check_cpu_arch_compatible): Check EM_K1OM.
+	(i386_arch): Handle Intel K1OM.
+	(i386_mach): Return bfd_mach_k1om for Intel K1OM.
+	(i386_target_format): Return ELF_TARGET_K1OM_FORMAT for Intel
+	K1OM.
+
+	* config/tc-i386.h (ELF_TARGET_K1OM_FORMAT): New.
+	(processor_type): Add PROCESSOR_K1OM.
+
+	* doc/c-i386.texi: Document k1om.
+
+2011-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* doc/c-i386.texi: Fix a typo.
+
+2011-07-06  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* config/tc-mips.c (append_insn): delete prev_pinfo2 and pinfo2.
+
+2011-07-04  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (gpr_read_mask, gpr_write_mask): Fix handling
+	of register 0.
+
+2011-07-04  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (append_insn): Make sure DWARF-2 location
+	information is properly adjusted for branches that get swapped.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* config/obj-elf.c (obj_elf_type): Use ELFOSABI_GNU name instead of
+	ELFOSABI_LINUX alias.
+	* config/tc-ia64.c: Likewise.
+
+2011-06-30  Paul Carroll  <pcarroll@codesourcery.com>
+
+	* config/tc-arm.c (do_t_add_sub): Only allow LSL shifts of less
+	than 4 in Thumb mode.
+
+2011-06-30  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12848
+	* config/tc-arm.c (BAD_RANGE): New error message define.
+	(md_apply_fix): Use it.
+	Fix range check for thumb branch instructions.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (append_method): New enum.
+	(can_swap_branch_p, get_append_method): New functions.
+	(append_insn): Use get_append_method to decide how the instruction
+	should be added.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (append_insn): Remove bogus goto.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (append_insn): Always clear the history after an
+	unconditional branch.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (find_altered_mips16_opcode): New function.
+	(append_insn): Use it.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (insn_uses_reg): Delete.
+	(gpr_read_mask, gpr_write_mask): New functions.
+	(fpr_read_mask, fpr_write_mask): Likewise.
+	(insns_between, nops_for_vr4130, append_insn): Use them.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (md_mips_end): Call mips_emit_delays.
+
+2011-06-29  Dave Martin  <dave.martin@linaro.org>
+
+	PR gas/12931
+	* config/tc-arm.c (mapping_state): When changing to ARM or THUMB
+	state set the minimum required alignment of the section.
+
+2011-06-29  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-i386.c (i386_mach): Convert to ISO-C.
+	(md_begin, pe_directive_secrel, md_estimate_size_before_relax): Ditto.
+	(md_convert_frag, md_apply_fix, md_undefined_symbol): Ditto.
+	(md_section_align, tc_gen_reloc): Ditto.
+
+2011-06-28  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (s_alpha_pdesc): Fix indentation. Do not
+	generate dummy fix.
+
+2011-06-28  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (load_expression): Use alloca instead of xmalloc.
+	(emit_jsrjmp): Ditto.
+	(tc_gen_reloc): Ditto.
+
+2011-06-28  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (alpha_evax_proc_hash): Remove.
+	(alpha_evax_proc_data): New variable.
+	(s_alpha_ent): Prevent nested function.  Remove has_insert call.
+	(s_alpha_pdesc): Do not call demand_empty_rest_of_line in case of
+	error.  Do not search in the hash table.  Check if match with .ent.
+	(s_alpha_name): Remove unused variable.
+	(md_begin): Remove initialization of alpha_evax_proc_hash.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (add_to_link_pool): Remove basesym parameter.
+	Locally declare basesym.  Add comments.  Do not set literal_pool_size.
+	(load_expression): Adjust call to add_to_link_pool.
+	(s_alpha_pdesc): Define pdesc symbol using dot.
+	Do not set literal_pool_size.
+	(s_alpha_end): Use NULL instead of 0.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* config/obj-evax.c (evax_frob_file_before_adjust): Add comments.
+	Fix style.
+	* config/obj-evax.h (struct alpha_linkage_fixups): Remove seg
+	field.  Add comments.
+	(obj_symbol_type, object_headers, OBJ_SYMFIELD_TYPE): Remove
+
+2011-06-26  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (fix_24k_record_store_info): If the previous
+	instruction was a store, and the next instructions are unknown,
+	assume the worst.
+
+2011-06-25  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR gas/12915
+	* config/tc-mips.c (nops_for_vr4130, nops_for_24k, nops_for_insn)
+	(nops_for_sequence, nops_for_insn_or_target): Add ignore parameters.
+	(mips_emit_delays, start_noreorder): Update accordingly.
+	(append_insn): Likewise.  Revert original fix for this PR
+	and use the ignore parameter instead.
+
+2011-06-24  Tristan Gingold  <gingold@adacore.com>
+
+	PR gas/11625
+	* config/obj-evax.c (evax_frob_symbol): Use as_bad instead of abort.
+
+2011-06-24  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-alpha.c (add_to_link_pool): Remove useless offset
+	variable.  Fix style.
+
+2011-06-23  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR gas/12915
+	* config/tc-mips.c (append_insn): Only consider hazards between the
+	pre-noreorder block and ip.
+
+2011-06-21  Sameera Deshpande  <sameera.deshpande@arm.com>
+
+	* config/tc-arm.c (vfp_conv): Add check on range of immediate operand
+	in vcvt instruction between floating-point and fixed-point.
+	(operand_parse_code): Add "OP_oI32z".
+	(parse_operands): OP_oI32z case added.
+
+2011-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.tgt: Revert x32 change.
+
+2011-06-20  Nick Clifton  <nickc@redhat.com>
+
+	* doc/Makefile.am: (CPU_DOCS): Add c-xstormy16.texi.
+	* doc/Makefile.in: Regenerate.
+	* doc/all.texi: Set XSTORMY16.
+	* doc/c-xstormy16.texi: New file.
+
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.tgt: Support x32.
+
+2011-06-15  Nick Clifton  <nickc@redhat.com>
+
+	* NEWS: Mention addition of TILEPRO and TIKE-Gx support.
+
+2011-06-14  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-ppc.h (struct ppc_tc_sy): Complete comment on within.
+	(tc_new_dot_label): Define.
+	(ppc_new_dot_label): Declare.
+	* config/tc-ppc.c (ppc_frob_label): Set within target field.
+	(ppc_fix_adjustable): Use this field to adjust the reloc.
+	(ppc_new_dot_label): New function.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* po/POTFILES.in: Regenerate.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* Makefile.am (TARGET_CPU_CFILES): Add config/tc-tilegx.c and
+	config/tc-tilepro.c.
+	(TARGET_CPU_HFILES): Add config/tc-tilegx.h and
+	config/tc-tilepro.h.
+	* Makefile.in: Regenerate.
+	* configure.tgt (tilepro-*-*): New.
+	(tilegx-*-*): Likewise.
+	* config/tc-tilegx.c: New file.
+	* config/tc-tilegx.h: Likewise.
+	* config/tc-tilepro.h: Likewise.
+	* config/tc-tilepro.c: Likewise.
+	* doc/Makefile.am (CPU_DOCS): Add c-tilegx.texi and
+	c-tilepro.texi.
+	* doc/Makefile.in: Regenerate.
+	* doc/all.texi (TILEGX): Define.
+	(TILEPRO): Define.
+	* doc/as.texinfo: Add Tile-Gx and TILEPro documentation.  Include
+	c-tilegx.texi and c-tilepro.texi.
+	* doc/c-tilegx.texi: New.
+	* doc/c-tilepro.texi: New.
+
+2011-06-13  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12854
+	* config/tc-arm.c (do_shift): Do not allow shift operations at the
+	end of a register based shift insn.
+	(do_t_shift): Likewise.
+
+2011-06-13  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-score.c (s3_my_get_expression): Delete unused local
+	variable 'seg'.
+	(s3_do_ldst_insn): Delete unused local variable 'strbak'.
+	(s3_do16_ldst_insn): Delete unused local variable 'temp'.
+	(s3_do_macro_bcmp): Zero inst_expand array.
+	(s3_do_macro_bcmpz): Likewise.
+	(s3_s_score_end): Delete unused local variable 'dot'.
+	(s3_gen_reloc): Delete unused local variables 'f', 's', and 'e'.
+	* config/tc-score7.c (s7_my_get_expression): Delete unused local
+	variable 'seg'.
+	(s7_do_ldst_insn): Delete unused local variable 'strbak'.
+	(s7_b32_relax_to_b16): Delete unused local variables 'r_old' and
+	'r_new'.
+	(s7_s_score_end): Delete unused local variable 'dot'.
+	(s7_relax_frag): Delete unused local variable 'relax_size'.
+	(s7_gen_reloc): Delete unused local variables 'f', 's', and 'e'.
+
+2011-06-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	AVX Programming Reference (June, 2011)
+	* config/tc-i386.c (i386_error): Add invalid_vsib_address and
+	unsupported_vector_index_register.
+	(cpu_arch): Add .avx2, .bmi2, .lzcnt and .invpcid.
+	(check_VecOperands): New.
+	(match_template): Call check_VecOperands.  Handle
+	invalid_vsib_address and unsupported_vector_index_register.
+	(build_modrm_byte): Support VecSIB.  Check register-only source
+	operand when two source operands are swapped.
+	(i386_index_check): Allow Xmm/Ymm index registers.
+
+	* doc/c-i386.texi: Document avx2/.avx2, bmi2/.bmi2, lzcnt/.lzcnt
+	and invpcid./invpcid.
+
+2011-06-09  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12861
+	* config/tc-cr16.c (tc_gen_reloc): Remove unused local variable
+	code.
+	(check_cinv_options): Remove unused local variables.  Make
+	function void.
+	(md_assemble): Remove unused local variable.
+
+2011-06-09  James Greenhalgh  <james.greenhalgh@arm.com>
+
+	* config/tc-arm.c (do_ldrd): Warn in unpredictable cases.
+
+2011-06-03  Arnaud Patard  <arnaud.patard@rtp-net.org>
+
+	PR gas/12698
+	* config/tc-arm.c (parse_psr): Set m_profile to false when
+	assembling for any architecture.
+
+2011-06-02  Jie Zhang jie@codesourcery.com
+	    Nathan Sidwell nathan@codesourcery.com
+
+	* config/tc-arm.c (parse_address_main): Handle -0 offsets.
+	(encode_arm_addr_mode_2): Set default sign of zero here ...
+	(encode_arm_addr_mode_3): ... and here.
+	(encode_arm_cp_address): ... and here.
+	(md_apply_fix): Use default sign of zero here.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* as.c: Fix spelling typo.
+	* read.c: Likewise.
+	* config/tc-ppc.c: Likewise.
+	* po/gas.pit: Regenerate.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-arm.c (arm_cpus): Add Cortex-R5.
+	(arm_extensions): Allow idiv on ARMv7-R.
+	* doc/c-arm.text: Update idiv extension restrictions.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-arm.c (arm_force_relocation): Resolve all pc-relative
+	loads.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-arm.c (do_t_branch): Avoid relaxing branches to constant
+	addresses.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+	Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config/tc-arm.c (fix_new_arm): Create an absolute symbol for
+	pc-relative fixes to constants.
+	* config/tc-arm.h (TC_FORCE_RELOCATATION_ABS): Define.
+
+2011-05-27  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-s390.c (md_begin): Remove unused variable dup_insn.
+
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c (md_gather_operands): Fix check for floating
+	register pair operands.
+
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c (md_gather_operands): Emit an error for odd
+	numbered registers used as register pair operand.
+
+2011-05-23  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-v850.h (TC_FX_SIZE_SLACK): Define.
+
+2011-05-20  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* config/tc-tic6x.c (tic6x_operators): Add "pcr_offset".
+	(tic6x_parse_name): Handle it.
+	(tic6x_fix_new_exp): Handle O_pcr_offset.
+	(tic6x_fix_adjustable): Return 0 for the new relocs.
+	(md_apply_fix): Handle them.
+	(tc_gen_reloc): Likewise.
+	* config/tc-tic6x.h (tic6x_fix_info): Add a fix_subsy member.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12754
+	* config/tc-tic30.c (ordinal_names): Allow translation of the
+	ordinal names.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-arm.c (s_unreq): Reword warning message to make it
+	easier to translate.
+	* config/tc-ia64.c (md_show_usage): Add note for translators.
+	* configure.in (ALL_LINGUAS): Add "fi".
+	* configure: Regenerate.
+
+2011-05-18  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-ppc.h (ppc_tc_sy): Reorder fields.
+	Put size into an union with dw.
+	(OBJ_COPY_SYMBOL_ATTRIBUTES): Adjust.
+	(ppc_xcoff_end): Declare.
+	(md_end): Define.
+	* config/tc-ppc.c: Add includes for xcoff.
+	(ppc_dwsect): New function.
+	(md_pseudo_table): Add dwsect.
+	(struct dw_subsection): New.
+	(dw_sections): New.
+	(ppc_change_debug_section): New function.
+	(ppc_xcoff_end): Ditto.
+	(ppc_function): Adjust for ppc_tc_sy.
+	(ppc_symbol_new_hook): Ditto.
+	(ppc_frob_symbol): Ditto.
+	(ppc_frob_section): Do not set vma for debug sections.
+	(ppc_fix_adjustable): Return true for debug sections.
+	* config/obj-coff.c: Add includes for xcoff.
+	(coff_frob_section): Handle dwarf section.
+
+2011-05-17  Nick Clifton  <nickc@redhat.com>
+
+	* po/fi.po: New Finnish translation.
+	* po/fr.po: Updated French translation.
+
+	* config/tc-m32r.c (md_show_usage): Fix typos in descriptions.
+	* config/tc-mt.c (md_assemble): Fix typos in warning messages.
+	* cond.c (s_else): Fix typos in error messages.
+	* config/tc-pj.c (md_assemble): Fix typo in error message.
+
+2011-05-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config/tc-cris.c (md_parse_option) <OPTION_PIC>: Error if not
+	emitting ELF object.
+	(md_show_usage): Only mention --pic if the assembler can generate
+	ELF objects.
+	* doc/c-cris.texi (CRIS-Opt): Mention that generating ELF is a
+	prerequisite for --pic being a valid option.
+
+2011-05-13  Frederic Marchal  <fmarchal@perso.be>
+
+	PR gas/12755
+	* config/tc-v850.c (parse_register_list): Correct error string.
+
+2011-05-12  Quentin Neill  <quentin.neill@amd.com>
+
+	* config/tc-i386.c (cpu_arch): Rename PROCESSOR_BDVER1 to PROCESSOR_BD.
+	(i386_align_code): Ditto
+
+2011-05-12  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	PR gas/12715
+	* config/tc-arm.c (parse_big_immediate):  Fix parsing of 64-bit
+	immediates on 32-bit hosts.
+
+2011-05-10  Quentin Neill  <quentin.neill@amd.com>
+
+	* config/tc-i386.c (cpu_arch): Add bdver2 and rename
+	PROCESSOR_BDVER1 to PROCESSOR_BDVER.
+	(i386_align_code): Rename PROCESSOR_BDVER1.
+	(processor_type): Ditto.
+	* doc/c-i386.texi: Add bdver2.
+
+2011-05-10  Alan Modra  <amodra@gmail.com>
+
+	* dw2gencfi.c (tc_cfi_endproc): Avoid "set but not used" error.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-tic6x.c (streq): Define.
+	(tic6x_get_unwind): New.
+	(s_tic6x_cantunwind, s_tic6x_handlerdata, s_tic6x_endp,
+	s_tic6x_personalityindex, s_tic6x_personality): New functions.
+	(md_pseudo_table): Add "endp", "handlerdata", "personalityindex",
+	"personality" and "cantunwind".
+	(tic6x_regname_to_dw2regnum, tic6x_frame_initial_instructions,
+	tic6x_start_unwind_section, tic6x_unwind_frame_regs,
+	tic6x_pop_rts_offset_little, tic6x_pop_rts_offset_big,
+	tic6x_unwind_reg_from_dwarf, tic6x_flush_unwind_word,
+	tic6x_unwind_byte, tic6x_unwind_2byte, tic6x_unwind_uleb,
+	tic6x_cfi_startproc, output_exidx_entry, tic6x_output_unwinding,
+	tic6x_cfi_endproc): New.
+	* config/tc-tic6x.h (TIC6X_NUM_UNWIND_REGS): Define.
+	(tic6x_unwind_info): New.
+	(tic6x_segment_info_type): Add marked_pr_dependency, unwind and
+	text_unwind.
+	(TARGET_USE_CFIPOP, tc_regname_to_dw2regnum,
+	tc_cfi_frame_initial_instructions, DWARF2_DEFAULT_RETURN_COLUMN,
+	DWARF2_CIE_DATA_ALIGNMENT, tc_cfi_startproc, tc_cfi_endproc,
+	tc_cfi_section_name): Define.
+	* doc/c-tic6x.texi: Document new unwinding directives.
+	* dw2gencfi.c (tc_cfi_startproc, tc_cfi_endproc): Add default
+	definitions.
+	(cfi_insn_data, fde_entry, CFI_adjust_cfa_offset, CFI_return_column,
+	CFI_rel_offset, CFI_escape, CFI_signal_frame, CFI_val_encoded_addr):
+	Move to dw2gencfi.h.
+	(CFI_EMIT_target): Define.
+	(dot_cfi_sections): Check tc_cfi_section_name.
+	(dot_cfi_startproc): Use tc_cfi_startproc.
+	(dot_cfi_endproc): Use tc_cfi_endproc.
+	* dw2gencfi.h (cfi_insn_data, fde_entry, CFI_adjust_cfa_offset,
+	CFI_return_column, CFI_rel_offset, CFI_escape, CFI_signal_frame,
+	CFI_val_encoded_addr):  Move to here from dw2gencfi.c.
+
+2011-05-07  Alan Modra  <amodra@gmail.com>
+
+	* dw2gencfi.c (CUR_SEG, SET_CUR_SEG, HANDLED, SET_HANDLED): Define.
+	Use throughout in place of #if SUPPORT_FRAME_LINKONCE.
+	(struct fde_entry): Rename cseg to cur_seg.
+	(cfi_change_reg_numbers): Remove ATTRIBUTE_UNUSED.
+	(get_cfi_seg): Likewise.  Use if (SUPPORT_FRAME_LINKONCE) rather
+	that #if SUPPORT_FRAME_LINKONCE.
+	(cfi_finish): Likewise.
+
+2011-05-06  Tristan Gingold  <gingold@adacore.com>
+
+	* read.c (s_comm_internal): Remove code for OBJ_VMS.
+	(s_data): Ditto.
+	(s_text): Ditto.
+	* write.c (write_object_file): Ditto.
+	* symbols.c (define_sym_at_dot): Ditto.
+	(colon): Ditto.
+
+2011-05-05  Alan Modra  <amodra@gmail.com>
+
+	* dw2gencfi.c (SUPPORT_FRAME_LINKONCE): Define.  Use throughout
+	file to conditionally compile code added 2011-04-26.
+	(cfi_change_reg_numbers): Add ATTRIBUTE_UNUSED on params only used
+	when SUPPORT_FRAME_LINKONCE.
+	(get_cfi_seg): Likewise.  Reintroduce old code for when not
+	SUPPORT_FRAME_LINKONCE.
+	(cfi_finish): Move get_cfi_seg calls out of loop when not
+	SUPPORT_FRAME_LINKONCE.  Avoid unused var warning.
+
+2011-05-03  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-tic6x.c (s_ehtype): New function.
+	(md_pseudo_table): Add "ehtype".
+	(tic6x_fix_adjustable, md_apply_fix): BFD_RELOC_C6000_EHTYPE.
+	* doc/c-tic6x.texi: Document .ehtype directive.
+
+2011-04-26  Kai Tietz  <ktietz@redhat.com>
+
+	* dw2gencfi.c (dwcfi_seg_list): New struct.
+	(dwcfi_hash): New static hash variable.
+	(get_debugseg_name): New.
+	(alloc_debugseg_item): New.
+	(make_debug_seg): New.
+	(dwcfi_hash_insert): New.
+	(dwcfi_hash_find): New.
+	(dwcfi_hash_find_or_make): New.
+	(cfi_insn_data): New member cur_seg.
+	(cie_entry): Likewise.
+	(fde_entry): New cseg and handled members.
+	(alloc_fde_entry): Initialize cseg member.
+	(alloc_cfi_insn_data): Initialize cur_seg member.
+	(dot_cfi_sections): Compare for beginning of
+	section names via strncmp.
+	(get_cfi_seg): New.
+	(cfi_finish): Treat link-once sections.
+	(is_now_linkonce_segment): New local helper.
+	(output_cie): Ignore cie entries not member of current
+	segment.
+	(output_fde): Likewise.
+	(select_cie_for_fde): Likewise.
+	(cfi_change_reg_numbers): Add new argument for current segment
+	and ignore insn elements, if not part of current segment.
+	* ehopt.c (get_cie_info): Use strncmp for
+	section name matching.
+	(heck_eh_frame): Likewise.
+
+2011-04-20  Catherine Moore  <clm@codesourcery.com>
+            David Ung <davidu@mips.com>
+
+	* config/mips.c (mips_cl_insn): Add new field complete_p.
+	(create_insn): Initialize complete_p to zero.
+	(BASE_REG_EQ): New.
+	(fix_24k_align_to): New.
+	(fix_24k_store_info): Declare.
+	(fix_24k_sort): New.
+	(fix_24k_record_store_info): New.
+	(nops_for_24k): New.
+	(nops_for_insn): Call nops_for_24k.
+	(append_insn): Move O_constant expression handling.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	* hash.c (set_gas_hash_table_size): Use bfd_hash_set_default_size.
+	(hash_new_sized): New function, split out from..
+	(hash_new): ..here.
+
+2011-04-19  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-arm.c (v7m_psrs): Revert previous delta.
+
+2011-04-18  Julian Brown  <julian@codesourcery.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-arm.c (parse_psr): Use selected_cpu not cpu_variant to
+	detect M-profile targets.
+	(do_t_swi): Exclude v7 and higher variants from arm_ext_os test.
+	(v7m_psrs): Fix typo: basepri_max should be basepri_mask.
+
+2011-04-14  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c (s390_machine): New prototype.
+	(md_pseudo_table): New pseudo-op .machine.
+	(s390_opcode_hash): Initialize to NULL.
+	(s390_parse_cpu): New function.
+	(md_parse_option): Use s390_parse_cpu.
+	(s390_setup_opcodes): New function.
+	(md_begin): Use s390_setup_opcodes.
+	(s390_machine): New hook handling the new .machine pseudo.
+
+	* doc/c-s390.texi: Document the new pseudo op .machine.
+
+2011-04-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (i386_mach): Start error message with lower
+	case.
+	(md_begin): Likewise.
 	(md_parse_option): Likewise.
-	(i386_target_format): Adjust for x86_64-darwin.
+	(i386_target_format): Likewise.
+	(check_byte_reg): Likewise.
+	(check_long_reg): Likewise.
+	(check_qword_reg): Likewise.
+	(check_word_reg): Likewise.
+
+2011-04-12  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12532
+	* config/tc-arm.c (relax_branch): Do not relax branches to
+	preemptable global symbols.
+
+2011-04-11  Julian Brown  <julian@codesourcery.com>
+
+	* config/tc-arm.c (parse_psr): Add LHS argument. Improve support
+	for *APSR bitmasks.
+	(operand_parse_code): Replace OP_PSR with OP_wPSR and OP_rPSR.
+	Remove OP_RVC_PSR.
+	(parse_operands): Likewise.
+	(do_mrs): Tweak error message for constraint.
+	(do_t_mrs): Update constraints for changes to APSR support.
+	(do_t_msr): Likewise. Don't set PSR_f flag here.
+	(psrs): Remove "g", "nzcvq", "nzcvqg".
+	(insns): Tweak entries for msr and mrs instructions.
+
+2011-04-11  Kai Tietz  <ktietz@redhat.com>
+
+	* config/tc-i386.c (x86_cons): Initialize adjust with zero.
+
+2011-04-11  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-i386.c (x86_cons): Define even for non-ELF targets.
+	* config/tc-i386.h (x86_cons): Always prototype.
+
+	* config/tc-cr16.c (getprocregp_image): Fix type of 'r' parameter
+	in order to avoid a compile time warning.
+	(getprocreg_image): Likewise.
+
+2011-04-11  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-cr16.c (getprocreg_image): Correct range check.
+	(getprocregp_image): Likewise.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.tgt (strongarm*be, strongarm*b, strongarm*,
+	xscale*be|xscale*b, xscale*): Remove architectures.
+	(thumb-*-coff, thumb-*-rtems*, thumb-*-elf, thumb-epoc-pe,
+	thumb-*-pe, xscale-*-coff, xscale-*-elf): Remove targets.
+
+2011-04-01  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-ia64.c (md_apply_fix): Add a cast to avoid a warning.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* config/tc-tic6x.c (sbss_section, scom_section, scom_symbol): New
+	static variables.
+	(md_begin): Initialize them.
+	(s_tic6x_scomm): New static function.
+	(md_pseudo_table): Add "scomm".
+	(tc_gen_reloc): Really undo all adjustments made by
+	bfd_install_relocation.
+	* doc/c-tic6x.texi: Document the .scomm directive.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf2dbg.c (DWARF2_VERSION): Define.
+	(out_debug_line): Use it.
+	(out_debug_aranges): Ditto.
+	(out_debug_info): Ditto.
+	* config/tc-ia64.h (DWARF2_VERSION): Override it.
+
+2011-03-30  Michael Snyder  <msnyder@vmware.com>
+
+	* obj-elf.c (obj_elf_section): Free malloced name.
+	* macro.c (get_any_string): Free malloced br_buf.
+	(do_formals): Free 'formal'.
+
+2011-03-30  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-ppc.c (ppc_frob_symbol): Convert stsym symbols value
+	to offset only if within is set.
+	(ppc_stabx): Reformat.  For stsym stabs, add a check and set
+	within only for symbols.
+
+2011-03-29  Richard Henderson  <rth@redhat.com>
+
+	PR 12610
+	* config/tc-alpha.c (s_alpha_align): Don't auto-align a previous
+	label; zap alpha_insn_label.
+
+2011-03-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (handle_quad): Properly handle multiple
+	operands.
+
+2011-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (BYTEUNPACK): Return yyerror when dest
+	reg $2 is the same as dest reg $4.
+
+2011-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (BYTEOP16M): Return yyerror when dest
+	reg $2 is the same as dest reg $4.
+
+2011-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (BYTEOP16P): Return yyerror when dest
+	reg $2 is the same as dest reg $4.
+
+2011-03-28  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (16bit acc add): Return yyerror when dest
+	reg $1 is the same as dest reg $7.
+
+2011-03-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (handle_quad): New.
+	(md_pseudo_table): Add "quad".
+
+2011-03-26  John Marino  <binutils@marino.st>
+
+	* configure.tgt: Fix support for *-*-dragonfly*.
+	* config/tc-i386.c: define SVR4_COMMENT_CHARS for dragonfly.
+	* config/te-dragonfly.h: New file.
+
+2011-03-24  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* config/tc-avr.c (mcu_types): Add new devices: atmega325pa,
+	atmega3250pa, atmega3290pa, atmega16hvbrevb, atmega32hvbrevb,
+	at90pwm161.
+	* doc/c-avr.texi: Document new device names.
+
+2011-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (dual 32bit add/sub): Return yyerror when dest
+	reg $1 is the same as dest reg $7.
+	(quad 16bit add/sub): Return yyerror when dest reg $1 is the same as
+	dest reg $7.
+
+2011-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (check_macfuncs): Clarify error message when
+	P is mismatched.  Check destination regno are off by one when P is
+	set, or are equal when P is not set.
+
+2011-03-23  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (SEARCH): Return yyerror when dest reg $2 is
+	the same as dest reg $4.
+	(BITMUX): Return yyerror when dest reg $3 is the same as dest reg $5.
+
+2011-03-23  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* config/tc-avr.c (mcu_types): Add new xmega devices: atxmega64a1u,
+	atxmega128a1u, atxmega16x1, atxmega32x1, atxmega128b1, atxmega256a3bu.
+	* doc/c-avr.texi: Document new device names.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* config/tc-avr.c (struct avr_opcodes_s): Add opcode field.
+	(AVR_INSN): Change definition to match.
+	(avr_opcodes): Likewise, change to match.
+	(mcu_types): Add XMEGA architecture names and new XMEGA device names.
+	(md_show_usage): Add XMEGA architecture names.
+	(avr_operand): Add 'E' constraint for DES instruction of XMEGA devices.
+	Add support for SPM Z+ instruction.
+	* doc/c-avr.texi: Add documentation for XMEGA architectures and
+	devices.
+
+2011-03-21  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* config/tc-avr.c (md_show_usage): Add "Assembler" text to output.
+
+2011-03-18  Alan Modra  <amodra@gmail.com>
+
+	* config/obj-elf.c (elf_frob_symbol): Report S_SET_SIZE symbol
+	on .size expression errors rather than symbols in the size expression.
+
+2011-03-18  Alan Modra  <amodra@gmail.com>
+
+	* input-scrub.c (line_numberT): Delete.
+	(input_scrub_close): Reset line counters.
+	* messages.c (as_show_where): Don't print invalid line number.
+	(as_warn_internal, as_bad_internal): Likewise.
+
+2011-03-18  Alan Modra  <amodra@gmail.com>
+
+	* read.c (read_a_source_file): Remove md_after_pass_hook.
+	Move "quit" label before set of dot_symbol.
+	* config/tc-d10v.h (md_after_pass_hook): Don't define.
+	* config/tc-d30v.h (md_after_pass_hook): Likewise.
+	* config/tc-m32r.h (md_after_pass_hook): Likewise.
+	(md_cleanup): Define to call m32r_fill_insn.
+
+2011-03-18  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c (md_parse_option): Add -march=all option which
+	switches to the highest available CPU.
+
+2011-03-17  Alan Modra  <amodra@gmail.com>
+
+	PR 12569
+	* expr.c (operand): Correct passing of "mode" to expr.
+	* read.c (do_org): Allow expr_section.
+	(get_known_segmented_expression): Don't assert anything about the
+	segment.
+
+2011-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* as.c (show_usage): Add --size-check=.
+	(parse_args): Add and handle OPTION_SIZE_CHECK.
+
+	* as.h (flag_size_check): New.
+
+	* config/obj-elf.c (elf_frob_symbol): Use as_bad to report
+	bad .size directive only for --size-check=error.
+
+	* doc/as.texinfo: Document --size-check=.
+
+2011-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/tc-bfin.c (bfin_cpus[]): Add 0.4 for
+	bf542/bf544/bf547/bf548/bf549.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* config/tc-arm.c (md_pcrel_from_section): Use S_FORCE_RELOC to
+	determine whether a relocation is needed.
+	(md_apply_fix, arm_apply_sym_value): Likewise.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* config/tc-arm.c (arm_adjust_symtab): Set the branch type
+	for Thumb symbols.
+
+2011-03-11  Nick Clifton  <nickc@redhat.com>
+
+	* remap.c (remap_debug_filename): Always allocate a buffer for the
+	returned pointer.
+	* stabs.c (stabs_generate_asm_file): Free the pointer returned by
+	remap_debug_filename.
+
+2011-03-10  Michael Snyder  <msnyder@vmware.com>
+
+	Revert the following change:
+	* dwarf2dbg.c (out_file_list): Free malloced 'dir'.
+	(out_debug_info): Free malloced 'dirname' and 'comp_dir'.
+
+2011-03-10  Alan Modra  <amodra@gmail.com>
+
+	* gas/config/obj-elf.h (ELF_TARGET_SYMBOL_FIELDS,
+	TARGET_SYMBOL_FIELDS): Don't define.
+	* gas/config/tc-arc.c (arc_common): Use correct symbol "local" field.
+
+2011-03-09  Michael Snyder  <msnyder@vmware.com>
+
+	* dwarf2dbg.c (out_file_list): Free malloced 'dir'.
+	(out_debug_info): Free malloced 'dirname' and 'comp_dir'.
+	(emit_fixed_inc_line_addr): Assign instead of conditional in
+	assert.
+
+2011-03-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/obj-elf.c (elf_frob_symbol): Mention symbol name in
+	non-constant .size expression.
+
+2011-03-02  Nick Clifton  <nickc@redhat.com>
+
+	* ecoff.c: Incldue filenames.h
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* depend.c (register_dependency): Use filename_(n)cmp.
+	* dwarf2dbg.c (get_filenum): Likewise.
+	* ecoff.c (add_file): Likewise.
+	(ecoff_generate_asm_lineno): Likewise.
+	* input-scrub.c (new_logical_line_flags): Likewise.
+	* listing.c (file_info): Likewise.
+	(listing_newline): Likewise.
+	* remap.c (remap_debug_filename): Likewise.
+	* stabs.c (generate_asm_file): Likewise.
+	(stabs_generate_asm_lineno): Likewise.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (append_insn): Disable branch relaxation for
+	DSP instructions.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (macro): Handle M_PREF_AB.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (RELAX_BRANCH_ENCODE): Encode the temporary
+	register to use.
+	(RELAX_BRANCH_UNCOND): Adjust accordingly.
+	(RELAX_BRANCH_LIKELY): Likewise.
+	(RELAX_BRANCH_LINK): Likewise.
+	(RELAX_BRANCH_TOOFAR): Likewise.
+	(RELAX_BRANCH_AT): New macro.
+	(append_insn): Encode the temporary register to use in standard
+	MIPS branch relaxation.
+	(relaxed_branch_length): Update according to changes to
+	RELAX_BRANCH_ENCODE.
+	(md_convert_frag): Use the encoded register as the temporary.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (mips_fix_adjustable): On REL targets also
+	reject PC-relative relocations.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (md_convert_frag): Correct message
+	capitalization.
+
+2011-02-28  Alan Modra  <amodra@gmail.com>
+
+	* symbols.c (report_op_error): Remove unnecessary forward declaration.
+	Add "op" parameter.  Report operator and operand segments in error
+	message, not operand symbols.
+	(resolve_symbol_value): Always set segment for equated symbols, not
+	just when finalizing.  Adjust report_op_error calls.
+
+2011-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (reloc): Don't sign-check 4-byte relocations
+	if 64bit relocations aren't allowed.
+
+2011-02-25  Alan Modra  <amodra@gmail.com>
+
+	PR gas/12519
+	* config/obj-elf.c (elf_frob_symbol): Properly handle size expression.
+
+2011-02-21  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (mips_ip) <'o'>: Remove duplicate
+	initialization of offset_reloc.
+
+2011-02-15  Richard Henderson  <rth@redhat.com>
+
+	* dw2gencfi.c (dot_cfi_dummy): New.
+	(cfi_pseudo_table) [!TARGET_USE_CFIPOP]: New.
+	* read.c (pobegin): Unconditionally call cfi_pop_insert.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-lex.l (BYTEOP2M): Remove tokenization.
+	* config/bfin-parse.y (BYTEOP2M): Delete token.
+	(asm_1): Remove BYTEOP2M insn matching.
+
+2011-02-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-defs.h: Include opcode/bfin.h.
+	(M_S2RND, M_T, M_W32, M_FU, M_TFU, M_IS, M_ISS2, M_IH, M_IU): Delete.
+
+2011-02-11  Mike Frysinger  <vapier@gentoo.org>
+
+	* doc/c-bfin.texi (Instruction Delimiting): Fix occur typo.
+	(Modify Registers): Fix subtracted typo.
+	(.byte2): Extend and swap descriptions with .byte4.
+	(.byte4): Extend and swap descriptions with .byte2.
+	(.db, .dw, .dd): Document behavior.
+
+2011-02-11  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/bfin-parse.y (TESTSET): Reject REG_SP and REG_FP.
+
+2011-02-11  Alan Modra  <amodra@gmail.com>
+
+	* doc/c-ppc.texi (PowerPC-Opts <-nops>): Clarify.
+
+2011-02-10  Alan Modra  <amodra@gmail.com>
+
+	* doc/as.texinfo (Overview): Add missing markup around Blackfin
+	and PowerPC options.
+
+2011-02-10  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-ppc.c (md_show_usage): Remove -l and -b.  Add -K PIC.
+	* doc/as.texinfo: Refer to and include c-ppc.texi for PowerPC options.
+	(Overview <Target PowerPC options>): Add a number of missing options.
+	* doc/c-ppc.texi: Likewise.  Add markup for use in manpage generation.
+
+2011-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/6957
+	* config/tc-i386.c (i386_align_code): Use f32_patt when tuning
+	for i686.
+
+2011-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (set_cpu_arch): Also update cpu_arch_isa_flags
+	for ISA extensions.
+	(md_parse_option): Likewise.
+
+2011-02-04  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* doc/as.texinfo (Target TIC6X options): Don't mention "-matomic".
+	* doc/c-tic6x.texi (TIC6X Directives): Don't mention ".atomic".
+	(TIC6X Options): Don't mention "-matomic".
+	* config/tc-tic6x.c (OPTION_MATOMIC, OPTION_MNO_ATOMIC): Delete.
+	(md_longopts): Remove corresponding entries.
+	(md_parse_option): Don't handle them.
+	(md_show_usage): Don't document them.
+	(tic6x_atomic): Delete variable.
+	(tic6x_update_features): Always copy tic6x_arch_enable to
+	tic6x_features.
+	(tic6x_arch_enable): Remove references to TIC6X_INSN_ATOMIC.
+	(s_tic6x_atomic, s_tic6x_noatomic): Remove functions.
+	(md_pseudo_table): Remove ".atomic" and ".noatomic".
+
+2011-01-31  Nick Clifton  <nickc@redhat.com>
+
+	* write.c (write_contents): Include output file name and bfd error
+	value when reporting the inability to write to the output file.
+	* config/tc-rx.c (rx_handle_align): Do not insert NOPs into align
+	frag that has a non-zero fill value.
+
+2011-01-27  DJ Delorie  <dj@redhat.com>
+
+	* config/tc-rx.c (md_convert_frag): If we can't compute the target
+	address, zero out the values stored in the object file to make
+	objdump's output consistent.
+
+2011-01-26  Kai Tietz  <kai.tietz@onevision.com>
+
+	* config/tc-i386.c (md_begin): Set for x64 windows COFF target
+	x86_dwarf2_return_column to 32.
+
+2011-01-20  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12384
+	* config/tc-h8300.c (constant_fits_width_p): Use correct type for
+	comparison.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* write.c (compress_debug): Return if section size is smaller
+	than 32 bytes.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/12409
+	* write.c (compress_debug): Return if section size is 0.
+
+2011-01-18  Mingfeng Wu  <mingfeng@faraday-tech.com>
+
+	* config/tc-arm.c (arm_cpus): Add Faraday ARMv5TE compatible
+	cores: fa606te, fa616te, fmp626.  Modify the VFP of fa626te.
+	* doc/c-arm.texi (ARM Options): Add -mcpu={fa606te, fa616te,
+	fmp626} options.
+
+2011-01-18  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12390
+	* doc/all.texi: Add NS32K
+	* doc/as.texinfo: Remove target specific details of which
+	characters act as comment initiators and statement separators into
+	individual target specific files.
+	* doc/c-alpha.texi (Alpha-Chars): Document special behaviour of
+	the hash character at the start of a line.
+	* doc/c-arm.texi (ARM-Chars): Likewise.
+	* doc/c-avr.texi (AVR-Chars): Likewise.
+	* doc/c-d10v.texi (D10V-Chars): Likewise.
+	* doc/c-d30v.texi (D30V-Chars):	Likewise.
+	* doc/c-mmix.texi (MMIX-Chars): Likewise.
+	* doc/c-s390.texi (s390 characters): Likewise.
+	* doc/c-sh.texi (SH-Chars): Likewise.
+	* doc/c-sh64.texi (SH64-Chars): Likewise.
+	* doc/c-sparc.texi (SPARC-Chars): Likewise.
+	* doc/c-tic6x.texi (TIC6X Syntax): Likewise.
+	* doc/c-xtensa.texi (Xtensa Syntax): Likewise.
+	* doc/c-z80.texi (Z80-Chars): Likewise.
+	* doc/c-z8k.texi (Z8000-Chars): Likewise.
+	* doc/c-pdp11.texi (PDP11-Syntax): Document line separator character.
+	* doc/c-arc.texi (ARC-Chars): Fill in this subsection.
+	* doc/c-bfin.texi (Blackfin Syntax): Document line comment and
+	line separator characters.
+	* doc/c-cr16.texi (CR16 Syntax): Likewise.
+	* doc/c-i386.texi (i386-Chars): Likewise.
+	* doc/c-i860.texi (i860-Chars):	Likewise.
+	* doc/c-i960.texi (i960-Chars):	Likewise.
+	* doc/c-ip2k.texi (IP2K-Chars):	Likewise.
+	* doc/c-lm32.texi (LM32-Chars):	likewise.
+	* doc/c-m32c.texi (M32C-Chars): Likewise.
+	* doc/c-m68hc11.texi (M68HC11-syntax): Likewise.
+	* doc/c-m68k.texi (M68K-Chars): Likewise.
+	* doc/c-microblaze.texi (MicroBlaze-Chars): Likewise.
+	* doc/c-msp430.texi (MSP430-Chars): Likewise.
+	* doc/c-mt.texi (MT-Chars): Likewise.
+	* doc/c-ns32k.texi (NS32K-Chars): Likewise.
+	* doc/c-pj.texi (PJ-Chars): Likewise.
+	* doc/c-ppc.texi (PowerPC-Chars): Likewise.
+	* doc/c-rx.texi (RX-Chars): Likewise.
+	* doc/c-score.texi (SCORE-Chars): Likewise.
+	* doc/c-tic54x.texi (TIC54X-Chars): Likewise.
+	* doc/c-v850.texi (V850-Chars): Likewise.
+	* doc/c-vax.texi (VAX-Chars): Likewise.
+	* doc/c-xc16x.texi (xc16x-Chars): Likewise.
+
+2011-01-17  Quentin Neill  <quentin.neill@amd.com>
+
+	* config/tc-i386.c (cpu_arch): Add CPU_TBM_FLAGS.
+
+	* doc/c-i386.texi (i386-TBM): New section.
+
+2011-01-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (disallow_64bit_disp): Renamed to ...
+	(disallow_64bit_reloc): This.
+	(md_assemble): Don't check movabs for x32 mode here.
+	(i386_target_format): Updated.
+	(tc_gen_reloc): Check if 64bit relocations are allowed.
+
+2011-01-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (disallow_64bit_disp): New.
+	(x86_elf_abi): Replace X86_64_LP64_ABI/X86_64_ILP32_ABI with
+	X86_64_ABI/X86_64_X32_ABI.
+	(md_assemble): Don't allow movabs with relocation in x32 mode.
+	(i386_target_format): Updated.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (OPTION_N32): Renamed to ...
+	(OPTION_X32): This.
+	(md_longopts): Replace n32 with x32.
+	(md_parse_option): Updated.
+	(md_show_usage): Likewise.
+
+	* doc/c-i386.texi: Replace --n32 with --x32.
+
+2011-01-11  Mingjie Xing  <mingjie.xing@gmail.com>
+
+	* config/tc-mips.c (mips_ip): Update error messages.  Take an
+	unadjusted offset for "+c" argument.
+
+2011-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-i386.c (x86_elf_abi): Only define for targets that use
+	it.
+
+2011-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-arm.c (s_arm_tls_desceq): Move code into ELF-only
+	part of the file.
+
+2011-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+	    Glauber de Oliveira Costa  <glommer@gmail.com>
+
+	* doc/c-arm.texi: Document TLSDESC and TLSCALL relocations, and
+	.tlsdescseq directive.
+	* config/tc-arm.c (arm_typed_reg_parse): Check for potential reloc
+	following a symbol.
+	(s_arm_tls_descseq): New directive.
+	(md_pseudo_table): Add it.
+	(encode_branch): Allow TLS_CALL relocs too.
+	(do_t_blx, do_t_branch23): Use encode_branch.
+	(reloc_names): Add tlsdesc and tlscall.
+	(md_apply_fix): Process tls desc relocations.
+	(tc_gen_reloc): Likewise.
+	(arm_fix_adjustable): Likewise.
+
+2011-01-07  Quentin Neill  <quentin.neill@amd.com>
+
+	* config/tc-i386.c (cpu_arch): Add CPU_BMI_FLAGS.
+
+	* doc/c-i386.texi (i386-BMI): New section.
+
+2011-01-06  Paul Koning  <ni1d@arrl.net>
+
+	* config/tc-pdp11.c (parse_op_no_deferred): Allow PC-relative
+	references to absolute addresses.
+
+2011-01-05  DJ Delorie  <dj@redhat.com>
+
+	* config/tc-rx.c (tc_gen_reloc): Emit an RX_OP_NEG expression
+	instead of an RH_NEG32 one.
+
+2011-01-05  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* doc/c-i386.texi: Clarify --n32.
 
-2012-01-04  Iain Sandoe  <idsandoe@googlemail.com>
+2011-01-04  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* config/obj-macho.c (obj_mach_o_segT_from_bfd_name): Tidy definition.
-	(obj_mach_o_get_section_names): New (split from obj_mach_o_section).
-	(obj_mach_o_make_or_get_sect): Likewise.
-	(obj_mach_o_section): Split out the functionality shared with zerofill.
-	(obj_mach_o_zerofill): New.
-	(obj_mach_o_common_parse): Ensure whitespace is skipped.
-	(mach_o_pseudo_table): Add .zerofill.
+	* config/tc-i386.c (build_modrm_byte): Allow encoding 32/64bit
+	integer registers in VEX.vvvv.  Check register-only source
+	operand when two source operands are swapped.  Properly update
+	destination when two source operands are swapped.
 
-2012-01-03  Iain Sandoe  <idsandoe@googlemail.com>
+2011-01-01  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* config/obj-macho.c (obj_macho_process_stab): New.
-	* config/obj-macho.h (OBJ_PROCESS_STAB): Define.
-	(obj_macho_process_stab): Declare.
+	* gas.c (parse_args): Update copyright to 2011.
 
-For older changes see ChangeLog-2011
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 8f7b7cd60e..807490342f 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -118,7 +118,6 @@ TARGET_CPU_CFILES = \
 	config/tc-d10v.c \
 	config/tc-d30v.c \
 	config/tc-dlx.c \
-	config/tc-epiphany.c \
 	config/tc-fr30.c \
 	config/tc-frv.c \
 	config/tc-h8300.c \
@@ -151,7 +150,6 @@ TARGET_CPU_CFILES = \
 	config/tc-pdp11.c \
 	config/tc-pj.c \
 	config/tc-ppc.c \
-	config/tc-rl78.c \
 	config/tc-rx.c \
 	config/tc-s390.c \
 	config/tc-score.c \
@@ -186,7 +184,6 @@ TARGET_CPU_HFILES = \
 	config/tc-d10v.h \
 	config/tc-d30v.h \
 	config/tc-dlx.h \
-	config/tc-epiphany.h \
 	config/tc-fr30.h \
 	config/tc-frv.h \
 	config/tc-h8300.h \
@@ -218,7 +215,6 @@ TARGET_CPU_HFILES = \
 	config/tc-pdp11.h \
 	config/tc-pj.h \
 	config/tc-ppc.h \
-	config/tc-rl78.h \
 	config/tc-rx.h \
 	config/tc-s390.h \
 	config/tc-score.h \
@@ -338,7 +334,6 @@ EXTRA_SCRIPTS = .gdbinit
 
 EXTRA_DIST = m68k-parse.c itbl-parse.c itbl-parse.h itbl-lex.c \
 	bfin-parse.c bfin-parse.h bfin-lex.c \
-	rl78-parse.c rl78-parse.h \
 	rx-parse.c rx-parse.h
 
 diststuff: $(EXTRA_DIST) info
@@ -468,14 +463,6 @@ endif
 	$(COMPILE) -c `test -f bfin-lex.c || echo $(srcdir)/`bfin-lex.c $(NO_WERROR)
 endif
 
-rl78-parse.c: $(srcdir)/config/rl78-parse.y
-	$(SHELL) $(YLWRAP) $(srcdir)/config/rl78-parse.y y.tab.c rl78-parse.c y.tab.h rl78-parse.h -- $(YACCCOMPILE) -d ;
-rl78-parse.h: rl78-parse.c
-rl78-parse.@OBJEXT@: rl78-parse.c rl78-parse.h $(srcdir)/config/rl78-defs.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/rl78.h $(BFDDIR)/libbfd.h
-
-rl78-defs.h: ; @true
-
 rx-parse.c: $(srcdir)/config/rx-parse.y
 	$(SHELL) $(YLWRAP) $(srcdir)/config/rx-parse.y y.tab.c rx-parse.c y.tab.h rx-parse.h -- $(YACCCOMPILE) -d ;
 rx-parse.h: rx-parse.c
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 39af3e8c14..ddd42d747e 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -385,7 +385,6 @@ TARGET_CPU_CFILES = \
 	config/tc-d10v.c \
 	config/tc-d30v.c \
 	config/tc-dlx.c \
-	config/tc-epiphany.c \
 	config/tc-fr30.c \
 	config/tc-frv.c \
 	config/tc-h8300.c \
@@ -418,7 +417,6 @@ TARGET_CPU_CFILES = \
 	config/tc-pdp11.c \
 	config/tc-pj.c \
 	config/tc-ppc.c \
-	config/tc-rl78.c \
 	config/tc-rx.c \
 	config/tc-s390.c \
 	config/tc-score.c \
@@ -453,7 +451,6 @@ TARGET_CPU_HFILES = \
 	config/tc-d10v.h \
 	config/tc-d30v.h \
 	config/tc-dlx.h \
-	config/tc-epiphany.h \
 	config/tc-fr30.h \
 	config/tc-frv.h \
 	config/tc-h8300.h \
@@ -485,7 +482,6 @@ TARGET_CPU_HFILES = \
 	config/tc-pdp11.h \
 	config/tc-pj.h \
 	config/tc-ppc.h \
-	config/tc-rl78.h \
 	config/tc-rx.h \
 	config/tc-s390.h \
 	config/tc-score.h \
@@ -598,7 +594,6 @@ noinst_SCRIPTS = $(GDBINIT)
 EXTRA_SCRIPTS = .gdbinit
 EXTRA_DIST = m68k-parse.c itbl-parse.c itbl-parse.h itbl-lex.c \
 	bfin-parse.c bfin-parse.h bfin-lex.c \
-	rl78-parse.c rl78-parse.h \
 	rx-parse.c rx-parse.h
 
 DISTCLEANFILES = targ-cpu.h obj-format.h targ-env.h itbl-cpu.h cgen-desc.h
@@ -801,7 +796,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-d10v.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-d30v.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-dlx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-epiphany.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-fr30.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-frv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-h8300.Po@am__quote@
@@ -834,7 +828,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-pdp11.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-pj.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-ppc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-rl78.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-rx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-s390.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-score.Po@am__quote@
@@ -1034,20 +1027,6 @@ tc-dlx.obj: config/tc-dlx.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-dlx.obj `if test -f 'config/tc-dlx.c'; then $(CYGPATH_W) 'config/tc-dlx.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-dlx.c'; fi`
 
-tc-epiphany.o: config/tc-epiphany.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-epiphany.o -MD -MP -MF $(DEPDIR)/tc-epiphany.Tpo -c -o tc-epiphany.o `test -f 'config/tc-epiphany.c' || echo '$(srcdir)/'`config/tc-epiphany.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-epiphany.Tpo $(DEPDIR)/tc-epiphany.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-epiphany.c' object='tc-epiphany.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-epiphany.o `test -f 'config/tc-epiphany.c' || echo '$(srcdir)/'`config/tc-epiphany.c
-
-tc-epiphany.obj: config/tc-epiphany.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-epiphany.obj -MD -MP -MF $(DEPDIR)/tc-epiphany.Tpo -c -o tc-epiphany.obj `if test -f 'config/tc-epiphany.c'; then $(CYGPATH_W) 'config/tc-epiphany.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-epiphany.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-epiphany.Tpo $(DEPDIR)/tc-epiphany.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-epiphany.c' object='tc-epiphany.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-epiphany.obj `if test -f 'config/tc-epiphany.c'; then $(CYGPATH_W) 'config/tc-epiphany.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-epiphany.c'; fi`
-
 tc-fr30.o: config/tc-fr30.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-fr30.o -MD -MP -MF $(DEPDIR)/tc-fr30.Tpo -c -o tc-fr30.o `test -f 'config/tc-fr30.c' || echo '$(srcdir)/'`config/tc-fr30.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-fr30.Tpo $(DEPDIR)/tc-fr30.Po
@@ -1496,20 +1475,6 @@ tc-ppc.obj: config/tc-ppc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-ppc.obj `if test -f 'config/tc-ppc.c'; then $(CYGPATH_W) 'config/tc-ppc.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-ppc.c'; fi`
 
-tc-rl78.o: config/tc-rl78.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-rl78.o -MD -MP -MF $(DEPDIR)/tc-rl78.Tpo -c -o tc-rl78.o `test -f 'config/tc-rl78.c' || echo '$(srcdir)/'`config/tc-rl78.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-rl78.Tpo $(DEPDIR)/tc-rl78.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-rl78.c' object='tc-rl78.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-rl78.o `test -f 'config/tc-rl78.c' || echo '$(srcdir)/'`config/tc-rl78.c
-
-tc-rl78.obj: config/tc-rl78.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-rl78.obj -MD -MP -MF $(DEPDIR)/tc-rl78.Tpo -c -o tc-rl78.obj `if test -f 'config/tc-rl78.c'; then $(CYGPATH_W) 'config/tc-rl78.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-rl78.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-rl78.Tpo $(DEPDIR)/tc-rl78.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-rl78.c' object='tc-rl78.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-rl78.obj `if test -f 'config/tc-rl78.c'; then $(CYGPATH_W) 'config/tc-rl78.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-rl78.c'; fi`
-
 tc-rx.o: config/tc-rx.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-rx.o -MD -MP -MF $(DEPDIR)/tc-rx.Tpo -c -o tc-rx.o `test -f 'config/tc-rx.c' || echo '$(srcdir)/'`config/tc-rx.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-rx.Tpo $(DEPDIR)/tc-rx.Po
@@ -2454,14 +2419,6 @@ bfin-lex.@OBJEXT@: bfin-lex.c bfin-parse.h $(srcdir)/config/bfin-defs.h
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `test -f bfin-lex.c || echo $(srcdir)/`bfin-lex.c $(NO_WERROR)
 
-rl78-parse.c: $(srcdir)/config/rl78-parse.y
-	$(SHELL) $(YLWRAP) $(srcdir)/config/rl78-parse.y y.tab.c rl78-parse.c y.tab.h rl78-parse.h -- $(YACCCOMPILE) -d ;
-rl78-parse.h: rl78-parse.c
-rl78-parse.@OBJEXT@: rl78-parse.c rl78-parse.h $(srcdir)/config/rl78-defs.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/rl78.h $(BFDDIR)/libbfd.h
-
-rl78-defs.h: ; @true
-
 rx-parse.c: $(srcdir)/config/rx-parse.y
 	$(SHELL) $(YLWRAP) $(srcdir)/config/rx-parse.y y.tab.c rx-parse.c y.tab.h rx-parse.h -- $(YACCCOMPILE) -d ;
 rx-parse.h: rx-parse.c
diff --git a/gas/NEWS b/gas/NEWS
index 6e2abffc2d..e2c1ce12c0 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,15 +1,8 @@
 -*- text -*-
 
-* Add support for .bundle_align_mode, .bundle_lock, and .bundle_unlock
-  directives.  These are currently available only for x86 and ARM targets.
-
-* Add support for the Renesas RL78 architecture.
-
-* Add support for the Adapteva EPIPHANY architecture.
-
 Changes in 2.22:
 
-* Add support for the Tilera TILEPro and TILE-Gx architectures.
+* Add support for the Tilera TILEPRO and TILE-Gx architectures.
 
 Changes in 2.21:
 
@@ -51,10 +44,10 @@ Changes in 2.20:
   indicate that if the symbol is the target of a relocation, its value should
   not be use.  Instead the function should be invoked and its result used as
   the value.
-
+ 
 * Add support for Lattice Mico32 (lm32) architecture.
 
-* Add support for Xilinx MicroBlaze architecture.
+* Add support for Xilinx MicroBlaze architecture. 
 
 Changes in 2.19:
 
@@ -113,7 +106,7 @@ Changes in 2.17:
 * The SH target supports a new command line switch --enable-reg-prefix which,
   if enabled, will allow register names to be optionally prefixed with a $
   character.  This allows register names to be distinguished from label names.
-
+  
 * Macros with a variable number of arguments are now supported. See the
   documentation for how this works.
 
@@ -126,7 +119,7 @@ Changes in 2.17:
   known to cause problems in certain sources when the respective target uses
   characters inconsistently, and thus macro parameter references may no longer
   be recognized as such (see the documentation for details).
-
+  
 * Support the .f_floating, .d_floating, .g_floating and .h_floating directives
   for the VAX target in order to be more compatible with the VAX MACRO
   assembler.
@@ -192,7 +185,7 @@ Changes in 2.15:
 
 * Added --gstabs+ switch to enable the generation of STABS debug format
   information with GNU extensions.
-
+ 
 * Added support for MIPS64 Release 2.
 
 * Added support for v850e1.
@@ -215,14 +208,14 @@ Changes in 2.14:
 
 * An assembler test generator has been contributed and an example file that
   uses it (gas/testsuite/gas/all/test-gen.c and test-exmaple.c).
-
+  
 * Support for SH2E added.
 
 * GASP has now been removed.
 
 * Support for Texas Instruments TMS320C4x and TMS320C3x series of
   DSP's contributed by Michael Hayes and Svein E. Seldal.
-
+  
 * Support for the Ubicom IP2xxx microcontroller added.
 
 Changes in 2.13:
@@ -245,8 +238,8 @@ Changes in 2.12:
 
 * 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
+* 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
   compatibility.
 
@@ -259,7 +252,7 @@ Changes in 2.12:
 * The MIPS assembler now accepts -march/-mtune. -mcpu has been deprecated
   but still works for compatability.
 
-* The MIPS assembler no longer issues a warning by default when it
+* The MIPS assembler no longer issues a warning by default when it 
   generates a nop instruction from a macro. The new command line option
   -n will turn on the warning.
 
@@ -310,7 +303,7 @@ Changes in 2.10:
 
 * Motorola MCore 210 processor support added.
 
-* A new pseudo-op .intel_syntax has been implemented to allow gas to parse i386
+* A new pseudo-op .intel_syntax has been implemented to allow gas to parse i386 
   assembly programs with intel syntax.
 
 * New pseudo-ops .func,.endfunc to aid in debugging user-written assembler code.
@@ -319,7 +312,7 @@ Changes in 2.10:
 
 * Full 16-bit mode support for i386.
 
-* Greatly improved instruction operand checking for i386.  This change will
+* Greatly improved instruction operand checking for i386.  This change will 
   produce errors or warnings on incorrect assembly code that previous versions
   of gas accepted.  If you get unexpected messages from code that worked with
   older versions of gas, please double check the code before reporting a bug.
@@ -338,12 +331,12 @@ Changes in 2.9:
 
 * Texas Instruments c30 (tms320c30) support added.
 
-* The assembler now optimizes the exception frame information generated by egcs
+* The assembler now optimizes the exception frame information generated by egcs 
   and gcc 2.8.  The new --traditional-format option disables this optimization.
 
 * Added --gstabs option to generate stabs debugging information.
 
-* The -a option takes a new suboption, m (e.g., -alm) to expand macros in a
+* The -a option takes a new suboption, m (e.g., -alm) to expand macros in a 
   listing.
 
 * Added -MD option to print dependencies.
@@ -393,7 +386,7 @@ Changes in 2.7:
 
 * SCO ELF support added.  For OpenServer 5 targets (i386-unknown-sco3.2v5) the
   default is to build COFF-only support.  To get a set of tools that generate
-  ELF (they'll understand both COFF and ELF), you must configure with
+  ELF (they'll understand both COFF and ELF), you must configure with 
   target=i386-unknown-sco3.2v5elf.
 
 * m88k-motorola-sysv3* support added.
@@ -424,18 +417,18 @@ Changes in 2.4:
 * Support for the control registers in the 68060.
 
 * Handles (ignores) a new directive ".this_GCC_requires_the_GNU_assembler", to
-  provide for possible future gcc changes, for targets where gas provides some
-  features not available in the native assembler.  If the native assembler is
+  provide for possible future gcc changes, for targets where gas provides some 
+  features not available in the native assembler.  If the native assembler is 
   used, it should become obvious pretty quickly what the problem is.
 
 * Usage message is available with "--help".
 
-* The GNU Assembler Preprocessor (gasp) is included.  (Actually, it was in 2.3
+* The GNU Assembler Preprocessor (gasp) is included.  (Actually, it was in 2.3 
   also, but didn't get into the NEWS file.)
 
 * Weak symbol support for a.out.
 
-* A bug in the listing code which could cause an infinite loop has been fixed.
+* A bug in the listing code which could cause an infinite loop has been fixed. 
   Bugs in listings when generating a COFF object file have also been fixed.
 
 * Initial i386-svr4 PIC implementation from Eric Youngdale, based on code by
@@ -457,7 +450,7 @@ Changes in 2.3:
   again too.
 
 * HP-PA work, by Jeff Law.  Note, for the PA, gas-2.3 has been designed to work
-  with gdb-4.12 and gcc-2.6.  As gcc-2.6 has not been released yet, a special
+  with gdb-4.12 and gcc-2.6.  As gcc-2.6 has not been released yet, a special 
   version of gcc-2.5.8 has been patched to work with gas-2.3.  You can retrieve
   this special version of gcc-2.5.8 via anonymous ftp from jaguar.cs.utah.edu
   in the "dist" directory.
@@ -466,18 +459,18 @@ Changes in 2.3:
   simple tests okay.  I haven't put it through extensive testing.  (GNU make is
   currently required for BSD 4.3 builds.)
 
-* Support for the DEC Alpha, running OSF/1 (ECOFF format).  The gas support is
+* Support for the DEC Alpha, running OSF/1 (ECOFF format).  The gas support is 
   based on code donated by CMU, which used an a.out-based format.  I'm afraid
   the alpha-a.out support is pretty badly mangled, and much of it removed;
   making it work will require rewriting it as BFD support for the format anyways.
 
 * Irix 5 support.
 
-* The test suites have been fixed up a bit, so that they should work with a
+* The test suites have been fixed up a bit, so that they should work with a 
   couple different versions of expect and dejagnu.
 
-* Symbols' values are now handled internally as expressions, permitting more
-  flexibility in evaluating them in some cases.  Some details of relocation
+* Symbols' values are now handled internally as expressions, permitting more 
+  flexibility in evaluating them in some cases.  Some details of relocation 
   handling have also changed, and simple constant pool management has been
   added, to make the Alpha port easier.
 
@@ -490,17 +483,17 @@ Changes in 2.2:
 
 * RS/6000 AIX and MIPS SGI Irix 5 support has been added.
 
-* Configurations that are still in development (and therefore are convenient to
-  have listed in configure.in) still get rejected without a minor change to
+* Configurations that are still in development (and therefore are convenient to 
+  have listed in configure.in) still get rejected without a minor change to 
   gas/Makefile.in, so people not doing development work shouldn't get the
   impression that support for such configurations is actually believed to be
   reliable.
 
-* The program name (usually "as") is printed when a fatal error message is
+* The program name (usually "as") is printed when a fatal error message is 
   displayed.  This should prevent some confusion about the source of occasional
   messages about "internal errors".
 
-* ELF support is falling into place.  Support for the 386 should be working.
+* ELF support is falling into place.  Support for the 386 should be working. 
   Support for SPARC Solaris is in.  HPPA support from Utah is being integrated.
 
 * Symbol values are maintained as expressions instead of being immediately
@@ -509,22 +502,22 @@ Changes in 2.2:
   known.
 
 * DBX-style debugging info ("stabs") is now supported for COFF formats.
-  If any stabs directives are seen in the source, GAS will create two new
-  sections: a ".stab" and a ".stabstr" section.  The format of the .stab
+  If any stabs directives are seen in the source, GAS will create two new 
+  sections: a ".stab" and a ".stabstr" section.  The format of the .stab 
   section is nearly identical to the a.out symbol format, and .stabstr is
   its string table.  For this to be useful, you must have configured GCC
   to generate stabs (by defining DBX_DEBUGGING_INFO), and must have a GDB
   that can use the stab sections (4.11 or later).
 
-* LynxOS, on i386 and m68k platforms, is now supported.  SPARC LynxOS
+* LynxOS, on i386 and m68k platforms, is now supported.  SPARC LynxOS 
   support is in progress.
 
 Changes in 2.1:
 
-* Several small fixes for i386-aix (PS/2) support from Minh Tran-Le have been
+* Several small fixes for i386-aix (PS/2) support from Minh Tran-Le have been 
   incorporated, but not well tested yet.
 
-* Altered the opcode table split for m68k; it should require less VM to compile
+* Altered the opcode table split for m68k; it should require less VM to compile 
   with gcc now.
 
 * Some minor adjustments to add (Convergent Technologies') Miniframe support,
diff --git a/gas/app.c b/gas/app.c
index e5a768716e..3229336068 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -275,7 +275,6 @@ app_push (void)
 
   state = 0;
   saved_input = NULL;
-  add_newlines = 0;
 
   return (char *) saved;
 }
diff --git a/gas/as.c b/gas/as.c
index 1ac3bdb4c3..b99ea1e8be 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -1,7 +1,7 @@
 /* as.c - GAS main program.
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012
+   2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -623,7 +623,7 @@ parse_args (int * pargc, char *** pargv)
 	case OPTION_VERSION:
 	  /* This output is intended to follow the GNU standards document.  */
 	  printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
-	  printf (_("Copyright 2012 Free Software Foundation, Inc.\n"));
+	  printf (_("Copyright 2011 Free Software Foundation, Inc.\n"));
 	  printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
 the GNU General Public License version 3 or later.\n\
@@ -1037,13 +1037,10 @@ static void
 perform_an_assembly_pass (int argc, char ** argv)
 {
   int saw_a_file = 0;
-#ifndef OBJ_MACH_O
   flagword applicable;
-#endif
 
   need_pass_2 = 0;
 
-#ifndef OBJ_MACH_O
   /* Create the standard sections, and those the assembler uses
      internally.  */
   text_section = subseg_new (TEXT_SECTION_NAME, 0);
@@ -1060,15 +1057,12 @@ perform_an_assembly_pass (int argc, char ** argv)
 				       | SEC_DATA));
   bfd_set_section_flags (stdoutput, bss_section, applicable & SEC_ALLOC);
   seg_info (bss_section)->bss = 1;
-#endif
   subseg_new (BFD_ABS_SECTION_NAME, 0);
   subseg_new (BFD_UND_SECTION_NAME, 0);
   reg_section = subseg_new ("*GAS `reg' section*", 0);
   expr_section = subseg_new ("*GAS `expr' section*", 0);
 
-#ifndef OBJ_MACH_O
   subseg_set (text_section, 0);
-#endif
 
   /* This may add symbol table entries, which requires having an open BFD,
      and sections already created.  */
diff --git a/gas/bfin-lex.c b/gas/bfin-lex.c
new file mode 100644
index 0000000000..71cc5d7055
--- /dev/null
+++ b/gas/bfin-lex.c
@@ -0,0 +1,3559 @@
+
+#line 3 "bfin-lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyleng;
+
+extern FILE *yyin, *yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
+
+#define yy_new_buffer yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
+extern char *yytext;
+#define yytext_ptr yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 239
+#define YY_END_OF_BUFFER 240
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[571] =
+    {   0,
+        0,    0,    0,    0,    0,    0,  240,  238,  236,  236,
+      221,  234,  220,  219,  201,  202,  217,  215,  212,  211,
+      204,  233,  233,  203,  222,  200,  196,  238,  225,  234,
+      147,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+      234,  234,  234,  234,   54,  234,  234,  234,   12,   10,
+      190,  189,  188,  186,  184,  234,  234,  234,  234,  234,
+       70,   19,   18,    8,    7,  234,  218,  216,  214,  213,
+        0,  210,  205,    0,    0,    0,  233,  235,    0,  199,
+      197,  223,  195,  194,  179,  176,  234,  234,  234,  149,
+      152,  234,  234,  148,    0,  146,  234,  139,  234,  234,
+
+      135,  234,  125,  234,  123,  234,  234,  234,  234,  234,
+      234,  234,  103,  102,  101,  234,  100,   99,  234,  234,
+       97,  234,   95,   94,   93,   91,  234,   85,  234,  234,
+       77,   86,  234,   71,   69,  234,  234,  234,  234,   65,
+      234,  234,  234,   59,  234,   56,  234,  234,   53,  234,
+      234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+      234,   25,  234,  234,  234,  234,  234,   15,   14,  234,
+      234,  159,  234,  234,  187,  185,  224,  234,  234,   95,
+      234,  234,  234,  206,  208,  207,  209,    0,    0,  233,
+      233,  198,  192,  193,  234,  234,  234,  172,  153,  154,
+
+      234,  234,  163,  164,  234,  155,  157,  233,  234,  234,
+      234,  234,  234,  234,  124,  234,  234,  119,  234,  234,
+      234,  234,  234,  234,  234,  234,  234,  180,   98,  234,
+      234,  234,  234,  234,  234,   80,   83,   78,   81,  234,
+      234,  234,   79,   82,  234,   67,   66,  234,   63,   62,
+      234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+       44,   39,   38,   37,   36,   35,   34,  234,   32,   31,
+      234,  234,  234,  234,  234,  234,  234,   21,  234,  234,
+       16,   13,  234,  234,    9,  234,  234,  234,  234,  234,
+      234,  237,  191,  171,  169,  178,  177,  170,  168,  175,
+
+      174,  234,  234,  234,  234,  234,  156,  158,  145,  234,
+      234,  234,  234,  138,  137,  234,  127,  234,  234,  118,
+      234,  234,  234,  234,  111,  110,  234,  234,  234,  234,
+      234,  234,  234,  105,  104,  234,  234,  234,   96,  234,
+       92,   89,   84,   74,  234,  234,   68,   64,  234,   61,
+       60,   58,   57,  234,   55,   45,  234,   50,   47,   49,
+       46,   48,  234,  234,   43,   42,  234,  234,  234,  234,
+      234,  234,   27,   24,   23,  234,  234,  234,  234,  234,
+      234,  229,  234,  228,  234,  234,  173,  234,  234,  234,
+      161,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+
+      234,  122,  234,  117,  116,  234,  234,  234,  234,  234,
+      234,  234,  234,  108,  234,  234,  234,  234,  234,  234,
+      234,  234,  234,  234,    2,  183,   52,   41,   40,  234,
+       33,  234,  234,  234,   30,  234,   22,  234,  234,  234,
+      234,  232,  234,  234,  234,  234,  234,  234,  165,  162,
+      144,  143,  142,  141,  140,  234,  234,  234,  234,  126,
+      121,  234,  234,  234,  234,  234,   51,  234,  234,  107,
+      234,  234,  234,  234,  234,   88,   87,   90,  234,  234,
+       73,   72,  234,   29,  234,  234,  234,   20,  234,  234,
+      151,  234,  230,  234,  227,  234,  166,  167,  234,  234,
+
+      234,  234,  234,  234,  120,  234,  114,  113,  234,  234,
+      234,    5,  106,  234,  181,  234,  234,  234,  234,  160,
+       28,  234,  234,   17,   11,  234,  234,  150,  234,  234,
+      134,  133,  132,  129,  234,  115,  234,    6,  109,  234,
+      234,    3,  234,   76,    1,   26,  231,  226,  136,  130,
+      131,  234,  234,  234,  234,  234,  128,  234,  234,    4,
+       75,  234,  234,  112,  234,  234,  234,  234,  182,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    1,    5,    6,    7,    8,    1,    9,
+       10,   11,   12,   13,   14,   15,   16,   17,   18,   19,
+       20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
+       30,   31,    1,   32,   33,   34,   35,   36,   37,   38,
+       39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+       49,   50,   51,   52,   53,   54,   55,   56,   57,   58,
+       59,    1,   60,   61,   62,    1,   33,   34,   35,   36,
+
+       37,   38,   39,   40,   41,   42,   43,   44,   45,   46,
+       47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
+       57,   58,    1,   63,    1,   64,    1,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6
+    } ;
+
+static yyconst flex_int32_t yy_meta[65] =
+    {   0,
+        1,    1,    2,    1,    1,    3,    1,    1,    1,    1,
+        1,    1,    1,    1,    4,    1,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    1,    1,    1,    1,
+        1,    1,    6,    7,    6,    6,    6,    7,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    4,    3,    3,    1,    1,
+        1,    3,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[577] =
+    {   0,
+        0,    0,   27,   28,   32,   40,  666,  667,  667,  667,
+      667,    0,  667,  635,  667,  667,  634,   67,  667,   56,
+      652,   67,   72,  667,  667,   44,   63,  631,  667,  114,
+      168,   67,   99,   33,   89,   70,  111,  157,  608,  209,
+      161,   48,   98,  245,  279,  313,  101,  609,   84,  639,
+      667,  667,  628,   90,  667,  152,   77,  616,  606,   75,
+      235,    0,  175,    0,    0,    0,  667,  667,  667,  667,
+      115,  667,  667,  142,  644,    0,   74,  667,    0,  624,
+      667,  667,  667,  131,  638,  637,  120,  152,  610,    0,
+        0,  190,  165,    0,    0,  635,  597,    0,  611,  600,
+
+      594,  601,    0,  603,    0,  586,  607,  602,  592,   96,
+      586,  169,  623,  591,    0,  584,    0,    0,  583,  597,
+      618,  588,    0,    0,  580,    0,  585,  614,  172,  174,
+        0,  581,  161,  205,  612,  570,  579,  577,  151,    0,
+      576,  585,  569,  605,  584,    0,  566,  571,  601,  574,
+      562,  577,  560,  236,  561,  577,  562,  187,  556,  566,
+      567,  590,  547,  562,  551,  550,  547,    0,    0,  551,
+      546,    0,  562,  577,  667,  667,  667,  542,  550,  549,
+      546,  195,  547,  667,  667,  667,  667,  579,  148,    0,
+        0,  667,  667,  559,  193,  195,  538,    0,  525,    0,
+
+      547,  544,    0,    0,  551,  532,  531,    0,  230,  234,
+      527,  530,  542,  534,    0,  531,  532,  271,  528,  541,
+      196,  222,  242,  540,  522,  244,  536,  552,    0,  519,
+      265,  531,  548,  518,  270,    0,    0,    0,    0,  517,
+      512,  522,    0,    0,  273,    0,    0,  514,    0,    0,
+      525,  509,  524,  275,  515,  509,  504,  284,  504,  293,
+      318,    0,    0,    0,    0,    0,    0,  508,    0,    0,
+      503,  501,  501,  512,  503,  283,  502,    0,  512,  494,
+        0,    0,  483,  497,    0,  492,  505,  488,  497,  501,
+      497,  526,  667,    0,    0,    0,    0,    0,    0,    0,
+
+        0,  484,  500,  488,  495,  480,    0,    0,    0,  487,
+      477,  492,  232,    0,  477,  294,  512,  491,  488,  289,
+      479,  490,  471,  477,    0,    0,  487,  486,  462,  464,
+      464,  479,  481,    0,    0,  477,  488,  461,    0,  448,
+        0,  494,    0,  446,  454,  468,    0,    0,  468,    0,
+        0,    0,    0,  469,    0,    0,  466,    0,    0,    0,
+        0,    0,  483,  484,    0,    0,  455,  463,  463,  445,
+      459,  443,  460,    0,    0,  458,  454,  440,  445,  441,
+      448,  425,  435,    0,  448,  438,    0,  436,  338,  430,
+        0,  431,  424,  427,  434,  425,  436,  427,  441,  427,
+
+      416,    0,  420,    0,    0,  422,  425,  427,  428,  413,
+      413,  429,  412,    0,  420,  426,  423,  414,  423,  407,
+      315,  177,  408,  403,    0,    0,    0,    0,    0,  407,
+        0,  413,  419,  400,    0,  409,    0,  410,  411,  414,
+      389,  404,  404,  391,  399,  393,  417,  418,    0,    0,
+        0,    0,    0,    0,    0,  397,  302,  402,  388,    0,
+      416,  390,  381,  380,  385,  379,    0,  381,  391,    0,
+      375,  375,  404,  391,  386,    0,    0,    0,  385,  375,
+        0,    0,  384,    0,  367,  381,  365,    0,  364,  359,
+        0,  368,    0,  378,    0,  355,    0,    0,  373,   86,
+
+      362,  361,  365,  374,    0,  350,    0,    0,  368,  367,
+      351,    0,    0,  356,    0,  335,  330,  339,  341,    0,
+        0,  324,  324,    0,    0,  320,  333,    0,  320,  246,
+        0,    0,    0,    0,  334,    0,  312,    0,    0,  305,
+      309,    0,  314,    0,    0,    0,    0,    0,    0,    0,
+        0,  309,  310,  304,  303,  292,    0,  287,  261,    0,
+        0,  255,  241,    0,  254,  214,  186,  185,    0,  667,
+      378,  382,  389,  179,  392,  395
+    } ;
+
+static yyconst flex_int16_t yy_def[577] =
+    {   0,
+      570,    1,    1,    1,    1,    1,  570,  570,  570,  570,
+      570,  571,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  572,  572,  570,  570,  570,  570,  570,  570,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      570,  570,  570,  570,  570,  571,   38,   40,   44,  571,
+      571,   46,  571,  571,  571,  571,  570,  570,  570,  570,
+      570,  570,  570,  570,  573,  574,   23,  570,  575,  570,
+      570,  570,  570,  570,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  576,  571,  571,  571,  571,  571,
+
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  570,  570,  570,  571,  571,  571,
+      571,  571,  571,  570,  570,  570,  570,  573,  573,  574,
+      575,  570,  570,  570,  571,  571,  571,  571,  571,  571,
+
+      571,  571,  571,  571,  571,  571,  571,  576,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  573,  570,  571,  571,  571,  571,  571,  571,  571,
+
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+      571,  571,  571,  571,  571,  571,  571,  571,  571,    0,
+      570,  570,  570,  570,  570,  570
+    } ;
+
+static yyconst flex_int16_t yy_nxt[732] =
+    {   0,
+        8,    9,   10,   11,    8,   12,   13,   14,   15,   16,
+       17,   18,   19,   20,   12,   21,   22,   23,   23,   23,
+       23,   23,   23,   23,   23,   23,   24,   25,   26,   27,
+       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
+       38,   39,   12,   40,   41,   42,   43,   44,   12,   45,
+       46,   47,   48,   49,   50,   12,   12,   12,   51,   52,
+       53,   12,   54,   55,   56,   56,   82,   57,   57,   72,
+       58,   58,   80,   81,   59,   59,   61,  111,   69,   60,
+       60,   76,   62,   63,   61,   73,  570,   64,  112,   65,
+       62,   63,   83,   95,  139,   64,   70,   65,  140,  102,
+
+       78,  103,   95,   95,   78,   78,  115,  570,  530,   78,
+      104,  570,  179,  105,  180,   95,  116,  106,   74,  176,
+      183,  117,   79,  107,  171,  170,  184,  570,  185,   71,
+       85,   86,  108,  531,  172,  109,  113,  166,  167,  110,
+      168,  114,  141,  142,  169,  173,  220,   87,   88,  221,
+      143,  118,  177,  186,  119,  187,   95,   89,  189,   90,
+      193,  194,   91,  292,   92,  120,  197,   93,  199,  200,
+      198,   94,   95,  121,  121,  121,  121,  135,  135,  135,
+      135,  206,  207,  190,   96,   96,   96,   96,  236,  237,
+      238,  239,  122,  136,  123,  178,  124,  241,  249,  113,
+
+      242,  137,  250,  223,  114,  569,  138,  125,   97,  126,
+      479,  166,  167,  480,  168,   98,  224,   99,  169,  271,
+      225,  243,  244,  100,  101,  128,  128,  128,  128,  202,
+      568,  290,  294,  203,  298,  272,  295,  567,  299,  204,
+      257,  205,  129,  130,  325,  131,  326,  296,  297,  300,
+      301,  135,  135,  135,  135,  132,  327,  328,  329,  133,
+      134,  144,  144,  144,  144,  144,  144,  136,  310,  309,
+      395,  566,  263,  309,  330,  137,  264,  145,  311,  146,
+      138,  265,  396,  334,  312,  313,  266,  335,  147,  331,
+      550,  267,  565,  551,  148,  149,  149,  149,  149,  149,
+
+      149,  149,  149,  320,  339,  321,  564,  563,  339,  343,
+      322,  150,  347,  343,  352,  151,  347,  356,  352,  500,
+      501,  502,  374,  356,  152,  153,  375,  356,  404,  358,
+      154,  155,  405,  359,  562,  363,  364,  561,  360,  560,
+      398,  399,  559,  361,  558,  156,  400,  157,  362,  158,
+      159,  557,  160,  161,  556,  447,  448,  365,  476,  555,
+      162,  366,  449,  163,  164,  477,  554,  553,  552,  165,
+      478,  549,  548,  547,  546,  545,  544,  543,  542,  367,
+       66,   66,   66,   66,   66,   77,   77,  541,   77,  188,
+      540,  188,  188,  188,  188,  188,  191,  191,  191,  208,
+
+      208,  208,  539,  538,  537,  536,  535,  534,  533,  532,
+      529,  528,  527,  526,  525,  524,  523,  522,  521,  520,
+      519,  518,  517,  516,  515,  514,  513,  512,  511,  510,
+      509,  508,  507,  506,  505,  504,  503,  499,  498,  497,
+      496,  495,  494,  493,  492,  491,  490,  489,  488,  487,
+      486,  485,  484,  483,  482,  481,  475,  474,  473,  472,
+      471,  470,  469,  468,  467,  466,  465,  464,  463,  462,
+      461,  460,  459,  458,  457,  456,  455,  454,  453,  452,
+      451,  450,  446,  445,  444,  443,  420,  442,  441,  440,
+      439,  438,  437,  436,  435,  434,  433,  432,  431,  430,
+
+      429,  428,  427,  426,  425,  424,  423,  422,  421,  420,
+      419,  418,  417,  416,  415,  414,  413,  412,  411,  410,
+      409,  408,  407,  406,  403,  402,  401,  397,  394,  393,
+      392,  391,  390,  389,  388,  387,  189,  386,  385,  384,
+      383,  382,  381,  380,  379,  378,  377,  376,  373,  372,
+      371,  370,  369,  368,  357,  355,  354,  353,  351,  350,
+      349,  348,  346,  345,  344,  342,  341,  340,  338,  337,
+      336,  333,  332,  324,  323,  319,  318,  317,  316,  315,
+      314,  308,  307,  306,  305,  304,  303,  302,  293,  189,
+      291,  289,  288,  287,  286,  285,  284,  283,  282,  281,
+
+      280,  279,  278,  277,  276,  275,  274,  273,  270,  269,
+      268,  262,  261,  260,  259,  258,  257,  256,  255,  254,
+      253,  252,  251,  248,  247,  246,  245,  240,  235,  234,
+      233,  232,  231,  230,  229,  228,  227,  226,  222,  219,
+      218,  217,  216,  215,  214,  213,  212,  211,  210,  209,
+      201,  196,  195,  192,  189,  182,  181,  175,  174,  170,
+      127,   84,   75,   68,   67,  570,    7,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570
+    } ;
+
+static yyconst flex_int16_t yy_chk[732] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    3,    4,   27,    3,    4,   20,
+        3,    4,   26,   26,    3,    4,    5,   34,   18,    3,
+        4,   22,    5,    5,    6,   20,   23,    5,   34,    5,
+        6,    6,   27,   35,   42,    6,   18,    6,   42,   32,
+
+       22,   32,   43,   33,   22,   23,   36,   77,  500,   23,
+       32,   77,   57,   32,   57,   37,   36,   32,   20,   54,
+       60,   36,   22,   32,   49,   60,   71,   23,   71,   18,
+       30,   30,   33,  500,   49,   33,   35,   47,   47,   33,
+       47,   35,   43,   43,   47,   49,  110,   30,   30,  110,
+       43,   37,   54,   74,   37,   74,   56,   30,  189,   30,
+       84,   84,   30,  189,   30,   37,   87,   30,   88,   88,
+       87,   30,   31,   38,   38,   38,   38,   41,   41,   41,
+       41,   93,   93,  574,   31,   31,   31,   31,  129,  129,
+      130,  130,   38,   41,   38,   56,   38,  133,  139,   56,
+
+      133,   41,  139,  112,   56,  568,   41,   38,   31,   38,
+      422,   63,   63,  422,   63,   31,  112,   31,   63,  158,
+      112,  134,  134,   31,   31,   40,   40,   40,   40,   92,
+      567,  182,  195,   92,  196,  158,  195,  566,  196,   92,
+      182,   92,   40,   40,  221,   40,  221,  195,  195,  196,
+      196,   61,   61,   61,   61,   40,  222,  222,  222,   40,
+       40,   44,   44,   44,   44,   44,   44,   61,  210,  209,
+      313,  565,  154,  209,  223,   61,  154,   44,  210,   44,
+       61,  154,  313,  226,  210,  210,  154,  226,   44,  223,
+      530,  154,  563,  530,   44,   45,   45,   45,   45,   45,
+
+       45,   45,   45,  218,  231,  218,  562,  559,  231,  235,
+      218,   45,  245,  235,  254,   45,  245,  258,  254,  457,
+      457,  457,  276,  258,   45,   45,  276,  258,  320,  260,
+       45,   46,  320,  260,  558,  261,  261,  556,  260,  555,
+      316,  316,  554,  260,  553,   46,  316,   46,  260,   46,
+       46,  552,   46,   46,  543,  389,  389,  261,  421,  541,
+       46,  261,  389,   46,   46,  421,  540,  537,  535,   46,
+      421,  529,  527,  526,  523,  522,  519,  518,  517,  261,
+      571,  571,  571,  571,  571,  572,  572,  516,  572,  573,
+      514,  573,  573,  573,  573,  573,  575,  575,  575,  576,
+
+      576,  576,  511,  510,  509,  506,  504,  503,  502,  501,
+      499,  496,  494,  492,  490,  489,  487,  486,  485,  483,
+      480,  479,  475,  474,  473,  472,  471,  469,  468,  466,
+      465,  464,  463,  462,  461,  459,  458,  456,  448,  447,
+      446,  445,  444,  443,  442,  441,  440,  439,  438,  436,
+      434,  433,  432,  430,  424,  423,  420,  419,  418,  417,
+      416,  415,  413,  412,  411,  410,  409,  408,  407,  406,
+      403,  401,  400,  399,  398,  397,  396,  395,  394,  393,
+      392,  390,  388,  386,  385,  383,  382,  381,  380,  379,
+      378,  377,  376,  373,  372,  371,  370,  369,  368,  367,
+
+      364,  363,  357,  354,  349,  346,  345,  344,  342,  340,
+      338,  337,  336,  333,  332,  331,  330,  329,  328,  327,
+      324,  323,  322,  321,  319,  318,  317,  315,  312,  311,
+      310,  306,  305,  304,  303,  302,  292,  291,  290,  289,
+      288,  287,  286,  284,  283,  280,  279,  277,  275,  274,
+      273,  272,  271,  268,  259,  257,  256,  255,  253,  252,
+      251,  248,  242,  241,  240,  234,  233,  232,  230,  228,
+      227,  225,  224,  220,  219,  217,  216,  214,  213,  212,
+      211,  207,  206,  205,  202,  201,  199,  197,  194,  188,
+      183,  181,  180,  179,  178,  174,  173,  171,  170,  167,
+
+      166,  165,  164,  163,  162,  161,  160,  159,  157,  156,
+      155,  153,  152,  151,  150,  149,  148,  147,  145,  144,
+      143,  142,  141,  138,  137,  136,  135,  132,  128,  127,
+      125,  122,  121,  120,  119,  116,  114,  113,  111,  109,
+      108,  107,  106,  104,  102,  101,  100,   99,   97,   96,
+       89,   86,   85,   80,   75,   59,   58,   53,   50,   48,
+       39,   28,   21,   17,   14,    7,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+#line 1 "bfin-lex.l"
+/* bfin-lex.l  ADI Blackfin lexer
+   Copyright 2005, 2006, 2007, 2008, 2010
+   Free Software Foundation, Inc.
+
+   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 3, 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, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+#line 22 "bfin-lex.l"
+
+#include "as.h"
+#include "bfin-defs.h"
+#include "bfin-parse.h"
+
+static long parse_int (char **end);
+static int parse_halfreg (Register *r, int cl, char *hr);
+static int parse_reg (Register *r, int type, char *rt);
+int yylex (void);
+
+#define _REG yylval.reg
+
+
+/* Define Start States ... Actually we will use exclusion.
+   If no start state is specified it should match any state
+   and <INITIAL> would match some keyword rules only with
+   initial.  */
+
+
+#line 840 "bfin-lex.c"
+
+#define INITIAL 0
+#define KEYWORD 1
+#define FLAGS 2
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+yy_size_t yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (void );
+#else
+extern int yywrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 44 "bfin-lex.l"
+
+#line 1026 "bfin-lex.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
+
+		yy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 571 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 667 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 45 "bfin-lex.l"
+_REG.regno = REG_sftreset;  return REG;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 46 "bfin-lex.l"
+_REG.regno = REG_omode;     return REG;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 47 "bfin-lex.l"
+_REG.regno = REG_idle_req;  return REG;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 48 "bfin-lex.l"
+_REG.regno = REG_hwerrcause; return REG;
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 49 "bfin-lex.l"
+_REG.regno = REG_excause;   return REG;
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 50 "bfin-lex.l"
+_REG.regno = REG_emucause;  return REG;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 51 "bfin-lex.l"
+return Z;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 52 "bfin-lex.l"
+return X;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 53 "bfin-lex.l"
+yylval.value = M_W32; return MMOD;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 54 "bfin-lex.l"
+return W;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 55 "bfin-lex.l"
+return VIT_MAX;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 56 "bfin-lex.l"
+return V; /* Special: V is a statflag and a modifier.  */
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 57 "bfin-lex.l"
+_REG.regno = REG_USP; return REG;
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 58 "bfin-lex.l"
+return TL;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 59 "bfin-lex.l"
+return TH;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 60 "bfin-lex.l"
+yylval.value = M_TFU; return MMOD;
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 61 "bfin-lex.l"
+return TESTSET;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 62 "bfin-lex.l"
+yylval.value = M_T; return MMOD;
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 63 "bfin-lex.l"
+return S;
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 64 "bfin-lex.l"
+_REG.regno = REG_SYSCFG; return REG;
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 65 "bfin-lex.l"
+return STI;
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 66 "bfin-lex.l"
+return SSYNC;
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 67 "bfin-lex.l"
+_REG.regno = REG_SP; _REG.flags = F_REG_LOW; return HALF_REG;
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 68 "bfin-lex.l"
+_REG.regno = REG_SP; _REG.flags = F_REG_HIGH; return HALF_REG;
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 69 "bfin-lex.l"
+_REG.regno = REG_SP; return REG;
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 70 "bfin-lex.l"
+return SIGNBITS;
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 71 "bfin-lex.l"
+return SIGN;
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 72 "bfin-lex.l"
+_REG.regno = REG_SEQSTAT; return REG;
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 73 "bfin-lex.l"
+return SEARCH;
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 74 "bfin-lex.l"
+return SHIFT;
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 75 "bfin-lex.l"
+return SCO;
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 77 "bfin-lex.l"
+return SAA;
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 78 "bfin-lex.l"
+yylval.value = M_S2RND; return MMOD;
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+#line 79 "bfin-lex.l"
+return RTX;
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 80 "bfin-lex.l"
+return RTS;
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 81 "bfin-lex.l"
+return RTN;
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 82 "bfin-lex.l"
+return RTI;
+	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 83 "bfin-lex.l"
+return RTE;
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 84 "bfin-lex.l"
+return ROT;
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 85 "bfin-lex.l"
+return RND20;
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 86 "bfin-lex.l"
+return RND12;
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+#line 87 "bfin-lex.l"
+return RNDL;
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 88 "bfin-lex.l"
+return RNDH;
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 89 "bfin-lex.l"
+return RND;
+	YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 91 "bfin-lex.l"
+return parse_halfreg(&yylval.reg, T_REG_R, yytext);
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 93 "bfin-lex.l"
+_REG.regno = REG_RETS; return REG;
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 94 "bfin-lex.l"
+_REG.regno = REG_RETI; return REG;
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 95 "bfin-lex.l"
+_REG.regno = REG_RETX; return REG;
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 96 "bfin-lex.l"
+_REG.regno = REG_RETN; return REG;
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 97 "bfin-lex.l"
+_REG.regno = REG_RETE; return REG;
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 98 "bfin-lex.l"
+_REG.regno = REG_EMUDAT; return REG;
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 99 "bfin-lex.l"
+return RAISE;
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 101 "bfin-lex.l"
+return parse_reg (&yylval.reg, T_REG_R, yytext);
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 103 "bfin-lex.l"
+return R;
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 104 "bfin-lex.l"
+return PRNT;
+	YY_BREAK
+case 56:
+YY_RULE_SETUP
+#line 105 "bfin-lex.l"
+return PC;
+	YY_BREAK
+case 57:
+YY_RULE_SETUP
+#line 106 "bfin-lex.l"
+return PACK;
+	YY_BREAK
+case 58:
+YY_RULE_SETUP
+#line 108 "bfin-lex.l"
+return parse_halfreg (&yylval.reg, T_REG_P, yytext);
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 109 "bfin-lex.l"
+return parse_reg (&yylval.reg, T_REG_P, yytext);
+	YY_BREAK
+case 60:
+YY_RULE_SETUP
+#line 111 "bfin-lex.l"
+return OUTC;
+	YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 112 "bfin-lex.l"
+return ONES;
+	YY_BREAK
+case 62:
+YY_RULE_SETUP
+#line 114 "bfin-lex.l"
+return NOT;
+	YY_BREAK
+case 63:
+YY_RULE_SETUP
+#line 115 "bfin-lex.l"
+return NOP;
+	YY_BREAK
+case 64:
+YY_RULE_SETUP
+#line 116 "bfin-lex.l"
+return MNOP;
+	YY_BREAK
+case 65:
+YY_RULE_SETUP
+#line 117 "bfin-lex.l"
+return NS;
+	YY_BREAK
+case 66:
+YY_RULE_SETUP
+#line 120 "bfin-lex.l"
+return MIN;
+	YY_BREAK
+case 67:
+YY_RULE_SETUP
+#line 121 "bfin-lex.l"
+return MAX;
+	YY_BREAK
+case 68:
+YY_RULE_SETUP
+#line 123 "bfin-lex.l"
+return parse_halfreg (&yylval.reg, T_REG_M, yytext);
+	YY_BREAK
+case 69:
+YY_RULE_SETUP
+#line 124 "bfin-lex.l"
+return parse_reg (&yylval.reg, T_REG_M, yytext);
+	YY_BREAK
+case 70:
+YY_RULE_SETUP
+#line 126 "bfin-lex.l"
+return M;
+	YY_BREAK
+case 71:
+YY_RULE_SETUP
+#line 127 "bfin-lex.l"
+return LT;
+	YY_BREAK
+case 72:
+YY_RULE_SETUP
+#line 128 "bfin-lex.l"
+return LSHIFT;
+	YY_BREAK
+case 73:
+YY_RULE_SETUP
+#line 129 "bfin-lex.l"
+return LSETUP;
+	YY_BREAK
+case 74:
+YY_RULE_SETUP
+#line 130 "bfin-lex.l"
+return LOOP;
+	YY_BREAK
+case 75:
+YY_RULE_SETUP
+#line 131 "bfin-lex.l"
+return LOOP_BEGIN;
+	YY_BREAK
+case 76:
+YY_RULE_SETUP
+#line 132 "bfin-lex.l"
+return LOOP_END;
+	YY_BREAK
+case 77:
+YY_RULE_SETUP
+#line 134 "bfin-lex.l"
+return LE;
+	YY_BREAK
+case 78:
+YY_RULE_SETUP
+#line 135 "bfin-lex.l"
+_REG.regno = REG_LC0; return REG;
+	YY_BREAK
+case 79:
+YY_RULE_SETUP
+#line 136 "bfin-lex.l"
+_REG.regno = REG_LT0; return REG;
+	YY_BREAK
+case 80:
+YY_RULE_SETUP
+#line 137 "bfin-lex.l"
+_REG.regno = REG_LB0; return REG;
+	YY_BREAK
+case 81:
+YY_RULE_SETUP
+#line 138 "bfin-lex.l"
+_REG.regno = REG_LC1; return REG;
+	YY_BREAK
+case 82:
+YY_RULE_SETUP
+#line 139 "bfin-lex.l"
+_REG.regno = REG_LT1; return REG;
+	YY_BREAK
+case 83:
+YY_RULE_SETUP
+#line 140 "bfin-lex.l"
+_REG.regno = REG_LB1; return REG;
+	YY_BREAK
+case 84:
+YY_RULE_SETUP
+#line 142 "bfin-lex.l"
+return parse_halfreg (&yylval.reg, T_REG_L, yytext);
+	YY_BREAK
+case 85:
+YY_RULE_SETUP
+#line 143 "bfin-lex.l"
+return parse_reg (&yylval.reg, T_REG_L, yytext);
+	YY_BREAK
+case 86:
+YY_RULE_SETUP
+#line 144 "bfin-lex.l"
+return LO;
+	YY_BREAK
+case 87:
+YY_RULE_SETUP
+#line 145 "bfin-lex.l"
+{ BEGIN 0; return JUMP_DOT_S;}
+	YY_BREAK
+case 88:
+YY_RULE_SETUP
+#line 146 "bfin-lex.l"
+{ BEGIN 0; return JUMP_DOT_L;}
+	YY_BREAK
+case 89:
+YY_RULE_SETUP
+#line 147 "bfin-lex.l"
+{ BEGIN 0; return JUMP;}
+	YY_BREAK
+case 90:
+YY_RULE_SETUP
+#line 148 "bfin-lex.l"
+{ BEGIN 0; return JUMP_DOT_L; }
+	YY_BREAK
+case 91:
+YY_RULE_SETUP
+#line 149 "bfin-lex.l"
+yylval.value = M_IU;   return MMOD;
+	YY_BREAK
+case 92:
+YY_RULE_SETUP
+#line 150 "bfin-lex.l"
+yylval.value = M_ISS2; return MMOD;
+	YY_BREAK
+case 93:
+YY_RULE_SETUP
+#line 151 "bfin-lex.l"
+yylval.value = M_IS;   return MMOD;
+	YY_BREAK
+case 94:
+YY_RULE_SETUP
+#line 152 "bfin-lex.l"
+yylval.value = M_IH;   return MMOD;
+	YY_BREAK
+case 95:
+YY_RULE_SETUP
+#line 153 "bfin-lex.l"
+return IF;
+	YY_BREAK
+case 96:
+YY_RULE_SETUP
+#line 154 "bfin-lex.l"
+return parse_halfreg (&yylval.reg, T_REG_I, yytext);
+	YY_BREAK
+case 97:
+YY_RULE_SETUP
+#line 155 "bfin-lex.l"
+return parse_reg (&yylval.reg, T_REG_I, yytext);
+	YY_BREAK
+case 98:
+YY_RULE_SETUP
+#line 156 "bfin-lex.l"
+return HLT;
+	YY_BREAK
+case 99:
+YY_RULE_SETUP
+#line 157 "bfin-lex.l"
+return HI;
+	YY_BREAK
+case 100:
+YY_RULE_SETUP
+#line 158 "bfin-lex.l"
+return GT;
+	YY_BREAK
+case 101:
+YY_RULE_SETUP
+#line 159 "bfin-lex.l"
+return GE;
+	YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 160 "bfin-lex.l"
+yylval.value = M_FU; return MMOD;
+	YY_BREAK
+case 103:
+YY_RULE_SETUP
+#line 161 "bfin-lex.l"
+_REG.regno = REG_FP; return REG;
+	YY_BREAK
+case 104:
+YY_RULE_SETUP
+#line 162 "bfin-lex.l"
+_REG.regno = REG_FP; _REG.flags = F_REG_LOW; return HALF_REG;
+	YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 163 "bfin-lex.l"
+_REG.regno = REG_FP; _REG.flags = F_REG_HIGH; return HALF_REG;
+	YY_BREAK
+case 106:
+YY_RULE_SETUP
+#line 165 "bfin-lex.l"
+return EXTRACT;
+	YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 166 "bfin-lex.l"
+return EXPADJ;
+	YY_BREAK
+case 108:
+YY_RULE_SETUP
+#line 167 "bfin-lex.l"
+return EXCPT;
+	YY_BREAK
+case 109:
+YY_RULE_SETUP
+#line 168 "bfin-lex.l"
+return EMUEXCPT;
+	YY_BREAK
+case 110:
+YY_RULE_SETUP
+#line 169 "bfin-lex.l"
+return DIVS;
+	YY_BREAK
+case 111:
+YY_RULE_SETUP
+#line 170 "bfin-lex.l"
+return DIVQ;
+	YY_BREAK
+case 112:
+YY_RULE_SETUP
+#line 171 "bfin-lex.l"
+return DISALGNEXCPT;
+	YY_BREAK
+case 113:
+YY_RULE_SETUP
+#line 172 "bfin-lex.l"
+return DEPOSIT;
+	YY_BREAK
+case 114:
+YY_RULE_SETUP
+#line 173 "bfin-lex.l"
+return DBGHALT;
+	YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 174 "bfin-lex.l"
+return DBGCMPLX;
+	YY_BREAK
+case 116:
+YY_RULE_SETUP
+#line 175 "bfin-lex.l"
+return DBGAL;
+	YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 176 "bfin-lex.l"
+return DBGAH;
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 177 "bfin-lex.l"
+return DBGA;
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 178 "bfin-lex.l"
+return DBG;
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 179 "bfin-lex.l"
+{ _REG.regno = REG_CYCLES2; return REG; }
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 180 "bfin-lex.l"
+{ _REG.regno = REG_CYCLES; return REG; }
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 181 "bfin-lex.l"
+return CSYNC;
+	YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 182 "bfin-lex.l"
+return CO;
+	YY_BREAK
+case 124:
+YY_RULE_SETUP
+#line 183 "bfin-lex.l"
+return CLI;
+	YY_BREAK
+case 125:
+YY_RULE_SETUP
+#line 185 "bfin-lex.l"
+_REG.regno = REG_CC; return CCREG;
+	YY_BREAK
+case 126:
+YY_RULE_SETUP
+#line 186 "bfin-lex.l"
+{ BEGIN 0; return CALL;}
+	YY_BREAK
+case 127:
+YY_RULE_SETUP
+#line 187 "bfin-lex.l"
+{ BEGIN 0; return CALL;}
+	YY_BREAK
+case 128:
+YY_RULE_SETUP
+#line 188 "bfin-lex.l"
+return BYTEUNPACK;
+	YY_BREAK
+case 129:
+YY_RULE_SETUP
+#line 189 "bfin-lex.l"
+return BYTEPACK;
+	YY_BREAK
+case 130:
+YY_RULE_SETUP
+#line 190 "bfin-lex.l"
+return BYTEOP16M;
+	YY_BREAK
+case 131:
+YY_RULE_SETUP
+#line 191 "bfin-lex.l"
+return BYTEOP16P;
+	YY_BREAK
+case 132:
+YY_RULE_SETUP
+#line 192 "bfin-lex.l"
+return BYTEOP3P;
+	YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 193 "bfin-lex.l"
+return BYTEOP2P;
+	YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 194 "bfin-lex.l"
+return BYTEOP1P;
+	YY_BREAK
+case 135:
+YY_RULE_SETUP
+#line 195 "bfin-lex.l"
+return BY;
+	YY_BREAK
+case 136:
+YY_RULE_SETUP
+#line 196 "bfin-lex.l"
+return BXORSHIFT;
+	YY_BREAK
+case 137:
+YY_RULE_SETUP
+#line 197 "bfin-lex.l"
+return BXOR;
+	YY_BREAK
+case 138:
+YY_RULE_SETUP
+#line 199 "bfin-lex.l"
+return BREV;
+	YY_BREAK
+case 139:
+YY_RULE_SETUP
+#line 200 "bfin-lex.l"
+return BP;
+	YY_BREAK
+case 140:
+YY_RULE_SETUP
+#line 201 "bfin-lex.l"
+return BITTST;
+	YY_BREAK
+case 141:
+YY_RULE_SETUP
+#line 202 "bfin-lex.l"
+return BITTGL;
+	YY_BREAK
+case 142:
+YY_RULE_SETUP
+#line 203 "bfin-lex.l"
+return BITSET;
+	YY_BREAK
+case 143:
+YY_RULE_SETUP
+#line 204 "bfin-lex.l"
+return BITMUX;
+	YY_BREAK
+case 144:
+YY_RULE_SETUP
+#line 205 "bfin-lex.l"
+return BITCLR;
+	YY_BREAK
+case 145:
+YY_RULE_SETUP
+#line 206 "bfin-lex.l"
+return parse_halfreg (&yylval.reg, T_REG_B, yytext);
+	YY_BREAK
+case 146:
+YY_RULE_SETUP
+#line 207 "bfin-lex.l"
+return parse_reg (&yylval.reg, T_REG_B, yytext);
+	YY_BREAK
+case 147:
+YY_RULE_SETUP
+#line 208 "bfin-lex.l"
+return B;
+	YY_BREAK
+case 148:
+YY_RULE_SETUP
+#line 209 "bfin-lex.l"
+_REG.regno = S_AZ;   return STATUS_REG;
+	YY_BREAK
+case 149:
+YY_RULE_SETUP
+#line 210 "bfin-lex.l"
+_REG.regno = S_AN;   return STATUS_REG;
+	YY_BREAK
+case 150:
+YY_RULE_SETUP
+#line 211 "bfin-lex.l"
+_REG.regno = S_AC0_COPY; return STATUS_REG;
+	YY_BREAK
+case 151:
+YY_RULE_SETUP
+#line 212 "bfin-lex.l"
+_REG.regno = S_V_COPY;   return STATUS_REG;
+	YY_BREAK
+case 152:
+YY_RULE_SETUP
+#line 213 "bfin-lex.l"
+_REG.regno = S_AQ;   return STATUS_REG;
+	YY_BREAK
+case 153:
+YY_RULE_SETUP
+#line 214 "bfin-lex.l"
+_REG.regno = S_AC0;  return STATUS_REG;
+	YY_BREAK
+case 154:
+YY_RULE_SETUP
+#line 215 "bfin-lex.l"
+_REG.regno = S_AC1;  return STATUS_REG;
+	YY_BREAK
+case 155:
+YY_RULE_SETUP
+#line 216 "bfin-lex.l"
+_REG.regno = S_AV0;  return STATUS_REG;
+	YY_BREAK
+case 156:
+YY_RULE_SETUP
+#line 217 "bfin-lex.l"
+_REG.regno = S_AV0S; return STATUS_REG;
+	YY_BREAK
+case 157:
+YY_RULE_SETUP
+#line 218 "bfin-lex.l"
+_REG.regno = S_AV1;  return STATUS_REG;
+	YY_BREAK
+case 158:
+YY_RULE_SETUP
+#line 219 "bfin-lex.l"
+_REG.regno = S_AV1S; return STATUS_REG;
+	YY_BREAK
+case 159:
+YY_RULE_SETUP
+#line 220 "bfin-lex.l"
+_REG.regno = S_VS;   return STATUS_REG;
+	YY_BREAK
+case 160:
+YY_RULE_SETUP
+#line 221 "bfin-lex.l"
+_REG.regno = S_RND_MOD; return STATUS_REG;
+	YY_BREAK
+case 161:
+YY_RULE_SETUP
+#line 224 "bfin-lex.l"
+_REG.regno = REG_ASTAT; return REG;
+	YY_BREAK
+case 162:
+YY_RULE_SETUP
+#line 225 "bfin-lex.l"
+return ASHIFT;
+	YY_BREAK
+case 163:
+YY_RULE_SETUP
+#line 226 "bfin-lex.l"
+return ASL;
+	YY_BREAK
+case 164:
+YY_RULE_SETUP
+#line 227 "bfin-lex.l"
+return ASR;
+	YY_BREAK
+case 165:
+YY_RULE_SETUP
+#line 228 "bfin-lex.l"
+return ALIGN8;
+	YY_BREAK
+case 166:
+YY_RULE_SETUP
+#line 229 "bfin-lex.l"
+return ALIGN16;
+	YY_BREAK
+case 167:
+YY_RULE_SETUP
+#line 230 "bfin-lex.l"
+return ALIGN24;
+	YY_BREAK
+case 168:
+YY_RULE_SETUP
+#line 231 "bfin-lex.l"
+return A_ONE_DOT_L;
+	YY_BREAK
+case 169:
+YY_RULE_SETUP
+#line 232 "bfin-lex.l"
+return A_ZERO_DOT_L;
+	YY_BREAK
+case 170:
+YY_RULE_SETUP
+#line 233 "bfin-lex.l"
+return A_ONE_DOT_H;
+	YY_BREAK
+case 171:
+YY_RULE_SETUP
+#line 234 "bfin-lex.l"
+return A_ZERO_DOT_H;
+	YY_BREAK
+case 172:
+YY_RULE_SETUP
+#line 235 "bfin-lex.l"
+return ABS;
+	YY_BREAK
+case 173:
+YY_RULE_SETUP
+#line 236 "bfin-lex.l"
+return ABORT;
+	YY_BREAK
+case 174:
+YY_RULE_SETUP
+#line 237 "bfin-lex.l"
+_REG.regno = REG_A1x; return REG;
+	YY_BREAK
+case 175:
+YY_RULE_SETUP
+#line 238 "bfin-lex.l"
+_REG.regno = REG_A1w; return REG;
+	YY_BREAK
+case 176:
+YY_RULE_SETUP
+#line 239 "bfin-lex.l"
+_REG.regno = REG_A1;  return REG_A_DOUBLE_ONE;
+	YY_BREAK
+case 177:
+YY_RULE_SETUP
+#line 240 "bfin-lex.l"
+_REG.regno = REG_A0x; return REG;
+	YY_BREAK
+case 178:
+YY_RULE_SETUP
+#line 241 "bfin-lex.l"
+_REG.regno = REG_A0w; return REG;
+	YY_BREAK
+case 179:
+YY_RULE_SETUP
+#line 242 "bfin-lex.l"
+_REG.regno = REG_A0;  return REG_A_DOUBLE_ZERO;
+	YY_BREAK
+case 180:
+YY_RULE_SETUP
+#line 243 "bfin-lex.l"
+return GOT;
+	YY_BREAK
+case 181:
+YY_RULE_SETUP
+#line 244 "bfin-lex.l"
+return GOT17M4;
+	YY_BREAK
+case 182:
+YY_RULE_SETUP
+#line 245 "bfin-lex.l"
+return FUNCDESC_GOT17M4;
+	YY_BREAK
+case 183:
+YY_RULE_SETUP
+#line 246 "bfin-lex.l"
+return PLTPC;
+	YY_BREAK
+case 184:
+YY_RULE_SETUP
+#line 249 "bfin-lex.l"
+return TILDA;
+	YY_BREAK
+case 185:
+YY_RULE_SETUP
+#line 250 "bfin-lex.l"
+return _BAR_ASSIGN;
+	YY_BREAK
+case 186:
+YY_RULE_SETUP
+#line 251 "bfin-lex.l"
+return BAR;
+	YY_BREAK
+case 187:
+YY_RULE_SETUP
+#line 252 "bfin-lex.l"
+return _CARET_ASSIGN;
+	YY_BREAK
+case 188:
+YY_RULE_SETUP
+#line 253 "bfin-lex.l"
+return CARET;
+	YY_BREAK
+case 189:
+YY_RULE_SETUP
+#line 254 "bfin-lex.l"
+return RBRACK;
+	YY_BREAK
+case 190:
+YY_RULE_SETUP
+#line 255 "bfin-lex.l"
+return LBRACK;
+	YY_BREAK
+case 191:
+YY_RULE_SETUP
+#line 256 "bfin-lex.l"
+return _GREATER_GREATER_GREATER_THAN_ASSIGN;
+	YY_BREAK
+case 192:
+YY_RULE_SETUP
+#line 257 "bfin-lex.l"
+return _GREATER_GREATER_ASSIGN;
+	YY_BREAK
+case 193:
+YY_RULE_SETUP
+#line 258 "bfin-lex.l"
+return _GREATER_GREATER_GREATER;
+	YY_BREAK
+case 194:
+YY_RULE_SETUP
+#line 259 "bfin-lex.l"
+return GREATER_GREATER;
+	YY_BREAK
+case 195:
+YY_RULE_SETUP
+#line 260 "bfin-lex.l"
+return _ASSIGN_ASSIGN;
+	YY_BREAK
+case 196:
+YY_RULE_SETUP
+#line 261 "bfin-lex.l"
+return ASSIGN;
+	YY_BREAK
+case 197:
+YY_RULE_SETUP
+#line 262 "bfin-lex.l"
+return _LESS_THAN_ASSIGN;
+	YY_BREAK
+case 198:
+YY_RULE_SETUP
+#line 263 "bfin-lex.l"
+return _LESS_LESS_ASSIGN;
+	YY_BREAK
+case 199:
+YY_RULE_SETUP
+#line 264 "bfin-lex.l"
+return LESS_LESS;
+	YY_BREAK
+case 200:
+YY_RULE_SETUP
+#line 265 "bfin-lex.l"
+return LESS_THAN;
+	YY_BREAK
+case 201:
+YY_RULE_SETUP
+#line 266 "bfin-lex.l"
+BEGIN(FLAGS); return LPAREN;
+	YY_BREAK
+case 202:
+YY_RULE_SETUP
+#line 267 "bfin-lex.l"
+BEGIN(INITIAL); return RPAREN;
+	YY_BREAK
+case 203:
+YY_RULE_SETUP
+#line 268 "bfin-lex.l"
+return COLON;
+	YY_BREAK
+case 204:
+YY_RULE_SETUP
+#line 269 "bfin-lex.l"
+return SLASH;
+	YY_BREAK
+case 205:
+YY_RULE_SETUP
+#line 270 "bfin-lex.l"
+return _MINUS_ASSIGN;
+	YY_BREAK
+case 206:
+YY_RULE_SETUP
+#line 271 "bfin-lex.l"
+return _PLUS_BAR_PLUS;
+	YY_BREAK
+case 207:
+YY_RULE_SETUP
+#line 272 "bfin-lex.l"
+return _MINUS_BAR_PLUS;
+	YY_BREAK
+case 208:
+YY_RULE_SETUP
+#line 273 "bfin-lex.l"
+return _PLUS_BAR_MINUS;
+	YY_BREAK
+case 209:
+YY_RULE_SETUP
+#line 274 "bfin-lex.l"
+return _MINUS_BAR_MINUS;
+	YY_BREAK
+case 210:
+YY_RULE_SETUP
+#line 275 "bfin-lex.l"
+return _MINUS_MINUS;
+	YY_BREAK
+case 211:
+YY_RULE_SETUP
+#line 276 "bfin-lex.l"
+return MINUS;
+	YY_BREAK
+case 212:
+YY_RULE_SETUP
+#line 277 "bfin-lex.l"
+return COMMA;
+	YY_BREAK
+case 213:
+YY_RULE_SETUP
+#line 278 "bfin-lex.l"
+return _PLUS_ASSIGN;
+	YY_BREAK
+case 214:
+YY_RULE_SETUP
+#line 279 "bfin-lex.l"
+return _PLUS_PLUS;
+	YY_BREAK
+case 215:
+YY_RULE_SETUP
+#line 280 "bfin-lex.l"
+return PLUS;
+	YY_BREAK
+case 216:
+YY_RULE_SETUP
+#line 281 "bfin-lex.l"
+return _STAR_ASSIGN;
+	YY_BREAK
+case 217:
+YY_RULE_SETUP
+#line 282 "bfin-lex.l"
+return STAR;
+	YY_BREAK
+case 218:
+YY_RULE_SETUP
+#line 283 "bfin-lex.l"
+return _AMPERSAND_ASSIGN;
+	YY_BREAK
+case 219:
+YY_RULE_SETUP
+#line 284 "bfin-lex.l"
+return AMPERSAND;
+	YY_BREAK
+case 220:
+YY_RULE_SETUP
+#line 285 "bfin-lex.l"
+return PERCENT;
+	YY_BREAK
+case 221:
+YY_RULE_SETUP
+#line 286 "bfin-lex.l"
+return BANG;
+	YY_BREAK
+case 222:
+YY_RULE_SETUP
+#line 287 "bfin-lex.l"
+return SEMICOLON;
+	YY_BREAK
+case 223:
+YY_RULE_SETUP
+#line 288 "bfin-lex.l"
+return _ASSIGN_BANG;
+	YY_BREAK
+case 224:
+YY_RULE_SETUP
+#line 289 "bfin-lex.l"
+return DOUBLE_BAR;
+	YY_BREAK
+case 225:
+YY_RULE_SETUP
+#line 290 "bfin-lex.l"
+return AT;
+	YY_BREAK
+case 226:
+YY_RULE_SETUP
+#line 291 "bfin-lex.l"
+return PREFETCH;
+	YY_BREAK
+case 227:
+YY_RULE_SETUP
+#line 292 "bfin-lex.l"
+return UNLINK;
+	YY_BREAK
+case 228:
+YY_RULE_SETUP
+#line 293 "bfin-lex.l"
+return LINK;
+	YY_BREAK
+case 229:
+YY_RULE_SETUP
+#line 294 "bfin-lex.l"
+return IDLE;
+	YY_BREAK
+case 230:
+YY_RULE_SETUP
+#line 295 "bfin-lex.l"
+return IFLUSH;
+	YY_BREAK
+case 231:
+YY_RULE_SETUP
+#line 296 "bfin-lex.l"
+return FLUSHINV;
+	YY_BREAK
+case 232:
+YY_RULE_SETUP
+#line 297 "bfin-lex.l"
+return FLUSH;
+	YY_BREAK
+case 233:
+YY_RULE_SETUP
+#line 298 "bfin-lex.l"
+{
+    yylval.value = parse_int (&yytext);
+    return NUMBER;
+  }
+	YY_BREAK
+case 234:
+YY_RULE_SETUP
+#line 302 "bfin-lex.l"
+{
+    yylval.symbol = symbol_find_or_make (yytext);
+    symbol_mark_used (yylval.symbol);
+    return SYMBOL;
+  }
+	YY_BREAK
+case 235:
+YY_RULE_SETUP
+#line 307 "bfin-lex.l"
+{
+    char *name;
+    char *ref = strdup (yytext);
+    if (ref[1] == 'b' || ref[1] == 'B')
+      {
+        name = fb_label_name ((int) (ref[0] - '0'), 0);
+	yylval.symbol = symbol_find (name);
+
+	if ((yylval.symbol != NULL)
+             && (S_IS_DEFINED (yylval.symbol)))
+          return SYMBOL;
+	as_bad ("backward reference to unknown label %d:",
+						  (int) (ref[0] - '0'));
+      }
+    else if (ref[1] == 'f' || ref[1] == 'F')
+      {
+        /* Forward reference.  Expect symbol to be undefined or
+           unknown.  undefined: seen it before.  unknown: never seen
+           it before.
+
+           Construct a local label name, then an undefined symbol.
+           Just return it as never seen before.  */
+
+        name = fb_label_name ((int) (ref[0] - '0'), 1);
+	yylval.symbol = symbol_find_or_make (name);
+	/* We have no need to check symbol properties.  */
+	return SYMBOL;
+      }
+  }
+	YY_BREAK
+case 236:
+/* rule 236 can match eol */
+YY_RULE_SETUP
+#line 336 "bfin-lex.l"
+;
+	YY_BREAK
+case 237:
+YY_RULE_SETUP
+#line 337 "bfin-lex.l"
+;
+	YY_BREAK
+case 238:
+YY_RULE_SETUP
+#line 338 "bfin-lex.l"
+return yytext[0];
+	YY_BREAK
+case 239:
+YY_RULE_SETUP
+#line 339 "bfin-lex.l"
+ECHO;
+	YY_BREAK
+#line 2340 "bfin-lex.c"
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(KEYWORD):
+case YY_STATE_EOF(FLAGS):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyrestart(yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 571 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 571 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 570);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up yytext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					yyrestart(yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( yywrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
+	}
+
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	yy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		yyfree((void *) b->yy_ch_buf  );
+
+	yyfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+	return yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *yyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 339 "bfin-lex.l"
+
+
+static long parse_int (char **end)
+{
+  char fmt = '\0';
+  int not_done = 1;
+  int shiftvalue = 0;
+  char * char_bag;
+  long value = 0;
+  char *arg = *end;
+
+  while (*arg && *arg == ' ')
+    arg++;
+
+  switch (*arg)
+    {
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      case '7':
+      case '8':
+      case '9':
+        fmt = 'd';
+        break;
+
+      case '0':  /* Accept different formated integers hex octal and binary. */
+        {
+	  char c = *++arg;
+          arg++;
+	  if (c == 'x' || c == 'X') /* Hex input.  */
+	    fmt = 'h';
+	  else if (c == 'b' || c == 'B')
+	    fmt = 'b';
+	  else if (c == '.')
+	    fmt = 'f';
+	  else
+            {             /* Octal.  */
+	      arg--;
+	      fmt = 'o';
+	    }
+	  break;
+        }
+
+      case 'd':
+      case 'D':
+      case 'h':
+      case 'H':
+      case 'o':
+      case 'O':
+      case 'b':
+      case 'B':
+      case 'f':
+      case 'F':
+        {
+	  fmt = *arg++;
+	  if (*arg == '#')
+	    arg++;
+        }
+    }
+
+  switch (fmt)
+    {
+      case 'h':
+      case 'H':
+        shiftvalue = 4;
+        char_bag = "0123456789ABCDEFabcdef";
+        break;
+
+      case 'o':
+      case 'O':
+        shiftvalue = 3;
+        char_bag = "01234567";
+        break;
+
+      case 'b':
+      case 'B':
+        shiftvalue = 1;
+        char_bag = "01";
+        break;
+
+/* The assembler allows for fractional constants to be created
+   by either the 0.xxxx or the f#xxxx format
+
+   i.e.   0.5 would result in 0x4000
+
+   note .5 would result in the identifier .5.
+
+   The assembler converts to fractional format 1.15 by the simple rule:
+
+             value = (short) (finput * (1 << 15)).  */
+
+      case 'f':
+      case 'F':
+        {
+          float fval = 0.0;
+          float pos = 10.0;
+          while (1)
+            {
+              int c;
+              c = *arg++;
+
+              if (c >= '0' && c <= '9')
+                {
+                  float digit = (c - '0') / pos;
+                  fval = fval + digit;
+                  pos = pos * 10.0;
+                }
+              else
+                {
+	          *--arg = c;
+                  value = (short) (fval * (1 << 15));
+                  break;
+                }
+            }
+          *end = arg+1;
+          return value;
+        }
+
+      case 'd':
+      case 'D':
+      default:
+        {
+          while (1)
+            {
+              char c;
+              c = *arg++;
+              if (c >= '0' && c <= '9')
+                value = (value * 10) + (c - '0');
+              else
+                {
+                  /* Constants that are suffixed with k|K are multiplied by 1024
+                     This suffix is only allowed on decimal constants. */
+                  if (c == 'k' || c == 'K')
+                    value *= 1024;
+                  else
+                    *--arg = c;
+                  break;
+                }
+            }
+          *end = arg+1;
+          return value;
+        }
+    }
+
+  while (not_done)
+    {
+      char c;
+      c = *arg++;
+      if (c == 0 || !strchr (char_bag, c))
+	{
+          not_done = 0;
+          *--arg = c;
+        }
+      else
+        {
+          if (c >= 'a' && c <= 'z')
+            c = c - ('a' - '9') + 1;
+          else if (c >= 'A' && c <= 'Z')
+            c = c - ('A' - '9') + 1;
+
+          c -= '0';
+          value = (value << shiftvalue) + c;
+        }
+    }
+  *end = arg+1;
+  return value;
+}
+
+
+static int parse_reg (Register *r, int cl, char *rt)
+{
+  r->regno = cl | (rt[1] - '0');
+  r->flags = F_REG_NONE;
+  return REG;
+}
+
+static int parse_halfreg (Register *r, int cl, char *rt)
+{
+  r->regno = cl | (rt[1] - '0');
+
+  switch (rt[3])
+    {
+      case 'b':
+      case 'B':
+	return BYTE_DREG;
+
+      case 'l':
+      case 'L':
+	r->flags = F_REG_LOW;
+	break;
+
+      case 'h':
+      case 'H':
+	r->flags = F_REG_HIGH;
+	break;
+    }
+
+  return HALF_REG;
+}
+
+/* Our start state is KEYWORD as we have
+   command keywords such as PREFETCH.  */
+
+void
+set_start_state (void)
+{
+  BEGIN KEYWORD;
+}
+
+
+#ifndef yywrap
+int
+yywrap ()
+{
+  return 1;
+}
+#endif
+
diff --git a/gas/bfin-parse.c b/gas/bfin-parse.c
new file mode 100644
index 0000000000..26c0928881
--- /dev/null
+++ b/gas/bfin-parse.c
@@ -0,0 +1,7951 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     BYTEOP16P = 258,
+     BYTEOP16M = 259,
+     BYTEOP1P = 260,
+     BYTEOP2P = 261,
+     BYTEOP3P = 262,
+     BYTEUNPACK = 263,
+     BYTEPACK = 264,
+     PACK = 265,
+     SAA = 266,
+     ALIGN8 = 267,
+     ALIGN16 = 268,
+     ALIGN24 = 269,
+     VIT_MAX = 270,
+     EXTRACT = 271,
+     DEPOSIT = 272,
+     EXPADJ = 273,
+     SEARCH = 274,
+     ONES = 275,
+     SIGN = 276,
+     SIGNBITS = 277,
+     LINK = 278,
+     UNLINK = 279,
+     REG = 280,
+     PC = 281,
+     CCREG = 282,
+     BYTE_DREG = 283,
+     REG_A_DOUBLE_ZERO = 284,
+     REG_A_DOUBLE_ONE = 285,
+     A_ZERO_DOT_L = 286,
+     A_ZERO_DOT_H = 287,
+     A_ONE_DOT_L = 288,
+     A_ONE_DOT_H = 289,
+     HALF_REG = 290,
+     NOP = 291,
+     RTI = 292,
+     RTS = 293,
+     RTX = 294,
+     RTN = 295,
+     RTE = 296,
+     HLT = 297,
+     IDLE = 298,
+     STI = 299,
+     CLI = 300,
+     CSYNC = 301,
+     SSYNC = 302,
+     EMUEXCPT = 303,
+     RAISE = 304,
+     EXCPT = 305,
+     LSETUP = 306,
+     LOOP = 307,
+     LOOP_BEGIN = 308,
+     LOOP_END = 309,
+     DISALGNEXCPT = 310,
+     JUMP = 311,
+     JUMP_DOT_S = 312,
+     JUMP_DOT_L = 313,
+     CALL = 314,
+     ABORT = 315,
+     NOT = 316,
+     TILDA = 317,
+     BANG = 318,
+     AMPERSAND = 319,
+     BAR = 320,
+     PERCENT = 321,
+     CARET = 322,
+     BXOR = 323,
+     MINUS = 324,
+     PLUS = 325,
+     STAR = 326,
+     SLASH = 327,
+     NEG = 328,
+     MIN = 329,
+     MAX = 330,
+     ABS = 331,
+     DOUBLE_BAR = 332,
+     _PLUS_BAR_PLUS = 333,
+     _PLUS_BAR_MINUS = 334,
+     _MINUS_BAR_PLUS = 335,
+     _MINUS_BAR_MINUS = 336,
+     _MINUS_MINUS = 337,
+     _PLUS_PLUS = 338,
+     SHIFT = 339,
+     LSHIFT = 340,
+     ASHIFT = 341,
+     BXORSHIFT = 342,
+     _GREATER_GREATER_GREATER_THAN_ASSIGN = 343,
+     ROT = 344,
+     LESS_LESS = 345,
+     GREATER_GREATER = 346,
+     _GREATER_GREATER_GREATER = 347,
+     _LESS_LESS_ASSIGN = 348,
+     _GREATER_GREATER_ASSIGN = 349,
+     DIVS = 350,
+     DIVQ = 351,
+     ASSIGN = 352,
+     _STAR_ASSIGN = 353,
+     _BAR_ASSIGN = 354,
+     _CARET_ASSIGN = 355,
+     _AMPERSAND_ASSIGN = 356,
+     _MINUS_ASSIGN = 357,
+     _PLUS_ASSIGN = 358,
+     _ASSIGN_BANG = 359,
+     _LESS_THAN_ASSIGN = 360,
+     _ASSIGN_ASSIGN = 361,
+     GE = 362,
+     LT = 363,
+     LE = 364,
+     GT = 365,
+     LESS_THAN = 366,
+     FLUSHINV = 367,
+     FLUSH = 368,
+     IFLUSH = 369,
+     PREFETCH = 370,
+     PRNT = 371,
+     OUTC = 372,
+     WHATREG = 373,
+     TESTSET = 374,
+     ASL = 375,
+     ASR = 376,
+     B = 377,
+     W = 378,
+     NS = 379,
+     S = 380,
+     CO = 381,
+     SCO = 382,
+     TH = 383,
+     TL = 384,
+     BP = 385,
+     BREV = 386,
+     X = 387,
+     Z = 388,
+     M = 389,
+     MMOD = 390,
+     R = 391,
+     RND = 392,
+     RNDL = 393,
+     RNDH = 394,
+     RND12 = 395,
+     RND20 = 396,
+     V = 397,
+     LO = 398,
+     HI = 399,
+     BITTGL = 400,
+     BITCLR = 401,
+     BITSET = 402,
+     BITTST = 403,
+     BITMUX = 404,
+     DBGAL = 405,
+     DBGAH = 406,
+     DBGHALT = 407,
+     DBG = 408,
+     DBGA = 409,
+     DBGCMPLX = 410,
+     IF = 411,
+     COMMA = 412,
+     BY = 413,
+     COLON = 414,
+     SEMICOLON = 415,
+     RPAREN = 416,
+     LPAREN = 417,
+     LBRACK = 418,
+     RBRACK = 419,
+     STATUS_REG = 420,
+     MNOP = 421,
+     SYMBOL = 422,
+     NUMBER = 423,
+     GOT = 424,
+     GOT17M4 = 425,
+     FUNCDESC_GOT17M4 = 426,
+     AT = 427,
+     PLTPC = 428
+   };
+#endif
+/* Tokens.  */
+#define BYTEOP16P 258
+#define BYTEOP16M 259
+#define BYTEOP1P 260
+#define BYTEOP2P 261
+#define BYTEOP3P 262
+#define BYTEUNPACK 263
+#define BYTEPACK 264
+#define PACK 265
+#define SAA 266
+#define ALIGN8 267
+#define ALIGN16 268
+#define ALIGN24 269
+#define VIT_MAX 270
+#define EXTRACT 271
+#define DEPOSIT 272
+#define EXPADJ 273
+#define SEARCH 274
+#define ONES 275
+#define SIGN 276
+#define SIGNBITS 277
+#define LINK 278
+#define UNLINK 279
+#define REG 280
+#define PC 281
+#define CCREG 282
+#define BYTE_DREG 283
+#define REG_A_DOUBLE_ZERO 284
+#define REG_A_DOUBLE_ONE 285
+#define A_ZERO_DOT_L 286
+#define A_ZERO_DOT_H 287
+#define A_ONE_DOT_L 288
+#define A_ONE_DOT_H 289
+#define HALF_REG 290
+#define NOP 291
+#define RTI 292
+#define RTS 293
+#define RTX 294
+#define RTN 295
+#define RTE 296
+#define HLT 297
+#define IDLE 298
+#define STI 299
+#define CLI 300
+#define CSYNC 301
+#define SSYNC 302
+#define EMUEXCPT 303
+#define RAISE 304
+#define EXCPT 305
+#define LSETUP 306
+#define LOOP 307
+#define LOOP_BEGIN 308
+#define LOOP_END 309
+#define DISALGNEXCPT 310
+#define JUMP 311
+#define JUMP_DOT_S 312
+#define JUMP_DOT_L 313
+#define CALL 314
+#define ABORT 315
+#define NOT 316
+#define TILDA 317
+#define BANG 318
+#define AMPERSAND 319
+#define BAR 320
+#define PERCENT 321
+#define CARET 322
+#define BXOR 323
+#define MINUS 324
+#define PLUS 325
+#define STAR 326
+#define SLASH 327
+#define NEG 328
+#define MIN 329
+#define MAX 330
+#define ABS 331
+#define DOUBLE_BAR 332
+#define _PLUS_BAR_PLUS 333
+#define _PLUS_BAR_MINUS 334
+#define _MINUS_BAR_PLUS 335
+#define _MINUS_BAR_MINUS 336
+#define _MINUS_MINUS 337
+#define _PLUS_PLUS 338
+#define SHIFT 339
+#define LSHIFT 340
+#define ASHIFT 341
+#define BXORSHIFT 342
+#define _GREATER_GREATER_GREATER_THAN_ASSIGN 343
+#define ROT 344
+#define LESS_LESS 345
+#define GREATER_GREATER 346
+#define _GREATER_GREATER_GREATER 347
+#define _LESS_LESS_ASSIGN 348
+#define _GREATER_GREATER_ASSIGN 349
+#define DIVS 350
+#define DIVQ 351
+#define ASSIGN 352
+#define _STAR_ASSIGN 353
+#define _BAR_ASSIGN 354
+#define _CARET_ASSIGN 355
+#define _AMPERSAND_ASSIGN 356
+#define _MINUS_ASSIGN 357
+#define _PLUS_ASSIGN 358
+#define _ASSIGN_BANG 359
+#define _LESS_THAN_ASSIGN 360
+#define _ASSIGN_ASSIGN 361
+#define GE 362
+#define LT 363
+#define LE 364
+#define GT 365
+#define LESS_THAN 366
+#define FLUSHINV 367
+#define FLUSH 368
+#define IFLUSH 369
+#define PREFETCH 370
+#define PRNT 371
+#define OUTC 372
+#define WHATREG 373
+#define TESTSET 374
+#define ASL 375
+#define ASR 376
+#define B 377
+#define W 378
+#define NS 379
+#define S 380
+#define CO 381
+#define SCO 382
+#define TH 383
+#define TL 384
+#define BP 385
+#define BREV 386
+#define X 387
+#define Z 388
+#define M 389
+#define MMOD 390
+#define R 391
+#define RND 392
+#define RNDL 393
+#define RNDH 394
+#define RND12 395
+#define RND20 396
+#define V 397
+#define LO 398
+#define HI 399
+#define BITTGL 400
+#define BITCLR 401
+#define BITSET 402
+#define BITTST 403
+#define BITMUX 404
+#define DBGAL 405
+#define DBGAH 406
+#define DBGHALT 407
+#define DBG 408
+#define DBGA 409
+#define DBGCMPLX 410
+#define IF 411
+#define COMMA 412
+#define BY 413
+#define COLON 414
+#define SEMICOLON 415
+#define RPAREN 416
+#define LPAREN 417
+#define LBRACK 418
+#define RBRACK 419
+#define STATUS_REG 420
+#define MNOP 421
+#define SYMBOL 422
+#define NUMBER 423
+#define GOT 424
+#define GOT17M4 425
+#define FUNCDESC_GOT17M4 426
+#define AT 427
+#define PLTPC 428
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 21 "bfin-parse.y"
+
+
+#include "as.h"
+#include <obstack.h>
+
+#include "bfin-aux.h"  /* Opcode generating auxiliaries.  */
+#include "libbfd.h"
+#include "elf/common.h"
+#include "elf/bfin.h"
+
+#define DSP32ALU(aopcde, HL, dst1, dst0, src0, src1, s, x, aop) \
+	bfin_gen_dsp32alu (HL, aopcde, aop, s, x, dst0, dst1, src0, src1)
+
+#define DSP32MAC(op1, MM, mmod, w1, P, h01, h11, h00, h10, dst, op0, src0, src1, w0) \
+	bfin_gen_dsp32mac (op1, MM, mmod, w1, P, h01, h11, h00, h10, op0, \
+	                   dst, src0, src1, w0)
+
+#define DSP32MULT(op1, MM, mmod, w1, P, h01, h11, h00, h10, dst, op0, src0, src1, w0) \
+	bfin_gen_dsp32mult (op1, MM, mmod, w1, P, h01, h11, h00, h10, op0, \
+	                    dst, src0, src1, w0)
+
+#define DSP32SHIFT(sopcde, dst0, src0, src1, sop, hls)  \
+	bfin_gen_dsp32shift (sopcde, dst0, src0, src1, sop, hls)
+
+#define DSP32SHIFTIMM(sopcde, dst0, immag, src1, sop, hls)  \
+	bfin_gen_dsp32shiftimm (sopcde, dst0, immag, src1, sop, hls)
+
+#define LDIMMHALF_R(reg, h, s, z, hword) \
+	bfin_gen_ldimmhalf (reg, h, s, z, hword, 1)
+
+#define LDIMMHALF_R5(reg, h, s, z, hword) \
+        bfin_gen_ldimmhalf (reg, h, s, z, hword, 2)
+
+#define LDSTIDXI(ptr, reg, w, sz, z, offset)  \
+	bfin_gen_ldstidxi (ptr, reg, w, sz, z, offset)
+
+#define LDST(ptr, reg, aop, sz, z, w)  \
+	bfin_gen_ldst (ptr, reg, aop, sz, z, w)
+
+#define LDSTII(ptr, reg, offset, w, op)  \
+	bfin_gen_ldstii (ptr, reg, offset, w, op)
+
+#define DSPLDST(i, m, reg, aop, w) \
+	bfin_gen_dspldst (i, reg, aop, w, m)
+
+#define LDSTPMOD(ptr, reg, idx, aop, w) \
+	bfin_gen_ldstpmod (ptr, reg, aop, w, idx)
+
+#define LDSTIIFP(offset, reg, w)  \
+	bfin_gen_ldstiifp (reg, offset, w)
+
+#define LOGI2OP(dst, src, opc) \
+	bfin_gen_logi2op (opc, src, dst.regno & CODE_MASK)
+
+#define ALU2OP(dst, src, opc)  \
+	bfin_gen_alu2op (dst, src, opc)
+
+#define BRCC(t, b, offset) \
+	bfin_gen_brcc (t, b, offset)
+
+#define UJUMP(offset) \
+	bfin_gen_ujump (offset)
+
+#define PROGCTRL(prgfunc, poprnd) \
+	bfin_gen_progctrl (prgfunc, poprnd)
+
+#define PUSHPOPMULTIPLE(dr, pr, d, p, w) \
+	bfin_gen_pushpopmultiple (dr, pr, d, p, w)
+
+#define PUSHPOPREG(reg, w) \
+	bfin_gen_pushpopreg (reg, w)
+
+#define CALLA(addr, s)  \
+	bfin_gen_calla (addr, s)
+
+#define LINKAGE(r, framesize) \
+	bfin_gen_linkage (r, framesize)
+
+#define COMPI2OPD(dst, src, op)  \
+	bfin_gen_compi2opd (dst, src, op)
+
+#define COMPI2OPP(dst, src, op)  \
+	bfin_gen_compi2opp (dst, src, op)
+
+#define DAGMODIK(i, op)  \
+	bfin_gen_dagmodik (i, op)
+
+#define DAGMODIM(i, m, op, br)  \
+	bfin_gen_dagmodim (i, m, op, br)
+
+#define COMP3OP(dst, src0, src1, opc)   \
+	bfin_gen_comp3op (src0, src1, dst, opc)
+
+#define PTR2OP(dst, src, opc)   \
+	bfin_gen_ptr2op (dst, src, opc)
+
+#define CCFLAG(x, y, opc, i, g)  \
+	bfin_gen_ccflag (x, y, opc, i, g)
+
+#define CCMV(src, dst, t) \
+	bfin_gen_ccmv (src, dst, t)
+
+#define CACTRL(reg, a, op) \
+	bfin_gen_cactrl (reg, a, op)
+
+#define LOOPSETUP(soffset, c, rop, eoffset, reg) \
+	bfin_gen_loopsetup (soffset, c, rop, eoffset, reg)
+
+#define HL2(r1, r0)  (IS_H (r1) << 1 | IS_H (r0))
+#define IS_RANGE(bits, expr, sign, mul)    \
+	value_match(expr, bits, sign, mul, 1)
+#define IS_URANGE(bits, expr, sign, mul)    \
+	value_match(expr, bits, sign, mul, 0)
+#define IS_CONST(expr) (expr->type == Expr_Node_Constant)
+#define IS_RELOC(expr) (expr->type != Expr_Node_Constant)
+#define IS_IMM(expr, bits)  value_match (expr, bits, 0, 1, 1)
+#define IS_UIMM(expr, bits)  value_match (expr, bits, 0, 1, 0)
+
+#define IS_PCREL4(expr) \
+	(value_match (expr, 4, 0, 2, 0))
+
+#define IS_LPPCREL10(expr) \
+	(value_match (expr, 10, 0, 2, 0))
+
+#define IS_PCREL10(expr) \
+	(value_match (expr, 10, 0, 2, 1))
+
+#define IS_PCREL12(expr) \
+	(value_match (expr, 12, 0, 2, 1))
+
+#define IS_PCREL24(expr) \
+	(value_match (expr, 24, 0, 2, 1))
+
+
+static int value_match (Expr_Node *, int, int, int, int);
+
+extern FILE *errorf;
+extern INSTR_T insn;
+
+static Expr_Node *binary (Expr_Op_Type, Expr_Node *, Expr_Node *);
+static Expr_Node *unary  (Expr_Op_Type, Expr_Node *);
+
+static void notethat (char *, ...);
+
+char *current_inputline;
+extern char *yytext;
+int yyerror (char *);
+
+void error (char *format, ...)
+{
+    va_list ap;
+    static char buffer[2000];
+
+    va_start (ap, format);
+    vsprintf (buffer, format, ap);
+    va_end (ap);
+
+    as_bad ("%s", buffer);
+}
+
+int
+yyerror (char *msg)
+{
+  if (msg[0] == '\0')
+    error ("%s", msg);
+
+  else if (yytext[0] != ';')
+    error ("%s. Input text was %s.", msg, yytext);
+  else
+    error ("%s.", msg);
+
+  return -1;
+}
+
+static int
+in_range_p (Expr_Node *exp, int from, int to, unsigned int mask)
+{
+  int val = EXPR_VALUE (exp);
+  if (exp->type != Expr_Node_Constant)
+    return 0;
+  if (val < from || val > to)
+    return 0;
+  return (val & mask) == 0;
+}
+
+extern int yylex (void);
+
+#define imm3(x) EXPR_VALUE (x)
+#define imm4(x) EXPR_VALUE (x)
+#define uimm4(x) EXPR_VALUE (x)
+#define imm5(x) EXPR_VALUE (x)
+#define uimm5(x) EXPR_VALUE (x)
+#define imm6(x) EXPR_VALUE (x)
+#define imm7(x) EXPR_VALUE (x)
+#define uimm8(x) EXPR_VALUE (x)
+#define imm16(x) EXPR_VALUE (x)
+#define uimm16s4(x) ((EXPR_VALUE (x)) >> 2)
+#define uimm16(x) EXPR_VALUE (x)
+
+/* Return true if a value is inside a range.  */
+#define IN_RANGE(x, low, high) \
+  (((EXPR_VALUE(x)) >= (low)) && (EXPR_VALUE(x)) <= ((high)))
+
+/* Auxiliary functions.  */
+
+static int
+valid_dreg_pair (Register *reg1, Expr_Node *reg2)
+{
+  if (!IS_DREG (*reg1))
+    {
+      yyerror ("Dregs expected");
+      return 0;
+    }
+
+  if (reg1->regno != 1 && reg1->regno != 3)
+    {
+      yyerror ("Bad register pair");
+      return 0;
+    }
+
+  if (imm7 (reg2) != reg1->regno - 1)
+    {
+      yyerror ("Bad register pair");
+      return 0;
+    }
+
+  reg1->regno--;
+  return 1;
+}
+
+static int
+check_multiply_halfregs (Macfunc *aa, Macfunc *ab)
+{
+  if ((!REG_EQUAL (aa->s0, ab->s0) && !REG_EQUAL (aa->s0, ab->s1))
+      || (!REG_EQUAL (aa->s1, ab->s1) && !REG_EQUAL (aa->s1, ab->s0)))
+    return yyerror ("Source multiplication register mismatch");
+
+  return 0;
+}
+
+
+/* Check mac option.  */
+
+static int
+check_macfunc_option (Macfunc *a, Opt_mode *opt)
+{
+  /* Default option is always valid.  */
+  if (opt->mod == 0)
+    return 0;
+
+  if ((a->w == 1 && a->P == 1
+       && opt->mod != M_FU && opt->mod != M_IS && opt->mod != M_IU
+       && opt->mod != M_S2RND && opt->mod != M_ISS2)
+      || (a->w == 1 && a->P == 0
+	  && opt->mod != M_FU && opt->mod != M_IS && opt->mod != M_IU
+	  && opt->mod != M_T && opt->mod != M_TFU && opt->mod != M_S2RND
+	  && opt->mod != M_ISS2 && opt->mod != M_IH)
+      || (a->w == 0 && a->P == 0
+	  && opt->mod != M_FU && opt->mod != M_IS && opt->mod != M_W32))
+    return -1;
+
+  return 0;
+}
+
+/* Check (vector) mac funcs and ops.  */
+
+static int
+check_macfuncs (Macfunc *aa, Opt_mode *opa,
+		Macfunc *ab, Opt_mode *opb)
+{
+  /* Variables for swapping.  */
+  Macfunc mtmp;
+  Opt_mode otmp;
+
+  /* The option mode should be put at the end of the second instruction
+     of the vector except M, which should follow MAC1 instruction.  */
+  if (opa->mod != 0)
+    return yyerror ("Bad opt mode");
+
+  /* If a0macfunc comes before a1macfunc, swap them.  */
+
+  if (aa->n == 0)
+    {
+      /*  (M) is not allowed here.  */
+      if (opa->MM != 0)
+	return yyerror ("(M) not allowed with A0MAC");
+      if (ab->n != 1)
+	return yyerror ("Vector AxMACs can't be same");
+
+      mtmp = *aa; *aa = *ab; *ab = mtmp;
+      otmp = *opa; *opa = *opb; *opb = otmp;
+    }
+  else
+    {
+      if (opb->MM != 0)
+	return yyerror ("(M) not allowed with A0MAC");
+      if (ab->n != 0)
+	return yyerror ("Vector AxMACs can't be same");
+    }
+
+  /*  If both ops are one of 0, 1, or 2, we have multiply_halfregs in both
+  assignment_or_macfuncs.  */
+  if ((aa->op == 0 || aa->op == 1 || aa->op == 2)
+      && (ab->op == 0 || ab->op == 1 || ab->op == 2))
+    {
+      if (check_multiply_halfregs (aa, ab) < 0)
+	return -1;
+    }
+  else
+    {
+      /*  Only one of the assign_macfuncs has a half reg multiply
+      Evil trick: Just 'OR' their source register codes:
+      We can do that, because we know they were initialized to 0
+      in the rules that don't use multiply_halfregs.  */
+      aa->s0.regno |= (ab->s0.regno & CODE_MASK);
+      aa->s1.regno |= (ab->s1.regno & CODE_MASK);
+    }
+
+  if (aa->w == ab->w && aa->P != ab->P)
+    return yyerror ("Destination Dreg sizes (full or half) must match");
+
+  if (aa->w && ab->w)
+    {
+      if (aa->P && (aa->dst.regno - ab->dst.regno) != 1)
+	return yyerror ("Destination Dregs (full) must differ by one");
+      if (!aa->P && aa->dst.regno != ab->dst.regno)
+	return yyerror ("Destination Dregs (half) must match");
+    }
+
+  /* Make sure mod flags get ORed, too.  */
+  opb->mod |= opa->mod;
+
+  /* Check option.  */
+  if (check_macfunc_option (aa, opb) < 0
+      && check_macfunc_option (ab, opb) < 0)
+    return yyerror ("bad option");
+
+  /* Make sure first macfunc has got both P flags ORed.  */
+  aa->P |= ab->P;
+
+  return 0;
+}
+
+
+static int
+is_group1 (INSTR_T x)
+{
+  /* Group1 is dpsLDST, LDSTpmod, LDST, LDSTiiFP, LDSTii.  */
+  if ((x->value & 0xc000) == 0x8000 || (x->value == 0x0000))
+    return 1;
+
+  return 0;
+}
+
+static int
+is_group2 (INSTR_T x)
+{
+  if ((((x->value & 0xfc00) == 0x9c00)  /* dspLDST.  */
+       && !((x->value & 0xfde0) == 0x9c60)  /* dagMODim.  */
+       && !((x->value & 0xfde0) == 0x9ce0)  /* dagMODim with bit rev.  */
+       && !((x->value & 0xfde0) == 0x9d60)) /* pick dagMODik.  */
+      || (x->value == 0x0000))
+    return 1;
+  return 0;
+}
+
+static int
+is_store (INSTR_T x)
+{
+  if (!x)
+    return 0;
+
+  if ((x->value & 0xf000) == 0x8000)
+    {
+      int aop = ((x->value >> 9) & 0x3);
+      int w = ((x->value >> 11) & 0x1);
+      if (!w || aop == 3)
+	return 0;
+      return 1;
+    }
+
+  if (((x->value & 0xFF60) == 0x9E60) ||  /* dagMODim_0 */
+      ((x->value & 0xFFF0) == 0x9F60))    /* dagMODik_0 */
+    return 0;
+
+  /* decode_dspLDST_0 */
+  if ((x->value & 0xFC00) == 0x9C00)
+    {
+      int w = ((x->value >> 9) & 0x1);
+      if (w)
+	return 1;
+    }
+
+  return 0;
+}
+
+static INSTR_T
+gen_multi_instr_1 (INSTR_T dsp32, INSTR_T dsp16_grp1, INSTR_T dsp16_grp2)
+{
+  int mask1 = dsp32 ? insn_regmask (dsp32->value, dsp32->next->value) : 0;
+  int mask2 = dsp16_grp1 ? insn_regmask (dsp16_grp1->value, 0) : 0;
+  int mask3 = dsp16_grp2 ? insn_regmask (dsp16_grp2->value, 0) : 0;
+
+  if ((mask1 & mask2) || (mask1 & mask3) || (mask2 & mask3))
+    yyerror ("resource conflict in multi-issue instruction");
+
+  /* Anomaly 05000074 */
+  if (ENABLE_AC_05000074
+      && dsp32 != NULL && dsp16_grp1 != NULL
+      && (dsp32->value & 0xf780) == 0xc680
+      && ((dsp16_grp1->value & 0xfe40) == 0x9240
+	  || (dsp16_grp1->value & 0xfe08) == 0xba08
+	  || (dsp16_grp1->value & 0xfc00) == 0xbc00))
+    yyerror ("anomaly 05000074 - Multi-Issue Instruction with \
+dsp32shiftimm in slot1 and P-reg Store in slot2 Not Supported");
+
+  if (is_store (dsp16_grp1) && is_store (dsp16_grp2))
+    yyerror ("Only one instruction in multi-issue instruction can be a store");
+
+  return bfin_gen_multi_instr (dsp32, dsp16_grp1, dsp16_grp2);
+}
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 445 "bfin-parse.y"
+{
+  INSTR_T instr;
+  Expr_Node *expr;
+  SYMBOL_T symbol;
+  long value;
+  Register reg;
+  Macfunc macfunc;
+  struct { int r0; int s0; int x0; int aop; } modcodes;
+  struct { int r0; } r0;
+  Opt_mode mod;
+}
+/* Line 193 of yacc.c.  */
+#line 878 "bfin-parse.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 216 of yacc.c.  */
+#line 891 "bfin-parse.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  156
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   1309
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  174
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  47
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  354
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  1021
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   428
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     4,     6,     9,    16,    21,    23,    25,
+      28,    34,    36,    43,    50,    54,    58,    76,    94,   106,
+     118,   130,   143,   156,   169,   175,   179,   183,   187,   196,
+     210,   223,   237,   251,   260,   278,   285,   295,   299,   306,
+     310,   316,   323,   332,   341,   344,   347,   352,   356,   359,
+     364,   368,   375,   380,   388,   396,   400,   404,   411,   415,
+     420,   424,   428,   432,   444,   456,   466,   472,   478,   488,
+     494,   500,   507,   514,   520,   526,   532,   539,   546,   552,
+     554,   558,   562,   566,   570,   575,   580,   590,   600,   606,
+     614,   619,   626,   633,   641,   651,   660,   669,   681,   691,
+     696,   702,   709,   717,   724,   729,   736,   742,   749,   756,
+     761,   770,   781,   792,   805,   811,   818,   824,   831,   836,
+     841,   846,   854,   864,   874,   884,   891,   898,   905,   914,
+     923,   930,   936,   942,   951,   956,   964,   966,   968,   970,
+     972,   974,   976,   978,   980,   982,   984,   987,   990,   995,
+    1000,  1007,  1014,  1017,  1020,  1025,  1028,  1031,  1034,  1037,
+    1040,  1043,  1050,  1057,  1063,  1068,  1072,  1076,  1080,  1084,
+    1088,  1092,  1097,  1100,  1105,  1108,  1113,  1116,  1121,  1124,
+    1132,  1141,  1150,  1158,  1166,  1174,  1184,  1192,  1201,  1211,
+    1220,  1227,  1235,  1244,  1254,  1263,  1271,  1279,  1286,  1298,
+    1306,  1318,  1326,  1330,  1333,  1335,  1343,  1353,  1365,  1369,
+    1375,  1383,  1386,  1389,  1392,  1395,  1397,  1399,  1402,  1405,
+    1410,  1412,  1414,  1421,  1428,  1435,  1438,  1441,  1443,  1445,
+    1446,  1452,  1458,  1462,  1466,  1470,  1474,  1475,  1477,  1479,
+    1481,  1483,  1485,  1486,  1490,  1491,  1495,  1499,  1500,  1504,
+    1508,  1514,  1520,  1521,  1525,  1529,  1530,  1534,  1538,  1539,
+    1543,  1547,  1551,  1557,  1563,  1564,  1568,  1569,  1573,  1575,
+    1577,  1579,  1581,  1582,  1586,  1590,  1594,  1600,  1606,  1608,
+    1610,  1612,  1613,  1617,  1618,  1622,  1627,  1632,  1634,  1636,
+    1638,  1640,  1642,  1644,  1646,  1648,  1652,  1656,  1660,  1664,
+    1670,  1676,  1682,  1688,  1692,  1696,  1702,  1708,  1709,  1711,
+    1713,  1716,  1719,  1722,  1726,  1728,  1734,  1740,  1744,  1747,
+    1750,  1753,  1757,  1759,  1761,  1763,  1765,  1769,  1773,  1777,
+    1781,  1783,  1785,  1787,  1789,  1793,  1795,  1797,  1801,  1803,
+    1805,  1809,  1812,  1815,  1817,  1821,  1825,  1829,  1833,  1837,
+    1841,  1845,  1849,  1853,  1857
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     175,     0,    -1,    -1,   176,    -1,   177,   160,    -1,   177,
+      77,   177,    77,   177,   160,    -1,   177,    77,   177,   160,
+      -1,     1,    -1,   166,    -1,   208,   179,    -1,   208,   179,
+     157,   208,   179,    -1,    55,    -1,    25,    97,   162,   207,
+     178,   161,    -1,    35,    97,   162,   207,   178,   161,    -1,
+      32,    97,    35,    -1,    34,    97,    35,    -1,   162,    25,
+     157,    25,   161,    97,     3,   162,    25,   159,   219,   157,
+      25,   159,   219,   161,   192,    -1,   162,    25,   157,    25,
+     161,    97,     4,   162,    25,   159,   219,   157,    25,   159,
+     219,   161,   192,    -1,   162,    25,   157,    25,   161,    97,
+       8,    25,   159,   219,   192,    -1,   162,    25,   157,    25,
+     161,    97,    19,    25,   162,   191,   161,    -1,    25,    97,
+      33,    70,    34,   157,    25,    97,    31,    70,    32,    -1,
+      25,    97,   178,    70,   178,   157,    25,    97,   178,    69,
+     178,   184,    -1,    25,    97,    25,   201,    25,   157,    25,
+      97,    25,   201,    25,   184,    -1,    25,    97,    25,   200,
+      25,   157,    25,    97,    25,   200,    25,   185,    -1,    25,
+      97,    76,    25,   189,    -1,   205,    76,   178,    -1,    31,
+      97,    35,    -1,    33,    97,    35,    -1,    25,    97,   194,
+     162,    25,   157,    25,   161,    -1,    25,    97,     5,   162,
+      25,   159,   219,   157,    25,   159,   219,   161,   193,    -1,
+      25,    97,     5,   162,    25,   159,   219,   157,    25,   159,
+     219,   161,    -1,    25,    97,     6,   162,    25,   159,   219,
+     157,    25,   159,   219,   161,   202,    -1,    25,    97,     7,
+     162,    25,   159,   219,   157,    25,   159,   219,   161,   203,
+      -1,    25,    97,     9,   162,    25,   157,    25,   161,    -1,
+      35,    97,    35,    97,    21,   162,    35,   161,    71,    35,
+      70,    21,   162,    35,   161,    71,    35,    -1,    25,    97,
+      25,   201,    25,   184,    -1,    25,    97,   199,   162,    25,
+     157,    25,   161,   189,    -1,   205,    69,   178,    -1,    35,
+      97,    35,   201,    35,   184,    -1,   205,   205,   219,    -1,
+     205,   178,   162,   125,   161,    -1,    35,    97,    25,   162,
+     137,   161,    -1,    35,    97,    25,   201,    25,   162,   140,
+     161,    -1,    35,    97,    25,   201,    25,   162,   141,   161,
+      -1,   205,   178,    -1,   205,    25,    -1,    25,    97,    35,
+     186,    -1,    35,    97,   219,    -1,   205,   219,    -1,    25,
+      97,   219,   187,    -1,    35,    97,    25,    -1,    25,    97,
+      25,   200,    25,   183,    -1,    25,    97,    28,   186,    -1,
+     205,    76,   178,   157,   205,    76,   178,    -1,   205,    69,
+     178,   157,   205,    69,   178,    -1,   206,   178,   195,    -1,
+      25,   102,   219,    -1,    25,   103,    25,   162,   131,   161,
+      -1,    25,   102,    25,    -1,   178,   103,   178,   195,    -1,
+      25,   103,    25,    -1,    25,   103,   219,    -1,    25,    98,
+      25,    -1,    11,   162,    25,   159,   219,   157,    25,   159,
+     219,   161,   192,    -1,   205,   178,   162,   125,   161,   157,
+     205,   178,   162,   125,   161,    -1,    25,    97,   162,    25,
+      70,    25,   161,    90,   219,    -1,    25,    97,    25,    65,
+      25,    -1,    25,    97,    25,    67,    25,    -1,    25,    97,
+      25,    70,   162,    25,    90,   219,   161,    -1,    27,    97,
+     178,   106,   178,    -1,    27,    97,   178,   111,   178,    -1,
+      27,    97,    25,   111,    25,   196,    -1,    27,    97,    25,
+     111,   219,   196,    -1,    27,    97,    25,   106,    25,    -1,
+      27,    97,    25,   106,   219,    -1,    27,    97,   178,   105,
+     178,    -1,    27,    97,    25,   105,    25,   196,    -1,    27,
+      97,    25,   105,   219,   196,    -1,    25,    97,    25,    64,
+      25,    -1,   212,    -1,    25,    97,    25,    -1,    27,    97,
+      25,    -1,    25,    97,    27,    -1,    27,   104,    27,    -1,
+      35,    97,   210,   179,    -1,    25,    97,   210,   179,    -1,
+      35,    97,   210,   179,   157,    35,    97,   210,   179,    -1,
+      25,    97,   210,   179,   157,    25,    97,   210,   179,    -1,
+     205,    86,   178,   158,    35,    -1,    35,    97,    86,    35,
+     158,    35,   190,    -1,   205,   178,    90,   219,    -1,    25,
+      97,    25,    90,   219,   188,    -1,    35,    97,    35,    90,
+     219,   190,    -1,    25,    97,    86,    25,   158,    35,   188,
+      -1,    35,    97,    18,   162,    25,   157,    35,   161,   189,
+      -1,    35,    97,    18,   162,    35,   157,    35,   161,    -1,
+      25,    97,    17,   162,    25,   157,    25,   161,    -1,    25,
+      97,    17,   162,    25,   157,    25,   161,   162,   132,   161,
+      -1,    25,    97,    16,   162,    25,   157,    35,   161,   186,
+      -1,   205,   178,    92,   219,    -1,   205,    85,   178,   158,
+      35,    -1,    35,    97,    85,    35,   158,    35,    -1,    25,
+      97,    85,    25,   158,    35,   189,    -1,    25,    97,    84,
+      25,   158,    35,    -1,   205,   178,    91,   219,    -1,    25,
+      97,    25,    91,   219,   189,    -1,    35,    97,    35,    91,
+     219,    -1,    35,    97,    35,    92,   219,   190,    -1,    25,
+      97,    25,    92,   219,   188,    -1,    35,    97,    20,    25,
+      -1,    25,    97,    10,   162,    35,   157,    35,   161,    -1,
+      35,    97,    27,    97,    87,   162,   178,   157,    25,   161,
+      -1,    35,    97,    27,    97,    68,   162,   178,   157,    25,
+     161,    -1,    35,    97,    27,    97,    68,   162,   178,   157,
+     178,   157,    27,   161,    -1,   205,    89,   178,   158,    35,
+      -1,    25,    97,    89,    25,   158,    35,    -1,   205,    89,
+     178,   158,   219,    -1,    25,    97,    89,    25,   158,   219,
+      -1,    35,    97,    22,   178,    -1,    35,    97,    22,    25,
+      -1,    35,    97,    22,    35,    -1,    35,    97,    15,   162,
+      25,   161,   180,    -1,    25,    97,    15,   162,    25,   157,
+      25,   161,   180,    -1,   149,   162,    25,   157,    25,   157,
+     178,   161,   180,    -1,   205,    87,   162,   178,   157,   178,
+     157,    27,   161,    -1,   146,   162,    25,   157,   219,   161,
+      -1,   147,   162,    25,   157,   219,   161,    -1,   145,   162,
+      25,   157,   219,   161,    -1,    27,   104,   148,   162,    25,
+     157,   219,   161,    -1,    27,    97,   148,   162,    25,   157,
+     219,   161,    -1,   156,    63,    27,    25,    97,    25,    -1,
+     156,    27,    25,    97,    25,    -1,   156,    63,    27,    56,
+     219,    -1,   156,    63,    27,    56,   219,   162,   130,   161,
+      -1,   156,    27,    56,   219,    -1,   156,    27,    56,   219,
+     162,   130,   161,    -1,    36,    -1,    38,    -1,    37,    -1,
+      39,    -1,    40,    -1,    41,    -1,    43,    -1,    46,    -1,
+      47,    -1,    48,    -1,    45,    25,    -1,    44,    25,    -1,
+      56,   162,    25,   161,    -1,    59,   162,    25,   161,    -1,
+      59,   162,    26,    70,    25,   161,    -1,    56,   162,    26,
+      70,    25,   161,    -1,    49,   219,    -1,    50,   219,    -1,
+     119,   162,    25,   161,    -1,    56,   219,    -1,    57,   219,
+      -1,    58,   219,    -1,    58,   217,    -1,    59,   219,    -1,
+      59,   217,    -1,    96,   162,    25,   157,    25,   161,    -1,
+      95,   162,    25,   157,    25,   161,    -1,    25,    97,    69,
+      25,   188,    -1,    25,    97,    62,    25,    -1,    25,    94,
+      25,    -1,    25,    94,   219,    -1,    25,    88,    25,    -1,
+      25,    93,    25,    -1,    25,    93,   219,    -1,    25,    88,
+     219,    -1,   113,   163,    25,   164,    -1,   113,   198,    -1,
+     112,   163,    25,   164,    -1,   112,   198,    -1,   114,   163,
+      25,   164,    -1,   114,   198,    -1,   115,   163,    25,   164,
+      -1,   115,   198,    -1,   122,   163,    25,   204,   164,    97,
+      25,    -1,   122,   163,    25,   201,   219,   164,    97,    25,
+      -1,   123,   163,    25,   201,   219,   164,    97,    25,    -1,
+     123,   163,    25,   204,   164,    97,    25,    -1,   123,   163,
+      25,   204,   164,    97,    35,    -1,   163,    25,   201,   219,
+     164,    97,    25,    -1,    25,    97,   123,   163,    25,   201,
+     219,   164,   186,    -1,    35,    97,   123,   163,    25,   204,
+     164,    -1,    25,    97,   123,   163,    25,   204,   164,   186,
+      -1,    25,    97,   123,   163,    25,    83,    25,   164,   186,
+      -1,    35,    97,   123,   163,    25,    83,    25,   164,    -1,
+     163,    25,   204,   164,    97,    25,    -1,   163,    25,    83,
+      25,   164,    97,    25,    -1,   123,   163,    25,    83,    25,
+     164,    97,    35,    -1,    25,    97,   122,   163,    25,   201,
+     219,   164,   186,    -1,    25,    97,   122,   163,    25,   204,
+     164,   186,    -1,    25,    97,   163,    25,    83,    25,   164,
+      -1,    25,    97,   163,    25,   201,   216,   164,    -1,    25,
+      97,   163,    25,   204,   164,    -1,   197,    97,   162,    25,
+     159,   219,   157,    25,   159,   219,   161,    -1,   197,    97,
+     162,    25,   159,   219,   161,    -1,   162,    25,   159,   219,
+     157,    25,   159,   219,   161,    97,   198,    -1,   162,    25,
+     159,   219,   161,    97,   198,    -1,   197,    97,    25,    -1,
+      23,   219,    -1,    24,    -1,    51,   162,   219,   157,   219,
+     161,    25,    -1,    51,   162,   219,   157,   219,   161,    25,
+      97,    25,    -1,    51,   162,   219,   157,   219,   161,    25,
+      97,    25,    91,   219,    -1,    52,   219,    25,    -1,    52,
+     219,    25,    97,    25,    -1,    52,   219,    25,    97,    25,
+      91,   219,    -1,    53,   168,    -1,    53,   219,    -1,    54,
+     168,    -1,    54,   219,    -1,    60,    -1,   153,    -1,   153,
+     178,    -1,   153,    25,    -1,   155,   162,    25,   161,    -1,
+     152,    -1,    42,    -1,   154,   162,    35,   157,   219,   161,
+      -1,   151,   162,    25,   157,   219,   161,    -1,   150,   162,
+      25,   157,   219,   161,    -1,   117,   219,    -1,   117,    25,
+      -1,    29,    -1,    30,    -1,    -1,   162,   134,   157,   135,
+     161,    -1,   162,   135,   157,   134,   161,    -1,   162,   135,
+     161,    -1,   162,   134,   161,    -1,   162,   120,   161,    -1,
+     162,   121,   161,    -1,    -1,   125,    -1,   126,    -1,   127,
+      -1,   120,    -1,   121,    -1,    -1,   162,   181,   161,    -1,
+      -1,   162,   124,   161,    -1,   162,   125,   161,    -1,    -1,
+     162,   182,   161,    -1,   162,   181,   161,    -1,   162,   182,
+     157,   181,   161,    -1,   162,   181,   157,   182,   161,    -1,
+      -1,   162,   133,   161,    -1,   162,   132,   161,    -1,    -1,
+     162,   132,   161,    -1,   162,   133,   161,    -1,    -1,   162,
+     124,   161,    -1,   162,   125,   161,    -1,   162,   142,   161,
+      -1,   162,   142,   157,   125,   161,    -1,   162,   125,   157,
+     142,   161,    -1,    -1,   162,   142,   161,    -1,    -1,   162,
+     125,   161,    -1,   107,    -1,   110,    -1,   109,    -1,   108,
+      -1,    -1,   162,   136,   161,    -1,   162,   136,   161,    -1,
+     162,   135,   161,    -1,   162,   135,   157,   136,   161,    -1,
+     162,   136,   157,   135,   161,    -1,    12,    -1,    13,    -1,
+      14,    -1,    -1,   162,   135,   161,    -1,    -1,   162,   135,
+     161,    -1,   163,    82,    25,   164,    -1,   163,    25,    83,
+     164,    -1,    74,    -1,    75,    -1,    78,    -1,    79,    -1,
+      80,    -1,    81,    -1,    70,    -1,    69,    -1,   162,   139,
+     161,    -1,   162,   128,   161,    -1,   162,   138,   161,    -1,
+     162,   129,   161,    -1,   162,   139,   157,   136,   161,    -1,
+     162,   128,   157,   136,   161,    -1,   162,   138,   157,   136,
+     161,    -1,   162,   129,   157,   136,   161,    -1,   162,   143,
+     161,    -1,   162,   144,   161,    -1,   162,   143,   157,   136,
+     161,    -1,   162,   144,   157,   136,   161,    -1,    -1,    83,
+      -1,    82,    -1,   178,    97,    -1,   178,   102,    -1,   178,
+     103,    -1,    25,    97,   178,    -1,   209,    -1,    25,    97,
+     162,   209,   161,    -1,    35,    97,   162,   209,   161,    -1,
+      35,    97,   178,    -1,   205,   210,    -1,   207,   210,    -1,
+     206,   210,    -1,    35,    71,    35,    -1,    97,    -1,    99,
+      -1,   101,    -1,   100,    -1,    27,   211,   165,    -1,    27,
+     211,   142,    -1,   165,   211,    27,    -1,   142,   211,    27,
+      -1,   167,    -1,   169,    -1,   170,    -1,   171,    -1,   213,
+     172,   214,    -1,   215,    -1,   219,    -1,   213,   172,   173,
+      -1,   168,    -1,   213,    -1,   162,   220,   161,    -1,    62,
+     220,    -1,    69,   220,    -1,   220,    -1,   220,    71,   220,
+      -1,   220,    72,   220,    -1,   220,    66,   220,    -1,   220,
+      70,   220,    -1,   220,    69,   220,    -1,   220,    90,   220,
+      -1,   220,    91,   220,    -1,   220,    64,   220,    -1,   220,
+      67,   220,    -1,   220,    65,   220,    -1,   218,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   646,   646,   647,   659,   661,   694,   721,   732,   736,
+     774,   794,   799,   809,   819,   824,   829,   847,   865,   879,
+     892,   908,   930,   948,   973,   995,  1000,  1010,  1021,  1032,
+    1046,  1061,  1077,  1093,  1104,  1118,  1144,  1162,  1167,  1173,
+    1185,  1196,  1207,  1218,  1229,  1240,  1251,  1277,  1291,  1301,
+    1346,  1365,  1376,  1387,  1398,  1409,  1420,  1436,  1453,  1469,
+    1480,  1491,  1524,  1535,  1548,  1559,  1598,  1608,  1618,  1638,
+    1648,  1658,  1669,  1683,  1694,  1707,  1717,  1729,  1744,  1755,
+    1761,  1783,  1794,  1805,  1813,  1839,  1869,  1898,  1929,  1943,
+    1954,  1968,  2002,  2020,  2045,  2057,  2075,  2086,  2097,  2108,
+    2121,  2132,  2143,  2154,  2165,  2176,  2209,  2219,  2232,  2252,
+    2263,  2274,  2287,  2300,  2311,  2322,  2333,  2344,  2354,  2365,
+    2376,  2388,  2399,  2410,  2424,  2437,  2449,  2461,  2472,  2483,
+    2494,  2506,  2518,  2529,  2540,  2551,  2561,  2567,  2573,  2579,
+    2585,  2591,  2597,  2603,  2609,  2615,  2621,  2632,  2643,  2654,
+    2665,  2676,  2687,  2698,  2704,  2718,  2729,  2740,  2751,  2762,
+    2772,  2785,  2793,  2801,  2825,  2836,  2847,  2858,  2869,  2880,
+    2892,  2905,  2914,  2925,  2936,  2948,  2959,  2970,  2981,  2995,
+    3007,  3033,  3063,  3074,  3099,  3136,  3164,  3189,  3200,  3211,
+    3222,  3248,  3267,  3281,  3305,  3317,  3336,  3382,  3419,  3435,
+    3454,  3468,  3487,  3503,  3511,  3520,  3531,  3543,  3557,  3565,
+    3575,  3587,  3598,  3608,  3619,  3630,  3636,  3641,  3646,  3652,
+    3660,  3666,  3672,  3678,  3684,  3690,  3698,  3712,  3716,  3726,
+    3730,  3735,  3740,  3745,  3752,  3756,  3763,  3767,  3772,  3777,
+    3785,  3789,  3796,  3800,  3808,  3813,  3819,  3828,  3833,  3839,
+    3845,  3851,  3860,  3863,  3867,  3874,  3877,  3881,  3888,  3893,
+    3899,  3905,  3911,  3916,  3924,  3927,  3934,  3937,  3944,  3948,
+    3952,  3956,  3963,  3966,  3973,  3978,  3985,  3992,  4004,  4008,
+    4012,  4019,  4022,  4032,  4035,  4044,  4050,  4059,  4063,  4070,
+    4074,  4078,  4082,  4089,  4093,  4100,  4108,  4116,  4124,  4132,
+    4139,  4146,  4154,  4164,  4169,  4174,  4179,  4187,  4190,  4194,
+    4203,  4210,  4217,  4224,  4239,  4245,  4258,  4271,  4289,  4296,
+    4303,  4313,  4326,  4330,  4334,  4338,  4345,  4351,  4357,  4363,
+    4373,  4382,  4384,  4386,  4390,  4398,  4402,  4409,  4415,  4421,
+    4425,  4429,  4433,  4439,  4445,  4449,  4453,  4457,  4461,  4465,
+    4469,  4473,  4477,  4481,  4485
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "BYTEOP16P", "BYTEOP16M", "BYTEOP1P",
+  "BYTEOP2P", "BYTEOP3P", "BYTEUNPACK", "BYTEPACK", "PACK", "SAA",
+  "ALIGN8", "ALIGN16", "ALIGN24", "VIT_MAX", "EXTRACT", "DEPOSIT",
+  "EXPADJ", "SEARCH", "ONES", "SIGN", "SIGNBITS", "LINK", "UNLINK", "REG",
+  "PC", "CCREG", "BYTE_DREG", "REG_A_DOUBLE_ZERO", "REG_A_DOUBLE_ONE",
+  "A_ZERO_DOT_L", "A_ZERO_DOT_H", "A_ONE_DOT_L", "A_ONE_DOT_H", "HALF_REG",
+  "NOP", "RTI", "RTS", "RTX", "RTN", "RTE", "HLT", "IDLE", "STI", "CLI",
+  "CSYNC", "SSYNC", "EMUEXCPT", "RAISE", "EXCPT", "LSETUP", "LOOP",
+  "LOOP_BEGIN", "LOOP_END", "DISALGNEXCPT", "JUMP", "JUMP_DOT_S",
+  "JUMP_DOT_L", "CALL", "ABORT", "NOT", "TILDA", "BANG", "AMPERSAND",
+  "BAR", "PERCENT", "CARET", "BXOR", "MINUS", "PLUS", "STAR", "SLASH",
+  "NEG", "MIN", "MAX", "ABS", "DOUBLE_BAR", "_PLUS_BAR_PLUS",
+  "_PLUS_BAR_MINUS", "_MINUS_BAR_PLUS", "_MINUS_BAR_MINUS", "_MINUS_MINUS",
+  "_PLUS_PLUS", "SHIFT", "LSHIFT", "ASHIFT", "BXORSHIFT",
+  "_GREATER_GREATER_GREATER_THAN_ASSIGN", "ROT", "LESS_LESS",
+  "GREATER_GREATER", "_GREATER_GREATER_GREATER", "_LESS_LESS_ASSIGN",
+  "_GREATER_GREATER_ASSIGN", "DIVS", "DIVQ", "ASSIGN", "_STAR_ASSIGN",
+  "_BAR_ASSIGN", "_CARET_ASSIGN", "_AMPERSAND_ASSIGN", "_MINUS_ASSIGN",
+  "_PLUS_ASSIGN", "_ASSIGN_BANG", "_LESS_THAN_ASSIGN", "_ASSIGN_ASSIGN",
+  "GE", "LT", "LE", "GT", "LESS_THAN", "FLUSHINV", "FLUSH", "IFLUSH",
+  "PREFETCH", "PRNT", "OUTC", "WHATREG", "TESTSET", "ASL", "ASR", "B", "W",
+  "NS", "S", "CO", "SCO", "TH", "TL", "BP", "BREV", "X", "Z", "M", "MMOD",
+  "R", "RND", "RNDL", "RNDH", "RND12", "RND20", "V", "LO", "HI", "BITTGL",
+  "BITCLR", "BITSET", "BITTST", "BITMUX", "DBGAL", "DBGAH", "DBGHALT",
+  "DBG", "DBGA", "DBGCMPLX", "IF", "COMMA", "BY", "COLON", "SEMICOLON",
+  "RPAREN", "LPAREN", "LBRACK", "RBRACK", "STATUS_REG", "MNOP", "SYMBOL",
+  "NUMBER", "GOT", "GOT17M4", "FUNCDESC_GOT17M4", "AT", "PLTPC", "$accept",
+  "statement", "asm", "asm_1", "REG_A", "opt_mode", "asr_asl", "sco",
+  "asr_asl_0", "amod0", "amod1", "amod2", "xpmod", "xpmod1", "vsmod",
+  "vmod", "smod", "searchmod", "aligndir", "byteop_mod", "c_align",
+  "w32_or_nothing", "iu_or_nothing", "reg_with_predec", "reg_with_postinc",
+  "min_max", "op_bar_op", "plus_minus", "rnd_op", "b3_op", "post_op",
+  "a_assign", "a_minusassign", "a_plusassign", "assign_macfunc",
+  "a_macfunc", "multiply_halfregs", "cc_op", "ccstat", "symbol",
+  "any_gotrel", "got", "got_or_expr", "pltpc", "eterm", "expr", "expr_1", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   174,   175,   175,   176,   176,   176,   176,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   178,   178,   179,
+     179,   179,   179,   179,   180,   180,   181,   181,   181,   181,
+     182,   182,   183,   183,   184,   184,   184,   185,   185,   185,
+     185,   185,   186,   186,   186,   187,   187,   187,   188,   188,
+     188,   188,   188,   188,   189,   189,   190,   190,   191,   191,
+     191,   191,   192,   192,   193,   193,   193,   193,   194,   194,
+     194,   195,   195,   196,   196,   197,   198,   199,   199,   200,
+     200,   200,   200,   201,   201,   202,   202,   202,   202,   202,
+     202,   202,   202,   203,   203,   203,   203,   204,   204,   204,
+     205,   206,   207,   208,   208,   208,   208,   208,   209,   209,
+     209,   210,   211,   211,   211,   211,   212,   212,   212,   212,
+     213,   214,   214,   214,   215,   216,   216,   217,   218,   218,
+     218,   218,   218,   219,   220,   220,   220,   220,   220,   220,
+     220,   220,   220,   220,   220
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     1,     2,     6,     4,     1,     1,     2,
+       5,     1,     6,     6,     3,     3,    17,    17,    11,    11,
+      11,    12,    12,    12,     5,     3,     3,     3,     8,    13,
+      12,    13,    13,     8,    17,     6,     9,     3,     6,     3,
+       5,     6,     8,     8,     2,     2,     4,     3,     2,     4,
+       3,     6,     4,     7,     7,     3,     3,     6,     3,     4,
+       3,     3,     3,    11,    11,     9,     5,     5,     9,     5,
+       5,     6,     6,     5,     5,     5,     6,     6,     5,     1,
+       3,     3,     3,     3,     4,     4,     9,     9,     5,     7,
+       4,     6,     6,     7,     9,     8,     8,    11,     9,     4,
+       5,     6,     7,     6,     4,     6,     5,     6,     6,     4,
+       8,    10,    10,    12,     5,     6,     5,     6,     4,     4,
+       4,     7,     9,     9,     9,     6,     6,     6,     8,     8,
+       6,     5,     5,     8,     4,     7,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     4,     4,
+       6,     6,     2,     2,     4,     2,     2,     2,     2,     2,
+       2,     6,     6,     5,     4,     3,     3,     3,     3,     3,
+       3,     4,     2,     4,     2,     4,     2,     4,     2,     7,
+       8,     8,     7,     7,     7,     9,     7,     8,     9,     8,
+       6,     7,     8,     9,     8,     7,     7,     6,    11,     7,
+      11,     7,     3,     2,     1,     7,     9,    11,     3,     5,
+       7,     2,     2,     2,     2,     1,     1,     2,     2,     4,
+       1,     1,     6,     6,     6,     2,     2,     1,     1,     0,
+       5,     5,     3,     3,     3,     3,     0,     1,     1,     1,
+       1,     1,     0,     3,     0,     3,     3,     0,     3,     3,
+       5,     5,     0,     3,     3,     0,     3,     3,     0,     3,
+       3,     3,     5,     5,     0,     3,     0,     3,     1,     1,
+       1,     1,     0,     3,     3,     3,     5,     5,     1,     1,
+       1,     0,     3,     0,     3,     4,     4,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     3,     3,     3,     5,
+       5,     5,     5,     3,     3,     5,     5,     0,     1,     1,
+       2,     2,     2,     3,     1,     5,     5,     3,     2,     2,
+       2,     3,     1,     1,     1,     1,     3,     3,     3,     3,
+       1,     1,     1,     1,     3,     1,     1,     3,     1,     1,
+       3,     2,     2,     1,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint16 yydefact[] =
+{
+       0,     7,     0,     0,   204,     0,     0,   227,   228,     0,
+       0,     0,     0,     0,   136,   138,   137,   139,   140,   141,
+     221,   142,     0,     0,   143,   144,   145,     0,     0,     0,
+       0,     0,     0,    11,     0,     0,     0,     0,   215,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   220,   216,     0,     0,
+       0,     0,     0,     0,     8,     0,     3,     0,     0,     0,
+       0,     0,     0,   229,   314,    79,     0,     0,     0,     0,
+     330,   338,   339,   354,   203,   343,     0,     0,     0,     0,
+       0,     0,     0,   322,   323,   325,   324,     0,     0,     0,
+       0,     0,     0,     0,   147,   146,   152,   153,     0,     0,
+     338,   212,   338,   214,     0,   155,   156,   339,   158,   157,
+       0,   160,   159,     0,     0,     0,   174,     0,   172,     0,
+     176,     0,   178,   226,   225,     0,     0,     0,   322,     0,
+       0,     0,     0,     0,     0,     0,   218,   217,     0,     0,
+       0,     0,     0,   307,     0,     0,     1,     0,     4,   310,
+     311,   312,     0,    45,     0,     0,     0,     0,     0,     0,
+       0,    44,     0,   318,    48,   281,   320,   319,     0,     9,
+       0,   341,   342,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   167,   170,   168,   169,   165,   166,
+       0,     0,     0,     0,     0,   278,   279,   280,     0,     0,
+       0,    80,    82,   252,     0,   252,     0,     0,   287,   288,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   313,
+       0,     0,   229,   255,    62,    58,    56,    60,    61,    81,
+       0,     0,    83,     0,   327,   326,    26,    14,    27,    15,
+       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
+       0,   317,   229,    47,     0,   208,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   307,   307,
+     329,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   294,   293,   309,   308,     0,     0,
+       0,   328,     0,   281,   202,     0,     0,    37,    25,     0,
+       0,     0,     0,     0,     0,     0,     0,    39,     0,    55,
+       0,     0,     0,     0,   340,   351,   353,   346,   352,   348,
+     347,   344,   345,   349,   350,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   293,   289,   290,   291,
+     292,     0,     0,     0,     0,     0,     0,    52,     0,    46,
+     164,   258,   264,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   307,     0,     0,     0,    85,
+       0,    49,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   109,   119,   120,   118,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      84,     0,     0,   148,     0,   337,   149,     0,     0,     0,
+       0,   173,   171,   175,   177,   154,   308,     0,     0,   308,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   219,
+       0,   134,     0,     0,     0,     0,     0,     0,     0,   285,
+       0,     6,    59,     0,   321,     0,     0,     0,     0,     0,
+       0,    90,   104,    99,     0,     0,     0,   233,     0,   232,
+       0,     0,   229,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    78,    66,    67,     0,   258,   264,   258,   242,
+     244,     0,     0,     0,     0,   163,     0,    24,     0,     0,
+       0,     0,   307,   307,     0,   312,     0,   315,   308,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   283,   283,
+      73,    74,   283,   283,     0,    75,    69,    70,     0,     0,
+       0,     0,     0,     0,     0,     0,   266,   106,   266,     0,
+     244,     0,     0,   307,     0,   316,     0,     0,   209,     0,
+       0,     0,     0,   286,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   131,     0,     0,   132,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   100,    88,     0,   114,   116,    40,   282,     0,     0,
+       0,     0,    10,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    91,   105,   108,     0,   236,    51,     0,
+       0,    35,   254,   253,     0,     0,     0,     0,     0,   103,
+     264,   258,   115,   117,     0,     0,   308,     0,     0,     0,
+      12,     0,   339,   335,     0,   336,   197,     0,     0,     0,
+       0,   256,   257,    57,     0,    76,    77,    71,    72,     0,
+       0,     0,     0,     0,    41,     0,     0,     0,     0,    92,
+     107,     0,    38,   101,   266,   308,     0,    13,     0,     0,
+       0,   151,   150,   162,   161,     0,     0,     0,     0,     0,
+     127,   125,   126,     0,   224,   223,   222,     0,   130,     0,
+       0,     0,     0,     0,     0,   190,     5,     0,     0,     0,
+       0,     0,   230,   231,     0,   313,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   237,   238,
+     239,     0,     0,     0,     0,     0,   259,     0,   260,     0,
+     261,   265,   102,    93,     0,   252,     0,     0,   252,     0,
+     195,     0,   196,     0,     0,     0,     0,     0,     0,     0,
+       0,   121,     0,     0,     0,     0,     0,     0,     0,     0,
+      89,     0,   186,     0,   205,   210,     0,   179,     0,     0,
+     182,   183,     0,   135,     0,     0,     0,     0,     0,     0,
+       0,   201,   191,   184,     0,   199,    54,    53,     0,     0,
+       0,     0,     0,     0,    33,   110,     0,   252,    96,     0,
+       0,   243,     0,   245,   246,     0,     0,     0,   252,   194,
+     252,   252,   187,     0,   331,   332,   333,   334,     0,    28,
+     264,   229,   284,   129,   128,     0,     0,   264,    95,    42,
+      43,     0,     0,   267,     0,   189,   229,     0,   180,   192,
+     181,     0,   133,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   122,    98,     0,    68,
+       0,     0,     0,   263,   262,   193,   188,   185,    65,     0,
+      36,    87,   234,   235,    94,     0,     0,     0,     0,    86,
+     206,   123,     0,     0,     0,     0,     0,     0,   124,     0,
+     272,     0,     0,     0,     0,     0,     0,     0,     0,   112,
+       0,   111,     0,     0,     0,     0,   272,   268,   271,   270,
+     269,     0,     0,     0,     0,     0,    63,     0,     0,     0,
+      97,   247,   244,    20,   244,     0,     0,   207,     0,     0,
+      18,    19,   200,   198,    64,     0,    30,     0,     0,   236,
+      23,    22,    21,   113,     0,     0,     0,   273,     0,    29,
+       0,    31,     0,    32,   240,   241,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     249,   236,   248,     0,     0,     0,     0,   275,     0,   274,
+       0,   296,     0,   298,     0,   297,     0,   295,     0,   303,
+       0,   304,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   251,   250,     0,   272,   272,
+     276,   277,   300,   302,   301,   299,   305,   306,    34,    16,
+      17
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    65,    66,    67,   370,   179,   751,   721,   957,   608,
+     611,   940,   357,   381,   495,   497,   659,   911,   916,   949,
+     230,   319,   645,    69,   126,   231,   354,   298,   951,   953,
+     299,   371,   372,    72,    73,    74,   177,    98,    75,    82,
+     817,   633,   634,   118,    83,    84,    85
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -869
+static const yytype_int16 yypact[] =
+{
+     862,  -869,   -96,   -14,  -869,   653,   618,  -869,  -869,   -22,
+      -7,    20,    71,    85,  -869,  -869,  -869,  -869,  -869,  -869,
+    -869,  -869,    58,   176,  -869,  -869,  -869,   -14,   -14,    48,
+     -14,   167,   231,  -869,   327,   -14,   -14,   376,  -869,    53,
+      56,    94,    96,   120,   126,   114,    64,   139,   144,   419,
+     115,   171,   185,   199,   207,   230,  -869,   324,   250,   258,
+      43,   358,    25,   419,  -869,   387,  -869,   -39,    13,   325,
+     223,   245,   390,   300,  -869,  -869,   443,   -14,   -14,   -14,
+    -869,  -869,  -869,  -869,  -869,   582,   152,   170,   178,   496,
+     453,   203,   259,     7,  -869,  -869,  -869,    26,   -46,   448,
+     455,   458,   464,   111,  -869,  -869,  -869,  -869,   -14,   463,
+     -10,  -869,    -9,  -869,    32,  -869,  -869,   308,  -869,  -869,
+     102,  -869,  -869,   479,   492,   497,  -869,   505,  -869,   508,
+    -869,   523,  -869,  -869,  -869,   526,   541,   561,  -869,   530,
+     567,   581,   586,   602,   611,   625,  -869,  -869,   549,   632,
+      57,   589,   221,   172,   637,   614,  -869,  1008,  -869,  -869,
+    -869,   365,     4,  -869,   584,   394,   365,   365,   365,   498,
+     365,    -6,   -14,  -869,  -869,   507,  -869,  -869,   301,   510,
+     519,  -869,  -869,   524,   -14,   -14,   -14,   -14,   -14,   -14,
+     -14,   -14,   -14,   -14,  -869,  -869,  -869,  -869,  -869,  -869,
+     548,   554,   563,   576,   583,  -869,  -869,  -869,   587,   592,
+     597,   601,  -869,   598,   673,   -19,   279,   293,  -869,  -869,
+     663,   698,   719,   723,   728,   594,   599,    63,   733,   691,
+     603,   604,   300,   605,  -869,  -869,  -869,   606,  -869,   225,
+     607,   271,  -869,   608,  -869,  -869,  -869,  -869,  -869,  -869,
+     609,   610,   739,   208,   -25,   676,   538,   740,   741,   615,
+     394,  -869,   300,  -869,   617,   680,   620,   709,   612,   621,
+     710,   626,   627,   -41,    -3,    14,    17,   628,   281,   349,
+    -869,   631,   633,   634,   636,   638,   639,   640,   641,   690,
+     -14,    62,   767,   -14,  -869,  -869,  -869,   769,   -14,   643,
+     644,  -869,    -8,   507,  -869,   773,   764,   646,   647,   648,
+     651,   365,   652,   -14,   -14,   -14,   675,  -869,   666,  -869,
+     134,   166,   276,   -14,  -869,   630,   642,  -869,   483,   368,
+     368,  -869,  -869,   532,   532,   780,   786,   787,   788,   779,
+     790,   791,   792,   793,   794,   795,   659,  -869,  -869,  -869,
+    -869,   -14,   -14,   -14,   797,   798,   318,  -869,   799,  -869,
+    -869,   662,   664,   667,   669,   670,   671,   806,   807,   765,
+     340,   390,   390,   245,   677,   384,   365,   809,   811,   682,
+     493,  -869,   706,   297,   317,   319,   815,   365,   365,   365,
+     816,   817,   226,  -869,  -869,  -869,  -869,   707,   818,    37,
+     -14,   -14,   -14,   824,   812,   688,   692,   823,   245,   693,
+     694,   -14,   827,  -869,   828,  -869,  -869,   830,   831,   833,
+     685,  -869,  -869,  -869,  -869,  -869,  -869,   -14,   697,   842,
+     -14,   704,   -14,   -14,   -14,   844,   -14,   -14,   -14,  -869,
+     845,   712,   774,   -14,   714,   182,   715,   716,   785,  -869,
+    1008,  -869,  -869,   724,  -869,   365,   365,   849,   853,   766,
+     100,  -869,  -869,  -869,   729,   763,   796,  -869,   800,  -869,
+     829,   832,   300,   768,   771,   776,   777,   770,   775,   781,
+     783,   784,  -869,  -869,  -869,   903,   662,   664,   662,   -58,
+     -15,   772,   782,   789,    33,  -869,   802,  -869,   902,   907,
+     910,   472,   281,   445,   924,  -869,   801,  -869,   925,   -14,
+     803,   804,   808,   813,   926,   805,   810,   819,   820,   820,
+    -869,  -869,   820,   820,   821,  -869,  -869,  -869,   826,   825,
+     834,   835,   836,   837,   838,   839,   840,  -869,   840,   841,
+     843,   917,   918,   562,   859,  -869,   919,   860,   864,   861,
+     865,   868,   869,  -869,   846,   863,   870,   872,   866,   908,
+     909,   911,   914,   912,   913,   915,  -869,   857,   931,   916,
+     867,   934,   871,   875,   876,   944,   920,   -14,   891,   921,
+     922,  -869,  -869,   365,  -869,  -869,   927,  -869,   928,   929,
+       5,    10,  -869,   964,   -14,   -14,   -14,   968,   959,   970,
+     961,   981,   933,  -869,  -869,  -869,  1050,   119,  -869,  1052,
+     559,  -869,  -869,  -869,  1054,   930,   211,   247,   932,  -869,
+     664,   662,  -869,  -869,   -14,   923,  1056,   -14,   935,   936,
+    -869,   937,   938,  -869,   941,  -869,  -869,  1057,  1058,  1060,
+     989,  -869,  -869,  -869,   953,  -869,  -869,  -869,  -869,   -14,
+     -14,   940,  1059,  1061,  -869,   546,   365,   365,   967,  -869,
+    -869,  1063,  -869,  -869,   840,  1070,   942,  -869,  1003,  1082,
+     -14,  -869,  -869,  -869,  -869,  1011,  1084,  1014,  1015,   278,
+    -869,  -869,  -869,   365,  -869,  -869,  -869,   952,  -869,   984,
+     216,   956,   954,  1091,  1093,  -869,  -869,   287,   365,   365,
+     962,   365,  -869,  -869,   365,  -869,   365,   965,   969,   971,
+     972,   973,   974,   975,   976,   977,   -14,  1035,  -869,  -869,
+    -869,   978,  1036,   979,   980,  1045,  -869,  1001,  -869,  1019,
+    -869,  -869,  -869,  -869,   982,   598,   983,   985,   598,  1055,
+    -869,   407,  -869,  1051,   990,   991,   390,   995,  1004,  1005,
+     574,  -869,  1006,  1007,  1016,  1017,  1012,  1018,  1020,  1021,
+    -869,  1022,  -869,   390,  1075,  -869,  1151,  -869,  1144,  1155,
+    -869,  -869,  1023,  -869,  1024,  1025,  1026,  1158,  1164,   -14,
+    1165,  -869,  -869,  -869,  1166,  -869,  -869,  -869,  1167,   365,
+     -14,  1168,  1170,  1171,  -869,  -869,   940,   598,  1030,  1037,
+    1172,  -869,  1174,  -869,  -869,  1169,  1040,  1041,   598,  -869,
+     598,   598,  -869,   -14,  -869,  -869,  -869,  -869,   365,  -869,
+     664,   300,  -869,  -869,  -869,  1042,  1043,   664,  -869,  -869,
+    -869,   372,  1180,  -869,  1135,  -869,   300,  1182,  -869,  -869,
+    -869,   940,  -869,  1183,  1184,  1053,  1048,  1062,  1128,  1065,
+    1064,  1066,  1068,  1067,  1071,  1072,  -869,  -869,  1081,  -869,
+     596,   635,  1145,  -869,  -869,  -869,  -869,  -869,  -869,  1147,
+    -869,  -869,  -869,  -869,  -869,  1073,  1076,  1074,  1179,  -869,
+    1126,  -869,  1077,  1078,   -14,   619,  1121,   -14,  -869,  1094,
+    1079,   -14,   -14,   -14,  1083,  1195,  1196,  1190,   365,  -869,
+    1200,  -869,  1162,   -14,   -14,   -14,  1079,  -869,  -869,  -869,
+    -869,  1085,   954,  1086,  1087,  1102,  -869,  1088,  1089,  1090,
+    -869,  1080,   843,  -869,   843,  1092,  1218,  -869,  1095,  1097,
+    -869,  -869,  -869,  -869,  -869,  1096,  1098,  1099,  1100,   350,
+    -869,  -869,  -869,  -869,  1101,  1215,  1220,  -869,   595,  -869,
+      84,  -869,   591,  -869,  -869,  -869,   312,   375,  1208,  1105,
+    1106,   378,   402,   403,   418,   426,   460,   476,   481,   616,
+    -869,   119,  -869,  1107,   -14,   -14,  1119,  -869,  1123,  -869,
+    1120,  -869,  1130,  -869,  1131,  -869,  1133,  -869,  1134,  -869,
+    1136,  -869,  1110,  1112,  1188,  1113,  1114,  1115,  1116,  1117,
+    1118,  1122,  1124,  1125,  1127,  -869,  -869,  1245,  1079,  1079,
+    -869,  -869,  -869,  -869,  -869,  -869,  -869,  -869,  -869,  -869,
+    -869
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -869,  -869,  -869,  -133,    41,  -216,  -733,  -868,   313,  -869,
+    -509,  -869,  -198,  -869,  -458,  -460,  -515,  -869,  -804,  -869,
+    -869,   986,    23,  -869,   -31,  -869,   421,  -205,  -869,  -869,
+    -253,     2,    22,  -171,   987,  -206,   -56,    46,  -869,   -17,
+    -869,  -869,  -869,  1247,  -869,   -27,     0
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -214
+static const yytype_int16 yytable[] =
+{
+     106,   107,    70,   109,   111,   113,   355,   115,   116,   119,
+     122,   128,   130,   132,   173,   176,   379,   359,   134,   117,
+     117,   374,    71,   660,   302,   428,   431,   604,   603,   304,
+     605,   662,   239,   232,     7,     8,     7,     8,   157,     7,
+       8,    68,   420,   174,   294,   295,   410,   262,    77,   398,
+     153,   404,   306,   242,   409,    78,   373,   266,   267,   195,
+     197,   199,   233,   856,   236,   238,    76,  -211,  -213,   450,
+     150,   956,   172,   427,   430,    99,   263,   181,   182,   183,
+     420,   264,   289,   104,   313,   314,   315,   442,   369,   408,
+     100,   159,     7,     8,    77,   139,   244,   420,   147,   606,
+     420,    78,   930,   993,   607,   534,   151,   154,   881,   155,
+     159,   171,   175,   290,   183,   160,   161,   101,   443,   245,
+     183,   158,   510,   421,   535,    77,   250,   269,   270,   251,
+     229,   252,    78,   253,   241,   584,   254,   397,   255,   133,
+       7,     8,   609,   356,   261,   317,   256,   610,    79,   760,
+    -211,  -213,   451,    80,    81,   240,   316,   615,   616,    70,
+     732,   422,    77,   733,    77,   182,   305,   704,   102,    78,
+     509,    78,   706,    77,   243,   617,    77,   194,   423,    71,
+      78,   424,   103,    78,   325,   326,   327,   328,   329,   330,
+     331,   332,   333,   334,    79,   196,   257,   258,    68,    80,
+      81,   105,   303,   198,  1019,  1020,   307,   308,   309,   310,
+     108,   312,   963,   964,    77,   123,   181,   182,   124,   775,
+     776,    78,   965,   966,   777,    79,   135,   183,   235,    77,
+      80,    81,    77,   394,   259,   778,    78,     7,     8,    78,
+      77,   294,   295,   395,   718,   719,   720,    78,   163,   625,
+     628,   530,     7,     8,   296,   297,   592,   125,   164,   127,
+     183,   531,    79,   441,    79,    77,   445,    80,    81,    80,
+      81,   447,    78,   260,     7,     8,    79,   140,    80,    81,
+     164,    80,    81,   129,   237,    77,   461,   462,   463,   131,
+     666,   466,   165,    77,   396,   467,   473,   624,   627,   166,
+      78,   470,   136,   770,   360,     7,     8,   137,   167,   168,
+     169,   471,   170,   771,    79,   173,   176,   576,   361,    80,
+      81,    77,   518,   468,   486,   487,   488,   469,    78,    79,
+     383,   384,    79,   141,    80,   110,   385,    80,    81,   571,
+      79,    77,   520,   572,   522,    80,    81,   142,    78,   146,
+     294,   295,   459,     7,     8,    77,   519,   521,   523,    77,
+     870,   143,    78,   296,   426,    79,    78,   874,   727,   144,
+      80,    81,   728,   536,   537,   538,   387,   388,   292,    77,
+     293,    77,   389,   152,   547,    79,    78,   156,    78,    77,
+      80,    81,   145,    79,     7,     8,    78,   875,    80,   112,
+     554,     7,     8,   557,   729,   559,   560,   561,   730,   563,
+     564,   565,   148,   941,   506,   942,   569,   511,   294,   295,
+     149,    79,   162,     7,     8,   164,    80,    81,   525,   526,
+     527,   296,   429,   585,   186,   320,   321,   159,    77,   190,
+     191,    79,   160,   505,   784,    78,    80,    81,   785,   544,
+     491,   492,    70,   294,   295,    79,    77,   579,   580,    79,
+      80,    81,   178,    78,    80,    81,   296,   508,   180,   969,
+     954,   955,    71,   970,   623,   718,   719,   720,   234,    79,
+     268,    79,   635,   246,    80,    81,    80,    81,   265,   114,
+     247,    68,   632,   248,    80,    81,   578,   578,   374,   249,
+     409,   200,   201,   202,   271,   203,   204,   622,   205,   206,
+     207,   208,   209,   210,   294,   295,   138,   272,    94,    95,
+      96,   211,   273,   212,   213,     7,     8,   296,   626,   214,
+     274,   215,   971,   275,    77,   976,   972,   809,   120,   977,
+     812,    78,   646,    80,    81,   647,   648,   184,   276,   186,
+     697,   277,   188,   189,   190,   191,    79,   280,   216,   978,
+     980,    80,    81,   979,   981,   217,   278,   708,   709,   710,
+     218,   219,   220,   192,   193,   982,   814,   815,   816,   983,
+     221,   222,   223,   984,   287,   224,   279,   985,   184,   185,
+     186,   187,   281,   188,   189,   190,   191,   734,   186,   857,
+     737,   188,   189,   190,   191,   871,   282,   294,   295,   306,
+     865,   283,   866,   867,   192,   193,   291,   986,   225,   226,
+     879,   987,   748,   749,   700,   515,   516,   284,   400,   401,
+     402,   705,   261,   988,    79,   403,   285,   989,   990,    80,
+      81,   301,   991,   765,   296,   665,   184,   185,   186,   187,
+     286,   188,   189,   190,   191,   306,   896,   288,   227,   228,
+     311,   781,   300,    80,    81,   343,   344,   322,   345,   318,
+     294,   346,   192,   193,   347,   348,   349,   350,   323,   347,
+     348,   349,   350,   723,   724,   324,   754,   755,   362,   799,
+     821,   351,   352,   353,   825,   826,   186,   756,   757,   188,
+     189,   190,   191,   789,   294,   295,   184,   836,   186,   187,
+     335,   188,   189,   190,   191,    93,   336,    94,    95,    96,
+     192,   193,    97,   363,   772,   337,   907,   908,   909,   910,
+     961,   962,   192,   193,   967,   968,   954,   955,   338,   786,
+     787,    86,   578,   358,   364,   339,    87,    88,   365,   340,
+      89,    90,   847,   366,   341,    91,    92,   367,   375,   342,
+     356,   376,   368,   852,   393,   377,   378,   380,   382,   386,
+     390,   391,   392,   399,   411,   405,   406,   412,   407,   414,
+     417,   413,   416,   418,   419,   415,   868,   440,   432,   425,
+     433,   434,   444,   435,   446,   436,   437,   438,   453,   454,
+     464,   465,   439,   455,   456,   474,   457,   448,   449,   458,
+     460,   475,   476,   477,   478,   479,   480,   481,   482,   483,
+     484,   485,   489,   490,   494,   498,   496,   499,   500,   501,
+     851,   502,   503,   493,   512,   504,   513,   517,   507,   514,
+     524,   528,   529,   533,   532,   539,   541,   540,   543,   553,
+     542,   546,   548,   549,   545,   550,   551,   906,   552,   869,
+     913,   555,    -2,     1,   917,   918,   919,   556,   558,   562,
+     566,   568,   876,     2,   567,   570,   927,   928,   929,   573,
+     574,   932,   575,   577,   581,     3,     4,     5,   582,     6,
+     586,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,   583,   587,   593,   590,   597,   602,   591,
+     594,   588,   598,   612,   589,   595,   596,   619,   599,   924,
+     600,   601,   620,   613,   618,   621,   614,   995,   996,   629,
+     631,   640,   663,   664,   668,   670,   688,    39,    40,   691,
+     676,   637,   630,   679,   690,   638,   641,   636,   692,   695,
+     639,   642,   693,   694,    41,    42,    43,    44,   649,    45,
+     643,    46,   644,   650,    47,    48,   651,   687,   159,   707,
+     698,   652,   653,   711,   712,   713,   714,   654,   699,   655,
+     656,   657,   658,   661,    49,   610,   715,    50,    51,    52,
+     675,    53,    54,    55,    56,    57,    58,    59,    60,     2,
+     667,   669,   671,   716,    61,    62,   672,    63,    64,   673,
+     674,     3,     4,     5,   677,     6,   678,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,   680,
+     681,   683,   682,   684,   685,   717,   686,   722,   689,   725,
+     696,   736,   743,   744,   701,   745,   746,   735,   747,   702,
+     703,   726,   758,   731,   752,   761,   753,   739,   759,   738,
+     763,   740,   750,    39,    40,   742,   762,   764,   766,   767,
+     741,   768,   769,   773,   774,   779,   782,   780,   783,   788,
+      41,    42,    43,    44,   790,    45,   791,    46,   792,   793,
+      47,    48,   800,   802,   794,   795,   796,   797,   798,   801,
+     803,   804,   805,   806,   807,   813,   808,   810,   818,   811,
+      49,   819,   820,    50,    51,    52,   822,    53,    54,    55,
+      56,    57,    58,    59,    60,   823,   824,   827,   828,   831,
+      61,    62,   837,    63,    64,   832,   838,   829,   830,   839,
+     840,   833,   834,   845,   841,   842,   835,   843,   844,   846,
+     848,   849,   858,   853,   850,   854,   855,   860,   859,   861,
+     862,   863,   864,   872,   873,   877,   878,   880,   882,   883,
+     885,   420,   884,   894,   902,   897,   898,   903,   912,   914,
+     921,   922,   923,   886,   887,   888,   891,   925,   889,   890,
+     892,   893,   926,   900,   899,   901,   904,   905,   935,   944,
+     959,   915,   939,   973,   920,   960,   931,   933,   934,   936,
+     937,   938,   945,   943,   946,   997,   999,   947,   998,  1007,
+     948,   950,   952,   958,   974,   975,  1000,  1001,   994,  1002,
+    1003,  1005,  1004,  1006,  1008,  1009,  1010,  1011,  1012,  1013,
+    1018,   895,   992,  1014,   121,  1015,  1016,     0,  1017,   452,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   472
+};
+
+static const yytype_int16 yycheck[] =
+{
+      27,    28,     0,    30,    31,    32,   211,    34,    35,    36,
+      37,    42,    43,    44,    70,    71,   232,   215,    45,    36,
+      37,   227,     0,   538,   157,   278,   279,   487,   486,    25,
+     488,   540,    25,    89,    29,    30,    29,    30,    77,    29,
+      30,     0,    83,    70,    69,    70,   262,   103,    62,   254,
+      25,   256,    71,    27,   260,    69,   227,    25,    26,    86,
+      87,    88,    89,   796,    91,    92,   162,    77,    77,    77,
+      27,   939,    70,   278,   279,    97,   103,    77,    78,    79,
+      83,   108,    25,    25,    90,    91,    92,    25,    25,   260,
+      97,    97,    29,    30,    62,    49,   142,    83,    57,   157,
+      83,    69,   906,   971,   162,    68,    63,    82,   841,    63,
+      97,    70,    71,    56,   114,   102,   103,    97,    56,   165,
+     120,   160,   375,   164,    87,    62,    15,    25,    26,    18,
+      89,    20,    69,    22,    93,    35,    25,   162,    27,    25,
+      29,    30,   157,   162,   103,   172,    35,   162,   162,   664,
+     160,   160,   160,   167,   168,   148,   162,   124,   125,   157,
+     620,   164,    62,   621,    62,   165,   162,   162,    97,    69,
+     375,    69,   162,    62,   148,   142,    62,    25,   164,   157,
+      69,   164,    97,    69,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   162,    25,    85,    86,   157,   167,
+     168,    25,   161,    25,  1008,  1009,   165,   166,   167,   168,
+     162,   170,   128,   129,    62,   162,   216,   217,   162,     3,
+       4,    69,   138,   139,     8,   162,   162,   227,    25,    62,
+     167,   168,    62,    25,   123,    19,    69,    29,    30,    69,
+      62,    69,    70,    35,   125,   126,   127,    69,    25,   502,
+     503,    25,    29,    30,    82,    83,   472,   163,    35,   163,
+     260,    35,   162,   290,   162,    62,   293,   167,   168,   167,
+     168,   298,    69,   162,    29,    30,   162,   162,   167,   168,
+      35,   167,   168,   163,    25,    62,   313,   314,   315,   163,
+     543,   157,    69,    62,   253,   161,   323,   502,   503,    76,
+      69,    25,   163,    25,    25,    29,    30,   163,    85,    86,
+      87,    35,    89,    35,   162,   371,   372,   450,    25,   167,
+     168,    62,    25,   157,   351,   352,   353,   161,    69,   162,
+     105,   106,   162,   162,   167,   168,   111,   167,   168,   157,
+     162,    62,    25,   161,    25,   167,   168,   162,    69,    25,
+      69,    70,   311,    29,    30,    62,   383,   384,   385,    62,
+     820,   162,    69,    82,    83,   162,    69,   827,   157,   162,
+     167,   168,   161,   400,   401,   402,   105,   106,   157,    62,
+     159,    62,   111,    25,   411,   162,    69,     0,    69,    62,
+     167,   168,   162,   162,    29,    30,    69,    25,   167,   168,
+     427,    29,    30,   430,   157,   432,   433,   434,   161,   436,
+     437,   438,   162,   922,   373,   924,   443,   376,    69,    70,
+     162,   162,    97,    29,    30,    35,   167,   168,   387,   388,
+     389,    82,    83,   460,    66,   134,   135,    97,    62,    71,
+      72,   162,   102,   103,   157,    69,   167,   168,   161,   408,
+     132,   133,   450,    69,    70,   162,    62,   455,   456,   162,
+     167,   168,   162,    69,   167,   168,    82,    83,    25,   157,
+     120,   121,   450,   161,   501,   125,   126,   127,    25,   162,
+     172,   162,   509,    35,   167,   168,   167,   168,    25,   162,
+      35,   450,   509,    35,   167,   168,   455,   456,   704,    35,
+     706,     5,     6,     7,    25,     9,    10,    35,    12,    13,
+      14,    15,    16,    17,    69,    70,    97,    25,    99,   100,
+     101,    25,    25,    27,    28,    29,    30,    82,    83,    33,
+      25,    35,   157,    25,    62,   157,   161,   735,   162,   161,
+     738,    69,   519,   167,   168,   522,   523,    64,    25,    66,
+     577,    25,    69,    70,    71,    72,   162,    27,    62,   157,
+     157,   167,   168,   161,   161,    69,    25,   594,   595,   596,
+      74,    75,    76,    90,    91,   157,   169,   170,   171,   161,
+      84,    85,    86,   157,    35,    89,    25,   161,    64,    65,
+      66,    67,    25,    69,    70,    71,    72,   624,    66,   797,
+     627,    69,    70,    71,    72,   821,    25,    69,    70,    71,
+     808,    25,   810,   811,    90,    91,    27,   157,   122,   123,
+     836,   161,   649,   650,   583,   132,   133,    25,    90,    91,
+      92,   590,   591,   157,   162,    97,    25,   161,   157,   167,
+     168,    27,   161,   670,    82,    83,    64,    65,    66,    67,
+      25,    69,    70,    71,    72,    71,   861,    25,   162,   163,
+     162,   692,    25,   167,   168,    64,    65,   157,    67,   162,
+      69,    70,    90,    91,    78,    79,    80,    81,   159,    78,
+      79,    80,    81,   124,   125,   161,   140,   141,    25,   716,
+     746,    90,    91,    92,   120,   121,    66,   656,   657,    69,
+      70,    71,    72,   701,    69,    70,    64,   763,    66,    67,
+     162,    69,    70,    71,    72,    97,   162,    99,   100,   101,
+      90,    91,   104,    25,   683,   162,   107,   108,   109,   110,
+     135,   136,    90,    91,   143,   144,   120,   121,   162,   698,
+     699,    88,   701,    70,    25,   162,    93,    94,    25,   162,
+      97,    98,   779,    25,   162,   102,   103,   163,    25,   162,
+     162,    70,   163,   790,    25,   162,   162,   162,   162,   162,
+     162,   162,   162,    97,   157,    35,    35,    97,   163,    70,
+      70,   161,   161,   157,   157,   173,   813,    97,   157,   161,
+     157,   157,    25,   157,    25,   157,   157,   157,    25,    35,
+     125,   135,   161,   157,   157,    25,   158,   164,   164,   158,
+     158,    25,    25,    25,    35,    25,    25,    25,    25,    25,
+      25,   162,    25,    25,   162,   158,   162,   158,   158,   158,
+     789,    25,    25,    34,    25,    70,    25,   131,   161,   157,
+      25,    25,    25,    25,   137,    21,   158,    35,    25,   164,
+     158,   157,    25,    25,   161,    25,    25,   884,    25,   818,
+     887,   164,     0,     1,   891,   892,   893,    25,   164,    25,
+      25,    97,   831,    11,   162,   161,   903,   904,   905,   164,
+     164,   912,    97,   159,    35,    23,    24,    25,    35,    27,
+     161,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,   157,   161,   157,    97,   157,    25,    97,
+     159,   135,   157,   161,   134,   159,   159,    35,   157,   898,
+     157,   157,    35,   161,   142,    35,   157,   974,   975,    25,
+      25,    25,    35,    35,    35,    91,    25,    95,    96,    25,
+      97,   157,   161,    97,    97,   157,   161,   164,    97,    25,
+     157,   161,    97,    97,   112,   113,   114,   115,   157,   117,
+     161,   119,   162,   157,   122,   123,   161,   130,    97,    25,
+      69,   157,   157,    25,    35,    25,    35,   161,    76,   162,
+     162,   162,   162,   162,   142,   162,    25,   145,   146,   147,
+     164,   149,   150,   151,   152,   153,   154,   155,   156,    11,
+     161,   161,   161,    90,   162,   163,   161,   165,   166,   161,
+     161,    23,    24,    25,   164,    27,   164,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,   161,
+     161,   157,   161,   161,   161,    25,   161,    25,   162,    25,
+     160,    25,    25,    25,   157,    25,    97,   164,   135,   161,
+     161,   161,   125,   161,    35,    25,    35,   161,    35,   164,
+      97,   164,   162,    95,    96,   164,   164,    25,    97,    25,
+     172,    97,    97,   161,   130,   159,    25,   163,    25,   157,
+     112,   113,   114,   115,   159,   117,   157,   119,   157,   157,
+     122,   123,    97,    97,   161,   161,   161,   161,   161,   161,
+     161,   161,    97,   142,   125,    90,   164,   164,    97,   164,
+     142,   161,   161,   145,   146,   147,   161,   149,   150,   151,
+     152,   153,   154,   155,   156,   161,   161,   161,   161,   157,
+     162,   163,    97,   165,   166,   157,    25,   161,   161,    35,
+      25,   161,   161,    25,   161,   161,   164,   162,   162,    25,
+      25,    25,   162,    25,    27,    25,    25,    25,   161,    25,
+      31,   161,   161,   161,   161,    25,    71,    25,    25,    25,
+     162,    83,   159,   132,    35,    70,    69,    91,    97,   125,
+      25,    25,    32,   161,   159,   161,   159,    27,   162,   161,
+     159,   159,    70,   157,   161,   161,   159,   159,   136,    21,
+      25,   162,   162,    35,   161,    25,   161,   161,   161,   161,
+     161,   161,   157,   161,   157,   136,   136,   161,   135,    71,
+     162,   162,   162,   162,   159,   159,   136,   136,   161,   136,
+     136,   161,   136,   161,   161,   161,   161,   161,   161,   161,
+      35,   860,   969,   161,    37,   161,   161,    -1,   161,   303,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   322
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     1,    11,    23,    24,    25,    27,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    95,
+      96,   112,   113,   114,   115,   117,   119,   122,   123,   142,
+     145,   146,   147,   149,   150,   151,   152,   153,   154,   155,
+     156,   162,   163,   165,   166,   175,   176,   177,   178,   197,
+     205,   206,   207,   208,   209,   212,   162,    62,    69,   162,
+     167,   168,   213,   218,   219,   220,    88,    93,    94,    97,
+      98,   102,   103,    97,    99,   100,   101,   104,   211,    97,
+      97,    97,    97,    97,    25,    25,   219,   219,   162,   219,
+     168,   219,   168,   219,   162,   219,   219,   213,   217,   219,
+     162,   217,   219,   162,   162,   163,   198,   163,   198,   163,
+     198,   163,   198,    25,   219,   162,   163,   163,    97,   211,
+     162,   162,   162,   162,   162,   162,    25,   178,   162,   162,
+      27,    63,    25,    25,    82,   211,     0,    77,   160,    97,
+     102,   103,    97,    25,    35,    69,    76,    85,    86,    87,
+      89,   178,   205,   210,   219,   178,   210,   210,   162,   179,
+      25,   220,   220,   220,    64,    65,    66,    67,    69,    70,
+      71,    72,    90,    91,    25,   219,    25,   219,    25,   219,
+       5,     6,     7,     9,    10,    12,    13,    14,    15,    16,
+      17,    25,    27,    28,    33,    35,    62,    69,    74,    75,
+      76,    84,    85,    86,    89,   122,   123,   162,   163,   178,
+     194,   199,   210,   219,    25,    25,   219,    25,   219,    25,
+     148,   178,    27,   148,   142,   165,    35,    35,    35,    35,
+      15,    18,    20,    22,    25,    27,    35,    85,    86,   123,
+     162,   178,   210,   219,   219,    25,    25,    26,   172,    25,
+      26,    25,    25,    25,    25,    25,    25,    25,    25,    25,
+      27,    25,    25,    25,    25,    25,    25,    35,    25,    25,
+      56,    27,   157,   159,    69,    70,    82,    83,   201,   204,
+      25,    27,   177,   178,    25,   162,    71,   178,   178,   178,
+     178,   162,   178,    90,    91,    92,   162,   219,   162,   195,
+     134,   135,   157,   159,   161,   220,   220,   220,   220,   220,
+     220,   220,   220,   220,   220,   162,   162,   162,   162,   162,
+     162,   162,   162,    64,    65,    67,    70,    78,    79,    80,
+      81,    90,    91,    92,   200,   201,   162,   186,    70,   186,
+      25,    25,    25,    25,    25,    25,    25,   163,   163,    25,
+     178,   205,   206,   207,   209,    25,    70,   162,   162,   179,
+     162,   187,   162,   105,   106,   111,   162,   105,   106,   111,
+     162,   162,   162,    25,    25,    35,   178,   162,   201,    97,
+      90,    91,    92,    97,   201,    35,    35,   163,   207,   209,
+     179,   157,    97,   161,    70,   173,   161,    70,   157,   157,
+      83,   164,   164,   164,   164,   161,    83,   201,   204,    83,
+     201,   204,   157,   157,   157,   157,   157,   157,   157,   161,
+      97,   219,    25,    56,    25,   219,    25,   219,   164,   164,
+      77,   160,   195,    25,    35,   157,   157,   158,   158,   178,
+     158,   219,   219,   219,   125,   135,   157,   161,   157,   161,
+      25,    35,   208,   219,    25,    25,    25,    25,    35,    25,
+      25,    25,    25,    25,    25,   162,   219,   219,   219,    25,
+      25,   132,   133,    34,   162,   188,   162,   189,   158,   158,
+     158,   158,    25,    25,    70,   103,   178,   161,    83,   201,
+     204,   178,    25,    25,   157,   132,   133,   131,    25,   219,
+      25,   219,    25,   219,    25,   178,   178,   178,    25,    25,
+      25,    35,   137,    25,    68,    87,   219,   219,   219,    21,
+      35,   158,   158,    25,   178,   161,   157,   219,    25,    25,
+      25,    25,    25,   164,   219,   164,    25,   219,   164,   219,
+     219,   219,    25,   219,   219,   219,    25,   162,    97,   219,
+     161,   157,   161,   164,   164,    97,   177,   159,   178,   205,
+     205,    35,    35,   157,    35,   219,   161,   161,   135,   134,
+      97,    97,   179,   157,   159,   159,   159,   157,   157,   157,
+     157,   157,    25,   188,   189,   188,   157,   162,   183,   157,
+     162,   184,   161,   161,   157,   124,   125,   142,   142,    35,
+      35,    35,    35,   219,   201,   204,    83,   201,   204,    25,
+     161,    25,   213,   215,   216,   219,   164,   157,   157,   157,
+      25,   161,   161,   161,   162,   196,   196,   196,   196,   157,
+     157,   161,   157,   157,   161,   162,   162,   162,   162,   190,
+     190,   162,   184,    35,    35,    83,   204,   161,    35,   161,
+      91,   161,   161,   161,   161,   164,    97,   164,   164,    97,
+     161,   161,   161,   157,   161,   161,   161,   130,    25,   162,
+      97,    25,    97,    97,    97,    25,   160,   219,    69,    76,
+     178,   157,   161,   161,   162,   178,   162,    25,   219,   219,
+     219,    25,    35,    25,    35,    25,    90,    25,   125,   126,
+     127,   181,    25,   124,   125,    25,   161,   157,   161,   157,
+     161,   161,   189,   188,   219,   164,    25,   219,   164,   161,
+     164,   172,   164,    25,    25,    25,    97,   135,   219,   219,
+     162,   180,    35,    35,   140,   141,   178,   178,   125,    35,
+     190,    25,   164,    97,    25,   219,    97,    25,    97,    97,
+      25,    35,   178,   161,   130,     3,     4,     8,    19,   159,
+     163,   198,    25,    25,   157,   161,   178,   178,   157,   205,
+     159,   157,   157,   157,   161,   161,   161,   161,   161,   219,
+      97,   161,    97,   161,   161,    97,   142,   125,   164,   186,
+     164,   164,   186,    90,   169,   170,   171,   214,    97,   161,
+     161,   210,   161,   161,   161,   120,   121,   161,   161,   161,
+     161,   157,   157,   161,   161,   164,   210,    97,    25,    35,
+      25,   161,   161,   162,   162,    25,    25,   219,    25,    25,
+      27,   178,   219,    25,    25,    25,   180,   186,   162,   161,
+      25,    25,    31,   161,   161,   186,   186,   186,   219,   178,
+     189,   179,   161,   161,   189,    25,   178,    25,    71,   179,
+      25,   180,    25,    25,   159,   162,   161,   159,   161,   162,
+     161,   159,   159,   159,   132,   200,   201,    70,    69,   161,
+     157,   161,    35,    91,   159,   159,   219,   107,   108,   109,
+     110,   191,    97,   219,   125,   162,   192,   219,   219,   219,
+     161,    25,    25,    32,   178,    27,    70,   219,   219,   219,
+     192,   161,   198,   161,   161,   136,   161,   161,   161,   162,
+     185,   184,   184,   161,    21,   157,   157,   161,   162,   193,
+     162,   202,   162,   203,   120,   121,   181,   182,   162,    25,
+      25,   135,   136,   128,   129,   138,   139,   143,   144,   157,
+     161,   157,   161,    35,   159,   159,   157,   161,   157,   161,
+     157,   161,   157,   161,   157,   161,   157,   161,   157,   161,
+     157,   161,   182,   181,   161,   219,   219,   136,   135,   136,
+     136,   136,   136,   136,   136,   161,   161,    71,   161,   161,
+     161,   161,   161,   161,   161,   161,   161,   161,    35,   192,
+     192
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 3:
+#line 648 "bfin-parse.y"
+    {
+	  insn = (yyvsp[(1) - (1)].instr);
+	  if (insn == (INSTR_T) 0)
+	    return NO_INSN_GENERATED;
+	  else if (insn == (INSTR_T) - 1)
+	    return SEMANTIC_ERROR;
+	  else
+	    return INSN_GENERATED;
+	}
+    break;
+
+  case 5:
+#line 662 "bfin-parse.y"
+    {
+	  if (((yyvsp[(1) - (6)].instr)->value & 0xf800) == 0xc000)
+	    {
+	      if (is_group1 ((yyvsp[(3) - (6)].instr)) && is_group2 ((yyvsp[(5) - (6)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(1) - (6)].instr), (yyvsp[(3) - (6)].instr), (yyvsp[(5) - (6)].instr));
+	      else if (is_group2 ((yyvsp[(3) - (6)].instr)) && is_group1 ((yyvsp[(5) - (6)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(1) - (6)].instr), (yyvsp[(5) - (6)].instr), (yyvsp[(3) - (6)].instr));
+	      else
+		return yyerror ("Wrong 16 bit instructions groups, slot 2 and slot 3 must be 16-bit instrution group");
+	    }
+	  else if (((yyvsp[(3) - (6)].instr)->value & 0xf800) == 0xc000)
+	    {
+	      if (is_group1 ((yyvsp[(1) - (6)].instr)) && is_group2 ((yyvsp[(5) - (6)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(3) - (6)].instr), (yyvsp[(1) - (6)].instr), (yyvsp[(5) - (6)].instr));
+	      else if (is_group2 ((yyvsp[(1) - (6)].instr)) && is_group1 ((yyvsp[(5) - (6)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(3) - (6)].instr), (yyvsp[(5) - (6)].instr), (yyvsp[(1) - (6)].instr));
+	      else
+		return yyerror ("Wrong 16 bit instructions groups, slot 1 and slot 3 must be 16-bit instrution group");
+	    }
+	  else if (((yyvsp[(5) - (6)].instr)->value & 0xf800) == 0xc000)
+	    {
+	      if (is_group1 ((yyvsp[(1) - (6)].instr)) && is_group2 ((yyvsp[(3) - (6)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(5) - (6)].instr), (yyvsp[(1) - (6)].instr), (yyvsp[(3) - (6)].instr));
+	      else if (is_group2 ((yyvsp[(1) - (6)].instr)) && is_group1 ((yyvsp[(3) - (6)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(5) - (6)].instr), (yyvsp[(3) - (6)].instr), (yyvsp[(1) - (6)].instr));
+	      else
+		return yyerror ("Wrong 16 bit instructions groups, slot 1 and slot 2 must be 16-bit instrution group");
+	    }
+	  else
+	    error ("\nIllegal Multi Issue Construct, at least any one of the slot must be DSP32 instruction group\n");
+	}
+    break;
+
+  case 6:
+#line 695 "bfin-parse.y"
+    {
+	  if (((yyvsp[(1) - (4)].instr)->value & 0xf800) == 0xc000)
+	    {
+	      if (is_group1 ((yyvsp[(3) - (4)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(1) - (4)].instr), (yyvsp[(3) - (4)].instr), 0);
+	      else if (is_group2 ((yyvsp[(3) - (4)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(1) - (4)].instr), 0, (yyvsp[(3) - (4)].instr));
+	      else
+		return yyerror ("Wrong 16 bit instructions groups, slot 2 must be the 16-bit instruction group");
+	    }
+	  else if (((yyvsp[(3) - (4)].instr)->value & 0xf800) == 0xc000)
+	    {
+	      if (is_group1 ((yyvsp[(1) - (4)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(3) - (4)].instr), (yyvsp[(1) - (4)].instr), 0);
+	      else if (is_group2 ((yyvsp[(1) - (4)].instr)))
+		(yyval.instr) = gen_multi_instr_1 ((yyvsp[(3) - (4)].instr), 0, (yyvsp[(1) - (4)].instr));
+	      else
+		return yyerror ("Wrong 16 bit instructions groups, slot 1 must be the 16-bit instruction group");
+	    }
+	  else if (is_group1 ((yyvsp[(1) - (4)].instr)) && is_group2 ((yyvsp[(3) - (4)].instr)))
+	      (yyval.instr) = gen_multi_instr_1 (0, (yyvsp[(1) - (4)].instr), (yyvsp[(3) - (4)].instr));
+	  else if (is_group2 ((yyvsp[(1) - (4)].instr)) && is_group1 ((yyvsp[(3) - (4)].instr)))
+	    (yyval.instr) = gen_multi_instr_1 (0, (yyvsp[(3) - (4)].instr), (yyvsp[(1) - (4)].instr));
+	  else
+	    return yyerror ("Wrong 16 bit instructions groups, slot 1 and slot 2 must be the 16-bit instruction group");
+	}
+    break;
+
+  case 7:
+#line 722 "bfin-parse.y"
+    {
+	(yyval.instr) = 0;
+	yyerror ("");
+	yyerrok;
+	}
+    break;
+
+  case 8:
+#line 733 "bfin-parse.y"
+    {
+	  (yyval.instr) = DSP32MAC (3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0);
+	}
+    break;
+
+  case 9:
+#line 737 "bfin-parse.y"
+    {
+	  int op0, op1;
+	  int w0 = 0, w1 = 0;
+	  int h00, h10, h01, h11;
+
+	  if (check_macfunc_option (&(yyvsp[(1) - (2)].macfunc), &(yyvsp[(2) - (2)].mod)) < 0)
+	    return yyerror ("bad option");
+
+	  if ((yyvsp[(1) - (2)].macfunc).n == 0)
+	    {
+	      if ((yyvsp[(2) - (2)].mod).MM)
+		return yyerror ("(m) not allowed with a0 unit");
+	      op1 = 3;
+	      op0 = (yyvsp[(1) - (2)].macfunc).op;
+	      w1 = 0;
+              w0 = (yyvsp[(1) - (2)].macfunc).w;
+	      h00 = IS_H ((yyvsp[(1) - (2)].macfunc).s0);
+              h10 = IS_H ((yyvsp[(1) - (2)].macfunc).s1);
+	      h01 = h11 = 0;
+	    }
+	  else
+	    {
+	      op1 = (yyvsp[(1) - (2)].macfunc).op;
+	      op0 = 3;
+	      w1 = (yyvsp[(1) - (2)].macfunc).w;
+              w0 = 0;
+	      h00 = h10 = 0;
+	      h01 = IS_H ((yyvsp[(1) - (2)].macfunc).s0);
+              h11 = IS_H ((yyvsp[(1) - (2)].macfunc).s1);
+	    }
+	  (yyval.instr) = DSP32MAC (op1, (yyvsp[(2) - (2)].mod).MM, (yyvsp[(2) - (2)].mod).mod, w1, (yyvsp[(1) - (2)].macfunc).P, h01, h11, h00, h10,
+			 &(yyvsp[(1) - (2)].macfunc).dst, op0, &(yyvsp[(1) - (2)].macfunc).s0, &(yyvsp[(1) - (2)].macfunc).s1, w0);
+	}
+    break;
+
+  case 10:
+#line 775 "bfin-parse.y"
+    {
+	  Register *dst;
+
+	  if (check_macfuncs (&(yyvsp[(1) - (5)].macfunc), &(yyvsp[(2) - (5)].mod), &(yyvsp[(4) - (5)].macfunc), &(yyvsp[(5) - (5)].mod)) < 0)
+	    return -1;
+	  notethat ("assign_macfunc (.), assign_macfunc (.)\n");
+
+	  if ((yyvsp[(1) - (5)].macfunc).w)
+	    dst = &(yyvsp[(1) - (5)].macfunc).dst;
+	  else
+	    dst = &(yyvsp[(4) - (5)].macfunc).dst;
+
+	  (yyval.instr) = DSP32MAC ((yyvsp[(1) - (5)].macfunc).op, (yyvsp[(2) - (5)].mod).MM, (yyvsp[(5) - (5)].mod).mod, (yyvsp[(1) - (5)].macfunc).w, (yyvsp[(1) - (5)].macfunc).P,
+			 IS_H ((yyvsp[(1) - (5)].macfunc).s0),  IS_H ((yyvsp[(1) - (5)].macfunc).s1), IS_H ((yyvsp[(4) - (5)].macfunc).s0), IS_H ((yyvsp[(4) - (5)].macfunc).s1),
+			 dst, (yyvsp[(4) - (5)].macfunc).op, &(yyvsp[(1) - (5)].macfunc).s0, &(yyvsp[(1) - (5)].macfunc).s1, (yyvsp[(4) - (5)].macfunc).w);
+	}
+    break;
+
+  case 11:
+#line 795 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: DISALGNEXCPT\n");
+	  (yyval.instr) = DSP32ALU (18, 0, 0, 0, 0, 0, 0, 0, 3);
+	}
+    break;
+
+  case 12:
+#line 800 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && !IS_A1 ((yyvsp[(4) - (6)].reg)) && IS_A1 ((yyvsp[(5) - (6)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = ( A0 += A1 )\n");
+	      (yyval.instr) = DSP32ALU (11, 0, 0, &(yyvsp[(1) - (6)].reg), 0, 0, 0, 0, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 13:
+#line 810 "bfin-parse.y"
+    {
+	  if (!IS_A1 ((yyvsp[(4) - (6)].reg)) && IS_A1 ((yyvsp[(5) - (6)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs_half = ( A0 += A1 )\n");
+	      (yyval.instr) = DSP32ALU (11, IS_H ((yyvsp[(1) - (6)].reg)), 0, &(yyvsp[(1) - (6)].reg), 0, 0, 0, 0, 1);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 14:
+#line 820 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: A_ZERO_DOT_H = dregs_hi\n");
+	  (yyval.instr) = DSP32ALU (9, IS_H ((yyvsp[(3) - (3)].reg)), 0, 0, &(yyvsp[(3) - (3)].reg), 0, 0, 0, 0);
+	}
+    break;
+
+  case 15:
+#line 825 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: A_ZERO_DOT_H = dregs_hi\n");
+	  (yyval.instr) = DSP32ALU (9, IS_H ((yyvsp[(3) - (3)].reg)), 0, 0, &(yyvsp[(3) - (3)].reg), 0, 0, 0, 2);
+	}
+    break;
+
+  case 16:
+#line 831 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(2) - (17)].reg)) || !IS_DREG ((yyvsp[(4) - (17)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (REG_SAME ((yyvsp[(2) - (17)].reg), (yyvsp[(4) - (17)].reg)))
+	    return yyerror ("Illegal dest register combination");
+	  else if (!valid_dreg_pair (&(yyvsp[(9) - (17)].reg), (yyvsp[(11) - (17)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(13) - (17)].reg), (yyvsp[(15) - (17)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: (dregs , dregs ) = BYTEOP16P (dregs_pair , dregs_pair ) (aligndir)\n");
+	      (yyval.instr) = DSP32ALU (21, 0, &(yyvsp[(2) - (17)].reg), &(yyvsp[(4) - (17)].reg), &(yyvsp[(9) - (17)].reg), &(yyvsp[(13) - (17)].reg), (yyvsp[(17) - (17)].r0).r0, 0, 0);
+	    }
+	}
+    break;
+
+  case 17:
+#line 849 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(2) - (17)].reg)) || !IS_DREG ((yyvsp[(4) - (17)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (REG_SAME ((yyvsp[(2) - (17)].reg), (yyvsp[(4) - (17)].reg)))
+	    return yyerror ("Illegal dest register combination");
+	  else if (!valid_dreg_pair (&(yyvsp[(9) - (17)].reg), (yyvsp[(11) - (17)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(13) - (17)].reg), (yyvsp[(15) - (17)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: (dregs , dregs ) = BYTEOP16M (dregs_pair , dregs_pair ) (aligndir)\n");
+	      (yyval.instr) = DSP32ALU (21, 0, &(yyvsp[(2) - (17)].reg), &(yyvsp[(4) - (17)].reg), &(yyvsp[(9) - (17)].reg), &(yyvsp[(13) - (17)].reg), (yyvsp[(17) - (17)].r0).r0, 0, 1);
+	    }
+	}
+    break;
+
+  case 18:
+#line 866 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(2) - (11)].reg)) || !IS_DREG ((yyvsp[(4) - (11)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (REG_SAME ((yyvsp[(2) - (11)].reg), (yyvsp[(4) - (11)].reg)))
+	    return yyerror ("Illegal dest register combination");
+	  else if (!valid_dreg_pair (&(yyvsp[(8) - (11)].reg), (yyvsp[(10) - (11)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: (dregs , dregs ) = BYTEUNPACK dregs_pair (aligndir)\n");
+	      (yyval.instr) = DSP32ALU (24, 0, &(yyvsp[(2) - (11)].reg), &(yyvsp[(4) - (11)].reg), &(yyvsp[(8) - (11)].reg), 0, (yyvsp[(11) - (11)].r0).r0, 0, 1);
+	    }
+	}
+    break;
+
+  case 19:
+#line 880 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(2) - (11)].reg), (yyvsp[(4) - (11)].reg)))
+	    return yyerror ("Illegal dest register combination");
+
+	  if (IS_DREG ((yyvsp[(2) - (11)].reg)) && IS_DREG ((yyvsp[(4) - (11)].reg)) && IS_DREG ((yyvsp[(8) - (11)].reg)))
+	    {
+	      notethat ("dsp32alu: (dregs , dregs ) = SEARCH dregs (searchmod)\n");
+	      (yyval.instr) = DSP32ALU (13, 0, &(yyvsp[(2) - (11)].reg), &(yyvsp[(4) - (11)].reg), &(yyvsp[(8) - (11)].reg), 0, 0, 0, (yyvsp[(10) - (11)].r0).r0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 20:
+#line 894 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (11)].reg), (yyvsp[(7) - (11)].reg)))
+	    return yyerror ("Illegal dest register combination");
+
+	  if (IS_DREG ((yyvsp[(1) - (11)].reg)) && IS_DREG ((yyvsp[(7) - (11)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = A1.l + A1.h, dregs = A0.l + A0.h  \n");
+	      (yyval.instr) = DSP32ALU (12, 0, &(yyvsp[(1) - (11)].reg), &(yyvsp[(7) - (11)].reg), 0, 0, 0, 0, 1);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 21:
+#line 909 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (12)].reg), (yyvsp[(7) - (12)].reg)))
+	    return yyerror ("Resource conflict in dest reg");
+
+	  if (IS_DREG ((yyvsp[(1) - (12)].reg)) && IS_DREG ((yyvsp[(7) - (12)].reg)) && !REG_SAME ((yyvsp[(3) - (12)].reg), (yyvsp[(5) - (12)].reg))
+	      && IS_A1 ((yyvsp[(9) - (12)].reg)) && !IS_A1 ((yyvsp[(11) - (12)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = A1 + A0 , dregs = A1 - A0 (amod1)\n");
+	      (yyval.instr) = DSP32ALU (17, 0, &(yyvsp[(1) - (12)].reg), &(yyvsp[(7) - (12)].reg), 0, 0, (yyvsp[(12) - (12)].modcodes).s0, (yyvsp[(12) - (12)].modcodes).x0, 0);
+
+	    }
+	  else if (IS_DREG ((yyvsp[(1) - (12)].reg)) && IS_DREG ((yyvsp[(7) - (12)].reg)) && !REG_SAME ((yyvsp[(3) - (12)].reg), (yyvsp[(5) - (12)].reg))
+		   && !IS_A1 ((yyvsp[(9) - (12)].reg)) && IS_A1 ((yyvsp[(11) - (12)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = A0 + A1 , dregs = A0 - A1 (amod1)\n");
+	      (yyval.instr) = DSP32ALU (17, 0, &(yyvsp[(1) - (12)].reg), &(yyvsp[(7) - (12)].reg), 0, 0, (yyvsp[(12) - (12)].modcodes).s0, (yyvsp[(12) - (12)].modcodes).x0, 1);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 22:
+#line 931 "bfin-parse.y"
+    {
+	  if ((yyvsp[(4) - (12)].r0).r0 == (yyvsp[(10) - (12)].r0).r0)
+	    return yyerror ("Operators must differ");
+
+	  if (IS_DREG ((yyvsp[(1) - (12)].reg)) && IS_DREG ((yyvsp[(3) - (12)].reg)) && IS_DREG ((yyvsp[(5) - (12)].reg))
+	      && REG_SAME ((yyvsp[(3) - (12)].reg), (yyvsp[(9) - (12)].reg)) && REG_SAME ((yyvsp[(5) - (12)].reg), (yyvsp[(11) - (12)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = dregs + dregs,"
+		       "dregs = dregs - dregs (amod1)\n");
+	      (yyval.instr) = DSP32ALU (4, 0, &(yyvsp[(1) - (12)].reg), &(yyvsp[(7) - (12)].reg), &(yyvsp[(3) - (12)].reg), &(yyvsp[(5) - (12)].reg), (yyvsp[(12) - (12)].modcodes).s0, (yyvsp[(12) - (12)].modcodes).x0, 2);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 23:
+#line 949 "bfin-parse.y"
+    {
+	  if (!REG_SAME ((yyvsp[(3) - (12)].reg), (yyvsp[(9) - (12)].reg)) || !REG_SAME ((yyvsp[(5) - (12)].reg), (yyvsp[(11) - (12)].reg)))
+	    return yyerror ("Differing source registers");
+
+	  if (!IS_DREG ((yyvsp[(1) - (12)].reg)) || !IS_DREG ((yyvsp[(3) - (12)].reg)) || !IS_DREG ((yyvsp[(5) - (12)].reg)) || !IS_DREG ((yyvsp[(7) - (12)].reg)))
+	    return yyerror ("Dregs expected");
+
+	  if (REG_SAME ((yyvsp[(1) - (12)].reg), (yyvsp[(7) - (12)].reg)))
+	    return yyerror ("Resource conflict in dest reg");
+
+	  if ((yyvsp[(4) - (12)].r0).r0 == 1 && (yyvsp[(10) - (12)].r0).r0 == 2)
+	    {
+	      notethat ("dsp32alu:  dregs = dregs .|. dregs , dregs = dregs .|. dregs (amod2)\n");
+	      (yyval.instr) = DSP32ALU (1, 1, &(yyvsp[(1) - (12)].reg), &(yyvsp[(7) - (12)].reg), &(yyvsp[(3) - (12)].reg), &(yyvsp[(5) - (12)].reg), (yyvsp[(12) - (12)].modcodes).s0, (yyvsp[(12) - (12)].modcodes).x0, (yyvsp[(12) - (12)].modcodes).r0);
+	    }
+	  else if ((yyvsp[(4) - (12)].r0).r0 == 0 && (yyvsp[(10) - (12)].r0).r0 == 3)
+	    {
+	      notethat ("dsp32alu:  dregs = dregs .|. dregs , dregs = dregs .|. dregs (amod2)\n");
+	      (yyval.instr) = DSP32ALU (1, 0, &(yyvsp[(1) - (12)].reg), &(yyvsp[(7) - (12)].reg), &(yyvsp[(3) - (12)].reg), &(yyvsp[(5) - (12)].reg), (yyvsp[(12) - (12)].modcodes).s0, (yyvsp[(12) - (12)].modcodes).x0, (yyvsp[(12) - (12)].modcodes).r0);
+	    }
+	  else
+	    return yyerror ("Bar operand mismatch");
+	}
+    break;
+
+  case 24:
+#line 974 "bfin-parse.y"
+    {
+	  int op;
+
+	  if (IS_DREG ((yyvsp[(1) - (5)].reg)) && IS_DREG ((yyvsp[(4) - (5)].reg)))
+	    {
+	      if ((yyvsp[(5) - (5)].r0).r0)
+		{
+		  notethat ("dsp32alu: dregs = ABS dregs (v)\n");
+		  op = 6;
+		}
+	      else
+		{
+		  /* Vector version of ABS.  */
+		  notethat ("dsp32alu: dregs = ABS dregs\n");
+		  op = 7;
+		}
+	      (yyval.instr) = DSP32ALU (op, 0, 0, &(yyvsp[(1) - (5)].reg), &(yyvsp[(4) - (5)].reg), 0, 0, 0, 2);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 25:
+#line 996 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: Ax = ABS Ax\n");
+	  (yyval.instr) = DSP32ALU (16, IS_A1 ((yyvsp[(1) - (3)].reg)), 0, 0, 0, 0, 0, 0, IS_A1 ((yyvsp[(3) - (3)].reg)));
+	}
+    break;
+
+  case 26:
+#line 1001 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("dsp32alu: A0.l = reg_half\n");
+	      (yyval.instr) = DSP32ALU (9, IS_H ((yyvsp[(3) - (3)].reg)), 0, 0, &(yyvsp[(3) - (3)].reg), 0, 0, 0, 0);
+	    }
+	  else
+	    return yyerror ("A0.l = Rx.l expected");
+	}
+    break;
+
+  case 27:
+#line 1011 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("dsp32alu: A1.l = reg_half\n");
+	      (yyval.instr) = DSP32ALU (9, IS_H ((yyvsp[(3) - (3)].reg)), 0, 0, &(yyvsp[(3) - (3)].reg), 0, 0, 0, 2);
+	    }
+	  else
+	    return yyerror ("A1.l = Rx.l expected");
+	}
+    break;
+
+  case 28:
+#line 1022 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (8)].reg)) && IS_DREG ((yyvsp[(5) - (8)].reg)) && IS_DREG ((yyvsp[(7) - (8)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = ALIGN8 (dregs , dregs )\n");
+	      (yyval.instr) = DSP32SHIFT (13, &(yyvsp[(1) - (8)].reg), &(yyvsp[(7) - (8)].reg), &(yyvsp[(5) - (8)].reg), (yyvsp[(3) - (8)].r0).r0, 0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 29:
+#line 1033 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (13)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (!valid_dreg_pair (&(yyvsp[(5) - (13)].reg), (yyvsp[(7) - (13)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(9) - (13)].reg), (yyvsp[(11) - (13)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: dregs = BYTEOP1P (dregs_pair , dregs_pair ) (T)\n");
+	      (yyval.instr) = DSP32ALU (20, 0, 0, &(yyvsp[(1) - (13)].reg), &(yyvsp[(5) - (13)].reg), &(yyvsp[(9) - (13)].reg), (yyvsp[(13) - (13)].modcodes).s0, 0, (yyvsp[(13) - (13)].modcodes).r0);
+	    }
+	}
+    break;
+
+  case 30:
+#line 1047 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (12)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (!valid_dreg_pair (&(yyvsp[(5) - (12)].reg), (yyvsp[(7) - (12)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(9) - (12)].reg), (yyvsp[(11) - (12)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: dregs = BYTEOP1P (dregs_pair , dregs_pair ) (T)\n");
+	      (yyval.instr) = DSP32ALU (20, 0, 0, &(yyvsp[(1) - (12)].reg), &(yyvsp[(5) - (12)].reg), &(yyvsp[(9) - (12)].reg), 0, 0, 0);
+	    }
+	}
+    break;
+
+  case 31:
+#line 1063 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (13)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (!valid_dreg_pair (&(yyvsp[(5) - (13)].reg), (yyvsp[(7) - (13)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(9) - (13)].reg), (yyvsp[(11) - (13)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: dregs = BYTEOP2P (dregs_pair , dregs_pair ) (rnd_op)\n");
+	      (yyval.instr) = DSP32ALU (22, (yyvsp[(13) - (13)].modcodes).r0, 0, &(yyvsp[(1) - (13)].reg), &(yyvsp[(5) - (13)].reg), &(yyvsp[(9) - (13)].reg), (yyvsp[(13) - (13)].modcodes).s0, (yyvsp[(13) - (13)].modcodes).x0, (yyvsp[(13) - (13)].modcodes).aop);
+	    }
+	}
+    break;
+
+  case 32:
+#line 1079 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (13)].reg)))
+	    return yyerror ("Dregs expected");
+	  else if (!valid_dreg_pair (&(yyvsp[(5) - (13)].reg), (yyvsp[(7) - (13)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(9) - (13)].reg), (yyvsp[(11) - (13)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: dregs = BYTEOP3P (dregs_pair , dregs_pair ) (b3_op)\n");
+	      (yyval.instr) = DSP32ALU (23, (yyvsp[(13) - (13)].modcodes).x0, 0, &(yyvsp[(1) - (13)].reg), &(yyvsp[(5) - (13)].reg), &(yyvsp[(9) - (13)].reg), (yyvsp[(13) - (13)].modcodes).s0, 0, 0);
+	    }
+	}
+    break;
+
+  case 33:
+#line 1094 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (8)].reg)) && IS_DREG ((yyvsp[(5) - (8)].reg)) && IS_DREG ((yyvsp[(7) - (8)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = BYTEPACK (dregs , dregs )\n");
+	      (yyval.instr) = DSP32ALU (24, 0, 0, &(yyvsp[(1) - (8)].reg), &(yyvsp[(5) - (8)].reg), &(yyvsp[(7) - (8)].reg), 0, 0, 0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 34:
+#line 1106 "bfin-parse.y"
+    {
+	  if (IS_HCOMPL ((yyvsp[(1) - (17)].reg), (yyvsp[(3) - (17)].reg)) && IS_HCOMPL ((yyvsp[(7) - (17)].reg), (yyvsp[(14) - (17)].reg)) && IS_HCOMPL ((yyvsp[(10) - (17)].reg), (yyvsp[(17) - (17)].reg)))
+	    {
+	      notethat ("dsp32alu:	dregs_hi = dregs_lo ="
+		       "SIGN (dregs_hi) * dregs_hi + "
+		       "SIGN (dregs_lo) * dregs_lo \n");
+
+		(yyval.instr) = DSP32ALU (12, 0, 0, &(yyvsp[(1) - (17)].reg), &(yyvsp[(7) - (17)].reg), &(yyvsp[(10) - (17)].reg), 0, 0, 0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 35:
+#line 1119 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_DREG ((yyvsp[(5) - (6)].reg)))
+	    {
+	      if ((yyvsp[(6) - (6)].modcodes).aop == 0)
+		{
+	          /* No saturation flag specified, generate the 16 bit variant.  */
+		  notethat ("COMP3op: dregs = dregs +- dregs\n");
+		  (yyval.instr) = COMP3OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg), (yyvsp[(4) - (6)].r0).r0);
+		}
+	      else
+		{
+		 /* Saturation flag specified, generate the 32 bit variant.  */
+                 notethat ("dsp32alu: dregs = dregs +- dregs (amod1)\n");
+                 (yyval.instr) = DSP32ALU (4, 0, 0, &(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0, (yyvsp[(6) - (6)].modcodes).x0, (yyvsp[(4) - (6)].r0).r0);
+		}
+	    }
+	  else
+	    if (IS_PREG ((yyvsp[(1) - (6)].reg)) && IS_PREG ((yyvsp[(3) - (6)].reg)) && IS_PREG ((yyvsp[(5) - (6)].reg)) && (yyvsp[(4) - (6)].r0).r0 == 0)
+	      {
+		notethat ("COMP3op: pregs = pregs + pregs\n");
+		(yyval.instr) = COMP3OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg), 5);
+	      }
+	    else
+	      return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 36:
+#line 1145 "bfin-parse.y"
+    {
+	  int op;
+
+	  if (IS_DREG ((yyvsp[(1) - (9)].reg)) && IS_DREG ((yyvsp[(5) - (9)].reg)) && IS_DREG ((yyvsp[(7) - (9)].reg)))
+	    {
+	      if ((yyvsp[(9) - (9)].r0).r0)
+		op = 6;
+	      else
+		op = 7;
+
+	      notethat ("dsp32alu: dregs = {MIN|MAX} (dregs, dregs)\n");
+	      (yyval.instr) = DSP32ALU (op, 0, 0, &(yyvsp[(1) - (9)].reg), &(yyvsp[(5) - (9)].reg), &(yyvsp[(7) - (9)].reg), 0, 0, (yyvsp[(3) - (9)].r0).r0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 37:
+#line 1163 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: Ax = - Ax\n");
+	  (yyval.instr) = DSP32ALU (14, IS_A1 ((yyvsp[(1) - (3)].reg)), 0, 0, 0, 0, 0, 0, IS_A1 ((yyvsp[(3) - (3)].reg)));
+	}
+    break;
+
+  case 38:
+#line 1168 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: dregs_lo = dregs_lo +- dregs_lo (amod1)\n");
+	  (yyval.instr) = DSP32ALU (2 | (yyvsp[(4) - (6)].r0).r0, IS_H ((yyvsp[(1) - (6)].reg)), 0, &(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg),
+			 (yyvsp[(6) - (6)].modcodes).s0, (yyvsp[(6) - (6)].modcodes).x0, HL2 ((yyvsp[(3) - (6)].reg), (yyvsp[(5) - (6)].reg)));
+	}
+    break;
+
+  case 39:
+#line 1174 "bfin-parse.y"
+    {
+	  if (EXPR_VALUE ((yyvsp[(3) - (3)].expr)) == 0 && !REG_SAME ((yyvsp[(1) - (3)].reg), (yyvsp[(2) - (3)].reg)))
+	    {
+	      notethat ("dsp32alu: A1 = A0 = 0\n");
+	      (yyval.instr) = DSP32ALU (8, 0, 0, 0, 0, 0, 0, 0, 2);
+	    }
+	  else
+	    return yyerror ("Bad value, 0 expected");
+	}
+    break;
+
+  case 40:
+#line 1186 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (5)].reg), (yyvsp[(2) - (5)].reg)))
+	    {
+	      notethat ("dsp32alu: Ax = Ax (S)\n");
+	      (yyval.instr) = DSP32ALU (8, 0, 0, 0, 0, 0, 1, 0, IS_A1 ((yyvsp[(1) - (5)].reg)));
+	    }
+	  else
+	    return yyerror ("Registers must be equal");
+	}
+    break;
+
+  case 41:
+#line 1197 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (6)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs_half = dregs (RND)\n");
+	      (yyval.instr) = DSP32ALU (12, IS_H ((yyvsp[(1) - (6)].reg)), 0, &(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), 0, 0, 0, 3);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 42:
+#line 1208 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (8)].reg)) && IS_DREG ((yyvsp[(5) - (8)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs_half = dregs (+-) dregs (RND12)\n");
+	      (yyval.instr) = DSP32ALU (5, IS_H ((yyvsp[(1) - (8)].reg)), 0, &(yyvsp[(1) - (8)].reg), &(yyvsp[(3) - (8)].reg), &(yyvsp[(5) - (8)].reg), 0, 0, (yyvsp[(4) - (8)].r0).r0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 43:
+#line 1219 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (8)].reg)) && IS_DREG ((yyvsp[(5) - (8)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs_half = dregs -+ dregs (RND20)\n");
+	      (yyval.instr) = DSP32ALU (5, IS_H ((yyvsp[(1) - (8)].reg)), 0, &(yyvsp[(1) - (8)].reg), &(yyvsp[(3) - (8)].reg), &(yyvsp[(5) - (8)].reg), 0, 1, (yyvsp[(4) - (8)].r0).r0 | 2);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 44:
+#line 1230 "bfin-parse.y"
+    {
+	  if (!REG_SAME ((yyvsp[(1) - (2)].reg), (yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("dsp32alu: An = Am\n");
+	      (yyval.instr) = DSP32ALU (8, 0, 0, 0, 0, 0, IS_A1 ((yyvsp[(1) - (2)].reg)), 0, 3);
+	    }
+	  else
+	    return yyerror ("Accu reg arguments must differ");
+	}
+    break;
+
+  case 45:
+#line 1241 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("dsp32alu: An = dregs\n");
+	      (yyval.instr) = DSP32ALU (9, 0, 0, 0, &(yyvsp[(2) - (2)].reg), 0, 1, 0, IS_A1 ((yyvsp[(1) - (2)].reg)) << 1);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 46:
+#line 1252 "bfin-parse.y"
+    {
+	  if (!IS_H ((yyvsp[(3) - (4)].reg)))
+	    {
+	      if ((yyvsp[(1) - (4)].reg).regno == REG_A0x && IS_DREG ((yyvsp[(3) - (4)].reg)))
+		{
+		  notethat ("dsp32alu: A0.x = dregs_lo\n");
+		  (yyval.instr) = DSP32ALU (9, 0, 0, 0, &(yyvsp[(3) - (4)].reg), 0, 0, 0, 1);
+		}
+	      else if ((yyvsp[(1) - (4)].reg).regno == REG_A1x && IS_DREG ((yyvsp[(3) - (4)].reg)))
+		{
+		  notethat ("dsp32alu: A1.x = dregs_lo\n");
+		  (yyval.instr) = DSP32ALU (9, 0, 0, 0, &(yyvsp[(3) - (4)].reg), 0, 0, 0, 3);
+		}
+	      else if (IS_DREG ((yyvsp[(1) - (4)].reg)) && IS_DREG ((yyvsp[(3) - (4)].reg)))
+		{
+		  notethat ("ALU2op: dregs = dregs_lo\n");
+		  (yyval.instr) = ALU2OP (&(yyvsp[(1) - (4)].reg), &(yyvsp[(3) - (4)].reg), 10 | ((yyvsp[(4) - (4)].r0).r0 ? 0: 1));
+		}
+	      else
+	        return yyerror ("Register mismatch");
+	    }
+	  else
+	    return yyerror ("Low reg expected");
+	}
+    break;
+
+  case 47:
+#line 1278 "bfin-parse.y"
+    {
+	  notethat ("LDIMMhalf: pregs_half = imm16\n");
+
+	  if (!IS_DREG ((yyvsp[(1) - (3)].reg)) && !IS_PREG ((yyvsp[(1) - (3)].reg)) && !IS_IREG ((yyvsp[(1) - (3)].reg))
+	      && !IS_MREG ((yyvsp[(1) - (3)].reg)) && !IS_BREG ((yyvsp[(1) - (3)].reg)) && !IS_LREG ((yyvsp[(1) - (3)].reg)))
+	    return yyerror ("Wrong register for load immediate");
+
+	  if (!IS_IMM ((yyvsp[(3) - (3)].expr), 16) && !IS_UIMM ((yyvsp[(3) - (3)].expr), 16))
+	    return yyerror ("Constant out of range");
+
+	  (yyval.instr) = LDIMMHALF_R (&(yyvsp[(1) - (3)].reg), IS_H ((yyvsp[(1) - (3)].reg)), 0, 0, (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 48:
+#line 1292 "bfin-parse.y"
+    {
+	  notethat ("dsp32alu: An = 0\n");
+
+	  if (imm7 ((yyvsp[(2) - (2)].expr)) != 0)
+	    return yyerror ("0 expected");
+
+	  (yyval.instr) = DSP32ALU (8, 0, 0, 0, 0, 0, 0, 0, IS_A1 ((yyvsp[(1) - (2)].reg)));
+	}
+    break;
+
+  case 49:
+#line 1302 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (4)].reg)) && !IS_PREG ((yyvsp[(1) - (4)].reg)) && !IS_IREG ((yyvsp[(1) - (4)].reg))
+	      && !IS_MREG ((yyvsp[(1) - (4)].reg)) && !IS_BREG ((yyvsp[(1) - (4)].reg)) && !IS_LREG ((yyvsp[(1) - (4)].reg)))
+	    return yyerror ("Wrong register for load immediate");
+
+	  if ((yyvsp[(4) - (4)].r0).r0 == 0)
+	    {
+	      /* 7 bit immediate value if possible.
+		 We will check for that constant value for efficiency
+		 If it goes to reloc, it will be 16 bit.  */
+	      if (IS_CONST ((yyvsp[(3) - (4)].expr)) && IS_IMM ((yyvsp[(3) - (4)].expr), 7) && IS_DREG ((yyvsp[(1) - (4)].reg)))
+		{
+		  notethat ("COMPI2opD: dregs = imm7 (x) \n");
+		  (yyval.instr) = COMPI2OPD (&(yyvsp[(1) - (4)].reg), imm7 ((yyvsp[(3) - (4)].expr)), 0);
+		}
+	      else if (IS_CONST ((yyvsp[(3) - (4)].expr)) && IS_IMM ((yyvsp[(3) - (4)].expr), 7) && IS_PREG ((yyvsp[(1) - (4)].reg)))
+		{
+		  notethat ("COMPI2opP: pregs = imm7 (x)\n");
+		  (yyval.instr) = COMPI2OPP (&(yyvsp[(1) - (4)].reg), imm7 ((yyvsp[(3) - (4)].expr)), 0);
+		}
+	      else
+		{
+		  if (IS_CONST ((yyvsp[(3) - (4)].expr)) && !IS_IMM ((yyvsp[(3) - (4)].expr), 16))
+		    return yyerror ("Immediate value out of range");
+
+		  notethat ("LDIMMhalf: regs = luimm16 (x)\n");
+		  /* reg, H, S, Z.   */
+		  (yyval.instr) = LDIMMHALF_R5 (&(yyvsp[(1) - (4)].reg), 0, 1, 0, (yyvsp[(3) - (4)].expr));
+		}
+	    }
+	  else
+	    {
+	      /* (z) There is no 7 bit zero extended instruction.
+	      If the expr is a relocation, generate it.   */
+
+	      if (IS_CONST ((yyvsp[(3) - (4)].expr)) && !IS_UIMM ((yyvsp[(3) - (4)].expr), 16))
+		return yyerror ("Immediate value out of range");
+
+	      notethat ("LDIMMhalf: regs = luimm16 (x)\n");
+	      /* reg, H, S, Z.  */
+	      (yyval.instr) = LDIMMHALF_R5 (&(yyvsp[(1) - (4)].reg), 0, 0, 1, (yyvsp[(3) - (4)].expr));
+	    }
+	}
+    break;
+
+  case 50:
+#line 1347 "bfin-parse.y"
+    {
+	  if (IS_H ((yyvsp[(1) - (3)].reg)))
+	    return yyerror ("Low reg expected");
+
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && (yyvsp[(3) - (3)].reg).regno == REG_A0x)
+	    {
+	      notethat ("dsp32alu: dregs_lo = A0.x\n");
+	      (yyval.instr) = DSP32ALU (10, 0, 0, &(yyvsp[(1) - (3)].reg), 0, 0, 0, 0, 0);
+	    }
+	  else if (IS_DREG ((yyvsp[(1) - (3)].reg)) && (yyvsp[(3) - (3)].reg).regno == REG_A1x)
+	    {
+	      notethat ("dsp32alu: dregs_lo = A1.x\n");
+	      (yyval.instr) = DSP32ALU (10, 0, 0, &(yyvsp[(1) - (3)].reg), 0, 0, 0, 0, 1);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 51:
+#line 1366 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_DREG ((yyvsp[(5) - (6)].reg)))
+	    {
+	      notethat ("dsp32alu: dregs = dregs .|. dregs (amod0)\n");
+	      (yyval.instr) = DSP32ALU (0, 0, 0, &(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0, (yyvsp[(6) - (6)].modcodes).x0, (yyvsp[(4) - (6)].r0).r0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 52:
+#line 1377 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (4)].reg)) && IS_DREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("ALU2op: dregs = dregs_byte\n");
+	      (yyval.instr) = ALU2OP (&(yyvsp[(1) - (4)].reg), &(yyvsp[(3) - (4)].reg), 12 | ((yyvsp[(4) - (4)].r0).r0 ? 0: 1));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 53:
+#line 1388 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (7)].reg), (yyvsp[(3) - (7)].reg)) && REG_SAME ((yyvsp[(5) - (7)].reg), (yyvsp[(7) - (7)].reg)) && !REG_SAME ((yyvsp[(1) - (7)].reg), (yyvsp[(5) - (7)].reg)))
+	    {
+	      notethat ("dsp32alu: A1 = ABS A1 , A0 = ABS A0\n");
+	      (yyval.instr) = DSP32ALU (16, 0, 0, 0, 0, 0, 0, 0, 3);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 54:
+#line 1399 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (7)].reg), (yyvsp[(3) - (7)].reg)) && REG_SAME ((yyvsp[(5) - (7)].reg), (yyvsp[(7) - (7)].reg)) && !REG_SAME ((yyvsp[(1) - (7)].reg), (yyvsp[(5) - (7)].reg)))
+	    {
+	      notethat ("dsp32alu: A1 = - A1 , A0 = - A0\n");
+	      (yyval.instr) = DSP32ALU (14, 0, 0, 0, 0, 0, 0, 0, 3);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 55:
+#line 1410 "bfin-parse.y"
+    {
+	  if (!IS_A1 ((yyvsp[(1) - (3)].reg)) && IS_A1 ((yyvsp[(2) - (3)].reg)))
+	    {
+	      notethat ("dsp32alu: A0 -= A1\n");
+	      (yyval.instr) = DSP32ALU (11, 0, 0, 0, 0, 0, (yyvsp[(3) - (3)].r0).r0, 0, 3);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 56:
+#line 1421 "bfin-parse.y"
+    {
+	  if (IS_IREG ((yyvsp[(1) - (3)].reg)) && EXPR_VALUE ((yyvsp[(3) - (3)].expr)) == 4)
+	    {
+	      notethat ("dagMODik: iregs -= 4\n");
+	      (yyval.instr) = DAGMODIK (&(yyvsp[(1) - (3)].reg), 3);
+	    }
+	  else if (IS_IREG ((yyvsp[(1) - (3)].reg)) && EXPR_VALUE ((yyvsp[(3) - (3)].expr)) == 2)
+	    {
+	      notethat ("dagMODik: iregs -= 2\n");
+	      (yyval.instr) = DAGMODIK (&(yyvsp[(1) - (3)].reg), 1);
+	    }
+	  else
+	    return yyerror ("Register or value mismatch");
+	}
+    break;
+
+  case 57:
+#line 1437 "bfin-parse.y"
+    {
+	  if (IS_IREG ((yyvsp[(1) - (6)].reg)) && IS_MREG ((yyvsp[(3) - (6)].reg)))
+	    {
+	      notethat ("dagMODim: iregs += mregs (opt_brev)\n");
+	      /* i, m, op, br.  */
+	      (yyval.instr) = DAGMODIM (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), 0, 1);
+	    }
+	  else if (IS_PREG ((yyvsp[(1) - (6)].reg)) && IS_PREG ((yyvsp[(3) - (6)].reg)))
+	    {
+	      notethat ("PTR2op: pregs += pregs (BREV )\n");
+	      (yyval.instr) = PTR2OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), 5);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 58:
+#line 1454 "bfin-parse.y"
+    {
+	  if (IS_IREG ((yyvsp[(1) - (3)].reg)) && IS_MREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("dagMODim: iregs -= mregs\n");
+	      (yyval.instr) = DAGMODIM (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 1, 0);
+	    }
+	  else if (IS_PREG ((yyvsp[(1) - (3)].reg)) && IS_PREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("PTR2op: pregs -= pregs\n");
+	      (yyval.instr) = PTR2OP (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 59:
+#line 1470 "bfin-parse.y"
+    {
+	  if (!IS_A1 ((yyvsp[(1) - (4)].reg)) && IS_A1 ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("dsp32alu: A0 += A1 (W32)\n");
+	      (yyval.instr) = DSP32ALU (11, 0, 0, 0, 0, 0, (yyvsp[(4) - (4)].r0).r0, 0, 2);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 60:
+#line 1481 "bfin-parse.y"
+    {
+	  if (IS_IREG ((yyvsp[(1) - (3)].reg)) && IS_MREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("dagMODim: iregs += mregs\n");
+	      (yyval.instr) = DAGMODIM (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 0, 0);
+	    }
+	  else
+	    return yyerror ("iregs += mregs expected");
+	}
+    break;
+
+  case 61:
+#line 1492 "bfin-parse.y"
+    {
+	  if (IS_IREG ((yyvsp[(1) - (3)].reg)))
+	    {
+	      if (EXPR_VALUE ((yyvsp[(3) - (3)].expr)) == 4)
+		{
+		  notethat ("dagMODik: iregs += 4\n");
+		  (yyval.instr) = DAGMODIK (&(yyvsp[(1) - (3)].reg), 2);
+		}
+	      else if (EXPR_VALUE ((yyvsp[(3) - (3)].expr)) == 2)
+		{
+		  notethat ("dagMODik: iregs += 2\n");
+		  (yyval.instr) = DAGMODIK (&(yyvsp[(1) - (3)].reg), 0);
+		}
+	      else
+		return yyerror ("iregs += [ 2 | 4 ");
+	    }
+	  else if (IS_PREG ((yyvsp[(1) - (3)].reg)) && IS_IMM ((yyvsp[(3) - (3)].expr), 7))
+	    {
+	      notethat ("COMPI2opP: pregs += imm7\n");
+	      (yyval.instr) = COMPI2OPP (&(yyvsp[(1) - (3)].reg), imm7 ((yyvsp[(3) - (3)].expr)), 1);
+	    }
+	  else if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_IMM ((yyvsp[(3) - (3)].expr), 7))
+	    {
+	      notethat ("COMPI2opD: dregs += imm7\n");
+	      (yyval.instr) = COMPI2OPD (&(yyvsp[(1) - (3)].reg), imm7 ((yyvsp[(3) - (3)].expr)), 1);
+	    }
+	  else if ((IS_DREG ((yyvsp[(1) - (3)].reg)) || IS_PREG ((yyvsp[(1) - (3)].reg))) && IS_CONST ((yyvsp[(3) - (3)].expr)))
+	    return yyerror ("Immediate value out of range");
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 62:
+#line 1525 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_DREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("ALU2op: dregs *= dregs\n");
+	      (yyval.instr) = ALU2OP (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 3);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 63:
+#line 1536 "bfin-parse.y"
+    {
+	  if (!valid_dreg_pair (&(yyvsp[(3) - (11)].reg), (yyvsp[(5) - (11)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else if (!valid_dreg_pair (&(yyvsp[(7) - (11)].reg), (yyvsp[(9) - (11)].expr)))
+	    return yyerror ("Bad dreg pair");
+	  else
+	    {
+	      notethat ("dsp32alu: SAA (dregs_pair , dregs_pair ) (aligndir)\n");
+	      (yyval.instr) = DSP32ALU (18, 0, 0, 0, &(yyvsp[(3) - (11)].reg), &(yyvsp[(7) - (11)].reg), (yyvsp[(11) - (11)].r0).r0, 0, 0);
+	    }
+	}
+    break;
+
+  case 64:
+#line 1549 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (11)].reg), (yyvsp[(2) - (11)].reg)) && REG_SAME ((yyvsp[(7) - (11)].reg), (yyvsp[(8) - (11)].reg)) && !REG_SAME ((yyvsp[(1) - (11)].reg), (yyvsp[(7) - (11)].reg)))
+	    {
+	      notethat ("dsp32alu: A1 = A1 (S) , A0 = A0 (S)\n");
+	      (yyval.instr) = DSP32ALU (8, 0, 0, 0, 0, 0, 1, 0, 2);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 65:
+#line 1560 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (9)].reg)) && IS_DREG ((yyvsp[(4) - (9)].reg)) && IS_DREG ((yyvsp[(6) - (9)].reg))
+	      && REG_SAME ((yyvsp[(1) - (9)].reg), (yyvsp[(4) - (9)].reg)))
+	    {
+	      if (EXPR_VALUE ((yyvsp[(9) - (9)].expr)) == 1)
+		{
+		  notethat ("ALU2op: dregs = (dregs + dregs) << 1\n");
+		  (yyval.instr) = ALU2OP (&(yyvsp[(1) - (9)].reg), &(yyvsp[(6) - (9)].reg), 4);
+		}
+	      else if (EXPR_VALUE ((yyvsp[(9) - (9)].expr)) == 2)
+		{
+		  notethat ("ALU2op: dregs = (dregs + dregs) << 2\n");
+		  (yyval.instr) = ALU2OP (&(yyvsp[(1) - (9)].reg), &(yyvsp[(6) - (9)].reg), 5);
+		}
+	      else
+		return yyerror ("Bad shift value");
+	    }
+	  else if (IS_PREG ((yyvsp[(1) - (9)].reg)) && IS_PREG ((yyvsp[(4) - (9)].reg)) && IS_PREG ((yyvsp[(6) - (9)].reg))
+		   && REG_SAME ((yyvsp[(1) - (9)].reg), (yyvsp[(4) - (9)].reg)))
+	    {
+	      if (EXPR_VALUE ((yyvsp[(9) - (9)].expr)) == 1)
+		{
+		  notethat ("PTR2op: pregs = (pregs + pregs) << 1\n");
+		  (yyval.instr) = PTR2OP (&(yyvsp[(1) - (9)].reg), &(yyvsp[(6) - (9)].reg), 6);
+		}
+	      else if (EXPR_VALUE ((yyvsp[(9) - (9)].expr)) == 2)
+		{
+		  notethat ("PTR2op: pregs = (pregs + pregs) << 2\n");
+		  (yyval.instr) = PTR2OP (&(yyvsp[(1) - (9)].reg), &(yyvsp[(6) - (9)].reg), 7);
+		}
+	      else
+		return yyerror ("Bad shift value");
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 66:
+#line 1599 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (5)].reg)) && IS_DREG ((yyvsp[(3) - (5)].reg)) && IS_DREG ((yyvsp[(5) - (5)].reg)))
+	    {
+	      notethat ("COMP3op: dregs = dregs | dregs\n");
+	      (yyval.instr) = COMP3OP (&(yyvsp[(1) - (5)].reg), &(yyvsp[(3) - (5)].reg), &(yyvsp[(5) - (5)].reg), 3);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 67:
+#line 1609 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (5)].reg)) && IS_DREG ((yyvsp[(3) - (5)].reg)) && IS_DREG ((yyvsp[(5) - (5)].reg)))
+	    {
+	      notethat ("COMP3op: dregs = dregs ^ dregs\n");
+	      (yyval.instr) = COMP3OP (&(yyvsp[(1) - (5)].reg), &(yyvsp[(3) - (5)].reg), &(yyvsp[(5) - (5)].reg), 4);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 68:
+#line 1619 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(1) - (9)].reg)) && IS_PREG ((yyvsp[(3) - (9)].reg)) && IS_PREG ((yyvsp[(6) - (9)].reg)))
+	    {
+	      if (EXPR_VALUE ((yyvsp[(8) - (9)].expr)) == 1)
+		{
+		  notethat ("COMP3op: pregs = pregs + (pregs << 1)\n");
+		  (yyval.instr) = COMP3OP (&(yyvsp[(1) - (9)].reg), &(yyvsp[(3) - (9)].reg), &(yyvsp[(6) - (9)].reg), 6);
+		}
+	      else if (EXPR_VALUE ((yyvsp[(8) - (9)].expr)) == 2)
+		{
+		  notethat ("COMP3op: pregs = pregs + (pregs << 2)\n");
+		  (yyval.instr) = COMP3OP (&(yyvsp[(1) - (9)].reg), &(yyvsp[(3) - (9)].reg), &(yyvsp[(6) - (9)].reg), 7);
+		}
+	      else
+		  return yyerror ("Bad shift value");
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 69:
+#line 1639 "bfin-parse.y"
+    {
+	  if ((yyvsp[(3) - (5)].reg).regno == REG_A0 && (yyvsp[(5) - (5)].reg).regno == REG_A1)
+	    {
+	      notethat ("CCflag: CC = A0 == A1\n");
+	      (yyval.instr) = CCFLAG (0, 0, 5, 0, 0);
+	    }
+	  else
+	    return yyerror ("AREGs are in bad order or same");
+	}
+    break;
+
+  case 70:
+#line 1649 "bfin-parse.y"
+    {
+	  if ((yyvsp[(3) - (5)].reg).regno == REG_A0 && (yyvsp[(5) - (5)].reg).regno == REG_A1)
+	    {
+	      notethat ("CCflag: CC = A0 < A1\n");
+	      (yyval.instr) = CCFLAG (0, 0, 6, 0, 0);
+	    }
+	  else
+	    return yyerror ("AREGs are in bad order or same");
+	}
+    break;
+
+  case 71:
+#line 1659 "bfin-parse.y"
+    {
+	  if ((IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_DREG ((yyvsp[(5) - (6)].reg)))
+	      || (IS_PREG ((yyvsp[(3) - (6)].reg)) && IS_PREG ((yyvsp[(5) - (6)].reg))))
+	    {
+	      notethat ("CCflag: CC = dpregs < dpregs\n");
+	      (yyval.instr) = CCFLAG (&(yyvsp[(3) - (6)].reg), (yyvsp[(5) - (6)].reg).regno & CODE_MASK, (yyvsp[(6) - (6)].r0).r0, 0, IS_PREG ((yyvsp[(3) - (6)].reg)) ? 1 : 0);
+	    }
+	  else
+	    return yyerror ("Bad register in comparison");
+	}
+    break;
+
+  case 72:
+#line 1670 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(3) - (6)].reg)) && !IS_PREG ((yyvsp[(3) - (6)].reg)))
+	    return yyerror ("Bad register in comparison");
+
+	  if (((yyvsp[(6) - (6)].r0).r0 == 1 && IS_IMM ((yyvsp[(5) - (6)].expr), 3))
+	      || ((yyvsp[(6) - (6)].r0).r0 == 3 && IS_UIMM ((yyvsp[(5) - (6)].expr), 3)))
+	    {
+	      notethat ("CCflag: CC = dpregs < (u)imm3\n");
+	      (yyval.instr) = CCFLAG (&(yyvsp[(3) - (6)].reg), imm3 ((yyvsp[(5) - (6)].expr)), (yyvsp[(6) - (6)].r0).r0, 1, IS_PREG ((yyvsp[(3) - (6)].reg)) ? 1 : 0);
+	    }
+	  else
+	    return yyerror ("Bad constant value");
+	}
+    break;
+
+  case 73:
+#line 1684 "bfin-parse.y"
+    {
+	  if ((IS_DREG ((yyvsp[(3) - (5)].reg)) && IS_DREG ((yyvsp[(5) - (5)].reg)))
+	      || (IS_PREG ((yyvsp[(3) - (5)].reg)) && IS_PREG ((yyvsp[(5) - (5)].reg))))
+	    {
+	      notethat ("CCflag: CC = dpregs == dpregs\n");
+	      (yyval.instr) = CCFLAG (&(yyvsp[(3) - (5)].reg), (yyvsp[(5) - (5)].reg).regno & CODE_MASK, 0, 0, IS_PREG ((yyvsp[(3) - (5)].reg)) ? 1 : 0);
+	    }
+	  else
+	    return yyerror ("Bad register in comparison");
+	}
+    break;
+
+  case 74:
+#line 1695 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(3) - (5)].reg)) && !IS_PREG ((yyvsp[(3) - (5)].reg)))
+	    return yyerror ("Bad register in comparison");
+
+	  if (IS_IMM ((yyvsp[(5) - (5)].expr), 3))
+	    {
+	      notethat ("CCflag: CC = dpregs == imm3\n");
+	      (yyval.instr) = CCFLAG (&(yyvsp[(3) - (5)].reg), imm3 ((yyvsp[(5) - (5)].expr)), 0, 1, IS_PREG ((yyvsp[(3) - (5)].reg)) ? 1 : 0);
+	    }
+	  else
+	    return yyerror ("Bad constant range");
+	}
+    break;
+
+  case 75:
+#line 1708 "bfin-parse.y"
+    {
+	  if ((yyvsp[(3) - (5)].reg).regno == REG_A0 && (yyvsp[(5) - (5)].reg).regno == REG_A1)
+	    {
+	      notethat ("CCflag: CC = A0 <= A1\n");
+	      (yyval.instr) = CCFLAG (0, 0, 7, 0, 0);
+	    }
+	  else
+	    return yyerror ("AREGs are in bad order or same");
+	}
+    break;
+
+  case 76:
+#line 1718 "bfin-parse.y"
+    {
+	  if ((IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_DREG ((yyvsp[(5) - (6)].reg)))
+	      || (IS_PREG ((yyvsp[(3) - (6)].reg)) && IS_PREG ((yyvsp[(5) - (6)].reg))))
+	    {
+	      notethat ("CCflag: CC = dpregs <= dpregs (..)\n");
+	      (yyval.instr) = CCFLAG (&(yyvsp[(3) - (6)].reg), (yyvsp[(5) - (6)].reg).regno & CODE_MASK,
+			   1 + (yyvsp[(6) - (6)].r0).r0, 0, IS_PREG ((yyvsp[(3) - (6)].reg)) ? 1 : 0);
+	    }
+	  else
+	    return yyerror ("Bad register in comparison");
+	}
+    break;
+
+  case 77:
+#line 1730 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(3) - (6)].reg)) && !IS_PREG ((yyvsp[(3) - (6)].reg)))
+	    return yyerror ("Bad register in comparison");
+
+	  if (((yyvsp[(6) - (6)].r0).r0 == 1 && IS_IMM ((yyvsp[(5) - (6)].expr), 3))
+	      || ((yyvsp[(6) - (6)].r0).r0 == 3 && IS_UIMM ((yyvsp[(5) - (6)].expr), 3)))
+	    {
+	      notethat ("CCflag: CC = dpregs <= (u)imm3\n");
+	      (yyval.instr) = CCFLAG (&(yyvsp[(3) - (6)].reg), imm3 ((yyvsp[(5) - (6)].expr)), 1 + (yyvsp[(6) - (6)].r0).r0, 1, IS_PREG ((yyvsp[(3) - (6)].reg)) ? 1 : 0);
+	    }
+	  else
+	    return yyerror ("Bad constant value");
+	}
+    break;
+
+  case 78:
+#line 1745 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (5)].reg)) && IS_DREG ((yyvsp[(3) - (5)].reg)) && IS_DREG ((yyvsp[(5) - (5)].reg)))
+	    {
+	      notethat ("COMP3op: dregs = dregs & dregs\n");
+	      (yyval.instr) = COMP3OP (&(yyvsp[(1) - (5)].reg), &(yyvsp[(3) - (5)].reg), &(yyvsp[(5) - (5)].reg), 2);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 79:
+#line 1756 "bfin-parse.y"
+    {
+	  notethat ("CC2stat operation\n");
+	  (yyval.instr) = bfin_gen_cc2stat ((yyvsp[(1) - (1)].modcodes).r0, (yyvsp[(1) - (1)].modcodes).x0, (yyvsp[(1) - (1)].modcodes).s0);
+	}
+    break;
+
+  case 80:
+#line 1762 "bfin-parse.y"
+    {
+	  if ((IS_GENREG ((yyvsp[(1) - (3)].reg)) && IS_GENREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_GENREG ((yyvsp[(1) - (3)].reg)) && IS_DAGREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_DAGREG ((yyvsp[(1) - (3)].reg)) && IS_GENREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_DAGREG ((yyvsp[(1) - (3)].reg)) && IS_DAGREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_GENREG ((yyvsp[(1) - (3)].reg)) && (yyvsp[(3) - (3)].reg).regno == REG_USP)
+	      || ((yyvsp[(1) - (3)].reg).regno == REG_USP && IS_GENREG ((yyvsp[(3) - (3)].reg)))
+	      || ((yyvsp[(1) - (3)].reg).regno == REG_USP && (yyvsp[(3) - (3)].reg).regno == REG_USP)
+	      || (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_SYSREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_PREG ((yyvsp[(1) - (3)].reg)) && IS_SYSREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_SYSREG ((yyvsp[(1) - (3)].reg)) && IS_GENREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_ALLREG ((yyvsp[(1) - (3)].reg)) && IS_EMUDAT ((yyvsp[(3) - (3)].reg)))
+	      || (IS_EMUDAT ((yyvsp[(1) - (3)].reg)) && IS_ALLREG ((yyvsp[(3) - (3)].reg)))
+	      || (IS_SYSREG ((yyvsp[(1) - (3)].reg)) && (yyvsp[(3) - (3)].reg).regno == REG_USP))
+	    {
+	      (yyval.instr) = bfin_gen_regmv (&(yyvsp[(3) - (3)].reg), &(yyvsp[(1) - (3)].reg));
+	    }
+	  else
+	    return yyerror ("Unsupported register move");
+	}
+    break;
+
+  case 81:
+#line 1784 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("CC2dreg: CC = dregs\n");
+	      (yyval.instr) = bfin_gen_cc2dreg (1, &(yyvsp[(3) - (3)].reg));
+	    }
+	  else
+	    return yyerror ("Only 'CC = Dreg' supported");
+	}
+    break;
+
+  case 82:
+#line 1795 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)))
+	    {
+	      notethat ("CC2dreg: dregs = CC\n");
+	      (yyval.instr) = bfin_gen_cc2dreg (0, &(yyvsp[(1) - (3)].reg));
+	    }
+	  else
+	    return yyerror ("Only 'Dreg = CC' supported");
+	}
+    break;
+
+  case 83:
+#line 1806 "bfin-parse.y"
+    {
+	  notethat ("CC2dreg: CC =! CC\n");
+	  (yyval.instr) = bfin_gen_cc2dreg (3, 0);
+	}
+    break;
+
+  case 84:
+#line 1814 "bfin-parse.y"
+    {
+	  notethat ("dsp32mult: dregs_half = multiply_halfregs (opt_mode)\n");
+
+	  if (!IS_H ((yyvsp[(1) - (4)].reg)) && (yyvsp[(4) - (4)].mod).MM)
+	    return yyerror ("(M) not allowed with MAC0");
+
+	  if ((yyvsp[(4) - (4)].mod).mod != 0 && (yyvsp[(4) - (4)].mod).mod != M_FU && (yyvsp[(4) - (4)].mod).mod != M_IS
+	      && (yyvsp[(4) - (4)].mod).mod != M_IU && (yyvsp[(4) - (4)].mod).mod != M_T && (yyvsp[(4) - (4)].mod).mod != M_TFU
+	      && (yyvsp[(4) - (4)].mod).mod != M_S2RND && (yyvsp[(4) - (4)].mod).mod != M_ISS2 && (yyvsp[(4) - (4)].mod).mod != M_IH)
+	    return yyerror ("bad option.");
+
+	  if (IS_H ((yyvsp[(1) - (4)].reg)))
+	    {
+	      (yyval.instr) = DSP32MULT (0, (yyvsp[(4) - (4)].mod).MM, (yyvsp[(4) - (4)].mod).mod, 1, 0,
+			      IS_H ((yyvsp[(3) - (4)].macfunc).s0), IS_H ((yyvsp[(3) - (4)].macfunc).s1), 0, 0,
+			      &(yyvsp[(1) - (4)].reg), 0, &(yyvsp[(3) - (4)].macfunc).s0, &(yyvsp[(3) - (4)].macfunc).s1, 0);
+	    }
+	  else
+	    {
+	      (yyval.instr) = DSP32MULT (0, 0, (yyvsp[(4) - (4)].mod).mod, 0, 0,
+			      0, 0, IS_H ((yyvsp[(3) - (4)].macfunc).s0), IS_H ((yyvsp[(3) - (4)].macfunc).s1),
+			      &(yyvsp[(1) - (4)].reg), 0, &(yyvsp[(3) - (4)].macfunc).s0, &(yyvsp[(3) - (4)].macfunc).s1, 1);
+	    }
+	}
+    break;
+
+  case 85:
+#line 1840 "bfin-parse.y"
+    {
+	  /* Odd registers can use (M).  */
+	  if (!IS_DREG ((yyvsp[(1) - (4)].reg)))
+	    return yyerror ("Dreg expected");
+
+	  if (IS_EVEN ((yyvsp[(1) - (4)].reg)) && (yyvsp[(4) - (4)].mod).MM)
+	    return yyerror ("(M) not allowed with MAC0");
+
+	  if ((yyvsp[(4) - (4)].mod).mod != 0 && (yyvsp[(4) - (4)].mod).mod != M_FU && (yyvsp[(4) - (4)].mod).mod != M_IS
+	      && (yyvsp[(4) - (4)].mod).mod != M_S2RND && (yyvsp[(4) - (4)].mod).mod != M_ISS2)
+	    return yyerror ("bad option");
+
+	  if (!IS_EVEN ((yyvsp[(1) - (4)].reg)))
+	    {
+	      notethat ("dsp32mult: dregs = multiply_halfregs (opt_mode)\n");
+
+	      (yyval.instr) = DSP32MULT (0, (yyvsp[(4) - (4)].mod).MM, (yyvsp[(4) - (4)].mod).mod, 1, 1,
+			      IS_H ((yyvsp[(3) - (4)].macfunc).s0), IS_H ((yyvsp[(3) - (4)].macfunc).s1), 0, 0,
+			      &(yyvsp[(1) - (4)].reg), 0, &(yyvsp[(3) - (4)].macfunc).s0, &(yyvsp[(3) - (4)].macfunc).s1, 0);
+	    }
+	  else
+	    {
+	      notethat ("dsp32mult: dregs = multiply_halfregs opt_mode\n");
+	      (yyval.instr) = DSP32MULT (0, 0, (yyvsp[(4) - (4)].mod).mod, 0, 1,
+			      0, 0, IS_H ((yyvsp[(3) - (4)].macfunc).s0), IS_H ((yyvsp[(3) - (4)].macfunc).s1),
+			      &(yyvsp[(1) - (4)].reg),  0, &(yyvsp[(3) - (4)].macfunc).s0, &(yyvsp[(3) - (4)].macfunc).s1, 1);
+	    }
+	}
+    break;
+
+  case 86:
+#line 1871 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (9)].reg)) || !IS_DREG ((yyvsp[(6) - (9)].reg)))
+	    return yyerror ("Dregs expected");
+
+	  if (!IS_HCOMPL((yyvsp[(1) - (9)].reg), (yyvsp[(6) - (9)].reg)))
+	    return yyerror ("Dest registers mismatch");
+
+	  if (check_multiply_halfregs (&(yyvsp[(3) - (9)].macfunc), &(yyvsp[(8) - (9)].macfunc)) < 0)
+	    return -1;
+
+	  if ((!IS_H ((yyvsp[(1) - (9)].reg)) && (yyvsp[(4) - (9)].mod).MM)
+	      || (!IS_H ((yyvsp[(6) - (9)].reg)) && (yyvsp[(9) - (9)].mod).MM))
+	    return yyerror ("(M) not allowed with MAC0");
+
+	  notethat ("dsp32mult: dregs_hi = multiply_halfregs mxd_mod, "
+		    "dregs_lo = multiply_halfregs opt_mode\n");
+
+	  if (IS_H ((yyvsp[(1) - (9)].reg)))
+	    (yyval.instr) = DSP32MULT (0, (yyvsp[(4) - (9)].mod).MM, (yyvsp[(9) - (9)].mod).mod, 1, 0,
+			    IS_H ((yyvsp[(3) - (9)].macfunc).s0), IS_H ((yyvsp[(3) - (9)].macfunc).s1), IS_H ((yyvsp[(8) - (9)].macfunc).s0), IS_H ((yyvsp[(8) - (9)].macfunc).s1),
+			    &(yyvsp[(1) - (9)].reg), 0, &(yyvsp[(3) - (9)].macfunc).s0, &(yyvsp[(3) - (9)].macfunc).s1, 1);
+	  else
+	    (yyval.instr) = DSP32MULT (0, (yyvsp[(9) - (9)].mod).MM, (yyvsp[(9) - (9)].mod).mod, 1, 0,
+			    IS_H ((yyvsp[(8) - (9)].macfunc).s0), IS_H ((yyvsp[(8) - (9)].macfunc).s1), IS_H ((yyvsp[(3) - (9)].macfunc).s0), IS_H ((yyvsp[(3) - (9)].macfunc).s1),
+			    &(yyvsp[(1) - (9)].reg), 0, &(yyvsp[(3) - (9)].macfunc).s0, &(yyvsp[(3) - (9)].macfunc).s1, 1);
+	}
+    break;
+
+  case 87:
+#line 1899 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (9)].reg)) || !IS_DREG ((yyvsp[(6) - (9)].reg)))
+	    return yyerror ("Dregs expected");
+
+	  if ((IS_EVEN ((yyvsp[(1) - (9)].reg)) && (yyvsp[(6) - (9)].reg).regno - (yyvsp[(1) - (9)].reg).regno != 1)
+	      || (IS_EVEN ((yyvsp[(6) - (9)].reg)) && (yyvsp[(1) - (9)].reg).regno - (yyvsp[(6) - (9)].reg).regno != 1))
+	    return yyerror ("Dest registers mismatch");
+
+	  if (check_multiply_halfregs (&(yyvsp[(3) - (9)].macfunc), &(yyvsp[(8) - (9)].macfunc)) < 0)
+	    return -1;
+
+	  if ((IS_EVEN ((yyvsp[(1) - (9)].reg)) && (yyvsp[(4) - (9)].mod).MM)
+	      || (IS_EVEN ((yyvsp[(6) - (9)].reg)) && (yyvsp[(9) - (9)].mod).MM))
+	    return yyerror ("(M) not allowed with MAC0");
+
+	  notethat ("dsp32mult: dregs = multiply_halfregs mxd_mod, "
+		   "dregs = multiply_halfregs opt_mode\n");
+
+	  if (IS_EVEN ((yyvsp[(1) - (9)].reg)))
+	    (yyval.instr) = DSP32MULT (0, (yyvsp[(9) - (9)].mod).MM, (yyvsp[(9) - (9)].mod).mod, 1, 1,
+			    IS_H ((yyvsp[(8) - (9)].macfunc).s0), IS_H ((yyvsp[(8) - (9)].macfunc).s1), IS_H ((yyvsp[(3) - (9)].macfunc).s0), IS_H ((yyvsp[(3) - (9)].macfunc).s1),
+			    &(yyvsp[(1) - (9)].reg), 0, &(yyvsp[(3) - (9)].macfunc).s0, &(yyvsp[(3) - (9)].macfunc).s1, 1);
+	  else
+	    (yyval.instr) = DSP32MULT (0, (yyvsp[(4) - (9)].mod).MM, (yyvsp[(9) - (9)].mod).mod, 1, 1,
+			    IS_H ((yyvsp[(3) - (9)].macfunc).s0), IS_H ((yyvsp[(3) - (9)].macfunc).s1), IS_H ((yyvsp[(8) - (9)].macfunc).s0), IS_H ((yyvsp[(8) - (9)].macfunc).s1),
+			    &(yyvsp[(1) - (9)].reg), 0, &(yyvsp[(3) - (9)].macfunc).s0, &(yyvsp[(3) - (9)].macfunc).s1, 1);
+	}
+    break;
+
+  case 88:
+#line 1930 "bfin-parse.y"
+    {
+	  if (!REG_SAME ((yyvsp[(1) - (5)].reg), (yyvsp[(3) - (5)].reg)))
+	    return yyerror ("Aregs must be same");
+
+	  if (IS_DREG ((yyvsp[(5) - (5)].reg)) && !IS_H ((yyvsp[(5) - (5)].reg)))
+	    {
+	      notethat ("dsp32shift: A0 = ASHIFT A0 BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (3, 0, &(yyvsp[(5) - (5)].reg), 0, 0, IS_A1 ((yyvsp[(1) - (5)].reg)));
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 89:
+#line 1944 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(6) - (7)].reg)) && !IS_H ((yyvsp[(6) - (7)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_half = ASHIFT dregs_half BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (0, &(yyvsp[(1) - (7)].reg), &(yyvsp[(6) - (7)].reg), &(yyvsp[(4) - (7)].reg), (yyvsp[(7) - (7)].modcodes).s0, HL2 ((yyvsp[(1) - (7)].reg), (yyvsp[(4) - (7)].reg)));
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 90:
+#line 1955 "bfin-parse.y"
+    {
+	  if (!REG_SAME ((yyvsp[(1) - (4)].reg), (yyvsp[(2) - (4)].reg)))
+	    return yyerror ("Aregs must be same");
+
+	  if (IS_UIMM ((yyvsp[(4) - (4)].expr), 5))
+	    {
+	      notethat ("dsp32shiftimm: A0 = A0 << uimm5\n");
+	      (yyval.instr) = DSP32SHIFTIMM (3, 0, imm5 ((yyvsp[(4) - (4)].expr)), 0, 0, IS_A1 ((yyvsp[(1) - (4)].reg)));
+	    }
+	  else
+	    return yyerror ("Bad shift value");
+	}
+    break;
+
+  case 91:
+#line 1969 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+	    {
+	      if ((yyvsp[(6) - (6)].modcodes).r0)
+		{
+		  /*  Vector?  */
+		  notethat ("dsp32shiftimm: dregs = dregs << expr (V, .)\n");
+		  (yyval.instr) = DSP32SHIFTIMM (1, &(yyvsp[(1) - (6)].reg), imm4 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0 ? 1 : 2, 0);
+		}
+	      else
+		{
+		  notethat ("dsp32shiftimm: dregs =  dregs << uimm5 (.)\n");
+		  (yyval.instr) = DSP32SHIFTIMM (2, &(yyvsp[(1) - (6)].reg), imm6 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0 ? 1 : 2, 0);
+		}
+	    }
+	  else if ((yyvsp[(6) - (6)].modcodes).s0 == 0 && IS_PREG ((yyvsp[(1) - (6)].reg)) && IS_PREG ((yyvsp[(3) - (6)].reg)))
+	    {
+	      if (EXPR_VALUE ((yyvsp[(5) - (6)].expr)) == 2)
+		{
+		  notethat ("PTR2op: pregs = pregs << 2\n");
+		  (yyval.instr) = PTR2OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), 1);
+		}
+	      else if (EXPR_VALUE ((yyvsp[(5) - (6)].expr)) == 1)
+		{
+		  notethat ("COMP3op: pregs = pregs << 1\n");
+		  (yyval.instr) = COMP3OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), &(yyvsp[(3) - (6)].reg), 5);
+		}
+	      else
+		return yyerror ("Bad shift value");
+	    }
+	  else
+	    return yyerror ("Bad shift value or register");
+	}
+    break;
+
+  case 92:
+#line 2003 "bfin-parse.y"
+    {
+	  if (IS_UIMM ((yyvsp[(5) - (6)].expr), 4))
+	    {
+	      if ((yyvsp[(6) - (6)].modcodes).s0)
+		{
+		  notethat ("dsp32shiftimm: dregs_half = dregs_half << uimm4 (S)\n");
+		  (yyval.instr) = DSP32SHIFTIMM (0x0, &(yyvsp[(1) - (6)].reg), imm5 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0, HL2 ((yyvsp[(1) - (6)].reg), (yyvsp[(3) - (6)].reg)));
+		}
+	      else
+		{
+		  notethat ("dsp32shiftimm: dregs_half = dregs_half << uimm4\n");
+		  (yyval.instr) = DSP32SHIFTIMM (0x0, &(yyvsp[(1) - (6)].reg), imm5 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), 2, HL2 ((yyvsp[(1) - (6)].reg), (yyvsp[(3) - (6)].reg)));
+		}
+	    }
+	  else
+	    return yyerror ("Bad shift value");
+	}
+    break;
+
+  case 93:
+#line 2021 "bfin-parse.y"
+    {
+	  int op;
+
+	  if (IS_DREG ((yyvsp[(1) - (7)].reg)) && IS_DREG ((yyvsp[(4) - (7)].reg)) && IS_DREG ((yyvsp[(6) - (7)].reg)) && !IS_H ((yyvsp[(6) - (7)].reg)))
+	    {
+	      if ((yyvsp[(7) - (7)].modcodes).r0)
+		{
+		  op = 1;
+		  notethat ("dsp32shift: dregs = ASHIFT dregs BY "
+			   "dregs_lo (V, .)\n");
+		}
+	      else
+		{
+
+		  op = 2;
+		  notethat ("dsp32shift: dregs = ASHIFT dregs BY dregs_lo (.)\n");
+		}
+	      (yyval.instr) = DSP32SHIFT (op, &(yyvsp[(1) - (7)].reg), &(yyvsp[(6) - (7)].reg), &(yyvsp[(4) - (7)].reg), (yyvsp[(7) - (7)].modcodes).s0, 0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 94:
+#line 2046 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (9)].reg)) && IS_DREG_L ((yyvsp[(5) - (9)].reg)) && IS_DREG_L ((yyvsp[(7) - (9)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = EXPADJ (dregs , dregs_lo )\n");
+	      (yyval.instr) = DSP32SHIFT (7, &(yyvsp[(1) - (9)].reg), &(yyvsp[(7) - (9)].reg), &(yyvsp[(5) - (9)].reg), (yyvsp[(9) - (9)].r0).r0, 0);
+	    }
+	  else
+	    return yyerror ("Bad shift value or register");
+	}
+    break;
+
+  case 95:
+#line 2058 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (8)].reg)) && IS_DREG_L ((yyvsp[(5) - (8)].reg)) && IS_DREG_L ((yyvsp[(7) - (8)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = EXPADJ (dregs_lo, dregs_lo)\n");
+	      (yyval.instr) = DSP32SHIFT (7, &(yyvsp[(1) - (8)].reg), &(yyvsp[(7) - (8)].reg), &(yyvsp[(5) - (8)].reg), 2, 0);
+	    }
+	  else if (IS_DREG_L ((yyvsp[(1) - (8)].reg)) && IS_DREG_H ((yyvsp[(5) - (8)].reg)) && IS_DREG_L ((yyvsp[(7) - (8)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = EXPADJ (dregs_hi, dregs_lo)\n");
+	      (yyval.instr) = DSP32SHIFT (7, &(yyvsp[(1) - (8)].reg), &(yyvsp[(7) - (8)].reg), &(yyvsp[(5) - (8)].reg), 3, 0);
+	    }
+	  else
+	    return yyerror ("Bad shift value or register");
+	}
+    break;
+
+  case 96:
+#line 2076 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (8)].reg)) && IS_DREG ((yyvsp[(5) - (8)].reg)) && IS_DREG ((yyvsp[(7) - (8)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = DEPOSIT (dregs , dregs )\n");
+	      (yyval.instr) = DSP32SHIFT (10, &(yyvsp[(1) - (8)].reg), &(yyvsp[(7) - (8)].reg), &(yyvsp[(5) - (8)].reg), 2, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 97:
+#line 2087 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (11)].reg)) && IS_DREG ((yyvsp[(5) - (11)].reg)) && IS_DREG ((yyvsp[(7) - (11)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = DEPOSIT (dregs , dregs ) (X)\n");
+	      (yyval.instr) = DSP32SHIFT (10, &(yyvsp[(1) - (11)].reg), &(yyvsp[(7) - (11)].reg), &(yyvsp[(5) - (11)].reg), 3, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 98:
+#line 2098 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (9)].reg)) && IS_DREG ((yyvsp[(5) - (9)].reg)) && IS_DREG_L ((yyvsp[(7) - (9)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = EXTRACT (dregs, dregs_lo ) (.)\n");
+	      (yyval.instr) = DSP32SHIFT (10, &(yyvsp[(1) - (9)].reg), &(yyvsp[(7) - (9)].reg), &(yyvsp[(5) - (9)].reg), (yyvsp[(9) - (9)].r0).r0, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 99:
+#line 2109 "bfin-parse.y"
+    {
+	  if (!REG_SAME ((yyvsp[(1) - (4)].reg), (yyvsp[(2) - (4)].reg)))
+	    return yyerror ("Aregs must be same");
+
+	  if (IS_UIMM ((yyvsp[(4) - (4)].expr), 5))
+	    {
+	      notethat ("dsp32shiftimm: Ax = Ax >>> uimm5\n");
+	      (yyval.instr) = DSP32SHIFTIMM (3, 0, -imm6 ((yyvsp[(4) - (4)].expr)), 0, 0, IS_A1 ((yyvsp[(1) - (4)].reg)));
+	    }
+	  else
+	    return yyerror ("Shift value range error");
+	}
+    break;
+
+  case 100:
+#line 2122 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (5)].reg), (yyvsp[(3) - (5)].reg)) && IS_DREG_L ((yyvsp[(5) - (5)].reg)))
+	    {
+	      notethat ("dsp32shift: Ax = LSHIFT Ax BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (3, 0, &(yyvsp[(5) - (5)].reg), 0, 1, IS_A1 ((yyvsp[(1) - (5)].reg)));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 101:
+#line 2133 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(4) - (6)].reg)) && IS_DREG_L ((yyvsp[(6) - (6)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = LSHIFT dregs_hi BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (0, &(yyvsp[(1) - (6)].reg), &(yyvsp[(6) - (6)].reg), &(yyvsp[(4) - (6)].reg), 2, HL2 ((yyvsp[(1) - (6)].reg), (yyvsp[(4) - (6)].reg)));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 102:
+#line 2144 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (7)].reg)) && IS_DREG ((yyvsp[(4) - (7)].reg)) && IS_DREG_L ((yyvsp[(6) - (7)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = LSHIFT dregs BY dregs_lo (V )\n");
+	      (yyval.instr) = DSP32SHIFT ((yyvsp[(7) - (7)].r0).r0 ? 1: 2, &(yyvsp[(1) - (7)].reg), &(yyvsp[(6) - (7)].reg), &(yyvsp[(4) - (7)].reg), 2, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 103:
+#line 2155 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(4) - (6)].reg)) && IS_DREG_L ((yyvsp[(6) - (6)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = SHIFT dregs BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (2, &(yyvsp[(1) - (6)].reg), &(yyvsp[(6) - (6)].reg), &(yyvsp[(4) - (6)].reg), 2, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 104:
+#line 2166 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (4)].reg), (yyvsp[(2) - (4)].reg)) && IS_IMM ((yyvsp[(4) - (4)].expr), 6) >= 0)
+	    {
+	      notethat ("dsp32shiftimm: Ax = Ax >> imm6\n");
+	      (yyval.instr) = DSP32SHIFTIMM (3, 0, -imm6 ((yyvsp[(4) - (4)].expr)), 0, 1, IS_A1 ((yyvsp[(1) - (4)].reg)));
+	    }
+	  else
+	    return yyerror ("Accu register expected");
+	}
+    break;
+
+  case 105:
+#line 2177 "bfin-parse.y"
+    {
+	  if ((yyvsp[(6) - (6)].r0).r0 == 1)
+	    {
+	      if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+		{
+		  notethat ("dsp32shiftimm: dregs = dregs >> uimm5 (V)\n");
+		  (yyval.instr) = DSP32SHIFTIMM (1, &(yyvsp[(1) - (6)].reg), -uimm5 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), 2, 0);
+		}
+	      else
+	        return yyerror ("Register mismatch");
+	    }
+	  else
+	    {
+	      if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+		{
+		  notethat ("dsp32shiftimm: dregs = dregs >> uimm5\n");
+		  (yyval.instr) = DSP32SHIFTIMM (2, &(yyvsp[(1) - (6)].reg), -imm6 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), 2, 0);
+		}
+	      else if (IS_PREG ((yyvsp[(1) - (6)].reg)) && IS_PREG ((yyvsp[(3) - (6)].reg)) && EXPR_VALUE ((yyvsp[(5) - (6)].expr)) == 2)
+		{
+		  notethat ("PTR2op: pregs = pregs >> 2\n");
+		  (yyval.instr) = PTR2OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), 3);
+		}
+	      else if (IS_PREG ((yyvsp[(1) - (6)].reg)) && IS_PREG ((yyvsp[(3) - (6)].reg)) && EXPR_VALUE ((yyvsp[(5) - (6)].expr)) == 1)
+		{
+		  notethat ("PTR2op: pregs = pregs >> 1\n");
+		  (yyval.instr) = PTR2OP (&(yyvsp[(1) - (6)].reg), &(yyvsp[(3) - (6)].reg), 4);
+		}
+	      else
+	        return yyerror ("Register mismatch");
+	    }
+	}
+    break;
+
+  case 106:
+#line 2210 "bfin-parse.y"
+    {
+	  if (IS_UIMM ((yyvsp[(5) - (5)].expr), 5))
+	    {
+	      notethat ("dsp32shiftimm:  dregs_half =  dregs_half >> uimm5\n");
+	      (yyval.instr) = DSP32SHIFTIMM (0, &(yyvsp[(1) - (5)].reg), -uimm5 ((yyvsp[(5) - (5)].expr)), &(yyvsp[(3) - (5)].reg), 2, HL2 ((yyvsp[(1) - (5)].reg), (yyvsp[(3) - (5)].reg)));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 107:
+#line 2220 "bfin-parse.y"
+    {
+	  if (IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+	    {
+	      notethat ("dsp32shiftimm: dregs_half = dregs_half >>> uimm5\n");
+	      (yyval.instr) = DSP32SHIFTIMM (0, &(yyvsp[(1) - (6)].reg), -uimm5 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg),
+				  (yyvsp[(6) - (6)].modcodes).s0, HL2 ((yyvsp[(1) - (6)].reg), (yyvsp[(3) - (6)].reg)));
+	    }
+	  else
+	    return yyerror ("Register or modifier mismatch");
+	}
+    break;
+
+  case 108:
+#line 2233 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+	    {
+	      if ((yyvsp[(6) - (6)].modcodes).r0)
+		{
+		  /* Vector?  */
+		  notethat ("dsp32shiftimm: dregs  =  dregs >>> uimm5 (V, .)\n");
+		  (yyval.instr) = DSP32SHIFTIMM (1, &(yyvsp[(1) - (6)].reg), -uimm5 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0, 0);
+		}
+	      else
+		{
+		  notethat ("dsp32shiftimm: dregs  =  dregs >>> uimm5 (.)\n");
+		  (yyval.instr) = DSP32SHIFTIMM (2, &(yyvsp[(1) - (6)].reg), -uimm5 ((yyvsp[(5) - (6)].expr)), &(yyvsp[(3) - (6)].reg), (yyvsp[(6) - (6)].modcodes).s0, 0);
+		}
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 109:
+#line 2253 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (4)].reg)) && IS_DREG ((yyvsp[(4) - (4)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = ONES dregs\n");
+	      (yyval.instr) = DSP32SHIFT (6, &(yyvsp[(1) - (4)].reg), 0, &(yyvsp[(4) - (4)].reg), 3, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 110:
+#line 2264 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (8)].reg)) && IS_DREG ((yyvsp[(5) - (8)].reg)) && IS_DREG ((yyvsp[(7) - (8)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = PACK (dregs_hi , dregs_hi )\n");
+	      (yyval.instr) = DSP32SHIFT (4, &(yyvsp[(1) - (8)].reg), &(yyvsp[(7) - (8)].reg), &(yyvsp[(5) - (8)].reg), HL2 ((yyvsp[(5) - (8)].reg), (yyvsp[(7) - (8)].reg)), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 111:
+#line 2275 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (10)].reg))
+	      && (yyvsp[(7) - (10)].reg).regno == REG_A0
+	      && IS_DREG ((yyvsp[(9) - (10)].reg)) && !IS_H ((yyvsp[(1) - (10)].reg)) && !IS_A1 ((yyvsp[(7) - (10)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = CC = BXORSHIFT (A0 , dregs )\n");
+	      (yyval.instr) = DSP32SHIFT (11, &(yyvsp[(1) - (10)].reg), &(yyvsp[(9) - (10)].reg), 0, 0, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 112:
+#line 2288 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (10)].reg))
+	      && (yyvsp[(7) - (10)].reg).regno == REG_A0
+	      && IS_DREG ((yyvsp[(9) - (10)].reg)) && !IS_H ((yyvsp[(1) - (10)].reg)) && !IS_A1 ((yyvsp[(7) - (10)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = CC = BXOR (A0 , dregs)\n");
+	      (yyval.instr) = DSP32SHIFT (11, &(yyvsp[(1) - (10)].reg), &(yyvsp[(9) - (10)].reg), 0, 1, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 113:
+#line 2301 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (12)].reg)) && !IS_H ((yyvsp[(1) - (12)].reg)) && !REG_SAME ((yyvsp[(7) - (12)].reg), (yyvsp[(9) - (12)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = CC = BXOR (A0 , A1 , CC)\n");
+	      (yyval.instr) = DSP32SHIFT (12, &(yyvsp[(1) - (12)].reg), 0, 0, 1, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 114:
+#line 2312 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(1) - (5)].reg), (yyvsp[(3) - (5)].reg)) && IS_DREG_L ((yyvsp[(5) - (5)].reg)))
+	    {
+	      notethat ("dsp32shift: Ax = ROT Ax BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (3, 0, &(yyvsp[(5) - (5)].reg), 0, 2, IS_A1 ((yyvsp[(1) - (5)].reg)));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 115:
+#line 2323 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(4) - (6)].reg)) && IS_DREG_L ((yyvsp[(6) - (6)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = ROT dregs BY dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (2, &(yyvsp[(1) - (6)].reg), &(yyvsp[(6) - (6)].reg), &(yyvsp[(4) - (6)].reg), 3, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 116:
+#line 2334 "bfin-parse.y"
+    {
+	  if (IS_IMM ((yyvsp[(5) - (5)].expr), 6))
+	    {
+	      notethat ("dsp32shiftimm: An = ROT An BY imm6\n");
+	      (yyval.instr) = DSP32SHIFTIMM (3, 0, imm6 ((yyvsp[(5) - (5)].expr)), 0, 2, IS_A1 ((yyvsp[(1) - (5)].reg)));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 117:
+#line 2345 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (6)].reg)) && IS_DREG ((yyvsp[(4) - (6)].reg)) && IS_IMM ((yyvsp[(6) - (6)].expr), 6))
+	    {
+	      (yyval.instr) = DSP32SHIFTIMM (2, &(yyvsp[(1) - (6)].reg), imm6 ((yyvsp[(6) - (6)].expr)), &(yyvsp[(4) - (6)].reg), 3, IS_A1 ((yyvsp[(1) - (6)].reg)));
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 118:
+#line 2355 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (4)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = SIGNBITS An\n");
+	      (yyval.instr) = DSP32SHIFT (6, &(yyvsp[(1) - (4)].reg), 0, 0, IS_A1 ((yyvsp[(4) - (4)].reg)), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 119:
+#line 2366 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (4)].reg)) && IS_DREG ((yyvsp[(4) - (4)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = SIGNBITS dregs\n");
+	      (yyval.instr) = DSP32SHIFT (5, &(yyvsp[(1) - (4)].reg), 0, &(yyvsp[(4) - (4)].reg), 0, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 120:
+#line 2377 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (4)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = SIGNBITS dregs_lo\n");
+	      (yyval.instr) = DSP32SHIFT (5, &(yyvsp[(1) - (4)].reg), 0, &(yyvsp[(4) - (4)].reg), 1 + IS_H ((yyvsp[(4) - (4)].reg)), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 121:
+#line 2389 "bfin-parse.y"
+    {
+	  if (IS_DREG_L ((yyvsp[(1) - (7)].reg)) && IS_DREG ((yyvsp[(5) - (7)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs_lo = VIT_MAX (dregs) (..)\n");
+	      (yyval.instr) = DSP32SHIFT (9, &(yyvsp[(1) - (7)].reg), 0, &(yyvsp[(5) - (7)].reg), ((yyvsp[(7) - (7)].r0).r0 ? 0 : 1), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 122:
+#line 2400 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (9)].reg)) && IS_DREG ((yyvsp[(5) - (9)].reg)) && IS_DREG ((yyvsp[(7) - (9)].reg)))
+	    {
+	      notethat ("dsp32shift: dregs = VIT_MAX (dregs, dregs) (ASR)\n");
+	      (yyval.instr) = DSP32SHIFT (9, &(yyvsp[(1) - (9)].reg), &(yyvsp[(7) - (9)].reg), &(yyvsp[(5) - (9)].reg), 2 | ((yyvsp[(9) - (9)].r0).r0 ? 0 : 1), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 123:
+#line 2411 "bfin-parse.y"
+    {
+	  if (REG_SAME ((yyvsp[(3) - (9)].reg), (yyvsp[(5) - (9)].reg)))
+	    return yyerror ("Illegal source register combination");
+
+	  if (IS_DREG ((yyvsp[(3) - (9)].reg)) && IS_DREG ((yyvsp[(5) - (9)].reg)) && !IS_A1 ((yyvsp[(7) - (9)].reg)))
+	    {
+	      notethat ("dsp32shift: BITMUX (dregs , dregs , A0) (ASR)\n");
+	      (yyval.instr) = DSP32SHIFT (8, 0, &(yyvsp[(3) - (9)].reg), &(yyvsp[(5) - (9)].reg), (yyvsp[(9) - (9)].r0).r0, 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 124:
+#line 2425 "bfin-parse.y"
+    {
+	  if (!IS_A1 ((yyvsp[(1) - (9)].reg)) && !IS_A1 ((yyvsp[(4) - (9)].reg)) && IS_A1 ((yyvsp[(6) - (9)].reg)))
+	    {
+	      notethat ("dsp32shift: A0 = BXORSHIFT (A0 , A1 , CC )\n");
+	      (yyval.instr) = DSP32SHIFT (12, 0, 0, 0, 0, 0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 125:
+#line 2438 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+	    {
+	      notethat ("LOGI2op: BITCLR (dregs , uimm5 )\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(3) - (6)].reg), uimm5 ((yyvsp[(5) - (6)].expr)), 4);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 126:
+#line 2450 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+	    {
+	      notethat ("LOGI2op: BITCLR (dregs , uimm5 )\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(3) - (6)].reg), uimm5 ((yyvsp[(5) - (6)].expr)), 2);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 127:
+#line 2462 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_UIMM ((yyvsp[(5) - (6)].expr), 5))
+	    {
+	      notethat ("LOGI2op: BITCLR (dregs , uimm5 )\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(3) - (6)].reg), uimm5 ((yyvsp[(5) - (6)].expr)), 3);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 128:
+#line 2473 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(5) - (8)].reg)) && IS_UIMM ((yyvsp[(7) - (8)].expr), 5))
+	    {
+	      notethat ("LOGI2op: CC =! BITTST (dregs , uimm5 )\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(5) - (8)].reg), uimm5 ((yyvsp[(7) - (8)].expr)), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch or value error");
+	}
+    break;
+
+  case 129:
+#line 2484 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(5) - (8)].reg)) && IS_UIMM ((yyvsp[(7) - (8)].expr), 5))
+	    {
+	      notethat ("LOGI2op: CC = BITTST (dregs , uimm5 )\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(5) - (8)].reg), uimm5 ((yyvsp[(7) - (8)].expr)), 1);
+	    }
+	  else
+	    return yyerror ("Register mismatch or value error");
+	}
+    break;
+
+  case 130:
+#line 2495 "bfin-parse.y"
+    {
+	  if ((IS_DREG ((yyvsp[(4) - (6)].reg)) || IS_PREG ((yyvsp[(4) - (6)].reg)))
+	      && (IS_DREG ((yyvsp[(6) - (6)].reg)) || IS_PREG ((yyvsp[(6) - (6)].reg))))
+	    {
+	      notethat ("ccMV: IF ! CC gregs = gregs\n");
+	      (yyval.instr) = CCMV (&(yyvsp[(6) - (6)].reg), &(yyvsp[(4) - (6)].reg), 0);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 131:
+#line 2507 "bfin-parse.y"
+    {
+	  if ((IS_DREG ((yyvsp[(5) - (5)].reg)) || IS_PREG ((yyvsp[(5) - (5)].reg)))
+	      && (IS_DREG ((yyvsp[(3) - (5)].reg)) || IS_PREG ((yyvsp[(3) - (5)].reg))))
+	    {
+	      notethat ("ccMV: IF CC gregs = gregs\n");
+	      (yyval.instr) = CCMV (&(yyvsp[(5) - (5)].reg), &(yyvsp[(3) - (5)].reg), 1);
+	    }
+	  else
+	    return yyerror ("Register mismatch");
+	}
+    break;
+
+  case 132:
+#line 2519 "bfin-parse.y"
+    {
+	  if (IS_PCREL10 ((yyvsp[(5) - (5)].expr)))
+	    {
+	      notethat ("BRCC: IF !CC JUMP  pcrel11m2\n");
+	      (yyval.instr) = BRCC (0, 0, (yyvsp[(5) - (5)].expr));
+	    }
+	  else
+	    return yyerror ("Bad jump offset");
+	}
+    break;
+
+  case 133:
+#line 2530 "bfin-parse.y"
+    {
+	  if (IS_PCREL10 ((yyvsp[(5) - (8)].expr)))
+	    {
+	      notethat ("BRCC: IF !CC JUMP  pcrel11m2\n");
+	      (yyval.instr) = BRCC (0, 1, (yyvsp[(5) - (8)].expr));
+	    }
+	  else
+	    return yyerror ("Bad jump offset");
+	}
+    break;
+
+  case 134:
+#line 2541 "bfin-parse.y"
+    {
+	  if (IS_PCREL10 ((yyvsp[(4) - (4)].expr)))
+	    {
+	      notethat ("BRCC: IF CC JUMP  pcrel11m2\n");
+	      (yyval.instr) = BRCC (1, 0, (yyvsp[(4) - (4)].expr));
+	    }
+	  else
+	    return yyerror ("Bad jump offset");
+	}
+    break;
+
+  case 135:
+#line 2552 "bfin-parse.y"
+    {
+	  if (IS_PCREL10 ((yyvsp[(4) - (7)].expr)))
+	    {
+	      notethat ("BRCC: IF !CC JUMP  pcrel11m2\n");
+	      (yyval.instr) = BRCC (1, 1, (yyvsp[(4) - (7)].expr));
+	    }
+	  else
+	    return yyerror ("Bad jump offset");
+	}
+    break;
+
+  case 136:
+#line 2562 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: NOP\n");
+	  (yyval.instr) = PROGCTRL (0, 0);
+	}
+    break;
+
+  case 137:
+#line 2568 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: RTS\n");
+	  (yyval.instr) = PROGCTRL (1, 0);
+	}
+    break;
+
+  case 138:
+#line 2574 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: RTI\n");
+	  (yyval.instr) = PROGCTRL (1, 1);
+	}
+    break;
+
+  case 139:
+#line 2580 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: RTX\n");
+	  (yyval.instr) = PROGCTRL (1, 2);
+	}
+    break;
+
+  case 140:
+#line 2586 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: RTN\n");
+	  (yyval.instr) = PROGCTRL (1, 3);
+	}
+    break;
+
+  case 141:
+#line 2592 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: RTE\n");
+	  (yyval.instr) = PROGCTRL (1, 4);
+	}
+    break;
+
+  case 142:
+#line 2598 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: IDLE\n");
+	  (yyval.instr) = PROGCTRL (2, 0);
+	}
+    break;
+
+  case 143:
+#line 2604 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: CSYNC\n");
+	  (yyval.instr) = PROGCTRL (2, 3);
+	}
+    break;
+
+  case 144:
+#line 2610 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: SSYNC\n");
+	  (yyval.instr) = PROGCTRL (2, 4);
+	}
+    break;
+
+  case 145:
+#line 2616 "bfin-parse.y"
+    {
+	  notethat ("ProgCtrl: EMUEXCPT\n");
+	  (yyval.instr) = PROGCTRL (2, 5);
+	}
+    break;
+
+  case 146:
+#line 2622 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("ProgCtrl: CLI dregs\n");
+	      (yyval.instr) = PROGCTRL (3, (yyvsp[(2) - (2)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Dreg expected for CLI");
+	}
+    break;
+
+  case 147:
+#line 2633 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("ProgCtrl: STI dregs\n");
+	      (yyval.instr) = PROGCTRL (4, (yyvsp[(2) - (2)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Dreg expected for STI");
+	}
+    break;
+
+  case 148:
+#line 2644 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("ProgCtrl: JUMP (pregs )\n");
+	      (yyval.instr) = PROGCTRL (5, (yyvsp[(3) - (4)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Bad register for indirect jump");
+	}
+    break;
+
+  case 149:
+#line 2655 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("ProgCtrl: CALL (pregs )\n");
+	      (yyval.instr) = PROGCTRL (6, (yyvsp[(3) - (4)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Bad register for indirect call");
+	}
+    break;
+
+  case 150:
+#line 2666 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(5) - (6)].reg)))
+	    {
+	      notethat ("ProgCtrl: CALL (PC + pregs )\n");
+	      (yyval.instr) = PROGCTRL (7, (yyvsp[(5) - (6)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Bad register for indirect call");
+	}
+    break;
+
+  case 151:
+#line 2677 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(5) - (6)].reg)))
+	    {
+	      notethat ("ProgCtrl: JUMP (PC + pregs )\n");
+	      (yyval.instr) = PROGCTRL (8, (yyvsp[(5) - (6)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Bad register for indirect jump");
+	}
+    break;
+
+  case 152:
+#line 2688 "bfin-parse.y"
+    {
+	  if (IS_UIMM ((yyvsp[(2) - (2)].expr), 4))
+	    {
+	      notethat ("ProgCtrl: RAISE uimm4\n");
+	      (yyval.instr) = PROGCTRL (9, uimm4 ((yyvsp[(2) - (2)].expr)));
+	    }
+	  else
+	    return yyerror ("Bad value for RAISE");
+	}
+    break;
+
+  case 153:
+#line 2699 "bfin-parse.y"
+    {
+		notethat ("ProgCtrl: EMUEXCPT\n");
+		(yyval.instr) = PROGCTRL (10, uimm4 ((yyvsp[(2) - (2)].expr)));
+	}
+    break;
+
+  case 154:
+#line 2705 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      if ((yyvsp[(3) - (4)].reg).regno == REG_SP || (yyvsp[(3) - (4)].reg).regno == REG_FP)
+		return yyerror ("Bad register for TESTSET");
+
+	      notethat ("ProgCtrl: TESTSET (pregs )\n");
+	      (yyval.instr) = PROGCTRL (11, (yyvsp[(3) - (4)].reg).regno & CODE_MASK);
+	    }
+	  else
+	    return yyerror ("Preg expected");
+	}
+    break;
+
+  case 155:
+#line 2719 "bfin-parse.y"
+    {
+	  if (IS_PCREL12 ((yyvsp[(2) - (2)].expr)))
+	    {
+	      notethat ("UJUMP: JUMP pcrel12\n");
+	      (yyval.instr) = UJUMP ((yyvsp[(2) - (2)].expr));
+	    }
+	  else
+	    return yyerror ("Bad value for relative jump");
+	}
+    break;
+
+  case 156:
+#line 2730 "bfin-parse.y"
+    {
+	  if (IS_PCREL12 ((yyvsp[(2) - (2)].expr)))
+	    {
+	      notethat ("UJUMP: JUMP_DOT_S pcrel12\n");
+	      (yyval.instr) = UJUMP((yyvsp[(2) - (2)].expr));
+	    }
+	  else
+	    return yyerror ("Bad value for relative jump");
+	}
+    break;
+
+  case 157:
+#line 2741 "bfin-parse.y"
+    {
+	  if (IS_PCREL24 ((yyvsp[(2) - (2)].expr)))
+	    {
+	      notethat ("CALLa: jump.l pcrel24\n");
+	      (yyval.instr) = CALLA ((yyvsp[(2) - (2)].expr), 0);
+	    }
+	  else
+	    return yyerror ("Bad value for long jump");
+	}
+    break;
+
+  case 158:
+#line 2752 "bfin-parse.y"
+    {
+	  if (IS_PCREL24 ((yyvsp[(2) - (2)].expr)))
+	    {
+	      notethat ("CALLa: jump.l pcrel24\n");
+	      (yyval.instr) = CALLA ((yyvsp[(2) - (2)].expr), 2);
+	    }
+	  else
+	    return yyerror ("Bad value for long jump");
+	}
+    break;
+
+  case 159:
+#line 2763 "bfin-parse.y"
+    {
+	  if (IS_PCREL24 ((yyvsp[(2) - (2)].expr)))
+	    {
+	      notethat ("CALLa: CALL pcrel25m2\n");
+	      (yyval.instr) = CALLA ((yyvsp[(2) - (2)].expr), 1);
+	    }
+	  else
+	    return yyerror ("Bad call address");
+	}
+    break;
+
+  case 160:
+#line 2773 "bfin-parse.y"
+    {
+	  if (IS_PCREL24 ((yyvsp[(2) - (2)].expr)))
+	    {
+	      notethat ("CALLa: CALL pcrel25m2\n");
+	      (yyval.instr) = CALLA ((yyvsp[(2) - (2)].expr), 2);
+	    }
+	  else
+	    return yyerror ("Bad call address");
+	}
+    break;
+
+  case 161:
+#line 2786 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_DREG ((yyvsp[(5) - (6)].reg)))
+	    (yyval.instr) = ALU2OP (&(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg), 8);
+	  else
+	    return yyerror ("Bad registers for DIVQ");
+	}
+    break;
+
+  case 162:
+#line 2794 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(3) - (6)].reg)) && IS_DREG ((yyvsp[(5) - (6)].reg)))
+	    (yyval.instr) = ALU2OP (&(yyvsp[(3) - (6)].reg), &(yyvsp[(5) - (6)].reg), 9);
+	  else
+	    return yyerror ("Bad registers for DIVS");
+	}
+    break;
+
+  case 163:
+#line 2802 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (5)].reg)) && IS_DREG ((yyvsp[(4) - (5)].reg)))
+	    {
+	      if ((yyvsp[(5) - (5)].modcodes).r0 == 0 && (yyvsp[(5) - (5)].modcodes).s0 == 0 && (yyvsp[(5) - (5)].modcodes).aop == 0)
+		{
+		  notethat ("ALU2op: dregs = - dregs\n");
+		  (yyval.instr) = ALU2OP (&(yyvsp[(1) - (5)].reg), &(yyvsp[(4) - (5)].reg), 14);
+		}
+	      else if ((yyvsp[(5) - (5)].modcodes).r0 == 1 && (yyvsp[(5) - (5)].modcodes).s0 == 0 && (yyvsp[(5) - (5)].modcodes).aop == 3)
+		{
+		  notethat ("dsp32alu: dregs = - dregs (.)\n");
+		  (yyval.instr) = DSP32ALU (15, 0, 0, &(yyvsp[(1) - (5)].reg), &(yyvsp[(4) - (5)].reg), 0, (yyvsp[(5) - (5)].modcodes).s0, 0, 3);
+		}
+	      else
+		{
+		  notethat ("dsp32alu: dregs = - dregs (.)\n");
+		  (yyval.instr) = DSP32ALU (7, 0, 0, &(yyvsp[(1) - (5)].reg), &(yyvsp[(4) - (5)].reg), 0, (yyvsp[(5) - (5)].modcodes).s0, 0, 3);
+		}
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 164:
+#line 2826 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (4)].reg)) && IS_DREG ((yyvsp[(4) - (4)].reg)))
+	    {
+	      notethat ("ALU2op: dregs = ~dregs\n");
+	      (yyval.instr) = ALU2OP (&(yyvsp[(1) - (4)].reg), &(yyvsp[(4) - (4)].reg), 15);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 165:
+#line 2837 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_DREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("ALU2op: dregs >>= dregs\n");
+	      (yyval.instr) = ALU2OP (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 1);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 166:
+#line 2848 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_UIMM ((yyvsp[(3) - (3)].expr), 5))
+	    {
+	      notethat ("LOGI2op: dregs >>= uimm5\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(1) - (3)].reg), uimm5 ((yyvsp[(3) - (3)].expr)), 6);
+	    }
+	  else
+	    return yyerror ("Dregs expected or value error");
+	}
+    break;
+
+  case 167:
+#line 2859 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_DREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("ALU2op: dregs >>>= dregs\n");
+	      (yyval.instr) = ALU2OP (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 0);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 168:
+#line 2870 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_DREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("ALU2op: dregs <<= dregs\n");
+	      (yyval.instr) = ALU2OP (&(yyvsp[(1) - (3)].reg), &(yyvsp[(3) - (3)].reg), 2);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 169:
+#line 2881 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_UIMM ((yyvsp[(3) - (3)].expr), 5))
+	    {
+	      notethat ("LOGI2op: dregs <<= uimm5\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(1) - (3)].reg), uimm5 ((yyvsp[(3) - (3)].expr)), 7);
+	    }
+	  else
+	    return yyerror ("Dregs expected or const value error");
+	}
+    break;
+
+  case 170:
+#line 2893 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_UIMM ((yyvsp[(3) - (3)].expr), 5))
+	    {
+	      notethat ("LOGI2op: dregs >>>= uimm5\n");
+	      (yyval.instr) = LOGI2OP ((yyvsp[(1) - (3)].reg), uimm5 ((yyvsp[(3) - (3)].expr)), 5);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 171:
+#line 2906 "bfin-parse.y"
+    {
+	  notethat ("CaCTRL: FLUSH [ pregs ]\n");
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    (yyval.instr) = CACTRL (&(yyvsp[(3) - (4)].reg), 0, 2);
+	  else
+	    return yyerror ("Bad register(s) for FLUSH");
+	}
+    break;
+
+  case 172:
+#line 2915 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("CaCTRL: FLUSH [ pregs ++ ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(2) - (2)].reg), 1, 2);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for FLUSH");
+	}
+    break;
+
+  case 173:
+#line 2926 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("CaCTRL: FLUSHINV [ pregs ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(3) - (4)].reg), 0, 1);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for FLUSH");
+	}
+    break;
+
+  case 174:
+#line 2937 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("CaCTRL: FLUSHINV [ pregs ++ ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(2) - (2)].reg), 1, 1);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for FLUSH");
+	}
+    break;
+
+  case 175:
+#line 2949 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("CaCTRL: IFLUSH [ pregs ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(3) - (4)].reg), 0, 3);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for FLUSH");
+	}
+    break;
+
+  case 176:
+#line 2960 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("CaCTRL: IFLUSH [ pregs ++ ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(2) - (2)].reg), 1, 3);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for FLUSH");
+	}
+    break;
+
+  case 177:
+#line 2971 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(3) - (4)].reg)))
+	    {
+	      notethat ("CaCTRL: PREFETCH [ pregs ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(3) - (4)].reg), 0, 0);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for PREFETCH");
+	}
+    break;
+
+  case 178:
+#line 2982 "bfin-parse.y"
+    {
+	  if (IS_PREG ((yyvsp[(2) - (2)].reg)))
+	    {
+	      notethat ("CaCTRL: PREFETCH [ pregs ++ ]\n");
+	      (yyval.instr) = CACTRL (&(yyvsp[(2) - (2)].reg), 1, 0);
+	    }
+	  else
+	    return yyerror ("Bad register(s) for PREFETCH");
+	}
+    break;
+
+  case 179:
+#line 2996 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(7) - (7)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  if (!IS_PREG ((yyvsp[(3) - (7)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  notethat ("LDST: B [ pregs <post_op> ] = dregs\n");
+	  (yyval.instr) = LDST (&(yyvsp[(3) - (7)].reg), &(yyvsp[(7) - (7)].reg), (yyvsp[(4) - (7)].modcodes).x0, 2, 0, 1);
+	}
+    break;
+
+  case 180:
+#line 3008 "bfin-parse.y"
+    {
+	  Expr_Node *tmp = (yyvsp[(5) - (8)].expr);
+
+	  if (!IS_DREG ((yyvsp[(8) - (8)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  if (!IS_PREG ((yyvsp[(3) - (8)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  if (IS_RELOC ((yyvsp[(5) - (8)].expr)))
+	    return yyerror ("Plain symbol used as offset");
+
+	  if ((yyvsp[(4) - (8)].r0).r0)
+	    tmp = unary (Expr_Op_Type_NEG, tmp);
+
+	  if (in_range_p (tmp, -32768, 32767, 0))
+	    {
+	      notethat ("LDST: B [ pregs + imm16 ] = dregs\n");
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(3) - (8)].reg), &(yyvsp[(8) - (8)].reg), 1, 2, 0, (yyvsp[(5) - (8)].expr));
+	    }
+	  else
+	    return yyerror ("Displacement out of range");
+	}
+    break;
+
+  case 181:
+#line 3034 "bfin-parse.y"
+    {
+	  Expr_Node *tmp = (yyvsp[(5) - (8)].expr);
+
+	  if (!IS_DREG ((yyvsp[(8) - (8)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  if (!IS_PREG ((yyvsp[(3) - (8)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  if ((yyvsp[(4) - (8)].r0).r0)
+	    tmp = unary (Expr_Op_Type_NEG, tmp);
+
+	  if (IS_RELOC ((yyvsp[(5) - (8)].expr)))
+	    return yyerror ("Plain symbol used as offset");
+
+	  if (in_range_p (tmp, 0, 30, 1))
+	    {
+	      notethat ("LDSTii: W [ pregs +- uimm5m2 ] = dregs\n");
+	      (yyval.instr) = LDSTII (&(yyvsp[(3) - (8)].reg), &(yyvsp[(8) - (8)].reg), tmp, 1, 1);
+	    }
+	  else if (in_range_p (tmp, -65536, 65535, 1))
+	    {
+	      notethat ("LDSTidxI: W [ pregs + imm17m2 ] = dregs\n");
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(3) - (8)].reg), &(yyvsp[(8) - (8)].reg), 1, 1, 0, tmp);
+	    }
+	  else
+	    return yyerror ("Displacement out of range");
+	}
+    break;
+
+  case 182:
+#line 3064 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(7) - (7)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  if (!IS_PREG ((yyvsp[(3) - (7)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  notethat ("LDST: W [ pregs <post_op> ] = dregs\n");
+	  (yyval.instr) = LDST (&(yyvsp[(3) - (7)].reg), &(yyvsp[(7) - (7)].reg), (yyvsp[(4) - (7)].modcodes).x0, 1, 0, 1);
+	}
+    break;
+
+  case 183:
+#line 3075 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(7) - (7)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  if ((yyvsp[(4) - (7)].modcodes).x0 == 2)
+	    {
+	      if (!IS_IREG ((yyvsp[(3) - (7)].reg)) && !IS_PREG ((yyvsp[(3) - (7)].reg)))
+		return yyerror ("Ireg or Preg expected in address");
+	    }
+	  else if (!IS_IREG ((yyvsp[(3) - (7)].reg)))
+	    return yyerror ("Ireg expected in address");
+
+	  if (IS_IREG ((yyvsp[(3) - (7)].reg)))
+	    {
+	      notethat ("dspLDST: W [ iregs <post_op> ] = dregs_half\n");
+	      (yyval.instr) = DSPLDST (&(yyvsp[(3) - (7)].reg), 1 + IS_H ((yyvsp[(7) - (7)].reg)), &(yyvsp[(7) - (7)].reg), (yyvsp[(4) - (7)].modcodes).x0, 1);
+	    }
+	  else
+	    {
+	      notethat ("LDSTpmod: W [ pregs ] = dregs_half\n");
+	      (yyval.instr) = LDSTPMOD (&(yyvsp[(3) - (7)].reg), &(yyvsp[(7) - (7)].reg), &(yyvsp[(3) - (7)].reg), 1 + IS_H ((yyvsp[(7) - (7)].reg)), 1);
+	    }
+	}
+    break;
+
+  case 184:
+#line 3100 "bfin-parse.y"
+    {
+	  Expr_Node *tmp = (yyvsp[(4) - (7)].expr);
+	  int ispreg = IS_PREG ((yyvsp[(7) - (7)].reg));
+
+	  if (!IS_PREG ((yyvsp[(2) - (7)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  if (!IS_DREG ((yyvsp[(7) - (7)].reg)) && !ispreg)
+	    return yyerror ("Preg expected for source operand");
+
+	  if ((yyvsp[(3) - (7)].r0).r0)
+	    tmp = unary (Expr_Op_Type_NEG, tmp);
+
+	  if (IS_RELOC ((yyvsp[(4) - (7)].expr)))
+	    return yyerror ("Plain symbol used as offset");
+
+	  if (in_range_p (tmp, 0, 63, 3))
+	    {
+	      notethat ("LDSTii: dpregs = [ pregs + uimm6m4 ]\n");
+	      (yyval.instr) = LDSTII (&(yyvsp[(2) - (7)].reg), &(yyvsp[(7) - (7)].reg), tmp, 1, ispreg ? 3 : 0);
+	    }
+	  else if ((yyvsp[(2) - (7)].reg).regno == REG_FP && in_range_p (tmp, -128, 0, 3))
+	    {
+	      notethat ("LDSTiiFP: dpregs = [ FP - uimm7m4 ]\n");
+	      tmp = unary (Expr_Op_Type_NEG, tmp);
+	      (yyval.instr) = LDSTIIFP (tmp, &(yyvsp[(7) - (7)].reg), 1);
+	    }
+	  else if (in_range_p (tmp, -131072, 131071, 3))
+	    {
+	      notethat ("LDSTidxI: [ pregs + imm18m4 ] = dpregs\n");
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(2) - (7)].reg), &(yyvsp[(7) - (7)].reg), 1, 0, ispreg ? 1 : 0, tmp);
+	    }
+	  else
+	    return yyerror ("Displacement out of range");
+	}
+    break;
+
+  case 185:
+#line 3137 "bfin-parse.y"
+    {
+	  Expr_Node *tmp = (yyvsp[(7) - (9)].expr);
+	  if (!IS_DREG ((yyvsp[(1) - (9)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+	  if (!IS_PREG ((yyvsp[(5) - (9)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  if ((yyvsp[(6) - (9)].r0).r0)
+	    tmp = unary (Expr_Op_Type_NEG, tmp);
+
+	  if (IS_RELOC ((yyvsp[(7) - (9)].expr)))
+	    return yyerror ("Plain symbol used as offset");
+
+	  if (in_range_p (tmp, 0, 30, 1))
+	    {
+	      notethat ("LDSTii: dregs = W [ pregs + uimm5m2 ] (.)\n");
+	      (yyval.instr) = LDSTII (&(yyvsp[(5) - (9)].reg), &(yyvsp[(1) - (9)].reg), tmp, 0, 1 << (yyvsp[(9) - (9)].r0).r0);
+	    }
+	  else if (in_range_p (tmp, -65536, 65535, 1))
+	    {
+	      notethat ("LDSTidxI: dregs = W [ pregs + imm17m2 ] (.)\n");
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(5) - (9)].reg), &(yyvsp[(1) - (9)].reg), 0, 1, (yyvsp[(9) - (9)].r0).r0, tmp);
+	    }
+	  else
+	    return yyerror ("Displacement out of range");
+	}
+    break;
+
+  case 186:
+#line 3165 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (7)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  if ((yyvsp[(6) - (7)].modcodes).x0 == 2)
+	    {
+	      if (!IS_IREG ((yyvsp[(5) - (7)].reg)) && !IS_PREG ((yyvsp[(5) - (7)].reg)))
+		return yyerror ("Ireg or Preg expected in address");
+	    }
+	  else if (!IS_IREG ((yyvsp[(5) - (7)].reg)))
+	    return yyerror ("Ireg expected in address");
+
+	  if (IS_IREG ((yyvsp[(5) - (7)].reg)))
+	    {
+	      notethat ("dspLDST: dregs_half = W [ iregs <post_op> ]\n");
+	      (yyval.instr) = DSPLDST(&(yyvsp[(5) - (7)].reg), 1 + IS_H ((yyvsp[(1) - (7)].reg)), &(yyvsp[(1) - (7)].reg), (yyvsp[(6) - (7)].modcodes).x0, 0);
+	    }
+	  else
+	    {
+	      notethat ("LDSTpmod: dregs_half = W [ pregs <post_op> ]\n");
+	      (yyval.instr) = LDSTPMOD (&(yyvsp[(5) - (7)].reg), &(yyvsp[(1) - (7)].reg), &(yyvsp[(5) - (7)].reg), 1 + IS_H ((yyvsp[(1) - (7)].reg)), 0);
+	    }
+	}
+    break;
+
+  case 187:
+#line 3190 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (8)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+	  if (!IS_PREG ((yyvsp[(5) - (8)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  notethat ("LDST: dregs = W [ pregs <post_op> ] (.)\n");
+	  (yyval.instr) = LDST (&(yyvsp[(5) - (8)].reg), &(yyvsp[(1) - (8)].reg), (yyvsp[(6) - (8)].modcodes).x0, 1, (yyvsp[(8) - (8)].r0).r0, 0);
+	}
+    break;
+
+  case 188:
+#line 3201 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (9)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+	  if (!IS_PREG ((yyvsp[(5) - (9)].reg)) || !IS_PREG ((yyvsp[(7) - (9)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  notethat ("LDSTpmod: dregs = W [ pregs ++ pregs ] (.)\n");
+	  (yyval.instr) = LDSTPMOD (&(yyvsp[(5) - (9)].reg), &(yyvsp[(1) - (9)].reg), &(yyvsp[(7) - (9)].reg), 3, (yyvsp[(9) - (9)].r0).r0);
+	}
+    break;
+
+  case 189:
+#line 3212 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (8)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+	  if (!IS_PREG ((yyvsp[(5) - (8)].reg)) || !IS_PREG ((yyvsp[(7) - (8)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  notethat ("LDSTpmod: dregs_half = W [ pregs ++ pregs ]\n");
+	  (yyval.instr) = LDSTPMOD (&(yyvsp[(5) - (8)].reg), &(yyvsp[(1) - (8)].reg), &(yyvsp[(7) - (8)].reg), 1 + IS_H ((yyvsp[(1) - (8)].reg)), 0);
+	}
+    break;
+
+  case 190:
+#line 3223 "bfin-parse.y"
+    {
+	  if (!IS_IREG ((yyvsp[(2) - (6)].reg)) && !IS_PREG ((yyvsp[(2) - (6)].reg)))
+	    return yyerror ("Ireg or Preg expected in address");
+	  else if (IS_IREG ((yyvsp[(2) - (6)].reg)) && !IS_DREG ((yyvsp[(6) - (6)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+	  else if (IS_PREG ((yyvsp[(2) - (6)].reg)) && !IS_DREG ((yyvsp[(6) - (6)].reg)) && !IS_PREG ((yyvsp[(6) - (6)].reg)))
+	    return yyerror ("Dreg or Preg expected for source operand");
+
+	  if (IS_IREG ((yyvsp[(2) - (6)].reg)))
+	    {
+	      notethat ("dspLDST: [ iregs <post_op> ] = dregs\n");
+	      (yyval.instr) = DSPLDST(&(yyvsp[(2) - (6)].reg), 0, &(yyvsp[(6) - (6)].reg), (yyvsp[(3) - (6)].modcodes).x0, 1);
+	    }
+	  else if (IS_DREG ((yyvsp[(6) - (6)].reg)))
+	    {
+	      notethat ("LDST: [ pregs <post_op> ] = dregs\n");
+	      (yyval.instr) = LDST (&(yyvsp[(2) - (6)].reg), &(yyvsp[(6) - (6)].reg), (yyvsp[(3) - (6)].modcodes).x0, 0, 0, 1);
+	    }
+	  else
+	    {
+	      notethat ("LDST: [ pregs <post_op> ] = pregs\n");
+	      (yyval.instr) = LDST (&(yyvsp[(2) - (6)].reg), &(yyvsp[(6) - (6)].reg), (yyvsp[(3) - (6)].modcodes).x0, 0, 1, 1);
+	    }
+	}
+    break;
+
+  case 191:
+#line 3249 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(7) - (7)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+
+	  if (IS_IREG ((yyvsp[(2) - (7)].reg)) && IS_MREG ((yyvsp[(4) - (7)].reg)))
+	    {
+	      notethat ("dspLDST: [ iregs ++ mregs ] = dregs\n");
+	      (yyval.instr) = DSPLDST(&(yyvsp[(2) - (7)].reg), (yyvsp[(4) - (7)].reg).regno & CODE_MASK, &(yyvsp[(7) - (7)].reg), 3, 1);
+	    }
+	  else if (IS_PREG ((yyvsp[(2) - (7)].reg)) && IS_PREG ((yyvsp[(4) - (7)].reg)))
+	    {
+	      notethat ("LDSTpmod: [ pregs ++ pregs ] = dregs\n");
+	      (yyval.instr) = LDSTPMOD (&(yyvsp[(2) - (7)].reg), &(yyvsp[(7) - (7)].reg), &(yyvsp[(4) - (7)].reg), 0, 1);
+	    }
+	  else
+	    return yyerror ("Preg ++ Preg or Ireg ++ Mreg expected in address");
+	}
+    break;
+
+  case 192:
+#line 3268 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(8) - (8)].reg)))
+	    return yyerror ("Dreg expected for source operand");
+
+	  if (IS_PREG ((yyvsp[(3) - (8)].reg)) && IS_PREG ((yyvsp[(5) - (8)].reg)))
+	    {
+	      notethat ("LDSTpmod: W [ pregs ++ pregs ] = dregs_half\n");
+	      (yyval.instr) = LDSTPMOD (&(yyvsp[(3) - (8)].reg), &(yyvsp[(8) - (8)].reg), &(yyvsp[(5) - (8)].reg), 1 + IS_H ((yyvsp[(8) - (8)].reg)), 1);
+	    }
+	  else
+	    return yyerror ("Preg ++ Preg expected in address");
+	}
+    break;
+
+  case 193:
+#line 3282 "bfin-parse.y"
+    {
+	  Expr_Node *tmp = (yyvsp[(7) - (9)].expr);
+	  if (!IS_DREG ((yyvsp[(1) - (9)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+	  if (!IS_PREG ((yyvsp[(5) - (9)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  if ((yyvsp[(6) - (9)].r0).r0)
+	    tmp = unary (Expr_Op_Type_NEG, tmp);
+
+	  if (IS_RELOC ((yyvsp[(7) - (9)].expr)))
+	    return yyerror ("Plain symbol used as offset");
+
+	  if (in_range_p (tmp, -32768, 32767, 0))
+	    {
+	      notethat ("LDSTidxI: dregs = B [ pregs + imm16 ] (%c)\n",
+		       (yyvsp[(9) - (9)].r0).r0 ? 'X' : 'Z');
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(5) - (9)].reg), &(yyvsp[(1) - (9)].reg), 0, 2, (yyvsp[(9) - (9)].r0).r0, tmp);
+	    }
+	  else
+	    return yyerror ("Displacement out of range");
+	}
+    break;
+
+  case 194:
+#line 3306 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (8)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+	  if (!IS_PREG ((yyvsp[(5) - (8)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  notethat ("LDST: dregs = B [ pregs <post_op> ] (%c)\n",
+		    (yyvsp[(8) - (8)].r0).r0 ? 'X' : 'Z');
+	  (yyval.instr) = LDST (&(yyvsp[(5) - (8)].reg), &(yyvsp[(1) - (8)].reg), (yyvsp[(6) - (8)].modcodes).x0, 2, (yyvsp[(8) - (8)].r0).r0, 0);
+	}
+    break;
+
+  case 195:
+#line 3318 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(1) - (7)].reg)))
+	    return yyerror ("Dreg expected for destination operand");
+
+	  if (IS_IREG ((yyvsp[(4) - (7)].reg)) && IS_MREG ((yyvsp[(6) - (7)].reg)))
+	    {
+	      notethat ("dspLDST: dregs = [ iregs ++ mregs ]\n");
+	      (yyval.instr) = DSPLDST(&(yyvsp[(4) - (7)].reg), (yyvsp[(6) - (7)].reg).regno & CODE_MASK, &(yyvsp[(1) - (7)].reg), 3, 0);
+	    }
+	  else if (IS_PREG ((yyvsp[(4) - (7)].reg)) && IS_PREG ((yyvsp[(6) - (7)].reg)))
+	    {
+	      notethat ("LDSTpmod: dregs = [ pregs ++ pregs ]\n");
+	      (yyval.instr) = LDSTPMOD (&(yyvsp[(4) - (7)].reg), &(yyvsp[(1) - (7)].reg), &(yyvsp[(6) - (7)].reg), 0, 0);
+	    }
+	  else
+	    return yyerror ("Preg ++ Preg or Ireg ++ Mreg expected in address");
+	}
+    break;
+
+  case 196:
+#line 3337 "bfin-parse.y"
+    {
+	  Expr_Node *tmp = (yyvsp[(6) - (7)].expr);
+	  int ispreg = IS_PREG ((yyvsp[(1) - (7)].reg));
+	  int isgot = IS_RELOC((yyvsp[(6) - (7)].expr));
+
+	  if (!IS_PREG ((yyvsp[(4) - (7)].reg)))
+	    return yyerror ("Preg expected in address");
+
+	  if (!IS_DREG ((yyvsp[(1) - (7)].reg)) && !ispreg)
+	    return yyerror ("Dreg or Preg expected for destination operand");
+
+	  if (tmp->type == Expr_Node_Reloc
+	      && strcmp (tmp->value.s_value,
+			 "_current_shared_library_p5_offset_") != 0)
+	    return yyerror ("Plain symbol used as offset");
+
+	  if ((yyvsp[(5) - (7)].r0).r0)
+	    tmp = unary (Expr_Op_Type_NEG, tmp);
+
+	  if (isgot)
+	    {
+	      notethat ("LDSTidxI: dpregs = [ pregs + sym@got ]\n");
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(4) - (7)].reg), &(yyvsp[(1) - (7)].reg), 0, 0, ispreg ? 1 : 0, tmp);
+	    }
+	  else if (in_range_p (tmp, 0, 63, 3))
+	    {
+	      notethat ("LDSTii: dpregs = [ pregs + uimm7m4 ]\n");
+	      (yyval.instr) = LDSTII (&(yyvsp[(4) - (7)].reg), &(yyvsp[(1) - (7)].reg), tmp, 0, ispreg ? 3 : 0);
+	    }
+	  else if ((yyvsp[(4) - (7)].reg).regno == REG_FP && in_range_p (tmp, -128, 0, 3))
+	    {
+	      notethat ("LDSTiiFP: dpregs = [ FP - uimm7m4 ]\n");
+	      tmp = unary (Expr_Op_Type_NEG, tmp);
+	      (yyval.instr) = LDSTIIFP (tmp, &(yyvsp[(1) - (7)].reg), 0);
+	    }
+	  else if (in_range_p (tmp, -131072, 131071, 3))
+	    {
+	      notethat ("LDSTidxI: dpregs = [ pregs + imm18m4 ]\n");
+	      (yyval.instr) = LDSTIDXI (&(yyvsp[(4) - (7)].reg), &(yyvsp[(1) - (7)].reg), 0, 0, ispreg ? 1 : 0, tmp);
+
+	    }
+	  else
+	    return yyerror ("Displacement out of range");
+	}
+    break;
+
+  case 197:
+#line 3383 "bfin-parse.y"
+    {
+	  if (!IS_IREG ((yyvsp[(4) - (6)].reg)) && !IS_PREG ((yyvsp[(4) - (6)].reg)))
+	    return yyerror ("Ireg or Preg expected in address");
+	  else if (IS_IREG ((yyvsp[(4) - (6)].reg)) && !IS_DREG ((yyvsp[(1) - (6)].reg)))
+	    return yyerror ("Dreg expected in destination operand");
+	  else if (IS_PREG ((yyvsp[(4) - (6)].reg)) && !IS_DREG ((yyvsp[(1) - (6)].reg)) && !IS_PREG ((yyvsp[(1) - (6)].reg))
+		   && ((yyvsp[(4) - (6)].reg).regno != REG_SP || !IS_ALLREG ((yyvsp[(1) - (6)].reg)) || (yyvsp[(5) - (6)].modcodes).x0 != 0))
+	    return yyerror ("Dreg or Preg expected in destination operand");
+
+	  if (IS_IREG ((yyvsp[(4) - (6)].reg)))
+	    {
+	      notethat ("dspLDST: dregs = [ iregs <post_op> ]\n");
+	      (yyval.instr) = DSPLDST (&(yyvsp[(4) - (6)].reg), 0, &(yyvsp[(1) - (6)].reg), (yyvsp[(5) - (6)].modcodes).x0, 0);
+	    }
+	  else if (IS_DREG ((yyvsp[(1) - (6)].reg)))
+	    {
+	      notethat ("LDST: dregs = [ pregs <post_op> ]\n");
+	      (yyval.instr) = LDST (&(yyvsp[(4) - (6)].reg), &(yyvsp[(1) - (6)].reg), (yyvsp[(5) - (6)].modcodes).x0, 0, 0, 0);
+	    }
+	  else if (IS_PREG ((yyvsp[(1) - (6)].reg)))
+	    {
+	      if (REG_SAME ((yyvsp[(1) - (6)].reg), (yyvsp[(4) - (6)].reg)) && (yyvsp[(5) - (6)].modcodes).x0 != 2)
+		return yyerror ("Pregs can't be same");
+
+	      notethat ("LDST: pregs = [ pregs <post_op> ]\n");
+	      (yyval.instr) = LDST (&(yyvsp[(4) - (6)].reg), &(yyvsp[(1) - (6)].reg), (yyvsp[(5) - (6)].modcodes).x0, 0, 1, 0);
+	    }
+	  else
+	    {
+	      notethat ("PushPopReg: allregs = [ SP ++ ]\n");
+	      (yyval.instr) = PUSHPOPREG (&(yyvsp[(1) - (6)].reg), 0);
+	    }
+	}
+    break;
+
+  case 198:
+#line 3420 "bfin-parse.y"
+    {
+	  if ((yyvsp[(1) - (11)].reg).regno != REG_SP)
+	    yyerror ("Stack Pointer expected");
+	  if ((yyvsp[(4) - (11)].reg).regno == REG_R7
+	      && IN_RANGE ((yyvsp[(6) - (11)].expr), 0, 7)
+	      && (yyvsp[(8) - (11)].reg).regno == REG_P5
+	      && IN_RANGE ((yyvsp[(10) - (11)].expr), 0, 5))
+	    {
+	      notethat ("PushPopMultiple: [ -- SP ] = (R7 : reglim , P5 : reglim )\n");
+	      (yyval.instr) = PUSHPOPMULTIPLE (imm5 ((yyvsp[(6) - (11)].expr)), imm5 ((yyvsp[(10) - (11)].expr)), 1, 1, 1);
+	    }
+	  else
+	    return yyerror ("Bad register for PushPopMultiple");
+	}
+    break;
+
+  case 199:
+#line 3436 "bfin-parse.y"
+    {
+	  if ((yyvsp[(1) - (7)].reg).regno != REG_SP)
+	    yyerror ("Stack Pointer expected");
+
+	  if ((yyvsp[(4) - (7)].reg).regno == REG_R7 && IN_RANGE ((yyvsp[(6) - (7)].expr), 0, 7))
+	    {
+	      notethat ("PushPopMultiple: [ -- SP ] = (R7 : reglim )\n");
+	      (yyval.instr) = PUSHPOPMULTIPLE (imm5 ((yyvsp[(6) - (7)].expr)), 0, 1, 0, 1);
+	    }
+	  else if ((yyvsp[(4) - (7)].reg).regno == REG_P5 && IN_RANGE ((yyvsp[(6) - (7)].expr), 0, 6))
+	    {
+	      notethat ("PushPopMultiple: [ -- SP ] = (P5 : reglim )\n");
+	      (yyval.instr) = PUSHPOPMULTIPLE (0, imm5 ((yyvsp[(6) - (7)].expr)), 0, 1, 1);
+	    }
+	  else
+	    return yyerror ("Bad register for PushPopMultiple");
+	}
+    break;
+
+  case 200:
+#line 3455 "bfin-parse.y"
+    {
+	  if ((yyvsp[(11) - (11)].reg).regno != REG_SP)
+	    yyerror ("Stack Pointer expected");
+	  if ((yyvsp[(2) - (11)].reg).regno == REG_R7 && (IN_RANGE ((yyvsp[(4) - (11)].expr), 0, 7))
+	      && (yyvsp[(6) - (11)].reg).regno == REG_P5 && (IN_RANGE ((yyvsp[(8) - (11)].expr), 0, 6)))
+	    {
+	      notethat ("PushPopMultiple: (R7 : reglim , P5 : reglim ) = [ SP ++ ]\n");
+	      (yyval.instr) = PUSHPOPMULTIPLE (imm5 ((yyvsp[(4) - (11)].expr)), imm5 ((yyvsp[(8) - (11)].expr)), 1, 1, 0);
+	    }
+	  else
+	    return yyerror ("Bad register range for PushPopMultiple");
+	}
+    break;
+
+  case 201:
+#line 3469 "bfin-parse.y"
+    {
+	  if ((yyvsp[(7) - (7)].reg).regno != REG_SP)
+	    yyerror ("Stack Pointer expected");
+
+	  if ((yyvsp[(2) - (7)].reg).regno == REG_R7 && IN_RANGE ((yyvsp[(4) - (7)].expr), 0, 7))
+	    {
+	      notethat ("PushPopMultiple: (R7 : reglim ) = [ SP ++ ]\n");
+	      (yyval.instr) = PUSHPOPMULTIPLE (imm5 ((yyvsp[(4) - (7)].expr)), 0, 1, 0, 0);
+	    }
+	  else if ((yyvsp[(2) - (7)].reg).regno == REG_P5 && IN_RANGE ((yyvsp[(4) - (7)].expr), 0, 6))
+	    {
+	      notethat ("PushPopMultiple: (P5 : reglim ) = [ SP ++ ]\n");
+	      (yyval.instr) = PUSHPOPMULTIPLE (0, imm5 ((yyvsp[(4) - (7)].expr)), 0, 1, 0);
+	    }
+	  else
+	    return yyerror ("Bad register range for PushPopMultiple");
+	}
+    break;
+
+  case 202:
+#line 3488 "bfin-parse.y"
+    {
+	  if ((yyvsp[(1) - (3)].reg).regno != REG_SP)
+	    yyerror ("Stack Pointer expected");
+
+	  if (IS_ALLREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      notethat ("PushPopReg: [ -- SP ] = allregs\n");
+	      (yyval.instr) = PUSHPOPREG (&(yyvsp[(3) - (3)].reg), 1);
+	    }
+	  else
+	    return yyerror ("Bad register for PushPopReg");
+	}
+    break;
+
+  case 203:
+#line 3504 "bfin-parse.y"
+    {
+	  if (IS_URANGE (16, (yyvsp[(2) - (2)].expr), 0, 4))
+	    (yyval.instr) = LINKAGE (0, uimm16s4 ((yyvsp[(2) - (2)].expr)));
+	  else
+	    return yyerror ("Bad constant for LINK");
+	}
+    break;
+
+  case 204:
+#line 3512 "bfin-parse.y"
+    {
+		notethat ("linkage: UNLINK\n");
+		(yyval.instr) = LINKAGE (1, 0);
+	}
+    break;
+
+  case 205:
+#line 3521 "bfin-parse.y"
+    {
+	  if (IS_PCREL4 ((yyvsp[(3) - (7)].expr)) && IS_LPPCREL10 ((yyvsp[(5) - (7)].expr)) && IS_CREG ((yyvsp[(7) - (7)].reg)))
+	    {
+	      notethat ("LoopSetup: LSETUP (pcrel4 , lppcrel10 ) counters\n");
+	      (yyval.instr) = LOOPSETUP ((yyvsp[(3) - (7)].expr), &(yyvsp[(7) - (7)].reg), 0, (yyvsp[(5) - (7)].expr), 0);
+	    }
+	  else
+	    return yyerror ("Bad register or values for LSETUP");
+
+	}
+    break;
+
+  case 206:
+#line 3532 "bfin-parse.y"
+    {
+	  if (IS_PCREL4 ((yyvsp[(3) - (9)].expr)) && IS_LPPCREL10 ((yyvsp[(5) - (9)].expr))
+	      && IS_PREG ((yyvsp[(9) - (9)].reg)) && IS_CREG ((yyvsp[(7) - (9)].reg)))
+	    {
+	      notethat ("LoopSetup: LSETUP (pcrel4 , lppcrel10 ) counters = pregs\n");
+	      (yyval.instr) = LOOPSETUP ((yyvsp[(3) - (9)].expr), &(yyvsp[(7) - (9)].reg), 1, (yyvsp[(5) - (9)].expr), &(yyvsp[(9) - (9)].reg));
+	    }
+	  else
+	    return yyerror ("Bad register or values for LSETUP");
+	}
+    break;
+
+  case 207:
+#line 3544 "bfin-parse.y"
+    {
+	  if (IS_PCREL4 ((yyvsp[(3) - (11)].expr)) && IS_LPPCREL10 ((yyvsp[(5) - (11)].expr))
+	      && IS_PREG ((yyvsp[(9) - (11)].reg)) && IS_CREG ((yyvsp[(7) - (11)].reg))
+	      && EXPR_VALUE ((yyvsp[(11) - (11)].expr)) == 1)
+	    {
+	      notethat ("LoopSetup: LSETUP (pcrel4 , lppcrel10 ) counters = pregs >> 1\n");
+	      (yyval.instr) = LOOPSETUP ((yyvsp[(3) - (11)].expr), &(yyvsp[(7) - (11)].reg), 3, (yyvsp[(5) - (11)].expr), &(yyvsp[(9) - (11)].reg));
+	    }
+	  else
+	    return yyerror ("Bad register or values for LSETUP");
+	}
+    break;
+
+  case 208:
+#line 3558 "bfin-parse.y"
+    {
+	  if (!IS_RELOC ((yyvsp[(2) - (3)].expr)))
+	    return yyerror ("Invalid expression in loop statement");
+	  if (!IS_CREG ((yyvsp[(3) - (3)].reg)))
+            return yyerror ("Invalid loop counter register");
+	(yyval.instr) = bfin_gen_loop ((yyvsp[(2) - (3)].expr), &(yyvsp[(3) - (3)].reg), 0, 0);
+	}
+    break;
+
+  case 209:
+#line 3566 "bfin-parse.y"
+    {
+	  if (IS_RELOC ((yyvsp[(2) - (5)].expr)) && IS_PREG ((yyvsp[(5) - (5)].reg)) && IS_CREG ((yyvsp[(3) - (5)].reg)))
+	    {
+	      notethat ("Loop: LOOP expr counters = pregs\n");
+	      (yyval.instr) = bfin_gen_loop ((yyvsp[(2) - (5)].expr), &(yyvsp[(3) - (5)].reg), 1, &(yyvsp[(5) - (5)].reg));
+	    }
+	  else
+	    return yyerror ("Bad register or values for LOOP");
+	}
+    break;
+
+  case 210:
+#line 3576 "bfin-parse.y"
+    {
+	  if (IS_RELOC ((yyvsp[(2) - (7)].expr)) && IS_PREG ((yyvsp[(5) - (7)].reg)) && IS_CREG ((yyvsp[(3) - (7)].reg)) && EXPR_VALUE ((yyvsp[(7) - (7)].expr)) == 1)
+	    {
+	      notethat ("Loop: LOOP expr counters = pregs >> 1\n");
+	      (yyval.instr) = bfin_gen_loop ((yyvsp[(2) - (7)].expr), &(yyvsp[(3) - (7)].reg), 3, &(yyvsp[(5) - (7)].reg));
+	    }
+	  else
+	    return yyerror ("Bad register or values for LOOP");
+	}
+    break;
+
+  case 211:
+#line 3588 "bfin-parse.y"
+    {
+	  Expr_Node_Value val;
+	  val.i_value = (yyvsp[(2) - (2)].value);
+	  Expr_Node *tmp = Expr_Node_Create (Expr_Node_Constant, val, NULL, NULL);
+	  bfin_loop_attempt_create_label (tmp, 1);
+	  if (!IS_RELOC (tmp))
+	    return yyerror ("Invalid expression in LOOP_BEGIN statement");
+	  bfin_loop_beginend (tmp, 1);
+	  (yyval.instr) = 0;
+	}
+    break;
+
+  case 212:
+#line 3599 "bfin-parse.y"
+    {
+	  if (!IS_RELOC ((yyvsp[(2) - (2)].expr)))
+	    return yyerror ("Invalid expression in LOOP_BEGIN statement");
+
+	  bfin_loop_beginend ((yyvsp[(2) - (2)].expr), 1);
+	  (yyval.instr) = 0;
+	}
+    break;
+
+  case 213:
+#line 3609 "bfin-parse.y"
+    {
+	  Expr_Node_Value val;
+	  val.i_value = (yyvsp[(2) - (2)].value);
+	  Expr_Node *tmp = Expr_Node_Create (Expr_Node_Constant, val, NULL, NULL);
+	  bfin_loop_attempt_create_label (tmp, 1);
+	  if (!IS_RELOC (tmp))
+	    return yyerror ("Invalid expression in LOOP_END statement");
+	  bfin_loop_beginend (tmp, 0);
+	  (yyval.instr) = 0;
+	}
+    break;
+
+  case 214:
+#line 3620 "bfin-parse.y"
+    {
+	  if (!IS_RELOC ((yyvsp[(2) - (2)].expr)))
+	    return yyerror ("Invalid expression in LOOP_END statement");
+
+	  bfin_loop_beginend ((yyvsp[(2) - (2)].expr), 0);
+	  (yyval.instr) = 0;
+	}
+    break;
+
+  case 215:
+#line 3631 "bfin-parse.y"
+    {
+	  notethat ("psedoDEBUG: ABORT\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (3, 3, 0);
+	}
+    break;
+
+  case 216:
+#line 3637 "bfin-parse.y"
+    {
+	  notethat ("pseudoDEBUG: DBG\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (3, 7, 0);
+	}
+    break;
+
+  case 217:
+#line 3642 "bfin-parse.y"
+    {
+	  notethat ("pseudoDEBUG: DBG REG_A\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (3, IS_A1 ((yyvsp[(2) - (2)].reg)), 0);
+	}
+    break;
+
+  case 218:
+#line 3647 "bfin-parse.y"
+    {
+	  notethat ("pseudoDEBUG: DBG allregs\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (0, (yyvsp[(2) - (2)].reg).regno & CODE_MASK, ((yyvsp[(2) - (2)].reg).regno & CLASS_MASK) >> 4);
+	}
+    break;
+
+  case 219:
+#line 3653 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(3) - (4)].reg)))
+	    return yyerror ("Dregs expected");
+	  notethat ("pseudoDEBUG: DBGCMPLX (dregs )\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (3, 6, ((yyvsp[(3) - (4)].reg).regno & CODE_MASK) >> 4);
+	}
+    break;
+
+  case 220:
+#line 3661 "bfin-parse.y"
+    {
+	  notethat ("psedoDEBUG: DBGHALT\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (3, 5, 0);
+	}
+    break;
+
+  case 221:
+#line 3667 "bfin-parse.y"
+    {
+	  notethat ("psedoDEBUG: HLT\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (3, 4, 0);
+	}
+    break;
+
+  case 222:
+#line 3673 "bfin-parse.y"
+    {
+	  notethat ("pseudodbg_assert: DBGA (regs_lo/hi , uimm16 )\n");
+	  (yyval.instr) = bfin_gen_pseudodbg_assert (IS_H ((yyvsp[(3) - (6)].reg)), &(yyvsp[(3) - (6)].reg), uimm16 ((yyvsp[(5) - (6)].expr)));
+	}
+    break;
+
+  case 223:
+#line 3679 "bfin-parse.y"
+    {
+	  notethat ("pseudodbg_assert: DBGAH (regs , uimm16 )\n");
+	  (yyval.instr) = bfin_gen_pseudodbg_assert (3, &(yyvsp[(3) - (6)].reg), uimm16 ((yyvsp[(5) - (6)].expr)));
+	}
+    break;
+
+  case 224:
+#line 3685 "bfin-parse.y"
+    {
+	  notethat ("psedodbg_assert: DBGAL (regs , uimm16 )\n");
+	  (yyval.instr) = bfin_gen_pseudodbg_assert (2, &(yyvsp[(3) - (6)].reg), uimm16 ((yyvsp[(5) - (6)].expr)));
+	}
+    break;
+
+  case 225:
+#line 3691 "bfin-parse.y"
+    {
+	  if (!IS_UIMM ((yyvsp[(2) - (2)].expr), 8))
+	    return yyerror ("Constant out of range");
+	  notethat ("psedodbg_assert: OUTC uimm8\n");
+	  (yyval.instr) = bfin_gen_pseudochr (uimm8 ((yyvsp[(2) - (2)].expr)));
+	}
+    break;
+
+  case 226:
+#line 3699 "bfin-parse.y"
+    {
+	  if (!IS_DREG ((yyvsp[(2) - (2)].reg)))
+	    return yyerror ("Dregs expected");
+	  notethat ("psedodbg_assert: OUTC dreg\n");
+	  (yyval.instr) = bfin_gen_pseudodbg (2, (yyvsp[(2) - (2)].reg).regno & CODE_MASK, 0);
+	}
+    break;
+
+  case 227:
+#line 3713 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(1) - (1)].reg);
+	}
+    break;
+
+  case 228:
+#line 3717 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(1) - (1)].reg);
+	}
+    break;
+
+  case 229:
+#line 3726 "bfin-parse.y"
+    {
+	(yyval.mod).MM = 0;
+	(yyval.mod).mod = 0;
+	}
+    break;
+
+  case 230:
+#line 3731 "bfin-parse.y"
+    {
+	(yyval.mod).MM = 1;
+	(yyval.mod).mod = (yyvsp[(4) - (5)].value);
+	}
+    break;
+
+  case 231:
+#line 3736 "bfin-parse.y"
+    {
+	(yyval.mod).MM = 1;
+	(yyval.mod).mod = (yyvsp[(2) - (5)].value);
+	}
+    break;
+
+  case 232:
+#line 3741 "bfin-parse.y"
+    {
+	(yyval.mod).MM = 0;
+	(yyval.mod).mod = (yyvsp[(2) - (3)].value);
+	}
+    break;
+
+  case 233:
+#line 3746 "bfin-parse.y"
+    {
+	(yyval.mod).MM = 1;
+	(yyval.mod).mod = 0;
+	}
+    break;
+
+  case 234:
+#line 3753 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 235:
+#line 3757 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 236:
+#line 3763 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 0;
+	}
+    break;
+
+  case 237:
+#line 3768 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 1;
+	(yyval.modcodes).x0 = 0;
+	}
+    break;
+
+  case 238:
+#line 3773 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 1;
+	}
+    break;
+
+  case 239:
+#line 3778 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 1;
+	(yyval.modcodes).x0 = 1;
+	}
+    break;
+
+  case 240:
+#line 3786 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 241:
+#line 3790 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 242:
+#line 3796 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 0;
+	}
+    break;
+
+  case 243:
+#line 3801 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = (yyvsp[(2) - (3)].modcodes).s0;
+	(yyval.modcodes).x0 = (yyvsp[(2) - (3)].modcodes).x0;
+	}
+    break;
+
+  case 244:
+#line 3808 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 0;
+	(yyval.modcodes).aop = 0;
+	}
+    break;
+
+  case 245:
+#line 3814 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 0;
+	(yyval.modcodes).aop = 1;
+	}
+    break;
+
+  case 246:
+#line 3820 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 1;
+	(yyval.modcodes).x0 = 0;
+	(yyval.modcodes).aop = 1;
+	}
+    break;
+
+  case 247:
+#line 3828 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 0;
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 0;
+	}
+    break;
+
+  case 248:
+#line 3834 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 2 + (yyvsp[(2) - (3)].r0).r0;
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).x0 = 0;
+	}
+    break;
+
+  case 249:
+#line 3840 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 0;
+	(yyval.modcodes).s0 = (yyvsp[(2) - (3)].modcodes).s0;
+	(yyval.modcodes).x0 = (yyvsp[(2) - (3)].modcodes).x0;
+	}
+    break;
+
+  case 250:
+#line 3846 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 2 + (yyvsp[(2) - (5)].r0).r0;
+	(yyval.modcodes).s0 = (yyvsp[(4) - (5)].modcodes).s0;
+	(yyval.modcodes).x0 = (yyvsp[(4) - (5)].modcodes).x0;
+	}
+    break;
+
+  case 251:
+#line 3852 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 2 + (yyvsp[(4) - (5)].r0).r0;
+	(yyval.modcodes).s0 = (yyvsp[(2) - (5)].modcodes).s0;
+	(yyval.modcodes).x0 = (yyvsp[(2) - (5)].modcodes).x0;
+	}
+    break;
+
+  case 252:
+#line 3860 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 253:
+#line 3864 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 254:
+#line 3868 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 255:
+#line 3874 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 256:
+#line 3878 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 257:
+#line 3882 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 258:
+#line 3888 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 0;
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).aop = 0;
+	}
+    break;
+
+  case 259:
+#line 3894 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 0;
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).aop = 3;
+	}
+    break;
+
+  case 260:
+#line 3900 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 0;
+	(yyval.modcodes).s0 = 1;
+	(yyval.modcodes).aop = 3;
+	}
+    break;
+
+  case 261:
+#line 3906 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 1;
+	(yyval.modcodes).s0 = 0;
+	(yyval.modcodes).aop = 3;
+	}
+    break;
+
+  case 262:
+#line 3912 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 1;
+	(yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 263:
+#line 3917 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 1;
+	(yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 264:
+#line 3924 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 265:
+#line 3928 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 266:
+#line 3934 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 0;
+	}
+    break;
+
+  case 267:
+#line 3938 "bfin-parse.y"
+    {
+	(yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 268:
+#line 3945 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 269:
+#line 3949 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 270:
+#line 3953 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 3;
+	}
+    break;
+
+  case 271:
+#line 3957 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 2;
+	}
+    break;
+
+  case 272:
+#line 3963 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 273:
+#line 3967 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 274:
+#line 3974 "bfin-parse.y"
+    {
+	(yyval.modcodes).r0 = 0;
+	(yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 275:
+#line 3979 "bfin-parse.y"
+    {
+	if ((yyvsp[(2) - (3)].value) != M_T)
+	  return yyerror ("Bad modifier");
+	(yyval.modcodes).r0 = 1;
+	(yyval.modcodes).s0 = 0;
+	}
+    break;
+
+  case 276:
+#line 3986 "bfin-parse.y"
+    {
+	if ((yyvsp[(2) - (5)].value) != M_T)
+	  return yyerror ("Bad modifier");
+	(yyval.modcodes).r0 = 1;
+	(yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 277:
+#line 3993 "bfin-parse.y"
+    {
+	if ((yyvsp[(4) - (5)].value) != M_T)
+	  return yyerror ("Bad modifier");
+	(yyval.modcodes).r0 = 1;
+	(yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 278:
+#line 4005 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 279:
+#line 4009 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 280:
+#line 4013 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 2;
+	}
+    break;
+
+  case 281:
+#line 4019 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 282:
+#line 4023 "bfin-parse.y"
+    {
+	  if ((yyvsp[(2) - (3)].value) == M_W32)
+	    (yyval.r0).r0 = 1;
+	  else
+	    return yyerror ("Only (W32) allowed");
+	}
+    break;
+
+  case 283:
+#line 4032 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 284:
+#line 4036 "bfin-parse.y"
+    {
+	  if ((yyvsp[(2) - (3)].value) == M_IU)
+	    (yyval.r0).r0 = 3;
+	  else
+	    return yyerror ("(IU) expected");
+	}
+    break;
+
+  case 285:
+#line 4045 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(3) - (4)].reg);
+	}
+    break;
+
+  case 286:
+#line 4051 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(2) - (4)].reg);
+	}
+    break;
+
+  case 287:
+#line 4060 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 288:
+#line 4064 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 289:
+#line 4071 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 290:
+#line 4075 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 291:
+#line 4079 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 2;
+	}
+    break;
+
+  case 292:
+#line 4083 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 3;
+	}
+    break;
+
+  case 293:
+#line 4090 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 294:
+#line 4094 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 295:
+#line 4101 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 1;	/* HL.  */
+	  (yyval.modcodes).s0 = 0;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 0;	/* aop.  */
+	}
+    break;
+
+  case 296:
+#line 4109 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 1;	/* HL.  */
+	  (yyval.modcodes).s0 = 0;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 1;	/* aop.  */
+	}
+    break;
+
+  case 297:
+#line 4117 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 0;	/* HL.  */
+	  (yyval.modcodes).s0 = 0;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 0;	/* aop.  */
+	}
+    break;
+
+  case 298:
+#line 4125 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 0;	/* HL.  */
+	  (yyval.modcodes).s0 = 0;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 1;
+	}
+    break;
+
+  case 299:
+#line 4133 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 1;	/* HL.  */
+	  (yyval.modcodes).s0 = 1;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 0;	/* aop.  */
+	}
+    break;
+
+  case 300:
+#line 4140 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 1;	/* HL.  */
+	  (yyval.modcodes).s0 = 1;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 1;	/* aop.  */
+	}
+    break;
+
+  case 301:
+#line 4147 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 0;	/* HL.  */
+	  (yyval.modcodes).s0 = 1;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 0;	/* aop.  */
+	}
+    break;
+
+  case 302:
+#line 4155 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 0;	/* HL.  */
+	  (yyval.modcodes).s0 = 1;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* x.  */
+	  (yyval.modcodes).aop = 1;	/* aop.  */
+	}
+    break;
+
+  case 303:
+#line 4165 "bfin-parse.y"
+    {
+	  (yyval.modcodes).s0 = 0;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* HL.  */
+	}
+    break;
+
+  case 304:
+#line 4170 "bfin-parse.y"
+    {
+	  (yyval.modcodes).s0 = 0;	/* s.  */
+	  (yyval.modcodes).x0 = 1;	/* HL.  */
+	}
+    break;
+
+  case 305:
+#line 4175 "bfin-parse.y"
+    {
+	  (yyval.modcodes).s0 = 1;	/* s.  */
+	  (yyval.modcodes).x0 = 0;	/* HL.  */
+	}
+    break;
+
+  case 306:
+#line 4180 "bfin-parse.y"
+    {
+	  (yyval.modcodes).s0 = 1;	/* s.  */
+	  (yyval.modcodes).x0 = 1;	/* HL.  */
+	}
+    break;
+
+  case 307:
+#line 4187 "bfin-parse.y"
+    {
+	(yyval.modcodes).x0 = 2;
+	}
+    break;
+
+  case 308:
+#line 4191 "bfin-parse.y"
+    {
+	(yyval.modcodes).x0 = 0;
+	}
+    break;
+
+  case 309:
+#line 4195 "bfin-parse.y"
+    {
+	(yyval.modcodes).x0 = 1;
+	}
+    break;
+
+  case 310:
+#line 4204 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(1) - (2)].reg);
+	}
+    break;
+
+  case 311:
+#line 4211 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(1) - (2)].reg);
+	}
+    break;
+
+  case 312:
+#line 4218 "bfin-parse.y"
+    {
+	(yyval.reg) = (yyvsp[(1) - (2)].reg);
+	}
+    break;
+
+  case 313:
+#line 4225 "bfin-parse.y"
+    {
+	  if (IS_A1 ((yyvsp[(3) - (3)].reg)) && IS_EVEN ((yyvsp[(1) - (3)].reg)))
+	    return yyerror ("Cannot move A1 to even register");
+	  else if (!IS_A1 ((yyvsp[(3) - (3)].reg)) && !IS_EVEN ((yyvsp[(1) - (3)].reg)))
+	    return yyerror ("Cannot move A0 to odd register");
+
+	  (yyval.macfunc).w = 1;
+          (yyval.macfunc).P = 1;
+          (yyval.macfunc).n = IS_A1 ((yyvsp[(3) - (3)].reg));
+	  (yyval.macfunc).op = 3;
+          (yyval.macfunc).dst = (yyvsp[(1) - (3)].reg);
+	  (yyval.macfunc).s0.regno = 0;
+          (yyval.macfunc).s1.regno = 0;
+	}
+    break;
+
+  case 314:
+#line 4240 "bfin-parse.y"
+    {
+	  (yyval.macfunc) = (yyvsp[(1) - (1)].macfunc);
+	  (yyval.macfunc).w = 0; (yyval.macfunc).P = 0;
+	  (yyval.macfunc).dst.regno = 0;
+	}
+    break;
+
+  case 315:
+#line 4246 "bfin-parse.y"
+    {
+	  if ((yyvsp[(4) - (5)].macfunc).n && IS_EVEN ((yyvsp[(1) - (5)].reg)))
+	    return yyerror ("Cannot move A1 to even register");
+	  else if (!(yyvsp[(4) - (5)].macfunc).n && !IS_EVEN ((yyvsp[(1) - (5)].reg)))
+	    return yyerror ("Cannot move A0 to odd register");
+
+	  (yyval.macfunc) = (yyvsp[(4) - (5)].macfunc);
+	  (yyval.macfunc).w = 1;
+          (yyval.macfunc).P = 1;
+          (yyval.macfunc).dst = (yyvsp[(1) - (5)].reg);
+	}
+    break;
+
+  case 316:
+#line 4259 "bfin-parse.y"
+    {
+	  if ((yyvsp[(4) - (5)].macfunc).n && !IS_H ((yyvsp[(1) - (5)].reg)))
+	    return yyerror ("Cannot move A1 to low half of register");
+	  else if (!(yyvsp[(4) - (5)].macfunc).n && IS_H ((yyvsp[(1) - (5)].reg)))
+	    return yyerror ("Cannot move A0 to high half of register");
+
+	  (yyval.macfunc) = (yyvsp[(4) - (5)].macfunc);
+	  (yyval.macfunc).w = 1;
+	  (yyval.macfunc).P = 0;
+          (yyval.macfunc).dst = (yyvsp[(1) - (5)].reg);
+	}
+    break;
+
+  case 317:
+#line 4272 "bfin-parse.y"
+    {
+	  if (IS_A1 ((yyvsp[(3) - (3)].reg)) && !IS_H ((yyvsp[(1) - (3)].reg)))
+	    return yyerror ("Cannot move A1 to low half of register");
+	  else if (!IS_A1 ((yyvsp[(3) - (3)].reg)) && IS_H ((yyvsp[(1) - (3)].reg)))
+	    return yyerror ("Cannot move A0 to high half of register");
+
+	  (yyval.macfunc).w = 1;
+	  (yyval.macfunc).P = 0;
+	  (yyval.macfunc).n = IS_A1 ((yyvsp[(3) - (3)].reg));
+	  (yyval.macfunc).op = 3;
+          (yyval.macfunc).dst = (yyvsp[(1) - (3)].reg);
+	  (yyval.macfunc).s0.regno = 0;
+          (yyval.macfunc).s1.regno = 0;
+	}
+    break;
+
+  case 318:
+#line 4290 "bfin-parse.y"
+    {
+	  (yyval.macfunc).n = IS_A1 ((yyvsp[(1) - (2)].reg));
+	  (yyval.macfunc).op = 0;
+	  (yyval.macfunc).s0 = (yyvsp[(2) - (2)].macfunc).s0;
+	  (yyval.macfunc).s1 = (yyvsp[(2) - (2)].macfunc).s1;
+	}
+    break;
+
+  case 319:
+#line 4297 "bfin-parse.y"
+    {
+	  (yyval.macfunc).n = IS_A1 ((yyvsp[(1) - (2)].reg));
+	  (yyval.macfunc).op = 1;
+	  (yyval.macfunc).s0 = (yyvsp[(2) - (2)].macfunc).s0;
+	  (yyval.macfunc).s1 = (yyvsp[(2) - (2)].macfunc).s1;
+	}
+    break;
+
+  case 320:
+#line 4304 "bfin-parse.y"
+    {
+	  (yyval.macfunc).n = IS_A1 ((yyvsp[(1) - (2)].reg));
+	  (yyval.macfunc).op = 2;
+	  (yyval.macfunc).s0 = (yyvsp[(2) - (2)].macfunc).s0;
+	  (yyval.macfunc).s1 = (yyvsp[(2) - (2)].macfunc).s1;
+	}
+    break;
+
+  case 321:
+#line 4314 "bfin-parse.y"
+    {
+	  if (IS_DREG ((yyvsp[(1) - (3)].reg)) && IS_DREG ((yyvsp[(3) - (3)].reg)))
+	    {
+	      (yyval.macfunc).s0 = (yyvsp[(1) - (3)].reg);
+              (yyval.macfunc).s1 = (yyvsp[(3) - (3)].reg);
+	    }
+	  else
+	    return yyerror ("Dregs expected");
+	}
+    break;
+
+  case 322:
+#line 4327 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 0;
+	}
+    break;
+
+  case 323:
+#line 4331 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 1;
+	}
+    break;
+
+  case 324:
+#line 4335 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 2;
+	}
+    break;
+
+  case 325:
+#line 4339 "bfin-parse.y"
+    {
+	(yyval.r0).r0 = 3;
+	}
+    break;
+
+  case 326:
+#line 4346 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = (yyvsp[(3) - (3)].reg).regno;
+	  (yyval.modcodes).x0 = (yyvsp[(2) - (3)].r0).r0;
+	  (yyval.modcodes).s0 = 0;
+	}
+    break;
+
+  case 327:
+#line 4352 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 0x18;
+	  (yyval.modcodes).x0 = (yyvsp[(2) - (3)].r0).r0;
+	  (yyval.modcodes).s0 = 0;
+	}
+    break;
+
+  case 328:
+#line 4358 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = (yyvsp[(1) - (3)].reg).regno;
+	  (yyval.modcodes).x0 = (yyvsp[(2) - (3)].r0).r0;
+	  (yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 329:
+#line 4364 "bfin-parse.y"
+    {
+	  (yyval.modcodes).r0 = 0x18;
+	  (yyval.modcodes).x0 = (yyvsp[(2) - (3)].r0).r0;
+	  (yyval.modcodes).s0 = 1;
+	}
+    break;
+
+  case 330:
+#line 4374 "bfin-parse.y"
+    {
+	Expr_Node_Value val;
+	val.s_value = S_GET_NAME((yyvsp[(1) - (1)].symbol));
+	(yyval.expr) = Expr_Node_Create (Expr_Node_Reloc, val, NULL, NULL);
+	}
+    break;
+
+  case 331:
+#line 4383 "bfin-parse.y"
+    { (yyval.value) = BFD_RELOC_BFIN_GOT; }
+    break;
+
+  case 332:
+#line 4385 "bfin-parse.y"
+    { (yyval.value) = BFD_RELOC_BFIN_GOT17M4; }
+    break;
+
+  case 333:
+#line 4387 "bfin-parse.y"
+    { (yyval.value) = BFD_RELOC_BFIN_FUNCDESC_GOT17M4; }
+    break;
+
+  case 334:
+#line 4391 "bfin-parse.y"
+    {
+	Expr_Node_Value val;
+	val.i_value = (yyvsp[(3) - (3)].value);
+	(yyval.expr) = Expr_Node_Create (Expr_Node_GOT_Reloc, val, (yyvsp[(1) - (3)].expr), NULL);
+	}
+    break;
+
+  case 335:
+#line 4399 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(1) - (1)].expr);
+	}
+    break;
+
+  case 336:
+#line 4403 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(1) - (1)].expr);
+	}
+    break;
+
+  case 337:
+#line 4410 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(1) - (3)].expr);
+	}
+    break;
+
+  case 338:
+#line 4416 "bfin-parse.y"
+    {
+	Expr_Node_Value val;
+	val.i_value = (yyvsp[(1) - (1)].value);
+	(yyval.expr) = Expr_Node_Create (Expr_Node_Constant, val, NULL, NULL);
+	}
+    break;
+
+  case 339:
+#line 4422 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(1) - (1)].expr);
+	}
+    break;
+
+  case 340:
+#line 4426 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(2) - (3)].expr);
+	}
+    break;
+
+  case 341:
+#line 4430 "bfin-parse.y"
+    {
+	(yyval.expr) = unary (Expr_Op_Type_COMP, (yyvsp[(2) - (2)].expr));
+	}
+    break;
+
+  case 342:
+#line 4434 "bfin-parse.y"
+    {
+	(yyval.expr) = unary (Expr_Op_Type_NEG, (yyvsp[(2) - (2)].expr));
+	}
+    break;
+
+  case 343:
+#line 4440 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(1) - (1)].expr);
+	}
+    break;
+
+  case 344:
+#line 4446 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Mult, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 345:
+#line 4450 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Div, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 346:
+#line 4454 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Mod, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 347:
+#line 4458 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Add, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 348:
+#line 4462 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Sub, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 349:
+#line 4466 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Lshift, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 350:
+#line 4470 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_Rshift, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 351:
+#line 4474 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_BAND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 352:
+#line 4478 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_LOR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 353:
+#line 4482 "bfin-parse.y"
+    {
+	(yyval.expr) = binary (Expr_Op_Type_BOR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
+	}
+    break;
+
+  case 354:
+#line 4486 "bfin-parse.y"
+    {
+	(yyval.expr) = (yyvsp[(1) - (1)].expr);
+	}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 7558 "bfin-parse.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+#line 4492 "bfin-parse.y"
+
+
+EXPR_T
+mkexpr (int x, SYMBOL_T s)
+{
+  EXPR_T e = (EXPR_T) ALLOCATE (sizeof (struct expression_cell));
+  e->value = x;
+  EXPR_SYMBOL(e) = s;
+  return e;
+}
+
+static int
+value_match (Expr_Node *exp, int sz, int sign, int mul, int issigned)
+{
+  int umax = (1 << sz) - 1;
+  int min = -1 << (sz - 1);
+  int max = (1 << (sz - 1)) - 1;
+
+  int v = (EXPR_VALUE (exp)) & 0xffffffff;
+
+  if ((v % mul) != 0)
+    {
+      error ("%s:%d: Value Error -- Must align to %d\n", __FILE__, __LINE__, mul);
+      return 0;
+    }
+
+  v /= mul;
+
+  if (sign)
+    v = -v;
+
+  if (issigned)
+    {
+      if (v >= min && v <= max) return 1;
+
+#ifdef DEBUG
+      fprintf(stderr, "signed value %lx out of range\n", v * mul);
+#endif
+      return 0;
+    }
+  if (v <= umax && v >= 0)
+    return 1;
+#ifdef DEBUG
+  fprintf(stderr, "unsigned value %lx out of range\n", v * mul);
+#endif
+  return 0;
+}
+
+/* Return the expression structure that allows symbol operations.
+   If the left and right children are constants, do the operation.  */
+static Expr_Node *
+binary (Expr_Op_Type op, Expr_Node *x, Expr_Node *y)
+{
+  Expr_Node_Value val;
+
+  if (x->type == Expr_Node_Constant && y->type == Expr_Node_Constant)
+    {
+      switch (op)
+	{
+        case Expr_Op_Type_Add:
+	  x->value.i_value += y->value.i_value;
+	  break;
+        case Expr_Op_Type_Sub:
+	  x->value.i_value -= y->value.i_value;
+	  break;
+        case Expr_Op_Type_Mult:
+	  x->value.i_value *= y->value.i_value;
+	  break;
+        case Expr_Op_Type_Div:
+	  if (y->value.i_value == 0)
+	    error ("Illegal Expression:  Division by zero.");
+	  else
+	    x->value.i_value /= y->value.i_value;
+	  break;
+        case Expr_Op_Type_Mod:
+	  x->value.i_value %= y->value.i_value;
+	  break;
+        case Expr_Op_Type_Lshift:
+	  x->value.i_value <<= y->value.i_value;
+	  break;
+        case Expr_Op_Type_Rshift:
+	  x->value.i_value >>= y->value.i_value;
+	  break;
+        case Expr_Op_Type_BAND:
+	  x->value.i_value &= y->value.i_value;
+	  break;
+        case Expr_Op_Type_BOR:
+	  x->value.i_value |= y->value.i_value;
+	  break;
+        case Expr_Op_Type_BXOR:
+	  x->value.i_value ^= y->value.i_value;
+	  break;
+        case Expr_Op_Type_LAND:
+	  x->value.i_value = x->value.i_value && y->value.i_value;
+	  break;
+        case Expr_Op_Type_LOR:
+	  x->value.i_value = x->value.i_value || y->value.i_value;
+	  break;
+
+	default:
+	  error ("%s:%d: Internal assembler error\n", __FILE__, __LINE__);
+	}
+      return x;
+    }
+  /* Canonicalize order to EXPR OP CONSTANT.  */
+  if (x->type == Expr_Node_Constant)
+    {
+      Expr_Node *t = x;
+      x = y;
+      y = t;
+    }
+  /* Canonicalize subtraction of const to addition of negated const.  */
+  if (op == Expr_Op_Type_Sub && y->type == Expr_Node_Constant)
+    {
+      op = Expr_Op_Type_Add;
+      y->value.i_value = -y->value.i_value;
+    }
+  if (y->type == Expr_Node_Constant && x->type == Expr_Node_Binop
+      && x->Right_Child->type == Expr_Node_Constant)
+    {
+      if (op == x->value.op_value && x->value.op_value == Expr_Op_Type_Add)
+	{
+	  x->Right_Child->value.i_value += y->value.i_value;
+	  return x;
+	}
+    }
+
+  /* Create a new expression structure.  */
+  val.op_value = op;
+  return Expr_Node_Create (Expr_Node_Binop, val, x, y);
+}
+
+static Expr_Node *
+unary (Expr_Op_Type op, Expr_Node *x)
+{
+  if (x->type == Expr_Node_Constant)
+    {
+      switch (op)
+	{
+	case Expr_Op_Type_NEG:
+	  x->value.i_value = -x->value.i_value;
+	  break;
+	case Expr_Op_Type_COMP:
+	  x->value.i_value = ~x->value.i_value;
+	  break;
+	default:
+	  error ("%s:%d: Internal assembler error\n", __FILE__, __LINE__);
+	}
+      return x;
+    }
+  else
+    {
+      /* Create a new expression structure.  */
+      Expr_Node_Value val;
+      val.op_value = op;
+      return Expr_Node_Create (Expr_Node_Unop, val, x, NULL);
+    }
+}
+
+int debug_codeselection = 0;
+static void
+notethat (char *format, ...)
+{
+  va_list ap;
+  va_start (ap, format);
+  if (debug_codeselection)
+    {
+      vfprintf (errorf, format, ap);
+    }
+  va_end (ap);
+}
+
+#ifdef TEST
+main (int argc, char **argv)
+{
+  yyparse();
+}
+#endif
+
+
diff --git a/gas/bfin-parse.h b/gas/bfin-parse.h
new file mode 100644
index 0000000000..3a4f5f32a3
--- /dev/null
+++ b/gas/bfin-parse.h
@@ -0,0 +1,414 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     BYTEOP16P = 258,
+     BYTEOP16M = 259,
+     BYTEOP1P = 260,
+     BYTEOP2P = 261,
+     BYTEOP3P = 262,
+     BYTEUNPACK = 263,
+     BYTEPACK = 264,
+     PACK = 265,
+     SAA = 266,
+     ALIGN8 = 267,
+     ALIGN16 = 268,
+     ALIGN24 = 269,
+     VIT_MAX = 270,
+     EXTRACT = 271,
+     DEPOSIT = 272,
+     EXPADJ = 273,
+     SEARCH = 274,
+     ONES = 275,
+     SIGN = 276,
+     SIGNBITS = 277,
+     LINK = 278,
+     UNLINK = 279,
+     REG = 280,
+     PC = 281,
+     CCREG = 282,
+     BYTE_DREG = 283,
+     REG_A_DOUBLE_ZERO = 284,
+     REG_A_DOUBLE_ONE = 285,
+     A_ZERO_DOT_L = 286,
+     A_ZERO_DOT_H = 287,
+     A_ONE_DOT_L = 288,
+     A_ONE_DOT_H = 289,
+     HALF_REG = 290,
+     NOP = 291,
+     RTI = 292,
+     RTS = 293,
+     RTX = 294,
+     RTN = 295,
+     RTE = 296,
+     HLT = 297,
+     IDLE = 298,
+     STI = 299,
+     CLI = 300,
+     CSYNC = 301,
+     SSYNC = 302,
+     EMUEXCPT = 303,
+     RAISE = 304,
+     EXCPT = 305,
+     LSETUP = 306,
+     LOOP = 307,
+     LOOP_BEGIN = 308,
+     LOOP_END = 309,
+     DISALGNEXCPT = 310,
+     JUMP = 311,
+     JUMP_DOT_S = 312,
+     JUMP_DOT_L = 313,
+     CALL = 314,
+     ABORT = 315,
+     NOT = 316,
+     TILDA = 317,
+     BANG = 318,
+     AMPERSAND = 319,
+     BAR = 320,
+     PERCENT = 321,
+     CARET = 322,
+     BXOR = 323,
+     MINUS = 324,
+     PLUS = 325,
+     STAR = 326,
+     SLASH = 327,
+     NEG = 328,
+     MIN = 329,
+     MAX = 330,
+     ABS = 331,
+     DOUBLE_BAR = 332,
+     _PLUS_BAR_PLUS = 333,
+     _PLUS_BAR_MINUS = 334,
+     _MINUS_BAR_PLUS = 335,
+     _MINUS_BAR_MINUS = 336,
+     _MINUS_MINUS = 337,
+     _PLUS_PLUS = 338,
+     SHIFT = 339,
+     LSHIFT = 340,
+     ASHIFT = 341,
+     BXORSHIFT = 342,
+     _GREATER_GREATER_GREATER_THAN_ASSIGN = 343,
+     ROT = 344,
+     LESS_LESS = 345,
+     GREATER_GREATER = 346,
+     _GREATER_GREATER_GREATER = 347,
+     _LESS_LESS_ASSIGN = 348,
+     _GREATER_GREATER_ASSIGN = 349,
+     DIVS = 350,
+     DIVQ = 351,
+     ASSIGN = 352,
+     _STAR_ASSIGN = 353,
+     _BAR_ASSIGN = 354,
+     _CARET_ASSIGN = 355,
+     _AMPERSAND_ASSIGN = 356,
+     _MINUS_ASSIGN = 357,
+     _PLUS_ASSIGN = 358,
+     _ASSIGN_BANG = 359,
+     _LESS_THAN_ASSIGN = 360,
+     _ASSIGN_ASSIGN = 361,
+     GE = 362,
+     LT = 363,
+     LE = 364,
+     GT = 365,
+     LESS_THAN = 366,
+     FLUSHINV = 367,
+     FLUSH = 368,
+     IFLUSH = 369,
+     PREFETCH = 370,
+     PRNT = 371,
+     OUTC = 372,
+     WHATREG = 373,
+     TESTSET = 374,
+     ASL = 375,
+     ASR = 376,
+     B = 377,
+     W = 378,
+     NS = 379,
+     S = 380,
+     CO = 381,
+     SCO = 382,
+     TH = 383,
+     TL = 384,
+     BP = 385,
+     BREV = 386,
+     X = 387,
+     Z = 388,
+     M = 389,
+     MMOD = 390,
+     R = 391,
+     RND = 392,
+     RNDL = 393,
+     RNDH = 394,
+     RND12 = 395,
+     RND20 = 396,
+     V = 397,
+     LO = 398,
+     HI = 399,
+     BITTGL = 400,
+     BITCLR = 401,
+     BITSET = 402,
+     BITTST = 403,
+     BITMUX = 404,
+     DBGAL = 405,
+     DBGAH = 406,
+     DBGHALT = 407,
+     DBG = 408,
+     DBGA = 409,
+     DBGCMPLX = 410,
+     IF = 411,
+     COMMA = 412,
+     BY = 413,
+     COLON = 414,
+     SEMICOLON = 415,
+     RPAREN = 416,
+     LPAREN = 417,
+     LBRACK = 418,
+     RBRACK = 419,
+     STATUS_REG = 420,
+     MNOP = 421,
+     SYMBOL = 422,
+     NUMBER = 423,
+     GOT = 424,
+     GOT17M4 = 425,
+     FUNCDESC_GOT17M4 = 426,
+     AT = 427,
+     PLTPC = 428
+   };
+#endif
+/* Tokens.  */
+#define BYTEOP16P 258
+#define BYTEOP16M 259
+#define BYTEOP1P 260
+#define BYTEOP2P 261
+#define BYTEOP3P 262
+#define BYTEUNPACK 263
+#define BYTEPACK 264
+#define PACK 265
+#define SAA 266
+#define ALIGN8 267
+#define ALIGN16 268
+#define ALIGN24 269
+#define VIT_MAX 270
+#define EXTRACT 271
+#define DEPOSIT 272
+#define EXPADJ 273
+#define SEARCH 274
+#define ONES 275
+#define SIGN 276
+#define SIGNBITS 277
+#define LINK 278
+#define UNLINK 279
+#define REG 280
+#define PC 281
+#define CCREG 282
+#define BYTE_DREG 283
+#define REG_A_DOUBLE_ZERO 284
+#define REG_A_DOUBLE_ONE 285
+#define A_ZERO_DOT_L 286
+#define A_ZERO_DOT_H 287
+#define A_ONE_DOT_L 288
+#define A_ONE_DOT_H 289
+#define HALF_REG 290
+#define NOP 291
+#define RTI 292
+#define RTS 293
+#define RTX 294
+#define RTN 295
+#define RTE 296
+#define HLT 297
+#define IDLE 298
+#define STI 299
+#define CLI 300
+#define CSYNC 301
+#define SSYNC 302
+#define EMUEXCPT 303
+#define RAISE 304
+#define EXCPT 305
+#define LSETUP 306
+#define LOOP 307
+#define LOOP_BEGIN 308
+#define LOOP_END 309
+#define DISALGNEXCPT 310
+#define JUMP 311
+#define JUMP_DOT_S 312
+#define JUMP_DOT_L 313
+#define CALL 314
+#define ABORT 315
+#define NOT 316
+#define TILDA 317
+#define BANG 318
+#define AMPERSAND 319
+#define BAR 320
+#define PERCENT 321
+#define CARET 322
+#define BXOR 323
+#define MINUS 324
+#define PLUS 325
+#define STAR 326
+#define SLASH 327
+#define NEG 328
+#define MIN 329
+#define MAX 330
+#define ABS 331
+#define DOUBLE_BAR 332
+#define _PLUS_BAR_PLUS 333
+#define _PLUS_BAR_MINUS 334
+#define _MINUS_BAR_PLUS 335
+#define _MINUS_BAR_MINUS 336
+#define _MINUS_MINUS 337
+#define _PLUS_PLUS 338
+#define SHIFT 339
+#define LSHIFT 340
+#define ASHIFT 341
+#define BXORSHIFT 342
+#define _GREATER_GREATER_GREATER_THAN_ASSIGN 343
+#define ROT 344
+#define LESS_LESS 345
+#define GREATER_GREATER 346
+#define _GREATER_GREATER_GREATER 347
+#define _LESS_LESS_ASSIGN 348
+#define _GREATER_GREATER_ASSIGN 349
+#define DIVS 350
+#define DIVQ 351
+#define ASSIGN 352
+#define _STAR_ASSIGN 353
+#define _BAR_ASSIGN 354
+#define _CARET_ASSIGN 355
+#define _AMPERSAND_ASSIGN 356
+#define _MINUS_ASSIGN 357
+#define _PLUS_ASSIGN 358
+#define _ASSIGN_BANG 359
+#define _LESS_THAN_ASSIGN 360
+#define _ASSIGN_ASSIGN 361
+#define GE 362
+#define LT 363
+#define LE 364
+#define GT 365
+#define LESS_THAN 366
+#define FLUSHINV 367
+#define FLUSH 368
+#define IFLUSH 369
+#define PREFETCH 370
+#define PRNT 371
+#define OUTC 372
+#define WHATREG 373
+#define TESTSET 374
+#define ASL 375
+#define ASR 376
+#define B 377
+#define W 378
+#define NS 379
+#define S 380
+#define CO 381
+#define SCO 382
+#define TH 383
+#define TL 384
+#define BP 385
+#define BREV 386
+#define X 387
+#define Z 388
+#define M 389
+#define MMOD 390
+#define R 391
+#define RND 392
+#define RNDL 393
+#define RNDH 394
+#define RND12 395
+#define RND20 396
+#define V 397
+#define LO 398
+#define HI 399
+#define BITTGL 400
+#define BITCLR 401
+#define BITSET 402
+#define BITTST 403
+#define BITMUX 404
+#define DBGAL 405
+#define DBGAH 406
+#define DBGHALT 407
+#define DBG 408
+#define DBGA 409
+#define DBGCMPLX 410
+#define IF 411
+#define COMMA 412
+#define BY 413
+#define COLON 414
+#define SEMICOLON 415
+#define RPAREN 416
+#define LPAREN 417
+#define LBRACK 418
+#define RBRACK 419
+#define STATUS_REG 420
+#define MNOP 421
+#define SYMBOL 422
+#define NUMBER 423
+#define GOT 424
+#define GOT17M4 425
+#define FUNCDESC_GOT17M4 426
+#define AT 427
+#define PLTPC 428
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 445 "bfin-parse.y"
+{
+  INSTR_T instr;
+  Expr_Node *expr;
+  SYMBOL_T symbol;
+  long value;
+  Register reg;
+  Macfunc macfunc;
+  struct { int r0; int s0; int x0; int aop; } modcodes;
+  struct { int r0; } r0;
+  Opt_mode mod;
+}
+/* Line 1529 of yacc.c.  */
+#line 407 "bfin-parse.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+extern YYSTYPE yylval;
+
diff --git a/gas/cgen.c b/gas/cgen.c
index 9697ef6ec8..d3976d13b9 100644
--- a/gas/cgen.c
+++ b/gas/cgen.c
@@ -483,8 +483,7 @@ gas_cgen_parse_operand (cd, want, strP, opindex, opinfo, resultP, valueP)
 	  if (operand && (operand->hw_type == HW_H_SINT))
 	    signed_p = 1;
 
-	  if (stmp->bsym && (stmp->bsym->section == expr_section)
-	      && ! S_IS_LOCAL (stmp))
+	  if (stmp->bsym && (stmp->bsym->section == expr_section))
 	    {
 	      if (signed_p)
 		stmp->bsym->flags |= BSF_SRELC;
diff --git a/gas/config/bfin-parse.y b/gas/config/bfin-parse.y
index 4eaf6f1b7a..797664a501 100644
--- a/gas/config/bfin-parse.y
+++ b/gas/config/bfin-parse.y
@@ -166,9 +166,6 @@ char *current_inputline;
 extern char *yytext;
 int yyerror (char *);
 
-/* Used to set SRCx fields to all 1s as described in the PRM.  */
-static Register reg7 = {REG_R7, 0};
-
 void error (char *format, ...)
 {
     va_list ap;
@@ -804,7 +801,7 @@ asm_1:
 	  if (IS_DREG ($1) && !IS_A1 ($4) && IS_A1 ($5))
 	    {
 	      notethat ("dsp32alu: dregs = ( A0 += A1 )\n");
-	      $$ = DSP32ALU (11, 0, 0, &$1, &reg7, &reg7, 0, 0, 0);
+	      $$ = DSP32ALU (11, 0, 0, &$1, 0, 0, 0, 0, 0);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -814,7 +811,7 @@ asm_1:
 	  if (!IS_A1 ($4) && IS_A1 ($5))
 	    {
 	      notethat ("dsp32alu: dregs_half = ( A0 += A1 )\n");
-	      $$ = DSP32ALU (11, IS_H ($1), 0, &$1, &reg7, &reg7, 0, 0, 1);
+	      $$ = DSP32ALU (11, IS_H ($1), 0, &$1, 0, 0, 0, 0, 1);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -901,7 +898,7 @@ asm_1:
 	  if (IS_DREG ($1) && IS_DREG ($7))
 	    {
 	      notethat ("dsp32alu: dregs = A1.l + A1.h, dregs = A0.l + A0.h  \n");
-	      $$ = DSP32ALU (12, 0, &$1, &$7, &reg7, &reg7, 0, 0, 1);
+	      $$ = DSP32ALU (12, 0, &$1, &$7, 0, 0, 0, 0, 1);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -917,14 +914,14 @@ asm_1:
 	      && IS_A1 ($9) && !IS_A1 ($11))
 	    {
 	      notethat ("dsp32alu: dregs = A1 + A0 , dregs = A1 - A0 (amod1)\n");
-	      $$ = DSP32ALU (17, 0, &$1, &$7, &reg7, &reg7, $12.s0, $12.x0, 0);
+	      $$ = DSP32ALU (17, 0, &$1, &$7, 0, 0, $12.s0, $12.x0, 0);
 
 	    }
 	  else if (IS_DREG ($1) && IS_DREG ($7) && !REG_SAME ($3, $5)
 		   && !IS_A1 ($9) && IS_A1 ($11))
 	    {
 	      notethat ("dsp32alu: dregs = A0 + A1 , dregs = A0 - A1 (amod1)\n");
-	      $$ = DSP32ALU (17, 0, &$1, &$7, &reg7, &reg7, $12.s0, $12.x0, 1);
+	      $$ = DSP32ALU (17, 0, &$1, &$7, 0, 0, $12.s0, $12.x0, 1);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -998,7 +995,7 @@ asm_1:
 	| a_assign ABS REG_A
 	{
 	  notethat ("dsp32alu: Ax = ABS Ax\n");
-	  $$ = DSP32ALU (16, IS_A1 ($1), 0, 0, &reg7, &reg7, 0, 0, IS_A1 ($3));
+	  $$ = DSP32ALU (16, IS_A1 ($1), 0, 0, 0, 0, 0, 0, IS_A1 ($3));
 	}
 	| A_ZERO_DOT_L ASSIGN HALF_REG
 	{
@@ -1165,7 +1162,7 @@ asm_1:
 	| a_assign MINUS REG_A
 	{
 	  notethat ("dsp32alu: Ax = - Ax\n");
-	  $$ = DSP32ALU (14, IS_A1 ($1), 0, 0, &reg7, &reg7, 0, 0, IS_A1 ($3));
+	  $$ = DSP32ALU (14, IS_A1 ($1), 0, 0, 0, 0, 0, 0, IS_A1 ($3));
 	}
 	| HALF_REG ASSIGN HALF_REG plus_minus HALF_REG amod1
 	{
@@ -1178,7 +1175,7 @@ asm_1:
 	  if (EXPR_VALUE ($3) == 0 && !REG_SAME ($1, $2))
 	    {
 	      notethat ("dsp32alu: A1 = A0 = 0\n");
-	      $$ = DSP32ALU (8, 0, 0, 0, &reg7, &reg7, 0, 0, 2);
+	      $$ = DSP32ALU (8, 0, 0, 0, 0, 0, 0, 0, 2);
 	    }
 	  else
 	    return yyerror ("Bad value, 0 expected");
@@ -1190,7 +1187,7 @@ asm_1:
 	  if (REG_SAME ($1, $2))
 	    {
 	      notethat ("dsp32alu: Ax = Ax (S)\n");
-	      $$ = DSP32ALU (8, 0, 0, 0, &reg7, &reg7, 1, 0, IS_A1 ($1));
+	      $$ = DSP32ALU (8, 0, 0, 0, 0, 0, 1, 0, IS_A1 ($1));
 	    }
 	  else
 	    return yyerror ("Registers must be equal");
@@ -1234,7 +1231,7 @@ asm_1:
 	  if (!REG_SAME ($1, $2))
 	    {
 	      notethat ("dsp32alu: An = Am\n");
-	      $$ = DSP32ALU (8, 0, 0, 0, &reg7, &reg7, IS_A1 ($1), 0, 3);
+	      $$ = DSP32ALU (8, 0, 0, 0, 0, 0, IS_A1 ($1), 0, 3);
 	    }
 	  else
 	    return yyerror ("Accu reg arguments must differ");
@@ -1354,12 +1351,12 @@ asm_1:
 	  if (IS_DREG ($1) && $3.regno == REG_A0x)
 	    {
 	      notethat ("dsp32alu: dregs_lo = A0.x\n");
-	      $$ = DSP32ALU (10, 0, 0, &$1, &reg7, &reg7, 0, 0, 0);
+	      $$ = DSP32ALU (10, 0, 0, &$1, 0, 0, 0, 0, 0);
 	    }
 	  else if (IS_DREG ($1) && $3.regno == REG_A1x)
 	    {
 	      notethat ("dsp32alu: dregs_lo = A1.x\n");
-	      $$ = DSP32ALU (10, 0, 0, &$1, &reg7, &reg7, 0, 0, 1);
+	      $$ = DSP32ALU (10, 0, 0, &$1, 0, 0, 0, 0, 1);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -1392,7 +1389,7 @@ asm_1:
 	  if (REG_SAME ($1, $3) && REG_SAME ($5, $7) && !REG_SAME ($1, $5))
 	    {
 	      notethat ("dsp32alu: A1 = ABS A1 , A0 = ABS A0\n");
-	      $$ = DSP32ALU (16, 0, 0, 0, &reg7, &reg7, 0, 0, 3);
+	      $$ = DSP32ALU (16, 0, 0, 0, 0, 0, 0, 0, 3);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -1403,7 +1400,7 @@ asm_1:
 	  if (REG_SAME ($1, $3) && REG_SAME ($5, $7) && !REG_SAME ($1, $5))
 	    {
 	      notethat ("dsp32alu: A1 = - A1 , A0 = - A0\n");
-	      $$ = DSP32ALU (14, 0, 0, 0, &reg7, &reg7, 0, 0, 3);
+	      $$ = DSP32ALU (14, 0, 0, 0, 0, 0, 0, 0, 3);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -1414,7 +1411,7 @@ asm_1:
 	  if (!IS_A1 ($1) && IS_A1 ($2))
 	    {
 	      notethat ("dsp32alu: A0 -= A1\n");
-	      $$ = DSP32ALU (11, 0, 0, 0, &reg7, &reg7, $3.r0, 0, 3);
+	      $$ = DSP32ALU (11, 0, 0, 0, 0, 0, $3.r0, 0, 3);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -1474,7 +1471,7 @@ asm_1:
 	  if (!IS_A1 ($1) && IS_A1 ($3))
 	    {
 	      notethat ("dsp32alu: A0 += A1 (W32)\n");
-	      $$ = DSP32ALU (11, 0, 0, 0, &reg7, &reg7, $4.r0, 0, 2);
+	      $$ = DSP32ALU (11, 0, 0, 0, 0, 0, $4.r0, 0, 2);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
@@ -1553,7 +1550,7 @@ asm_1:
 	  if (REG_SAME ($1, $2) && REG_SAME ($7, $8) && !REG_SAME ($1, $7))
 	    {
 	      notethat ("dsp32alu: A1 = A1 (S) , A0 = A0 (S)\n");
-	      $$ = DSP32ALU (8, 0, 0, 0, &reg7, &reg7, 1, 0, 2);
+	      $$ = DSP32ALU (8, 0, 0, 0, 0, 0, 1, 0, 2);
 	    }
 	  else
 	    return yyerror ("Register mismatch");
diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index a15d3a2d68..d481026ee9 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -1531,7 +1531,6 @@ coff_frob_file_after_relocs (void)
                                                  'o' for over
                                                  'w' for data
   						 'd' (apparently m88k for data)
-						 'e' for exclude
                                                  'x' for text
   						 'r' for read-only data
   						 's' for shared data (PE)
@@ -1599,11 +1598,6 @@ obj_coff_section (int ignore ATTRIBUTE_UNUSED)
 		}
 	      switch (attr)
 		{
-		case 'e':
-		  /* Exclude section from linking.  */
-		  flags |= SEC_EXCLUDE;
-		  break;
-
 		case 'b':
 		  /* Uninitialised data section.  */
 		  flags |= SEC_ALLOC;
diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index ff5548eab4..fb9c6be1f2 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -181,7 +181,7 @@
 #endif
 
 #define OBJ_SYMFIELD_TYPE	unsigned long
-#define sy_obj			sy_obj_flags
+#define sy_obj			sy_flags
 
 /* We can't use the predefined section symbols in bfd/section.c, as
    COFF symbols have extra fields.  See bfd/libcoff.h:coff_symbol_type.  */
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index a101e8a996..6e16a62629 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -1,6 +1,6 @@
 /* ELF object file format
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -741,10 +741,10 @@ obj_elf_change_section (const char *name,
 }
 
 static bfd_vma
-obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *is_clone)
+obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *clone)
 {
   bfd_vma attr = 0;
-  *is_clone = FALSE;
+  *clone = FALSE;
 
   while (len > 0)
     {
@@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *is_clone)
 	  attr |= SHF_TLS;
 	  break;
 	case '?':
-	  *is_clone = TRUE;
+	  *clone = TRUE;
 	  break;
 	/* Compatibility.  */
 	case 'm':
@@ -978,7 +978,7 @@ obj_elf_section (int push)
 
       if (*input_line_pointer == '"')
 	{
-	  bfd_boolean is_clone;
+	  bfd_boolean clone;
 
 	  beg = demand_copy_C_string (&dummy);
 	  if (beg == NULL)
@@ -986,7 +986,7 @@ obj_elf_section (int push)
 	      ignore_rest_of_line ();
 	      return;
 	    }
-	  attr |= obj_elf_parse_section_letters (beg, strlen (beg), &is_clone);
+	  attr |= obj_elf_parse_section_letters (beg, strlen (beg), &clone);
 
 	  SKIP_WHITESPACE ();
 	  if (*input_line_pointer == ',')
@@ -1038,10 +1038,10 @@ obj_elf_section (int push)
 	      attr &= ~SHF_MERGE;
 	    }
 
-	  if ((attr & SHF_GROUP) != 0 && is_clone)
+	  if ((attr & SHF_GROUP) != 0 && clone)
 	    {
 	      as_warn (_("? section flag ignored with G present"));
-	      is_clone = FALSE;
+	      clone = FALSE;
 	    }
 	  if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',')
 	    {
@@ -1063,7 +1063,7 @@ obj_elf_section (int push)
 	      attr &= ~SHF_GROUP;
 	    }
 
-	  if (is_clone)
+	  if (clone)
 	    {
 	      const char *now_group = elf_group_name (now_seg);
 	      if (now_group != NULL)
@@ -1702,10 +1702,9 @@ obj_elf_type (int ignore ATTRIBUTE_UNUSED)
 
       bed = get_elf_backend_data (stdoutput);
       if (!(bed->elf_osabi == ELFOSABI_GNU
-	    || bed->elf_osabi == ELFOSABI_FREEBSD
 	    /* GNU is still using the default value 0.  */
 	    || bed->elf_osabi == ELFOSABI_NONE))
-	as_bad (_("symbol type \"%s\" is supported only by GNU and FreeBSD targets"),
+	as_bad (_("symbol type \"%s\" is supported only by GNU targets"),
 		type_name);
       type = BSF_FUNCTION | BSF_GNU_INDIRECT_FUNCTION;
     }
diff --git a/gas/config/obj-macho.c b/gas/config/obj-macho.c
index 21281a0ef1..5f1255d4f6 100644
--- a/gas/config/obj-macho.c
+++ b/gas/config/obj-macho.c
@@ -1,5 +1,5 @@
 /* Mach-O object file format
-   Copyright 2009, 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2009 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -18,23 +18,6 @@
    Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-/* Here we handle the mach-o directives that are common to all architectures.
-
-   Most significant are mach-o named sections and a variety of symbol type
-   decorations.  */
-
-/* Mach-O supports multiple, named segments each of which may contain
-   multiple named sections.  Thus the concept of subsectioning is 
-   handled by (say) having a __TEXT segment with appropriate flags from
-   which subsections are generated like __text, __const etc.  
-   
-   The well-known as short-hand section switch directives like .text, .data
-   etc. are mapped onto predefined segment/section pairs using facilites
-   supplied by the mach-o port of bfd.
-   
-   A number of additional mach-o short-hand section switch directives are
-   also defined.  */
-
 #define OBJ_HEADER "obj-macho.h"
 
 #include "as.h"
@@ -43,1948 +26,285 @@
 #include "write.h"
 #include "mach-o.h"
 #include "mach-o/loader.h"
-#include "obj-macho.h"
-
-#include <string.h>
-
-/* Forward decls.  */
-static segT obj_mach_o_segT_from_bfd_name (const char *, int);
-
-/* TODO: Implement "-dynamic"/"-static" command line options.  */
-
-static int obj_mach_o_is_static;
-
-/* TODO: Implement the "-n" command line option to suppress the initial
-   switch to the text segment.  */
-
-static int obj_mach_o_start_with_text_section = 1;
-
-/* Allow for special re-ordering on output.  */
-
-static int obj_mach_o_seen_objc_section;
-
-/* Start-up: At present, just create the sections we want.  */
-void
-mach_o_begin (void)
-{
-  /* Mach-O only defines the .text section by default, and even this can
-     be suppressed by a flag.  In the latter event, the first code MUST
-     be a section definition.  */
-  if (obj_mach_o_start_with_text_section)
-    {
-      text_section = obj_mach_o_segT_from_bfd_name (TEXT_SECTION_NAME, 1);
-      subseg_set (text_section, 0);
-      if (obj_mach_o_is_static)
-	{
-	  bfd_mach_o_section *mo_sec 
-			= bfd_mach_o_get_mach_o_section (text_section);
-	  mo_sec->flags &= ~BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS;
-	}
-    }
-}
-
-/* Remember the subsections_by_symbols state in case we need to reset
-   the file flags.  */
 
-static int obj_mach_o_subsections_by_symbols;
-
-/* This will put at most 16 characters (terminated by a ',' or newline) from
-   the input stream into dest.  If there are more than 16 chars before the
-   delimiter, a warning is given and the string is truncated.  On completion of
-   this function, input_line_pointer will point to the char after the ',' or 
-   to the newline.  
-   
-   It trims leading and trailing space.  */
-
-static int
-collect_16char_name (char *dest, const char *msg, int require_comma)
+static void
+obj_mach_o_weak (int ignore ATTRIBUTE_UNUSED)
 {
-  char c, *namstart;
-
-  SKIP_WHITESPACE ();
-  namstart = input_line_pointer;
-
-  while ( (c = *input_line_pointer) != ',' 
-	 && !is_end_of_line[(unsigned char) c])
-    input_line_pointer++;
-
-  {
-      int len = input_line_pointer - namstart; /* could be zero.  */
-      /* lose any trailing space.  */  
-      while (len > 0 && namstart[len-1] == ' ') 
-        len--;
-      if (len > 16)
-        {
-          *input_line_pointer = '\0'; /* make a temp string.  */
-	  as_bad (_("the %s name '%s' is too long (maximum 16 characters)"),
-		     msg, namstart);
-	  *input_line_pointer = c; /* restore for printing.  */
-	  len = 16;
-	}
-      if (len > 0)
-        memcpy (dest, namstart, len);
-  }
+  char *name;
+  int c;
+  symbolS *symbolP;
 
-  if (c != ',' && require_comma)
+  do
     {
-      as_bad (_("expected a %s name followed by a `,'"), msg);
-      return 1;
-    }
-
-  return 0;
-}
+      /* Get symbol name.  */
+      name = input_line_pointer;
+      c = get_symbol_end ();
+      symbolP = symbol_find_or_make (name);
+      S_SET_WEAK (symbolP);
+      *input_line_pointer = c;
+      SKIP_WHITESPACE ();
 
-static int
-obj_mach_o_get_section_names (char *seg, char *sec,
-			      unsigned segl, unsigned secl)
-{
-  /* Zero-length segment and section names are allowed.  */
-  /* Parse segment name.  */
-  memset (seg, 0, segl);
-  if (collect_16char_name (seg, "segment", 1))
-    {
-      ignore_rest_of_line ();
-      return 0;
+      if (c != ',')
+        break;
+      input_line_pointer++;
+      SKIP_WHITESPACE ();
     }
-  input_line_pointer++; /* Skip the terminating ',' */
-
-  /* Parse section name, which can be empty.  */
-  memset (sec, 0, secl);
-  collect_16char_name (sec, "section", 0);
-  return 1;
+  while (*input_line_pointer != '\n');
+  demand_empty_rest_of_line ();
 }
 
-/* Build (or get) a section from the mach-o description - which includes
-   optional definitions for type, attributes, alignment and stub size.
-   
-   BFD supplies default values for sections which have a canonical name.  */
+/* Parse:
+   .section segname,sectname[,type[,attribute[,sizeof_stub]]]
+*/
 
-#define SECT_TYPE_SPECIFIED 0x0001
-#define SECT_ATTR_SPECIFIED 0x0002
-#define SECT_ALGN_SPECIFIED 0x0004
-#define SECT_STUB_SPECIFIED 0x0008
-
-static segT
-obj_mach_o_make_or_get_sect (char * segname, char * sectname,
-			     unsigned int specified_mask, 
-			     unsigned int usectype, unsigned int usecattr,
-			     unsigned int ualign, offsetT stub_size)
+static void
+obj_mach_o_section (int ignore ATTRIBUTE_UNUSED)
 {
-  unsigned int sectype, secattr, secalign;
-  flagword oldflags, flags;
+  char *p;
+  char *segname;
+  char *sectname;
+  char c;
+  int sectype = BFD_MACH_O_S_REGULAR;
+  unsigned int secattr = 0;
+  offsetT sizeof_stub = 0;
   const char *name;
-  segT sec;
-  bfd_mach_o_section *msect;
-  const mach_o_section_name_xlat *xlat;
-
-  /* This provides default bfd flags and default mach-o section type and
-     attributes along with the canonical name.  */
-  xlat = bfd_mach_o_section_data_for_mach_sect (stdoutput, segname, sectname);
-
-  /* TODO: more checking of whether overides are acually allowed.  */
+  flagword oldflags, flags;
+  asection *sec;
 
-  if (xlat != NULL)
-    {
-      name = xstrdup (xlat->bfd_name);
-      sectype = xlat->macho_sectype;
-      if (specified_mask & SECT_TYPE_SPECIFIED)
-	{
-	  if ((sectype == BFD_MACH_O_S_ZEROFILL
-	       || sectype == BFD_MACH_O_S_GB_ZEROFILL)
-	      && sectype != usectype)
-	    as_bad (_("cannot overide zerofill section type for `%s,%s'"),
-		    segname, sectname);
-	  else
-	    sectype = usectype;
-	}
-      secattr = xlat->macho_secattr;
-      secalign = xlat->sectalign;
-      flags = xlat->bfd_flags;
-    }
-  else
+  /* Parse segment name.  */
+  if (!is_name_beginner (*input_line_pointer))
     {
-      /* There is no normal BFD section name for this section.  Create one.
-         The name created doesn't really matter as it will never be written
-         on disk.  */
-      size_t seglen = strlen (segname);
-      size_t sectlen = strlen (sectname);
-      char *n;
-
-      n = xmalloc (seglen + 1 + sectlen + 1);
-      memcpy (n, segname, seglen);
-      n[seglen] = '.';
-      memcpy (n + seglen + 1, sectname, sectlen);
-      n[seglen + 1 + sectlen] = 0;
-      name = n;
-      if (specified_mask & SECT_TYPE_SPECIFIED)
-	sectype = usectype;
-      else
-	sectype = BFD_MACH_O_S_REGULAR;
-      secattr = BFD_MACH_O_S_ATTR_NONE;
-      secalign = 0;
-      flags = SEC_NO_FLAGS;
+      as_bad (_("missing segment name"));
+      ignore_rest_of_line ();
+      return;
     }
+  p = input_line_pointer;
+  c = get_symbol_end ();
+  segname = alloca (input_line_pointer - p + 1);
+  strcpy (segname, p);
+  *input_line_pointer = c;
 
-  /* For now, just use what the user provided.  */
-
-  if (specified_mask & SECT_ATTR_SPECIFIED)
-    secattr = usecattr;
-
-  if (specified_mask & SECT_ALGN_SPECIFIED)
-    secalign = ualign;
-
-  /* Sub-segments don't exists as is on Mach-O.  */
-  sec = subseg_new (name, 0);
-
-  oldflags = bfd_get_section_flags (stdoutput, sec);
-  msect = bfd_mach_o_get_mach_o_section (sec);
-
-  if (oldflags == SEC_NO_FLAGS)
+  if (*input_line_pointer != ',')
     {
-      /* In the absence of canonical information, try to determine CODE and
-	 DEBUG section flags from the mach-o section data.  */
-      if (flags == SEC_NO_FLAGS
-	  && (specified_mask & SECT_ATTR_SPECIFIED)
-	  && (secattr & BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS))
-	flags |= SEC_CODE;
-      
-      if (flags == SEC_NO_FLAGS
-	  && (specified_mask & SECT_ATTR_SPECIFIED)
-	  && (secattr & BFD_MACH_O_S_ATTR_DEBUG))
-	flags |= SEC_DEBUGGING;
-
-      /* New, so just use the defaults or what's specified.  */
-      if (! bfd_set_section_flags (stdoutput, sec, flags))
-	as_warn (_("failed to set flags for \"%s\": %s"),
-		 bfd_section_name (stdoutput, sec),
-		 bfd_errmsg (bfd_get_error ()));
- 
-      strncpy (msect->segname, segname, sizeof (msect->segname));
-      strncpy (msect->sectname, sectname, sizeof (msect->sectname));
-
-      msect->align = secalign;
-      msect->flags = sectype | secattr;
-      
-      if (sectype == BFD_MACH_O_S_ZEROFILL
-	  || sectype == BFD_MACH_O_S_GB_ZEROFILL)
-        seg_info (sec)->bss = 1;
+      as_bad (_("missing comma after segment name"));
+      ignore_rest_of_line ();
+      return;
     }
-  else if (flags != SEC_NO_FLAGS)
+  input_line_pointer++;
+
+  /* Parse section name.  */
+  if (!is_name_beginner (*input_line_pointer))
     {
-      if (flags != oldflags
-	  || msect->flags != (secattr | sectype))
-	as_warn (_("Ignoring changed section attributes for %s"), name);
+      as_bad (_("missing section name"));
+      ignore_rest_of_line ();
+      return;
     }
+  p = input_line_pointer;
+  c = get_symbol_end ();
+  sectname = alloca (input_line_pointer - p + 1);
+  strcpy (sectname, p);
+  *input_line_pointer = c;
 
-  if (specified_mask & SECT_STUB_SPECIFIED)
-    /* At present, the stub size is not supplied from the BFD tables.  */
-    msect->reserved2 = stub_size;
-
-  return sec;
-}
-
-/* .section
-
-   The '.section' specification syntax looks like:
-   .section <segment> , <section> [, type [, attribs [, size]]]
-
-   White space is allowed everywhere between elements.
-
-   <segment> and <section> may be from 0 to 16 chars in length - they may
-   contain spaces but leading and trailing space will be trimmed.  It is 
-   mandatory that they be present (or that zero-length names are indicated
-   by ",,").
-
-   There is only a single section type for any entry.
-
-   There may be multiple attributes, they are delimited by `+'.
-
-   Not all section types and attributes are accepted by the Darwin system
-   assemblers as user-specifiable - although, at present, we do here.  */
-
-static void
-obj_mach_o_section (int ignore ATTRIBUTE_UNUSED)
-{
-  unsigned int sectype = BFD_MACH_O_S_REGULAR;
-  unsigned int specified_mask = 0;
-  unsigned int secattr = 0;
-  offsetT sizeof_stub = 0;
-  segT new_seg;
-  char segname[17];
-  char sectname[17];
-
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
-
-  /* Get the User's segment annd section names.  */
-  if (! obj_mach_o_get_section_names (segname, sectname, 17, 17))
-    return;
-
-  /* Parse section type, if present.  */
+  /* Parse type.  */
   if (*input_line_pointer == ',')
     {
-      char *p;
-      char c;
-      char tmpc;
-      int len;
       input_line_pointer++;
-      SKIP_WHITESPACE ();
+      if (!is_name_beginner (*input_line_pointer))
+        {
+          as_bad (_("missing section type name"));
+          ignore_rest_of_line ();
+          return;
+        }
       p = input_line_pointer;
-      while ((c = *input_line_pointer) != ','
-	      && !is_end_of_line[(unsigned char) c])
-	input_line_pointer++;
-
-      len = input_line_pointer - p;
-      /* strip trailing spaces.  */
-      while (len > 0 && p[len-1] == ' ')
-	len--;
-      tmpc = p[len];
+      c = get_symbol_end ();
 
-      /* Temporarily make a string from the token.  */
-      p[len] = 0;
-      sectype = bfd_mach_o_get_section_type_from_name (stdoutput, p);
-      if (sectype > 255) /* Max Section ID == 255.  */
+      sectype = bfd_mach_o_get_section_type_from_name (p);
+      if (sectype == -1)
         {
           as_bad (_("unknown or invalid section type '%s'"), p);
-	  p[len] = tmpc;
-	  ignore_rest_of_line ();
-	  return;
+          sectype = BFD_MACH_O_S_REGULAR;
         }
-      else
-	specified_mask |= SECT_TYPE_SPECIFIED;
-      /* Restore.  */
-      p[len] = tmpc;
+      *input_line_pointer = c;
 
-      /* Parse attributes.
-	 TODO: check validity of attributes for section type.  */
-      if ((specified_mask & SECT_TYPE_SPECIFIED)
-	  && c == ',')
+      /* Parse attributes.  */
+      if (*input_line_pointer == ',')
         {
           do
             {
               int attr;
 
-	      /* Skip initial `,' and subsequent `+'.  */
               input_line_pointer++;
-	      SKIP_WHITESPACE ();
-	      p = input_line_pointer;
-	      while ((c = *input_line_pointer) != '+'
-		      && c != ','
-		      && !is_end_of_line[(unsigned char) c])
-		input_line_pointer++;
 
-	      len = input_line_pointer - p;
-	      /* strip trailing spaces.  */
-	      while (len > 0 && p[len-1] == ' ')
-		len--;
-	      tmpc = p[len];
+              if (!is_name_beginner (*input_line_pointer))
+                {
+                  as_bad (_("missing section attribute identifier"));
+                  ignore_rest_of_line ();
+                  break;
+                }
+              p = input_line_pointer;
+              c = get_symbol_end ();
 
-	      /* Temporarily make a string from the token.  */
-	      p[len] ='\0';
               attr = bfd_mach_o_get_section_attribute_from_name (p);
-	      if (attr == -1)
-		{
-                  as_bad (_("unknown or invalid section attribute '%s'"), p);
-		  p[len] = tmpc;
-		  ignore_rest_of_line ();
-		  return;
-                }
+              if (attr == -1)
+                as_bad (_("unknown or invalid section attribute '%s'"), p);
               else
-		{
-		  specified_mask |= SECT_ATTR_SPECIFIED;
-                  secattr |= attr;
-		}
-	      /* Restore.  */
-	      p[len] = tmpc;
+                secattr |= attr;
+
+              *input_line_pointer = c;
             }
           while (*input_line_pointer == '+');
 
           /* Parse sizeof_stub.  */
-          if ((specified_mask & SECT_ATTR_SPECIFIED) 
-	      && *input_line_pointer == ',')
+          if (*input_line_pointer == ',')
             {
               if (sectype != BFD_MACH_O_S_SYMBOL_STUBS)
-                {
-		  as_bad (_("unexpected section size information"));
-		  ignore_rest_of_line ();
-		  return;
-		}
+                as_bad (_("unexpected sizeof_stub expression"));
 
-	      input_line_pointer++;
               sizeof_stub = get_absolute_expression ();
-              specified_mask |= SECT_STUB_SPECIFIED;
-            }
-          else if ((specified_mask & SECT_ATTR_SPECIFIED) 
-		   && sectype == BFD_MACH_O_S_SYMBOL_STUBS)
-            {
-              as_bad (_("missing sizeof_stub expression"));
-	      ignore_rest_of_line ();
-	      return;
             }
+          else if (sectype == BFD_MACH_O_S_SYMBOL_STUBS)
+            as_bad (_("missing sizeof_stub expression"));
         }
     }
+  demand_empty_rest_of_line ();
 
-  new_seg = obj_mach_o_make_or_get_sect (segname, sectname, specified_mask, 
-					 sectype, secattr, 0 /*align */,
-					 sizeof_stub);
-  if (new_seg != NULL)
+  bfd_mach_o_normalize_section_name (segname, sectname, &name, &flags);
+  if (name == NULL)
     {
-      subseg_set (new_seg, 0);
-      demand_empty_rest_of_line ();
-    }
-}
-
-/* .zerofill segname, sectname [, symbolname, size [, align]]
-
-   Zerofill switches, temporarily, to a sect of type 'zerofill'.
-
-   If a variable name is given, it defines that in the section.
-   Otherwise it just creates the section if it doesn't exist.  */
+      /* There is no normal BFD section name for this section.  Create one.
+         The name created doesn't really matter as it will never be written
+         on disk.  */
+      size_t seglen = strlen (segname);
+      size_t sectlen = strlen (sectname);
+      char *n;
 
-static void
-obj_mach_o_zerofill (int ignore ATTRIBUTE_UNUSED)
-{
-  char segname[17];
-  char sectname[17];
-  segT old_seg = now_seg;
-  segT new_seg;
-  symbolS *sym = NULL;
-  unsigned int align = 0;
-  unsigned int specified_mask = 0;
-  offsetT size = 0;
+      n = xmalloc (seglen + 1 + sectlen + 1);
+      memcpy (n, segname, seglen);
+      n[seglen] = '.';
+      memcpy (n + seglen + 1, sectname, sectlen);
+      n[seglen + 1 + sectlen] = 0;
+      name = n;
+    }
 
 #ifdef md_flush_pending_output
   md_flush_pending_output ();
 #endif
 
-  /* Get the User's segment annd section names.  */
-  if (! obj_mach_o_get_section_names (segname, sectname, 17, 17))
-    return;
-
-  /* Parse variable definition, if present.  */
-  if (*input_line_pointer == ',')
-    {
-      /* Parse symbol, size [.align] 
-         We follow the method of s_common_internal, with the difference
-         that the symbol cannot be a duplicate-common.  */
-      char *name;
-      char c;
-      char *p;
-      expressionS exp;
-  
-      input_line_pointer++; /* Skip ',' */
-      SKIP_WHITESPACE ();
-      name = input_line_pointer;
-      c = get_symbol_end ();
-      /* Just after name is now '\0'.  */
-      p = input_line_pointer;
-      *p = c;
-
-      if (name == p)
-	{
-	  as_bad (_("expected symbol name"));
-	  ignore_rest_of_line ();
-	  goto done;
-	}
-
-      SKIP_WHITESPACE ();  
-      if (*input_line_pointer == ',')
-	input_line_pointer++;
-
-      expression_and_evaluate (&exp);
-      if (exp.X_op != O_constant
-	  && exp.X_op != O_absent)
-	{
-	    as_bad (_("bad or irreducible absolute expression"));
-	  ignore_rest_of_line ();
-	  goto done;
-	}
-      else if (exp.X_op == O_absent)
-	{
-	  as_bad (_("missing size expression"));
-	  ignore_rest_of_line ();
-	  goto done;
-	}
-
-      size = exp.X_add_number;
-      size &= ((offsetT) 2 << (stdoutput->arch_info->bits_per_address - 1)) - 1;
-      if (exp.X_add_number != size || !exp.X_unsigned)
-	{
-	  as_warn (_("size (%ld) out of range, ignored"),
-		   (long) exp.X_add_number);
-	  ignore_rest_of_line ();
-	  goto done;
-	}
-
-     *p = 0; /* Make the name into a c string for err messages.  */
-     sym = symbol_find_or_make (name);
-     if (S_IS_DEFINED (sym) || symbol_equated_p (sym))
-	{
-	  as_bad (_("symbol `%s' is already defined"), name);
-	  *p = c;
-	  ignore_rest_of_line ();
-	   goto done;
-	}
-
-      size = S_GET_VALUE (sym);
-      if (size == 0)
-	size = exp.X_add_number;
-      else if (size != exp.X_add_number)
-	as_warn (_("size of \"%s\" is already %ld; not changing to %ld"),
-		   name, (long) size, (long) exp.X_add_number);
-
-      *p = c;  /* Restore the termination char.  */
-      
-      SKIP_WHITESPACE ();  
-      if (*input_line_pointer == ',')
-	{
-	  align = (unsigned int) parse_align (0);
-	  if (align == (unsigned int) -1)
-	    {
-	      as_warn (_("align value not recognized, using size"));
-	      align = size;
-	    }
-	  if (align > 15)
-	    {
-	      as_warn (_("Alignment (%lu) too large: 15 assumed."),
-			(unsigned long)align);
-	      align = 15;
-	    }
-	  specified_mask |= SECT_ALGN_SPECIFIED;
-	}
-    }
- /* else just a section definition.  */
-
-  specified_mask |= SECT_TYPE_SPECIFIED;
-  new_seg = obj_mach_o_make_or_get_sect (segname, sectname, specified_mask, 
-					 BFD_MACH_O_S_ZEROFILL,
-					 BFD_MACH_O_S_ATTR_NONE,
-					 align, (offsetT) 0 /*stub size*/);
-  if (new_seg == NULL)
-    return;
-
-  /* In case the user specifies the bss section by mach-o name.
-     Create it on demand */
-  if (strcmp (new_seg->name, BSS_SECTION_NAME) == 0
-      && bss_section == NULL)
-    bss_section = new_seg;
-
-  subseg_set (new_seg, 0);
-
-  if (sym != NULL)
-    {
-      char *pfrag;
-
-      if (align)
-	{
-	  record_alignment (new_seg, align);
-	  frag_align (align, 0, 0);
-	}
-
-      /* Detach from old frag.  */
-      if (S_GET_SEGMENT (sym) == new_seg)
-	symbol_get_frag (sym)->fr_symbol = NULL;
-
-      symbol_set_frag (sym, frag_now);
-      pfrag = frag_var (rs_org, 1, 1, 0, sym, size, NULL);
-      *pfrag = 0;
-
-      S_SET_SEGMENT (sym, new_seg);
-      if (new_seg == bss_section)
-	S_CLEAR_EXTERNAL (sym);
-    }
-
-done:
-  /* switch back to the section that was current before the .zerofill.  */
-  subseg_set (old_seg, 0);
-}
-
-static segT 
-obj_mach_o_segT_from_bfd_name (const char *nam, int must_succeed)
-{
-  const mach_o_section_name_xlat *xlat;
-  const char *segn;
-  segT sec;
-
-  /* BFD has tables of flags and default attributes for all the sections that
-     have a 'canonical' name.  */
-  xlat = bfd_mach_o_section_data_for_bfd_name (stdoutput, nam, &segn);
-  if (xlat == NULL)
-    {
-      if (must_succeed)
-	as_fatal (_("BFD is out of sync with GAS, "
-		     "unhandled well-known section type `%s'"), nam);
-      return NULL;
-    }
+  /* Sub-segments don't exists as is on Mach-O.  */
+  sec = subseg_new (name, 0);
 
-  sec = bfd_get_section_by_name (stdoutput, nam);
-  if (sec == NULL)
+  oldflags = bfd_get_section_flags (stdoutput, sec);
+  if (oldflags == SEC_NO_FLAGS)
     {
       bfd_mach_o_section *msect;
 
-      sec = subseg_force_new (xlat->bfd_name, 0);
-
-      /* Set default type, attributes and alignment.  */
+      if (! bfd_set_section_flags (stdoutput, sec, flags))
+	as_warn (_("error setting flags for \"%s\": %s"),
+		 bfd_section_name (stdoutput, sec),
+		 bfd_errmsg (bfd_get_error ()));
       msect = bfd_mach_o_get_mach_o_section (sec);
-      msect->flags = xlat->macho_sectype | xlat->macho_secattr;
-      msect->align = xlat->sectalign;
-
-      if ((msect->flags & BFD_MACH_O_SECTION_TYPE_MASK) 
-	  == BFD_MACH_O_S_ZEROFILL)
-	seg_info (sec)->bss = 1;
+      strncpy (msect->segname, segname, sizeof (msect->segname));
+      msect->segname[16] = 0;
+      strncpy (msect->sectname, sectname, sizeof (msect->sectname));
+      msect->sectname[16] = 0;
+      msect->flags = secattr | sectype;
+      msect->reserved2 = sizeof_stub;
     }
-
-  return sec;
-}
-
-static const char * const known_sections[] =
-{
-  /*  0 */ NULL,
-  /* __TEXT */
-  /*  1 */ ".const",
-  /*  2 */ ".static_const",
-  /*  3 */ ".cstring",
-  /*  4 */ ".literal4",
-  /*  5 */ ".literal8",
-  /*  6 */ ".literal16",
-  /*  7 */ ".constructor",
-  /*  8 */ ".destructor",
-  /*  9 */ ".eh_frame",
-  /* __DATA */
-  /* 10 */ ".const_data",
-  /* 11 */ ".static_data",
-  /* 12 */ ".mod_init_func",
-  /* 13 */ ".mod_term_func",
-  /* 14 */ ".dyld",
-  /* 15 */ ".cfstring"
-};
-
-/* Interface for a known non-optional section directive.  */
-
-static void
-obj_mach_o_known_section (int sect_index)
-{
-  segT section;
-
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
-
-  section = obj_mach_o_segT_from_bfd_name (known_sections[sect_index], 1);
-  if (section != NULL)
-    subseg_set (section, 0);
-
-  /* else, we leave the section as it was; there was a fatal error anyway.  */
-}
-
-static const char * const objc_sections[] =
-{
-  /*  0 */ NULL,
-  /*  1 */ ".objc_class",
-  /*  2 */ ".objc_meta_class",
-  /*  3 */ ".objc_cat_cls_meth",
-  /*  4 */ ".objc_cat_inst_meth",
-  /*  5 */ ".objc_protocol",
-  /*  6 */ ".objc_string_object",
-  /*  7 */ ".objc_cls_meth",
-  /*  8 */ ".objc_inst_meth",
-  /*  9 */ ".objc_cls_refs",
-  /* 10 */ ".objc_message_refs",
-  /* 11 */ ".objc_symbols",
-  /* 12 */ ".objc_category",
-  /* 13 */ ".objc_class_vars",
-  /* 14 */ ".objc_instance_vars",
-  /* 15 */ ".objc_module_info",
-  /* 16 */ ".cstring", /* objc_class_names Alias for .cstring */
-  /* 17 */ ".cstring", /* Alias objc_meth_var_types for .cstring */
-  /* 18 */ ".cstring", /* objc_meth_var_names Alias for .cstring */
-  /* 19 */ ".objc_selector_strs",
-  /* 20 */ ".objc_image_info", /* extension.  */
-  /* 21 */ ".objc_selector_fixup", /* extension.  */
-  /* 22 */ ".objc1_class_ext", /* ObjC-1 extension.  */
-  /* 23 */ ".objc1_property_list", /* ObjC-1 extension.  */
-  /* 24 */ ".objc1_protocol_ext" /* ObjC-1 extension.  */
-};
-
-/* This currently does the same as known_sections, but kept separate for
-   ease of maintenance.  */
-
-static void
-obj_mach_o_objc_section (int sect_index)
-{
-  segT section;
-  
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
-
-  section = obj_mach_o_segT_from_bfd_name (objc_sections[sect_index], 1);
-  if (section != NULL)
+  else if (flags != SEC_NO_FLAGS)
     {
-      obj_mach_o_seen_objc_section = 1; /* We need to ensure that certain
-					   sections are present and in the
-					   right order.  */
-      subseg_set (section, 0);
+      if (flags != oldflags)
+	as_warn (_("Ignoring changed section attributes for %s"), name);
     }
-
-  /* else, we leave the section as it was; there was a fatal error anyway.  */
-}
-
-/* Debug section directives.  */
-
-static const char * const debug_sections[] =
-{
-  /*  0 */ NULL,
-  /* __DWARF */
-  /*  1 */ ".debug_frame",
-  /*  2 */ ".debug_info",
-  /*  3 */ ".debug_abbrev",
-  /*  4 */ ".debug_aranges",
-  /*  5 */ ".debug_macinfo",
-  /*  6 */ ".debug_line",
-  /*  7 */ ".debug_loc",
-  /*  8 */ ".debug_pubnames",
-  /*  9 */ ".debug_pubtypes",
-  /* 10 */ ".debug_str",
-  /* 11 */ ".debug_ranges",
-  /* 12 */ ".debug_macro"
-};
-
-/* ??? Maybe these should be conditional on gdwarf-*.
-   It`s also likely that we will need to be able to set them from the cfi
-   code.  */
-
-static void
-obj_mach_o_debug_section (int sect_index)
-{
-  segT section;
-
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
-
-  section = obj_mach_o_segT_from_bfd_name (debug_sections[sect_index], 1);
-  if (section != NULL)
-    subseg_set (section, 0);
-
-  /* else, we leave the section as it was; there was a fatal error anyway.  */
 }
 
-/* This could be moved to the tc-xx files, but there is so little dependency
-   there, that the code might as well be shared.  */
-
-struct opt_tgt_sect 
-{
- const char *name;
- unsigned x86_val;
- unsigned ppc_val;
-};
-
-/* The extensions here are for specific sections that are generated by GCC
-   and Darwin system tools, but don't have directives in the `system as'.  */
-
-static const struct opt_tgt_sect tgt_sections[] =
+struct known_section
 {
-  /*  0 */ { NULL, 0, 0},
-  /*  1 */ { ".lazy_symbol_pointer", 0, 0},
-  /*  2 */ { ".lazy_symbol_pointer2", 0, 0}, /* X86 - extension */
-  /*  3 */ { ".lazy_symbol_pointer3", 0, 0}, /* X86 - extension */
-  /*  4 */ { ".non_lazy_symbol_pointer", 0, 0},
-  /*  5 */ { ".non_lazy_symbol_pointer_x86", 0, 0}, /* X86 - extension */
-  /*  6 */ { ".symbol_stub", 16, 20},
-  /*  7 */ { ".symbol_stub1", 0, 16}, /* PPC - extension */
-  /*  8 */ { ".picsymbol_stub", 26, 36},
-  /*  9 */ { ".picsymbol_stub1", 0, 32}, /* PPC - extension */
-  /* 10 */ { ".picsymbol_stub2", 25, 0}, /* X86 - extension */
-  /* 11 */ { ".picsymbol_stub3", 5, 0}, /* X86 - extension  */
+  const char *name;
+  unsigned int flags;
 };
 
-/* Interface for an optional section directive.  */
+static const struct known_section known_sections[] =
+  {
+    /* 0 */ { NULL, 0},
+    /* 1 */ { ".cstring", BFD_MACH_O_S_CSTRING_LITERALS }
+  };
 
 static void
-obj_mach_o_opt_tgt_section (int sect_index)
+obj_mach_o_known_section (int sect_index)
 {
-  const struct opt_tgt_sect *tgtsct = &tgt_sections[sect_index];
-  segT section;
+  const struct known_section *sect = &known_sections[sect_index];
+  asection *old_sec;
+  segT sec;
 
 #ifdef md_flush_pending_output
   md_flush_pending_output ();
 #endif
 
-  section = obj_mach_o_segT_from_bfd_name (tgtsct->name, 0);
-  if (section == NULL)
+  old_sec = bfd_get_section_by_name (stdoutput, sect->name);
+  if (old_sec)
     {
-      as_bad (_("%s is not used for the selected target"), tgtsct->name);
-      /* Leave the section as it is.  */
+      /* Section already present.  */
+      sec = old_sec;
+      subseg_set (sec, 0);
     }
   else
     {
-      bfd_mach_o_section *mo_sec = bfd_mach_o_get_mach_o_section (section);
-      subseg_set (section, 0);
-#if defined (TC_I386)
-      mo_sec->reserved2 = tgtsct->x86_val;
-#elif defined (TC_PPC)
-      mo_sec->reserved2 = tgtsct->ppc_val;
-#else
-      mo_sec->reserved2 = 0;
-#endif
-    }
-}
-
-/* We don't necessarily have the three 'base' sections on mach-o.
-   Normally, we would start up with only the 'text' section defined.
-   However, even that can be suppressed with (TODO) c/l option "-n".
-   Thus, we have to be able to create all three sections on-demand.  */
-
-static void
-obj_mach_o_base_section (int sect_index)
-{
-  segT section;
-
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
+      bfd_mach_o_section *msect;
 
-  /* We don't support numeric (or any other) qualifications on the
-     well-known section shorthands.  */
-  demand_empty_rest_of_line ();
+      sec = subseg_force_new (sect->name, 0);
 
-  switch (sect_index)
-    {
-      /* Handle the three sections that are globally known within GAS.
-	 For Mach-O, these are created on demand rather than at startup.  */
-      case 1:
-	if (text_section == NULL)
-	  text_section = obj_mach_o_segT_from_bfd_name (TEXT_SECTION_NAME, 1);
-	if (obj_mach_o_is_static)
-	  {
-	    bfd_mach_o_section *mo_sec
-		= bfd_mach_o_get_mach_o_section (text_section);
-	    mo_sec->flags &= ~BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS;
-	  }
-	section = text_section;
-	break;
-      case 2:
-	if (data_section == NULL)
-	  data_section = obj_mach_o_segT_from_bfd_name (DATA_SECTION_NAME, 1);
-	section = data_section;
-	break;
-      case 3:
-        /* ??? maybe this achieves very little, as an addition.  */
-	if (bss_section == NULL)
-	  {
-	    bss_section = obj_mach_o_segT_from_bfd_name (BSS_SECTION_NAME, 1);
-	    seg_info (bss_section)->bss = 1;
-	  }
-	section = bss_section;
-	break;
-      default:
-        as_fatal (_("internal error: base section index out of range"));
-        return;
-	break;
+      /* Set default flags.  */
+      msect = bfd_mach_o_get_mach_o_section (sec);
+      msect->flags = sect->flags;
     }
-  subseg_set (section, 0);
 }
 
-/* This finishes off parsing a .comm or .lcomm statement, which both can have
-   an (optional) alignment field.  It also allows us to create the bss section
-   on demand.  */
+/* Called from read.c:s_comm after we've parsed .comm symbol, size.
+   Parse a possible alignment value.  */
 
 static symbolS *
-obj_mach_o_common_parse (int is_local, symbolS *symbolP,
-			 addressT size)
+obj_mach_o_common_parse (int ignore ATTRIBUTE_UNUSED,
+                         symbolS *symbolP, addressT size)
 {
   addressT align = 0;
-  bfd_mach_o_asymbol *s;
-
-  SKIP_WHITESPACE ();  
 
-  /* Both comm and lcomm take an optional alignment, as a power
-     of two between 1 and 15.  */
   if (*input_line_pointer == ',')
     {
-      /* We expect a power of 2.  */
       align = parse_align (0);
       if (align == (addressT) -1)
 	return NULL;
-      if (align > 15)
-	{
-	  as_warn (_("Alignment (%lu) too large: 15 assumed."),
-		  (unsigned long)align);
-	  align = 15;
-	}
-    }
-
-  s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (symbolP);
-  if (is_local)
-    {
-      /* Create the BSS section on demand.  */
-      if (bss_section == NULL)
-	{
-	  bss_section = obj_mach_o_segT_from_bfd_name (BSS_SECTION_NAME, 1);
-	  seg_info (bss_section)->bss = 1;	  
-	}
-      bss_alloc (symbolP, size, align);
-      s->n_type = BFD_MACH_O_N_SECT;
-      S_CLEAR_EXTERNAL (symbolP);
-    }
-  else
-    {
-      S_SET_VALUE (symbolP, size);
-      S_SET_ALIGN (symbolP, align);
-      S_SET_EXTERNAL (symbolP);
-      S_SET_SEGMENT (symbolP, bfd_com_section_ptr);
-      s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT;
     }
 
-  /* This is a data object (whatever we choose that to mean).  */
-  s->symbol.flags |= BSF_OBJECT;
+  S_SET_VALUE (symbolP, size);
+  S_SET_EXTERNAL (symbolP);
+  S_SET_SEGMENT (symbolP, bfd_com_section_ptr);
 
-  /* We've set symbol qualifiers, so validate if you can.  */
-  s->symbol.udata.i = SYM_MACHO_FIELDS_NOT_VALIDATED;
+  symbol_get_bfdsym (symbolP)->flags |= BSF_OBJECT;
 
   return symbolP;
 }
 
 static void
-obj_mach_o_comm (int is_local)
+obj_mach_o_comm (int ignore ATTRIBUTE_UNUSED)
 {
-  s_comm_internal (is_local, obj_mach_o_common_parse);
+  s_comm_internal (ignore, obj_mach_o_common_parse);
 }
 
-/* Set properties that apply to the whole file.  At present, the only
-   one defined, is subsections_via_symbols.  */
-
-typedef enum obj_mach_o_file_properties {
-  OBJ_MACH_O_FILE_PROP_NONE = 0,
-  OBJ_MACH_O_FILE_PROP_SUBSECTS_VIA_SYMS,
-  OBJ_MACH_O_FILE_PROP_MAX
-} obj_mach_o_file_properties;
-
-static void 
-obj_mach_o_fileprop (int prop)
-{
-  if (prop < 0 || prop >= OBJ_MACH_O_FILE_PROP_MAX)
-    as_fatal (_("internal error: bad file property ID %d"), prop);
-    
-  switch ((obj_mach_o_file_properties) prop)
-    {
-      case OBJ_MACH_O_FILE_PROP_SUBSECTS_VIA_SYMS:
-        obj_mach_o_subsections_by_symbols = 1;
-	if (!bfd_set_private_flags (stdoutput, 
-				    BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS))
-	  as_bad (_("failed to set subsections by symbols"));
-	demand_empty_rest_of_line ();
-	break;
-      default:
-	break;
-    }
-}
-
-/* Temporary markers for symbol reference data.  
-   Lazy will remain in place.  */
-#define LAZY 0x01
-#define REFE 0x02
-
-/* We have a bunch of qualifiers that may be applied to symbols.
-   .globl is handled here so that we might make sure that conflicting qualifiers
-   are caught where possible.  */
-
-typedef enum obj_mach_o_symbol_type {
-  OBJ_MACH_O_SYM_UNK = 0,
-  OBJ_MACH_O_SYM_LOCAL = 1,
-  OBJ_MACH_O_SYM_GLOBL = 2,
-  OBJ_MACH_O_SYM_REFERENCE = 3,
-  OBJ_MACH_O_SYM_WEAK_REF = 4,
-  OBJ_MACH_O_SYM_LAZY_REF = 5,
-  OBJ_MACH_O_SYM_WEAK_DEF = 6,
-  OBJ_MACH_O_SYM_PRIV_EXT = 7,
-  OBJ_MACH_O_SYM_NO_DEAD_STRIP = 8,
-  OBJ_MACH_O_SYM_WEAK = 9
-} obj_mach_o_symbol_type;
-
-/* Set Mach-O-specific symbol qualifiers. */
-
-static int
-obj_mach_o_set_symbol_qualifier (symbolS *sym, int type)
-{
-  int is_defined;
-  bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (sym);
-  bfd_mach_o_section *sec;
-  int sectype = -1;
-  int err = 0;
-
-  /* If the symbol is defined, then we can do more rigorous checking on
-     the validity of the qualifiers.  Otherwise, we are stuck with waiting 
-     until it's defined - or until write the file.
-     
-     In certain cases (e.g. when a symbol qualifier is intended to introduce
-     an undefined symbol in a stubs section) we should check that the current
-     section is appropriate to the qualifier.  */
-
-  is_defined = s->symbol.section != bfd_und_section_ptr;
-  if (is_defined)
-    sec = bfd_mach_o_get_mach_o_section (s->symbol.section) ;
-  else
-    sec = bfd_mach_o_get_mach_o_section (now_seg) ;
-
-  if (sec != NULL)
-    sectype = sec->flags & BFD_MACH_O_SECTION_TYPE_MASK;
-
-  switch ((obj_mach_o_symbol_type) type)
-    {
-      case OBJ_MACH_O_SYM_LOCAL:
-	/* This is an extension over the system tools.  */
-        if (s->n_type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT))
-	  {
-	    as_bad (_("'%s' previously declared as '%s'."), s->symbol.name,
-		      (s->n_type & BFD_MACH_O_N_PEXT) ? "private extern"
-						      : "global" );
-	    err = 1;
-	  }
-	else
-	  {
-	    s->n_type &= ~BFD_MACH_O_N_EXT;
-	    S_CLEAR_EXTERNAL (sym);
-	  }
-	break;
-
-      case OBJ_MACH_O_SYM_PRIV_EXT:
-	s->n_type |= BFD_MACH_O_N_PEXT ;
-	s->n_desc &= ~LAZY; /* The native tool switches this off too.  */
-	/* We follow the system tools in marking PEXT as also global.  */
-	/* Fall through.  */
-
-      case OBJ_MACH_O_SYM_GLOBL:
-	/* It's not an error to define a symbol and then make it global.  */
-	s->n_type |= BFD_MACH_O_N_EXT;
-	S_SET_EXTERNAL (sym);
-	break;
-
-      case OBJ_MACH_O_SYM_REFERENCE:
-        if (is_defined)
-          s->n_desc |= BFD_MACH_O_N_NO_DEAD_STRIP;
-        else
-          s->n_desc |= (REFE | BFD_MACH_O_N_NO_DEAD_STRIP);
-	break;
-
-      case OBJ_MACH_O_SYM_LAZY_REF:
-        if (is_defined)
-          s->n_desc |= BFD_MACH_O_N_NO_DEAD_STRIP;
-        else
-          s->n_desc |= (REFE | LAZY | BFD_MACH_O_N_NO_DEAD_STRIP);
-	break;
-
-      /* Force ld to retain the symbol - even if it appears unused.  */
-      case OBJ_MACH_O_SYM_NO_DEAD_STRIP:
-	s->n_desc |= BFD_MACH_O_N_NO_DEAD_STRIP ;
-	break;
-
-      /* Mach-O's idea of weak ...  */
-      case OBJ_MACH_O_SYM_WEAK_REF:
-	s->n_desc |= BFD_MACH_O_N_WEAK_REF ;
-	break;
-
-      case OBJ_MACH_O_SYM_WEAK_DEF:
-	if (is_defined && sectype != BFD_MACH_O_S_COALESCED)
-	  {
-	    as_bad (_("'%s' can't be a weak_definition (currently only"
-		      " supported in sections of type coalesced)"),
-		      s->symbol.name);
-	    err = 1;
-	  }
-	else
-	  s->n_desc |= BFD_MACH_O_N_WEAK_DEF;
-	break;
-
-      case OBJ_MACH_O_SYM_WEAK:
-        /* A generic 'weak' - we try to figure out what it means at
-	   symbol frob time.  */
-	S_SET_WEAK (sym);
-	break;
-
-      default:
-	break;
-    }
-
-    /* We've seen some kind of qualifier - check validity if or when the entity
-     is defined.  */
-  s->symbol.udata.i = SYM_MACHO_FIELDS_NOT_VALIDATED;
-  return err;
-}
-
-/* Respond to symbol qualifiers.
-   All of the form:
-   .<qualifier> symbol [, symbol]*
-   a list of symbols is an extension over the Darwin system as.  */
-
 static void
-obj_mach_o_sym_qual (int ntype)
+obj_mach_o_subsections_via_symbols (int arg ATTRIBUTE_UNUSED)
 {
-  char *name;
-  char c;
-  symbolS *symbolP;
-
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
-
-  do
-    {
-      name = input_line_pointer;
-      c = get_symbol_end ();
-      symbolP = symbol_find_or_make (name);
-      obj_mach_o_set_symbol_qualifier (symbolP, ntype);
-      *input_line_pointer = c;
-      SKIP_WHITESPACE ();
-      c = *input_line_pointer;
-      if (c == ',')
-	{
-	  input_line_pointer++;
-	  SKIP_WHITESPACE ();
-	  if (is_end_of_line[(unsigned char) *input_line_pointer])
-	    c = '\n';
-	}
-    }
-  while (c == ',');
-
-  demand_empty_rest_of_line ();
-}
-
-typedef struct obj_mach_o_indirect_sym
-{
-  symbolS *sym;
-  segT sect;
-  struct obj_mach_o_indirect_sym *next;
-} obj_mach_o_indirect_sym;
-
-/* We store in order an maintain a pointer to the last one - to save reversing
-   later.  */
-obj_mach_o_indirect_sym *indirect_syms;
-obj_mach_o_indirect_sym *indirect_syms_tail;
-
-static void
-obj_mach_o_indirect_symbol (int arg ATTRIBUTE_UNUSED)
-{
-  bfd_mach_o_section *sec = bfd_mach_o_get_mach_o_section (now_seg);
-
-#ifdef md_flush_pending_output
-  md_flush_pending_output ();
-#endif
-
-  if (obj_mach_o_is_static)
-    as_bad (_("use of .indirect_symbols requires `-dynamic'"));
-
-  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
-    {
-      case BFD_MACH_O_S_SYMBOL_STUBS:
-      case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
-      case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
-        {
-          obj_mach_o_indirect_sym *isym;
-	  char *name = input_line_pointer;
-	  char c = get_symbol_end ();
-	  symbolS *sym = symbol_find_or_make (name);
-	  unsigned int elsize =
-			bfd_mach_o_section_get_entry_size (stdoutput, sec);
-
-	  if (elsize == 0)
-	    {
-	      as_bad (_("attempt to add an indirect_symbol to a stub or"
-			" reference section with a zero-sized element at %s"),
-			name);
-	      *input_line_pointer = c;
-	      ignore_rest_of_line ();
-	      return;
-	  }
-	  *input_line_pointer = c;
-
-	  /* The indirect symbols are validated after the symbol table is 
-	     frozen, we must make sure that if a local symbol is used as an 
-	     indirect, it is promoted to a 'real' one.  Fetching the bfd sym
-	     achieves this.  */
-	  symbol_get_bfdsym (sym);
-	  isym = (obj_mach_o_indirect_sym *)
-			xmalloc (sizeof (obj_mach_o_indirect_sym));
-
-	  /* Just record the data for now, we will validate it when we
-	     compute the output in obj_mach_o_set_indirect_symbols.  */
-	  isym->sym = sym;
-	  isym->sect = now_seg;
-	  isym->next = NULL;
-	  if (indirect_syms == NULL)
-	    indirect_syms = isym;
-	  else
-	    indirect_syms_tail->next = isym;
-	  indirect_syms_tail = isym;
-	}
-        break;
-
-      default:
-	as_bad (_("an .indirect_symbol must be in a symbol pointer"
-		  " or stub section."));
-	ignore_rest_of_line ();
-	return;
-    }
+  /* Currently ignore it.  */
   demand_empty_rest_of_line ();
 }
 
 const pseudo_typeS mach_o_pseudo_table[] =
 {
-  /* Section directives.  */
-  { "comm", obj_mach_o_comm, 0 },
-  { "lcomm", obj_mach_o_comm, 1 },
-
-  { "text", obj_mach_o_base_section, 1},
-  { "data", obj_mach_o_base_section, 2},
-  { "bss", obj_mach_o_base_section, 3},   /* extension */
-
-  { "const", obj_mach_o_known_section, 1},
-  { "static_const", obj_mach_o_known_section, 2},
-  { "cstring", obj_mach_o_known_section, 3},
-  { "literal4", obj_mach_o_known_section, 4},
-  { "literal8", obj_mach_o_known_section, 5},
-  { "literal16", obj_mach_o_known_section, 6},
-  { "constructor", obj_mach_o_known_section, 7},
-  { "destructor", obj_mach_o_known_section, 8},
-  { "eh_frame", obj_mach_o_known_section, 9},
-
-  { "const_data", obj_mach_o_known_section, 10},
-  { "static_data", obj_mach_o_known_section, 11},
-  { "mod_init_func", obj_mach_o_known_section, 12},
-  { "mod_term_func", obj_mach_o_known_section, 13},
-  { "dyld", obj_mach_o_known_section, 14},
-  { "cfstring", obj_mach_o_known_section, 15},
-
-  { "objc_class", obj_mach_o_objc_section, 1},
-  { "objc_meta_class", obj_mach_o_objc_section, 2},
-  { "objc_cat_cls_meth", obj_mach_o_objc_section, 3},
-  { "objc_cat_inst_meth", obj_mach_o_objc_section, 4},
-  { "objc_protocol", obj_mach_o_objc_section, 5},
-  { "objc_string_object", obj_mach_o_objc_section, 6},
-  { "objc_cls_meth", obj_mach_o_objc_section, 7},
-  { "objc_inst_meth", obj_mach_o_objc_section, 8},
-  { "objc_cls_refs", obj_mach_o_objc_section, 9},
-  { "objc_message_refs", obj_mach_o_objc_section, 10},
-  { "objc_symbols", obj_mach_o_objc_section, 11},
-  { "objc_category", obj_mach_o_objc_section, 12},
-  { "objc_class_vars", obj_mach_o_objc_section, 13},
-  { "objc_instance_vars", obj_mach_o_objc_section, 14},
-  { "objc_module_info", obj_mach_o_objc_section, 15},
-  { "objc_class_names", obj_mach_o_objc_section, 16}, /* Alias for .cstring */
-  { "objc_meth_var_types", obj_mach_o_objc_section, 17}, /* Alias for .cstring */
-  { "objc_meth_var_names", obj_mach_o_objc_section, 18}, /* Alias for .cstring */
-  { "objc_selector_strs", obj_mach_o_objc_section, 19},
-  { "objc_image_info", obj_mach_o_objc_section, 20}, /* extension.  */
-  { "objc_selector_fixup", obj_mach_o_objc_section, 21}, /* extension.  */
-  { "objc1_class_ext", obj_mach_o_objc_section, 22}, /* ObjC-1 extension.  */
-  { "objc1_property_list", obj_mach_o_objc_section, 23}, /* ObjC-1 extension.  */
-  { "objc1_protocol_ext", obj_mach_o_objc_section, 24}, /* ObjC-1 extension.  */
-
-  { "debug_frame", obj_mach_o_debug_section, 1}, /* extension.  */
-  { "debug_info", obj_mach_o_debug_section, 2}, /* extension.  */
-  { "debug_abbrev", obj_mach_o_debug_section, 3}, /* extension.  */
-  { "debug_aranges", obj_mach_o_debug_section, 4}, /* extension.  */
-  { "debug_macinfo", obj_mach_o_debug_section, 5}, /* extension.  */
-  { "debug_line", obj_mach_o_debug_section, 6}, /* extension.  */
-  { "debug_loc", obj_mach_o_debug_section, 7}, /* extension.  */
-  { "debug_pubnames", obj_mach_o_debug_section, 8}, /* extension.  */
-  { "debug_pubtypes", obj_mach_o_debug_section, 9}, /* extension.  */
-  { "debug_str", obj_mach_o_debug_section, 10}, /* extension.  */
-  { "debug_ranges", obj_mach_o_debug_section, 11}, /* extension.  */
-  { "debug_macro", obj_mach_o_debug_section, 12}, /* extension.  */
-  
-  { "lazy_symbol_pointer", obj_mach_o_opt_tgt_section, 1},
-  { "lazy_symbol_pointer2", obj_mach_o_opt_tgt_section, 2}, /* extension.  */
-  { "lazy_symbol_pointer3", obj_mach_o_opt_tgt_section, 3}, /* extension.  */
-  { "non_lazy_symbol_pointer", obj_mach_o_opt_tgt_section, 4},
-  { "non_lazy_symbol_pointer_x86", obj_mach_o_opt_tgt_section, 5}, /* extension.  */
-  { "symbol_stub", obj_mach_o_opt_tgt_section, 6},
-  { "symbol_stub1", obj_mach_o_opt_tgt_section, 7}, /* extension.  */
-  { "picsymbol_stub", obj_mach_o_opt_tgt_section, 8}, /* extension.  */
-  { "picsymbol_stub1", obj_mach_o_opt_tgt_section, 9}, /* extension.  */
-  { "picsymbol_stub2", obj_mach_o_opt_tgt_section, 4}, /* extension.  */
-  { "picsymbol_stub3", obj_mach_o_opt_tgt_section, 4}, /* extension.  */
-
+  { "weak", obj_mach_o_weak, 0},
   { "section", obj_mach_o_section, 0},
-  { "zerofill", obj_mach_o_zerofill, 0},
-
-  /* Symbol qualifiers.  */
-  {"local",		obj_mach_o_sym_qual, OBJ_MACH_O_SYM_LOCAL},
-  {"globl",		obj_mach_o_sym_qual, OBJ_MACH_O_SYM_GLOBL},
-  {"reference",		obj_mach_o_sym_qual, OBJ_MACH_O_SYM_REFERENCE},
-  {"weak_reference",	obj_mach_o_sym_qual, OBJ_MACH_O_SYM_WEAK_REF},
-  {"lazy_reference",	obj_mach_o_sym_qual, OBJ_MACH_O_SYM_LAZY_REF},
-  {"weak_definition",	obj_mach_o_sym_qual, OBJ_MACH_O_SYM_WEAK_DEF},
-  {"private_extern",	obj_mach_o_sym_qual, OBJ_MACH_O_SYM_PRIV_EXT},
-  {"no_dead_strip",	obj_mach_o_sym_qual, OBJ_MACH_O_SYM_NO_DEAD_STRIP},
-  {"weak",		obj_mach_o_sym_qual, OBJ_MACH_O_SYM_WEAK}, /* ext */
-
-  { "indirect_symbol",	obj_mach_o_indirect_symbol, 0},
-
-  /* File flags.  */
-  { "subsections_via_symbols", obj_mach_o_fileprop, 
-			       OBJ_MACH_O_FILE_PROP_SUBSECTS_VIA_SYMS},
+  { "cstring", obj_mach_o_known_section, 1},
+  { "lcomm", s_lcomm, 1 },
+  { "comm", obj_mach_o_comm, 0 },
+  { "subsections_via_symbols", obj_mach_o_subsections_via_symbols, 0 },
 
   {NULL, NULL, 0}
 };
-
-/* Determine the default n_type value for a symbol from its section.  */
-
-static unsigned
-obj_mach_o_type_for_symbol (bfd_mach_o_asymbol *s)
-{
-  if (s->symbol.section == bfd_abs_section_ptr)
-    return BFD_MACH_O_N_ABS;
-  else if (s->symbol.section == bfd_com_section_ptr
-	   || s->symbol.section == bfd_und_section_ptr)
-    return BFD_MACH_O_N_UNDF;
-  else
-    return BFD_MACH_O_N_SECT;
-}
-
-void
-obj_mach_o_frob_colon (const char *name)
-{
-  if (!bfd_is_local_label_name (stdoutput, name))
-    {
-      /* A non-local label will create a new subsection, so start a new
-         frag.  */
-      frag_wane (frag_now);
-      frag_new (0);
-    }
-}
-
-/* We need to check the correspondence between some kinds of symbols and their
-   sections.  Common and BSS vars will seen via the obj_macho_comm() function.
-   
-   The earlier we can pick up a problem, the better the diagnostics will be.
-   
-   However, when symbol type information is attached, the symbol section will
-   quite possibly be unknown.  So we are stuck with checking (most of the)
-   validity at the time the file is written (unfortunately, then one doesn't
-   get line number information in the diagnostic).  */
-
-/* Here we pick up the case where symbol qualifiers have been applied that
-   are possibly incompatible with the section etc. that the symbol is defined
-   in.  */
-
-void obj_mach_o_frob_label (struct symbol *sp)
-{
-  bfd_mach_o_asymbol *s;
-  unsigned base_type;
-  bfd_mach_o_section *sec;
-  int sectype = -1;
-
-  if (!bfd_is_local_label_name (stdoutput, S_GET_NAME (sp)))
-    {
-      /* If this is a non-local label, it should have started a new sub-
-	 section.  */
-      gas_assert (frag_now->obj_frag_data.subsection == NULL);
-      frag_now->obj_frag_data.subsection = sp;
-    }
-
-  /* Leave local symbols alone.  */
-
-  if (S_IS_LOCAL (sp))
-    return;
-
-  s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (sp);
-  /* Leave debug symbols alone.  */
-  if ((s->n_type & BFD_MACH_O_N_STAB) != 0)
-    return;
-
-  /* This is the base symbol type, that we mask in.  */
-  base_type = obj_mach_o_type_for_symbol (s);
-
-  sec = bfd_mach_o_get_mach_o_section (s->symbol.section);  
-  if (sec != NULL)
-    sectype = sec->flags & BFD_MACH_O_SECTION_TYPE_MASK;
-
-  /* If there is a pre-existing qualifier, we can make some checks about
-     validity now.  */
-
-  if(s->symbol.udata.i == SYM_MACHO_FIELDS_NOT_VALIDATED)
-    {
-      if ((s->n_desc & BFD_MACH_O_N_WEAK_DEF)
-	  && sectype != BFD_MACH_O_S_COALESCED)
-	as_bad (_("'%s' can't be a weak_definition (currently only supported"
-		  " in sections of type coalesced)"), s->symbol.name);
-
-      /* Have we changed from an undefined to defined ref? */
-      s->n_desc &= ~(REFE | LAZY);
-    }
-
-  s->n_type &= ~BFD_MACH_O_N_TYPE;
-  s->n_type |= base_type;
-}
-
-/* This is the fall-back, we come here when we get to the end of the file and
-   the symbol is not defined - or there are combinations of qualifiers required
-   (e.g. global + weak_def).  */
-
-int
-obj_mach_o_frob_symbol (struct symbol *sp)
-{
-  bfd_mach_o_asymbol *s;
-  unsigned base_type;
-  bfd_mach_o_section *sec;
-  int sectype = -1;
-
-  /* Leave local symbols alone.  */
-  if (S_IS_LOCAL (sp))
-    return 0;
-
-  s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (sp);
-  /* Leave debug symbols alone.  */
-  if ((s->n_type & BFD_MACH_O_N_STAB) != 0)
-    return 0;
-
-  base_type = obj_mach_o_type_for_symbol (s);
-  sec = bfd_mach_o_get_mach_o_section (s->symbol.section);  
-  if (sec != NULL)
-    sectype = sec->flags & BFD_MACH_O_SECTION_TYPE_MASK;
-
-  if (s->symbol.section == bfd_und_section_ptr)
-    {
-      /* ??? Do we really gain much from implementing this as well as the
-	 mach-o specific ones?  */
-      if (s->symbol.flags & BSF_WEAK)
-	s->n_desc |= BFD_MACH_O_N_WEAK_REF;
-
-      /* Undefined syms, become extern.  */
-      s->n_type |= BFD_MACH_O_N_EXT;
-      S_SET_EXTERNAL (sp);
-    }
-  else if (s->symbol.section == bfd_com_section_ptr)
-    {
-      /* ... so do comm.  */
-      s->n_type |= BFD_MACH_O_N_EXT;
-      S_SET_EXTERNAL (sp);
-    }
-  else
-    {
-      if ((s->symbol.flags & BSF_WEAK)
-	   && (sectype == BFD_MACH_O_S_COALESCED)
-	   && (s->n_type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT)))
-	s->n_desc |= BFD_MACH_O_N_WEAK_DEF;
-/* ??? we should do this - but then that reveals that the semantics of weak
-       are different from what's supported in mach-o object files.
-      else
-	as_bad (_("'%s' can't be a weak_definition."),
-		s->symbol.name); */
-    }
-
-  if (s->symbol.udata.i == SYM_MACHO_FIELDS_UNSET)
-    {
-      /* Anything here that should be added that is non-standard.  */
-      s->n_desc &= ~BFD_MACH_O_REFERENCE_MASK;
-      s->symbol.udata.i = SYM_MACHO_FIELDS_NOT_VALIDATED;
-    }    
-  else if (s->symbol.udata.i == SYM_MACHO_FIELDS_NOT_VALIDATED)
-    {
-      /* Try to validate any combinations.  */
-      if (s->n_desc & BFD_MACH_O_N_WEAK_DEF)
-	{
-	  if (s->symbol.section == bfd_und_section_ptr)
-	    as_bad (_("'%s' can't be a weak_definition (since it is"
-		      " undefined)"), s->symbol.name);
-	  else if (sectype != BFD_MACH_O_S_COALESCED)
-	    as_bad (_("'%s' can't be a weak_definition (currently only supported"
-		      " in sections of type coalesced)"), s->symbol.name);
-	  else if (! (s->n_type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT)))
-	    as_bad (_("Non-global symbol: '%s' can't be a weak_definition."),
-		    s->symbol.name);
-	}
-
-    }
-  else
-    as_bad (_("internal error: [%s] unexpected code [%lx] in frob symbol"),
-	    s->symbol.name, (unsigned long)s->symbol.udata.i);
-
-  s->n_type &= ~BFD_MACH_O_N_TYPE;
-  s->n_type |= base_type;
-
-  if (s->symbol.flags & BSF_GLOBAL)
-    s->n_type |= BFD_MACH_O_N_EXT;
-
-  /* This cuts both ways - we promote some things to external above.  */
-  if (s->n_type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT))
-    S_SET_EXTERNAL (sp);
-
-  return 0;
-}
-
-/* Support stabs for mach-o.  */
-
-void
-obj_mach_o_process_stab (int what, const char *string,
-			 int type, int other, int desc)
-{
-  symbolS *symbolP;
-  bfd_mach_o_asymbol *s;
-
-  switch (what)
-    {
-      case 'd':
-	symbolP = symbol_new ("", now_seg, frag_now_fix (), frag_now);
-	/* Special stabd NULL name indicator.  */
-	S_SET_NAME (symbolP, NULL);
-	break;
-
-      case 'n':
-      case 's':
-	symbolP = symbol_new (string, undefined_section, (valueT) 0,
-			      &zero_address_frag);
-	pseudo_set (symbolP);
-	break;
-
-      default:
-	as_bad(_("unrecognized stab type '%c'"), (char)what);
-	abort ();
-	break;
-    }
-
-  s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (symbolP);
-  s->n_type = type;
-  s->n_desc = desc;
-  /* For stabd, this will eventually get overwritten by the section number.  */
-  s->n_sect = other;
-
-  /* It's a debug symbol.  */
-  s->symbol.flags |= BSF_DEBUGGING;
-  
-  /* We've set it - so check it, if you can, but don't try to create the
-     flags.  */
-  s->symbol.udata.i = SYM_MACHO_FIELDS_NOT_VALIDATED;
-}
-
-/* This is a place to check for any errors that we can't detect until we know
-   what remains undefined at the end of assembly.  */
-
-static void
-obj_mach_o_check_before_writing (bfd *abfd ATTRIBUTE_UNUSED,
-				 asection *sec,
-				 void *unused ATTRIBUTE_UNUSED)
-{
-  fixS *fixP;
-  struct frchain *frchp;
-  segment_info_type *seginfo = seg_info (sec);
-
-  if (seginfo == NULL)
-    return;
-
-  /* We are not allowed subtractions where either of the operands is
-     undefined.  So look through the frags for any fixes to check.  */
-  for (frchp = seginfo->frchainP; frchp != NULL; frchp = frchp->frch_next)
-   for (fixP = frchp->fix_root; fixP != NULL; fixP = fixP->fx_next)
-    {
-      if (fixP->fx_addsy != NULL
-	  && fixP->fx_subsy != NULL
-	  && (! S_IS_DEFINED (fixP->fx_addsy)
-	      || ! S_IS_DEFINED (fixP->fx_subsy)))
-	{
-	  segT add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy);
-	  segT sub_symbol_segment = S_GET_SEGMENT (fixP->fx_subsy);
-
-	  if (! S_IS_DEFINED (fixP->fx_addsy)
-	      && S_IS_DEFINED (fixP->fx_subsy))
-	    {
-	      as_bad_where (fixP->fx_file, fixP->fx_line,
-		_("`%s' can't be undefined in `%s' - `%s' {%s section}"),
-		S_GET_NAME (fixP->fx_addsy), S_GET_NAME (fixP->fx_addsy),
-		S_GET_NAME (fixP->fx_subsy), segment_name (sub_symbol_segment));
-	    }
-	  else if (! S_IS_DEFINED (fixP->fx_subsy)
-		   && S_IS_DEFINED (fixP->fx_addsy))
-	    {
-	      as_bad_where (fixP->fx_file, fixP->fx_line,
-		_("`%s' can't be undefined in `%s' {%s section} - `%s'"),
-		S_GET_NAME (fixP->fx_subsy), S_GET_NAME (fixP->fx_addsy),
-		segment_name (add_symbol_segment), S_GET_NAME (fixP->fx_subsy));
-	    }
-	  else
-	    {
-	      as_bad_where (fixP->fx_file, fixP->fx_line,
-		_("`%s' and `%s' can't be undefined in `%s' - `%s'"),
-		S_GET_NAME (fixP->fx_addsy), S_GET_NAME (fixP->fx_subsy),
-		S_GET_NAME (fixP->fx_addsy), S_GET_NAME (fixP->fx_subsy));
-	    }
-	}
-    }
-}
-
-/* Do any checks that we can't complete without knowing what's undefined.  */
-void
-obj_mach_o_pre_output_hook (void)
-{
-  bfd_map_over_sections (stdoutput, obj_mach_o_check_before_writing, (char *) 0);
-}
-
-/* Here we count up frags in each subsection (where a sub-section is defined
-   as starting with a non-local symbol).
-   Note that, if there are no non-local symbols in a section, all the frags will
-   be attached as one anonymous subsection.  */
-
-static void
-obj_mach_o_set_subsections (bfd *abfd ATTRIBUTE_UNUSED,
-                            asection *sec,
-                            void *unused ATTRIBUTE_UNUSED)
-{
-  segment_info_type *seginfo = seg_info (sec);
-  symbolS *cur_subsection = NULL;
-  struct obj_mach_o_symbol_data *cur_subsection_data = NULL;
-  fragS *frag;
-  frchainS *chain;
-
-  /* Protect against sections not created by gas.  */
-  if (seginfo == NULL)
-    return;
-
-  /* Attach every frag to a subsection.  */
-  for (chain = seginfo->frchainP; chain != NULL; chain = chain->frch_next)
-    for (frag = chain->frch_root; frag != NULL; frag = frag->fr_next)
-      {
-        if (frag->obj_frag_data.subsection == NULL)
-          frag->obj_frag_data.subsection = cur_subsection;
-        else
-          {
-            cur_subsection = frag->obj_frag_data.subsection;
-            cur_subsection_data = symbol_get_obj (cur_subsection);
-            cur_subsection_data->subsection_size = 0;
-          }
-        if (cur_subsection_data != NULL)
-          {
-            /* Update subsection size.  */
-            cur_subsection_data->subsection_size += frag->fr_fix;
-          }
-      }
-}
-
-/* Handle mach-o subsections-via-symbols counting up frags belonging to each 
-   sub-section.  */
-
-void
-obj_mach_o_pre_relax_hook (void)
-{
-  bfd_map_over_sections (stdoutput, obj_mach_o_set_subsections, (char *) 0);
-}
-
-/* Zerofill and GB Zerofill sections must be sorted to follow all other
-   sections in their segments.
-
-   The native 'as' leaves the sections physically in the order they appear in
-   the source, and adjusts the section VMAs to meet the constraint.
-   
-   We follow this for now - if nothing else, it makes comparison easier.
-
-   An alternative implementation would be to sort the sections as ld requires.
-   It might be advantageous to implement such a scheme in the future (or even
-   to make the style of section ordering user-selectable).  */
-
-typedef struct obj_mach_o_set_vma_data
-{
-  bfd_vma vma;
-  unsigned vma_pass;
-  unsigned zerofill_seen;
-  unsigned gb_zerofill_seen;
-} obj_mach_o_set_vma_data;
-
-/* We do (possibly) three passes through to set the vma, so that:
-
-   zerofill sections get VMAs after all others in their segment
-   GB zerofill get VMAs last.
-   
-   As we go, we notice if we see any Zerofill or GB Zerofill sections, so that
-   we can skip the additional passes if there's nothing to do.  */
-
-static void
-obj_mach_o_set_section_vma (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *v_p)
-{
-  bfd_mach_o_section *ms = bfd_mach_o_get_mach_o_section (sec);
-  unsigned bfd_align = bfd_get_section_alignment (abfd, sec);
-  obj_mach_o_set_vma_data *p = (struct obj_mach_o_set_vma_data *)v_p;
-  unsigned sectype = (ms->flags & BFD_MACH_O_SECTION_TYPE_MASK);
-  unsigned zf;
-
-  zf = 0;
-  if (sectype == BFD_MACH_O_S_ZEROFILL)
-    {
-      zf = 1;
-      p->zerofill_seen = zf;
-    }
-  else if (sectype == BFD_MACH_O_S_GB_ZEROFILL)
-    {
-      zf = 2;
-      p->gb_zerofill_seen = zf;
-    }
-
-  if (p->vma_pass != zf)
-    return;
-
-  /* We know the section size now - so make a vma for the section just
-     based on order.  */
-  ms->size = bfd_get_section_size (sec);
-  
-  /* Make sure that the align agrees, and set to the largest value chosen.  */
-  ms->align = ms->align > bfd_align ? ms->align : bfd_align;
-  bfd_set_section_alignment (abfd, sec, ms->align);
-  
-  p->vma += (1 << ms->align) - 1;
-  p->vma &= ~((1 << ms->align) - 1);
-  ms->addr = p->vma;
-  bfd_set_section_vma (abfd, sec, p->vma);
-  p->vma += ms->size;
-}
-
-/* (potentially) three passes over the sections, setting VMA.  We skip the 
-  {gb}zerofill passes if we didn't see any of the relevant sections.  */
-
-void obj_mach_o_post_relax_hook (void)
-{
-  obj_mach_o_set_vma_data d;
-
-  memset (&d, 0, sizeof (d));
-  
-  bfd_map_over_sections (stdoutput, obj_mach_o_set_section_vma, (char *) &d);
-  if ((d.vma_pass = d.zerofill_seen) != 0)
-    bfd_map_over_sections (stdoutput, obj_mach_o_set_section_vma, (char *) &d);
-  if ((d.vma_pass = d.gb_zerofill_seen) != 0)
-    bfd_map_over_sections (stdoutput, obj_mach_o_set_section_vma, (char *) &d);
-}
-
-static void
-obj_mach_o_set_indirect_symbols (bfd *abfd, asection *sec,
-				 void *xxx ATTRIBUTE_UNUSED)
-{
-  bfd_vma sect_size = bfd_section_size (abfd, sec);
-  bfd_mach_o_section *ms = bfd_mach_o_get_mach_o_section (sec);
-  unsigned lazy = 0;
-
-  /* See if we have any indirect syms to consider.  */
-  if (indirect_syms == NULL)
-    return;
-
-  /* Process indirect symbols.
-     Check for errors, if OK attach them as a flat array to the section
-     for which they are defined.  */
-
-  switch (ms->flags & BFD_MACH_O_SECTION_TYPE_MASK)
-    {
-      case BFD_MACH_O_S_SYMBOL_STUBS:
-      case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
-	lazy = LAZY;
-	/* Fall through.  */
-      case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
-	{
-	  unsigned int nactual = 0;
-	  unsigned int ncalc;
-	  obj_mach_o_indirect_sym *isym;
-	  obj_mach_o_indirect_sym *list = NULL;
-	  obj_mach_o_indirect_sym *list_tail = NULL;
-	  unsigned long eltsiz = 
-			bfd_mach_o_section_get_entry_size (abfd, ms);
-
-	  for (isym = indirect_syms; isym != NULL; isym = isym->next)
-	    {
-	      if (isym->sect == sec)
-		{
-		  nactual++;
-		  if (list == NULL)
-		    list = isym;
-		  else
-		    list_tail->next = isym;
-		  list_tail = isym;
-		}
-	    }
-
-	  /* If none are in this section, stop here.  */
-	  if (nactual == 0)
-	    break;
-
-	  /* If we somehow added indirect symbols to a section with a zero
-	     entry size, we're dead ... */
-	  gas_assert (eltsiz != 0);
-
-	  ncalc = (unsigned int) (sect_size / eltsiz);
-	  if (nactual != ncalc)
-	    as_bad (_("the number of .indirect_symbols defined in section %s"
-		      " does not match the number expected (%d defined, %d"
-		      " expected)"), sec->name, nactual, ncalc);
-	  else
-	    {
-	      unsigned n;
-	      bfd_mach_o_asymbol *sym;
-	      ms->indirect_syms =
-			bfd_zalloc (abfd,
-				    nactual * sizeof (bfd_mach_o_asymbol *));
-
-	      if (ms->indirect_syms == NULL)
-		{
-		  as_fatal (_("internal error: failed to allocate %d indirect"
-			      "symbol pointers"), nactual);
-		}
-	      
-	      for (isym = list, n = 0; isym != NULL; isym = isym->next, n++)
-		{
-		  sym = (bfd_mach_o_asymbol *)symbol_get_bfdsym (isym->sym);
-		  /* Array is init to NULL & NULL signals a local symbol
-		     If the section is lazy-bound, we need to keep the
-		     reference to the symbol, since dyld can override.
-		     
-		     Absolute symbols are handled specially.  */
-		  if (sym->symbol.section == bfd_abs_section_ptr)
-		    ms->indirect_syms[n] = sym;
-		  else if (S_IS_LOCAL (isym->sym) && ! lazy)
-		    ;
-		  else
-		    {
-		      if (sym == NULL)
-		        ;
-		      /* If the symbols is external ...  */
-		      else if (S_IS_EXTERNAL (isym->sym)
-			       || (sym->n_type & BFD_MACH_O_N_EXT)
-			       || ! S_IS_DEFINED (isym->sym)
-			       || lazy)
-			{
-			  sym->n_desc &= ~LAZY;
-			  /* ... it can be lazy, if not defined or hidden.  */
-			  if ((sym->n_type & BFD_MACH_O_N_TYPE) 
-			       == BFD_MACH_O_N_UNDF 
-			      && ! (sym->n_type & BFD_MACH_O_N_PEXT)
-			      && (sym->n_type & BFD_MACH_O_N_EXT))
-			    sym->n_desc |= lazy;
-			  ms->indirect_syms[n] = sym;
-		        }
-		    }
-		}
-	    }
-	}
-	break;
-
-      default:
-	break;
-    }
-}
-
-/* The process of relocation could alter what's externally visible, thus we
-   leave setting the indirect symbols until last.  */
-
-void
-obj_mach_o_frob_file_after_relocs (void)
-{
-  bfd_map_over_sections (stdoutput, obj_mach_o_set_indirect_symbols, (char *) 0);
-}
-
-/* Reverse relocations order to make ld happy.  */
-
-void
-obj_mach_o_reorder_section_relocs (asection *sec, arelent **rels, unsigned int n)
-{
-  unsigned int i;
-  unsigned int max = n / 2;
-
-  for (i = 0; i < max; i++)
-    {
-      arelent *r = rels[i];
-      rels[i] = rels[n - i - 1];
-      rels[n - i - 1] = r;
-    }
-  bfd_set_reloc (stdoutput, sec, rels, n);
-}
-
-/* Relocation rules are different in frame sections.  */
-
-static int
-obj_mach_o_is_frame_section (segT sec)
-{
-  int l;
-  l = strlen (segment_name (sec));
-  if ((l == 9 && strncmp (".eh_frame", segment_name (sec), 9) == 0)
-       || (l == 12 && strncmp (".debug_frame", segment_name (sec), 12) == 0))
-    return 1;
-  return 0;
-}
-
-/* Unless we're in a frame section, we need to force relocs to be generated for
-   local subtractions.  We might eliminate them later (if they are within the
-   same sub-section) but we don't know that at the point that this decision is
-   being made.  */
-
-int
-obj_mach_o_allow_local_subtract (expressionS * left ATTRIBUTE_UNUSED, 
-				 expressionS * right ATTRIBUTE_UNUSED,
-				 segT seg)
-{
-  /* Don't interfere if it's one of the GAS internal sections.  */
-  if (! SEG_NORMAL (seg))
-    return 1;
-
-  /* Allow in frame sections, otherwise emit a reloc.  */
-  return obj_mach_o_is_frame_section (seg);
-}
-
-int
-obj_mach_o_in_different_subsection (symbolS *a, symbolS *b)
-{
-  fragS *fa;
-  fragS *fb;
-
-  if (S_GET_SEGMENT (a) != S_GET_SEGMENT (b)
-      || !S_IS_DEFINED (a)
-      || !S_IS_DEFINED (b))
-    {
-      /* Not in the same segment, or undefined symbol.  */
-      return 1;
-    }
-
-  fa = symbol_get_frag (a);
-  fb = symbol_get_frag (b);
-  if (fa == NULL || fb == NULL)
-    {
-      /* One of the symbols is not in a subsection.  */
-      return 1;
-    }
-
-  return fa->obj_frag_data.subsection != fb->obj_frag_data.subsection;
-}
-
-int
-obj_mach_o_force_reloc_sub_same (fixS *fix, segT seg)
-{
-  if (! SEG_NORMAL (seg))
-    return 1;
-  return obj_mach_o_in_different_subsection (fix->fx_addsy, fix->fx_subsy);
-}
-
-int
-obj_mach_o_force_reloc_sub_local (fixS *fix, segT seg ATTRIBUTE_UNUSED)
-{
-  return obj_mach_o_in_different_subsection (fix->fx_addsy, fix->fx_subsy);
-}
-
-int
-obj_mach_o_force_reloc (fixS *fix)
-{
-  if (generic_force_reloc (fix))
-    return 1;
-
-  /* Force a reloc if the target is not in the same subsection.
-     FIXME: handle (a - b) where a and b belongs to the same subsection ?  */
-  if (fix->fx_addsy != NULL)
-    {
-      symbolS *subsec = fix->fx_frag->obj_frag_data.subsection;
-      symbolS *targ = fix->fx_addsy;
-
-      /* There might be no subsections at all.  */
-      if (subsec == NULL)
-        return 0;
-
-      if (S_GET_SEGMENT (targ) == absolute_section)
-        return 0;
-
-      return obj_mach_o_in_different_subsection (targ, subsec);
-    }
-  return 0;
-}
diff --git a/gas/config/obj-macho.h b/gas/config/obj-macho.h
index 92cb8ef878..d7e9bda61e 100644
--- a/gas/config/obj-macho.h
+++ b/gas/config/obj-macho.h
@@ -1,5 +1,5 @@
 /* Mach-O object file format for gas, the assembler.
-   Copyright 2009, 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2009 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -18,33 +18,13 @@
    Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#ifndef _OBJ_MACH_O_H
-#define _OBJ_MACH_O_H
-
 /* Tag to validate Mach-O object file format processing */
 #define OBJ_MACH_O 1
 
-#include "bfd/mach-o.h"
-
 #include "targ-cpu.h"
 
 #define OUTPUT_FLAVOR bfd_target_mach_o_flavour
 
-/* We want to control how the sections are pre-defined on startup.  */
-#define obj_begin() mach_o_begin ()
-extern void mach_o_begin (void);
-
-/* All our align expressions are power of two.  */
-#define USE_ALIGN_PTWO 1
-
-/* Common symbols can carry alignment information.  */
-#ifndef S_SET_ALIGN
-#define S_SET_ALIGN(S,V) do {\
-  bfd_mach_o_asymbol *___s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (S);\
-  ___s->n_desc = (___s->n_desc & 0xf0ff) | (((V) & 0x0f) << 8);\
-} while (0)
-#endif
-
 extern const pseudo_typeS mach_o_pseudo_table[];
 
 #ifndef obj_pop_insert
@@ -57,63 +37,3 @@ extern const pseudo_typeS mach_o_pseudo_table[];
 #define obj_symbol_new_hook(s)	{;}
 
 #define EMIT_SECTION_SYMBOLS		0
-
-struct obj_mach_o_symbol_data
-{
-  /* If the symbol represents a subsection, this is the size of the subsection.
-     This is used to check whether a local symbol belongs to a subsection.  */
-  valueT subsection_size;
-};
-#define OBJ_SYMFIELD_TYPE struct obj_mach_o_symbol_data
-
-#define obj_frob_colon obj_mach_o_frob_colon
-extern void obj_mach_o_frob_colon (const char *);
-
-/* Called when a label is defined.  Mach-O uses this to create subsections.  */
-#define obj_frob_label obj_mach_o_frob_label
-extern void obj_mach_o_frob_label (symbolS *);
-
-#define obj_frob_symbol(s, punt) punt = obj_mach_o_frob_symbol(s)
-extern int obj_mach_o_frob_symbol (struct symbol *);
-
-#define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)	obj_mach_o_process_stab(W,S,T,O,D)
-extern void obj_mach_o_process_stab (int, const char *,int, int, int);
-
-struct obj_mach_o_frag_data
-{
-  /* Symbol that corresponds to the subsection.  */
-  symbolS *subsection;
-};
-  
-#define OBJ_FRAG_TYPE struct obj_mach_o_frag_data
-
-#define md_pre_output_hook obj_mach_o_pre_output_hook()
-extern void obj_mach_o_pre_output_hook(void);
-
-#define md_pre_relax_hook obj_mach_o_pre_relax_hook()
-extern void obj_mach_o_pre_relax_hook (void);
-
-#define md_post_relax_hook obj_mach_o_post_relax_hook()
-extern void obj_mach_o_post_relax_hook (void);
-
-#define obj_frob_file_after_relocs obj_mach_o_frob_file_after_relocs
-extern void obj_mach_o_frob_file_after_relocs (void);
-
-#define SET_SECTION_RELOCS(sec, relocs, n) \
-  obj_mach_o_reorder_section_relocs (sec, relocs, n)
-extern void obj_mach_o_reorder_section_relocs (asection *, arelent **,
-					       unsigned int);
-
-/* Emit relocs for local subtracts, to cater for subsections-via-symbols.  */
-#define md_allow_local_subtract(LEFT, RIGHT, SECTION) \
- obj_mach_o_allow_local_subtract (LEFT, RIGHT, SECTION)
-extern int obj_mach_o_allow_local_subtract (expressionS *, expressionS *,
-					    segT);
-
-struct fix;
-extern int obj_mach_o_in_different_subsection (symbolS *a, symbolS *b);
-extern int obj_mach_o_force_reloc (struct fix *fix);
-extern int obj_mach_o_force_reloc_sub_same (struct fix *fix, segT seg);
-extern int obj_mach_o_force_reloc_sub_local (struct fix *fix, segT seg);
-
-#endif /* _OBJ_MACH_O_H */
diff --git a/gas/config/rx-defs.h b/gas/config/rx-defs.h
index 5353cb9191..c4648d2190 100644
--- a/gas/config/rx-defs.h
+++ b/gas/config/rx-defs.h
@@ -34,10 +34,7 @@
 #define RX_RELAX_IMM	2
 #define RX_RELAX_DISP	3
 
-extern int rx_pid_register;
-extern int rx_gp_register;
-
-extern int    rx_error (const char *);
+extern int    rx_error (char *);
 extern void   rx_lex_init (char *, char *);
 extern void   rx_base1 (int);
 extern void   rx_base2 (int, int);
diff --git a/gas/config/rx-parse.y b/gas/config/rx-parse.y
index 263e78b936..2d1f85e9f4 100644
--- a/gas/config/rx-parse.y
+++ b/gas/config/rx-parse.y
@@ -1170,8 +1170,6 @@ rx_lex (void)
     return 0;
 
   if (ISALPHA (*rx_lex_start)
-      || (rx_pid_register != -1 && memcmp (rx_lex_start, "%pidreg", 7) == 0)
-      || (rx_gp_register != -1 && memcmp (rx_lex_start, "%gpreg", 6) == 0)
       || (*rx_lex_start == '.' && ISALPHA (rx_lex_start[1])))
     {
       unsigned int i;
@@ -1185,28 +1183,6 @@ rx_lex (void)
       save = *e;
       *e = 0;
 
-      if (strcmp (rx_lex_start, "%pidreg") == 0)
-	{
-	  {
-	    rx_lval.regno = rx_pid_register;
-	    *e = save;
-	    rx_lex_start = e;
-	    rx_last_token = REG;
-	    return REG;
-	  }
-	}
-
-      if (strcmp (rx_lex_start, "%gpreg") == 0)
-	{
-	  {
-	    rx_lval.regno = rx_gp_register;
-	    *e = save;
-	    rx_lex_start = e;
-	    rx_last_token = REG;
-	    return REG;
-	  }
-	}
-
       if (rx_last_token == 0)
 	for (ci = 0; ci < NUM_CONDITION_OPCODES; ci ++)
 	  if (check_condition (condition_opcode_table[ci].string))
@@ -1277,7 +1253,7 @@ rx_lex (void)
 }
 
 int
-rx_error (const char * str)
+rx_error (char * str)
 {
   int len;
 
@@ -1506,13 +1482,6 @@ displacement (expressionS exp, int msize)
 	}
     }
 
-  if (exp.X_op == O_subtract)
-    {
-      exp.X_md = BFD_RELOC_RX_DIFF;
-      O2 (exp);
-      return 2;
-    }
-
   if (exp.X_op != O_constant)
     {
       rx_error (_("displacements must be constants"));
diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index 43bd18b8bd..406fffbf99 100644
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -1394,7 +1394,7 @@ load_expression (int targreg,
 		    gas_assert (insn.nfixups + 1 <= MAX_INSN_FIXUPS);
 		    insn.fixups[insn.nfixups].reloc = BFD_RELOC_ALPHA_NOP;
 		    ensym = symbol_find_or_make (ensymname);
-		    symbol_mark_used (ensym);
+		    ensym->sy_used = 1;
 		    /* The fixup must be the same as the BFD_RELOC_ALPHA_BOH
 		       case in emit_jsrjmp.  See B.4.5.2 of the OpenVMS Linker
 		       Utility Manual.  */
@@ -1426,7 +1426,7 @@ load_expression (int targreg,
 		    gas_assert (insn.nfixups + 1 <= MAX_INSN_FIXUPS);
 		    insn.fixups[insn.nfixups].reloc = BFD_RELOC_ALPHA_LDA;
 		    psym = symbol_find_or_make (psymname);
-		    symbol_mark_used (psym);
+		    psym->sy_used = 1;
 		    insn.fixups[insn.nfixups].exp.X_op = O_subtract;
 		    insn.fixups[insn.nfixups].exp.X_add_symbol = psym;
 		    insn.fixups[insn.nfixups].exp.X_op_symbol = alpha_evax_proc->symbol;
@@ -3602,7 +3602,7 @@ s_alpha_comm (int ignore ATTRIBUTE_UNUSED)
       frag_align (log_align, 0, 0);
       record_alignment (bss_section, log_align);
 
-      symbol_set_frag (symbolP, frag_now);
+      symbolP->sy_frag = frag_now;
       pfrag = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP,
                         size, NULL);
       *pfrag = 0;
@@ -4435,7 +4435,6 @@ static void
 s_alpha_frame (int ignore ATTRIBUTE_UNUSED)
 {
   long val;
-  int ra;
 
   alpha_evax_proc->framereg = tc_get_register (1);
 
@@ -4451,10 +4450,7 @@ s_alpha_frame (int ignore ATTRIBUTE_UNUSED)
 
   alpha_evax_proc->framesize = val;
 
-  ra = tc_get_register (1);
-  if (ra != AXP_REG_RA)
-    as_warn (_("Bad RA (%d) register for .frame"), ra);
-
+  (void) tc_get_register (1);
   SKIP_WHITESPACE ();
   if (*input_line_pointer++ != ',')
     {
@@ -4471,12 +4467,13 @@ s_alpha_frame (int ignore ATTRIBUTE_UNUSED)
 static void
 s_alpha_prologue (int ignore ATTRIBUTE_UNUSED)
 {
+  get_absolute_expression ();
   demand_empty_rest_of_line ();
   alpha_prologue_label = symbol_new
     (FAKE_LABEL_NAME, now_seg, (valueT) frag_now_fix (), frag_now);
 }
 
-/* Parse .pdesc <entry_name>,{null|stack|reg}
+/* Parse .pdesc <entry_name>.
    Insert a procedure descriptor.  */
 
 static void
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 9222aff21e..a6a85c513b 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1,6 +1,6 @@
 /* tc-arm.c -- Assemble for the ARM
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 	Modified by David Taylor (dtaylor@armltd.co.uk)
@@ -32,7 +32,7 @@
 #include "safe-ctype.h"
 #include "subsegs.h"
 #include "obstack.h"
-#include "libiberty.h"
+
 #include "opcode/arm.h"
 
 #ifdef OBJ_ELF
@@ -98,7 +98,7 @@ enum arm_float_abi
 /* Types of processor to assemble for.	*/
 #ifndef CPU_DEFAULT
 /* The code that was here used to select a default CPU depending on compiler
-   pre-defines which were only present when doing native builds, thus
+   pre-defines which were only present when doing native builds, thus 
    changing gas' default behaviour depending upon the build host.
 
    If you have a target that requires a default CPU option then the you
@@ -351,9 +351,6 @@ enum it_instruction_type
    IT_INSN                 /* The IT insn has been parsed.  */
 };
 
-/* The maximum number of operands we need.  */
-#define ARM_IT_MAX_OPERANDS 6
-
 struct arm_it
 {
   const char *	error;
@@ -405,7 +402,7 @@ struct arm_it
     unsigned negative	: 1;  /* Index register was negated.  */
     unsigned shifted	: 1;  /* Shift applied to operation.  */
     unsigned shift_kind : 3;  /* Shift operation (enum shift_kind).  */
-  } operands[ARM_IT_MAX_OPERANDS];
+  } operands[6];
 };
 
 static struct arm_it inst;
@@ -563,7 +560,6 @@ const char * const reg_expected_msgs[] =
 };
 
 /* Some well known registers that we refer to directly elsewhere.  */
-#define REG_R12	12
 #define REG_SP	13
 #define REG_LR	14
 #define REG_PC	15
@@ -2058,7 +2054,6 @@ parse_neon_el_struct_list (char **str, unsigned *pbase,
    arm_reloc_hsh contains no entries, so this function can only
    succeed if there is no () after the word.  Returns -1 on error,
    BFD_RELOC_UNUSED if there wasn't any suffix.	 */
-
 static int
 parse_reloc (char **str)
 {
@@ -3540,7 +3535,6 @@ s_arm_unwind_fnend (int ignored ATTRIBUTE_UNUSED)
   record_alignment (now_seg, 2);
 
   ptr = frag_more (8);
-  memset (ptr, 0, 8);
   where = frag_now_fix () - 8;
 
   /* Self relative offset of the function start.  */
@@ -4890,9 +4884,10 @@ parse_shifter_operand (char **str, int i)
 	  return FAIL;
 	}
 
-      /* Encode as specified.  */
-      inst.operands[i].imm = inst.reloc.exp.X_add_number | value << 7;
-      return SUCCESS;
+      /* Convert to decoded value.  md_apply_fix will put it back.  */
+      inst.reloc.exp.X_add_number
+	= (((inst.reloc.exp.X_add_number << (32 - value))
+	    | (inst.reloc.exp.X_add_number >> value)) & 0xffffffff);
     }
 
   inst.reloc.type = BFD_RELOC_ARM_IMMEDIATE;
@@ -5064,7 +5059,7 @@ parse_shifter_operand_group_reloc (char **str, int i)
 
 /* Parse a Neon alignment expression.  Information is written to
    inst.operands[i].  We assume the initial ':' has been skipped.
-
+   
    align	.imm = align << 8, .immisalign=1, .preind=0  */
 static parse_operand_result
 parse_neon_alignment (char **str, int i)
@@ -5177,7 +5172,7 @@ parse_address_main (char **str, int i, int group_relocations,
 	     code before we get to see it here. This may be subject to
 	     change.  */
 	  parse_operand_result result = parse_neon_alignment (&p, i);
-
+	  
 	  if (result != PARSE_OPERAND_SUCCESS)
 	    return result;
 	}
@@ -5265,7 +5260,7 @@ parse_address_main (char **str, int i, int group_relocations,
       /* FIXME: '@' should be used here, but it's filtered out by generic code
 	 before we get to see it here. This may be subject to change.  */
       parse_operand_result result = parse_neon_alignment (&p, i);
-
+      
       if (result != PARSE_OPERAND_SUCCESS)
 	return result;
     }
@@ -5448,7 +5443,7 @@ parse_psr (char **str, bfd_boolean lhs)
     {
       if (m_profile)
 	goto unsupported_psr;
-
+	
       psr_field = SPSR_BIT;
     }
   else if (strncasecmp (p, "CPSR", 4) == 0)
@@ -5521,7 +5516,7 @@ check_suffix:
 	  unsigned int nzcvq_bits = 0;
 	  unsigned int g_bit = 0;
 	  char *bit;
-
+	  
 	  for (bit = start; bit != p; bit++)
 	    {
 	      switch (TOLOWER (*bit))
@@ -5541,24 +5536,24 @@ check_suffix:
 		case 'v':
 		  nzcvq_bits |= (nzcvq_bits & 0x08) ? 0x20 : 0x08;
 		  break;
-
+		
 		case 'q':
 		  nzcvq_bits |= (nzcvq_bits & 0x10) ? 0x20 : 0x10;
 		  break;
-
+		
 		case 'g':
 		  g_bit |= (g_bit & 0x1) ? 0x2 : 0x1;
 		  break;
-
+		
 		default:
 		  inst.error = _("unexpected bit specified after APSR");
 		  return FAIL;
 		}
 	    }
-
+	  
 	  if (nzcvq_bits == 0x1f)
 	    psr_field |= PSR_f;
-
+	  
 	  if (g_bit == 0x1)
 	    {
 	      if (!ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v6_dsp))
@@ -5570,7 +5565,7 @@ check_suffix:
 
 	      psr_field |= PSR_s;
 	    }
-
+	  
 	  if ((nzcvq_bits & 0x20) != 0
 	      || (nzcvq_bits != 0x1f && nzcvq_bits != 0)
 	      || (g_bit & 0x2) != 0)
@@ -5936,7 +5931,7 @@ parse_neon_mov (char **str, int *which_operand)
 
               inst.operands[i].reg = val;
               inst.operands[i].isreg = 1;
-              inst.operands[i].present = 1;
+              inst.operands[i++].present = 1;
             }
         }
       else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS)
@@ -6026,7 +6021,7 @@ parse_neon_mov (char **str, int *which_operand)
           inst.operands[i].isvec = 1;
           inst.operands[i].issingle = 1;
           inst.operands[i].vectype = optype;
-          inst.operands[i].present = 1;
+          inst.operands[i++].present = 1;
         }
     }
   else
@@ -6063,7 +6058,7 @@ enum operand_parse_code
   OP_RRnpc,	/* ARM register, not r15 */
   OP_RRnpcsp,	/* ARM register, neither r15 nor r13 (a.k.a. 'BadReg') */
   OP_RRnpcb,	/* ARM register, not r15, in square brackets */
-  OP_RRnpctw,	/* ARM register, not r15 in Thumb-state or with writeback,
+  OP_RRnpctw,	/* ARM register, not r15 in Thumb-state or with writeback, 
 		   optional trailing ! */
   OP_RRw,	/* ARM register, not r15, optional trailing ! */
   OP_RCP,	/* Coprocessor number */
@@ -6620,7 +6615,7 @@ parse_operands (char *str, const unsigned int *pattern, bfd_boolean thumb)
             goto failure;
 	  break;
 
-	case OP_wPSR:
+	case OP_wPSR:	 
 	case OP_rPSR:
 	  po_reg_or_goto (REG_TYPE_RNB, try_psr);
 	  if (!ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_virt))
@@ -6780,8 +6775,8 @@ parse_operands (char *str, const unsigned int *pattern, bfd_boolean thumb)
 	  break;
 
 	case OP_RRnpctw:
-	  if (inst.operands[i].isreg
-	      && inst.operands[i].reg == REG_PC
+	  if (inst.operands[i].isreg 
+	      && inst.operands[i].reg == REG_PC 
 	      && (inst.operands[i].writeback || thumb))
 	    inst.error = BAD_PC;
 	  break;
@@ -7023,11 +7018,7 @@ encode_arm_shifter_operand (int i)
       encode_arm_shift (i);
     }
   else
-    {
-      inst.instruction |= INST_IMMEDIATE;
-      if (inst.reloc.type != BFD_RELOC_ARM_IMMEDIATE)
-	inst.instruction |= inst.operands[i].imm;
-    }
+    inst.instruction |= INST_IMMEDIATE;
 }
 
 /* Subroutine of encode_arm_addr_mode_2 and encode_arm_addr_mode_3.  */
@@ -7924,18 +7915,6 @@ do_ldrexd (void)
   inst.instruction |= inst.operands[2].reg << 16;
 }
 
-/* In both ARM and thumb state 'ldr pc, #imm'  with an immediate
-   which is not a multiple of four is UNPREDICTABLE.  */
-static void
-check_ldr_r15_aligned (void)
-{
-  constraint (!(inst.operands[1].immisreg)
-	      && (inst.operands[0].reg == REG_PC
-	      && inst.operands[1].reg == REG_PC
-	      && (inst.reloc.exp.X_add_number & 0x3)),
-	      _("ldr to register 15 must be 4-byte alligned"));
-}
-
 static void
 do_ldst (void)
 {
@@ -7944,7 +7923,6 @@ do_ldst (void)
     if (move_or_literal_pool (0, /*thumb_p=*/FALSE, /*mode_3=*/FALSE))
       return;
   encode_arm_addr_mode_2 (1, /*is_t=*/FALSE);
-  check_ldr_r15_aligned ();
 }
 
 static void
@@ -8088,7 +8066,7 @@ static void
 do_vmrs (void)
 {
   unsigned Rt = inst.operands[0].reg;
-
+  
   if (thumb_mode && inst.operands[0].reg == REG_SP)
     {
       inst.error = BAD_SP;
@@ -8102,18 +8080,8 @@ do_vmrs (void)
       return;
     }
 
-  switch (inst.operands[1].reg)
-    {
-    case 0: /* FPSID */
-    case 1: /* FPSCR */
-    case 6: /* MVFR1 */
-    case 7: /* MVFR0 */
-    case 8: /* FPEXC */
-      inst.instruction |= (inst.operands[1].reg << 16);
-      break;
-    default:
-      first_error (_("operand 1 must be a VFP extension System Register"));
-    }
+  if (inst.operands[1].reg != 1)
+    first_error (_("operand 1 must be FPSCR"));
 
   inst.instruction |= (Rt << 12);
 }
@@ -8122,7 +8090,7 @@ static void
 do_vmsr (void)
 {
   unsigned Rt = inst.operands[1].reg;
-
+  
   if (thumb_mode)
     reject_bad_reg (Rt);
   else if (Rt == REG_PC)
@@ -8131,16 +8099,8 @@ do_vmsr (void)
       return;
     }
 
-  switch (inst.operands[0].reg)
-    {
-    case 0: /* FPSID  */
-    case 1: /* FPSCR  */
-    case 8: /* FPEXC */
-      inst.instruction |= (inst.operands[0].reg << 16);
-      break;
-    default:
-      first_error (_("operand 0 must be FPSID or FPSCR pr FPEXC"));
-    }
+  if (inst.operands[0].reg != 1)
+    first_error (_("operand 0 must be FPSCR"));
 
   inst.instruction |= (Rt << 12);
 }
@@ -8830,14 +8790,14 @@ vfp_conv (int srcsize)
 {
   int immbits = srcsize - inst.operands[1].imm;
 
-  if (srcsize == 16 && !(immbits >= 0 && immbits <= srcsize))
-    {
+  if (srcsize == 16 && !(immbits >= 0 && immbits <= srcsize)) 
+    {  
       /* If srcsize is 16, inst.operands[1].imm must be in the range 0-16.
          i.e. immbits must be in range 0 - 16.  */
       inst.error = _("immediate value out of range, expected range [0, 16]");
       return;
     }
-  else if (srcsize == 32 && !(immbits >= 0 && immbits < srcsize))
+  else if (srcsize == 32 && !(immbits >= 0 && immbits < srcsize)) 
     {
       /* If srcsize is 32, inst.operands[1].imm must be in the range 1-32.
          i.e. immbits must be in range 0 - 31.  */
@@ -10064,7 +10024,7 @@ do_t_branch23 (void)
 {
   set_it_insn_type_last ();
   encode_branch (BFD_RELOC_THUMB_PCREL_BRANCH23);
-
+  
   /* md_apply_fix blows up with 'bl foo(PLT)' where foo is defined in
      this file.  We used to simply ignore the PLT reloc type here --
      the branch encoding is now needed to deal with TLSCALL relocs.
@@ -10371,11 +10331,11 @@ do_t_ldmstm (void)
 		  /* First, record an error for Case 3.  */
 		  if (inst.operands[1].imm & mask
 		      && inst.operands[0].writeback)
-		    inst.error =
+    		    inst.error = 
 			_("having the base register in the register list when "
 			  "using write back is UNPREDICTABLE");
-
-		  opcode = (inst.instruction == T_MNEM_stmia ? T_MNEM_str
+		    
+		  opcode = (inst.instruction == T_MNEM_stmia ? T_MNEM_str 
 							     : T_MNEM_ldr);
 		  inst.instruction = THUMB_OP16 (opcode);
 		  inst.instruction |= inst.operands[0].reg << 3;
@@ -10387,7 +10347,7 @@ do_t_ldmstm (void)
 	    {
 	      if (inst.operands[0].writeback)
 		{
-		  inst.instruction =
+		  inst.instruction = 
 			THUMB_OP16 (inst.instruction == T_MNEM_stmia
 			            ? T_MNEM_push : T_MNEM_pop);
 		  inst.instruction |= inst.operands[1].imm;
@@ -10395,7 +10355,7 @@ do_t_ldmstm (void)
 		}
 	      else if ((inst.operands[1].imm & (inst.operands[1].imm-1)) == 0)
 		{
-		  inst.instruction =
+		  inst.instruction = 
 			THUMB_OP16 (inst.instruction == T_MNEM_stmia
 			            ? T_MNEM_str_sp : T_MNEM_ldr_sp);
 		  inst.instruction |= ((ffs (inst.operands[1].imm)-1) << 8);
@@ -10573,17 +10533,13 @@ do_t_ldst (void)
 	}
 
       /* Do some validations regarding addressing modes.  */
-      if (inst.operands[1].immisreg)
+      if (inst.operands[1].immisreg && opcode != T_MNEM_ldr
+	  && opcode != T_MNEM_str)
 	reject_bad_reg (inst.operands[1].imm);
 
-      constraint (inst.operands[1].writeback == 1
-		  && inst.operands[0].reg == inst.operands[1].reg,
-		  BAD_OVERLAP);
-
       inst.instruction = THUMB_OP32 (opcode);
       inst.instruction |= inst.operands[0].reg << 12;
       encode_thumb32_addr_mode (1, /*is_t=*/FALSE, /*is_d=*/FALSE);
-      check_ldr_r15_aligned ();
       return;
     }
 
@@ -10674,16 +10630,7 @@ do_t_ldstd (void)
       inst.operands[1].reg = inst.operands[0].reg + 1;
       constraint (inst.operands[0].reg == REG_LR,
 		  _("r14 not allowed here"));
-      constraint (inst.operands[0].reg == REG_R12,
-                  _("r12 not allowed here"));
     }
-
-  if (inst.operands[2].writeback
-      && (inst.operands[0].reg == inst.operands[2].reg
-      || inst.operands[1].reg == inst.operands[2].reg))
-    as_warn (_("base register written back, and overlaps "
-               "one of transfer registers"));
-
   inst.instruction |= inst.operands[0].reg << 12;
   inst.instruction |= inst.operands[1].reg << 8;
   encode_thumb32_addr_mode (2, /*is_t=*/FALSE, /*is_d=*/TRUE);
@@ -10945,17 +10892,6 @@ do_t_mov_cmp (void)
 	switch (inst.instruction)
 	  {
 	  case T_MNEM_mov:
-	    /* In v4t or v5t a move of two lowregs produces unpredictable
-	       results. Don't allow this.  */
-	    if (low_regs)
-	      {
-		constraint (!ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_v6),
-			    "MOV Rd, Rs with two low registers is not "
-			    "permitted on this architecture");
-		ARM_MERGE_FEATURE_SETS (thumb_arch_used, thumb_arch_used,
-					arm_ext_v6);
-	      }
-
 	    inst.instruction = T_OPCODE_MOV_HR;
 	    inst.instruction |= (Rn & 0x8) << 4;
 	    inst.instruction |= (Rn & 0x7);
@@ -12447,9 +12383,7 @@ neon_select_shape (enum neon_shape shape, ...)
 	  if (!matches)
 	    break;
         }
-      if (matches && (j >= ARM_IT_MAX_OPERANDS || !inst.operands[j].present))
-	/* We've matched all the entries in the shape table, and we don't
-	   have any left over operands which have not been matched.  */
+      if (matches)
         break;
     }
 
@@ -15274,7 +15208,7 @@ do_neon_ldr_str (void)
 
   /* Use of PC in vstr in ARM mode is deprecated in ARMv7.
      And is UNPREDICTABLE in thumb mode.  */
-  if (!is_ldr
+  if (!is_ldr 
       && inst.operands[1].reg == REG_PC
       && ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v7))
     {
@@ -16731,7 +16665,7 @@ static const struct reg_entry reg_names[] =
   SPLRBANK(12,MON,RNB), SPLRBANK(12,mon,RNB),
   REGDEF(elr_hyp,768|(14<<16),RNB), REGDEF(ELR_hyp,768|(14<<16),RNB),
   REGDEF(sp_hyp,768|(15<<16),RNB), REGDEF(SP_hyp,768|(15<<16),RNB),
-  REGDEF(spsr_hyp,768|(14<<16)|SPSR_BIT,RNB),
+  REGDEF(spsr_hyp,768|(14<<16)|SPSR_BIT,RNB), 
   REGDEF(SPSR_hyp,768|(14<<16)|SPSR_BIT,RNB),
 
   /* FPA registers.  */
@@ -18165,8 +18099,8 @@ static const struct asm_opcode insns[] =
  cCE("fmrs",	e100a10, 2, (RR, RVS),	      vfp_reg_from_sp),
  cCE("fmsr",	e000a10, 2, (RVS, RR),	      vfp_sp_from_reg),
  cCE("fmstat",	ef1fa10, 0, (),		      noargs),
- cCE("vmrs",	ef00a10, 2, (APSR_RR, RVC),   vmrs),
- cCE("vmsr",	ee00a10, 2, (RVC, RR),        vmsr),
+ cCE("vmrs",	ef10a10, 2, (APSR_RR, RVC),   vmrs),
+ cCE("vmsr",	ee10a10, 2, (RVC, RR),        vmsr),
  cCE("fsitos",	eb80ac0, 2, (RVS, RVS),	      vfp_sp_monadic),
  cCE("fuitos",	eb80a40, 2, (RVS, RVS),	      vfp_sp_monadic),
  cCE("ftosis",	ebd0a40, 2, (RVS, RVS),	      vfp_sp_monadic),
@@ -19016,26 +18950,6 @@ md_chars_to_number (char * buf, int n)
 
 /* MD interface: Sections.  */
 
-/* Calculate the maximum variable size (i.e., excluding fr_fix)
-   that an rs_machine_dependent frag may reach.  */
-
-unsigned int
-arm_frag_max_var (fragS *fragp)
-{
-  /* We only use rs_machine_dependent for variable-size Thumb instructions,
-     which are either THUMB_SIZE (2) or INSN_SIZE (4).
-
-     Note that we generate relaxable instructions even for cases that don't
-     really need it, like an immediate that's a trivial constant.  So we're
-     overestimating the instruction size for some of those cases.  Rather
-     than putting more intelligence here, it would probably be better to
-     avoid generating a relaxation frag in the first place when it can be
-     determined up front that a short instruction will suffice.  */
-
-  gas_assert (fragp->fr_type == rs_machine_dependent);
-  return INSN_SIZE;
-}
-
 /* Estimate the size of a frag before relaxing.  Assume everything fits in
    2 bytes.  */
 
@@ -19607,7 +19521,7 @@ arm_frag_align_code (int n, int max)
     {
       char err_msg[128];
 
-      sprintf (err_msg,
+      sprintf (err_msg, 
         _("alignments greater than %d bytes not supported in .text sections."),
         MAX_MEM_FOR_RS_ALIGN_CODE + 1);
       as_fatal ("%s", err_msg);
@@ -19965,12 +19879,8 @@ create_unwind_entry (int have_data)
 	size = unwind.opcode_count - 2;
     }
   else
-    {
-      gas_assert (unwind.personality_index == -1);
-
-      /* An extra byte is required for the opcode count.	*/
-      size = unwind.opcode_count + 1;
-    }
+    /* An extra byte is required for the opcode count.	*/
+    size = unwind.opcode_count + 1;
 
   size = (size + 3) >> 2;
   if (size > 0xff)
@@ -19982,8 +19892,6 @@ create_unwind_entry (int have_data)
 
   /* Allocate the table entry.	*/
   ptr = frag_more ((size << 2) + 4);
-  /* PR 13449: Zero the table entries in case some of them are not used.  */
-  memset (ptr, 0, (size << 2) + 4);
   where = frag_now_fix () - ((size << 2) + 4);
 
   switch (unwind.personality_index)
@@ -19998,7 +19906,7 @@ create_unwind_entry (int have_data)
       ptr += 4;
 
       /* Set the first byte to the number of additional words.	*/
-      data = size > 0 ? size - 1 : 0;
+      data = size - 1;
       n = 3;
       break;
 
@@ -20512,7 +20420,7 @@ encode_thumb2_b_bl_offset (char * buf, offsetT value)
   I1 = (value >> 23) & 0x01;
   I2 = (value >> 22) & 0x01;
   hi = (value >> 12) & 0x3ff;
-  lo = (value >> 1) & 0x7ff;
+  lo = (value >> 1) & 0x7ff; 
   newval   = md_chars_to_number (buf, THUMB_SIZE);
   newval2  = md_chars_to_number (buf + THUMB_SIZE, THUMB_SIZE);
   newval  |= (S << 10) | hi;
@@ -20629,7 +20537,7 @@ md_apply_fix (fixS *	fixP,
 		break;
 	      }
 	  }
-
+	
 	newimm = encode_arm_immediate (value);
 	temp = md_chars_to_number (buf, INSN_SIZE);
 
@@ -22492,16 +22400,8 @@ md_begin (void)
     hash_insert (arm_barrier_opt_hsh, barrier_opt_names[i].template_name,
 		 (void *) (barrier_opt_names + i));
 #ifdef OBJ_ELF
-  for (i = 0; i < ARRAY_SIZE (reloc_names); i++)
-    {
-      struct reloc_entry * entry = reloc_names + i;
-
-      if (arm_is_eabi() && entry->reloc == BFD_RELOC_ARM_PLT32)
-	/* This makes encode_branch() use the EABI versions of this relocation.  */
-	entry->reloc = BFD_RELOC_UNUSED;
-
-      hash_insert (arm_reloc_hsh, entry->name, (void *) entry);
-    }
+  for (i = 0; i < sizeof (reloc_names) / sizeof (struct reloc_entry); i++)
+    hash_insert (arm_reloc_hsh, reloc_names[i].name, (void *) (reloc_names + i));
 #endif
 
   set_constant_flonums ();
@@ -22934,7 +22834,6 @@ const struct arm_legacy_option_table arm_legacy_opts[] =
 struct arm_cpu_option_table
 {
   char *name;
-  size_t name_len;
   const arm_feature_set	value;
   /* For some CPUs we assume an FPU unless the user explicitly sets
      -mfpu=...	*/
@@ -22946,226 +22845,211 @@ struct arm_cpu_option_table
 
 /* This list should, at a minimum, contain all the cpu names
    recognized by GCC.  */
-#define ARM_CPU_OPT(N, V, DF, CN) { N, sizeof (N) - 1, V, DF, CN }
 static const struct arm_cpu_option_table arm_cpus[] =
 {
-  ARM_CPU_OPT ("all",		ARM_ANY,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm1",		ARM_ARCH_V1,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm2",		ARM_ARCH_V2,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm250",	ARM_ARCH_V2S,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm3",		ARM_ARCH_V2S,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm6",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm60",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm600",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm610",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm620",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7m",		ARM_ARCH_V3M,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7d",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7dm",	ARM_ARCH_V3M,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7di",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7dmi",	ARM_ARCH_V3M,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm70",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm700",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm700i",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm710",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm710t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm720",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm720t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm740t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm710c",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7100",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7500",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7500fe",	ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7tdmi",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm7tdmi-s",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm8",		ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm810",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("strongarm",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("strongarm1",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("strongarm110",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("strongarm1100",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("strongarm1110",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm9",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm920",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    "ARM920T"),
-  ARM_CPU_OPT ("arm920t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm922t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm940t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL),
-  ARM_CPU_OPT ("arm9tdmi",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,	  NULL),
-  ARM_CPU_OPT ("fa526",		ARM_ARCH_V4,	 FPU_ARCH_FPA,	  NULL),
-  ARM_CPU_OPT ("fa626",		ARM_ARCH_V4,	 FPU_ARCH_FPA,	  NULL),
+  {"all",		ARM_ANY,	 FPU_ARCH_FPA,    NULL},
+  {"arm1",		ARM_ARCH_V1,	 FPU_ARCH_FPA,    NULL},
+  {"arm2",		ARM_ARCH_V2,	 FPU_ARCH_FPA,    NULL},
+  {"arm250",		ARM_ARCH_V2S,	 FPU_ARCH_FPA,    NULL},
+  {"arm3",		ARM_ARCH_V2S,	 FPU_ARCH_FPA,    NULL},
+  {"arm6",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm60",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm600",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm610",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm620",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7m",		ARM_ARCH_V3M,	 FPU_ARCH_FPA,    NULL},
+  {"arm7d",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7dm",		ARM_ARCH_V3M,	 FPU_ARCH_FPA,    NULL},
+  {"arm7di",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7dmi",		ARM_ARCH_V3M,	 FPU_ARCH_FPA,    NULL},
+  {"arm70",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm700",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm700i",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm710",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm710t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm720",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm720t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm740t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm710c",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7100",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7500",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7500fe",		ARM_ARCH_V3,	 FPU_ARCH_FPA,    NULL},
+  {"arm7t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm7tdmi",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm7tdmi-s",	ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm8",		ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"arm810",		ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"strongarm",		ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"strongarm1",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"strongarm110",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"strongarm1100",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"strongarm1110",	ARM_ARCH_V4,	 FPU_ARCH_FPA,    NULL},
+  {"arm9",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm920",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    "ARM920T"},
+  {"arm920t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm922t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm940t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
+  {"arm9tdmi",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,	  NULL},
+  {"fa526",		ARM_ARCH_V4,	 FPU_ARCH_FPA,	  NULL},
+  {"fa626",		ARM_ARCH_V4,	 FPU_ARCH_FPA,	  NULL},
   /* For V5 or later processors we default to using VFP; but the user
      should really set the FPU type explicitly.	 */
-  ARM_CPU_OPT ("arm9e-r0",	ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm9e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm926ej",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, "ARM926EJ-S"),
-  ARM_CPU_OPT ("arm926ejs",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, "ARM926EJ-S"),
-  ARM_CPU_OPT ("arm926ej-s",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm946e-r0",	ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm946e",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, "ARM946E-S"),
-  ARM_CPU_OPT ("arm946e-s",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm966e-r0",	ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm966e",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, "ARM966E-S"),
-  ARM_CPU_OPT ("arm966e-s",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm968e-s",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm10t",	ARM_ARCH_V5T,	 FPU_ARCH_VFP_V1, NULL),
-  ARM_CPU_OPT ("arm10tdmi",	ARM_ARCH_V5T,	 FPU_ARCH_VFP_V1, NULL),
-  ARM_CPU_OPT ("arm10e",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm1020",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, "ARM1020E"),
-  ARM_CPU_OPT ("arm1020t",	ARM_ARCH_V5T,	 FPU_ARCH_VFP_V1, NULL),
-  ARM_CPU_OPT ("arm1020e",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm1022e",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm1026ejs",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2,
-								 "ARM1026EJ-S"),
-  ARM_CPU_OPT ("arm1026ej-s",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("fa606te",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("fa616te",	ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("fa626te",	ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("fmp626",	ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("fa726te",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm1136js",	ARM_ARCH_V6,	 FPU_NONE,	  "ARM1136J-S"),
-  ARM_CPU_OPT ("arm1136j-s",	ARM_ARCH_V6,	 FPU_NONE,	  NULL),
-  ARM_CPU_OPT ("arm1136jfs",	ARM_ARCH_V6,	 FPU_ARCH_VFP_V2,
-								 "ARM1136JF-S"),
-  ARM_CPU_OPT ("arm1136jf-s",	ARM_ARCH_V6,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("mpcore",	ARM_ARCH_V6K,	 FPU_ARCH_VFP_V2, "MPCore"),
-  ARM_CPU_OPT ("mpcorenovfp",	ARM_ARCH_V6K,	 FPU_NONE,	  "MPCore"),
-  ARM_CPU_OPT ("arm1156t2-s",	ARM_ARCH_V6T2,	 FPU_NONE,	  NULL),
-  ARM_CPU_OPT ("arm1156t2f-s",	ARM_ARCH_V6T2,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("arm1176jz-s",	ARM_ARCH_V6ZK,	 FPU_NONE,	  NULL),
-  ARM_CPU_OPT ("arm1176jzf-s",	ARM_ARCH_V6ZK,	 FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("cortex-a5",	ARM_ARCH_V7A_MP_SEC,
-						 FPU_NONE,	  "Cortex-A5"),
-  ARM_CPU_OPT ("cortex-a7",	ARM_ARCH_V7A_IDIV_MP_SEC_VIRT,
-						 FPU_ARCH_NEON_VFP_V4,
-								  "Cortex-A7"),
-  ARM_CPU_OPT ("cortex-a8",	ARM_ARCH_V7A_SEC,
-						 ARM_FEATURE (0, FPU_VFP_V3
+  {"arm9e-r0",		ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL},
+  {"arm9e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm926ej",		ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, "ARM926EJ-S"},
+  {"arm926ejs",		ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, "ARM926EJ-S"},
+  {"arm926ej-s",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm946e-r0",	ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL},
+  {"arm946e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, "ARM946E-S"},
+  {"arm946e-s",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm966e-r0",	ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL},
+  {"arm966e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, "ARM966E-S"},
+  {"arm966e-s",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm968e-s",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm10t",		ARM_ARCH_V5T,	 FPU_ARCH_VFP_V1, NULL},
+  {"arm10tdmi",		ARM_ARCH_V5T,	 FPU_ARCH_VFP_V1, NULL},
+  {"arm10e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm1020",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, "ARM1020E"},
+  {"arm1020t",		ARM_ARCH_V5T,	 FPU_ARCH_VFP_V1, NULL},
+  {"arm1020e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm1022e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm1026ejs",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, "ARM1026EJ-S"},
+  {"arm1026ej-s",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, NULL},
+  {"fa606te",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"fa616te",		ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2, NULL},
+  {"fa626te",		ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2, NULL},
+  {"fmp626",		ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2, NULL},
+  {"fa726te",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm1136js",		ARM_ARCH_V6,	 FPU_NONE,	  "ARM1136J-S"},
+  {"arm1136j-s",	ARM_ARCH_V6,	 FPU_NONE,	  NULL},
+  {"arm1136jfs",	ARM_ARCH_V6,	 FPU_ARCH_VFP_V2, "ARM1136JF-S"},
+  {"arm1136jf-s",	ARM_ARCH_V6,	 FPU_ARCH_VFP_V2, NULL},
+  {"mpcore",		ARM_ARCH_V6K,	 FPU_ARCH_VFP_V2, "MPCore"},
+  {"mpcorenovfp",	ARM_ARCH_V6K,	 FPU_NONE,	  "MPCore"},
+  {"arm1156t2-s",	ARM_ARCH_V6T2,	 FPU_NONE,	  NULL},
+  {"arm1156t2f-s",	ARM_ARCH_V6T2,	 FPU_ARCH_VFP_V2, NULL},
+  {"arm1176jz-s",	ARM_ARCH_V6ZK,	 FPU_NONE,	  NULL},
+  {"arm1176jzf-s",	ARM_ARCH_V6ZK,	 FPU_ARCH_VFP_V2, NULL},
+  {"cortex-a5",		ARM_ARCH_V7A_MP_SEC, 
+					 FPU_NONE,	  "Cortex-A5"},
+  {"cortex-a7",		ARM_ARCH_V7A_IDIV_MP_SEC_VIRT,
+    					 FPU_ARCH_NEON_VFP_V4,
+					 		  "Cortex-A7"},
+  {"cortex-a8",		ARM_ARCH_V7A_SEC,
+					 ARM_FEATURE (0, FPU_VFP_V3
                                                         | FPU_NEON_EXT_V1),
-								  "Cortex-A8"),
-  ARM_CPU_OPT ("cortex-a9",	ARM_ARCH_V7A_MP_SEC,
-						 ARM_FEATURE (0, FPU_VFP_V3
+                                                          "Cortex-A8"},
+  {"cortex-a9",		ARM_ARCH_V7A_MP_SEC,
+					 ARM_FEATURE (0, FPU_VFP_V3
                                                         | FPU_NEON_EXT_V1),
-								  "Cortex-A9"),
-  ARM_CPU_OPT ("cortex-a15",	ARM_ARCH_V7A_IDIV_MP_SEC_VIRT,
-						 FPU_ARCH_NEON_VFP_V4,
-								  "Cortex-A15"),
-  ARM_CPU_OPT ("cortex-r4",	ARM_ARCH_V7R,	 FPU_NONE,	  "Cortex-R4"),
-  ARM_CPU_OPT ("cortex-r4f",	ARM_ARCH_V7R,	 FPU_ARCH_VFP_V3D16,
-								  "Cortex-R4F"),
-  ARM_CPU_OPT ("cortex-r5",	ARM_ARCH_V7R_IDIV,
-						 FPU_NONE,	  "Cortex-R5"),
-  ARM_CPU_OPT ("cortex-m4",	ARM_ARCH_V7EM,	 FPU_NONE,	  "Cortex-M4"),
-  ARM_CPU_OPT ("cortex-m3",	ARM_ARCH_V7M,	 FPU_NONE,	  "Cortex-M3"),
-  ARM_CPU_OPT ("cortex-m1",	ARM_ARCH_V6SM,	 FPU_NONE,	  "Cortex-M1"),
-  ARM_CPU_OPT ("cortex-m0",	ARM_ARCH_V6SM,	 FPU_NONE,	  "Cortex-M0"),
+                                                          "Cortex-A9"},
+  {"cortex-a15",	ARM_ARCH_V7A_IDIV_MP_SEC_VIRT,
+					 FPU_ARCH_NEON_VFP_V4,
+                                                          "Cortex-A15"},
+  {"cortex-r4",		ARM_ARCH_V7R,	 FPU_NONE,	  "Cortex-R4"},
+  {"cortex-r4f",	ARM_ARCH_V7R,	 FPU_ARCH_VFP_V3D16,
+  							  "Cortex-R4F"},
+  {"cortex-r5",		ARM_ARCH_V7R_IDIV,
+					 FPU_NONE,	  "Cortex-R5"},
+  {"cortex-m4",		ARM_ARCH_V7EM,	 FPU_NONE,	  "Cortex-M4"},
+  {"cortex-m3",		ARM_ARCH_V7M,	 FPU_NONE,	  "Cortex-M3"},
+  {"cortex-m1",		ARM_ARCH_V6SM,	 FPU_NONE,	  "Cortex-M1"},
+  {"cortex-m0",		ARM_ARCH_V6SM,	 FPU_NONE,	  "Cortex-M0"},
   /* ??? XSCALE is really an architecture.  */
-  ARM_CPU_OPT ("xscale",	ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2, NULL),
+  {"xscale",		ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2, NULL},
   /* ??? iwmmxt is not a processor.  */
-  ARM_CPU_OPT ("iwmmxt",	ARM_ARCH_IWMMXT, FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("iwmmxt2",	ARM_ARCH_IWMMXT2,FPU_ARCH_VFP_V2, NULL),
-  ARM_CPU_OPT ("i80200",	ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2, NULL),
+  {"iwmmxt",		ARM_ARCH_IWMMXT, FPU_ARCH_VFP_V2, NULL},
+  {"iwmmxt2",		ARM_ARCH_IWMMXT2,FPU_ARCH_VFP_V2, NULL},
+  {"i80200",		ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2, NULL},
   /* Maverick */
-  ARM_CPU_OPT ("ep9312",	ARM_FEATURE (ARM_AEXT_V4T, ARM_CEXT_MAVERICK),
-						 FPU_ARCH_MAVERICK,
-								  "ARM920T"),
-  { NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE, NULL }
+  {"ep9312",	ARM_FEATURE (ARM_AEXT_V4T, ARM_CEXT_MAVERICK), FPU_ARCH_MAVERICK, "ARM920T"},
+  {NULL,		ARM_ARCH_NONE,	 ARM_ARCH_NONE, NULL}
 };
-#undef ARM_CPU_OPT
 
 struct arm_arch_option_table
 {
   char *name;
-  size_t name_len;
   const arm_feature_set	value;
   const arm_feature_set	default_fpu;
 };
 
 /* This list should, at a minimum, contain all the architecture names
    recognized by GCC.  */
-#define ARM_ARCH_OPT(N, V, DF) { N, sizeof (N) - 1, V, DF }
 static const struct arm_arch_option_table arm_archs[] =
 {
-  ARM_ARCH_OPT ("all",		ARM_ANY,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv1",	ARM_ARCH_V1,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv2",	ARM_ARCH_V2,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv2a",	ARM_ARCH_V2S,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv2s",	ARM_ARCH_V2S,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv3",	ARM_ARCH_V3,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv3m",	ARM_ARCH_V3M,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv4",	ARM_ARCH_V4,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv4xm",	ARM_ARCH_V4xM,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv4t",	ARM_ARCH_V4T,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv4txm",	ARM_ARCH_V4TxM,	 FPU_ARCH_FPA),
-  ARM_ARCH_OPT ("armv5",	ARM_ARCH_V5,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv5t",	ARM_ARCH_V5T,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv5txm",	ARM_ARCH_V5TxM,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv5te",	ARM_ARCH_V5TE,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv5texp",	ARM_ARCH_V5TExP, FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv5tej",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6",	ARM_ARCH_V6,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6j",	ARM_ARCH_V6,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6k",	ARM_ARCH_V6K,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6z",	ARM_ARCH_V6Z,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6zk",	ARM_ARCH_V6ZK,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6t2",	ARM_ARCH_V6T2,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6kt2",	ARM_ARCH_V6KT2,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6zt2",	ARM_ARCH_V6ZT2,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6zkt2",	ARM_ARCH_V6ZKT2, FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6-m",	ARM_ARCH_V6M,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv6s-m",	ARM_ARCH_V6SM,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7",	ARM_ARCH_V7,	 FPU_ARCH_VFP),
+  {"all",		ARM_ANY,	 FPU_ARCH_FPA},
+  {"armv1",		ARM_ARCH_V1,	 FPU_ARCH_FPA},
+  {"armv2",		ARM_ARCH_V2,	 FPU_ARCH_FPA},
+  {"armv2a",		ARM_ARCH_V2S,	 FPU_ARCH_FPA},
+  {"armv2s",		ARM_ARCH_V2S,	 FPU_ARCH_FPA},
+  {"armv3",		ARM_ARCH_V3,	 FPU_ARCH_FPA},
+  {"armv3m",		ARM_ARCH_V3M,	 FPU_ARCH_FPA},
+  {"armv4",		ARM_ARCH_V4,	 FPU_ARCH_FPA},
+  {"armv4xm",		ARM_ARCH_V4xM,	 FPU_ARCH_FPA},
+  {"armv4t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA},
+  {"armv4txm",		ARM_ARCH_V4TxM,	 FPU_ARCH_FPA},
+  {"armv5",		ARM_ARCH_V5,	 FPU_ARCH_VFP},
+  {"armv5t",		ARM_ARCH_V5T,	 FPU_ARCH_VFP},
+  {"armv5txm",		ARM_ARCH_V5TxM,	 FPU_ARCH_VFP},
+  {"armv5te",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP},
+  {"armv5texp",		ARM_ARCH_V5TExP, FPU_ARCH_VFP},
+  {"armv5tej",		ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP},
+  {"armv6",		ARM_ARCH_V6,	 FPU_ARCH_VFP},
+  {"armv6j",		ARM_ARCH_V6,	 FPU_ARCH_VFP},
+  {"armv6k",		ARM_ARCH_V6K,	 FPU_ARCH_VFP},
+  {"armv6z",		ARM_ARCH_V6Z,	 FPU_ARCH_VFP},
+  {"armv6zk",		ARM_ARCH_V6ZK,	 FPU_ARCH_VFP},
+  {"armv6t2",		ARM_ARCH_V6T2,	 FPU_ARCH_VFP},
+  {"armv6kt2",		ARM_ARCH_V6KT2,	 FPU_ARCH_VFP},
+  {"armv6zt2",		ARM_ARCH_V6ZT2,	 FPU_ARCH_VFP},
+  {"armv6zkt2",		ARM_ARCH_V6ZKT2, FPU_ARCH_VFP},
+  {"armv6-m",		ARM_ARCH_V6M,	 FPU_ARCH_VFP},
+  {"armv6s-m",		ARM_ARCH_V6SM,	 FPU_ARCH_VFP},
+  {"armv7",		ARM_ARCH_V7,	 FPU_ARCH_VFP},
   /* The official spelling of the ARMv7 profile variants is the dashed form.
      Accept the non-dashed form for compatibility with old toolchains.  */
-  ARM_ARCH_OPT ("armv7a",	ARM_ARCH_V7A,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7r",	ARM_ARCH_V7R,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7m",	ARM_ARCH_V7M,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7-a",	ARM_ARCH_V7A,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7-r",	ARM_ARCH_V7R,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7-m",	ARM_ARCH_V7M,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("armv7e-m",	ARM_ARCH_V7EM,	 FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("xscale",	ARM_ARCH_XSCALE, FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("iwmmxt",	ARM_ARCH_IWMMXT, FPU_ARCH_VFP),
-  ARM_ARCH_OPT ("iwmmxt2",	ARM_ARCH_IWMMXT2,FPU_ARCH_VFP),
-  { NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE }
+  {"armv7a",		ARM_ARCH_V7A,	 FPU_ARCH_VFP},
+  {"armv7r",		ARM_ARCH_V7R,	 FPU_ARCH_VFP},
+  {"armv7m",		ARM_ARCH_V7M,	 FPU_ARCH_VFP},
+  {"armv7-a",		ARM_ARCH_V7A,	 FPU_ARCH_VFP},
+  {"armv7-r",		ARM_ARCH_V7R,	 FPU_ARCH_VFP},
+  {"armv7-m",		ARM_ARCH_V7M,	 FPU_ARCH_VFP},
+  {"armv7e-m",		ARM_ARCH_V7EM,	 FPU_ARCH_VFP},
+  {"xscale",		ARM_ARCH_XSCALE, FPU_ARCH_VFP},
+  {"iwmmxt",		ARM_ARCH_IWMMXT, FPU_ARCH_VFP},
+  {"iwmmxt2",		ARM_ARCH_IWMMXT2,FPU_ARCH_VFP},
+  {NULL,		ARM_ARCH_NONE,	 ARM_ARCH_NONE}
 };
-#undef ARM_ARCH_OPT
 
 /* ISA extensions in the co-processor and main instruction set space.  */
 struct arm_option_extension_value_table
 {
   char *name;
-  size_t name_len;
   const arm_feature_set value;
   const arm_feature_set allowed_archs;
 };
 
 /* The following table must be in alphabetical order with a NULL last entry.
    */
-#define ARM_EXT_OPT(N, V, AA) { N, sizeof (N) - 1, V, AA }
 static const struct arm_option_extension_value_table arm_extensions[] =
 {
-  ARM_EXT_OPT ("idiv",	ARM_FEATURE (ARM_EXT_ADIV | ARM_EXT_DIV, 0),
-				   ARM_FEATURE (ARM_EXT_V7A | ARM_EXT_V7R, 0)),
-  ARM_EXT_OPT ("iwmmxt",ARM_FEATURE (0, ARM_CEXT_IWMMXT),	ARM_ANY),
-  ARM_EXT_OPT ("iwmmxt2",
-			ARM_FEATURE (0, ARM_CEXT_IWMMXT2),	ARM_ANY),
-  ARM_EXT_OPT ("maverick",
-                        ARM_FEATURE (0, ARM_CEXT_MAVERICK),	ARM_ANY),
-  ARM_EXT_OPT ("mp",	ARM_FEATURE (ARM_EXT_MP, 0),
-				   ARM_FEATURE (ARM_EXT_V7A | ARM_EXT_V7R, 0)),
-  ARM_EXT_OPT ("os",	ARM_FEATURE (ARM_EXT_OS, 0),
-				   ARM_FEATURE (ARM_EXT_V6M, 0)),
-  ARM_EXT_OPT ("sec",	ARM_FEATURE (ARM_EXT_SEC, 0),
-				   ARM_FEATURE (ARM_EXT_V6K | ARM_EXT_V7A, 0)),
-  ARM_EXT_OPT ("virt",	ARM_FEATURE (ARM_EXT_VIRT | ARM_EXT_ADIV
-				     | ARM_EXT_DIV, 0),
-				   ARM_FEATURE (ARM_EXT_V7A, 0)),
-  ARM_EXT_OPT ("xscale",ARM_FEATURE (0, ARM_CEXT_XSCALE),	ARM_ANY),
-  { NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE }
+  {"idiv",	ARM_FEATURE (ARM_EXT_ADIV | ARM_EXT_DIV, 0),
+				   ARM_FEATURE (ARM_EXT_V7A | ARM_EXT_V7R, 0)},
+  {"iwmmxt",	ARM_FEATURE (0, ARM_CEXT_IWMMXT),	ARM_ANY},
+  {"iwmmxt2",	ARM_FEATURE (0, ARM_CEXT_IWMMXT2),	ARM_ANY},
+  {"maverick",	ARM_FEATURE (0, ARM_CEXT_MAVERICK),	ARM_ANY},
+  {"mp",	ARM_FEATURE (ARM_EXT_MP, 0),
+		     ARM_FEATURE (ARM_EXT_V7A | ARM_EXT_V7R, 0)},
+  {"os",	ARM_FEATURE (ARM_EXT_OS, 0),
+    				   ARM_FEATURE (ARM_EXT_V6M, 0)},
+  {"sec",	ARM_FEATURE (ARM_EXT_SEC, 0),
+    		     ARM_FEATURE (ARM_EXT_V6K | ARM_EXT_V7A, 0)},
+  {"virt",	ARM_FEATURE (ARM_EXT_VIRT | ARM_EXT_ADIV | ARM_EXT_DIV, 0),
+				   ARM_FEATURE (ARM_EXT_V7A, 0)},
+  {"xscale",	ARM_FEATURE (0, ARM_CEXT_XSCALE),	ARM_ANY},
+  {NULL,	ARM_ARCH_NONE,			  ARM_ARCH_NONE}
 };
-#undef ARM_EXT_OPT
 
 /* ISA floating-point and Advanced SIMD extensions.  */
 struct arm_option_fpu_value_table
@@ -23249,16 +23133,16 @@ struct arm_long_option_table
 };
 
 static bfd_boolean
-arm_parse_extension (char *str, const arm_feature_set **opt_p)
+arm_parse_extension (char * str, const arm_feature_set **opt_p)
 {
   arm_feature_set *ext_set = (arm_feature_set *)
       xmalloc (sizeof (arm_feature_set));
 
   /* We insist on extensions being specified in alphabetical order, and with
-     extensions being added before being removed.  We achieve this by having
-     the global ARM_EXTENSIONS table in alphabetical order, and using the
+     extensions being added before being removed.  We achieve this by having 
+     the global ARM_EXTENSIONS table in alphabetical order, and using the 
      ADDING_VALUE variable to indicate whether we are adding an extension (1)
-     or removing it (0) and only allowing it to change in the order
+     or removing it (0) and only allowing it to change in the order 
      -1 -> 1 -> 0.  */
   const struct arm_option_extension_value_table * opt = NULL;
   int adding_value = -1;
@@ -23269,8 +23153,8 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
 
   while (str != NULL && *str != 0)
     {
-      char *ext;
-      size_t len;
+      char * ext;
+      size_t optlen;
 
       if (*str != '+')
 	{
@@ -23282,11 +23166,12 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
       ext = strchr (str, '+');
 
       if (ext != NULL)
-	len = ext - str;
+	optlen = ext - str;
       else
-	len = strlen (str);
+	optlen = strlen (str);
 
-      if (len >= 2 && strncmp (str, "no", 2) == 0)
+      if (optlen >= 2
+	  && strncmp (str, "no", 2) == 0)
 	{
 	  if (adding_value != 0)
 	    {
@@ -23294,10 +23179,10 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
 	      opt = arm_extensions;
 	    }
 
-	  len -= 2;
+	  optlen -= 2;
 	  str += 2;
 	}
-      else if (len > 0)
+      else if (optlen > 0)
 	{
 	  if (adding_value == -1)
 	    {
@@ -23312,7 +23197,7 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
 	    }
 	}
 
-      if (len == 0)
+      if (optlen == 0)
 	{
 	  as_bad (_("missing architectural extension"));
 	  return FALSE;
@@ -23323,7 +23208,8 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
 
       /* Scan over the options table trying to find an exact match. */
       for (; opt->name != NULL; opt++)
-	if (opt->name_len == len && strncmp (opt->name, str, len) == 0)
+	if (strncmp (opt->name, str, optlen) == 0
+	    && strlen (opt->name) == optlen)
 	  {
 	    /* Check we can apply the extension to this architecture.  */
 	    if (!ARM_CPU_HAS_FEATURE (*ext_set, opt->allowed_archs))
@@ -23347,7 +23233,7 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
 	     alphabetical order, or because it does not exist?  */
 
 	  for (opt = arm_extensions; opt->name != NULL; opt++)
-	    if (opt->name_len == len && strncmp (opt->name, str, len) == 0)
+	    if (strncmp (opt->name, str, optlen) == 0)
 	      break;
 
 	  if (opt->name == NULL)
@@ -23372,25 +23258,25 @@ arm_parse_extension (char *str, const arm_feature_set **opt_p)
 }
 
 static bfd_boolean
-arm_parse_cpu (char *str)
+arm_parse_cpu (char * str)
 {
-  const struct arm_cpu_option_table *opt;
-  char *ext = strchr (str, '+');
-  size_t len;
+  const struct arm_cpu_option_table * opt;
+  char * ext = strchr (str, '+');
+  int optlen;
 
   if (ext != NULL)
-    len = ext - str;
+    optlen = ext - str;
   else
-    len = strlen (str);
+    optlen = strlen (str);
 
-  if (len == 0)
+  if (optlen == 0)
     {
       as_bad (_("missing cpu name `%s'"), str);
       return FALSE;
     }
 
   for (opt = arm_cpus; opt->name != NULL; opt++)
-    if (opt->name_len == len && strncmp (opt->name, str, len) == 0)
+    if (strncmp (opt->name, str, optlen) == 0)
       {
 	mcpu_cpu_opt = &opt->value;
 	mcpu_fpu_opt = &opt->default_fpu;
@@ -23398,9 +23284,9 @@ arm_parse_cpu (char *str)
 	  strcpy (selected_cpu_name, opt->canonical_name);
 	else
 	  {
-	    size_t i;
+	    int i;
 
-	    for (i = 0; i < len; i++)
+	    for (i = 0; i < optlen; i++)
 	      selected_cpu_name[i] = TOUPPER (opt->name[i]);
 	    selected_cpu_name[i] = 0;
 	  }
@@ -23416,25 +23302,25 @@ arm_parse_cpu (char *str)
 }
 
 static bfd_boolean
-arm_parse_arch (char *str)
+arm_parse_arch (char * str)
 {
   const struct arm_arch_option_table *opt;
   char *ext = strchr (str, '+');
-  size_t len;
+  int optlen;
 
   if (ext != NULL)
-    len = ext - str;
+    optlen = ext - str;
   else
-    len = strlen (str);
+    optlen = strlen (str);
 
-  if (len == 0)
+  if (optlen == 0)
     {
       as_bad (_("missing architecture name `%s'"), str);
       return FALSE;
     }
 
   for (opt = arm_archs; opt->name != NULL; opt++)
-    if (opt->name_len == len && strncmp (opt->name, str, len) == 0)
+    if (strncmp (opt->name, str, optlen) == 0)
       {
 	march_cpu_opt = &opt->value;
 	march_fpu_opt = &opt->default_fpu;
@@ -23716,7 +23602,6 @@ static void
 aeabi_set_public_attributes (void)
 {
   int arch;
-  char profile;
   int virt_sec = 0;
   arm_feature_set flags;
   arm_feature_set tmp;
@@ -23727,14 +23612,7 @@ aeabi_set_public_attributes (void)
   ARM_MERGE_FEATURE_SETS (flags, arm_arch_used, thumb_arch_used);
   ARM_MERGE_FEATURE_SETS (flags, flags, *mfpu_opt);
   ARM_MERGE_FEATURE_SETS (flags, flags, selected_cpu);
-
-  if (ARM_CPU_HAS_FEATURE (arm_arch_used, arm_arch_any))
-    ARM_MERGE_FEATURE_SETS (flags, flags, arm_ext_v1);
-
-  if (ARM_CPU_HAS_FEATURE (thumb_arch_used, arm_arch_any))
-    ARM_MERGE_FEATURE_SETS (flags, flags, arm_ext_v4t);
-
-  /* Allow the user to override the reported architecture.  */
+  /*Allow the user to override the reported architecture.  */
   if (object_arch)
     {
       ARM_CLEAR_FEATURE (flags, flags, arm_arch_any);
@@ -23794,16 +23672,11 @@ aeabi_set_public_attributes (void)
 
   /* Tag_CPU_arch_profile.  */
   if (ARM_CPU_HAS_FEATURE (flags, arm_ext_v7a))
-    profile = 'A';
+    aeabi_set_attribute_int (Tag_CPU_arch_profile, 'A');
   else if (ARM_CPU_HAS_FEATURE (flags, arm_ext_v7r))
-    profile = 'R';
+    aeabi_set_attribute_int (Tag_CPU_arch_profile, 'R');
   else if (ARM_CPU_HAS_FEATURE (flags, arm_ext_m))
-    profile = 'M';
-  else
-    profile = '\0';
-
-  if (profile != '\0')
-    aeabi_set_attribute_int (Tag_CPU_arch_profile, profile);
+    aeabi_set_attribute_int (Tag_CPU_arch_profile, 'M');
 
   /* Tag_ARM_ISA_use.  */
   if (ARM_CPU_HAS_FEATURE (flags, arm_ext_v1)
@@ -23847,24 +23720,18 @@ aeabi_set_public_attributes (void)
     aeabi_set_attribute_int
       (Tag_Advanced_SIMD_arch, (ARM_CPU_HAS_FEATURE (flags, fpu_neon_ext_fma)
 				? 2 : 1));
-
+  
   /* Tag_VFP_HP_extension (formerly Tag_NEON_FP16_arch).  */
   if (ARM_CPU_HAS_FEATURE (flags, fpu_vfp_fp16))
     aeabi_set_attribute_int (Tag_VFP_HP_extension, 1);
 
-  /* Tag_DIV_use.
-
-     We set Tag_DIV_use to two when integer divide instructions have been used
-     in ARM state, or when Thumb integer divide instructions have been used,
-     but we have no architecture profile set, nor have we any ARM instructions.
-
-     For new architectures we will have to check these tests.  */
-  gas_assert (arch <= TAG_CPU_ARCH_V7E_M);
-  if (ARM_CPU_HAS_FEATURE (flags, arm_ext_adiv)
-      || (profile == '\0'
-	  && ARM_CPU_HAS_FEATURE (flags, arm_ext_div)
-	  && !ARM_CPU_HAS_FEATURE (arm_arch_used, arm_arch_any)))
+  /* Tag_DIV_use.  */
+  if (ARM_CPU_HAS_FEATURE (flags, arm_ext_adiv))
     aeabi_set_attribute_int (Tag_DIV_use, 2);
+  else if (ARM_CPU_HAS_FEATURE (flags, arm_ext_div))
+    aeabi_set_attribute_int (Tag_DIV_use, 0);
+  else
+    aeabi_set_attribute_int (Tag_DIV_use, 1);
 
   /* Tag_MP_extension_use.  */
   if (ARM_CPU_HAS_FEATURE (flags, arm_ext_mp))
@@ -23919,7 +23786,6 @@ s_arm_cpu (int ignored ATTRIBUTE_UNUSED)
 	    int i;
 	    for (i = 0; opt->name[i]; i++)
 	      selected_cpu_name[i] = TOUPPER (opt->name[i]);
-
 	    selected_cpu_name[i] = 0;
 	  }
 	ARM_MERGE_FEATURE_SETS (cpu_variant, *mcpu_cpu_opt, *mfpu_opt);
diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h
index 4425d75448..2916ae19a3 100644
--- a/gas/config/tc-arm.h
+++ b/gas/config/tc-arm.h
@@ -1,6 +1,6 @@
 /* This file is tc-arm.h
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2012  Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 	Modified by David Taylor (dtaylor@armltd.co.uk)
 
@@ -79,14 +79,8 @@ struct fix;
 # define TARGET_FORMAT	elf32_arm_target_format ()
 #endif
 
-/* We support double slash line-comments for compatibility with the ARM AArch64 Assembler.  */
-#define DOUBLESLASH_LINE_COMMENTS
-
 #define TC_FORCE_RELOCATION(FIX) arm_force_relocation (FIX)
 
-extern unsigned int arm_frag_max_var (struct frag *);
-#define md_frag_max_var arm_frag_max_var
-
 #define md_relax_frag(segment, fragp, stretch) \
   arm_relax_frag (segment, fragp, stretch)
 extern int arm_relax_frag (asection *, struct frag *, long);
diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c
index 657c7edee3..1eb4ad1b02 100644
--- a/gas/config/tc-cris.c
+++ b/gas/config/tc-cris.c
@@ -815,7 +815,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec ATTRIBUTE_UNUSED,
 
   /* Used to check integrity of the relaxation.
      One of 2 = long, 1 = word, or 0 = byte.  */
-  int length_code ATTRIBUTE_UNUSED;
+  int length_code;
 
   /* Size in bytes of variable-sized part of frag.  */
   int var_part_size = 0;
diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index 3b06a788f4..b347d8b828 100644
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -1,5 +1,5 @@
 /* tc-crx.c -- Assembler code for the CRX CPU core.
-   Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012
+   Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    Contributed by Tomer Levi, NSC, Israel.
@@ -24,7 +24,6 @@
    MA 02110-1301, USA.  */
 
 #include "as.h"
-#include "bfd_stdint.h"
 #include "safe-ctype.h"
 #include "dwarf2dbg.h"
 #include "opcode/crx.h"
@@ -1174,7 +1173,9 @@ getreg_image (reg r)
 static long
 getconstant (long x, int nbits)
 {
-  return x & ((((1U << (nbits - 1)) - 1) << 1) | 1);
+  /* The following expression avoids overflow if
+     'nbits' is the number of bits in 'bfd_vma'.  */
+  return (x & ((((1 << (nbits - 1)) - 1) << 1) | 1));
 }
 
 /* Print a constant value to 'output_opcode':
@@ -1325,11 +1326,17 @@ get_number_of_operands (void)
 static op_err
 check_range (long *num, int bits, int unsigned flags, int update)
 {
-  uint32_t max;
+  long min, max;
   int retval = OP_LEGAL;
   int bin;
-  uint32_t upper_64kb = 0xffff0000;
-  uint32_t value = *num;
+  long upper_64kb = 0xFFFF0000;
+  long value = *num;
+
+  /* For hosts witah longs bigger than 32-bits make sure that the top 
+     bits of a 32-bit negative value read in by the parser are set,
+     so that the correct comparisons are made.  */
+  if (value & 0x80000000)
+    value |= (-1L << 31);
 
   /* Verify operand value is even.  */
   if (flags & OP_EVEN)
@@ -1353,12 +1360,7 @@ check_range (long *num, int bits, int unsigned flags, int update)
 
   if (flags & OP_SHIFT)
     {
-      /* All OP_SHIFT args are also OP_SIGNED, so we want to keep the
-	 sign.  However, right shift of a signed type with a negative
-	 value is implementation defined.  See ISO C 6.5.7.  So we use
-	 an unsigned type and sign extend afterwards.  */
       value >>= 1;
-      value = (value ^ 0x40000000) - 0x40000000;
       if (update)
 	*num = value;
     }
@@ -1380,14 +1382,13 @@ check_range (long *num, int bits, int unsigned flags, int update)
     {
       int is_dispu4 = 0;
 
-      uint32_t mul = (instruction->flags & DISPUB4 ? 1 
-		      : instruction->flags & DISPUW4 ? 2
-		      : instruction->flags & DISPUD4 ? 4
-		      : 0);
+      int mul = (instruction->flags & DISPUB4) ? 1 
+		: (instruction->flags & DISPUW4) ? 2
+		: (instruction->flags & DISPUD4) ? 4 : 0;
       
       for (bin = 0; bin < cst4_maps; bin++)
 	{
-	  if (value == mul * bin)
+	  if (value == (mul * bin))
 	    {
 	      is_dispu4 = 1;
 	      if (update)
@@ -1404,7 +1405,7 @@ check_range (long *num, int bits, int unsigned flags, int update)
 
       for (bin = 0; bin < cst4_maps; bin++)
 	{
-	  if (value == (uint32_t) cst4_map[bin])
+	  if (value == cst4_map[bin])
 	    {
 	      is_cst4 = 1;
 	      if (update)
@@ -1417,19 +1418,17 @@ check_range (long *num, int bits, int unsigned flags, int update)
     }
   else if (flags & OP_SIGNED)
     {
-      max = 1;
-      max = max << (bits - 1);
-      value += max;
-      max = ((max - 1) << 1) | 1;
-      if (value > max)
+      max = (1 << (bits - 1)) - 1;
+      min = - (1 << (bits - 1));
+      if ((value > max) || (value < min))
 	retval = OP_OUT_OF_RANGE;
     }
   else if (flags & OP_UNSIGNED)
     {
-      max = 1;
-      max = max << (bits - 1);
-      max = ((max - 1) << 1) | 1;
-      if (value > max)
+      max = ((((1 << (bits - 1)) - 1) << 1) | 1);
+      min = 0;
+      if (((unsigned long) value > (unsigned long) max) 
+	    || ((unsigned long) value < (unsigned long) min))
 	retval = OP_OUT_OF_RANGE;
     }
   return retval;
diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index edfad44d0e..cc46740d3a 100644
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -1,6 +1,6 @@
 /* tc-h8300.c -- Assemble code for the Renesas H8/300
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -558,21 +558,17 @@ skip_colonthing (char *src, int *mode)
 static int
 constant_fits_width_p (struct h8_op *operand, unsigned int width)
 {
-  offsetT num;
-
-  num = ((operand->exp.X_add_number & 0xffffffff) ^ 0x80000000) - 0x80000000;
-  return (num & ~width) == 0 || (num | width) == ~0;
+  return ((operand->exp.X_add_number & ~width) == 0
+	  || (operand->exp.X_add_number | (offsetT) width) == (offsetT)(~0));
 }
 
 static int
 constant_fits_size_p (struct h8_op *operand, int size, int no_symbols)
 {
-  offsetT num;
-
+  offsetT num = operand->exp.X_add_number;
   if (no_symbols
       && (operand->exp.X_add_symbol != 0 || operand->exp.X_op_symbol != 0))
     return 0;
-  num = operand->exp.X_add_number & 0xffffffff;
   switch (size)
     {
     case L_2:
@@ -586,13 +582,11 @@ constant_fits_size_p (struct h8_op *operand, int size, int no_symbols)
     case L_5:
       return num >= 1 && num < 32;
     case L_8:
-      num = (num ^ 0x80000000) - 0x80000000;
-      return (num & ~0xFF) == 0 || (num | 0x7F) == ~0;
+      return (num & ~0xFF) == 0 || ((unsigned)num | 0x7F) == ~0u;
     case L_8U:
       return (num & ~0xFF) == 0;
     case L_16:
-      num = (num ^ 0x80000000) - 0x80000000;
-      return (num & ~0xFFFF) == 0 || (num | 0x7FFF) == ~0;
+      return (num & ~0xFFFF) == 0 || ((unsigned)num | 0x7FFF) == ~0u;
     case L_16U:
       return (num & ~0xFFFF) == 0;
     case L_32:
@@ -1190,7 +1184,7 @@ get_specific (const struct h8_instruction *instruction,
 		}
 	      else if (x_mode == IMM && op_mode != IMM)
 		{
-		  offsetT num = operands[i].exp.X_add_number & 0xffffffff;
+		  offsetT num = operands[i].exp.X_add_number;
 		  if (op_mode == KBIT || op_mode == DBIT)
 		    /* This is ok if the immediate value is sensible.  */;
 		  else if (op_mode == CONST_2)
@@ -1872,8 +1866,8 @@ fix_operand_size (struct h8_op *operand, int size)
 	   necessary.  */
 	if (Hmode
 	    && !Nmode 
-	    && ((((addressT) operand->exp.X_add_number + 0x8000)
-		 & 0xffffffff) > 0xffff
+	    && (operand->exp.X_add_number < -32768
+		|| operand->exp.X_add_number > 32767
 		|| operand->exp.X_add_symbol != 0
 		|| operand->exp.X_op_symbol != 0))
 	  operand->mode |= L_24;
@@ -1882,8 +1876,9 @@ fix_operand_size (struct h8_op *operand, int size)
 	break;
 
       case PCREL:
-	if ((((addressT) operand->exp.X_add_number + 0x80)
-	     & 0xffffffff) <= 0xff)
+	/* This condition is long standing, though somewhat suspect.  */
+	if (operand->exp.X_add_number > -128
+	    && operand->exp.X_add_number < 127)
 	  {
 	    if (operand->exp.X_add_symbol != NULL)
 	      operand->mode |= bsize;
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index ae0b436b7b..59182bbeab 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1,7 +1,6 @@
 /* tc-i386.c -- Assemble code for the Intel 80386
    Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-   2012
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -60,13 +59,12 @@
    WAIT_PREFIX must be the first prefix since FWAIT is really is an
    instruction, and so must come before any prefixes.
    The preferred prefix order is SEG_PREFIX, ADDR_PREFIX, DATA_PREFIX,
-   REP_PREFIX/HLE_PREFIX, LOCK_PREFIX.  */
+   REP_PREFIX, LOCK_PREFIX.  */
 #define WAIT_PREFIX	0
 #define SEG_PREFIX	1
 #define ADDR_PREFIX	2
 #define DATA_PREFIX	3
 #define REP_PREFIX	4
-#define HLE_PREFIX	REP_PREFIX
 #define LOCK_PREFIX	5
 #define REX_PREFIX	6       /* must come last.  */
 #define MAX_PREFIXES	7	/* max prefixes per opcode */
@@ -281,16 +279,8 @@ struct _i386_insn
     /* Swap operand in encoding.  */
     unsigned int swap_operand;
 
-    /* Prefer 8bit or 32bit displacement in encoding.  */
-    enum
-      {
-	disp_encoding_default = 0,
-	disp_encoding_8bit,
-	disp_encoding_32bit
-      } disp_encoding;
-
-    /* Have HLE prefix.  */
-    unsigned int have_hle;
+    /* Force 32bit displacement in encoding.  */
+    unsigned int disp32_encoding;
 
     /* Error message.  */
     enum i386_error error;
@@ -313,8 +303,7 @@ const char extra_symbol_chars[] = "*%-(["
      || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF))	\
 	 && !defined (TE_GNU)				\
 	 && !defined (TE_LINUX)				\
-	 && !defined (TE_NACL)				\
-	 && !defined (TE_NETWARE)			\
+ 	 && !defined (TE_NETWARE)			\
 	 && !defined (TE_FreeBSD)			\
 	 && !defined (TE_DragonFly)			\
 	 && !defined (TE_NetBSD)))
@@ -699,8 +688,6 @@ static const arch_entry cpu_arch[] =
     CPU_ANY_AVX_FLAGS, 0, 1 },
   { STRING_COMMA_LEN (".vmx"), PROCESSOR_UNKNOWN,
     CPU_VMX_FLAGS, 0, 0 },
-  { STRING_COMMA_LEN (".vmfunc"), PROCESSOR_UNKNOWN,
-    CPU_VMFUNC_FLAGS, 0, 0 },
   { STRING_COMMA_LEN (".smx"), PROCESSOR_UNKNOWN,
     CPU_SMX_FLAGS, 0, 0 },
   { STRING_COMMA_LEN (".xsave"), PROCESSOR_UNKNOWN,
@@ -735,10 +722,6 @@ static const arch_entry cpu_arch[] =
     CPU_EPT_FLAGS, 0, 0 },
   { STRING_COMMA_LEN (".lzcnt"), PROCESSOR_UNKNOWN,
     CPU_LZCNT_FLAGS, 0, 0 },
-  { STRING_COMMA_LEN (".hle"), PROCESSOR_UNKNOWN,
-    CPU_HLE_FLAGS, 0, 0 },
-  { STRING_COMMA_LEN (".rtm"), PROCESSOR_UNKNOWN,
-    CPU_RTM_FLAGS, 0, 0 },
   { STRING_COMMA_LEN (".invpcid"), PROCESSOR_UNKNOWN,
     CPU_INVPCID_FLAGS, 0, 0 },
   { STRING_COMMA_LEN (".clflush"), PROCESSOR_UNKNOWN,
@@ -3007,50 +2990,6 @@ process_immext (void)
   i.tm.extension_opcode = None;
 }
 
-
-static int
-check_hle (void)
-{
-  switch (i.tm.opcode_modifier.hleprefixok)
-    {
-    default:
-      abort ();
-    case HLEPrefixNone:
-      if (i.prefix[HLE_PREFIX] == XACQUIRE_PREFIX_OPCODE)
-	as_bad (_("invalid instruction `%s' after `xacquire'"),
-		i.tm.name);
-      else
-	as_bad (_("invalid instruction `%s' after `xrelease'"),
-		i.tm.name);
-      return 0;
-    case HLEPrefixLock:
-      if (i.prefix[LOCK_PREFIX])
-	return 1;
-      if (i.prefix[HLE_PREFIX] == XACQUIRE_PREFIX_OPCODE)
-	as_bad (_("missing `lock' with `xacquire'"));
-      else
-	as_bad (_("missing `lock' with `xrelease'"));
-      return 0;
-    case HLEPrefixAny:
-      return 1;
-    case HLEPrefixRelease:
-      if (i.prefix[HLE_PREFIX] != XRELEASE_PREFIX_OPCODE)
-	{
-	  as_bad (_("instruction `%s' after `xacquire' not allowed"),
-		  i.tm.name);
-	  return 0;
-	}
-      if (i.mem_operands == 0
-	  || !operand_type_check (i.types[i.operands - 1], anymem))
-	{
-	  as_bad (_("memory destination needed for instruction `%s'"
-		    " after `xrelease'"), i.tm.name);
-	  return 0;
-	}
-      return 1;
-    }
-}
-
 /* This is the guts of the machine-dependent assembler.  LINE points to a
    machine dependent instruction.  This function is supposed to emit
    the frags/bytes it assembles to.  */
@@ -3111,7 +3050,7 @@ md_assemble (char *line)
   /* Don't optimize displacement for movabs since it only takes 64bit
      displacement.  */
   if (i.disp_operands
-      && i.disp_encoding != disp_encoding_32bit
+      && !i.disp32_encoding
       && (flag_code != CODE_64BIT
 	  || strcmp (mnemonic, "movabs") != 0))
     optimize_disp ();
@@ -3169,10 +3108,6 @@ md_assemble (char *line)
       return;
     }
 
-  /* Check if HLE prefix is OK.  */
-  if (i.have_hle && !check_hle ())
-    return;
-
   /* Check string instruction segment overrides.  */
   if (i.tm.opcode_modifier.isstring && i.mem_operands != 0)
     {
@@ -3376,10 +3311,7 @@ parse_insn (char *line, char *mnemonic)
 	    case PREFIX_EXIST:
 	      return NULL;
 	    case PREFIX_REP:
-	      if (current_templates->start->cpu_flags.bitfield.cpuhle)
-		i.have_hle = 1;
-	      else
-		expecting_string_instruction = current_templates->start->name;
+	      expecting_string_instruction = current_templates->start->name;
 	      break;
 	    default:
 	      break;
@@ -3397,15 +3329,11 @@ parse_insn (char *line, char *mnemonic)
 	 encoding.  */
       if (mnem_p - 2 == dot_p && dot_p[1] == 's')
 	i.swap_operand = 1;
-      else if (mnem_p - 3 == dot_p
-	       && dot_p[1] == 'd'
-	       && dot_p[2] == '8')
-	i.disp_encoding = disp_encoding_8bit;
-      else if (mnem_p - 4 == dot_p
+      else if (mnem_p - 4 == dot_p 
 	       && dot_p[1] == 'd'
 	       && dot_p[2] == '3'
 	       && dot_p[3] == '2')
-	i.disp_encoding = disp_encoding_32bit;
+	i.disp32_encoding = 1;
       else
 	goto check_suffix;
       mnem_p = dot_p;
@@ -5767,19 +5695,7 @@ build_modrm_byte (void)
 		      || i.reloc[op] == BFD_RELOC_X86_64_TLSDESC_CALL))
 		i.rm.mode = 0;
 	      else
-		{
-		  if (!fake_zero_displacement
-		      && !i.disp_operands
-		      && i.disp_encoding)
-		    {
-		      fake_zero_displacement = 1;
-		      if (i.disp_encoding == disp_encoding_8bit)
-			i.types[op].bitfield.disp8 = 1;
-		      else
-			i.types[op].bitfield.disp32 = 1;
-		    }
-		  i.rm.mode = mode_from_disp_size (i.types[op]);
-		}
+		i.rm.mode = mode_from_disp_size (i.types[op]);
 	    }
 
 	  if (fake_zero_displacement)
@@ -5914,7 +5830,7 @@ build_modrm_byte (void)
 		  vex_reg = op + 1;
 		}
 	      else
-		{
+		{ 
 		  /* There are only 2 operands.  */
 		  gas_assert (op < 2 && i.operands == 2);
 		  vex_reg = 1;
@@ -5981,7 +5897,7 @@ output_branch (void)
   offsetT off;
 
   code16 = flag_code == CODE_16BIT ? CODE16 : 0;
-  size = i.disp_encoding == disp_encoding_32bit ? BIG : SMALL;
+  size = i.disp32_encoding ? BIG : SMALL;
 
   prefix = 0;
   if (i.prefix[DATA_PREFIX] != 0)
@@ -6100,17 +6016,8 @@ output_jump (void)
   if (i.prefixes != 0 && !intel_syntax)
     as_warn (_("skipping prefixes on this instruction"));
 
-  p = frag_more (i.tm.opcode_length + size);
-  switch (i.tm.opcode_length)
-    {
-    case 2:
-      *p++ = i.tm.base_opcode >> 8;
-    case 1:
-      *p++ = i.tm.base_opcode;
-      break;
-    default:
-      abort ();
-    }
+  p = frag_more (1 + size);
+  *p++ = i.tm.base_opcode;
 
   fixP = fix_new_exp (frag_now, p - frag_now->fr_literal, size,
 		      i.op[0].disps, 1, reloc (size, 1, 1, i.reloc[0]));
@@ -6619,8 +6526,7 @@ x86_cons_fix_new (fragS *frag, unsigned int off, unsigned int len,
   fix_new_exp (frag, off, len, exp, 0, r);
 }
 
-#if !(defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (OBJ_MACH_O)) \
-    || defined (LEX_AT)
+#if (!defined (OBJ_ELF) && !defined (OBJ_MAYBE_ELF)) || defined (LEX_AT)
 # define lex_got(reloc, adjust, types) NULL
 #else
 /* Parse operands of the form
@@ -6703,10 +6609,8 @@ lex_got (enum bfd_reloc_code_real *rel,
   char *cp;
   unsigned int j;
 
-#if defined (OBJ_MAYBE_ELF)
   if (!IS_ELF)
     return NULL;
-#endif
 
   for (cp = input_line_pointer; *cp != '@'; cp++)
     if (is_end_of_line[(unsigned char) *cp] || *cp == ',')
@@ -7715,18 +7619,6 @@ i386_att_operand (char *operand_string)
   return 1;			/* Normal return.  */
 }
 
-/* Calculate the maximum variable size (i.e., excluding fr_fix)
-   that an rs_machine_dependent frag may reach.  */
-
-unsigned int
-i386_frag_max_var (fragS *frag)
-{
-  /* The only relaxable frags are for jumps.
-     Unconditional jumps can grow by 4 bytes and others by 5 bytes.  */
-  gas_assert (frag->fr_type == rs_machine_dependent);
-  return TYPE_FROM_RELAX_STATE (frag->fr_subtype) == UNCOND_JUMP ? 4 : 5;
-}
-
 /* md_estimate_size_before_relax()
 
    Called just before relax() for rs_machine_dependent frags.  The x86
@@ -8391,7 +8283,7 @@ struct option md_longopts[] =
 {
   {"32", no_argument, NULL, OPTION_32},
 #if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \
-     || defined (TE_PE) || defined (TE_PEP) || defined (OBJ_MACH_O))
+     || defined (TE_PE) || defined (TE_PEP))
   {"64", no_argument, NULL, OPTION_64},
 #endif
 #if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)
@@ -8449,7 +8341,7 @@ md_parse_option (int c, char *arg)
       break;
 #endif
 #if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) \
-     || defined (TE_PE) || defined (TE_PEP) || defined (OBJ_MACH_O))
+     || defined (TE_PE) || defined (TE_PEP))
     case OPTION_64:
       {
 	const char **list, **l;
@@ -8459,8 +8351,7 @@ md_parse_option (int c, char *arg)
 	  if (CONST_STRNEQ (*l, "elf64-x86-64")
 	      || strcmp (*l, "coff-x86-64") == 0
 	      || strcmp (*l, "pe-x86-64") == 0
-	      || strcmp (*l, "pei-x86-64") == 0
-	      || strcmp (*l, "mach-o-x86-64") == 0)
+	      || strcmp (*l, "pei-x86-64") == 0)
 	    {
 	      default_arch = "x86_64";
 	      break;
@@ -8728,7 +8619,7 @@ show_arch (FILE *stream, int ext, int check)
 	  fprintf (stream, "%s\n", message);
 	  p = start;
 	  left = size - (start - message) - len - 2;
-
+	  
 	  gas_assert (left >= 0);
 
 	  p = mempcpy (p, name, len);
@@ -8882,14 +8773,7 @@ i386_target_format (void)
 #endif
 #if defined (OBJ_MACH_O)
     case bfd_target_mach_o_flavour:
-      if (flag_code == CODE_64BIT)
-	{
-	  use_rela_relocations = 1;
-	  object_64bit = 1;
-	  return "mach-o-x86-64";
-	}
-      else
-	return "mach-o-i386";
+      return flag_code == CODE_64BIT ? "mach-o-x86-64" : "mach-o-i386";
 #endif
     default:
       abort ();
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 51c6cb6382..6a6b31d648 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -1,6 +1,6 @@
 /* tc-i386.h -- Header file for tc-i386.c
    Copyright 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -61,10 +61,6 @@ extern unsigned long i386_mach (void);
 #define ELF_TARGET_FORMAT64	"elf64-x86-64-freebsd"
 #elif defined (TE_VXWORKS)
 #define ELF_TARGET_FORMAT	"elf32-i386-vxworks"
-#elif defined (TE_NACL)
-#define ELF_TARGET_FORMAT	"elf32-i386-nacl"
-#define ELF_TARGET_FORMAT32	"elf32-x86-64-nacl"
-#define ELF_TARGET_FORMAT64	"elf64-x86-64-nacl"
 #endif
 
 #ifdef TE_SOLARIS
@@ -166,7 +162,7 @@ extern int tc_i386_fix_adjustable (struct fix *);
 /* This expression evaluates to true if the relocation is for a local
    object for which we still want to do the relocation at runtime.
    False if we are willing to perform this relocation while building
-   the .o file.  GOTOFF and GOT32 do not need to be checked here because
+   the .o file.  GOTOFF and GOT32 do not need to be checked here because 
    they are not pcrel.  .*/
 
 #define TC_FORCE_RELOCATION_LOCAL(FIX)			\
@@ -217,9 +213,6 @@ if (fragP->fr_type == rs_align_code) 					\
 void i386_print_statistics (FILE *);
 #define tc_print_statistics i386_print_statistics
 
-extern unsigned int i386_frag_max_var (fragS *);
-#define md_frag_max_var i386_frag_max_var
-
 #define md_number_to_chars number_to_chars_littleendian
 
 enum processor_type
@@ -321,18 +314,4 @@ void tc_pe_dwarf2_emit_offset (symbolS *, unsigned int);
 /* X_add_symbol:X_op_symbol (Intel mode only) */
 #define O_full_ptr O_md2
 
-#ifdef OBJ_MACH_O
-
-#define TC_FORCE_RELOCATION(FIX) (obj_mach_o_force_reloc (FIX))
-
-#define TC_FORCE_RELOCATION_SUB_SAME(FIX,SEG) \
-	  (obj_mach_o_force_reloc_sub_same (FIX, SEG))
-
-#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX,SEG) \
-	(obj_mach_o_force_reloc_sub_local (FIX, SEG))
-
-#define TC_VALIDATE_FIX_SUB(FIX, SEG) 1
-
-#endif /* OBJ_MACH_O */
-
 #endif /* TC_I386 */
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 449d8c3251..0e4c66efe8 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1,6 +1,6 @@
 /* tc-mips.c -- assemble code for a MIPS chip.
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    Contributed by the OSF and Ralph Campbell.
    Written by Keith Knowles and Ralph Campbell, working independently.
@@ -370,8 +370,7 @@ static int file_ase_mt;
 			     || mips_opts.isa == ISA_MIPS64R2)
 
 #define ISA_SUPPORTS_MCU_ASE (mips_opts.isa == ISA_MIPS32R2		\
-			      || mips_opts.isa == ISA_MIPS64R2		\
-			      || mips_opts.micromips)
+			      || mips_opts.isa == ISA_MIPS64R2)
 
 /* The argument of the -march= flag.  The architecture we are assembling.  */
 static int file_mips_arch = CPU_UNKNOWN;
@@ -497,16 +496,13 @@ static int mips_32bitmode = 0;
 /* True if CPU has a ror instruction.  */
 #define CPU_HAS_ROR(CPU)	CPU_HAS_DROR (CPU)
 
-/* True if CPU is in the Octeon family */
-#define CPU_IS_OCTEON(CPU) ((CPU) == CPU_OCTEON || (CPU) == CPU_OCTEONP || (CPU) == CPU_OCTEON2)
-
 /* True if CPU has seq/sne and seqi/snei instructions.  */
-#define CPU_HAS_SEQ(CPU)	(CPU_IS_OCTEON (CPU))
+#define CPU_HAS_SEQ(CPU)	((CPU) == CPU_OCTEON)
 
 /* True if CPU does not implement the all the coprocessor insns.  For these
    CPUs only those COP insns are accepted that are explicitly marked to be
    available on the CPU.  ISA membership for COP insns is ignored.  */
-#define NO_ISA_COP(CPU)		(CPU_IS_OCTEON (CPU))
+#define NO_ISA_COP(CPU)		((CPU) == CPU_OCTEON)
 
 /* True if mflo and mfhi can be immediately followed by instructions
    which write to the HI and LO registers.
@@ -1356,8 +1352,6 @@ static void s_cprestore (int);
 static void s_cpreturn (int);
 static void s_dtprelword (int);
 static void s_dtpreldword (int);
-static void s_tprelword (int);
-static void s_tpreldword (int);
 static void s_gpvalue (int);
 static void s_gpword (int);
 static void s_gpdword (int);
@@ -1437,8 +1431,6 @@ static const pseudo_typeS mips_pseudo_table[] =
   {"cpreturn", s_cpreturn, 0},
   {"dtprelword", s_dtprelword, 0},
   {"dtpreldword", s_dtpreldword, 0},
-  {"tprelword", s_tprelword, 0},
-  {"tpreldword", s_tpreldword, 0},
   {"gpvalue", s_gpvalue, 0},
   {"gpword", s_gpword, 0},
   {"gpdword", s_gpdword, 0},
@@ -2761,36 +2753,27 @@ reg_needs_delay (unsigned int reg)
   return 0;
 }
 
-/* Move all labels in LABELS to the current insertion point.  TEXT_P
-   says whether the labels refer to text or data.  */
+/* Move all labels in insn_labels to the current insertion point.  */
 
 static void
-mips_move_labels (struct insn_label_list *labels, bfd_boolean text_p)
+mips_move_labels (void)
 {
+  segment_info_type *si = seg_info (now_seg);
   struct insn_label_list *l;
   valueT val;
 
-  for (l = labels; l != NULL; l = l->next)
+  for (l = si->label_list; l != NULL; l = l->next)
     {
       gas_assert (S_GET_SEGMENT (l->label) == now_seg);
       symbol_set_frag (l->label, frag_now);
       val = (valueT) frag_now_fix ();
       /* MIPS16/microMIPS text labels are stored as odd.  */
-      if (text_p && HAVE_CODE_COMPRESSION)
+      if (HAVE_CODE_COMPRESSION)
 	++val;
       S_SET_VALUE (l->label, val);
     }
 }
 
-/* Move all labels in insn_labels to the current insertion point
-   and treat them as text labels.  */
-
-static void
-mips_move_text_labels (void)
-{
-  mips_move_labels (seg_info (now_seg)->label_list, TRUE);
-}
-
 static bfd_boolean
 s_is_linkonce (symbolS *sym, segT from_seg)
 {
@@ -3704,6 +3687,7 @@ can_swap_branch_p (struct mips_cl_insn *ip)
   unsigned long pinfo, pinfo2, prev_pinfo, prev_pinfo2;
   unsigned int gpr_read, gpr_write, prev_gpr_read, prev_gpr_write;
 
+
   /* -O2 and above is required for this optimization.  */
   if (mips_optimize < 2)
     return FALSE;
@@ -3935,8 +3919,6 @@ micromips_add_label (void)
 #if defined(OBJ_ELF) || defined(OBJ_MAYBE_ELF)
   if (IS_ELF)
     S_SET_OTHER (s, ELF_ST_SET_MICROMIPS (S_GET_OTHER (s)));
-#else
-  (void) s;
 #endif
 }
 
@@ -4158,7 +4140,7 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr,
 	      frag_grow (40);
 	    }
 
-	  mips_move_text_labels ();
+	  mips_move_labels ();
 
 #ifndef NO_ECOFF_DEBUGGING
 	  if (ECOFF_DEBUGGING)
@@ -4550,7 +4532,7 @@ mips_emit_delays (void)
 	{
 	  while (nops-- > 0)
 	    add_fixed_insn (NOP_INSN);
-	  mips_move_text_labels ();
+	  mips_move_labels ();
 	}
     }
   mips_no_prev_insn ();
@@ -4594,7 +4576,7 @@ start_noreorder (void)
 	     decrease the size of prev_nop_frag.  */
 	  frag_wane (frag_now);
 	  frag_new (0);
-	  mips_move_text_labels ();
+	  mips_move_labels ();
 	}
       mips_mark_labels ();
       mips_clear_insn_labels ();
@@ -4608,6 +4590,7 @@ start_noreorder (void)
 static void
 end_noreorder (void)
 {
+
   mips_opts.noreorder--;
   if (mips_opts.noreorder == 0 && prev_nop_frag != NULL)
     {
@@ -5277,7 +5260,9 @@ macro_build_jalr (expressionS *ep, int cprestore)
       frag_grow (8);
       f = frag_more (0);
     }
-  if (mips_opts.micromips)
+  if (!mips_opts.micromips)
+    macro_build (NULL, "jalr", "d,s", RA, PIC_CALL_REG);
+  else
     {
       jalr = mips_opts.noreorder && !cprestore ? "jalr" : "jalrs";
       if (MIPS_JALR_HINT_P (ep))
@@ -5285,8 +5270,6 @@ macro_build_jalr (expressionS *ep, int cprestore)
       else
 	macro_build (NULL, jalr, "mj", PIC_CALL_REG);
     }
-  else
-    macro_build (NULL, "jalr", "d,s", RA, PIC_CALL_REG);
   if (MIPS_JALR_HINT_P (ep))
     fix_new_exp (frag_now, f - frag_now->fr_literal, 4, ep, FALSE, jalr_reloc);
 }
@@ -5961,7 +5944,7 @@ move_register (int dest, int source)
      instruction specifically requires a 32-bit one.  */
   if (mips_opts.micromips
       && !(history[0].insn_mo->pinfo2 & INSN2_BRANCH_DELAY_32BIT))
-    macro_build (NULL, "move", "mp,mj", dest, source);
+    macro_build (NULL, "move", "mp,mj", dest, source );
   else
     macro_build (NULL, HAVE_32BIT_GPRS ? "addu" : "daddu", "d,v,t",
 		 dest, source, 0);
@@ -6277,7 +6260,6 @@ macro (struct mips_cl_insn *ip)
   int ust = 0;
   int lp = 0;
   int ab = 0;
-  int off0 = 0;
   int off;
   offsetT maxnum;
   bfd_reloc_code_real_type r;
@@ -8312,29 +8294,20 @@ macro (struct mips_cl_insn *ip)
 			     tempreg, tempreg, breg);
 	      breg = tempreg;
 	    }
-	  if (off0)
-	    {
-	      if (offset_expr.X_add_number == 0)
-		tempreg = breg;
-	      else
-		macro_build (&offset_expr, ADDRESS_ADDI_INSN,
-			     "t,r,j", tempreg, breg, BFD_RELOC_LO16);
-	      macro_build (NULL, s, fmt, treg, tempreg);
-	    }
-	  else if (!off12)
+	  if (!off12)
 	    macro_build (&offset_expr, s, fmt, treg, BFD_RELOC_LO16, breg);
 	  else
 	    macro_build (NULL, s, fmt,
 			 treg, (unsigned long) offset_expr.X_add_number, breg);
 	}
-      else if (off12 || off0)
+      else if (off12)
 	{
-	  /* A 12-bit or 0-bit offset field is too narrow to be used
-	     for a low-part relocation, so load the whole address into
-	     the auxillary register.  In the case of "A(b)" addresses,
-	     we first load absolute address "A" into the register and
-	     then add base register "b".  In the case of "o(b)" addresses,
-	     we simply need to add 16-bit offset "o" to base register "b", and
+	  /* A 12-bit offset field is too narrow to be used for a low-part
+	     relocation, so load the whole address into the auxillary
+	     register.  In the case of "A(b)" addresses, we first load
+	     absolute address "A" into the register and then add base
+	     register "b".  In the case of "o(b)" addresses, we simply
+	     need to add 16-bit offset "o" to base register "b", and
 	     offset_reloc already contains the relocations associated
 	     with "o".  */
 	  if (ab)
@@ -8349,11 +8322,8 @@ macro (struct mips_cl_insn *ip)
 			 tempreg, breg, -1,
 			 offset_reloc[0], offset_reloc[1], offset_reloc[2]);
 	  expr1.X_add_number = 0;
-	  if (off0)
-	    macro_build (NULL, s, fmt, treg, tempreg);
-	  else
-	    macro_build (NULL, s, fmt,
-		         treg, (unsigned long) expr1.X_add_number, tempreg);
+	  macro_build (NULL, s, fmt,
+		       treg, (unsigned long) expr1.X_add_number, tempreg);
 	}
       else if (mips_pic == NO_PIC)
 	{
@@ -9147,22 +9117,6 @@ macro (struct mips_cl_insn *ip)
 	}
       break;
 
-	
-    case M_SAA_AB:
-      ab = 1;
-    case M_SAA_OB:
-      s = "saa";
-      off0 = 1;
-      fmt = "t,(b)";
-      goto ld_st;
-    case M_SAAD_AB:
-      ab = 1;
-    case M_SAAD_OB:
-      s = "saad";
-      off0 = 1;
-      fmt = "t,(b)";
-      goto ld_st;
-
    /* New code added to support COPZ instructions.
       This code builds table entries out of the macros in mip_opcodes.
       R4000 uses interlocks to handle coproc delays.
@@ -9196,7 +9150,7 @@ macro (struct mips_cl_insn *ip)
       if (NO_ISA_COP (mips_opts.arch)
 	  && (ip->insn_mo->pinfo2 & INSN2_M_FP_S) == 0)
 	{
-	  as_bad (_("Opcode not supported on this processor: %s"),
+	  as_bad (_("opcode not supported on this processor: %s"),
 		  mips_cpu_info_from_arch (mips_opts.arch)->name);
 	  break;
 	}
@@ -10493,7 +10447,7 @@ validate_micromips_insn (const struct mips_opcode *opc)
       case 'D': USE_BITS (FD);		break;
       case 'E': USE_BITS (RT);		break;
       case 'G': USE_BITS (RS);		break;
-      case 'H': USE_BITS (SEL);		break;
+      case 'H': USE_BITS (SEL);	break;
       case 'K': USE_BITS (RS);		break;
       case 'M': USE_BITS (CCC);		break;
       case 'N': USE_BITS (BCC);		break;
@@ -10745,7 +10699,7 @@ mips_ip (char *str, struct mips_cl_insn *ip)
 	    return;
 
 	  if (!ok)
-	    sprintf (buf, _("Opcode not supported on this processor: %s (%s)"),
+	    sprintf (buf, _("opcode not supported on this processor: %s (%s)"),
 		     mips_cpu_info_from_arch (mips_opts.arch)->name,
 		     mips_cpu_info_from_isa (mips_opts.isa)->name);
 	  else
@@ -11010,9 +10964,9 @@ mips_ip (char *str, struct mips_cl_insn *ip)
 
 	    case '\\':		/* 3-bit bit position.  */
 	      {
-		unsigned long mask = (mips_opts.micromips
-				      ? MICROMIPSOP_MASK_3BITPOS
-				      : OP_MASK_3BITPOS);
+		unsigned long mask = (!mips_opts.micromips
+				      ? OP_MASK_3BITPOS
+				      : MICROMIPSOP_MASK_3BITPOS);
 
 		my_getExpression (&imm_expr, s);
 		check_absolute_expr (ip, &imm_expr);
@@ -13274,7 +13228,7 @@ mips16_ip (char *str, struct mips_cl_insn *ip)
 		{
 		  static char buf[100];
 		  sprintf (buf,
-			   _("Opcode not supported on this processor: %s (%s)"),
+			   _("opcode not supported on this processor: %s (%s)"),
 			   mips_cpu_info_from_arch (mips_opts.arch)->name,
 			   mips_cpu_info_from_isa (mips_opts.isa)->name);
 		  insn_error = buf;
@@ -14086,14 +14040,7 @@ static const struct percent_op_match mips16_percent_op[] =
   {"%gprel", BFD_RELOC_MIPS16_GPREL},
   {"%got", BFD_RELOC_MIPS16_GOT16},
   {"%call16", BFD_RELOC_MIPS16_CALL16},
-  {"%hi", BFD_RELOC_MIPS16_HI16_S},
-  {"%tlsgd", BFD_RELOC_MIPS16_TLS_GD},
-  {"%tlsldm", BFD_RELOC_MIPS16_TLS_LDM},
-  {"%dtprel_hi", BFD_RELOC_MIPS16_TLS_DTPREL_HI16},
-  {"%dtprel_lo", BFD_RELOC_MIPS16_TLS_DTPREL_LO16},
-  {"%tprel_hi", BFD_RELOC_MIPS16_TLS_TPREL_HI16},
-  {"%tprel_lo", BFD_RELOC_MIPS16_TLS_TPREL_LO16},
-  {"%gottprel", BFD_RELOC_MIPS16_TLS_GOTTPREL}
+  {"%hi", BFD_RELOC_MIPS16_HI16_S}
 };
 
 
@@ -15422,8 +15369,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_MIPS_TLS_DTPREL_HI16:
     case BFD_RELOC_MIPS_TLS_DTPREL_LO16:
     case BFD_RELOC_MIPS_TLS_GOTTPREL:
-    case BFD_RELOC_MIPS_TLS_TPREL32:
-    case BFD_RELOC_MIPS_TLS_TPREL64:
     case BFD_RELOC_MIPS_TLS_TPREL_HI16:
     case BFD_RELOC_MIPS_TLS_TPREL_LO16:
     case BFD_RELOC_MICROMIPS_TLS_GD:
@@ -15433,13 +15378,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_MICROMIPS_TLS_GOTTPREL:
     case BFD_RELOC_MICROMIPS_TLS_TPREL_HI16:
     case BFD_RELOC_MICROMIPS_TLS_TPREL_LO16:
-    case BFD_RELOC_MIPS16_TLS_GD:
-    case BFD_RELOC_MIPS16_TLS_LDM:
-    case BFD_RELOC_MIPS16_TLS_DTPREL_HI16:
-    case BFD_RELOC_MIPS16_TLS_DTPREL_LO16:
-    case BFD_RELOC_MIPS16_TLS_GOTTPREL:
-    case BFD_RELOC_MIPS16_TLS_TPREL_HI16:
-    case BFD_RELOC_MIPS16_TLS_TPREL_LO16:
       S_SET_THREAD_LOCAL (fixP->fx_addsy);
       /* fall through */
 
@@ -15658,18 +15596,11 @@ get_symbol (void)
    fill byte should be used, FILL points to an integer that contains
    that byte, otherwise FILL is null.
 
-   This function used to have the comment:
-
-      The MIPS assembler also automatically adjusts any preceding label.
-
-   The implementation therefore applied the adjustment to a maximum of
-   one label.  However, other label adjustments are applied to batches
-   of labels, and adjusting just one caused problems when new labels
-   were added for the sake of debugging or unwind information.
-   We therefore adjust all preceding labels (given as LABELS) instead.  */
+   The MIPS assembler also automatically adjusts any preceding
+   label.  */
 
 static void
-mips_align (int to, int *fill, struct insn_label_list *labels)
+mips_align (int to, int *fill, symbolS *label)
 {
   mips_emit_delays ();
   mips_record_compressed_mode ();
@@ -15678,7 +15609,12 @@ mips_align (int to, int *fill, struct insn_label_list *labels)
   else
     frag_align (to, fill ? *fill : 0, 0);
   record_alignment (now_seg, to);
-  mips_move_labels (labels, FALSE);
+  if (label != NULL)
+    {
+      gas_assert (S_GET_SEGMENT (label) == now_seg);
+      symbol_set_frag (label, frag_now);
+      S_SET_VALUE (label, (valueT) frag_now_fix ());
+    }
 }
 
 /* Align to a given power of two.  .align 0 turns off the automatic
@@ -15720,7 +15656,7 @@ s_align (int x ATTRIBUTE_UNUSED)
       struct insn_label_list *l = si->label_list;
       /* Auto alignment should be switched on by next section change.  */
       auto_align = 1;
-      mips_align (temp, fill_ptr, l);
+      mips_align (temp, fill_ptr, l != NULL ? l->label : NULL);
     }
   else
     {
@@ -15890,10 +15826,12 @@ s_cons (int log_size)
 {
   segment_info_type *si = seg_info (now_seg);
   struct insn_label_list *l = si->label_list;
+  symbolS *label;
 
+  label = l != NULL ? l->label : NULL;
   mips_emit_delays ();
   if (log_size > 0 && auto_align)
-    mips_align (log_size, 0, l);
+    mips_align (log_size, 0, label);
   cons (1 << log_size);
   mips_clear_insn_labels ();
 }
@@ -15903,15 +15841,18 @@ s_float_cons (int type)
 {
   segment_info_type *si = seg_info (now_seg);
   struct insn_label_list *l = si->label_list;
+  symbolS *label;
+
+  label = l != NULL ? l->label : NULL;
 
   mips_emit_delays ();
 
   if (auto_align)
     {
       if (type == 'd')
-	mips_align (3, 0, l);
+	mips_align (3, 0, label);
       else
-	mips_align (2, 0, l);
+	mips_align (2, 0, label);
     }
 
   float_cons (type);
@@ -16001,7 +15942,7 @@ s_option (int x ATTRIBUTE_UNUSED)
 	mips_pic = NO_PIC;
       else if (i == 2)
 	{
-	  mips_pic = SVR4_PIC;
+	mips_pic = SVR4_PIC;
 	  mips_abicalls = TRUE;
 	}
       else
@@ -16606,14 +16547,12 @@ s_cpreturn (int ignore ATTRIBUTE_UNUSED)
   demand_empty_rest_of_line ();
 }
 
-/* Handle a .dtprelword, .dtpreldword, .tprelword, or .tpreldword
-   pseudo-op; DIRSTR says which. The pseudo-op generates a BYTES-size
-   DTP- or TP-relative relocation of type RTYPE, for use in either DWARF
-   debug information or MIPS16 TLS.  */
+/* Handle the .dtprelword and .dtpreldword pseudo-ops.  They generate
+   a 32-bit or 64-bit DTP-relative relocation (BYTES says which) for
+   use in DWARF debug information.  */
 
 static void
-s_tls_rel_directive (const size_t bytes, const char *dirstr,
-		     bfd_reloc_code_real_type rtype)
+s_dtprel_internal (size_t bytes)
 {
   expressionS ex;
   char *p;
@@ -16622,15 +16561,20 @@ s_tls_rel_directive (const size_t bytes, const char *dirstr,
 
   if (ex.X_op != O_symbol)
     {
-      as_bad (_("Unsupported use of %s"), dirstr);
+      as_bad (_("Unsupported use of %s"), (bytes == 8
+					   ? ".dtpreldword"
+					   : ".dtprelword"));
       ignore_rest_of_line ();
     }
 
   p = frag_more (bytes);
   md_number_to_chars (p, 0, bytes);
-  fix_new_exp (frag_now, p - frag_now->fr_literal, bytes, &ex, FALSE, rtype);
+  fix_new_exp (frag_now, p - frag_now->fr_literal, bytes, &ex, FALSE,
+	       (bytes == 8
+		? BFD_RELOC_MIPS_TLS_DTPREL64
+		: BFD_RELOC_MIPS_TLS_DTPREL32));
+
   demand_empty_rest_of_line ();
-  mips_clear_insn_labels ();
 }
 
 /* Handle .dtprelword.  */
@@ -16638,7 +16582,7 @@ s_tls_rel_directive (const size_t bytes, const char *dirstr,
 static void
 s_dtprelword (int ignore ATTRIBUTE_UNUSED)
 {
-  s_tls_rel_directive (4, ".dtprelword", BFD_RELOC_MIPS_TLS_DTPREL32);
+  s_dtprel_internal (4);
 }
 
 /* Handle .dtpreldword.  */
@@ -16646,23 +16590,7 @@ s_dtprelword (int ignore ATTRIBUTE_UNUSED)
 static void
 s_dtpreldword (int ignore ATTRIBUTE_UNUSED)
 {
-  s_tls_rel_directive (8, ".dtpreldword", BFD_RELOC_MIPS_TLS_DTPREL64);
-}
-
-/* Handle .tprelword.  */
-
-static void
-s_tprelword (int ignore ATTRIBUTE_UNUSED)
-{
-  s_tls_rel_directive (4, ".tprelword", BFD_RELOC_MIPS_TLS_TPREL32);
-}
-
-/* Handle .tpreldword.  */
-
-static void
-s_tpreldword (int ignore ATTRIBUTE_UNUSED)
-{
-  s_tls_rel_directive (8, ".tpreldword", BFD_RELOC_MIPS_TLS_TPREL64);
+  s_dtprel_internal (8);
 }
 
 /* Handle the .gpvalue pseudo-op.  This is used when generating NewABI PIC
@@ -16692,6 +16620,7 @@ s_gpword (int ignore ATTRIBUTE_UNUSED)
 {
   segment_info_type *si;
   struct insn_label_list *l;
+  symbolS *label;
   expressionS ex;
   char *p;
 
@@ -16704,9 +16633,10 @@ s_gpword (int ignore ATTRIBUTE_UNUSED)
 
   si = seg_info (now_seg);
   l = si->label_list;
+  label = l != NULL ? l->label : NULL;
   mips_emit_delays ();
   if (auto_align)
-    mips_align (2, 0, l);
+    mips_align (2, 0, label);
 
   expression (&ex);
   mips_clear_insn_labels ();
@@ -16730,6 +16660,7 @@ s_gpdword (int ignore ATTRIBUTE_UNUSED)
 {
   segment_info_type *si;
   struct insn_label_list *l;
+  symbolS *label;
   expressionS ex;
   char *p;
 
@@ -16742,9 +16673,10 @@ s_gpdword (int ignore ATTRIBUTE_UNUSED)
 
   si = seg_info (now_seg);
   l = si->label_list;
+  label = l != NULL ? l->label : NULL;
   mips_emit_delays ();
   if (auto_align)
-    mips_align (3, 0, l);
+    mips_align (3, 0, label);
 
   expression (&ex);
   mips_clear_insn_labels ();
@@ -18295,7 +18227,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp)
 			 | RELAX_DELAY_SLOT_SIZE_SECOND);
 	  msg = macro_warning (s);
 	  if (msg != NULL)
-	    as_warn_where (fragp->fr_file, fragp->fr_line, "%s", msg);
+	    as_warn_where (fragp->fr_file, fragp->fr_line, msg);
 	  subtype &= ~s;
 	}
 
@@ -18309,7 +18241,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp)
 	       & (RELAX_SECOND_LONGER | RELAX_NOMACRO | RELAX_DELAY_SLOT));
 	  msg = macro_warning (s);
 	  if (msg != NULL)
-	    as_warn_where (fragp->fr_file, fragp->fr_line, "%s", msg);
+	    as_warn_where (fragp->fr_file, fragp->fr_line, msg);
 	  subtype &= ~s;
 	}
 
@@ -18465,7 +18397,7 @@ mips_elf_final_processing (void)
     elf_elfheader (stdoutput)->e_flags |= EF_MIPS_NOREORDER;
   if (mips_pic != NO_PIC)
     {
-      elf_elfheader (stdoutput)->e_flags |= EF_MIPS_PIC;
+    elf_elfheader (stdoutput)->e_flags |= EF_MIPS_PIC;
       elf_elfheader (stdoutput)->e_flags |= EF_MIPS_CPIC;
     }
   if (mips_abicalls)
@@ -19031,10 +18963,6 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "m4kp",           0,			ISA_MIPS32R2,   CPU_MIPS32R2 },
   { "m14k",           MIPS_CPU_ASE_MCU,		ISA_MIPS32R2,   CPU_MIPS32R2 },
   { "m14kc",          MIPS_CPU_ASE_MCU,		ISA_MIPS32R2,   CPU_MIPS32R2 },
-  { "m14ke",          MIPS_CPU_ASE_DSP | MIPS_CPU_ASE_DSPR2 | MIPS_CPU_ASE_MCU,
-						ISA_MIPS32R2,   CPU_MIPS32R2 },
-  { "m14kec",         MIPS_CPU_ASE_DSP | MIPS_CPU_ASE_DSPR2 | MIPS_CPU_ASE_MCU,
-						ISA_MIPS32R2,   CPU_MIPS32R2 },
   { "24kc",           0,			ISA_MIPS32R2,   CPU_MIPS32R2 },
   { "24kf2_1",        0,			ISA_MIPS32R2,   CPU_MIPS32R2 },
   { "24kf",           0,			ISA_MIPS32R2,   CPU_MIPS32R2 },
@@ -19109,17 +19037,10 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
 
   /* Cavium Networks Octeon CPU core */
   { "octeon",	      0,      ISA_MIPS64R2,   CPU_OCTEON },
-  { "octeon+",	      0,      ISA_MIPS64R2,   CPU_OCTEONP },
-  { "octeon2",	      0,      ISA_MIPS64R2,   CPU_OCTEON2 },
 
   /* RMI Xlr */
   { "xlr",	      0,      ISA_MIPS64,     CPU_XLR },
 
-  /* Broadcom XLP.
-     XLP is mostly like XLR, with the prominent exception that it is
-     MIPS64R2 rather than MIPS64.  */
-  { "xlp",	      0,      ISA_MIPS64R2,     CPU_XLR },
-
   /* End marker */
   { NULL, 0, 0, 0 }
 };
diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
index 76280c114b..f9bf78b845 100644
--- a/gas/config/tc-mn10200.c
+++ b/gas/config/tc-mn10200.c
@@ -481,7 +481,6 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
 	  break;
 	case 0xff:
 	  opcode = 0xfe;
-	  break;
 	case 0xe8:
 	  opcode = 0xe9;
 	  break;
diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index 4029c641b6..0a4f26cb59 100644
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -281,8 +281,6 @@ static const struct reg_name other_registers[] =
   { "pc", AM33 },
   { "psw", 0 },
   { "sp", 0 },
-  { "ssp", 0 },
-  { "usp", 0 },
 };
 
 #define OTHER_REG_NAME_CNT	ARRAY_SIZE (other_registers)
@@ -2065,12 +2063,6 @@ keep_going:
 	      && fixups[i].reloc != BFD_RELOC_32_GOT_PCREL
 	      && fixups[i].reloc != BFD_RELOC_32_GOTOFF
 	      && fixups[i].reloc != BFD_RELOC_32_PLT_PCREL
-	      && fixups[i].reloc != BFD_RELOC_MN10300_TLS_GD
-	      && fixups[i].reloc != BFD_RELOC_MN10300_TLS_LD
-	      && fixups[i].reloc != BFD_RELOC_MN10300_TLS_LDO
-	      && fixups[i].reloc != BFD_RELOC_MN10300_TLS_GOTIE
-	      && fixups[i].reloc != BFD_RELOC_MN10300_TLS_IE
-	      && fixups[i].reloc != BFD_RELOC_MN10300_TLS_LE
 	      && fixups[i].reloc != BFD_RELOC_MN10300_GOT32)
 	    {
 	      reloc_howto_type *reloc_howto;
@@ -2509,18 +2501,6 @@ mn10300_parse_name (char const *name,
     reloc_type = BFD_RELOC_MN10300_GOT32;
   else if ((next_end = mn10300_end_of_match (next + 1, "PLT")))
     reloc_type = BFD_RELOC_32_PLT_PCREL;
-  else if ((next_end = mn10300_end_of_match (next + 1, "tlsgd")))
-    reloc_type = BFD_RELOC_MN10300_TLS_GD;
-  else if ((next_end = mn10300_end_of_match (next + 1, "tlsldm")))
-    reloc_type = BFD_RELOC_MN10300_TLS_LD;
-  else if ((next_end = mn10300_end_of_match (next + 1, "dtpoff")))
-    reloc_type = BFD_RELOC_MN10300_TLS_LDO;
-  else if ((next_end = mn10300_end_of_match (next + 1, "gotntpoff")))
-    reloc_type = BFD_RELOC_MN10300_TLS_GOTIE;
-  else if ((next_end = mn10300_end_of_match (next + 1, "indntpoff")))
-    reloc_type = BFD_RELOC_MN10300_TLS_IE;
-  else if ((next_end = mn10300_end_of_match (next + 1, "tpoff")))
-    reloc_type = BFD_RELOC_MN10300_TLS_LE;
   else
     goto no_suffix;
 
diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
index 709a9bc18b..aaebde4348 100644
--- a/gas/config/tc-ns32k.c
+++ b/gas/config/tc-ns32k.c
@@ -1896,7 +1896,7 @@ md_begin (void)
 {
   /* Build a hashtable of the instructions.  */
   const struct ns32k_opcode *ptr;
-  const char *status;
+  const char *stat;
   const struct ns32k_opcode *endop;
 
   inst_hash_handle = hash_new ();
@@ -1904,9 +1904,9 @@ md_begin (void)
   endop = ns32k_opcodes + sizeof (ns32k_opcodes) / sizeof (ns32k_opcodes[0]);
   for (ptr = ns32k_opcodes; ptr < endop; ptr++)
     {
-      if ((status = hash_insert (inst_hash_handle, ptr->name, (char *) ptr)))
+      if ((stat = hash_insert (inst_hash_handle, ptr->name, (char *) ptr)))
 	/* Fatal.  */
-	as_fatal (_("Can't hash %s: %s"), ptr->name, status);
+	as_fatal (_("Can't hash %s: %s"), ptr->name, stat);
     }
 
   /* Some private space please!  */
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 0e7f017932..aba70975b3 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1,6 +1,6 @@
 /* tc-ppc.c -- Assemble for the PowerPC or POWER (RS/6000)
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
@@ -1265,8 +1265,6 @@ PowerPC options:\n\
 -me500, -me500x2        generate code for Motorola e500 core complex\n\
 -me500mc,               generate code for Freescale e500mc core complex\n\
 -me500mc64,             generate code for Freescale e500mc64 core complex\n\
--me5500,                generate code for Freescale e5500 core complex\n\
--me6500,                generate code for Freescale e6500 core complex\n\
 -mspe                   generate code for Motorola SPE instructions\n\
 -mtitan                 generate code for AppliedMicro Titan core complex\n\
 -mregnames              Allow symbolic names for registers\n\
@@ -1365,16 +1363,14 @@ ppc_target_format (void)
   return "xcoff-powermac";
 #else
 #  ifdef TE_AIX5
-  return (ppc_obj64 ? "aix5coff64-rs6000" : "aixcoff-rs6000");
+    return (ppc_obj64 ? "aix5coff64-rs6000" : "aixcoff-rs6000");
 #  else
-  return (ppc_obj64 ? "aixcoff64-rs6000" : "aixcoff-rs6000");
+    return (ppc_obj64 ? "aixcoff64-rs6000" : "aixcoff-rs6000");
 #  endif
 #endif
 #endif
 #ifdef OBJ_ELF
-# ifdef TE_FreeBSD
-  return (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd");
-# elif defined (TE_VXWORKS)
+# ifdef TE_VXWORKS
   return "elf32-powerpc-vxworks";
 # else
   return (target_big_endian
@@ -6016,14 +6012,8 @@ ppc_handle_align (struct frag *fragP)
 	    }
 
 	  if ((ppc_cpu & PPC_OPCODE_POWER7) != 0)
-	    {
-	      if (ppc_cpu & PPC_OPCODE_E500MC)
-		/* e500mc group terminating nop: "ori 0,0,0".  */
-		md_number_to_chars (dest, 0x60000000, 4);
-	      else
-		/* power7 group terminating nop: "ori 2,2,0".  */
-		md_number_to_chars (dest, 0x60420000, 4);
-	    }
+	    /* power7 group terminating nop: "ori 2,2,0".  */
+	    md_number_to_chars (dest, 0x60420000, 4);
 	  else
 	    /* power6 group terminating nop: "ori 1,1,0".  */
 	    md_number_to_chars (dest, 0x60210000, 4);
diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c
index 4fa0f6737a..56cda15417 100644
--- a/gas/config/tc-rx.c
+++ b/gas/config/tc-rx.c
@@ -1,5 +1,5 @@
 /* tc-rx.c -- Assembler for the Renesas RX
-   Copyright 2008, 2009, 2010, 2011
+   Copyright 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -51,11 +51,6 @@ static int elf_flags = 0;
 bfd_boolean rx_use_conventional_section_names = FALSE;
 static bfd_boolean rx_use_small_data_limit = FALSE;
 
-static bfd_boolean rx_pid_mode = FALSE;
-static int rx_num_int_regs = 0;
-int rx_pid_register;
-int rx_gp_register;
-
 enum options
 {
   OPTION_BIG = OPTION_MD_BASE,
@@ -65,9 +60,7 @@ enum options
   OPTION_CONVENTIONAL_SECTION_NAMES,
   OPTION_RENESAS_SECTION_NAMES,
   OPTION_SMALL_DATA_LIMIT,
-  OPTION_RELAX,
-  OPTION_PID,
-  OPTION_INT_REGS,
+  OPTION_RELAX
 };
 
 #define RX_SHORTOPTS ""
@@ -90,8 +83,6 @@ struct option md_longopts[] =
   {"muse-renesas-section-names", no_argument, NULL, OPTION_RENESAS_SECTION_NAMES},
   {"msmall-data-limit", no_argument, NULL, OPTION_SMALL_DATA_LIMIT},
   {"relax", no_argument, NULL, OPTION_RELAX},
-  {"mpid", no_argument, NULL, OPTION_PID},
-  {"mint-register", required_argument, NULL, OPTION_INT_REGS},
   {NULL, no_argument, NULL, 0}
 };
 size_t md_longopts_size = sizeof (md_longopts);
@@ -132,15 +123,6 @@ md_parse_option (int c ATTRIBUTE_UNUSED, char * arg ATTRIBUTE_UNUSED)
     case OPTION_RELAX:
       linkrelax = 1;
       return 1;
-
-    case OPTION_PID:
-      rx_pid_mode = TRUE;
-      elf_flags |= E_FLAG_RX_PID;
-      return 1;
-
-    case OPTION_INT_REGS:
-      rx_num_int_regs = atoi (optarg);
-      return 1;
     }
   return 0;
 }
@@ -156,9 +138,6 @@ md_show_usage (FILE * stream)
   fprintf (stream, _("  --muse-conventional-section-names\n"));
   fprintf (stream, _("  --muse-renesas-section-names [default]\n"));
   fprintf (stream, _("  --msmall-data-limit\n"));
-  fprintf (stream, _("  --mrelax\n"));
-  fprintf (stream, _("  --mpid\n"));
-  fprintf (stream, _("  --mint-register=<value>\n"));
 }
 
 static void
@@ -605,44 +584,16 @@ const pseudo_typeS md_pseudo_table[] =
 };
 
 static asymbol * gp_symbol;
-static asymbol * rx_pid_symbol;
-
-static symbolS * rx_pidreg_symbol;
-static symbolS * rx_gpreg_symbol;
 
 void
 md_begin (void)
 {
-  /* Make the __gp and __pid_base symbols now rather
-     than after the symbol table is frozen.  We only do this
-     when supporting small data limits because otherwise we
-     pollute the symbol table.  */
-
-  /* The meta-registers %pidreg and %gpreg depend on what other
-     options are specified.  The __rx_*_defined symbols exist so we
-     can .ifdef asm code based on what options were passed to gas,
-     without needing a preprocessor  */
-
-  if (rx_pid_mode)
-    {
-      rx_pid_register = 13 - rx_num_int_regs;
-      rx_pid_symbol = symbol_get_bfdsym (symbol_find_or_make ("__pid_base"));
-      rx_pidreg_symbol = symbol_find_or_make ("__rx_pidreg_defined");
-      S_SET_VALUE (rx_pidreg_symbol, rx_pid_register);
-      S_SET_SEGMENT (rx_pidreg_symbol, absolute_section);
-    }
-
   if (rx_use_small_data_limit)
-    {
-      if (rx_pid_mode)
-	rx_gp_register = rx_pid_register - 1;
-      else
-	rx_gp_register = 13 - rx_num_int_regs;
-      gp_symbol = symbol_get_bfdsym (symbol_find_or_make ("__gp"));
-      rx_gpreg_symbol = symbol_find_or_make ("__rx_gpreg_defined");
-      S_SET_VALUE (rx_gpreg_symbol, rx_gp_register);
-      S_SET_SEGMENT (rx_gpreg_symbol, absolute_section);
-    }
+    /* Make the __gp symbol now rather
+       than after the symbol table is frozen.  We only do this
+       when supporting small data limits because otherwise we
+       pollute the symbol table.  */
+    gp_symbol = symbol_get_bfdsym (symbol_find_or_make ("__gp"));
 }
 
 char * rx_lex_start;
@@ -1199,7 +1150,7 @@ rx_handle_align (fragS * frag)
       && subseg_text_p (now_seg))
     {
       int count = (frag->fr_next->fr_address
-		   - frag->fr_address
+		   - frag->fr_address	
 		   - frag->fr_fix);
       unsigned char *base = (unsigned char *)frag->fr_literal + frag->fr_fix;
 
@@ -2271,10 +2222,10 @@ md_apply_fix (struct fix * f ATTRIBUTE_UNUSED,
 }
 
 arelent **
-tc_gen_reloc (asection * sec ATTRIBUTE_UNUSED, fixS * fixp)
+tc_gen_reloc (asection * seg ATTRIBUTE_UNUSED, fixS * fixp)
 {
   static arelent * reloc[5];
-  bfd_boolean is_opcode = FALSE;
+  int is_opcode = 0;
 
   if (fixp->fx_r_type == BFD_RELOC_NONE)
     {
@@ -2299,11 +2250,9 @@ tc_gen_reloc (asection * sec ATTRIBUTE_UNUSED, fixS * fixp)
       && fixp->fx_subsy)
     {
       fixp->fx_r_type = BFD_RELOC_RX_DIFF;
-      is_opcode = TRUE;
+      is_opcode = 1;
     }
-  else if (sec)
-    is_opcode = sec->flags & SEC_CODE;
-      
+
   /* Certain BFD relocations cannot be translated directly into
      a single (non-Red Hat) RX relocation, but instead need
      multiple RX relocations - handle them here.  */
@@ -2334,8 +2283,6 @@ tc_gen_reloc (asection * sec ATTRIBUTE_UNUSED, fixS * fixp)
 	case 2:
 	  if (!is_opcode && target_big_endian)
 	    reloc[3]->howto   = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_RX_ABS16_REV);
-	  else if (is_opcode)
-	    reloc[3]->howto   = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_RX_ABS16UL);
 	  else
 	    reloc[3]->howto   = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_RX_ABS16);
 	  break;
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 4db1a09136..15a4128380 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -1,6 +1,6 @@
 /* tc-sh.c -- Assemble code for the Renesas / SuperH SH
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -789,9 +789,11 @@ sh_cons_fix_new (fragS *frag, int off, int size, expressionS *exp)
 	r_type = BFD_RELOC_32;
 	break;
 
+#ifdef HAVE_SH64
       case 8:
 	r_type = BFD_RELOC_64;
 	break;
+#endif
 
       default:
 	goto error;
@@ -3966,11 +3968,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
      the other symbol.  We have to adjust the relocation type here.  */
   if (fixP->fx_pcrel)
     {
-#ifndef HAVE_SH64
-      /* Safeguard; this must not occur for non-sh64 configurations.  */
-      gas_assert (fixP->fx_r_type != BFD_RELOC_64);
-#endif
-
       switch (fixP->fx_r_type)
 	{
 	default:
@@ -4169,12 +4166,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
       buf[highbyte] |= (val >> 8) & 0xf;
       break;
 
-#ifndef HAVE_SH64
-    case BFD_RELOC_64:
-      apply_full_field_fix (fixP, buf, *valP, 8);
-      break;
-#endif
-
     case BFD_RELOC_32:
     case BFD_RELOC_32_PCREL:
       apply_full_field_fix (fixP, buf, val, 4);
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index f453733067..77fda56b8a 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -3193,12 +3193,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT segment ATTRIBUTE_UNUSED)
 
   /* If this is a data relocation, just output VAL.  */
 
-  if (fixP->fx_r_type == BFD_RELOC_8)
-    {
-      md_number_to_chars (buf, val, 1);
-    }
-  else if (fixP->fx_r_type == BFD_RELOC_16
-	   || fixP->fx_r_type == BFD_RELOC_SPARC_UA16)
+  if (fixP->fx_r_type == BFD_RELOC_16
+      || fixP->fx_r_type == BFD_RELOC_SPARC_UA16)
     {
       md_number_to_chars (buf, val, 2);
     }
diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index fd6cec7f82..60f7fb41a7 100644
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -1,6 +1,6 @@
 /* tc-tic4x.c -- Assemble for the Texas Instruments TMS320C[34]x.
-   Copyright (C) 1997,1998, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010,
-   2012 Free Software Foundation. Inc.
+   Copyright (C) 1997,1998, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation. Inc.
 
    Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz)
 
@@ -2955,11 +2955,13 @@ md_pcrel_from (fixS *fixP)
 /* Fill the alignment area with NOP's on .text, unless fill-data
    was specified. */
 int 
-tic4x_do_align (int alignment,
-		const char *fill,
-		int len,
-		int max)
+tic4x_do_align (int alignment ATTRIBUTE_UNUSED,
+		const char *fill ATTRIBUTE_UNUSED,
+		int len ATTRIBUTE_UNUSED,
+		int max ATTRIBUTE_UNUSED)
 {
+  unsigned long nop = TIC_NOP_OPCODE;
+
   /* Because we are talking lwords, not bytes, adjust alignment to do words */
   alignment += 2;
   
@@ -2967,17 +2969,11 @@ tic4x_do_align (int alignment,
     {
       if (fill == NULL)
         {
-	  /* FIXME: subseg_text_p tests SEC_CODE which isn't in allowed
-	     section flags.  See bfd/coff-tic4x.c target vecs.  */
-          if (1 || subseg_text_p (now_seg))
-	    {
-	      char nop[4];
-
-	      md_number_to_chars (nop, TIC_NOP_OPCODE, 4);
-	      frag_align_pattern (alignment, nop, sizeof (nop), max);
-	    }
-          else
-            frag_align (alignment, 0, max);
+          /*if (subseg_text_p (now_seg))*/  /* FIXME: doesn't work for .text for some reason */
+          frag_align_pattern( alignment, (const char *)&nop, sizeof(nop), max);
+          return 1;
+          /*else
+            frag_align (alignment, 0, max);*/
 	}
       else if (len <= 1)
 	frag_align (alignment, *fill, max);
diff --git a/gas/config/tc-tilegx.c b/gas/config/tc-tilegx.c
index b2d94205be..2f4d79c601 100644
--- a/gas/config/tc-tilegx.c
+++ b/gas/config/tc-tilegx.c
@@ -72,18 +72,12 @@ static int tilegx_arch_size = 64;
 const char *
 tilegx_target_format (void)
 {
-    if (target_big_endian) {
-        return tilegx_arch_size == 64 ? "elf64-tilegx-be" : "elf32-tilegx-be";
-    } else {
-        return tilegx_arch_size == 64 ? "elf64-tilegx-le" : "elf32-tilegx-le";
-    }
+  return tilegx_arch_size == 64 ? "elf64-tilegx" : "elf32-tilegx";
 }
 
 
 #define OPTION_32 (OPTION_MD_BASE + 0)
 #define OPTION_64 (OPTION_MD_BASE + 1)
-#define OPTION_EB (OPTION_MD_BASE + 2)
-#define OPTION_EL (OPTION_MD_BASE + 3)
 
 const char *md_shortopts = "VQ:";
 
@@ -91,8 +85,6 @@ struct option md_longopts[] =
 {
   {"32", no_argument, NULL, OPTION_32},
   {"64", no_argument, NULL, OPTION_64},
-  {"EB", no_argument, NULL, OPTION_EB },
-  {"EL", no_argument, NULL, OPTION_EL },
   {NULL, no_argument, NULL, 0}
 };
 
@@ -121,14 +113,6 @@ md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
       tilegx_arch_size = 64;
       break;
 
-    case OPTION_EB:
-      target_big_endian = 1;
-      break;
-
-    case OPTION_EL:
-      target_big_endian = 0;
-      break;
-
     default:
       return 0;
     }
@@ -142,7 +126,6 @@ md_show_usage (FILE *stream)
   fprintf (stream, _("\
   -Q                      ignored\n\
   -V                      print assembler version number\n\
-  -EB/-EL                 generate big-endian/little-endian code\n\
   --32/--64               generate 32bit/64bit code\n"));
 }
 
@@ -157,22 +140,27 @@ md_show_usage (FILE *stream)
 #define O_hw1_last		O_md6
 #define O_hw2_last		O_md7
 #define O_hw0_got		O_md8
-#define O_hw0_last_got		O_md9
-#define O_hw1_last_got		O_md10
-#define O_plt		   	O_md11
-#define O_hw0_tls_gd		O_md12
-#define O_hw0_last_tls_gd	O_md13
-#define O_hw1_last_tls_gd	O_md14
-#define O_hw0_tls_ie		O_md15
-#define O_hw0_last_tls_ie	O_md16
-#define O_hw1_last_tls_ie	O_md17
-#define O_hw0_tls_le		O_md18
-#define O_hw0_last_tls_le	O_md19
-#define O_hw1_last_tls_le	O_md20
-#define O_tls_gd_call		O_md21
-#define O_tls_gd_add		O_md22
-#define O_tls_ie_load		O_md23
-#define O_tls_add		O_md24
+#define O_hw1_got		O_md9
+#define O_hw2_got		O_md10
+#define O_hw3_got		O_md11
+#define O_hw0_last_got		O_md12
+#define O_hw1_last_got		O_md13
+#define O_hw2_last_got		O_md14
+#define O_plt		   	O_md15
+#define O_hw0_tls_gd		O_md16
+#define O_hw1_tls_gd		O_md17
+#define O_hw2_tls_gd		O_md18
+#define O_hw3_tls_gd		O_md19
+#define O_hw0_last_tls_gd	O_md20
+#define O_hw1_last_tls_gd	O_md21
+#define O_hw2_last_tls_gd	O_md22
+#define O_hw0_tls_ie		O_md23
+#define O_hw1_tls_ie		O_md24
+#define O_hw2_tls_ie		O_md25
+#define O_hw3_tls_ie		O_md26
+#define O_hw0_last_tls_ie	O_md27
+#define O_hw1_last_tls_ie	O_md28
+#define O_hw2_last_tls_ie	O_md29
 
 static struct hash_control *special_operator_hash;
 
@@ -253,10 +241,6 @@ md_begin (void)
 {
   const struct tilegx_opcode *op;
   int i;
-  int mach = (tilegx_arch_size == 64) ? bfd_mach_tilegx : bfd_mach_tilegx32;
-
-  if (! bfd_set_arch_mach (stdoutput, bfd_arch_tilegx, mach))
-    as_warn (_("Could not set architecture and machine"));
 
   /* Guarantee text section is aligned.  */
   bfd_set_section_alignment (stdoutput, text_section,
@@ -284,22 +268,27 @@ md_begin (void)
   /* hw3_last is a convenience alias for the equivalent hw3.  */
   hash_insert (special_operator_hash, "hw3_last", (void*)O_hw3);
   INSERT_SPECIAL_OP (hw0_got);
+  INSERT_SPECIAL_OP (hw1_got);
+  INSERT_SPECIAL_OP (hw2_got);
+  INSERT_SPECIAL_OP (hw3_got);
   INSERT_SPECIAL_OP (hw0_last_got);
   INSERT_SPECIAL_OP (hw1_last_got);
+  INSERT_SPECIAL_OP (hw2_last_got);
   INSERT_SPECIAL_OP(plt);
   INSERT_SPECIAL_OP (hw0_tls_gd);
+  INSERT_SPECIAL_OP (hw1_tls_gd);
+  INSERT_SPECIAL_OP (hw2_tls_gd);
+  INSERT_SPECIAL_OP (hw3_tls_gd);
   INSERT_SPECIAL_OP (hw0_last_tls_gd);
   INSERT_SPECIAL_OP (hw1_last_tls_gd);
+  INSERT_SPECIAL_OP (hw2_last_tls_gd);
   INSERT_SPECIAL_OP (hw0_tls_ie);
+  INSERT_SPECIAL_OP (hw1_tls_ie);
+  INSERT_SPECIAL_OP (hw2_tls_ie);
+  INSERT_SPECIAL_OP (hw3_tls_ie);
   INSERT_SPECIAL_OP (hw0_last_tls_ie);
   INSERT_SPECIAL_OP (hw1_last_tls_ie);
-  INSERT_SPECIAL_OP (hw0_tls_le);
-  INSERT_SPECIAL_OP (hw0_last_tls_le);
-  INSERT_SPECIAL_OP (hw1_last_tls_le);
-  INSERT_SPECIAL_OP (tls_gd_call);
-  INSERT_SPECIAL_OP (tls_gd_add);
-  INSERT_SPECIAL_OP (tls_ie_load);
-  INSERT_SPECIAL_OP (tls_add);
+  INSERT_SPECIAL_OP (hw2_last_tls_ie);
 #undef INSERT_SPECIAL_OP
 
   /* Initialize op_hash hash table.  */
@@ -433,27 +422,41 @@ apply_special_operator (operatorT op, offsetT num, char *file, unsigned lineno)
 
   switch (op)
     {
+    case O_hw0_last_tls_gd:
+    case O_hw0_last_tls_ie:
     case O_hw0_last:
       check_shift = 0;
       /* Fall through.  */
+    case O_hw0_tls_gd:
+    case O_hw0_tls_ie:
     case O_hw0:
       ret = (signed short)num;
       break;
 
+    case O_hw1_last_tls_gd:
+    case O_hw1_last_tls_ie:
     case O_hw1_last:
       check_shift = 16;
       /* Fall through.  */
+    case O_hw1_tls_gd:
+    case O_hw1_tls_ie:
     case O_hw1:
       ret = (signed short)(num >> 16);
       break;
 
+    case O_hw2_last_tls_gd:
+    case O_hw2_last_tls_ie:
     case O_hw2_last:
       check_shift = 32;
       /* Fall through.  */
+    case O_hw2_tls_gd:
+    case O_hw2_tls_ie:
     case O_hw2:
       ret = (signed short)(num >> 32);
       break;
 
+    case O_hw3_tls_gd:
+    case O_hw3_tls_ie:
     case O_hw3:
       ret = (signed short)(num >> 48);
       break;
@@ -556,6 +559,21 @@ emit_tilegx_instruction (tilegx_bundle_bits bits,
 	      require_symbol = 1;
 	      break;
 
+	    case O_hw1_got:
+	      HANDLE_OP16 (HW1_GOT);
+	      require_symbol = 1;
+	      break;
+
+	    case O_hw2_got:
+	      HANDLE_OP16 (HW2_GOT);
+	      require_symbol = 1;
+	      break;
+
+	    case O_hw3_got:
+	      HANDLE_OP16 (HW3_GOT);
+	      require_symbol = 1;
+	      break;
+
 	    case O_hw0_last_got:
 	      HANDLE_OP16 (HW0_LAST_GOT);
 	      require_symbol = 1;
@@ -566,132 +584,88 @@ emit_tilegx_instruction (tilegx_bundle_bits bits,
 	      require_symbol = 1;
 	      break;
 
+	    case O_hw2_last_got:
+	      HANDLE_OP16 (HW2_LAST_GOT);
+	      require_symbol = 1;
+	      break;
+
 	    case O_hw0_tls_gd:
 	      HANDLE_OP16 (HW0_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw0_last_tls_gd:
-	      HANDLE_OP16 (HW0_LAST_TLS_GD);
+	    case O_hw1_tls_gd:
+	      HANDLE_OP16 (HW1_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw1_last_tls_gd:
-	      HANDLE_OP16 (HW1_LAST_TLS_GD);
+	    case O_hw2_tls_gd:
+	      HANDLE_OP16 (HW2_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw0_tls_ie:
-	      HANDLE_OP16 (HW0_TLS_IE);
+	    case O_hw3_tls_gd:
+	      HANDLE_OP16 (HW3_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw0_last_tls_ie:
-	      HANDLE_OP16 (HW0_LAST_TLS_IE);
+	    case O_hw0_last_tls_gd:
+	      HANDLE_OP16 (HW0_LAST_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw1_last_tls_ie:
-	      HANDLE_OP16 (HW1_LAST_TLS_IE);
+	    case O_hw1_last_tls_gd:
+	      HANDLE_OP16 (HW1_LAST_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw0_tls_le:
-	      HANDLE_OP16 (HW0_TLS_LE);
+	    case O_hw2_last_tls_gd:
+	      HANDLE_OP16 (HW2_LAST_TLS_GD);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw0_last_tls_le:
-	      HANDLE_OP16 (HW0_LAST_TLS_LE);
+	    case O_hw0_tls_ie:
+	      HANDLE_OP16 (HW0_TLS_IE);
 	      require_symbol = 1;
 	      break;
 
-	    case O_hw1_last_tls_le:
-	      HANDLE_OP16 (HW1_LAST_TLS_LE);
+	    case O_hw1_tls_ie:
+	      HANDLE_OP16 (HW1_TLS_IE);
 	      require_symbol = 1;
 	      break;
 
-#undef HANDLE_OP16
+	    case O_hw2_tls_ie:
+	      HANDLE_OP16 (HW2_TLS_IE);
+	      require_symbol = 1;
+	      break;
 
-	    case O_plt:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEGX_JUMPOFF_X1:
-		  reloc = BFD_RELOC_TILEGX_JUMPOFF_X1_PLT;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
+	    case O_hw3_tls_ie:
+	      HANDLE_OP16 (HW3_TLS_IE);
 	      require_symbol = 1;
 	      break;
 
-	    case O_tls_gd_call:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEGX_JUMPOFF_X1:
-		  reloc = BFD_RELOC_TILEGX_TLS_GD_CALL;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
+	    case O_hw0_last_tls_ie:
+	      HANDLE_OP16 (HW0_LAST_TLS_IE);
 	      require_symbol = 1;
 	      break;
 
-	    case O_tls_gd_add:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEGX_IMM8_X0:
-		  reloc = BFD_RELOC_TILEGX_IMM8_X0_TLS_GD_ADD;
-		  break;
-		case BFD_RELOC_TILEGX_IMM8_X1:
-		  reloc = BFD_RELOC_TILEGX_IMM8_X1_TLS_GD_ADD;
-		  break;
-		case BFD_RELOC_TILEGX_IMM8_Y0:
-		  reloc = BFD_RELOC_TILEGX_IMM8_Y0_TLS_GD_ADD;
-		  break;
-		case BFD_RELOC_TILEGX_IMM8_Y1:
-		  reloc = BFD_RELOC_TILEGX_IMM8_Y1_TLS_GD_ADD;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
+	    case O_hw1_last_tls_ie:
+	      HANDLE_OP16 (HW1_LAST_TLS_IE);
 	      require_symbol = 1;
 	      break;
 
-	    case O_tls_ie_load:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEGX_IMM8_X1:
-		  reloc = BFD_RELOC_TILEGX_TLS_IE_LOAD;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
+	    case O_hw2_last_tls_ie:
+	      HANDLE_OP16 (HW2_LAST_TLS_IE);
 	      require_symbol = 1;
 	      break;
 
-	    case O_tls_add:
+#undef HANDLE_OP16
+
+	    case O_plt:
 	      switch (reloc)
 		{
-		case BFD_RELOC_TILEGX_IMM8_X0:
-		  reloc = BFD_RELOC_TILEGX_IMM8_X0_TLS_ADD;
-		  break;
-		case BFD_RELOC_TILEGX_IMM8_X1:
-		  reloc = BFD_RELOC_TILEGX_IMM8_X1_TLS_ADD;
-		  break;
-		case BFD_RELOC_TILEGX_IMM8_Y0:
-		  reloc = BFD_RELOC_TILEGX_IMM8_Y0_TLS_ADD;
-		  break;
-		case BFD_RELOC_TILEGX_IMM8_Y1:
-		  reloc = BFD_RELOC_TILEGX_IMM8_Y1_TLS_ADD;
+		case BFD_RELOC_TILEGX_JUMPOFF_X1:
+		  reloc = BFD_RELOC_TILEGX_JUMPOFF_X1_PLT;
 		  break;
 		default:
 		  die = 1;
@@ -715,22 +689,17 @@ emit_tilegx_instruction (tilegx_bundle_bits bits,
 	      /* Now that we've changed the reloc, change ha16(x) into x,
 		 etc.  */
 
-	      if (!operand_exp->X_add_symbol->sy_flags.sy_local_symbol
-                  && operand_exp->X_add_symbol->sy_value.X_md)
+	      if (operand_exp->X_add_symbol->sy_value.X_md)
 		{
+		  if (require_symbol)
+		    {
+		      as_bad (_("Operator may only be applied to symbols."));
+		    }
+
 		  /* HACK: We used X_md to mark this symbol as a fake wrapper
 		     around a real expression. To unwrap it, we just grab its
 		     value here.  */
 		  operand_exp = &operand_exp->X_add_symbol->sy_value;
-
-		  if (require_symbol)
-		    {
-		      /* Look at the expression, and reject it if it's not a
-			 plain symbol.  */
-		      if (operand_exp->X_op != O_symbol
-			  || operand_exp->X_add_number != 0)
-			as_bad (_("Operator may only be applied to symbols."));
-		    }
 		}
 	      else
 		{
@@ -1292,15 +1261,6 @@ const pseudo_typeS md_pseudo_table[] =
 /* Equal to MAX_PRECISION in atof-ieee.c  */
 #define MAX_LITTLENUMS 6
 
-void
-md_number_to_chars (char * buf, valueT val, int n)
-{
-  if (target_big_endian)
-    number_to_chars_bigendian (buf, val, n);
-  else
-    number_to_chars_littleendian (buf, val, n);
-}
-
 /* Turn the string pointed to by litP into a floating point constant
    of type TYPE, and emit the appropriate bytes.  The number of
    LITTLENUMS emitted is stored in *SIZEP.  An error message is
@@ -1506,34 +1466,34 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 #ifdef OBJ_ELF
       switch (fixP->fx_r_type)
 	{
-	case BFD_RELOC_TILEGX_IMM8_X0_TLS_ADD:
-	case BFD_RELOC_TILEGX_IMM8_X1_TLS_ADD:
-	case BFD_RELOC_TILEGX_IMM8_Y0_TLS_ADD:
-	case BFD_RELOC_TILEGX_IMM8_Y1_TLS_ADD:
-	case BFD_RELOC_TILEGX_IMM8_X0_TLS_GD_ADD:
-	case BFD_RELOC_TILEGX_IMM8_X1_TLS_GD_ADD:
-	case BFD_RELOC_TILEGX_IMM8_Y0_TLS_GD_ADD:
-	case BFD_RELOC_TILEGX_IMM8_Y1_TLS_GD_ADD:
 	case BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD:
 	case BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD:
-	case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
-	case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
-	case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
-	case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
 	case BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE:
 	case BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
 	case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
 	case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
 	case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
 	case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
-	case BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_LE:
-	case BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_LE:
-	case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_LE:
-	case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_LE:
-	case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_LE:
-	case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_LE:
-	case BFD_RELOC_TILEGX_TLS_GD_CALL:
-	case BFD_RELOC_TILEGX_TLS_IE_LOAD:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD:
+	case BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE:
+	case BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE:
 	case BFD_RELOC_TILEGX_TLS_DTPMOD64:
 	case BFD_RELOC_TILEGX_TLS_DTPOFF64:
 	case BFD_RELOC_TILEGX_TLS_TPOFF64:
@@ -1560,6 +1520,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW0:
     case BFD_RELOC_TILEGX_IMM16_X0_HW0_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW0_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW0_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE:
       special = O_hw0;
       break;
 
@@ -1568,6 +1534,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST:
     case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
       special = O_hw0_last;
       break;
 
@@ -1576,6 +1548,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW1:
     case BFD_RELOC_TILEGX_IMM16_X0_HW1_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW1_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE:
       special = O_hw1;
       break;
 
@@ -1584,6 +1562,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST:
     case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
       special = O_hw1_last;
       break;
 
@@ -1592,6 +1576,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW2:
     case BFD_RELOC_TILEGX_IMM16_X0_HW2_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW2_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE:
       special = O_hw2;
       break;
 
@@ -1600,6 +1590,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST:
     case BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
       special = O_hw2_last;
       break;
 
@@ -1608,6 +1604,12 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_TILEGX_IMM16_X1_HW3:
     case BFD_RELOC_TILEGX_IMM16_X0_HW3_PCREL:
     case BFD_RELOC_TILEGX_IMM16_X1_HW3_PCREL:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD:
+    case BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE:
+    case BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE:
       special = O_hw3;
       break;
 
diff --git a/gas/config/tc-tilegx.h b/gas/config/tc-tilegx.h
index ec8a40d001..aad63138fe 100644
--- a/gas/config/tc-tilegx.h
+++ b/gas/config/tc-tilegx.h
@@ -24,9 +24,7 @@
 
 #define TC_TILEGX
 
-#ifndef TARGET_BYTES_BIG_ENDIAN
 #define TARGET_BYTES_BIG_ENDIAN 0
-#endif
 
 #define WORKING_DOT_WORD
 
@@ -37,6 +35,8 @@ extern const char * tilegx_target_format (void);
 
 #define DWARF2_LINE_MIN_INSN_LENGTH	8
 
+#define md_number_to_chars		number_to_chars_littleendian
+
 #define DIFF_EXPR_OK   /* foo-. gets turned into PC relative relocs */
 
 #define HANDLE_ALIGN(fragp) tilegx_handle_align (fragp)
diff --git a/gas/config/tc-tilepro.c b/gas/config/tc-tilepro.c
index 733a628f20..c198b2c4fa 100644
--- a/gas/config/tc-tilepro.c
+++ b/gas/config/tc-tilepro.c
@@ -103,14 +103,14 @@ md_show_usage (FILE *stream)
 
 /* Extra expression types.  */
 
-#define O_lo16        O_md1
-#define O_hi16        O_md2
-#define O_ha16        O_md3
-#define O_got         O_md4
+#define O_lo16	      O_md1
+#define O_hi16	      O_md2
+#define O_ha16	      O_md3
+#define O_got	      O_md4
 #define O_got_lo16    O_md5
 #define O_got_hi16    O_md6
 #define O_got_ha16    O_md7
-#define O_plt         O_md8
+#define O_plt	      O_md8
 #define O_tls_gd      O_md9
 #define O_tls_gd_lo16 O_md10
 #define O_tls_gd_hi16 O_md11
@@ -119,13 +119,6 @@ md_show_usage (FILE *stream)
 #define O_tls_ie_lo16 O_md14
 #define O_tls_ie_hi16 O_md15
 #define O_tls_ie_ha16 O_md16
-#define O_tls_le      O_md17
-#define O_tls_le_lo16 O_md18
-#define O_tls_le_hi16 O_md19
-#define O_tls_le_ha16 O_md20
-#define O_tls_gd_call O_md21
-#define O_tls_gd_add  O_md22
-#define O_tls_ie_load O_md23
 
 static struct hash_control *special_operator_hash;
 
@@ -237,13 +230,6 @@ md_begin (void)
   INSERT_SPECIAL_OP(tls_ie_lo16);
   INSERT_SPECIAL_OP(tls_ie_hi16);
   INSERT_SPECIAL_OP(tls_ie_ha16);
-  INSERT_SPECIAL_OP(tls_le);
-  INSERT_SPECIAL_OP(tls_le_lo16);
-  INSERT_SPECIAL_OP(tls_le_hi16);
-  INSERT_SPECIAL_OP(tls_le_ha16);
-  INSERT_SPECIAL_OP(tls_gd_call);
-  INSERT_SPECIAL_OP(tls_gd_add);
-  INSERT_SPECIAL_OP(tls_ie_load);
 #undef INSERT_SPECIAL_OP
 
   /* Initialize op_hash hash table.  */
@@ -395,12 +381,24 @@ apply_special_operator (operatorT op, int num)
   switch (op)
     {
     case O_lo16:
+    case O_got:
+    case O_got_lo16:
+    case O_tls_gd:
+    case O_tls_gd_lo16:
+    case O_tls_ie:
+    case O_tls_ie_lo16:
       return (signed short)num;
 
     case O_hi16:
+    case O_got_hi16:
+    case O_tls_gd_hi16:
+    case O_tls_ie_hi16:
       return (signed short)(num >> 16);
 
     case O_ha16:
+    case O_got_ha16:
+    case O_tls_gd_ha16:
+    case O_tls_ie_ha16:
       return (signed short)((num + 0x8000) >> 16);
 
     default:
@@ -530,26 +528,6 @@ emit_tilepro_instruction (tilepro_bundle_bits bits,
 	      require_symbol = 1;
 	      break;
 
-	    case O_tls_le:
-	      HANDLE_OP16 (TLS_LE);
-	      require_symbol = 1;
-	      break;
-
-	    case O_tls_le_lo16:
-	      HANDLE_OP16 (TLS_LE_LO);
-	      require_symbol = 1;
-	      break;
-
-	    case O_tls_le_hi16:
-	      HANDLE_OP16 (TLS_LE_HI);
-	      require_symbol = 1;
-	      break;
-
-	    case O_tls_le_ha16:
-	      HANDLE_OP16 (TLS_LE_HA);
-	      require_symbol = 1;
-	      break;
-
 #undef HANDLE_OP16
 
 	    case O_plt:
@@ -566,57 +544,6 @@ emit_tilepro_instruction (tilepro_bundle_bits bits,
 	      require_symbol = 1;
 	      break;
 
-	    case O_tls_gd_call:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEPRO_JOFFLONG_X1:
-		  reloc = BFD_RELOC_TILEPRO_TLS_GD_CALL;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
-	      require_symbol = 1;
-	      break;
-
-	    case O_tls_gd_add:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEPRO_IMM8_X0:
-		  reloc = BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD;
-		  break;
-		case BFD_RELOC_TILEPRO_IMM8_X1:
-		  reloc = BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD;
-		  break;
-		case BFD_RELOC_TILEPRO_IMM8_Y0:
-		  reloc = BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD;
-		  break;
-		case BFD_RELOC_TILEPRO_IMM8_Y1:
-		  reloc = BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
-	      require_symbol = 1;
-	      break;
-
-	    case O_tls_ie_load:
-	      switch (reloc)
-		{
-		case BFD_RELOC_TILEPRO_IMM8_X1:
-		  reloc = BFD_RELOC_TILEPRO_TLS_IE_LOAD;
-		  break;
-		default:
-		  die = 1;
-		  break;
-		}
-	      use_subexp = 1;
-	      require_symbol = 1;
-	      break;
-
 	    default:
 	      /* Do nothing.  */
 	      break;
@@ -631,22 +558,17 @@ emit_tilepro_instruction (tilepro_bundle_bits bits,
 	      /* Now that we've changed the reloc, change ha16(x) into x,
 		 etc.  */
 
-	      if (!operand_exp->X_add_symbol->sy_flags.sy_local_symbol
-                  && operand_exp->X_add_symbol->sy_value.X_md)
+	      if (operand_exp->X_add_symbol->sy_value.X_md)
 		{
+		  if (require_symbol)
+		    {
+		      as_bad (_("Operator may only be applied to symbols."));
+		    }
+
 		  /* HACK: We used X_md to mark this symbol as a fake wrapper
 		     around a real expression. To unwrap it, we just grab its
 		     value here.  */
 		  operand_exp = &operand_exp->X_add_symbol->sy_value;
-
-		  if (require_symbol)
-		    {
-		      /* Look at the expression, and reject it if it's not a
-			 plain symbol.  */
-		      if (operand_exp->X_op != O_symbol
-			  || operand_exp->X_add_number != 0)
-			as_bad (_("Operator may only be applied to symbols."));
-		    }
 		}
 	      else
 		{
@@ -1384,36 +1306,22 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 #ifdef OBJ_ELF
       switch (fixP->fx_r_type)
 	{
-	case BFD_RELOC_TILEPRO_IMM8_X0_TLS_GD_ADD:
-	case BFD_RELOC_TILEPRO_IMM8_X1_TLS_GD_ADD:
-	case BFD_RELOC_TILEPRO_IMM8_Y0_TLS_GD_ADD:
-	case BFD_RELOC_TILEPRO_IMM8_Y1_TLS_GD_ADD:
 	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD:
 	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA:
 	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE:
 	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE:
+	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO:
+	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO:
 	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_LO:
 	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_LO:
+	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI:
+	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI:
 	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HI:
 	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HI:
+	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA:
+	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA:
 	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HA:
 	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HA:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_LO:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_LO:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HI:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HI:
-	case BFD_RELOC_TILEPRO_IMM16_X0_TLS_LE_HA:
-	case BFD_RELOC_TILEPRO_IMM16_X1_TLS_LE_HA:
-	case BFD_RELOC_TILEPRO_TLS_GD_CALL:
-	case BFD_RELOC_TILEPRO_TLS_IE_LOAD:
 	case BFD_RELOC_TILEPRO_TLS_DTPMOD32:
 	case BFD_RELOC_TILEPRO_TLS_DTPOFF32:
 	case BFD_RELOC_TILEPRO_TLS_TPOFF32:
@@ -1431,6 +1339,36 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
   /* Apply lo16, hi16, ha16, etc. munging. */
   switch (fixP->fx_r_type)
     {
+    case BFD_RELOC_TILEPRO_IMM16_X0_GOT:
+    case BFD_RELOC_TILEPRO_IMM16_X1_GOT:
+      *valP = value = apply_special_operator (O_got, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_GOT_LO:
+    case BFD_RELOC_TILEPRO_IMM16_X1_GOT_LO:
+      *valP = value = apply_special_operator (O_got_lo16, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_GOT_HI:
+    case BFD_RELOC_TILEPRO_IMM16_X1_GOT_HI:
+      *valP = value = apply_special_operator (O_got_hi16, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_GOT_HA:
+    case BFD_RELOC_TILEPRO_IMM16_X1_GOT_HA:
+      *valP = value = apply_special_operator (O_got_ha16, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD:
+      *valP = value = apply_special_operator (O_tls_gd, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE:
+      *valP = value = apply_special_operator (O_tls_ie, value);
+      break;
+
     case BFD_RELOC_LO16:
     case BFD_RELOC_TILEPRO_IMM16_X0_LO:
     case BFD_RELOC_TILEPRO_IMM16_X1_LO:
@@ -1439,6 +1377,16 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
       *valP = value = apply_special_operator (O_lo16, value);
       break;
 
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO:
+      *valP = value = apply_special_operator (O_tls_gd_lo16, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_LO:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_LO:
+      *valP = value = apply_special_operator (O_tls_ie_lo16, value);
+      break;
+
     case BFD_RELOC_HI16:
     case BFD_RELOC_TILEPRO_IMM16_X0_HI:
     case BFD_RELOC_TILEPRO_IMM16_X1_HI:
@@ -1447,6 +1395,16 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
       *valP = value = apply_special_operator (O_hi16, value);
       break;
 
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI:
+      *valP = value = apply_special_operator (O_tls_gd_hi16, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HI:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HI:
+      *valP = value = apply_special_operator (O_tls_ie_hi16, value);
+      break;
+
     case BFD_RELOC_HI16_S:
     case BFD_RELOC_TILEPRO_IMM16_X0_HA:
     case BFD_RELOC_TILEPRO_IMM16_X1_HA:
@@ -1455,6 +1413,16 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
       *valP = value = apply_special_operator (O_ha16, value);
       break;
 
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA:
+      *valP = value = apply_special_operator (O_tls_gd_ha16, value);
+      break;
+
+    case BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HA:
+    case BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HA:
+      *valP = value = apply_special_operator (O_tls_ie_ha16, value);
+      break;
+
     default:
       /* Do nothing  */
       break;
diff --git a/gas/configure b/gas/configure
index 6b4d11c1a5..b70b86e364 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12143,7 +12143,7 @@ _ACEOF
         fi
         ;;
 
-      epiphany | fr30 | ip2k | iq2000 | lm32 | m32r | openrisc)
+      fr30 | ip2k | iq2000 | lm32 | m32r | openrisc)
 	using_cgen=yes
 	;;
 
@@ -12195,13 +12195,6 @@ _ACEOF
 	fi
 	;;
 
-      rl78)
-        echo ${extra_objects} | grep -s "rl78-parse.o"
-        if test $? -ne 0 ; then
-          extra_objects="$extra_objects rl78-parse.o"
-        fi
-	;;
-
       rx)
         echo ${extra_objects} | grep -s "rx-parse.o"
         if test $? -ne 0 ; then
@@ -12753,7 +12746,7 @@ if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi
 
-ALL_LINGUAS="fr tr es rw id ru fi ja"
+ALL_LINGUAS="fr tr es rw id ru fi"
 # If we haven't got the data from the intl directory,
 # assume NLS is disabled.
 USE_NLS=no
diff --git a/gas/configure.in b/gas/configure.in
index acdd105832..ea6df790eb 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -305,7 +305,7 @@ changequote([,])dnl
         fi
         ;;
 
-      epiphany | fr30 | ip2k | iq2000 | lm32 | m32r | openrisc)
+      fr30 | ip2k | iq2000 | lm32 | m32r | openrisc)
 	using_cgen=yes
 	;;
 
@@ -353,13 +353,6 @@ changequote([,])dnl
 	fi
 	;;
 
-      rl78)
-        echo ${extra_objects} | grep -s "rl78-parse.o"
-        if test $? -ne 0 ; then
-          extra_objects="$extra_objects rl78-parse.o"
-        fi
-	;;
-
       rx)
         echo ${extra_objects} | grep -s "rx-parse.o"
         if test $? -ne 0 ; then
@@ -625,7 +618,7 @@ AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
 AC_PROG_YACC
 AM_PROG_LEX
 
-ALL_LINGUAS="fr tr es rw id ru fi ja"
+ALL_LINGUAS="fr tr es rw id ru fi"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 99a276fcc0..a171a32bbf 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -13,7 +13,7 @@
 #   em		emulation; identifies the config/te-* files
 
 # Optional output shell variables; these are not always set:
-#   arch	the default architecture; sets DEFAULT_ARCH on some systems
+#   arch	the default architecture; sets DEFAULT_ARCH on some systems 
 #   endian	"big" or "little"; used on bi-endian systems
 
 cpu_type=
@@ -38,13 +38,12 @@ case ${cpu} in
   cr16*)		cpu_type=cr16 endian=little ;;
   crisv32)		cpu_type=cris arch=crisv32 ;;
   crx*)			cpu_type=crx endian=little ;;
-  epiphany*)		cpu_type=epiphany endian=little ;;
   fido)			cpu_type=m68k ;;
   hppa*)		cpu_type=hppa ;;
   i[3-7]86)		cpu_type=i386 arch=i386;;
   ia64)			cpu_type=ia64 ;;
-  ip2k)			cpu_type=ip2k endian=big ;;
-  iq2000)		cpu_type=iq2000 endian=big ;;
+  ip2k)			cpu_type=ip2k endian=big ;; 
+  iq2000)		cpu_type=iq2000 endian=big ;; 
   lm32)			cpu_type=lm32 ;;
   m32c)			cpu_type=m32c endian=little ;;
   m32r)			cpu_type=m32r endian=big ;;
@@ -65,7 +64,6 @@ case ${cpu} in
   powerpc*le*)		cpu_type=ppc endian=little ;;
   powerpc*)		cpu_type=ppc endian=big ;;
   rs6000*)		cpu_type=ppc ;;
-  rl78*)		cpu_type=rl78 ;;
   rx)			cpu_type=rx ;;
   s390x*)		cpu_type=s390 arch=s390x ;;
   s390*)		cpu_type=s390 arch=s390 ;;
@@ -82,8 +80,6 @@ case ${cpu} in
   sparclet*)		cpu_type=sparc arch=sparclet ;;
   sparclite*)		cpu_type=sparc arch=sparclite ;;
   sparc*)		cpu_type=sparc arch=sparclite ;; # ??? See tc-sparc.c.
-  tilegx*be)		cpu_type=tilegx endian=big ;;
-  tilegx*)		cpu_type=tilegx endian=little ;;
   v850*)		cpu_type=v850 ;;
   x86_64*)		cpu_type=i386 arch=x86_64;;
   xtensa*)		cpu_type=xtensa arch=xtensa ;;
@@ -145,8 +141,6 @@ case ${generic_target} in
   d30v-*-*)				fmt=elf ;;
   dlx-*-*)				fmt=elf ;;
 
-  epiphany-*-*)				fmt=elf ;;
-
   fr30-*-*)				fmt=elf ;;
   frv-*-*linux*)			fmt=elf em=linux;;
   frv-*-*)				fmt=elf ;;
@@ -183,10 +177,6 @@ case ${generic_target} in
   i386-*-elf)				fmt=elf ;;
   i386-*-kaos*)				fmt=elf ;;
   i386-*-bsd*)				fmt=aout em=386bsd ;;
-  i386-*-nacl*)				fmt=elf em=nacl
-    case ${cpu} in
-      x86_64*)				arch=x86_64:32 ;;
-    esac ;;
   i386-*-netbsd0.8)			fmt=aout em=386bsd ;;
   i386-*-netbsdpe*)			fmt=coff em=pe ;;
   i386-*-netbsd*-gnu* | \
@@ -409,7 +399,7 @@ case ${generic_target} in
   tic54x-*-* | c54x*-*-*)		fmt=coff bfd_gas=yes need_libm=yes;;
   tic6x-*-*)				fmt=elf ;;
 
-  tilepro-*-* | tilegx*-*-*)		fmt=elf ;;
+  tilepro-*-* | tilegx-*-*)		fmt=elf ;;
 
   v850*-*-*)				fmt=elf ;;
 
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 34ccae5c5a..87017fc90e 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -35,9 +35,8 @@ CPU_DOCS = \
 	c-avr.texi \
 	c-bfin.texi \
 	c-cr16.texi \
-	c-cris.texi \
 	c-d10v.texi \
-	c-epiphany.texi \
+	c-cris.texi \
 	c-h8300.texi \
 	c-hppa.texi \
 	c-i370.texi \
@@ -59,7 +58,6 @@ CPU_DOCS = \
 	c-pdp11.texi \
 	c-pj.texi \
 	c-ppc.texi \
-	c-rl78.texi \
 	c-rx.texi \
 	c-s390.texi \
 	c-score.texi \
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index e9edb0ea6f..d7d0247bf4 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -275,9 +275,8 @@ CPU_DOCS = \
 	c-avr.texi \
 	c-bfin.texi \
 	c-cr16.texi \
-	c-cris.texi \
 	c-d10v.texi \
-	c-epiphany.texi \
+	c-cris.texi \
 	c-h8300.texi \
 	c-hppa.texi \
 	c-i370.texi \
@@ -299,7 +298,6 @@ CPU_DOCS = \
 	c-pdp11.texi \
 	c-pj.texi \
 	c-ppc.texi \
-	c-rl78.texi \
 	c-rx.texi \
 	c-s390.texi \
 	c-score.texi \
diff --git a/gas/doc/all.texi b/gas/doc/all.texi
index 63282f2390..6f935ad5b7 100644
--- a/gas/doc/all.texi
+++ b/gas/doc/all.texi
@@ -35,7 +35,6 @@
 @set CRIS
 @set D10V
 @set D30V
-@set EPIPHANY
 @set H8/300
 @set HPPA
 @set I370
@@ -60,7 +59,6 @@
 @set PDP11
 @set PJ
 @set PPC
-@set RL78
 @set RX
 @set S390
 @set SCORE
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index a648f094a2..8ed62a4db6 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -1,6 +1,6 @@
 \input texinfo @c                               -*-Texinfo-*-
 @c  Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-@c  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+@c  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 @c  Free Software Foundation, Inc.
 @c UPDATE!!  On future updates--
 @c   (1)   check for new machine-dep cmdline options in
@@ -307,11 +307,6 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 @emph{Target D30V options:}
    [@b{-O}|@b{-n}|@b{-N}]
 @end ifset
-@ifset EPIPHANY
-
-@emph{Target EPIPHANY options:}
-   [@b{-mepiphany}|@b{-mepiphany16}]
-@end ifset
 @ifset H8
 
 @emph{Target H8/300 options:}
@@ -439,8 +434,8 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
    [@b{-a32}|@b{-a64}]
    [@b{-mpwrx}|@b{-mpwr2}|@b{-mpwr}|@b{-m601}|@b{-mppc}|@b{-mppc32}|@b{-m603}|@b{-m604}|@b{-m403}|@b{-m405}|
     @b{-m440}|@b{-m464}|@b{-m476}|@b{-m7400}|@b{-m7410}|@b{-m7450}|@b{-m7455}|@b{-m750cl}|@b{-mppc64}|
-    @b{-m620}|@b{-me500}|@b{-e500x2}|@b{-me500mc}|@b{-me500mc64}|@b{-me5500}|@b{-me6500}|@b{-mppc64bridge}|
-    @b{-mbooke}|@b{-mpower4}|@b{-mpr4}|@b{-mpower5}|@b{-mpwr5}|@b{-mpwr5x}|@b{-mpower6}|@b{-mpwr6}|
+    @b{-m620}|@b{-me500}|@b{-e500x2}|@b{-me500mc}|@b{-me500mc64}|@b{-mppc64bridge}|@b{-mbooke}|
+    @b{-mpower4}|@b{-mpr4}|@b{-mpower5}|@b{-mpwr5}|@b{-mpwr5x}|@b{-mpower6}|@b{-mpwr6}|
     @b{-mpower7}|@b{-mpw7}|@b{-ma2}|@b{-mcell}|@b{-mspe}|@b{-mtitan}|@b{-me300}|@b{-mcom}]
    [@b{-many}] [@b{-maltivec}|@b{-mvsx}]
    [@b{-mregnames}|@b{-mno-regnames}]
@@ -497,7 +492,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 @ifset TILEGX
 
 @emph{Target TILE-Gx options:}
-   [@b{-m32}|@b{-m64}][@b{-EB}][@b{-EL}]
+   [@b{-m32}|@b{-m64}]
 @end ifset
 @ifset TILEPRO
 @c TILEPro has no machine-dependent assembler options
@@ -848,27 +843,6 @@ Warn when a nop after a 32-bit multiply instruction is generated.
 @end ifset
 @c man end
 
-@ifset EPIPHANY
-The following options are available when @value{AS} is configured for the
-Adapteva EPIPHANY series.
-
-@ifclear man
-@xref{Epiphany Options}, for the options available when @value{AS} is
-configured for an Epiphany processor.
-@end ifclear
-
-@ifset man
-@c man begin OPTIONS
-The following options are available when @value{AS} is configured for
-an Epiphany processor.
-@c man end
-@c man begin INCLUDE
-@include c-epiphany.texi
-@c ended inside the included file
-@end ifset
-
-@end ifset
-
 @ifset I80386
 
 @ifclear man
@@ -3970,7 +3944,6 @@ Some machine configurations provide additional directives.
 * Ascii::                       @code{.ascii "@var{string}"}@dots{}
 * Asciz::                       @code{.asciz "@var{string}"}@dots{}
 * Balign::                      @code{.balign @var{abs-expr} , @var{abs-expr}}
-* Bundle directives::           @code{.bundle_align_mode @var{abs-expr}}, @code{.bundle_lock}, @code{.bundle_unlock}
 * Byte::                        @code{.byte @var{expressions}}
 * CFI directives::		@code{.cfi_startproc [simple]}, @code{.cfi_endproc}, etc.
 * Comm::                        @code{.comm @var{symbol} , @var{length} }
@@ -4293,59 +4266,6 @@ filled in with the value 0x368d (the exact placement of the bytes depends upon
 the endianness of the processor).  If it skips 1 or 3 bytes, the fill value is
 undefined.
 
-@node Bundle directives
-@section @code{.bundle_align_mode @var{abs-expr}}
-@cindex @code{bundle_align_mode} directive
-@cindex bundle
-@cindex instruction bundle
-@cindex aligned instruction bundle
-@code{.bundle_align_mode} enables or disables @dfn{aligned instruction
-bundle} mode.  In this mode, sequences of adjacent instructions are grouped
-into fixed-sized @dfn{bundles}.  If the argument is zero, this mode is
-disabled (which is the default state).  If the argument it not zero, it
-gives the size of an instruction bundle as a power of two (as for the
-@code{.p2align} directive, @pxref{P2align}).
-
-For some targets, it's an ABI requirement that no instruction may span a
-certain aligned boundary.  A @dfn{bundle} is simply a sequence of
-instructions that starts on an aligned boundary.  For example, if
-@var{abs-expr} is @code{5} then the bundle size is 32, so each aligned
-chunk of 32 bytes is a bundle.  When aligned instruction bundle mode is in
-effect, no single instruction may span a boundary between bundles.  If an
-instruction would start too close to the end of a bundle for the length of
-that particular instruction to fit within the bundle, then the space at the
-end of that bundle is filled with no-op instructions so the instruction
-starts in the next bundle.  As a corollary, it's an error if any single
-instruction's encoding is longer than the bundle size.
-
-@section @code{.bundle_lock} and @code{.bundle_unlock}
-@cindex @code{bundle_lock} directive
-@cindex @code{bundle_unlock} directive
-The @code{.bundle_lock} and directive @code{.bundle_unlock} directives
-allow explicit control over instruction bundle padding.  These directives
-are only valid when @code{.bundle_align_mode} has been used to enable
-aligned instruction bundle mode.  It's an error if they appear when
-@code{.bundle_align_mode} has not been used at all, or when the last
-directive was @w{@code{.bundle_align_mode 0}}.
-
-@cindex bundle-locked
-For some targets, it's an ABI requirement that certain instructions may
-appear only as part of specified permissible sequences of multiple
-instructions, all within the same bundle.  A pair of @code{.bundle_lock}
-and @code{.bundle_unlock} directives define a @dfn{bundle-locked}
-instruction sequence.  For purposes of aligned instruction bundle mode, a
-sequence starting with @code{.bundle_lock} and ending with
-@code{.bundle_unlock} is treated as a single instruction.  That is, the
-entire sequence must fit into a single bundle and may not span a bundle
-boundary.  If necessary, no-op instructions will be inserted before the
-first instruction of the sequence so that the whole sequence starts on an
-aligned bundle boundary.  It's an error if the sequence is longer than the
-bundle size.
-
-Bundle-locked sequences do not nest.  It's an error if two
-@code{.bundle_lock} directives appear without an intervening
-@code{.bundle_unlock} directive.
-
 @node Byte
 @section @code{.byte @var{expressions}}
 
@@ -5575,7 +5495,7 @@ hence @emph{octa}-word for 16 bytes.
 Set the location counter to @var{loc} in the absolute section.  @var{loc} must
 be an absolute expression.  This directive may be useful for defining
 symbols with absolute values.  Do not confuse it with the @code{.org}
-directive.
+directive. 
 
 @node Org
 @section @code{.org @var{new-lc} , @var{fill}}
@@ -6929,9 +6849,6 @@ subject, see the hardware manufacturer's manual.
 @ifset D30V
 * D30V-Dependent::              D30V Dependent Features
 @end ifset
-@ifset EPIPHANY
-* Epiphany-Dependent::          EPIPHANY Dependent Features
-@end ifset
 @ifset H8/300
 * H8/300-Dependent::            Renesas H8/300 Dependent Features
 @end ifset
@@ -6999,9 +6916,6 @@ subject, see the hardware manufacturer's manual.
 @ifset PPC
 * PPC-Dependent::               PowerPC Dependent Features
 @end ifset
-@ifset RL78
-* RL78-Dependent::              RL78 Dependent Features
-@end ifset
 @ifset RX
 * RX-Dependent::                RX Dependent Features
 @end ifset
@@ -7111,10 +7025,6 @@ family.
 @include c-d30v.texi
 @end ifset
 
-@ifset EPIPHANY
-@include c-epiphany.texi
-@end ifset
-
 @ifset H8/300
 @include c-h8300.texi
 @end ifset
@@ -7199,10 +7109,6 @@ family.
 @include c-ppc.texi
 @end ifset
 
-@ifset RL78
-@include c-rl78.texi
-@end ifset
-
 @ifset RX
 @include c-rx.texi
 @end ifset
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index b7859a788e..a388c18121 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -494,10 +494,8 @@ and
 @code{TPOFF}.
 
 For compatibility with older toolchains the assembler also accepts
-@code{(PLT)} after branch targets.  On legacy targets this will
-generate the deprecated @samp{R_ARM_PLT32} relocation.  On EABI
-targets it will encode either the @samp{R_ARM_CALL} or
-@samp{R_ARM_JUMP24} relocation, as appropriate.
+@code{(PLT)} after branch targets.  This will generate the deprecated
+@samp{R_ARM_PLT32} relocation.
 
 @cindex MOVW and MOVT relocations, ARM
 Relocations for @samp{MOVW} and @samp{MOVT} instructions can be generated
diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
index 7c1921977d..30745b406e 100644
--- a/gas/doc/c-i386.texi
+++ b/gas/doc/c-i386.texi
@@ -145,7 +145,6 @@ accept various extension mnemonics.  For example,
 @code{avx2},
 @code{noavx},
 @code{vmx},
-@code{vmfunc},
 @code{smx},
 @code{xsave},
 @code{xsaveopt},
@@ -159,8 +158,6 @@ accept various extension mnemonics.  For example,
 @code{movbe},
 @code{ept},
 @code{lzcnt},
-@code{hle},
-@code{rtm},
 @code{invpcid},
 @code{clflush},
 @code{lwp},
@@ -442,8 +439,8 @@ quadruple word).
 
 Different encoding options can be specified via optional mnemonic
 suffix.  @samp{.s} suffix swaps 2 register operands in encoding when
-moving from one register to another.  @samp{.d8} or @samp{.d32} suffix
-prefers 8bit or 32bit displacement in encoding.
+moving from one register to another.  @samp{.d32} suffix forces 32bit
+displacement in encoding.
 
 @cindex conversion instructions, i386
 @cindex i386 conversion instructions
@@ -1017,8 +1014,7 @@ supported on the CPU specified.  The choices for @var{cpu_type} are:
 @item @samp{.clflush} @tab @samp{.movbe} @tab @samp{.xsave} @tab @samp{.xsaveopt}
 @item @samp{.aes} @tab @samp{.pclmul} @tab @samp{.fma} @tab @samp{.fsgsbase}
 @item @samp{.rdrnd} @tab @samp{.f16c} @tab @samp{.avx2} @tab @samp{.bmi2}
-@item @samp{.lzcnt} @tab @samp{.invpcid} @tab @samp{.vmfunc} @tab @samp{.hle}
-@item @samp{.rtm}
+@item @samp{.lzcnt} @tab @samp{.invpcid}
 @item @samp{.3dnow} @tab @samp{.3dnowa} @tab @samp{.sse4a} @tab @samp{.sse5}
 @item @samp{.syscall} @tab @samp{.rdtscp} @tab @samp{.svme} @tab @samp{.abm}
 @item @samp{.lwp} @tab @samp{.fma4} @tab @samp{.xop}
diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
index 4124213415..d3860f1a99 100644
--- a/gas/doc/c-mips.texi
+++ b/gas/doc/c-mips.texi
@@ -290,8 +290,6 @@ m4k,
 m4kp,
 m14k,
 m14kc,
-m14ke,
-m14kec,
 24kc,
 24kf2_1,
 24kf,
@@ -323,10 +321,7 @@ loongson2e,
 loongson2f,
 loongson3a,
 octeon,
-octeon+,
-octeon2,
-xlr,
-xlp
+xlr
 @end quotation
 
 For compatibility reasons, @samp{@var{n}x} and @samp{@var{b}fx} are
diff --git a/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
index 2e762a5273..2c1ebd0d76 100644
--- a/gas/doc/c-ppc.texi
+++ b/gas/doc/c-ppc.texi
@@ -1,5 +1,5 @@
 @c Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-@c 2012 Free Software Foundation, Inc.
+@c Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
 @c man end
@@ -88,12 +88,6 @@ Generate code for Freescale e500mc core complex.
 @item -me500mc64
 Generate code for Freescale e500mc64 core complex.
 
-@item -me5500
-Generate code for Freescale e5500 core complex.
-
-@item -me6500
-Generate code for Freescale e6500 core complex.
-
 @item -mspe
 Generate code for Motorola SPE instructions.
 
diff --git a/gas/doc/c-rx.texi b/gas/doc/c-rx.texi
index cb89bd66c2..183fbe385e 100644
--- a/gas/doc/c-rx.texi
+++ b/gas/doc/c-rx.texi
@@ -74,25 +74,11 @@ This is the default.
 @item -msmall-data-limit
 This option tells the assembler that the small data limit feature of
 the RX port of GCC is being used.  This results in the assembler
-generating an undefined reference to a symbol called @code{__gp} for
-use by the relocations that are needed to support the small data limit
+generating an undefined reference to a symbol called __gp for use by
+the relocations that are needed to support the small data limit
 feature.   This option is not enabled by default as it would otherwise
 pollute the symbol table.
 
-@cindex @samp{-mpid}
-@item -mpid
-This option tells the assembler that the position independent data of the
-RX port of GCC is being used.  This results in the assembler
-generating an undefined reference to a symbol called @code{__pid_base},
-and also setting the RX_PID flag bit in the e_flags field of the ELF
-header of the object file.
-
-@cindex @samp{-mint-register}
-@item -mint-register=@var{num}
-This option tells the assembler how many registers have been reserved
-for use by interrupt handlers.  This is needed in order to compute the
-correct values for the @code{%gpreg} and @code{%pidreg} meta registers.
-
 @end table
 
 @node RX-Modifiers
@@ -100,45 +86,22 @@ correct values for the @code{%gpreg} and @code{%pidreg} meta registers.
 
 @cindex RX modifiers
 @cindex syntax, RX
-@cindex %gp
 
-The assembler supports one modifier when using symbol addresses
+The assembler supports several modifiers when using symbol addresses
 in RX instruction operands.  The general syntax is the following:
 
 @smallexample
-%gp(symbol)
+%modifier(symbol)
 @end smallexample
 
-The modifier returns the offset from the @var{__gp} symbol to the
-specified symbol as a 16-bit value.  The intent is that this offset
-should be used in a register+offset move instruction when generating
-references to small data.  Ie, like this:
-
-@smallexample
-  mov.W	 %gp(_foo)[%gpreg], r1
-@end smallexample
-
-The assembler also supports two meta register names which can be used
-to refer to registers whose values may not be known to the
-programmer.  These meta register names are:
-
 @table @code
+@cindex symbol modifiers
 
-@cindex @samp{%gpreg}
-@item %gpreg
-The small data address register.
-
-@cindex @samp{%pidreg}
-@item %pidreg
-The PID base address register.
+@item %gp
+@c FIXME: Add documentation here.
 
 @end table
 
-Both registers normally have the value r13, but this can change if
-some registers have been reserved for use by interrupt handlers or if
-both the small data limit and position independent data features are
-being used at the same time.
-
 @node RX-Directives
 @section Assembler Directives
 
diff --git a/gas/doc/c-sh.texi b/gas/doc/c-sh.texi
index aff68307c3..438ac5fd5e 100644
--- a/gas/doc/c-sh.texi
+++ b/gas/doc/c-sh.texi
@@ -1,5 +1,5 @@
 @c Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2001, 2003, 2004,
-@c 2005, 2008, 2010, 2011, 2012  Free Software Foundation, Inc.
+@c 2005, 2008, 2010, 2011  Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
 @page
@@ -210,16 +210,13 @@ conventional architectures at the same frequency.
 @cindex machine directives, SH
 @cindex @code{uaword} directive, SH
 @cindex @code{ualong} directive, SH
-@cindex @code{uaquad} directive, SH
 
 @table @code
 @item uaword
 @itemx ualong
-@itemx uaquad
-@code{@value{AS}} will issue a warning when a misaligned @code{.word},
-@code{.long}, or @code{.quad} directive is used.  You may use
-@code{.uaword}, @code{.ualong}, or @code{.uaquad} to indicate that the
-value is intentionally misaligned.
+@code{@value{AS}} will issue a warning when a misaligned @code{.word} or
+@code{.long} directive is used.  You may use @code{.uaword} or
+@code{.ualong} to indicate that the value is intentionally misaligned.
 @end table
 
 @node SH Opcodes
diff --git a/gas/doc/c-sh64.texi b/gas/doc/c-sh64.texi
index cc52cbc6ed..8138c1ffa1 100644
--- a/gas/doc/c-sh64.texi
+++ b/gas/doc/c-sh64.texi
@@ -1,4 +1,4 @@
-@c Copyright (C) 2002, 2003, 2008, 2011, 2012 Free Software Foundation, Inc.
+@c Copyright (C) 2002, 2003, 2008, 2011 Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
 @page
@@ -188,6 +188,10 @@ Specify the ABI for the following instructions.  Note that you cannot use
 this directive unless you specified an ABI on the command line, and the 
 ABIs specified must match.
 
+@item .uaquad
+Like .uaword and .ualong, this allows you to specify an intentionally
+unaligned quadword (64 bit word).
+
 @end table
 
 @node SH64 Opcodes
diff --git a/gas/doc/c-tic6x.texi b/gas/doc/c-tic6x.texi
index 06bb1e755b..bc69160c9d 100644
--- a/gas/doc/c-tic6x.texi
+++ b/gas/doc/c-tic6x.texi
@@ -171,6 +171,7 @@ entry for that function.  Anything between this directive and the
 @code{.endp} directive will be added to the exception table entry.
 
 Must be preceded by a CFI block containing a @code{.cfi_lsda} directive.
+directive.
 
 @cindex @code{.nocmp} directive, TIC6X
 @item .nocmp
diff --git a/gas/doc/c-tilegx.texi b/gas/doc/c-tilegx.texi
index 268cc4f7a5..66dd5a33a4 100644
--- a/gas/doc/c-tilegx.texi
+++ b/gas/doc/c-tilegx.texi
@@ -33,11 +33,6 @@ The following table lists all available TILE-Gx specific options:
 @item -m32 | -m64
 Select the word size, either 32 bits or 64 bits.
 
-@cindex @samp{-EB} option, TILE-Gx
-@cindex @samp{-EL} option, TILE-Gx
-@item -EB | -EL
-Select the endianness, either big-endian (-EB) or little-endian (-EL).
-
 @end table
 @c man end
 
@@ -218,6 +213,21 @@ shl16insli r0, r0, hw0(sym)
 This modifier is used to load bits 0-15 of the symbol's offset in the
 GOT entry corresponding to the symbol.
 
+@item hw1_got
+
+This modifier is used to load bits 16-31 of the symbol's offset in the
+GOT entry corresponding to the symbol.
+
+@item hw2_got
+
+This modifier is used to load bits 32-47 of the symbol's offset in the
+GOT entry corresponding to the symbol.
+
+@item hw3_got
+
+This modifier is used to load bits 48-63 of the symbol's offset in the
+GOT entry corresponding to the symbol.
+
 @item hw0_last_got
 
 This modifier yields the same value as @code{hw0_got}, but it also
@@ -225,9 +235,13 @@ checks that the value does not overflow.
 
 @item hw1_last_got
 
-This modifier is used to load bits 16-31 of the symbol's offset in the
-GOT entry corresponding to the symbol, and it also checks that the
-value does not overflow.
+This modifier yields the same value as @code{hw1_got}, but it also
+checks that the value does not overflow.
+
+@item hw2_last_got
+
+This modifier yields the same value as @code{hw2_got}, but it also
+checks that the value does not overflow.
 
 @item plt
 
@@ -248,6 +262,24 @@ This modifier is used to load bits 0-15 of the offset of the GOT entry
 of the symbol's TLS descriptor, to be used for general-dynamic TLS
 accesses.
 
+@item hw1_tls_gd
+
+This modifier is used to load bits 16-31 of the offset of the GOT
+entry of the symbol's TLS descriptor, to be used for general-dynamic
+TLS accesses.
+
+@item hw2_tls_gd
+
+This modifier is used to load bits 32-47 of the offset of the GOT
+entry of the symbol's TLS descriptor, to be used for general-dynamic
+TLS accesses.
+
+@item hw3_tls_gd
+
+This modifier is used to load bits 48-63 of the offset of the GOT
+entry of the symbol's TLS descriptor, to be used for general-dynamic
+TLS accesses.
+
 @item hw0_last_tls_gd
 
 This modifier yields the same value as @code{hw0_tls_gd}, but it also
@@ -255,9 +287,13 @@ checks that the value does not overflow.
 
 @item hw1_last_tls_gd
 
-This modifier is used to load bits 16-31 of the offset of the GOT
-entry of the symbol's TLS descriptor, to be used for general-dynamic
-TLS accesses.  It also checks that the value does not overflow.
+This modifier yields the same value as @code{hw1_tls_gd}, but it also
+checks that the value does not overflow.
+
+@item hw2_last_tls_gd
+
+This modifier yields the same value as @code{hw2_tls_gd}, but it also
+checks that the value does not overflow.
 
 @item hw0_tls_ie
 
@@ -265,48 +301,38 @@ This modifier is used to load bits 0-15 of the offset of the GOT entry
 containing the offset of the symbol's address from the TCB, to be used
 for initial-exec TLS accesses.
 
-@item hw0_last_tls_ie
-
-This modifier yields the same value as @code{hw0_tls_ie}, but it also
-checks that the value does not overflow.
-
-@item hw1_last_tls_ie
+@item hw1_tls_ie
 
 This modifier is used to load bits 16-31 of the offset of the GOT
 entry containing the offset of the symbol's address from the TCB, to
-be used for initial-exec TLS accesses.  It also checks that the value
-does not overflow.
+be used for initial-exec TLS accesses.
 
-@item hw0_tls_le
+@item hw2_tls_ie
 
-This modifier is used to load bits 0-15 of the offset of the symbol's
-address from the TCB, to be used for local-exec TLS accesses.
-
-@item hw0_last_tls_le
-
-This modifier yields the same value as @code{hw0_tls_le}, but it also
-checks that the value does not overflow.
+This modifier is used to load bits 32-47 of the offset of the GOT entry
+containing the offset of the symbol's address from the TCB, to be used
+for initial-exec TLS accesses.
 
-@item hw1_last_tls_le
+@item hw3_tls_ie
 
-This modifier is used to load bits 16-31 of the offset of the symbol's
-address from the TCB, to be used for local-exec TLS accesses.  It
-also checks that the value does not overflow.
+This modifier is used to load bits 48-63 of the offset of the GOT
+entry containing the offset of the symbol's address from the TCB, to
+be used for initial-exec TLS accesses.
 
-@item tls_gd_call
+@item hw0_last_tls_ie
 
-This modifier is used to tag an instrution as the ``call'' part of a
-calling sequence for a TLS GD reference of its operand.
+This modifier yields the same value as @code{hw0_tls_ie}, but it also
+checks that the value does not overflow.
 
-@item tls_gd_add
+@item hw1_last_tls_ie
 
-This modifier is used to tag an instruction as the ``add'' part of a
-calling sequence for a TLS GD reference of its operand.
+This modifier yields the same value as @code{hw1_tls_ie}, but it also
+checks that the value does not overflow.
 
-@item tls_ie_load
+@item hw2_last_tls_ie
 
-This modifier is used to tag an instruction as the ``load'' part of a
-calling sequence for a TLS IE reference of its operand.
+This modifier yields the same value as @code{hw2_tls_ie}, but it also
+checks that the value does not overflow.
 
 @end table
 
diff --git a/gas/doc/c-tilepro.texi b/gas/doc/c-tilepro.texi
index 5d80c4f05c..bbccdfbb68 100644
--- a/gas/doc/c-tilepro.texi
+++ b/gas/doc/c-tilepro.texi
@@ -261,41 +261,6 @@ to be used for initial-exec TLS accesses.
 This modifier is like @code{tls_ie_hi16}, but it adds one to the value
 if @code{tls_ie_lo16} of the input value is negative.
 
-@item tls_le
-
-This modifier is used to load the offset of the symbol's address from
-the TCB, to be used for local-exec TLS accesses.
-
-@item tls_le_lo16
-
-This modifier is used to load the low 16 bits of the offset of the
-symbol's address from the TCB, to be used for local-exec TLS accesses.
-
-@item tls_le_hi16
-
-This modifier is used to load the high 16 bits of the offset of the
-symbol's address from the TCB, to be used for local-exec TLS accesses.
-
-@item tls_le_ha16
-
-This modifier is like @code{tls_le_hi16}, but it adds one to the value
-if @code{tls_le_lo16} of the input value is negative.
-
-@item tls_gd_call
-
-This modifier is used to tag an instrution as the ``call'' part of a
-calling sequence for a TLS GD reference of its operand.
-
-@item tls_gd_add
-
-This modifier is used to tag an instruction as the ``add'' part of a
-calling sequence for a TLS GD reference of its operand.
-
-@item tls_ie_load
-
-This modifier is used to tag an instruction as the ``load'' part of a
-calling sequence for a TLS IE reference of its operand.
-
 @end table
 
 @node TILEPro Directives
diff --git a/gas/doc/internals.texi b/gas/doc/internals.texi
index 2f0b104d71..58b56868ce 100644
--- a/gas/doc/internals.texi
+++ b/gas/doc/internals.texi
@@ -1306,7 +1306,8 @@ This macro controls resolution of fixup expressions involving the
 difference of two symbols in the same section.  If this macro returns zero,
 the subtrahend will be resolved and @code{fx_subsy} set to @code{NULL} for
 @code{md_apply_fix}.  If undefined, the default of
-@w{@code{! SEG_NORMAL (@var{seg})}} will be used.
+@w{@code{! SEG_NORMAL (@var{seg}) || TC_FORCE_RELOCATION (@var{fix})}} will
+be used.
 
 @item TC_FORCE_RELOCATION_SUB_ABS (@var{fix}, @var{seg})
 @cindex TC_FORCE_RELOCATION_SUB_ABS
diff --git a/gas/frags.h b/gas/frags.h
index a1fabfb97a..dd247f9c53 100644
--- a/gas/frags.h
+++ b/gas/frags.h
@@ -100,9 +100,6 @@ struct frag {
 #ifdef TC_FRAG_TYPE
   TC_FRAG_TYPE tc_frag_data;
 #endif
-#ifdef OBJ_FRAG_TYPE
-  OBJ_FRAG_TYPE obj_frag_data;
-#endif
 
   /* Data begins here.  */
   char fr_literal[1];
diff --git a/gas/itbl-lex.c b/gas/itbl-lex.c
new file mode 100644
index 0000000000..d78e54aea3
--- /dev/null
+++ b/gas/itbl-lex.c
@@ -0,0 +1,1924 @@
+
+#line 3 "itbl-lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyleng;
+
+extern FILE *yyin, *yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
+
+#define yy_new_buffer yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
+extern char *yytext;
+#define yytext_ptr yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 15
+#define YY_END_OF_BUFFER 16
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[60] =
+    {   0,
+        0,    0,   16,   14,   13,   12,   11,    8,    8,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+       10,    8,    0,   10,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,    7,    9,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+        5,    1,    2,    3,   10,    6,   10,    4,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    4,    1,    1,    5,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    6,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    1,    8,    1,
+        1,    1,    1,    1,    9,   10,   11,   12,   13,   10,
+       14,   15,   16,   15,   15,   15,   17,   18,   15,   15,
+       15,   19,   20,   15,   15,   15,   15,   15,   15,   15,
+        1,    1,    1,    1,   15,    1,   21,   10,   22,   23,
+
+       24,   10,   25,   15,   26,   15,   15,   15,   27,   28,
+       15,   29,   15,   30,   31,   15,   15,   15,   15,   32,
+       15,   15,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[33] =
+    {   0,
+        1,    1,    1,    1,    1,    2,    2,    1,    2,    2,
+        2,    2,    2,    3,    3,    3,    3,    3,    3,    3,
+        2,    2,    2,    2,    3,    3,    3,    3,    3,    3,
+        3,    3
+    } ;
+
+static yyconst flex_int16_t yy_base[62] =
+    {   0,
+        0,    0,   83,   84,   84,   84,   84,   27,   29,   70,
+        0,   62,   61,   60,   20,   55,   47,   46,   45,   12,
+       35,   37,    0,    0,   62,   60,   59,   58,   53,   49,
+       45,   43,   42,   41,   37,   32,    0,    0,   43,   44,
+       43,   42,   42,   36,   23,   27,   26,   25,   25,   20,
+        0,    0,    0,    0,   35,    0,   23,    0,   84,   58,
+       43
+    } ;
+
+static yyconst flex_int16_t yy_def[62] =
+    {   0,
+       59,    1,   59,   59,   59,   59,   59,   59,   59,   60,
+       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
+       60,   59,   61,   60,   60,   60,   60,   60,   60,   60,
+       60,   60,   60,   60,   60,   60,   60,   61,   60,   60,
+       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
+       60,   60,   60,   60,   60,   60,   60,   60,    0,   59,
+       59
+    } ;
+
+static yyconst flex_int16_t yy_nxt[117] =
+    {   0,
+        4,    5,    6,    5,    7,    8,    9,    7,   10,   11,
+       12,   13,   11,   14,   11,   15,   11,   11,   11,   11,
+       16,   17,   18,   11,   19,   20,   11,   11,   21,   11,
+       11,   11,   22,   22,   22,   22,   29,   30,   35,   36,
+       37,   37,   22,   22,   38,   58,   58,   56,   57,   54,
+       53,   52,   51,   56,   55,   54,   53,   52,   23,   24,
+       24,   51,   50,   49,   48,   47,   46,   45,   44,   43,
+       42,   41,   40,   39,   34,   33,   32,   31,   28,   27,
+       26,   25,   59,    3,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59
+    } ;
+
+static yyconst flex_int16_t yy_chk[117] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    8,    8,    9,    9,   15,   15,   20,   20,
+       21,   21,   22,   22,   61,   57,   55,   50,   49,   48,
+       47,   46,   45,   44,   43,   42,   41,   40,    8,   60,
+       60,   39,   36,   35,   34,   33,   32,   31,   30,   29,
+       28,   27,   26,   25,   19,   18,   17,   16,   14,   13,
+       12,   10,    3,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+#line 1 "itbl-lex.l"
+/* itbl-lex.l
+   Copyright 1997, 1998, 2001, 2002, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+
+   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 3, 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, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+#line 23 "itbl-lex.l"
+#include "as.h"
+#include "itbl-lex.h"
+#include <itbl-parse.h>
+
+#ifdef DEBUG
+#define DBG(x) printf x
+#define MDBG(x) printf x
+#else
+#define DBG(x)
+#define MDBG(x)
+#endif
+
+int insntbl_line = 1;
+#line 527 "itbl-lex.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+yy_size_t yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (void );
+#else
+extern int yywrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 43 "itbl-lex.l"
+
+
+#line 712 "itbl-lex.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
+
+		yy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 60 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 84 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 45 "itbl-lex.l"
+{
+    return CREG;
+  }
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 48 "itbl-lex.l"
+{
+    return DREG;
+  }
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 51 "itbl-lex.l"
+{
+    return GREG;
+  }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 54 "itbl-lex.l"
+{
+    return IMMED;
+  }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 57 "itbl-lex.l"
+{
+    return ADDR;
+  }
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 60 "itbl-lex.l"
+{
+    return INSN;
+  }
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 63 "itbl-lex.l"
+{
+    yytext[yyleng] = 0;
+    yylval.processor = strtoul (yytext+1, 0, 0);
+    return PNUM;
+  }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 68 "itbl-lex.l"
+{
+    yytext[yyleng] = 0;
+    yylval.num = strtoul (yytext, 0, 0);
+    return NUM;
+  }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 73 "itbl-lex.l"
+{
+    yytext[yyleng] = 0;
+    yylval.num = strtoul (yytext, 0, 0);
+    return NUM;
+  }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 78 "itbl-lex.l"
+{
+    yytext[yyleng] = 0;
+    yylval.str = strdup (yytext);
+    return ID;
+  }
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 83 "itbl-lex.l"
+{
+    int c;
+    while ((c = input ()) !=  EOF) 
+      {
+        if (c ==  '\n') 
+    	{
+    		unput (c);
+    		break;
+    	}
+      }
+  }
+	YY_BREAK
+case 12:
+/* rule 12 can match eol */
+YY_RULE_SETUP
+#line 94 "itbl-lex.l"
+{ 
+    insntbl_line++; 
+    MDBG (("in lex, NL = %d (x%x)\n", NL, NL));
+    return NL; 
+  }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 99 "itbl-lex.l"
+{ 
+  }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 101 "itbl-lex.l"
+{
+    MDBG (("char = %x, %d\n", yytext[0], yytext[0]));
+    return yytext[0];
+  }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 105 "itbl-lex.l"
+ECHO;
+	YY_BREAK
+#line 917 "itbl-lex.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyrestart(yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 60 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 60 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 59);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up yytext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					yyrestart(yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( yywrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
+	}
+
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	yy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		yyfree((void *) b->yy_ch_buf  );
+
+	yyfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+	return yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *yyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 105 "itbl-lex.l"
+
+
+
+#ifndef yywrap
+int 
+yywrap () 
+  { 
+    return 1; 
+  }
+#endif
+
diff --git a/gas/itbl-parse.c b/gas/itbl-parse.c
new file mode 100644
index 0000000000..6dc09e3ddb
--- /dev/null
+++ b/gas/itbl-parse.c
@@ -0,0 +1,2006 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     DREG = 258,
+     CREG = 259,
+     GREG = 260,
+     IMMED = 261,
+     ADDR = 262,
+     INSN = 263,
+     NUM = 264,
+     ID = 265,
+     NL = 266,
+     PNUM = 267
+   };
+#endif
+/* Tokens.  */
+#define DREG 258
+#define CREG 259
+#define GREG 260
+#define IMMED 261
+#define ADDR 262
+#define INSN 263
+#define NUM 264
+#define ID 265
+#define NL 266
+#define PNUM 267
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 21 "itbl-parse.y"
+
+
+/* 
+
+Yacc grammar for instruction table entries.
+
+=======================================================================
+Original Instruction table specification document:
+
+	    MIPS Coprocessor Table Specification
+	    ====================================
+
+This document describes the format of the MIPS coprocessor table.  The
+table specifies a list of valid functions, data registers and control
+registers that can be used in coprocessor instructions.  This list,
+together with the coprocessor instruction classes listed below,
+specifies the complete list of coprocessor instructions that will
+be recognized and assembled by the GNU assembler.  In effect,
+this makes the GNU assembler table-driven, where the table is
+specified by the programmer.
+
+The table is an ordinary text file that the GNU assembler reads when
+it starts.  Using the information in the table, the assembler
+generates an internal list of valid coprocessor registers and
+functions.  The assembler uses this internal list in addition to the
+standard MIPS registers and instructions which are built-in to the 
+assembler during code generation.
+
+To specify the coprocessor table when invoking the GNU assembler, use
+the command line option "--itbl file", where file is the
+complete name of the table, including path and extension.
+
+Examples:
+
+	    gas -t cop.tbl test.s -o test.o
+	    gas -t /usr/local/lib/cop.tbl test.s -o test.o
+	    gas --itbl d:\gnu\data\cop.tbl test.s -o test.o
+
+Only one table may be supplied during a single invocation of
+the assembler.
+
+
+Instruction classes
+===================
+
+Below is a list of the valid coprocessor instruction classes for
+any given coprocessor "z".  These instructions are already recognized
+by the assembler, and are listed here only for reference.
+
+Class   format	    	    	      instructions
+-------------------------------------------------
+Class1:
+	op base rt offset
+	    	    	    	    	    	    	    LWCz rt,offset (base)
+	    	    	    	    	    	    	    SWCz rt,offset (base)
+Class2:
+	COPz sub rt rd 0
+	    	    	    	    	    	    	    MTCz rt,rd
+	    	    	    	    	    	    	    MFCz rt,rd
+	    	    	    	    	    	    	    CTCz rt,rd
+	    	    	    	    	    	    	    CFCz rt,rd
+Class3:
+	COPz CO cofun
+	    	    	    	    	    	    	    COPz cofun
+Class4:
+	COPz BC br offset
+	    	    	    	    	    	    	    BCzT offset
+	    	    	    	    	    	    	    BCzF offset
+Class5:
+	COPz sub rt rd 0
+	    	    	    	    	    	    	    DMFCz rt,rd
+	    	    	    	    	    	    	    DMTCz rt,rd
+Class6:
+	op base rt offset
+	    	    	    	    	    	    	    LDCz rt,offset (base)
+	    	    	    	    	    	    	    SDCz rt,offset (base)
+Class7:
+	COPz BC br offset
+	    	    	    	    	    	    	    BCzTL offset
+	    	    	    	    	    	    	    BCzFL offset
+
+The coprocessor table defines coprocessor-specific registers that can
+be used with all of the above classes of instructions, where
+appropriate.  It also defines additional coprocessor-specific
+functions for Class3 (COPz cofun) instructions, Thus, the table allows
+the programmer to use convenient mnemonics and operands for these
+functions, instead of the COPz mmenmonic and cofun operand.
+
+The names of the MIPS general registers and their aliases are defined
+by the assembler and will be recognized as valid register names by the
+assembler when used (where allowed) in coprocessor instructions.
+However, the names and values of all coprocessor data and control
+register mnemonics must be specified in the coprocessor table.
+
+
+Table Grammar
+=============
+
+Here is the grammar for the coprocessor table:
+
+	    table -> entry*
+
+	    entry -> [z entrydef] [comment] '\n'
+
+	    entrydef -> type name val
+	    entrydef -> 'insn' name val funcdef ; type of entry (instruction)
+
+	    z -> 'p'['0'..'3']	    	     ; processor number 
+	    type -> ['dreg' | 'creg' | 'greg' ]	     ; type of entry (register)
+	; 'dreg', 'creg' or 'greg' specifies a data, control, or general
+	;	    register mnemonic, respectively
+	    name -> [ltr|dec]*	    	     ; mnemonic of register/function
+	    val -> [dec|hex]	    	     ; register/function number (integer constant)
+
+	    funcdef -> frange flags fields
+	    	    	    	; bitfield range for opcode
+	    	    	    	; list of fields' formats
+	    fields -> field*
+	    field -> [','] ftype frange flags
+	    flags -> ['*' flagexpr]
+	    flagexpr -> '[' flagexpr ']'
+	    flagexpr -> val '|' flagexpr 
+	    ftype -> [ type | 'immed' | 'addr' ]
+	; 'immed' specifies an immediate value; see grammar for "val" above
+	    	; 'addr' specifies a C identifier; name of symbol to be resolved at 
+	;	    link time
+	    frange -> ':' val '-' val	; starting to ending bit positions, where
+	    	    	    	; where 0 is least significant bit
+	    frange -> (null)	    	; default range of 31-0 will be assumed
+
+	    comment -> [';'|'#'] [char]*
+	    char -> any printable character
+	    ltr -> ['a'..'z'|'A'..'Z'] 
+	    dec -> ['0'..'9']*	    	    	    	    	     ; value in decimal
+	    hex -> '0x'['0'..'9' | 'a'..'f' | 'A'..'F']*	; value in hexadecimal 
+
+
+Examples
+========
+
+Example 1:
+
+The table:
+
+	    p1 dreg d1 1	     ; data register "d1" for COP1 has value 1
+	    p1 creg c3 3	     ; ctrl register "c3" for COP1 has value 3
+	    p3 func fill 0x1f:24-20	      ; function "fill" for COP3 has value 31 and 
+	    	    	; no fields
+
+will allow the assembler to accept the following coprocessor instructions:
+
+	    LWC1 d1,0x100 ($2)
+	    fill
+
+Here, the general purpose register "$2", and instruction "LWC1", are standard 
+mnemonics built-in to the MIPS assembler.  
+
+
+Example 2:
+
+The table:
+
+	    p3 dreg d3 3	     ; data register "d3" for COP3 has value 3
+	    p3 creg c2 22	     ; control register "c2" for COP3 has value 22
+	    p3 func fee 0x1f:24-20 dreg:17-13 creg:12-8 immed:7-0 
+	    	; function "fee" for COP3 has value 31, and 3 fields 
+	    	; consisting of a data register, a control register, 
+	    	; and an immediate value.
+
+will allow the assembler to accept the following coprocessor instruction:
+
+	    fee d3,c2,0x1
+
+and will emit the object code:
+
+	    31-26  25 24-20 19-18  17-13 12-8  7-0
+	    COPz   CO fun	    	      dreg  creg  immed
+	    010011 1  11111 00	     00011 10110 00000001 
+
+	    0x4ff07601
+
+
+Example 3:
+
+The table:
+
+	    p3 dreg d3 3	     ; data register "d3" for COP3 has value 3
+	    p3 creg c2 22	     ; control register "c2" for COP3 has value 22
+	    p3 func fuu 0x01f00001 dreg:17-13 creg:12-8
+
+will allow the assembler to accept the following coprocessor
+instruction:
+
+	    fuu d3,c2
+
+and will emit the object code:
+
+	    31-26  25 24-20 19-18  17-13 12-8  7-0
+	    COPz   CO fun	    	      dreg  creg  
+	    010011 1  11111 00	     00011 10110 00000001 
+
+	    0x4ff07601
+
+In this way, the programmer can force arbitrary bits of an instruction
+to have predefined values.
+
+=======================================================================
+Additional notes:
+
+Encoding of ranges:
+To handle more than one bit position range within an instruction,
+use 0s to mask out the ranges which don't apply.
+May decide to modify the syntax to allow commas separate multiple 
+ranges within an instruction (range','range).
+
+Changes in grammar:
+	The number of parms argument to the function entry
+was deleted from the original format such that we now count the fields.
+
+----
+FIXME! should really change lexical analyzer 
+to recognize 'dreg' etc. in context sensitive way.
+Currently function names or mnemonics may be incorrectly parsed as keywords
+
+FIXME! hex is ambiguous with any digit
+
+*/
+
+#include "as.h"
+#include "itbl-lex.h"
+#include "itbl-ops.h"
+
+/* #define DEBUG */
+
+#ifdef DEBUG
+#ifndef DBG_LVL
+#define DBG_LVL 1
+#endif
+#else
+#define DBG_LVL 0
+#endif
+
+#if DBG_LVL >= 1
+#define DBG(x) printf x
+#else
+#define DBG(x) 
+#endif
+
+#if DBG_LVL >= 2
+#define DBGL2(x) printf x
+#else
+#define DBGL2(x) 
+#endif
+
+static int sbit, ebit;
+static struct itbl_entry *insn=0;
+static int yyerror (const char *);
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 282 "itbl-parse.y"
+{
+    char *str;
+    int num;
+    int processor;
+    unsigned long val;
+  }
+/* Line 193 of yacc.c.  */
+#line 387 "itbl-parse.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 216 of yacc.c.  */
+#line 400 "itbl-parse.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  9
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   46
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  20
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  15
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  29
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  51
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   267
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,    17,     2,    13,    19,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    18,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    15,     2,    16,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    14,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     5,     8,     9,    15,    16,    26,    28,
+      31,    35,    38,    39,    41,    43,    45,    49,    53,    57,
+      59,    62,    63,    68,    69,    71,    73,    75,    77,    79
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      21,     0,    -1,    22,    -1,    23,    22,    -1,    -1,    31,
+      32,    33,    34,    11,    -1,    -1,    31,     8,    33,    34,
+      30,    29,    24,    25,    11,    -1,    11,    -1,     1,    11,
+      -1,    13,    27,    25,    -1,    27,    25,    -1,    -1,    32,
+      -1,     7,    -1,     6,    -1,    26,    30,    29,    -1,     9,
+      14,    28,    -1,    15,    28,    16,    -1,     9,    -1,    17,
+      28,    -1,    -1,    18,     9,    19,     9,    -1,    -1,    12,
+      -1,     3,    -1,     4,    -1,     5,    -1,    10,    -1,     9,
+      -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   299,   299,   303,   304,   308,   315,   314,   323,   324,
+     328,   329,   330,   334,   339,   344,   352,   361,   365,   369,
+     376,   382,   388,   395,   402,   410,   415,   420,   428,   444
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "DREG", "CREG", "GREG", "IMMED", "ADDR",
+  "INSN", "NUM", "ID", "NL", "PNUM", "','", "'|'", "'['", "']'", "'*'",
+  "':'", "'-'", "$accept", "insntbl", "entrys", "entry", "@1",
+  "fieldspecs", "ftype", "fieldspec", "flagexpr", "flags", "range", "pnum",
+  "regtype", "name", "value", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,    44,   124,    91,    93,    42,    58,    45
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    20,    21,    22,    22,    23,    24,    23,    23,    23,
+      25,    25,    25,    26,    26,    26,    27,    28,    28,    28,
+      29,    29,    30,    30,    31,    32,    32,    32,    33,    34
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     2,     0,     5,     0,     9,     1,     2,
+       3,     2,     0,     1,     1,     1,     3,     3,     3,     1,
+       2,     0,     4,     0,     1,     1,     1,     1,     1,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     0,     8,    24,     0,     2,     0,     0,     9,     1,
+       3,    25,    26,    27,     0,     0,    28,     0,     0,    29,
+      23,     0,     0,    21,     5,     0,     0,     6,     0,    19,
+       0,    20,    12,    22,     0,     0,    15,    14,     0,     0,
+      23,    12,    13,    17,    18,    12,     7,    21,    11,    10,
+      16
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     4,     5,     6,    32,    39,    40,    41,    31,    27,
+      23,     7,    42,    17,    20
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -16
+static const yytype_int8 yypact[] =
+{
+       0,    -9,   -16,   -16,    10,   -16,     0,    12,   -16,   -16,
+     -16,   -16,   -16,   -16,     3,     3,   -16,     9,     9,   -16,
+      11,     8,    19,    15,   -16,    14,    -6,   -16,    25,    21,
+      -6,   -16,     1,   -16,    -6,    20,   -16,   -16,    18,    26,
+      11,     1,   -16,   -16,   -16,     1,   -16,    15,   -16,   -16,
+     -16
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -16,   -16,    32,   -16,   -16,   -15,   -16,     2,    -3,    -8,
+       4,   -16,    34,    27,    28
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -5
+static const yytype_int8 yytable[] =
+{
+      -4,     1,     8,    29,    11,    12,    13,    36,    37,    30,
+       9,     2,     3,    16,    38,    11,    12,    13,    19,    24,
+      14,    11,    12,    13,    36,    37,    48,    35,    25,    22,
+      49,    43,    26,    28,    33,    34,    44,    46,    10,    50,
+      45,    15,    18,     0,    47,     0,    21
+};
+
+static const yytype_int8 yycheck[] =
+{
+       0,     1,    11,     9,     3,     4,     5,     6,     7,    15,
+       0,    11,    12,    10,    13,     3,     4,     5,     9,    11,
+       8,     3,     4,     5,     6,     7,    41,    30,     9,    18,
+      45,    34,    17,    19,     9,    14,    16,    11,     6,    47,
+      38,     7,    15,    -1,    40,    -1,    18
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     1,    11,    12,    21,    22,    23,    31,    11,     0,
+      22,     3,     4,     5,     8,    32,    10,    33,    33,     9,
+      34,    34,    18,    30,    11,     9,    17,    29,    19,     9,
+      15,    28,    24,     9,    14,    28,     6,     7,    13,    25,
+      26,    27,    32,    28,    16,    27,    11,    30,    25,    25,
+      29
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 5:
+#line 309 "itbl-parse.y"
+    {
+	    DBG (("line %d: entry pnum=%d type=%d name=%s value=x%x\n", 
+	    	    insntbl_line, (yyvsp[(1) - (5)].num), (yyvsp[(2) - (5)].num), (yyvsp[(3) - (5)].str), (yyvsp[(4) - (5)].val)));
+	    itbl_add_reg ((yyvsp[(1) - (5)].num), (yyvsp[(2) - (5)].num), (yyvsp[(3) - (5)].str), (yyvsp[(4) - (5)].val));
+	  }
+    break;
+
+  case 6:
+#line 315 "itbl-parse.y"
+    {
+	    DBG (("line %d: entry pnum=%d type=INSN name=%s value=x%x",
+	    	    insntbl_line, (yyvsp[(1) - (6)].num), (yyvsp[(3) - (6)].str), (yyvsp[(4) - (6)].val)));
+	    DBG ((" sbit=%d ebit=%d flags=0x%x\n", sbit, ebit, (yyvsp[(6) - (6)].val)));
+	    insn=itbl_add_insn ((yyvsp[(1) - (6)].num), (yyvsp[(3) - (6)].str), (yyvsp[(4) - (6)].val), sbit, ebit, (yyvsp[(6) - (6)].val));
+	  }
+    break;
+
+  case 7:
+#line 322 "itbl-parse.y"
+    {}
+    break;
+
+  case 13:
+#line 335 "itbl-parse.y"
+    {
+	    DBGL2 (("ftype\n"));
+	    (yyval.num) = (yyvsp[(1) - (1)].num);
+	  }
+    break;
+
+  case 14:
+#line 340 "itbl-parse.y"
+    {
+	    DBGL2 (("addr\n"));
+	    (yyval.num) = ADDR;
+	  }
+    break;
+
+  case 15:
+#line 345 "itbl-parse.y"
+    {
+	    DBGL2 (("immed\n"));
+	    (yyval.num) = IMMED;
+	  }
+    break;
+
+  case 16:
+#line 353 "itbl-parse.y"
+    {
+	    DBG (("line %d: field type=%d sbit=%d ebit=%d, flags=0x%x\n", 
+	    	    insntbl_line, (yyvsp[(1) - (3)].num), sbit, ebit, (yyvsp[(3) - (3)].val)));
+	    itbl_add_operand (insn, (yyvsp[(1) - (3)].num), sbit, ebit, (yyvsp[(3) - (3)].val));
+	  }
+    break;
+
+  case 17:
+#line 362 "itbl-parse.y"
+    {
+	    (yyval.val) = (yyvsp[(1) - (3)].num) | (yyvsp[(3) - (3)].val);
+	  }
+    break;
+
+  case 18:
+#line 366 "itbl-parse.y"
+    {
+	    (yyval.val) = (yyvsp[(2) - (3)].val);
+	  }
+    break;
+
+  case 19:
+#line 370 "itbl-parse.y"
+    {
+	    (yyval.val) = (yyvsp[(1) - (1)].num);
+	  }
+    break;
+
+  case 20:
+#line 377 "itbl-parse.y"
+    {
+	    DBGL2 (("flags=%d\n", (yyvsp[(2) - (2)].val)));
+	    (yyval.val) = (yyvsp[(2) - (2)].val);
+	  }
+    break;
+
+  case 21:
+#line 382 "itbl-parse.y"
+    {
+	    (yyval.val) = 0;
+	  }
+    break;
+
+  case 22:
+#line 389 "itbl-parse.y"
+    {
+	    DBGL2 (("range %d %d\n", (yyvsp[(2) - (4)].num), (yyvsp[(4) - (4)].num)));
+	    sbit = (yyvsp[(2) - (4)].num);
+	    ebit = (yyvsp[(4) - (4)].num);
+	  }
+    break;
+
+  case 23:
+#line 395 "itbl-parse.y"
+    {
+	    sbit = 31;
+	    ebit = 0;
+	  }
+    break;
+
+  case 24:
+#line 403 "itbl-parse.y"
+    {
+	    DBGL2 (("pnum=%d\n",(yyvsp[(1) - (1)].num)));
+	    (yyval.num) = (yyvsp[(1) - (1)].num);
+	  }
+    break;
+
+  case 25:
+#line 411 "itbl-parse.y"
+    {
+	    DBGL2 (("dreg\n"));
+	    (yyval.num) = DREG;
+	  }
+    break;
+
+  case 26:
+#line 416 "itbl-parse.y"
+    {
+	    DBGL2 (("creg\n"));
+	    (yyval.num) = CREG;
+	  }
+    break;
+
+  case 27:
+#line 421 "itbl-parse.y"
+    {
+	    DBGL2 (("greg\n"));
+	    (yyval.num) = GREG;
+	  }
+    break;
+
+  case 28:
+#line 429 "itbl-parse.y"
+    {
+	    DBGL2 (("name=%s\n",(yyvsp[(1) - (1)].str)));
+	    (yyval.str) = (yyvsp[(1) - (1)].str); 
+	  }
+    break;
+
+  case 29:
+#line 445 "itbl-parse.y"
+    {
+	    DBGL2 (("val=x%x\n",(yyvsp[(1) - (1)].num)));
+	    (yyval.val) = (yyvsp[(1) - (1)].num);
+	  }
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 1783 "itbl-parse.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+#line 450 "itbl-parse.y"
+
+
+static int
+yyerror (msg)
+     const char *msg;
+{
+  printf ("line %d: %s\n", insntbl_line, msg);
+  return 0;
+}
+
diff --git a/gas/itbl-parse.h b/gas/itbl-parse.h
new file mode 100644
index 0000000000..18dfb8c83a
--- /dev/null
+++ b/gas/itbl-parse.h
@@ -0,0 +1,87 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     DREG = 258,
+     CREG = 259,
+     GREG = 260,
+     IMMED = 261,
+     ADDR = 262,
+     INSN = 263,
+     NUM = 264,
+     ID = 265,
+     NL = 266,
+     PNUM = 267
+   };
+#endif
+/* Tokens.  */
+#define DREG 258
+#define CREG 259
+#define GREG 260
+#define IMMED 261
+#define ADDR 262
+#define INSN 263
+#define NUM 264
+#define ID 265
+#define NL 266
+#define PNUM 267
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 282 "itbl-parse.y"
+{
+    char *str;
+    int num;
+    int processor;
+    unsigned long val;
+  }
+/* Line 1529 of yacc.c.  */
+#line 80 "itbl-parse.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+extern YYSTYPE yylval;
+
diff --git a/gas/m68k-parse.c b/gas/m68k-parse.c
new file mode 100644
index 0000000000..9be8bf5518
--- /dev/null
+++ b/gas/m68k-parse.c
@@ -0,0 +1,2863 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     DR = 258,
+     AR = 259,
+     FPR = 260,
+     FPCR = 261,
+     LPC = 262,
+     ZAR = 263,
+     ZDR = 264,
+     LZPC = 265,
+     CREG = 266,
+     INDEXREG = 267,
+     EXPR = 268
+   };
+#endif
+/* Tokens.  */
+#define DR 258
+#define AR 259
+#define FPR 260
+#define FPCR 261
+#define LPC 262
+#define ZAR 263
+#define ZDR 264
+#define LZPC 265
+#define CREG 266
+#define INDEXREG 267
+#define EXPR 268
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 28 "m68k-parse.y"
+
+
+#include "as.h"
+#include "tc-m68k.h"
+#include "m68k-parse.h"
+#include "safe-ctype.h"
+
+/* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
+   etc), as well as gratuitously global symbol names If other parser
+   generators (bison, byacc, etc) produce additional global names that
+   conflict at link time, then those parser generators need to be
+   fixed instead of adding those names to this list.  */
+
+#define	yymaxdepth m68k_maxdepth
+#define	yyparse	m68k_parse
+#define	yylex	m68k_lex
+#define	yyerror	m68k_error
+#define	yylval	m68k_lval
+#define	yychar	m68k_char
+#define	yydebug	m68k_debug
+#define	yypact	m68k_pact	
+#define	yyr1	m68k_r1			
+#define	yyr2	m68k_r2			
+#define	yydef	m68k_def		
+#define	yychk	m68k_chk		
+#define	yypgo	m68k_pgo		
+#define	yyact	m68k_act		
+#define	yyexca	m68k_exca
+#define yyerrflag m68k_errflag
+#define yynerrs	m68k_nerrs
+#define	yyps	m68k_ps
+#define	yypv	m68k_pv
+#define	yys	m68k_s
+#define	yy_yys	m68k_yys
+#define	yystate	m68k_state
+#define	yytmp	m68k_tmp
+#define	yyv	m68k_v
+#define	yy_yyv	m68k_yyv
+#define	yyval	m68k_val
+#define	yylloc	m68k_lloc
+#define yyreds	m68k_reds		/* With YYDEBUG defined */
+#define yytoks	m68k_toks		/* With YYDEBUG defined */
+#define yylhs	m68k_yylhs
+#define yylen	m68k_yylen
+#define yydefred m68k_yydefred
+#define yydgoto	m68k_yydgoto
+#define yysindex m68k_yysindex
+#define yyrindex m68k_yyrindex
+#define yygindex m68k_yygindex
+#define yytable	 m68k_yytable
+#define yycheck	 m68k_yycheck
+
+#ifndef YYDEBUG
+#define YYDEBUG 1
+#endif
+
+/* Internal functions.  */
+
+static enum m68k_register m68k_reg_parse (char **);
+static int yylex (void);
+static void yyerror (const char *);
+
+/* The parser sets fields pointed to by this global variable.  */
+static struct m68k_op *op;
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 96 "m68k-parse.y"
+{
+  struct m68k_indexreg indexreg;
+  enum m68k_register reg;
+  struct m68k_exp exp;
+  unsigned long mask;
+  int onereg;
+  int trailing_ampersand;
+}
+/* Line 193 of yacc.c.  */
+#line 198 "m68k-parse.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 216 of yacc.c.  */
+#line 211 "m68k-parse.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  44
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   215
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  27
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  21
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  89
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  180
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   268
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,    17,     2,     2,    14,     2,
+      18,    19,     2,    20,    22,    21,     2,    26,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      15,     2,    16,     2,    25,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    23,     2,    24,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     8,    11,    12,    14,    17,    20,
+      22,    24,    26,    28,    30,    32,    35,    38,    40,    44,
+      49,    54,    60,    66,    71,    75,    79,    83,    91,    99,
+     106,   112,   119,   125,   132,   138,   144,   149,   159,   167,
+     176,   183,   194,   203,   214,   223,   232,   235,   239,   243,
+     249,   256,   267,   277,   288,   290,   292,   294,   296,   298,
+     300,   302,   304,   306,   308,   310,   312,   314,   316,   317,
+     319,   321,   323,   324,   327,   328,   331,   332,   335,   337,
+     341,   345,   347,   349,   353,   357,   361,   363,   365,   367
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      28,     0,    -1,    30,    -1,    31,    29,    -1,    32,    29,
+      -1,    -1,    14,    -1,    15,    15,    -1,    16,    16,    -1,
+       3,    -1,     4,    -1,     5,    -1,     6,    -1,    11,    -1,
+      13,    -1,    17,    13,    -1,    14,    13,    -1,    44,    -1,
+      18,     4,    19,    -1,    18,     4,    19,    20,    -1,    21,
+      18,     4,    19,    -1,    18,    13,    22,    38,    19,    -1,
+      18,    38,    22,    13,    19,    -1,    13,    18,    38,    19,
+      -1,    18,     7,    19,    -1,    18,     8,    19,    -1,    18,
+      10,    19,    -1,    18,    13,    22,    38,    22,    33,    19,
+      -1,    18,    13,    22,    38,    22,    40,    19,    -1,    18,
+      13,    22,    34,    41,    19,    -1,    18,    34,    22,    13,
+      19,    -1,    13,    18,    38,    22,    33,    19,    -1,    18,
+      38,    22,    33,    19,    -1,    13,    18,    38,    22,    40,
+      19,    -1,    18,    38,    22,    40,    19,    -1,    13,    18,
+      34,    41,    19,    -1,    18,    34,    41,    19,    -1,    18,
+      23,    13,    41,    24,    22,    33,    42,    19,    -1,    18,
+      23,    13,    41,    24,    42,    19,    -1,    18,    23,    38,
+      24,    22,    33,    42,    19,    -1,    18,    23,    38,    24,
+      42,    19,    -1,    18,    23,    13,    22,    38,    22,    33,
+      24,    42,    19,    -1,    18,    23,    38,    22,    33,    24,
+      42,    19,    -1,    18,    23,    13,    22,    38,    22,    40,
+      24,    42,    19,    -1,    18,    23,    38,    22,    40,    24,
+      42,    19,    -1,    18,    23,    43,    34,    41,    24,    42,
+      19,    -1,    39,    25,    -1,    39,    25,    20,    -1,    39,
+      25,    21,    -1,    39,    25,    18,    13,    19,    -1,    39,
+      25,    18,    43,    33,    19,    -1,    39,    25,    18,    13,
+      19,    25,    18,    43,    33,    19,    -1,    39,    25,    18,
+      13,    19,    25,    18,    13,    19,    -1,    39,    25,    18,
+      43,    33,    19,    25,    18,    13,    19,    -1,    12,    -1,
+      35,    -1,    12,    -1,    36,    -1,    36,    -1,     4,    -1,
+       8,    -1,     3,    -1,     9,    -1,     4,    -1,     7,    -1,
+      37,    -1,    10,    -1,     8,    -1,    -1,    38,    -1,     7,
+      -1,    10,    -1,    -1,    22,    38,    -1,    -1,    22,    13,
+      -1,    -1,    13,    22,    -1,    46,    -1,    46,    26,    45,
+      -1,    47,    26,    45,    -1,    47,    -1,    46,    -1,    46,
+      26,    45,    -1,    47,    26,    45,    -1,    47,    21,    47,
+      -1,     3,    -1,     4,    -1,     5,    -1,     6,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   121,   121,   122,   126,   135,   136,   143,   148,   153,
+     158,   163,   168,   173,   178,   183,   188,   193,   206,   211,
+     216,   221,   231,   241,   251,   256,   261,   266,   273,   284,
+     291,   297,   304,   310,   321,   331,   338,   344,   352,   359,
+     366,   372,   380,   387,   399,   410,   423,   431,   439,   447,
+     457,   464,   472,   479,   493,   494,   507,   508,   520,   521,
+     522,   528,   529,   535,   536,   543,   544,   545,   552,   555,
+     561,   562,   569,   572,   582,   586,   596,   600,   609,   610,
+     614,   626,   630,   631,   635,   642,   652,   656,   660,   664
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "DR", "AR", "FPR", "FPCR", "LPC", "ZAR",
+  "ZDR", "LZPC", "CREG", "INDEXREG", "EXPR", "'&'", "'<'", "'>'", "'#'",
+  "'('", "')'", "'+'", "'-'", "','", "'['", "']'", "'@'", "'/'", "$accept",
+  "operand", "optional_ampersand", "generic_operand", "motorola_operand",
+  "mit_operand", "zireg", "zdireg", "zadr", "zdr", "apc", "zapc",
+  "optzapc", "zpc", "optczapc", "optcexpr", "optexprc", "reglist",
+  "ireglist", "reglistpair", "reglistreg", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,    38,    60,    62,    35,    40,    41,
+      43,    45,    44,    91,    93,    64,    47
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    27,    28,    28,    28,    29,    29,    30,    30,    30,
+      30,    30,    30,    30,    30,    30,    30,    30,    31,    31,
+      31,    31,    31,    31,    31,    31,    31,    31,    31,    31,
+      31,    31,    31,    31,    31,    31,    31,    31,    31,    31,
+      31,    31,    31,    31,    31,    31,    32,    32,    32,    32,
+      32,    32,    32,    32,    33,    33,    34,    34,    35,    35,
+      35,    36,    36,    37,    37,    38,    38,    38,    39,    39,
+      40,    40,    41,    41,    42,    42,    43,    43,    44,    44,
+      44,    45,    45,    45,    45,    46,    47,    47,    47,    47
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     2,     2,     0,     1,     2,     2,     1,
+       1,     1,     1,     1,     1,     2,     2,     1,     3,     4,
+       4,     5,     5,     4,     3,     3,     3,     7,     7,     6,
+       5,     6,     5,     6,     5,     5,     4,     9,     7,     8,
+       6,    10,     8,    10,     8,     8,     2,     3,     3,     5,
+       6,    10,     9,    10,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     0,     1,
+       1,     1,     0,     2,     0,     2,     0,     2,     1,     3,
+       3,     1,     1,     3,     3,     3,     1,     1,     1,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+      68,    86,    87,    88,    89,    64,    67,    66,    13,    14,
+       0,     0,     0,     0,     0,     0,     0,     2,     5,     5,
+      65,    69,     0,    17,    78,     0,     0,    16,     7,     8,
+      15,    61,    63,    64,    67,    62,    66,    56,     0,    76,
+      72,    57,     0,     0,     1,     6,     3,     4,    46,     0,
+       0,     0,    63,    72,     0,    18,    24,    25,    26,     0,
+      72,     0,     0,     0,     0,     0,     0,    76,    47,    48,
+      86,    87,    88,    89,    79,    82,    81,    85,    80,     0,
+       0,    23,     0,    19,    72,     0,    77,     0,     0,    74,
+      72,     0,    73,    36,    59,    70,    60,    71,    54,     0,
+       0,    55,    58,     0,    20,     0,     0,     0,     0,    35,
+       0,     0,     0,    21,     0,    73,    74,     0,     0,     0,
+       0,     0,    30,    22,    32,    34,    49,    77,     0,    83,
+      84,    31,    33,    29,     0,     0,     0,     0,     0,    74,
+      74,    75,    74,    40,    74,     0,    50,    27,    28,     0,
+       0,    74,    38,     0,     0,     0,     0,     0,    76,     0,
+      74,    74,     0,    42,    44,    39,    45,     0,     0,     0,
+       0,     0,    37,    52,     0,     0,    41,    43,    51,    53
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,    16,    46,    17,    18,    19,   100,    40,   101,   102,
+      20,    92,    22,   103,    64,   120,    62,    23,    74,    75,
+      76
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -98
+static const yytype_int16 yypact[] =
+{
+      89,    14,     9,    31,    35,   -98,   -98,   -98,   -98,     0,
+      36,    42,    28,    56,    63,    67,    90,   -98,    75,    75,
+     -98,   -98,    86,   -98,    96,   -15,   123,   -98,   -98,   -98,
+     -98,   -98,    97,   115,   119,   -98,   120,   -98,   122,    16,
+     126,   -98,   127,   157,   -98,   -98,   -98,   -98,    19,   154,
+     154,   154,   -98,   140,    29,   144,   -98,   -98,   -98,   123,
+     141,    99,    18,    70,   147,   105,   148,   152,   -98,   -98,
+     -98,   -98,   -98,   -98,   -98,   142,   -13,   -98,   -98,   146,
+     150,   -98,   133,   -98,   140,    60,   146,   149,   133,   153,
+     140,   151,   -98,   -98,   -98,   -98,   -98,   -98,   -98,   155,
+     158,   -98,   -98,   159,   -98,    62,   143,   154,   154,   -98,
+     160,   161,   162,   -98,   133,   163,   164,   165,   166,   116,
+     168,   167,   -98,   -98,   -98,   -98,   169,   -98,   173,   -98,
+     -98,   -98,   -98,   -98,   174,   176,   133,   116,   177,   175,
+     175,   -98,   175,   -98,   175,   170,   178,   -98,   -98,   180,
+     181,   175,   -98,   171,   179,   182,   183,   187,   186,   189,
+     175,   175,   190,   -98,   -98,   -98,   -98,    79,   143,   195,
+     191,   192,   -98,   -98,   193,   194,   -98,   -98,   -98,   -98
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+     -98,   -98,   196,   -98,   -98,   -98,   -81,     6,   -98,    -9,
+     -98,     2,   -98,   -78,   -38,   -97,   -67,   -98,   -48,   172,
+      12
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -64
+static const yytype_int16 yytable[] =
+{
+     106,   110,    21,    78,   111,    41,    50,   117,    50,   -10,
+     118,    51,    25,   108,    -9,    80,    42,    41,    26,   138,
+      52,    31,    87,     5,     6,   128,     7,    35,    54,    60,
+      37,   -11,    53,   134,   -63,   -12,   135,    67,   142,    68,
+      69,    61,   154,   155,    29,   156,   112,   157,    81,    27,
+      41,    82,   121,    41,   162,   149,   151,    28,   150,   129,
+     130,    85,    77,   170,   171,    84,    31,    32,    90,    30,
+      33,    34,    35,    36,    52,    37,    38,     5,     6,   113,
+       7,   126,   114,    91,   127,    43,    39,   174,   115,    45,
+      44,   168,     1,     2,     3,     4,     5,     6,   173,     7,
+       8,   127,     9,    10,    11,    12,    13,    14,    31,    94,
+      15,    48,    95,    96,    35,    97,    55,    98,    99,    31,
+      94,    88,    49,    89,    96,    35,    31,    52,    98,   141,
+       5,     6,    35,     7,    56,    37,    31,    94,    57,    58,
+      95,    96,    35,    97,    59,    98,    31,    94,    63,    65,
+      52,    96,    35,     5,     6,    98,     7,    70,    71,    72,
+      73,    66,    79,    86,    83,   105,    93,   104,   107,   109,
+     122,     0,    24,   116,   123,   119,     0,   124,   125,   131,
+     132,   133,     0,     0,   141,   136,   137,   143,   158,   139,
+     140,   144,   146,   147,   145,   148,   152,   153,   163,   167,
+       0,   164,   165,   159,   160,   161,   166,   169,   175,   172,
+     176,   177,   178,   179,     0,    47
+};
+
+static const yytype_int16 yycheck[] =
+{
+      67,    82,     0,    51,    82,    14,    21,    88,    21,     0,
+      88,    26,     0,    26,     0,    53,    14,    26,    18,   116,
+       4,     3,    60,     7,     8,   106,    10,     9,    26,    13,
+      12,     0,    26,   114,    25,     0,   114,    18,   119,    20,
+      21,    39,   139,   140,    16,   142,    84,   144,    19,    13,
+      59,    22,    90,    62,   151,   136,   137,    15,   136,   107,
+     108,    59,    50,   160,   161,    59,     3,     4,    62,    13,
+       7,     8,     9,    10,     4,    12,    13,     7,     8,    19,
+      10,    19,    22,    13,    22,    18,    23,   168,    86,    14,
+       0,   158,     3,     4,     5,     6,     7,     8,    19,    10,
+      11,    22,    13,    14,    15,    16,    17,    18,     3,     4,
+      21,    25,     7,     8,     9,    10,    19,    12,    13,     3,
+       4,    22,    26,    24,     8,     9,     3,     4,    12,    13,
+       7,     8,     9,    10,    19,    12,     3,     4,    19,    19,
+       7,     8,     9,    10,    22,    12,     3,     4,    22,    22,
+       4,     8,     9,     7,     8,    12,    10,     3,     4,     5,
+       6,     4,    22,    22,    20,    13,    19,    19,    26,    19,
+      19,    -1,     0,    24,    19,    22,    -1,    19,    19,    19,
+      19,    19,    -1,    -1,    13,    22,    22,    19,    18,    24,
+      24,    24,    19,    19,    25,    19,    19,    22,    19,    13,
+      -1,    19,    19,    25,    24,    24,    19,    18,    13,    19,
+      19,    19,    19,    19,    -1,    19
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     3,     4,     5,     6,     7,     8,    10,    11,    13,
+      14,    15,    16,    17,    18,    21,    28,    30,    31,    32,
+      37,    38,    39,    44,    46,    47,    18,    13,    15,    16,
+      13,     3,     4,     7,     8,     9,    10,    12,    13,    23,
+      34,    36,    38,    18,     0,    14,    29,    29,    25,    26,
+      21,    26,     4,    34,    38,    19,    19,    19,    19,    22,
+      13,    38,    43,    22,    41,    22,     4,    18,    20,    21,
+       3,     4,     5,     6,    45,    46,    47,    47,    45,    22,
+      41,    19,    22,    20,    34,    38,    22,    41,    22,    24,
+      34,    13,    38,    19,     4,     7,     8,    10,    12,    13,
+      33,    35,    36,    40,    19,    13,    43,    26,    26,    19,
+      33,    40,    41,    19,    22,    38,    24,    33,    40,    22,
+      42,    41,    19,    19,    19,    19,    19,    22,    33,    45,
+      45,    19,    19,    19,    33,    40,    22,    22,    42,    24,
+      24,    13,    33,    19,    24,    25,    19,    19,    19,    33,
+      40,    33,    19,    22,    42,    42,    42,    42,    18,    25,
+      24,    24,    42,    19,    19,    19,    19,    13,    43,    18,
+      42,    42,    19,    19,    33,    13,    19,    19,    19,    19
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 3:
+#line 123 "m68k-parse.y"
+    {
+		  op->trailing_ampersand = (yyvsp[(2) - (2)].trailing_ampersand);
+		}
+    break;
+
+  case 4:
+#line 127 "m68k-parse.y"
+    {
+		  op->trailing_ampersand = (yyvsp[(2) - (2)].trailing_ampersand);
+		}
+    break;
+
+  case 5:
+#line 135 "m68k-parse.y"
+    { (yyval.trailing_ampersand) = 0; }
+    break;
+
+  case 6:
+#line 137 "m68k-parse.y"
+    { (yyval.trailing_ampersand) = 1; }
+    break;
+
+  case 7:
+#line 144 "m68k-parse.y"
+    {
+		  op->mode = LSH;
+		}
+    break;
+
+  case 8:
+#line 149 "m68k-parse.y"
+    {
+		  op->mode = RSH;
+		}
+    break;
+
+  case 9:
+#line 154 "m68k-parse.y"
+    {
+		  op->mode = DREG;
+		  op->reg = (yyvsp[(1) - (1)].reg);
+		}
+    break;
+
+  case 10:
+#line 159 "m68k-parse.y"
+    {
+		  op->mode = AREG;
+		  op->reg = (yyvsp[(1) - (1)].reg);
+		}
+    break;
+
+  case 11:
+#line 164 "m68k-parse.y"
+    {
+		  op->mode = FPREG;
+		  op->reg = (yyvsp[(1) - (1)].reg);
+		}
+    break;
+
+  case 12:
+#line 169 "m68k-parse.y"
+    {
+		  op->mode = CONTROL;
+		  op->reg = (yyvsp[(1) - (1)].reg);
+		}
+    break;
+
+  case 13:
+#line 174 "m68k-parse.y"
+    {
+		  op->mode = CONTROL;
+		  op->reg = (yyvsp[(1) - (1)].reg);
+		}
+    break;
+
+  case 14:
+#line 179 "m68k-parse.y"
+    {
+		  op->mode = ABSL;
+		  op->disp = (yyvsp[(1) - (1)].exp);
+		}
+    break;
+
+  case 15:
+#line 184 "m68k-parse.y"
+    {
+		  op->mode = IMMED;
+		  op->disp = (yyvsp[(2) - (2)].exp);
+		}
+    break;
+
+  case 16:
+#line 189 "m68k-parse.y"
+    {
+		  op->mode = IMMED;
+		  op->disp = (yyvsp[(2) - (2)].exp);
+		}
+    break;
+
+  case 17:
+#line 194 "m68k-parse.y"
+    {
+		  op->mode = REGLST;
+		  op->mask = (yyvsp[(1) - (1)].mask);
+		}
+    break;
+
+  case 18:
+#line 207 "m68k-parse.y"
+    {
+		  op->mode = AINDR;
+		  op->reg = (yyvsp[(2) - (3)].reg);
+		}
+    break;
+
+  case 19:
+#line 212 "m68k-parse.y"
+    {
+		  op->mode = AINC;
+		  op->reg = (yyvsp[(2) - (4)].reg);
+		}
+    break;
+
+  case 20:
+#line 217 "m68k-parse.y"
+    {
+		  op->mode = ADEC;
+		  op->reg = (yyvsp[(3) - (4)].reg);
+		}
+    break;
+
+  case 21:
+#line 222 "m68k-parse.y"
+    {
+		  op->reg = (yyvsp[(4) - (5)].reg);
+		  op->disp = (yyvsp[(2) - (5)].exp);
+		  if (((yyvsp[(4) - (5)].reg) >= ZADDR0 && (yyvsp[(4) - (5)].reg) <= ZADDR7)
+		      || (yyvsp[(4) - (5)].reg) == ZPC)
+		    op->mode = BASE;
+		  else
+		    op->mode = DISP;
+		}
+    break;
+
+  case 22:
+#line 232 "m68k-parse.y"
+    {
+		  op->reg = (yyvsp[(2) - (5)].reg);
+		  op->disp = (yyvsp[(4) - (5)].exp);
+		  if (((yyvsp[(2) - (5)].reg) >= ZADDR0 && (yyvsp[(2) - (5)].reg) <= ZADDR7)
+		      || (yyvsp[(2) - (5)].reg) == ZPC)
+		    op->mode = BASE;
+		  else
+		    op->mode = DISP;
+		}
+    break;
+
+  case 23:
+#line 242 "m68k-parse.y"
+    {
+		  op->reg = (yyvsp[(3) - (4)].reg);
+		  op->disp = (yyvsp[(1) - (4)].exp);
+		  if (((yyvsp[(3) - (4)].reg) >= ZADDR0 && (yyvsp[(3) - (4)].reg) <= ZADDR7)
+		      || (yyvsp[(3) - (4)].reg) == ZPC)
+		    op->mode = BASE;
+		  else
+		    op->mode = DISP;
+		}
+    break;
+
+  case 24:
+#line 252 "m68k-parse.y"
+    {
+		  op->mode = DISP;
+		  op->reg = (yyvsp[(2) - (3)].reg);
+		}
+    break;
+
+  case 25:
+#line 257 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(2) - (3)].reg);
+		}
+    break;
+
+  case 26:
+#line 262 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(2) - (3)].reg);
+		}
+    break;
+
+  case 27:
+#line 267 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(4) - (7)].reg);
+		  op->disp = (yyvsp[(2) - (7)].exp);
+		  op->index = (yyvsp[(6) - (7)].indexreg);
+		}
+    break;
+
+  case 28:
+#line 274 "m68k-parse.y"
+    {
+		  if ((yyvsp[(4) - (7)].reg) == PC || (yyvsp[(4) - (7)].reg) == ZPC)
+		    yyerror (_("syntax error"));
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(6) - (7)].reg);
+		  op->disp = (yyvsp[(2) - (7)].exp);
+		  op->index.reg = (yyvsp[(4) - (7)].reg);
+		  op->index.size = SIZE_UNSPEC;
+		  op->index.scale = 1;
+		}
+    break;
+
+  case 29:
+#line 285 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(5) - (6)].reg);
+		  op->disp = (yyvsp[(2) - (6)].exp);
+		  op->index = (yyvsp[(4) - (6)].indexreg);
+		}
+    break;
+
+  case 30:
+#line 292 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->disp = (yyvsp[(4) - (5)].exp);
+		  op->index = (yyvsp[(2) - (5)].indexreg);
+		}
+    break;
+
+  case 31:
+#line 298 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(3) - (6)].reg);
+		  op->disp = (yyvsp[(1) - (6)].exp);
+		  op->index = (yyvsp[(5) - (6)].indexreg);
+		}
+    break;
+
+  case 32:
+#line 305 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(2) - (5)].reg);
+		  op->index = (yyvsp[(4) - (5)].indexreg);
+		}
+    break;
+
+  case 33:
+#line 311 "m68k-parse.y"
+    {
+		  if ((yyvsp[(3) - (6)].reg) == PC || (yyvsp[(3) - (6)].reg) == ZPC)
+		    yyerror (_("syntax error"));
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(5) - (6)].reg);
+		  op->disp = (yyvsp[(1) - (6)].exp);
+		  op->index.reg = (yyvsp[(3) - (6)].reg);
+		  op->index.size = SIZE_UNSPEC;
+		  op->index.scale = 1;
+		}
+    break;
+
+  case 34:
+#line 322 "m68k-parse.y"
+    {
+		  if ((yyvsp[(2) - (5)].reg) == PC || (yyvsp[(2) - (5)].reg) == ZPC)
+		    yyerror (_("syntax error"));
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(4) - (5)].reg);
+		  op->index.reg = (yyvsp[(2) - (5)].reg);
+		  op->index.size = SIZE_UNSPEC;
+		  op->index.scale = 1;
+		}
+    break;
+
+  case 35:
+#line 332 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(4) - (5)].reg);
+		  op->disp = (yyvsp[(1) - (5)].exp);
+		  op->index = (yyvsp[(3) - (5)].indexreg);
+		}
+    break;
+
+  case 36:
+#line 339 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(3) - (4)].reg);
+		  op->index = (yyvsp[(2) - (4)].indexreg);
+		}
+    break;
+
+  case 37:
+#line 345 "m68k-parse.y"
+    {
+		  op->mode = POST;
+		  op->reg = (yyvsp[(4) - (9)].reg);
+		  op->disp = (yyvsp[(3) - (9)].exp);
+		  op->index = (yyvsp[(7) - (9)].indexreg);
+		  op->odisp = (yyvsp[(8) - (9)].exp);
+		}
+    break;
+
+  case 38:
+#line 353 "m68k-parse.y"
+    {
+		  op->mode = POST;
+		  op->reg = (yyvsp[(4) - (7)].reg);
+		  op->disp = (yyvsp[(3) - (7)].exp);
+		  op->odisp = (yyvsp[(6) - (7)].exp);
+		}
+    break;
+
+  case 39:
+#line 360 "m68k-parse.y"
+    {
+		  op->mode = POST;
+		  op->reg = (yyvsp[(3) - (8)].reg);
+		  op->index = (yyvsp[(6) - (8)].indexreg);
+		  op->odisp = (yyvsp[(7) - (8)].exp);
+		}
+    break;
+
+  case 40:
+#line 367 "m68k-parse.y"
+    {
+		  op->mode = POST;
+		  op->reg = (yyvsp[(3) - (6)].reg);
+		  op->odisp = (yyvsp[(5) - (6)].exp);
+		}
+    break;
+
+  case 41:
+#line 373 "m68k-parse.y"
+    {
+		  op->mode = PRE;
+		  op->reg = (yyvsp[(5) - (10)].reg);
+		  op->disp = (yyvsp[(3) - (10)].exp);
+		  op->index = (yyvsp[(7) - (10)].indexreg);
+		  op->odisp = (yyvsp[(9) - (10)].exp);
+		}
+    break;
+
+  case 42:
+#line 381 "m68k-parse.y"
+    {
+		  op->mode = PRE;
+		  op->reg = (yyvsp[(3) - (8)].reg);
+		  op->index = (yyvsp[(5) - (8)].indexreg);
+		  op->odisp = (yyvsp[(7) - (8)].exp);
+		}
+    break;
+
+  case 43:
+#line 388 "m68k-parse.y"
+    {
+		  if ((yyvsp[(5) - (10)].reg) == PC || (yyvsp[(5) - (10)].reg) == ZPC)
+		    yyerror (_("syntax error"));
+		  op->mode = PRE;
+		  op->reg = (yyvsp[(7) - (10)].reg);
+		  op->disp = (yyvsp[(3) - (10)].exp);
+		  op->index.reg = (yyvsp[(5) - (10)].reg);
+		  op->index.size = SIZE_UNSPEC;
+		  op->index.scale = 1;
+		  op->odisp = (yyvsp[(9) - (10)].exp);
+		}
+    break;
+
+  case 44:
+#line 400 "m68k-parse.y"
+    {
+		  if ((yyvsp[(3) - (8)].reg) == PC || (yyvsp[(3) - (8)].reg) == ZPC)
+		    yyerror (_("syntax error"));
+		  op->mode = PRE;
+		  op->reg = (yyvsp[(5) - (8)].reg);
+		  op->index.reg = (yyvsp[(3) - (8)].reg);
+		  op->index.size = SIZE_UNSPEC;
+		  op->index.scale = 1;
+		  op->odisp = (yyvsp[(7) - (8)].exp);
+		}
+    break;
+
+  case 45:
+#line 411 "m68k-parse.y"
+    {
+		  op->mode = PRE;
+		  op->reg = (yyvsp[(5) - (8)].reg);
+		  op->disp = (yyvsp[(3) - (8)].exp);
+		  op->index = (yyvsp[(4) - (8)].indexreg);
+		  op->odisp = (yyvsp[(7) - (8)].exp);
+		}
+    break;
+
+  case 46:
+#line 424 "m68k-parse.y"
+    {
+		  /* We use optzapc to avoid a shift/reduce conflict.  */
+		  if ((yyvsp[(1) - (2)].reg) < ADDR0 || (yyvsp[(1) - (2)].reg) > ADDR7)
+		    yyerror (_("syntax error"));
+		  op->mode = AINDR;
+		  op->reg = (yyvsp[(1) - (2)].reg);
+		}
+    break;
+
+  case 47:
+#line 432 "m68k-parse.y"
+    {
+		  /* We use optzapc to avoid a shift/reduce conflict.  */
+		  if ((yyvsp[(1) - (3)].reg) < ADDR0 || (yyvsp[(1) - (3)].reg) > ADDR7)
+		    yyerror (_("syntax error"));
+		  op->mode = AINC;
+		  op->reg = (yyvsp[(1) - (3)].reg);
+		}
+    break;
+
+  case 48:
+#line 440 "m68k-parse.y"
+    {
+		  /* We use optzapc to avoid a shift/reduce conflict.  */
+		  if ((yyvsp[(1) - (3)].reg) < ADDR0 || (yyvsp[(1) - (3)].reg) > ADDR7)
+		    yyerror (_("syntax error"));
+		  op->mode = ADEC;
+		  op->reg = (yyvsp[(1) - (3)].reg);
+		}
+    break;
+
+  case 49:
+#line 448 "m68k-parse.y"
+    {
+		  op->reg = (yyvsp[(1) - (5)].reg);
+		  op->disp = (yyvsp[(4) - (5)].exp);
+		  if (((yyvsp[(1) - (5)].reg) >= ZADDR0 && (yyvsp[(1) - (5)].reg) <= ZADDR7)
+		      || (yyvsp[(1) - (5)].reg) == ZPC)
+		    op->mode = BASE;
+		  else
+		    op->mode = DISP;
+		}
+    break;
+
+  case 50:
+#line 458 "m68k-parse.y"
+    {
+		  op->mode = BASE;
+		  op->reg = (yyvsp[(1) - (6)].reg);
+		  op->disp = (yyvsp[(4) - (6)].exp);
+		  op->index = (yyvsp[(5) - (6)].indexreg);
+		}
+    break;
+
+  case 51:
+#line 465 "m68k-parse.y"
+    {
+		  op->mode = POST;
+		  op->reg = (yyvsp[(1) - (10)].reg);
+		  op->disp = (yyvsp[(4) - (10)].exp);
+		  op->index = (yyvsp[(9) - (10)].indexreg);
+		  op->odisp = (yyvsp[(8) - (10)].exp);
+		}
+    break;
+
+  case 52:
+#line 473 "m68k-parse.y"
+    {
+		  op->mode = POST;
+		  op->reg = (yyvsp[(1) - (9)].reg);
+		  op->disp = (yyvsp[(4) - (9)].exp);
+		  op->odisp = (yyvsp[(8) - (9)].exp);
+		}
+    break;
+
+  case 53:
+#line 480 "m68k-parse.y"
+    {
+		  op->mode = PRE;
+		  op->reg = (yyvsp[(1) - (10)].reg);
+		  op->disp = (yyvsp[(4) - (10)].exp);
+		  op->index = (yyvsp[(5) - (10)].indexreg);
+		  op->odisp = (yyvsp[(9) - (10)].exp);
+		}
+    break;
+
+  case 55:
+#line 495 "m68k-parse.y"
+    {
+		  (yyval.indexreg).reg = (yyvsp[(1) - (1)].reg);
+		  (yyval.indexreg).size = SIZE_UNSPEC;
+		  (yyval.indexreg).scale = 1;
+		}
+    break;
+
+  case 57:
+#line 509 "m68k-parse.y"
+    {
+		  (yyval.indexreg).reg = (yyvsp[(1) - (1)].reg);
+		  (yyval.indexreg).size = SIZE_UNSPEC;
+		  (yyval.indexreg).scale = 1;
+		}
+    break;
+
+  case 68:
+#line 552 "m68k-parse.y"
+    {
+		  (yyval.reg) = ZADDR0;
+		}
+    break;
+
+  case 72:
+#line 569 "m68k-parse.y"
+    {
+		  (yyval.reg) = ZADDR0;
+		}
+    break;
+
+  case 73:
+#line 573 "m68k-parse.y"
+    {
+		  (yyval.reg) = (yyvsp[(2) - (2)].reg);
+		}
+    break;
+
+  case 74:
+#line 582 "m68k-parse.y"
+    {
+		  (yyval.exp).exp.X_op = O_absent;
+		  (yyval.exp).size = SIZE_UNSPEC;
+		}
+    break;
+
+  case 75:
+#line 587 "m68k-parse.y"
+    {
+		  (yyval.exp) = (yyvsp[(2) - (2)].exp);
+		}
+    break;
+
+  case 76:
+#line 596 "m68k-parse.y"
+    {
+		  (yyval.exp).exp.X_op = O_absent;
+		  (yyval.exp).size = SIZE_UNSPEC;
+		}
+    break;
+
+  case 77:
+#line 601 "m68k-parse.y"
+    {
+		  (yyval.exp) = (yyvsp[(1) - (2)].exp);
+		}
+    break;
+
+  case 79:
+#line 611 "m68k-parse.y"
+    {
+		  (yyval.mask) = (yyvsp[(1) - (3)].mask) | (yyvsp[(3) - (3)].mask);
+		}
+    break;
+
+  case 80:
+#line 615 "m68k-parse.y"
+    {
+		  (yyval.mask) = (1 << (yyvsp[(1) - (3)].onereg)) | (yyvsp[(3) - (3)].mask);
+		}
+    break;
+
+  case 81:
+#line 627 "m68k-parse.y"
+    {
+		  (yyval.mask) = 1 << (yyvsp[(1) - (1)].onereg);
+		}
+    break;
+
+  case 83:
+#line 632 "m68k-parse.y"
+    {
+		  (yyval.mask) = (yyvsp[(1) - (3)].mask) | (yyvsp[(3) - (3)].mask);
+		}
+    break;
+
+  case 84:
+#line 636 "m68k-parse.y"
+    {
+		  (yyval.mask) = (1 << (yyvsp[(1) - (3)].onereg)) | (yyvsp[(3) - (3)].mask);
+		}
+    break;
+
+  case 85:
+#line 643 "m68k-parse.y"
+    {
+		  if ((yyvsp[(1) - (3)].onereg) <= (yyvsp[(3) - (3)].onereg))
+		    (yyval.mask) = (1 << ((yyvsp[(3) - (3)].onereg) + 1)) - 1 - ((1 << (yyvsp[(1) - (3)].onereg)) - 1);
+		  else
+		    (yyval.mask) = (1 << ((yyvsp[(1) - (3)].onereg) + 1)) - 1 - ((1 << (yyvsp[(3) - (3)].onereg)) - 1);
+		}
+    break;
+
+  case 86:
+#line 653 "m68k-parse.y"
+    {
+		  (yyval.onereg) = (yyvsp[(1) - (1)].reg) - DATA0;
+		}
+    break;
+
+  case 87:
+#line 657 "m68k-parse.y"
+    {
+		  (yyval.onereg) = (yyvsp[(1) - (1)].reg) - ADDR0 + 8;
+		}
+    break;
+
+  case 88:
+#line 661 "m68k-parse.y"
+    {
+		  (yyval.onereg) = (yyvsp[(1) - (1)].reg) - FP0 + 16;
+		}
+    break;
+
+  case 89:
+#line 665 "m68k-parse.y"
+    {
+		  if ((yyvsp[(1) - (1)].reg) == FPI)
+		    (yyval.onereg) = 24;
+		  else if ((yyvsp[(1) - (1)].reg) == FPS)
+		    (yyval.onereg) = 25;
+		  else
+		    (yyval.onereg) = 26;
+		}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 2204 "m68k-parse.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+#line 675 "m68k-parse.y"
+
+
+/* The string to parse is stored here, and modified by yylex.  */
+
+static char *str;
+
+/* The original string pointer.  */
+
+static char *strorig;
+
+/* If *CCP could be a register, return the register number and advance
+   *CCP.  Otherwise don't change *CCP, and return 0.  */
+
+static enum m68k_register
+m68k_reg_parse (ccp)
+     register char **ccp;
+{
+  char *start = *ccp;
+  char c;
+  char *p;
+  symbolS *symbolp;
+
+  if (flag_reg_prefix_optional)
+    {
+      if (*start == REGISTER_PREFIX)
+	start++;
+      p = start;
+    }
+  else
+    {
+      if (*start != REGISTER_PREFIX)
+	return 0;
+      p = start + 1;
+    }
+
+  if (! is_name_beginner (*p))
+    return 0;
+
+  p++;
+  while (is_part_of_name (*p) && *p != '.' && *p != ':' && *p != '*')
+    p++;
+
+  c = *p;
+  *p = 0;
+  symbolp = symbol_find (start);
+  *p = c;
+
+  if (symbolp != NULL && S_GET_SEGMENT (symbolp) == reg_section)
+    {
+      *ccp = p;
+      return S_GET_VALUE (symbolp);
+    }
+
+  /* In MRI mode, something like foo.bar can be equated to a register
+     name.  */
+  while (flag_mri && c == '.')
+    {
+      ++p;
+      while (is_part_of_name (*p) && *p != '.' && *p != ':' && *p != '*')
+	p++;
+      c = *p;
+      *p = '\0';
+      symbolp = symbol_find (start);
+      *p = c;
+      if (symbolp != NULL && S_GET_SEGMENT (symbolp) == reg_section)
+	{
+	  *ccp = p;
+	  return S_GET_VALUE (symbolp);
+	}
+    }
+
+  return 0;
+}
+
+/* The lexer.  */
+
+static int
+yylex ()
+{
+  enum m68k_register reg;
+  char *s;
+  int parens;
+  int c = 0;
+  int tail = 0;
+  char *hold;
+
+  if (*str == ' ')
+    ++str;
+
+  if (*str == '\0')
+    return 0;
+
+  /* Various special characters are just returned directly.  */
+  switch (*str)
+    {
+    case '@':
+      /* In MRI mode, this can be the start of an octal number.  */
+      if (flag_mri)
+	{
+	  if (ISDIGIT (str[1])
+	      || ((str[1] == '+' || str[1] == '-')
+		  && ISDIGIT (str[2])))
+	    break;
+	}
+      /* Fall through.  */
+    case '#':
+    case '&':
+    case ',':
+    case ')':
+    case '/':
+    case '[':
+    case ']':
+    case '<':
+    case '>':
+      return *str++;
+    case '+':
+      /* It so happens that a '+' can only appear at the end of an
+	 operand, or if it is trailed by an '&'(see mac load insn).
+	 If it appears anywhere else, it must be a unary.  */
+      if (str[1] == '\0' || (str[1] == '&' && str[2] == '\0'))
+	return *str++;
+      break;
+    case '-':
+      /* A '-' can only appear in -(ar), rn-rn, or ar@-.  If it
+         appears anywhere else, it must be a unary minus on an
+         expression, unless it it trailed by a '&'(see mac load insn).  */
+      if (str[1] == '\0' || (str[1] == '&' && str[2] == '\0'))
+	return *str++;
+      s = str + 1;
+      if (*s == '(')
+	++s;
+      if (m68k_reg_parse (&s) != 0)
+	return *str++;
+      break;
+    case '(':
+      /* A '(' can only appear in `(reg)', `(expr,...', `([', `@(', or
+         `)('.  If it appears anywhere else, it must be starting an
+         expression.  */
+      if (str[1] == '['
+	  || (str > strorig
+	      && (str[-1] == '@'
+		  || str[-1] == ')')))
+	return *str++;
+      s = str + 1;
+      if (m68k_reg_parse (&s) != 0)
+	return *str++;
+      /* Check for the case of '(expr,...' by scanning ahead.  If we
+         find a comma outside of balanced parentheses, we return '('.
+         If we find an unbalanced right parenthesis, then presumably
+         the '(' really starts an expression.  */
+      parens = 0;
+      for (s = str + 1; *s != '\0'; s++)
+	{
+	  if (*s == '(')
+	    ++parens;
+	  else if (*s == ')')
+	    {
+	      if (parens == 0)
+		break;
+	      --parens;
+	    }
+	  else if (*s == ',' && parens == 0)
+	    {
+	      /* A comma can not normally appear in an expression, so
+		 this is a case of '(expr,...'.  */
+	      return *str++;
+	    }
+	}
+    }
+
+  /* See if it's a register.  */
+
+  reg = m68k_reg_parse (&str);
+  if (reg != 0)
+    {
+      int ret;
+
+      yylval.reg = reg;
+
+      if (reg >= DATA0 && reg <= DATA7)
+	ret = DR;
+      else if (reg >= ADDR0 && reg <= ADDR7)
+	ret = AR;
+      else if (reg >= FP0 && reg <= FP7)
+	return FPR;
+      else if (reg == FPI
+	       || reg == FPS
+	       || reg == FPC)
+	return FPCR;
+      else if (reg == PC)
+	return LPC;
+      else if (reg >= ZDATA0 && reg <= ZDATA7)
+	ret = ZDR;
+      else if (reg >= ZADDR0 && reg <= ZADDR7)
+	ret = ZAR;
+      else if (reg == ZPC)
+	return LZPC;
+      else
+	return CREG;
+
+      /* If we get here, we have a data or address register.  We
+	 must check for a size or scale; if we find one, we must
+	 return INDEXREG.  */
+
+      s = str;
+
+      if (*s != '.' && *s != ':' && *s != '*')
+	return ret;
+
+      yylval.indexreg.reg = reg;
+
+      if (*s != '.' && *s != ':')
+	yylval.indexreg.size = SIZE_UNSPEC;
+      else
+	{
+	  ++s;
+	  switch (*s)
+	    {
+	    case 'w':
+	    case 'W':
+	      yylval.indexreg.size = SIZE_WORD;
+	      ++s;
+	      break;
+	    case 'l':
+	    case 'L':
+	      yylval.indexreg.size = SIZE_LONG;
+	      ++s;
+	      break;
+	    default:
+	      yyerror (_("illegal size specification"));
+	      yylval.indexreg.size = SIZE_UNSPEC;
+	      break;
+	    }
+	}
+
+      yylval.indexreg.scale = 1;
+
+      if (*s == '*' || *s == ':')
+	{
+	  expressionS scale;
+
+	  ++s;
+
+	  hold = input_line_pointer;
+	  input_line_pointer = s;
+	  expression (&scale);
+	  s = input_line_pointer;
+	  input_line_pointer = hold;
+
+	  if (scale.X_op != O_constant)
+	    yyerror (_("scale specification must resolve to a number"));
+	  else
+	    {
+	      switch (scale.X_add_number)
+		{
+		case 1:
+		case 2:
+		case 4:
+		case 8:
+		  yylval.indexreg.scale = scale.X_add_number;
+		  break;
+		default:
+		  yyerror (_("invalid scale value"));
+		  break;
+		}
+	    }
+	}
+
+      str = s;
+
+      return INDEXREG;
+    }
+
+  /* It must be an expression.  Before we call expression, we need to
+     look ahead to see if there is a size specification.  We must do
+     that first, because otherwise foo.l will be treated as the symbol
+     foo.l, rather than as the symbol foo with a long size
+     specification.  The grammar requires that all expressions end at
+     the end of the operand, or with ',', '(', ']', ')'.  */
+
+  parens = 0;
+  for (s = str; *s != '\0'; s++)
+    {
+      if (*s == '(')
+	{
+	  if (parens == 0
+	      && s > str
+	      && (s[-1] == ')' || ISALNUM (s[-1])))
+	    break;
+	  ++parens;
+	}
+      else if (*s == ')')
+	{
+	  if (parens == 0)
+	    break;
+	  --parens;
+	}
+      else if (parens == 0
+	       && (*s == ',' || *s == ']'))
+	break;
+    }
+
+  yylval.exp.size = SIZE_UNSPEC;
+  if (s <= str + 2
+      || (s[-2] != '.' && s[-2] != ':'))
+    tail = 0;
+  else
+    {
+      switch (s[-1])
+	{
+	case 's':
+	case 'S':
+	case 'b':
+	case 'B':
+	  yylval.exp.size = SIZE_BYTE;
+	  break;
+	case 'w':
+	case 'W':
+	  yylval.exp.size = SIZE_WORD;
+	  break;
+	case 'l':
+	case 'L':
+	  yylval.exp.size = SIZE_LONG;
+	  break;
+	default:
+	  break;
+	}
+      if (yylval.exp.size != SIZE_UNSPEC)
+	tail = 2;
+    }
+
+#ifdef OBJ_ELF
+  {
+    /* Look for @PLTPC, etc.  */
+    char *cp;
+
+    yylval.exp.pic_reloc = pic_none;
+    cp = s - tail;
+    if (cp - 7 > str && cp[-7] == '@')
+      {
+	if (strncmp (cp - 7, "@TLSLDM", 7) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_tls_ldm;
+	    tail += 7;
+	  }
+	else if (strncmp (cp - 7, "@TLSLDO", 7) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_tls_ldo;
+	    tail += 7;
+	  }
+      }
+    else if (cp - 6 > str && cp[-6] == '@')
+      {
+	if (strncmp (cp - 6, "@PLTPC", 6) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_plt_pcrel;
+	    tail += 6;
+	  }
+	else if (strncmp (cp - 6, "@GOTPC", 6) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_got_pcrel;
+	    tail += 6;
+	  }
+	else if (strncmp (cp - 6, "@TLSGD", 6) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_tls_gd;
+	    tail += 6;
+	  }
+	else if (strncmp (cp - 6, "@TLSIE", 6) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_tls_ie;
+	    tail += 6;
+	  }	
+	else if (strncmp (cp - 6, "@TLSLE", 6) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_tls_le;
+	    tail += 6;
+	  }	
+      }
+    else if (cp - 4 > str && cp[-4] == '@')
+      {
+	if (strncmp (cp - 4, "@PLT", 4) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_plt_off;
+	    tail += 4;
+	  }
+	else if (strncmp (cp - 4, "@GOT", 4) == 0)
+	  {
+	    yylval.exp.pic_reloc = pic_got_off;
+	    tail += 4;
+	  }
+      }
+  }
+#endif
+
+  if (tail != 0)
+    {
+      c = s[-tail];
+      s[-tail] = 0;
+    }
+
+  hold = input_line_pointer;
+  input_line_pointer = str;
+  expression (&yylval.exp.exp);
+  str = input_line_pointer;
+  input_line_pointer = hold;
+
+  if (tail != 0)
+    {
+      s[-tail] = c;
+      str = s;
+    }
+
+  return EXPR;
+}
+
+/* Parse an m68k operand.  This is the only function which is called
+   from outside this file.  */
+
+int
+m68k_ip_op (s, oparg)
+     char *s;
+     struct m68k_op *oparg;
+{
+  memset (oparg, 0, sizeof *oparg);
+  oparg->error = NULL;
+  oparg->index.reg = ZDATA0;
+  oparg->index.scale = 1;
+  oparg->disp.exp.X_op = O_absent;
+  oparg->odisp.exp.X_op = O_absent;
+
+  str = strorig = s;
+  op = oparg;
+
+  return yyparse ();
+}
+
+/* The error handler.  */
+
+static void
+yyerror (s)
+     const char *s;
+{
+  op->error = s;
+}
+
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index 2b39604085..754a392e67 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -59,8 +59,6 @@ config/tc-d30v.c
 config/tc-d30v.h
 config/tc-dlx.c
 config/tc-dlx.h
-config/tc-epiphany.c
-config/tc-epiphany.h
 config/tc-fr30.c
 config/tc-fr30.h
 config/tc-frv.c
@@ -124,8 +122,6 @@ config/tc-pj.c
 config/tc-pj.h
 config/tc-ppc.c
 config/tc-ppc.h
-config/tc-rl78.c
-config/tc-rl78.h
 config/tc-rx.c
 config/tc-rx.h
 config/tc-s390.c
diff --git a/gas/po/es.po b/gas/po/es.po
index b6237a2fee..f568bf0dca 100644
--- a/gas/po/es.po
+++ b/gas/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para gas-2.21.53.
+# Mensajes en español para gas-2.20.90.
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gas 2.21.53\n"
+"Project-Id-Version: gas 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-25 20:47-0500\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2011-08-24 11:49-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -54,26 +54,26 @@ msgstr "falta la comilla que cierra; (se asume)"
 msgid "end of file in comment; newline inserted"
 msgstr "fin de fichero en comentario; se insertó una línea nueva"
 
-#: as.c:162
+#: as.c:161
 msgid "missing emulation mode name"
 msgstr "falta el nombre del modo de emulación"
 
-#: as.c:177
+#: as.c:176
 #, c-format
 msgid "unrecognized emulation name `%s'"
 msgstr "no se reconoce el nombre de emulación `%s'"
 
-#: as.c:224
+#: as.c:223
 #, c-format
 msgid "GNU assembler version %s (%s) using BFD version %s\n"
 msgstr "GNU ensamblador versión %s (%s) utilizando BFD versión %s\n"
 
-#: as.c:231
+#: as.c:230
 #, c-format
 msgid "Usage: %s [option...] [asmfile...]\n"
 msgstr "Modo de empleo: %s [opción...] [ficheroasm...]\n"
 
-#: as.c:233
+#: as.c:232
 #, c-format
 msgid ""
 "Options:\n"
@@ -102,12 +102,12 @@ msgstr ""
 "                      \t  s      incluye símbolos\n"
 "                      \t  =FICH  lista a FICHero (debe ser la última subopción)\n"
 
-#: as.c:247
+#: as.c:246
 #, c-format
 msgid "  --alternate             initially turn on alternate macro syntax\n"
 msgstr "  --alternate             activa inicialmente la sintaxis alternativa de macros\n"
 
-#: as.c:250
+#: as.c:249
 #, c-format
 msgid ""
 "  --compress-debug-sections\n"
@@ -116,7 +116,7 @@ msgstr ""
 "  --compress-debug-sections\n"
 "                          comprime las secciones de depuración DWARF con zlib\n"
 
-#: as.c:253
+#: as.c:252
 #, c-format
 msgid ""
 "  --nocompress-debug-sections\n"
@@ -125,12 +125,12 @@ msgstr ""
 "  --nocompress-debug-sections\n"
 "                          no comprime las secciones de depuración DWARF\n"
 
-#: as.c:257
+#: as.c:256
 #, c-format
 msgid "  -D                      produce assembler debugging messages\n"
 msgstr "  -D                      produce mensajes de depuración de ensamblador\n"
 
-#: as.c:259
+#: as.c:258
 #, c-format
 msgid ""
 "  --debug-prefix-map OLD=NEW\n"
@@ -139,121 +139,112 @@ msgstr ""
 "  --debug-prefix-map ANT=NUEVO\n"
 "                          mapea ANT en NUEVO en la información de depuración\n"
 
-#: as.c:262
+#: as.c:261
 #, c-format
 msgid "  --defsym SYM=VAL        define symbol SYM to given value\n"
 msgstr "  --defsym SIM=VAL        define el símbolo SIM al valor dado\n"
 
-#: as.c:278
+#: as.c:277
 #, c-format
 msgid "                          emulate output (default %s)\n"
 msgstr "                          emula la salida (por defecto %s)\n"
 
-#: as.c:283
+#: as.c:282
 #, c-format
 msgid "  --execstack             require executable stack for this object\n"
 msgstr "  --execstack             requiere pila ejecutable para este objeto\n"
 
-#: as.c:285
+#: as.c:284
 #, c-format
 msgid "  --noexecstack           don't require executable stack for this object\n"
 msgstr "  --noexecstack           no requiere pila ejecutable para este objeto\n"
 
 #: as.c:287
 #, c-format
-msgid ""
-"  --size-check=[error|warning]\n"
-"\t\t\t  ELF .size directive check (default --size-check=error)\n"
-msgstr ""
-"  --size-check=[error|warning]\n"
-"\t\t\t  revisar directiva .size de ELF (--size-check=error por defecto)\n"
-
-#: as.c:291
-#, c-format
 msgid "  -f                      skip whitespace and comment preprocessing\n"
 msgstr "  -f                      salta espacios en blanco y comentarios de preprocesamiento\n"
 
-#: as.c:293
+#: as.c:289
 #, c-format
 msgid "  -g --gen-debug          generate debugging information\n"
 msgstr "  -g --gen-debug          genera información de depuración\n"
 
-#: as.c:295
+#: as.c:291
 #, c-format
 msgid "  --gstabs                generate STABS debugging information\n"
 msgstr "  --gstabs                genera información de depuración de STABS\n"
 
-#: as.c:297
+#: as.c:293
 #, c-format
 msgid "  --gstabs+               generate STABS debug info with GNU extensions\n"
 msgstr "  --gstabs+               genera información de depuración de STABS con extensiones GNU\n"
 
-#: as.c:299
+#: as.c:295
 #, c-format
 msgid "  --gdwarf-2              generate DWARF2 debugging information\n"
 msgstr "  --gdwarf-2              genera información de depuración DWARF2\n"
 
-#: as.c:301
+#: as.c:297
 #, c-format
 msgid "  --hash-size=<value>     set the hash table size close to <value>\n"
 msgstr "  --hash-size=<valor>     establece el tamaño de la tabla de dispersión cerca a <valor>\n"
 
-#: as.c:303
+#: as.c:299
 #, c-format
 msgid "  --help                  show this message and exit\n"
 msgstr "  --help                  muestra este mensaje y termina\n"
 
-#: as.c:305
+#: as.c:301
 #, c-format
 msgid "  --target-help           show target specific options\n"
 msgstr "  --target-help           muestra las opciones específicas del objetivo\n"
 
-#: as.c:307
+#: as.c:303
 #, c-format
 msgid "  -I DIR                  add DIR to search list for .include directives\n"
 msgstr "  -I DIR                  agrega DIR a la lista de búsqueda para directivas .include\n"
 
-#: as.c:309
+#: as.c:305
 #, c-format
 msgid "  -J                      don't warn about signed overflow\n"
 msgstr "  -J                      no avisa sobre desbordamiento con signo\n"
 
-#: as.c:311
+#: as.c:307
 #, c-format
 msgid "  -K                      warn when differences altered for long displacements\n"
 msgstr "  -K                      avisa cuando hay diferencias alteradas por desubicaciones largas\n"
 
-#: as.c:313
+#: as.c:309
 #, c-format
 msgid "  -L,--keep-locals        keep local symbols (e.g. starting with `L')\n"
 msgstr "  -L,--keep-locals        conserva los símbolos locales (p.e. si inician con `L')\n"
 
-#: as.c:315
+#: as.c:311
 #, c-format
 msgid "  -M,--mri                assemble in MRI compatibility mode\n"
 msgstr "  -M,--mri                ensambla en modo de compatibilidad MRI\n"
 
-#: as.c:317
+#: as.c:313
 #, c-format
 msgid "  --MD FILE               write dependency information in FILE (default none)\n"
 msgstr "  --MD FICHERO            escribe la información de dependencias en el FICHERO (por defecto ninguno)\n"
 
-#: as.c:319
+#: as.c:315
 #, c-format
 msgid "  -nocpp                  ignored\n"
 msgstr "  -nocpp                  se descarta\n"
 
-#: as.c:321
+#: as.c:317
 #, c-format
 msgid "  -o OBJFILE              name the object-file output OBJFILE (default a.out)\n"
 msgstr "  -o FICHOBJ              nombra la salida del objeto fichero FICHOBJ (por defecto a.out)\n"
 
-#: as.c:323
+#: as.c:319
 #, c-format
 msgid "  -R                      fold data section into text section\n"
 msgstr "  -R                      incorpora la sección de datos en la sección de texto\n"
 
-#: as.c:325
+#: as.c:321
 #, c-format
 msgid ""
 "  --reduce-memory-overheads \n"
@@ -264,42 +255,42 @@ msgstr ""
 "                          prefiere un menor uso de memoria al costo de\n"
 "                          tiempos de ensamblado más largos\n"
 
-#: as.c:329
+#: as.c:325
 #, c-format
 msgid "  --statistics            print various measured statistics from execution\n"
 msgstr "  --statistics            muestra varias estadísticas medidas de la ejecución\n"
 
-#: as.c:331
+#: as.c:327
 #, c-format
 msgid "  --strip-local-absolute  strip local absolute symbols\n"
 msgstr "  --strip-local-absolute  remueve los símbolos locales absolutos\n"
 
-#: as.c:333
+#: as.c:329
 #, c-format
 msgid "  --traditional-format    Use same format as native assembler when possible\n"
 msgstr "  --traditional-format    Usa el mismo formato que el ensamblador nativo en lo posible\n"
 
-#: as.c:335
+#: as.c:331
 #, c-format
 msgid "  --version               print assembler version number and exit\n"
 msgstr "  --version               muestra el número de versión del ensamblador y termina\n"
 
-#: as.c:337
+#: as.c:333
 #, c-format
 msgid "  -W  --no-warn           suppress warnings\n"
 msgstr "  -W  --no-warn           suprime los avisos\n"
 
-#: as.c:339
+#: as.c:335
 #, c-format
 msgid "  --warn                  don't suppress warnings\n"
 msgstr "  --warn                  no suprime los avisos\n"
 
-#: as.c:341
+#: as.c:337
 #, c-format
 msgid "  --fatal-warnings        treat warnings as errors\n"
 msgstr "  --fatal-warnings        trata los avisos como errores\n"
 
-#: as.c:344
+#: as.c:340
 #, c-format
 msgid ""
 "  --itbl INSTTBL          extend instruction set to include instructions\n"
@@ -309,22 +300,22 @@ msgstr ""
 "                          instrucciones que coincidan con las especificaciones\n"
 "                          definidas en el fichero INSTTBL\n"
 
-#: as.c:348
+#: as.c:344
 #, c-format
 msgid "  -w                      ignored\n"
 msgstr "  -w                      se descarta\n"
 
-#: as.c:350
+#: as.c:346
 #, c-format
 msgid "  -X                      ignored\n"
 msgstr "  -X                      se descarta\n"
 
-#: as.c:352
+#: as.c:348
 #, c-format
 msgid "  -Z                      generate object file even after errors\n"
 msgstr "  -Z                      genera el fichero objeto aún después de errores\n"
 
-#: as.c:354
+#: as.c:350
 #, c-format
 msgid ""
 "  --listing-lhs-width     set the width in words of the output data column of\n"
@@ -333,7 +324,7 @@ msgstr ""
 "  --listing-lhs-width     establece la anchura en palabras de la columna de\n"
 "                          datos de salida en el listado\n"
 
-#: as.c:357
+#: as.c:353
 #, c-format
 msgid ""
 "  --listing-lhs-width2    set the width in words of the continuation lines\n"
@@ -345,7 +336,7 @@ msgstr ""
 "                          descarta si es más pequeño que la anchura de la\n"
 "                          primera línea\n"
 
-#: as.c:361
+#: as.c:357
 #, c-format
 msgid ""
 "  --listing-rhs-width     set the max width in characters of the lines from\n"
@@ -354,7 +345,7 @@ msgstr ""
 "  --listing-rhs-width     establece la anchura máxima en caracteres de las\n"
 "                          líneas del fichero fuente\n"
 
-#: as.c:364
+#: as.c:360
 #, c-format
 msgid ""
 "  --listing-cont-lines    set the maximum number of continuation lines used\n"
@@ -364,33 +355,33 @@ msgstr ""
 "                          utilizadas para la columna de datos de salida del\n"
 "                          listado\n"
 
-#: as.c:367
+#: as.c:363
 #, c-format
 msgid "  @FILE                   read options from FILE\n"
 msgstr "  @FICHERO                lee opciones del FICHERO\n"
 
-#: as.c:375
+#: as.c:371
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Reporte bichos a %s\n"
 
-#: as.c:587
+#: as.c:581
 #, c-format
 msgid "unrecognized option -%c%s"
 msgstr "no se reconoce la opción -%c%s"
 
 #. This output is intended to follow the GNU standards document.
-#: as.c:625
+#: as.c:619
 #, c-format
 msgid "GNU assembler %s\n"
 msgstr "GNU ensamblador %s\n"
 
-#: as.c:626
+#: as.c:620
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
-#: as.c:627
+#: as.c:621
 #, c-format
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
@@ -401,86 +392,81 @@ msgstr ""
 "la Licencia Pública General de GNU versión 3 o posterior.\n"
 "Este programa no tiene ninguna garantía.\n"
 
-#: as.c:631
+#: as.c:625
 #, c-format
 msgid "This assembler was configured for a target of `%s'.\n"
 msgstr "Este ensamblador se configuró para un objetivo `%s'.\n"
 
-#: as.c:638
+#: as.c:632
 msgid "multiple emulation names specified"
 msgstr "se especificaron múltiples nombres de emulación"
 
-#: as.c:640
+#: as.c:634
 msgid "emulations not handled in this configuration"
 msgstr "las emulaciones no se manejan en esta configuración"
 
-#: as.c:645
+#: as.c:639
 #, c-format
 msgid "alias = %s\n"
 msgstr "alias = %s\n"
 
-#: as.c:646
+#: as.c:640
 #, c-format
 msgid "canonical = %s\n"
 msgstr "canónico = %s\n"
 
-#: as.c:647
+#: as.c:641
 #, c-format
 msgid "cpu-type = %s\n"
 msgstr "tipo-cpu = %s\n"
 
-#: as.c:649
+#: as.c:643
 #, c-format
 msgid "format = %s\n"
 msgstr "formato = %s\n"
 
-#: as.c:652
+#: as.c:646
 #, c-format
 msgid "bfd-target = %s\n"
 msgstr "objetivo-bfd = %s\n"
 
-#: as.c:660
+#: as.c:654
 msgid "cannot compress debug sections (zlib not installed)"
 msgstr "no se pueden comprimir las secciones de depuración (zlib no está instalado)"
 
-#: as.c:681
+#: as.c:675
 msgid "bad defsym; format is --defsym name=value"
 msgstr "defsym erróneo; el formato es --defsym nombre=valor"
 
-#: as.c:701
+#: as.c:695
 msgid "no file name following -t option"
 msgstr "no hay un nombre de fichero a continuación de la opción -t"
 
-#: as.c:716
+#: as.c:710
 #, c-format
 msgid "failed to read instruction table %s\n"
 msgstr "falló al leer la tabla de instrucciones %s\n"
 
-#: as.c:828
-#, c-format
-msgid "Invalid --size-check= option: `%s'"
-msgstr "Opción --size-check= inválida: `%s'"
-
-#: as.c:896
+#: as.c:881
 #, c-format
 msgid "invalid listing option `%c'"
 msgstr "opción de listado `%c' inválida"
 
-#: as.c:949
+#: as.c:934
 msgid "--hash-size needs a numeric argument"
 msgstr "--hash-size necesita un argumento numérico"
 
-#: as.c:974
+#: as.c:959
 #, c-format
 msgid "%s: total time in assembly: %ld.%06ld\n"
 msgstr "%s: tiempo total en ensamblado: %ld.%06ld\n"
 
-#: as.c:977
+#: as.c:962
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: tamaño de datos %ld\n"
 
-#: as.c:1289
+#: as.c:1272
 #, c-format
 msgid "%d warnings, treating warnings as errors"
 msgstr "%d avisos, se tratan los avisos como errores"
@@ -500,9 +486,9 @@ msgstr "falló la prueba de sanidad"
 
 #: cgen.c:113 config/tc-alpha.c:2104 config/tc-alpha.c:2128
 #: config/tc-arc.c:1684 config/tc-d10v.c:552 config/tc-d30v.c:538
-#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2617
-#: config/tc-ppc.c:2768 config/tc-ppc.c:2910 config/tc-ppc.c:2921
-#: config/tc-s390.c:1250 config/tc-s390.c:1364 config/tc-s390.c:1493
+#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2586
+#: config/tc-ppc.c:2737 config/tc-ppc.c:2879 config/tc-ppc.c:2890
+#: config/tc-s390.c:1223 config/tc-s390.c:1323 config/tc-s390.c:1452
 #: config/tc-v850.c:2229 config/tc-v850.c:2300 config/tc-v850.c:2346
 #: config/tc-v850.c:2383 config/tc-v850.c:2420 config/tc-v850.c:2649
 msgid "too many fixups"
@@ -510,17 +496,17 @@ msgstr "demasiadas composturas"
 
 #: cgen.c:400 cgen.c:420 config/tc-arc.c:1665 config/tc-d10v.c:463
 #: config/tc-d30v.c:454 config/tc-i370.c:2125 config/tc-mn10200.c:1042
-#: config/tc-mn10300.c:1676 config/tc-ppc.c:2656 config/tc-s390.c:1221
+#: config/tc-mn10300.c:1676 config/tc-ppc.c:2625 config/tc-s390.c:1194
 #: config/tc-v850.c:2337 config/tc-v850.c:2371 config/tc-v850.c:2411
 #: config/tc-v850.c:2622 config/tc-z80.c:417
 msgid "illegal operand"
 msgstr "operando ilegal"
 
-#: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:632 config/tc-d10v.c:465
+#: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:590 config/tc-d10v.c:465
 #: config/tc-d30v.c:456 config/tc-h8300.c:500 config/tc-i370.c:2127
 #: config/tc-mcore.c:662 config/tc-microblaze.c:579 config/tc-mmix.c:488
 #: config/tc-mn10200.c:1045 config/tc-mn10300.c:1679 config/tc-msp430.c:452
-#: config/tc-or32.c:307 config/tc-ppc.c:2658 config/tc-s390.c:1239
+#: config/tc-or32.c:307 config/tc-ppc.c:2627 config/tc-s390.c:1212
 #: config/tc-sh.c:1387 config/tc-sh64.c:2213 config/tc-v850.c:2341
 #: config/tc-v850.c:2375 config/tc-v850.c:2415 config/tc-v850.c:2625
 #: config/tc-z80.c:570 config/tc-z8k.c:350
@@ -536,18 +522,19 @@ msgid "operand mask overflow"
 msgstr "desbordamiento de máscara de operando"
 
 #. We can't actually support subtracting a symbol.
-#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1645 config/tc-arm.c:9058
-#: config/tc-arm.c:9110 config/tc-arm.c:9357 config/tc-arm.c:10157
-#: config/tc-arm.c:11248 config/tc-arm.c:11288 config/tc-arm.c:11616
-#: config/tc-arm.c:11655 config/tc-avr.c:1165 config/tc-cris.c:4047
-#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4694
-#: config/tc-msp430.c:1936 config/tc-ppc.c:6102 config/tc-spu.c:957
+#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1631 config/tc-arm.c:8897
+#: config/tc-arm.c:8949 config/tc-arm.c:9196 config/tc-arm.c:9986
+#: config/tc-arm.c:11068 config/tc-arm.c:11108 config/tc-arm.c:11436
+#: config/tc-arm.c:11475 config/tc-avr.c:1108 config/tc-cris.c:4043
+#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4462
+#: config/tc-mips.c:5586 config/tc-mips.c:6557 config/tc-mips.c:7133
+#: config/tc-msp430.c:1936 config/tc-ppc.c:5874 config/tc-spu.c:957
 #: config/tc-spu.c:981 config/tc-v850.c:3084 config/tc-xstormy16.c:483
 #: config/tc-xtensa.c:5833 config/tc-xtensa.c:11830
 msgid "expression too complex"
 msgstr "expresión demasiado compleja"
 
-#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:6227 config/tc-s390.c:2135
+#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:5999 config/tc-s390.c:2028
 #: config/tc-v850.c:3131 config/tc-xstormy16.c:537
 msgid "unresolved expression that must be resolved"
 msgstr "expresión sin resolver que se debe resolver"
@@ -582,12 +569,12 @@ msgid "\".elseif\" after \".else\""
 msgstr "\".elseif\" después de \".else\""
 
 #: cond.c:314 cond.c:420
-msgid "here is the previous \".else\""
-msgstr "aquí está el \".else\" anterior"
+msgid "here is the previous \"else\""
+msgstr "aquí está el \"else\" anterior"
 
 #: cond.c:317 cond.c:423
-msgid "here is the previous \".if\""
-msgstr "aquí está el \".if\" anterior"
+msgid "here is the previous \"if\""
+msgstr "aquí está el \"if\" anterior"
 
 #: cond.c:346
 msgid "non-constant expression in \".elseif\" statement"
@@ -602,8 +589,8 @@ msgid "\".else\" without matching \".if\""
 msgstr "\".else\" sin un \".if\" coincidente"
 
 #: cond.c:417
-msgid "duplicate \".else\""
-msgstr "\".else\" duplicado"
+msgid "duplicate \"else\""
+msgstr "\"else\" duplicado"
 
 #: cond.c:468
 msgid ".ifeqs syntax error"
@@ -637,8 +624,8 @@ msgstr "No se admiten NaNs en este objetivo\n"
 msgid "Infinities are not supported by this target\n"
 msgstr "No se admiten infinitos en este objetivo\n"
 
-#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1036
-#: config/tc-ia64.c:11435 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
+#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1026
+#: config/tc-ia64.c:11433 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
 msgid "Unrecognized or unsupported floating point constant"
 msgstr "No se reconoce o no se admite la constante de coma flotante"
 
@@ -652,104 +639,104 @@ msgstr "Se intentó poner un símbolo común en el conjunto %s"
 msgid "Attempt to put an undefined symbol into set %s"
 msgstr "Se intentó poner un símbolo indefinido en el conjunto %s"
 
-#: config/obj-aout.c:115 config/obj-coff.c:1398
+#: config/obj-aout.c:115 config/obj-coff.c:1394
 #, c-format
 msgid "Symbol `%s' can not be both weak and common"
 msgstr "El símbolo `%s' no puede ser débil y común al mismo tiempo"
 
-#: config/obj-coff.c:140 dw2gencfi.c:214
+#: config/obj-coff.c:136
 #, c-format
 msgid "Inserting \"%s\" into structure table failed: %s"
 msgstr "Falló la inserción de \"%s\" en la tabla de estructuras: %s"
 
-#: config/obj-coff.c:219 config/obj-coff.c:1695 config/tc-ppc.c:5147
-#: config/tc-tic54x.c:4008 read.c:2795
+#: config/obj-coff.c:215 config/obj-coff.c:1691 config/tc-ppc.c:4937
+#: config/tc-tic54x.c:4008 read.c:2806
 #, c-format
 msgid "error setting flags for \"%s\": %s"
 msgstr "error al establecer las opciones para \"%s\": %s"
 
 #. Zero is used as an end marker in the file.
-#: config/obj-coff.c:438
+#: config/obj-coff.c:434
 msgid "Line numbers must be positive integers\n"
 msgstr "Los números de línea deben ser enteros positivos\n"
 
-#: config/obj-coff.c:470
+#: config/obj-coff.c:466
 msgid ".ln pseudo-op inside .def/.endef: ignored."
 msgstr "pseudo-operador .ln dentro de .def/.endef: se descarta."
 
-#: config/obj-coff.c:512 ecoff.c:3250
+#: config/obj-coff.c:508 ecoff.c:3250
 msgid ".loc outside of .text"
 msgstr ".loc fuera de .text"
 
-#: config/obj-coff.c:519
+#: config/obj-coff.c:515
 msgid ".loc pseudo-op inside .def/.endef: ignored."
 msgstr "pseudo-operador .loc dentro de .def/.endef: se descarta."
 
-#: config/obj-coff.c:600
+#: config/obj-coff.c:596
 msgid ".def pseudo-op used inside of .def/.endef: ignored."
 msgstr "se usó el pseudo-operador .def dentro de .def/.endef: se descarta."
 
-#: config/obj-coff.c:636
+#: config/obj-coff.c:632
 msgid ".endef pseudo-op used outside of .def/.endef: ignored."
 msgstr "se usó el pseudo-operador .endef fuera de .def/.endef: se descarta."
 
-#: config/obj-coff.c:675
+#: config/obj-coff.c:671
 #, c-format
 msgid "`%s' symbol without preceding function"
 msgstr "símbolo `%s' sin una función precedente"
 
-#: config/obj-coff.c:762
+#: config/obj-coff.c:758
 #, c-format
 msgid "unexpected storage class %d"
 msgstr "clase de almacenamiento %d inesperada"
 
-#: config/obj-coff.c:870
+#: config/obj-coff.c:866
 msgid ".dim pseudo-op used outside of .def/.endef: ignored."
 msgstr "se usó el pseudo-operador .dim fuera de .def/.endef: se descarta."
 
-#: config/obj-coff.c:890
+#: config/obj-coff.c:886
 msgid "badly formed .dim directive ignored"
 msgstr "se descarta la directiva .dim formada erróneamente"
 
-#: config/obj-coff.c:939
+#: config/obj-coff.c:935
 msgid ".size pseudo-op used outside of .def/.endef ignored."
 msgstr "se descarta el pseudo-operador .size que se usó fuera de .def/.endef."
 
-#: config/obj-coff.c:954
+#: config/obj-coff.c:950
 msgid ".scl pseudo-op used outside of .def/.endef ignored."
 msgstr "se descarta el pseudo-operador .scl que se usó fuera de .def/.endef."
 
-#: config/obj-coff.c:971
+#: config/obj-coff.c:967
 msgid ".tag pseudo-op used outside of .def/.endef ignored."
 msgstr "se descarta el pseudo-operador .tag que se usó fuera de .def/.endef."
 
-#: config/obj-coff.c:989
+#: config/obj-coff.c:985
 #, c-format
 msgid "tag not found for .tag %s"
 msgstr "no se encontró una marca para .tag %s"
 
-#: config/obj-coff.c:1002
+#: config/obj-coff.c:998
 msgid ".type pseudo-op used outside of .def/.endef ignored."
 msgstr "se descarta el pseudo-operador .type que se usó fuera de .def/.endef."
 
-#: config/obj-coff.c:1021
+#: config/obj-coff.c:1017
 msgid ".val pseudo-op used outside of .def/.endef ignored."
 msgstr "se descarta el pseudo-operador .val que se usó fuera de .def/.endef."
 
-#: config/obj-coff.c:1178
+#: config/obj-coff.c:1174
 msgid "badly formed .weak directive ignored"
 msgstr "se descarta la directiva .weak formada erróneamente"
 
-#: config/obj-coff.c:1356
+#: config/obj-coff.c:1352
 msgid "mismatched .eb"
 msgstr ".eb sin coincidencia"
 
-#: config/obj-coff.c:1377
+#: config/obj-coff.c:1373
 #, c-format
 msgid "C_EFCN symbol for %s out of scope"
 msgstr "símbolo C_EFCN para %s fuera de ámbito"
 
-#: config/obj-coff.c:1431
+#: config/obj-coff.c:1427
 #, c-format
 msgid "Warning: internal error: forgetting to set endndx of %s"
 msgstr "Aviso: error interno: se olvida definir endndx de %s"
@@ -757,22 +744,22 @@ msgstr "Aviso: error interno: se olvida definir endndx de %s"
 #. STYP_INFO
 #. STYP_LIB
 #. STYP_OVER
-#: config/obj-coff.c:1661
+#: config/obj-coff.c:1657
 #, c-format
 msgid "unsupported section attribute '%c'"
 msgstr "no se admite el atributo de sección '%c'"
 
-#: config/obj-coff.c:1665 config/tc-ppc.c:5129
+#: config/obj-coff.c:1661 config/tc-ppc.c:4919
 #, c-format
 msgid "unknown section attribute '%c'"
 msgstr "atributo de sección '%c' desconocido"
 
-#: config/obj-coff.c:1707
+#: config/obj-coff.c:1703
 #, c-format
 msgid "Ignoring changed section attributes for %s"
 msgstr "Se descartan los atributos de sección cambiados para %s"
 
-#: config/obj-coff.c:1847
+#: config/obj-coff.c:1838
 #, c-format
 msgid "0x%lx: \"%s\" type = %ld, class = %d, segment = %d\n"
 msgstr "0x%lx: \"%s\" tipo = %ld, clase = %d, segmento = %d\n"
@@ -828,7 +815,7 @@ msgstr "se descarta el tamaño de entidad de sección cambiado para %s"
 msgid "unrecognized .section attribute: want a,e,w,x,M,S,G,T"
 msgstr "no se reconoce el atributo de .section: se quiere a,e,w,x,M,S,G,T"
 
-#: config/obj-elf.c:836 read.c:2779
+#: config/obj-elf.c:836 read.c:2790
 msgid "unrecognized section type"
 msgstr "no se reconoce el tipo de sección"
 
@@ -840,93 +827,92 @@ msgstr "no se reconoce el atributo de sección"
 msgid "missing name"
 msgstr "falta un nombre"
 
-#: config/obj-elf.c:1032
+#: config/obj-elf.c:1030
 msgid "invalid merge entity size"
 msgstr "tamaño de entidad de mezcla inválido"
 
-#: config/obj-elf.c:1039
+#: config/obj-elf.c:1037
 msgid "entity size for SHF_MERGE not specified"
 msgstr "no se especificó el tamaño de entidad para SHF_MERGE"
 
-#: config/obj-elf.c:1045
+#: config/obj-elf.c:1043
 msgid "? section flag ignored with G present"
 msgstr "se descarta la opción de sección ? con G presente"
 
-#: config/obj-elf.c:1064
+#: config/obj-elf.c:1062
 msgid "group name for SHF_GROUP not specified"
 msgstr "no se especificó el tamaño de entidad para SHF_GROUP"
 
-#: config/obj-elf.c:1087
+#: config/obj-elf.c:1085
 msgid "character following name is not '#'"
 msgstr "el carácter a continuación del nombre no es '#'"
 
-#: config/obj-elf.c:1207
+#: config/obj-elf.c:1204
 msgid ".previous without corresponding .section; ignored"
 msgstr ".previous sin .section correspondiente; se descarta"
 
-#: config/obj-elf.c:1233
+#: config/obj-elf.c:1230
 msgid ".popsection without corresponding .pushsection; ignored"
 msgstr ".popsection sin .pushsection correspondiente; se descarta"
 
-#: config/obj-elf.c:1279
+#: config/obj-elf.c:1276
 msgid "expected comma after name in .symver"
 msgstr "se esperaba una coma después del nombre en .symver"
 
-#: config/obj-elf.c:1303
+#: config/obj-elf.c:1300
 #, c-format
 msgid "missing version name in `%s' for symbol `%s'"
 msgstr "falta el nombre de versión en `%s' para el símbolo `%s'"
 
-#: config/obj-elf.c:1314
+#: config/obj-elf.c:1311
 #, c-format
 msgid "multiple versions [`%s'|`%s'] for symbol `%s'"
 msgstr "versiones múltiples [`%s'|`%s'] para el símbolo `%s'"
 
-#: config/obj-elf.c:1351
+#: config/obj-elf.c:1348
 #, c-format
 msgid "expected `%s' to have already been set for .vtable_inherit"
 msgstr "se esperaba que `%s' ya estuviera definido para .vtable_inherit"
 
-#: config/obj-elf.c:1361
+#: config/obj-elf.c:1358
 msgid "expected comma after name in .vtable_inherit"
 msgstr "se esperaba una coma después del nombre en .vtable_inherit"
 
-#: config/obj-elf.c:1414
+#: config/obj-elf.c:1411
 msgid "expected comma after name in .vtable_entry"
 msgstr "se esperaba una coma después del nombre en .vtable_entry"
 
-#: config/obj-elf.c:1537
+#: config/obj-elf.c:1534
 msgid "expected quoted string"
 msgstr "se esperaba una cadena entre comillas"
 
-#: config/obj-elf.c:1557
+#: config/obj-elf.c:1554
 #, c-format
 msgid "expected comma after name `%s' in .size directive"
 msgstr "se esperaba una coma después del nombre `%s' en la directiva .size"
 
-#: config/obj-elf.c:1566
+#: config/obj-elf.c:1563
 msgid "missing expression in .size directive"
 msgstr "falta una expresión en la directiva .size"
 
-#: config/obj-elf.c:1690
+#: config/obj-elf.c:1687
 #, c-format
 msgid "symbol '%s' is already defined"
 msgstr "el símbolo '%s' ya está definido"
 
-#: config/obj-elf.c:1710 config/obj-elf.c:1722
+#: config/obj-elf.c:1707 config/obj-elf.c:1719
 #, c-format
 msgid "symbol type \"%s\" is supported only by GNU targets"
 msgstr "el tipo de símbolo \"%s\" sólo se admite en objetivos GNU"
 
-#: config/obj-elf.c:1733
+#: config/obj-elf.c:1730
 #, c-format
 msgid "unrecognized symbol type \"%s\""
 msgstr "no se reconoce el tipo de símbolo \"%s\""
 
-#: config/obj-elf.c:1903 config/obj-elf.c:1906
-#, c-format
-msgid ".size expression for %s does not evaluate to a constant"
-msgstr "la expresión .size para %s no evalúa a una constante"
+#: config/obj-elf.c:1906
+msgid ".size expression too complicated to fix up"
+msgstr "la expresión .size es demasiado complicada para componerla"
 
 #: config/obj-elf.c:1938
 #, c-format
@@ -948,17 +934,17 @@ msgstr "se asume que todos los miembros del grupo `%s' son COMDAT"
 msgid "can't create group: %s"
 msgstr "no se puede crear un grupo: %s"
 
-#: config/obj-elf.c:2267
+#: config/obj-elf.c:2260
 #, c-format
 msgid "failed to set up debugging information: %s"
 msgstr "falló al establecer la información de depuración: %s"
 
-#: config/obj-elf.c:2287
+#: config/obj-elf.c:2280
 #, c-format
 msgid "can't start writing .mdebug section: %s"
 msgstr "no se puede iniciar la escritura de la sección .mdebug: %s"
 
-#: config/obj-elf.c:2295
+#: config/obj-elf.c:2288
 #, c-format
 msgid "could not write .mdebug section: %s"
 msgstr "no se puede escribir la sección .mdebug: %s"
@@ -1071,7 +1057,7 @@ msgstr "argumentos inapropiados para el código de operación `%s'"
 msgid "opcode `%s' not supported for target %s"
 msgstr "no se admite el código de operación `%s' para el objetivo %s"
 
-#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1441
+#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1384
 #: config/tc-msp430.c:1828
 #, c-format
 msgid "unknown opcode `%s'"
@@ -1153,7 +1139,7 @@ msgid "sequence number in use for !tlsgd!%ld"
 msgstr "número de secuencia en uso para !tlsgd!%ld"
 
 #: config/tc-alpha.c:2001 config/tc-arc.c:292 config/tc-mn10200.c:856
-#: config/tc-mn10300.c:1148 config/tc-ppc.c:1730 config/tc-s390.c:638
+#: config/tc-mn10300.c:1148 config/tc-ppc.c:1699 config/tc-s390.c:611
 msgid "operand"
 msgstr "operando"
 
@@ -1170,7 +1156,7 @@ msgid "can not resolve expression"
 msgstr "no se puede resolver la expresión"
 
 #: config/tc-alpha.c:3524 config/tc-i370.c:1055 config/tc-microblaze.c:185
-#: config/tc-ppc.c:2055 config/tc-ppc.c:4892
+#: config/tc-ppc.c:2024 config/tc-ppc.c:4682
 #, c-format
 msgid ".COMMon length (%ld.) <0! Ignored."
 msgstr "¡Longitud de .COMM (%ld.) <0! Se descarta."
@@ -1179,7 +1165,7 @@ msgstr "¡Longitud de .COMM (%ld.) <0! Se descarta."
 msgid "Ignoring attempt to re-define symbol"
 msgstr "Se descarta el intento de redefinir el símbolo"
 
-#: config/tc-alpha.c:3627 config/tc-ppc.c:4929 config/tc-sparc.c:3828
+#: config/tc-alpha.c:3627 config/tc-ppc.c:4719 config/tc-sparc.c:3828
 #, c-format
 msgid "Length of .comm \"%s\" is already %ld. Not changed to %ld."
 msgstr "La longitud de .comm \"%s\" ya es %ld. No se cambia a %ld."
@@ -1220,7 +1206,7 @@ msgstr "directiva .fmask errónea"
 msgid "bad .mask directive"
 msgstr "directiva .mask errónea"
 
-#: config/tc-alpha.c:3882 config/tc-mips.c:15469 config/tc-score.c:5743
+#: config/tc-alpha.c:3882 config/tc-mips.c:15153 config/tc-score.c:5743
 #: ecoff.c:3178
 msgid ".frame outside of .ent"
 msgstr ".frame fuera de .ent"
@@ -1352,37 +1338,37 @@ msgstr "Alineación demasiado grande: se asume %d."
 msgid "Alignment negative: 0 assumed"
 msgstr "Alineación negativa: se asume 0"
 
-#: config/tc-alpha.c:5163 config/tc-alpha.c:5656
+#: config/tc-alpha.c:5162 config/tc-alpha.c:5655
 #, c-format
 msgid "Unknown CPU identifier `%s'"
 msgstr "Identificador de CPU `%s' desconocido"
 
-#: config/tc-alpha.c:5354
+#: config/tc-alpha.c:5353
 #, c-format
 msgid "Chose GP value of %lx\n"
 msgstr "Escoja el valor GP de %lx\n"
 
-#: config/tc-alpha.c:5368
+#: config/tc-alpha.c:5367
 msgid "bad .section directive: want a,s,w,x,M,S,G,T in string"
 msgstr "directiva .section errónea: se quiere a,s,w,x,M,S,G,T en la cadena"
 
-#: config/tc-alpha.c:5457
+#: config/tc-alpha.c:5456
 #, c-format
 msgid "internal error: can't hash opcode `%s': %s"
 msgstr "error interno: no se puede dispersar el código de operación `%s': %s"
 
-#: config/tc-alpha.c:5493
+#: config/tc-alpha.c:5492
 #, c-format
 msgid "internal error: can't hash macro `%s': %s"
 msgstr "error interno: no se puede dispersar la macro `%s': %s"
 
-#: config/tc-alpha.c:5578 config/tc-arm.c:6746 config/tc-arm.c:6758
+#: config/tc-alpha.c:5577 config/tc-arm.c:6588 config/tc-arm.c:6600
 #: config/tc-i960.c:708 config/tc-xtensa.c:5315 config/tc-xtensa.c:5393
-#: config/tc-xtensa.c:5510 config/tc-z80.c:1897
+#: config/tc-xtensa.c:5510 config/tc-z80.c:1888
 msgid "syntax error"
 msgstr "error sintáctico"
 
-#: config/tc-alpha.c:5707
+#: config/tc-alpha.c:5706
 msgid ""
 "Alpha options:\n"
 "-32addr\t\t\ttreat addresses as 32-bit values\n"
@@ -1400,7 +1386,7 @@ msgstr ""
 "-m21064 | -m21066 | -m21164 | -m21164a | -m21164pc | -m21264 | -m21264a | -m21264b\n"
 "\t\t\testas variantes incluyen códigos de operación PALcode\n"
 
-#: config/tc-alpha.c:5717
+#: config/tc-alpha.c:5716
 msgid ""
 "VMS options:\n"
 "-+\t\t\tencode (don't truncate) names longer than 64 characters\n"
@@ -1412,40 +1398,40 @@ msgstr ""
 "-H\t\t\tmuestra el símbolo nuevo después del truncado por dispersión\n"
 "-replace/-noreplace\tactiva o desactiva la optimización de llamadas a procedimiento\n"
 
-#: config/tc-alpha.c:5968
+#: config/tc-alpha.c:5967
 #, c-format
 msgid "unhandled relocation type %s"
 msgstr "tipo de reubicación %s sin manejar"
 
-#: config/tc-alpha.c:5981
+#: config/tc-alpha.c:5980
 msgid "non-absolute expression in constant field"
 msgstr "expresión no absoluta en campo constante"
 
-#: config/tc-alpha.c:5995
+#: config/tc-alpha.c:5994
 #, c-format
 msgid "type %d reloc done?\n"
 msgstr "¿tipo %d de reubicación hecha?\n"
 
-#: config/tc-alpha.c:6042 config/tc-alpha.c:6049 config/tc-mips.c:9793
+#: config/tc-alpha.c:6041 config/tc-alpha.c:6048
 msgid "Used $at without \".set noat\""
 msgstr "Se usó $at sin \".set noat\""
 
-#: config/tc-alpha.c:6218
+#: config/tc-alpha.c:6217
 #, c-format
 msgid "!samegp reloc against symbol without .prologue: %s"
 msgstr "reubicación !samegp contra un símbolo sin .prologue: %s"
 
-#: config/tc-alpha.c:6262 config/tc-xtensa.c:5999
+#: config/tc-alpha.c:6261 config/tc-xtensa.c:5999
 #, c-format
 msgid "cannot represent `%s' relocation in object file"
 msgstr "no se puede representar la reubicación `%s' en el fichero objeto"
 
-#: config/tc-alpha.c:6268
+#: config/tc-alpha.c:6267
 #, c-format
 msgid "internal error? cannot generate `%s' relocation"
 msgstr "¿Error interno? no se puede generar la reubicación `%s'"
 
-#: config/tc-alpha.c:6364
+#: config/tc-alpha.c:6363
 #, c-format
 msgid "frame reg expected, using $%d."
 msgstr "se esperaba un registro de marco, se usa $%d."
@@ -1453,15 +1439,15 @@ msgstr "se esperaba un registro de marco, se usa $%d."
 #: config/tc-arc.c:194 config/tc-arc.c:215 config/tc-arc.c:992
 #: config/tc-h8300.c:77 config/tc-h8300.c:86 config/tc-h8300.c:96
 #: config/tc-h8300.c:106 config/tc-h8300.c:116 config/tc-h8300.c:127
-#: config/tc-h8300.c:244 config/tc-hppa.c:6887 config/tc-hppa.c:6893
-#: config/tc-hppa.c:6899 config/tc-hppa.c:6905 config/tc-hppa.c:8312
+#: config/tc-h8300.c:244 config/tc-hppa.c:6866 config/tc-hppa.c:6872
+#: config/tc-hppa.c:6878 config/tc-hppa.c:6884 config/tc-hppa.c:8291
 #: config/tc-lm32.c:198 config/tc-mn10300.c:937 config/tc-mn10300.c:942
 #: config/tc-mn10300.c:2433 config/tc-xc16x.c:79 config/tc-xc16x.c:86
 #: config/tc-xc16x.c:93
 msgid "could not set architecture and machine"
 msgstr "no se pueden establecer la arquitectura y la máquina"
 
-#: config/tc-arc.c:212 config/tc-arm.c:22240 config/tc-score.c:6303
+#: config/tc-arc.c:212 config/tc-arm.c:22001 config/tc-score.c:6303
 #: config/tc-score.c:6532 config/tc-score.c:6537
 msgid "virtual memory exhausted"
 msgstr "memoria agotada"
@@ -1552,7 +1538,7 @@ msgstr "código de operación 0x3 y SINTAX_3OP inválidos"
 msgid "unknown suffix class"
 msgstr "clase de sufijo desconocida"
 
-#: config/tc-arc.c:862 config/tc-tic6x.c:582
+#: config/tc-arc.c:862
 msgid "expected comma after symbol name"
 msgstr "se esperaba una coma después del nombre del símbolo"
 
@@ -1623,7 +1609,7 @@ msgstr "símbolo como registro destino"
 
 #. xgettext:c-format.
 #: config/tc-arc.c:1759 config/tc-i370.c:2207 config/tc-mn10200.c:1141
-#: config/tc-mn10300.c:1820 config/tc-ppc.c:2970 config/tc-s390.c:1506
+#: config/tc-mn10300.c:1820 config/tc-ppc.c:2939 config/tc-s390.c:1465
 #: config/tc-v850.c:2699
 #, c-format
 msgid "junk at end of line: `%s'"
@@ -1642,819 +1628,798 @@ msgstr "instrucción de salto de 8 bytes con ranura de retardo"
 msgid "conditional branch follows set of flags"
 msgstr "ramificación condicional a continuación del conjunto de opciones"
 
-#: config/tc-arc.c:1893 config/tc-arm.c:16170
+#: config/tc-arc.c:1893 config/tc-arm.c:15965
 #, c-format
 msgid "bad instruction `%s'"
 msgstr "instrucción `%s' errónea"
 
-#: config/tc-arm.c:539
+#: config/tc-arm.c:529
 msgid "ARM register expected"
 msgstr "se esperaba un registro ARM"
 
-#: config/tc-arm.c:540
+#: config/tc-arm.c:530
 msgid "bad or missing co-processor number"
 msgstr "número de co-procesador erróneo o faltante"
 
-#: config/tc-arm.c:541
+#: config/tc-arm.c:531
 msgid "co-processor register expected"
 msgstr "se esperaba un registro de co-procesador"
 
-#: config/tc-arm.c:542
+#: config/tc-arm.c:532
 msgid "FPA register expected"
 msgstr "se esperaba un registro FPA"
 
-#: config/tc-arm.c:543
+#: config/tc-arm.c:533
 msgid "VFP single precision register expected"
 msgstr "Se esperaba un registro de precisión simple VFP"
 
-#: config/tc-arm.c:544
+#: config/tc-arm.c:534
 msgid "VFP/Neon double precision register expected"
 msgstr "Se esperaba un registro de precisión doble VFP/Neon"
 
-#: config/tc-arm.c:545
+#: config/tc-arm.c:535
 msgid "Neon quad precision register expected"
 msgstr "Se esperaba un registro de precisión cuádruple Neon"
 
-#: config/tc-arm.c:546
+#: config/tc-arm.c:536
 msgid "VFP single or double precision register expected"
 msgstr "Se esperaba un registro de precisión simple o doble VFP"
 
-#: config/tc-arm.c:547
+#: config/tc-arm.c:537
 msgid "Neon double or quad precision register expected"
 msgstr "Se esperaba un registro de precisión doble o cuádruple Neon"
 
-#: config/tc-arm.c:548
+#: config/tc-arm.c:538
 msgid "VFP single, double or Neon quad precision register expected"
 msgstr "Se esperaba un registro de precisión simple o doble VFP, o cuádruple Neon"
 
-#: config/tc-arm.c:549
+#: config/tc-arm.c:539
 msgid "VFP system register expected"
 msgstr "se esperaba un registro de sistema VFP"
 
-#: config/tc-arm.c:550
+#: config/tc-arm.c:540
 msgid "Maverick MVF register expected"
 msgstr "se esperaba un registro Maverick MVF"
 
-#: config/tc-arm.c:551
+#: config/tc-arm.c:541
 msgid "Maverick MVD register expected"
 msgstr "se esperaba un registro Maverick MVD"
 
-#: config/tc-arm.c:552
+#: config/tc-arm.c:542
 msgid "Maverick MVFX register expected"
 msgstr "se esperaba un registro Maverick MVFX"
 
-#: config/tc-arm.c:553
+#: config/tc-arm.c:543
 msgid "Maverick MVDX register expected"
 msgstr "se esperaba un registro Maverick MVDX"
 
-#: config/tc-arm.c:554
+#: config/tc-arm.c:544
 msgid "Maverick MVAX register expected"
 msgstr "se esperaba un registro Maverick MVAX"
 
-#: config/tc-arm.c:555
+#: config/tc-arm.c:545
 msgid "Maverick DSPSC register expected"
 msgstr "se esperaba un registro Maverick DSPSC"
 
-#: config/tc-arm.c:556
+#: config/tc-arm.c:546
 msgid "iWMMXt data register expected"
 msgstr "se esperaba un registro de datos iWMMXt"
 
-#: config/tc-arm.c:557 config/tc-arm.c:6525
+#: config/tc-arm.c:547 config/tc-arm.c:6363
 msgid "iWMMXt control register expected"
 msgstr "se esperaba un registro de control iWMMXt"
 
-#: config/tc-arm.c:558
+#: config/tc-arm.c:548
 msgid "iWMMXt scalar register expected"
 msgstr "se esperaba un registro escalar iWMMXt"
 
-#: config/tc-arm.c:559
+#: config/tc-arm.c:549
 msgid "XScale accumulator register expected"
 msgstr "se esperaba un registro acumulador XScale"
 
 #. For score5u : div/mul will pop warning message, mmu/alw/asw will pop error message.
-#: config/tc-arm.c:708 config/tc-score.c:259
+#: config/tc-arm.c:698 config/tc-score.c:259
 msgid "bad arguments to instruction"
 msgstr "argumentos erróneos para la instrucción"
 
-#: config/tc-arm.c:709
+#: config/tc-arm.c:699
 msgid "r13 not allowed here"
 msgstr "no se permite r13 aquí"
 
-#: config/tc-arm.c:710
+#: config/tc-arm.c:700
 msgid "r15 not allowed here"
 msgstr "no se permite r15 aquí"
 
-#: config/tc-arm.c:711
+#: config/tc-arm.c:701
 msgid "instruction cannot be conditional"
 msgstr "la instrucción no puede ser condicional"
 
-#: config/tc-arm.c:712
+#: config/tc-arm.c:702
 msgid "registers may not be the same"
 msgstr "los registros no pueden ser el mismo"
 
-#: config/tc-arm.c:713
+#: config/tc-arm.c:703
 msgid "lo register required"
 msgstr "se requiere el registro lo"
 
-#: config/tc-arm.c:714
+#: config/tc-arm.c:704
 msgid "instruction not supported in Thumb16 mode"
 msgstr "la instrucción no se admite en modo Thumb16"
 
-#: config/tc-arm.c:715
+#: config/tc-arm.c:705
 msgid "instruction does not accept this addressing mode"
 msgstr "la instrucción no acepta este modo de direccionamiento"
 
-#: config/tc-arm.c:716
+#: config/tc-arm.c:706
 msgid "branch must be last instruction in IT block"
 msgstr "branch debe ser la última instrucción en el bloque IT"
 
-#: config/tc-arm.c:717
+#: config/tc-arm.c:707
 msgid "instruction not allowed in IT block"
 msgstr "no se permite la instrucción en el bloque IT"
 
-#: config/tc-arm.c:718
+#: config/tc-arm.c:708
 msgid "selected FPU does not support instruction"
 msgstr "la FPU seleccionada no admite la instrucción"
 
-#: config/tc-arm.c:719
+#: config/tc-arm.c:709
 msgid "thumb conditional instruction should be in IT block"
 msgstr "la instrucción condicional thumb debe estar en el bloque IT"
 
-#: config/tc-arm.c:720
+#: config/tc-arm.c:710
 msgid "incorrect condition in IT block"
 msgstr "condición incorrecta en el bloque IT"
 
-#: config/tc-arm.c:721
+#: config/tc-arm.c:711
 msgid "IT falling in the range of a previous IT block"
 msgstr "caída IT en el rango de un bloque IT previo"
 
-#: config/tc-arm.c:722
+#: config/tc-arm.c:712
 msgid "missing .fnstart before unwinding directive"
 msgstr "falta .fnstart antes de la directiva unwinding"
 
-#: config/tc-arm.c:724
+#: config/tc-arm.c:714
 msgid "cannot use register index with PC-relative addressing"
 msgstr "no se puede usar el índice de registro con direccionamiento relativo al PC"
 
-#: config/tc-arm.c:726
+#: config/tc-arm.c:716
 msgid "cannot use writeback with PC-relative addressing"
 msgstr "no se puede usar escritura hacia atrás con el direccionamiento relativo al PC"
 
-#: config/tc-arm.c:917
+#: config/tc-arm.c:907
 msgid "immediate expression requires a # prefix"
 msgstr "la expresión inmediata requiere un prefijo #"
 
-#: config/tc-arm.c:945 read.c:3664
+#: config/tc-arm.c:935 read.c:3678
 msgid "missing expression"
 msgstr "falta una expresión"
 
-#: config/tc-arm.c:945 config/tc-score.c:6519 expr.c:1357 read.c:2456
+#: config/tc-arm.c:935 config/tc-score.c:6519 expr.c:1358 read.c:2469
 msgid "bad expression"
 msgstr "expresión errónea"
 
-#: config/tc-arm.c:956 config/tc-i860.c:1004 config/tc-sparc.c:2880
+#: config/tc-arm.c:946 config/tc-i860.c:1004 config/tc-sparc.c:2880
 msgid "bad segment"
 msgstr "segmento erróneo"
 
-#: config/tc-arm.c:975 config/tc-arm.c:4848 config/tc-i960.c:1300
+#: config/tc-arm.c:965 config/tc-arm.c:4809 config/tc-i960.c:1300
 #: config/tc-score.c:1211
 msgid "invalid constant"
 msgstr "constante inválida"
 
-#: config/tc-arm.c:1105
+#: config/tc-arm.c:1095
 msgid "expected #constant"
 msgstr "se esperaba #constant"
 
-#: config/tc-arm.c:1266
+#: config/tc-arm.c:1256
 #, c-format
 msgid "unexpected character `%c' in type specifier"
 msgstr "carácter inesperado `%c' en el especificador de tipo"
 
-#: config/tc-arm.c:1283
+#: config/tc-arm.c:1273
 #, c-format
 msgid "bad size %d in type specifier"
 msgstr "tamaño erróneo %d en el especificador de tipo"
 
-#: config/tc-arm.c:1333
+#: config/tc-arm.c:1323
 msgid "only one type should be specified for operand"
 msgstr "sólo se debe especificar un tipo para el operando"
 
-#: config/tc-arm.c:1339
+#: config/tc-arm.c:1329
 msgid "vector type expected"
 msgstr "se esperaba un tipo vector"
 
-#: config/tc-arm.c:1411
+#: config/tc-arm.c:1401
 msgid "can't redefine type for operand"
 msgstr "no se puede redefinir el tipo para el operando"
 
-#: config/tc-arm.c:1422
+#: config/tc-arm.c:1412
 msgid "only D registers may be indexed"
 msgstr "sólo se pueden indizar los registros D"
 
-#: config/tc-arm.c:1428
+#: config/tc-arm.c:1418
 msgid "can't change index for operand"
 msgstr "no se puede cambiar el índice para el operando"
 
-#: config/tc-arm.c:1444 config/tc-arm.c:3332 config/tc-arm.c:4430
+#: config/tc-arm.c:1434 config/tc-arm.c:3318 config/tc-arm.c:4391
 msgid "constant expression required"
 msgstr "se requiere una expresión constante"
 
-#: config/tc-arm.c:1491
+#: config/tc-arm.c:1477
 msgid "register operand expected, but got scalar"
 msgstr "se esperaba un operando de registro, pero se recibió un escalar"
 
-#: config/tc-arm.c:1524
+#: config/tc-arm.c:1510
 msgid "scalar must have an index"
 msgstr "el escalar debe tener un índice"
 
-#: config/tc-arm.c:1529 config/tc-arm.c:14756 config/tc-arm.c:14806
-#: config/tc-arm.c:15221
+#: config/tc-arm.c:1515 config/tc-arm.c:14574 config/tc-arm.c:14624
+#: config/tc-arm.c:15039
 msgid "scalar index out of range"
 msgstr "índice escalar fuera de rango"
 
-#: config/tc-arm.c:1577
+#: config/tc-arm.c:1563
 msgid "bad range in register list"
 msgstr "rango erróneo en la lista de registros"
 
-#: config/tc-arm.c:1585 config/tc-arm.c:1594 config/tc-arm.c:1635
+#: config/tc-arm.c:1571 config/tc-arm.c:1580 config/tc-arm.c:1621
 #, c-format
 msgid "Warning: duplicated register (r%d) in register list"
 msgstr "Aviso: registro duplicado (r%d) en la lista de registros"
 
-#: config/tc-arm.c:1597
+#: config/tc-arm.c:1583
 msgid "Warning: register range not in ascending order"
 msgstr "Aviso: el rango de registros no está en orden ascendente"
 
-#: config/tc-arm.c:1608
+#: config/tc-arm.c:1594
 msgid "missing `}'"
 msgstr "falta un `}'"
 
-#: config/tc-arm.c:1624
+#: config/tc-arm.c:1610
 msgid "invalid register mask"
 msgstr "máscara de registro inválida"
 
-#: config/tc-arm.c:1706
+#: config/tc-arm.c:1692
 msgid "expecting {"
 msgstr "se esperaba {"
 
-#: config/tc-arm.c:1761 config/tc-arm.c:1805
+#: config/tc-arm.c:1747 config/tc-arm.c:1791
 msgid "register out of range in list"
 msgstr "registro fuera de rango en la lista"
 
-#: config/tc-arm.c:1777 config/tc-arm.c:1822 config/tc-h8300.c:1040
-#: config/tc-mips.c:10894 config/tc-mips.c:10916
+#: config/tc-arm.c:1763 config/tc-arm.c:1808 config/tc-h8300.c:1040
+#: config/tc-mips.c:10575 config/tc-mips.c:10597
 msgid "invalid register list"
 msgstr "lista de registros inválida"
 
-#: config/tc-arm.c:1783 config/tc-arm.c:3846 config/tc-arm.c:3979
+#: config/tc-arm.c:1769 config/tc-arm.c:3832 config/tc-arm.c:3965
 msgid "register list not in ascending order"
 msgstr "la lista de registros no está en orden ascendente"
 
-#: config/tc-arm.c:1814
+#: config/tc-arm.c:1800
 msgid "register range not in ascending order"
 msgstr "el rango de registros no está en orden ascendente"
 
-#: config/tc-arm.c:1847
+#: config/tc-arm.c:1833
 msgid "non-contiguous register range"
 msgstr "el rango de registros no es contiguo"
 
-#: config/tc-arm.c:1906
+#: config/tc-arm.c:1892
 msgid "register stride must be 1 or 2"
 msgstr "el registro estribo debe ser 1 o 2"
 
-#: config/tc-arm.c:1907
+#: config/tc-arm.c:1893
 msgid "mismatched element/structure types in list"
 msgstr "los tipos de elementos/estructura no coinciden en la lista"
 
-#: config/tc-arm.c:1971
+#: config/tc-arm.c:1957
 msgid "don't use Rn-Rm syntax with non-unit stride"
 msgstr "no use la sintaxis Rn-Rm sin un estribo que no sea unidad"
 
-#: config/tc-arm.c:2026
+#: config/tc-arm.c:2012
 msgid "error parsing element/structure list"
 msgstr "error al decodificar la lista de elementos/estructura"
 
-#: config/tc-arm.c:2032
+#: config/tc-arm.c:2018
 msgid "expected }"
 msgstr "se esperaba }"
 
-#: config/tc-arm.c:2089
+#: config/tc-arm.c:2075
 #, c-format
 msgid "ignoring attempt to redefine built-in register '%s'"
 msgstr "se descarta el intento de redefinir el símbolo interno '%s'"
 
-#: config/tc-arm.c:2094
+#: config/tc-arm.c:2080
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr "se descarta la redefinición del alias de registro '%s'"
 
-#: config/tc-arm.c:2122
+#: config/tc-arm.c:2108
 msgid "attempt to redefine typed alias"
 msgstr "se intentó redefinir el alias con tipo"
 
-#: config/tc-arm.c:2161
+#: config/tc-arm.c:2147
 #, c-format
 msgid "unknown register '%s' -- .req ignored"
 msgstr "registro '%s' desconocido -- se descarta .req"
 
-#: config/tc-arm.c:2256
+#: config/tc-arm.c:2242
 msgid "bad type for register"
 msgstr "tipo erróneo para el registro"
 
-#: config/tc-arm.c:2267
+#: config/tc-arm.c:2253
 msgid "expression must be constant"
 msgstr "la expresión debe ser constante"
 
-#: config/tc-arm.c:2284
+#: config/tc-arm.c:2270
 msgid "can't redefine the type of a register alias"
 msgstr "no se redefinir el tipo de un alias de registro"
 
-#: config/tc-arm.c:2291
+#: config/tc-arm.c:2277
 msgid "you must specify a single type only"
 msgstr "sólo debe especificar un tipo único"
 
-#: config/tc-arm.c:2304
+#: config/tc-arm.c:2290
 msgid "can't redefine the index of a scalar alias"
 msgstr "no se puede redefinir el índice de un alias escalar"
 
-#: config/tc-arm.c:2312
+#: config/tc-arm.c:2298
 msgid "scalar index must be constant"
 msgstr "el índice escalar debe ser constante"
 
-#: config/tc-arm.c:2321
+#: config/tc-arm.c:2307
 msgid "expecting ]"
 msgstr "se esperaba ]"
 
-#: config/tc-arm.c:2368
+#: config/tc-arm.c:2354
 msgid "invalid syntax for .req directive"
 msgstr "sintaxis inválida para la directiva .req."
 
-#: config/tc-arm.c:2374
+#: config/tc-arm.c:2360
 msgid "invalid syntax for .dn directive"
 msgstr "sintaxis inválida para la directiva .dn"
 
-#: config/tc-arm.c:2380
+#: config/tc-arm.c:2366
 msgid "invalid syntax for .qn directive"
 msgstr "sintaxis inválida para la directiva .qn"
 
-#: config/tc-arm.c:2406
+#: config/tc-arm.c:2392
 msgid "invalid syntax for .unreq directive"
 msgstr "sintaxis inválida para la directiva .unreq"
 
-#: config/tc-arm.c:2413
+#: config/tc-arm.c:2399
 #, c-format
 msgid "unknown register alias '%s'"
 msgstr "alias de registro '%s' desconocido"
 
-#: config/tc-arm.c:2415
+#: config/tc-arm.c:2401
 #, c-format
-msgid "ignoring attempt to use .unreq on fixed register name: '%s'"
-msgstr "se descarta el intento de usar .unreq en un nombre de registro interno fijo: '%s'"
+msgid "ignoring attempt to undefine built-in register '%s'"
+msgstr "se descarta el intento de eliminar la definición del registro interno '%s'"
 
-#: config/tc-arm.c:2666
+#: config/tc-arm.c:2652
 #, c-format
 msgid "Failed to find real start of function: %s\n"
 msgstr "Falló al buscar el inicio real de la función: %s\n"
 
-#: config/tc-arm.c:2683
+#: config/tc-arm.c:2669
 msgid "selected processor does not support THUMB opcodes"
 msgstr "el procesador seleccionado no admite códigos de operación THUMB"
 
-#: config/tc-arm.c:2696
+#: config/tc-arm.c:2682
 msgid "selected processor does not support ARM opcodes"
 msgstr "el procesador seleccionado no admite códigos de operación ARM"
 
-#: config/tc-arm.c:2708
+#: config/tc-arm.c:2694
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr "tamaño de instrucción seleccionado inválido (%d)"
 
-#: config/tc-arm.c:2740
+#: config/tc-arm.c:2726
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr "operando inválido para la directiva .code (%d) (se esperaba 16 o 32)"
 
-#: config/tc-arm.c:2796
+#: config/tc-arm.c:2782
 #, c-format
 msgid "expected comma after name \"%s\""
 msgstr "se esperaba una coma después del nombre \"%s\""
 
-#: config/tc-arm.c:2846 config/tc-m32r.c:588
+#: config/tc-arm.c:2832 config/tc-m32r.c:588
 #, c-format
 msgid "symbol `%s' already defined"
 msgstr "el símbolo `%s' ya está definido"
 
-#: config/tc-arm.c:2880
+#: config/tc-arm.c:2866
 #, c-format
 msgid "unrecognized syntax mode \"%s\""
 msgstr "no se reconoce el modo de sintaxis \"%s\""
 
-#: config/tc-arm.c:2901
+#: config/tc-arm.c:2887
 #, c-format
 msgid "alignment too large: %d assumed"
 msgstr "alineación demasiado grande: se asume %d"
 
-#: config/tc-arm.c:2904
+#: config/tc-arm.c:2890
 msgid "alignment negative. 0 assumed."
 msgstr "alineación negativa. Se asume 0."
 
-#: config/tc-arm.c:3054
+#: config/tc-arm.c:3040
 msgid "literal pool overflow"
 msgstr "desbordamiento en el conjunto de literales"
 
-#: config/tc-arm.c:3210 config/tc-arm.c:6460
+#: config/tc-arm.c:3196 config/tc-arm.c:6298
 msgid "unrecognized relocation suffix"
 msgstr "no se reconoce el sufijo de reubicación"
 
-#: config/tc-arm.c:3225
+#: config/tc-arm.c:3211
 msgid "(plt) is only valid on branch targets"
 msgstr "(plt) sólo es válido en objetivos ramas"
 
-#: config/tc-arm.c:3231 config/tc-s390.c:1134 config/tc-s390.c:1771
+#: config/tc-arm.c:3217 config/tc-s390.c:1107 config/tc-s390.c:1730
 #: config/tc-xtensa.c:1591
 #, c-format
 msgid "%s relocations do not fit in %d bytes"
 msgstr "las reubicaciones %s no caben en %d bytes"
 
-#: config/tc-arm.c:3308
+#: config/tc-arm.c:3294
 msgid ".inst.n operand too big. Use .inst.w instead"
 msgstr "el operando de .inst.n es demasiado grande. Use en su lugar .inst.w"
 
-#: config/tc-arm.c:3328
+#: config/tc-arm.c:3314
 msgid "cannot determine Thumb instruction size. Use .inst.n/.inst.w instead"
 msgstr "no se puede determinar el tamaño de la instrucción Thumb. Use en su lugar .inst.n/.inst.w"
 
-#: config/tc-arm.c:3358
+#: config/tc-arm.c:3344
 msgid "width suffixes are invalid in ARM mode"
 msgstr "los sufijos de anchura son inválidos en modo ARM"
 
-#: config/tc-arm.c:3400 dwarf2dbg.c:711
+#: config/tc-arm.c:3386 dwarf2dbg.c:707
 msgid "expected 0 or 1"
 msgstr "se esperaba 0 ó 1"
 
-#: config/tc-arm.c:3404
+#: config/tc-arm.c:3390
 msgid "missing comma"
 msgstr "falta una coma"
 
-#: config/tc-arm.c:3437
+#: config/tc-arm.c:3423
 msgid "duplicate .fnstart directive"
 msgstr "directiva .fnstart duplicada"
 
-#: config/tc-arm.c:3468 config/tc-tic6x.c:413
+#: config/tc-arm.c:3454
 msgid "duplicate .handlerdata directive"
 msgstr "directiva .handlerdata duplicada"
 
-#: config/tc-arm.c:3487
+#: config/tc-arm.c:3473
 msgid ".fnend directive without .fnstart"
 msgstr "directiva .fnend sin .fnstart"
 
-#: config/tc-arm.c:3553 config/tc-tic6x.c:394
+#: config/tc-arm.c:3539
 msgid "personality routine specified for cantunwind frame"
 msgstr "se especificó una rutina personality para el marco cantunwind"
 
-#: config/tc-arm.c:3570 config/tc-tic6x.c:455
+#: config/tc-arm.c:3556
 msgid "duplicate .personalityindex directive"
 msgstr "directiva .personalityindex duplicada"
 
-#: config/tc-arm.c:3577 config/tc-tic6x.c:462
+#: config/tc-arm.c:3563
 msgid "bad personality routine number"
 msgstr "número de rutina personality erróneo"
 
-#: config/tc-arm.c:3599 config/tc-tic6x.c:479
+#: config/tc-arm.c:3585
 msgid "duplicate .personality directive"
 msgstr "directiva .personality duplicada"
 
-#: config/tc-arm.c:3622 config/tc-arm.c:3750 config/tc-arm.c:3798
+#: config/tc-arm.c:3608 config/tc-arm.c:3736 config/tc-arm.c:3784
 msgid "expected register list"
 msgstr "se esperaba una lista de registros"
 
-#: config/tc-arm.c:3704
+#: config/tc-arm.c:3690
 msgid "expected , <constant>"
 msgstr "se esperaba , <constante>"
 
-#: config/tc-arm.c:3713
+#: config/tc-arm.c:3699
 msgid "number of registers must be in the range [1:4]"
 msgstr "el número de registros debe estar en el rango [1:4]"
 
-#: config/tc-arm.c:3860 config/tc-arm.c:3993
+#: config/tc-arm.c:3846 config/tc-arm.c:3979
 msgid "bad register range"
 msgstr "rango de registro erróneo"
 
-#: config/tc-arm.c:4050
+#: config/tc-arm.c:4036
 msgid "register expected"
 msgstr "se esperaba un registro"
 
-#: config/tc-arm.c:4060
+#: config/tc-arm.c:4046
 msgid "FPA .unwind_save does not take a register list"
 msgstr ".unwind_save de FPA no toma una lista de registros"
 
-#: config/tc-arm.c:4079
+#: config/tc-arm.c:4065
 msgid ".unwind_save does not support this kind of register"
 msgstr ".unwind_save no admite este tipo de registro"
 
-#: config/tc-arm.c:4118
+#: config/tc-arm.c:4104
 msgid "SP and PC not permitted in .unwind_movsp directive"
 msgstr "no se permiten SP y PC en la directiva .unwind_movsp"
 
-#: config/tc-arm.c:4123
+#: config/tc-arm.c:4109
 msgid "unexpected .unwind_movsp directive"
 msgstr "directiva .unwind_movsp inesperada"
 
-#: config/tc-arm.c:4150
+#: config/tc-arm.c:4136
 msgid "stack increment must be multiple of 4"
 msgstr "el operando de pila debe ser un múltiplo de 4"
 
-#: config/tc-arm.c:4182
+#: config/tc-arm.c:4168
 msgid "expected <reg>, <reg>"
 msgstr "se esperaba <reg>, <reg>"
 
-#: config/tc-arm.c:4200
+#: config/tc-arm.c:4186
 msgid "register must be either sp or set by a previousunwind_movsp directive"
 msgstr "el registro debe ser sp o establecido por una directiva previousunwind_movsp"
 
-#: config/tc-arm.c:4239
+#: config/tc-arm.c:4225
 msgid "expected <offset>, <opcode>"
 msgstr "se esperaba <desplazamiento>, <códigoop>"
 
-#: config/tc-arm.c:4251
+#: config/tc-arm.c:4237
 msgid "unwind opcode too long"
 msgstr "código de operación de desenredo demasiado largo"
 
-#: config/tc-arm.c:4256
+#: config/tc-arm.c:4242
 msgid "invalid unwind opcode"
 msgstr "código de operación de desenredo inválido"
 
-#: config/tc-arm.c:4436 config/tc-arm.c:5346 config/tc-arm.c:9360
-#: config/tc-arm.c:9888 config/tc-arm.c:13218 config/tc-arm.c:21248
-#: config/tc-arm.c:21273 config/tc-arm.c:21281 config/tc-z8k.c:1144
+#: config/tc-arm.c:4397 config/tc-arm.c:5307 config/tc-arm.c:9199
+#: config/tc-arm.c:9724 config/tc-arm.c:13036 config/tc-arm.c:21030
+#: config/tc-arm.c:21055 config/tc-arm.c:21063 config/tc-z8k.c:1144
 #: config/tc-z8k.c:1154
 msgid "immediate value out of range"
 msgstr "valor inmediato fuera de rango"
 
-#: config/tc-arm.c:4601
+#: config/tc-arm.c:4562
 msgid "invalid FPA immediate expression"
 msgstr "expresión inmediata FPA inválida"
 
-#: config/tc-arm.c:4725 config/tc-arm.c:4734
+#: config/tc-arm.c:4686 config/tc-arm.c:4695
 msgid "shift expression expected"
 msgstr "se esperaba una expresión de desplazamiento"
 
-#: config/tc-arm.c:4748
+#: config/tc-arm.c:4709
 msgid "'LSL' or 'ASR' required"
 msgstr "se requiere 'LSL' o 'ASR'"
 
-#: config/tc-arm.c:4756
+#: config/tc-arm.c:4717
 msgid "'LSL' required"
 msgstr "se requiere 'LSL'"
 
-#: config/tc-arm.c:4764
+#: config/tc-arm.c:4725
 msgid "'ASR' required"
 msgstr "se requiere 'ASR'"
 
-#: config/tc-arm.c:4836 config/tc-arm.c:5340 config/tc-arm.c:7168
+#: config/tc-arm.c:4797 config/tc-arm.c:5301 config/tc-arm.c:7010
 msgid "constant expression expected"
 msgstr "se esperaba una expresión constante"
 
-#: config/tc-arm.c:4843
+#: config/tc-arm.c:4804
 msgid "invalid rotation"
 msgstr "rotación inválida"
 
-#: config/tc-arm.c:5003 config/tc-arm.c:5167
+#: config/tc-arm.c:4964 config/tc-arm.c:5128
 msgid "unknown group relocation"
 msgstr "reubicación de grupo desconocida"
 
-#: config/tc-arm.c:5039
+#: config/tc-arm.c:5000
 msgid "alignment must be constant"
 msgstr "la alineación debe ser constante"
 
-#: config/tc-arm.c:5198
+#: config/tc-arm.c:5159
 msgid "this group relocation is not allowed on this instruction"
 msgstr "esta reubicación de grupo no se permite en esta instrucción"
 
-#: config/tc-arm.c:5219 config/tc-arm.c:5747
+#: config/tc-arm.c:5180 config/tc-arm.c:5585
 msgid "']' expected"
 msgstr "se esperaba ']'"
 
-#: config/tc-arm.c:5237
+#: config/tc-arm.c:5198
 msgid "'}' expected at end of 'option' field"
 msgstr "se esperaba '}' al final del campo 'option'"
 
-#: config/tc-arm.c:5242
+#: config/tc-arm.c:5203
 msgid "cannot combine index with option"
 msgstr "no se puede combinar index con option"
 
-#: config/tc-arm.c:5255
+#: config/tc-arm.c:5216
 msgid "cannot combine pre- and post-indexing"
 msgstr "no se puede combinar pre y post-indizado"
 
-#: config/tc-arm.c:5478
-msgid "unexpected bit specified after APSR"
-msgstr "se especificó un bit inesperado después de APSR"
-
-#: config/tc-arm.c:5490
-msgid "selected processor does not support DSP extension"
-msgstr "el procesador seleccionado no admite la extensión DSP"
-
-#: config/tc-arm.c:5502
-msgid "bad bitmask specified after APSR"
-msgstr "se especificó una máscara de bit errónea después de APSR"
-
-#: config/tc-arm.c:5526
-msgid "writing to APSR without specifying a bitmask is deprecated"
-msgstr "escribir a APSR sin especificar una máscara de bit es obsoleto"
-
-#: config/tc-arm.c:5538 config/tc-arm.c:10977 config/tc-arm.c:11016
-#: config/tc-arm.c:11020
-msgid "selected processor does not support requested special purpose register"
-msgstr "el procesador seleccionado no admite para el registro de propósito especial solicitado"
-
-#: config/tc-arm.c:5543
+#: config/tc-arm.c:5381
 msgid "flag for {c}psr instruction expected"
 msgstr "se esperaba una opción para la instrucción {c}psr"
 
-#: config/tc-arm.c:5568
+#: config/tc-arm.c:5406
 msgid "unrecognized CPS flag"
 msgstr "no se reconoce la opción CPS"
 
-#: config/tc-arm.c:5575
+#: config/tc-arm.c:5413
 msgid "missing CPS flags"
 msgstr "faltan las opciones CPS"
 
-#: config/tc-arm.c:5598 config/tc-arm.c:5604
+#: config/tc-arm.c:5436 config/tc-arm.c:5442
 msgid "valid endian specifiers are be or le"
 msgstr "los especificadores endian válidos son be o le"
 
-#: config/tc-arm.c:5626
+#: config/tc-arm.c:5464
 msgid "missing rotation field after comma"
 msgstr "falta el campo rotation después de la coma"
 
-#: config/tc-arm.c:5641
+#: config/tc-arm.c:5479
 msgid "rotation can only be 0, 8, 16, or 24"
 msgstr "la rotación sólo puede ser 0, 8 , 16 o 24"
 
-#: config/tc-arm.c:5670
+#: config/tc-arm.c:5508
 msgid "condition required"
 msgstr "se requiere una condición"
 
-#: config/tc-arm.c:5709 config/tc-arm.c:7755
+#: config/tc-arm.c:5547 config/tc-arm.c:7594
 msgid "'[' expected"
 msgstr "se esperaba '['"
 
-#: config/tc-arm.c:5722
+#: config/tc-arm.c:5560
 msgid "',' expected"
 msgstr "se esperaba ','"
 
-#: config/tc-arm.c:5739
+#: config/tc-arm.c:5577
 msgid "invalid shift"
 msgstr "desplazamiento inválido"
 
-#: config/tc-arm.c:5812
+#: config/tc-arm.c:5650
 msgid "can't use Neon quad register here"
 msgstr "no se puede usar un registro Neon cuádruple aquí"
 
-#: config/tc-arm.c:5878
+#: config/tc-arm.c:5716
 msgid "expected <Rm> or <Dm> or <Qm> operand"
 msgstr "se esperaba un operando <Rm> o <Dm> o <Qm>"
 
-#: config/tc-arm.c:5958
+#: config/tc-arm.c:5796
 msgid "parse error"
 msgstr "error de decodificación"
 
-#: config/tc-arm.c:5968 read.c:2127
+#: config/tc-arm.c:5806 read.c:2140
 msgid "expected comma"
 msgstr "se esperaba una coma"
 
 #. ISB can only take SY as an option.
-#: config/tc-arm.c:6227
+#: config/tc-arm.c:6065
 msgid "invalid barrier type"
 msgstr "tipo de barrera erróneo"
 
-#: config/tc-arm.c:6364
+#: config/tc-arm.c:6202
 msgid "immediate value is out of range"
 msgstr "el valor inmediato está fuera de rango"
 
-#: config/tc-arm.c:6510
+#: config/tc-arm.c:6348
 msgid "iWMMXt data or control register expected"
 msgstr "se esperaba un registro de datos o control iWMMXt"
 
-#: config/tc-arm.c:6550
+#: config/tc-arm.c:6392
 msgid "Banked registers are not available with this architecture."
 msgstr "Los registros en bancos no están disponibles para esta arquitectura."
 
-#: config/tc-arm.c:6675
+#: config/tc-arm.c:6517
 #, c-format
 msgid "unhandled operand code %d"
 msgstr "código de operando %d sin manejar"
 
-#: config/tc-arm.c:6772 config/tc-score.c:264
+#: config/tc-arm.c:6614 config/tc-score.c:264
 msgid "garbage following instruction"
 msgstr "basura a continuación de la instrucción"
 
 #. If REG is R13 (the stack pointer), warn that its use is
 #. deprecated.
-#: config/tc-arm.c:6813
+#: config/tc-arm.c:6655
 msgid "use of r13 is deprecated"
 msgstr "el uso de r13 es obsoleto"
 
-#: config/tc-arm.c:6883
+#: config/tc-arm.c:6725
 msgid "D register out of range for selected VFP version"
 msgstr "el registro D está fuera de rango para la versión VFP seleccionada"
 
-#: config/tc-arm.c:6962
+#: config/tc-arm.c:6804
 msgid "instruction does not accept preindexed addressing"
 msgstr "la instrucción no acepta el direccionamiento preindizado"
 
 #. unindexed - only for coprocessor
-#: config/tc-arm.c:6978 config/tc-arm.c:9153
+#: config/tc-arm.c:6820 config/tc-arm.c:8992
 msgid "instruction does not accept unindexed addressing"
 msgstr "la instrucción no acepta el direccionamiento sin indizar"
 
-#: config/tc-arm.c:6986
+#: config/tc-arm.c:6828
 msgid "destination register same as write-back base"
 msgstr "el registro destino es el mismo que la base de escritura-hacia-atrás"
 
-#: config/tc-arm.c:6987
+#: config/tc-arm.c:6829
 msgid "source register same as write-back base"
 msgstr "el registro fuente es el mismo que la base de escritura-hacia-atrás"
 
-#: config/tc-arm.c:7037
+#: config/tc-arm.c:6879
 msgid "use of PC in this instruction is deprecated"
 msgstr "el uso de PC en esta instrucción es obsoleto"
 
-#: config/tc-arm.c:7055
+#: config/tc-arm.c:6897
 msgid "instruction does not accept scaled register index"
 msgstr "la instrucción no acepta el índice de registro escalado"
 
-#: config/tc-arm.c:7101
+#: config/tc-arm.c:6943
 msgid "instruction does not support unindexed addressing"
 msgstr "la instrucción no admite el direccionamiento sin indizar"
 
-#: config/tc-arm.c:7116
+#: config/tc-arm.c:6958
 msgid "pc may not be used with write-back"
 msgstr "el pc no se puede usar con escritura hacia atrás"
 
-#: config/tc-arm.c:7121
+#: config/tc-arm.c:6963
 msgid "instruction does not support writeback"
 msgstr "la instrucción no admite escritura hacia atrás"
 
-#: config/tc-arm.c:7163
+#: config/tc-arm.c:7005
 msgid "invalid pseudo operation"
 msgstr "pseudo operación inválida"
 
-#: config/tc-arm.c:7209
+#: config/tc-arm.c:7051
 msgid "literal pool insertion failed"
 msgstr "falló la inserción en el conjunto de literales"
 
-#: config/tc-arm.c:7268
+#: config/tc-arm.c:7110
 msgid "Rn must not overlap other operands"
 msgstr "Rn no debe sobreescribir otros operandos"
 
-#: config/tc-arm.c:7273
+#: config/tc-arm.c:7115
 msgid "swp{b} use is deprecated for this architecture"
 msgstr "el uso de swp{b} es obsoleto en esta arquitectura"
 
-#: config/tc-arm.c:7370 config/tc-arm.c:9720
+#: config/tc-arm.c:7212 config/tc-arm.c:9559
 msgid "bad barrier type"
 msgstr "tipo de barrera erróneo"
 
-#: config/tc-arm.c:7381 config/tc-arm.c:7400 config/tc-arm.c:7413
-#: config/tc-arm.c:9732 config/tc-arm.c:9763 config/tc-arm.c:9785
+#: config/tc-arm.c:7223 config/tc-arm.c:7242 config/tc-arm.c:7255
+#: config/tc-arm.c:9571 config/tc-arm.c:9602 config/tc-arm.c:9624
 msgid "bit-field extends past end of register"
 msgstr "el campo de bits se extiende más allá del final del registro"
 
-#: config/tc-arm.c:7443
-msgid "the only valid suffixes here are '(plt)' and '(tlscall)'"
-msgstr "los únicos sufijos válidos aquí son '(plt)' y '(tlscall)'"
+#: config/tc-arm.c:7284
+msgid "the only suffix valid here is '(plt)'"
+msgstr "el único sufijo válido aquí es '(plt)'"
 
-#: config/tc-arm.c:7496
+#: config/tc-arm.c:7335
 msgid "use of r15 in blx in ARM mode is not really useful"
 msgstr "el uso de r15 en blx en modo ARM no es realmente útil"
 
-#: config/tc-arm.c:7518
+#: config/tc-arm.c:7357
 msgid "use of r15 in bx in ARM mode is not really useful"
 msgstr "el uso de r15 en bx en modo ARM no es realmente útil"
 
-#: config/tc-arm.c:7543
+#: config/tc-arm.c:7382
 msgid "use of r15 in bxj is not really useful"
 msgstr "el uso de r15 en bxj no es realmente útil"
 
-#: config/tc-arm.c:7722 config/tc-arm.c:7731
+#: config/tc-arm.c:7561 config/tc-arm.c:7570
 msgid "writeback of base register is UNPREDICTABLE"
 msgstr "la escritura hacia atrás del registro base es IMPREDECIBLE"
 
-#: config/tc-arm.c:7725
+#: config/tc-arm.c:7564
 msgid "writeback of base register when in register list is UNPREDICTABLE"
 msgstr "la escritura hacia atrás del registro base cuando está en la lista de registros es IMPREDECIBLE"
 
-#: config/tc-arm.c:7735
+#: config/tc-arm.c:7574
 msgid "if writeback register is in list, it must be the lowest reg in the list"
 msgstr "si el registro de escritura hacia atrás está en la lista, debe ser el registro más bajo en la lista"
 
-#: config/tc-arm.c:7750
+#: config/tc-arm.c:7589
 msgid "first destination register must be even"
 msgstr "el primer registro de destino debe ser par"
 
-#: config/tc-arm.c:7753 config/tc-arm.c:7822
+#: config/tc-arm.c:7592 config/tc-arm.c:7661
 msgid "can only load two consecutive registers"
 msgstr "solamente se pueden cargar dos registros consecutivos"
 
@@ -2462,1154 +2427,1155 @@ msgstr "solamente se pueden cargar dos registros consecutivos"
 #. have been called in the first place.
 #. If op 2 were present and equal to PC, this function wouldn't
 #. have been called in the first place.
-#: config/tc-arm.c:7754 config/tc-arm.c:7825 config/tc-arm.c:8423
-#: config/tc-arm.c:10504
+#: config/tc-arm.c:7593 config/tc-arm.c:7664 config/tc-arm.c:8262
+#: config/tc-arm.c:10318
 msgid "r14 not allowed here"
 msgstr "no se permite r14 aquí"
 
-#: config/tc-arm.c:7768
+#: config/tc-arm.c:7607
 msgid "base register written back, and overlaps second destination register"
 msgstr "el registro base se escribió hacia atrás, y sobreescribe el segundo registro de destino"
 
-#: config/tc-arm.c:7776
+#: config/tc-arm.c:7615
 msgid "index register overlaps destination register"
 msgstr "el registro índice sobreescribe el registro destino"
 
-#: config/tc-arm.c:7806 config/tc-arm.c:8405
+#: config/tc-arm.c:7645 config/tc-arm.c:8244
 msgid "offset must be zero in ARM encoding"
 msgstr "el desplazamiento debe ser cero en codificación ARM"
 
-#: config/tc-arm.c:7819 config/tc-arm.c:8417
+#: config/tc-arm.c:7658 config/tc-arm.c:8256
 msgid "even register required"
 msgstr "se requiere un registro par"
 
-#: config/tc-arm.c:7850 config/tc-arm.c:7882
+#: config/tc-arm.c:7689 config/tc-arm.c:7721
 msgid "this instruction requires a post-indexed address"
 msgstr "esta instrucción requiere una dirección post-indizada"
 
-#: config/tc-arm.c:7909
+#: config/tc-arm.c:7748
 msgid "Rd and Rm should be different in mla"
 msgstr "Rd y Rm deben ser diferentes en mla"
 
-#: config/tc-arm.c:7933 config/tc-arm.c:10848
+#: config/tc-arm.c:7772 config/tc-arm.c:10662
 msgid ":lower16: not allowed this instruction"
 msgstr ":lower16: no se permite esta instrucción"
 
-#: config/tc-arm.c:7935
+#: config/tc-arm.c:7774
 msgid ":upper16: not allowed instruction"
 msgstr ":upper16: no se permite esta instrucción"
 
-#: config/tc-arm.c:7954 config/tc-arm.c:7997
+#: config/tc-arm.c:7793 config/tc-arm.c:7836
 msgid "operand 1 must be FPSCR"
 msgstr "el operando 1 debe ser FPSCR"
 
-#: config/tc-arm.c:8016
+#: config/tc-arm.c:7855
 msgid "operand 0 must be FPSCR"
 msgstr "el operando 0 debe ser FPSCR"
 
-#: config/tc-arm.c:8036 config/tc-arm.c:10966
+#: config/tc-arm.c:7875 config/tc-arm.c:10780
 msgid "bad register for mrs"
 msgstr "registro erróneo para mrs"
 
-#: config/tc-arm.c:8043 config/tc-arm.c:10983
-msgid "'APSR', 'CPSR' or 'SPSR' expected"
-msgstr "se esperaba 'APSR', 'CPSR' o 'SPSR'"
+#: config/tc-arm.c:7882 config/tc-arm.c:10803
+msgid "'CPSR' or 'SPSR' expected"
+msgstr "se esperaba 'CPSR' o 'SPSR'"
 
-#: config/tc-arm.c:8084
+#: config/tc-arm.c:7923
 msgid "Rd and Rm should be different in mul"
 msgstr "Rd y Rm deben ser diferentes en mul"
 
-#: config/tc-arm.c:8103 config/tc-arm.c:8350 config/tc-arm.c:11117
+#: config/tc-arm.c:7942 config/tc-arm.c:8189 config/tc-arm.c:10937
 msgid "rdhi and rdlo must be different"
 msgstr "rdhi y rdlo deben ser diferentes"
 
-#: config/tc-arm.c:8109
+#: config/tc-arm.c:7948
 msgid "rdhi, rdlo and rm must all be different"
 msgstr "rdhi, rdlo y rm deben ser todos diferentes"
 
-#: config/tc-arm.c:8175
+#: config/tc-arm.c:8014
 msgid "'[' expected after PLD mnemonic"
 msgstr "se esperaba '[' después del mnemónico PLD"
 
-#: config/tc-arm.c:8177 config/tc-arm.c:8192
+#: config/tc-arm.c:8016 config/tc-arm.c:8031
 msgid "post-indexed expression used in preload instruction"
 msgstr "se usó una expresión post-indizada en la instrucción de precarga"
 
-#: config/tc-arm.c:8179 config/tc-arm.c:8194
+#: config/tc-arm.c:8018 config/tc-arm.c:8033
 msgid "writeback used in preload instruction"
 msgstr "se usó escritura hacia atrás en la instrucción de precarga"
 
-#: config/tc-arm.c:8181 config/tc-arm.c:8196
+#: config/tc-arm.c:8020 config/tc-arm.c:8035
 msgid "unindexed addressing used in preload instruction"
 msgstr "se usó un direccionamiento sin indizar en la instrucción de precarga"
 
-#: config/tc-arm.c:8190
+#: config/tc-arm.c:8029
 msgid "'[' expected after PLI mnemonic"
 msgstr "se esperaba '[' después del mnemónico PLI"
 
-#: config/tc-arm.c:8376
+#: config/tc-arm.c:8215
 msgid "SRS base register must be r13"
 msgstr "el registro base SRS debe ser r13"
 
-#: config/tc-arm.c:8420
+#: config/tc-arm.c:8259
 msgid "can only store two consecutive registers"
 msgstr "solamente se pueden almacenar dos registros consecutivos"
 
-#: config/tc-arm.c:8515 config/tc-arm.c:8532
+#: config/tc-arm.c:8354 config/tc-arm.c:8371
 msgid "only two consecutive VFP SP registers allowed here"
 msgstr "solamente se permiten dos registros SP VFP consecutivos aquí"
 
-#: config/tc-arm.c:8560 config/tc-arm.c:8575
+#: config/tc-arm.c:8399 config/tc-arm.c:8414
 msgid "this addressing mode requires base-register writeback"
 msgstr "este modo de direccionamiento requiere escritura hacia atrás del registro-base"
 
-#: config/tc-arm.c:8749
+#: config/tc-arm.c:8588
 msgid "this instruction does not support indexing"
 msgstr "esta instrucción no admite indizado"
 
-#: config/tc-arm.c:8772
+#: config/tc-arm.c:8611
 msgid "only r15 allowed here"
 msgstr "sólo se permite r15 aquí"
 
-#: config/tc-arm.c:8907
+#: config/tc-arm.c:8746
 msgid "immediate operand requires iWMMXt2"
 msgstr "el operando inmediato requiere iWMMXt2"
 
-#: config/tc-arm.c:9051
+#: config/tc-arm.c:8890
 msgid "shift by register not allowed in thumb mode"
 msgstr "no se permite desplazar por registro en modo thumb"
 
-#: config/tc-arm.c:9063 config/tc-arm.c:11660 config/tc-arm.c:20630
+#: config/tc-arm.c:8902 config/tc-arm.c:11480 config/tc-arm.c:20417
 msgid "shift expression is too large"
 msgstr "la expresión de desplazamiento es demasiado grande"
 
-#: config/tc-arm.c:9090
+#: config/tc-arm.c:8929
 msgid "Instruction does not support =N addresses"
 msgstr "La instrucción no admite las direcciones =N"
 
-#: config/tc-arm.c:9096
+#: config/tc-arm.c:8935
 msgid "cannot use register index with this instruction"
 msgstr "no se puede usar el índice de registro con esta instrucción"
 
-#: config/tc-arm.c:9098
+#: config/tc-arm.c:8937
 msgid "Thumb does not support negative register indexing"
 msgstr "Thumb no admite el indizado negativo de registro"
 
-#: config/tc-arm.c:9100
+#: config/tc-arm.c:8939
 msgid "Thumb does not support register post-indexing"
 msgstr "Thumb no admite el post-indizado de registro"
 
-#: config/tc-arm.c:9102
+#: config/tc-arm.c:8941
 msgid "Thumb does not support register indexing with writeback"
 msgstr "Thumb no admite el indizado de registro con escritura hacia atrás"
 
-#: config/tc-arm.c:9104
+#: config/tc-arm.c:8943
 msgid "Thumb supports only LSL in shifted register indexing"
 msgstr "Thumb sólo admite LSL en el indizado desplazado de registro"
 
-#: config/tc-arm.c:9113 config/tc-arm.c:14558
+#: config/tc-arm.c:8952 config/tc-arm.c:14376
 msgid "shift out of range"
 msgstr "desplazamiento fuera de rango"
 
-#: config/tc-arm.c:9122
+#: config/tc-arm.c:8961
 msgid "cannot use writeback with this instruction"
 msgstr "no se puede usar escritura hacia atrás con esta instrucción"
 
-#: config/tc-arm.c:9143
+#: config/tc-arm.c:8982
 msgid "cannot use post-indexing with PC-relative addressing"
 msgstr "no se puede usar post-indizado con el direccionamiento relativo al PC"
 
-#: config/tc-arm.c:9144
+#: config/tc-arm.c:8983
 msgid "cannot use post-indexing with this instruction"
 msgstr "no se puede usar post-indizado con esta instrucción"
 
-#: config/tc-arm.c:9355
+#: config/tc-arm.c:9194
 msgid "only SUBS PC, LR, #const allowed"
 msgstr "sólo se permiten SUBS PC, LR, #const"
 
-#: config/tc-arm.c:9434 config/tc-arm.c:9585 config/tc-arm.c:9682
-#: config/tc-arm.c:10927 config/tc-arm.c:11223
+#: config/tc-arm.c:9273 config/tc-arm.c:9424 config/tc-arm.c:9521
+#: config/tc-arm.c:10741 config/tc-arm.c:11043
 msgid "shift must be constant"
 msgstr "el desplazamiento debe ser constante"
 
-#: config/tc-arm.c:9461 config/tc-arm.c:9600 config/tc-arm.c:9697
-#: config/tc-arm.c:10940
+#: config/tc-arm.c:9300 config/tc-arm.c:9439 config/tc-arm.c:9536
+#: config/tc-arm.c:10754
 msgid "unshifted register required"
 msgstr "se requiere un registro sin desplazar"
 
-#: config/tc-arm.c:9476 config/tc-arm.c:9708 config/tc-arm.c:11078
+#: config/tc-arm.c:9315 config/tc-arm.c:9547 config/tc-arm.c:10898
 msgid "dest must overlap one source register"
 msgstr "dest debe sobreescribir un registro fuente"
 
-#: config/tc-arm.c:9603
+#: config/tc-arm.c:9442
 msgid "dest and source1 must be the same register"
 msgstr "dest y source1 deben ser el mismo registro"
 
-#: config/tc-arm.c:9884
+#: config/tc-arm.c:9720
 msgid "instruction is always unconditional"
 msgstr "la instrucción es siempre incondicional"
 
-#: config/tc-arm.c:9986
+#: config/tc-arm.c:9815
 msgid "selected processor does not support 'A' form of this instruction"
 msgstr "el procesador seleccionado no admite la forma 'A' de esta instrucción"
 
-#: config/tc-arm.c:9989
+#: config/tc-arm.c:9818
 msgid "Thumb does not support the 2-argument form of this instruction"
 msgstr "Thumb no admite la forma con 2 argumentos de esta instrucción"
 
-#: config/tc-arm.c:10097
+#: config/tc-arm.c:9926
 msgid "SP not allowed in register list"
 msgstr "no se permite SP en la lista de registros"
 
-#: config/tc-arm.c:10101 config/tc-arm.c:10207
+#: config/tc-arm.c:9930 config/tc-arm.c:10036
 msgid "having the base register in the register list when using write back is UNPREDICTABLE"
 msgstr "si tiene el registro base en la lista de registros al usar escritura hacia atrás se vuelve IMPREDECIBLE"
 
-#: config/tc-arm.c:10109
+#: config/tc-arm.c:9938
 msgid "LR and PC should not both be in register list"
 msgstr "tanto LR como PC no deben estar en la lista de registros"
 
-#: config/tc-arm.c:10117
+#: config/tc-arm.c:9946
 msgid "PC not allowed in register list"
 msgstr "no se permite PC en la lista de registros"
 
-#: config/tc-arm.c:10159
+#: config/tc-arm.c:9988
 msgid "Thumb load/store multiple does not support {reglist}^"
 msgstr "no se admiten load/store Thumb múltiples para {reglist}^"
 
-#: config/tc-arm.c:10184 config/tc-arm.c:10261
+#: config/tc-arm.c:10013 config/tc-arm.c:10090
 #, c-format
 msgid "value stored for r%d is UNKNOWN"
 msgstr "el valor almacenado para r%d es DESCONOCIDO"
 
-#: config/tc-arm.c:10254
+#: config/tc-arm.c:10083
 msgid "Thumb-2 instruction only valid in unified syntax"
 msgstr "la instrucción Thumb-2 sólo es válida en la sintaxis unificada"
 
-#: config/tc-arm.c:10258 config/tc-arm.c:10268
+#: config/tc-arm.c:10087 config/tc-arm.c:10097
 msgid "this instruction will write back the base register"
 msgstr "esta instrucción escribirá hacia atrás el registro base"
 
-#: config/tc-arm.c:10271
+#: config/tc-arm.c:10100
 msgid "this instruction will not write back the base register"
 msgstr "esta instrucción no escribirá hacia atrás el registro base"
 
-#: config/tc-arm.c:10302
+#: config/tc-arm.c:10131
 msgid "r14 not allowed as first register when second register is omitted"
 msgstr "no se permite r14 como primer registro cuando se omite el segundo registro"
 
-#: config/tc-arm.c:10402
-msgid "This instruction may be unpredictable if executed on M-profile cores with interrupts enabled."
-msgstr "Esta instrucción puede ser impredecible si se ejecuta en núcleos M-profile con interrupciones activadas."
-
-#: config/tc-arm.c:10427 config/tc-arm.c:10440 config/tc-arm.c:10476
+#: config/tc-arm.c:10241 config/tc-arm.c:10254 config/tc-arm.c:10290
 msgid "Thumb does not support this addressing mode"
 msgstr "Thumb no admite este modo de direccionamiento"
 
-#: config/tc-arm.c:10444
+#: config/tc-arm.c:10258
 msgid "byte or halfword not valid for base register"
 msgstr "byte o halfword no válido para el registro base"
 
-#: config/tc-arm.c:10447
+#: config/tc-arm.c:10261
 msgid "r15 based store not allowed"
 msgstr "no se permite el almacenamiento basado en r15"
 
-#: config/tc-arm.c:10449
+#: config/tc-arm.c:10263
 msgid "invalid base register for register offset"
 msgstr "registro base inválido para el desplazamiento del registro"
 
-#: config/tc-arm.c:10631
+#: config/tc-arm.c:10445
 #, c-format
 msgid "Use of r%u as a source register is deprecated when r%u is the destination register."
 msgstr "El uso de r%u como registro fuente es obsoleto cuando r%u es el registro destino."
 
-#: config/tc-arm.c:10804
+#: config/tc-arm.c:10618
 msgid "shifts in CMP/MOV instructions are only supported in unified syntax"
 msgstr "los desplazamientos en las instrucciones CMP/MOV sólo se admiten en la sintaxis unificada"
 
-#: config/tc-arm.c:10832
+#: config/tc-arm.c:10646
 msgid "only lo regs allowed with immediate"
 msgstr "sólo se permiten registros lo con inmediatos"
 
-#: config/tc-arm.c:10853
+#: config/tc-arm.c:10667
 msgid ":upper16: not allowed this instruction"
 msgstr ":upper16: no se permite esta instrucción"
 
-#: config/tc-arm.c:11001
+#: config/tc-arm.c:10793 config/tc-arm.c:10799 config/tc-arm.c:10832
+#: config/tc-arm.c:10838
+msgid "selected processor does not support requested special purpose register"
+msgstr "el procesador seleccionado no admite para el registro de propósito especial solicitado"
+
+#: config/tc-arm.c:10822
 msgid "Thumb encoding does not support an immediate here"
 msgstr "la codificación Thumb no admite un inmediato aquí"
 
-#: config/tc-arm.c:11083
+#: config/tc-arm.c:10903
 msgid "Thumb-2 MUL must not set flags"
 msgstr "MUL de Thumb-2 no debe establecer opciones"
 
-#: config/tc-arm.c:11148
+#: config/tc-arm.c:10968
 msgid "Thumb does not support NOP with hints"
 msgstr "Thumb no admite NOP con pistas"
 
-#: config/tc-arm.c:11286
+#: config/tc-arm.c:11106
 msgid "push/pop do not support {reglist}^"
 msgstr "push/pop no admiten {reglist}^"
 
-#: config/tc-arm.c:11309
+#: config/tc-arm.c:11129
 msgid "invalid register list to push/pop instruction"
 msgstr "lista de registros inválida para la instrucción push/pop"
 
-#: config/tc-arm.c:11542
+#: config/tc-arm.c:11362
 msgid "source1 and dest must be same register"
 msgstr "source1 y dest deben ser el mismo registro"
 
-#: config/tc-arm.c:11563
+#: config/tc-arm.c:11383
 msgid "ror #imm not supported"
 msgstr "no se admite ror #imm"
 
-#: config/tc-arm.c:11614
+#: config/tc-arm.c:11434
 msgid "SMC is not permitted on this architecture"
 msgstr "No se admite SMC en esta arquitectura"
 
-#: config/tc-arm.c:11777
+#: config/tc-arm.c:11597
 msgid "Thumb encoding does not support rotation"
 msgstr "la codificación Thumb no admite rotación"
 
-#: config/tc-arm.c:11792
+#: config/tc-arm.c:11610
 msgid "SVC is not permitted on this architecture"
 msgstr "No se admite SVC en esta arquitectura"
 
-#: config/tc-arm.c:11808
+#: config/tc-arm.c:11626
 msgid "instruction requires register index"
 msgstr "la instrucción requiere un índice de registro"
 
-#: config/tc-arm.c:11817
+#: config/tc-arm.c:11635
 msgid "instruction does not allow shifted index"
 msgstr "la instrucción no permite un índice desplazado"
 
-#: config/tc-arm.c:11962
+#: config/tc-arm.c:11780
 msgid "invalid neon suffix for non neon instruction"
 msgstr "sufijo neón inválido para la instrucción que no es neon"
 
-#: config/tc-arm.c:12253 config/tc-arm.c:12588
+#: config/tc-arm.c:12071 config/tc-arm.c:12406
 msgid "invalid instruction shape"
 msgstr "instrucción shape inválida"
 
-#: config/tc-arm.c:12497
+#: config/tc-arm.c:12315
 msgid "types specified in both the mnemonic and operands"
 msgstr "se especificaron tipos en el mnemónico y en los operandos"
 
-#: config/tc-arm.c:12534
+#: config/tc-arm.c:12352
 msgid "operand types can't be inferred"
 msgstr "no se pueden inferir los tipos de operando"
 
-#: config/tc-arm.c:12540
+#: config/tc-arm.c:12358
 msgid "type specifier has the wrong number of parts"
 msgstr "el especificador de tipo tiene el número erróneo de partes"
 
-#: config/tc-arm.c:12604 config/tc-arm.c:14299 config/tc-arm.c:14306
+#: config/tc-arm.c:12422 config/tc-arm.c:14117 config/tc-arm.c:14124
 msgid "operand size must match register width"
 msgstr "el tamaño del operador debe coincidir con la anchura del registro"
 
-#: config/tc-arm.c:12615
+#: config/tc-arm.c:12433
 msgid "bad type in Neon instruction"
 msgstr "tipo erróneo en la instrucción Neon"
 
-#: config/tc-arm.c:12626
+#: config/tc-arm.c:12444
 msgid "inconsistent types in Neon instruction"
 msgstr "tipos inconsistentes en la instrucción Neon"
 
-#: config/tc-arm.c:13443
+#: config/tc-arm.c:13261
 msgid "first and second operands shall be the same register"
 msgstr "el primer y segundo operandos deben ser el mismo registro"
 
-#: config/tc-arm.c:13711
+#: config/tc-arm.c:13529
 msgid "scalar out of range for multiply instruction"
 msgstr "escalar fuera de rango para la instrucción multiply"
 
-#: config/tc-arm.c:13887 config/tc-arm.c:13899
+#: config/tc-arm.c:13705 config/tc-arm.c:13717
 msgid "immediate out of range for insert"
 msgstr "inmediato fuera de rango para insert"
 
-#: config/tc-arm.c:13911 config/tc-arm.c:14906
+#: config/tc-arm.c:13729 config/tc-arm.c:14724
 msgid "immediate out of range for shift"
 msgstr "inmediato fuera de rango para shift"
 
-#: config/tc-arm.c:13968 config/tc-arm.c:13995 config/tc-arm.c:14404
-#: config/tc-arm.c:14852
+#: config/tc-arm.c:13786 config/tc-arm.c:13813 config/tc-arm.c:14222
+#: config/tc-arm.c:14670
 msgid "immediate out of range"
 msgstr "inmediato fuera de rango"
 
-#: config/tc-arm.c:14032
+#: config/tc-arm.c:13850
 msgid "immediate out of range for narrowing operation"
 msgstr "inmediato fuera de rango para la operación de estrechamiento"
 
-#: config/tc-arm.c:14157
+#: config/tc-arm.c:13975
 msgid "operands 0 and 1 must be the same register"
 msgstr "los operandos 0 y 1 debe ser el mismo registro"
 
-#: config/tc-arm.c:14378
+#: config/tc-arm.c:14196
 msgid "operand size must be specified for immediate VMOV"
 msgstr "el tamaño del operando se debe especificar para el inmediato VMOV"
 
-#: config/tc-arm.c:14388
+#: config/tc-arm.c:14206
 msgid "immediate has bits set outside the operand size"
 msgstr "el inmediato tiene bits definidos fuera del tamaño del operando"
 
-#: config/tc-arm.c:14584
+#: config/tc-arm.c:14402
 msgid "elements must be smaller than reversal region"
 msgstr "los elementos deben ser menores que la región de reversa"
 
-#: config/tc-arm.c:14755 config/tc-arm.c:14805
+#: config/tc-arm.c:14573 config/tc-arm.c:14623
 msgid "bad type for scalar"
 msgstr "tipo erróneo para el escalar"
 
-#: config/tc-arm.c:14869 config/tc-arm.c:14877
+#: config/tc-arm.c:14687 config/tc-arm.c:14695
 msgid "VFP registers must be adjacent"
 msgstr "los registros VFP deben ser adjacentes"
 
-#: config/tc-arm.c:15018
+#: config/tc-arm.c:14836
 msgid "bad list length for table lookup"
 msgstr "longitud de lista errónea para la búsqueda de tabla"
 
-#: config/tc-arm.c:15048
+#: config/tc-arm.c:14866
 msgid "writeback (!) must be used for VLDMDB and VSTMDB"
 msgstr "se debe usar writeback (!) para VLDMDB y VSTMDB"
 
-#: config/tc-arm.c:15051
+#: config/tc-arm.c:14869
 msgid "register list must contain at least 1 and at most 16 registers"
 msgstr "la lista de registros debe contener por lo menos 1 y cuando mucho 16 registros"
 
-#: config/tc-arm.c:15076
+#: config/tc-arm.c:14894
 msgid "Use of PC here is deprecated"
 msgstr "El uso de PC aquí es obsoleto"
 
-#: config/tc-arm.c:15078
+#: config/tc-arm.c:14896
 msgid "Use of PC here is UNPREDICTABLE"
 msgstr "El uso de PC aquí es IMPREDECIBLE"
 
-#: config/tc-arm.c:15141
+#: config/tc-arm.c:14959
 msgid "bad alignment"
 msgstr "alineación errónea"
 
-#: config/tc-arm.c:15158
+#: config/tc-arm.c:14976
 msgid "bad list type for instruction"
 msgstr "tipo de lista erróneo para la instrucción"
 
-#: config/tc-arm.c:15200
+#: config/tc-arm.c:15018
 msgid "unsupported alignment for instruction"
 msgstr "no se admite la alineación para la instrucción"
 
-#: config/tc-arm.c:15219 config/tc-arm.c:15313 config/tc-arm.c:15324
-#: config/tc-arm.c:15334 config/tc-arm.c:15348
+#: config/tc-arm.c:15037 config/tc-arm.c:15131 config/tc-arm.c:15142
+#: config/tc-arm.c:15152 config/tc-arm.c:15166
 msgid "bad list length"
 msgstr "longitud de lista errónea"
 
-#: config/tc-arm.c:15224
+#: config/tc-arm.c:15042
 msgid "stride of 2 unavailable when element size is 8"
 msgstr "no está disponible el estribo de 2 cuando el tamaño del elemento es 8"
 
-#: config/tc-arm.c:15257 config/tc-arm.c:15332
+#: config/tc-arm.c:15075 config/tc-arm.c:15150
 msgid "can't use alignment with this instruction"
 msgstr "no se puede usar la alineación con esta instrucción"
 
-#: config/tc-arm.c:15399
+#: config/tc-arm.c:15217
 msgid "post-index must be a register"
 msgstr "el post-índice debe ser un registro"
 
-#: config/tc-arm.c:15401
+#: config/tc-arm.c:15219
 msgid "bad register for post-index"
 msgstr "registro erróneo para el post-índice"
 
-#: config/tc-arm.c:15737 config/tc-arm.c:15823
+#: config/tc-arm.c:15532 config/tc-arm.c:15618
 msgid "conditional infixes are deprecated in unified syntax"
 msgstr "los infijos condicionales son obsoletos en la sintaxis unificada"
 
-#: config/tc-arm.c:15971
+#: config/tc-arm.c:15766
 msgid "Warning: conditional outside an IT block for Thumb."
 msgstr "Aviso: condicional fuera de un bloque IT para Thumb."
 
-#: config/tc-arm.c:16176
+#: config/tc-arm.c:15971
 msgid "s suffix on comparison instruction is deprecated"
 msgstr "el sufijo s para la instrucción de comparación es obsoleto"
 
-#: config/tc-arm.c:16195
+#: config/tc-arm.c:15990
 #, c-format
 msgid "selected processor does not support Thumb mode `%s'"
 msgstr "el procesador seleccionado no admite el modo Thumb `%s'"
 
-#: config/tc-arm.c:16201
+#: config/tc-arm.c:15996
 msgid "Thumb does not support conditional execution"
 msgstr "Thumb no admite la ejecución condicional"
 
-#: config/tc-arm.c:16220
+#: config/tc-arm.c:16015
 #, c-format
 msgid "selected processor does not support Thumb-2 mode `%s'"
 msgstr "el procesador seleccionado no admite el modo Thumb-2 `%s'"
 
-#: config/tc-arm.c:16245
+#: config/tc-arm.c:16040
 #, c-format
 msgid "cannot honor width suffix -- `%s'"
 msgstr "no se puede honrar el sufijo de anchura -- `%s'"
 
-#: config/tc-arm.c:16286
+#: config/tc-arm.c:16081
 #, c-format
 msgid "selected processor does not support ARM mode `%s'"
 msgstr "el procesador seleccionado no admite el modo ARM `%s'"
 
-#: config/tc-arm.c:16291
+#: config/tc-arm.c:16086
 #, c-format
 msgid "width suffixes are invalid in ARM mode -- `%s'"
 msgstr "los sufijos de anchura son inválidos en modo ARM -- `%s'"
 
-#: config/tc-arm.c:16324
+#: config/tc-arm.c:16119
 #, c-format
 msgid "attempt to use an ARM instruction on a Thumb-only processor -- `%s'"
 msgstr "se intentó usar una instrucción ARM en un procesador que sólo es Thumb -- `%s'"
 
-#: config/tc-arm.c:16341
+#: config/tc-arm.c:16136
 #, c-format
 msgid "section '%s' finished with an open IT block."
 msgstr "la sección '%s' terminó con un bloque IT abierto."
 
-#: config/tc-arm.c:16346
+#: config/tc-arm.c:16141
 msgid "file finished with an open IT block."
 msgstr "el fichero terminó con un bloque IT abierto."
 
-#: config/tc-arm.c:19385
+#: config/tc-arm.c:19172
 #, c-format
 msgid "alignments greater than %d bytes not supported in .text sections."
 msgstr "no se admiten las alineaciones más grandes que %d bytes en las secciones .text."
 
-#: config/tc-arm.c:19653 config/tc-ia64.c:3469
+#: config/tc-arm.c:19440 config/tc-ia64.c:3469
 #, c-format
 msgid "Group section `%s' has no group signature"
 msgstr "La sección de grupo `%s' no tiene firma de grupo"
 
-#: config/tc-arm.c:19698
+#: config/tc-arm.c:19485
 msgid "handlerdata in cantunwind frame"
 msgstr "handlerdata en un marco cantunwind"
 
-#: config/tc-arm.c:19715
+#: config/tc-arm.c:19502
 msgid "too many unwind opcodes for personality routine 0"
 msgstr "demasiados códigos de operación de desenredo para la rutina personality 0"
 
-#: config/tc-arm.c:19747
+#: config/tc-arm.c:19534
 msgid "too many unwind opcodes"
 msgstr "demasiados códigos de operación de desenredo"
 
-#: config/tc-arm.c:20007
+#: config/tc-arm.c:19794
 msgid "GOT already in the symbol table"
 msgstr "GOT ya está en la tabla de símbolos"
 
-#: config/tc-arm.c:20345 config/tc-arm.c:20387 config/tc-arm.c:20657
+#: config/tc-arm.c:20132 config/tc-arm.c:20174 config/tc-arm.c:20444
 #, c-format
 msgid "undefined symbol %s used as an immediate value"
 msgstr "se usa el símbolo sin definir %s como un valor inmediato"
 
-#: config/tc-arm.c:20347 config/tc-arm.c:20389
+#: config/tc-arm.c:20134 config/tc-arm.c:20176
 #, c-format
 msgid "symbol %s is in a different section"
 msgstr "el símbolo %s está en una sección diferente"
 
-#: config/tc-arm.c:20349 config/tc-arm.c:20391
+#: config/tc-arm.c:20136 config/tc-arm.c:20178
 #, c-format
 msgid "symbol %s is weak and may be overridden later"
 msgstr "el símbolo %s es débil y se puede sobreescribir después"
 
-#: config/tc-arm.c:20368 config/tc-arm.c:20699
+#: config/tc-arm.c:20155 config/tc-arm.c:20486
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr "constante inválida (%lx) después de la compostura"
 
-#: config/tc-arm.c:20424
+#: config/tc-arm.c:20211
 #, c-format
 msgid "unable to compute ADRL instructions for PC offset of 0x%lx"
 msgstr "no se pueden calcular las instrucciones ADRL para el desplazamiento de PC de 0x%lx"
 
-#: config/tc-arm.c:20459 config/tc-arm.c:20484
+#: config/tc-arm.c:20246 config/tc-arm.c:20271
 msgid "invalid literal constant: pool needs to be closer"
 msgstr "constante literal inválida: el conjunto necesita estar más cerca"
 
-#: config/tc-arm.c:20462 config/tc-arm.c:20500
+#: config/tc-arm.c:20249 config/tc-arm.c:20287
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr "valor inmediato erróneo para el desplazamiento (%ld)"
 
-#: config/tc-arm.c:20486
+#: config/tc-arm.c:20273
 #, c-format
 msgid "bad immediate value for 8-bit offset (%ld)"
 msgstr "valor inmediato erróneo para el desplazamiento de 8-bit (%ld)"
 
-#: config/tc-arm.c:20541
+#: config/tc-arm.c:20328
 msgid "offset not a multiple of 4"
 msgstr "el desplazamiento no es un múltiplo de 4"
 
-#: config/tc-arm.c:20548 config/tc-arm.c:20563 config/tc-arm.c:20578
-#: config/tc-arm.c:20589 config/tc-arm.c:20612 config/tc-arm.c:21332
+#: config/tc-arm.c:20335 config/tc-arm.c:20350 config/tc-arm.c:20365
+#: config/tc-arm.c:20376 config/tc-arm.c:20399 config/tc-arm.c:21114
 #: config/tc-moxie.c:662 config/tc-pj.c:448 config/tc-sh.c:4281
 msgid "offset out of range"
 msgstr "desplazamiento fuera de rango"
 
-#: config/tc-arm.c:20715
+#: config/tc-arm.c:20502
 msgid "invalid smc expression"
 msgstr "expresión smc inválida"
 
-#: config/tc-arm.c:20724
+#: config/tc-arm.c:20511
 msgid "invalid hvc expression"
 msgstr "expresión hvc inválida"
 
-#: config/tc-arm.c:20735 config/tc-arm.c:20744
+#: config/tc-arm.c:20522 config/tc-arm.c:20531
 msgid "invalid swi expression"
 msgstr "expresión swi inválida"
 
-#: config/tc-arm.c:20754
+#: config/tc-arm.c:20541
 msgid "invalid expression in load/store multiple"
 msgstr "expresión inválida en load/store múltiples"
 
-#: config/tc-arm.c:20815
+#: config/tc-arm.c:20602
 #, c-format
 msgid "blx to '%s' an ARM ISA state function changed to bl"
 msgstr "blx a '%s' cambió una función de estado ISA de ARM a bl"
 
-#: config/tc-arm.c:20834
+#: config/tc-arm.c:20621
 msgid "misaligned branch destination"
 msgstr "destinaciones ramificadas desalineadas"
 
-#: config/tc-arm.c:20838 config/tc-arm.c:20875 config/tc-arm.c:20889
-#: config/tc-arm.c:20902 config/tc-arm.c:21009 config/tc-arm.c:21027
+#: config/tc-arm.c:20625 config/tc-arm.c:20662 config/tc-arm.c:20676
+#: config/tc-arm.c:20689 config/tc-arm.c:20799 config/tc-arm.c:20817
 msgid "branch out of range"
 msgstr "ramificación fuera de rango"
 
-#: config/tc-arm.c:20924
+#: config/tc-arm.c:20712
 msgid "conditional branch out of range"
 msgstr "ramificación condicional fuera de rango"
 
-#: config/tc-arm.c:20959
+#: config/tc-arm.c:20748
 #, c-format
 msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl"
 msgstr "blx a la función Thumb '%s' cambió del estado ISA Thumb a bl"
 
-#: config/tc-arm.c:21015
+#: config/tc-arm.c:20805
 msgid "Thumb2 branch out of range"
 msgstr "ramificación Thumb2 fuera de rango"
 
-#: config/tc-arm.c:21106
+#: config/tc-arm.c:20888
 msgid "rel31 relocation overflow"
 msgstr "desbordamiento de reubicación rel31"
 
-#: config/tc-arm.c:21118 config/tc-arm.c:21141
+#: config/tc-arm.c:20900 config/tc-arm.c:20923
 msgid "co-processor offset out of range"
 msgstr "desplazamiento de coprocesador fuera de rango"
 
-#: config/tc-arm.c:21158
+#: config/tc-arm.c:20940
 #, c-format
 msgid "invalid offset, target not word aligned (0x%08lX)"
 msgstr "desplazamiento inválido, el objetivo no está alineado a word (0x%08lX)"
 
-#: config/tc-arm.c:21165 config/tc-arm.c:21174 config/tc-arm.c:21182
-#: config/tc-arm.c:21190 config/tc-arm.c:21198
+#: config/tc-arm.c:20947 config/tc-arm.c:20956 config/tc-arm.c:20964
+#: config/tc-arm.c:20972 config/tc-arm.c:20980
 #, c-format
 msgid "invalid offset, value too big (0x%08lX)"
 msgstr "desplazamiento inválido, valor demasiado grande (0x%08lX)"
 
-#: config/tc-arm.c:21239
+#: config/tc-arm.c:21021
 msgid "invalid Hi register with immediate"
 msgstr "registro Hi inválido con el inmediato"
 
-#: config/tc-arm.c:21255
+#: config/tc-arm.c:21037
 msgid "invalid immediate for stack address calculation"
 msgstr "inmediato inválido para el cálculo de la dirección de la pila"
 
-#: config/tc-arm.c:21263
+#: config/tc-arm.c:21045
 #, c-format
 msgid "invalid immediate for address calculation (value = 0x%08lX)"
 msgstr "inmediato inválido para el cálculo de la dirección (valor = 0x%08lX)"
 
-#: config/tc-arm.c:21293
+#: config/tc-arm.c:21075
 #, c-format
 msgid "invalid immediate: %ld is out of range"
 msgstr "inmediato inválido: %ld está fuera de rango"
 
-#: config/tc-arm.c:21305
+#: config/tc-arm.c:21087
 #, c-format
 msgid "invalid shift value: %ld"
 msgstr "valor de desplazamiento inválido: %ld"
 
-#: config/tc-arm.c:21384
+#: config/tc-arm.c:21166
 #, c-format
 msgid "the offset 0x%08lX is not representable"
 msgstr "el desplazamiento 0x%08lX no es representable"
 
-#: config/tc-arm.c:21424
+#: config/tc-arm.c:21206
 #, c-format
 msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)"
 msgstr "desplazamiento erróneo 0x%08lX (sólo hay 12 bits disponibles para esta magnitud)"
 
-#: config/tc-arm.c:21463
+#: config/tc-arm.c:21245
 #, c-format
 msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)"
 msgstr "desplazamiento erróneo 0x%08lX (sólo hay 8 bits disponibles para esta magnitud)"
 
-#: config/tc-arm.c:21503
+#: config/tc-arm.c:21285
 #, c-format
 msgid "bad offset 0x%08lX (must be word-aligned)"
 msgstr "desplazamiento erróneo 0x%08lX (debe ser alineado a word)"
 
-#: config/tc-arm.c:21508
+#: config/tc-arm.c:21290
 #, c-format
 msgid "bad offset 0x%08lX (must be an 8-bit number of words)"
 msgstr "desplazamiento erróneo 0x%08lX (debe ser un número de 8-bit de words)"
 
-#: config/tc-arm.c:21539 config/tc-score.c:7397
+#: config/tc-arm.c:21321 config/tc-score.c:7397
 #, c-format
 msgid "bad relocation fixup type (%d)"
 msgstr "tipo de compostura de reubicación inválido (%d)"
 
-#: config/tc-arm.c:21650
+#: config/tc-arm.c:21432
 msgid "literal referenced across section boundary"
 msgstr "se referencía una literal a través de un límite de sección"
 
-#: config/tc-arm.c:21717
+#: config/tc-arm.c:21494
 msgid "internal relocation (type: IMMEDIATE) not fixed up"
 msgstr "reubicación interna (tipo: IMMEDIATE) no compuesta"
 
-#: config/tc-arm.c:21722
+#: config/tc-arm.c:21499
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr "se utiliza ADRL para un símbolo que no está definido en el mismo fichero"
 
-#: config/tc-arm.c:21737
+#: config/tc-arm.c:21514
 #, c-format
 msgid "undefined local label `%s'"
 msgstr "etiqueta local `%s' sin definir"
 
-#: config/tc-arm.c:21743
+#: config/tc-arm.c:21520
 msgid "internal_relocation (type: OFFSET_IMM) not fixed up"
 msgstr "reubicación_interna (tipo OFFSET_IMM) no compuesta"
 
-#: config/tc-arm.c:21765 config/tc-cris.c:3986 config/tc-mcore.c:1926
+#: config/tc-arm.c:21542 config/tc-cris.c:3984 config/tc-mcore.c:1926
 #: config/tc-microblaze.c:1833 config/tc-mmix.c:2867 config/tc-moxie.c:757
 #: config/tc-ns32k.c:2248 config/tc-score.c:7490
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: config/tc-arm.c:21768 config/tc-arm.c:21789 config/tc-score.c:7492
+#: config/tc-arm.c:21545 config/tc-arm.c:21566 config/tc-score.c:7492
 #, c-format
 msgid "cannot represent %s relocation in this object file format"
 msgstr "no se puede representar la reubicación %s en este formato de fichero objeto"
 
-#: config/tc-arm.c:22145
+#: config/tc-arm.c:21906
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr "%s: tipo de función inesperado: %d"
 
-#: config/tc-arm.c:22274
+#: config/tc-arm.c:22035
 msgid "use of old and new-style options to set CPU type"
 msgstr "se utilizan opciones de estilo antiguo y nuevo para establecer el tipo de CPU"
 
-#: config/tc-arm.c:22284
+#: config/tc-arm.c:22045
 msgid "use of old and new-style options to set FPU type"
 msgstr "se utilizan opciones de estilo antiguo y nuevo para establecer el tipo de FPU"
 
-#: config/tc-arm.c:22360
+#: config/tc-arm.c:22121
 msgid "hard-float conflicts with specified fpu"
 msgstr "hard-float tiene conflictos con la unidad de coma flotante (fpu) especificada"
 
-#: config/tc-arm.c:22547
+#: config/tc-arm.c:22308
 msgid "generate PIC code"
 msgstr "genera código PIC"
 
-#: config/tc-arm.c:22548
+#: config/tc-arm.c:22309
 msgid "assemble Thumb code"
 msgstr "ensambla código Thumb"
 
-#: config/tc-arm.c:22549
+#: config/tc-arm.c:22310
 msgid "support ARM/Thumb interworking"
 msgstr "admite la interoperación ARM/Thumb"
 
-#: config/tc-arm.c:22551
+#: config/tc-arm.c:22312
 msgid "code uses 32-bit program counter"
 msgstr "el código utiliza un contador de programa de 32-bit"
 
-#: config/tc-arm.c:22552
+#: config/tc-arm.c:22313
 msgid "code uses 26-bit program counter"
 msgstr "el código utiliza un contador de programa de 26-bit"
 
-#: config/tc-arm.c:22553
+#: config/tc-arm.c:22314
 msgid "floating point args are in fp regs"
 msgstr "los argumentos de coma flotante están en los registros de coma flotante"
 
-#: config/tc-arm.c:22555
+#: config/tc-arm.c:22316
 msgid "re-entrant code"
 msgstr "código reentrante"
 
-#: config/tc-arm.c:22556
+#: config/tc-arm.c:22317
 msgid "code is ATPCS conformant"
 msgstr "el código es conforme a ATPCS"
 
-#: config/tc-arm.c:22557
+#: config/tc-arm.c:22318
 msgid "assemble for big-endian"
 msgstr "ensambla para big-endian"
 
-#: config/tc-arm.c:22558
+#: config/tc-arm.c:22319
 msgid "assemble for little-endian"
 msgstr "ensambla para little-endian"
 
 #. These are recognized by the assembler, but have no affect on code.
-#: config/tc-arm.c:22562
+#: config/tc-arm.c:22323
 msgid "use frame pointer"
 msgstr "usa puntero de marco"
 
-#: config/tc-arm.c:22563
+#: config/tc-arm.c:22324
 msgid "use stack size checking"
 msgstr "usa revisión del tamaño de la pila"
 
-#: config/tc-arm.c:22566
+#: config/tc-arm.c:22327
 msgid "do not warn on use of deprecated feature"
 msgstr "no avisa del uso de una opción obsoleta"
 
 #. 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:22583 config/tc-arm.c:22584
+#: config/tc-arm.c:22344 config/tc-arm.c:22345
 msgid "use -mcpu=arm1"
 msgstr "usa -mcpu=arm1"
 
-#: config/tc-arm.c:22585 config/tc-arm.c:22586
+#: config/tc-arm.c:22346 config/tc-arm.c:22347
 msgid "use -mcpu=arm2"
 msgstr "usa -mcpu=arm2"
 
-#: config/tc-arm.c:22587 config/tc-arm.c:22588
+#: config/tc-arm.c:22348 config/tc-arm.c:22349
 msgid "use -mcpu=arm250"
 msgstr "usa -mcpu=arm250"
 
-#: config/tc-arm.c:22589 config/tc-arm.c:22590
+#: config/tc-arm.c:22350 config/tc-arm.c:22351
 msgid "use -mcpu=arm3"
 msgstr "usa -mcpu=arm3"
 
-#: config/tc-arm.c:22591 config/tc-arm.c:22592
+#: config/tc-arm.c:22352 config/tc-arm.c:22353
 msgid "use -mcpu=arm6"
 msgstr "usa -mcpu=arm6"
 
-#: config/tc-arm.c:22593 config/tc-arm.c:22594
+#: config/tc-arm.c:22354 config/tc-arm.c:22355
 msgid "use -mcpu=arm600"
 msgstr "usa -mcpu=arm600"
 
-#: config/tc-arm.c:22595 config/tc-arm.c:22596
+#: config/tc-arm.c:22356 config/tc-arm.c:22357
 msgid "use -mcpu=arm610"
 msgstr "usa -mcpu=arm610"
 
-#: config/tc-arm.c:22597 config/tc-arm.c:22598
+#: config/tc-arm.c:22358 config/tc-arm.c:22359
 msgid "use -mcpu=arm620"
 msgstr "usa -mcpu=arm620"
 
-#: config/tc-arm.c:22599 config/tc-arm.c:22600
+#: config/tc-arm.c:22360 config/tc-arm.c:22361
 msgid "use -mcpu=arm7"
 msgstr "usa -mcpu=arm7"
 
-#: config/tc-arm.c:22601 config/tc-arm.c:22602
+#: config/tc-arm.c:22362 config/tc-arm.c:22363
 msgid "use -mcpu=arm70"
 msgstr "usa -mcpu=arm70"
 
-#: config/tc-arm.c:22603 config/tc-arm.c:22604
+#: config/tc-arm.c:22364 config/tc-arm.c:22365
 msgid "use -mcpu=arm700"
 msgstr "usa -mcpu=arm700"
 
-#: config/tc-arm.c:22605 config/tc-arm.c:22606
+#: config/tc-arm.c:22366 config/tc-arm.c:22367
 msgid "use -mcpu=arm700i"
 msgstr "usa -mcpu=arm700i"
 
-#: config/tc-arm.c:22607 config/tc-arm.c:22608
+#: config/tc-arm.c:22368 config/tc-arm.c:22369
 msgid "use -mcpu=arm710"
 msgstr "usa -mcpu=arm710"
 
-#: config/tc-arm.c:22609 config/tc-arm.c:22610
+#: config/tc-arm.c:22370 config/tc-arm.c:22371
 msgid "use -mcpu=arm710c"
 msgstr "usa -mcpu=arm710c"
 
-#: config/tc-arm.c:22611 config/tc-arm.c:22612
+#: config/tc-arm.c:22372 config/tc-arm.c:22373
 msgid "use -mcpu=arm720"
 msgstr "usa -mcpu=arm720"
 
-#: config/tc-arm.c:22613 config/tc-arm.c:22614
+#: config/tc-arm.c:22374 config/tc-arm.c:22375
 msgid "use -mcpu=arm7d"
 msgstr "usa -mcpu=arm7d"
 
-#: config/tc-arm.c:22615 config/tc-arm.c:22616
+#: config/tc-arm.c:22376 config/tc-arm.c:22377
 msgid "use -mcpu=arm7di"
 msgstr "usa -mcpu=arm7di"
 
-#: config/tc-arm.c:22617 config/tc-arm.c:22618
+#: config/tc-arm.c:22378 config/tc-arm.c:22379
 msgid "use -mcpu=arm7m"
 msgstr "usa -mcpu=arm7m"
 
-#: config/tc-arm.c:22619 config/tc-arm.c:22620
+#: config/tc-arm.c:22380 config/tc-arm.c:22381
 msgid "use -mcpu=arm7dm"
 msgstr "usa -mcpu=arm7dm"
 
-#: config/tc-arm.c:22621 config/tc-arm.c:22622
+#: config/tc-arm.c:22382 config/tc-arm.c:22383
 msgid "use -mcpu=arm7dmi"
 msgstr "usa -mcpu=arm7dmi"
 
-#: config/tc-arm.c:22623 config/tc-arm.c:22624
+#: config/tc-arm.c:22384 config/tc-arm.c:22385
 msgid "use -mcpu=arm7100"
 msgstr "usa -mcpu=arm7100"
 
-#: config/tc-arm.c:22625 config/tc-arm.c:22626
+#: config/tc-arm.c:22386 config/tc-arm.c:22387
 msgid "use -mcpu=arm7500"
 msgstr "usa -mcpu=arm7500"
 
-#: config/tc-arm.c:22627 config/tc-arm.c:22628
+#: config/tc-arm.c:22388 config/tc-arm.c:22389
 msgid "use -mcpu=arm7500fe"
 msgstr "usa -mcpu=arm7500fe"
 
-#: config/tc-arm.c:22629 config/tc-arm.c:22630 config/tc-arm.c:22631
-#: config/tc-arm.c:22632
+#: config/tc-arm.c:22390 config/tc-arm.c:22391 config/tc-arm.c:22392
+#: config/tc-arm.c:22393
 msgid "use -mcpu=arm7tdmi"
 msgstr "usa -mcpu=arm7tdmi"
 
-#: config/tc-arm.c:22633 config/tc-arm.c:22634
+#: config/tc-arm.c:22394 config/tc-arm.c:22395
 msgid "use -mcpu=arm710t"
 msgstr "usa -mcpu=arm710t"
 
-#: config/tc-arm.c:22635 config/tc-arm.c:22636
+#: config/tc-arm.c:22396 config/tc-arm.c:22397
 msgid "use -mcpu=arm720t"
 msgstr "usa -mcpu=arm720t"
 
-#: config/tc-arm.c:22637 config/tc-arm.c:22638
+#: config/tc-arm.c:22398 config/tc-arm.c:22399
 msgid "use -mcpu=arm740t"
 msgstr "usa -mcpu=arm740t"
 
-#: config/tc-arm.c:22639 config/tc-arm.c:22640
+#: config/tc-arm.c:22400 config/tc-arm.c:22401
 msgid "use -mcpu=arm8"
 msgstr "usa -mcpu=arm8"
 
-#: config/tc-arm.c:22641 config/tc-arm.c:22642
+#: config/tc-arm.c:22402 config/tc-arm.c:22403
 msgid "use -mcpu=arm810"
 msgstr "usa -mcpu=arm810"
 
-#: config/tc-arm.c:22643 config/tc-arm.c:22644
+#: config/tc-arm.c:22404 config/tc-arm.c:22405
 msgid "use -mcpu=arm9"
 msgstr "usa -mcpu=arm9"
 
-#: config/tc-arm.c:22645 config/tc-arm.c:22646
+#: config/tc-arm.c:22406 config/tc-arm.c:22407
 msgid "use -mcpu=arm9tdmi"
 msgstr "usa -mcpu=arm9tdmi"
 
-#: config/tc-arm.c:22647 config/tc-arm.c:22648
+#: config/tc-arm.c:22408 config/tc-arm.c:22409
 msgid "use -mcpu=arm920"
 msgstr "usa -mcpu=arm920"
 
-#: config/tc-arm.c:22649 config/tc-arm.c:22650
+#: config/tc-arm.c:22410 config/tc-arm.c:22411
 msgid "use -mcpu=arm940"
 msgstr "usa -mcpu=arm940"
 
-#: config/tc-arm.c:22651
+#: config/tc-arm.c:22412
 msgid "use -mcpu=strongarm"
 msgstr "usa -mcpu=strongarm"
 
-#: config/tc-arm.c:22653
+#: config/tc-arm.c:22414
 msgid "use -mcpu=strongarm110"
 msgstr "usa -mcpu=strongarm110"
 
-#: config/tc-arm.c:22655
+#: config/tc-arm.c:22416
 msgid "use -mcpu=strongarm1100"
 msgstr "usa -mcpu=strongarm1100"
 
-#: config/tc-arm.c:22657
+#: config/tc-arm.c:22418
 msgid "use -mcpu=strongarm1110"
 msgstr "usa -mcpu=strongarm1110"
 
-#: config/tc-arm.c:22658
+#: config/tc-arm.c:22419
 msgid "use -mcpu=xscale"
 msgstr "usa -mcpu=xscale"
 
-#: config/tc-arm.c:22659
+#: config/tc-arm.c:22420
 msgid "use -mcpu=iwmmxt"
 msgstr "usa -mcpu=iwmmxt"
 
-#: config/tc-arm.c:22660
+#: config/tc-arm.c:22421
 msgid "use -mcpu=all"
 msgstr "usa -mcpu=all"
 
 #. Architecture variants -- don't add any more to this list either.
-#: config/tc-arm.c:22663 config/tc-arm.c:22664
+#: config/tc-arm.c:22424 config/tc-arm.c:22425
 msgid "use -march=armv2"
 msgstr "usa -march=armv2"
 
-#: config/tc-arm.c:22665 config/tc-arm.c:22666
+#: config/tc-arm.c:22426 config/tc-arm.c:22427
 msgid "use -march=armv2a"
 msgstr "usa -march=armv2a"
 
-#: config/tc-arm.c:22667 config/tc-arm.c:22668
+#: config/tc-arm.c:22428 config/tc-arm.c:22429
 msgid "use -march=armv3"
 msgstr "usa -march=armv3"
 
-#: config/tc-arm.c:22669 config/tc-arm.c:22670
+#: config/tc-arm.c:22430 config/tc-arm.c:22431
 msgid "use -march=armv3m"
 msgstr "usa -march=armv3m"
 
-#: config/tc-arm.c:22671 config/tc-arm.c:22672
+#: config/tc-arm.c:22432 config/tc-arm.c:22433
 msgid "use -march=armv4"
 msgstr "usa -march=armv4"
 
-#: config/tc-arm.c:22673 config/tc-arm.c:22674
+#: config/tc-arm.c:22434 config/tc-arm.c:22435
 msgid "use -march=armv4t"
 msgstr "usa -march=armv4t"
 
-#: config/tc-arm.c:22675 config/tc-arm.c:22676
+#: config/tc-arm.c:22436 config/tc-arm.c:22437
 msgid "use -march=armv5"
 msgstr "usa -march=armv5"
 
-#: config/tc-arm.c:22677 config/tc-arm.c:22678
+#: config/tc-arm.c:22438 config/tc-arm.c:22439
 msgid "use -march=armv5t"
 msgstr "usa -march=armv5t"
 
-#: config/tc-arm.c:22679 config/tc-arm.c:22680
+#: config/tc-arm.c:22440 config/tc-arm.c:22441
 msgid "use -march=armv5te"
 msgstr "usa -march=armv5te"
 
 #. Floating point variants -- don't add any more to this list either.
-#: config/tc-arm.c:22683
+#: config/tc-arm.c:22444
 msgid "use -mfpu=fpe"
 msgstr "usa -mfpu=fpe"
 
-#: config/tc-arm.c:22684
+#: config/tc-arm.c:22445
 msgid "use -mfpu=fpa10"
 msgstr "usa -mfpu=fpa10"
 
-#: config/tc-arm.c:22685
+#: config/tc-arm.c:22446
 msgid "use -mfpu=fpa11"
 msgstr "usa -mfpu=fpa11"
 
-#: config/tc-arm.c:22687
+#: config/tc-arm.c:22448
 msgid "use either -mfpu=softfpa or -mfpu=softvfp"
 msgstr "usa -mfpu=softfpa ó -mfpu=softvfp"
 
-#: config/tc-arm.c:23016
+#: config/tc-arm.c:22772
 msgid "invalid architectural extension"
 msgstr "extensión de arquitectura inválida"
 
-#: config/tc-arm.c:23049
+#: config/tc-arm.c:22805
 msgid "must specify extensions to add before specifying those to remove"
 msgstr "se deben especificar extensiones para agregar antes de especificar las que se borrarán"
 
-#: config/tc-arm.c:23057
+#: config/tc-arm.c:22813
 msgid "missing architectural extension"
 msgstr "falta la extensión de la arquitectura"
 
-#: config/tc-arm.c:23072
+#: config/tc-arm.c:22828
 msgid "extension does not apply to the base architecture"
 msgstr "la extensión no se aplica a la arquitectura base"
 
-#: config/tc-arm.c:23095
+#: config/tc-arm.c:22851
 #, c-format
 msgid "unknown architectural extension `%s'"
 msgstr "extensión de arquitectura `%s' desconocida"
 
-#: config/tc-arm.c:23097
+#: config/tc-arm.c:22853
 msgid "architectural extensions must be specified in alphabetical order"
 msgstr "las extensiones de arquitectura se deben especificar en orden alfabético"
 
-#: config/tc-arm.c:23129
+#: config/tc-arm.c:22885
 #, c-format
 msgid "missing cpu name `%s'"
 msgstr "falta el nombre de cpu `%s'"
 
-#: config/tc-arm.c:23155 config/tc-arm.c:23651
+#: config/tc-arm.c:22911 config/tc-arm.c:23401
 #, c-format
 msgid "unknown cpu `%s'"
 msgstr "cpu `%s' desconocido"
 
-#: config/tc-arm.c:23173
+#: config/tc-arm.c:22929
 #, c-format
 msgid "missing architecture name `%s'"
 msgstr "falta el nombre de arquitectura `%s'"
 
-#: config/tc-arm.c:23190 config/tc-arm.c:23685 config/tc-arm.c:23716
-#: config/tc-arm.c:23767 config/tc-score.c:7727
+#: config/tc-arm.c:22946 config/tc-arm.c:23435 config/tc-arm.c:23466
+#: config/tc-arm.c:23517 config/tc-score.c:7727
 #, c-format
 msgid "unknown architecture `%s'\n"
 msgstr "arquitectura `%s' desconocida\n"
 
-#: config/tc-arm.c:23206 config/tc-arm.c:23798
+#: config/tc-arm.c:22962 config/tc-arm.c:23548
 #, c-format
 msgid "unknown floating point format `%s'\n"
 msgstr "formato de coma flotante `%s' desconocido\n"
 
-#: config/tc-arm.c:23222
+#: config/tc-arm.c:22978
 #, c-format
 msgid "unknown floating point abi `%s'\n"
 msgstr "abi de coma flotante `%s' desconocida\n"
 
-#: config/tc-arm.c:23238
+#: config/tc-arm.c:22994
 #, c-format
 msgid "unknown EABI `%s'\n"
 msgstr "EABI `%s' desconocida\n"
 
-#: config/tc-arm.c:23258
+#: config/tc-arm.c:23014
 #, c-format
 msgid "unknown implicit IT mode `%s', should be arm, thumb, always, or never."
 msgstr "modo IT implícito `%s' desconocido, debe ser arm, thumb, always o never."
 
-#: config/tc-arm.c:23268
+#: config/tc-arm.c:23024
 msgid "<cpu name>\t  assemble for CPU <cpu name>"
 msgstr "<nombre cpu>\t  ensambla para el CPU <nombre cpu>"
 
-#: config/tc-arm.c:23270
+#: config/tc-arm.c:23026
 msgid "<arch name>\t  assemble for architecture <arch name>"
 msgstr "<nombre arq>\t  ensambla para la arquitectura <nombre arq>"
 
-#: config/tc-arm.c:23272
+#: config/tc-arm.c:23028
 msgid "<fpu name>\t  assemble for FPU architecture <fpu name>"
 msgstr "<nombre fpu>\t  ensambla para la arquitectura de Unidad de Coma Flotante <nombre fpu>"
 
-#: config/tc-arm.c:23274
+#: config/tc-arm.c:23030
 msgid "<abi>\t  assemble for floating point ABI <abi>"
 msgstr "<abi>\t  ensambla para la ABI de coma flotante <abi>"
 
-#: config/tc-arm.c:23277
+#: config/tc-arm.c:23033
 msgid "<ver>\t\t  assemble for eabi version <ver>"
 msgstr "<ver>\t\t  ensambla para la eabi versión <ver>"
 
-#: config/tc-arm.c:23280
+#: config/tc-arm.c:23036
 msgid "<mode>\t  controls implicit insertion of IT instructions"
 msgstr "<modo>\t  controla la inserción implícita de instrucciones IT"
 
-#: config/tc-arm.c:23324 config/tc-arm.c:23342 config/tc-arm.c:23362
+#: config/tc-arm.c:23080 config/tc-arm.c:23098 config/tc-arm.c:23118
 #, c-format
 msgid "option `-%c%s' is deprecated: %s"
 msgstr "la opción `-%c%s' es obsoleta: %s"
 
-#: config/tc-arm.c:23382
+#: config/tc-arm.c:23138
 #, c-format
 msgid " ARM-specific assembler options:\n"
 msgstr "Opciones de ensamblador específicas de ARM:\n"
 
-#: config/tc-arm.c:23393
+#: config/tc-arm.c:23149
 #, c-format
 msgid "  -EB                     assemble code for a big-endian cpu\n"
 msgstr "  -EB                     ensambla código para un cpu big-endian\n"
 
-#: config/tc-arm.c:23398
+#: config/tc-arm.c:23154
 #, c-format
 msgid "  -EL                     assemble code for a little-endian cpu\n"
 msgstr "  -EL                     ensambla código para un cpu little-endian\n"
 
-#: config/tc-arm.c:23402
+#: config/tc-arm.c:23158
 #, c-format
 msgid "  --fix-v4bx              Allow BX in ARMv4 code\n"
 msgstr "  --fix-v4bx              Permite BX en código ARMv4\n"
 
-#: config/tc-arm.c:23749
+#: config/tc-arm.c:23499
 #, c-format
 msgid "architectural extension `%s' is not allowed for the current base architecture"
 msgstr "no se permite la extensión de arquitectura `%s' para la arquitectura base actual"
 
-#: config/tc-avr.c:373
+#: config/tc-avr.c:336
 #, c-format
 msgid "Known MCU names:"
 msgstr "Nombres MCU conocidos:"
 
-#: config/tc-avr.c:438
+#: config/tc-avr.c:401
 #, c-format
 msgid ""
-"AVR Assembler options:\n"
+"AVR options:\n"
 "  -mmcu=[avr-name] select microcontroller variant\n"
 "                   [avr-name] can be:\n"
 "                   avr1  - classic AVR core without data RAM\n"
@@ -3624,11 +3590,6 @@ msgid ""
 "                   avr5  - enhanced AVR core with up to 64K program memory\n"
 "                   avr51 - enhanced AVR core with up to 128K program memory\n"
 "                   avr6  - enhanced AVR core with up to 256K program memory\n"
-"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
-"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
-"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
-"                   avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
-"                   avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n"
 "                   or immediate microcontroller name.\n"
 msgstr ""
 "Opciones de AVR:\n"
@@ -3646,14 +3607,9 @@ msgstr ""
 "              avr5  - núcleo AVR mejorado hasta con 64K de memoria de programa\n"
 "              avr51 - núcleo AVR mejorado hasta con 128K de memoria de programa\n"
 "              avr6  - núcleo AVR mejorado hasta con 256K de memoria de programa\n"
-"              avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
-"              avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
-"              avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
-"              avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
-"              avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n"
 "              o el nombre inmediato del microcontrolador\n"
 
-#: config/tc-avr.c:460
+#: config/tc-avr.c:418
 #, c-format
 msgid ""
 "  -mall-opcodes    accept all AVR opcodes, even if not supported by MCU\n"
@@ -3669,153 +3625,153 @@ msgstr ""
 "  -mno-wrap        rechaza las instrucciones rjmp/rcall con envoltura de 8K\n"
 "                   (por defecto para avr3, avr5)\n"
 
-#: config/tc-avr.c:504 config/tc-msp430.c:743
+#: config/tc-avr.c:462 config/tc-msp430.c:743
 #, c-format
 msgid "unknown MCU: %s\n"
 msgstr "MCU desconocido: %s\n"
 
-#: config/tc-avr.c:513
+#: config/tc-avr.c:471
 #, c-format
 msgid "redefinition of mcu type `%s' to `%s'"
 msgstr "redefinición del tipo de mcu `%s' a `%s'"
 
-#: config/tc-avr.c:591
+#: config/tc-avr.c:549
 msgid "constant value required"
 msgstr "se requiere un valor constante"
 
-#: config/tc-avr.c:594
+#: config/tc-avr.c:552
 #, c-format
 msgid "number must be positive and less than %d"
 msgstr "el número debe ser positivo y menor que %d"
 
-#: config/tc-avr.c:620 config/tc-avr.c:757
+#: config/tc-avr.c:578 config/tc-avr.c:715
 #, c-format
 msgid "constant out of 8-bit range: %d"
 msgstr "constante fuera del rango de 8-bit: %d"
 
-#: config/tc-avr.c:688 config/tc-score.c:1200 read.c:3662
+#: config/tc-avr.c:646 config/tc-score.c:1200 read.c:3676
 msgid "illegal expression"
 msgstr "expresión ilegal"
 
-#: config/tc-avr.c:717 config/tc-avr.c:1508
+#: config/tc-avr.c:675 config/tc-avr.c:1451
 msgid "`)' required"
 msgstr "se requiere `)'"
 
-#: config/tc-avr.c:812
+#: config/tc-avr.c:770
 msgid "register r16-r23 required"
 msgstr "se requiere los registros r16-r23"
 
-#: config/tc-avr.c:818
+#: config/tc-avr.c:776
 msgid "register number above 15 required"
 msgstr "se requiere un número de registro superior a 15"
 
-#: config/tc-avr.c:824
+#: config/tc-avr.c:782
 msgid "even register number required"
 msgstr "se requieren un número de registro par"
 
-#: config/tc-avr.c:830
+#: config/tc-avr.c:788
 msgid "register r24, r26, r28 or r30 required"
 msgstr "se requieren los registros r24, r26, r28 o r30"
 
-#: config/tc-avr.c:836
+#: config/tc-avr.c:794
 msgid "register name or number from 0 to 31 required"
 msgstr "se requiere un nombre de registro o un número del 0 al 31"
 
-#: config/tc-avr.c:854
+#: config/tc-avr.c:812
 msgid "pointer register (X, Y or Z) required"
 msgstr "se requiere un registro puntero (X, Y o Z)"
 
-#: config/tc-avr.c:861
+#: config/tc-avr.c:819
 msgid "cannot both predecrement and postincrement"
 msgstr "no se puede predecrementar y postincrementar"
 
-#: config/tc-avr.c:869
+#: config/tc-avr.c:827
 msgid "addressing mode not supported"
 msgstr "no se admite el modo de direccionamiento"
 
-#: config/tc-avr.c:875
+#: config/tc-avr.c:833
 msgid "can't predecrement"
 msgstr "no se puede predecrementar"
 
-#: config/tc-avr.c:878
+#: config/tc-avr.c:836
 msgid "pointer register Z required"
 msgstr "se requiere el registro puntero Z"
 
-#: config/tc-avr.c:897
+#: config/tc-avr.c:850
 msgid "postincrement not supported"
 msgstr "no se admite el postincremento"
 
-#: config/tc-avr.c:907
+#: config/tc-avr.c:860
 msgid "pointer register (Y or Z) required"
 msgstr "se requiere un registro puntero (Y o Z)"
 
-#: config/tc-avr.c:1021
+#: config/tc-avr.c:964
 #, c-format
 msgid "unknown constraint `%c'"
 msgstr "restricción `%c' desconocida"
 
-#: config/tc-avr.c:1073
+#: config/tc-avr.c:1016
 msgid "`,' required"
 msgstr "se requiere `,'"
 
-#: config/tc-avr.c:1091
+#: config/tc-avr.c:1034
 msgid "undefined combination of operands"
 msgstr "combinación indefinida de operandos"
 
-#: config/tc-avr.c:1100
+#: config/tc-avr.c:1043
 msgid "skipping two-word instruction"
 msgstr "se salta la instrucción de dos word"
 
-#: config/tc-avr.c:1192 config/tc-avr.c:1208 config/tc-avr.c:1329
+#: config/tc-avr.c:1135 config/tc-avr.c:1151 config/tc-avr.c:1272
 #: config/tc-msp430.c:1969 config/tc-msp430.c:1987
 #, c-format
 msgid "odd address operand: %ld"
 msgstr "operando de direccón impar: %ld"
 
-#: config/tc-avr.c:1200 config/tc-avr.c:1219 config/tc-avr.c:1237
-#: config/tc-avr.c:1248 config/tc-avr.c:1255 config/tc-avr.c:1262
+#: config/tc-avr.c:1143 config/tc-avr.c:1162 config/tc-avr.c:1180
+#: config/tc-avr.c:1191 config/tc-avr.c:1198 config/tc-avr.c:1205
 #: config/tc-d10v.c:505 config/tc-d30v.c:554 config/tc-msp430.c:1977
 #: config/tc-msp430.c:1992 config/tc-msp430.c:2002
 #, c-format
 msgid "operand out of range: %ld"
 msgstr "operando fuera de rango: %ld"
 
-#: config/tc-avr.c:1338 config/tc-d10v.c:1594 config/tc-d30v.c:2037
+#: config/tc-avr.c:1281 config/tc-d10v.c:1594 config/tc-d30v.c:2037
 #: config/tc-msp430.c:2020
 #, c-format
 msgid "line %d: unknown relocation type: 0x%x"
 msgstr "línea %d: tipo de reubicación desconocida: 0x%x"
 
-#: config/tc-avr.c:1352
+#: config/tc-avr.c:1295
 msgid "only constant expression allowed"
 msgstr "sólo se permite una expresión constante"
 
 #. xgettext:c-format.
-#: config/tc-avr.c:1412 config/tc-bfin.c:833 config/tc-d10v.c:1466
+#: config/tc-avr.c:1355 config/tc-bfin.c:828 config/tc-d10v.c:1466
 #: config/tc-d30v.c:1774 config/tc-mn10200.c:781 config/tc-mn10300.c:2170
-#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6611
+#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6383
 #: config/tc-spu.c:879 config/tc-spu.c:1090 config/tc-v850.c:3000
-#: config/tc-z80.c:2021
+#: config/tc-z80.c:2012
 #, c-format
 msgid "reloc %d not supported by object file format"
 msgstr "el formato del fichero objeto no admite la reubicación %d"
 
-#: config/tc-avr.c:1435 config/tc-h8300.c:1935 config/tc-mcore.c:881
+#: config/tc-avr.c:1378 config/tc-h8300.c:1935 config/tc-mcore.c:881
 #: config/tc-microblaze.c:823 config/tc-moxie.c:178 config/tc-msp430.c:1820
 #: config/tc-pj.c:253 config/tc-sh.c:2590 config/tc-z8k.c:1216
 msgid "can't find opcode "
 msgstr "no se puede encontrar el código de operación "
 
-#: config/tc-avr.c:1452
+#: config/tc-avr.c:1395
 #, c-format
 msgid "illegal opcode %s for mcu %s"
 msgstr "código de operación %s ilegal para el mcu %s"
 
-#: config/tc-avr.c:1463
+#: config/tc-avr.c:1406
 msgid "garbage at end of line"
 msgstr "basura al final de la línea"
 
-#: config/tc-avr.c:1537 config/tc-avr.c:1544
+#: config/tc-avr.c:1480 config/tc-avr.c:1487
 #, c-format
 msgid "illegal %srelocation size: %d"
 msgstr "tamaño de %sreubicación ilegal: %d"
@@ -3824,283 +3780,283 @@ msgstr "tamaño de %sreubicación ilegal: %d"
 msgid "missing ')'"
 msgstr "falta un ')'"
 
-#: config/tc-bfin.c:442
+#: config/tc-bfin.c:437
 #, c-format
 msgid " Blackfin specific assembler options:\n"
 msgstr "Opciones de ensamblador específicas de Blackfin:\n"
 
-#: config/tc-bfin.c:443
+#: config/tc-bfin.c:438
 #, c-format
 msgid "  -mcpu=<cpu[-sirevision]> specify the name of the target CPU\n"
 msgstr "  -mcpu=<cpu[-sirevision]> especifica el nombre del CPU objetivo\n"
 
-#: config/tc-bfin.c:444
+#: config/tc-bfin.c:439
 #, c-format
 msgid "  -mfdpic                  assemble for the FDPIC ABI\n"
 msgstr "  -mfdpic                  ensambla para la ABI de FDPIC\n"
 
-#: config/tc-bfin.c:445
+#: config/tc-bfin.c:440
 #, c-format
 msgid "  -mno-fdpic/-mnopic       disable -mfdpic\n"
 msgstr "  -mno-fdpic/-mnopic       desactiva -mfdpic\n"
 
-#: config/tc-bfin.c:458
+#: config/tc-bfin.c:453
 msgid "Could not set architecture and machine."
 msgstr "No se pueden establecer la arquitectura y la máquina."
 
-#: config/tc-bfin.c:607
+#: config/tc-bfin.c:602
 msgid "Parse failed."
 msgstr "Falló la decodificación."
 
-#: config/tc-bfin.c:682
+#: config/tc-bfin.c:677
 msgid "pcrel too far BFD_RELOC_BFIN_10"
 msgstr "pcrel demasiado lejos de BFD_RELOC_BFIN_10"
 
-#: config/tc-bfin.c:698
+#: config/tc-bfin.c:693
 msgid "pcrel too far BFD_RELOC_BFIN_12"
 msgstr "pcrel demasiado lejos de BFD_RELOC_BFIN_12"
 
-#: config/tc-bfin.c:718
+#: config/tc-bfin.c:713
 msgid "pcrel too far BFD_RELOC_BFIN_24"
 msgstr "pcrel demasiado lejos de BFD_RELOC_BFIN_24"
 
-#: config/tc-bfin.c:733
+#: config/tc-bfin.c:728
 msgid "pcrel too far BFD_RELOC_BFIN_5"
 msgstr "pcrel demasiado lejos de BFD_RELOC_BFIN_5"
 
-#: config/tc-bfin.c:745
+#: config/tc-bfin.c:740
 msgid "pcrel too far BFD_RELOC_BFIN_11_PCREL"
 msgstr "pcrel demasiado lejos de BFD_RELOC_BFIN_11_PCREL"
 
-#: config/tc-bfin.c:755
+#: config/tc-bfin.c:750
 msgid "rel too far BFD_RELOC_8"
 msgstr "rel demasiado lejos de BFD_RELOC_8"
 
-#: config/tc-bfin.c:762
+#: config/tc-bfin.c:757
 msgid "rel too far BFD_RELOC_16"
 msgstr "rel demasiado lejos de BFD_RELOC_16"
 
-#: config/tc-cr16.c:165 read.c:4422
+#: config/tc-cr16.c:164 read.c:4436
 msgid "using a bit field width of zero"
 msgstr "se usa una anchura de campo de bit de cero"
 
-#: config/tc-cr16.c:173 read.c:4430
+#: config/tc-cr16.c:172 read.c:4444
 #, c-format
 msgid "field width \"%s\" too complex for a bitfield"
 msgstr "la anchura de campo \"%s\" es demasiado compleja para un campo de bits"
 
-#: config/tc-cr16.c:182 read.c:4438
+#: config/tc-cr16.c:181 read.c:4452
 #, c-format
 msgid "field width %lu too big to fit in %d bytes: truncated to %d bits"
 msgstr "la anchura de campo %lu es demasiado grande para caber en %d bytes: se truncó a %d bits"
 
-#: config/tc-cr16.c:204 read.c:4460
+#: config/tc-cr16.c:203 read.c:4474
 #, c-format
 msgid "field value \"%s\" too complex for a bitfield"
 msgstr "el valor del campo \"%s\" es demasiado complejo para un campo de bits"
 
-#: config/tc-cr16.c:385
+#: config/tc-cr16.c:384
 #, c-format
 msgid "Unknown register pair - index relative mode: `%d'"
 msgstr "Par de registros desconocidos - modo relativo de índice: `%d'"
 
-#: config/tc-cr16.c:571 config/tc-crx.c:345 config/tc-mn10200.c:768
-#: write.c:990
+#: config/tc-cr16.c:570 config/tc-crx.c:345 config/tc-mn10200.c:768
+#: write.c:986
 #, c-format
 msgid "can't resolve `%s' {%s section} - `%s' {%s section}"
 msgstr "no se puede resolver `%s' {sección %s} - `%s' {sección %s}"
 
-#: config/tc-cr16.c:603 config/tc-crx.c:361
+#: config/tc-cr16.c:602 config/tc-crx.c:361
 #, c-format
 msgid "internal error: reloc %d (`%s') not supported by object file format"
 msgstr "error interno: el formato del fichero objeto no admite la reubicación %d (`%s')"
 
-#: config/tc-cr16.c:696 config/tc-i386.c:8723 config/tc-s390.c:1911
+#: config/tc-cr16.c:695 config/tc-i386.c:8604 config/tc-s390.c:1804
 msgid "GOT already in symbol table"
 msgstr "GOT ya está en la tabla de símbolos"
 
-#: config/tc-cr16.c:805 config/tc-cr16.c:828 config/tc-cris.c:1190
+#: config/tc-cr16.c:804 config/tc-cr16.c:827 config/tc-cris.c:1190
 #: config/tc-crx.c:535 config/tc-crx.c:562 config/tc-crx.c:580
 #: config/tc-pdp11.c:194
 msgid "Virtual memory exhausted"
 msgstr "Memoria agotada"
 
-#: config/tc-cr16.c:813 config/tc-crx.c:572 config/tc-crx.c:591
-#: config/tc-m68k.c:4656
+#: config/tc-cr16.c:812 config/tc-crx.c:572 config/tc-crx.c:591
+#: config/tc-i386.c:2258 config/tc-i386.c:2280 config/tc-m68k.c:4656
 #, c-format
 msgid "Internal Error:  Can't hash %s: %s"
 msgstr "Error Interno:  No se puede dispersar %s: %s"
 
-#: config/tc-cr16.c:839 config/tc-cris.c:1224 config/tc-crx.c:545
+#: config/tc-cr16.c:838 config/tc-cris.c:1224 config/tc-crx.c:545
 #, c-format
 msgid "Can't hash `%s': %s\n"
 msgstr "No se puede dispersar `%s': %s\n"
 
-#: config/tc-cr16.c:840 config/tc-cris.c:1225 config/tc-crx.c:546
+#: config/tc-cr16.c:839 config/tc-cris.c:1225 config/tc-crx.c:546
 msgid "(unknown reason)"
 msgstr "(razón desconocida)"
 
 #. Missing or bad expr becomes absolute 0.
-#: config/tc-cr16.c:892 config/tc-crx.c:619
+#: config/tc-cr16.c:891 config/tc-crx.c:619
 #, c-format
 msgid "missing or invalid displacement expression `%s' taken as 0"
 msgstr "la expresión de desubicación faltante o inválida `%s' se toma como 0"
 
-#: config/tc-cr16.c:942
+#: config/tc-cr16.c:941
 #, c-format
 msgid "GOT bad expression with %s."
 msgstr "expresión GOT errónea con %s."
 
-#: config/tc-cr16.c:1053
+#: config/tc-cr16.c:1052
 #, c-format
 msgid "operand %d: illegal use expression: `%s`"
 msgstr "operando %d: expresión de uso ilegal: `%s`"
 
-#: config/tc-cr16.c:1118 config/tc-crx.c:1127
+#: config/tc-cr16.c:1117 config/tc-crx.c:1127
 #, c-format
 msgid "Unknown register: `%d'"
 msgstr "Registro desconocido: `%d'"
 
 #. Issue a error message when register is illegal.
-#: config/tc-cr16.c:1126 config/tc-crx.c:1135
+#: config/tc-cr16.c:1125 config/tc-crx.c:1135
 #, c-format
 msgid "Illegal register (`%s') in Instruction: `%s'"
 msgstr "Registro ilegal (`%s') en Instruction: `%s'"
 
-#: config/tc-cr16.c:1197 config/tc-cr16.c:1272 config/tc-crx.c:757
+#: config/tc-cr16.c:1196 config/tc-cr16.c:1271 config/tc-crx.c:757
 #: config/tc-crx.c:777 config/tc-crx.c:792
 #, c-format
 msgid "Illegal register `%s' in Instruction `%s'"
 msgstr "Registro `%s' ilegal en la Instruction `%s'"
 
-#: config/tc-cr16.c:1225 config/tc-cr16.c:1236
+#: config/tc-cr16.c:1224 config/tc-cr16.c:1235
 #, c-format
 msgid "Illegal register pair `%s' in Instruction `%s'"
 msgstr "Par de registro ilegal `%s' en la Instrucción `%s'"
 
-#: config/tc-cr16.c:1261 config/tc-i960.c:835
+#: config/tc-cr16.c:1260 config/tc-i960.c:835
 msgid "unmatched '['"
 msgstr "'[' desemparejado"
 
-#: config/tc-cr16.c:1267 config/tc-i960.c:842
+#: config/tc-cr16.c:1266 config/tc-i960.c:842
 msgid "garbage after index spec ignored"
 msgstr "se descarta la basura después de la especificación del índice"
 
-#: config/tc-cr16.c:1415 config/tc-crx.c:936
+#: config/tc-cr16.c:1414 config/tc-crx.c:936
 #, c-format
 msgid "Illegal operands (whitespace): `%s'"
 msgstr "Operandos ilegales (espacios en blanco): `%s'"
 
-#: config/tc-cr16.c:1427 config/tc-cr16.c:1434 config/tc-cr16.c:1451
+#: config/tc-cr16.c:1426 config/tc-cr16.c:1433 config/tc-cr16.c:1450
 #: config/tc-crx.c:948 config/tc-crx.c:955 config/tc-crx.c:972
 #: config/tc-crx.c:1764
 #, c-format
 msgid "Missing matching brackets : `%s'"
 msgstr "Faltan las llaves coincidentes : `%s'"
 
-#: config/tc-cr16.c:1483 config/tc-crx.c:998
+#: config/tc-cr16.c:1482 config/tc-crx.c:998
 #, c-format
 msgid "Unknown exception: `%s'"
 msgstr "Excepción desconocida: `%s'"
 
-#: config/tc-cr16.c:1570 config/tc-crx.c:1094
+#: config/tc-cr16.c:1569 config/tc-crx.c:1094
 #, c-format
 msgid "Illegal `cinv' parameter: `%c'"
 msgstr "Parámetro `cinv' ilegal: `%c'"
 
-#: config/tc-cr16.c:1592 config/tc-cr16.c:1631
+#: config/tc-cr16.c:1591 config/tc-cr16.c:1630
 #, c-format
 msgid "Unknown register pair: `%d'"
 msgstr "Par de registro desconocido: `%d'"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1600
+#: config/tc-cr16.c:1599
 #, c-format
 msgid "Illegal register pair (`%s') in Instruction: `%s'"
 msgstr "Par de registro ilegal (`%s') en la Instrucción: `%s'"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1639
+#: config/tc-cr16.c:1638
 #, c-format
 msgid "Illegal index register pair (`%s') in Instruction: `%s'"
 msgstr "Par de registro de índice ilegal (`%s') en la Instrucción: `%s'"
 
-#: config/tc-cr16.c:1678
+#: config/tc-cr16.c:1677
 #, c-format
 msgid "Unknown processor register : `%d'"
 msgstr "Registro de procesador desconocido: `%d'"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1686
+#: config/tc-cr16.c:1685
 #, c-format
 msgid "Illegal processor register (`%s') in Instruction: `%s'"
 msgstr "Registro de procesador ilegal (`%s') en la Instrucción: `%s'"
 
-#: config/tc-cr16.c:1734
+#: config/tc-cr16.c:1733
 #, c-format
 msgid "Unknown processor register (32 bit) : `%d'"
 msgstr "Registro de procesador desconocido (32 bit) : `%d'"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1742
+#: config/tc-cr16.c:1741
 #, c-format
 msgid "Illegal 32 bit - processor register (`%s') in Instruction: `%s'"
 msgstr "Registro de procesador de 32 bit ilegal (`%s') en la Instruction: `%s'"
 
-#: config/tc-cr16.c:2106 config/tc-crx.c:1662 config/tc-crx.c:1679
+#: config/tc-cr16.c:2105 config/tc-crx.c:1662 config/tc-crx.c:1679
 #, c-format
 msgid "Same src/dest register is used (`r%d'), result is undefined"
 msgstr "Se usa el mismo registro fuente/destino (`r%d'), el resultado es indefinido"
 
-#: config/tc-cr16.c:2127
+#: config/tc-cr16.c:2126
 msgid "RA register is saved twice."
 msgstr "El registro RA se guarda dos veces."
 
-#: config/tc-cr16.c:2131
+#: config/tc-cr16.c:2130
 #, c-format
 msgid "`%s' Illegal use of registers."
 msgstr "`%s' Uso inválido de registros."
 
-#: config/tc-cr16.c:2145
+#: config/tc-cr16.c:2144
 #, c-format
 msgid "`%s' Illegal count-register combination."
 msgstr "`%s' Combinación de registros-cuenta ilegal."
 
-#: config/tc-cr16.c:2151
+#: config/tc-cr16.c:2150
 #, c-format
 msgid "`%s' Illegal use of register."
 msgstr "`%s' Uso inválido de registro."
 
-#: config/tc-cr16.c:2160 config/tc-crx.c:1671
+#: config/tc-cr16.c:2159 config/tc-crx.c:1671
 #, c-format
 msgid "`%s' has undefined result"
 msgstr "`%s' tiene un resultado indefinido"
 
-#: config/tc-cr16.c:2168
+#: config/tc-cr16.c:2167
 #, c-format
 msgid "Same src/dest register is used (`r%d'),result is undefined"
 msgstr "Se usa el mismo registro fuente/destino (`r%d'), el resultado es indefinido"
 
-#: config/tc-cr16.c:2339 config/tc-crx.c:1576
+#: config/tc-cr16.c:2338 config/tc-crx.c:1576
 msgid "Incorrect number of operands"
 msgstr "Número incorrecto de operandos"
 
-#: config/tc-cr16.c:2341 config/tc-crx.c:1578
+#: config/tc-cr16.c:2340 config/tc-crx.c:1578
 #, c-format
 msgid "Illegal type of operand (arg %d)"
 msgstr "Tipo de operando ilegal (arg %d)"
 
-#: config/tc-cr16.c:2347 config/tc-crx.c:1584
+#: config/tc-cr16.c:2346 config/tc-crx.c:1584
 #, c-format
 msgid "Operand out of range (arg %d)"
 msgstr "Operando fuera de rango (arg %d)"
 
-#: config/tc-cr16.c:2350 config/tc-crx.c:1587
+#: config/tc-cr16.c:2349 config/tc-crx.c:1587
 #, c-format
 msgid "Operand has odd displacement (arg %d)"
 msgstr "El operando tiene un desplazamiento impar (arg %d)"
 
-#: config/tc-cr16.c:2353 config/tc-cr16.c:2384 config/tc-crx.c:1600
+#: config/tc-cr16.c:2352 config/tc-cr16.c:2383 config/tc-crx.c:1600
 #: config/tc-crx.c:1631
 #, c-format
 msgid "Illegal operand (arg %d)"
@@ -4108,12 +4064,12 @@ msgstr "Operando ilegal (arg %d)"
 
 #. Give an error if a frag containing code is not aligned to a 2-byte
 #. boundary.
-#: config/tc-cr16.c:2486 config/tc-cr16.h:73 config/tc-crx.c:1953
+#: config/tc-cr16.c:2485 config/tc-cr16.h:73 config/tc-crx.c:1953
 #: config/tc-crx.h:76
 msgid "instruction address is not a multiple of 2"
 msgstr "la dirección de la instrucción no es un múltiplo de 2"
 
-#: config/tc-cr16.c:2563 config/tc-cris.c:1538 config/tc-cris.c:1546
+#: config/tc-cr16.c:2562 config/tc-cris.c:1538 config/tc-cris.c:1546
 #: config/tc-crx.c:1989 config/tc-dlx.c:685 config/tc-hppa.c:3244
 #: config/tc-hppa.c:3251 config/tc-i860.c:491 config/tc-i860.c:508
 #: config/tc-i860.c:988 config/tc-sparc.c:1410 config/tc-sparc.c:1418
@@ -4211,7 +4167,7 @@ msgstr "Se especificó el registro sin implementar `%s'"
 
 #. We've come to the end of instructions with this
 #. opcode, so it must be an error.
-#: config/tc-cris.c:2079 config/tc-mips.c:10425 config/tc-mips.c:10430
+#: config/tc-cris.c:2079
 msgid "Illegal operands"
 msgstr "Operandos ilegales"
 
@@ -4324,59 +4280,55 @@ msgstr "Por favor utilice --help para ver el modo de empleo y opciones para este
 msgid "--no-underscore is invalid with a.out format"
 msgstr "--no-underscore es inválido con el formato a.out"
 
-#: config/tc-cris.c:3815
-msgid "--pic is invalid for this object format"
-msgstr "--pic es inválido en este formato de objeto"
-
-#: config/tc-cris.c:3829
+#: config/tc-cris.c:3827
 #, c-format
 msgid "invalid <arch> in --march=<arch>: %s"
 msgstr "arquitectura <arq> en --march=<arq> inválida: %s"
 
-#: config/tc-cris.c:3938 config/tc-moxie.c:709
+#: config/tc-cris.c:3936 config/tc-moxie.c:709
 msgid "Semantics error.  This type of operand can not be relocated, it must be an assembly-time constant"
 msgstr "Error semántico. Este tipo de operando no se puede reubicar, debe ser una constante en el momento de ensamblado"
 
-#: config/tc-cris.c:3987 config/tc-moxie.c:758
+#: config/tc-cris.c:3985 config/tc-moxie.c:758
 #, c-format
 msgid "Cannot generate relocation type for symbol %s, code %s"
 msgstr "No se puede generar el tipo de reubicación para el símbolo %s, código %s"
 
 #. The messages are formatted to line up with the generic options.
-#: config/tc-cris.c:4000
+#: config/tc-cris.c:3998
 #, c-format
 msgid "CRIS-specific options:\n"
 msgstr "Opciones específicas de CRIS:\n"
 
-#: config/tc-cris.c:4002
+#: config/tc-cris.c:4000
 msgid "  -h, -H                  Don't execute, print this help text.  Deprecated.\n"
 msgstr "  -h, -H                  No ejecuta, muestra este texto de ayuda.  Obsoleto.\n"
 
-#: config/tc-cris.c:4004
+#: config/tc-cris.c:4002
 msgid "  -N                      Warn when branches are expanded to jumps.\n"
 msgstr "  -N                      Avisa cuando las ramificaciones se expanden a saltos.\n"
 
-#: config/tc-cris.c:4006
+#: config/tc-cris.c:4004
 msgid "  --underscore            User symbols are normally prepended with underscore.\n"
 msgstr "  --underscore            Los símbolos de usuario generalmente se preceden con subrayado.\n"
 
-#: config/tc-cris.c:4008
+#: config/tc-cris.c:4006
 msgid "                          Registers will not need any prefix.\n"
 msgstr "                          Los registros no necesitarán ningún prefijo.\n"
 
-#: config/tc-cris.c:4010
+#: config/tc-cris.c:4008
 msgid "  --no-underscore         User symbols do not have any prefix.\n"
 msgstr "  --no-underscore         Los símbolos de usuario no tienen ningún prefijo.\n"
 
-#: config/tc-cris.c:4012
+#: config/tc-cris.c:4010
 msgid "                          Registers will require a `$'-prefix.\n"
 msgstr "                          Los registros requerirán un prefijo `$'.\n"
 
-#: config/tc-cris.c:4015
+#: config/tc-cris.c:4012
 msgid "  --pic\t\t\tEnable generation of position-independent code.\n"
 msgstr "  --pic\t\t\tActiva la generación de código independiente de posición.\n"
 
-#: config/tc-cris.c:4018
+#: config/tc-cris.c:4014
 msgid ""
 "  --march=<arch>\t\tGenerate code for <arch>.  Valid choices for <arch>\n"
 "\t\t\t\tare v0_v10, v10, v32 and common_v10_v32.\n"
@@ -4384,51 +4336,51 @@ msgstr ""
 "  --march=<arq>\t\tGenera código para <arq>.  Las opciones válidas para <arq>\n"
 "\t\t\t\tson v0_v10, v10, v32 y common_v10_v32.\n"
 
-#: config/tc-cris.c:4039
+#: config/tc-cris.c:4035
 msgid "Invalid relocation"
 msgstr "Reubicación inválida"
 
-#: config/tc-cris.c:4076
+#: config/tc-cris.c:4072
 msgid "Invalid pc-relative relocation"
 msgstr "Reubicación relativa a pc inválida"
 
-#: config/tc-cris.c:4121
+#: config/tc-cris.c:4117
 #, c-format
 msgid "Adjusted signed .word (%ld) overflows: `switch'-statement too large."
 msgstr "El .word (%ld) con signo ajustado se desborda: la sentencia `switch' es demasiado grande."
 
-#: config/tc-cris.c:4151
+#: config/tc-cris.c:4147
 #, c-format
 msgid ".syntax %s requires command-line option `--underscore'"
 msgstr ".syntax %s requiere de la opción de línea de órdenes `--underscore'"
 
-#: config/tc-cris.c:4160
+#: config/tc-cris.c:4156
 #, c-format
 msgid ".syntax %s requires command-line option `--no-underscore'"
 msgstr ".syntax %s requiere de la opción de línea de órdenes `--no-underscore'"
 
-#: config/tc-cris.c:4197
+#: config/tc-cris.c:4193
 msgid "Unknown .syntax operand"
 msgstr "Operando .syntax inválido"
 
-#: config/tc-cris.c:4207
+#: config/tc-cris.c:4203
 msgid "Pseudodirective .file is only valid when generating ELF"
 msgstr "La pseudodirectiva .file es válida solamente cuando se genera ELF"
 
-#: config/tc-cris.c:4219
+#: config/tc-cris.c:4215
 msgid "Pseudodirective .loc is only valid when generating ELF"
 msgstr "La pseudodirectiva .loc es válida solamente cuando se genera ELF"
 
-#: config/tc-cris.c:4234
+#: config/tc-cris.c:4230
 #, c-format
 msgid "internal inconsistency problem: %s called for %d bytes"
 msgstr "problema de inconsistencia interna: se llamó %s por %d bytes"
 
-#: config/tc-cris.c:4386
+#: config/tc-cris.c:4382
 msgid "unknown operand to .arch"
 msgstr "operando desconocido para .arch"
 
-#: config/tc-cris.c:4395
+#: config/tc-cris.c:4391
 msgid ".arch <arch> requires a matching --march=... option"
 msgstr ".arch <arq> requiere una opción --march=... coincidente"
 
@@ -4814,14 +4766,14 @@ msgstr "falta un .proc"
 msgid ".endfunc missing for previous .proc"
 msgstr "falta un .endfunc para el .proc previo"
 
-#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1927
+#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1916
 #, c-format
 msgid "internal error: can't hash `%s': %s\n"
 msgstr "error interno: no se puede dispersar `%s': %s\n"
 
 #. Probably a memory allocation problem?  Give up now.
-#: config/tc-dlx.c:298 config/tc-hppa.c:8354 config/tc-mips.c:1930
-#: config/tc-mips.c:1984 config/tc-or32.c:211 config/tc-sparc.c:860
+#: config/tc-dlx.c:298 config/tc-hppa.c:8333 config/tc-mips.c:1919
+#: config/tc-mips.c:1973 config/tc-or32.c:211 config/tc-sparc.c:860
 msgid "Broken assembler.  No assembly attempted."
 msgstr "Ensamblador descompuesto.  No se intentó ensamblar."
 
@@ -5175,7 +5127,7 @@ msgstr "operandos inválidos"
 msgid "operand/size mis-match"
 msgstr "no coinciden los operandos/tamaños"
 
-#: config/tc-h8300.c:1952 config/tc-mips.c:10489 config/tc-sh.c:2971
+#: config/tc-h8300.c:1952 config/tc-mips.c:10170 config/tc-sh.c:2971
 #: config/tc-sh64.c:2795 config/tc-z8k.c:1226
 msgid "unknown opcode"
 msgstr "código de operación desconocido"
@@ -5212,7 +5164,7 @@ msgid "Difference of symbols in different sections is not supported"
 msgstr "No se admite la diferencia de símbolos en secciones diferentes"
 
 #: config/tc-h8300.c:2233 config/tc-mcore.c:2199 config/tc-microblaze.c:2294
-#: config/tc-pj.c:487 config/tc-sh.c:4468 config/tc-tic6x.c:4500
+#: config/tc-pj.c:487 config/tc-sh.c:4468 config/tc-tic6x.c:4103
 #: config/tc-xc16x.c:315
 #, c-format
 msgid "Cannot represent relocation type %s"
@@ -5294,7 +5246,7 @@ msgstr "Símbolo no absoluto: '%s'."
 msgid "Undefined absolute constant: '%s'."
 msgstr "Constante absoluta sin definir: '%s'."
 
-#: config/tc-hppa.c:2261 config/tc-hppa.c:5717
+#: config/tc-hppa.c:2261 config/tc-hppa.c:5696
 msgid "could not update architecture and machine"
 msgstr "no se pueden actualizar la arquitectura y la máquina"
 
@@ -5327,334 +5279,330 @@ msgstr "Ubicación de argumento inválida: %s\n"
 msgid "Invalid argument description: %d"
 msgstr "Descripción de argumento inválida: %d"
 
-#: config/tc-hppa.c:3475
+#: config/tc-hppa.c:3474
 msgid "Invalid Indexed Load Completer."
 msgstr "Completador de Carga Indizado Inválido."
 
-#: config/tc-hppa.c:3480
+#: config/tc-hppa.c:3479
 msgid "Invalid Indexed Load Completer Syntax."
 msgstr "Sintaxis de Completador de Carga Indizado Inválido."
 
-#: config/tc-hppa.c:3514
+#: config/tc-hppa.c:3513
 msgid "Invalid Short Load/Store Completer."
 msgstr "Completador Short de Load/Store Inválido."
 
-#: config/tc-hppa.c:3574 config/tc-hppa.c:3579
+#: config/tc-hppa.c:3573 config/tc-hppa.c:3578
 msgid "Invalid Store Bytes Short Completer"
 msgstr "Completador Short Bytes de Store Inválido."
 
-#: config/tc-hppa.c:3894 config/tc-hppa.c:3900
+#: config/tc-hppa.c:3889 config/tc-hppa.c:3895
 msgid "Invalid left/right combination completer"
 msgstr "Completador de combinación derecha/izquierda inválido"
 
-#: config/tc-hppa.c:3949 config/tc-hppa.c:3956
+#: config/tc-hppa.c:3944 config/tc-hppa.c:3951
 msgid "Invalid permutation completer"
 msgstr "Completador de permutación inválido"
 
-#: config/tc-hppa.c:4056
+#: config/tc-hppa.c:4057
 #, c-format
 msgid "Invalid Add Condition: %s"
 msgstr "Condición de Adición Inválida: %s"
 
-#: config/tc-hppa.c:4072 config/tc-hppa.c:4082
+#: config/tc-hppa.c:4068 config/tc-hppa.c:4078
 msgid "Invalid Add and Branch Condition"
 msgstr "Condición de Adición y Ramificación Inválida"
 
-#: config/tc-hppa.c:4103 config/tc-hppa.c:4248
+#: config/tc-hppa.c:4099 config/tc-hppa.c:4236
 msgid "Invalid Compare/Subtract Condition"
 msgstr "Condición de Comparación/Sustracción Inválida"
 
-#: config/tc-hppa.c:4143
+#: config/tc-hppa.c:4139
 #, c-format
-msgid "Invalid Branch On Bit Condition: %c"
-msgstr "Condición de Ramificación en Bit Inválida: %c"
+msgid "Invalid Bit Branch Condition: %c"
+msgstr "Condición de Ramificación de Bit Inválida: %c"
 
-#: config/tc-hppa.c:4146
-msgid "Missing Branch On Bit Condition"
-msgstr "Falta una Condición de Ramificación de Bit"
-
-#: config/tc-hppa.c:4231
+#: config/tc-hppa.c:4224
 #, c-format
 msgid "Invalid Compare/Subtract Condition: %s"
 msgstr "Condición de Comparación/Sustracción Inválida: %s"
 
-#: config/tc-hppa.c:4263
+#: config/tc-hppa.c:4251
 msgid "Invalid Compare and Branch Condition"
 msgstr "Condición de Comparación y Ramificación Inválida"
 
-#: config/tc-hppa.c:4359
+#: config/tc-hppa.c:4347
 msgid "Invalid Logical Instruction Condition."
 msgstr "Condición de Instrucción Lógica Inválida."
 
-#: config/tc-hppa.c:4421
+#: config/tc-hppa.c:4405
 msgid "Invalid Shift/Extract/Deposit Condition."
 msgstr "Condición Desplazar/Extraer/Depositar Inválida."
 
-#: config/tc-hppa.c:4534
+#: config/tc-hppa.c:4517
 msgid "Invalid Unit Instruction Condition."
 msgstr "Condición de Instrucción Unit Inválida."
 
-#: config/tc-hppa.c:5013 config/tc-hppa.c:5045 config/tc-hppa.c:5076
-#: config/tc-hppa.c:5106
+#: config/tc-hppa.c:4992 config/tc-hppa.c:5024 config/tc-hppa.c:5055
+#: config/tc-hppa.c:5085
 msgid "Branch to unaligned address"
 msgstr "Ramificación a dirección sin alinear"
 
-#: config/tc-hppa.c:5290
+#: config/tc-hppa.c:5269
 msgid "Invalid SFU identifier"
 msgstr "Identificador SFU inválido"
 
-#: config/tc-hppa.c:5340
+#: config/tc-hppa.c:5319
 msgid "Invalid COPR identifier"
 msgstr "Identificador COPR inválido"
 
-#: config/tc-hppa.c:5469
+#: config/tc-hppa.c:5448
 msgid "Invalid Floating Point Operand Format."
 msgstr "Formato de Operando de Coma Flotante Inválido."
 
-#: config/tc-hppa.c:5586 config/tc-hppa.c:5606 config/tc-hppa.c:5626
-#: config/tc-hppa.c:5646 config/tc-hppa.c:5666
+#: config/tc-hppa.c:5565 config/tc-hppa.c:5585 config/tc-hppa.c:5605
+#: config/tc-hppa.c:5625 config/tc-hppa.c:5645
 msgid "Invalid register for single precision fmpyadd or fmpysub"
 msgstr "Registro inválido para fmpyadd ó fmpysub de precisión simple"
 
-#: config/tc-hppa.c:5734
+#: config/tc-hppa.c:5713
 #, c-format
 msgid "Invalid operands %s"
 msgstr "Operandos inválidos %s"
 
-#: config/tc-hppa.c:5744
+#: config/tc-hppa.c:5723
 #, c-format
 msgid "Immediates %d and %d will give undefined behavior."
 msgstr "Los inmediatos %d y %d darán una conducta sin definir."
 
-#: config/tc-hppa.c:5796 config/tc-hppa.c:7023 config/tc-hppa.c:7078
+#: config/tc-hppa.c:5775 config/tc-hppa.c:7002 config/tc-hppa.c:7057
 msgid "Missing function name for .PROC (corrupted label chain)"
 msgstr "Falta el nombre de función para .PROC (cadena de etiquetas corrupta)"
 
-#: config/tc-hppa.c:5799 config/tc-hppa.c:7081
+#: config/tc-hppa.c:5778 config/tc-hppa.c:7060
 msgid "Missing function name for .PROC"
 msgstr "Falta el nombre de función para .PROC"
 
-#: config/tc-hppa.c:5858
+#: config/tc-hppa.c:5837
 msgid "Argument to .BLOCK/.BLOCKZ must be between 0 and 0x3fffffff"
 msgstr "El argumento para .BLOCK/.BLOCKZ debe estar entre 0 y 0x3fffffff"
 
-#: config/tc-hppa.c:5954
+#: config/tc-hppa.c:5933
 #, c-format
 msgid "Invalid .CALL argument: %s"
 msgstr "Argumento de .CALL inválido: %s"
 
-#: config/tc-hppa.c:6102
+#: config/tc-hppa.c:6081
 msgid ".callinfo is not within a procedure definition"
 msgstr ".callinfo no está dentro de una definición de procedimiento"
 
-#: config/tc-hppa.c:6122
+#: config/tc-hppa.c:6101
 #, c-format
 msgid "FRAME parameter must be a multiple of 8: %d\n"
 msgstr "El parámetro FRAM debe ser un múltiplo de 8: %d\n"
 
-#: config/tc-hppa.c:6141
+#: config/tc-hppa.c:6120
 msgid "Value for ENTRY_GR must be in the range 3..18\n"
 msgstr "El valor para ENTRY_GR debe estar en el rango 3..18\n"
 
-#: config/tc-hppa.c:6153
+#: config/tc-hppa.c:6132
 msgid "Value for ENTRY_FR must be in the range 12..21\n"
 msgstr "El valor para ENTRY_FR debe estar en el rango 12..21\n"
 
-#: config/tc-hppa.c:6163
+#: config/tc-hppa.c:6142
 msgid "Value for ENTRY_SR must be 3\n"
 msgstr "El valor para ENTRY_SR debe ser 3\n"
 
-#: config/tc-hppa.c:6219
+#: config/tc-hppa.c:6198
 #, c-format
 msgid "Invalid .CALLINFO argument: %s"
 msgstr "Argumento de .CALLINFO inválido: %s"
 
-#: config/tc-hppa.c:6329
+#: config/tc-hppa.c:6308
 msgid "The .ENTER pseudo-op is not supported"
 msgstr "No se admite el pseudo-operador .ENTER"
 
-#: config/tc-hppa.c:6345
+#: config/tc-hppa.c:6324
 msgid "Misplaced .entry. Ignored."
 msgstr ".entry mal colocado. Se descarta."
 
-#: config/tc-hppa.c:6349
+#: config/tc-hppa.c:6328
 msgid "Missing .callinfo."
 msgstr "Falta un .callinfo."
 
-#: config/tc-hppa.c:6413
+#: config/tc-hppa.c:6392
 msgid ".REG expression must be a register"
 msgstr "la expresión .REG debe ser un registro"
 
-#: config/tc-hppa.c:6429
+#: config/tc-hppa.c:6408
 msgid "bad or irreducible absolute expression; zero assumed"
 msgstr "expresión absoluta errónea o irreducible; se asume cero"
 
-#: config/tc-hppa.c:6440
+#: config/tc-hppa.c:6419
 msgid ".REG must use a label"
 msgstr ".REG debe usar una etiqueta"
 
-#: config/tc-hppa.c:6442
+#: config/tc-hppa.c:6421
 msgid ".EQU must use a label"
 msgstr ".EQU debe usar una etiqueta"
 
-#: config/tc-hppa.c:6504
+#: config/tc-hppa.c:6483
 #, c-format
 msgid "Symbol '%s' could not be created."
 msgstr "No se puede crear el símbolo '%s'."
 
-#: config/tc-hppa.c:6508
+#: config/tc-hppa.c:6487
 msgid "No memory for symbol name."
 msgstr "No hay memoria para el nombre del símbolo."
 
-#: config/tc-hppa.c:6558
+#: config/tc-hppa.c:6537
 msgid ".EXIT must appear within a procedure"
 msgstr ".EXIT debe aparecer dentro de un procedimiento"
 
-#: config/tc-hppa.c:6562
+#: config/tc-hppa.c:6541
 msgid "Missing .callinfo"
 msgstr "Falta un .callinfo"
 
-#: config/tc-hppa.c:6566
+#: config/tc-hppa.c:6545
 msgid "No .ENTRY for this .EXIT"
 msgstr "No hay .ENTRY para este .EXIT"
 
-#: config/tc-hppa.c:6606
+#: config/tc-hppa.c:6585
 #, c-format
 msgid "Using ENTRY rather than CODE in export directive for %s"
 msgstr "Se usa ENTRY en lugar de CODE en la directiva export para %s"
 
-#: config/tc-hppa.c:6729
+#: config/tc-hppa.c:6708
 #, c-format
 msgid "Undefined .EXPORT/.IMPORT argument (ignored): %s"
 msgstr "Argumento de .EXPORT/.IMPORT indefinido (se descarta): %s"
 
-#: config/tc-hppa.c:6753
+#: config/tc-hppa.c:6732
 #, c-format
 msgid "Cannot define export symbol: %s\n"
 msgstr "No se puede definir el símbolo de exportación: %s\n"
 
-#: config/tc-hppa.c:6850
+#: config/tc-hppa.c:6829
 msgid "Missing label name on .LABEL"
 msgstr "Falta el nombre de etiqueta en .LABEL"
 
-#: config/tc-hppa.c:6855
+#: config/tc-hppa.c:6834
 msgid "extra .LABEL arguments ignored."
 msgstr "se descartan los argumentos extra de .LABEL."
 
-#: config/tc-hppa.c:6871
+#: config/tc-hppa.c:6850
 msgid "The .LEAVE pseudo-op is not supported"
 msgstr "No se admite el pseudo-operador .LEAVE"
 
-#: config/tc-hppa.c:6909
+#: config/tc-hppa.c:6888
 msgid "Unrecognized .LEVEL argument\n"
 msgstr "No se reconoce el argumento de .LEVEL\n"
 
-#: config/tc-hppa.c:6943
+#: config/tc-hppa.c:6922
 #, c-format
 msgid "Cannot define static symbol: %s\n"
 msgstr "No se puede definir el símbolo estático: %s\n"
 
-#: config/tc-hppa.c:6977
+#: config/tc-hppa.c:6956
 msgid "Nested procedures"
 msgstr "Procedimientos anidados"
 
-#: config/tc-hppa.c:6987
+#: config/tc-hppa.c:6966
 msgid "Cannot allocate unwind descriptor\n"
 msgstr "No se puede asignar un descriptor de desenredo\n"
 
-#: config/tc-hppa.c:7085
+#: config/tc-hppa.c:7064
 msgid "misplaced .procend"
 msgstr ".procend mal colocado"
 
-#: config/tc-hppa.c:7088
+#: config/tc-hppa.c:7067
 msgid "Missing .callinfo for this procedure"
 msgstr "Falta un .callinfo para este procedimiento"
 
-#: config/tc-hppa.c:7091
+#: config/tc-hppa.c:7070
 msgid "Missing .EXIT for a .ENTRY"
 msgstr "Falta un .EXIT para un .ENTRY"
 
-#: config/tc-hppa.c:7128
+#: config/tc-hppa.c:7107
 msgid "Not in a space.\n"
 msgstr "No está en un espacio.\n"
 
-#: config/tc-hppa.c:7131
+#: config/tc-hppa.c:7110
 msgid "Not in a subspace.\n"
 msgstr "No está en un subespacio.\n"
 
-#: config/tc-hppa.c:7220
+#: config/tc-hppa.c:7199
 msgid "Invalid .SPACE argument"
 msgstr "Argumento de .SPACE inválido"
 
-#: config/tc-hppa.c:7266
+#: config/tc-hppa.c:7245
 msgid "Can't change spaces within a procedure definition. Ignored"
 msgstr "No se pueden cambiar espacios dentro de una definición de procedimiento. Se descarta"
 
-#: config/tc-hppa.c:7394
+#: config/tc-hppa.c:7373
 #, c-format
 msgid "Undefined space: '%s' Assuming space number = 0."
 msgstr "Espacio indefinido: '%s' Se asume que el número de espacio = 0."
 
-#: config/tc-hppa.c:7417
+#: config/tc-hppa.c:7396
 msgid "Must be in a space before changing or declaring subspaces.\n"
 msgstr "Debe estar en un espacio antes de cambiar o declarar subespacios.\n"
 
-#: config/tc-hppa.c:7421
+#: config/tc-hppa.c:7400
 msgid "Can't change subspaces within a procedure definition. Ignored"
 msgstr "No se pueden cambiar subespacios dentro de una definición de procedimiento. Se descarta"
 
-#: config/tc-hppa.c:7457
+#: config/tc-hppa.c:7436
 msgid "Parameters of an existing subspace can't be modified"
 msgstr "No se pueden modificar los parámetros de un subespacio existente"
 
-#: config/tc-hppa.c:7509
+#: config/tc-hppa.c:7488
 msgid "Alignment must be a power of 2"
 msgstr "La alineación debe ser una potencia de 2"
 
-#: config/tc-hppa.c:7556
+#: config/tc-hppa.c:7535
 msgid "FIRST not supported as a .SUBSPACE argument"
 msgstr "No se admite FIRST como un argumento de .SUBSPACE"
 
-#: config/tc-hppa.c:7558
+#: config/tc-hppa.c:7537
 msgid "Invalid .SUBSPACE argument"
 msgstr "Argumento de .SUBSPACE inválido"
 
-#: config/tc-hppa.c:7747
+#: config/tc-hppa.c:7726
 #, c-format
 msgid "Internal error: Unable to find containing space for %s."
 msgstr "Error interno: No se puede encontrar el espacio contenedor para %s."
 
-#: config/tc-hppa.c:7785
+#: config/tc-hppa.c:7764
 #, c-format
 msgid "Out of memory: could not allocate new space chain entry: %s\n"
 msgstr "Memoria agotada: no se puede asignar una nueva entrada de cadena de espacio: %s\n"
 
-#: config/tc-hppa.c:7873
+#: config/tc-hppa.c:7852
 #, c-format
 msgid "Out of memory: could not allocate new subspace chain entry: %s\n"
 msgstr "Memoria agotada: no se puede asignar una nueva entrada de cadena de subespacio: %s\n"
 
-#: config/tc-hppa.c:8318
+#: config/tc-hppa.c:8297
 msgid "-R option not supported on this target."
 msgstr "No se admite la opción -R en este objetivo."
 
-#: config/tc-hppa.c:8335 config/tc-sparc.c:815 config/tc-sparc.c:852
+#: config/tc-hppa.c:8314 config/tc-sparc.c:815 config/tc-sparc.c:852
 #, c-format
 msgid "Internal error: can't hash `%s': %s\n"
 msgstr "Error interno: no se puede dispersar `%s': %s\n"
 
-#: config/tc-hppa.c:8344 config/tc-i860.c:236
+#: config/tc-hppa.c:8323 config/tc-i860.c:236
 #, c-format
 msgid "internal error: losing opcode: `%s' \"%s\"\n"
 msgstr "error interno: se pierde el código de operación: `%s' \"%s\"\n"
 
-#: config/tc-i370.c:419 config/tc-ppc.c:1185 config/tc-s390.c:420
-#: config/tc-s390.c:427
+#: config/tc-i370.c:419 config/tc-ppc.c:1155 config/tc-s390.c:406
+#: config/tc-s390.c:413
 #, c-format
 msgid "invalid switch -m%s"
 msgstr "interruptor -m%s inválido"
 
-#: config/tc-i370.c:516 config/tc-s390.c:507
+#: config/tc-i370.c:516 config/tc-s390.c:515
 #, c-format
 msgid "Internal assembler error for instruction %s"
 msgstr "Error interno del ensamblador para la instrucción %s"
@@ -5664,11 +5612,11 @@ msgstr "Error interno del ensamblador para la instrucción %s"
 msgid "Internal assembler error for macro %s"
 msgstr "Error interno del ensamblador para la macro %s"
 
-#: config/tc-i370.c:630 config/tc-ppc.c:1893
+#: config/tc-i370.c:630 config/tc-ppc.c:1862
 msgid "identifier+constant@got means identifier@got+constant"
 msgstr "identificador+constante@got significa identificador@got+constante"
 
-#: config/tc-i370.c:684 config/tc-m68k.c:8077 config/tc-ppc.c:1982
+#: config/tc-i370.c:684 config/tc-m68k.c:8077 config/tc-ppc.c:1951
 #, c-format
 msgid "%s relocations do not fit in %d bytes\n"
 msgstr "%s reubicaciones no caben en %d bytes\n"
@@ -5691,28 +5639,28 @@ msgid "this DS form not yet supported"
 msgstr "aún no se admite esta forma DS"
 
 #: config/tc-i370.c:1046 config/tc-m32r.c:1493 config/tc-microblaze.c:177
-#: config/tc-ppc.c:2047 config/tc-ppc.c:4884
+#: config/tc-ppc.c:2016 config/tc-ppc.c:4674
 msgid "Expected comma after symbol-name: rest of line ignored."
 msgstr "Se esperaba coma después del nombre del símbolo: se descarta el resto de la línea."
 
 #: config/tc-i370.c:1069 config/tc-m32r.c:1517 config/tc-microblaze.c:199
-#: config/tc-ppc.c:2069 config/tc-ppc.c:3272 config/tc-ppc.c:4908
+#: config/tc-ppc.c:2038 config/tc-ppc.c:3241 config/tc-ppc.c:4698
 msgid "ignoring bad alignment"
 msgstr "se descarta la alineación errónea"
 
 #: config/tc-i370.c:1080 config/tc-m32r.c:1544 config/tc-microblaze.c:210
-#: config/tc-ppc.c:2080 config/tc-ppc.c:4920
+#: config/tc-ppc.c:2049 config/tc-ppc.c:4710
 #, c-format
 msgid "Ignoring attempt to re-define symbol `%s'."
 msgstr "Se descarta el intento de redefinir el símbolo `%s'."
 
-#: config/tc-i370.c:1088 config/tc-microblaze.c:218 config/tc-ppc.c:2088
+#: config/tc-i370.c:1088 config/tc-microblaze.c:218 config/tc-ppc.c:2057
 #, c-format
 msgid "Length of .lcomm \"%s\" is already %ld. Not changed to %ld."
 msgstr "La longitud de .lcomm \"%s\" ya es %ld. No se cambió a %ld."
 
 #: config/tc-i370.c:1107 config/tc-m32r.c:1529 config/tc-microblaze.c:234
-#: config/tc-ppc.c:2106 config/tc-v850.c:375
+#: config/tc-ppc.c:2075 config/tc-v850.c:375
 msgid "Common alignment not a power of 2"
 msgstr "La alineación común no es una potencia de 2"
 
@@ -5765,12 +5713,12 @@ msgstr "el registro droping %d en la sección %s no coincide con el registro usi
 msgid "droping register %d in section %s previously used in section %s"
 msgstr "el registro droping %d en la sección %s se usó previamente en la sección %s"
 
-#: config/tc-i370.c:1847 config/tc-ppc.c:3109
+#: config/tc-i370.c:1847 config/tc-ppc.c:3078
 msgid "wrong number of operands"
 msgstr "número erróneo de operandos"
 
 #: config/tc-i370.c:1928 config/tc-mn10200.c:898 config/tc-mn10300.c:1251
-#: config/tc-ppc.c:2405 config/tc-s390.c:1590 config/tc-v850.c:2024
+#: config/tc-ppc.c:2374 config/tc-s390.c:1549 config/tc-v850.c:2024
 #, c-format
 msgid "Unrecognized opcode: `%s'"
 msgstr "No se reconoce el código de operación: `%s'"
@@ -5789,525 +5737,512 @@ msgstr "se espera un registro para el operando %d"
 msgid "Internal Error: bad instruction length"
 msgstr "Error interno: longitud errónea de instrucción"
 
-#: config/tc-i386.c:1873
+#: config/tc-i386.c:1848
 #, c-format
 msgid "%s shortened to %s"
 msgstr "%s reducido a %s"
 
-#: config/tc-i386.c:1959
+#: config/tc-i386.c:1934
 msgid "same type of prefix used twice"
 msgstr "se utilizó dos veces el mismo tipo de prefijo"
 
-#: config/tc-i386.c:1986
+#: config/tc-i386.c:1961
 #, c-format
 msgid "64bit mode not supported on `%s'."
 msgstr "no se admite el modo de 64bit en `%s'."
 
-#: config/tc-i386.c:1995
+#: config/tc-i386.c:1970
 #, c-format
 msgid "32bit mode not supported on `%s'."
 msgstr "no se admite el modo de 32bit en `%s'."
 
-#: config/tc-i386.c:2035
+#: config/tc-i386.c:2010
 msgid "bad argument to syntax directive."
 msgstr "argumento erróneo para la directiva syntax."
 
-#: config/tc-i386.c:2084
+#: config/tc-i386.c:2059
 msgid "bad argument to sse_check directive."
 msgstr "argumento erróneo para la directiva sse_check."
 
-#: config/tc-i386.c:2088
+#: config/tc-i386.c:2063
 msgid "missing argument for sse_check directive"
 msgstr "falta una argumento para la directiva sse_check"
 
-#: config/tc-i386.c:2118
+#: config/tc-i386.c:2093
 #, c-format
 msgid "`%s' is not supported on `%s'"
 msgstr "`%s' no se admite en `%s'"
 
-#: config/tc-i386.c:2192
+#: config/tc-i386.c:2166
 #, c-format
 msgid "no such architecture: `%s'"
 msgstr "no hay tal arquitectura: `%s'"
 
-#: config/tc-i386.c:2197
+#: config/tc-i386.c:2171
 msgid "missing cpu architecture"
 msgstr "falta la arquitectura de cpu"
 
-#: config/tc-i386.c:2211
+#: config/tc-i386.c:2185
 #, c-format
 msgid "no such architecture modifier: `%s'"
 msgstr "no hay tal modificador de arquitectura: `%s'"
 
-#: config/tc-i386.c:2226 config/tc-i386.c:2242
+#: config/tc-i386.c:2200 config/tc-i386.c:2215
 msgid "Intel L1OM is 64bit ELF only"
 msgstr "Intel L1OM es solamente 64bit ELF"
 
-#: config/tc-i386.c:2253 config/tc-i386.c:8600
-msgid "unknown architecture"
-msgstr "arquitectura desconocida"
-
-#: config/tc-i386.c:2287 config/tc-i386.c:2309
-#, c-format
-msgid "internal Error:  Can't hash %s: %s"
-msgstr "error Interno:  No se puede dispersar %s: %s"
+#: config/tc-i386.c:2224 config/tc-i386.c:8494
+msgid "Unknown architecture"
+msgstr "Arquitectura desconocida"
 
-#: config/tc-i386.c:2604
+#: config/tc-i386.c:2570
 #, c-format
 msgid "unknown relocation (%u)"
 msgstr "reubicación desconocida (%u)"
 
-#: config/tc-i386.c:2606
+#: config/tc-i386.c:2572
 #, c-format
 msgid "%u-byte relocation cannot be applied to %u-byte field"
 msgstr "la reubicación de %u-bytes no se puede aplicar al campo %u-bytes"
 
-#: config/tc-i386.c:2610
+#: config/tc-i386.c:2576
 msgid "non-pc-relative relocation for pc-relative field"
 msgstr "reubicación no relativa a pc para el campo relativo a pc"
 
-#: config/tc-i386.c:2615
+#: config/tc-i386.c:2581
 msgid "relocated field and relocation type differ in signedness"
 msgstr "el campo reubicado y el tipo de reubicación difieren en signo"
 
-#: config/tc-i386.c:2624
+#: config/tc-i386.c:2590
 msgid "there are no unsigned pc-relative relocations"
 msgstr "no hay reubicaciones relativas a pc sin signo"
 
-#: config/tc-i386.c:2632
+#: config/tc-i386.c:2598
 #, c-format
 msgid "cannot do %u byte pc-relative relocation"
 msgstr "no se puede hacer la reubicación relativa a pc de %u bytes"
 
-#: config/tc-i386.c:2649
+#: config/tc-i386.c:2615
 #, c-format
 msgid "cannot do %s %u byte relocation"
 msgstr "no se puede hacer la reubicación %s de %u bytes"
 
-#: config/tc-i386.c:2933
+#: config/tc-i386.c:2899
 #, c-format
 msgid "can't use register '%s%s' as operand %d in '%s'."
 msgstr "no se puede utilizar el registro '%s%s' como operando %d en '%s'."
 
-#: config/tc-i386.c:3045
+#: config/tc-i386.c:3011
 #, c-format
 msgid "SSE instruction `%s' is used"
 msgstr "se usa la instrucción SSE `%s'"
 
-#: config/tc-i386.c:3059 config/tc-i386.c:4489
+#: config/tc-i386.c:3025 config/tc-i386.c:4455
 #, c-format
 msgid "ambiguous operand size for `%s'"
 msgstr "tamaño de operando ambiguo para `%s'"
 
-#: config/tc-i386.c:3076
+#: config/tc-i386.c:3042
 msgid "expecting lockable instruction after `lock'"
 msgstr "se espera una instrucción bloqueable después de `lock'"
 
 #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
-#: config/tc-i386.c:3127
+#: config/tc-i386.c:3093
 #, c-format
 msgid "translating to `%sp'"
 msgstr "se traduce a `%sp'"
 
-#: config/tc-i386.c:3182
+#: config/tc-i386.c:3148
 #, c-format
 msgid "can't encode register '%s%s' in an instruction requiring REX prefix."
 msgstr "no se puede codificar el registro '%s%s' en una instrucción que requiere el prefijo REX."
 
-#: config/tc-i386.c:3225 config/tc-i386.c:3357
+#: config/tc-i386.c:3191 config/tc-i386.c:3323
 #, c-format
 msgid "no such instruction: `%s'"
 msgstr "no hay tal instrucción: `%s'"
 
-#: config/tc-i386.c:3236 config/tc-i386.c:3390
+#: config/tc-i386.c:3202 config/tc-i386.c:3356
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr "carácter inválido %s en el mnemónico"
 
-#: config/tc-i386.c:3243
+#: config/tc-i386.c:3209
 msgid "expecting prefix; got nothing"
 msgstr "se esperaba un prefijo; se obtuvo nada"
 
-#: config/tc-i386.c:3245
+#: config/tc-i386.c:3211
 msgid "expecting mnemonic; got nothing"
 msgstr "se esperaba un mnemónico; se obtuvo nada"
 
-#: config/tc-i386.c:3260 config/tc-i386.c:3408
+#: config/tc-i386.c:3226 config/tc-i386.c:3374
 #, c-format
 msgid "`%s' is only supported in 64-bit mode"
 msgstr "`%s' sólo se admite en modo de 64-bit"
 
-#: config/tc-i386.c:3261 config/tc-i386.c:3407
+#: config/tc-i386.c:3227 config/tc-i386.c:3373
 #, c-format
 msgid "`%s' is not supported in 64-bit mode"
 msgstr "`%s' no se admite en modo de 64-bit"
 
-#: config/tc-i386.c:3273
+#: config/tc-i386.c:3239
 #, c-format
 msgid "redundant %s prefix"
 msgstr "prefijo %s redundante"
 
-#: config/tc-i386.c:3414
+#: config/tc-i386.c:3380
 #, c-format
 msgid "`%s' is not supported on `%s%s'"
 msgstr "`%s' no se admite en `%s%s'"
 
-#: config/tc-i386.c:3425
+#: config/tc-i386.c:3391
 msgid "use .code16 to ensure correct addressing mode"
 msgstr "use .code16 para asegurar el modo de direccionamiento correcto"
 
-#: config/tc-i386.c:3438
+#: config/tc-i386.c:3404
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr "se espera una instrucción de cadena después de `%s'"
 
-#: config/tc-i386.c:3470
+#: config/tc-i386.c:3436
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr "caracter inválido %s antes del operando %d"
 
-#: config/tc-i386.c:3484
+#: config/tc-i386.c:3450
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr "paréntesis sin balancear en el operando %d."
 
-#: config/tc-i386.c:3487
+#: config/tc-i386.c:3453
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr "llaves sin balancear en el operando %d."
 
-#: config/tc-i386.c:3496
+#: config/tc-i386.c:3462
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr "carácter inválido %s en el operando %d"
 
-#: config/tc-i386.c:3524
+#: config/tc-i386.c:3490
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr "operandos espurios; (%d operandos/instrucción máximo)"
 
-#: config/tc-i386.c:3547
+#: config/tc-i386.c:3513
 msgid "expecting operand after ','; got nothing"
 msgstr "se esperaba un operando después de ','; se obtuvo nada"
 
-#: config/tc-i386.c:3552
+#: config/tc-i386.c:3518
 msgid "expecting operand before ','; got nothing"
 msgstr "se esperaba un operando antes de ','; se obtuvo nada"
 
-#: config/tc-i386.c:4190
+#: config/tc-i386.c:4156
 msgid "operand size mismatch"
 msgstr "no coincide el tamaño del operando"
 
-#: config/tc-i386.c:4193
+#: config/tc-i386.c:4159
 msgid "operand type mismatch"
 msgstr "no coincide el tipo de operando"
 
-#: config/tc-i386.c:4196
+#: config/tc-i386.c:4162
 msgid "register type mismatch"
 msgstr "no coincide el tipo de registro"
 
-#: config/tc-i386.c:4199
+#: config/tc-i386.c:4165
 msgid "number of operands mismatch"
 msgstr "no coincide el número de operandos"
 
-#: config/tc-i386.c:4202
+#: config/tc-i386.c:4168
 msgid "invalid instruction suffix"
 msgstr "sufijo de instrucción inválido"
 
-#: config/tc-i386.c:4205
+#: config/tc-i386.c:4171
 msgid "Imm4 isn't the first operand"
 msgstr "Imm4 no es el primer operando"
 
-#: config/tc-i386.c:4208
+#: config/tc-i386.c:4174
 msgid "only supported with old gcc"
 msgstr "sólo se admite con gcc antiguo"
 
-#: config/tc-i386.c:4211
+#: config/tc-i386.c:4177
 msgid "unsupported with Intel mnemonic"
 msgstr "no se admite con mnemónico Intel"
 
-#: config/tc-i386.c:4214
+#: config/tc-i386.c:4180
 msgid "unsupported syntax"
 msgstr "no se admite la sintaxis"
 
-#: config/tc-i386.c:4217
+#: config/tc-i386.c:4183
 msgid "unsupported"
 msgstr "no se admite"
 
-#: config/tc-i386.c:4220
+#: config/tc-i386.c:4186
 #, c-format
 msgid "%s for `%s'"
 msgstr "%s para `%s'"
 
-#: config/tc-i386.c:4231
+#: config/tc-i386.c:4197
 #, c-format
 msgid "indirect %s without `*'"
 msgstr "%s indirecto sin `*'"
 
 #. Warn them that a data or address size prefix doesn't
 #. affect assembly of the next line of code.
-#: config/tc-i386.c:4239
+#: config/tc-i386.c:4205
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr "prefijo `%s' por sí solo"
 
-#: config/tc-i386.c:4273 config/tc-i386.c:4289
+#: config/tc-i386.c:4239 config/tc-i386.c:4255
 #, c-format
 msgid "`%s' operand %d must use `%ses' segment"
 msgstr "`%s' operando %d debe usar el segmento `%ses'"
 
 #. We have to know the operand size for crc32.
-#: config/tc-i386.c:4343
+#: config/tc-i386.c:4309
 #, c-format
 msgid "ambiguous memory operand size for `%s`"
 msgstr "tamaño de operando de memoria ambiguo para `%s'"
 
-#: config/tc-i386.c:4462
+#: config/tc-i386.c:4428
 msgid "no instruction mnemonic suffix given and no register operands; can't size instruction"
 msgstr "no se dio un sufijo mnemónico de instrucción y ningún operando de registro; no se puede determinar el tamaño de la instrucción"
 
-#: config/tc-i386.c:4599 config/tc-i386.c:4674 config/tc-i386.c:4703
-#: config/tc-i386.c:4749 config/tc-i386.c:4787
+#: config/tc-i386.c:4565 config/tc-i386.c:4640 config/tc-i386.c:4669
+#: config/tc-i386.c:4715 config/tc-i386.c:4753
 #, c-format
-msgid "incorrect register `%s%s' used with `%c' suffix"
-msgstr "se utilizó el registro incorrecto `%s%s' con el sufijo `%c'"
+msgid "Incorrect register `%s%s' used with `%c' suffix"
+msgstr "Se utilizó el registro incorrecto `%s%s' con el sufijo `%c'"
 
-#: config/tc-i386.c:4607 config/tc-i386.c:4681 config/tc-i386.c:4794
+#: config/tc-i386.c:4573 config/tc-i386.c:4647 config/tc-i386.c:4760
 #, c-format
 msgid "using `%s%s' instead of `%s%s' due to `%c' suffix"
 msgstr "se usa `%s%s' en lugar de `%s%s' debido al sufijo `%c'"
 
-#: config/tc-i386.c:4633 config/tc-i386.c:4657 config/tc-i386.c:4725
-#: config/tc-i386.c:4770
+#: config/tc-i386.c:4599 config/tc-i386.c:4623 config/tc-i386.c:4691
+#: config/tc-i386.c:4736
 #, c-format
 msgid "`%s%s' not allowed with `%s%c'"
 msgstr "no se permite `%s%s' con `%s%c'"
 
-#: config/tc-i386.c:4859
+#: config/tc-i386.c:4825
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr "no se dio un sufijo mnemónico de instrucción; no se puede determinar el tamaño inmediato"
 
-#: config/tc-i386.c:4895
+#: config/tc-i386.c:4861
 #, c-format
 msgid "the last operand of `%s' must be `%s%s'"
 msgstr "el último operando de `%s' debe ser `%s%s'"
 
-#: config/tc-i386.c:4898
+#: config/tc-i386.c:4864
 #, c-format
 msgid "the first operand of `%s' must be `%s%s'"
 msgstr "el primer operando de `%s' debe ser `%s%s'"
 
-#: config/tc-i386.c:5046
+#: config/tc-i386.c:5012
 #, c-format
 msgid "you can't `pop %scs'"
 msgstr "no se puede hacer `pop %scs'"
 
 #. Reversed arguments on faddp, fsubp, etc.
-#: config/tc-i386.c:5075
+#: config/tc-i386.c:5041
 #, c-format
 msgid "translating to `%s %s%s,%s%s'"
 msgstr "se traduce a `%s %s%s,%s%s'"
 
 #. Extraneous `l' suffix on fp insn.
-#: config/tc-i386.c:5082
+#: config/tc-i386.c:5048
 #, c-format
 msgid "translating to `%s %s%s'"
 msgstr "se traduce a `%s %s%s'"
 
-#: config/tc-i386.c:5110
+#: config/tc-i386.c:5076
 #, c-format
 msgid "segment override on `%s' is ineffectual"
 msgstr "la anulación del segmento en `%s' no tiene efecto"
 
-#: config/tc-i386.c:5807 config/tc-i386.c:5901 config/tc-i386.c:5946
+#: config/tc-i386.c:5734 config/tc-i386.c:5828 config/tc-i386.c:5873
 msgid "skipping prefixes on this instruction"
 msgstr "se saltan los prefijos en esta instrucción"
 
-#: config/tc-i386.c:5966
+#: config/tc-i386.c:5893
 msgid "16-bit jump out of range"
 msgstr "salto de 16-bit fuera de rango"
 
-#: config/tc-i386.c:5975
+#: config/tc-i386.c:5902
 #, c-format
 msgid "can't handle non absolute segment in `%s'"
 msgstr "no se puede manejar un segmento no absoluto en `%s'"
 
-#: config/tc-i386.c:6555
+#: config/tc-i386.c:6482
 #, c-format
 msgid "@%s reloc is not supported with %d-bit output format"
 msgstr "no se admiten las reubicaciones @%s con el formato de salida de %d bits"
 
-#: config/tc-i386.c:6603
+#: config/tc-i386.c:6529
 #, c-format
 msgid "missing or invalid expression `%s'"
 msgstr "expresión faltante o inválida `%s'"
 
-#: config/tc-i386.c:6661
+#: config/tc-i386.c:6588
 #, c-format
 msgid "at most %d immediate operands are allowed"
 msgstr "sólo se permiten cuando mucho %d operandos inmediatos"
 
-#: config/tc-i386.c:6683 config/tc-i386.c:6930
+#: config/tc-i386.c:6610 config/tc-i386.c:6857
 #, c-format
 msgid "junk `%s' after expression"
 msgstr "`%s' basura después de la expresión"
 
-#: config/tc-i386.c:6704
+#: config/tc-i386.c:6631
 #, c-format
 msgid "missing or invalid immediate expression `%s'"
 msgstr "expresión inmediata faltante o inválida `%s'"
 
-#: config/tc-i386.c:6727 config/tc-i386.c:7020
+#: config/tc-i386.c:6654 config/tc-i386.c:6947
 #, c-format
 msgid "unimplemented segment %s in operand"
 msgstr "segmento %s sin implementar en el operando"
 
-#: config/tc-i386.c:6734
+#: config/tc-i386.c:6661
 #, c-format
 msgid "illegal immediate register operand %s"
 msgstr "operando de registro inmediato ilegal %s"
 
-#: config/tc-i386.c:6782
+#: config/tc-i386.c:6709
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr "se esperaba un factor de escala de 1, 2, 4, u 8: se obtuvo `%s'"
 
-#: config/tc-i386.c:6791
+#: config/tc-i386.c:6718
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr "factor de escala de %d sin un registro índice"
 
-#: config/tc-i386.c:6813
+#: config/tc-i386.c:6740
 #, c-format
 msgid "at most %d displacement operands are allowed"
 msgstr "sólo se permiten hasta %d operandos de desubicación"
 
-#: config/tc-i386.c:6986
+#: config/tc-i386.c:6913
 #, c-format
 msgid "missing or invalid displacement expression `%s'"
 msgstr "expresión de desubicación faltante o inválida `%s'"
 
-#: config/tc-i386.c:7003
+#: config/tc-i386.c:6930
 #, c-format
 msgid "0x%lx out range of signed 32bit displacement"
 msgstr "0x%lx fuera de rango del desplazamiento de 32 bit con signo"
 
-#: config/tc-i386.c:7107
+#: config/tc-i386.c:7034
 #, c-format
 msgid "`%s' is not valid here (expected `%c%s%s%c')"
 msgstr "`%s' no es válido aquí (se esperaba `%c%s%s%c')"
 
-#: config/tc-i386.c:7187
+#: config/tc-i386.c:7114
 #, c-format
 msgid "`%s' is not a valid %s expression"
 msgstr "`%s' no es una expresión %s válida"
 
-#: config/tc-i386.c:7192
+#: config/tc-i386.c:7119
 #, c-format
 msgid "`%s' is not a valid %s-bit %s expression"
 msgstr "`%1$s' no es una expresión %3$s de %2$s-bit válida"
 
-#: config/tc-i386.c:7273
+#: config/tc-i386.c:7200
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr "operando de memoria `%s' erróneo"
 
-#: config/tc-i386.c:7288
+#: config/tc-i386.c:7215
 #, c-format
 msgid "junk `%s' after register"
 msgstr "`%s' basura después del registro"
 
-#: config/tc-i386.c:7301 config/tc-i386.c:7417 config/tc-i386.c:7458
+#: config/tc-i386.c:7228 config/tc-i386.c:7344 config/tc-i386.c:7385
 #, c-format
 msgid "bad register name `%s'"
 msgstr "nombre de registro `%s' erróneo"
 
-#: config/tc-i386.c:7309
+#: config/tc-i386.c:7236
 msgid "immediate operand illegal with absolute jump"
 msgstr "operando inmediato ilegal con salto absoluto"
 
-#: config/tc-i386.c:7331
+#: config/tc-i386.c:7258
 #, c-format
 msgid "too many memory references for `%s'"
 msgstr "demasiadas referencias a memoria para `%s'"
 
-#: config/tc-i386.c:7409
+#: config/tc-i386.c:7336
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr "se esperaba `,' ó `)' después del registro índice en `%s'"
 
-#: config/tc-i386.c:7434
+#: config/tc-i386.c:7361
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr "se esperaba `)' después del factor de escala en `%s'"
 
-#: config/tc-i386.c:7442
+#: config/tc-i386.c:7369
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr "se esperaba un registro índice o un factor de escala después de `,'; se obtuvo '%c'"
 
-#: config/tc-i386.c:7450
+#: config/tc-i386.c:7377
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr "se esperaba `,' ó `)' después del registro base en `%s'"
 
 #. It's not a memory operand; argh!
-#: config/tc-i386.c:7494
+#: config/tc-i386.c:7421
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr "carácter inválido %s al inicio del operando %d `%s'"
 
-#: config/tc-i386.c:7676
+#: config/tc-i386.c:7603
 msgid "long jump required"
 msgstr "se requiere un salto largo"
 
-#: config/tc-i386.c:7731
+#: config/tc-i386.c:7658
 msgid "jump target out of range"
 msgstr "objetivo de salto fuera de rango"
 
-#: config/tc-i386.c:8249
-msgid "no compiled in support for x86_64"
-msgstr "no se compiló el soporte para x86_64"
-
-#: config/tc-i386.c:8269
-msgid "no compiled in support for 32bit x86_64"
-msgstr "no se compiló el soporte para x86_64 de 32bit"
-
-#: config/tc-i386.c:8273
-msgid "32bit x86_64 is only supported for ELF"
-msgstr "x86_64 de 32bit sólo se admite para ELF"
+#: config/tc-i386.c:8172
+msgid "No compiled in support for x86_64"
+msgstr "No se compiló el soporte para x86_64"
 
-#: config/tc-i386.c:8303 config/tc-i386.c:8359
+#: config/tc-i386.c:8204 config/tc-i386.c:8259
 #, c-format
-msgid "invalid -march= option: `%s'"
-msgstr "opción -march= inválida: `%s'"
+msgid "Invalid -march= option: `%s'"
+msgstr "Opción -march= inválida: `%s'"
 
-#: config/tc-i386.c:8368 config/tc-i386.c:8380
+#: config/tc-i386.c:8268 config/tc-i386.c:8280
 #, c-format
-msgid "invalid -mtune= option: `%s'"
-msgstr "opción -mtune= inválida: `%s'"
+msgid "Invalid -mtune= option: `%s'"
+msgstr "Opción -mtune= inválida: `%s'"
 
-#: config/tc-i386.c:8389
+#: config/tc-i386.c:8289
 #, c-format
-msgid "invalid -mmnemonic= option: `%s'"
-msgstr "opción -mmnemonic= inválida: `%s'"
+msgid "Invalid -mmnemonic= option: `%s'"
+msgstr "Opción -mnemonic= inválida: `%s'"
 
-#: config/tc-i386.c:8398
+#: config/tc-i386.c:8298
 #, c-format
-msgid "invalid -msyntax= option: `%s'"
-msgstr "opción -msyntax= inválida: `%s'"
+msgid "Invalid -msyntax= option: `%s'"
+msgstr "Opción -msyntax= inválida: `%s'"
 
-#: config/tc-i386.c:8425
+#: config/tc-i386.c:8325
 #, c-format
-msgid "invalid -msse-check= option: `%s'"
-msgstr "opción -msse-check= inválida: `%s'"
+msgid "Invalid -msse-check= option: `%s'"
+msgstr "Opción -msse-check= inválida: `%s'"
 
-#: config/tc-i386.c:8434
+#: config/tc-i386.c:8334
 #, c-format
-msgid "invalid -mavxscalar= option: `%s'"
-msgstr "opción -mavxscalar= inválida: `%s'"
+msgid "Invalid -mavxscalar= option: `%s'"
+msgstr "Opción -mavxscalar= inválida: `%s'"
 
-#: config/tc-i386.c:8526
+#: config/tc-i386.c:8426
 #, c-format
 msgid ""
 "  -Q                      ignored\n"
@@ -6318,7 +6253,7 @@ msgstr ""
 "  -V                      muestra el número de versión del ensamblador\n"
 "  -k                      se descarta\n"
 
-#: config/tc-i386.c:8531
+#: config/tc-i386.c:8431
 #, c-format
 msgid ""
 "  -n                      Do not optimize code alignment\n"
@@ -6327,27 +6262,27 @@ msgstr ""
 "  -n                      No optimiza la alineación de código\n"
 "  -q                      omite algunos avisos\n"
 
-#: config/tc-i386.c:8535
+#: config/tc-i386.c:8435
 #, c-format
 msgid "  -s                      ignored\n"
 msgstr "  -s                      se descarta\n"
 
-#: config/tc-i386.c:8540
+#: config/tc-i386.c:8440
 #, c-format
-msgid "  --32/--64/--x32         generate 32bit/64bit/x32 code\n"
-msgstr "  --32/--64/--x32         genera código 32bit/64bit/x32\n"
+msgid "  --32/--64               generate 32bit/64bit code\n"
+msgstr "  --32/--64               genera código 32bit/64bit\n"
 
-#: config/tc-i386.c:8544
+#: config/tc-i386.c:8444
 #, c-format
 msgid "  --divide                do not treat `/' as a comment character\n"
 msgstr "  --divide                no trata `/' como un carácter de comentario\n"
 
-#: config/tc-i386.c:8547
+#: config/tc-i386.c:8447
 #, c-format
 msgid "  --divide                ignored\n"
 msgstr "  --divide                se descarta\n"
 
-#: config/tc-i386.c:8550
+#: config/tc-i386.c:8450
 #, c-format
 msgid ""
 "  -march=CPU[,+EXTENSION...]\n"
@@ -6356,22 +6291,22 @@ msgstr ""
 "  -march=CPU[,+EXTENSIÓN...]\n"
 "                          genera código para el CPU y la EXTENSIÓN. CPU es uno de:\n"
 
-#: config/tc-i386.c:8554
+#: config/tc-i386.c:8454
 #, c-format
 msgid "                          EXTENSION is combination of:\n"
 msgstr "                          EXTENSIÓN es una combinación de:\n"
 
-#: config/tc-i386.c:8557
+#: config/tc-i386.c:8457
 #, c-format
 msgid "  -mtune=CPU              optimize for CPU, CPU is one of:\n"
 msgstr "  -mtune=CPU              optimiza para el CPU, donde CPU es uno de:\n"
 
-#: config/tc-i386.c:8560
+#: config/tc-i386.c:8460
 #, c-format
 msgid "  -msse2avx               encode SSE instructions with VEX prefix\n"
 msgstr "  -msse2avx               codifica instrucciones SSE con prefijo VEX\n"
 
-#: config/tc-i386.c:8562
+#: config/tc-i386.c:8462
 #, c-format
 msgid ""
 "  -msse-check=[none|error|warning]\n"
@@ -6380,7 +6315,7 @@ msgstr ""
 "  -msse-check=[none|error|warning]\n"
 "                          revisa las instrucciones SSE\n"
 
-#: config/tc-i386.c:8565
+#: config/tc-i386.c:8465
 #, c-format
 msgid ""
 "  -mavxscalar=[128|256]   encode scalar AVX instructions with specific vector\n"
@@ -6389,71 +6324,62 @@ msgstr ""
 "  -mavxscalar=[128|256]   codifica las instrucciones AVX escalares con\n"
 "                           una longitud de vector específica\n"
 
-#: config/tc-i386.c:8568
+#: config/tc-i386.c:8468
 #, c-format
 msgid "  -mmnemonic=[att|intel]  use AT&T/Intel mnemonic\n"
 msgstr "  -mmnemonic=[att|intel]  usa mnemónicos AT&T/Intel\n"
 
-#: config/tc-i386.c:8570
+#: config/tc-i386.c:8470
 #, c-format
 msgid "  -msyntax=[att|intel]    use AT&T/Intel syntax\n"
 msgstr "  -msyntax=[att|intel]    usa sintaxis AT&T/Intel\n"
 
-#: config/tc-i386.c:8572
+#: config/tc-i386.c:8472
 #, c-format
 msgid "  -mindex-reg             support pseudo index registers\n"
 msgstr "  -mindex-reg             admite registros de pseudo índice\n"
 
-#: config/tc-i386.c:8574
+#: config/tc-i386.c:8474
 #, c-format
 msgid "  -mnaked-reg             don't require `%%' prefix for registers\n"
 msgstr "  -mnaked-reg             no requiere el prefijo `%%' para los registros\n"
 
-#: config/tc-i386.c:8576
+#: config/tc-i386.c:8476
 #, c-format
 msgid "  -mold-gcc               support old (<= 2.8.1) versions of gcc\n"
 msgstr "  -mold-gcc               admite versiones antiguas de gcc (<=2.8.1)\n"
 
-#: config/tc-i386.c:8650
+#: config/tc-i386.c:8530
 msgid "Intel L1OM is 64bit only"
 msgstr "Intel L1OM sólo es 64bit"
 
-#: config/tc-i386.c:8872
+#: config/tc-i386.c:8753
 #, c-format
 msgid "can not do %d byte pc-relative relocation"
 msgstr "no se puede hacer la reubicación relativa a pc de %d bytes"
 
-#: config/tc-i386.c:8890
+#: config/tc-i386.c:8771
 #, c-format
 msgid "can not do %d byte relocation"
 msgstr "no se puede hacer la reubicación de %d bytes"
 
-#: config/tc-i386.c:8959
-#, c-format
-msgid "cannot represent relocation type %s in x32 mode"
-msgstr "no se puede representar el tipo de reubicación %s en modo x32"
-
-#: config/tc-i386.c:8994 config/tc-s390.c:2346
+#: config/tc-i386.c:8854 config/tc-s390.c:2239
 #, c-format
 msgid "cannot represent relocation type %s"
 msgstr "no se puede representar el tipo de reubicación %s"
 
-#: config/tc-i386.c:9101
+#: config/tc-i386.c:8961
 msgid "bad .section directive: want a,l,w,x,M,S,G,T in string"
 msgstr "directiva .section errónea: se quiere a,l,w,x,M,S,G,T en la cadena"
 
-#: config/tc-i386.c:9104
+#: config/tc-i386.c:8964
 msgid "bad .section directive: want a,w,x,M,S,G,T in string"
 msgstr "directiva .section errónea: se quiere a,w,x,M,S,G,T en la cadena"
 
-#: config/tc-i386.c:9123
+#: config/tc-i386.c:8983
 msgid ".largecomm supported only in 64bit mode, producing .comm"
 msgstr ".largecomm sólo se admite en modo de 64bit, se produce .comm"
 
-#: config/tc-i386.c:9178 read.c:3859
-msgid "unexpected `\"' in expression"
-msgstr "`\"' inesperada en la expresión"
-
 #: config/tc-i860.c:122
 msgid "Directive .dual available only with -mintel-syntax option"
 msgstr "La directiva .dual sólo está disponible con la opción -mintel-syntax"
@@ -6745,7 +6671,7 @@ msgstr "El tamaño de los registros rotantes excede el tamaño del marco"
 msgid "Unwind directive not followed by an instruction."
 msgstr "La directiva de desenredo no está seguida por una instrucción."
 
-#: config/tc-ia64.c:1017 config/tc-ia64.c:7449
+#: config/tc-ia64.c:1017 config/tc-ia64.c:7447
 msgid "qualifying predicate not followed by instruction"
 msgstr "el predicado calificador no está seguido por una instrucción"
 
@@ -7081,7 +7007,7 @@ msgstr "Se esperaba una coma"
 msgid "Expected '['"
 msgstr "Se esperaba '['"
 
-#: config/tc-ia64.c:4514 config/tc-ia64.c:7584
+#: config/tc-ia64.c:4514 config/tc-ia64.c:7582
 msgid "Expected ']'"
 msgstr "Se esperaba ']'"
 
@@ -7148,7 +7074,7 @@ msgstr "No se reconoce el tipo de relación de predicado"
 msgid "Bad register range"
 msgstr "Rango de registro erróneo"
 
-#: config/tc-ia64.c:5001 config/tc-ia64.c:7529
+#: config/tc-ia64.c:5001 config/tc-ia64.c:7527
 msgid "Predicate register expected"
 msgstr "Se esperaba un registro de predicado"
 
@@ -7331,6 +7257,13 @@ msgid ""
 "  -mhint.b=[ok|warning|error]\n"
 "\t\t\t  hint.b check (default -mhint.b=error)\n"
 "  -x | -xexplicit\t  turn on dependency violation checking\n"
+"  -xauto\t\t  automagically remove dependency violations (default)\n"
+"  -xnone\t\t  turn off dependency violation checking\n"
+"  -xdebug\t\t  debug dependency violation checker\n"
+"  -xdebugn\t\t  debug dependency violation checker but turn off\n"
+"\t\t\t  dependency violation checking\n"
+"  -xdebugx\t\t  debug dependency violation checker and turn on\n"
+"\t\t\t  dependency violation checking\n"
 msgstr ""
 "Opciones de IA-64:\n"
 "  --mconstant-gp\t  marca el fichero de salida como que usa el modelo\n"
@@ -7354,259 +7287,247 @@ msgstr ""
 "\t\t\t  revisión de hint.b (-mhint.b=error por defecto)\n"
 "  -x | -xexplicit\t  activa la revisión de violaciones de dependencias\n"
 "                 \t  (por defecto)\n"
-
-#. Note for translators: "automagically" can be translated as "automatically" here.
-#: config/tc-ia64.c:7006
-msgid ""
-"  -xauto\t\t  automagically remove dependency violations (default)\n"
-"  -xnone\t\t  turn off dependency violation checking\n"
-"  -xdebug\t\t  debug dependency violation checker\n"
-"  -xdebugn\t\t  debug dependency violation checker but turn off\n"
-"\t\t\t  dependency violation checking\n"
-"  -xdebugx\t\t  debug dependency violation checker and turn on\n"
-"\t\t\t  dependency violation checking\n"
-msgstr ""
-"  -xauto\t\t  borra las violaciones de dependencias automágicamente\n"
-"\t\t\t  (por defecto)\n"
-"  -xnone\t\t  desactiva la revisión de violación de dependencias\n"
-"  -xdebug\t\t  depura el revisor de violación de dependencias\n"
-"  -xdebugn\t\t  depura el revisor de violación de dependencias pero\n"
-"\t\t\t  desactiva la revisión de violación de dependencias\n"
-"  -xdebugx\t\t  depura el revisor de violación de dependencias y\n"
-"\t\t\t  activa la revisión de violación de dependencias\n"
-
-#: config/tc-ia64.c:7021
+"  -xauto\t\t  borra automágicamente las violaciones de dependencias\n"
+"        \t\t  (por defecto)\n"
+"  -xnone\t\t  desactiva la revisión de violaciones de dependencias\n"
+"  -xdebug\t\t  depura el revisor de violaciones de dependencias\n"
+"  -xdebugn\t\t  depura el revisor de violaciones de dependencias pero\n"
+"\t\t\t  desactiva la revisión de violaciones de dependencias\n"
+"  -xdebugx\t\t  depura el revisor de violaciones de dependencias y\n"
+"\t\t\t  activa la revisión de violaciones de dependencias\n"
+
+#: config/tc-ia64.c:7019
 msgid "--gstabs is not supported for ia64"
 msgstr "no se admite --gstabs para ia64"
 
-#: config/tc-ia64.c:7259
+#: config/tc-ia64.c:7257
 #, c-format
 msgid "ia64.md_begin: can't hash `%s': %s"
 msgstr "ia64.md_begin: no se puede dispersar `%s': %s"
 
-#: config/tc-ia64.c:7320
+#: config/tc-ia64.c:7318
 #, c-format
 msgid "Inserting \"%s\" into constant hash table failed: %s"
 msgstr "Falló la inserción de \"%s\" en la tabla de dispersión de constantes: %s"
 
-#: config/tc-ia64.c:7332 config/tc-mips.c:1916
+#: config/tc-ia64.c:7330 config/tc-mips.c:1905
 msgid "Could not set architecture and machine"
 msgstr "No se pueden establecer la arquitectura y la máquina"
 
-#: config/tc-ia64.c:7464
+#: config/tc-ia64.c:7462
 msgid "Explicit stops are ignored in auto mode"
 msgstr "Se descartan las paradas explícitas en modo automático"
 
-#: config/tc-ia64.c:7473
+#: config/tc-ia64.c:7471
 msgid "Found '{' when manual bundling is already turned on"
 msgstr "Se encontró '{' cuando la agrupación manual ya está activada"
 
-#: config/tc-ia64.c:7486
+#: config/tc-ia64.c:7484
 msgid "Found '{' after explicit switch to automatic mode"
 msgstr "Se encontró '{' después del cambio explícito al modo automático"
 
-#: config/tc-ia64.c:7492
+#: config/tc-ia64.c:7490
 msgid "Found '}' when manual bundling is off"
 msgstr "Se encontró '}' cuando la agrupación manual está desactivada"
 
-#: config/tc-ia64.c:7519
+#: config/tc-ia64.c:7517
 msgid "Expected ')'"
 msgstr "Se esperaba ')'"
 
-#: config/tc-ia64.c:7524
+#: config/tc-ia64.c:7522
 msgid "Qualifying predicate expected"
 msgstr "Se esperaba un predicado calificador"
 
-#: config/tc-ia64.c:7543
+#: config/tc-ia64.c:7541
 msgid "Tag must come before qualifying predicate."
 msgstr "La etiqueta debe venir antes del predicado calificador."
 
-#: config/tc-ia64.c:7573
+#: config/tc-ia64.c:7571
 msgid "Expected ':'"
 msgstr "Se esperaba ':'"
 
-#: config/tc-ia64.c:7589
+#: config/tc-ia64.c:7587
 msgid "Tag name expected"
 msgstr "Se esperaba un nombre de etiqueta"
 
-#: config/tc-ia64.c:7691
+#: config/tc-ia64.c:7689
 msgid "Rotating register index must be a non-negative constant"
 msgstr "El índice de registros rotantes debe ser una constante que no sea negativa"
 
-#: config/tc-ia64.c:7696
+#: config/tc-ia64.c:7694
 #, c-format
 msgid "Index out of range 0..%u"
 msgstr "�ndice fuera de rango 0..%u"
 
-#: config/tc-ia64.c:7708
+#: config/tc-ia64.c:7706
 msgid "Indirect register index must be a general register"
 msgstr "El índice de registros indirectos debe ser un registro general"
 
-#: config/tc-ia64.c:7717
+#: config/tc-ia64.c:7715
 msgid "Index can only be applied to rotating or indirect registers"
 msgstr "El índice sólo se puede aplicar a registros rotantes o indirectos"
 
-#: config/tc-ia64.c:7753 config/tc-xstormy16.c:146
+#: config/tc-ia64.c:7751 config/tc-xstormy16.c:146
 msgid "Expected '('"
 msgstr "Se esperaba '('"
 
-#: config/tc-ia64.c:7761 config/tc-pdp11.c:448 config/tc-pdp11.c:512
-#: config/tc-pdp11.c:546 config/tc-xstormy16.c:155
+#: config/tc-ia64.c:7759 config/tc-pdp11.c:448 config/tc-pdp11.c:514
+#: config/tc-pdp11.c:553 config/tc-xstormy16.c:155
 msgid "Missing ')'"
 msgstr "Falta un ')'"
 
-#: config/tc-ia64.c:7779 config/tc-xstormy16.c:162
+#: config/tc-ia64.c:7777 config/tc-xstormy16.c:162
 msgid "Not a symbolic expression"
 msgstr "No es una expresión simbólica"
 
-#: config/tc-ia64.c:7784 config/tc-ia64.c:7798
+#: config/tc-ia64.c:7782 config/tc-ia64.c:7796
 msgid "Illegal combination of relocation functions"
 msgstr "Combinación ilegal de funciones de reubicación"
 
-#: config/tc-ia64.c:7887
+#: config/tc-ia64.c:7885
 msgid "No current frame"
 msgstr "No hay un marco actual"
 
-#: config/tc-ia64.c:7889
+#: config/tc-ia64.c:7887
 #, c-format
 msgid "Register number out of range 0..%u"
 msgstr "Número de registro fuera de rango 0..%u"
 
-#: config/tc-ia64.c:7927
+#: config/tc-ia64.c:7925
 msgid "Standalone `#' is illegal"
 msgstr "Un `#' solo es ilegal"
 
-#: config/tc-ia64.c:7930
+#: config/tc-ia64.c:7928
 msgid "Redundant `#' suffix operators"
 msgstr "Operadores de sufijo `#' redundantes"
 
-#: config/tc-ia64.c:8088
+#: config/tc-ia64.c:8086
 #, c-format
 msgid "Unhandled dependency %s for %s (%s), note %d"
 msgstr "Dependencia %s sin manejar para %s (%s), nota %d"
 
-#: config/tc-ia64.c:9383
+#: config/tc-ia64.c:9381
 #, c-format
 msgid "Unrecognized dependency specifier %d\n"
 msgstr "No se reconoce el especificador de dependencia %d\n"
 
-#: config/tc-ia64.c:10259
+#: config/tc-ia64.c:10257
 msgid "Only the first path encountering the conflict is reported"
 msgstr "Solamente se reporta la primera ruta donde se encuentra el conflicto"
 
-#: config/tc-ia64.c:10261
+#: config/tc-ia64.c:10259
 msgid "This is the location of the conflicting usage"
 msgstr "Esta es la ubicación del uso conflictivo"
 
-#: config/tc-ia64.c:10522
+#: config/tc-ia64.c:10520
 #, c-format
 msgid "Unknown opcode `%s'"
 msgstr "Código de operación `%s' desconocido"
 
-#: config/tc-ia64.c:10600
+#: config/tc-ia64.c:10598
 #, c-format
 msgid "AR %d can only be accessed by %c-unit"
 msgstr "AR %d sólo se puede acceder por %c-unit"
 
-#: config/tc-ia64.c:10612
+#: config/tc-ia64.c:10610
 msgid "hint.b may be treated as nop"
 msgstr "hint.b se puede tratar como nop"
 
-#: config/tc-ia64.c:10615
+#: config/tc-ia64.c:10613
 msgid "hint.b shouldn't be used"
 msgstr "no se debe usar hint.b"
 
-#: config/tc-ia64.c:10654
+#: config/tc-ia64.c:10652
 #, c-format
 msgid "`%s' cannot be predicated"
 msgstr "`%s' no puede ser predicado"
 
-#: config/tc-ia64.c:10726
+#: config/tc-ia64.c:10724
 msgid "Closing bracket missing"
 msgstr "Falta una llave que cierra"
 
-#: config/tc-ia64.c:10735
+#: config/tc-ia64.c:10733
 msgid "Index must be a general register"
 msgstr "El índice debe ser un registro general"
 
-#: config/tc-ia64.c:10900
+#: config/tc-ia64.c:10898
 #, c-format
 msgid "Unsupported fixup size %d"
 msgstr "No se admite el tamaño de compostura %d"
 
 #. This should be an error, but since previously there wasn't any
 #. diagnostic here, don't make it fail because of this for now.
-#: config/tc-ia64.c:11172
+#: config/tc-ia64.c:11170
 #, c-format
 msgid "Cannot express %s%d%s relocation"
 msgstr "No se puede expresar la reubicación %s%d%s"
 
-#: config/tc-ia64.c:11191
+#: config/tc-ia64.c:11189
 msgid "No addend allowed in @fptr() relocation"
 msgstr "No se permite addend en la reubicación @fptr()"
 
-#: config/tc-ia64.c:11230
+#: config/tc-ia64.c:11228
 msgid "integer operand out of range"
 msgstr "operando entero fuera de rango"
 
-#: config/tc-ia64.c:11297
+#: config/tc-ia64.c:11295
 #, c-format
 msgid "%s must have a constant value"
 msgstr "%s debe tener un valor constante"
 
-#: config/tc-ia64.c:11317
+#: config/tc-ia64.c:11315
 msgid "cannot resolve @slotcount parameter"
 msgstr "no se puede resolver el parámetro @slotcount"
 
-#: config/tc-ia64.c:11350
+#: config/tc-ia64.c:11348
 msgid "invalid @slotcount value"
 msgstr "valor de @slotcount inválido"
 
-#: config/tc-ia64.c:11387 config/tc-z8k.c:1372
+#: config/tc-ia64.c:11385 config/tc-z8k.c:1372
 #, c-format
 msgid "Cannot represent %s relocation in object file"
 msgstr "No se puede representar la reubicación %s en el fichero objeto"
 
-#: config/tc-ia64.c:11498
+#: config/tc-ia64.c:11496
 msgid "Can't add stop bit to mark end of instruction group"
 msgstr "No se puede agregar el bit de parada para marcar el fin del grupo de instrucciones"
 
-#: config/tc-ia64.c:11598 config/tc-score.c:6109 read.c:1448 read.c:2434
-#: read.c:3138 read.c:3476 read.c:3520
+#: config/tc-ia64.c:11596 config/tc-score.c:6109 read.c:1451 read.c:2447
+#: read.c:3149 read.c:3490 read.c:3534
 msgid "expected symbol name"
 msgstr "se esperaba un nombre de símbolo"
 
-#: config/tc-ia64.c:11608 read.c:2444 read.c:3148 read.c:3504 stabs.c:469
+#: config/tc-ia64.c:11606 read.c:2457 read.c:3159 read.c:3518 stabs.c:468
 #, c-format
 msgid "expected comma after \"%s\""
 msgstr "se esperaba una coma después de \"%s\""
 
-#: config/tc-ia64.c:11650
+#: config/tc-ia64.c:11648
 #, c-format
 msgid "`%s' is already the alias of %s `%s'"
 msgstr "el símbolo `%s' ya es el alias de %s `%s'"
 
-#: config/tc-ia64.c:11660
+#: config/tc-ia64.c:11658
 #, c-format
 msgid "%s `%s' already has an alias `%s'"
 msgstr "%s `%s' ya tiene un alias `%s'"
 
-#: config/tc-ia64.c:11671
+#: config/tc-ia64.c:11669
 #, c-format
 msgid "inserting \"%s\" into %s alias hash table failed: %s"
 msgstr "falló la inserción de \"%s\" en la tabla de dispersión de alias %s: %s"
 
-#: config/tc-ia64.c:11679
+#: config/tc-ia64.c:11677
 #, c-format
 msgid "inserting \"%s\" into %s name hash table failed: %s"
 msgstr "falló la inserción de \"%s\" en la tabla de dispersión de nombres %s: %s"
 
-#: config/tc-ia64.c:11705
+#: config/tc-ia64.c:11703
 #, c-format
 msgid "symbol `%s' aliased to `%s' is not used"
 msgstr "el símbolo `%s' que tiene como alias a `%s' no se utiliza"
 
-#: config/tc-ia64.c:11728
+#: config/tc-ia64.c:11726
 #, c-format
 msgid "section `%s' aliased to `%s' is not used"
 msgstr "la sección `%s' que tiene como alias a `%s' no se utiliza"
@@ -7650,19 +7571,19 @@ msgstr "la instrucción accede implícitamente a R31 de la carga previa."
 msgid "Unmatched high relocation"
 msgstr "Reubicación high sin coincidencia"
 
-#: config/tc-iq2000.c:829 config/tc-mips.c:15333 config/tc-score.c:5819
+#: config/tc-iq2000.c:829 config/tc-mips.c:15017 config/tc-score.c:5819
 msgid ".end not in text section"
 msgstr ".end no está en la sección text"
 
-#: config/tc-iq2000.c:833 config/tc-mips.c:15337 config/tc-score.c:5822
+#: config/tc-iq2000.c:833 config/tc-mips.c:15021 config/tc-score.c:5822
 msgid ".end directive without a preceding .ent directive."
 msgstr "directiva .end sin una directiva .ent precedente."
 
-#: config/tc-iq2000.c:842 config/tc-mips.c:15346 config/tc-score.c:5830
+#: config/tc-iq2000.c:842 config/tc-mips.c:15030 config/tc-score.c:5830
 msgid ".end symbol does not match .ent symbol."
 msgstr "el símbolo .end no coincide con el símbolo .ent."
 
-#: config/tc-iq2000.c:845 config/tc-mips.c:15353 config/tc-score.c:5835
+#: config/tc-iq2000.c:845 config/tc-mips.c:15037 config/tc-score.c:5835
 msgid ".end directive missing or unknown symbol"
 msgstr "falta la directiva .end o hay un símbolo desconocido"
 
@@ -7670,7 +7591,7 @@ msgstr "falta la directiva .end o hay un símbolo desconocido"
 msgid "Expected simple number."
 msgstr "Se esperaba un número simple."
 
-#: config/tc-iq2000.c:892 config/tc-mips.c:15258 config/tc-score.c:5670
+#: config/tc-iq2000.c:892 config/tc-mips.c:14942 config/tc-score.c:5670
 #, c-format
 msgid " *input_line_pointer == '%c' 0x%02x\n"
 msgstr " *input_line_pointer == '%c' 0x%02x\n"
@@ -7679,7 +7600,7 @@ msgstr " *input_line_pointer == '%c' 0x%02x\n"
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: config/tc-iq2000.c:928 config/tc-mips.c:15425 config/tc-score.c:5708
+#: config/tc-iq2000.c:928 config/tc-mips.c:15109 config/tc-score.c:5708
 msgid ".ent or .aent not in text section."
 msgstr ".ent o .aent no están en la sección text."
 
@@ -7792,7 +7713,7 @@ msgstr "  -ignore-parallel-conflicts            no revisa cuando hay instruccion
 
 #: config/tc-m32r.c:408
 #, c-format
-msgid "                                         for constraint violations\n"
+msgid "                                         fo contraint violations\n"
 msgstr "                                         que violan las restricciones\n"
 
 #: config/tc-m32r.c:410
@@ -7802,7 +7723,7 @@ msgstr "  -no-ignore-parallel-conflicts         revisa cuando hay instrucciones
 
 #: config/tc-m32r.c:412
 #, c-format
-msgid "                                         constraint violations\n"
+msgid "                                         contraint violations\n"
 msgstr "                                         que violan las restricciones\n"
 
 #: config/tc-m32r.c:414
@@ -9187,796 +9108,759 @@ msgid "Absolute value in relaxation code.  Assembler error....."
 msgstr "Valor absoluto en código de relajación.  Error de ensamblador....."
 
 #: config/tc-microblaze.c:2363 config/tc-mn10300.c:1067 config/tc-sh.c:804
-#: config/tc-z80.c:666 read.c:4351
+#: config/tc-z80.c:666 read.c:4365
 #, c-format
 msgid "unsupported BFD relocation size %u"
 msgstr "no se admite el tamaño de reubicación BFD %u"
 
 #. Prototypes for static functions.
-#: config/tc-mips.c:1064
+#: config/tc-mips.c:1060
 #, c-format
 msgid "internal Error, line %d, %s"
 msgstr "Error interno, línea %d, %s"
 
-#: config/tc-mips.c:1825 config/tc-mips.c:13188
+#: config/tc-mips.c:1814 config/tc-mips.c:12891
 #, c-format
 msgid "Unrecognized register name `%s'"
 msgstr "No se reconoce el nombre de registro `%s'"
 
-#: config/tc-mips.c:1911
+#: config/tc-mips.c:1900
 msgid "-G may not be used in position-independent code"
 msgstr "-G no se puede usar en código independiente de posición"
 
-#: config/tc-mips.c:1960
+#: config/tc-mips.c:1949
 #, c-format
 msgid "internal: can't hash `%s': %s"
 msgstr "interno: no se puede dispersar `%s': %s"
 
-#: config/tc-mips.c:1968
+#: config/tc-mips.c:1957
 #, c-format
 msgid "internal error: bad mips16 opcode: %s %s\n"
 msgstr "error interno: código de operación mips16 erróneo: %s %s\n"
 
-#: config/tc-mips.c:2140
+#: config/tc-mips.c:2129
 #, c-format
 msgid "returned from mips_ip(%s) insn_opcode = 0x%x\n"
 msgstr "devuelto de mips_ip(%s) insn_opcode = 0x%x\n"
 
-#: config/tc-mips.c:3074 config/tc-mips.c:3082
+#: config/tc-mips.c:2958 config/tc-mips.c:14590
+msgid "extended instruction in delay slot"
+msgstr "instrucción extendida en ranura de retardo"
+
+#: config/tc-mips.c:3022 config/tc-mips.c:3029
 #, c-format
 msgid "jump to misaligned address (0x%lx)"
 msgstr "salto a una dirección mal alineada (0x%lx)"
 
-#: config/tc-mips.c:3093 config/tc-mips.c:4042
+#: config/tc-mips.c:3039 config/tc-mips.c:3810
 #, c-format
 msgid "branch to misaligned address (0x%lx)"
 msgstr "ramificación a una dirección mal alineada (0x%lx)"
 
-#: config/tc-mips.c:3098 config/tc-mips.c:4045
+#: config/tc-mips.c:3044 config/tc-mips.c:3813
 #, c-format
 msgid "branch address range overflow (0x%lx)"
 msgstr "desbordamiento de rango de salto de dirección (0x%lx)"
 
-#: config/tc-mips.c:3253 config/tc-mips.c:14896
-msgid "extended instruction in delay slot"
-msgstr "instrucción extendida en ranura de retardo"
-
 #. To reproduce this failure try assembling gas/testsuites/
 #. gas/mips/mips16-intermix.s with a mips-ecoff targeted
 #. assembler.
-#: config/tc-mips.c:3299
+#: config/tc-mips.c:3071
 #, c-format
 msgid "Unsupported MIPS relocation number %d"
 msgstr "No se admite el número de reubicación MIPS %d"
 
-#: config/tc-mips.c:3779
+#: config/tc-mips.c:3543
 msgid "Macro instruction expanded into multiple instructions in a branch delay slot"
 msgstr "Instrucción macro expandida en instrucciones múltiples en una ranura de retraso de ramificación"
 
-#: config/tc-mips.c:3782
+#: config/tc-mips.c:3546
 msgid "Macro instruction expanded into multiple instructions"
 msgstr "Instrucción macro expandida en instrucciones múltiples"
 
-#: config/tc-mips.c:4314
+#: config/tc-mips.c:4082 config/tc-mips.c:8005 config/tc-mips.c:8029
+#: config/tc-mips.c:8102 config/tc-mips.c:8125
 msgid "operand overflow"
 msgstr "desbordamiento de operando"
 
-#: config/tc-mips.c:4333 config/tc-mips.c:4933 config/tc-mips.c:8427
+#: config/tc-mips.c:4101 config/tc-mips.c:4701 config/tc-mips.c:8192
 msgid "Macro used $at after \".set noat\""
 msgstr "La macro utilizó $at después de \".set noat\""
 
-#: config/tc-mips.c:4362
+#: config/tc-mips.c:4130
 msgid "unsupported large constant"
 msgstr "no se admite la constante large"
 
-#: config/tc-mips.c:4364
+#: config/tc-mips.c:4132
 #, c-format
 msgid "Instruction %s requires absolute expression"
 msgstr "La instrucción %s requiere una expresión absoluta"
 
-#: config/tc-mips.c:4497 config/tc-mips.c:6798 config/tc-mips.c:7390
+#: config/tc-mips.c:4265 config/tc-mips.c:6567 config/tc-mips.c:7143
 #, c-format
 msgid "Number (0x%s) larger than 32 bits"
 msgstr "El número (0x%s) es más grande que 32 bits"
 
-#: config/tc-mips.c:4517
+#: config/tc-mips.c:4285
 msgid "Number larger than 64 bits"
 msgstr "El número es más grande que 64 bits"
 
-#: config/tc-mips.c:4811 config/tc-mips.c:4839 config/tc-mips.c:4877
-#: config/tc-mips.c:4922 config/tc-mips.c:7012 config/tc-mips.c:7051
-#: config/tc-mips.c:7090 config/tc-mips.c:7485 config/tc-mips.c:7537
+#: config/tc-mips.c:4579 config/tc-mips.c:4607 config/tc-mips.c:4645
+#: config/tc-mips.c:4690 config/tc-mips.c:6776 config/tc-mips.c:6815
+#: config/tc-mips.c:6854 config/tc-mips.c:7239 config/tc-mips.c:7291
 msgid "PIC code offset overflow (max 16 signed bits)"
 msgstr "Desbordamiento del desplazamiento del código PIC (máx 16 bits con signo)"
 
-#: config/tc-mips.c:5244 config/tc-mips.c:5310 config/tc-mips.c:5398
-#: config/tc-mips.c:5445 config/tc-mips.c:5507 config/tc-mips.c:5556
-#: config/tc-mips.c:8521 config/tc-mips.c:8528 config/tc-mips.c:8535
-#: config/tc-mips.c:8642
+#: config/tc-mips.c:5012 config/tc-mips.c:5078 config/tc-mips.c:5166
+#: config/tc-mips.c:5213 config/tc-mips.c:5274 config/tc-mips.c:5322
+#: config/tc-mips.c:8286 config/tc-mips.c:8293 config/tc-mips.c:8300
+#: config/tc-mips.c:8407
 msgid "Unsupported large constant"
 msgstr "No se admite la constante large"
 
 #. result is always true
-#: config/tc-mips.c:5276
+#: config/tc-mips.c:5044
 #, c-format
 msgid "Branch %s is always true"
 msgstr "La ramificación %s es siempre verdadera"
 
-#: config/tc-mips.c:5518 config/tc-mips.c:5567 config/tc-mips.c:9297
-#: config/tc-mips.c:9454
+#: config/tc-mips.c:5285 config/tc-mips.c:5333 config/tc-mips.c:9058
+#: config/tc-mips.c:9215
 #, c-format
 msgid "Improper position (%lu)"
 msgstr "Posición impropia (%lu)"
 
-#: config/tc-mips.c:5523 config/tc-mips.c:9364
+#: config/tc-mips.c:5291 config/tc-mips.c:9125
 #, c-format
 msgid "Improper extract size (%lu, position %lu)"
 msgstr "Tamaño de extract impropio (%lu, posición %lu)"
 
-#: config/tc-mips.c:5572 config/tc-mips.c:9328
+#: config/tc-mips.c:5339 config/tc-mips.c:9089
 #, c-format
 msgid "Improper insert size (%lu, position %lu)"
 msgstr "Tamaño de insert impropio (%lu, posición %lu)"
 
-#: config/tc-mips.c:5609 config/tc-mips.c:5706
+#: config/tc-mips.c:5376 config/tc-mips.c:5473
 msgid "Divide by zero."
 msgstr "División por cero."
 
-#: config/tc-mips.c:5792
+#: config/tc-mips.c:5559
 msgid "dla used to load 32-bit register"
 msgstr "Se usa dla para cargar registros de 32-bit"
 
-#: config/tc-mips.c:5795
+#: config/tc-mips.c:5562
 msgid "la used to load 64-bit address"
 msgstr "Se usa la para cargar registros de 64-bit"
 
-#: config/tc-mips.c:5819 config/tc-mips.c:6788 config/tc-mips.c:7380
-msgid "Expression too complex"
-msgstr "Expresión demasiado compleja"
-
-#: config/tc-mips.c:5907
-msgid "Offset too large"
-msgstr "Desplazamiento demasiado grande"
+#: config/tc-mips.c:5674 config/tc-z80.c:695
+msgid "offset too large"
+msgstr "desplazamiento demasiado grande"
 
-#: config/tc-mips.c:6079 config/tc-mips.c:6354
+#: config/tc-mips.c:5846 config/tc-mips.c:6121
 msgid "PIC code offset overflow (max 32 signed bits)"
 msgstr "Desbordamiento del desplazamiento del código PIC (máx 32 bits con signo)"
 
-#: config/tc-mips.c:6432
+#: config/tc-mips.c:6204
 msgid "MIPS PIC call to register other than $25"
 msgstr "Llamada PIC MIPS a un registro diferente de $25"
 
-#: config/tc-mips.c:6438 config/tc-mips.c:6449 config/tc-mips.c:6573
-#: config/tc-mips.c:6584
+#: config/tc-mips.c:6210 config/tc-mips.c:6221 config/tc-mips.c:6345
+#: config/tc-mips.c:6356
 msgid "No .cprestore pseudo-op used in PIC code"
 msgstr "No se utilizó el pseudo-operador .cprestore en el código PIC"
 
-#: config/tc-mips.c:6443 config/tc-mips.c:6578
+#: config/tc-mips.c:6215 config/tc-mips.c:6350
 msgid "No .frame pseudo-op used in PIC code"
 msgstr "No se utilizó el pseudo-operador .frame en el código PIC"
 
-#: config/tc-mips.c:6599
+#: config/tc-mips.c:6371
 msgid "Non-PIC jump used in PIC library"
 msgstr "Se usó un salto que no es PIC en una biblioteca PIC"
 
-#: config/tc-mips.c:6765
-#, c-format
-msgid "Opcode not supported on this processor: %s"
-msgstr "No se admite el código de operación en este procesador: %s"
-
-#: config/tc-mips.c:7643
+#: config/tc-mips.c:6534 config/tc-mips.c:7397
 #, c-format
 msgid "opcode not supported on this processor: %s"
 msgstr "no se admite el código de operación en este procesador: %s"
 
-#: config/tc-mips.c:7790 config/tc-mips.c:7821 config/tc-mips.c:7873
-#: config/tc-mips.c:7903
+#: config/tc-mips.c:7544 config/tc-mips.c:7575 config/tc-mips.c:7627
+#: config/tc-mips.c:7657
 msgid "Improper rotate count"
 msgstr "Cuenta de rotación impropia"
 
-#: config/tc-mips.c:7942
+#: config/tc-mips.c:7707
 #, c-format
 msgid "Instruction %s: result is always false"
 msgstr "Instrucción %s: el resultado es siempre falso"
 
-#: config/tc-mips.c:8103
+#: config/tc-mips.c:7868
 #, c-format
 msgid "Instruction %s: result is always true"
 msgstr "Instrucción %s: el resultado es siempre verdadero"
 
-#: config/tc-mips.c:8240 config/tc-mips.c:8264 config/tc-mips.c:8337
-#: config/tc-mips.c:8360
-msgid "Operand overflow"
-msgstr "Desbordamiento de operando"
-
 #. FIXME: Check if this is one of the itbl macros, since they
 #. are added dynamically.
-#: config/tc-mips.c:8423
+#: config/tc-mips.c:8188
 #, c-format
 msgid "Macro %s not implemented yet"
 msgstr "La macro %s aún no está implementada"
 
-#: config/tc-mips.c:8673
+#: config/tc-mips.c:8438
 #, c-format
 msgid "internal: bad mips opcode (mask error): %s %s"
 msgstr "interno: código de operación mips erróneo (error de máscara): %s %s"
 
-#: config/tc-mips.c:8718
+#: config/tc-mips.c:8478 config/tc-mips.c:9289
 #, c-format
 msgid "internal: bad mips opcode (unknown extension operand type `+%c'): %s %s"
 msgstr "interno: código de operación mips erróneo (tipo de operando de extensión `+%c' desconocido): %s %s"
 
-#: config/tc-mips.c:8797
+#: config/tc-mips.c:8557
 #, c-format
 msgid "internal: bad mips opcode (unknown operand type `%c'): %s %s"
 msgstr "interno: código de operación mips erróneo (tipo de operando `%c' desconocido): %s %s"
 
-#: config/tc-mips.c:8804
+#: config/tc-mips.c:8564
 #, c-format
 msgid "internal: bad mips opcode (bits 0x%lx undefined): %s %s"
 msgstr "interno: código de operación mips erróneo (bits 0x%lx indefinidos): %s %s"
 
-#: config/tc-mips.c:8927 config/tc-mips.c:8935
-msgid "Unrecognized opcode"
-msgstr "No se reconoce el código de operación"
+#: config/tc-mips.c:8687 config/tc-mips.c:8695 config/tc-mips.c:10179
+#: config/tc-score.c:2696 config/tc-score.c:2742
+msgid "unrecognized opcode"
+msgstr "no se reconoce el código de operación"
 
-#: config/tc-mips.c:8962 config/tc-mips.c:10524
+#: config/tc-mips.c:8722 config/tc-mips.c:10205
 #, c-format
 msgid "opcode not supported on this processor: %s (%s)"
 msgstr "no se admite el código de operación en este procesador: %s (%s)"
 
-#: config/tc-mips.c:8996
+#: config/tc-mips.c:8756
 #, c-format
 msgid "BALIGN immediate not 1 or 3 (%lu)"
 msgstr "El inmediato BALING no es 1 o 3 (%lu)"
 
-#: config/tc-mips.c:9009 config/tc-mips.c:9022 config/tc-mips.c:9035
-#: config/tc-mips.c:9048 config/tc-mips.c:9074 config/tc-mips.c:9118
+#: config/tc-mips.c:8769 config/tc-mips.c:8782 config/tc-mips.c:8795
+#: config/tc-mips.c:8808 config/tc-mips.c:8834 config/tc-mips.c:8878
 #, c-format
 msgid "DSP immediate not in range 0..%d (%lu)"
 msgstr "el inmediato DSP no está en el rango 0..%d (%lu)"
 
-#: config/tc-mips.c:9066 config/tc-mips.c:9093
+#: config/tc-mips.c:8826 config/tc-mips.c:8853
 msgid "Invalid dsp acc register"
 msgstr "Registro acc dsp inválido"
 
-#: config/tc-mips.c:9104 config/tc-mips.c:9135 config/tc-mips.c:9152
+#: config/tc-mips.c:8864 config/tc-mips.c:8895 config/tc-mips.c:8912
 #, c-format
 msgid "DSP immediate not in range %ld..%ld (%ld)"
 msgstr "El inmediato DSP no está en el rango %ld..%ld (%ld)"
 
-#: config/tc-mips.c:9165
+#: config/tc-mips.c:8925
 #, c-format
 msgid "MT usermode bit not 0 or 1 (%lu)"
 msgstr "El bit de modo de usuario MT no es 0 o 1 (%lu)"
 
-#: config/tc-mips.c:9176
+#: config/tc-mips.c:8936
 #, c-format
 msgid "MT load high bit not 0 or 1 (%lu)"
 msgstr "el bit alto de load MT no es 0 o 1 (%lu)"
 
-#: config/tc-mips.c:9193 config/tc-mips.c:9206
+#: config/tc-mips.c:8953 config/tc-mips.c:8966
 msgid "Invalid dsp/smartmips acc register"
 msgstr "Registro acc dsp/smartmips inválido"
 
-#: config/tc-mips.c:9270
+#: config/tc-mips.c:9031
 #, c-format
 msgid "Illegal %s number (%lu, 0x%lx)"
 msgstr "Número %s ilegal (%lu, 0x%lx)"
 
-#: config/tc-mips.c:9383 config/tc-mips.c:10032
+#: config/tc-mips.c:9144 config/tc-mips.c:9716
 msgid "absolute expression required"
 msgstr "se requiere una expresión absoluta"
 
-#: config/tc-mips.c:9406
+#: config/tc-mips.c:9167
 #, c-format
 msgid "Invalid register number (%d)"
 msgstr "Número de registro inválido (%d)"
 
-#: config/tc-mips.c:9414
+#: config/tc-mips.c:9175
 msgid "Invalid coprocessor 0 register number"
 msgstr "Número de registro 0 de coprocesador inválido"
 
-#: config/tc-mips.c:9424
+#: config/tc-mips.c:9185
 #, c-format
 msgid "Improper bit index (%lu)"
 msgstr "�ndice de bit impropio (%lu)"
 
-#: config/tc-mips.c:9485 config/tc-mips.c:9502
+#: config/tc-mips.c:9246 config/tc-mips.c:9263
 #, c-format
 msgid "Improper size (%lu)"
 msgstr "Tamaño impropio (%lu)"
 
-#: config/tc-mips.c:9518
+#: config/tc-mips.c:9279
 #, c-format
 msgid "Improper immediate (%ld)"
 msgstr "Inmediato impropio (%ld)"
 
-#: config/tc-mips.c:9535 config/tc-mips.c:9552 config/tc-mips.c:9572
-#, c-format
-msgid "Offset not in range %ld..%ld (%ld)"
-msgstr "El desplazamiento no está en el rango %ld..%ld (%ld)"
-
-#: config/tc-mips.c:9578
-#, c-format
-msgid "Offset not 16 bytes alignment (%ld)"
-msgstr "El desplazamiento no está alineado a 16 bytes (%ld)"
-
-#: config/tc-mips.c:9593 config/tc-mips.c:10705
-msgid "used $at without \".set noat\""
-msgstr "se utilizó $at sin \".set noat\""
-
-#: config/tc-mips.c:9595 config/tc-mips.c:10707
-#, c-format
-msgid "used $%u with \".set at=$%u\""
-msgstr "se utilizó $%u sin \".set at=$%u\""
-
-#: config/tc-mips.c:9608
-#, c-format
-msgid "Internal error: bad mips opcode (unknown extension operand type `+%c'): %s %s"
-msgstr "Error interno: código de operación mips erróneo (tipo de operando de extensión `+%c' desconocido): %s %s"
-
-#: config/tc-mips.c:9626
+#: config/tc-mips.c:9306
 #, c-format
 msgid "Improper shift amount (%lu)"
 msgstr "Cantidad de desplazamiento impropia (%lu)"
 
-#: config/tc-mips.c:9650 config/tc-mips.c:10845 config/tc-mips.c:11098
+#: config/tc-mips.c:9330 config/tc-mips.c:10526 config/tc-mips.c:10779
 #, c-format
 msgid "Invalid value for `%s' (%lu)"
 msgstr "Valor inválido para `%s' (%lu)"
 
-#: config/tc-mips.c:9686
+#: config/tc-mips.c:9366
 #, c-format
 msgid "Code for %s not in range 0..1023 (%lu)"
 msgstr "El código para %s no está en el rango 0..1023 (%lu)"
 
-#: config/tc-mips.c:9698
+#: config/tc-mips.c:9378
 #, c-format
 msgid "Lower code for %s not in range 0..1023 (%lu)"
 msgstr "El código más bajo para %s no está en el rango 0..1023 (%lu)"
 
-#: config/tc-mips.c:9710
+#: config/tc-mips.c:9390
 #, c-format
 msgid "Code for %s not in range 0..1048575 (%lu)"
 msgstr "El código para %s no está en el rango 0..1048575 (%lu)"
 
-#: config/tc-mips.c:9723
+#: config/tc-mips.c:9403
 #, c-format
 msgid "Coproccesor code > 25 bits (%lu)"
 msgstr "Código de coprocesador > 25 bits (%lu)"
 
-#: config/tc-mips.c:9737
+#: config/tc-mips.c:9417
 #, c-format
 msgid "Illegal 19-bit code (%lu)"
 msgstr "Código de 19-bit ilegal (%lu)"
 
-#: config/tc-mips.c:9750
+#: config/tc-mips.c:9430
 #, c-format
 msgid "Invalid performance register (%lu)"
 msgstr "Registro de rendimiento inválido (%lu)"
 
-#: config/tc-mips.c:9795
+#: config/tc-mips.c:9473 config/tc-mips.c:10386
+msgid "used $at without \".set noat\""
+msgstr "se utilizó $at sin \".set noat\""
+
+#: config/tc-mips.c:9475 config/tc-mips.c:10388
 #, c-format
-msgid "Used $%u with \".set at=$%u\""
-msgstr "se utilizó $%u con \".set at=$%u\""
+msgid "used $%u with \".set at=$%u\""
+msgstr "se utilizó $%u sin \".set at=$%u\""
 
-#: config/tc-mips.c:9822
-msgid "Source and destination must be different"
-msgstr "La fuente y el destino deben ser diferentes"
+#: config/tc-mips.c:9501
+msgid "source and destination must be different"
+msgstr "la fuente y el destino deben ser diferentes"
 
-#: config/tc-mips.c:9828
-msgid "A destination register must be supplied"
-msgstr "Se debe proporcionar un registro destino"
+#: config/tc-mips.c:9506
+msgid "a destination register must be supplied"
+msgstr "se debe proporcionar un registro destino"
 
-#: config/tc-mips.c:9891
+#: config/tc-mips.c:9575
 #, c-format
 msgid "Improper align amount (%ld), using low bits"
 msgstr "Cantidad de desplazamiento impropia (%ld), se usan bits bajos"
 
-#: config/tc-mips.c:9905
+#: config/tc-mips.c:9589
 #, c-format
 msgid "Invalid MDMX Immediate (%ld)"
 msgstr "Inmediato MDMX inválido (%ld)"
 
-#: config/tc-mips.c:9943
+#: config/tc-mips.c:9627
 #, c-format
 msgid "Float register should be even, was %d"
 msgstr "El registro de coma flotante debería ser par, era %d"
 
-#: config/tc-mips.c:9982
+#: config/tc-mips.c:9666
 #, c-format
 msgid "Bad element selector %ld"
 msgstr "Selector de elemento %ld erróneo"
 
-#: config/tc-mips.c:9990
+#: config/tc-mips.c:9674
 #, c-format
 msgid "Expecting ']' found '%s'"
 msgstr "Se esperaba ']', se encontró '%s'"
 
-#: config/tc-mips.c:10096
+#: config/tc-mips.c:9780
 #, c-format
 msgid "Bad floating point constant: %s"
 msgstr "Constante de coma flotante errónea: %s"
 
-#: config/tc-mips.c:10216
+#: config/tc-mips.c:9900
 msgid "Can't use floating point insn in this section"
 msgstr "No se pueden utilizar insn de coma flotante en esta sección"
 
-#: config/tc-mips.c:10275
-msgid "Expression out of range"
-msgstr "Expresión fuera de rango"
+#: config/tc-mips.c:9959
+msgid "expression out of range"
+msgstr "expresión fuera de rango"
 
-#: config/tc-mips.c:10319
-#, c-format
-msgid "lui expression (%lu) not in range 0..65535"
-msgstr "La expresión lui (%lu) no está en el rango 0..65535"
+#: config/tc-mips.c:10003
+msgid "lui expression not in range 0..65535"
+msgstr "la expresión lui no está en el rango 0..65535"
 
-#: config/tc-mips.c:10341
+#: config/tc-mips.c:10024
 #, c-format
 msgid "Condition code register should be even for %s, was %d"
 msgstr "El registro de código de condición debería ser par para %s, era %d"
 
-#: config/tc-mips.c:10347
+#: config/tc-mips.c:10029
 #, c-format
 msgid "Condition code register should be 0 or 4 for %s, was %d"
 msgstr "El registro de código de condición debería ser 0 o 4 para %s, era %d"
 
-#: config/tc-mips.c:10374
-msgid "Invalid coprocessor sub-selection value (0-7)"
-msgstr "Valor de subselección de coprocesador (0-7) inválido"
+#: config/tc-mips.c:10055
+msgid "invalid coprocessor sub-selection value (0-7)"
+msgstr "valor de subselección de coprocesador (0-7) inválido"
 
-#: config/tc-mips.c:10386 config/tc-mips.c:10403
+#: config/tc-mips.c:10067 config/tc-mips.c:10084
 #, c-format
 msgid "bad byte vector index (%ld)"
 msgstr "índice de vector de byte erróneo (%ld)"
 
-#: config/tc-mips.c:10414
+#: config/tc-mips.c:10095
 #, c-format
-msgid "Bad char = '%c'\n"
-msgstr "Carácter erróneo = '%c'\n"
+msgid "bad char = '%c'\n"
+msgstr "carácter erróneo = '%c'\n"
 
-#: config/tc-mips.c:10498 config/tc-score.c:2696 config/tc-score.c:2742
-msgid "unrecognized opcode"
-msgstr "no se reconoce el código de operación"
+#: config/tc-mips.c:10106 config/tc-mips.c:10111 config/tc-mips.c:10804
+msgid "illegal operands"
+msgstr "operandos ilegales"
 
-#: config/tc-mips.c:10881 config/tc-mips.c:10962 config/tc-mips.c:10977
+#: config/tc-mips.c:10562 config/tc-mips.c:10643 config/tc-mips.c:10658
 msgid "can't parse register list"
 msgstr "no se puede decodificar la lista de registros"
 
-#: config/tc-mips.c:10950
+#: config/tc-mips.c:10631
 msgid "more than one frame size in list"
 msgstr "más de un tamaño de marco en la lista"
 
-#: config/tc-mips.c:11005
+#: config/tc-mips.c:10686
 msgid "unexpected register in list"
 msgstr "registro inesperado en la lista"
 
-#: config/tc-mips.c:11015
+#: config/tc-mips.c:10696
 msgid "arg/static registers overlap"
 msgstr "los registros arg/static se sobreescriben"
 
-#: config/tc-mips.c:11033
+#: config/tc-mips.c:10714
 msgid "invalid arg register list"
 msgstr "lista de registros arg inválida"
 
-#: config/tc-mips.c:11042 config/tc-mips.c:11065
+#: config/tc-mips.c:10723 config/tc-mips.c:10746
 msgid "invalid static register list"
 msgstr "lista de registros static inválida"
 
-#: config/tc-mips.c:11072
+#: config/tc-mips.c:10753
 msgid "missing frame size"
 msgstr "falta el tamaño del marco"
 
-#: config/tc-mips.c:11075
+#: config/tc-mips.c:10756
 msgid "invalid frame size"
 msgstr "tamaño de marco inválido"
 
-#: config/tc-mips.c:11123
-msgid "illegal operands"
-msgstr "operandos ilegales"
-
-#: config/tc-mips.c:11241
+#: config/tc-mips.c:10922
 msgid "extended operand requested but not required"
 msgstr "se solicitó un operando extendido pero se necesita"
 
-#: config/tc-mips.c:11243
+#: config/tc-mips.c:10924
 msgid "invalid unextended operand value"
 msgstr "valor de operando no extendido inválido"
 
-#: config/tc-mips.c:11271
+#: config/tc-mips.c:10952
 msgid "operand value out of range for instruction"
 msgstr "el valor del operando está fuera de rango para la instrucción"
 
-#: config/tc-mips.c:11376
+#: config/tc-mips.c:11057
 #, c-format
 msgid "relocation %s isn't supported by the current ABI"
 msgstr "la ABI actual no admite la reubicación %s"
 
-#: config/tc-mips.c:11432
+#: config/tc-mips.c:11113
 msgid "unclosed '('"
 msgstr "'(' sin cerrar"
 
-#: config/tc-mips.c:11699
+#: config/tc-mips.c:11400
 #, c-format
 msgid "A different %s was already specified, is now %s"
 msgstr "Ya se había especificado un %s diferente, ahora es %s"
 
-#: config/tc-mips.c:11970
+#: config/tc-mips.c:11671
 msgid "-call_shared is supported only for ELF format"
 msgstr "-call_shared sólo se admite en el formato ELF"
 
-#: config/tc-mips.c:11980
+#: config/tc-mips.c:11681
 msgid "-call_nonpic is supported only for ELF format"
 msgstr "-call_nonpic sólo se admite en el formato ELF"
 
-#: config/tc-mips.c:11990
+#: config/tc-mips.c:11691
 msgid "-non_shared is supported only for ELF format"
 msgstr "-non_shared sólo se admite en el formato ELF"
 
-#: config/tc-mips.c:12023
+#: config/tc-mips.c:11724
 msgid "-n32 is supported for ELF format only"
 msgstr "-n32 sólo se admite en el formato ELF"
 
-#: config/tc-mips.c:12032
+#: config/tc-mips.c:11733
 msgid "-64 is supported for ELF format only"
 msgstr "-64 sólo se admite en el formato ELF"
 
-#: config/tc-mips.c:12037 config/tc-mips.c:12090
+#: config/tc-mips.c:11738 config/tc-mips.c:11791
 msgid "No compiled in support for 64 bit object file format"
 msgstr "No se compiló el soporte para el formato de fichero objeto de 64 bit"
 
-#: config/tc-mips.c:12077
+#: config/tc-mips.c:11778
 msgid "-mabi is supported for ELF format only"
 msgstr "-mabi sólo se admite en el formato ELF"
 
-#: config/tc-mips.c:12097
+#: config/tc-mips.c:11798
 #, c-format
 msgid "invalid abi -mabi=%s"
 msgstr "interruptor abi -mabi=%s inválido"
 
-#: config/tc-mips.c:12177
+#: config/tc-mips.c:11878
 msgid "-G not supported in this configuration."
 msgstr "-G no se admite en esta configuración."
 
-#: config/tc-mips.c:12203
+#: config/tc-mips.c:11904
 #, c-format
 msgid "-%s conflicts with the other architecture options, which imply -%s"
 msgstr "-%s tiene conflictos con las otras opciones de arquitectura, las cuales implican -%s"
 
-#: config/tc-mips.c:12215
+#: config/tc-mips.c:11916
 #, c-format
 msgid "-march=%s is not compatible with the selected ABI"
 msgstr "-march=%s no es compatible con la ABI seleccionada"
 
-#: config/tc-mips.c:12234
+#: config/tc-mips.c:11935
 msgid "-mgp64 used with a 32-bit processor"
 msgstr "Se utilizó -mgp64 con un procesador de 32-bit"
 
-#: config/tc-mips.c:12236
+#: config/tc-mips.c:11937
 msgid "-mgp32 used with a 64-bit ABI"
 msgstr "se utilizó -mgp32 con un ABI de 64-bit"
 
-#: config/tc-mips.c:12238
+#: config/tc-mips.c:11939
 msgid "-mgp64 used with a 32-bit ABI"
 msgstr "se utilizó -mgp64 con un ABI de 32-bit"
 
-#: config/tc-mips.c:12276
+#: config/tc-mips.c:11977
 msgid "-mfp64 used with a 32-bit fpu"
 msgstr "se utilizó -mfp64 con un fpu de 32-bit"
 
-#: config/tc-mips.c:12279
+#: config/tc-mips.c:11980
 msgid "-mfp64 used with a 32-bit ABI"
 msgstr "se utilizó -mfp64 con un ABI de 32-bit"
 
-#: config/tc-mips.c:12283
+#: config/tc-mips.c:11984
 msgid "-mfp32 used with a 64-bit ABI"
 msgstr "se utilizó -mfp32 con un ABI de 64-bit"
 
-#: config/tc-mips.c:12297
+#: config/tc-mips.c:11998
 msgid "trap exception not supported at ISA 1"
 msgstr "la excepción de trampa no se admite en ISA 1"
 
-#: config/tc-mips.c:12307
+#: config/tc-mips.c:12008
 msgid "-mfp32 used with -mips3d"
 msgstr "se utilizó -mfp32 con -mips3d"
 
-#: config/tc-mips.c:12313
+#: config/tc-mips.c:12014
 msgid "-mfp32 used with -mdmx"
 msgstr "se utilizó -mfp32 con -mdmx"
 
-#: config/tc-mips.c:12318
+#: config/tc-mips.c:12019
 #, c-format
 msgid "%s ISA does not support SmartMIPS"
 msgstr "ISA %s no admite SmartMIPS"
 
-#: config/tc-mips.c:12324 config/tc-mips.c:13280
+#: config/tc-mips.c:12025 config/tc-mips.c:12983
 #, c-format
 msgid "%s ISA does not support DSP ASE"
 msgstr "ISA %s no admite DSP ASE"
 
-#: config/tc-mips.c:12333 config/tc-mips.c:13293
+#: config/tc-mips.c:12034 config/tc-mips.c:12996
 #, c-format
 msgid "%s ISA does not support DSP R2 ASE"
 msgstr "ISA %s no admite DSP R2 ASE"
 
-#: config/tc-mips.c:12339 config/tc-mips.c:13306
+#: config/tc-mips.c:12040 config/tc-mips.c:13009
 #, c-format
 msgid "%s ISA does not support MT ASE"
 msgstr "ISA %s no admite MT ASE"
 
-#: config/tc-mips.c:12387
+#: config/tc-mips.c:12089
 msgid "PC relative MIPS16 instruction references a different section"
 msgstr "la instrucción MIPS16 relativa a PC referencía a una sección diferente"
 
-#: config/tc-mips.c:12685 config/tc-sparc.c:3184 config/tc-sparc.c:3191
+#: config/tc-mips.c:12387 config/tc-sparc.c:3184 config/tc-sparc.c:3191
 #: config/tc-sparc.c:3198 config/tc-sparc.c:3205 config/tc-sparc.c:3212
 #: config/tc-sparc.c:3221 config/tc-sparc.c:3232 config/tc-sparc.c:3254
-#: config/tc-sparc.c:3278 write.c:1138
+#: config/tc-sparc.c:3278 write.c:1132
 msgid "relocation overflow"
 msgstr "desbordamiento de reubicación"
 
-#: config/tc-mips.c:12695
+#: config/tc-mips.c:12397
 #, c-format
 msgid "Branch to misaligned address (%lx)"
 msgstr "Ramificación a una dirección mal alineada (%lx)"
 
-#: config/tc-mips.c:12742
+#: config/tc-mips.c:12444
 msgid "Branch out of range"
 msgstr "Ramificación fuera de rango"
 
-#: config/tc-mips.c:12824
+#: config/tc-mips.c:12526
 #, c-format
 msgid "Alignment too large: %d. assumed."
 msgstr "Alineación demasiado grande: se asume %d."
 
-#: config/tc-mips.c:12827
+#: config/tc-mips.c:12529
 msgid "Alignment negative: 0 assumed."
 msgstr "Alineación negativa: se asume 0."
 
-#: config/tc-mips.c:13085
+#: config/tc-mips.c:12788
 #, c-format
 msgid "%s: no such section"
 msgstr "%s: no existe tal sección"
 
-#: config/tc-mips.c:13134
+#: config/tc-mips.c:12837
 #, c-format
 msgid ".option pic%d not supported"
 msgstr "No se admite .option pic%d"
 
-#: config/tc-mips.c:13139 config/tc-mips.c:13446
+#: config/tc-mips.c:12842 config/tc-mips.c:13149
 msgid "-G may not be used with SVR4 PIC code"
 msgstr "-G no se puede utilizar con código PIC de SVR4"
 
-#: config/tc-mips.c:13145
+#: config/tc-mips.c:12848
 #, c-format
 msgid "Unrecognized option \"%s\""
 msgstr "No se reconoce la opción \"%s\""
 
-#: config/tc-mips.c:13205
+#: config/tc-mips.c:12908
 msgid "`noreorder' must be set before `nomacro'"
 msgstr "se debe establecer `noreorder' antes de `nomacro'"
 
-#: config/tc-mips.c:13231
+#: config/tc-mips.c:12934
 #, c-format
 msgid "%s isa does not support 64-bit registers"
 msgstr "isa %s no admite registros de 64-bit"
 
-#: config/tc-mips.c:13242
+#: config/tc-mips.c:12945
 #, c-format
 msgid "%s isa does not support 64-bit floating point registers"
 msgstr "isa %s no admite registros de coma flotante de 64-bit"
 
-#: config/tc-mips.c:13263
+#: config/tc-mips.c:12966
 #, c-format
 msgid "%s ISA does not support SmartMIPS ASE"
 msgstr "ISA %s no admite SmartMIPS ASE"
 
-#: config/tc-mips.c:13330
+#: config/tc-mips.c:13033
 #, c-format
 msgid "unknown architecture %s"
 msgstr "arquitectura %s desconocida"
 
-#: config/tc-mips.c:13343 config/tc-mips.c:13373
+#: config/tc-mips.c:13046 config/tc-mips.c:13076
 #, c-format
 msgid "unknown ISA level %s"
 msgstr "nivel ISA %s desconocido"
 
-#: config/tc-mips.c:13351
+#: config/tc-mips.c:13054
 #, c-format
 msgid "unknown ISA or architecture %s"
 msgstr "ISA o arquitectura %s desconocidos"
 
-#: config/tc-mips.c:13401
+#: config/tc-mips.c:13104
 msgid ".set pop with no .set push"
 msgstr ".set pop sin .set push"
 
-#: config/tc-mips.c:13430
+#: config/tc-mips.c:13133
 #, c-format
 msgid "Tried to set unrecognized symbol: %s\n"
 msgstr "Se trató de establecer el símbolo que no se reconoce: %s\n"
 
-#: config/tc-mips.c:13488
+#: config/tc-mips.c:13191
 msgid ".cpload not in noreorder section"
 msgstr ".cpload no está en la sección noreorder"
 
-#: config/tc-mips.c:13556 config/tc-mips.c:13575
+#: config/tc-mips.c:13259 config/tc-mips.c:13278
 msgid "missing argument separator ',' for .cpsetup"
 msgstr "falta el separador de argumentos ',' para .cpsetup"
 
-#: config/tc-mips.c:13733
+#: config/tc-mips.c:13436
 #, c-format
 msgid "Unsupported use of %s"
 msgstr "No se admite el uso de %s"
 
-#: config/tc-mips.c:13815 config/tc-score.c:6035
+#: config/tc-mips.c:13518 config/tc-score.c:6035
 msgid "Unsupported use of .gpword"
 msgstr "No se admite el uso de .gpword"
 
-#: config/tc-mips.c:13855
+#: config/tc-mips.c:13558
 msgid "Unsupported use of .gpdword"
 msgstr "No se admite el uso de .gpdword"
 
-#: config/tc-mips.c:13949
+#: config/tc-mips.c:13652
 #, c-format
 msgid "ignoring attempt to redefine symbol %s"
 msgstr "se ignora el intento de redefinir el símbolo %s"
 
-#: config/tc-mips.c:13964 ecoff.c:3378
+#: config/tc-mips.c:13667 ecoff.c:3378
 msgid "bad .weakext directive"
 msgstr "directiva .weakext errónea"
 
-#: config/tc-mips.c:14200
+#: config/tc-mips.c:13903
 msgid "unsupported PC relative reference to different section"
 msgstr "no se admite la referencia relativa a PC a una sección diferente"
 
-#: config/tc-mips.c:14313 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
+#: config/tc-mips.c:14016 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
 msgid "unsupported relocation"
 msgstr "no se admite la reubicación"
 
-#: config/tc-mips.c:14571 config/tc-pdp11.c:1424
+#: config/tc-mips.c:14269 config/tc-pdp11.c:1431
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr "No se puede representar la reubicación %s en este formato de fichero objeto"
 
-#: config/tc-mips.c:14656
-msgid "Relaxed out-of-range branch into a jump"
-msgstr "Ramificación relajada fuera de rango en un salto"
+#: config/tc-mips.c:14354
+msgid "relaxed out-of-range branch into a jump"
+msgstr "ramificación relajada fuera de rango en un salto"
 
-#: config/tc-mips.c:15217
+#: config/tc-mips.c:14901
 msgid "missing .end at end of assembly"
 msgstr "falta un .end al final del ensamblado"
 
-#: config/tc-mips.c:15232 config/tc-score.c:5644
+#: config/tc-mips.c:14916 config/tc-score.c:5644
 msgid "expected simple number"
 msgstr "se esperaba un número simple"
 
-#: config/tc-mips.c:15260 config/tc-score.c:5671
+#: config/tc-mips.c:14944 config/tc-score.c:5671
 msgid "invalid number"
 msgstr "número inválido"
 
-#: config/tc-mips.c:15428 config/tc-score.c:5710
+#: config/tc-mips.c:15112 config/tc-score.c:5710
 msgid "missing .end"
 msgstr "falta un .end"
 
-#: config/tc-mips.c:15480
+#: config/tc-mips.c:15164
 msgid "Bad .frame directive"
 msgstr "Directiva .frame errónea"
 
-#: config/tc-mips.c:15512
+#: config/tc-mips.c:15196
 msgid ".mask/.fmask outside of .ent"
 msgstr ".mask/.fmask fuera de .ent"
 
-#: config/tc-mips.c:15519
+#: config/tc-mips.c:15203
 msgid "Bad .mask/.fmask directive"
 msgstr "Directiva .mask/.fmask errónea"
 
-#: config/tc-mips.c:15796
+#: config/tc-mips.c:15478
 #, c-format
 msgid "Bad value (%s) for %s"
 msgstr "Valor erróneo (%s) para %s"
 
-#: config/tc-mips.c:15860
+#: config/tc-mips.c:15542
 #, c-format
 msgid ""
 "MIPS options:\n"
@@ -9993,7 +9877,7 @@ msgstr ""
 "-G NUM\t\t\tpermite la referencia a objetos hasta NUM bytes\n"
 "\t\t\timplícitamente con el registro gp [por defecto 8]\n"
 
-#: config/tc-mips.c:15867
+#: config/tc-mips.c:15549
 #, c-format
 msgid ""
 "-mips1\t\t\tgenerate MIPS ISA I instructions\n"
@@ -10017,7 +9901,7 @@ msgstr ""
 "-mips64                 genera instrucciones MIPS64 ISA\n"
 "-march=CPU/-mtune=CPU\tgenera código/calendarización para el CPU, donde CPU es uno de:\n"
 
-#: config/tc-mips.c:15886
+#: config/tc-mips.c:15568
 #, c-format
 msgid ""
 "-mCPU\t\t\tequivalent to -march=CPU -mtune=CPU. Deprecated.\n"
@@ -10028,7 +9912,7 @@ msgstr ""
 "-no-mCPU\t\tno genera código específico para el CPU.\n"
 "\t\t\tPara -mCPU y -no-mCPU, CPU debe ser uno de:\n"
 
-#: config/tc-mips.c:15899
+#: config/tc-mips.c:15581
 #, c-format
 msgid ""
 "-mips16\t\t\tgenerate mips16 instructions\n"
@@ -10037,7 +9921,7 @@ msgstr ""
 "-mips16\t\t\tgenera instrucciones mips16\n"
 "-no-mips16\t\tno genera instrucciones mips16\n"
 
-#: config/tc-mips.c:15902
+#: config/tc-mips.c:15584
 #, c-format
 msgid ""
 "-msmartmips\t\tgenerate smartmips instructions\n"
@@ -10046,7 +9930,7 @@ msgstr ""
 "-msmartmips\t\tgenera instrucciones smartmips\n"
 "-no-smartmips\t\tno genera instrucciones smartmips\n"
 
-#: config/tc-mips.c:15905
+#: config/tc-mips.c:15587
 #, c-format
 msgid ""
 "-mdsp\t\t\tgenerate DSP instructions\n"
@@ -10055,7 +9939,7 @@ msgstr ""
 "-mdsp\t\t\tgenera instrucciones DSP\n"
 "-mno-dsp\t\tno genera instrucciones DSP\n"
 
-#: config/tc-mips.c:15908
+#: config/tc-mips.c:15590
 #, c-format
 msgid ""
 "-mdspr2\t\t\tgenerate DSP R2 instructions\n"
@@ -10064,7 +9948,7 @@ msgstr ""
 "-mdspr2\t\t\tgenera instrucciones DSP R2\n"
 "-mno-dspr2\t\tno genera instrucciones DSP R2\n"
 
-#: config/tc-mips.c:15911
+#: config/tc-mips.c:15593
 #, c-format
 msgid ""
 "-mmt\t\t\tgenerate MT instructions\n"
@@ -10073,7 +9957,7 @@ msgstr ""
 "-mmt\t\t\tgenera instrucciones MT\n"
 "-mno-mt\t\tno genera instrucciones MT\n"
 
-#: config/tc-mips.c:15914
+#: config/tc-mips.c:15596
 #, c-format
 msgid ""
 "-mfix-loongson2f-jump\twork around Loongson2F JUMP instructions\n"
@@ -10104,7 +9988,7 @@ msgstr ""
 "--trap, --no-break\texcepción trap en div por 0 y desbordamiento de mult\n"
 "--break, --no-trap\texcepción break en div por 0 y desbordamiento de mult\n"
 
-#: config/tc-mips.c:15928
+#: config/tc-mips.c:15610
 #, c-format
 msgid ""
 "-mhard-float\t\tallow floating-point instructions\n"
@@ -10119,7 +10003,7 @@ msgstr ""
 "-mdouble-float\t\tpermite operaciones de coma flotante de 32 y 64 bits\n"
 "--[no-]construct-floats [des]activa valores de coma flotante a construir\n"
 
-#: config/tc-mips.c:15936
+#: config/tc-mips.c:15618
 #, c-format
 msgid ""
 "-KPIC, -call_shared\tgenerate SVR4 position independent code\n"
@@ -10142,7 +10026,7 @@ msgstr ""
 "                        código que no es compartido\n"
 "-mabi=ABI\t\tcrea un fichero objeto que cumple con el ABI para:\n"
 
-#: config/tc-mips.c:15957
+#: config/tc-mips.c:15639
 #, c-format
 msgid ""
 "-32\t\t\tcreate o32 ABI object file (default)\n"
@@ -10382,7 +10266,7 @@ msgstr "no se admite el paso hacia atrás de una expresión LOC"
 #. We will only get here in rare cases involving #NO_APP,
 #. where the unterminated string is not recognized by the
 #. preformatting pass.
-#: config/tc-mmix.c:4034 config/tc-mmix.c:4192 config/tc-z80.c:1695
+#: config/tc-mmix.c:4034 config/tc-mmix.c:4192 config/tc-z80.c:1686
 msgid "unterminated string"
 msgstr "cadena sin terminar"
 
@@ -10767,12 +10651,12 @@ msgstr "%s no puede ocupar la ranura de retardo de otra insn de ramificación."
 
 #: config/tc-mt.c:261
 #, c-format
-msgid "operand references R%ld of previous instruction."
+msgid "operand references R%ld of previous instrutcion."
 msgstr "el operando se refiere a R%ld de la instrucción previa."
 
 #: config/tc-mt.c:267
 #, c-format
-msgid "operand references R%ld of instruction before previous."
+msgid "operand references R%ld of instructcion before previous."
 msgstr "el operando se refiere a R%ld de la instrucción anterior a la previa."
 
 #: config/tc-mt.c:281 config/tc-mt.c:286
@@ -11015,63 +10899,67 @@ msgstr "Error en la expresión"
 msgid "Low order bits truncated in immediate float operand"
 msgstr "Se truncaron los bits de orden inferior en el operando de coma flotante inmediato"
 
-#: config/tc-pdp11.c:611
+#: config/tc-pdp11.c:532
+msgid "Label expected"
+msgstr "Se esperaba una etiqueta"
+
+#: config/tc-pdp11.c:618
 msgid "Float AC not legal as integer operand"
 msgstr "AC de coma flotante no es legal como operando entero"
 
-#: config/tc-pdp11.c:631
+#: config/tc-pdp11.c:638
 msgid "General register not legal as float operand"
 msgstr "El registro general no es legal como operando de coma flotante"
 
-#: config/tc-pdp11.c:664
+#: config/tc-pdp11.c:671
 msgid "No instruction found"
 msgstr "No se encontró una instrucción"
 
-#: config/tc-pdp11.c:674 config/tc-z80.c:1894 config/tc-z80.c:1907
+#: config/tc-pdp11.c:681 config/tc-z80.c:1885 config/tc-z80.c:1898
 #, c-format
 msgid "Unknown instruction '%s'"
 msgstr "Instrucción '%s' desconocida"
 
-#: config/tc-pdp11.c:680
+#: config/tc-pdp11.c:687
 #, c-format
 msgid "Unsupported instruction set extension: %s"
 msgstr "No se admite la extensión de conjunto de instrucciones: %s"
 
-#: config/tc-pdp11.c:716
+#: config/tc-pdp11.c:723
 msgid "operand is not an absolute constant"
 msgstr "el operando no es una constante absoluta"
 
-#: config/tc-pdp11.c:724
+#: config/tc-pdp11.c:731
 msgid "3-bit immediate out of range"
 msgstr "inmediato de 3-bit fuera de rango"
 
-#: config/tc-pdp11.c:731
+#: config/tc-pdp11.c:738
 msgid "6-bit immediate out of range"
 msgstr "inmediato de 6-bit fuera de rango"
 
-#: config/tc-pdp11.c:738
+#: config/tc-pdp11.c:745
 msgid "8-bit immediate out of range"
 msgstr "inmediato de 8-bit fuera de rango"
 
-#: config/tc-pdp11.c:755 config/tc-pdp11.c:948
+#: config/tc-pdp11.c:762 config/tc-pdp11.c:955
 msgid "Symbol expected"
 msgstr "Se esperaba un símbolo"
 
-#: config/tc-pdp11.c:760
+#: config/tc-pdp11.c:767
 msgid "8-bit displacement out of range"
 msgstr "Desubicación de 8-bit fuera de rango"
 
-#: config/tc-pdp11.c:802 config/tc-pdp11.c:823 config/tc-pdp11.c:840
-#: config/tc-pdp11.c:861 config/tc-pdp11.c:878 config/tc-pdp11.c:899
-#: config/tc-pdp11.c:918 config/tc-pdp11.c:939
+#: config/tc-pdp11.c:809 config/tc-pdp11.c:830 config/tc-pdp11.c:847
+#: config/tc-pdp11.c:868 config/tc-pdp11.c:885 config/tc-pdp11.c:906
+#: config/tc-pdp11.c:925 config/tc-pdp11.c:946
 msgid "Missing ','"
 msgstr "Falta una ','"
 
-#: config/tc-pdp11.c:953
+#: config/tc-pdp11.c:960
 msgid "6-bit displacement out of range"
 msgstr "Desubicación de 6-bit fuera de rango"
 
-#: config/tc-pdp11.c:974 config/tc-vax.c:1944
+#: config/tc-pdp11.c:981 config/tc-vax.c:1944
 msgid "Too many operands"
 msgstr "Demasiados operandos"
 
@@ -11084,7 +10972,7 @@ msgid "can't have relocation for ipush"
 msgstr "no se puede tener una reubicación para ipush"
 
 #: config/tc-pj.c:289
-msgid "expected expression"
+msgid "expected expresssion"
 msgstr "se esperaba una expresión"
 
 #: config/tc-pj.c:355
@@ -11111,16 +10999,16 @@ msgstr "convert_frag\n"
 msgid "estimate size\n"
 msgstr "tamaño estimado\n"
 
-#: config/tc-ppc.c:1119
+#: config/tc-ppc.c:1089
 #, c-format
 msgid "%s unsupported"
 msgstr "no se admite %s"
 
-#: config/tc-ppc.c:1216
+#: config/tc-ppc.c:1186
 msgid "--nops needs a numeric argument"
 msgstr "--nops necesita un argumento numérico"
 
-#: config/tc-ppc.c:1230
+#: config/tc-ppc.c:1200
 #, c-format
 msgid ""
 "PowerPC options:\n"
@@ -11159,7 +11047,7 @@ msgstr ""
 "                        genera código para PowerPC 7400/7410/7450/7455\n"
 "-m750cl                 genera código para PowerPC 750cl\n"
 
-#: config/tc-ppc.c:1248
+#: config/tc-ppc.c:1218
 #, c-format
 msgid ""
 "-mppc64, -m620          generate code for PowerPC 620/625/630\n"
@@ -11189,7 +11077,7 @@ msgstr ""
 "-mcom                   genera código de instrucciones comunes Power/PowerPC\n"
 "-many                   genera código para cualquier arquitectura (PWR/PWRX/PPC)\n"
 
-#: config/tc-ppc.c:1261
+#: config/tc-ppc.c:1231
 #, c-format
 msgid ""
 "-maltivec               generate code for AltiVec\n"
@@ -11214,324 +11102,308 @@ msgstr ""
 "-mregnames              Permite nombres simbólicos para los registros\n"
 "-mno-regnames           No permite nombres simbólicos para los registros\n"
 
-#: config/tc-ppc.c:1273
+#: config/tc-ppc.c:1243
 #, c-format
 msgid ""
 "-mrelocatable           support for GCC's -mrelocatble option\n"
 "-mrelocatable-lib       support for GCC's -mrelocatble-lib option\n"
 "-memb                   set PPC_EMB bit in ELF flags\n"
-"-mlittle, -mlittle-endian, -le\n"
+"-mlittle, -mlittle-endian, -l, -le\n"
 "                        generate code for a little endian machine\n"
-"-mbig, -mbig-endian, -be\n"
+"-mbig, -mbig-endian, -b, -be\n"
 "                        generate code for a big endian machine\n"
 "-msolaris               generate code for Solaris\n"
 "-mno-solaris            do not generate code for Solaris\n"
-"-K PIC                  set EF_PPC_RELOCATABLE_LIB in ELF flags\n"
 "-V                      print assembler version number\n"
 "-Qy, -Qn                ignored\n"
 msgstr ""
-"-mrelocatable           admite la opción -mrelocatble de GCC\n"
-"-mrelocatable-lib       admite la opción -mrelocatble-lib de GCC\n"
+"-mrelocatable           admite la opción -mrelocatable de GCC\n"
+"-mrelocatable-lib       admite la opción -mrelocatable-lib de GCC\n"
 "-memb                   activa el bit PPC_EMB en las opciones ELF\n"
-"-mlittle, -mlittle-endian, -le\n"
+"-mlittle, -mlittle-endian -l, -le\n"
 "                        genera código para una máquina little endian\n"
-"-mbig, -mbig-endian, be\n"
+"-mbig, -mbig-endian, -b, be\n"
 "                        genera código para una máquina big endian\n"
 "-msolaris               genera código para Solaris\n"
 "-mno-solaris            no genera código para Solaris\n"
-"-K PIC                  activa EF_PPC_RELOCATABLE_LIB en las opciones ELF\n"
 "-V                      muestra el número de versión del ensamblador\n"
 "-Qy, -Qn                se descarta\n"
 
-#: config/tc-ppc.c:1287
+#: config/tc-ppc.c:1256
 #, c-format
 msgid "-nops=count             when aligning, more than COUNT nops uses a branch\n"
 msgstr "-nops=cuenta            al alinear, más de CUENTA nops usa una ramificación\n"
 
-#: config/tc-ppc.c:1313
+#: config/tc-ppc.c:1282
 #, c-format
 msgid "Unknown default cpu = %s, os = %s"
 msgstr "Cpu por defecto desconocido = %s, os = %s"
 
-#: config/tc-ppc.c:1339
+#: config/tc-ppc.c:1308
 msgid "Neither Power nor PowerPC opcodes were selected."
 msgstr "No se escogieron los códigos de operación Power ni PowerPC."
 
-#: config/tc-ppc.c:1420
+#: config/tc-ppc.c:1389
 #, c-format
 msgid "powerpc_operands[%d].bitm invalid"
 msgstr "powerpc_operands[%d].bitm inválido"
 
-#: config/tc-ppc.c:1427
+#: config/tc-ppc.c:1396
 #, c-format
 msgid "powerpc_operands[%d] duplicates powerpc_operands[%d]"
 msgstr "powerpc_operands[%d] duplica a powerpc_operands[%d]"
 
-#: config/tc-ppc.c:1449
+#: config/tc-ppc.c:1418
 #, c-format
 msgid "major opcode is not sorted for %s"
 msgstr "el código de operación major no está ordenado para %s"
 
-#: config/tc-ppc.c:1485
+#: config/tc-ppc.c:1454
 #, c-format
 msgid "%s (%08lx %08lx) after %s (%08lx %08lx)"
 msgstr "%s (%08lx %08lx) después de %s (%08lx %08lx)"
 
-#: config/tc-ppc.c:1494
+#: config/tc-ppc.c:1463
 #, c-format
 msgid "mask trims opcode bits for %s"
 msgstr "la máscara recorta bits del código de operación para %s"
 
-#: config/tc-ppc.c:1503
+#: config/tc-ppc.c:1472
 #, c-format
 msgid "operand index error for %s"
 msgstr "error de índice de operando para %s"
 
-#: config/tc-ppc.c:1515
+#: config/tc-ppc.c:1484
 #, c-format
 msgid "operand %d overlap in %s"
 msgstr "el operando %d sobreescribe en %s"
 
-#: config/tc-ppc.c:1532
+#: config/tc-ppc.c:1501
 #, c-format
 msgid "duplicate instruction %s"
 msgstr "instrucción duplicada %s"
 
-#: config/tc-ppc.c:1556
+#: config/tc-ppc.c:1525
 #, c-format
 msgid "duplicate macro %s"
 msgstr "macro duplicado %s"
 
-#: config/tc-ppc.c:1913
+#: config/tc-ppc.c:1882
 msgid "symbol+offset not supported for got tls"
 msgstr "no se admite símbolo+desplazamiento para got tls"
 
-#: config/tc-ppc.c:2168
+#: config/tc-ppc.c:2137
 msgid "Relocation cannot be done when using -mrelocatable"
 msgstr "No se puede hacer la reubicación cuando se utiliza -mrelocatable"
 
-#: config/tc-ppc.c:2218
+#: config/tc-ppc.c:2187
 msgid "TOC section size exceeds 64k"
 msgstr "el tamaño de la sección TOC excede los 64k"
 
-#: config/tc-ppc.c:2299
+#: config/tc-ppc.c:2268
 #, c-format
 msgid "syntax error: invalid toc specifier `%s'"
 msgstr "error sintáctico: especificador de tabla de contenidos `%s' inválido"
 
-#: config/tc-ppc.c:2313
+#: config/tc-ppc.c:2282
 #, c-format
 msgid "syntax error: expected `]', found  `%c'"
 msgstr "error sintáctico: se esperaba `]', se obtuvo  `%c'"
 
-#: config/tc-ppc.c:2589
+#: config/tc-ppc.c:2558
 msgid "[tocv] symbol is not a toc symbol"
 msgstr "el símbolo [tocv] no es un símbolo de tabla de contenido"
 
-#: config/tc-ppc.c:2600
+#: config/tc-ppc.c:2569
 msgid "Unimplemented toc32 expression modifier"
 msgstr "Modificador de expresión toc32 sin implementar"
 
-#: config/tc-ppc.c:2605
+#: config/tc-ppc.c:2574
 msgid "Unimplemented toc64 expression modifier"
 msgstr "Modificador de expresión toc64 sin implementar"
 
-#: config/tc-ppc.c:2609
+#: config/tc-ppc.c:2578
 #, c-format
 msgid "Unexpected return value [%d] from parse_toc_entry!\n"
 msgstr "¡Valor de devolución inesperado [%d] de parse_toc_entry!\n"
 
-#: config/tc-ppc.c:2789
+#: config/tc-ppc.c:2758
 #, c-format
 msgid "@tls may not be used with \"%s\" operands"
 msgstr "@tls no se puede utilizar con operandos \"%s\""
 
-#: config/tc-ppc.c:2792
+#: config/tc-ppc.c:2761
 msgid "@tls may only be used in last operand"
 msgstr "@tls sólo se puede utilizar en el último operando"
 
-#: config/tc-ppc.c:2902
+#: config/tc-ppc.c:2871
 msgid "unsupported relocation for DS offset field"
 msgstr "no se admite el tipo de reubicación para el campo de desplazamiento DS"
 
-#: config/tc-ppc.c:2956
+#: config/tc-ppc.c:2925
 #, c-format
 msgid "syntax error; end of line, expected `%c'"
 msgstr "error sintáctico; fin de línea, se esperaba `%c'"
 
-#: config/tc-ppc.c:2958
+#: config/tc-ppc.c:2927
 #, c-format
 msgid "syntax error; found `%c', expected `%c'"
 msgstr "error sintáctico; se encontró `%c', se esperaba `%c'"
 
-#: config/tc-ppc.c:2998 config/tc-ppc.h:94
+#: config/tc-ppc.c:2967 config/tc-ppc.h:94
 msgid "instruction address is not a multiple of 4"
 msgstr "la dirección de la instrucción no es un múltiplo de 4"
 
-#: config/tc-ppc.c:3247
+#: config/tc-ppc.c:3216
 msgid "missing size"
 msgstr "falta el tamaño"
 
-#: config/tc-ppc.c:3256
+#: config/tc-ppc.c:3225
 msgid "negative size"
 msgstr "tamaño negativo"
 
-#: config/tc-ppc.c:3293
+#: config/tc-ppc.c:3262
 msgid "missing real symbol name"
 msgstr "falta el nombre del símbolo real"
 
-#: config/tc-ppc.c:3314
+#: config/tc-ppc.c:3283
 msgid "attempt to redefine symbol"
 msgstr "se intenta redefinir el símbolo"
 
-#: config/tc-ppc.c:3579
-#, c-format
-msgid "No known dwarf XCOFF section for flag 0x%08x\n"
-msgstr "No hay una sección XCOFF dwarf conocida para la opción 0x%08x\n"
-
-#: config/tc-ppc.c:3592
-#, c-format
-msgid "label %s was not defined in this dwarf section"
-msgstr "la etiqueta %s no se definió en esta sección dwarf"
-
-#: config/tc-ppc.c:3708
+#: config/tc-ppc.c:3525
 msgid "The XCOFF file format does not support arbitrary sections"
 msgstr "El formato del fichero XCOFF no admite secciones arbitrarias"
 
-#: config/tc-ppc.c:3781
+#: config/tc-ppc.c:3598
 msgid ".ref outside .csect"
 msgstr ".ref fuera de .csect"
 
-#: config/tc-ppc.c:3803 config/tc-ppc.c:4005
+#: config/tc-ppc.c:3620 config/tc-ppc.c:3820
 msgid "missing symbol name"
 msgstr "falta el nombre del símbolo"
 
-#: config/tc-ppc.c:3834
+#: config/tc-ppc.c:3651
 msgid "missing rename string"
 msgstr "falta la cadena para renombrar"
 
-#: config/tc-ppc.c:3864 config/tc-ppc.c:4406 read.c:3364
+#: config/tc-ppc.c:3681 config/tc-ppc.c:4223 read.c:3375
 msgid "missing value"
 msgstr "falta el valor"
 
-#: config/tc-ppc.c:3882
+#: config/tc-ppc.c:3699
 msgid "illegal .stabx expression; zero assumed"
 msgstr "expresión .stabx ilegal; se asume cero"
 
-#: config/tc-ppc.c:3914
+#: config/tc-ppc.c:3731
 msgid "missing class"
 msgstr "falta la clase"
 
-#: config/tc-ppc.c:3923
+#: config/tc-ppc.c:3740
 msgid "missing type"
 msgstr "falta el tipo"
 
-#: config/tc-ppc.c:3950
-msgid ".stabx of storage class stsym must be within .bs/.es"
-msgstr ".stabx de la clase de almacenamiento stsym debe estar entre .bs/.es"
-
-#: config/tc-ppc.c:4193
+#: config/tc-ppc.c:4010
 msgid "nested .bs blocks"
 msgstr "bloques .bs anidados"
 
-#: config/tc-ppc.c:4225
+#: config/tc-ppc.c:4042
 msgid ".es without preceding .bs"
 msgstr ".es sin un .bs precedente"
 
-#: config/tc-ppc.c:4398
+#: config/tc-ppc.c:4215
 msgid "non-constant byte count"
 msgstr "la cuenta de byte no es constante"
 
-#: config/tc-ppc.c:4472
+#: config/tc-ppc.c:4262
 msgid ".tc not in .toc section"
 msgstr ".tc no está en la sección .toc"
 
-#: config/tc-ppc.c:4491
+#: config/tc-ppc.c:4281
 msgid ".tc with no label"
 msgstr ".tc sin etiqueta"
 
-#: config/tc-ppc.c:4584 config/tc-s390.c:1843
+#: config/tc-ppc.c:4374
 msgid ".machine stack overflow"
 msgstr "desbordamiento de pila en .machine"
 
-#: config/tc-ppc.c:4591 config/tc-s390.c:1850
+#: config/tc-ppc.c:4381
 msgid ".machine stack underflow"
 msgstr "desbordamiento por debajo de la pila en .machine"
 
-#: config/tc-ppc.c:4598 config/tc-s390.c:1857
+#: config/tc-ppc.c:4388
 #, c-format
 msgid "invalid machine `%s'"
 msgstr "máquina `%s' inválida"
 
-#: config/tc-ppc.c:4649
+#: config/tc-ppc.c:4439
 msgid "No previous section to return to. Directive ignored."
 msgstr "No hay sección previa a la cual regresar. Se descarta la directiva."
 
 #. Section Contents
 #. unknown
-#: config/tc-ppc.c:5059
+#: config/tc-ppc.c:4849
 msgid "Unsupported section attribute -- 'a'"
 msgstr "No se admite el atributo de sección -- 'a'"
 
-#: config/tc-ppc.c:5243
+#: config/tc-ppc.c:5033
 msgid "bad symbol suffix"
 msgstr "sufijo de símbolo erróneo"
 
-#: config/tc-ppc.c:5336
+#: config/tc-ppc.c:5125
 msgid "Unrecognized symbol suffix"
 msgstr "No se reconoce el sufijo de símbolo"
 
-#: config/tc-ppc.c:5424
+#: config/tc-ppc.c:5213
 msgid "two .function pseudo-ops with no intervening .ef"
 msgstr "dos pseudo-operadores .function sin un .ef que intervenga"
 
-#: config/tc-ppc.c:5437
+#: config/tc-ppc.c:5226
 msgid ".ef with no preceding .function"
 msgstr ".ef sin un .function precedente"
 
-#: config/tc-ppc.c:5566
+#: config/tc-ppc.c:5355
 #, c-format
 msgid "warning: symbol %s has no csect"
 msgstr "aviso: el símbolo %s no tiene csect"
 
-#: config/tc-ppc.c:5828
+#: config/tc-ppc.c:5600
 msgid "symbol in .toc does not match any .tc"
 msgstr "el símbolo en .toc no coincide con ningún .tc"
 
-#: config/tc-ppc.c:6230
+#: config/tc-ppc.c:6002
 #, c-format
 msgid "unsupported relocation against %s"
 msgstr "no se admite la reubicación contra %s"
 
-#: config/tc-ppc.c:6303
+#: config/tc-ppc.c:6075
 #, c-format
 msgid "cannot emit PC relative %s relocation against %s"
 msgstr "no se puede emitir la reubicación %s relativa a PC contra %s"
 
-#: config/tc-ppc.c:6308
+#: config/tc-ppc.c:6080
 #, c-format
 msgid "cannot emit PC relative %s relocation"
 msgstr "no se puede emitir la reubicación %s relativa a PC"
 
-#: config/tc-ppc.c:6497
+#: config/tc-ppc.c:6269
 #, c-format
 msgid "Unable to handle reference to symbol %s"
 msgstr "No se puede manejar la referencia al símbolo %s"
 
-#: config/tc-ppc.c:6500
+#: config/tc-ppc.c:6272
 msgid "Unable to resolve expression"
 msgstr "No se puede resolver la expresión"
 
-#: config/tc-ppc.c:6527
+#: config/tc-ppc.c:6299
 msgid "must branch to an address a multiple of 4"
 msgstr "se debe ramificar a una dirección que sea múltiplo de 4"
 
-#: config/tc-ppc.c:6531
+#: config/tc-ppc.c:6303
 #, c-format
 msgid "@local or @plt branch destination is too far away, %ld bytes"
 msgstr "el destino de la ramificación @local o @plt está demasiado lejos, %ld bytes"
 
-#: config/tc-ppc.c:6562
+#: config/tc-ppc.c:6334
 #, c-format
 msgid "Gas failure, reloc value %d\n"
 msgstr "Falla de gas, valor de reubicación %d\n"
@@ -11626,48 +11498,48 @@ msgstr "No se admite el pseudo-operador .MACRO"
 msgid "The .BTEQU pseudo-op is not implemented."
 msgstr "No se admite el pseudo-operador .BTEQU"
 
-#: config/tc-rx.c:1883
+#: config/tc-rx.c:1868
 msgid "invalid immediate size"
 msgstr "tamaño inmediato inválido"
 
-#: config/tc-rx.c:1902
+#: config/tc-rx.c:1887
 msgid "invalid immediate field position"
 msgstr "posición de campo inmediato inválida"
 
-#: config/tc-rx.c:1951
+#: config/tc-rx.c:1936
 #, c-format
 msgid "bad frag at %p : fix %ld addr %ld %ld \n"
 msgstr "fragmento erróneo en %p: fix %ld dir %ld %ld \n"
 
-#: config/tc-rx.c:2018
+#: config/tc-rx.c:1999
 #, c-format
 msgid "unsupported constant size %d\n"
 msgstr "no se admite el tamaño de constante %d\n"
 
-#: config/tc-rx.c:2025
+#: config/tc-rx.c:2006
 msgid "difference of two symbols only supported with .long, .short, or .byte"
 msgstr "sólo se admite la diferencia de dos símbolos con .long .short o .byte"
 
-#: config/tc-rx.c:2069
+#: config/tc-rx.c:2050
 #, c-format
 msgid "jump not 3..10 bytes away (is %d)"
 msgstr "jump no está a 3..10 bytes (es %d)"
 
-#: config/tc-rx.c:2215
+#: config/tc-rx.c:2196
 #, c-format
 msgid "Unknown reloc in md_apply_fix: %s"
 msgstr "Reubicación desconocida en md_apply_fix: %s"
 
-#: config/tc-s390.c:332 config/tc-sparc.c:272
+#: config/tc-s390.c:327 config/tc-sparc.c:272
 msgid "Invalid default architecture, broken assembler."
 msgstr "Arquitectura por defecto inválida, ensamblador descompuesto."
 
-#: config/tc-s390.c:439 config/tc-sparc.c:475
+#: config/tc-s390.c:425 config/tc-sparc.c:475
 #, c-format
 msgid "invalid architecture -A%s"
 msgstr "arquitectura inválida -A%s"
 
-#: config/tc-s390.c:462
+#: config/tc-s390.c:448
 #, c-format
 msgid ""
 "        S390 options:\n"
@@ -11684,7 +11556,7 @@ msgstr ""
 "        -m31              Establece el formato del fichero al formato 31 bit\n"
 "        -m64              Establece el formato del fichero al formato 64 bit\n"
 
-#: config/tc-s390.c:469
+#: config/tc-s390.c:455
 #, c-format
 msgid ""
 "        -V                print assembler version number\n"
@@ -11693,121 +11565,113 @@ msgstr ""
 "        -V                muestra el número de versión del ensamblador\n"
 "        -Qy, -Qn          se descarta\n"
 
-#: config/tc-s390.c:534
+#: config/tc-s390.c:474
 msgid "The 64 bit file format is used without esame instructions."
 msgstr "Se usa el formato de fichero de 64 bit sin instrucciones esame."
 
-#: config/tc-s390.c:550
+#: config/tc-s390.c:491
 #, c-format
 msgid "Internal assembler error for instruction format %s"
 msgstr "Error interno del ensamblador para el formato de instrucción %s"
 
-#: config/tc-s390.c:596
+#: config/tc-s390.c:569
 #, c-format
 msgid "operand out of range (%s not between %ld and %ld)"
 msgstr "operando fuera de rango (%s no está entre %ld y %ld)"
 
-#: config/tc-s390.c:778
+#: config/tc-s390.c:751
 #, c-format
 msgid "identifier+constant@%s means identifier@%s+constant"
 msgstr "identificador+constante@%s significa identificador@%s+constante"
 
-#: config/tc-s390.c:859
+#: config/tc-s390.c:832
 msgid "Can't handle O_big in s390_exp_compare"
 msgstr "No se puede manejar O_big en s390_exp_compare"
 
-#: config/tc-s390.c:940
+#: config/tc-s390.c:913
 msgid "Invalid suffix for literal pool entry"
 msgstr "Sufijo inválido para la entrada de conjunto de literales"
 
-#: config/tc-s390.c:997
+#: config/tc-s390.c:970
 msgid "Big number is too big"
 msgstr "El número grande es demasiado grande"
 
-#: config/tc-s390.c:1144
+#: config/tc-s390.c:1117
 msgid "relocation not applicable"
 msgstr "la reubicación no es aplicable"
 
-#: config/tc-s390.c:1261
+#: config/tc-s390.c:1234
 msgid "index register specified but zero"
 msgstr "se especificó el registro índice pero es cero"
 
-#: config/tc-s390.c:1265
+#: config/tc-s390.c:1238
 msgid "base register specified but zero"
 msgstr "se especificó el registro base pero es cero"
 
-#: config/tc-s390.c:1269
-msgid "odd numbered general purpose register specified as register pair"
-msgstr "se especificaron registros de propósito general numerados impares como par de registro"
-
-#: config/tc-s390.c:1277
-msgid "invalid floating point register pair.  Valid fp register pair operands are 0, 1, 4, 5, 8, 9, 12 or 13."
-msgstr "par de registro de coma flotante inválido.  Los operandos de pares de registro fp válidos son 0, 1, 4, 5, 8, 9, 12 o 13."
-
-#: config/tc-s390.c:1360
+#: config/tc-s390.c:1319
 msgid "invalid operand suffix"
 msgstr "sufijo de operando inválido"
 
-#: config/tc-s390.c:1383
+#: config/tc-s390.c:1342
 msgid "syntax error; missing '(' after displacement"
 msgstr "error sintáctico; falta un '(' después de la desubicación"
 
-#: config/tc-s390.c:1399 config/tc-s390.c:1443 config/tc-s390.c:1473
+#: config/tc-s390.c:1358 config/tc-s390.c:1402 config/tc-s390.c:1432
 msgid "syntax error; expected ,"
 msgstr "error sintáctico; se esperaba ,"
 
-#: config/tc-s390.c:1431
+#: config/tc-s390.c:1390
 msgid "syntax error; missing ')' after base register"
 msgstr "error sintáctico; falta un ')' después del registro base"
 
-#: config/tc-s390.c:1460
+#: config/tc-s390.c:1419
 msgid "syntax error; ')' not allowed here"
 msgstr "errór sintáctico; ')' no se permite aquí"
 
-#: config/tc-s390.c:1595
+#: config/tc-s390.c:1554
 #, c-format
 msgid "Opcode %s not available in this mode"
 msgstr "El código de operación %s no está disponible en este modo"
 
-#: config/tc-s390.c:1650 config/tc-s390.c:1673 config/tc-s390.c:1686
+#: config/tc-s390.c:1609 config/tc-s390.c:1632 config/tc-s390.c:1645
 msgid "Invalid .insn format\n"
 msgstr "Formato .insn inválido\n"
 
-#: config/tc-s390.c:1658
+#: config/tc-s390.c:1617
 #, c-format
 msgid "Unrecognized opcode format: `%s'"
 msgstr "No se reconoce el formato de código de operación: `%s'"
 
-#: config/tc-s390.c:1689
+#: config/tc-s390.c:1648
 msgid "second operand of .insn not a constant\n"
 msgstr "el segundo operando de .insn no es una constante\n"
 
-#: config/tc-s390.c:1692
+#: config/tc-s390.c:1651
 msgid "missing comma after insn constant\n"
 msgstr "falta una coma después de la constante insn\n"
 
-#: config/tc-s390.c:2050
+#: config/tc-s390.c:1943
 #, c-format
 msgid "cannot emit relocation %s against subsy symbol %s"
 msgstr "no se puede emitir la reubicación %s contra el símbolo subsy %s"
 
-#: config/tc-s390.c:2138
+#: config/tc-s390.c:2031
 msgid "unsupported relocation type"
 msgstr "no se admite el tipo de reubicación"
 
 #  El mensaje no se puede traducir correctamente. El segundo parámetro
 #  se sustituye por " against " sin traducir. cfuga
-#: config/tc-s390.c:2185
+#: config/tc-s390.c:2078
 #, c-format
 msgid "cannot emit PC relative %s relocation%s%s"
 msgstr "no se puede emitir la reubicación %s relativa al PC%s%s"
 
-#: config/tc-s390.c:2310
+#: config/tc-s390.c:2203
 #, c-format
 msgid "Gas failure, reloc type %s\n"
 msgstr "Falla de gas, valor de reubicación %s\n"
 
-#: config/tc-s390.c:2312
+#: config/tc-s390.c:2205
 #, c-format
 msgid "Gas failure, reloc type #%i\n"
 msgstr "Falla de gas, tipo de reubicación #%i\n"
@@ -12029,7 +11893,7 @@ msgstr "error de instrucción pce (16 bit || 16 bit)'"
 msgid "score3d instruction."
 msgstr "instrucción score3d."
 
-#: config/tc-score.c:6126 read.c:1465
+#: config/tc-score.c:6126 read.c:1468
 msgid "missing size expression"
 msgstr "falta una expresión de tamaño"
 
@@ -12038,7 +11902,7 @@ msgstr "falta una expresión de tamaño"
 msgid "BSS length (%d) < 0 ignored"
 msgstr "se descarta la longitud BSS (%d) <0"
 
-#: config/tc-score.c:6147 read.c:2298
+#: config/tc-score.c:6147 read.c:2311
 #, c-format
 msgid "error setting flags for \".sbss\": %s"
 msgstr "error al establecer las opciones para \".sbss\": %s"
@@ -12052,12 +11916,12 @@ msgstr "falta la alineación"
 msgid "alignment too large; %d assumed"
 msgstr "alineación demasiado grande; se asume %d"
 
-#: config/tc-score.c:6203 read.c:2359
+#: config/tc-score.c:6203 read.c:2372
 msgid "alignment negative; 0 assumed"
 msgstr "alineación negativa; se asume 0"
 
-#: config/tc-score.c:6270 ecoff.c:3365 read.c:1484 read.c:1590 read.c:2476
-#: read.c:3098 read.c:3488 symbols.c:334 symbols.c:430
+#: config/tc-score.c:6270 ecoff.c:3365 read.c:1487 read.c:1600 read.c:2489
+#: read.c:3109 read.c:3502 symbols.c:337 symbols.c:433
 #, c-format
 msgid "symbol `%s' is already defined"
 msgstr "el símbolo `%s' ya está definido"
@@ -13039,7 +12903,7 @@ msgstr "alineación demasiado grande; se asume %d"
 msgid "negative alignment"
 msgstr "alineación negativa"
 
-#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1321 read.c:2371
+#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1324 read.c:2384
 msgid "alignment not a power of 2"
 msgstr "la alineación no es una potencia de 2"
 
@@ -13201,26 +13065,6 @@ msgstr "La reubicación no cabe. (valor de reubicación = 0x%lx)"
 msgid "spu convert_frag\n"
 msgstr "convert_frag de spu\n"
 
-#: config/tc-tic30.c:37
-msgid "first"
-msgstr "primero"
-
-#: config/tc-tic30.c:37
-msgid "second"
-msgstr "segundo"
-
-#: config/tc-tic30.c:37
-msgid "third"
-msgstr "tercero"
-
-#: config/tc-tic30.c:37
-msgid "fourth"
-msgstr "cuarto"
-
-#: config/tc-tic30.c:37
-msgid "fifth"
-msgstr "quinto"
-
 #: config/tc-tic30.c:483
 msgid "More than one AR register found in indirect reference"
 msgstr "Se encontró más un registro AR en la referencia indirecta"
@@ -14137,54 +13981,64 @@ msgstr "¿se intentó hacer .space/.bes hacia atrás? (%ld)"
 msgid "Invalid label '%s'"
 msgstr "Etiqueta '%s' inválida"
 
-#: config/tc-tic6x.c:233
+#: config/tc-tic6x.c:192
 #, c-format
 msgid "unknown architecture '%s'"
 msgstr "arquitectura '%s' desconocida"
 
-#: config/tc-tic6x.c:263
+#: config/tc-tic6x.c:222
 #, c-format
 msgid "unknown -mpid= argument '%s'"
 msgstr "argumento -mpid= '%s' desconocido"
 
-#: config/tc-tic6x.c:321
+#: config/tc-tic6x.c:288
 #, c-format
 msgid "TMS320C6000 options:\n"
 msgstr "opciones de TMS320C6000:\n"
 
-#: config/tc-tic6x.c:322
+#: config/tc-tic6x.c:289
 #, c-format
 msgid "  -march=ARCH             enable instructions from architecture ARCH\n"
 msgstr "  -march=ARQ              permite instrucciones para la arquitectura ARQ\n"
 
-#: config/tc-tic6x.c:323
+#: config/tc-tic6x.c:290
+#, c-format
+msgid "  -matomic                enable atomic operation instructions\n"
+msgstr "  -matomic                permite instrucciones de operación atómica\n"
+
+#: config/tc-tic6x.c:291
+#, c-format
+msgid "  -mno-atomic             disable atomic operation instructions\n"
+msgstr "  -mno-atomic             desactiva las instrucciones de operación atómica\n"
+
+#: config/tc-tic6x.c:292
 #, c-format
 msgid "  -mbig-endian            generate big-endian code\n"
 msgstr "  -mbig-endian            genera código big-endian\n"
 
-#: config/tc-tic6x.c:324
+#: config/tc-tic6x.c:293
 #, c-format
 msgid "  -mlittle-endian         generate little-endian code\n"
 msgstr "  -mlittle-endian         genera código little-endian\n"
 
-#: config/tc-tic6x.c:325
+#: config/tc-tic6x.c:294
 #, c-format
 msgid "  -mdsbt                  code uses DSBT addressing\n"
 msgstr "  -mdsbt                  el código usa direccionamiento DSBT\n"
 
-#: config/tc-tic6x.c:326
+#: config/tc-tic6x.c:295
 #, c-format
 msgid "  -mno-dsbt               code does not use DSBT addressing\n"
 msgstr "  -mno-dsbt               el código no usa direccionamiento DSBT\n"
 
-#: config/tc-tic6x.c:327
+#: config/tc-tic6x.c:296
 #, c-format
 msgid "  -mpid=no                code uses position-dependent data addressing\n"
 msgstr ""
 "  -mpid=no                el código usa direccionamiento de datos\n"
 "                                   dependiente de la posición\n"
 
-#: config/tc-tic6x.c:328
+#: config/tc-tic6x.c:297
 #, c-format
 msgid ""
 "  -mpid=near              code uses position-independent data addressing,\n"
@@ -14194,7 +14048,7 @@ msgstr ""
 "                            independiente de la posición, los accesos GOT\n"
 "                            usan el direccionamiento DP near\n"
 
-#: config/tc-tic6x.c:330
+#: config/tc-tic6x.c:299
 #, c-format
 msgid ""
 "  -mpid=far               code uses position-independent data addressing,\n"
@@ -14204,426 +14058,322 @@ msgstr ""
 "                            independiente de la posición, los accesos GOT\n"
 "                            usan el direccionamiento DP far\n"
 
-#: config/tc-tic6x.c:332
+#: config/tc-tic6x.c:301
 #, c-format
 msgid "  -mpic                   code addressing is position-independent\n"
 msgstr ""
 "  -mpic                   el direccionamiento de código es\n"
 "                            independiente de posición\n"
 
-#: config/tc-tic6x.c:333
+#: config/tc-tic6x.c:302
 #, c-format
 msgid "  -mno-pic                code addressing is position-dependent\n"
 msgstr ""
 "  -mno-pic                el direccionamiento de código es\n"
 "                             dependiente de posición\n"
 
-#: config/tc-tic6x.c:338
+#: config/tc-tic6x.c:307
 #, c-format
 msgid "Supported ARCH values are:"
 msgstr "Se admiten los siguentes valores de ARQ:"
 
-#: config/tc-tic6x.c:387
-msgid "unexpected .cantunwind directive"
-msgstr "directiva .cantunwind inesperada"
-
-#: config/tc-tic6x.c:407
-msgid "unexpected .handlerdata directive"
-msgstr "directiva .handlerdata inesperada"
-
-#: config/tc-tic6x.c:419
-msgid "personality routine required before .handlerdata directive"
-msgstr "se requirió una rutina personality antes de la directiva .handlerdata"
-
-#: config/tc-tic6x.c:535
-msgid "expected symbol"
-msgstr "se esperaba un símbolo"
-
-#: config/tc-tic6x.c:592
-#, c-format
-msgid "invalid length for .scomm directive"
-msgstr "longitud inválida para la directiva .scomm"
-
-#: config/tc-tic6x.c:606
-msgid "alignment is not a positive number"
-msgstr "la alineación no es un número positivo"
-
-#: config/tc-tic6x.c:618
-msgid "alignment is not a power of 2"
-msgstr "la alineación no es una potencia de 2"
-
-#: config/tc-tic6x.c:633
-#, c-format
-msgid "attempt to re-define symbol `%s'"
-msgstr "se intentó redefinir el símbolo `%s'"
-
-#: config/tc-tic6x.c:642
-#, c-format
-msgid "attempt to redefine `%s' with a different length"
-msgstr "se intentó redefinir `%s' con una longitud diferente"
-
-#: config/tc-tic6x.c:844
+#: config/tc-tic6x.c:531
 msgid "multiple '||' on same line"
 msgstr "'||' múltiples en la misma línea"
 
-#: config/tc-tic6x.c:847
+#: config/tc-tic6x.c:534
 msgid "'||' after predicate"
 msgstr "'||' después del predicado"
 
-#: config/tc-tic6x.c:891
+#: config/tc-tic6x.c:578
 msgid "multiple predicates on same line"
 msgstr "predicados múltiples en la misma línea"
 
-#: config/tc-tic6x.c:897
+#: config/tc-tic6x.c:584
 #, c-format
 msgid "bad predicate '%s'"
 msgstr "predicado '%s' erróneo"
 
-#: config/tc-tic6x.c:908
+#: config/tc-tic6x.c:595
 msgid "predication on A0 not supported on this architecture"
 msgstr "la predicación en A0 no se admite en esta arquitectura"
 
-#: config/tc-tic6x.c:941
+#: config/tc-tic6x.c:628
 msgid "label after '||'"
 msgstr "etiqueta después de '||'"
 
-#: config/tc-tic6x.c:947
+#: config/tc-tic6x.c:634
 msgid "label after predicate"
 msgstr "etiqueta después del predicado"
 
-#: config/tc-tic6x.c:971
+#: config/tc-tic6x.c:658
 msgid "'||' not followed by instruction"
 msgstr "'||' no está seguido por una instrucción"
 
-#: config/tc-tic6x.c:977
+#: config/tc-tic6x.c:664
 msgid "predicate not followed by instruction"
 msgstr "el predicado no está seguido por una instrucción"
 
-#: config/tc-tic6x.c:1410
+#: config/tc-tic6x.c:1097
 #, c-format
 msgid "control register '%s' not supported on this architecture"
 msgstr "el registro de control '%s' no se admite en esta arquitectura"
 
-#: config/tc-tic6x.c:1589 config/tc-tic6x.c:1592 config/tc-tic6x.c:1645
-#: config/tc-tic6x.c:1649
+#: config/tc-tic6x.c:1276 config/tc-tic6x.c:1279 config/tc-tic6x.c:1332
+#: config/tc-tic6x.c:1336
 #, c-format
 msgid "register number %u not supported on this architecture"
 msgstr "el número de registro %u no se admite en esta arquitectura"
 
-#: config/tc-tic6x.c:1620
+#: config/tc-tic6x.c:1307
 #, c-format
 msgid "register pair for operand %u of '%.*s' not a valid even/odd pair"
 msgstr "la pareja de registros para el operando %u de '%.*s' no es una pareja par/impar válida"
 
-#: config/tc-tic6x.c:1676
+#: config/tc-tic6x.c:1363
 #, c-format
 msgid "junk after operand %u of '%.*s'"
 msgstr "basura después del operando %u de '%.*s'"
 
-#: config/tc-tic6x.c:1689
+#: config/tc-tic6x.c:1376
 #, c-format
 msgid "bad register or register pair for operand %u of '%.*s'"
 msgstr "registro o pareja de registros erróneos para el operando %u de '%.*s'"
 
-#: config/tc-tic6x.c:1695
+#: config/tc-tic6x.c:1382
 #, c-format
 msgid "bad register for operand %u of '%.*s'"
 msgstr "registro erróneo para el operando %u de '%.*s'"
 
-#: config/tc-tic6x.c:1700
+#: config/tc-tic6x.c:1387
 #, c-format
 msgid "bad register pair for operand %u of '%.*s'"
 msgstr "pareja de registros errónea para el operando %u de '%.*s'"
 
-#: config/tc-tic6x.c:1705
+#: config/tc-tic6x.c:1392
 #, c-format
 msgid "bad functional unit for operand %u of '%.*s'"
 msgstr "unidad funcional errónea para el operando %u de '%.*s'"
 
-#: config/tc-tic6x.c:1710
+#: config/tc-tic6x.c:1397
 #, c-format
 msgid "bad operand %u of '%.*s'"
 msgstr "operando %u erróneo de '%.*s'"
 
-#: config/tc-tic6x.c:1842
+#: config/tc-tic6x.c:1496
 msgid "$DSBT_INDEX must be used with __c6xabi_DSBT_BASE"
 msgstr "$DSBT_INDEX se debe usar con __c6xabi_DSBT_BASE"
 
-#: config/tc-tic6x.c:1882
+#: config/tc-tic6x.c:1535
 msgid "$DSBT_INDEX not supported in this context"
 msgstr "no se admite $DSBT_INDEX en este contexto"
 
-#: config/tc-tic6x.c:1895
+#: config/tc-tic6x.c:1548
 msgid "$GOT not supported in this context"
 msgstr "no se admite $GOT en este contexto"
 
-#: config/tc-tic6x.c:1912
+#: config/tc-tic6x.c:1565
 msgid "$DPR_GOT not supported in this context"
 msgstr "no se admite $DPR_GOT en este contexto"
 
-#: config/tc-tic6x.c:1933
+#: config/tc-tic6x.c:1586
 msgid "$DPR_BYTE not supported in this context"
 msgstr "no se admite $DPR_BYTE en este contexto"
 
-#: config/tc-tic6x.c:1950
+#: config/tc-tic6x.c:1603
 msgid "$DPR_HWORD not supported in this context"
 msgstr "no se admite $DPR_HWORD en este contexto"
 
-#: config/tc-tic6x.c:1967
+#: config/tc-tic6x.c:1620
 msgid "$DPR_WORD not supported in this context"
 msgstr "no se admite $DPR_WORD en este contexto"
 
-#: config/tc-tic6x.c:1986
-msgid "$PCR_OFFSET not supported in this context"
-msgstr "no se admite $PCR_OFFSET en este contexto"
-
-#: config/tc-tic6x.c:1997
+#: config/tc-tic6x.c:1631
 msgid "invalid PC-relative operand"
 msgstr "operando relativo al PC inválido"
 
-#: config/tc-tic6x.c:2035
+#: config/tc-tic6x.c:1668
 #, c-format
 msgid "no %d-byte relocations available"
 msgstr "no hay reubicaciones de %d bytes disponibles"
 
-#: config/tc-tic6x.c:2522 config/tc-tic6x.c:2553 config/tc-tic6x.c:2571
-#: config/tc-tic6x.c:2977 config/tc-tic6x.c:2996 config/tc-tic6x.c:3028
+#: config/tc-tic6x.c:2146 config/tc-tic6x.c:2177 config/tc-tic6x.c:2195
+#: config/tc-tic6x.c:2601 config/tc-tic6x.c:2620 config/tc-tic6x.c:2652
 #, c-format
 msgid "operand %u of '%.*s' out of range"
 msgstr "el operando %u de '%.*s' está fuera de rango"
 
-#: config/tc-tic6x.c:2615 config/tc-tic6x.c:2816
+#: config/tc-tic6x.c:2239 config/tc-tic6x.c:2440
 #, c-format
 msgid "offset in operand %u of '%.*s' not divisible by %u"
 msgstr "el desplazamiento en el operando %u de '%.*s' no es divisible por %u"
 
-#: config/tc-tic6x.c:2808 config/tc-tic6x.c:2841
+#: config/tc-tic6x.c:2432 config/tc-tic6x.c:2465
 #, c-format
 msgid "offset in operand %u of '%.*s' out of range"
 msgstr "el desplazamiento en el operando %u de '%.*s' está fuera de rango"
 
-#: config/tc-tic6x.c:2923
+#: config/tc-tic6x.c:2547
 #, c-format
 msgid "functional unit already masked for operand %u of '%.*s'"
 msgstr "la unidad funcional ya está enmascarada para el operando %u de '%.*s'"
 
-#: config/tc-tic6x.c:2947 config/tc-tic6x.c:3706
+#: config/tc-tic6x.c:2571 config/tc-tic6x.c:3330
 #, c-format
 msgid "'%.*s' instruction not in a software pipelined loop"
 msgstr "la instrucción '%.*s' no está en un ciclo entubado por software"
 
-#: config/tc-tic6x.c:3046
+#: config/tc-tic6x.c:2670
 #, c-format
 msgid "instruction '%.*s' cannot be predicated"
 msgstr "la instrucción '%.*s' no puede ser predicado"
 
-#: config/tc-tic6x.c:3175
+#: config/tc-tic6x.c:2799
 #, c-format
 msgid "unknown opcode '%s'"
 msgstr "código de operación '%s' desconocido"
 
-#: config/tc-tic6x.c:3314
+#: config/tc-tic6x.c:2938
 #, c-format
 msgid "'%.*s' instruction not supported on this architecture"
 msgstr "la instrucción '%.*s' no se admite en esta arquitectura"
 
-#: config/tc-tic6x.c:3322
+#: config/tc-tic6x.c:2946
 #, c-format
 msgid "'%.*s' instruction not supported on this functional unit"
 msgstr "la instrucción '%.*s' no se admite en esta unidad funcional"
 
-#: config/tc-tic6x.c:3330
+#: config/tc-tic6x.c:2954
 #, c-format
 msgid "'%.*s' instruction not supported on this functional unit for this architecture"
 msgstr "la instrucción '%.*s' no se admite en esta unidad funcional para esta arquitectura"
 
-#: config/tc-tic6x.c:3350
+#: config/tc-tic6x.c:2974
 msgid "missing operand after comma"
 msgstr "falta un operando después de la coma"
 
-#: config/tc-tic6x.c:3358 config/tc-tic6x.c:3376
+#: config/tc-tic6x.c:2982 config/tc-tic6x.c:3000
 #, c-format
 msgid "too many operands to '%.*s'"
 msgstr "demasiados operandos para '%.*s'"
 
-#: config/tc-tic6x.c:3389
+#: config/tc-tic6x.c:3013
 #, c-format
 msgid "bad number of operands to '%.*s'"
 msgstr "número erróneo de operandos para '%.*s'"
 
-#: config/tc-tic6x.c:3461
+#: config/tc-tic6x.c:3085
 #, c-format
 msgid "operand %u of '%.*s' not constant"
 msgstr "el operando %u de '%.*s' no es una constante"
 
-#: config/tc-tic6x.c:3466
+#: config/tc-tic6x.c:3090
 #, c-format
 msgid "operand %u of '%.*s' on wrong side"
 msgstr "el operando %u de '%.*s' está en el lado equivocado"
 
-#: config/tc-tic6x.c:3471
+#: config/tc-tic6x.c:3095
 #, c-format
 msgid "operand %u of '%.*s' not a valid return address register"
 msgstr "el operando %u de '%.*s' no es un registro de dirección de devolución válido"
 
-#: config/tc-tic6x.c:3477
+#: config/tc-tic6x.c:3101
 #, c-format
 msgid "operand %u of '%.*s' is write-only"
 msgstr "el operando %u de '%.*s' es de sólo escritura"
 
-#: config/tc-tic6x.c:3482
+#: config/tc-tic6x.c:3106
 #, c-format
 msgid "operand %u of '%.*s' is read-only"
 msgstr "el operando %u de '%.*s' es de sólo lectura"
 
-#: config/tc-tic6x.c:3487
+#: config/tc-tic6x.c:3111
 #, c-format
 msgid "operand %u of '%.*s' not a valid memory reference"
 msgstr "el operando %u de '%.*s' no es una referencia de memoria válida"
 
-#: config/tc-tic6x.c:3493
+#: config/tc-tic6x.c:3117
 #, c-format
 msgid "operand %u of '%.*s' not a valid base address register"
 msgstr "el operando %u de '%.*s' no es un registro de dirección base válido"
 
-#: config/tc-tic6x.c:3579
+#: config/tc-tic6x.c:3203
 #, c-format
 msgid "bad operand combination for '%.*s'"
 msgstr "combinación de operandos errónea para '%.*s'"
 
-#: config/tc-tic6x.c:3625
+#: config/tc-tic6x.c:3249
 msgid "parallel instruction not following another instruction"
 msgstr "la instrucción paralela no está a continuación de otra instrucción"
 
-#: config/tc-tic6x.c:3631
+#: config/tc-tic6x.c:3255
 msgid "too many instructions in execute packet"
 msgstr "demasiadas instrucciones en el paquete de ejecución"
 
-#: config/tc-tic6x.c:3636
+#: config/tc-tic6x.c:3260
 msgid "label not at start of execute packet"
 msgstr "la etiqueta no está al inicio del paquete de ejecución"
 
-#: config/tc-tic6x.c:3639
+#: config/tc-tic6x.c:3263
 #, c-format
 msgid "'%.*s' instruction not at start of execute packet"
 msgstr "la instrucción '%.*s' no está al inicio del paquete de ejecución"
 
-#: config/tc-tic6x.c:3687
+#: config/tc-tic6x.c:3311
 msgid "functional unit already used in this execute packet"
 msgstr "la unidad funcional ya está en uso en este paquete de ejecución"
 
-#: config/tc-tic6x.c:3695
+#: config/tc-tic6x.c:3319
 msgid "nested software pipelined loop"
 msgstr "ciclo entubado por software anidado"
 
-#: config/tc-tic6x.c:3714
+#: config/tc-tic6x.c:3338
 msgid "'||^' without previous SPMASK"
 msgstr "'||^' sin un SPMASK previo"
 
-#: config/tc-tic6x.c:3716
+#: config/tc-tic6x.c:3340
 msgid "cannot mask instruction using no functional unit"
 msgstr "no se puede enmascarar la instrucción sin una unidad funcional"
 
-#: config/tc-tic6x.c:3728
+#: config/tc-tic6x.c:3352
 msgid "functional unit already masked"
 msgstr "la unidad funcional ya está enmascarada"
 
-#: config/tc-tic6x.c:3793
+#: config/tc-tic6x.c:3416
 msgid "value too large for 2-byte field"
 msgstr "valor demasiado grande para un campo de 2 bytes"
 
-#: config/tc-tic6x.c:3803
+#: config/tc-tic6x.c:3426
 msgid "value too large for 1-byte field"
 msgstr "valor demasiado grande para un campo de 1 byte"
 
-#: config/tc-tic6x.c:3841 config/tc-tic6x.c:3906 config/tc-tic6x.c:3933
-#: config/tc-tic6x.c:3961
+#: config/tc-tic6x.c:3464 config/tc-tic6x.c:3516 config/tc-tic6x.c:3543
+#: config/tc-tic6x.c:3571
 msgid "immediate offset out of range"
 msgstr "el desplazamiento inmediato está fuera de rango"
 
-#: config/tc-tic6x.c:3930
+#: config/tc-tic6x.c:3540
 msgid "immediate offset not 2-byte-aligned"
 msgstr "el desplazamiento inmediato no está alineado a 2 bytes"
 
-#: config/tc-tic6x.c:3958
+#: config/tc-tic6x.c:3568
 msgid "immediate offset not 4-byte-aligned"
 msgstr "el desplazamiento inmediato no está alineado a 4 bytes"
 
-#: config/tc-tic6x.c:3972
+#: config/tc-tic6x.c:3582
 msgid "addend used with $DSBT_INDEX"
 msgstr "se usó addend con $DSBT_INDEX"
 
-#: config/tc-tic6x.c:3986 config/tc-tic6x.c:4004 config/tc-tic6x.c:4022
-#: config/tc-tic6x.c:4040
+#: config/tc-tic6x.c:3596 config/tc-tic6x.c:3614 config/tc-tic6x.c:3632
+#: config/tc-tic6x.c:3650
 msgid "PC-relative offset not 4-byte-aligned"
 msgstr "el desplazamiento relativo al PC no está alineado a 4 bytes"
 
-#: config/tc-tic6x.c:3989 config/tc-tic6x.c:4007 config/tc-tic6x.c:4025
-#: config/tc-tic6x.c:4043
+#: config/tc-tic6x.c:3599 config/tc-tic6x.c:3617 config/tc-tic6x.c:3635
+#: config/tc-tic6x.c:3653
 msgid "PC-relative offset out of range"
 msgstr "el desplazamiento relativo al PC está fuera de rango"
 
-#: config/tc-tic6x.c:4522
-#, c-format
-msgid "undefined symbol %s in PCR relocation"
-msgstr "símbolo sin definir %s en la reubicación PCR"
-
-#: config/tc-tic6x.c:4640
-#, c-format
-msgid "group section `%s' has no group signature"
-msgstr "la sección de grupo `%s' no tiene firma de grupo"
-
-#: config/tc-tic6x.c:4791
-msgid "missing .endp before .cfi_startproc"
-msgstr "falta un .endp antes de .cfi_startproc"
-
-#: config/tc-tic6x.c:4895
-msgid "stack pointer offset too large for personality routine"
-msgstr "el desplazamiento del puntero de pila es demasiado grande para la rutina personality"
-
-#: config/tc-tic6x.c:4902
-msgid "stack frame layout does not match personality routine"
-msgstr "la disposición del marco de pila no coincide con la rutina personality"
-
-#: config/tc-tic6x.c:5036
-msgid "too many unwinding instructions"
-msgstr "demasiadas instrucciones de desenredo"
-
-#: config/tc-tic6x.c:5111 config/tc-tic6x.c:5124 config/tc-tic6x.c:5132
-#, c-format
-msgid "unable to generate unwinding opcode for reg %d"
-msgstr "no se puede genera códigos de operación de desenredo para el registro %d"
-
-#: config/tc-tic6x.c:5141
-msgid "unable to restore return address from previously restored reg"
-msgstr "no se puede restaurar la dirección de devolución para el registro previamente restaurado"
-
-#: config/tc-tic6x.c:5153
-#, c-format
-msgid "unhandled CFA insn for unwinding (%d)"
-msgstr "insn CFA sin manejar para el desenredo (%d)"
-
-#: config/tc-tic6x.c:5163
-#, c-format
-msgid "unable to generate unwinding opcode for frame pointer reg %d"
-msgstr "no se puede generar código de operación de desenredo para el registro de puntero a marco %d"
-
-#: config/tc-tic6x.c:5172
-msgid "unable to generate unwinding opcode for frame pointer offset"
-msgstr "no se puede generar código de operación de desenredo para el desplazamiento de puntero a marco"
-
-#: config/tc-tic6x.c:5181
-msgid "unwound stack pointer not doubleword aligned"
-msgstr "el puntero de pila desenredado no está alineado a dobleword"
-
-#: config/tc-tic6x.c:5326
-msgid "stack frame layout too complex for unwinder"
-msgstr "la disposición del marco de pila es demasiado complejo para el desenredador"
-
-#: config/tc-tic6x.c:5343
-msgid "unwound frame has negative size"
-msgstr "el marco desenredado tiene tamaño negativo"
-
 #: config/tc-v850.c:286
 #, c-format
 msgid ".COMMon length (%d.) < 0! Ignored."
@@ -14680,7 +14430,7 @@ msgid "second register should follow dash in register list"
 msgstr "el segundo registro debe estar a continuación de un guión en la lista de registros"
 
 #: config/tc-v850.c:1279
-msgid "second register should be greater than first register"
+msgid "second register should greater tahn first register"
 msgstr "el segundo registro debe ser mayor que el primer registro"
 
 #: config/tc-v850.c:1327
@@ -15764,45 +15514,41 @@ msgstr "sintaxis de expresión errónea"
 msgid "cannot make a relative jump to an absolute location"
 msgstr "no se puede hacer un salto relativo a una ubicación absoluta"
 
-#: config/tc-z80.c:695
-msgid "offset too large"
-msgstr "desplazamiento demasiado grande"
-
-#: config/tc-z80.c:697 config/tc-z80.c:1964
+#: config/tc-z80.c:697 config/tc-z80.c:1955
 msgid "overflow"
 msgstr "desbordamiento"
 
-#: config/tc-z80.c:1069 config/tc-z80.c:1112 config/tc-z80.c:1156
-#: config/tc-z80.c:1276 config/tc-z80.c:1330 config/tc-z80.c:1599
+#: config/tc-z80.c:1065 config/tc-z80.c:1108 config/tc-z80.c:1152
+#: config/tc-z80.c:1272 config/tc-z80.c:1326 config/tc-z80.c:1595
 msgid "bad intruction syntax"
 msgstr "sintaxis de instrucción errónea"
 
-#: config/tc-z80.c:1202
+#: config/tc-z80.c:1198
 msgid "condition code invalid for jr"
 msgstr "código de condición inválido para jr"
 
-#: config/tc-z80.c:1224
+#: config/tc-z80.c:1220
 msgid "bad instruction syntax"
 msgstr "sintaxis de instrucción errónea"
 
-#: config/tc-z80.c:1708
+#: config/tc-z80.c:1699
 msgid "parentheses ignored"
 msgstr "se descartan los paréntesis"
 
-#: config/tc-z80.c:1913 read.c:3603
+#: config/tc-z80.c:1904 read.c:3617
 #, c-format
 msgid "junk at end of line, first unrecognized character is `%c'"
 msgstr "basura al final de la línea; el primer carácter descartado es `%c'"
 
-#: config/tc-z80.c:1939 config/tc-z8k.c:1461 config/tc-z8k.c:1524
+#: config/tc-z80.c:1930 config/tc-z8k.c:1461 config/tc-z8k.c:1524
 msgid "relative jump out of range"
 msgstr "salto relativo fuera de rango"
 
-#: config/tc-z80.c:1956
+#: config/tc-z80.c:1947
 msgid "index offset  out of range"
 msgstr "desplazamiento de índice fuera de rango"
 
-#: config/tc-z80.c:1998 config/tc-z8k.c:1532
+#: config/tc-z80.c:1989 config/tc-z8k.c:1532
 #, c-format
 msgid "md_apply_fix: unknown r_type 0x%x\n"
 msgstr "md_apply_fix: r_type 0x%x desconocido\n"
@@ -16018,119 +15764,110 @@ msgstr "no se puede decodificar INSN_REPL '%s'"
 msgid "could not build transition for %s => %s"
 msgstr "no se puede construir la transición para %s => %s"
 
-#: depend.c:195
+#: depend.c:194
 #, c-format
 msgid "can't open `%s' for writing"
 msgstr "no se puede abrir `%s' para escritura"
 
-#: depend.c:207
+#: depend.c:206
 #, c-format
 msgid "can't close `%s'"
 msgstr "no se puede cerrar `%s'"
 
-#: dw2gencfi.c:199 read.c:2272
-#, c-format
-msgid "bfd_set_section_flags: %s"
-msgstr "bfd_set_section_flags: %s"
-
-#: dw2gencfi.c:457
+#: dw2gencfi.c:329
 #, c-format
 msgid "register save offset not a multiple of %u"
 msgstr "el desplazamiento del registro save no es un múltiplo de %u"
 
-#: dw2gencfi.c:540
+#: dw2gencfi.c:412
 msgid "CFI state restore without previous remember"
 msgstr "se usó un state restore de CFI sin un remember previo"
 
-#: dw2gencfi.c:589
+#: dw2gencfi.c:469
 msgid "missing separator"
 msgstr "falta el separador"
 
-#: dw2gencfi.c:639
+#: dw2gencfi.c:519
 msgid "bad register expression"
 msgstr "expresión de registro inválida"
 
-#: dw2gencfi.c:660 dw2gencfi.c:783 dw2gencfi.c:821 dw2gencfi.c:891
-#: dw2gencfi.c:963
+#: dw2gencfi.c:540 dw2gencfi.c:663 dw2gencfi.c:701 dw2gencfi.c:771
+#: dw2gencfi.c:843
 msgid "CFI instruction used without previous .cfi_startproc"
 msgstr "se utilizó la instrucción CFI sin un .cfi_startproc precedente"
 
-#: dw2gencfi.c:845
+#: dw2gencfi.c:725
 msgid "invalid or unsupported encoding in .cfi_personality"
 msgstr "codificación inválida o no admitida en .cfi_personality"
 
-#: dw2gencfi.c:852
+#: dw2gencfi.c:732
 msgid ".cfi_personality requires encoding and symbol arguments"
 msgstr ".cfi_personality requiere argumentos de codificación y símbolo"
 
-#: dw2gencfi.c:875
+#: dw2gencfi.c:755
 msgid "wrong second argument to .cfi_personality"
 msgstr "segundo argumento erróneo para .cfi_personality"
 
-#: dw2gencfi.c:915 dw2gencfi.c:991
+#: dw2gencfi.c:795 dw2gencfi.c:871
 msgid "invalid or unsupported encoding in .cfi_lsda"
 msgstr "codificación inválida o no admitida en .cfi_lsda"
 
-#: dw2gencfi.c:922
+#: dw2gencfi.c:802
 msgid ".cfi_lsda requires encoding and symbol arguments"
 msgstr ".cfi_lsda requiere argumentos de codificación y símbolo"
 
-#: dw2gencfi.c:947
+#: dw2gencfi.c:827
 msgid "wrong second argument to .cfi_lsda"
 msgstr "segundo argumento erróneo para .cfi_lsda"
 
-#: dw2gencfi.c:1012
+#: dw2gencfi.c:892
 msgid "wrong third argument to .cfi_val_encoded_addr"
 msgstr "tercer argumento erróneo para .cfi_val_encoded_addr"
 
-#: dw2gencfi.c:1083
+#: dw2gencfi.c:957
 msgid "previous CFI entry not closed (missing .cfi_endproc)"
 msgstr "la entrada CFI previa no está cerrada (falta un .cfi_endproc)"
 
-#: dw2gencfi.c:1123
+#: dw2gencfi.c:992
 msgid ".cfi_endproc without corresponding .cfi_startproc"
 msgstr ".cfi_endproc sin un .cfi_startproc correspondiente"
 
-#: dw2gencfi.c:1920 dw2gencfi.c:1983
+#: dw2gencfi.c:1709 dw2gencfi.c:1746
 msgid "open CFI at the end of file; missing .cfi_endproc directive"
 msgstr "un CFI abierto al final del fichero; falta una directiva .cfi_endproc"
 
-#: dw2gencfi.c:2009
-msgid "CFI is not supported for this target"
-msgstr "no se admite CFI en este objetivo"
-
-#: dwarf2dbg.c:552 dwarf2dbg.c:587
+#: dwarf2dbg.c:548 dwarf2dbg.c:583
 msgid "file number less than one"
 msgstr "número de fichero menor que uno"
 
-#: dwarf2dbg.c:562
+#: dwarf2dbg.c:558
 #, c-format
 msgid "file number %ld already allocated"
 msgstr "el número de fichero %ld ya está reservado"
 
-#: dwarf2dbg.c:592 dwarf2dbg.c:1345
+#: dwarf2dbg.c:588 dwarf2dbg.c:1341
 #, c-format
 msgid "unassigned file number %ld"
 msgstr "número de fichero %ld sin asignar"
 
-#: dwarf2dbg.c:661
+#: dwarf2dbg.c:657
 msgid "is_stmt value not 0 or 1"
 msgstr "el valor is_stmt no es 0 ó 1"
 
-#: dwarf2dbg.c:673
+#: dwarf2dbg.c:669
 msgid "isa number less than zero"
 msgstr "número isa menor que uno"
 
-#: dwarf2dbg.c:685
+#: dwarf2dbg.c:681
 msgid "discriminator less than zero"
 msgstr "discriminador menor que cero"
 
-#: dwarf2dbg.c:691
+#: dwarf2dbg.c:687
 #, c-format
 msgid "unknown .loc sub-directive `%s'"
 msgstr "sub-directiva .loc `%s' desconocida"
 
-#: dwarf2dbg.c:1408
+#: dwarf2dbg.c:1404
 msgid "internal error: unknown dwarf2 format"
 msgstr "error interno: formato dwarf2 desconocido"
 
@@ -16319,11 +16056,11 @@ msgstr "falta un .end o un .bend al final del fichero"
 msgid "GP prologue size exceeds field size, using 0 instead"
 msgstr "el tamaño del prólogo GP excede el tamaño del campo, se utiliza 0 en su lugar"
 
-#: expr.c:87 read.c:3668
+#: expr.c:87 read.c:3682
 msgid "bignum invalid"
 msgstr "bignum inválido"
 
-#: expr.c:89 read.c:3670 read.c:4147 read.c:5031
+#: expr.c:89 read.c:3684 read.c:4161 read.c:5045
 msgid "floating point number invalid"
 msgstr "número de coma flotante inválido"
 
@@ -16361,58 +16098,58 @@ msgstr "la constante de carácter es demasiado grande"
 msgid "expr.c(operand): bad atof_generic return val %d"
 msgstr "expr.c(operando): valor de devolución %d atof_generic erróneo"
 
-#: expr.c:966
+#: expr.c:969
 #, c-format
 msgid "missing '%c'"
 msgstr "falta un '%c'"
 
-#: expr.c:977 read.c:4513
+#: expr.c:980 read.c:4527
 msgid "EBCDIC constants are not supported"
 msgstr "no se admiten las constantes EBCDIC"
 
-#: expr.c:1099
+#: expr.c:1102
 #, c-format
 msgid "Unary operator %c ignored because bad operand follows"
 msgstr "Se descarta el operador unario %c porque hay un operando erróneo a continuación"
 
-#: expr.c:1145 expr.c:1170
+#: expr.c:1148 expr.c:1173
 msgid "syntax error in .startof. or .sizeof."
 msgstr "error sintáctico en .startof. o .sizeof."
 
-#: expr.c:1251 expr.c:1612
+#: expr.c:1254 expr.c:1608
 #, c-format
 msgid "invalid use of operator \"%s\""
 msgstr "uso inválido del operador \"%s\""
 
-#: expr.c:1757
+#: expr.c:1753
 msgid "missing operand; zero assumed"
 msgstr "falta un operando; se asume cero"
 
-#: expr.c:1796
+#: expr.c:1792
 msgid "left operand is a bignum; integer 0 assumed"
 msgstr "el operando izquierdo es un número grande; se asume el entero 0"
 
-#: expr.c:1798
+#: expr.c:1794
 msgid "left operand is a float; integer 0 assumed"
 msgstr "el operando izquierdo es un número de coma flotante; se asume el entero 0"
 
-#: expr.c:1807
+#: expr.c:1803
 msgid "right operand is a bignum; integer 0 assumed"
 msgstr "el operando derecho es un número grande; se asume el entero 0"
 
-#: expr.c:1809
+#: expr.c:1805
 msgid "right operand is a float; integer 0 assumed"
 msgstr "el operando derecho es un número de coma flotante; se asume el entero 0"
 
-#: expr.c:1879 symbols.c:1379
+#: expr.c:1873 symbols.c:1358
 msgid "division by zero"
 msgstr "división por cero"
 
-#: expr.c:1885
+#: expr.c:1879
 msgid "shift count"
 msgstr "cuenta de desplazamiento"
 
-#: expr.c:2002
+#: expr.c:1993
 msgid "operation combines symbols in different segments"
 msgstr "la operación combina símbolos en segmentos diferentes"
 
@@ -16424,7 +16161,7 @@ msgstr "se intentó alojar datos en la sección absoluta"
 msgid "attempt to allocate data in common section"
 msgstr "se intentó alojar datos en la sección común"
 
-#: frags.c:112 write.c:1379
+#: frags.c:112 write.c:1372
 #, c-format
 msgid "can't extend frag %u chars"
 msgstr "no se pueden extender %u caracteres de fragmento"
@@ -16441,7 +16178,7 @@ msgstr "no se pueden extender %u caracteres de fragmento"
 #. line here (assuming of course that we actually have a line of
 #. input to read), so that it can be displayed in the listing
 #. that is produced at the end of the assembly.
-#: input-file.c:138 input-scrub.c:243 listing.c:338
+#: input-file.c:138 input-scrub.c:243 listing.c:337
 msgid "{standard input}"
 msgstr "{entrada estándar}"
 
@@ -16450,12 +16187,12 @@ msgstr "{entrada estándar}"
 msgid "can't open %s for reading: %s"
 msgstr "no se puede abrir %s para lectura: %s"
 
-#: input-file.c:152 input-file.c:227 input-file.c:259
+#: input-file.c:152 input-file.c:215 input-file.c:241
 #, c-format
 msgid "can't read from %s: %s"
 msgstr "no se puede leer de %s: %s"
 
-#: input-file.c:267 listing.c:1397 output-file.c:69
+#: input-file.c:249 listing.c:1396 output-file.c:69
 #, c-format
 msgid "can't close %s: %s"
 msgstr "no se puede cerrar %s: %s"
@@ -16464,7 +16201,7 @@ msgstr "no se puede cerrar %s: %s"
 msgid "macros nested too deeply"
 msgstr "macros anidadas con demasiada profundidad"
 
-#: input-scrub.c:379 input-scrub.c:403
+#: input-scrub.c:377 input-scrub.c:401
 msgid "partial line at end of file ignored"
 msgstr "se descarta la línea parcial al final del fichero"
 
@@ -16473,15 +16210,15 @@ msgstr "se descarta la línea parcial al final del fichero"
 msgid "Unable to allocate memory for new instructions\n"
 msgstr "No se puede reservar memoria para las instrucciones nuevas\n"
 
-#: listing.c:244
+#: listing.c:243
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: listing.c:250
+#: listing.c:249
 msgid "Error:"
 msgstr "Error:"
 
-#: listing.c:1283
+#: listing.c:1282
 #, c-format
 msgid ""
 "\n"
@@ -16492,12 +16229,12 @@ msgstr ""
 " marca tiempo  \t: %s\n"
 "\n"
 
-#: listing.c:1293
+#: listing.c:1292
 #, c-format
 msgid "%s "
 msgstr "%s "
 
-#: listing.c:1298
+#: listing.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -16506,7 +16243,7 @@ msgstr ""
 "\n"
 "\t%s "
 
-#: listing.c:1308
+#: listing.c:1307
 msgid ""
 "\n"
 " options passed\t: "
@@ -16514,7 +16251,7 @@ msgstr ""
 "\n"
 " opciones pasadas\t: "
 
-#: listing.c:1347
+#: listing.c:1346
 #, c-format
 msgid ""
 " GNU assembler version %s (%s)\n"
@@ -16523,7 +16260,7 @@ msgstr ""
 "Ensamblador de GNU versión %s (%s)\n"
 "\t utilizando BFD versión %s."
 
-#: listing.c:1350
+#: listing.c:1349
 #, c-format
 msgid ""
 "\n"
@@ -16532,7 +16269,7 @@ msgstr ""
 "\n"
 " fich entrada  \t: %s"
 
-#: listing.c:1351
+#: listing.c:1350
 #, c-format
 msgid ""
 "\n"
@@ -16541,7 +16278,7 @@ msgstr ""
 "\n"
 " fich salida   \t: %s"
 
-#: listing.c:1352
+#: listing.c:1351
 #, c-format
 msgid ""
 "\n"
@@ -16550,16 +16287,16 @@ msgstr ""
 "\n"
 " objetivo      \t: %s"
 
-#: listing.c:1376
+#: listing.c:1375
 #, c-format
 msgid "can't open %s: %s"
 msgstr "no se puede abrir %s: %s"
 
-#: listing.c:1461
+#: listing.c:1460
 msgid "strange paper height, set to no form"
 msgstr "tamaño de papel extraño, se establece a sin forma"
 
-#: listing.c:1525
+#: listing.c:1524
 msgid "new line in title"
 msgstr "línea nueva en el título"
 
@@ -16569,101 +16306,101 @@ msgstr "línea nueva en el título"
 msgid "% operator needs absolute expression"
 msgstr "el operador % necesita una expresión absoluta"
 
-#: macro.c:516
+#: macro.c:512
 #, c-format
 msgid "Missing parameter qualifier for `%s' in macro `%s'"
 msgstr "Falta el calificador de parámetro para `%s' en la macro `%s'"
 
-#: macro.c:526
+#: macro.c:522
 #, c-format
 msgid "`%s' is not a valid parameter qualifier for `%s' in macro `%s'"
 msgstr "`%s' no es un calificador de parámetro válido para `%s' en la macro `%s'"
 
-#: macro.c:543
+#: macro.c:539
 #, c-format
 msgid "Pointless default value for required parameter `%s' in macro `%s'"
 msgstr "Valor por defecto sin sentido para el parámetro requerido `%s' en la macro `%s'"
 
-#: macro.c:555
+#: macro.c:551
 #, c-format
 msgid "A parameter named `%s' already exists for macro `%s'"
 msgstr "Ya existe un parámetro llamado `%s' para la macro `%s'"
 
-#: macro.c:592
+#: macro.c:588
 #, c-format
 msgid "Reserved word `%s' used as parameter in macro `%s'"
 msgstr "Se usó la palabra reservada `%s' como un parámetro en la macro `%s'"
 
-#: macro.c:650
+#: macro.c:646
 #, c-format
 msgid "unexpected end of file in macro `%s' definition"
 msgstr "fin de fichero inesperado en la definición de macro `%s'"
 
-#: macro.c:662
+#: macro.c:658
 #, c-format
 msgid "missing `)' after formals in macro definition `%s'"
 msgstr "falta `)' después de los formales en la definición de macro `%s'"
 
-#: macro.c:677
+#: macro.c:673
 msgid "Missing macro name"
 msgstr "Falta el nombre de macro"
 
-#: macro.c:686
+#: macro.c:682
 #, c-format
 msgid "Bad parameter list for macro `%s'"
 msgstr "Lista de parámetros errónea para la macro `%s'"
 
-#: macro.c:692
+#: macro.c:688
 #, c-format
 msgid "Macro `%s' was already defined"
 msgstr "La macro `%s' ya está definida"
 
-#: macro.c:816 macro.c:818
+#: macro.c:812 macro.c:814
 msgid "missing `)'"
 msgstr "falta un `)'"
 
-#: macro.c:915
+#: macro.c:911
 #, c-format
 msgid "`%s' was already used as parameter (or another local) name"
 msgstr "Ya se usó `%s' como nombre de parámetro (o nombre local)"
 
-#: macro.c:1073
+#: macro.c:1069
 msgid "confusion in formal parameters"
 msgstr "confusión en los parámetros formales"
 
-#: macro.c:1081
+#: macro.c:1077
 #, c-format
 msgid "Parameter named `%s' does not exist for macro `%s'"
 msgstr "El parámetro nombrado '%s' no existe para la macro `%s'"
 
-#: macro.c:1092
+#: macro.c:1088
 #, c-format
 msgid "Value for parameter `%s' of macro `%s' was already specified"
 msgstr "Ya se había especificado el valor para el parámetro `%s' de la macro `%s'"
 
-#: macro.c:1106
+#: macro.c:1102
 msgid "can't mix positional and keyword arguments"
 msgstr "no se pueden mezclar argumentos posicionales y palabras clave"
 
-#: macro.c:1117
+#: macro.c:1113
 msgid "too many positional arguments"
 msgstr "demasiados argumentos posicionales"
 
-#: macro.c:1165
+#: macro.c:1161
 #, c-format
 msgid "Missing value for required parameter `%s' of macro `%s'"
 msgstr "Falta el valor para el parámetro requerido `%s' de la macro `%s'"
 
-#: macro.c:1284
+#: macro.c:1280
 #, c-format
 msgid "Attempt to purge non-existant macro `%s'"
 msgstr "se intentó purgar la macro inexistente `%s'"
 
-#: macro.c:1303
+#: macro.c:1299
 msgid "unexpected end of file in irp or irpc"
 msgstr "fin de fichero inesperado en irp ó irpc"
 
-#: macro.c:1311
+#: macro.c:1307
 msgid "missing model parameter"
 msgstr "falta el parámetro modelo"
 
@@ -16672,63 +16409,63 @@ msgstr "falta el parámetro modelo"
 msgid "Assembler messages:\n"
 msgstr "Mensajes del ensamblador:\n"
 
-#: messages.c:160
+#: messages.c:150
 #, c-format
 msgid "Warning: "
 msgstr "Aviso: "
 
-#: messages.c:226
+#: messages.c:211
 #, c-format
 msgid "Error: "
 msgstr "Error: "
 
-#: messages.c:282
+#: messages.c:267
 #, c-format
 msgid "Fatal error: "
 msgstr "Error fatal: "
 
-#: messages.c:300
+#: messages.c:285
 #, c-format
 msgid "Internal error!\n"
 msgstr "¡Error interno!\n"
 
-#: messages.c:302
+#: messages.c:287
 #, c-format
 msgid "Assertion failure in %s at %s line %d.\n"
 msgstr "Falla de afirmación en %s en %s línea %d.\n"
 
-#: messages.c:305
+#: messages.c:290
 #, c-format
 msgid "Assertion failure at %s line %d.\n"
 msgstr "Falla de afirmación en %s línea %d.\n"
 
-#: messages.c:306 messages.c:323
+#: messages.c:291 messages.c:308
 #, c-format
 msgid "Please report this bug.\n"
 msgstr "Por favor reporte este bicho.\n"
 
-#: messages.c:318
+#: messages.c:303
 #, c-format
 msgid "Internal error, aborting at %s line %d in %s\n"
 msgstr "Error interno, se aborta en %s línea %d en %s\n"
 
-#: messages.c:321
+#: messages.c:306
 #, c-format
 msgid "Internal error, aborting at %s line %d\n"
 msgstr "Error interno, se aborta en %s línea %d\n"
 
-#: messages.c:370
+#: messages.c:355
 #, c-format
 msgid "%s out of domain (%d is not a multiple of %d)"
 msgstr "%s fuera de dominio (%d no es un múltiplo de %d)"
 
-#: messages.c:388
+#: messages.c:373
 #, c-format
 msgid "%s out of range (%d is not between %d and %d)"
 msgstr "%s fuera de rango (%d no está entre %d y %d)"
 
 #. xgettext:c-format.
-#: messages.c:411
+#: messages.c:396
 #, c-format
 msgid "%s out of range (0x%s is not between 0x%s and 0x%s)"
 msgstr "%s fuera de rango (0x%s no está entre 0x%s y 0x%s)"
@@ -16767,29 +16504,29 @@ msgstr "pseudo-operador desconocido: `%s'"
 msgid "label \"%d$\" redefined"
 msgstr "se redefinió la etiqueta \"%d$\""
 
-#: read.c:1221
+#: read.c:1224
 msgid ".abort detected.  Abandoning ship."
 msgstr "se detectó .abort.  Se abandona la nave."
 
-#: read.c:1239 read.c:2650
+#: read.c:1242 read.c:2661
 msgid "ignoring fill value in absolute section"
 msgstr "se descarta el valor de relleno en la sección absoluta"
 
-#: read.c:1330
+#: read.c:1333
 #, c-format
 msgid "alignment too large: %u assumed"
 msgstr "la alineación es demasiado grande: se asume %u"
 
-#: read.c:1362
+#: read.c:1365
 msgid "expected fill pattern missing"
 msgstr "falta el patrón de relleno esperado"
 
-#: read.c:1471
+#: read.c:1474
 #, c-format
 msgid "size (%ld) out of range, ignored"
 msgstr "tamaño (%ld) fuera de rango, se descarta"
 
-#: read.c:1500
+#: read.c:1503
 #, c-format
 msgid "size of \"%s\" is already %ld; not changing to %ld"
 msgstr "la longitud de \"%s\" ya es %ld; no se cambia a %ld"
@@ -16803,331 +16540,340 @@ msgstr "la longitud de \"%s\" ya es %ld; no se cambia a %ld"
 #. We do not want to barf on this, especially since such files are used
 #. in the GCC and GDB testsuites.  So we check for negative line numbers
 #. rather than non-positive line numbers.
-#: read.c:1742
+#: read.c:1755
 #, c-format
 msgid "line numbers must be positive; line number %d rejected"
 msgstr "los números de línea deben ser positivos; se rechazó el número de línea %d."
 
-#: read.c:1779
+#: read.c:1792
 #, c-format
 msgid "incompatible flag %i in line directive"
 msgstr "opción incompatible %i en la directriz de línea"
 
-#: read.c:1791
+#: read.c:1804
 #, c-format
 msgid "unsupported flag %i in line directive"
 msgstr "no se admite la opción %i en la directriz de línea"
 
-#: read.c:1830
+#: read.c:1843
 msgid "start address not supported"
 msgstr "no se admite la dirección de inicio"
 
-#: read.c:1839
+#: read.c:1852
 msgid ".err encountered"
 msgstr "se encontró .err"
 
-#: read.c:1855
+#: read.c:1868
 msgid ".error directive invoked in source file"
 msgstr "se invocó la directiva .error en el fichero fuente"
 
-#: read.c:1856
+#: read.c:1869
 msgid ".warning directive invoked in source file"
 msgstr "se invocó la directiva .warning en el fichero fuente"
 
-#: read.c:1862
+#: read.c:1875
 #, c-format
 msgid "%s argument must be a string"
 msgstr "el argumento %s debe ser una cadena"
 
-#: read.c:1894 read.c:1896
+#: read.c:1907 read.c:1909
 #, c-format
 msgid ".fail %ld encountered"
 msgstr "se encontró .fail %ld"
 
-#: read.c:1936
+#: read.c:1949
 #, c-format
 msgid ".fill size clamped to %d"
 msgstr "el tamaño de fill se restringe a %d"
 
-#: read.c:1941
+#: read.c:1954
 msgid "size negative; .fill ignored"
 msgstr "tamaño negativo; se descarta .fill"
 
-#: read.c:1947
+#: read.c:1960
 msgid "repeat < 0; .fill ignored"
 msgstr "repetición < 0; se descarta .fill"
 
-#: read.c:2103
+#: read.c:2116
 #, c-format
 msgid "Attribute name not recognised: %s"
 msgstr "No se reconoce el nombre del atributo: %s"
 
-#: read.c:2118
+#: read.c:2131
 msgid "expected numeric constant"
 msgstr "se esperaba una constante numérica"
 
-#: read.c:2159
+#: read.c:2172
 msgid "bad string constant"
 msgstr "constante de cadena errónea"
 
-#: read.c:2163
+#: read.c:2176
 msgid "expected <tag> , <value>"
 msgstr "se esperaba <etiq> , <valor>"
 
-#: read.c:2238
+#: read.c:2251
 #, c-format
 msgid "unrecognized .linkonce type `%s'"
 msgstr "no se reconoce el tipo .linkonce `%s'"
 
-#: read.c:2250
+#: read.c:2263
 msgid ".linkonce is not supported for this object file format"
 msgstr ".linkonce no se admite en este formato de fichero objeto"
 
-#: read.c:2345
+#: read.c:2285
+#, c-format
+msgid "bfd_set_section_flags: %s"
+msgstr "bfd_set_section_flags: %s"
+
+#: read.c:2358
 msgid "expected alignment after size"
 msgstr "se esperaba alineación después del tamaño"
 
-#: read.c:2572
+#: read.c:2585
 #, c-format
 msgid "attempt to redefine pseudo-op `%s' ignored"
 msgstr "se descarta el intento de redefinir el pseudo-operador `%s'"
 
-#: read.c:2591
+#: read.c:2604
 msgid "ignoring macro exit outside a macro definition."
 msgstr "se descarta la salida de macro fuera de una definición de macro."
 
-#: read.c:2645
+#: read.c:2656
 #, c-format
 msgid "invalid segment \"%s\""
 msgstr "segmento \"%s\" inválido"
 
-#: read.c:2653
+#: read.c:2664
 msgid "only constant offsets supported in absolute section"
 msgstr "sólo se admiten los desplazamientos constantes en la sección absoluta"
 
-#: read.c:2692
+#: read.c:2703
 msgid "MRI style ORG pseudo-op not supported"
 msgstr "no se admite el pseudo-operador ORG de estilo MRI"
 
-#: read.c:2845
+#: read.c:2856
 #, c-format
 msgid "unrecognized section type `%s'"
 msgstr "no se reconoce el tipo de sección `%s'"
 
-#: read.c:2859
+#: read.c:2870
 msgid "absolute sections are not supported"
 msgstr "no se admiten las secciones absolutas"
 
-#: read.c:2874
+#: read.c:2885
 #, c-format
 msgid "unrecognized section command `%s'"
 msgstr "no se reconoce la orden de sección `%s'"
 
-#: read.c:2938
+#: read.c:2949
 #, c-format
-msgid ".end%c encountered without preceding %s"
+msgid ".end%c encountered without preceeding %s"
 msgstr "se encontró .end%c sin un %s precedente"
 
-#: read.c:2968 read.c:2998
+#: read.c:2979 read.c:3009
 #, c-format
 msgid "%s without %s"
 msgstr "%s sin %s"
 
-#: read.c:3247
+#: read.c:3258
 msgid "unsupported variable size or fill value"
 msgstr "no se admiten el tamaño de la variable o el valor de relleno"
 
-#: read.c:3275
+#: read.c:3286
 msgid ".space repeat count is zero, ignored"
 msgstr "la cuenta de repetición .space es cero, se descarta"
 
-#: read.c:3277
+#: read.c:3288
 msgid ".space repeat count is negative, ignored"
 msgstr "la cuenta de repetición .space es negativa, se descarta"
 
-#: read.c:3306
+#: read.c:3317
 msgid "space allocation too complex in absolute section"
 msgstr "la asignación de espacio es demasiado compleja en la sección absoluta"
 
-#: read.c:3312
+#: read.c:3323
 msgid "space allocation too complex in common section"
 msgstr "la asignación de espacio es demasiado compleja en la sección común"
 
-#: read.c:3403 read.c:4759
+#: read.c:3414 read.c:4773
 #, c-format
 msgid "bad floating literal: %s"
 msgstr "literal de coma flotante errónea: %s"
 
-#: read.c:3560
+#: read.c:3574
 #, c-format
 msgid "%s: would close weakref loop: %s"
 msgstr "%s: cerraría el ciclo weakref: %s"
 
-#: read.c:3606
+#: read.c:3620
 #, c-format
 msgid "junk at end of line, first unrecognized character valued 0x%x"
 msgstr "basura al final de la línea; el primer carácter descartado tiene valor 0x%x"
 
-#: read.c:3734
+#: read.c:3748
 #, c-format
 msgid "`%s' can't be equated to common symbol '%s'"
 msgstr "`%s' no se puede igualar al símbolo común '%s'"
 
-#: read.c:3871
+#: read.c:3873
+msgid "unexpected `\"' in expression"
+msgstr "`\"' inesperada en la expresión"
+
+#: read.c:3885
 msgid "rva without symbol"
 msgstr "rva sin símbolo"
 
-#: read.c:3928
+#: read.c:3942
 msgid "missing or bad offset expression"
 msgstr "expresión de desplazamiento faltante o errónea"
 
-#: read.c:3949
+#: read.c:3963
 msgid "missing reloc type"
 msgstr "falta el tipo de reubicación"
 
-#: read.c:3961
+#: read.c:3975
 msgid "unrecognized reloc type"
 msgstr "no se reconoce el tipo de reubicación"
 
-#: read.c:3977
+#: read.c:3991
 msgid "bad reloc expression"
 msgstr "expresión de reubicación errónea"
 
-#: read.c:4103
+#: read.c:4117
 msgid "attempt to store value in absolute section"
 msgstr "se intentó almacenar un valor en la sección absoluta"
 
-#: read.c:4141 read.c:5025
+#: read.c:4155 read.c:5039
 msgid "zero assumed for missing expression"
 msgstr "se asume cero para la expresión faltante"
 
-#: read.c:4153 read.c:5037 write.c:266 write.c:987
+#: read.c:4167 read.c:5051 write.c:266 write.c:983
 msgid "register value used as expression"
 msgstr "se usó un valor de registro como una expresión"
 
-#: read.c:4233
+#: read.c:4247
 #, c-format
 msgid "value 0x%llx truncated to 0x%llx"
 msgstr "el valor 0x%llx se truncó a 0x%llx"
 
-#: read.c:4236
+#: read.c:4250
 msgid "value 0x%I64x truncated to 0x%I64x"
 msgstr "el valor 0x%I64x se truncó a 0x%I64x"
 
-#: read.c:4240
+#: read.c:4254
 #, c-format
 msgid "value 0x%lx truncated to 0x%lx"
 msgstr "el valor 0x%lx se truncó a 0x%lx"
 
-#: read.c:4267
+#: read.c:4281
 #, c-format
 msgid "bignum truncated to %d bytes"
 msgstr "se truncó el número grande a %d bytes"
 
-#: read.c:4586 read.c:4781
+#: read.c:4600 read.c:4795
 msgid "unresolvable or nonpositive repeat count; using 1"
 msgstr "cuenta de repetición sin resolver o no positiva; se utiliza 1"
 
-#: read.c:4635
+#: read.c:4649
 #, c-format
 msgid "unknown floating type type '%c'"
 msgstr "tipo de coma flotante desconocido tipo '%c'"
 
-#: read.c:4657
+#: read.c:4671
 msgid "floating point constant too large"
 msgstr "constante de coma flotante demasiado grande"
 
-#: read.c:5193
+#: read.c:5207
 msgid "strings must be placed into a section"
 msgstr "las cadenas se deben colocar en una sección"
 
-#: read.c:5241
+#: read.c:5255
 msgid "expected <nn>"
 msgstr "se esperaba <nn>"
 
 #. To be compatible with BSD 4.2 as: give the luser a linefeed!!
-#: read.c:5274 read.c:5360
+#: read.c:5288 read.c:5374
 msgid "unterminated string; newline inserted"
 msgstr "cadena sin terminar; se insertó una línea nueva"
 
-#: read.c:5368
+#: read.c:5382
 msgid "bad escaped character in string"
 msgstr "carácter escapado erróneamente en la cadena"
 
-#: read.c:5393
+#: read.c:5407
 msgid "expected address expression"
 msgstr "se esperaba una expresión de dirección"
 
-#: read.c:5412
+#: read.c:5426
 #, c-format
 msgid "symbol \"%s\" undefined; zero assumed"
 msgstr "símbolo \"%s\" sin definir; se asume cero"
 
-#: read.c:5415
+#: read.c:5429
 msgid "some symbol undefined; zero assumed"
 msgstr "algunos símbolos sin definir; se asumen cero"
 
-#: read.c:5450
+#: read.c:5465
 msgid "this string may not contain '\\0'"
 msgstr "esta cadena no puede contener '\\0'"
 
-#: read.c:5486
+#: read.c:5501
 msgid "missing string"
 msgstr "falta una cadena"
 
-#: read.c:5577
+#: read.c:5592
 #, c-format
 msgid ".incbin count zero, ignoring `%s'"
 msgstr "la cuenta .incbin es cero, se descarta `%s'"
 
-#: read.c:5603
+#: read.c:5618
 #, c-format
 msgid "file not found: %s"
 msgstr "no se encontró el fichero: %s"
 
-#: read.c:5617
+#: read.c:5632
 #, c-format
 msgid "seek to end of .incbin file failed `%s'"
 msgstr "falló la búsqueda del final del fichero .incbin `%s'"
 
-#: read.c:5628
+#: read.c:5643
 #, c-format
 msgid "skip (%ld) or count (%ld) invalid for file size (%ld)"
 msgstr "salto (%ld) o cuenta (%ld) inválidos para el tamaño del fichero (%ld)"
 
-#: read.c:5635
+#: read.c:5650
 #, c-format
 msgid "could not skip to %ld in file `%s'"
 msgstr "no se puede saltar a %ld en el fichero `%s'"
 
-#: read.c:5644
+#: read.c:5659
 #, c-format
 msgid "truncated file `%s', %ld of %ld bytes read"
 msgstr "el fichero `%s' está truncado, se leyeron %ld de %ld bytes"
 
-#: read.c:5803
+#: read.c:5818
 msgid "missing .func"
 msgstr "falta un .func"
 
-#: read.c:5820
+#: read.c:5835
 msgid ".endfunc missing for previous .func"
 msgstr "falta un .endfunc para el .func previo"
 
-#: read.c:5957
+#: read.c:5972
 #, c-format
 msgid "missing closing `%c'"
 msgstr "falta un `%c' que cierra"
 
-#: read.c:5959
+#: read.c:5974
 msgid "stray `\\'"
 msgstr "`\\' basura"
 
-#: remap.c:53
+#: remap.c:52
 #, c-format
 msgid "invalid argument '%s' to -fdebug-prefix-map"
 msgstr "argumento '%s' inválido para -fdebug-prefix-map"
 
-#: stabs.c:215 stabs.c:223 stabs.c:231 stabs.c:250
+#: stabs.c:214 stabs.c:222 stabs.c:230 stabs.c:249
 #, c-format
 msgid ".stab%c: missing comma"
 msgstr ".stab%c: falta una coma"
@@ -17135,90 +16881,100 @@ msgstr ".stab%c: falta una coma"
 #. This could happen for example with a source file with a huge
 #. number of lines.  The only cure is to use a different debug
 #. format, probably DWARF.
-#: stabs.c:243
+#: stabs.c:242
 #, c-format
 msgid ".stab%c: description field '%x' too big, try a different debug format"
 msgstr ".stab%c: la descripción del campo '%x' es demasiado grande, intente un formato de depuración diferente"
 
-#: stabs.c:424
+#: stabs.c:423
 msgid "comma missing in .xstabs"
 msgstr "falta una coma en .xstabs"
 
-#: symbols.c:285
+#: symbols.c:288
 #, c-format
 msgid "cannot define symbol `%s' in absolute section"
 msgstr "no se puede definir el símbolo `%s' en la sección absoluta"
 
-#: symbols.c:415
+#: symbols.c:418
 #, c-format
 msgid "symbol `%s' is already defined as \"%s\"/%s%ld"
 msgstr "el símbolo \"%s\" ya está definido como \"%s\"/%s%ld"
 
-#: symbols.c:490 symbols.c:497
+#: symbols.c:496 symbols.c:503
 #, c-format
 msgid "inserting \"%s\" into symbol table failed: %s"
 msgstr "falló la inserción de \"%s\" en la tabla de símbolos: %s"
 
-#: symbols.c:1008
+#: symbols.c:966 symbols.c:970
 #, c-format
-msgid "invalid operands (%s and %s sections) for `%s'"
-msgstr "operandos inválidos (secciones %s y %s) para `%s'"
+msgid "undefined symbol `%s' in operation"
+msgstr "símbolo sin definir `%s' en la operación"
 
-#: symbols.c:1012
+#: symbols.c:977
 #, c-format
-msgid "invalid operand (%s section) for `%s'"
-msgstr "operando inválido (sección %s) para `%s'"
+msgid "invalid sections for operation on `%s' and `%s'"
+msgstr "secciones inválidas para la operación en `%s' y `%s'"
 
-#: symbols.c:1020
+#: symbols.c:981
 #, c-format
-msgid "invalid operands (%s and %s sections) for `%s' when setting `%s'"
-msgstr "operandos inválidos (secciones %s y %s) para `%s' al establecer `%s'"
+msgid "invalid section for operation on `%s'"
+msgstr "sección inválida para la operación en `%s'"
 
-#: symbols.c:1023
+#: symbols.c:989 symbols.c:992
 #, c-format
-msgid "invalid operand (%s section) for `%s' when setting `%s'"
-msgstr "operando inválido (sección %s) para `%s' al establecer `%s'"
+msgid "undefined symbol `%s' in operation setting `%s'"
+msgstr "símbolo sin definir `%s' en la operación que establece `%s'"
 
-#: symbols.c:1072
+#: symbols.c:998
+#, c-format
+msgid "invalid sections for operation on `%s' and `%s' setting `%s'"
+msgstr "secciones inválidas para la operación en `%s' y `%s' que establece `%s'"
+
+#: symbols.c:1001
+#, c-format
+msgid "invalid section for operation on `%s' setting `%s'"
+msgstr "sección inválida para la operación en `%s' que establece `%s'"
+
+#: symbols.c:1051
 #, c-format
 msgid "symbol definition loop encountered at `%s'"
 msgstr "se encontró un ciclo de definición de símbolo en %s"
 
-#: symbols.c:1099
+#: symbols.c:1078
 #, c-format
 msgid "cannot convert expression symbol %s to complex relocation"
 msgstr "no se puede convertir el símbolo de expresión %s a una reubicación compleja"
 
-#: symbols.c:1381
+#: symbols.c:1360
 #, c-format
 msgid "division by zero when setting `%s'"
 msgstr "división por cero al establecer `%s'"
 
-#: symbols.c:1462 write.c:2048
+#: symbols.c:1441 write.c:2046
 #, c-format
 msgid "can't resolve value for symbol `%s'"
 msgstr "no se puede resolver el valor para el símbolo `%s'"
 
-#: symbols.c:1909
+#: symbols.c:1888
 #, c-format
 msgid "\"%d\" (instance number %d of a %s label)"
 msgstr "\"%d\" (número de instancia %d de una etiqueta %s)"
 
-#: symbols.c:1938
+#: symbols.c:1917
 #, c-format
 msgid "attempt to get value of unresolved symbol `%s'"
 msgstr "se intentó obtener el valor del símbolo sin resolver `%s'"
 
-#: symbols.c:2213
+#: symbols.c:2192
 msgid "section symbols are already global"
 msgstr "los símbolos de sección ya son globales"
 
-#: symbols.c:2326
+#: symbols.c:2305
 #, c-format
 msgid "Accessing function `%s' as thread-local object"
 msgstr "Se accede a la función `%s' como un objeto de hilo local"
 
-#: symbols.c:2330
+#: symbols.c:2309
 #, c-format
 msgid "Accessing `%s' as thread-local object"
 msgstr "Se accede `%s' como un objeto de hilo local"
@@ -17241,136 +16997,111 @@ msgstr "expresión de desplazamiento inválida"
 msgid "invalid reloc expression"
 msgstr "expresión de reubicación inválida"
 
-#: write.c:1072
+#: write.c:1066
 #, c-format
 msgid "value of %s too large for field of %d bytes at %s"
 msgstr "el valor de %s es demasiado grande para el campo de %d bytes en %s"
 
-#: write.c:1084
+#: write.c:1078
 #, c-format
 msgid "signed .word overflow; switch may be too large; %ld at 0x%lx"
 msgstr "desbordamiento de .word con signo; el interruptor puede ser demasiado grande; %ld en 0x%lx"
 
-#: write.c:1128
+#: write.c:1122
 msgid "redefined symbol cannot be used on reloc"
 msgstr "un símbolo redefinido no se puede usar en la reubicación"
 
-#: write.c:1141
+#: write.c:1135
 msgid "relocation out of range"
 msgstr "reubicación fuera de rango"
 
-#: write.c:1144
+#: write.c:1138
 #, c-format
 msgid "%s:%u: bad return from bfd_install_relocation: %x"
 msgstr "%s:%u: devolución errónea de bfd_install_relocation: %x"
 
-#: write.c:1208
+#: write.c:1202
 msgid "internal error: fixup not contained within frag"
 msgstr "error interno: la compostura no está contenida en un fragmento"
 
-#: write.c:1261
+#: write.c:1255
 msgid "reloc not within (fixed part of) section"
 msgstr "la reubicación no está dentro (de la parte fija de) la sección"
 
-#: write.c:1325 write.c:1455
+#: write.c:1319 write.c:1448
 msgid "can't extend frag"
 msgstr "no se pueden extender el fragmento"
 
-#: write.c:1517 write.c:1538
+#: write.c:1510 write.c:1531
 #, c-format
 msgid "can't write %s: %s"
 msgstr "no se puede escribir %s: %s"
 
-#: write.c:1568
-#, c-format
-msgid "cannot write to output file '%s': %s"
-msgstr "no se puede escribir al fichero de salida '%s': %s"
+#: write.c:1561
+msgid "cannot write to output file"
+msgstr "no se puede escribir al fichero de salida"
 
-#: write.c:1724
+#: write.c:1715
 #, c-format
 msgid "%d error%s, %d warning%s, generating bad object file"
 msgstr "%d errore%s, %d aviso%s, se genera un fichero objeto erróneo"
 
-#: write.c:1731
+#: write.c:1722
 #, c-format
 msgid "%d error%s, %d warning%s, no object file generated"
 msgstr "%d errore%s, %d aviso%s, no se genera un fichero objeto"
 
-#: write.c:1963
+#: write.c:1961
 #, c-format
 msgid "%s: global symbols not supported in common sections"
 msgstr "%s: no se admiten los símbolos globales en las secciones comunes"
 
-#: write.c:1977
+#: write.c:1975
 #, c-format
 msgid "local label `%s' is not defined"
 msgstr "la etiqueta local `%s' no está definida"
 
-#: write.c:1999
+#: write.c:1997
 #, c-format
 msgid "Local symbol `%s' can't be equated to common symbol `%s'"
 msgstr "El símbolo local `%s' no se puede igualar al símbolo común `%s'"
 
-#: write.c:2006
+#: write.c:2004
 #, c-format
 msgid "can't make global register symbol `%s'"
 msgstr "no se puede hacer global el símbolo de registro `%s'"
 
-#: write.c:2299
+#: write.c:2297
 #, c-format
 msgid "alignment padding (%lu bytes) not a multiple of %ld"
 msgstr "el relleno de alineación (%lu bytes) no es un múltiplo de %ld"
 
-#: write.c:2461
+#: write.c:2459
 #, c-format
 msgid ".word %s-%s+%s didn't fit"
 msgstr "no cabe .word %s-%s+%s"
 
-#: write.c:2555
+#: write.c:2553
 msgid "padding added"
 msgstr "se agregó relleno"
 
-#: write.c:2605
+#: write.c:2603
 msgid "attempt to move .org backwards"
 msgstr "se intentó mover .org hacia atrás"
 
-#: write.c:2629
+#: write.c:2627
 msgid ".space specifies non-absolute value"
 msgstr ".space especifica un valor que no es absoluto"
 
-#: write.c:2644
+#: write.c:2642
 msgid ".space or .fill with negative value, ignored"
 msgstr ".space ó .fill con valor negativo, se descarta"
 
-#: write.c:2715
+#: write.c:2713
 #, c-format
 msgid "Infinite loop encountered whilst attempting to compute the addresses of symbols in section %s"
 msgstr "Se encontró un ciclo infinito al intentar computar las direcciones de los símbolos en la sección %s"
 
-#~ msgid ".size expression too complicated to fix up"
-#~ msgstr "la expresión .size es demasiado complicada para componerla"
-
-#~ msgid "Label expected"
-#~ msgstr "Se esperaba una etiqueta"
-
-#~ msgid "  -matomic                enable atomic operation instructions\n"
-#~ msgstr "  -matomic                permite instrucciones de operación atómica\n"
-
-#~ msgid "  -mno-atomic             disable atomic operation instructions\n"
-#~ msgstr "  -mno-atomic             desactiva las instrucciones de operación atómica\n"
-
-#~ msgid "invalid sections for operation on `%s' and `%s'"
-#~ msgstr "secciones inválidas para la operación en `%s' y `%s'"
-
-#~ msgid "invalid section for operation on `%s'"
-#~ msgstr "sección inválida para la operación en `%s'"
-
-#~ msgid "undefined symbol `%s' in operation setting `%s'"
-#~ msgstr "símbolo sin definir `%s' en la operación que establece `%s'"
-
-#~ msgid "invalid sections for operation on `%s' and `%s' setting `%s'"
-#~ msgstr "secciones inválidas para la operación en `%s' y `%s' que establece `%s'"
-
 #~ msgid "base register should not be in register list when written back"
 #~ msgstr "el registro base no debe estar en la lista de registros cuando se escribe hacia atrás"
 
@@ -19102,6 +18833,9 @@ msgstr "Se encontró un ciclo infinito al intentar computar las direcciones de l
 #~ msgid "Invalid offset"
 #~ msgstr "Desplazamiento inválido"
 
+#~ msgid "Expression too complex"
+#~ msgstr "Expresión demasiado compleja"
+
 #~ msgid "Opcode `%s' must have suffix from list: <%s>"
 #~ msgstr "El código de operación `%s' debe tener un sufijo de la lista: <%s>"
 
diff --git a/gas/po/fi.po b/gas/po/fi.po
index 74d878fc78..f9f2ce17c1 100644
--- a/gas/po/fi.po
+++ b/gas/po/fi.po
@@ -1,14 +1,14 @@
 # Finnish messages for gas.
-# Copyright © 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright © 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Jorma Karvonen <karvonen.jorma@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gas-2.21.53\n"
+"Project-Id-Version: gas-2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-23 20:40+0200\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2011-05-17 12:12+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -57,27 +57,27 @@ msgstr "puuttuva sulkeva lainausmerkki: (otaksuttu)"
 msgid "end of file in comment; newline inserted"
 msgstr "tiedoston loppu kommentissa: uusi rivi lisätty"
 
-#: as.c:162
+#: as.c:161
 msgid "missing emulation mode name"
 msgstr "puuttuva emulointitilan nimi"
 
-#: as.c:177
+#: as.c:176
 #, c-format
 msgid "unrecognized emulation name `%s'"
 msgstr "tunnistamaton emulointinimi �%s�"
 
-#: as.c:224
+#: as.c:223
 #, c-format
 msgid "GNU assembler version %s (%s) using BFD version %s\n"
 msgstr "GNU assembleriversio %s (%s) käyttää BFD-versiota %s\n"
 
-#: as.c:231
+#: as.c:230
 #, c-format
 msgid "Usage: %s [option...] [asmfile...]\n"
 msgstr "Käyttö: %s [valitsin...] [asm-tiedosto...]\n"
 
 #  Lisätty ylimääräisiä välilyönteja sarkainasetusten säilyttämiseksi
-#: as.c:233
+#: as.c:232
 #, c-format
 msgid ""
 "Options:\n"
@@ -106,12 +106,12 @@ msgstr ""
 "                      \t  s         sisällytetään symbolit\n"
 "                      \t  =TIEDOSTO TIEDOSTO-luettelo (on oltava viimeinen alivalitsin)\n"
 
-#: as.c:247
+#: as.c:246
 #, c-format
 msgid "  --alternate             initially turn on alternate macro syntax\n"
 msgstr "  --alternate             laittaa alustuksessa päälle vaihtoehtoisen makrosyntaksin\n"
 
-#: as.c:250
+#: as.c:249
 #, c-format
 msgid ""
 "  --compress-debug-sections\n"
@@ -120,7 +120,7 @@ msgstr ""
 "  --compress-debug-sections\n"
 "                          tiivistä DWARF-vianjäljityslohkot käyttäen zlib-ohjelmistoa\n"
 
-#: as.c:253
+#: as.c:252
 #, c-format
 msgid ""
 "  --nocompress-debug-sections\n"
@@ -129,135 +129,126 @@ msgstr ""
 "  --nocompress-debug-sections\n"
 "                          älä tiivistä DWARF-vianjäljityslohkoja\n"
 
-#: as.c:257
+#: as.c:256
 #, c-format
 msgid "  -D                      produce assembler debugging messages\n"
 msgstr "  -D                      tuottaa assemblerin vianjäljitysviestit\n"
 
-#: as.c:259
+#: as.c:258
 #, c-format
 msgid ""
 "  --debug-prefix-map OLD=NEW\n"
 "                          map OLD to NEW in debug information\n"
 msgstr ""
 "  --debug-prefix-map VANHA=UUSI\n"
-"                          kuvaa VANHA UUTEEN vianjäljitystiedoissa\n"
+"                          kartoita VANHA UUTEEN vianjäljitystiedoissa\n"
 
-#: as.c:262
+#: as.c:261
 #, c-format
 msgid "  --defsym SYM=VAL        define symbol SYM to given value\n"
 msgstr "  --defsym SYM=ARVO       määrittelee symbolin SYM annetulle arvolle\n"
 
-#: as.c:278
+#: as.c:277
 #, c-format
 msgid "                          emulate output (default %s)\n"
 msgstr "                          emuloi tulosteen (oletus %s)\n"
 
-#: as.c:283
+#: as.c:282
 #, c-format
 msgid "  --execstack             require executable stack for this object\n"
 msgstr "  --execstack             vaatii suoritettavan pinon tälle objektille\n"
 
-#: as.c:285
+#: as.c:284
 #, c-format
 msgid "  --noexecstack           don't require executable stack for this object\n"
 msgstr "  --noexecstack           ei vaadi suoritettavaa pinoa tälle objektille\n"
 
 #: as.c:287
 #, c-format
-msgid ""
-"  --size-check=[error|warning]\n"
-"\t\t\t  ELF .size directive check (default --size-check=error)\n"
-msgstr ""
-"  --size-check=[error|warning]\n"
-"\t\t\t  �ELF .size�-direktiivitarkistus (oletus --size-check=error)\n"
-
-#: as.c:291
-#, c-format
 msgid "  -f                      skip whitespace and comment preprocessing\n"
 msgstr "  -f                      ohittaa tyhjätilamerkkiesikäsittelyn ja kommenttiesikäsittelyn\n"
 
-#: as.c:293
+#: as.c:289
 #, c-format
 msgid "  -g --gen-debug          generate debugging information\n"
 msgstr "  -g --gen-debug          tuottaa vianjäljitystiedot\n"
 
-#: as.c:295
+#: as.c:291
 #, c-format
 msgid "  --gstabs                generate STABS debugging information\n"
 msgstr "  --gstabs                tuottaa STABS-vianjäljitystiedot\n"
 
-#: as.c:297
+#: as.c:293
 #, c-format
 msgid "  --gstabs+               generate STABS debug info with GNU extensions\n"
 msgstr "  --gstabs+               tuottaa STABS-vianjäljitystiedot GNU-laajennuksin\n"
 
-#: as.c:299
+#: as.c:295
 #, c-format
 msgid "  --gdwarf-2              generate DWARF2 debugging information\n"
 msgstr "  --gdwarf-2              tuottaa DWARF2-vianjäljitystiedot\n"
 
-#: as.c:301
+#: as.c:297
 #, c-format
 msgid "  --hash-size=<value>     set the hash table size close to <value>\n"
 msgstr "  --hash-size=<arvo>      asettaa sekasummataulukoon lähelle arvoa <arvo>\n"
 
-#: as.c:303
+#: as.c:299
 #, c-format
 msgid "  --help                  show this message and exit\n"
 msgstr "  --help                  näyttää tämän ohjeen ja poistuu\n"
 
-#: as.c:305
+#: as.c:301
 #, c-format
 msgid "  --target-help           show target specific options\n"
 msgstr "  --target-help           näyttää kohdekohtaiset valitsimet\n"
 
-#: as.c:307
+#: as.c:303
 #, c-format
 msgid "  -I DIR                  add DIR to search list for .include directives\n"
 msgstr "  -I HAKEMISTO            lisää HAKEMISTOn �.include�-direktiivin hakuluetteloon\n"
 
-#: as.c:309
+#: as.c:305
 #, c-format
 msgid "  -J                      don't warn about signed overflow\n"
 msgstr "  -J                      ei varoita etumerkillisestä ylivuodosta\n"
 
-#: as.c:311
+#: as.c:307
 #, c-format
 msgid "  -K                      warn when differences altered for long displacements\n"
 msgstr "  -K                      varoittaa pitkien siirtymien aiheuttamista eroista\n"
 
-#: as.c:313
+#: as.c:309
 #, c-format
 msgid "  -L,--keep-locals        keep local symbols (e.g. starting with `L')\n"
 msgstr "  -L,--keep-locals        pitää paikalliset symbolit (esim. aloittaen �L�:llä)\n"
 
-#: as.c:315
+#: as.c:311
 #, c-format
 msgid "  -M,--mri                assemble in MRI compatibility mode\n"
 msgstr "  -M,--mri                kääntää konekielelle MRI-yhteensopivassa tilassa\n"
 
-#: as.c:317
+#: as.c:313
 #, c-format
 msgid "  --MD FILE               write dependency information in FILE (default none)\n"
 msgstr "  --MD TIEDOSTO           kirjoittaa riippuvuustietoja TIEDOSTOon (oletuksena ei mitään)\n"
 
-#: as.c:319
+#: as.c:315
 #, c-format
 msgid "  -nocpp                  ignored\n"
 msgstr "  -nocpp                  ei otettu huomioon\n"
 
-#: as.c:321
+#: as.c:317
 #, c-format
 msgid "  -o OBJFILE              name the object-file output OBJFILE (default a.out)\n"
 msgstr "  -o OBJTIEDOSTO          nimeää objektitiedostotulosteen nimellä OBJTIEDOSTO (oletus a.out)\n"
 
-#: as.c:323
+#: as.c:319
 #, c-format
 msgid "  -R                      fold data section into text section\n"
 msgstr "  -R                      sekoittaa datalohkon tekstilohkoon\n"
 
-#: as.c:325
+#: as.c:321
 #, c-format
 msgid ""
 "  --reduce-memory-overheads \n"
@@ -269,42 +260,42 @@ msgstr ""
 "                          konekielelle kääntöajan kustannuksella\n"
 
 #  Jätetty pois "mitatut tilastot"
-#: as.c:329
+#: as.c:325
 #, c-format
 msgid "  --statistics            print various measured statistics from execution\n"
 msgstr "  --statistics            tulostaa erilaisia tilastoja suorituksesta\n"
 
-#: as.c:331
+#: as.c:327
 #, c-format
 msgid "  --strip-local-absolute  strip local absolute symbols\n"
 msgstr "  --strip-local-absolute  riisuu paikalliset absoluuttiset symbolit\n"
 
-#: as.c:333
+#: as.c:329
 #, c-format
 msgid "  --traditional-format    Use same format as native assembler when possible\n"
 msgstr "  --traditional-format    Käyttää samaa muotoa kuin kotoperäinen assembleri, milloin mahdollista\n"
 
-#: as.c:335
+#: as.c:331
 #, c-format
 msgid "  --version               print assembler version number and exit\n"
 msgstr "  --version               tulostaa assemblerin versionumeron ja poistuu\n"
 
-#: as.c:337
+#: as.c:333
 #, c-format
 msgid "  -W  --no-warn           suppress warnings\n"
 msgstr "  -W  --no-warn           vaientaa varoitukset\n"
 
-#: as.c:339
+#: as.c:335
 #, c-format
 msgid "  --warn                  don't suppress warnings\n"
 msgstr "  --warn                  ei vaienna varoituksia\n"
 
-#: as.c:341
+#: as.c:337
 #, c-format
 msgid "  --fatal-warnings        treat warnings as errors\n"
 msgstr "  --fatal-warnings        käsittelee varoituksia virheinä\n"
 
-#: as.c:344
+#: as.c:340
 #, c-format
 msgid ""
 "  --itbl INSTTBL          extend instruction set to include instructions\n"
@@ -313,22 +304,22 @@ msgstr ""
 "  --itbl INSTTBL          laajentaa käskyjoukon sisältämään käskyt,\n"
 "                          jotka täsmäävät INSTTBL-tiedostossa määriteltyjen käskyjen kanssa\n"
 
-#: as.c:348
+#: as.c:344
 #, c-format
 msgid "  -w                      ignored\n"
 msgstr "  -w                      ei otettu huomioon\n"
 
-#: as.c:350
+#: as.c:346
 #, c-format
 msgid "  -X                      ignored\n"
 msgstr "  -X                      ei otettu huomioon\n"
 
-#: as.c:352
+#: as.c:348
 #, c-format
 msgid "  -Z                      generate object file even after errors\n"
 msgstr "  -Z                      tuottaa objektitiedoston jopa virheiden jälkeen\n"
 
-#: as.c:354
+#: as.c:350
 #, c-format
 msgid ""
 "  --listing-lhs-width     set the width in words of the output data column of\n"
@@ -337,7 +328,7 @@ msgstr ""
 "  --listing-lhs-width     asettaa luettelon tulostesarakkeen\n"
 "                          leveyden sanoina\n"
 
-#: as.c:357
+#: as.c:353
 #, c-format
 msgid ""
 "  --listing-lhs-width2    set the width in words of the continuation lines\n"
@@ -348,14 +339,14 @@ msgstr ""
 "                          ei oteta huomioon, jos se on pienempi kuin ensimmäisen\n"
 "                          rivin leveys\n"
 
-#: as.c:361
+#: as.c:357
 #, c-format
 msgid ""
 "  --listing-rhs-width     set the max width in characters of the lines from\n"
 "                          the source file\n"
 msgstr "  --listing-rhs-width     asettaa lähdetiedoston rivien maksimileveyden merkkeinä\n"
 
-#: as.c:364
+#: as.c:360
 #, c-format
 msgid ""
 "  --listing-cont-lines    set the maximum number of continuation lines used\n"
@@ -364,35 +355,35 @@ msgstr ""
 "  --listing-cont-lines    asettaa käytettyjen jatkorivien maksimimäärä\n"
 "                          luettelon tulostedatasarakkeelle\n"
 
-#: as.c:367
+#: as.c:363
 #, c-format
 msgid "  @FILE                   read options from FILE\n"
 msgstr "  @TIEDOSTO               lukee valitsimet TIEDOSTOsta\n"
 
-#: as.c:375
+#: as.c:371
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen %s\n"
 "Ilmoita käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>\n"
 
-#: as.c:587
+#: as.c:581
 #, c-format
 msgid "unrecognized option -%c%s"
 msgstr "tunnistamaton valitsin -%c%s"
 
 #. This output is intended to follow the GNU standards document.
-#: as.c:625
+#: as.c:619
 #, c-format
 msgid "GNU assembler %s\n"
 msgstr "GNU assembleri %s\n"
 
-#: as.c:626
+#: as.c:620
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright © 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright © 2010 Free Software Foundation, Inc.\n"
 
-#: as.c:627
+#: as.c:621
 #, c-format
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
@@ -403,86 +394,81 @@ msgstr ""
 "tai minkä tahansa myöhäisemmän version ehtojen alaisena.\n"
 "Tällä ohjelmalla ehdottomasti ei ole mitään takuuta\n"
 
-#: as.c:631
+#: as.c:625
 #, c-format
 msgid "This assembler was configured for a target of `%s'.\n"
 msgstr "Tämän assemblerin asetukset valittiin kohteelle �%s�.\n"
 
-#: as.c:638
+#: as.c:632
 msgid "multiple emulation names specified"
 msgstr "useita emulointinimiä määritelty"
 
-#: as.c:640
+#: as.c:634
 msgid "emulations not handled in this configuration"
 msgstr "emulointeja ei ole käsitelty tässä asetuksessa"
 
-#: as.c:645
+#: as.c:639
 #, c-format
 msgid "alias = %s\n"
 msgstr "alias = %s\n"
 
-#: as.c:646
+#: as.c:640
 #, c-format
 msgid "canonical = %s\n"
 msgstr "kanoninen = %s\n"
 
-#: as.c:647
+#: as.c:641
 #, c-format
 msgid "cpu-type = %s\n"
 msgstr "prosessorityyppi = %s\n"
 
-#: as.c:649
+#: as.c:643
 #, c-format
 msgid "format = %s\n"
 msgstr "muoto = %s\n"
 
-#: as.c:652
+#: as.c:646
 #, c-format
 msgid "bfd-target = %s\n"
 msgstr "bfd-kohde = %s\n"
 
-#: as.c:660
+#: as.c:654
 msgid "cannot compress debug sections (zlib not installed)"
 msgstr "ei voida tiivistää vianjäljityslohkoja (zlib ei ole asennettu)"
 
-#: as.c:681
+#: as.c:675
 msgid "bad defsym; format is --defsym name=value"
 msgstr "virheellinen �defsym�-valitsin: muoto on �--defsym nimi=arvo�"
 
-#: as.c:701
+#: as.c:695
 msgid "no file name following -t option"
 msgstr "Ei tiedostonimeä �-t�-valitsimen jälkeen"
 
-#: as.c:716
+#: as.c:710
 #, c-format
 msgid "failed to read instruction table %s\n"
 msgstr "käskytaulun %s lukeminen epäonnistui\n"
 
-#: as.c:828
-#, c-format
-msgid "Invalid --size-check= option: `%s'"
-msgstr "Virheellinen �--size-check=�-valitsin: �%s�"
-
-#: as.c:896
+#: as.c:881
 #, c-format
 msgid "invalid listing option `%c'"
 msgstr "virheellinen luettelointivalitsin �%c�"
 
-#: as.c:949
+#: as.c:934
 msgid "--hash-size needs a numeric argument"
 msgstr "�--hash-size�-valitsin tarvitsee numeerisen argumentin"
 
-#: as.c:974
+#: as.c:959
 #, c-format
 msgid "%s: total time in assembly: %ld.%06ld\n"
 msgstr "%s: kokonaisaika käännettäessä konekielelle: %ld.%06ld\n"
 
-#: as.c:977
+#: as.c:962
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: datakoko %ld\n"
 
-#: as.c:1289
+#: as.c:1272
 #, c-format
 msgid "%d warnings, treating warnings as errors"
 msgstr "%d varoitusta, käsitellään varoitukset virheinä"
@@ -502,9 +488,9 @@ msgstr "järkevyystesti epäonnistui"
 
 #: cgen.c:113 config/tc-alpha.c:2104 config/tc-alpha.c:2128
 #: config/tc-arc.c:1684 config/tc-d10v.c:552 config/tc-d30v.c:538
-#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2617
-#: config/tc-ppc.c:2768 config/tc-ppc.c:2910 config/tc-ppc.c:2921
-#: config/tc-s390.c:1250 config/tc-s390.c:1364 config/tc-s390.c:1493
+#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2586
+#: config/tc-ppc.c:2737 config/tc-ppc.c:2879 config/tc-ppc.c:2890
+#: config/tc-s390.c:1223 config/tc-s390.c:1323 config/tc-s390.c:1452
 #: config/tc-v850.c:2229 config/tc-v850.c:2300 config/tc-v850.c:2346
 #: config/tc-v850.c:2383 config/tc-v850.c:2420 config/tc-v850.c:2649
 msgid "too many fixups"
@@ -512,17 +498,17 @@ msgstr "liian monta korjausta"
 
 #: cgen.c:400 cgen.c:420 config/tc-arc.c:1665 config/tc-d10v.c:463
 #: config/tc-d30v.c:454 config/tc-i370.c:2125 config/tc-mn10200.c:1042
-#: config/tc-mn10300.c:1676 config/tc-ppc.c:2656 config/tc-s390.c:1221
+#: config/tc-mn10300.c:1676 config/tc-ppc.c:2625 config/tc-s390.c:1194
 #: config/tc-v850.c:2337 config/tc-v850.c:2371 config/tc-v850.c:2411
 #: config/tc-v850.c:2622 config/tc-z80.c:417
 msgid "illegal operand"
 msgstr "luvaton operandi"
 
-#: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:632 config/tc-d10v.c:465
+#: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:590 config/tc-d10v.c:465
 #: config/tc-d30v.c:456 config/tc-h8300.c:500 config/tc-i370.c:2127
 #: config/tc-mcore.c:662 config/tc-microblaze.c:579 config/tc-mmix.c:488
 #: config/tc-mn10200.c:1045 config/tc-mn10300.c:1679 config/tc-msp430.c:452
-#: config/tc-or32.c:307 config/tc-ppc.c:2658 config/tc-s390.c:1239
+#: config/tc-or32.c:307 config/tc-ppc.c:2627 config/tc-s390.c:1212
 #: config/tc-sh.c:1387 config/tc-sh64.c:2213 config/tc-v850.c:2341
 #: config/tc-v850.c:2375 config/tc-v850.c:2415 config/tc-v850.c:2625
 #: config/tc-z80.c:570 config/tc-z8k.c:350
@@ -538,18 +524,19 @@ msgid "operand mask overflow"
 msgstr "operandipeiteylivuoto"
 
 #. We can't actually support subtracting a symbol.
-#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1645 config/tc-arm.c:9058
-#: config/tc-arm.c:9110 config/tc-arm.c:9357 config/tc-arm.c:10157
-#: config/tc-arm.c:11248 config/tc-arm.c:11288 config/tc-arm.c:11616
-#: config/tc-arm.c:11655 config/tc-avr.c:1165 config/tc-cris.c:4047
-#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4694
-#: config/tc-msp430.c:1936 config/tc-ppc.c:6102 config/tc-spu.c:957
+#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1631 config/tc-arm.c:8897
+#: config/tc-arm.c:8949 config/tc-arm.c:9196 config/tc-arm.c:9986
+#: config/tc-arm.c:11068 config/tc-arm.c:11108 config/tc-arm.c:11436
+#: config/tc-arm.c:11475 config/tc-avr.c:1108 config/tc-cris.c:4043
+#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4462
+#: config/tc-mips.c:5586 config/tc-mips.c:6557 config/tc-mips.c:7133
+#: config/tc-msp430.c:1936 config/tc-ppc.c:5874 config/tc-spu.c:957
 #: config/tc-spu.c:981 config/tc-v850.c:3084 config/tc-xstormy16.c:483
 #: config/tc-xtensa.c:5833 config/tc-xtensa.c:11830
 msgid "expression too complex"
 msgstr "lauseke on liian mutkikas"
 
-#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:6227 config/tc-s390.c:2135
+#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:5999 config/tc-s390.c:2028
 #: config/tc-v850.c:3131 config/tc-xstormy16.c:537
 msgid "unresolved expression that must be resolved"
 msgstr "ratkaisematon lauseke, joka on oltava ratkaistu"
@@ -583,13 +570,15 @@ msgstr "�.elseif�-näennäiskäsky ilman vastaavaa �.if�-näennäiskäsk
 msgid "\".elseif\" after \".else\""
 msgstr "�.elseif�-näennäiskäsky on �.else�-näennäiskäskyn jälkeen"
 
+#  Lähdekoodin mukaan tässä pitäisi ilmeisesti olla .else eikä else
 #: cond.c:314 cond.c:420
-msgid "here is the previous \".else\""
-msgstr "tässä on edellinen �.else�-näennäiskäsky"
+msgid "here is the previous \"else\""
+msgstr "tässä on edellinen �else�-näennäiskäsky"
 
+#  Lähdekoodin mukaan tässä pitäisi ilmeisesti olla .if eikä if
 #: cond.c:317 cond.c:423
-msgid "here is the previous \".if\""
-msgstr "tässä on edellinen �.if�-näennäiskäsky"
+msgid "here is the previous \"if\""
+msgstr "tässä on edellinen �if�-näennäiskäsky"
 
 #: cond.c:346
 msgid "non-constant expression in \".elseif\" statement"
@@ -603,9 +592,10 @@ msgstr "�.endif�-näennäiskäsky ilman �.if�-näennäiskäskyä"
 msgid "\".else\" without matching \".if\""
 msgstr "�.else�-näennäiskäsky ilman täsmäävää �.if�-näennäiskäskyä"
 
+#  Lähdekoodin mukaan tässä pitäisi ilmeisesti olla .else eikä else
 #: cond.c:417
-msgid "duplicate \".else\""
-msgstr "kaksoiskappale �.else�-näennäiskäsky"
+msgid "duplicate \"else\""
+msgstr "kaksoiskappale �else�-näennäiskäsky"
 
 #: cond.c:468
 msgid ".ifeqs syntax error"
@@ -639,8 +629,8 @@ msgstr "�NaN�-määrittelyjä ei tueta tälle kohteelle\n"
 msgid "Infinities are not supported by this target\n"
 msgstr "Äärettömyyksiä ei tueta tälle kohteelle\n"
 
-#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1036
-#: config/tc-ia64.c:11435 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
+#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1026
+#: config/tc-ia64.c:11433 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
 msgid "Unrecognized or unsupported floating point constant"
 msgstr "Tunnistamaton tai tukematon liukulukuvakio"
 
@@ -655,107 +645,107 @@ msgstr "Yritettiin laittaa �common�-symboli joukkoon %s"
 msgid "Attempt to put an undefined symbol into set %s"
 msgstr "Yritettiin laittaa määrittelemätön symboli joukkoon %s"
 
-#: config/obj-aout.c:115 config/obj-coff.c:1398
+#: config/obj-aout.c:115 config/obj-coff.c:1394
 #, c-format
 msgid "Symbol `%s' can not be both weak and common"
 msgstr "Symboli �%s� ei voi olla sekä �weak� että �common�"
 
-#: config/obj-coff.c:140 dw2gencfi.c:214
+#: config/obj-coff.c:136
 #, c-format
 msgid "Inserting \"%s\" into structure table failed: %s"
 msgstr "Kohteen �%s� lisääminen rakennetauluun ei onnistunut: %s"
 
-#: config/obj-coff.c:219 config/obj-coff.c:1695 config/tc-ppc.c:5147
-#: config/tc-tic54x.c:4008 read.c:2795
+#: config/obj-coff.c:215 config/obj-coff.c:1691 config/tc-ppc.c:4937
+#: config/tc-tic54x.c:4008 read.c:2806
 #, c-format
 msgid "error setting flags for \"%s\": %s"
 msgstr "virhe asetettaessa lippuja bfd-lohkonimelle �%s�: %s"
 
 #. Zero is used as an end marker in the file.
-#: config/obj-coff.c:438
+#: config/obj-coff.c:434
 msgid "Line numbers must be positive integers\n"
 msgstr "Rivinumerojen on oltava positiivisia kokonaislukuja\n"
 
 #  Pilkku tuntui luontevammalta kuin kaksoispiste. "Pseudo-operation" (näennäiskäsky) lyhennetään usein muotoon "pseudo-op". Se on assemblerille tarkoitettu käsky, joka ei luo mitään konekoodia. Assembleri ratkaisee sen konekäännöshetkellä, kun taas konekäskyt ratkaistaan ajoaikaisesti. Näennäiskäskyä kutsutaan joskus myös assembleriohjeeksi tai assembleridirektiiviksi.
-#: config/obj-coff.c:470
+#: config/obj-coff.c:466
 msgid ".ln pseudo-op inside .def/.endef: ignored."
 msgstr "�.ln�-näennäiskäsky �.def/.endef�-näennäiskäskyn sisällä, ei otettu huomioon."
 
 # ".loc"-näennäiskäsky eli direktiivi on sama kuin ".ln"-näennäiskäsky, mutta jotkut assemblerit käyttävät edellistä, jotkut jälkimmäistä.
-#: config/obj-coff.c:512 ecoff.c:3250
+#: config/obj-coff.c:508 ecoff.c:3250
 msgid ".loc outside of .text"
 msgstr "�.loc�-direktiivi �.text�-direktiivin ulkopuolella"
 
-#: config/obj-coff.c:519
+#: config/obj-coff.c:515
 msgid ".loc pseudo-op inside .def/.endef: ignored."
 msgstr "�.loc�-näennäiskäsky �.def/.endef�-näennäiskäskyn sisällä, ei otettu huomioon."
 
-#: config/obj-coff.c:600
+#: config/obj-coff.c:596
 msgid ".def pseudo-op used inside of .def/.endef: ignored."
 msgstr "�.def�-näennäiskäskyä käytetty �.def/.endef�-näennäiskäskyn sisällä, ei otettu huomioon."
 
-#: config/obj-coff.c:636
+#: config/obj-coff.c:632
 msgid ".endef pseudo-op used outside of .def/.endef: ignored."
 msgstr "�.endef�-näennäiskäskyä käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:675
+#: config/obj-coff.c:671
 #, c-format
 msgid "`%s' symbol without preceding function"
 msgstr "�%s�-symboli ilman edeltävää funktiota"
 
-#: config/obj-coff.c:762
+#: config/obj-coff.c:758
 #, c-format
 msgid "unexpected storage class %d"
 msgstr "odottamaton tallennusluokka %d"
 
-#: config/obj-coff.c:870
+#: config/obj-coff.c:866
 msgid ".dim pseudo-op used outside of .def/.endef: ignored."
 msgstr "�.dim�-näennäiskäskyä käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:890
+#: config/obj-coff.c:886
 msgid "badly formed .dim directive ignored"
 msgstr "vääränmuotoista �.dim�-direktiiviä ei otettu huomioon"
 
-#: config/obj-coff.c:939
+#: config/obj-coff.c:935
 msgid ".size pseudo-op used outside of .def/.endef ignored."
 msgstr "�.size�-näennäiskäskyä käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:954
+#: config/obj-coff.c:950
 msgid ".scl pseudo-op used outside of .def/.endef ignored."
 msgstr "�.scl�-näennäiskäsky käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:971
+#: config/obj-coff.c:967
 msgid ".tag pseudo-op used outside of .def/.endef ignored."
 msgstr "�.tag�-näennäiskäsky käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:989
+#: config/obj-coff.c:985
 #, c-format
 msgid "tag not found for .tag %s"
 msgstr "tunnistetta ei löytynyt näennäiskäskylle �.tag� %s"
 
-#: config/obj-coff.c:1002
+#: config/obj-coff.c:998
 msgid ".type pseudo-op used outside of .def/.endef ignored."
 msgstr "�.type�-näennäiskäskyä käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:1021
+#: config/obj-coff.c:1017
 msgid ".val pseudo-op used outside of .def/.endef ignored."
 msgstr "�.val�-näennäiskäskyä käytetty �.def/.endef�-näennäiskäskyn ulkopuolella, ei otettu huomioon."
 
-#: config/obj-coff.c:1178
+#: config/obj-coff.c:1174
 msgid "badly formed .weak directive ignored"
 msgstr "väärän muotoista �.weak�-direktiiviä ei otettu huomioon"
 
 #  ".eb"-näennäiskäsky tunnistaa sisäisen lohkon lopun ja tarjoaa sisäisen lohkon loppukohtaisia lisätietoja.
-#: config/obj-coff.c:1356
+#: config/obj-coff.c:1352
 msgid "mismatched .eb"
 msgstr "täsmäämätön �.eb�-symboli"
 
-#: config/obj-coff.c:1377
+#: config/obj-coff.c:1373
 #, c-format
 msgid "C_EFCN symbol for %s out of scope"
 msgstr "�C_EFCN�-symboli nimelle %s vaikutusalueen ulkopuolella"
 
-#: config/obj-coff.c:1431
+#: config/obj-coff.c:1427
 #, c-format
 msgid "Warning: internal error: forgetting to set endndx of %s"
 msgstr "Varoitus: sisäinen virhe: unohdettiin asettaa %s-endndx"
@@ -763,22 +753,22 @@ msgstr "Varoitus: sisäinen virhe: unohdettiin asettaa %s-endndx"
 #. STYP_INFO
 #. STYP_LIB
 #. STYP_OVER
-#: config/obj-coff.c:1661
+#: config/obj-coff.c:1657
 #, c-format
 msgid "unsupported section attribute '%c'"
 msgstr "ei-tuettu lohkoattribuutti �%c�"
 
-#: config/obj-coff.c:1665 config/tc-ppc.c:5129
+#: config/obj-coff.c:1661 config/tc-ppc.c:4919
 #, c-format
 msgid "unknown section attribute '%c'"
 msgstr "tuntematon lohkoattribuutti �%c�"
 
-#: config/obj-coff.c:1707
+#: config/obj-coff.c:1703
 #, c-format
 msgid "Ignoring changed section attributes for %s"
 msgstr "Ei oteta huomioon vaihtuneita lohkoattribuutteja lohkolle %s"
 
-#: config/obj-coff.c:1847
+#: config/obj-coff.c:1838
 #, c-format
 msgid "0x%lx: \"%s\" type = %ld, class = %d, segment = %d\n"
 msgstr "0x%lx: �%s� tyyppi = %ld, luokka = %d, segmentti = %d\n"
@@ -834,7 +824,7 @@ msgstr "vaihdettua lohkoyksikkökokoa lohkolle %s ei oteta huomioon"
 msgid "unrecognized .section attribute: want a,e,w,x,M,S,G,T"
 msgstr "tunnistamaton �.section�-attribuutti: haluaa attribuutin a,e,w,x,M,S,G,T"
 
-#: config/obj-elf.c:836 read.c:2779
+#: config/obj-elf.c:836 read.c:2790
 msgid "unrecognized section type"
 msgstr "lohkotyyppiä ei tunnistettu"
 
@@ -846,93 +836,92 @@ msgstr "lohkoattribuutteja ei tunnistettu"
 msgid "missing name"
 msgstr "puuttuva nimi"
 
-#: config/obj-elf.c:1032
+#: config/obj-elf.c:1030
 msgid "invalid merge entity size"
 msgstr "virheellinen lomituskokonaisuuden koko"
 
-#: config/obj-elf.c:1039
+#: config/obj-elf.c:1037
 msgid "entity size for SHF_MERGE not specified"
 msgstr "kokonaisuuskokoa lohkoattribuutille �SHF_MERGE� ei ole määritelty"
 
-#: config/obj-elf.c:1045
+#: config/obj-elf.c:1043
 msgid "? section flag ignored with G present"
 msgstr "? lohkolippu ohitetaan kun G on läsnä"
 
-#: config/obj-elf.c:1064
+#: config/obj-elf.c:1062
 msgid "group name for SHF_GROUP not specified"
 msgstr "ryhmänimeä lohkoattribuutille �SHF_GROUP� ei ole määritelty"
 
-#: config/obj-elf.c:1087
+#: config/obj-elf.c:1085
 msgid "character following name is not '#'"
 msgstr "nimeä seuraava merkki ei ole �#�"
 
-#: config/obj-elf.c:1207
+#: config/obj-elf.c:1204
 msgid ".previous without corresponding .section; ignored"
 msgstr "�.previous�-lohko ilman vastaavaa �.section�-lohkoa, ei otettu huomioon"
 
-#: config/obj-elf.c:1233
+#: config/obj-elf.c:1230
 msgid ".popsection without corresponding .pushsection; ignored"
 msgstr "�.popsection�-lohko ilman vastaavaa �.pushsection�-lohkoa, ei otettu huomioon"
 
-#: config/obj-elf.c:1279
+#: config/obj-elf.c:1276
 msgid "expected comma after name in .symver"
 msgstr "odotettiin pilkkua nimen jälkeen �.symver�-näennäiskäskyssä"
 
-#: config/obj-elf.c:1303
+#: config/obj-elf.c:1300
 #, c-format
 msgid "missing version name in `%s' for symbol `%s'"
 msgstr "puuttuva versionimi kohteessa �%s� symbolille �%s�"
 
-#: config/obj-elf.c:1314
+#: config/obj-elf.c:1311
 #, c-format
 msgid "multiple versions [`%s'|`%s'] for symbol `%s'"
 msgstr "useita versioita [�%s�|�%s�] symbolille �%s�"
 
-#: config/obj-elf.c:1351
+#: config/obj-elf.c:1348
 #, c-format
 msgid "expected `%s' to have already been set for .vtable_inherit"
 msgstr "odotettiin �%s� olevan jo asetettu kohteelle .vtable_inherit"
 
-#: config/obj-elf.c:1361
+#: config/obj-elf.c:1358
 msgid "expected comma after name in .vtable_inherit"
 msgstr "odotettiin pilkkua nimen jälkeen �.vtable_inherit�-näennäiskäskyssä"
 
-#: config/obj-elf.c:1414
+#: config/obj-elf.c:1411
 msgid "expected comma after name in .vtable_entry"
 msgstr "odotettiin pilkkua nimen jälkeen �.vtable_entry�-näennäiskäskyssä"
 
-#: config/obj-elf.c:1537
+#: config/obj-elf.c:1534
 msgid "expected quoted string"
 msgstr "odotettiin merkkijonoa lainausmerkkien sisällä"
 
-#: config/obj-elf.c:1557
+#: config/obj-elf.c:1554
 #, c-format
 msgid "expected comma after name `%s' in .size directive"
 msgstr "odotettiin pilkkua nimen �%s� jälkeen �.size�-direktiivissä"
 
-#: config/obj-elf.c:1566
+#: config/obj-elf.c:1563
 msgid "missing expression in .size directive"
 msgstr "puuttuva lauseke �.size�-direktiivissä"
 
-#: config/obj-elf.c:1690
+#: config/obj-elf.c:1687
 #, c-format
 msgid "symbol '%s' is already defined"
 msgstr "symboli ’%s’ on jo määritelty"
 
-#: config/obj-elf.c:1710 config/obj-elf.c:1722
+#: config/obj-elf.c:1707 config/obj-elf.c:1719
 #, c-format
 msgid "symbol type \"%s\" is supported only by GNU targets"
 msgstr "symbolityyppiä �%s� tukevat vain GNU-kohteet"
 
-#: config/obj-elf.c:1733
+#: config/obj-elf.c:1730
 #, c-format
 msgid "unrecognized symbol type \"%s\""
 msgstr "tunnistamaton symbolityyppi �%s�"
 
-#: config/obj-elf.c:1903 config/obj-elf.c:1906
-#, c-format
-msgid ".size expression for %s does not evaluate to a constant"
-msgstr ".size-lauseke kohteelle %s ei määritellä vakioksi"
+#: config/obj-elf.c:1906
+msgid ".size expression too complicated to fix up"
+msgstr "�.size�-lauseke liian mutkikas korjattavaksi"
 
 #: config/obj-elf.c:1938
 #, c-format
@@ -955,17 +944,17 @@ msgstr "otaksutaan ryhmän �%s� kaikkien jäsenien olevan COMDAT-kelpoisia"
 msgid "can't create group: %s"
 msgstr "ei voida luoda ryhmää: %s"
 
-#: config/obj-elf.c:2267
+#: config/obj-elf.c:2260
 #, c-format
 msgid "failed to set up debugging information: %s"
 msgstr "vianjäljitystietojen asetus epäonnistui: %s"
 
-#: config/obj-elf.c:2287
+#: config/obj-elf.c:2280
 #, c-format
 msgid "can't start writing .mdebug section: %s"
 msgstr "lohkon �.mdebug� kirjoitus ei voi alkaa: %s"
 
-#: config/obj-elf.c:2295
+#: config/obj-elf.c:2288
 #, c-format
 msgid "could not write .mdebug section: %s"
 msgstr "lohkoa �.mdebug� ei voitu kirjoittaa: %s"
@@ -1079,7 +1068,7 @@ msgstr "virheellisiä argumentteja käskykoodille �%s�"
 msgid "opcode `%s' not supported for target %s"
 msgstr "käskykoodia �%s� ei tueta kohteelle %s"
 
-#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1441
+#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1384
 #: config/tc-msp430.c:1828
 #, c-format
 msgid "unknown opcode `%s'"
@@ -1161,7 +1150,7 @@ msgid "sequence number in use for !tlsgd!%ld"
 msgstr "sekvenssinumero käytössä kohteelle �!tlsgd!%ld�"
 
 #: config/tc-alpha.c:2001 config/tc-arc.c:292 config/tc-mn10200.c:856
-#: config/tc-mn10300.c:1148 config/tc-ppc.c:1730 config/tc-s390.c:638
+#: config/tc-mn10300.c:1148 config/tc-ppc.c:1699 config/tc-s390.c:611
 msgid "operand"
 msgstr "operandi"
 
@@ -1178,7 +1167,7 @@ msgid "can not resolve expression"
 msgstr "ei voida ratkaista lauseketta"
 
 #: config/tc-alpha.c:3524 config/tc-i370.c:1055 config/tc-microblaze.c:185
-#: config/tc-ppc.c:2055 config/tc-ppc.c:4892
+#: config/tc-ppc.c:2024 config/tc-ppc.c:4682
 #, c-format
 msgid ".COMMon length (%ld.) <0! Ignored."
 msgstr "�.COMMon�-pituus (%ld.) <0! Ei otettu huomioon."
@@ -1187,7 +1176,7 @@ msgstr "�.COMMon�-pituus (%ld.) <0! Ei otettu huomioon."
 msgid "Ignoring attempt to re-define symbol"
 msgstr "Ei oteta huomioon yritystä määrittää symboli uudelleen"
 
-#: config/tc-alpha.c:3627 config/tc-ppc.c:4929 config/tc-sparc.c:3828
+#: config/tc-alpha.c:3627 config/tc-ppc.c:4719 config/tc-sparc.c:3828
 #, c-format
 msgid "Length of .comm \"%s\" is already %ld. Not changed to %ld."
 msgstr "Näennäiskäskyn �.comm� �%s� pituus on jo %ld. Ei vaihdeta arvoon %ld."
@@ -1228,7 +1217,7 @@ msgstr "virheellinen �.fmask�-direktiivi"
 msgid "bad .mask directive"
 msgstr "virheellinen �.mask�-direktiivi"
 
-#: config/tc-alpha.c:3882 config/tc-mips.c:15469 config/tc-score.c:5743
+#: config/tc-alpha.c:3882 config/tc-mips.c:15153 config/tc-score.c:5743
 #: ecoff.c:3178
 msgid ".frame outside of .ent"
 msgstr "�.frame�-direktiivi on �.ent�-direktiivin ulkopuolella"
@@ -1360,37 +1349,37 @@ msgstr "Tasaus liian iso: �%d.� otaksuttu"
 msgid "Alignment negative: 0 assumed"
 msgstr "Tasaus negatiivinen: 0 otaksuttu"
 
-#: config/tc-alpha.c:5163 config/tc-alpha.c:5656
+#: config/tc-alpha.c:5162 config/tc-alpha.c:5655
 #, c-format
 msgid "Unknown CPU identifier `%s'"
 msgstr "Tuntematon prosessoritunniste �%s�"
 
-#: config/tc-alpha.c:5354
+#: config/tc-alpha.c:5353
 #, c-format
 msgid "Chose GP value of %lx\n"
 msgstr "Valitsi GP-arvon %lx\n"
 
-#: config/tc-alpha.c:5368
+#: config/tc-alpha.c:5367
 msgid "bad .section directive: want a,s,w,x,M,S,G,T in string"
 msgstr "virheellinen �.section�-direktiivi: halutaan a,s,w,x,M,S,G,T merkkijonossa"
 
-#: config/tc-alpha.c:5457
+#: config/tc-alpha.c:5456
 #, c-format
 msgid "internal error: can't hash opcode `%s': %s"
 msgstr "sisäinen virhe: ei voi sekasummata käskykoodia �%s�: %s"
 
-#: config/tc-alpha.c:5493
+#: config/tc-alpha.c:5492
 #, c-format
 msgid "internal error: can't hash macro `%s': %s"
 msgstr "sisäinen virhe: ei voi sekasummata makroa �%s�: %s"
 
-#: config/tc-alpha.c:5578 config/tc-arm.c:6746 config/tc-arm.c:6758
+#: config/tc-alpha.c:5577 config/tc-arm.c:6588 config/tc-arm.c:6600
 #: config/tc-i960.c:708 config/tc-xtensa.c:5315 config/tc-xtensa.c:5393
-#: config/tc-xtensa.c:5510 config/tc-z80.c:1897
+#: config/tc-xtensa.c:5510 config/tc-z80.c:1888
 msgid "syntax error"
 msgstr "syntaksivirhe"
 
-#: config/tc-alpha.c:5707
+#: config/tc-alpha.c:5706
 msgid ""
 "Alpha options:\n"
 "-32addr\t\t\ttreat addresses as 32-bit values\n"
@@ -1408,7 +1397,7 @@ msgstr ""
 "-m21064 | -m21066 | -m21164 | -m21164a | -m21164pc | -m21264 | -m21264a | -m21264b\n"
 "\t\t\tnämä variantit sisältävät PAL-koodisia käskykoodeja\n"
 
-#: config/tc-alpha.c:5717
+#: config/tc-alpha.c:5716
 msgid ""
 "VMS options:\n"
 "-+\t\t\tencode (don't truncate) names longer than 64 characters\n"
@@ -1420,40 +1409,40 @@ msgstr ""
 "-H\t\t\tnäyttää uuden symbolin sekasummaustypistyksen jälkeen\n"
 "-replace/-noreplace\tottaa käyttöön tai pois käytöstä proseduurikutsujen optimoinnin\n"
 
-#: config/tc-alpha.c:5968
+#: config/tc-alpha.c:5967
 #, c-format
 msgid "unhandled relocation type %s"
 msgstr "käsittelemätön sijoitustyyppi %s"
 
-#: config/tc-alpha.c:5981
+#: config/tc-alpha.c:5980
 msgid "non-absolute expression in constant field"
 msgstr "ei-absoluuttinen lauseke vakiokentässä"
 
-#: config/tc-alpha.c:5995
+#: config/tc-alpha.c:5994
 #, c-format
 msgid "type %d reloc done?\n"
 msgstr "tyypin %d reloc-tietue valmis?\n"
 
-#: config/tc-alpha.c:6042 config/tc-alpha.c:6049 config/tc-mips.c:9793
+#: config/tc-alpha.c:6041 config/tc-alpha.c:6048
 msgid "Used $at without \".set noat\""
 msgstr "Käytetty $at-rekisteriä ilman �.set noat�-määrittelyä"
 
-#: config/tc-alpha.c:6218
+#: config/tc-alpha.c:6217
 #, c-format
 msgid "!samegp reloc against symbol without .prologue: %s"
 msgstr "�!samegp reloc�-tietue symbolia vastaan ilman �.prologue�-direktiiviä: %s"
 
-#: config/tc-alpha.c:6262 config/tc-xtensa.c:5999
+#: config/tc-alpha.c:6261 config/tc-xtensa.c:5999
 #, c-format
 msgid "cannot represent `%s' relocation in object file"
 msgstr "ei voi edustaa �%s�-sijoitusta objektitiedostossa"
 
-#: config/tc-alpha.c:6268
+#: config/tc-alpha.c:6267
 #, c-format
 msgid "internal error? cannot generate `%s' relocation"
 msgstr "sisäinen virhe? ei voi tuottaa �%s�-sijoitusta"
 
-#: config/tc-alpha.c:6364
+#: config/tc-alpha.c:6363
 #, c-format
 msgid "frame reg expected, using $%d."
 msgstr "odotettiin kehysrekisteriä, käytetään $%d."
@@ -1461,15 +1450,15 @@ msgstr "odotettiin kehysrekisteriä, käytetään $%d."
 #: config/tc-arc.c:194 config/tc-arc.c:215 config/tc-arc.c:992
 #: config/tc-h8300.c:77 config/tc-h8300.c:86 config/tc-h8300.c:96
 #: config/tc-h8300.c:106 config/tc-h8300.c:116 config/tc-h8300.c:127
-#: config/tc-h8300.c:244 config/tc-hppa.c:6887 config/tc-hppa.c:6893
-#: config/tc-hppa.c:6899 config/tc-hppa.c:6905 config/tc-hppa.c:8312
+#: config/tc-h8300.c:244 config/tc-hppa.c:6866 config/tc-hppa.c:6872
+#: config/tc-hppa.c:6878 config/tc-hppa.c:6884 config/tc-hppa.c:8291
 #: config/tc-lm32.c:198 config/tc-mn10300.c:937 config/tc-mn10300.c:942
 #: config/tc-mn10300.c:2433 config/tc-xc16x.c:79 config/tc-xc16x.c:86
 #: config/tc-xc16x.c:93
 msgid "could not set architecture and machine"
 msgstr "ei voitu asettaa arkkitehtuuria ja konetta"
 
-#: config/tc-arc.c:212 config/tc-arm.c:22240 config/tc-score.c:6303
+#: config/tc-arc.c:212 config/tc-arm.c:22001 config/tc-score.c:6303
 #: config/tc-score.c:6532 config/tc-score.c:6537
 msgid "virtual memory exhausted"
 msgstr "virtuaalimuisti loppui"
@@ -1560,7 +1549,7 @@ msgstr "käskykoodi 0x3 ja SYNTAX_3OP virheellinen"
 msgid "unknown suffix class"
 msgstr "tuntematon loppuliiteluokka"
 
-#: config/tc-arc.c:862 config/tc-tic6x.c:582
+#: config/tc-arc.c:862
 msgid "expected comma after symbol name"
 msgstr "odotettiin pilkkua symbolinimen jälkeen"
 
@@ -1631,7 +1620,7 @@ msgstr "symboli kohderekisterinä"
 
 #. xgettext:c-format.
 #: config/tc-arc.c:1759 config/tc-i370.c:2207 config/tc-mn10200.c:1141
-#: config/tc-mn10300.c:1820 config/tc-ppc.c:2970 config/tc-s390.c:1506
+#: config/tc-mn10300.c:1820 config/tc-ppc.c:2939 config/tc-s390.c:1465
 #: config/tc-v850.c:2699
 #, c-format
 msgid "junk at end of line: `%s'"
@@ -1650,823 +1639,803 @@ msgstr "8-tavuinen hyppykäsky viivevälillä"
 msgid "conditional branch follows set of flags"
 msgstr "ehdollinen haarautuminen seuraa lippujoukkoa"
 
-#: config/tc-arc.c:1893 config/tc-arm.c:16170
+#: config/tc-arc.c:1893 config/tc-arm.c:15965
 #, c-format
 msgid "bad instruction `%s'"
 msgstr "virheellinen käsky �%s�"
 
-#: config/tc-arm.c:539
+#: config/tc-arm.c:529
 msgid "ARM register expected"
 msgstr "odotettiin ARM-rekisteriä"
 
-#: config/tc-arm.c:540
+#: config/tc-arm.c:530
 msgid "bad or missing co-processor number"
 msgstr "virheellinen tai puuttuva apuprosessorinumero"
 
-#: config/tc-arm.c:541
+#: config/tc-arm.c:531
 msgid "co-processor register expected"
 msgstr "odotettiin apuprosessorirekisteriä"
 
-#: config/tc-arm.c:542
+#: config/tc-arm.c:532
 msgid "FPA register expected"
 msgstr "odotettiin FPA-rekisteriä"
 
-#: config/tc-arm.c:543
+#: config/tc-arm.c:533
 msgid "VFP single precision register expected"
 msgstr "odotettiin VFP-perustarkkuusrekisteriä"
 
-#: config/tc-arm.c:544
+#: config/tc-arm.c:534
 msgid "VFP/Neon double precision register expected"
 msgstr "Odotettiin VFP/Neon-kaksoistarkkuusrekisteriä"
 
-#: config/tc-arm.c:545
+#: config/tc-arm.c:535
 msgid "Neon quad precision register expected"
 msgstr "Odotettiin Neon-nelitarkkuusrekisteriä"
 
-#: config/tc-arm.c:546
+#: config/tc-arm.c:536
 msgid "VFP single or double precision register expected"
 msgstr "Odotettiin VFP-perustarkkuusrekisteriä tai VFP-kaksoistarkkuusrekisteriä"
 
-#: config/tc-arm.c:547
+#: config/tc-arm.c:537
 msgid "Neon double or quad precision register expected"
 msgstr "Odotettiin Neon-kaksois- tai nelitarkkuusrekisteriä"
 
-#: config/tc-arm.c:548
+#: config/tc-arm.c:538
 msgid "VFP single, double or Neon quad precision register expected"
 msgstr "Odotettiin VFP-perus-, kaksi- tai Neon-nelitarkkuusrekisteriä"
 
-#: config/tc-arm.c:549
+#: config/tc-arm.c:539
 msgid "VFP system register expected"
 msgstr "Odotettiin VFP-järjestelmärekisteriä"
 
-#: config/tc-arm.c:550
+#: config/tc-arm.c:540
 msgid "Maverick MVF register expected"
 msgstr "Odotettiin Maverick MVF -rekisteriä"
 
-#: config/tc-arm.c:551
+#: config/tc-arm.c:541
 msgid "Maverick MVD register expected"
 msgstr "Odotettiin Maverick MVD -rekisteriä"
 
-#: config/tc-arm.c:552
+#: config/tc-arm.c:542
 msgid "Maverick MVFX register expected"
 msgstr "Odotettiin Maverick MVFX -rekisteriä"
 
-#: config/tc-arm.c:553
+#: config/tc-arm.c:543
 msgid "Maverick MVDX register expected"
 msgstr "Odotettiin Maverick MVDX -rekisteriä"
 
-#: config/tc-arm.c:554
+#: config/tc-arm.c:544
 msgid "Maverick MVAX register expected"
 msgstr "Odotettiin Maverick MVAX -rekisteriä"
 
-#: config/tc-arm.c:555
+#: config/tc-arm.c:545
 msgid "Maverick DSPSC register expected"
 msgstr "Odotettiin Maverick DSPSC -rekisteriä"
 
-#: config/tc-arm.c:556
+#: config/tc-arm.c:546
 msgid "iWMMXt data register expected"
 msgstr "Odotettiin iWMMXt-datarekisteriä"
 
-#: config/tc-arm.c:557 config/tc-arm.c:6525
+#: config/tc-arm.c:547 config/tc-arm.c:6363
 msgid "iWMMXt control register expected"
 msgstr "Odotettiin iWMMXt-ohjausrekisteriä"
 
-#: config/tc-arm.c:558
+#: config/tc-arm.c:548
 msgid "iWMMXt scalar register expected"
 msgstr "Odotettiin iWMMXt-skalaarirekisteriä"
 
-#: config/tc-arm.c:559
+#: config/tc-arm.c:549
 msgid "XScale accumulator register expected"
 msgstr "Odotettiin XScale-akkurekisteriä"
 
 #. For score5u : div/mul will pop warning message, mmu/alw/asw will pop error message.
-#: config/tc-arm.c:708 config/tc-score.c:259
+#: config/tc-arm.c:698 config/tc-score.c:259
 msgid "bad arguments to instruction"
 msgstr "virheelliset argumentit käskyyn"
 
-#: config/tc-arm.c:709
+#: config/tc-arm.c:699
 msgid "r13 not allowed here"
 msgstr "�r13� ei ole sallittu tässä"
 
-#: config/tc-arm.c:710
+#: config/tc-arm.c:700
 msgid "r15 not allowed here"
 msgstr "�r15� ei ole sallittu tässä"
 
-#: config/tc-arm.c:711
+#: config/tc-arm.c:701
 msgid "instruction cannot be conditional"
 msgstr "käsky ei voi olla ehdollinen"
 
-#: config/tc-arm.c:712
+#: config/tc-arm.c:702
 msgid "registers may not be the same"
 msgstr "rekisterit eivät voi olla samoja"
 
-#: config/tc-arm.c:713
+#: config/tc-arm.c:703
 msgid "lo register required"
 msgstr "�lo�-rekisteri vaadittu"
 
-#: config/tc-arm.c:714
+#: config/tc-arm.c:704
 msgid "instruction not supported in Thumb16 mode"
 msgstr "käskyä ei ole tuettu �Thumb16�-tilassa"
 
-#: config/tc-arm.c:715
+#: config/tc-arm.c:705
 msgid "instruction does not accept this addressing mode"
 msgstr "käsky ei hyväksy tätä osoitteenmuodostustilaa"
 
-#: config/tc-arm.c:716
+#: config/tc-arm.c:706
 msgid "branch must be last instruction in IT block"
 msgstr "haarautumiskäskyn on oltava viimeinen käsky �IT�-lohkossa"
 
-#: config/tc-arm.c:717
+#: config/tc-arm.c:707
 msgid "instruction not allowed in IT block"
 msgstr "käsky ei ole sallittu �IT�-lohkossa"
 
-#: config/tc-arm.c:718
+#: config/tc-arm.c:708
 msgid "selected FPU does not support instruction"
 msgstr "valittu FPU ei tue käskyä"
 
-#: config/tc-arm.c:719
+#: config/tc-arm.c:709
 msgid "thumb conditional instruction should be in IT block"
 msgstr "ehdollisen thumb-käskyn pitäisi olla IT-lohkossa"
 
-#: config/tc-arm.c:720
+#: config/tc-arm.c:710
 msgid "incorrect condition in IT block"
 msgstr "virheellinen ehto IT-lohkossa"
 
-#: config/tc-arm.c:721
+#: config/tc-arm.c:711
 msgid "IT falling in the range of a previous IT block"
 msgstr "IT putoaa edellisen IT-lohkon alueelle"
 
-#: config/tc-arm.c:722
+#: config/tc-arm.c:712
 msgid "missing .fnstart before unwinding directive"
 msgstr "puuttuva .fnstart ennen unwinding-direktiivia"
 
-#: config/tc-arm.c:724
+#: config/tc-arm.c:714
 msgid "cannot use register index with PC-relative addressing"
 msgstr "ei voi käyttää rekisteri-indeksiä ohjelmalaskurisuhteellisella osoitteenmuodostuksella"
 
-#: config/tc-arm.c:726
+#: config/tc-arm.c:716
 msgid "cannot use writeback with PC-relative addressing"
 msgstr "ei voi käyttää �writeback�-toimintoa ohjelmalaskurisuhteellisella osoitteenmuodostuksella"
 
 #  immediate tarkoittaa assembly-kielisessä koodissa sijoitusta, jossa rekisteriin ei sijoiteta toisen rekisterin sisältöä vaan välitön arvo (esimerkiksi numero tai ascii-merkki). Arvo sisältyy tavallaan käskyyn. ATK-sanakirja tarjoaa "immediate instruction"-käsitteen vastineeksi "itseiskäsky" ja "immediate operand" on "itseisoperandi". Logiikka kuitenkin ontuu "immediate value"-käsitteen kohdalla, koska "itseisarvo" on jo varattu toiseen merkitykseen.
-#: config/tc-arm.c:917
+#: config/tc-arm.c:907
 msgid "immediate expression requires a # prefix"
 msgstr "välitön lauseke vaatii �#�-etuliitteen"
 
-#: config/tc-arm.c:945 read.c:3664
+#: config/tc-arm.c:935 read.c:3678
 msgid "missing expression"
 msgstr "puuttuva lauseke"
 
-#: config/tc-arm.c:945 config/tc-score.c:6519 expr.c:1357 read.c:2456
+#: config/tc-arm.c:935 config/tc-score.c:6519 expr.c:1358 read.c:2469
 msgid "bad expression"
 msgstr "virheellinen lauseke"
 
-#: config/tc-arm.c:956 config/tc-i860.c:1004 config/tc-sparc.c:2880
+#: config/tc-arm.c:946 config/tc-i860.c:1004 config/tc-sparc.c:2880
 msgid "bad segment"
 msgstr "virheellinen segmentti"
 
-#: config/tc-arm.c:975 config/tc-arm.c:4848 config/tc-i960.c:1300
+#: config/tc-arm.c:965 config/tc-arm.c:4809 config/tc-i960.c:1300
 #: config/tc-score.c:1211
 msgid "invalid constant"
 msgstr "virheellinen vakio"
 
-#: config/tc-arm.c:1105
+#: config/tc-arm.c:1095
 msgid "expected #constant"
 msgstr "odotettiin �#constant�-vakiota"
 
-#: config/tc-arm.c:1266
+#: config/tc-arm.c:1256
 #, c-format
 msgid "unexpected character `%c' in type specifier"
 msgstr "odottamaton merkki �%c� tyyppimäärittelyssä"
 
-#: config/tc-arm.c:1283
+#: config/tc-arm.c:1273
 #, c-format
 msgid "bad size %d in type specifier"
 msgstr "virheellinen koko %d tyyppimäärittelyssä"
 
-#: config/tc-arm.c:1333
+#: config/tc-arm.c:1323
 msgid "only one type should be specified for operand"
 msgstr "vain yksi tyyppi olisi määriteltävä operandille"
 
-#: config/tc-arm.c:1339
+#: config/tc-arm.c:1329
 msgid "vector type expected"
 msgstr "odotettiin vektorityyppiä"
 
-#: config/tc-arm.c:1411
+#: config/tc-arm.c:1401
 msgid "can't redefine type for operand"
 msgstr "ei voi määritellä uudelleen tyyppiä operandille"
 
 #  Viittaa Neon-prosessorin VFD-tyyppiseen rekisteriin
-#: config/tc-arm.c:1422
+#: config/tc-arm.c:1412
 msgid "only D registers may be indexed"
 msgstr "vain D-rekisterit saa indeksoida"
 
-#: config/tc-arm.c:1428
+#: config/tc-arm.c:1418
 msgid "can't change index for operand"
 msgstr "ei voi vaihtaa indeksiä operandille"
 
-#: config/tc-arm.c:1444 config/tc-arm.c:3332 config/tc-arm.c:4430
+#: config/tc-arm.c:1434 config/tc-arm.c:3318 config/tc-arm.c:4391
 msgid "constant expression required"
 msgstr "vakiolauseke vaadittu"
 
-#: config/tc-arm.c:1491
+#: config/tc-arm.c:1477
 msgid "register operand expected, but got scalar"
 msgstr "odotettiin rekisterioperandia, mutta saatiin skalaari"
 
-#: config/tc-arm.c:1524
+#: config/tc-arm.c:1510
 msgid "scalar must have an index"
 msgstr "skalaarin on oltava indeksi"
 
-#: config/tc-arm.c:1529 config/tc-arm.c:14756 config/tc-arm.c:14806
-#: config/tc-arm.c:15221
+#: config/tc-arm.c:1515 config/tc-arm.c:14574 config/tc-arm.c:14624
+#: config/tc-arm.c:15039
 msgid "scalar index out of range"
 msgstr "skalaari-indeksi lukualueen ulkopuolella"
 
-#: config/tc-arm.c:1577
+#: config/tc-arm.c:1563
 msgid "bad range in register list"
 msgstr "virheellinen lukualue rekisteriluettelossa"
 
-#: config/tc-arm.c:1585 config/tc-arm.c:1594 config/tc-arm.c:1635
+#: config/tc-arm.c:1571 config/tc-arm.c:1580 config/tc-arm.c:1621
 #, c-format
 msgid "Warning: duplicated register (r%d) in register list"
 msgstr "Varoitus: kaksoiskappale rekisteristä (r%d) rekisteriluettelossa"
 
-#: config/tc-arm.c:1597
+#: config/tc-arm.c:1583
 msgid "Warning: register range not in ascending order"
 msgstr "Varoitus: rekisterilukualue ei ole nousevassa järjestyksessä"
 
-#: config/tc-arm.c:1608
+#: config/tc-arm.c:1594
 msgid "missing `}'"
 msgstr "puuttuva �}�"
 
-#: config/tc-arm.c:1624
+#: config/tc-arm.c:1610
 msgid "invalid register mask"
 msgstr "virheellinen rekisteripeite"
 
-#: config/tc-arm.c:1706
+#: config/tc-arm.c:1692
 msgid "expecting {"
 msgstr "odotetaan {"
 
-#: config/tc-arm.c:1761 config/tc-arm.c:1805
+#: config/tc-arm.c:1747 config/tc-arm.c:1791
 msgid "register out of range in list"
 msgstr "rekisteri lukualueen ulkopuolella luettelossa"
 
-#: config/tc-arm.c:1777 config/tc-arm.c:1822 config/tc-h8300.c:1040
-#: config/tc-mips.c:10894 config/tc-mips.c:10916
+#: config/tc-arm.c:1763 config/tc-arm.c:1808 config/tc-h8300.c:1040
+#: config/tc-mips.c:10575 config/tc-mips.c:10597
 msgid "invalid register list"
 msgstr "virheellinen rekisteriluettelo"
 
-#: config/tc-arm.c:1783 config/tc-arm.c:3846 config/tc-arm.c:3979
+#: config/tc-arm.c:1769 config/tc-arm.c:3832 config/tc-arm.c:3965
 msgid "register list not in ascending order"
 msgstr "rekisteriluettelo ei ole nousevassa järjestyksessä"
 
-#: config/tc-arm.c:1814
+#: config/tc-arm.c:1800
 msgid "register range not in ascending order"
 msgstr "rekisterilukualue ei ole nousevassa järjestyksessä"
 
-#: config/tc-arm.c:1847
+#: config/tc-arm.c:1833
 msgid "non-contiguous register range"
 msgstr "ei-jatkuva rekisterilukualue"
 
-#: config/tc-arm.c:1906
+#: config/tc-arm.c:1892
 msgid "register stride must be 1 or 2"
 msgstr "rekisteriyksikköaskeleen on oltava 1 tai 2"
 
-#: config/tc-arm.c:1907
+#: config/tc-arm.c:1893
 msgid "mismatched element/structure types in list"
 msgstr "täsmäämättömiä �element/structure�-tyyppejä luettelossa"
 
-#: config/tc-arm.c:1971
+#: config/tc-arm.c:1957
 msgid "don't use Rn-Rm syntax with non-unit stride"
 msgstr "älä käytä �Rn-Rm�-syntaksia ei-yksikköaskeleessa"
 
-#: config/tc-arm.c:2026
+#: config/tc-arm.c:2012
 msgid "error parsing element/structure list"
 msgstr "virhe jäsennettäessä �element/structure�-luetteloa"
 
-#: config/tc-arm.c:2032
+#: config/tc-arm.c:2018
 msgid "expected }"
 msgstr "odotettiin }"
 
-#: config/tc-arm.c:2089
+#: config/tc-arm.c:2075
 #, c-format
 msgid "ignoring attempt to redefine built-in register '%s'"
 msgstr "ei oteta huomioon yritystä määritellä sisäänrakennettua rekisteria ’%s’ uudelleen"
 
-#: config/tc-arm.c:2094
+#: config/tc-arm.c:2080
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr "ei oteta huomioon rekisterialiaksen ’%s’ uudelleenmäärittelyä"
 
-#: config/tc-arm.c:2122
+#: config/tc-arm.c:2108
 msgid "attempt to redefine typed alias"
 msgstr "yritys määritellä tyypitetty alias uudelleen"
 
-#: config/tc-arm.c:2161
+#: config/tc-arm.c:2147
 #, c-format
 msgid "unknown register '%s' -- .req ignored"
 msgstr "tuntematon rekisteri ’%s’ -- �.req�-direktiiviä ei otettu huomioon"
 
-#: config/tc-arm.c:2256
+#: config/tc-arm.c:2242
 msgid "bad type for register"
 msgstr "virheellinen tyyppi rekisterille"
 
-#: config/tc-arm.c:2267
+#: config/tc-arm.c:2253
 msgid "expression must be constant"
 msgstr "lausekkeen on oltava vakio"
 
-#: config/tc-arm.c:2284
+#: config/tc-arm.c:2270
 msgid "can't redefine the type of a register alias"
 msgstr "ei voi määritellä rekisterialiastyyppiä uudelleen"
 
-#: config/tc-arm.c:2291
+#: config/tc-arm.c:2277
 msgid "you must specify a single type only"
 msgstr "on määriteltävä vain yksi tyyppi"
 
-#: config/tc-arm.c:2304
+#: config/tc-arm.c:2290
 msgid "can't redefine the index of a scalar alias"
 msgstr "ei voi määritellä skalaarialiaksen indeksiä uudelleen"
 
-#: config/tc-arm.c:2312
+#: config/tc-arm.c:2298
 msgid "scalar index must be constant"
 msgstr "skalaari-indeksin on oltava vakio"
 
-#: config/tc-arm.c:2321
+#: config/tc-arm.c:2307
 msgid "expecting ]"
 msgstr "odotetaan ]"
 
-#: config/tc-arm.c:2368
+#: config/tc-arm.c:2354
 msgid "invalid syntax for .req directive"
 msgstr "virheellinen syntaksi �.req�-direktiiville"
 
-#: config/tc-arm.c:2374
+#: config/tc-arm.c:2360
 msgid "invalid syntax for .dn directive"
 msgstr "virheellinen syntaksi �.dn�-direktiiville"
 
-#: config/tc-arm.c:2380
+#: config/tc-arm.c:2366
 msgid "invalid syntax for .qn directive"
 msgstr "virheellinen syntaksi �.qn�-direktiiville"
 
-#: config/tc-arm.c:2406
+#: config/tc-arm.c:2392
 msgid "invalid syntax for .unreq directive"
 msgstr "virheellinen syntaksi �.unreq�-direktiiville"
 
-#: config/tc-arm.c:2413
+#: config/tc-arm.c:2399
 #, c-format
 msgid "unknown register alias '%s'"
 msgstr "tuntematon rekisterialias ’%s’"
 
-#: config/tc-arm.c:2415
+#  Tässä pitäisi ehkä lukea redefine, muuten en oikein ymmärrä lausetta
+#: config/tc-arm.c:2401
 #, c-format
-msgid "ignoring attempt to use .unreq on fixed register name: '%s'"
-msgstr "ei oteta huomioon yritystä käyttää .unreq kiinteälle rekisterinimelle: ’%s’"
+msgid "ignoring attempt to undefine built-in register '%s'"
+msgstr "ei oteta huomioon yritystä määritellä sisäänrakennettua rekisteriä ’%s’ uudelleen"
 
-#: config/tc-arm.c:2666
+#: config/tc-arm.c:2652
 #, c-format
 msgid "Failed to find real start of function: %s\n"
 msgstr "Funktion todellisen alun löytäminen epäonnistui: %s\n"
 
-#: config/tc-arm.c:2683
+#: config/tc-arm.c:2669
 msgid "selected processor does not support THUMB opcodes"
 msgstr "valittu prosessori ei tue THUMB-käskykoodeja"
 
-#: config/tc-arm.c:2696
+#: config/tc-arm.c:2682
 msgid "selected processor does not support ARM opcodes"
 msgstr "valittu prosessori ei tue ARM-käskykoodeja"
 
-#: config/tc-arm.c:2708
+#: config/tc-arm.c:2694
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr "valittu käskykoko (%d) on virheellinen"
 
-#: config/tc-arm.c:2740
+#: config/tc-arm.c:2726
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr "virheellinen operandi �.code�-direktiiviin (%d) (odotettiin 16 tai 32)"
 
-#: config/tc-arm.c:2796
+#: config/tc-arm.c:2782
 #, c-format
 msgid "expected comma after name \"%s\""
 msgstr "odotettiin pilkkua nimen �%s� jälkeen"
 
-#: config/tc-arm.c:2846 config/tc-m32r.c:588
+#: config/tc-arm.c:2832 config/tc-m32r.c:588
 #, c-format
 msgid "symbol `%s' already defined"
 msgstr "symboli �%s� on jo määritelty"
 
-#: config/tc-arm.c:2880
+#: config/tc-arm.c:2866
 #, c-format
 msgid "unrecognized syntax mode \"%s\""
 msgstr "tunnistamaton syntaksitila �%s�"
 
-#: config/tc-arm.c:2901
+#: config/tc-arm.c:2887
 #, c-format
 msgid "alignment too large: %d assumed"
 msgstr "tasaus liian iso: %d otaksuttu"
 
-#: config/tc-arm.c:2904
+#: config/tc-arm.c:2890
 msgid "alignment negative. 0 assumed."
 msgstr "tasaus negatiivinen. 0 otaksuttu."
 
-#: config/tc-arm.c:3054
+#: config/tc-arm.c:3040
 msgid "literal pool overflow"
 msgstr "literaalivarannon ylivuoto"
 
-#: config/tc-arm.c:3210 config/tc-arm.c:6460
+#: config/tc-arm.c:3196 config/tc-arm.c:6298
 msgid "unrecognized relocation suffix"
 msgstr "tunnistamaton sijoitusloppuliite"
 
-#: config/tc-arm.c:3225
+#: config/tc-arm.c:3211
 msgid "(plt) is only valid on branch targets"
 msgstr "(plt) on voimassa vain haaroituskohteissa"
 
-#: config/tc-arm.c:3231 config/tc-s390.c:1134 config/tc-s390.c:1771
+#: config/tc-arm.c:3217 config/tc-s390.c:1107 config/tc-s390.c:1730
 #: config/tc-xtensa.c:1591
 #, c-format
 msgid "%s relocations do not fit in %d bytes"
 msgstr "%s-sijoitukset eivät sovi %d tavuun"
 
-#: config/tc-arm.c:3308
+#: config/tc-arm.c:3294
 msgid ".inst.n operand too big. Use .inst.w instead"
 msgstr ".inst.n -operandi on liian suuri. Käytä sen sijaan .inst.w"
 
-#: config/tc-arm.c:3328
+#: config/tc-arm.c:3314
 msgid "cannot determine Thumb instruction size. Use .inst.n/.inst.w instead"
 msgstr "ei voida määritellä Thumb-käskyn kokoa. Käytä sen sijaan .inst.n/.inst.w"
 
-#: config/tc-arm.c:3358
+#: config/tc-arm.c:3344
 msgid "width suffixes are invalid in ARM mode"
 msgstr "leveysloppuliitteet ovat virheellisiä ARM-tilassa"
 
-#: config/tc-arm.c:3400 dwarf2dbg.c:711
+#: config/tc-arm.c:3386 dwarf2dbg.c:707
 msgid "expected 0 or 1"
 msgstr "odotettiin 0 tai 1"
 
-#: config/tc-arm.c:3404
+#: config/tc-arm.c:3390
 msgid "missing comma"
 msgstr "puuttuva pilkku"
 
-#: config/tc-arm.c:3437
+#: config/tc-arm.c:3423
 msgid "duplicate .fnstart directive"
 msgstr "kaksoiskappale �.fnstart�-direktiivi"
 
-#: config/tc-arm.c:3468 config/tc-tic6x.c:413
+#: config/tc-arm.c:3454
 msgid "duplicate .handlerdata directive"
 msgstr "kaksoiskappale �.handlerdata�-direktiivi"
 
-#: config/tc-arm.c:3487
+#: config/tc-arm.c:3473
 msgid ".fnend directive without .fnstart"
 msgstr "�.fnend�-direktiivi ilman �.fnstart�-direktiivia"
 
-#: config/tc-arm.c:3553 config/tc-tic6x.c:394
+#: config/tc-arm.c:3539
 msgid "personality routine specified for cantunwind frame"
 msgstr "persoonallisuusrutiini määritelty �cantunwind�-kehykselle"
 
-#: config/tc-arm.c:3570 config/tc-tic6x.c:455
+#: config/tc-arm.c:3556
 msgid "duplicate .personalityindex directive"
 msgstr "kaksoiskappale �.personalityindex�-direktiivi"
 
-#: config/tc-arm.c:3577 config/tc-tic6x.c:462
+#: config/tc-arm.c:3563
 msgid "bad personality routine number"
 msgstr "virheellinen persoonallisuusrutiininumero"
 
-#: config/tc-arm.c:3599 config/tc-tic6x.c:479
+#: config/tc-arm.c:3585
 msgid "duplicate .personality directive"
 msgstr "kaksoiskappale �.personality�-direktiivi"
 
-#: config/tc-arm.c:3622 config/tc-arm.c:3750 config/tc-arm.c:3798
+#: config/tc-arm.c:3608 config/tc-arm.c:3736 config/tc-arm.c:3784
 msgid "expected register list"
 msgstr "odotettiin rekisteriluetteloa"
 
-#: config/tc-arm.c:3704
+#: config/tc-arm.c:3690
 msgid "expected , <constant>"
 msgstr "odotettiin , <vakio>"
 
-#: config/tc-arm.c:3713
+#: config/tc-arm.c:3699
 msgid "number of registers must be in the range [1:4]"
 msgstr "rekistereiden numeron on oltava lukualueella [1:4]"
 
-#: config/tc-arm.c:3860 config/tc-arm.c:3993
+#: config/tc-arm.c:3846 config/tc-arm.c:3979
 msgid "bad register range"
 msgstr "virheellinen rekisterilukualue"
 
-#: config/tc-arm.c:4050
+#: config/tc-arm.c:4036
 msgid "register expected"
 msgstr "odotettiin rekisteriä"
 
-#: config/tc-arm.c:4060
+#: config/tc-arm.c:4046
 msgid "FPA .unwind_save does not take a register list"
 msgstr "�FPA .unwind_save�-direktiivi ei ota rekisteriluetteloa"
 
-#: config/tc-arm.c:4079
+#: config/tc-arm.c:4065
 msgid ".unwind_save does not support this kind of register"
 msgstr "�.unwind_save�-direktiivi ei tue tämän kaltaista rekisteriä"
 
-#: config/tc-arm.c:4118
+#: config/tc-arm.c:4104
 msgid "SP and PC not permitted in .unwind_movsp directive"
 msgstr "Pino-osoitin ja ohjelmalaskuri ei ole sallittu �.unwind_movsp�-direktiivissä"
 
-#: config/tc-arm.c:4123
+#: config/tc-arm.c:4109
 msgid "unexpected .unwind_movsp directive"
 msgstr "odottamaton �.unwind_movsp�-direktiivi"
 
-#: config/tc-arm.c:4150
+#: config/tc-arm.c:4136
 msgid "stack increment must be multiple of 4"
 msgstr "pinon askellisäyksen on oltava 4:n monikerta"
 
-#: config/tc-arm.c:4182
+#: config/tc-arm.c:4168
 msgid "expected <reg>, <reg>"
 msgstr "odotettiin <rekisteri>, <rekisteri>"
 
-#: config/tc-arm.c:4200
+#: config/tc-arm.c:4186
 msgid "register must be either sp or set by a previousunwind_movsp directive"
 msgstr "rekisterin on oltava joko �sp� tai aiemman �previousunwind_movsp�-direktiivin asettama"
 
-#: config/tc-arm.c:4239
+#: config/tc-arm.c:4225
 msgid "expected <offset>, <opcode>"
 msgstr "odotettiin <siirrososoite>, <käskykoodi>"
 
-#: config/tc-arm.c:4251
+#: config/tc-arm.c:4237
 msgid "unwind opcode too long"
 msgstr "�unwind�-käskykoodi on liian pitkä"
 
-#: config/tc-arm.c:4256
+#: config/tc-arm.c:4242
 msgid "invalid unwind opcode"
 msgstr "virheellinen �unwind�-käskykoodi"
 
 #  :4000 :4863 :8438 :8920 :11718 :18666 :18691 :18699
-#: config/tc-arm.c:4436 config/tc-arm.c:5346 config/tc-arm.c:9360
-#: config/tc-arm.c:9888 config/tc-arm.c:13218 config/tc-arm.c:21248
-#: config/tc-arm.c:21273 config/tc-arm.c:21281 config/tc-z8k.c:1144
+#: config/tc-arm.c:4397 config/tc-arm.c:5307 config/tc-arm.c:9199
+#: config/tc-arm.c:9724 config/tc-arm.c:13036 config/tc-arm.c:21030
+#: config/tc-arm.c:21055 config/tc-arm.c:21063 config/tc-z8k.c:1144
 #: config/tc-z8k.c:1154
 msgid "immediate value out of range"
 msgstr "välitön arvo on lukualueen ulkopuolella"
 
-#: config/tc-arm.c:4601
+#: config/tc-arm.c:4562
 msgid "invalid FPA immediate expression"
 msgstr "virheellinen FPA-välitönlauseke"
 
-#: config/tc-arm.c:4725 config/tc-arm.c:4734
+#: config/tc-arm.c:4686 config/tc-arm.c:4695
 msgid "shift expression expected"
 msgstr "odotettiin sivuttaissiirroslauseketta"
 
-#: config/tc-arm.c:4748
+#: config/tc-arm.c:4709
 msgid "'LSL' or 'ASR' required"
 msgstr "’LSL’ tai ’ASR’ vaadittu"
 
-#: config/tc-arm.c:4756
+#: config/tc-arm.c:4717
 msgid "'LSL' required"
 msgstr "’LSL’ vaadittu"
 
-#: config/tc-arm.c:4764
+#: config/tc-arm.c:4725
 msgid "'ASR' required"
 msgstr "’ASR’ vaadittu"
 
-#: config/tc-arm.c:4836 config/tc-arm.c:5340 config/tc-arm.c:7168
+#: config/tc-arm.c:4797 config/tc-arm.c:5301 config/tc-arm.c:7010
 msgid "constant expression expected"
 msgstr "odotettiin vakiolauseketta"
 
-#: config/tc-arm.c:4843
+#: config/tc-arm.c:4804
 msgid "invalid rotation"
 msgstr "virheellinen kierto"
 
-#: config/tc-arm.c:5003 config/tc-arm.c:5167
+#: config/tc-arm.c:4964 config/tc-arm.c:5128
 msgid "unknown group relocation"
 msgstr "tuntematon ryhmäsijoitus"
 
-#: config/tc-arm.c:5039
+#: config/tc-arm.c:5000
 msgid "alignment must be constant"
 msgstr "tasauksen on oltava vakio"
 
-#: config/tc-arm.c:5198
+#: config/tc-arm.c:5159
 msgid "this group relocation is not allowed on this instruction"
 msgstr "tämä ryhmäsijoitus ei ole sallittu tässä käskyssä"
 
-#: config/tc-arm.c:5219 config/tc-arm.c:5747
+#: config/tc-arm.c:5180 config/tc-arm.c:5585
 msgid "']' expected"
 msgstr "’]’ odotettiin"
 
-#: config/tc-arm.c:5237
+#: config/tc-arm.c:5198
 msgid "'}' expected at end of 'option' field"
 msgstr "’}’ odotettiin ’option’-kentän lopussa"
 
-#: config/tc-arm.c:5242
+#: config/tc-arm.c:5203
 msgid "cannot combine index with option"
 msgstr "ei voi yhdistää indeksiä valitsimen kanssa"
 
-#: config/tc-arm.c:5255
+#: config/tc-arm.c:5216
 msgid "cannot combine pre- and post-indexing"
 msgstr "ei voi yhdistää ennakko- ja jälki-indeksointia"
 
-#: config/tc-arm.c:5478
-msgid "unexpected bit specified after APSR"
-msgstr "odottamaton bitti määritelty APSR:n jälkeen"
-
-#: config/tc-arm.c:5490
-msgid "selected processor does not support DSP extension"
-msgstr "valittu prosessori ei tue DSP-laajennusta"
-
-#: config/tc-arm.c:5502
-msgid "bad bitmask specified after APSR"
-msgstr "väärä bittipeite määritelty APSR:n jälkeen"
-
-#: config/tc-arm.c:5526
-msgid "writing to APSR without specifying a bitmask is deprecated"
-msgstr "APSR:n kirjoittaminen määrittelemättä bittipeitettä on vanhentunut"
-
-#: config/tc-arm.c:5538 config/tc-arm.c:10977 config/tc-arm.c:11016
-#: config/tc-arm.c:11020
-msgid "selected processor does not support requested special purpose register"
-msgstr "valittu prosessori ei tue pyydettyä erikoiskäyttörekisteriä"
-
-#: config/tc-arm.c:5543
+#: config/tc-arm.c:5381
 msgid "flag for {c}psr instruction expected"
 msgstr "odotettiin lippua �{c}psr�-käskylle"
 
-#: config/tc-arm.c:5568
+#: config/tc-arm.c:5406
 msgid "unrecognized CPS flag"
 msgstr "tunnistamaton CPS-lippu"
 
-#: config/tc-arm.c:5575
+#: config/tc-arm.c:5413
 msgid "missing CPS flags"
 msgstr "CPS-liput puuttuvat"
 
 #  "be" tarkoittaa "big-endian" ja "le" tarkoittaa "little-endian"
-#: config/tc-arm.c:5598 config/tc-arm.c:5604
+#: config/tc-arm.c:5436 config/tc-arm.c:5442
 msgid "valid endian specifiers are be or le"
 msgstr "oikeita tavujärjestysmäärittelyjä ovat �be� tai �le�"
 
-#: config/tc-arm.c:5626
+#: config/tc-arm.c:5464
 msgid "missing rotation field after comma"
 msgstr "puuttuva kiertokenttä pilkun jälkeen"
 
-#: config/tc-arm.c:5641
+#: config/tc-arm.c:5479
 msgid "rotation can only be 0, 8, 16, or 24"
 msgstr "kierto voi olla vain 0, 8, 16, tai 24"
 
-#: config/tc-arm.c:5670
+#: config/tc-arm.c:5508
 msgid "condition required"
 msgstr "ehto vaadittu"
 
-#: config/tc-arm.c:5709 config/tc-arm.c:7755
+#: config/tc-arm.c:5547 config/tc-arm.c:7594
 msgid "'[' expected"
 msgstr "’[’ odotettiin"
 
-#: config/tc-arm.c:5722
+#: config/tc-arm.c:5560
 msgid "',' expected"
 msgstr "’,’ odotettiin"
 
-#: config/tc-arm.c:5739
+#: config/tc-arm.c:5577
 msgid "invalid shift"
 msgstr "virheellinen sivuttaissiirto"
 
-#: config/tc-arm.c:5812
+#: config/tc-arm.c:5650
 msgid "can't use Neon quad register here"
 msgstr "tässä ei voi käyttää Neon-nelitarkkuusrekisteriä"
 
-#: config/tc-arm.c:5878
+#: config/tc-arm.c:5716
 msgid "expected <Rm> or <Dm> or <Qm> operand"
 msgstr "odotettiin �<Rm>�- tai �<Dm>�- tai �<Qm>�- operandia"
 
-#: config/tc-arm.c:5958
+#: config/tc-arm.c:5796
 msgid "parse error"
 msgstr "jäsennysvirhe"
 
-#: config/tc-arm.c:5968 read.c:2127
+#: config/tc-arm.c:5806 read.c:2140
 msgid "expected comma"
 msgstr "odotettiin pilkkua"
 
 #. ISB can only take SY as an option.
-#: config/tc-arm.c:6227
+#: config/tc-arm.c:6065
 msgid "invalid barrier type"
 msgstr "virheellinen estetyyppi"
 
-#: config/tc-arm.c:6364
+#: config/tc-arm.c:6202
 msgid "immediate value is out of range"
 msgstr "välitön arvo on lukualueen ulkopuolella"
 
-#: config/tc-arm.c:6510
+#: config/tc-arm.c:6348
 msgid "iWMMXt data or control register expected"
 msgstr "odotettiin �iWMMXt�-datarekisteriä tai -ohjausrekisteriä"
 
-#: config/tc-arm.c:6550
+#: config/tc-arm.c:6392
 msgid "Banked registers are not available with this architecture."
 msgstr "Muistilohkotut rekisterit ei ole saatavilla tässä arkkitehtuurissa."
 
-#: config/tc-arm.c:6675
+#: config/tc-arm.c:6517
 #, c-format
 msgid "unhandled operand code %d"
 msgstr "käsittelemätön operandikoodi %d"
 
-#: config/tc-arm.c:6772 config/tc-score.c:264
+#: config/tc-arm.c:6614 config/tc-score.c:264
 msgid "garbage following instruction"
 msgstr "käskyn jälkeen roskaa"
 
 #. If REG is R13 (the stack pointer), warn that its use is
 #. deprecated.
-#: config/tc-arm.c:6813
+#: config/tc-arm.c:6655
 msgid "use of r13 is deprecated"
 msgstr "r13-käyttö on vanhentunut"
 
-#: config/tc-arm.c:6883
+#: config/tc-arm.c:6725
 msgid "D register out of range for selected VFP version"
 msgstr "D-rekisteri lukualueen ulkopuolella valitulle VFP-versiolle"
 
-#: config/tc-arm.c:6962
+#: config/tc-arm.c:6804
 msgid "instruction does not accept preindexed addressing"
 msgstr "käsky ei hyväksy ennakkoindeksoitua osoitteenmuodostusta"
 
 #. unindexed - only for coprocessor
-#: config/tc-arm.c:6978 config/tc-arm.c:9153
+#: config/tc-arm.c:6820 config/tc-arm.c:8992
 msgid "instruction does not accept unindexed addressing"
 msgstr "käsky ei hyväksy indeksoimatonta osoitteenmuodostusta"
 
-#: config/tc-arm.c:6986
+#: config/tc-arm.c:6828
 msgid "destination register same as write-back base"
 msgstr "kohderekisteri sama kuin �write-back�-perusta"
 
-#: config/tc-arm.c:6987
+#: config/tc-arm.c:6829
 msgid "source register same as write-back base"
 msgstr "lähderekisteri sama kuin �write-back�-perusta"
 
-#: config/tc-arm.c:7037
+#: config/tc-arm.c:6879
 msgid "use of PC in this instruction is deprecated"
 msgstr "ohjelmalaskurin käyttö tässä käskyssä on vanhentunut"
 
-#: config/tc-arm.c:7055
+#: config/tc-arm.c:6897
 msgid "instruction does not accept scaled register index"
 msgstr "käsky ei hyväksy skaalattua rekisteri-indeksiä"
 
-#: config/tc-arm.c:7101
+#: config/tc-arm.c:6943
 msgid "instruction does not support unindexed addressing"
 msgstr "käsky ei tue indeksoimatonta osoitteenmuodostusta"
 
-#: config/tc-arm.c:7116
+#: config/tc-arm.c:6958
 msgid "pc may not be used with write-back"
 msgstr "ohjelmalaskuria ei saa käyttää �write-back�:n kanssa"
 
-#: config/tc-arm.c:7121
+#: config/tc-arm.c:6963
 msgid "instruction does not support writeback"
 msgstr "käsky ei tue �writeback�:iä"
 
-#: config/tc-arm.c:7163
+#: config/tc-arm.c:7005
 msgid "invalid pseudo operation"
 msgstr "virheellinen näennäistoiminto"
 
-#: config/tc-arm.c:7209
+#: config/tc-arm.c:7051
 msgid "literal pool insertion failed"
 msgstr "literaalivarannon lisäys ei onnistunut"
 
-#: config/tc-arm.c:7268
+#: config/tc-arm.c:7110
 msgid "Rn must not overlap other operands"
 msgstr "�Rn� ei saa olla osittain päällekkäin muiden operandien kanssa"
 
-#: config/tc-arm.c:7273
+#: config/tc-arm.c:7115
 msgid "swp{b} use is deprecated for this architecture"
 msgstr "swp{b}-käyttö on vanhentunut tässä arkkitehtuurissa"
 
-#: config/tc-arm.c:7370 config/tc-arm.c:9720
+#: config/tc-arm.c:7212 config/tc-arm.c:9559
 msgid "bad barrier type"
 msgstr "virheellinen estetyyppi"
 
-#: config/tc-arm.c:7381 config/tc-arm.c:7400 config/tc-arm.c:7413
-#: config/tc-arm.c:9732 config/tc-arm.c:9763 config/tc-arm.c:9785
+#: config/tc-arm.c:7223 config/tc-arm.c:7242 config/tc-arm.c:7255
+#: config/tc-arm.c:9571 config/tc-arm.c:9602 config/tc-arm.c:9624
 msgid "bit-field extends past end of register"
 msgstr "bittikenttä laajenee rekisterin lopun ohitse"
 
-#: config/tc-arm.c:7443
-msgid "the only valid suffixes here are '(plt)' and '(tlscall)'"
-msgstr "ainoat kelvolliset loppuliitteet ovat ’(plt)’ ja ’(tlscall)’"
+#: config/tc-arm.c:7284
+msgid "the only suffix valid here is '(plt)'"
+msgstr "täällä on voimassa vain loppuliite ’(plt)’"
 
-#: config/tc-arm.c:7496
+#: config/tc-arm.c:7335
 msgid "use of r15 in blx in ARM mode is not really useful"
 msgstr "�r15�:n käyttö �blx�-kohteessa ARM-tilassa ei ole todella hyödyllinen"
 
-#: config/tc-arm.c:7518
+#: config/tc-arm.c:7357
 msgid "use of r15 in bx in ARM mode is not really useful"
 msgstr "�r15�:n käyttö �bx�-kohteessa ARM-tilassa ei ole todella hyödyllinen"
 
-#: config/tc-arm.c:7543
+#: config/tc-arm.c:7382
 msgid "use of r15 in bxj is not really useful"
 msgstr "�r15�:n käyttö �bxj�-kohteessa ei ole todella hyödyllinen"
 
-#: config/tc-arm.c:7722 config/tc-arm.c:7731
+#: config/tc-arm.c:7561 config/tc-arm.c:7570
 msgid "writeback of base register is UNPREDICTABLE"
 msgstr "perusrekisterin �writeback� on ENNUSTAMATON"
 
-#: config/tc-arm.c:7725
+#: config/tc-arm.c:7564
 msgid "writeback of base register when in register list is UNPREDICTABLE"
 msgstr "perusrekisterin �writeback� kun rekisteriluettelossa on ENNUSTAMATON"
 
-#: config/tc-arm.c:7735
+#: config/tc-arm.c:7574
 msgid "if writeback register is in list, it must be the lowest reg in the list"
 msgstr "jos �writeback�-rekisteri on luettelossa, sen on oltava alin rekisteri luettelossa"
 
-#: config/tc-arm.c:7750
+#: config/tc-arm.c:7589
 msgid "first destination register must be even"
 msgstr "ensimmäisen kohderekisterin on oltava parillinen"
 
-#: config/tc-arm.c:7753 config/tc-arm.c:7822
+#: config/tc-arm.c:7592 config/tc-arm.c:7661
 msgid "can only load two consecutive registers"
 msgstr "voi ladata vain kaksi peräkkäistä rekisteriä"
 
@@ -2474,1157 +2443,1158 @@ msgstr "voi ladata vain kaksi peräkkäistä rekisteriä"
 #. have been called in the first place.
 #. If op 2 were present and equal to PC, this function wouldn't
 #. have been called in the first place.
-#: config/tc-arm.c:7754 config/tc-arm.c:7825 config/tc-arm.c:8423
-#: config/tc-arm.c:10504
+#: config/tc-arm.c:7593 config/tc-arm.c:7664 config/tc-arm.c:8262
+#: config/tc-arm.c:10318
 msgid "r14 not allowed here"
 msgstr "�r14� ei ole sallittu tässä"
 
-#: config/tc-arm.c:7768
+#: config/tc-arm.c:7607
 msgid "base register written back, and overlaps second destination register"
 msgstr "perusrekisteri kirjoitettu takaisin ja on osittain toisen kohderekisterin päällä"
 
-#: config/tc-arm.c:7776
+#: config/tc-arm.c:7615
 msgid "index register overlaps destination register"
 msgstr "indeksirekisteri on osittain toisen kohderekisterin päällä"
 
-#: config/tc-arm.c:7806 config/tc-arm.c:8405
+#: config/tc-arm.c:7645 config/tc-arm.c:8244
 msgid "offset must be zero in ARM encoding"
 msgstr "siirrososoitteen on oltava nolla ARM-koodauksessa"
 
-#: config/tc-arm.c:7819 config/tc-arm.c:8417
+#: config/tc-arm.c:7658 config/tc-arm.c:8256
 msgid "even register required"
 msgstr "parillinen rekisteri vaadittu"
 
-#: config/tc-arm.c:7850 config/tc-arm.c:7882
+#: config/tc-arm.c:7689 config/tc-arm.c:7721
 msgid "this instruction requires a post-indexed address"
 msgstr "tämä käsky vaatii jälki-indeksoidun osoitteen"
 
-#: config/tc-arm.c:7909
+#: config/tc-arm.c:7748
 msgid "Rd and Rm should be different in mla"
 msgstr "�Rd� ja �Rm� pitäisi olla eri �mla�:ssa"
 
-#: config/tc-arm.c:7933 config/tc-arm.c:10848
+#: config/tc-arm.c:7772 config/tc-arm.c:10662
 msgid ":lower16: not allowed this instruction"
 msgstr "�:lower16:� ei ole sallittu tässä käskyssä"
 
-#: config/tc-arm.c:7935
+#: config/tc-arm.c:7774
 msgid ":upper16: not allowed instruction"
 msgstr "�:upper16:� ei ole sallittu käsky"
 
-#: config/tc-arm.c:7954 config/tc-arm.c:7997
+#: config/tc-arm.c:7793 config/tc-arm.c:7836
 msgid "operand 1 must be FPSCR"
 msgstr "operandin 1 on oltava FPSCR"
 
-#: config/tc-arm.c:8016
+#: config/tc-arm.c:7855
 msgid "operand 0 must be FPSCR"
 msgstr "operandin 0 on oltava FPSCR"
 
-#: config/tc-arm.c:8036 config/tc-arm.c:10966
+#: config/tc-arm.c:7875 config/tc-arm.c:10780
 msgid "bad register for mrs"
 msgstr "virheellinen rekisteri kohteelle mrs"
 
-#: config/tc-arm.c:8043 config/tc-arm.c:10983
-msgid "'APSR', 'CPSR' or 'SPSR' expected"
-msgstr "odotettiin ’APSR’, ’CPSR’ tai ’SPSR’"
+#: config/tc-arm.c:7882 config/tc-arm.c:10803
+msgid "'CPSR' or 'SPSR' expected"
+msgstr "odotettiin ’CPSR’ tai ’SPSR’"
 
-#: config/tc-arm.c:8084
+#: config/tc-arm.c:7923
 msgid "Rd and Rm should be different in mul"
 msgstr "�Rd� ja �Rm� pitäisi olla erilainen �mul�:ssa"
 
-#: config/tc-arm.c:8103 config/tc-arm.c:8350 config/tc-arm.c:11117
+#: config/tc-arm.c:7942 config/tc-arm.c:8189 config/tc-arm.c:10937
 msgid "rdhi and rdlo must be different"
 msgstr "�rdhi� ja �rdlo� on oltava erilaisia"
 
-#: config/tc-arm.c:8109
+#: config/tc-arm.c:7948
 msgid "rdhi, rdlo and rm must all be different"
 msgstr "�rdhi�, �rdlo� ja �rm� on oltava kaikki erilaisia"
 
-#: config/tc-arm.c:8175
+#: config/tc-arm.c:8014
 msgid "'[' expected after PLD mnemonic"
 msgstr "odotettiin ’[’-merkkiä PLD-muistikkaan jälkeen"
 
-#: config/tc-arm.c:8177 config/tc-arm.c:8192
+#: config/tc-arm.c:8016 config/tc-arm.c:8031
 msgid "post-indexed expression used in preload instruction"
 msgstr "jälki-indeksoitua lauseketta käytetty ennakkoladatussa käskyssä"
 
-#: config/tc-arm.c:8179 config/tc-arm.c:8194
+#: config/tc-arm.c:8018 config/tc-arm.c:8033
 msgid "writeback used in preload instruction"
 msgstr "�writeback� käytetty ennakkoladatussa käskyssä"
 
-#: config/tc-arm.c:8181 config/tc-arm.c:8196
+#: config/tc-arm.c:8020 config/tc-arm.c:8035
 msgid "unindexed addressing used in preload instruction"
 msgstr "indeksoimatonta osoitteenmuodostusta käytetty ennakkoladatussa käskyssä"
 
-#: config/tc-arm.c:8190
+#: config/tc-arm.c:8029
 msgid "'[' expected after PLI mnemonic"
 msgstr "odotettiin ’[’-merkkiä PLI-muistikkaan jälkeen"
 
-#: config/tc-arm.c:8376
+#: config/tc-arm.c:8215
 msgid "SRS base register must be r13"
 msgstr "SRS-perusrekisterin on oltava �r13�"
 
-#: config/tc-arm.c:8420
+#: config/tc-arm.c:8259
 msgid "can only store two consecutive registers"
 msgstr "voi tallentaa vain kaksi peräkkäistä rekisteriä"
 
-#: config/tc-arm.c:8515 config/tc-arm.c:8532
+#: config/tc-arm.c:8354 config/tc-arm.c:8371
 msgid "only two consecutive VFP SP registers allowed here"
 msgstr "tässä sallitaan vain kaksi peräkkäistä �VFP SP�-rekisteriä"
 
-#: config/tc-arm.c:8560 config/tc-arm.c:8575
+#: config/tc-arm.c:8399 config/tc-arm.c:8414
 msgid "this addressing mode requires base-register writeback"
 msgstr "tämä osoitteenmuodostustila vaatii perusrekisterin �writeback�-toiminnon"
 
-#: config/tc-arm.c:8749
+#: config/tc-arm.c:8588
 msgid "this instruction does not support indexing"
 msgstr "tämä käsky ei tue indeksointia"
 
-#: config/tc-arm.c:8772
+#: config/tc-arm.c:8611
 msgid "only r15 allowed here"
 msgstr "vain �r15� sallittu tässä"
 
-#: config/tc-arm.c:8907
+#: config/tc-arm.c:8746
 msgid "immediate operand requires iWMMXt2"
 msgstr "välitön operandi vaatii iWMMXt2-määrittelyn"
 
-#: config/tc-arm.c:9051
+#: config/tc-arm.c:8890
 msgid "shift by register not allowed in thumb mode"
 msgstr "rekisterin sivuttaissiirros ei ole sallittu �thumb�-tilassa"
 
-#: config/tc-arm.c:9063 config/tc-arm.c:11660 config/tc-arm.c:20630
+#: config/tc-arm.c:8902 config/tc-arm.c:11480 config/tc-arm.c:20417
 msgid "shift expression is too large"
 msgstr "sivuttaissiirroslauseke on liian iso"
 
-#: config/tc-arm.c:9090
+#: config/tc-arm.c:8929
 msgid "Instruction does not support =N addresses"
 msgstr "Käsky ei tue �=N�-osoitteita"
 
-#: config/tc-arm.c:9096
+#: config/tc-arm.c:8935
 msgid "cannot use register index with this instruction"
 msgstr "ei voi käyttää rekisteri-indeksiä tämän käskyn kanssa"
 
-#: config/tc-arm.c:9098
+#: config/tc-arm.c:8937
 msgid "Thumb does not support negative register indexing"
 msgstr "�Thumb� ei tue negatiivista rekisteri-indeksointia"
 
-#: config/tc-arm.c:9100
+#: config/tc-arm.c:8939
 msgid "Thumb does not support register post-indexing"
 msgstr "�Thumb� ei tue rekisterijälki-indeksointia"
 
-#: config/tc-arm.c:9102
+#: config/tc-arm.c:8941
 msgid "Thumb does not support register indexing with writeback"
 msgstr "�Thumb� ei tue rekisteri-indeksointia �writeback�:lla"
 
-#: config/tc-arm.c:9104
+#: config/tc-arm.c:8943
 msgid "Thumb supports only LSL in shifted register indexing"
 msgstr "�Thumb� tukee vain �LSL�:ää rekisteri-indeksoinnin sivuttaissiirrossa"
 
-#: config/tc-arm.c:9113 config/tc-arm.c:14558
+#: config/tc-arm.c:8952 config/tc-arm.c:14376
 msgid "shift out of range"
 msgstr "sivuttaissiirto lukualueen ulkopuolella"
 
-#: config/tc-arm.c:9122
+#: config/tc-arm.c:8961
 msgid "cannot use writeback with this instruction"
 msgstr "ei voi käyttää �writeback�-toimintoa tällä käskyllä"
 
-#: config/tc-arm.c:9143
+#: config/tc-arm.c:8982
 msgid "cannot use post-indexing with PC-relative addressing"
 msgstr "ei voi käyttää jälki-indeksointia ohjelmalaskurisuhteellisella osoitteenmuodostuksella"
 
-#: config/tc-arm.c:9144
+#: config/tc-arm.c:8983
 msgid "cannot use post-indexing with this instruction"
 msgstr "ei voi käyttää jälki-indeksointia tällä käskyllä"
 
-#: config/tc-arm.c:9355
+#: config/tc-arm.c:9194
 msgid "only SUBS PC, LR, #const allowed"
 msgstr "vain �SUBS PC�, �LR�, �#const� on sallittu"
 
-#: config/tc-arm.c:9434 config/tc-arm.c:9585 config/tc-arm.c:9682
-#: config/tc-arm.c:10927 config/tc-arm.c:11223
+#: config/tc-arm.c:9273 config/tc-arm.c:9424 config/tc-arm.c:9521
+#: config/tc-arm.c:10741 config/tc-arm.c:11043
 msgid "shift must be constant"
 msgstr "sivuttaissiirron on oltava vakio"
 
-#: config/tc-arm.c:9461 config/tc-arm.c:9600 config/tc-arm.c:9697
-#: config/tc-arm.c:10940
+#: config/tc-arm.c:9300 config/tc-arm.c:9439 config/tc-arm.c:9536
+#: config/tc-arm.c:10754
 msgid "unshifted register required"
 msgstr "sivuttaissiirtämätön rekisteri vaadittu"
 
-#: config/tc-arm.c:9476 config/tc-arm.c:9708 config/tc-arm.c:11078
+#: config/tc-arm.c:9315 config/tc-arm.c:9547 config/tc-arm.c:10898
 msgid "dest must overlap one source register"
 msgstr "�dest� on oltava osittain päällekkäin yhden lähderekisterin kanssa"
 
-#: config/tc-arm.c:9603
+#: config/tc-arm.c:9442
 msgid "dest and source1 must be the same register"
 msgstr "�dest� ja �source1� on oltava sama rekisteri"
 
-#: config/tc-arm.c:9884
+#: config/tc-arm.c:9720
 msgid "instruction is always unconditional"
 msgstr "käsky on aina ehdoton"
 
-#: config/tc-arm.c:9986
+#: config/tc-arm.c:9815
 msgid "selected processor does not support 'A' form of this instruction"
 msgstr "valittu prosessori ei tue tämän käskyn ’A’-muotoa"
 
-#: config/tc-arm.c:9989
+#: config/tc-arm.c:9818
 msgid "Thumb does not support the 2-argument form of this instruction"
 msgstr "�Thumb� ei tue tämän käskyn kaksiargumenttimuotoa"
 
-#: config/tc-arm.c:10097
+#: config/tc-arm.c:9926
 msgid "SP not allowed in register list"
 msgstr "�SP� ei ole sallittu rekisteriluettelossa"
 
-#: config/tc-arm.c:10101 config/tc-arm.c:10207
+#: config/tc-arm.c:9930 config/tc-arm.c:10036
 msgid "having the base register in the register list when using write back is UNPREDICTABLE"
 msgstr "perusrekisterin oleminen rekisteriluettelossa, kun käytetään �writeback�-toimintoa on ENNUSTAMATON"
 
-#: config/tc-arm.c:10109
+#: config/tc-arm.c:9938
 msgid "LR and PC should not both be in register list"
 msgstr "Rekisterien LR ja PC ei pitäisi olla molempien rekisteriluettelossa"
 
-#: config/tc-arm.c:10117
+#: config/tc-arm.c:9946
 msgid "PC not allowed in register list"
 msgstr "Ohjelmalaskuri ei ole sallittu rekisteriluettelossa"
 
-#: config/tc-arm.c:10159
+#: config/tc-arm.c:9988
 msgid "Thumb load/store multiple does not support {reglist}^"
 msgstr "�Thumb� lataa/tallenna-monikerta ei tue kohdetta �{reglist}^�"
 
-#: config/tc-arm.c:10184 config/tc-arm.c:10261
+#: config/tc-arm.c:10013 config/tc-arm.c:10090
 #, c-format
 msgid "value stored for r%d is UNKNOWN"
 msgstr "kohteelle r%d tallennettu arvo on TUNTEMATON"
 
-#: config/tc-arm.c:10254
+#: config/tc-arm.c:10083
 msgid "Thumb-2 instruction only valid in unified syntax"
 msgstr "�Thumb-2�-käsky on voimassa vain yhdistetyssä syntaksissa"
 
-#: config/tc-arm.c:10258 config/tc-arm.c:10268
+#: config/tc-arm.c:10087 config/tc-arm.c:10097
 msgid "this instruction will write back the base register"
 msgstr "tämä käsky kirjoittaa takaisin perusrekisterin"
 
-#: config/tc-arm.c:10271
+#: config/tc-arm.c:10100
 msgid "this instruction will not write back the base register"
 msgstr "tämä käsky ei kirjoita takaisin perusrekisteriä"
 
-#: config/tc-arm.c:10302
+#: config/tc-arm.c:10131
 msgid "r14 not allowed as first register when second register is omitted"
 msgstr "�r14� ei ole sallittu ensimmäisenä rekisterinä kun toinen rekisteri ohitetaan"
 
-#: config/tc-arm.c:10402
-msgid "This instruction may be unpredictable if executed on M-profile cores with interrupts enabled."
-msgstr "Tämä käsky voi olla ennustamaton suoritettuna M-profiiliytimessä keskeytykset otettuna pois käytöstä"
-
-#: config/tc-arm.c:10427 config/tc-arm.c:10440 config/tc-arm.c:10476
+#: config/tc-arm.c:10241 config/tc-arm.c:10254 config/tc-arm.c:10290
 msgid "Thumb does not support this addressing mode"
 msgstr "�Thumb� ei tue tätä osoitteenmuodostustilaa"
 
-#: config/tc-arm.c:10444
+#: config/tc-arm.c:10258
 msgid "byte or halfword not valid for base register"
 msgstr "�byte� tai �halfword� ei ole voimassa perusrekisterille"
 
-#: config/tc-arm.c:10447
+#: config/tc-arm.c:10261
 msgid "r15 based store not allowed"
 msgstr "�r15�-perustainen tallennus ei ole sallittu"
 
-#: config/tc-arm.c:10449
+#: config/tc-arm.c:10263
 msgid "invalid base register for register offset"
 msgstr "virheellinen perusrekisteri rekisterisiirrososoitteelle"
 
-#: config/tc-arm.c:10631
+#: config/tc-arm.c:10445
 #, c-format
 msgid "Use of r%u as a source register is deprecated when r%u is the destination register."
 msgstr "Rekisterin r%u käyttö lähderekisterinä on vanhentunut, kun r%u on kohderekisteri."
 
-#: config/tc-arm.c:10804
+#: config/tc-arm.c:10618
 msgid "shifts in CMP/MOV instructions are only supported in unified syntax"
 msgstr "�sivuttaisiirtoja CMP/MOV-käskyissä tuetaan vain yhdistetyssä syntaksissa"
 
-#: config/tc-arm.c:10832
+#: config/tc-arm.c:10646
 msgid "only lo regs allowed with immediate"
 msgstr "vain �lo regs� sallittu välittömän arvon kanssa"
 
-#: config/tc-arm.c:10853
+#: config/tc-arm.c:10667
 msgid ":upper16: not allowed this instruction"
 msgstr "�:upper16:� ei ole sallittu tässä käskyssä"
 
-#: config/tc-arm.c:11001
+#: config/tc-arm.c:10793 config/tc-arm.c:10799 config/tc-arm.c:10832
+#: config/tc-arm.c:10838
+msgid "selected processor does not support requested special purpose register"
+msgstr "valittu prosessori ei tue pyydettyä erikoiskäyttörekisteriä"
+
+#: config/tc-arm.c:10822
 msgid "Thumb encoding does not support an immediate here"
 msgstr "�Thumb�-koodaus ei tue tässä välitöntä arvoa"
 
-#: config/tc-arm.c:11083
+#: config/tc-arm.c:10903
 msgid "Thumb-2 MUL must not set flags"
 msgstr "Thumb-2 MUL ei saa asettaa lippuja"
 
-#: config/tc-arm.c:11148
+#: config/tc-arm.c:10968
 msgid "Thumb does not support NOP with hints"
 msgstr "�Thumb� ei tue �NOP�-komentoa vihjeiden kanssa"
 
-#: config/tc-arm.c:11286
+#: config/tc-arm.c:11106
 msgid "push/pop do not support {reglist}^"
 msgstr "�push/pop� eivät tue kohdetta �{reglist}^�"
 
-#: config/tc-arm.c:11309
+#: config/tc-arm.c:11129
 msgid "invalid register list to push/pop instruction"
 msgstr "virheellinen rekisteriluettelo �push/pop�-käskyihin"
 
-#: config/tc-arm.c:11542
+#: config/tc-arm.c:11362
 msgid "source1 and dest must be same register"
 msgstr "rekisterien �source1� ja �dest� on oltava sama rekisteri"
 
-#: config/tc-arm.c:11563
+#: config/tc-arm.c:11383
 msgid "ror #imm not supported"
 msgstr "�ror #imm� ei ole tuettu"
 
-#: config/tc-arm.c:11614
+#: config/tc-arm.c:11434
 msgid "SMC is not permitted on this architecture"
 msgstr "SMC ei ole sallittu tässä arkkitehtuurissa"
 
-#: config/tc-arm.c:11777
+#: config/tc-arm.c:11597
 msgid "Thumb encoding does not support rotation"
 msgstr "�Thumb�-koodaus ei tue kiertoa"
 
-#: config/tc-arm.c:11792
+#: config/tc-arm.c:11610
 msgid "SVC is not permitted on this architecture"
 msgstr "SVC ei ole sallittu tässä arkkitehtuurissa"
 
-#: config/tc-arm.c:11808
+#: config/tc-arm.c:11626
 msgid "instruction requires register index"
 msgstr "käsky vaatii rekisteri-indeksin"
 
-#: config/tc-arm.c:11817
+#: config/tc-arm.c:11635
 msgid "instruction does not allow shifted index"
 msgstr "käsky ei salli sivuttaissiirrettyä indeksiä"
 
-#: config/tc-arm.c:11962
+#: config/tc-arm.c:11780
 msgid "invalid neon suffix for non neon instruction"
 msgstr "virheellinen neon-loppuliite ei-neon -käskylle"
 
-#: config/tc-arm.c:12253 config/tc-arm.c:12588
+#: config/tc-arm.c:12071 config/tc-arm.c:12406
 msgid "invalid instruction shape"
 msgstr "virheellinen käskymuoto"
 
-#: config/tc-arm.c:12497
+#: config/tc-arm.c:12315
 msgid "types specified in both the mnemonic and operands"
 msgstr "tyypit määritelty sekä muistikkaassa että operandissa"
 
-#: config/tc-arm.c:12534
+#: config/tc-arm.c:12352
 msgid "operand types can't be inferred"
 msgstr "operandityyppejä ei voi sekoittaa keskenään"
 
-#: config/tc-arm.c:12540
+#: config/tc-arm.c:12358
 msgid "type specifier has the wrong number of parts"
 msgstr "tyypimäärittelyssä on väärä lukumäärä osia"
 
-#: config/tc-arm.c:12604 config/tc-arm.c:14299 config/tc-arm.c:14306
+#: config/tc-arm.c:12422 config/tc-arm.c:14117 config/tc-arm.c:14124
 msgid "operand size must match register width"
 msgstr "operandikoon on täsmättävä rekisterileveyden kanssa"
 
-#: config/tc-arm.c:12615
+#: config/tc-arm.c:12433
 msgid "bad type in Neon instruction"
 msgstr "virheellinen tyyppi Neon-käskyssä"
 
-#: config/tc-arm.c:12626
+#: config/tc-arm.c:12444
 msgid "inconsistent types in Neon instruction"
 msgstr "epäjohdonmukaisia tyyppejä Neon-käskyssä"
 
-#: config/tc-arm.c:13443
+#: config/tc-arm.c:13261
 msgid "first and second operands shall be the same register"
 msgstr "ensimmäisen ja toisen operandin pitäisi olla sama rekisteri"
 
-#: config/tc-arm.c:13711
+#: config/tc-arm.c:13529
 msgid "scalar out of range for multiply instruction"
 msgstr "skalaari lukualueen ulkopuolella kertolaskukäskylle"
 
-#: config/tc-arm.c:13887 config/tc-arm.c:13899
+#: config/tc-arm.c:13705 config/tc-arm.c:13717
 msgid "immediate out of range for insert"
 msgstr "välitön arvo lukualueen ulkopuolella lisäyskäskylle"
 
-#: config/tc-arm.c:13911 config/tc-arm.c:14906
+#: config/tc-arm.c:13729 config/tc-arm.c:14724
 msgid "immediate out of range for shift"
 msgstr "välitön arvo lukualueen ulkopuolella sivuttaissiirrolle"
 
-#: config/tc-arm.c:13968 config/tc-arm.c:13995 config/tc-arm.c:14404
-#: config/tc-arm.c:14852
+#: config/tc-arm.c:13786 config/tc-arm.c:13813 config/tc-arm.c:14222
+#: config/tc-arm.c:14670
 msgid "immediate out of range"
 msgstr "välitön arvo lukualueen ulkopuolella"
 
-#: config/tc-arm.c:14032
+#: config/tc-arm.c:13850
 msgid "immediate out of range for narrowing operation"
 msgstr "välitön arvo lukualueen ulkopuolella kaventamistoimelle"
 
-#: config/tc-arm.c:14157
+#: config/tc-arm.c:13975
 msgid "operands 0 and 1 must be the same register"
 msgstr "operandien 0 ja 1 on oltava sama rekisteri"
 
-#: config/tc-arm.c:14378
+#: config/tc-arm.c:14196
 msgid "operand size must be specified for immediate VMOV"
 msgstr "operandikoon on oltava määritelty välittömälle VMOV-arvolle"
 
-#: config/tc-arm.c:14388
+#: config/tc-arm.c:14206
 msgid "immediate has bits set outside the operand size"
 msgstr "välittömässä arvossa on asetettu bittejä operandikoon ulkopuolelle"
 
-#: config/tc-arm.c:14584
+#: config/tc-arm.c:14402
 msgid "elements must be smaller than reversal region"
 msgstr "elementtien on oltava pienempiä kuin puretun alueen"
 
-#: config/tc-arm.c:14755 config/tc-arm.c:14805
+#: config/tc-arm.c:14573 config/tc-arm.c:14623
 msgid "bad type for scalar"
 msgstr "virheellinen tyyppi skalaarille"
 
-#: config/tc-arm.c:14869 config/tc-arm.c:14877
+#: config/tc-arm.c:14687 config/tc-arm.c:14695
 msgid "VFP registers must be adjacent"
 msgstr "VFP-rekisterien on oltava vierekkäisiä"
 
-#: config/tc-arm.c:15018
+#: config/tc-arm.c:14836
 msgid "bad list length for table lookup"
 msgstr "virheellinen luettelopituus tauluhakua varten"
 
-#: config/tc-arm.c:15048
+#: config/tc-arm.c:14866
 msgid "writeback (!) must be used for VLDMDB and VSTMDB"
 msgstr "toimintoa writeback (!) on käytettävä kohteelle VLDMDB ja VSTMDB"
 
-#: config/tc-arm.c:15051
+#: config/tc-arm.c:14869
 msgid "register list must contain at least 1 and at most 16 registers"
 msgstr "rekisteriluettelon täytyy sisältää vähintään 1 ja enintään 16 rekisteriä"
 
-#: config/tc-arm.c:15076
+#: config/tc-arm.c:14894
 msgid "Use of PC here is deprecated"
 msgstr "Ohjelmalaskurin käyttö on vanhentunut"
 
-#: config/tc-arm.c:15078
+#: config/tc-arm.c:14896
 msgid "Use of PC here is UNPREDICTABLE"
 msgstr "Ohjelmalaskurin käyttö tässä on ENNUSTAMATON"
 
-#: config/tc-arm.c:15141
+#: config/tc-arm.c:14959
 msgid "bad alignment"
 msgstr "virheellinen tasaus"
 
-#: config/tc-arm.c:15158
+#: config/tc-arm.c:14976
 msgid "bad list type for instruction"
 msgstr "virheellinen luettelotyyppi käskylle"
 
-#: config/tc-arm.c:15200
+#: config/tc-arm.c:15018
 msgid "unsupported alignment for instruction"
 msgstr "ei-tuettu tasaus käskylle"
 
-#: config/tc-arm.c:15219 config/tc-arm.c:15313 config/tc-arm.c:15324
-#: config/tc-arm.c:15334 config/tc-arm.c:15348
+#: config/tc-arm.c:15037 config/tc-arm.c:15131 config/tc-arm.c:15142
+#: config/tc-arm.c:15152 config/tc-arm.c:15166
 msgid "bad list length"
 msgstr "virheellinen luettelopituus"
 
-#: config/tc-arm.c:15224
+#: config/tc-arm.c:15042
 msgid "stride of 2 unavailable when element size is 8"
 msgstr "kahden askellus ei ole käytettävissä kun elementtikoko on 8"
 
-#: config/tc-arm.c:15257 config/tc-arm.c:15332
+#: config/tc-arm.c:15075 config/tc-arm.c:15150
 msgid "can't use alignment with this instruction"
 msgstr "ei voi käyttää tasausta tämän käskyn kanssa"
 
-#: config/tc-arm.c:15399
+#: config/tc-arm.c:15217
 msgid "post-index must be a register"
 msgstr "jälki-indeksin on oltava rekisteri"
 
-#: config/tc-arm.c:15401
+#: config/tc-arm.c:15219
 msgid "bad register for post-index"
 msgstr "virheellinen rekisteri jälki-indeksille"
 
 #  infix ei ole etuliite (prefix) eikä loppuliite (suffix)
-#: config/tc-arm.c:15737 config/tc-arm.c:15823
+#: config/tc-arm.c:15532 config/tc-arm.c:15618
 msgid "conditional infixes are deprecated in unified syntax"
 msgstr "ehdolliset infix-liitteet ovat vanhentuneita yhdistetyssä syntaksissa"
 
-#: config/tc-arm.c:15971
+#: config/tc-arm.c:15766
 msgid "Warning: conditional outside an IT block for Thumb."
 msgstr "Varoitus: ehtolause IT-lohkon ulkopuolella Thumb-käskylle"
 
-#: config/tc-arm.c:16176
+#: config/tc-arm.c:15971
 msgid "s suffix on comparison instruction is deprecated"
 msgstr "s-loppuliite vertailukäskyssä on vanhentunut"
 
 #  lähdekoodin mukaan tuettava kohde on käsky
-#: config/tc-arm.c:16195
+#: config/tc-arm.c:15990
 #, c-format
 msgid "selected processor does not support Thumb mode `%s'"
 msgstr "valittu prosessori ei tue Thumb-tilaa �%s�"
 
-#: config/tc-arm.c:16201
+#: config/tc-arm.c:15996
 msgid "Thumb does not support conditional execution"
 msgstr "Thumb ei tue ehdollista suoritusta"
 
 #  lähdekoodin mukaan tuettava kohde on käsky
-#: config/tc-arm.c:16220
+#: config/tc-arm.c:16015
 #, c-format
 msgid "selected processor does not support Thumb-2 mode `%s'"
 msgstr "valittu prosessori ei tue Thumb-2 -tilaa �%s�"
 
-#: config/tc-arm.c:16245
+#: config/tc-arm.c:16040
 #, c-format
 msgid "cannot honor width suffix -- `%s'"
 msgstr "ei voi noudattaa leveysloppuliitettä -- �%s�"
 
-#: config/tc-arm.c:16286
+#: config/tc-arm.c:16081
 #, c-format
 msgid "selected processor does not support ARM mode `%s'"
 msgstr "valittu prosessori ei tue ARM-tilaa �%s�"
 
-#: config/tc-arm.c:16291
+#: config/tc-arm.c:16086
 #, c-format
 msgid "width suffixes are invalid in ARM mode -- `%s'"
 msgstr "leveysloppuliitteet ovat virheellisiä ARM-tilassa -- �%s�"
 
-#: config/tc-arm.c:16324
+#: config/tc-arm.c:16119
 #, c-format
 msgid "attempt to use an ARM instruction on a Thumb-only processor -- `%s'"
 msgstr "yritys käyttää ARM-käskyä prosessorissa, joka tukee vain Thumb-käskyjä -- �%s�"
 
-#: config/tc-arm.c:16341
+#: config/tc-arm.c:16136
 #, c-format
 msgid "section '%s' finished with an open IT block."
 msgstr "lohko �%s� päättynyt avoimessa IT-lohkossa."
 
-#: config/tc-arm.c:16346
+#: config/tc-arm.c:16141
 msgid "file finished with an open IT block."
 msgstr "tiedosto loppui avoimella IT-lohkolla"
 
-#: config/tc-arm.c:19385
+#: config/tc-arm.c:19172
 #, c-format
 msgid "alignments greater than %d bytes not supported in .text sections."
 msgstr "%d tavua suurempia tasauksia ei ole tuettu �.text�-lohkoissa."
 
-#: config/tc-arm.c:19653 config/tc-ia64.c:3469
+#: config/tc-arm.c:19440 config/tc-ia64.c:3469
 #, c-format
 msgid "Group section `%s' has no group signature"
 msgstr "Ryhmälohkolla ’%s’ ei ole ryhmätunnistetta"
 
-#: config/tc-arm.c:19698
+#: config/tc-arm.c:19485
 msgid "handlerdata in cantunwind frame"
 msgstr "käsittelijätietoja �cantunwind�-kehyksessä"
 
-#: config/tc-arm.c:19715
+#: config/tc-arm.c:19502
 msgid "too many unwind opcodes for personality routine 0"
 msgstr "liian monia �unwind�-käskykoodeja henkilöllisyysrutiinille 0"
 
-#: config/tc-arm.c:19747
+#: config/tc-arm.c:19534
 msgid "too many unwind opcodes"
 msgstr "liian monia �unwind�-käskykoodeja"
 
-#: config/tc-arm.c:20007
+#: config/tc-arm.c:19794
 msgid "GOT already in the symbol table"
 msgstr "GOT on jo symbolitaulussa"
 
-#: config/tc-arm.c:20345 config/tc-arm.c:20387 config/tc-arm.c:20657
+#: config/tc-arm.c:20132 config/tc-arm.c:20174 config/tc-arm.c:20444
 #, c-format
 msgid "undefined symbol %s used as an immediate value"
 msgstr "määrittelemätöntä symbolia %s käytetty välittömänä arvona"
 
-#: config/tc-arm.c:20347 config/tc-arm.c:20389
+#: config/tc-arm.c:20134 config/tc-arm.c:20176
 #, c-format
 msgid "symbol %s is in a different section"
 msgstr "symboli %s on eri lohkossa"
 
-#: config/tc-arm.c:20349 config/tc-arm.c:20391
+#: config/tc-arm.c:20136 config/tc-arm.c:20178
 #, c-format
 msgid "symbol %s is weak and may be overridden later"
 msgstr "symboli %s on �weak� ja saatetaan myöhemmin korvata"
 
-#: config/tc-arm.c:20368 config/tc-arm.c:20699
+#: config/tc-arm.c:20155 config/tc-arm.c:20486
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr "virheellinen vakio (%lx) korjauksen jälkeen"
 
-#: config/tc-arm.c:20424
+#: config/tc-arm.c:20211
 #, c-format
 msgid "unable to compute ADRL instructions for PC offset of 0x%lx"
 msgstr "ei kyetä laskemaan ADRL-käskyjä 0x%lx:n ohjelmalaskurisiirrososoitteelle"
 
-#: config/tc-arm.c:20459 config/tc-arm.c:20484
+#: config/tc-arm.c:20246 config/tc-arm.c:20271
 msgid "invalid literal constant: pool needs to be closer"
 msgstr "virheellinen literaalivakio: varannon on oltava lähempi"
 
-#: config/tc-arm.c:20462 config/tc-arm.c:20500
+#: config/tc-arm.c:20249 config/tc-arm.c:20287
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr "virheellinen välitön arvo siirrososoitteelle (%ld)"
 
-#: config/tc-arm.c:20486
+#: config/tc-arm.c:20273
 #, c-format
 msgid "bad immediate value for 8-bit offset (%ld)"
 msgstr "virheellinen välitön arvo 8-bittiselle siirrososoitteelle (%ld)"
 
-#: config/tc-arm.c:20541
+#: config/tc-arm.c:20328
 msgid "offset not a multiple of 4"
 msgstr "siirrososoite ei ole 4:n monikerta"
 
-#: config/tc-arm.c:20548 config/tc-arm.c:20563 config/tc-arm.c:20578
-#: config/tc-arm.c:20589 config/tc-arm.c:20612 config/tc-arm.c:21332
+#: config/tc-arm.c:20335 config/tc-arm.c:20350 config/tc-arm.c:20365
+#: config/tc-arm.c:20376 config/tc-arm.c:20399 config/tc-arm.c:21114
 #: config/tc-moxie.c:662 config/tc-pj.c:448 config/tc-sh.c:4281
 msgid "offset out of range"
 msgstr "siirrososoite lukualueen ulkopuolella"
 
-#: config/tc-arm.c:20715
+#: config/tc-arm.c:20502
 msgid "invalid smc expression"
 msgstr "virheellinen smc-lauseke"
 
-#: config/tc-arm.c:20724
+#: config/tc-arm.c:20511
 msgid "invalid hvc expression"
 msgstr "virheellinen hvc-lauseke"
 
-#: config/tc-arm.c:20735 config/tc-arm.c:20744
+#: config/tc-arm.c:20522 config/tc-arm.c:20531
 msgid "invalid swi expression"
 msgstr "virheellinen swi-lauseke"
 
-#: config/tc-arm.c:20754
+#: config/tc-arm.c:20541
 msgid "invalid expression in load/store multiple"
 msgstr "virheellinen lauseke �lataa/tallenna�-monikerrassa"
 
-#: config/tc-arm.c:20815
+#: config/tc-arm.c:20602
 #, c-format
 msgid "blx to '%s' an ARM ISA state function changed to bl"
 msgstr "blx kohteeseen �%s� �ARM ISA�-tilafunktio vaihtui kohteeksi bl"
 
-#: config/tc-arm.c:20834
+#: config/tc-arm.c:20621
 msgid "misaligned branch destination"
 msgstr "tasaamaton haarautumiskohde"
 
-#: config/tc-arm.c:20838 config/tc-arm.c:20875 config/tc-arm.c:20889
-#: config/tc-arm.c:20902 config/tc-arm.c:21009 config/tc-arm.c:21027
+#: config/tc-arm.c:20625 config/tc-arm.c:20662 config/tc-arm.c:20676
+#: config/tc-arm.c:20689 config/tc-arm.c:20799 config/tc-arm.c:20817
 msgid "branch out of range"
 msgstr "haarautuminen lukualueen ulkopuolella"
 
-#: config/tc-arm.c:20924
+#: config/tc-arm.c:20712
 msgid "conditional branch out of range"
 msgstr "ehdollinen haarautuminen lukualueen ulkopuolella"
 
-#: config/tc-arm.c:20959
+#: config/tc-arm.c:20748
 #, c-format
 msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl"
 msgstr "blx kohteeseen �Thumb�-funktio �%s� �Thumb ISA�-tilasta vaihtui kohteeksi bl"
 
-#: config/tc-arm.c:21015
+#: config/tc-arm.c:20805
 msgid "Thumb2 branch out of range"
 msgstr "Thumb2-haarautuminen on lukualueen ulkopuolella"
 
-#: config/tc-arm.c:21106
+#: config/tc-arm.c:20888
 msgid "rel31 relocation overflow"
 msgstr "�rel31�-sijoitusylivuoto"
 
-#: config/tc-arm.c:21118 config/tc-arm.c:21141
+#: config/tc-arm.c:20900 config/tc-arm.c:20923
 msgid "co-processor offset out of range"
 msgstr "apuprosessorisiirrososoite lukualueen ulkopuolella"
 
-#: config/tc-arm.c:21158
+#: config/tc-arm.c:20940
 #, c-format
 msgid "invalid offset, target not word aligned (0x%08lX)"
 msgstr "virheellinen siirrososoite, kohde ei ole word-tasattu (0x%08lX)"
 
-#: config/tc-arm.c:21165 config/tc-arm.c:21174 config/tc-arm.c:21182
-#: config/tc-arm.c:21190 config/tc-arm.c:21198
+#: config/tc-arm.c:20947 config/tc-arm.c:20956 config/tc-arm.c:20964
+#: config/tc-arm.c:20972 config/tc-arm.c:20980
 #, c-format
 msgid "invalid offset, value too big (0x%08lX)"
 msgstr "virheellinen siirrososoite, arvo liian suuri (0x%08lX)"
 
-#: config/tc-arm.c:21239
+#: config/tc-arm.c:21021
 msgid "invalid Hi register with immediate"
 msgstr "virheellinen �Hi�-rekisteri välittömällä arvolla"
 
-#: config/tc-arm.c:21255
+#: config/tc-arm.c:21037
 msgid "invalid immediate for stack address calculation"
 msgstr "virheellinen välitön arvo pino-osoitelaskennalle"
 
-#: config/tc-arm.c:21263
+#: config/tc-arm.c:21045
 #, c-format
 msgid "invalid immediate for address calculation (value = 0x%08lX)"
 msgstr "virheellinen välitön arvo osoitelaskennalle (arvo = 0x%08lX)"
 
-#: config/tc-arm.c:21293
+#: config/tc-arm.c:21075
 #, c-format
 msgid "invalid immediate: %ld is out of range"
 msgstr "virheellinen välitön arvo: %ld on lukualueen ulkopuolella"
 
-#: config/tc-arm.c:21305
+#: config/tc-arm.c:21087
 #, c-format
 msgid "invalid shift value: %ld"
 msgstr "virheellinen sivuttaissiirtoarvo: %ld"
 
-#: config/tc-arm.c:21384
+#: config/tc-arm.c:21166
 #, c-format
 msgid "the offset 0x%08lX is not representable"
 msgstr "siirrososoite 0x%08lX ei ole edustava"
 
-#: config/tc-arm.c:21424
+#: config/tc-arm.c:21206
 #, c-format
 msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)"
 msgstr "virheellinen siirrososoite 0x%08lX (vain 12 bittiä käytettävissä suuruusluokalle)"
 
-#: config/tc-arm.c:21463
+#: config/tc-arm.c:21245
 #, c-format
 msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)"
 msgstr "virheellinen siirrososoite 0x%08lX (vain 8 bittiä käytettävissä suuruusluokalle)"
 
-#: config/tc-arm.c:21503
+#: config/tc-arm.c:21285
 #, c-format
 msgid "bad offset 0x%08lX (must be word-aligned)"
 msgstr "virheellinen siirrososoite 0x%08lX (on oltava word-tasattu)"
 
-#: config/tc-arm.c:21508
+#: config/tc-arm.c:21290
 #, c-format
 msgid "bad offset 0x%08lX (must be an 8-bit number of words)"
 msgstr "virheellinen siirrososoite 0x%08lX (on oltava 8-bittinen sanojen lukumäärä)"
 
-#: config/tc-arm.c:21539 config/tc-score.c:7397
+#: config/tc-arm.c:21321 config/tc-score.c:7397
 #, c-format
 msgid "bad relocation fixup type (%d)"
 msgstr "virheellinen sijoituskorjaustyyppi (%d)"
 
-#: config/tc-arm.c:21650
+#: config/tc-arm.c:21432
 msgid "literal referenced across section boundary"
 msgstr "literaaliviitattu lohkorajan ylitse"
 
-#: config/tc-arm.c:21717
+#: config/tc-arm.c:21494
 msgid "internal relocation (type: IMMEDIATE) not fixed up"
 msgstr "sisäistä sijoitusta (tyyppi: VÄLITÖN) ei ole korjattu"
 
-#: config/tc-arm.c:21722
+#: config/tc-arm.c:21499
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr "ADRL käytetty symbolille, joka ei ole määritelty samassa tiedostossa"
 
-#: config/tc-arm.c:21737
+#: config/tc-arm.c:21514
 #, c-format
 msgid "undefined local label `%s'"
 msgstr "määrittelemätön paikallinen nimiö �%s�"
 
-#: config/tc-arm.c:21743
+#: config/tc-arm.c:21520
 msgid "internal_relocation (type: OFFSET_IMM) not fixed up"
 msgstr "sijoitusta �internal_relocation� (tyyppi: OFFSET_IMM) ei ole korjattu"
 
-#: config/tc-arm.c:21765 config/tc-cris.c:3986 config/tc-mcore.c:1926
+#: config/tc-arm.c:21542 config/tc-cris.c:3984 config/tc-mcore.c:1926
 #: config/tc-microblaze.c:1833 config/tc-mmix.c:2867 config/tc-moxie.c:757
 #: config/tc-ns32k.c:2248 config/tc-score.c:7490
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: config/tc-arm.c:21768 config/tc-arm.c:21789 config/tc-score.c:7492
+#: config/tc-arm.c:21545 config/tc-arm.c:21566 config/tc-score.c:7492
 #, c-format
 msgid "cannot represent %s relocation in this object file format"
 msgstr "ei voi edustaa %s-sijoitusta tässä objektitiedostomuodossa"
 
-#: config/tc-arm.c:22145
+#: config/tc-arm.c:21906
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr "%s: odottamaton funktiotyyppi: %d"
 
-#: config/tc-arm.c:22274
+#: config/tc-arm.c:22035
 msgid "use of old and new-style options to set CPU type"
 msgstr "vanhojen ja uusien tyylivalitsimien käyttö prosessorityypin asettamiseksi"
 
-#: config/tc-arm.c:22284
+#: config/tc-arm.c:22045
 msgid "use of old and new-style options to set FPU type"
 msgstr "vanhojen ja uusien tyylivalitsimien käyttö liukulukuyksikön tyypin asettamiseksi"
 
-#: config/tc-arm.c:22360
+#: config/tc-arm.c:22121
 msgid "hard-float conflicts with specified fpu"
 msgstr "laitteistoliukuluku on ristiriidassa määritellyn liukulukuyksikön kanssa"
 
-#: config/tc-arm.c:22547
+#: config/tc-arm.c:22308
 msgid "generate PIC code"
 msgstr "tuottaa PIC-koodin"
 
-#: config/tc-arm.c:22548
+#: config/tc-arm.c:22309
 msgid "assemble Thumb code"
 msgstr "assembloi Thumb-koodin"
 
-#: config/tc-arm.c:22549
+#: config/tc-arm.c:22310
 msgid "support ARM/Thumb interworking"
 msgstr "tukee �ARM/Thumb�-yhteistoimivuutta"
 
-#: config/tc-arm.c:22551
+#: config/tc-arm.c:22312
 msgid "code uses 32-bit program counter"
 msgstr "koodi käyttää 32-bittistä ohjelmalaskuria"
 
-#: config/tc-arm.c:22552
+#: config/tc-arm.c:22313
 msgid "code uses 26-bit program counter"
 msgstr "koodi käyttää 26-bittistä ohjelmalaskuria"
 
-#: config/tc-arm.c:22553
+#: config/tc-arm.c:22314
 msgid "floating point args are in fp regs"
 msgstr "liukulukuargumentit ovat liukulukurekistereissä"
 
-#: config/tc-arm.c:22555
+#: config/tc-arm.c:22316
 msgid "re-entrant code"
 msgstr "vapaakäyntinen koodi"
 
-#: config/tc-arm.c:22556
+#: config/tc-arm.c:22317
 msgid "code is ATPCS conformant"
 msgstr "koodi on ATPCS-yhteensopiva"
 
-#: config/tc-arm.c:22557
+#: config/tc-arm.c:22318
 msgid "assemble for big-endian"
 msgstr "assembloi �big-endian�-tavujärjestykselle"
 
-#: config/tc-arm.c:22558
+#: config/tc-arm.c:22319
 msgid "assemble for little-endian"
 msgstr "assembloi �little-endian�-tavujärjestykselle"
 
 #. These are recognized by the assembler, but have no affect on code.
-#: config/tc-arm.c:22562
+#: config/tc-arm.c:22323
 msgid "use frame pointer"
 msgstr "käytä kehysosoitinta"
 
-#: config/tc-arm.c:22563
+#: config/tc-arm.c:22324
 msgid "use stack size checking"
 msgstr "käytä pinokokotarkistusta"
 
-#: config/tc-arm.c:22566
+#: config/tc-arm.c:22327
 msgid "do not warn on use of deprecated feature"
 msgstr "älä varoita vanhentuneen ominaisuuden käytöstä"
 
 #. 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:22583 config/tc-arm.c:22584
+#: config/tc-arm.c:22344 config/tc-arm.c:22345
 msgid "use -mcpu=arm1"
 msgstr "käytä �-mcpu=arm1�-valitsinasetusta"
 
-#: config/tc-arm.c:22585 config/tc-arm.c:22586
+#: config/tc-arm.c:22346 config/tc-arm.c:22347
 msgid "use -mcpu=arm2"
 msgstr "käytä �-mcpu=arm2�-valitsinasetusta"
 
-#: config/tc-arm.c:22587 config/tc-arm.c:22588
+#: config/tc-arm.c:22348 config/tc-arm.c:22349
 msgid "use -mcpu=arm250"
 msgstr "käytä �-mcpu=arm250�-valitsinasetusta"
 
-#: config/tc-arm.c:22589 config/tc-arm.c:22590
+#: config/tc-arm.c:22350 config/tc-arm.c:22351
 msgid "use -mcpu=arm3"
 msgstr "käytä �-mcpu=arm3�-valitsinasetusta"
 
-#: config/tc-arm.c:22591 config/tc-arm.c:22592
+#: config/tc-arm.c:22352 config/tc-arm.c:22353
 msgid "use -mcpu=arm6"
 msgstr "käytä �-mcpu=arm6�-valitsinasetusta"
 
-#: config/tc-arm.c:22593 config/tc-arm.c:22594
+#: config/tc-arm.c:22354 config/tc-arm.c:22355
 msgid "use -mcpu=arm600"
 msgstr "käytä �-mcpu=arm600�-valitsinasetusta"
 
-#: config/tc-arm.c:22595 config/tc-arm.c:22596
+#: config/tc-arm.c:22356 config/tc-arm.c:22357
 msgid "use -mcpu=arm610"
 msgstr "käytä �-mcpu=arm610�-valitsinasetusta"
 
-#: config/tc-arm.c:22597 config/tc-arm.c:22598
+#: config/tc-arm.c:22358 config/tc-arm.c:22359
 msgid "use -mcpu=arm620"
 msgstr "käytä �-mcpu=arm620�-valitsinasetusta"
 
-#: config/tc-arm.c:22599 config/tc-arm.c:22600
+#: config/tc-arm.c:22360 config/tc-arm.c:22361
 msgid "use -mcpu=arm7"
 msgstr "käytä �-mcpu=arm7�-valitsinasetusta"
 
-#: config/tc-arm.c:22601 config/tc-arm.c:22602
+#: config/tc-arm.c:22362 config/tc-arm.c:22363
 msgid "use -mcpu=arm70"
 msgstr "käytä �-mcpu=arm70�-valitsinasetusta"
 
-#: config/tc-arm.c:22603 config/tc-arm.c:22604
+#: config/tc-arm.c:22364 config/tc-arm.c:22365
 msgid "use -mcpu=arm700"
 msgstr "käytä �-mcpu=arm700�-valitsinasetusta"
 
-#: config/tc-arm.c:22605 config/tc-arm.c:22606
+#: config/tc-arm.c:22366 config/tc-arm.c:22367
 msgid "use -mcpu=arm700i"
 msgstr "käytä �-mcpu=arm700i�-valitsinasetusta"
 
-#: config/tc-arm.c:22607 config/tc-arm.c:22608
+#: config/tc-arm.c:22368 config/tc-arm.c:22369
 msgid "use -mcpu=arm710"
 msgstr "käytä �-mcpu=arm710�-valitsinasetusta"
 
-#: config/tc-arm.c:22609 config/tc-arm.c:22610
+#: config/tc-arm.c:22370 config/tc-arm.c:22371
 msgid "use -mcpu=arm710c"
 msgstr "käytä �-mcpu=arm710c�-valitsinasetusta"
 
-#: config/tc-arm.c:22611 config/tc-arm.c:22612
+#: config/tc-arm.c:22372 config/tc-arm.c:22373
 msgid "use -mcpu=arm720"
 msgstr "käytä �-mcpu=arm720�-valitsinasetusta"
 
-#: config/tc-arm.c:22613 config/tc-arm.c:22614
+#: config/tc-arm.c:22374 config/tc-arm.c:22375
 msgid "use -mcpu=arm7d"
 msgstr "käytä �-mcpu=arm7d�-valitsinasetusta"
 
-#: config/tc-arm.c:22615 config/tc-arm.c:22616
+#: config/tc-arm.c:22376 config/tc-arm.c:22377
 msgid "use -mcpu=arm7di"
 msgstr "käytä �-mcpu=arm7di�-valitsinasetusta"
 
-#: config/tc-arm.c:22617 config/tc-arm.c:22618
+#: config/tc-arm.c:22378 config/tc-arm.c:22379
 msgid "use -mcpu=arm7m"
 msgstr "käytä �-mcpu=arm7m�-valitsinasetusta"
 
-#: config/tc-arm.c:22619 config/tc-arm.c:22620
+#: config/tc-arm.c:22380 config/tc-arm.c:22381
 msgid "use -mcpu=arm7dm"
 msgstr "käytä �-mcpu=arm7dm�-valitsinasetusta"
 
-#: config/tc-arm.c:22621 config/tc-arm.c:22622
+#: config/tc-arm.c:22382 config/tc-arm.c:22383
 msgid "use -mcpu=arm7dmi"
 msgstr "käytä �-mcpu=arm7dmi�-valitsinasetusta"
 
-#: config/tc-arm.c:22623 config/tc-arm.c:22624
+#: config/tc-arm.c:22384 config/tc-arm.c:22385
 msgid "use -mcpu=arm7100"
 msgstr "käytä �-mcpu=arm7100�-valitsinasetusta"
 
-#: config/tc-arm.c:22625 config/tc-arm.c:22626
+#: config/tc-arm.c:22386 config/tc-arm.c:22387
 msgid "use -mcpu=arm7500"
 msgstr "käytä �-mcpu=arm7500�-valitsinasetusta"
 
-#: config/tc-arm.c:22627 config/tc-arm.c:22628
+#: config/tc-arm.c:22388 config/tc-arm.c:22389
 msgid "use -mcpu=arm7500fe"
 msgstr "käytä �-mcpu=arm7500fe�-valitsinasetusta"
 
-#: config/tc-arm.c:22629 config/tc-arm.c:22630 config/tc-arm.c:22631
-#: config/tc-arm.c:22632
+#: config/tc-arm.c:22390 config/tc-arm.c:22391 config/tc-arm.c:22392
+#: config/tc-arm.c:22393
 msgid "use -mcpu=arm7tdmi"
 msgstr "käytä �-mcpu=arm7tdmi�-valitsinasetusta"
 
-#: config/tc-arm.c:22633 config/tc-arm.c:22634
+#: config/tc-arm.c:22394 config/tc-arm.c:22395
 msgid "use -mcpu=arm710t"
 msgstr "käytä �-mcpu=arm710t�-valitsinasetusta"
 
-#: config/tc-arm.c:22635 config/tc-arm.c:22636
+#: config/tc-arm.c:22396 config/tc-arm.c:22397
 msgid "use -mcpu=arm720t"
 msgstr "käytä �-mcpu=arm720t�-valitsinasetusta"
 
-#: config/tc-arm.c:22637 config/tc-arm.c:22638
+#: config/tc-arm.c:22398 config/tc-arm.c:22399
 msgid "use -mcpu=arm740t"
 msgstr "käytä �-mcpu=arm740t�-valitsinasetusta"
 
-#: config/tc-arm.c:22639 config/tc-arm.c:22640
+#: config/tc-arm.c:22400 config/tc-arm.c:22401
 msgid "use -mcpu=arm8"
 msgstr "käytä �-mcpu=arm8�-valitsinasetusta"
 
-#: config/tc-arm.c:22641 config/tc-arm.c:22642
+#: config/tc-arm.c:22402 config/tc-arm.c:22403
 msgid "use -mcpu=arm810"
 msgstr "käytä �-mcpu=arm810�-valitsinasetusta"
 
-#: config/tc-arm.c:22643 config/tc-arm.c:22644
+#: config/tc-arm.c:22404 config/tc-arm.c:22405
 msgid "use -mcpu=arm9"
 msgstr "käytä �-mcpu=arm9�-valitsinasetusta"
 
-#: config/tc-arm.c:22645 config/tc-arm.c:22646
+#: config/tc-arm.c:22406 config/tc-arm.c:22407
 msgid "use -mcpu=arm9tdmi"
 msgstr "käytä �-mcpu=arm9tdmi�-valitsinasetusta"
 
-#: config/tc-arm.c:22647 config/tc-arm.c:22648
+#: config/tc-arm.c:22408 config/tc-arm.c:22409
 msgid "use -mcpu=arm920"
 msgstr "käytä �-mcpu=arm920�-valitsinasetusta"
 
-#: config/tc-arm.c:22649 config/tc-arm.c:22650
+#: config/tc-arm.c:22410 config/tc-arm.c:22411
 msgid "use -mcpu=arm940"
 msgstr "käytä �-mcpu=arm940�-valitsinasetusta"
 
-#: config/tc-arm.c:22651
+#: config/tc-arm.c:22412
 msgid "use -mcpu=strongarm"
 msgstr "käytä �-mcpu=strongarm�-valitsinasetusta"
 
-#: config/tc-arm.c:22653
+#: config/tc-arm.c:22414
 msgid "use -mcpu=strongarm110"
 msgstr "käytä �-mcpu=strongarm110�-valitsinasetusta"
 
-#: config/tc-arm.c:22655
+#: config/tc-arm.c:22416
 msgid "use -mcpu=strongarm1100"
 msgstr "käytä �-mcpu=strongarm1100�-valitsinasetusta"
 
-#: config/tc-arm.c:22657
+#: config/tc-arm.c:22418
 msgid "use -mcpu=strongarm1110"
 msgstr "käytä �-mcpu=strongarm1110�-valitsinasetusta"
 
-#: config/tc-arm.c:22658
+#: config/tc-arm.c:22419
 msgid "use -mcpu=xscale"
 msgstr "käytä �-mcpu=xscale�-valitsinasetusta"
 
-#: config/tc-arm.c:22659
+#: config/tc-arm.c:22420
 msgid "use -mcpu=iwmmxt"
 msgstr "käytä �-mcpu=iwmmxt�-valitsinasetusta"
 
-#: config/tc-arm.c:22660
+#: config/tc-arm.c:22421
 msgid "use -mcpu=all"
 msgstr "käytä �-mcpu=all�-valitsinasetusta"
 
 #. Architecture variants -- don't add any more to this list either.
-#: config/tc-arm.c:22663 config/tc-arm.c:22664
+#: config/tc-arm.c:22424 config/tc-arm.c:22425
 msgid "use -march=armv2"
 msgstr "käytä �-march=armv2�-valitsinasetusta"
 
-#: config/tc-arm.c:22665 config/tc-arm.c:22666
+#: config/tc-arm.c:22426 config/tc-arm.c:22427
 msgid "use -march=armv2a"
 msgstr "käytä �-march=armv2a�-valitsinasetusta"
 
-#: config/tc-arm.c:22667 config/tc-arm.c:22668
+#: config/tc-arm.c:22428 config/tc-arm.c:22429
 msgid "use -march=armv3"
 msgstr "käytä �-march=armv3�-valitsinasetusta"
 
-#: config/tc-arm.c:22669 config/tc-arm.c:22670
+#: config/tc-arm.c:22430 config/tc-arm.c:22431
 msgid "use -march=armv3m"
 msgstr "käytä �-march=armv3m�-valitsinasetusta"
 
-#: config/tc-arm.c:22671 config/tc-arm.c:22672
+#: config/tc-arm.c:22432 config/tc-arm.c:22433
 msgid "use -march=armv4"
 msgstr "käytä �-march=armv4�-valitsinasetusta"
 
-#: config/tc-arm.c:22673 config/tc-arm.c:22674
+#: config/tc-arm.c:22434 config/tc-arm.c:22435
 msgid "use -march=armv4t"
 msgstr "käytä �-march=armv4t�-valitsinasetusta"
 
-#: config/tc-arm.c:22675 config/tc-arm.c:22676
+#: config/tc-arm.c:22436 config/tc-arm.c:22437
 msgid "use -march=armv5"
 msgstr "käytä �-march=armv5�-valitsinasetusta"
 
-#: config/tc-arm.c:22677 config/tc-arm.c:22678
+#: config/tc-arm.c:22438 config/tc-arm.c:22439
 msgid "use -march=armv5t"
 msgstr "käytä �-march=armv5t�-valitsinasetusta"
 
-#: config/tc-arm.c:22679 config/tc-arm.c:22680
+#: config/tc-arm.c:22440 config/tc-arm.c:22441
 msgid "use -march=armv5te"
 msgstr "käytä �-march=armv5te�-valitsinasetusta"
 
 #. Floating point variants -- don't add any more to this list either.
-#: config/tc-arm.c:22683
+#: config/tc-arm.c:22444
 msgid "use -mfpu=fpe"
 msgstr "käytä �-mfpu=fpe�-valitsinasetusta"
 
-#: config/tc-arm.c:22684
+#: config/tc-arm.c:22445
 msgid "use -mfpu=fpa10"
 msgstr "käytä �-mfpu=fpa10�-valitsinasetusta"
 
-#: config/tc-arm.c:22685
+#: config/tc-arm.c:22446
 msgid "use -mfpu=fpa11"
 msgstr "käytä �-mfpu=fpa11�-valitsinasetusta"
 
-#: config/tc-arm.c:22687
+#: config/tc-arm.c:22448
 msgid "use either -mfpu=softfpa or -mfpu=softvfp"
 msgstr "käytä joko �-mfpu=softfpa�- tai �-mfpu=softvfp�-valitsinasetusta"
 
-#: config/tc-arm.c:23016
+#: config/tc-arm.c:22772
 msgid "invalid architectural extension"
 msgstr "virheellinen arkkitehtuurilaajennus"
 
-#: config/tc-arm.c:23049
+#: config/tc-arm.c:22805
 msgid "must specify extensions to add before specifying those to remove"
 msgstr "on määriteltävä laajennukset ennen poistettavien määrittelyä"
 
-#: config/tc-arm.c:23057
+#: config/tc-arm.c:22813
 msgid "missing architectural extension"
 msgstr "puuttuva arkkitehtuurilaajennus"
 
-#: config/tc-arm.c:23072
+#: config/tc-arm.c:22828
 msgid "extension does not apply to the base architecture"
 msgstr "laajennus ei koske perusarkkitehtuuria"
 
-#: config/tc-arm.c:23095
+#: config/tc-arm.c:22851
 #, c-format
 msgid "unknown architectural extension `%s'"
 msgstr "tuntematon arkkitehtuurilaajennus �%s�"
 
-#: config/tc-arm.c:23097
+#: config/tc-arm.c:22853
 msgid "architectural extensions must be specified in alphabetical order"
 msgstr "arkkitehtuurilaajennukset on määriteltävä aakkosjärjestyksessä"
 
-#: config/tc-arm.c:23129
+#: config/tc-arm.c:22885
 #, c-format
 msgid "missing cpu name `%s'"
 msgstr "puuttuva prosessorinimi �%s�"
 
-#: config/tc-arm.c:23155 config/tc-arm.c:23651
+#: config/tc-arm.c:22911 config/tc-arm.c:23401
 #, c-format
 msgid "unknown cpu `%s'"
 msgstr "tuntematon prosessori �%s�"
 
-#: config/tc-arm.c:23173
+#: config/tc-arm.c:22929
 #, c-format
 msgid "missing architecture name `%s'"
 msgstr "puuttuva arkkitehtuurinimi �%s�"
 
-#: config/tc-arm.c:23190 config/tc-arm.c:23685 config/tc-arm.c:23716
-#: config/tc-arm.c:23767 config/tc-score.c:7727
+#: config/tc-arm.c:22946 config/tc-arm.c:23435 config/tc-arm.c:23466
+#: config/tc-arm.c:23517 config/tc-score.c:7727
 #, c-format
 msgid "unknown architecture `%s'\n"
 msgstr "tuntematon arkkitehtuuri �%s�\n"
 
-#: config/tc-arm.c:23206 config/tc-arm.c:23798
+#: config/tc-arm.c:22962 config/tc-arm.c:23548
 #, c-format
 msgid "unknown floating point format `%s'\n"
 msgstr "tuntematon liukulukumuoto �%s�\n"
 
-#: config/tc-arm.c:23222
+#: config/tc-arm.c:22978
 #, c-format
 msgid "unknown floating point abi `%s'\n"
 msgstr "tuntematon liukuluku-abi �%s�\n"
 
-#: config/tc-arm.c:23238
+#: config/tc-arm.c:22994
 #, c-format
 msgid "unknown EABI `%s'\n"
 msgstr "tuntematon EABI �%s�\n"
 
-#: config/tc-arm.c:23258
+#: config/tc-arm.c:23014
 #, c-format
 msgid "unknown implicit IT mode `%s', should be arm, thumb, always, or never."
 msgstr "tuntematon implisiittinen IT-tila �%s�, pitäisi olla arm, thumb, always, tai never."
 
-#: config/tc-arm.c:23268
+#: config/tc-arm.c:23024
 msgid "<cpu name>\t  assemble for CPU <cpu name>"
 msgstr "<prosessorinimi>\t  assembloi prosessorille <prosessorinimi>"
 
-#: config/tc-arm.c:23270
+#: config/tc-arm.c:23026
 msgid "<arch name>\t  assemble for architecture <arch name>"
 msgstr "<arkkitehtuurinimi>\t  assembloi arkkitehtuurille <arkkitehtuurinimi>"
 
-#: config/tc-arm.c:23272
+#: config/tc-arm.c:23028
 msgid "<fpu name>\t  assemble for FPU architecture <fpu name>"
 msgstr "<fpu-nimi>\t  assembloi FPU-arkkitehtuurille <fpu-nimi>"
 
-#: config/tc-arm.c:23274
+#: config/tc-arm.c:23030
 msgid "<abi>\t  assemble for floating point ABI <abi>"
 msgstr "<abi>\t  assembloi liukuluku-ABI:lle <abi>"
 
-#: config/tc-arm.c:23277
+#: config/tc-arm.c:23033
 msgid "<ver>\t\t  assemble for eabi version <ver>"
 msgstr "<ver>\t\t  assembloi eabi-versiolle <ver>"
 
-#: config/tc-arm.c:23280
+#: config/tc-arm.c:23036
 msgid "<mode>\t  controls implicit insertion of IT instructions"
 msgstr "<mode>\t  ohjaa IT-käskyjen implisiittistä lisäämistä"
 
-#: config/tc-arm.c:23324 config/tc-arm.c:23342 config/tc-arm.c:23362
+#: config/tc-arm.c:23080 config/tc-arm.c:23098 config/tc-arm.c:23118
 #, c-format
 msgid "option `-%c%s' is deprecated: %s"
 msgstr "valitsin �-%c%s� on poistettu käytöstä: %s"
 
-#: config/tc-arm.c:23382
+#: config/tc-arm.c:23138
 #, c-format
 msgid " ARM-specific assembler options:\n"
 msgstr " ARM-kohtaisia assemblerivalitsimia:\n"
 
-#: config/tc-arm.c:23393
+#: config/tc-arm.c:23149
 #, c-format
 msgid "  -EB                     assemble code for a big-endian cpu\n"
 msgstr "  -EB                     assembloi koodi �big-endian�-tyyppiselle prosessorille\n"
 
-#: config/tc-arm.c:23398
+#: config/tc-arm.c:23154
 #, c-format
 msgid "  -EL                     assemble code for a little-endian cpu\n"
 msgstr "  -EL                     assembloi koodi �little-endian�-tyyppiselle prosessorille\n"
 
-#: config/tc-arm.c:23402
+#: config/tc-arm.c:23158
 #, c-format
 msgid "  --fix-v4bx              Allow BX in ARMv4 code\n"
 msgstr "  --fix-v4bx              Salli BX ARMv4-koodissa\n"
 
-#: config/tc-arm.c:23749
+#: config/tc-arm.c:23499
 #, c-format
 msgid "architectural extension `%s' is not allowed for the current base architecture"
 msgstr "arkkitehtuurilaajennus �%s� ei ole sallittu nykyisessä perusarkkitehtuurissa"
 
-#: config/tc-avr.c:373
+#: config/tc-avr.c:336
 #, c-format
 msgid "Known MCU names:"
 msgstr "Tunnetut MCU-nimet:"
 
-#: config/tc-avr.c:438
+#: config/tc-avr.c:401
 #, c-format
 msgid ""
-"AVR Assembler options:\n"
+"AVR options:\n"
 "  -mmcu=[avr-name] select microcontroller variant\n"
 "                   [avr-name] can be:\n"
 "                   avr1  - classic AVR core without data RAM\n"
@@ -3639,11 +3609,6 @@ msgid ""
 "                   avr5  - enhanced AVR core with up to 64K program memory\n"
 "                   avr51 - enhanced AVR core with up to 128K program memory\n"
 "                   avr6  - enhanced AVR core with up to 256K program memory\n"
-"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
-"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
-"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
-"                   avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
-"                   avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n"
 "                   or immediate microcontroller name.\n"
 msgstr ""
 "AVR-valitsimet:\n"
@@ -3661,15 +3626,10 @@ msgstr ""
 "                   avr5  - laajennettu AVR-ydin aina 64 kilotavua ohjelmamuistia\n"
 "                   avr51 - laajennettu AVR-ydin aina 128 kilotavua ohjelmamuistia\n"
 "                   avr6  - laajennettu AVR-ydin aina 256 kilotavua ohjelmamuistia\n"
-"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
-"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
-"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
-"                   avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
-"                   avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n"
 "                   tai välitön mikrokontrollerinimi.\n"
 
 #  wrap-around tarkoittaa ohjelmoinnissa, että esimerkiksi laskuri maksimiarvoon päästyään alkaa laskennan uudelleen nollasta. Laskurina voi toimia esimerkiksi 8-bittinen muistipaikka tai rekisteri ja silloin maksimiarvon on 255 (jos muistipaikka käsitellään etumerkittömänä lukuna) ja sen jälkeinen (laskuri)arvo on nolla.
-#: config/tc-avr.c:460
+#: config/tc-avr.c:418
 #, c-format
 msgid ""
 "  -mall-opcodes    accept all AVR opcodes, even if not supported by MCU\n"
@@ -3684,156 +3644,156 @@ msgstr ""
 "  -mno-wrap        hylkää �rjmp/rcall�-käskyt 8 kilotavun laskurikierrolla\n"
 "                   (oletus avr3:lle, avr5:lle)\n"
 
-#: config/tc-avr.c:504 config/tc-msp430.c:743
+#: config/tc-avr.c:462 config/tc-msp430.c:743
 #, c-format
 msgid "unknown MCU: %s\n"
 msgstr "tuntematon MCU: %s\n"
 
-#: config/tc-avr.c:513
+#: config/tc-avr.c:471
 #, c-format
 msgid "redefinition of mcu type `%s' to `%s'"
 msgstr "mcu-tyypin uudelleenmäärittely nimestä �%s� nimeen �%s�"
 
-#: config/tc-avr.c:591
+#: config/tc-avr.c:549
 msgid "constant value required"
 msgstr "vakioarvo vaadittu"
 
-#: config/tc-avr.c:594
+#: config/tc-avr.c:552
 #, c-format
 msgid "number must be positive and less than %d"
 msgstr "numeron on oltava positiivinen ja pienempi kuin %d"
 
 #  Tämäkin virheilmoitus on virheellinen. Lähdekoodissa tutkitaan, että onko luku pienempi kuin -255 tai suurempi kuin 255, eli pitäisi olla "vakio 16-bittialueen ulkopuolella: %d". Todellisuudessa kohteena on 8-bittinen rekisteri, johon sopii kerrallaan vain puolet (0...255) tai (-255...0) tutkittavasta lukualueesta.
-#: config/tc-avr.c:620 config/tc-avr.c:757
+#: config/tc-avr.c:578 config/tc-avr.c:715
 #, c-format
 msgid "constant out of 8-bit range: %d"
 msgstr "vakio 8-bittialueen ulkopuolella: %d"
 
-#: config/tc-avr.c:688 config/tc-score.c:1200 read.c:3662
+#: config/tc-avr.c:646 config/tc-score.c:1200 read.c:3676
 msgid "illegal expression"
 msgstr "luvaton lauseke"
 
-#: config/tc-avr.c:717 config/tc-avr.c:1508
+#: config/tc-avr.c:675 config/tc-avr.c:1451
 msgid "`)' required"
 msgstr "�)� vaadittu"
 
-#: config/tc-avr.c:812
+#: config/tc-avr.c:770
 msgid "register r16-r23 required"
 msgstr "rekisteri �r16-r23� vaadittu"
 
-#: config/tc-avr.c:818
+#: config/tc-avr.c:776
 msgid "register number above 15 required"
 msgstr "vaadittu rekisterinumero, joka on arvon 15 yläpuolella"
 
-#: config/tc-avr.c:824
+#: config/tc-avr.c:782
 msgid "even register number required"
 msgstr "parillinen rekisterinumero vaadittu"
 
-#: config/tc-avr.c:830
+#: config/tc-avr.c:788
 msgid "register r24, r26, r28 or r30 required"
 msgstr "rekisteri r24, r26, r28 tai r30 vaadittu"
 
-#: config/tc-avr.c:836
+#: config/tc-avr.c:794
 msgid "register name or number from 0 to 31 required"
 msgstr "rekisterinimi tai numero arvosta 0 arvoon 31 vaadittu"
 
-#: config/tc-avr.c:854
+#: config/tc-avr.c:812
 msgid "pointer register (X, Y or Z) required"
 msgstr "osoitinrekisteri (X, Y tai Z) vaadittu"
 
-#: config/tc-avr.c:861
+#: config/tc-avr.c:819
 msgid "cannot both predecrement and postincrement"
 msgstr "ei voi sekä ennakkoaskelvähentää että jälkiaskellisätä"
 
-#: config/tc-avr.c:869
+#: config/tc-avr.c:827
 msgid "addressing mode not supported"
 msgstr "osoitteenmuodostustila ei ole tuettu"
 
-#: config/tc-avr.c:875
+#: config/tc-avr.c:833
 msgid "can't predecrement"
 msgstr "ei voi ennakkoaskelvähentää"
 
-#: config/tc-avr.c:878
+#: config/tc-avr.c:836
 msgid "pointer register Z required"
 msgstr "osoitinrekisteri Z vaadittu"
 
-#: config/tc-avr.c:897
+#: config/tc-avr.c:850
 msgid "postincrement not supported"
 msgstr "jälkiaskelkasvatusta ei ole tuettu"
 
-#: config/tc-avr.c:907
+#: config/tc-avr.c:860
 msgid "pointer register (Y or Z) required"
 msgstr "osoitinrekisteri (Y tai Z) vaadittu"
 
-#: config/tc-avr.c:1021
+#: config/tc-avr.c:964
 #, c-format
 msgid "unknown constraint `%c'"
 msgstr "tuntematon rajoite �%c�"
 
-#: config/tc-avr.c:1073
+#: config/tc-avr.c:1016
 msgid "`,' required"
 msgstr "�,� vaadittu"
 
-#: config/tc-avr.c:1091
+#: config/tc-avr.c:1034
 msgid "undefined combination of operands"
 msgstr "määrittelemätön operandien yhdistelmä"
 
-#: config/tc-avr.c:1100
+#: config/tc-avr.c:1043
 msgid "skipping two-word instruction"
 msgstr "hypätään kaksisanakäskyn ylitse"
 
-#: config/tc-avr.c:1192 config/tc-avr.c:1208 config/tc-avr.c:1329
+#: config/tc-avr.c:1135 config/tc-avr.c:1151 config/tc-avr.c:1272
 #: config/tc-msp430.c:1969 config/tc-msp430.c:1987
 #, c-format
 msgid "odd address operand: %ld"
 msgstr "pariton osoiteoperandi: %ld"
 
-#: config/tc-avr.c:1200 config/tc-avr.c:1219 config/tc-avr.c:1237
-#: config/tc-avr.c:1248 config/tc-avr.c:1255 config/tc-avr.c:1262
+#: config/tc-avr.c:1143 config/tc-avr.c:1162 config/tc-avr.c:1180
+#: config/tc-avr.c:1191 config/tc-avr.c:1198 config/tc-avr.c:1205
 #: config/tc-d10v.c:505 config/tc-d30v.c:554 config/tc-msp430.c:1977
 #: config/tc-msp430.c:1992 config/tc-msp430.c:2002
 #, c-format
 msgid "operand out of range: %ld"
 msgstr "operandi lukualueen ulkopuolella: %ld"
 
-#: config/tc-avr.c:1338 config/tc-d10v.c:1594 config/tc-d30v.c:2037
+#: config/tc-avr.c:1281 config/tc-d10v.c:1594 config/tc-d30v.c:2037
 #: config/tc-msp430.c:2020
 #, c-format
 msgid "line %d: unknown relocation type: 0x%x"
 msgstr "rivi %d: tuntematon sijoitustyyppi: 0x%x"
 
-#: config/tc-avr.c:1352
+#: config/tc-avr.c:1295
 msgid "only constant expression allowed"
 msgstr "vain vakiolauseke sallittu"
 
 #. xgettext:c-format.
-#: config/tc-avr.c:1412 config/tc-bfin.c:833 config/tc-d10v.c:1466
+#: config/tc-avr.c:1355 config/tc-bfin.c:828 config/tc-d10v.c:1466
 #: config/tc-d30v.c:1774 config/tc-mn10200.c:781 config/tc-mn10300.c:2170
-#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6611
+#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6383
 #: config/tc-spu.c:879 config/tc-spu.c:1090 config/tc-v850.c:3000
-#: config/tc-z80.c:2021
+#: config/tc-z80.c:2012
 #, c-format
 msgid "reloc %d not supported by object file format"
 msgstr "objektitiedostomuoto ei tue �reloc�-tyyppiä %d"
 
-#: config/tc-avr.c:1435 config/tc-h8300.c:1935 config/tc-mcore.c:881
+#: config/tc-avr.c:1378 config/tc-h8300.c:1935 config/tc-mcore.c:881
 #: config/tc-microblaze.c:823 config/tc-moxie.c:178 config/tc-msp430.c:1820
 #: config/tc-pj.c:253 config/tc-sh.c:2590 config/tc-z8k.c:1216
 msgid "can't find opcode "
 msgstr "käskykoodia ei löydy"
 
 #  MCU tulee muistaakseni sanoista MicroController Unit eli Microcontroller
-#: config/tc-avr.c:1452
+#: config/tc-avr.c:1395
 #, c-format
 msgid "illegal opcode %s for mcu %s"
 msgstr "luvaton käskykoodi %s mikrokontrollerille %s"
 
-#: config/tc-avr.c:1463
+#: config/tc-avr.c:1406
 msgid "garbage at end of line"
 msgstr "roskaa rivin lopussa"
 
 #  Lähdekoodin mukaan %s-merkkijonoon tulee ensimmäisellä käyttökerralla tyhjä merkkijono "" ja toisella kerralla "pm". Jälkimmäinen olisi luontevasti "pm-sijoituskoko", mutta ensimmäinen "-sijoituskoko" näyttäisi oudon näköiseltä. Yhden merkin lainausmerkit voisivat menetellä.
-#: config/tc-avr.c:1537 config/tc-avr.c:1544
+#: config/tc-avr.c:1480 config/tc-avr.c:1487
 #, c-format
 msgid "illegal %srelocation size: %d"
 msgstr "luvaton ’%s’-sijoituskoko: %d"
@@ -3842,283 +3802,283 @@ msgstr "luvaton ’%s’-sijoituskoko: %d"
 msgid "missing ')'"
 msgstr "puuttuva ’)’"
 
-#: config/tc-bfin.c:442
+#: config/tc-bfin.c:437
 #, c-format
 msgid " Blackfin specific assembler options:\n"
 msgstr " Blackfin-kohtaiset assembleri-valitsimet:\n"
 
-#: config/tc-bfin.c:443
+#: config/tc-bfin.c:438
 #, c-format
 msgid "  -mcpu=<cpu[-sirevision]> specify the name of the target CPU\n"
 msgstr "  -mcpu=<cpu[-sirevision]> määritä kohdeprosessorin nimi\n"
 
-#: config/tc-bfin.c:444
+#: config/tc-bfin.c:439
 #, c-format
 msgid "  -mfdpic                  assemble for the FDPIC ABI\n"
 msgstr "  -mfdpic                  assembloi FDPIC ABI:lle\n"
 
-#: config/tc-bfin.c:445
+#: config/tc-bfin.c:440
 #, c-format
 msgid "  -mno-fdpic/-mnopic       disable -mfdpic\n"
 msgstr "  -mno-fdpic/-mnopic       ota pois käytöstä -mfdpic\n"
 
-#: config/tc-bfin.c:458
+#: config/tc-bfin.c:453
 msgid "Could not set architecture and machine."
 msgstr "Ei voitu asettaa arkkitehtuuria ja konetta."
 
-#: config/tc-bfin.c:607
+#: config/tc-bfin.c:602
 msgid "Parse failed."
 msgstr "Jäsentäminen epäonnistui."
 
-#: config/tc-bfin.c:682
+#: config/tc-bfin.c:677
 msgid "pcrel too far BFD_RELOC_BFIN_10"
 msgstr "pcrel liian kaukana BFD_RELOC_BFIN_10"
 
-#: config/tc-bfin.c:698
+#: config/tc-bfin.c:693
 msgid "pcrel too far BFD_RELOC_BFIN_12"
 msgstr "pcrel liian kaukana BFD_RELOC_BFIN_12"
 
-#: config/tc-bfin.c:718
+#: config/tc-bfin.c:713
 msgid "pcrel too far BFD_RELOC_BFIN_24"
 msgstr "pcrel liian kaukana BFD_RELOC_BFIN_24"
 
-#: config/tc-bfin.c:733
+#: config/tc-bfin.c:728
 msgid "pcrel too far BFD_RELOC_BFIN_5"
 msgstr "pcrel liian kaukana BFD_RELOC_BFIN_5"
 
-#: config/tc-bfin.c:745
+#: config/tc-bfin.c:740
 msgid "pcrel too far BFD_RELOC_BFIN_11_PCREL"
 msgstr "pcrel liian kaukana BFD_RELOC_BFIN_11_PCREL"
 
-#: config/tc-bfin.c:755
+#: config/tc-bfin.c:750
 msgid "rel too far BFD_RELOC_8"
 msgstr "rel liian kaukana BFD_RELOC_8"
 
-#: config/tc-bfin.c:762
+#: config/tc-bfin.c:757
 msgid "rel too far BFD_RELOC_16"
 msgstr "rel liian kaukana BFD_RELOC_16"
 
-#: config/tc-cr16.c:165 read.c:4422
+#: config/tc-cr16.c:164 read.c:4436
 msgid "using a bit field width of zero"
 msgstr "käytetään nollakokoista bittikenttäleveyttä"
 
-#: config/tc-cr16.c:173 read.c:4430
+#: config/tc-cr16.c:172 read.c:4444
 #, c-format
 msgid "field width \"%s\" too complex for a bitfield"
 msgstr "kenttäleveys �%s� liian mutkikas bittikentälle"
 
-#: config/tc-cr16.c:182 read.c:4438
+#: config/tc-cr16.c:181 read.c:4452
 #, c-format
 msgid "field width %lu too big to fit in %d bytes: truncated to %d bits"
 msgstr "kenttäleveys %lu liian suuri sopimaan %d tavuun: typistetty %d:n bittiin"
 
-#: config/tc-cr16.c:204 read.c:4460
+#: config/tc-cr16.c:203 read.c:4474
 #, c-format
 msgid "field value \"%s\" too complex for a bitfield"
 msgstr "kenttäarvo �%s� liian mutkikas bittikentälle"
 
-#: config/tc-cr16.c:385
+#: config/tc-cr16.c:384
 #, c-format
 msgid "Unknown register pair - index relative mode: `%d'"
 msgstr "Tuntematon rekisteripari - indeksisuhteellinen tila: �%d�"
 
-#: config/tc-cr16.c:571 config/tc-crx.c:345 config/tc-mn10200.c:768
-#: write.c:990
+#: config/tc-cr16.c:570 config/tc-crx.c:345 config/tc-mn10200.c:768
+#: write.c:986
 #, c-format
 msgid "can't resolve `%s' {%s section} - `%s' {%s section}"
 msgstr "ei voi ratkaista lausekkeen �%s� {%s lohko} eroa lausekkeeseen �%s� {%s lohko}"
 
-#: config/tc-cr16.c:603 config/tc-crx.c:361
+#: config/tc-cr16.c:602 config/tc-crx.c:361
 #, c-format
 msgid "internal error: reloc %d (`%s') not supported by object file format"
 msgstr "sisäinen virhe: reloc-tyyppi %d (�%s�) ei ole objektitiedostomuodon tukema"
 
-#: config/tc-cr16.c:696 config/tc-i386.c:8723 config/tc-s390.c:1911
+#: config/tc-cr16.c:695 config/tc-i386.c:8604 config/tc-s390.c:1804
 msgid "GOT already in symbol table"
 msgstr "GOT on jo symbolitaulussa"
 
-#: config/tc-cr16.c:805 config/tc-cr16.c:828 config/tc-cris.c:1190
+#: config/tc-cr16.c:804 config/tc-cr16.c:827 config/tc-cris.c:1190
 #: config/tc-crx.c:535 config/tc-crx.c:562 config/tc-crx.c:580
 #: config/tc-pdp11.c:194
 msgid "Virtual memory exhausted"
 msgstr "Virtuaalimuisti loppui"
 
-#: config/tc-cr16.c:813 config/tc-crx.c:572 config/tc-crx.c:591
-#: config/tc-m68k.c:4656
+#: config/tc-cr16.c:812 config/tc-crx.c:572 config/tc-crx.c:591
+#: config/tc-i386.c:2258 config/tc-i386.c:2280 config/tc-m68k.c:4656
 #, c-format
 msgid "Internal Error:  Can't hash %s: %s"
 msgstr "Sisäinen virhe:  Ei voida sekasummata ’%s’-rekisteriä: %s"
 
-#: config/tc-cr16.c:839 config/tc-cris.c:1224 config/tc-crx.c:545
+#: config/tc-cr16.c:838 config/tc-cris.c:1224 config/tc-crx.c:545
 #, c-format
 msgid "Can't hash `%s': %s\n"
 msgstr "Ei voida sekasummata �%s�-muistikasta: %s\n"
 
-#: config/tc-cr16.c:840 config/tc-cris.c:1225 config/tc-crx.c:546
+#: config/tc-cr16.c:839 config/tc-cris.c:1225 config/tc-crx.c:546
 msgid "(unknown reason)"
 msgstr "(tuntematon syy)"
 
 #. Missing or bad expr becomes absolute 0.
-#: config/tc-cr16.c:892 config/tc-crx.c:619
+#: config/tc-cr16.c:891 config/tc-crx.c:619
 #, c-format
 msgid "missing or invalid displacement expression `%s' taken as 0"
 msgstr "puuttuvaa tai virheellistä siirtymälauseketta �%s� pidetään nollana"
 
-#: config/tc-cr16.c:942
+#: config/tc-cr16.c:941
 #, c-format
 msgid "GOT bad expression with %s."
 msgstr "GOT virheellinen lauseke kohteen %s kanssa."
 
-#: config/tc-cr16.c:1053
+#: config/tc-cr16.c:1052
 #, c-format
 msgid "operand %d: illegal use expression: `%s`"
 msgstr "operandi %d: luvaton käyttölauseke: �%s�"
 
-#: config/tc-cr16.c:1118 config/tc-crx.c:1127
+#: config/tc-cr16.c:1117 config/tc-crx.c:1127
 #, c-format
 msgid "Unknown register: `%d'"
 msgstr "Tuntematon rekisteri: �%d�"
 
 #. Issue a error message when register is illegal.
-#: config/tc-cr16.c:1126 config/tc-crx.c:1135
+#: config/tc-cr16.c:1125 config/tc-crx.c:1135
 #, c-format
 msgid "Illegal register (`%s') in Instruction: `%s'"
 msgstr "Luvaton rekisteri (�%s�) käskyssä: �%s�"
 
-#: config/tc-cr16.c:1197 config/tc-cr16.c:1272 config/tc-crx.c:757
+#: config/tc-cr16.c:1196 config/tc-cr16.c:1271 config/tc-crx.c:757
 #: config/tc-crx.c:777 config/tc-crx.c:792
 #, c-format
 msgid "Illegal register `%s' in Instruction `%s'"
 msgstr "Luvaton rekisteri �%s� käskyssä �%s�"
 
-#: config/tc-cr16.c:1225 config/tc-cr16.c:1236
+#: config/tc-cr16.c:1224 config/tc-cr16.c:1235
 #, c-format
 msgid "Illegal register pair `%s' in Instruction `%s'"
 msgstr "Luvaton rekisteripari �%s� käskyssä �%s�"
 
-#: config/tc-cr16.c:1261 config/tc-i960.c:835
+#: config/tc-cr16.c:1260 config/tc-i960.c:835
 msgid "unmatched '['"
 msgstr "täsmäämätön ’[’"
 
-#: config/tc-cr16.c:1267 config/tc-i960.c:842
+#: config/tc-cr16.c:1266 config/tc-i960.c:842
 msgid "garbage after index spec ignored"
 msgstr "roskaa indeksimäärittelyn jälkeen ei otettu huomioon"
 
-#: config/tc-cr16.c:1415 config/tc-crx.c:936
+#: config/tc-cr16.c:1414 config/tc-crx.c:936
 #, c-format
 msgid "Illegal operands (whitespace): `%s'"
 msgstr "Luvattomat operandit (tyhjetila): �%s�"
 
-#: config/tc-cr16.c:1427 config/tc-cr16.c:1434 config/tc-cr16.c:1451
+#: config/tc-cr16.c:1426 config/tc-cr16.c:1433 config/tc-cr16.c:1450
 #: config/tc-crx.c:948 config/tc-crx.c:955 config/tc-crx.c:972
 #: config/tc-crx.c:1764
 #, c-format
 msgid "Missing matching brackets : `%s'"
 msgstr "Puuttuvat täsmäävät sulkeet : �%s�"
 
-#: config/tc-cr16.c:1483 config/tc-crx.c:998
+#: config/tc-cr16.c:1482 config/tc-crx.c:998
 #, c-format
 msgid "Unknown exception: `%s'"
 msgstr "Tuntematon poikkeus: �%s�"
 
-#: config/tc-cr16.c:1570 config/tc-crx.c:1094
+#: config/tc-cr16.c:1569 config/tc-crx.c:1094
 #, c-format
 msgid "Illegal `cinv' parameter: `%c'"
 msgstr "Luvaton �cinv�-käskyparametri: �%c�"
 
-#: config/tc-cr16.c:1592 config/tc-cr16.c:1631
+#: config/tc-cr16.c:1591 config/tc-cr16.c:1630
 #, c-format
 msgid "Unknown register pair: `%d'"
 msgstr "Tuntematon rekisteripari: �%d�"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1600
+#: config/tc-cr16.c:1599
 #, c-format
 msgid "Illegal register pair (`%s') in Instruction: `%s'"
 msgstr "Luvaton rekisteripari (�%s�) käskyssä: �%s�"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1639
+#: config/tc-cr16.c:1638
 #, c-format
 msgid "Illegal index register pair (`%s') in Instruction: `%s'"
 msgstr "Luvaton indeksirekisteripari (�%s�) käskyssä: �%s�"
 
-#: config/tc-cr16.c:1678
+#: config/tc-cr16.c:1677
 #, c-format
 msgid "Unknown processor register : `%d'"
 msgstr "Tuntematon prosessorirekisteri : �%d�"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1686
+#: config/tc-cr16.c:1685
 #, c-format
 msgid "Illegal processor register (`%s') in Instruction: `%s'"
 msgstr "Luvaton prosessorirekisteri (�%s�) käskyssä: �%s�"
 
-#: config/tc-cr16.c:1734
+#: config/tc-cr16.c:1733
 #, c-format
 msgid "Unknown processor register (32 bit) : `%d'"
 msgstr "Tuntematon prosessorirekisteri (32-bittinen) : �%d�"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1742
+#: config/tc-cr16.c:1741
 #, c-format
 msgid "Illegal 32 bit - processor register (`%s') in Instruction: `%s'"
 msgstr "Luvaton 32-bittinen prosessorirekisteri (�%s�) käskyssä: �%s�"
 
-#: config/tc-cr16.c:2106 config/tc-crx.c:1662 config/tc-crx.c:1679
+#: config/tc-cr16.c:2105 config/tc-crx.c:1662 config/tc-crx.c:1679
 #, c-format
 msgid "Same src/dest register is used (`r%d'), result is undefined"
 msgstr "Käytetään samaa lähde- ja kohderekisteriä (�r%d�), tulos on määrittelemätön"
 
-#: config/tc-cr16.c:2127
+#: config/tc-cr16.c:2126
 msgid "RA register is saved twice."
 msgstr "RA-rekisteri on tallennettu kahdesti."
 
-#: config/tc-cr16.c:2131
+#: config/tc-cr16.c:2130
 #, c-format
 msgid "`%s' Illegal use of registers."
 msgstr "�%s� Luvaton rekisterien käyttö."
 
-#: config/tc-cr16.c:2145
+#: config/tc-cr16.c:2144
 #, c-format
 msgid "`%s' Illegal count-register combination."
 msgstr "�%s� Luvaton ’count’-vakion ja rekisterin yhdistelmä."
 
-#: config/tc-cr16.c:2151
+#: config/tc-cr16.c:2150
 #, c-format
 msgid "`%s' Illegal use of register."
 msgstr "�%s� Luvaton rekisterikäyttö."
 
-#: config/tc-cr16.c:2160 config/tc-crx.c:1671
+#: config/tc-cr16.c:2159 config/tc-crx.c:1671
 #, c-format
 msgid "`%s' has undefined result"
 msgstr "�%s� on määrittelemätön tulos"
 
-#: config/tc-cr16.c:2168
+#: config/tc-cr16.c:2167
 #, c-format
 msgid "Same src/dest register is used (`r%d'),result is undefined"
 msgstr "Käytetään samaa lähde- ja kohderekisteriä (�r%d�), tulos on määrittelemätön"
 
-#: config/tc-cr16.c:2339 config/tc-crx.c:1576
+#: config/tc-cr16.c:2338 config/tc-crx.c:1576
 msgid "Incorrect number of operands"
 msgstr "Virheellinen operandien lukumäärä"
 
-#: config/tc-cr16.c:2341 config/tc-crx.c:1578
+#: config/tc-cr16.c:2340 config/tc-crx.c:1578
 #, c-format
 msgid "Illegal type of operand (arg %d)"
 msgstr "Luvaton operandityyppi (argumentti %d)"
 
-#: config/tc-cr16.c:2347 config/tc-crx.c:1584
+#: config/tc-cr16.c:2346 config/tc-crx.c:1584
 #, c-format
 msgid "Operand out of range (arg %d)"
 msgstr "Operandi lukualueen ulkopuolella (argumentti %d)"
 
-#: config/tc-cr16.c:2350 config/tc-crx.c:1587
+#: config/tc-cr16.c:2349 config/tc-crx.c:1587
 #, c-format
 msgid "Operand has odd displacement (arg %d)"
 msgstr "Operandilla on pariton siirtymä (argumentti %d)"
 
-#: config/tc-cr16.c:2353 config/tc-cr16.c:2384 config/tc-crx.c:1600
+#: config/tc-cr16.c:2352 config/tc-cr16.c:2383 config/tc-crx.c:1600
 #: config/tc-crx.c:1631
 #, c-format
 msgid "Illegal operand (arg %d)"
@@ -4126,12 +4086,12 @@ msgstr "Luvaton operandi (argumentti %d)"
 
 #. Give an error if a frag containing code is not aligned to a 2-byte
 #. boundary.
-#: config/tc-cr16.c:2486 config/tc-cr16.h:73 config/tc-crx.c:1953
+#: config/tc-cr16.c:2485 config/tc-cr16.h:73 config/tc-crx.c:1953
 #: config/tc-crx.h:76
 msgid "instruction address is not a multiple of 2"
 msgstr "käskyosoite ei ole kahden monikerta"
 
-#: config/tc-cr16.c:2563 config/tc-cris.c:1538 config/tc-cris.c:1546
+#: config/tc-cr16.c:2562 config/tc-cris.c:1538 config/tc-cris.c:1546
 #: config/tc-crx.c:1989 config/tc-dlx.c:685 config/tc-hppa.c:3244
 #: config/tc-hppa.c:3251 config/tc-i860.c:491 config/tc-i860.c:508
 #: config/tc-i860.c:988 config/tc-sparc.c:1410 config/tc-sparc.c:1418
@@ -4229,7 +4189,7 @@ msgstr "Toteuttamaton rekisteri �%s� määritelty"
 
 #. We've come to the end of instructions with this
 #. opcode, so it must be an error.
-#: config/tc-cris.c:2079 config/tc-mips.c:10425 config/tc-mips.c:10430
+#: config/tc-cris.c:2079
 msgid "Illegal operands"
 msgstr "Luvattomat operandit"
 
@@ -4342,59 +4302,55 @@ msgstr "Käytä �--help�-valitsinta nähdäksesi käytön ja valitsimet täl
 msgid "--no-underscore is invalid with a.out format"
 msgstr "�--no-underscore�-valitsin on virheellinen ’a.out’-muodon kanssa"
 
-#: config/tc-cris.c:3815
-msgid "--pic is invalid for this object format"
-msgstr "--pic on virheellinen tälle objektitiedostomuodolle"
-
-#: config/tc-cris.c:3829
+#: config/tc-cris.c:3827
 #, c-format
 msgid "invalid <arch> in --march=<arch>: %s"
 msgstr "virheellinen <arkkitehtuuri> �--march=<arkkitehtuuri>�-valitsimessa: %s"
 
-#: config/tc-cris.c:3938 config/tc-moxie.c:709
+#: config/tc-cris.c:3936 config/tc-moxie.c:709
 msgid "Semantics error.  This type of operand can not be relocated, it must be an assembly-time constant"
 msgstr "Semanttinen virhe.  Tätä operandityyppiä ei voi sijoittaa, sen on oltava assembly-aikainen vakio"
 
-#: config/tc-cris.c:3987 config/tc-moxie.c:758
+#: config/tc-cris.c:3985 config/tc-moxie.c:758
 #, c-format
 msgid "Cannot generate relocation type for symbol %s, code %s"
 msgstr "Ei voida tuottaa sijoitustyyppiä symbolille %s, koodi %s"
 
 #. The messages are formatted to line up with the generic options.
-#: config/tc-cris.c:4000
+#: config/tc-cris.c:3998
 #, c-format
 msgid "CRIS-specific options:\n"
 msgstr "CRIS-kohtaiset valitsimet:\n"
 
-#: config/tc-cris.c:4002
+#: config/tc-cris.c:4000
 msgid "  -h, -H                  Don't execute, print this help text.  Deprecated.\n"
 msgstr "  -h, -H                  Älä suorita, tulosta tämä opasteteksti.  Poistettu käytöstä.\n"
 
-#: config/tc-cris.c:4004
+#: config/tc-cris.c:4002
 msgid "  -N                      Warn when branches are expanded to jumps.\n"
 msgstr "  -N                      Varoita kun haarautumisia on laajennettu hyppyihin.\n"
 
-#: config/tc-cris.c:4006
+#: config/tc-cris.c:4004
 msgid "  --underscore            User symbols are normally prepended with underscore.\n"
 msgstr "  --underscore            Käyttäjäsymbolien eteen on normaalisti lisätty alaviiva.\n"
 
-#: config/tc-cris.c:4008
+#: config/tc-cris.c:4006
 msgid "                          Registers will not need any prefix.\n"
 msgstr "                          Rekisterit eivät tarvitse mitään etuliitettä.\n"
 
-#: config/tc-cris.c:4010
+#: config/tc-cris.c:4008
 msgid "  --no-underscore         User symbols do not have any prefix.\n"
 msgstr "  --no-underscore         Käyttäjäsymboleissa ei ole mitään etuliitettä.\n"
 
-#: config/tc-cris.c:4012
+#: config/tc-cris.c:4010
 msgid "                          Registers will require a `$'-prefix.\n"
 msgstr "                          Rekisterit vaativat �$�-etuliitteen.\n"
 
-#: config/tc-cris.c:4015
+#: config/tc-cris.c:4012
 msgid "  --pic\t\t\tEnable generation of position-independent code.\n"
 msgstr "  --pic\t\t\tOta käyttöön paikkariippumattoman koodin tuottaminen.\n"
 
-#: config/tc-cris.c:4018
+#: config/tc-cris.c:4014
 msgid ""
 "  --march=<arch>\t\tGenerate code for <arch>.  Valid choices for <arch>\n"
 "\t\t\t\tare v0_v10, v10, v32 and common_v10_v32.\n"
@@ -4402,52 +4358,52 @@ msgstr ""
 "  --march=<arkkitehtuuri>\t\tTuota koodia <arkkitehtuuri>:lle.  Voimassa olevat valinnat <arkkitehtuuri>:lle\n"
 "\t\t\t\tovat v0_v10, v10, v32 ja common_v10_v32.\n"
 
-#: config/tc-cris.c:4039
+#: config/tc-cris.c:4035
 msgid "Invalid relocation"
 msgstr "Virheellinen sijoitus"
 
-#: config/tc-cris.c:4076
+#: config/tc-cris.c:4072
 msgid "Invalid pc-relative relocation"
 msgstr "Virheellinen ohjelmalaskurisuhteellinen sijoitus"
 
 #  Tämä virheilmoitus saadaan, jos ".word"-siirros on suurempi kuin 32767 tai pienempi kuin -32768.
-#: config/tc-cris.c:4121
+#: config/tc-cris.c:4117
 #, c-format
 msgid "Adjusted signed .word (%ld) overflows: `switch'-statement too large."
 msgstr "Säädetyn etumerkkillisen �.word�-siirroksen (%ld) ylivuodot: �switch�-lause liian suuri."
 
-#: config/tc-cris.c:4151
+#: config/tc-cris.c:4147
 #, c-format
 msgid ".syntax %s requires command-line option `--underscore'"
 msgstr "’.syntax’-symboli %s vaatii komentorivivalitsimen �--underscore�"
 
-#: config/tc-cris.c:4160
+#: config/tc-cris.c:4156
 #, c-format
 msgid ".syntax %s requires command-line option `--no-underscore'"
 msgstr "’.syntax’-symboli %s vaatii komentorivivalitsimen �--no-underscore�"
 
-#: config/tc-cris.c:4197
+#: config/tc-cris.c:4193
 msgid "Unknown .syntax operand"
 msgstr "Tuntematon ’.syntax’-operandi"
 
-#: config/tc-cris.c:4207
+#: config/tc-cris.c:4203
 msgid "Pseudodirective .file is only valid when generating ELF"
 msgstr "Näennäisdirektiivi �.file� on voimassa vain kun tuotetaan ELF-tiedostoa"
 
-#: config/tc-cris.c:4219
+#: config/tc-cris.c:4215
 msgid "Pseudodirective .loc is only valid when generating ELF"
 msgstr "Näennäisdirektiivi �.loc� on voimassa vain kun tuotetaan ELF-tiedostoa"
 
-#: config/tc-cris.c:4234
+#: config/tc-cris.c:4230
 #, c-format
 msgid "internal inconsistency problem: %s called for %d bytes"
 msgstr "sisäinen yhteensopimattomuuspulma: %s kutsuttu %d tavulle"
 
-#: config/tc-cris.c:4386
+#: config/tc-cris.c:4382
 msgid "unknown operand to .arch"
 msgstr "tuntematon operandi �.arch�-arkkitehtuuriin"
 
-#: config/tc-cris.c:4395
+#: config/tc-cris.c:4391
 msgid ".arch <arch> requires a matching --march=... option"
 msgstr "�.arch� <arkkitehtuuri> vaatii täsmäävän --march=... valitsimen"
 
@@ -4831,14 +4787,14 @@ msgstr "puuttuva �.proc�"
 msgid ".endfunc missing for previous .proc"
 msgstr "�.endfunc� puuttuu edelliselle �.proc�:lle"
 
-#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1927
+#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1916
 #, c-format
 msgid "internal error: can't hash `%s': %s\n"
 msgstr "sisäinen virhe: ei voi sekasummata käskykoodia �%s�: %s\n"
 
 #. Probably a memory allocation problem?  Give up now.
-#: config/tc-dlx.c:298 config/tc-hppa.c:8354 config/tc-mips.c:1930
-#: config/tc-mips.c:1984 config/tc-or32.c:211 config/tc-sparc.c:860
+#: config/tc-dlx.c:298 config/tc-hppa.c:8333 config/tc-mips.c:1919
+#: config/tc-mips.c:1973 config/tc-or32.c:211 config/tc-sparc.c:860
 msgid "Broken assembler.  No assembly attempted."
 msgstr "Rikkinäinen assembleri.  Ei yritetty käännöstä."
 
@@ -5192,7 +5148,7 @@ msgstr "virheelliset operandit"
 msgid "operand/size mis-match"
 msgstr "�operandi/koko�-täsmäämättömyys"
 
-#: config/tc-h8300.c:1952 config/tc-mips.c:10489 config/tc-sh.c:2971
+#: config/tc-h8300.c:1952 config/tc-mips.c:10170 config/tc-sh.c:2971
 #: config/tc-sh64.c:2795 config/tc-z8k.c:1226
 msgid "unknown opcode"
 msgstr "tuntematon käskykoodi"
@@ -5229,7 +5185,7 @@ msgid "Difference of symbols in different sections is not supported"
 msgstr "Synbolien eroa eri lohkoissa ei tueta"
 
 #: config/tc-h8300.c:2233 config/tc-mcore.c:2199 config/tc-microblaze.c:2294
-#: config/tc-pj.c:487 config/tc-sh.c:4468 config/tc-tic6x.c:4500
+#: config/tc-pj.c:487 config/tc-sh.c:4468 config/tc-tic6x.c:4103
 #: config/tc-xc16x.c:315
 #, c-format
 msgid "Cannot represent relocation type %s"
@@ -5311,7 +5267,7 @@ msgstr "Ei-absoluuttinen symboli: ’%s’."
 msgid "Undefined absolute constant: '%s'."
 msgstr "Määrittelemätön absoluuttinen vakio: ’%s’."
 
-#: config/tc-hppa.c:2261 config/tc-hppa.c:5717
+#: config/tc-hppa.c:2261 config/tc-hppa.c:5696
 msgid "could not update architecture and machine"
 msgstr "ei voitu päivittää arkkitehtuuria ja konetta"
 
@@ -5344,334 +5300,330 @@ msgstr "Virheellinen argumenttisijainti: %s\n"
 msgid "Invalid argument description: %d"
 msgstr "Virheellinen argumenttikuvaus: %d"
 
-#: config/tc-hppa.c:3475
+#: config/tc-hppa.c:3474
 msgid "Invalid Indexed Load Completer."
 msgstr "Virheellinen indeksoitu lataustäydentäjä."
 
-#: config/tc-hppa.c:3480
+#: config/tc-hppa.c:3479
 msgid "Invalid Indexed Load Completer Syntax."
 msgstr "Virheellinen indeksoitu lataustäydentäjäsyntaksi."
 
-#: config/tc-hppa.c:3514
+#: config/tc-hppa.c:3513
 msgid "Invalid Short Load/Store Completer."
 msgstr "Virheellinen �Short Load/Store�-täydentäjä."
 
-#: config/tc-hppa.c:3574 config/tc-hppa.c:3579
+#: config/tc-hppa.c:3573 config/tc-hppa.c:3578
 msgid "Invalid Store Bytes Short Completer"
 msgstr "Virheellinen �Store Bytes Short�-täydentäjä"
 
-#: config/tc-hppa.c:3894 config/tc-hppa.c:3900
+#: config/tc-hppa.c:3889 config/tc-hppa.c:3895
 msgid "Invalid left/right combination completer"
 msgstr "Virheellinen �vasen/oikea�-yhdistelmätäydentäjä"
 
-#: config/tc-hppa.c:3949 config/tc-hppa.c:3956
+#: config/tc-hppa.c:3944 config/tc-hppa.c:3951
 msgid "Invalid permutation completer"
 msgstr "Virheellinen permutaatiotäydentäjä"
 
-#: config/tc-hppa.c:4056
+#: config/tc-hppa.c:4057
 #, c-format
 msgid "Invalid Add Condition: %s"
 msgstr "Virheellinen �lisää�-ehto: %s"
 
-#: config/tc-hppa.c:4072 config/tc-hppa.c:4082
+#: config/tc-hppa.c:4068 config/tc-hppa.c:4078
 msgid "Invalid Add and Branch Condition"
 msgstr "Virheellinen �lisää�- ja �haarautus�-ehto"
 
-#: config/tc-hppa.c:4103 config/tc-hppa.c:4248
+#: config/tc-hppa.c:4099 config/tc-hppa.c:4236
 msgid "Invalid Compare/Subtract Condition"
 msgstr "Virheellinen �vertaa�-/�vähennä�-ehto"
 
-#: config/tc-hppa.c:4143
+#: config/tc-hppa.c:4139
 #, c-format
-msgid "Invalid Branch On Bit Condition: %c"
-msgstr "Virheellinen bittipäällä-haarautumisehto: %c"
+msgid "Invalid Bit Branch Condition: %c"
+msgstr "Virheellinen bittihaarautumisehto: %c"
 
-#: config/tc-hppa.c:4146
-msgid "Missing Branch On Bit Condition"
-msgstr "Puuttuva bittipäällä-haarautumisehto: %c"
-
-#: config/tc-hppa.c:4231
+#: config/tc-hppa.c:4224
 #, c-format
 msgid "Invalid Compare/Subtract Condition: %s"
 msgstr "Virheellinen �vertaa�-/�vähennä�-ehto: %s"
 
-#: config/tc-hppa.c:4263
+#: config/tc-hppa.c:4251
 msgid "Invalid Compare and Branch Condition"
 msgstr "Virheellinen �vertaa�- ja �haaraudu�-ehto"
 
-#: config/tc-hppa.c:4359
+#: config/tc-hppa.c:4347
 msgid "Invalid Logical Instruction Condition."
 msgstr "Virheellinen looginen käskyehto."
 
-#: config/tc-hppa.c:4421
+#: config/tc-hppa.c:4405
 msgid "Invalid Shift/Extract/Deposit Condition."
 msgstr "Virheellinen �Shift/Extract/Deposit�-ehto."
 
-#: config/tc-hppa.c:4534
+#: config/tc-hppa.c:4517
 msgid "Invalid Unit Instruction Condition."
 msgstr "Virheellinen yksikkökäskyehto."
 
-#: config/tc-hppa.c:5013 config/tc-hppa.c:5045 config/tc-hppa.c:5076
-#: config/tc-hppa.c:5106
+#: config/tc-hppa.c:4992 config/tc-hppa.c:5024 config/tc-hppa.c:5055
+#: config/tc-hppa.c:5085
 msgid "Branch to unaligned address"
 msgstr "Haarautuminen tasaamattomaan osoitteeseen"
 
-#: config/tc-hppa.c:5290
+#: config/tc-hppa.c:5269
 msgid "Invalid SFU identifier"
 msgstr "Virheellinen SFU-tunniste"
 
-#: config/tc-hppa.c:5340
+#: config/tc-hppa.c:5319
 msgid "Invalid COPR identifier"
 msgstr "Virheellinen COPR-tunniste"
 
-#: config/tc-hppa.c:5469
+#: config/tc-hppa.c:5448
 msgid "Invalid Floating Point Operand Format."
 msgstr "Virheellinen liukulukuoperandimuoto."
 
-#: config/tc-hppa.c:5586 config/tc-hppa.c:5606 config/tc-hppa.c:5626
-#: config/tc-hppa.c:5646 config/tc-hppa.c:5666
+#: config/tc-hppa.c:5565 config/tc-hppa.c:5585 config/tc-hppa.c:5605
+#: config/tc-hppa.c:5625 config/tc-hppa.c:5645
 msgid "Invalid register for single precision fmpyadd or fmpysub"
 msgstr "Virheellinen rekisteri perustarkkuudelle �fmpyadd� tai �fmpysub�"
 
-#: config/tc-hppa.c:5734
+#: config/tc-hppa.c:5713
 #, c-format
 msgid "Invalid operands %s"
 msgstr "Virheelliset operandit %s"
 
-#: config/tc-hppa.c:5744
+#: config/tc-hppa.c:5723
 #, c-format
 msgid "Immediates %d and %d will give undefined behavior."
 msgstr "välittömät arvot %d ja %d antavat määrittelemättömän käyttäytymisen."
 
-#: config/tc-hppa.c:5796 config/tc-hppa.c:7023 config/tc-hppa.c:7078
+#: config/tc-hppa.c:5775 config/tc-hppa.c:7002 config/tc-hppa.c:7057
 msgid "Missing function name for .PROC (corrupted label chain)"
 msgstr "Puuttuva funktionimi kohteelle �.PROC� (rikkinäinen nimiöketju)"
 
-#: config/tc-hppa.c:5799 config/tc-hppa.c:7081
+#: config/tc-hppa.c:5778 config/tc-hppa.c:7060
 msgid "Missing function name for .PROC"
 msgstr "Puuttuva funktionimi kohteelle �.PROC�"
 
-#: config/tc-hppa.c:5858
+#: config/tc-hppa.c:5837
 msgid "Argument to .BLOCK/.BLOCKZ must be between 0 and 0x3fffffff"
 msgstr "Argumentin kohteeseen �.BLOCK/.BLOCKZ� on oltava välillä 0...0x3fffffff"
 
-#: config/tc-hppa.c:5954
+#: config/tc-hppa.c:5933
 #, c-format
 msgid "Invalid .CALL argument: %s"
 msgstr "Virheellinen �.CALL�-argumentti: %s"
 
-#: config/tc-hppa.c:6102
+#: config/tc-hppa.c:6081
 msgid ".callinfo is not within a procedure definition"
 msgstr "�.callinfo� ei ole proseduurimäärittelyn sisällä"
 
-#: config/tc-hppa.c:6122
+#: config/tc-hppa.c:6101
 #, c-format
 msgid "FRAME parameter must be a multiple of 8: %d\n"
 msgstr "FRAME-parameterin on oltava 8:n monikerta: %d\n"
 
-#: config/tc-hppa.c:6141
+#: config/tc-hppa.c:6120
 msgid "Value for ENTRY_GR must be in the range 3..18\n"
 msgstr "Arvon kohteelle �ENTRY_GR� on oltava lukualueessa 3..18\n"
 
-#: config/tc-hppa.c:6153
+#: config/tc-hppa.c:6132
 msgid "Value for ENTRY_FR must be in the range 12..21\n"
 msgstr "Arvon kohteelle �ENTRY_FR� on oltava lukualueessa 12..21\n"
 
-#: config/tc-hppa.c:6163
+#: config/tc-hppa.c:6142
 msgid "Value for ENTRY_SR must be 3\n"
 msgstr "Arvon kohteelle �ENTRY_SR� on oltava 3\n"
 
-#: config/tc-hppa.c:6219
+#: config/tc-hppa.c:6198
 #, c-format
 msgid "Invalid .CALLINFO argument: %s"
 msgstr "Virheellinen �.CALLINFO�-argumentti: %s"
 
-#: config/tc-hppa.c:6329
+#: config/tc-hppa.c:6308
 msgid "The .ENTER pseudo-op is not supported"
 msgstr "Näennäiskäsky �.ENTER� ei ole tuettu"
 
-#: config/tc-hppa.c:6345
+#: config/tc-hppa.c:6324
 msgid "Misplaced .entry. Ignored."
 msgstr "Väärin sijoitettu �.entry�. Ei otettu huomioon."
 
-#: config/tc-hppa.c:6349
+#: config/tc-hppa.c:6328
 msgid "Missing .callinfo."
 msgstr "Puuttuva �.callinfo�."
 
-#: config/tc-hppa.c:6413
+#: config/tc-hppa.c:6392
 msgid ".REG expression must be a register"
 msgstr "�.REG�-lausekkeen on oltava rekisteri"
 
-#: config/tc-hppa.c:6429
+#: config/tc-hppa.c:6408
 msgid "bad or irreducible absolute expression; zero assumed"
 msgstr "virheellinen tai supistumaton absoluuttinen lauseke: nolla otaksuttu"
 
-#: config/tc-hppa.c:6440
+#: config/tc-hppa.c:6419
 msgid ".REG must use a label"
 msgstr "�.REG�-lausekkeen on käytettävä nimiötä"
 
-#: config/tc-hppa.c:6442
+#: config/tc-hppa.c:6421
 msgid ".EQU must use a label"
 msgstr "�.EQU�-lausekkeen on käytettävä nimiötä"
 
-#: config/tc-hppa.c:6504
+#: config/tc-hppa.c:6483
 #, c-format
 msgid "Symbol '%s' could not be created."
 msgstr "Symbolia ’%s’ ei voitu luoda."
 
-#: config/tc-hppa.c:6508
+#: config/tc-hppa.c:6487
 msgid "No memory for symbol name."
 msgstr "Ei muistia symbolinimelle."
 
-#: config/tc-hppa.c:6558
+#: config/tc-hppa.c:6537
 msgid ".EXIT must appear within a procedure"
 msgstr "�.EXIT�-lausekkeen on esiinnyttävä proseduurin sisällä"
 
-#: config/tc-hppa.c:6562
+#: config/tc-hppa.c:6541
 msgid "Missing .callinfo"
 msgstr "Puuttuva �.callinfo�"
 
-#: config/tc-hppa.c:6566
+#: config/tc-hppa.c:6545
 msgid "No .ENTRY for this .EXIT"
 msgstr "Ei �.ENTRY�-näennäiskäskyä tälle �.EXIT�-näennäiskäskylle"
 
-#: config/tc-hppa.c:6606
+#: config/tc-hppa.c:6585
 #, c-format
 msgid "Using ENTRY rather than CODE in export directive for %s"
 msgstr "Käytetään ENTRY mieluimmin kuin CODE vientidirektiivissä kohteelle %s"
 
-#: config/tc-hppa.c:6729
+#: config/tc-hppa.c:6708
 #, c-format
 msgid "Undefined .EXPORT/.IMPORT argument (ignored): %s"
 msgstr "Määrittelemätön �.EXPORT/.IMPORT�-argumentti (ei otettu huomioon): %s"
 
-#: config/tc-hppa.c:6753
+#: config/tc-hppa.c:6732
 #, c-format
 msgid "Cannot define export symbol: %s\n"
 msgstr "Ei voida määritellä vientisymbolia: %s\n"
 
-#: config/tc-hppa.c:6850
+#: config/tc-hppa.c:6829
 msgid "Missing label name on .LABEL"
 msgstr "Puuttuva nimiönimi on �.LABEL�"
 
-#: config/tc-hppa.c:6855
+#: config/tc-hppa.c:6834
 msgid "extra .LABEL arguments ignored."
 msgstr "ylimääräisiä �.LABEL�-argumentteja ei otettu huomioon."
 
-#: config/tc-hppa.c:6871
+#: config/tc-hppa.c:6850
 msgid "The .LEAVE pseudo-op is not supported"
 msgstr "Näennäiskäskyä �.LEAVE� ei ole tuettu"
 
-#: config/tc-hppa.c:6909
+#: config/tc-hppa.c:6888
 msgid "Unrecognized .LEVEL argument\n"
 msgstr "Tunnistamaton �.LEVEL�-argumentti\n"
 
-#: config/tc-hppa.c:6943
+#: config/tc-hppa.c:6922
 #, c-format
 msgid "Cannot define static symbol: %s\n"
 msgstr "Ei voida määritellä staattista symbolia: %s\n"
 
-#: config/tc-hppa.c:6977
+#: config/tc-hppa.c:6956
 msgid "Nested procedures"
 msgstr "Sisäkkäisiä proseduureja"
 
-#: config/tc-hppa.c:6987
+#: config/tc-hppa.c:6966
 msgid "Cannot allocate unwind descriptor\n"
 msgstr "Ei voida varata unwind-kuvaajaa\n"
 
-#: config/tc-hppa.c:7085
+#: config/tc-hppa.c:7064
 msgid "misplaced .procend"
 msgstr "väärin sijoitettu �.procend�"
 
-#: config/tc-hppa.c:7088
+#: config/tc-hppa.c:7067
 msgid "Missing .callinfo for this procedure"
 msgstr "Puuttuva �.callinfo� tälle proseduurille"
 
-#: config/tc-hppa.c:7091
+#: config/tc-hppa.c:7070
 msgid "Missing .EXIT for a .ENTRY"
 msgstr "Puuttuva �.EXIT�-lauseke kohteelle �.ENTRY�"
 
-#: config/tc-hppa.c:7128
+#: config/tc-hppa.c:7107
 msgid "Not in a space.\n"
 msgstr "Ei ole tilassa.\n"
 
-#: config/tc-hppa.c:7131
+#: config/tc-hppa.c:7110
 msgid "Not in a subspace.\n"
 msgstr "Ei ole alitilassa.\n"
 
-#: config/tc-hppa.c:7220
+#: config/tc-hppa.c:7199
 msgid "Invalid .SPACE argument"
 msgstr "Virheellinen �.SPACE�-argumentti"
 
-#: config/tc-hppa.c:7266
+#: config/tc-hppa.c:7245
 msgid "Can't change spaces within a procedure definition. Ignored"
 msgstr "Ei voida muuttaa tiloja proseduurimäärittelyn sisällä. Ei otettu huomioon"
 
-#: config/tc-hppa.c:7394
+#: config/tc-hppa.c:7373
 #, c-format
 msgid "Undefined space: '%s' Assuming space number = 0."
 msgstr "Määrittelemätön tila: ’%s’ Otaksutaan, että tilanumero = 0."
 
-#: config/tc-hppa.c:7417
+#: config/tc-hppa.c:7396
 msgid "Must be in a space before changing or declaring subspaces.\n"
 msgstr "Täytyy olla tilassa ennen kuin muutetaan tai esitellään alitilat.\n"
 
-#: config/tc-hppa.c:7421
+#: config/tc-hppa.c:7400
 msgid "Can't change subspaces within a procedure definition. Ignored"
 msgstr "Ei voida muuttaa alitiloja proseduurimäärittelyn sisällä. Ei otettu huomioon"
 
-#: config/tc-hppa.c:7457
+#: config/tc-hppa.c:7436
 msgid "Parameters of an existing subspace can't be modified"
 msgstr "Olemassa olevan alitilan parametrejä ei voi muokata"
 
-#: config/tc-hppa.c:7509
+#: config/tc-hppa.c:7488
 msgid "Alignment must be a power of 2"
 msgstr "Tasauksen on oltava 2:n potenssi"
 
-#: config/tc-hppa.c:7556
+#: config/tc-hppa.c:7535
 msgid "FIRST not supported as a .SUBSPACE argument"
 msgstr "�FIRST� ei ole tuettu �.SUBSPACE�-argumenttina"
 
-#: config/tc-hppa.c:7558
+#: config/tc-hppa.c:7537
 msgid "Invalid .SUBSPACE argument"
 msgstr "Virheellinen �.SUBSPACE�-argumentti"
 
-#: config/tc-hppa.c:7747
+#: config/tc-hppa.c:7726
 #, c-format
 msgid "Internal error: Unable to find containing space for %s."
 msgstr "Sisäinen virhe: Ei löydy tilaa kohteelle %s."
 
-#: config/tc-hppa.c:7785
+#: config/tc-hppa.c:7764
 #, c-format
 msgid "Out of memory: could not allocate new space chain entry: %s\n"
 msgstr "Muisti loppui: ei voitu varata uutta tilaketjutulokohtaa: %s\n"
 
-#: config/tc-hppa.c:7873
+#: config/tc-hppa.c:7852
 #, c-format
 msgid "Out of memory: could not allocate new subspace chain entry: %s\n"
 msgstr "Muisti loppui: ei voitu varata uutta alitilaketjutulokohtaa: %s\n"
 
-#: config/tc-hppa.c:8318
+#: config/tc-hppa.c:8297
 msgid "-R option not supported on this target."
 msgstr "�-R�-valitsinta ei ole tuettu tässä kohteessa."
 
-#: config/tc-hppa.c:8335 config/tc-sparc.c:815 config/tc-sparc.c:852
+#: config/tc-hppa.c:8314 config/tc-sparc.c:815 config/tc-sparc.c:852
 #, c-format
 msgid "Internal error: can't hash `%s': %s\n"
 msgstr "Sisäinen virhe: ei voi sekasummata �%s�: %s\n"
 
-#: config/tc-hppa.c:8344 config/tc-i860.c:236
+#: config/tc-hppa.c:8323 config/tc-i860.c:236
 #, c-format
 msgid "internal error: losing opcode: `%s' \"%s\"\n"
 msgstr "sisäinen virhe: kadotetaan käskykoodi: �%s� �%s�\n"
 
-#: config/tc-i370.c:419 config/tc-ppc.c:1185 config/tc-s390.c:420
-#: config/tc-s390.c:427
+#: config/tc-i370.c:419 config/tc-ppc.c:1155 config/tc-s390.c:406
+#: config/tc-s390.c:413
 #, c-format
 msgid "invalid switch -m%s"
 msgstr "virheellinen kytkin -m%s"
 
-#: config/tc-i370.c:516 config/tc-s390.c:507
+#: config/tc-i370.c:516 config/tc-s390.c:515
 #, c-format
 msgid "Internal assembler error for instruction %s"
 msgstr "Sisäinen assembler-virhe käskylle %s"
@@ -5681,11 +5633,11 @@ msgstr "Sisäinen assembler-virhe käskylle %s"
 msgid "Internal assembler error for macro %s"
 msgstr "Sisäinen assembler-virhe makrolle %s"
 
-#: config/tc-i370.c:630 config/tc-ppc.c:1893
+#: config/tc-i370.c:630 config/tc-ppc.c:1862
 msgid "identifier+constant@got means identifier@got+constant"
 msgstr "tunniste+vakio@got on sama kuin tunniste@got+vakio"
 
-#: config/tc-i370.c:684 config/tc-m68k.c:8077 config/tc-ppc.c:1982
+#: config/tc-i370.c:684 config/tc-m68k.c:8077 config/tc-ppc.c:1951
 #, c-format
 msgid "%s relocations do not fit in %d bytes\n"
 msgstr "%s-sijoitukset eivät sovi %d tavuun\n"
@@ -5708,28 +5660,28 @@ msgid "this DS form not yet supported"
 msgstr "tätä DS-muotoa ei ole vielä tuettu"
 
 #: config/tc-i370.c:1046 config/tc-m32r.c:1493 config/tc-microblaze.c:177
-#: config/tc-ppc.c:2047 config/tc-ppc.c:4884
+#: config/tc-ppc.c:2016 config/tc-ppc.c:4674
 msgid "Expected comma after symbol-name: rest of line ignored."
 msgstr "Odotettiin pilkkua symbolinimen jälkeen: rivin loppua ei otettu huomioon."
 
 #: config/tc-i370.c:1069 config/tc-m32r.c:1517 config/tc-microblaze.c:199
-#: config/tc-ppc.c:2069 config/tc-ppc.c:3272 config/tc-ppc.c:4908
+#: config/tc-ppc.c:2038 config/tc-ppc.c:3241 config/tc-ppc.c:4698
 msgid "ignoring bad alignment"
 msgstr "ei oteta huomioon virheellistä tasausta"
 
 #: config/tc-i370.c:1080 config/tc-m32r.c:1544 config/tc-microblaze.c:210
-#: config/tc-ppc.c:2080 config/tc-ppc.c:4920
+#: config/tc-ppc.c:2049 config/tc-ppc.c:4710
 #, c-format
 msgid "Ignoring attempt to re-define symbol `%s'."
 msgstr "Ohitettiin yritys määritellä uudelleen symboli �%s�."
 
-#: config/tc-i370.c:1088 config/tc-microblaze.c:218 config/tc-ppc.c:2088
+#: config/tc-i370.c:1088 config/tc-microblaze.c:218 config/tc-ppc.c:2057
 #, c-format
 msgid "Length of .lcomm \"%s\" is already %ld. Not changed to %ld."
 msgstr "Näennäiskäskyn .lcomm �%s� pituus on jo %ld. Ei vaihdettu kokoon %ld."
 
 #: config/tc-i370.c:1107 config/tc-m32r.c:1529 config/tc-microblaze.c:234
-#: config/tc-ppc.c:2106 config/tc-v850.c:375
+#: config/tc-ppc.c:2075 config/tc-v850.c:375
 msgid "Common alignment not a power of 2"
 msgstr "Yhteistasaus ei ole 2:n potenssi"
 
@@ -5782,12 +5734,12 @@ msgstr "jätösrekisteri %d lohkossa %s ei täsmää käytettävään rekisterii
 msgid "droping register %d in section %s previously used in section %s"
 msgstr "jätösrekisteriä %d lohkossa %s aikaisemmin käytetty lohkossa %s"
 
-#: config/tc-i370.c:1847 config/tc-ppc.c:3109
+#: config/tc-i370.c:1847 config/tc-ppc.c:3078
 msgid "wrong number of operands"
 msgstr "väärä operandien lukumäärä"
 
 #: config/tc-i370.c:1928 config/tc-mn10200.c:898 config/tc-mn10300.c:1251
-#: config/tc-ppc.c:2405 config/tc-s390.c:1590 config/tc-v850.c:2024
+#: config/tc-ppc.c:2374 config/tc-s390.c:1549 config/tc-v850.c:2024
 #, c-format
 msgid "Unrecognized opcode: `%s'"
 msgstr "Tunnistamaton käskykoodi: ’%s’"
@@ -5806,525 +5758,512 @@ msgstr "odotettiin rekisteriä operandille %d"
 msgid "Internal Error: bad instruction length"
 msgstr "Sisäinen virhe: väärä käskypituus"
 
-#: config/tc-i386.c:1873
+#: config/tc-i386.c:1848
 #, c-format
 msgid "%s shortened to %s"
 msgstr "%s lyhennetty kohteeseen %s"
 
-#: config/tc-i386.c:1959
+#: config/tc-i386.c:1934
 msgid "same type of prefix used twice"
 msgstr "samaa etuliitetyyppiä käytetty kahdesti"
 
-#: config/tc-i386.c:1986
+#: config/tc-i386.c:1961
 #, c-format
 msgid "64bit mode not supported on `%s'."
 msgstr "64-bittitila ei ole tuettu kohteella �%s�."
 
-#: config/tc-i386.c:1995
+#: config/tc-i386.c:1970
 #, c-format
 msgid "32bit mode not supported on `%s'."
 msgstr "32-bittitila ei ole tuettu kohteella �%s�."
 
-#: config/tc-i386.c:2035
+#: config/tc-i386.c:2010
 msgid "bad argument to syntax directive."
 msgstr "virheellinen argumentti syntaksidirektiiviin."
 
-#: config/tc-i386.c:2084
+#: config/tc-i386.c:2059
 msgid "bad argument to sse_check directive."
 msgstr "väärä argumentti sse_check-direktiiviin."
 
-#: config/tc-i386.c:2088
+#: config/tc-i386.c:2063
 msgid "missing argument for sse_check directive"
 msgstr "puuttuva argumentti sse_check-direktiiville"
 
-#: config/tc-i386.c:2118
+#: config/tc-i386.c:2093
 #, c-format
 msgid "`%s' is not supported on `%s'"
 msgstr "�%s� ei ole tuettu kohteella �%s�"
 
-#: config/tc-i386.c:2192
+#: config/tc-i386.c:2166
 #, c-format
 msgid "no such architecture: `%s'"
 msgstr "tuntematon arkkitehtuuri: �%s�"
 
-#: config/tc-i386.c:2197
+#: config/tc-i386.c:2171
 msgid "missing cpu architecture"
 msgstr "puuttuva prosessoriarkkitehtuuri"
 
-#: config/tc-i386.c:2211
+#: config/tc-i386.c:2185
 #, c-format
 msgid "no such architecture modifier: `%s'"
 msgstr "tuntematon arkkitehtuurimäärite: �%s�"
 
-#: config/tc-i386.c:2226 config/tc-i386.c:2242
+#: config/tc-i386.c:2200 config/tc-i386.c:2215
 msgid "Intel L1OM is 64bit ELF only"
 msgstr "Intel L1OM on ainoastaan 64-bittinen ELF-muoto"
 
-#: config/tc-i386.c:2253 config/tc-i386.c:8600
-msgid "unknown architecture"
-msgstr "tuntematon arkkitehtuuri"
-
-#: config/tc-i386.c:2287 config/tc-i386.c:2309
-#, c-format
-msgid "internal Error:  Can't hash %s: %s"
-msgstr "sisäinen virhe:  Ei voida sekasummata ’%s’-rekisteriä: %s"
+#: config/tc-i386.c:2224 config/tc-i386.c:8494
+msgid "Unknown architecture"
+msgstr "Tuntematon arkkitehtuuri"
 
-#: config/tc-i386.c:2604
+#: config/tc-i386.c:2570
 #, c-format
 msgid "unknown relocation (%u)"
 msgstr "tuntematon sijoitus (%u)"
 
-#: config/tc-i386.c:2606
+#: config/tc-i386.c:2572
 #, c-format
 msgid "%u-byte relocation cannot be applied to %u-byte field"
 msgstr "%u-tavun sijoitusta ei voida soveltaa %u-tavukenttään"
 
-#: config/tc-i386.c:2610
+#: config/tc-i386.c:2576
 msgid "non-pc-relative relocation for pc-relative field"
 msgstr "ei-ohjelmalaskurisuhteellinen sijoitus ohjelmalaskurisuhteelliselle kentälle"
 
-#: config/tc-i386.c:2615
+#: config/tc-i386.c:2581
 msgid "relocated field and relocation type differ in signedness"
 msgstr "sijoituskentässä ja sijoitustyyppissä on erilainen etumerkillisyys"
 
-#: config/tc-i386.c:2624
+#: config/tc-i386.c:2590
 msgid "there are no unsigned pc-relative relocations"
 msgstr "ei ole etumerkittömiä ohjelmalaskurisuhteellisia sijoituksia"
 
-#: config/tc-i386.c:2632
+#: config/tc-i386.c:2598
 #, c-format
 msgid "cannot do %u byte pc-relative relocation"
 msgstr "ei voi tehdä %u-tavuista ohjelmalaskurisuhteellista sijoitusta"
 
-#: config/tc-i386.c:2649
+#: config/tc-i386.c:2615
 #, c-format
 msgid "cannot do %s %u byte relocation"
 msgstr "ei voi tehdä %s %u-tavuista sijoitusta"
 
-#: config/tc-i386.c:2933
+#: config/tc-i386.c:2899
 #, c-format
 msgid "can't use register '%s%s' as operand %d in '%s'."
 msgstr "ei voi käyttää rekisteriä ’%s%s’ operandina %d kohteessa ’%s’."
 
-#: config/tc-i386.c:3045
+#: config/tc-i386.c:3011
 #, c-format
 msgid "SSE instruction `%s' is used"
 msgstr "SSE-käsky �%s� käytetään"
 
-#: config/tc-i386.c:3059 config/tc-i386.c:4489
+#: config/tc-i386.c:3025 config/tc-i386.c:4455
 #, c-format
 msgid "ambiguous operand size for `%s'"
 msgstr "monimerkityksellinen operandikoko kohteelle �%s�"
 
-#: config/tc-i386.c:3076
+#: config/tc-i386.c:3042
 msgid "expecting lockable instruction after `lock'"
 msgstr "odotettiin lukittavaa käskyä �lock�:n jälkeen"
 
 #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
-#: config/tc-i386.c:3127
+#: config/tc-i386.c:3093
 #, c-format
 msgid "translating to `%sp'"
 msgstr "käännetään kohteeksi �%sp�"
 
-#: config/tc-i386.c:3182
+#: config/tc-i386.c:3148
 #, c-format
 msgid "can't encode register '%s%s' in an instruction requiring REX prefix."
 msgstr "ei voi koodata rekisteriä ’%s%s’ käskyssä, joka vaatii REX-etuliitteen."
 
-#: config/tc-i386.c:3225 config/tc-i386.c:3357
+#: config/tc-i386.c:3191 config/tc-i386.c:3323
 #, c-format
 msgid "no such instruction: `%s'"
 msgstr "tuntematon käsky: �%s�"
 
-#: config/tc-i386.c:3236 config/tc-i386.c:3390
+#: config/tc-i386.c:3202 config/tc-i386.c:3356
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr "virheellinen merkki %s muistikkaassa"
 
-#: config/tc-i386.c:3243
+#: config/tc-i386.c:3209
 msgid "expecting prefix; got nothing"
 msgstr "odotettiin etuliitettä: ei saatu mitään"
 
-#: config/tc-i386.c:3245
+#: config/tc-i386.c:3211
 msgid "expecting mnemonic; got nothing"
 msgstr "odotettiin muistikasta: ei saatu mitään"
 
-#: config/tc-i386.c:3260 config/tc-i386.c:3408
+#: config/tc-i386.c:3226 config/tc-i386.c:3374
 #, c-format
 msgid "`%s' is only supported in 64-bit mode"
 msgstr "�%s� on tuettu vain 64-bittitilassa"
 
-#: config/tc-i386.c:3261 config/tc-i386.c:3407
+#: config/tc-i386.c:3227 config/tc-i386.c:3373
 #, c-format
 msgid "`%s' is not supported in 64-bit mode"
 msgstr "�%s� ei ole tuettu 64-bittitilassa"
 
-#: config/tc-i386.c:3273
+#: config/tc-i386.c:3239
 #, c-format
 msgid "redundant %s prefix"
 msgstr "redundantti %s-etuliite"
 
-#: config/tc-i386.c:3414
+#: config/tc-i386.c:3380
 #, c-format
 msgid "`%s' is not supported on `%s%s'"
 msgstr "�%s� ei ole tuettu kohteella �%s%s�"
 
-#: config/tc-i386.c:3425
+#: config/tc-i386.c:3391
 msgid "use .code16 to ensure correct addressing mode"
 msgstr "käytä �.code16� takaamaan oikea osoitteenmuodostustila"
 
-#: config/tc-i386.c:3438
+#: config/tc-i386.c:3404
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr "odotettiin merkkijonokäskyä �%s�:n jälkeen"
 
-#: config/tc-i386.c:3470
+#: config/tc-i386.c:3436
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr "virheellinen merkki %s ennen operandia %d"
 
-#: config/tc-i386.c:3484
+#: config/tc-i386.c:3450
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr "päättämätön sulkumerkki operandissa %d."
 
-#: config/tc-i386.c:3487
+#: config/tc-i386.c:3453
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr "päättämättömät lainausmerkit operandissa %d."
 
-#: config/tc-i386.c:3496
+#: config/tc-i386.c:3462
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr "virheellinen merkki %s operandissa %d"
 
-#: config/tc-i386.c:3524
+#: config/tc-i386.c:3490
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr "vääriä operandeja: (enintään %d operandia/käsky)"
 
-#: config/tc-i386.c:3547
+#: config/tc-i386.c:3513
 msgid "expecting operand after ','; got nothing"
 msgstr "odotettiin operandia ’,’-merkin jälkeen: ei saatu mitään"
 
-#: config/tc-i386.c:3552
+#: config/tc-i386.c:3518
 msgid "expecting operand before ','; got nothing"
 msgstr "odotettiin operandia ennen ’,’-merkkiä: ei saatu mitään"
 
-#: config/tc-i386.c:4190
+#: config/tc-i386.c:4156
 msgid "operand size mismatch"
 msgstr "operandikokotäsmäämättömyys"
 
-#: config/tc-i386.c:4193
+#: config/tc-i386.c:4159
 msgid "operand type mismatch"
 msgstr "operandityyppitäsmäämättömyys"
 
-#: config/tc-i386.c:4196
+#: config/tc-i386.c:4162
 msgid "register type mismatch"
 msgstr "rekisterityyppitäsmäämättömyys"
 
-#: config/tc-i386.c:4199
+#: config/tc-i386.c:4165
 msgid "number of operands mismatch"
 msgstr "operandien lukumäärän täsmäämättömyys"
 
-#: config/tc-i386.c:4202
+#: config/tc-i386.c:4168
 msgid "invalid instruction suffix"
 msgstr "virheellinen käskyloppuliite"
 
-#: config/tc-i386.c:4205
+#: config/tc-i386.c:4171
 msgid "Imm4 isn't the first operand"
 msgstr "Imm4 ei ole ensimmäinen operandi"
 
-#: config/tc-i386.c:4208
+#: config/tc-i386.c:4174
 msgid "only supported with old gcc"
 msgstr "tuetaan vain vanhalla gcc-versiolla"
 
-#: config/tc-i386.c:4211
+#: config/tc-i386.c:4177
 msgid "unsupported with Intel mnemonic"
 msgstr "tukematon Intel-muistikas"
 
-#: config/tc-i386.c:4214
+#: config/tc-i386.c:4180
 msgid "unsupported syntax"
 msgstr "tukematon syntaksi"
 
-#: config/tc-i386.c:4217
+#: config/tc-i386.c:4183
 msgid "unsupported"
 msgstr "tukematon"
 
-#: config/tc-i386.c:4220
+#: config/tc-i386.c:4186
 #, c-format
 msgid "%s for `%s'"
 msgstr "%s kohteelle �%s�"
 
-#: config/tc-i386.c:4231
+#: config/tc-i386.c:4197
 #, c-format
 msgid "indirect %s without `*'"
 msgstr "epäsuora %s ilman �*�"
 
 #. Warn them that a data or address size prefix doesn't
 #. affect assembly of the next line of code.
-#: config/tc-i386.c:4239
+#: config/tc-i386.c:4205
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr "erillinen �%s�-etuliite"
 
-#: config/tc-i386.c:4273 config/tc-i386.c:4289
+#: config/tc-i386.c:4239 config/tc-i386.c:4255
 #, c-format
 msgid "`%s' operand %d must use `%ses' segment"
 msgstr "�%s�-operandin %d on käytettävä �%ses�-segmenttiä"
 
 #. We have to know the operand size for crc32.
-#: config/tc-i386.c:4343
+#: config/tc-i386.c:4309
 #, c-format
 msgid "ambiguous memory operand size for `%s`"
 msgstr "monimerkityksellinen muistioperandikoko kohteelle �%s�"
 
-#: config/tc-i386.c:4462
+#: config/tc-i386.c:4428
 msgid "no instruction mnemonic suffix given and no register operands; can't size instruction"
 msgstr "ei annettu käskymuistikasloppuliitettä eikä rekisterioperandia: käskyn kokoa ei voi määritellä"
 
-#: config/tc-i386.c:4599 config/tc-i386.c:4674 config/tc-i386.c:4703
-#: config/tc-i386.c:4749 config/tc-i386.c:4787
+#: config/tc-i386.c:4565 config/tc-i386.c:4640 config/tc-i386.c:4669
+#: config/tc-i386.c:4715 config/tc-i386.c:4753
 #, c-format
-msgid "incorrect register `%s%s' used with `%c' suffix"
-msgstr "virheellinen rekisteri �%s%s� käytetty �%c�-loppuliitteen kanssa"
+msgid "Incorrect register `%s%s' used with `%c' suffix"
+msgstr "Virheellinen rekisteri �%s%s� käytetty �%c�-loppuliitteen kanssa"
 
-#: config/tc-i386.c:4607 config/tc-i386.c:4681 config/tc-i386.c:4794
+#: config/tc-i386.c:4573 config/tc-i386.c:4647 config/tc-i386.c:4760
 #, c-format
 msgid "using `%s%s' instead of `%s%s' due to `%c' suffix"
 msgstr "käytetään �%s%s� eikä �%s%s� koska loppuliitteenä on �%c�"
 
-#: config/tc-i386.c:4633 config/tc-i386.c:4657 config/tc-i386.c:4725
-#: config/tc-i386.c:4770
+#: config/tc-i386.c:4599 config/tc-i386.c:4623 config/tc-i386.c:4691
+#: config/tc-i386.c:4736
 #, c-format
 msgid "`%s%s' not allowed with `%s%c'"
 msgstr "�%s%s� ei ole sallittu �%s%c�:n kanssa"
 
-#: config/tc-i386.c:4859
+#: config/tc-i386.c:4825
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr "ei ole annettu käskymuistikasloppuliitettä: ei voi määritellä välitöntä kokoa"
 
-#: config/tc-i386.c:4895
+#: config/tc-i386.c:4861
 #, c-format
 msgid "the last operand of `%s' must be `%s%s'"
 msgstr "kohteen �%s� viimeisimmän operandin on oltava �%s%s�"
 
-#: config/tc-i386.c:4898
+#: config/tc-i386.c:4864
 #, c-format
 msgid "the first operand of `%s' must be `%s%s'"
 msgstr "kohteen �%s� ensimmäisen operandin on oltava �%s%s�"
 
-#: config/tc-i386.c:5046
+#: config/tc-i386.c:5012
 #, c-format
 msgid "you can't `pop %scs'"
 msgstr "et voi käyttää �pop %scs�-käskyä"
 
 #. Reversed arguments on faddp, fsubp, etc.
-#: config/tc-i386.c:5075
+#: config/tc-i386.c:5041
 #, c-format
 msgid "translating to `%s %s%s,%s%s'"
 msgstr "käännetään käskyksi �%s %s%s,%s%s�"
 
 #. Extraneous `l' suffix on fp insn.
-#: config/tc-i386.c:5082
+#: config/tc-i386.c:5048
 #, c-format
 msgid "translating to `%s %s%s'"
 msgstr "käännetään käskyksi �%s %s%s�"
 
-#: config/tc-i386.c:5110
+#: config/tc-i386.c:5076
 #, c-format
 msgid "segment override on `%s' is ineffectual"
 msgstr "segmentin korvaus käskyssä �%s� on tehoton"
 
-#: config/tc-i386.c:5807 config/tc-i386.c:5901 config/tc-i386.c:5946
+#: config/tc-i386.c:5734 config/tc-i386.c:5828 config/tc-i386.c:5873
 msgid "skipping prefixes on this instruction"
 msgstr "hypätään etuliitteiden ylitse tässä käskyssä"
 
-#: config/tc-i386.c:5966
+#: config/tc-i386.c:5893
 msgid "16-bit jump out of range"
 msgstr "16-bittinen hyppy lukualueen ulkopuolella"
 
-#: config/tc-i386.c:5975
+#: config/tc-i386.c:5902
 #, c-format
 msgid "can't handle non absolute segment in `%s'"
 msgstr "ei voi käsitellä ei-absoluuttista segmenttiä käskyssä �%s�"
 
-#: config/tc-i386.c:6555
+#: config/tc-i386.c:6482
 #, c-format
 msgid "@%s reloc is not supported with %d-bit output format"
 msgstr "@%s reloc-tietue ei ole tuettu %d-bittisessä tulostemuodossa"
 
-#: config/tc-i386.c:6603
+#: config/tc-i386.c:6529
 #, c-format
 msgid "missing or invalid expression `%s'"
 msgstr "puuttuva tai virheellinen lauseke �%s�"
 
-#: config/tc-i386.c:6661
+#: config/tc-i386.c:6588
 #, c-format
 msgid "at most %d immediate operands are allowed"
 msgstr "enintään %d välitöntä operandia on sallittu"
 
-#: config/tc-i386.c:6683 config/tc-i386.c:6930
+#: config/tc-i386.c:6610 config/tc-i386.c:6857
 #, c-format
 msgid "junk `%s' after expression"
 msgstr "roskaa �%s� lausekkeen jälkeen"
 
-#: config/tc-i386.c:6704
+#: config/tc-i386.c:6631
 #, c-format
 msgid "missing or invalid immediate expression `%s'"
 msgstr "puuttuva tai virheellinen välitöntä lauseke �%s�"
 
-#: config/tc-i386.c:6727 config/tc-i386.c:7020
+#: config/tc-i386.c:6654 config/tc-i386.c:6947
 #, c-format
 msgid "unimplemented segment %s in operand"
 msgstr "toteuttamaton lohko %s operandissa"
 
-#: config/tc-i386.c:6734
+#: config/tc-i386.c:6661
 #, c-format
 msgid "illegal immediate register operand %s"
 msgstr "luvaton välitön rekisterioperandi %s"
 
-#: config/tc-i386.c:6782
+#: config/tc-i386.c:6709
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr "odotettiin skaalaustekijää 1, 2, 4, tai 8: saatiin �%s�"
 
-#: config/tc-i386.c:6791
+#: config/tc-i386.c:6718
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr "skaalaustekijä: %d ilman indeksirekisteriä"
 
-#: config/tc-i386.c:6813
+#: config/tc-i386.c:6740
 #, c-format
 msgid "at most %d displacement operands are allowed"
 msgstr "enintään %d siirtymäoperandia on sallittu"
 
-#: config/tc-i386.c:6986
+#: config/tc-i386.c:6913
 #, c-format
 msgid "missing or invalid displacement expression `%s'"
 msgstr "puuttuva tai virheellinen siirtymälauseke �%s�"
 
-#: config/tc-i386.c:7003
+#: config/tc-i386.c:6930
 #, c-format
 msgid "0x%lx out range of signed 32bit displacement"
 msgstr "0x%lx on etumerkillisen 32-bittisen siirtymän lukualueen ulkopuolella"
 
-#: config/tc-i386.c:7107
+#: config/tc-i386.c:7034
 #, c-format
 msgid "`%s' is not valid here (expected `%c%s%s%c')"
 msgstr "�%s� ei ole tässä voimassa oleva (odotettiin �%c%s%s%c�)"
 
-#: config/tc-i386.c:7187
+#: config/tc-i386.c:7114
 #, c-format
 msgid "`%s' is not a valid %s expression"
 msgstr "�%s� ei ole voimassa oleva �%s�-lauseke"
 
-#: config/tc-i386.c:7192
+#: config/tc-i386.c:7119
 #, c-format
 msgid "`%s' is not a valid %s-bit %s expression"
 msgstr "�%s� ei ole voimassa oleva %s-bittinen �%s�-lauseke"
 
-#: config/tc-i386.c:7273
+#: config/tc-i386.c:7200
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr "virheellinen muistioperandi �%s�"
 
-#: config/tc-i386.c:7288
+#: config/tc-i386.c:7215
 #, c-format
 msgid "junk `%s' after register"
 msgstr "roskaa �%s� rekisterin jälkeen"
 
-#: config/tc-i386.c:7301 config/tc-i386.c:7417 config/tc-i386.c:7458
+#: config/tc-i386.c:7228 config/tc-i386.c:7344 config/tc-i386.c:7385
 #, c-format
 msgid "bad register name `%s'"
 msgstr "virheellinen rekisterinimi �%s�"
 
-#: config/tc-i386.c:7309
+#: config/tc-i386.c:7236
 msgid "immediate operand illegal with absolute jump"
 msgstr "välitön operandi absoluuttisella hypyllä on luvaton"
 
-#: config/tc-i386.c:7331
+#: config/tc-i386.c:7258
 #, c-format
 msgid "too many memory references for `%s'"
 msgstr "liian monta muistiviittausta mallinteeseen �%s�"
 
-#: config/tc-i386.c:7409
+#: config/tc-i386.c:7336
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr "odotettiin �,� tai �)� indeksirekisterin jälkeen operandissa �%s�"
 
-#: config/tc-i386.c:7434
+#: config/tc-i386.c:7361
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr "odotettiin �)� skaalaustekijän jälkeen operandissa �%s�"
 
-#: config/tc-i386.c:7442
+#: config/tc-i386.c:7369
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr "odotettiin indeksirekisteriä tai skaalaustekijää �,�:n jälkeen: saatiin ’%c’"
 
-#: config/tc-i386.c:7450
+#: config/tc-i386.c:7377
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr "odotettiin �,� tai �)� perusrekisterin jälkeen operandissa �%s�"
 
 #. It's not a memory operand; argh!
-#: config/tc-i386.c:7494
+#: config/tc-i386.c:7421
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr "virheellinen char-tyyppinen %s aloitusoperandi %d �%s�"
 
-#: config/tc-i386.c:7676
+#: config/tc-i386.c:7603
 msgid "long jump required"
 msgstr "pitkä hyppy vaadittu"
 
-#: config/tc-i386.c:7731
+#: config/tc-i386.c:7658
 msgid "jump target out of range"
 msgstr "hyppykohde lukualueen ulkopuolella"
 
-#: config/tc-i386.c:8249
-msgid "no compiled in support for x86_64"
-msgstr "ei ole käännetty x86_64-tuessa"
-
-#: config/tc-i386.c:8269
-msgid "no compiled in support for 32bit x86_64"
-msgstr "ei ole käännetty 32-bittiselle x86_64-tuelle"
-
-#: config/tc-i386.c:8273
-msgid "32bit x86_64 is only supported for ELF"
-msgstr "32-bittinen x86_64 on tuettu vain ELF-muodolle"
+#: config/tc-i386.c:8172
+msgid "No compiled in support for x86_64"
+msgstr "Ei ole käännetty x86_64-tuessa"
 
-#: config/tc-i386.c:8303 config/tc-i386.c:8359
+#: config/tc-i386.c:8204 config/tc-i386.c:8259
 #, c-format
-msgid "invalid -march= option: `%s'"
-msgstr "virheellinen �-march=�-valitsin: �%s�"
+msgid "Invalid -march= option: `%s'"
+msgstr "Virheellinen �-march=�-valitsin: �%s�"
 
-#: config/tc-i386.c:8368 config/tc-i386.c:8380
+#: config/tc-i386.c:8268 config/tc-i386.c:8280
 #, c-format
-msgid "invalid -mtune= option: `%s'"
-msgstr "virheellinen �-mtune=�-valitsin: �%s�"
+msgid "Invalid -mtune= option: `%s'"
+msgstr "Virheellinen �-mtune=�-valitsin: �%s�"
 
-#: config/tc-i386.c:8389
+#: config/tc-i386.c:8289
 #, c-format
-msgid "invalid -mmnemonic= option: `%s'"
-msgstr "virheellinen �-mmnemonic=�-valitsin: �%s�"
+msgid "Invalid -mmnemonic= option: `%s'"
+msgstr "Virheellinen �-mmnemonic=�-valitsin: �%s�"
 
-#: config/tc-i386.c:8398
+#: config/tc-i386.c:8298
 #, c-format
-msgid "invalid -msyntax= option: `%s'"
-msgstr "virheellinen �-msyntax=�-valitsin: �%s�"
+msgid "Invalid -msyntax= option: `%s'"
+msgstr "Virheellinen �-msyntax=�-valitsin: �%s�"
 
-#: config/tc-i386.c:8425
+#: config/tc-i386.c:8325
 #, c-format
-msgid "invalid -msse-check= option: `%s'"
-msgstr "virheellinen �-msse-check=�-valitsin: �%s�"
+msgid "Invalid -msse-check= option: `%s'"
+msgstr "Virheellinen �-msse-check=�-valitsin: �%s�"
 
-#: config/tc-i386.c:8434
+#: config/tc-i386.c:8334
 #, c-format
-msgid "invalid -mavxscalar= option: `%s'"
-msgstr "virheellinen �-mavxscalar=�-valitsin: �%s�"
+msgid "Invalid -mavxscalar= option: `%s'"
+msgstr "Virheellinen �-mavxscalar=�-valitsin: �%s�"
 
-#: config/tc-i386.c:8526
+#: config/tc-i386.c:8426
 #, c-format
 msgid ""
 "  -Q                      ignored\n"
@@ -6335,7 +6274,7 @@ msgstr ""
 "  -V                      tulosta assemblerin versionumero\n"
 "  -k                      ei otettu huomioon\n"
 
-#: config/tc-i386.c:8531
+#: config/tc-i386.c:8431
 #, c-format
 msgid ""
 "  -n                      Do not optimize code alignment\n"
@@ -6344,27 +6283,27 @@ msgstr ""
 "  -n                      Älä optimoi kooditasausta\n"
 "  -q                      hiljennä joitain varoituksia\n"
 
-#: config/tc-i386.c:8535
+#: config/tc-i386.c:8435
 #, c-format
 msgid "  -s                      ignored\n"
 msgstr "  -s                      ei otettu huomioon\n"
 
-#: config/tc-i386.c:8540
+#: config/tc-i386.c:8440
 #, c-format
-msgid "  --32/--64/--x32         generate 32bit/64bit/x32 code\n"
-msgstr "  --32/--64/--x32         tuottaa 32-bittisen/64-bittisen/x32 -koodin\n"
+msgid "  --32/--64               generate 32bit/64bit code\n"
+msgstr "  --32/--64               tuottaa 32-bittisen tai 64-bittisen koodin\n"
 
-#: config/tc-i386.c:8544
+#: config/tc-i386.c:8444
 #, c-format
 msgid "  --divide                do not treat `/' as a comment character\n"
 msgstr "  --divide                ei käsittele �/�-merkkiä kommenttimerkkinä\n"
 
-#: config/tc-i386.c:8547
+#: config/tc-i386.c:8447
 #, c-format
 msgid "  --divide                ignored\n"
 msgstr "  --divide                ei otettu huomioon\n"
 
-#: config/tc-i386.c:8550
+#: config/tc-i386.c:8450
 #, c-format
 msgid ""
 "  -march=CPU[,+EXTENSION...]\n"
@@ -6373,22 +6312,22 @@ msgstr ""
 "  -march=PROSESSORI[,+LAAJENNUS...]\n"
 "                          tuota koodia PROSESSORIlle ja LAAJENNUKSELLE, PROSESSOR on yksi seuraavista:\n"
 
-#: config/tc-i386.c:8554
+#: config/tc-i386.c:8454
 #, c-format
 msgid "                          EXTENSION is combination of:\n"
 msgstr "                          LAAJENNUS on seuraavien yhdistelmä:\n"
 
-#: config/tc-i386.c:8557
+#: config/tc-i386.c:8457
 #, c-format
 msgid "  -mtune=CPU              optimize for CPU, CPU is one of:\n"
 msgstr "  -mtune=PROSESSORI       optimoi PROSESSORIlle, se on yksi seuraavista:\n"
 
-#: config/tc-i386.c:8560
+#: config/tc-i386.c:8460
 #, c-format
 msgid "  -msse2avx               encode SSE instructions with VEX prefix\n"
 msgstr "  -msse2avx               koodaa SSE-käskyt VEX-etuliitteellä\n"
 
-#: config/tc-i386.c:8562
+#: config/tc-i386.c:8462
 #, c-format
 msgid ""
 "  -msse-check=[none|error|warning]\n"
@@ -6397,7 +6336,7 @@ msgstr ""
 "  -msse-check=[none|error|warning]\n"
 "                          tarkista SSE-käskyt\n"
 
-#: config/tc-i386.c:8565
+#: config/tc-i386.c:8465
 #, c-format
 msgid ""
 "  -mavxscalar=[128|256]   encode scalar AVX instructions with specific vector\n"
@@ -6406,71 +6345,62 @@ msgstr ""
 "  -mavxscalar=[128|256]   koodaa skalaari-AVX-käskyt vektorikohtaisella\n"
 "                           pituudella\n"
 
-#: config/tc-i386.c:8568
+#: config/tc-i386.c:8468
 #, c-format
 msgid "  -mmnemonic=[att|intel]  use AT&T/Intel mnemonic\n"
 msgstr "  -mmnemonic=[att|intel]  käytä AT&T/Intel -muistikasta\n"
 
-#: config/tc-i386.c:8570
+#: config/tc-i386.c:8470
 #, c-format
 msgid "  -msyntax=[att|intel]    use AT&T/Intel syntax\n"
 msgstr "  -msyntax=[att|intel]    käytä AT&T/Intel -syntaksia\n"
 
-#: config/tc-i386.c:8572
+#: config/tc-i386.c:8472
 #, c-format
 msgid "  -mindex-reg             support pseudo index registers\n"
 msgstr "  -mindex-reg             tue näennäisindeksirekistereitä\n"
 
-#: config/tc-i386.c:8574
+#: config/tc-i386.c:8474
 #, c-format
 msgid "  -mnaked-reg             don't require `%%' prefix for registers\n"
 msgstr "  -mnaked-reg             ei vaadi �%%�-etuliitettä rekistereille\n"
 
-#: config/tc-i386.c:8576
+#: config/tc-i386.c:8476
 #, c-format
 msgid "  -mold-gcc               support old (<= 2.8.1) versions of gcc\n"
 msgstr "  -mold-gcc               tue vanhoja (<= 2.8.1) gcc-versioita\n"
 
-#: config/tc-i386.c:8650
+#: config/tc-i386.c:8530
 msgid "Intel L1OM is 64bit only"
 msgstr "Intel L1OM on vain 64-bittinen"
 
-#: config/tc-i386.c:8872
+#: config/tc-i386.c:8753
 #, c-format
 msgid "can not do %d byte pc-relative relocation"
 msgstr "ei voida tehdä %d-tavun ohjelmalaskurisuhteellista sijoitusta"
 
-#: config/tc-i386.c:8890
+#: config/tc-i386.c:8771
 #, c-format
 msgid "can not do %d byte relocation"
 msgstr "ei voida tehdä %d-tavun sijoitusta"
 
-#: config/tc-i386.c:8959
-#, c-format
-msgid "cannot represent relocation type %s in x32 mode"
-msgstr "ei voi edustaa sijoitustyyppiä %s x32-tilassa"
-
-#: config/tc-i386.c:8994 config/tc-s390.c:2346
+#: config/tc-i386.c:8854 config/tc-s390.c:2239
 #, c-format
 msgid "cannot represent relocation type %s"
 msgstr "ei voi edustaa sijoitustyyppiä %s"
 
-#: config/tc-i386.c:9101
+#: config/tc-i386.c:8961
 msgid "bad .section directive: want a,l,w,x,M,S,G,T in string"
 msgstr "virheellinen �.section�-direktiivi: halutaan a,l,w,x,M,S,G,T merkkijonossa"
 
-#: config/tc-i386.c:9104
+#: config/tc-i386.c:8964
 msgid "bad .section directive: want a,w,x,M,S,G,T in string"
 msgstr "virheellinen �.section�-direktiivi: haluaa a,w,x,M,S,G,T merkkijonossa"
 
-#: config/tc-i386.c:9123
+#: config/tc-i386.c:8983
 msgid ".largecomm supported only in 64bit mode, producing .comm"
 msgstr "direktiivi �.largecomm� tuettu vain 64-bittitilassa, tuotetaan direktiivi �.comm�"
 
-#: config/tc-i386.c:9178 read.c:3859
-msgid "unexpected `\"' in expression"
-msgstr "odotettamaton ’\"’ lausekkeessa"
-
 #: config/tc-i860.c:122
 msgid "Directive .dual available only with -mintel-syntax option"
 msgstr "Direktiivi �.dual� käytettävissä vain �-mintel-syntax�-valitsimen kanssa"
@@ -6762,7 +6692,7 @@ msgstr "Kiertorekisterien koko ylittää kehyskoon"
 msgid "Unwind directive not followed by an instruction."
 msgstr "Käskyä ei seuraa �unwind�-direktiivi."
 
-#: config/tc-ia64.c:1017 config/tc-ia64.c:7449
+#: config/tc-ia64.c:1017 config/tc-ia64.c:7447
 msgid "qualifying predicate not followed by instruction"
 msgstr "käskyä ei seuraa määräävä predikaatti"
 
@@ -7098,7 +7028,7 @@ msgstr "Odotettiin pilkkua"
 msgid "Expected '['"
 msgstr "Odotettiin '['"
 
-#: config/tc-ia64.c:4514 config/tc-ia64.c:7584
+#: config/tc-ia64.c:4514 config/tc-ia64.c:7582
 msgid "Expected ']'"
 msgstr "odotettiin ']'"
 
@@ -7165,7 +7095,7 @@ msgstr "Tunnistamaton predikointirelaatiotyyppi"
 msgid "Bad register range"
 msgstr "Virheellinen rekisteri-lukualue"
 
-#: config/tc-ia64.c:5001 config/tc-ia64.c:7529
+#: config/tc-ia64.c:5001 config/tc-ia64.c:7527
 msgid "Predicate register expected"
 msgstr "Odotettiin predikointirekisteriä"
 
@@ -7331,6 +7261,7 @@ msgstr "Puuttuu �}� tiedoston lopussa"
 msgid "Unrecognized option '-x%s'"
 msgstr "Tunnistamaton valitsin ’-x%s’"
 
+#  Otaksuttu, että automagically tarkoittaa automatically, mutta otaksuma voi olla väärä. Ohjelmoinnissa puhutaan myös maagisista luvuista ja tässä saattaa olla kyse niiden käyttämisestä.
 #: config/tc-ia64.c:6989
 msgid ""
 "IA-64 options:\n"
@@ -7348,6 +7279,13 @@ msgid ""
 "  -mhint.b=[ok|warning|error]\n"
 "\t\t\t  hint.b check (default -mhint.b=error)\n"
 "  -x | -xexplicit\t  turn on dependency violation checking\n"
+"  -xauto\t\t  automagically remove dependency violations (default)\n"
+"  -xnone\t\t  turn off dependency violation checking\n"
+"  -xdebug\t\t  debug dependency violation checker\n"
+"  -xdebugn\t\t  debug dependency violation checker but turn off\n"
+"\t\t\t  dependency violation checking\n"
+"  -xdebugx\t\t  debug dependency violation checker and turn on\n"
+"\t\t\t  dependency violation checking\n"
 msgstr ""
 "IA-64 -valitsimet:\n"
 "  --mconstant-gp\t  merkitse tulostetiedosto käyttämällä vakio-GP-mallia\n"
@@ -7364,18 +7302,6 @@ msgstr ""
 "  -mhint.b=[ok|warning|error]\n"
 "\t\t\t  hint.b -tarkistus (oletus -mhint.b=error)\n"
 "  -x | -xexplicit\t  käännä päälle riippuvuusrikkomustarkistus\n"
-
-#. Note for translators: "automagically" can be translated as "automatically" here.
-#: config/tc-ia64.c:7006
-msgid ""
-"  -xauto\t\t  automagically remove dependency violations (default)\n"
-"  -xnone\t\t  turn off dependency violation checking\n"
-"  -xdebug\t\t  debug dependency violation checker\n"
-"  -xdebugn\t\t  debug dependency violation checker but turn off\n"
-"\t\t\t  dependency violation checking\n"
-"  -xdebugx\t\t  debug dependency violation checker and turn on\n"
-"\t\t\t  dependency violation checking\n"
-msgstr ""
 "  -xauto\t\t  poista riippuvuusrikkomukset automaattisesti (oletus)\n"
 "  -xnone\t\t  käännä pois päältä riippuvuusrikkoutumistarkistus\n"
 "  -xdebug\t\t  vikajäljitä riippuvuusrikkoutumuistarkistaja\n"
@@ -7384,238 +7310,238 @@ msgstr ""
 "  -xdebugx\t\t  vikajäljitä riippuvuusrikkomustarkistaja ja käännä päälle\n"
 "\t\t\t  riippuvuusrikkomustarkistus\n"
 
-#: config/tc-ia64.c:7021
+#: config/tc-ia64.c:7019
 msgid "--gstabs is not supported for ia64"
 msgstr "--gstabs ei ole tuettu kohteelle ia64"
 
-#: config/tc-ia64.c:7259
+#: config/tc-ia64.c:7257
 #, c-format
 msgid "ia64.md_begin: can't hash `%s': %s"
 msgstr "ia64.md_begin: ei voi sekasummata �%s�: %s"
 
-#: config/tc-ia64.c:7320
+#: config/tc-ia64.c:7318
 #, c-format
 msgid "Inserting \"%s\" into constant hash table failed: %s"
 msgstr "Kohteen �%s� lisäys vakiosekasummatauluun epäonnistui: %s"
 
-#: config/tc-ia64.c:7332 config/tc-mips.c:1916
+#: config/tc-ia64.c:7330 config/tc-mips.c:1905
 msgid "Could not set architecture and machine"
 msgstr "Ei voitu asettaa arkkitehtuuria ja konetta"
 
-#: config/tc-ia64.c:7464
+#: config/tc-ia64.c:7462
 msgid "Explicit stops are ignored in auto mode"
 msgstr "Eksplisiittisiä pysäytyksiä ei otettu huomioon automaattitilassa"
 
-#: config/tc-ia64.c:7473
+#: config/tc-ia64.c:7471
 msgid "Found '{' when manual bundling is already turned on"
 msgstr "Löytyi ’{’ kun manuaaliniputus oli jo käännetty päälle"
 
-#: config/tc-ia64.c:7486
+#: config/tc-ia64.c:7484
 msgid "Found '{' after explicit switch to automatic mode"
 msgstr "Löytyi ’{’ kytkimen jälkeen, joka käänsi automaattiseen tilaan"
 
-#: config/tc-ia64.c:7492
+#: config/tc-ia64.c:7490
 msgid "Found '}' when manual bundling is off"
 msgstr "Löytyi ’}’ kun manuaalinen niputus oli käännetty pois päältä"
 
-#: config/tc-ia64.c:7519
+#: config/tc-ia64.c:7517
 msgid "Expected ')'"
 msgstr "Odotettiin ')'"
 
-#: config/tc-ia64.c:7524
+#: config/tc-ia64.c:7522
 msgid "Qualifying predicate expected"
 msgstr "Odotettiin määrittävää predikaattia"
 
-#: config/tc-ia64.c:7543
+#: config/tc-ia64.c:7541
 msgid "Tag must come before qualifying predicate."
 msgstr "Tunnisteen on tultava ennen määrittävää predikaattia."
 
-#: config/tc-ia64.c:7573
+#: config/tc-ia64.c:7571
 msgid "Expected ':'"
 msgstr "Odotettiin ':'"
 
-#: config/tc-ia64.c:7589
+#: config/tc-ia64.c:7587
 msgid "Tag name expected"
 msgstr "Odotettiin tunnistenimeä"
 
-#: config/tc-ia64.c:7691
+#: config/tc-ia64.c:7689
 msgid "Rotating register index must be a non-negative constant"
 msgstr "Kiertorekisterin indeksin on oltava ei-negatiivinen vakio"
 
-#: config/tc-ia64.c:7696
+#: config/tc-ia64.c:7694
 #, c-format
 msgid "Index out of range 0..%u"
 msgstr "Indeksi lukualueen 0..%u ulkopuolella"
 
-#: config/tc-ia64.c:7708
+#: config/tc-ia64.c:7706
 msgid "Indirect register index must be a general register"
 msgstr "Epäsuoran rekisteri-indeksin on oltava yleisrekisteri"
 
-#: config/tc-ia64.c:7717
+#: config/tc-ia64.c:7715
 msgid "Index can only be applied to rotating or indirect registers"
 msgstr "Indeksi voidaan liittää vain kierto- tai epäsuoriin rekistereihin"
 
-#: config/tc-ia64.c:7753 config/tc-xstormy16.c:146
+#: config/tc-ia64.c:7751 config/tc-xstormy16.c:146
 msgid "Expected '('"
 msgstr "Odotettiin '('"
 
-#: config/tc-ia64.c:7761 config/tc-pdp11.c:448 config/tc-pdp11.c:512
-#: config/tc-pdp11.c:546 config/tc-xstormy16.c:155
+#: config/tc-ia64.c:7759 config/tc-pdp11.c:448 config/tc-pdp11.c:514
+#: config/tc-pdp11.c:553 config/tc-xstormy16.c:155
 msgid "Missing ')'"
 msgstr "Puuttuva ')'"
 
-#: config/tc-ia64.c:7779 config/tc-xstormy16.c:162
+#: config/tc-ia64.c:7777 config/tc-xstormy16.c:162
 msgid "Not a symbolic expression"
 msgstr "Ei ole symbolinen lauseke"
 
-#: config/tc-ia64.c:7784 config/tc-ia64.c:7798
+#: config/tc-ia64.c:7782 config/tc-ia64.c:7796
 msgid "Illegal combination of relocation functions"
 msgstr "Luvaton sijoitusfunktioiden yhdistelmä"
 
-#: config/tc-ia64.c:7887
+#: config/tc-ia64.c:7885
 msgid "No current frame"
 msgstr "Ei nykyistä kehystä"
 
-#: config/tc-ia64.c:7889
+#: config/tc-ia64.c:7887
 #, c-format
 msgid "Register number out of range 0..%u"
 msgstr "Rekisterinumero lukualueen 0..%u ulkopuolella"
 
-#: config/tc-ia64.c:7927
+#: config/tc-ia64.c:7925
 msgid "Standalone `#' is illegal"
 msgstr "Erillinen �#� on luvaton"
 
-#: config/tc-ia64.c:7930
+#: config/tc-ia64.c:7928
 msgid "Redundant `#' suffix operators"
 msgstr "Redundantit �#�-loppuliiteoperaattorit"
 
-#: config/tc-ia64.c:8088
+#: config/tc-ia64.c:8086
 #, c-format
 msgid "Unhandled dependency %s for %s (%s), note %d"
 msgstr "Käsittelemätön riippuvuus %s kohteelle %s (%s), lippu %d"
 
-#: config/tc-ia64.c:9383
+#: config/tc-ia64.c:9381
 #, c-format
 msgid "Unrecognized dependency specifier %d\n"
 msgstr "Tunnistamaton riippuvuusmäärite %d\n"
 
-#: config/tc-ia64.c:10259
+#: config/tc-ia64.c:10257
 msgid "Only the first path encountering the conflict is reported"
 msgstr "Vain ensimmäinen ristiriidan kohtaava polku ilmoitetaan"
 
-#: config/tc-ia64.c:10261
+#: config/tc-ia64.c:10259
 msgid "This is the location of the conflicting usage"
 msgstr "Tämä on ristiriitaisen käytön sijainti"
 
-#: config/tc-ia64.c:10522
+#: config/tc-ia64.c:10520
 #, c-format
 msgid "Unknown opcode `%s'"
 msgstr "Tuntematon käskykoodi �%s�"
 
-#: config/tc-ia64.c:10600
+#: config/tc-ia64.c:10598
 #, c-format
 msgid "AR %d can only be accessed by %c-unit"
 msgstr "Kohdetta AR %d voi lukea vain %c-yksikkö"
 
-#: config/tc-ia64.c:10612
+#: config/tc-ia64.c:10610
 msgid "hint.b may be treated as nop"
 msgstr "hint.b pitäisi käsitellä nop-käskynä"
 
-#: config/tc-ia64.c:10615
+#: config/tc-ia64.c:10613
 msgid "hint.b shouldn't be used"
 msgstr "hint.b ei pitäisi käyttää"
 
-#: config/tc-ia64.c:10654
+#: config/tc-ia64.c:10652
 #, c-format
 msgid "`%s' cannot be predicated"
 msgstr "�%s� ei voi olla ilmoitettu"
 
-#: config/tc-ia64.c:10726
+#: config/tc-ia64.c:10724
 msgid "Closing bracket missing"
 msgstr "Sulkeva sulkumerkki puuttuu"
 
-#: config/tc-ia64.c:10735
+#: config/tc-ia64.c:10733
 msgid "Index must be a general register"
 msgstr "Indeksin on oltava yleisrekisteri"
 
-#: config/tc-ia64.c:10900
+#: config/tc-ia64.c:10898
 #, c-format
 msgid "Unsupported fixup size %d"
 msgstr "Tukematon korjauskoko %d"
 
 #. This should be an error, but since previously there wasn't any
 #. diagnostic here, don't make it fail because of this for now.
-#: config/tc-ia64.c:11172
+#: config/tc-ia64.c:11170
 #, c-format
 msgid "Cannot express %s%d%s relocation"
 msgstr "Ei voida ilmaista %s%d%s-sijoitusta"
 
-#: config/tc-ia64.c:11191
+#: config/tc-ia64.c:11189
 msgid "No addend allowed in @fptr() relocation"
 msgstr "Yhteenlaskettavaa ei sallita kohteessa @fptr()-sijoitus"
 
-#: config/tc-ia64.c:11230
+#: config/tc-ia64.c:11228
 msgid "integer operand out of range"
 msgstr "kokonaislukuoperandi lukualueen ulkopuolella"
 
-#: config/tc-ia64.c:11297
+#: config/tc-ia64.c:11295
 #, c-format
 msgid "%s must have a constant value"
 msgstr "%s on oltava vakioarvo"
 
-#: config/tc-ia64.c:11317
+#: config/tc-ia64.c:11315
 msgid "cannot resolve @slotcount parameter"
 msgstr "ei voi ratkaista @slotcount-parametria"
 
-#: config/tc-ia64.c:11350
+#: config/tc-ia64.c:11348
 msgid "invalid @slotcount value"
 msgstr "virheellinen @slotcount-arvo"
 
-#: config/tc-ia64.c:11387 config/tc-z8k.c:1372
+#: config/tc-ia64.c:11385 config/tc-z8k.c:1372
 #, c-format
 msgid "Cannot represent %s relocation in object file"
 msgstr "Ei voi edustaa ’%s’-sijoitusta objektitiedostossa"
 
-#: config/tc-ia64.c:11498
+#: config/tc-ia64.c:11496
 msgid "Can't add stop bit to mark end of instruction group"
 msgstr "Ei voi lisätä stop-bittiä käskyryhmän lopun merkitsemiseksi"
 
-#: config/tc-ia64.c:11598 config/tc-score.c:6109 read.c:1448 read.c:2434
-#: read.c:3138 read.c:3476 read.c:3520
+#: config/tc-ia64.c:11596 config/tc-score.c:6109 read.c:1451 read.c:2447
+#: read.c:3149 read.c:3490 read.c:3534
 msgid "expected symbol name"
 msgstr "odotettiin symbolinimeä"
 
-#: config/tc-ia64.c:11608 read.c:2444 read.c:3148 read.c:3504 stabs.c:469
+#: config/tc-ia64.c:11606 read.c:2457 read.c:3159 read.c:3518 stabs.c:468
 #, c-format
 msgid "expected comma after \"%s\""
 msgstr "odotettiin pilkkua �%s�:n jälkeen"
 
-#: config/tc-ia64.c:11650
+#: config/tc-ia64.c:11648
 #, c-format
 msgid "`%s' is already the alias of %s `%s'"
 msgstr "�%s� on jo kohteen %s alias �%s�"
 
-#: config/tc-ia64.c:11660
+#: config/tc-ia64.c:11658
 #, c-format
 msgid "%s `%s' already has an alias `%s'"
 msgstr "%s �%s� on jo alias �%s�"
 
-#: config/tc-ia64.c:11671
+#: config/tc-ia64.c:11669
 #, c-format
 msgid "inserting \"%s\" into %s alias hash table failed: %s"
 msgstr "kohteen �%s� lisäys %s-alias-sekasummatauluun epäonnistui: %s"
 
-#: config/tc-ia64.c:11679
+#: config/tc-ia64.c:11677
 #, c-format
 msgid "inserting \"%s\" into %s name hash table failed: %s"
 msgstr "kohteen �%s� lisäys %s-nimi-sekasummatauluun epäonnistui: %s"
 
-#: config/tc-ia64.c:11705
+#: config/tc-ia64.c:11703
 #, c-format
 msgid "symbol `%s' aliased to `%s' is not used"
 msgstr "symbolin �%s� muuntoa aliakseksi �%s� ei ole käytetty"
 
-#: config/tc-ia64.c:11728
+#: config/tc-ia64.c:11726
 #, c-format
 msgid "section `%s' aliased to `%s' is not used"
 msgstr "lohkon �%s� muuntoa aliakseksi �%s� ei ole käytetty"
@@ -7659,19 +7585,19 @@ msgstr "käsky implisiittisesti lukee edellisen latauksen kohdetta R31."
 msgid "Unmatched high relocation"
 msgstr "Pariton yläsijoitus"
 
-#: config/tc-iq2000.c:829 config/tc-mips.c:15333 config/tc-score.c:5819
+#: config/tc-iq2000.c:829 config/tc-mips.c:15017 config/tc-score.c:5819
 msgid ".end not in text section"
 msgstr "�.end� not in text section"
 
-#: config/tc-iq2000.c:833 config/tc-mips.c:15337 config/tc-score.c:5822
+#: config/tc-iq2000.c:833 config/tc-mips.c:15021 config/tc-score.c:5822
 msgid ".end directive without a preceding .ent directive."
 msgstr "�.end�-direktiivi ilman a preceding �.ent�-direktiivi."
 
-#: config/tc-iq2000.c:842 config/tc-mips.c:15346 config/tc-score.c:5830
+#: config/tc-iq2000.c:842 config/tc-mips.c:15030 config/tc-score.c:5830
 msgid ".end symbol does not match .ent symbol."
 msgstr "�.end� symboli does not match �.ent� symbol."
 
-#: config/tc-iq2000.c:845 config/tc-mips.c:15353 config/tc-score.c:5835
+#: config/tc-iq2000.c:845 config/tc-mips.c:15037 config/tc-score.c:5835
 msgid ".end directive missing or unknown symbol"
 msgstr "�.end�-direktiivi puuttuva tai tuntematon symbol"
 
@@ -7679,7 +7605,7 @@ msgstr "�.end�-direktiivi puuttuva tai tuntematon symbol"
 msgid "Expected simple number."
 msgstr "Odotettiin simple-numeroa."
 
-#: config/tc-iq2000.c:892 config/tc-mips.c:15258 config/tc-score.c:5670
+#: config/tc-iq2000.c:892 config/tc-mips.c:14942 config/tc-score.c:5670
 #, c-format
 msgid " *input_line_pointer == '%c' 0x%02x\n"
 msgstr " *input_line_pointer == ’%c’ 0x%02x\n"
@@ -7688,7 +7614,7 @@ msgstr " *input_line_pointer == ’%c’ 0x%02x\n"
 msgid "Invalid number"
 msgstr "Virheellinen number"
 
-#: config/tc-iq2000.c:928 config/tc-mips.c:15425 config/tc-score.c:5708
+#: config/tc-iq2000.c:928 config/tc-mips.c:15109 config/tc-score.c:5708
 msgid ".ent or .aent not in text section."
 msgstr ".ent� tai �.aent� not in text section."
 
@@ -7799,20 +7725,22 @@ msgstr "  -Wnp                    synonyymi valitsimelle -no-warn-explicit-paral
 msgid "  -ignore-parallel-conflicts            do not check parallel instructions\n"
 msgstr "  -ignore-parallel-conflicts            älä tarkista rinnakkaiskäskyjen\n"
 
+#  tässä pitäisi ilmeisesti olla for constraint
 #: config/tc-m32r.c:408
 #, c-format
-msgid "                                         for constraint violations\n"
-msgstr "                                         rajoiteristiriidoille\n"
+msgid "                                         fo contraint violations\n"
+msgstr "                                         rajoiterikkomuksia\n"
 
 #: config/tc-m32r.c:410
 #, c-format
 msgid "  -no-ignore-parallel-conflicts         check parallel instructions for\n"
 msgstr "  -no-ignore-parallel-conflicts         tarkista rinnakkaiskäskyjen\n"
 
+#  tässä pitäisi ilmeisesti olla constraint
 #: config/tc-m32r.c:412
 #, c-format
-msgid "                                         constraint violations\n"
-msgstr "                                         rajoiteristiriidat\n"
+msgid "                                         contraint violations\n"
+msgstr "                                         rajoiterikkomukset\n"
 
 #: config/tc-m32r.c:414
 #, c-format
@@ -9194,796 +9122,759 @@ msgid "Absolute value in relaxation code.  Assembler error....."
 msgstr "Absoluuttinen arvo lieventämiskoodissa. Assemblerivirhe..."
 
 #: config/tc-microblaze.c:2363 config/tc-mn10300.c:1067 config/tc-sh.c:804
-#: config/tc-z80.c:666 read.c:4351
+#: config/tc-z80.c:666 read.c:4365
 #, c-format
 msgid "unsupported BFD relocation size %u"
 msgstr "tukematon BFD-sijoituskoko %u"
 
 #. Prototypes for static functions.
-#: config/tc-mips.c:1064
+#: config/tc-mips.c:1060
 #, c-format
 msgid "internal Error, line %d, %s"
 msgstr "sisäinen virhe, rivi %d, %s"
 
-#: config/tc-mips.c:1825 config/tc-mips.c:13188
+#: config/tc-mips.c:1814 config/tc-mips.c:12891
 #, c-format
 msgid "Unrecognized register name `%s'"
 msgstr "Tunnistamaton rekisterinimi �%s�"
 
-#: config/tc-mips.c:1911
+#: config/tc-mips.c:1900
 msgid "-G may not be used in position-independent code"
 msgstr "�-G�-valitsinta ei voida käyttää paikkariippumattomassa koodissa"
 
-#: config/tc-mips.c:1960
+#: config/tc-mips.c:1949
 #, c-format
 msgid "internal: can't hash `%s': %s"
 msgstr "sisäinen: ei voi sekasummata ’%s’: %s"
 
-#: config/tc-mips.c:1968
+#: config/tc-mips.c:1957
 #, c-format
 msgid "internal error: bad mips16 opcode: %s %s\n"
 msgstr "sisäinen virhe: virheellinen mips16-käskykoodi: %s %s\n"
 
-#: config/tc-mips.c:2140
+#: config/tc-mips.c:2129
 #, c-format
 msgid "returned from mips_ip(%s) insn_opcode = 0x%x\n"
 msgstr "palautettiin kohteesta mips_ip(%s) käskykoodi insn_opcode = 0x%x\n"
 
-#: config/tc-mips.c:3074 config/tc-mips.c:3082
+#: config/tc-mips.c:2958 config/tc-mips.c:14590
+msgid "extended instruction in delay slot"
+msgstr "laajennettu käsky viivevälissä"
+
+#: config/tc-mips.c:3022 config/tc-mips.c:3029
 #, c-format
 msgid "jump to misaligned address (0x%lx)"
 msgstr "hyppää tasaamattomaan osoitteeseen (0x%lx)"
 
-#: config/tc-mips.c:3093 config/tc-mips.c:4042
+#: config/tc-mips.c:3039 config/tc-mips.c:3810
 #, c-format
 msgid "branch to misaligned address (0x%lx)"
 msgstr "haaraudu tasaamattomaan osoitteeseen (0x%lx)"
 
-#: config/tc-mips.c:3098 config/tc-mips.c:4045
+#: config/tc-mips.c:3044 config/tc-mips.c:3813
 #, c-format
 msgid "branch address range overflow (0x%lx)"
 msgstr "haarautumisosoitealueen ylivuoto (0x%lx)"
 
-#: config/tc-mips.c:3253 config/tc-mips.c:14896
-msgid "extended instruction in delay slot"
-msgstr "laajennettu käsky viivevälissä"
-
 #. To reproduce this failure try assembling gas/testsuites/
 #. gas/mips/mips16-intermix.s with a mips-ecoff targeted
 #. assembler.
-#: config/tc-mips.c:3299
+#: config/tc-mips.c:3071
 #, c-format
 msgid "Unsupported MIPS relocation number %d"
 msgstr "Tukematon MIPS-sijoitusnumero %d"
 
-#: config/tc-mips.c:3779
+#: config/tc-mips.c:3543
 msgid "Macro instruction expanded into multiple instructions in a branch delay slot"
 msgstr "Makrokäsky laajennettu useaksi käskyksi haarautumisviivevälissä"
 
-#: config/tc-mips.c:3782
+#: config/tc-mips.c:3546
 msgid "Macro instruction expanded into multiple instructions"
 msgstr "Makrokäsky laajennettu useiksi käskyiksi"
 
-#: config/tc-mips.c:4314
+#: config/tc-mips.c:4082 config/tc-mips.c:8005 config/tc-mips.c:8029
+#: config/tc-mips.c:8102 config/tc-mips.c:8125
 msgid "operand overflow"
 msgstr "operandin ylivuoto"
 
-#: config/tc-mips.c:4333 config/tc-mips.c:4933 config/tc-mips.c:8427
+#: config/tc-mips.c:4101 config/tc-mips.c:4701 config/tc-mips.c:8192
 msgid "Macro used $at after \".set noat\""
 msgstr "Makro käyttänyt $at-rekisteriä �.set noat�-määrittelyn jälkeen"
 
-#: config/tc-mips.c:4362
+#: config/tc-mips.c:4130
 msgid "unsupported large constant"
 msgstr "tukematon �large�-vakio"
 
-#: config/tc-mips.c:4364
+#: config/tc-mips.c:4132
 #, c-format
 msgid "Instruction %s requires absolute expression"
 msgstr "Käsky %s vaatii absoluuttisen lausekkeen"
 
-#: config/tc-mips.c:4497 config/tc-mips.c:6798 config/tc-mips.c:7390
+#: config/tc-mips.c:4265 config/tc-mips.c:6567 config/tc-mips.c:7143
 #, c-format
 msgid "Number (0x%s) larger than 32 bits"
 msgstr "Numero (0x%s) on suurempi kuin 32 bittiä"
 
-#: config/tc-mips.c:4517
+#: config/tc-mips.c:4285
 msgid "Number larger than 64 bits"
 msgstr "Numero on suurempi kuin 64 bittiä"
 
-#: config/tc-mips.c:4811 config/tc-mips.c:4839 config/tc-mips.c:4877
-#: config/tc-mips.c:4922 config/tc-mips.c:7012 config/tc-mips.c:7051
-#: config/tc-mips.c:7090 config/tc-mips.c:7485 config/tc-mips.c:7537
+#: config/tc-mips.c:4579 config/tc-mips.c:4607 config/tc-mips.c:4645
+#: config/tc-mips.c:4690 config/tc-mips.c:6776 config/tc-mips.c:6815
+#: config/tc-mips.c:6854 config/tc-mips.c:7239 config/tc-mips.c:7291
 msgid "PIC code offset overflow (max 16 signed bits)"
 msgstr "PIC-koodisiirrososoiteylivuoto (enintään 16 etumerkillistä bittiä)"
 
-#: config/tc-mips.c:5244 config/tc-mips.c:5310 config/tc-mips.c:5398
-#: config/tc-mips.c:5445 config/tc-mips.c:5507 config/tc-mips.c:5556
-#: config/tc-mips.c:8521 config/tc-mips.c:8528 config/tc-mips.c:8535
-#: config/tc-mips.c:8642
+#: config/tc-mips.c:5012 config/tc-mips.c:5078 config/tc-mips.c:5166
+#: config/tc-mips.c:5213 config/tc-mips.c:5274 config/tc-mips.c:5322
+#: config/tc-mips.c:8286 config/tc-mips.c:8293 config/tc-mips.c:8300
+#: config/tc-mips.c:8407
 msgid "Unsupported large constant"
 msgstr "Tukematon �large�-vakio"
 
 #. result is always true
-#: config/tc-mips.c:5276
+#: config/tc-mips.c:5044
 #, c-format
 msgid "Branch %s is always true"
 msgstr "Haarautuminen %s on aina tosi"
 
-#: config/tc-mips.c:5518 config/tc-mips.c:5567 config/tc-mips.c:9297
-#: config/tc-mips.c:9454
+#: config/tc-mips.c:5285 config/tc-mips.c:5333 config/tc-mips.c:9058
+#: config/tc-mips.c:9215
 #, c-format
 msgid "Improper position (%lu)"
 msgstr "Väärä sijainti (%lu)"
 
-#: config/tc-mips.c:5523 config/tc-mips.c:9364
+#: config/tc-mips.c:5291 config/tc-mips.c:9125
 #, c-format
 msgid "Improper extract size (%lu, position %lu)"
 msgstr "Väärä purkamiskoko (%lu, sijainti %lu)"
 
-#: config/tc-mips.c:5572 config/tc-mips.c:9328
+#: config/tc-mips.c:5339 config/tc-mips.c:9089
 #, c-format
 msgid "Improper insert size (%lu, position %lu)"
 msgstr "Väärä lisäyskoko (%lu, sijainti %lu)"
 
-#: config/tc-mips.c:5609 config/tc-mips.c:5706
+#: config/tc-mips.c:5376 config/tc-mips.c:5473
 msgid "Divide by zero."
 msgstr "Jako nollalla."
 
-#: config/tc-mips.c:5792
+#: config/tc-mips.c:5559
 msgid "dla used to load 32-bit register"
 msgstr "�dla� käytetty lataamaan 32-bittinen rekisteri"
 
-#: config/tc-mips.c:5795
+#: config/tc-mips.c:5562
 msgid "la used to load 64-bit address"
 msgstr "�la� käytetty lataamaan 64-bittinen osoite"
 
-#: config/tc-mips.c:5819 config/tc-mips.c:6788 config/tc-mips.c:7380
-msgid "Expression too complex"
-msgstr "Lauseke on liian mutkikas"
-
-#: config/tc-mips.c:5907
-msgid "Offset too large"
-msgstr "Siirrososoite on liian iso"
+#: config/tc-mips.c:5674 config/tc-z80.c:695
+msgid "offset too large"
+msgstr "siirrososoite on liian iso"
 
-#: config/tc-mips.c:6079 config/tc-mips.c:6354
+#: config/tc-mips.c:5846 config/tc-mips.c:6121
 msgid "PIC code offset overflow (max 32 signed bits)"
 msgstr "PIC-koodisiirrososoiteylivuoto (enintään 32 etumerkillistä bittiä)"
 
-#: config/tc-mips.c:6432
+#: config/tc-mips.c:6204
 msgid "MIPS PIC call to register other than $25"
 msgstr "�MIPS PIC�-kutsu rekisteriin, joka on muu kuin $25"
 
-#: config/tc-mips.c:6438 config/tc-mips.c:6449 config/tc-mips.c:6573
-#: config/tc-mips.c:6584
+#: config/tc-mips.c:6210 config/tc-mips.c:6221 config/tc-mips.c:6345
+#: config/tc-mips.c:6356
 msgid "No .cprestore pseudo-op used in PIC code"
 msgstr "Ei �.cprestore�-näennäiskäskyä käytetty PIC-koodissa"
 
-#: config/tc-mips.c:6443 config/tc-mips.c:6578
+#: config/tc-mips.c:6215 config/tc-mips.c:6350
 msgid "No .frame pseudo-op used in PIC code"
 msgstr "Ei �.frame-näennäiskäskyä käytetty PIC-koodissa"
 
-#: config/tc-mips.c:6599
+#: config/tc-mips.c:6371
 msgid "Non-PIC jump used in PIC library"
 msgstr "Ei-PIC-hyppyä käytetty PIC-kirjastossa"
 
-#: config/tc-mips.c:6765
-#, c-format
-msgid "Opcode not supported on this processor: %s"
-msgstr "Käskykoodia ei tueta tässä prosessorissa: %s"
-
-#: config/tc-mips.c:7643
+#: config/tc-mips.c:6534 config/tc-mips.c:7397
 #, c-format
 msgid "opcode not supported on this processor: %s"
 msgstr "käskykoodia ei tueta tässä prosessorissa: %s"
 
-#: config/tc-mips.c:7790 config/tc-mips.c:7821 config/tc-mips.c:7873
-#: config/tc-mips.c:7903
+#: config/tc-mips.c:7544 config/tc-mips.c:7575 config/tc-mips.c:7627
+#: config/tc-mips.c:7657
 msgid "Improper rotate count"
 msgstr "Väärä kiertolukumäärä"
 
-#: config/tc-mips.c:7942
+#: config/tc-mips.c:7707
 #, c-format
 msgid "Instruction %s: result is always false"
 msgstr "Käsky %s: tulos on aina epätosi"
 
-#: config/tc-mips.c:8103
+#: config/tc-mips.c:7868
 #, c-format
 msgid "Instruction %s: result is always true"
 msgstr "Käsky %s: tulos on aina tosi"
 
-#: config/tc-mips.c:8240 config/tc-mips.c:8264 config/tc-mips.c:8337
-#: config/tc-mips.c:8360
-msgid "Operand overflow"
-msgstr "Operandin ylivuoto"
-
 #. FIXME: Check if this is one of the itbl macros, since they
 #. are added dynamically.
-#: config/tc-mips.c:8423
+#: config/tc-mips.c:8188
 #, c-format
 msgid "Macro %s not implemented yet"
 msgstr "Makroa %s ei ole vielä toteutettu"
 
-#: config/tc-mips.c:8673
+#: config/tc-mips.c:8438
 #, c-format
 msgid "internal: bad mips opcode (mask error): %s %s"
 msgstr "sisäinen: virheellinen mips-käskykoodi (peitevirhe): %s %s"
 
-#: config/tc-mips.c:8718
+#: config/tc-mips.c:8478 config/tc-mips.c:9289
 #, c-format
 msgid "internal: bad mips opcode (unknown extension operand type `+%c'): %s %s"
 msgstr "sisäinen: virheellinen mips-käskykoodi (tuntematon laajennusoperandityyppi ’+%c’): %s %s"
 
-#: config/tc-mips.c:8797
+#: config/tc-mips.c:8557
 #, c-format
 msgid "internal: bad mips opcode (unknown operand type `%c'): %s %s"
 msgstr "sisäinen: virheellinen mips-käskykoodi (tuntematon operandityyppi ’%c’): %s %s"
 
-#: config/tc-mips.c:8804
+#: config/tc-mips.c:8564
 #, c-format
 msgid "internal: bad mips opcode (bits 0x%lx undefined): %s %s"
 msgstr "sisäinen: virheellinen mips-käskykoodi (bitit 0x%lx määrittelemättömiä): %s %s"
 
-#: config/tc-mips.c:8927 config/tc-mips.c:8935
-msgid "Unrecognized opcode"
-msgstr "Tunnistamaton käskykoodi"
+#: config/tc-mips.c:8687 config/tc-mips.c:8695 config/tc-mips.c:10179
+#: config/tc-score.c:2696 config/tc-score.c:2742
+msgid "unrecognized opcode"
+msgstr "tunnistamaton käskykoodi"
 
-#: config/tc-mips.c:8962 config/tc-mips.c:10524
+#: config/tc-mips.c:8722 config/tc-mips.c:10205
 #, c-format
 msgid "opcode not supported on this processor: %s (%s)"
 msgstr "käskykoodia ei tueta tälle prosessorille: %s (%s)"
 
-#: config/tc-mips.c:8996
+#: config/tc-mips.c:8756
 #, c-format
 msgid "BALIGN immediate not 1 or 3 (%lu)"
 msgstr "BALIGN -välitön arvo ei ole 1 tai 3 (%lu)"
 
-#: config/tc-mips.c:9009 config/tc-mips.c:9022 config/tc-mips.c:9035
-#: config/tc-mips.c:9048 config/tc-mips.c:9074 config/tc-mips.c:9118
+#: config/tc-mips.c:8769 config/tc-mips.c:8782 config/tc-mips.c:8795
+#: config/tc-mips.c:8808 config/tc-mips.c:8834 config/tc-mips.c:8878
 #, c-format
 msgid "DSP immediate not in range 0..%d (%lu)"
 msgstr "DSP -välitön arvo ei ole lukualueella 0..%d (%lu)"
 
-#: config/tc-mips.c:9066 config/tc-mips.c:9093
+#: config/tc-mips.c:8826 config/tc-mips.c:8853
 msgid "Invalid dsp acc register"
 msgstr "Virheellinen �dsp acc�-rekisteri"
 
-#: config/tc-mips.c:9104 config/tc-mips.c:9135 config/tc-mips.c:9152
+#: config/tc-mips.c:8864 config/tc-mips.c:8895 config/tc-mips.c:8912
 #, c-format
 msgid "DSP immediate not in range %ld..%ld (%ld)"
 msgstr "DSP -välitön arvo ei ole lukualueella %ld..%ld (%ld)"
 
-#: config/tc-mips.c:9165
+#: config/tc-mips.c:8925
 #, c-format
 msgid "MT usermode bit not 0 or 1 (%lu)"
 msgstr "�MT usermode�-bitti ei ole 0 tai 1 (%lu)"
 
-#: config/tc-mips.c:9176
+#: config/tc-mips.c:8936
 #, c-format
 msgid "MT load high bit not 0 or 1 (%lu)"
 msgstr "�MT load high�-bitti ei ole 0 tai 1 (%lu)"
 
-#: config/tc-mips.c:9193 config/tc-mips.c:9206
+#: config/tc-mips.c:8953 config/tc-mips.c:8966
 msgid "Invalid dsp/smartmips acc register"
 msgstr "Virheellinen �dsp/smartmips acc�-rekisteri"
 
-#: config/tc-mips.c:9270
+#: config/tc-mips.c:9031
 #, c-format
 msgid "Illegal %s number (%lu, 0x%lx)"
 msgstr "Luvaton %s numero (%lu, 0x%lx)"
 
-#: config/tc-mips.c:9383 config/tc-mips.c:10032
+#: config/tc-mips.c:9144 config/tc-mips.c:9716
 msgid "absolute expression required"
 msgstr "absoluuttinen lauseke vaadittu"
 
-#: config/tc-mips.c:9406
+#: config/tc-mips.c:9167
 #, c-format
 msgid "Invalid register number (%d)"
 msgstr "Virheellinen rekisterinumero (%d)"
 
-#: config/tc-mips.c:9414
+#: config/tc-mips.c:9175
 msgid "Invalid coprocessor 0 register number"
 msgstr "Virheellinen apuprosessori 0 rekisterinumero"
 
-#: config/tc-mips.c:9424
+#: config/tc-mips.c:9185
 #, c-format
 msgid "Improper bit index (%lu)"
 msgstr "Väärä bitti-indeksi (%lu)"
 
-#: config/tc-mips.c:9485 config/tc-mips.c:9502
+#: config/tc-mips.c:9246 config/tc-mips.c:9263
 #, c-format
 msgid "Improper size (%lu)"
 msgstr "Väärä koko (%lu)"
 
-#: config/tc-mips.c:9518
+#: config/tc-mips.c:9279
 #, c-format
 msgid "Improper immediate (%ld)"
 msgstr "Väärä välitön arvo (%ld)"
 
-#: config/tc-mips.c:9535 config/tc-mips.c:9552 config/tc-mips.c:9572
-#, c-format
-msgid "Offset not in range %ld..%ld (%ld)"
-msgstr "Siirrososoite ei ole lukualueella %ld..%ld (%ld)"
-
-#: config/tc-mips.c:9578
-#, c-format
-msgid "Offset not 16 bytes alignment (%ld)"
-msgstr "Siirrososoite ei ole 16-tavutasattu (%ld)"
-
-#: config/tc-mips.c:9593 config/tc-mips.c:10705
-msgid "used $at without \".set noat\""
-msgstr "käytetty $at ilman �.set noat�"
-
-#: config/tc-mips.c:9595 config/tc-mips.c:10707
-#, c-format
-msgid "used $%u with \".set at=$%u\""
-msgstr "käytetty $%u asetuksella �.set at=$%u�"
-
-#: config/tc-mips.c:9608
-#, c-format
-msgid "Internal error: bad mips opcode (unknown extension operand type `+%c'): %s %s"
-msgstr "Sisäinen virhe: virheellinen mips-käskykoodi (tuntematon laajennusoperandityyppi ’+%c’): %s %s"
-
-#: config/tc-mips.c:9626
+#: config/tc-mips.c:9306
 #, c-format
 msgid "Improper shift amount (%lu)"
 msgstr "Väärä siirtosumma (%lu)"
 
-#: config/tc-mips.c:9650 config/tc-mips.c:10845 config/tc-mips.c:11098
+#: config/tc-mips.c:9330 config/tc-mips.c:10526 config/tc-mips.c:10779
 #, c-format
 msgid "Invalid value for `%s' (%lu)"
 msgstr "Virheellinen arvo kohteelle ’%s’ (%lu)"
 
-#: config/tc-mips.c:9686
+#: config/tc-mips.c:9366
 #, c-format
 msgid "Code for %s not in range 0..1023 (%lu)"
 msgstr "Koodi kohteelle %s ei ole lukualueella 0..1023 (%lu)"
 
-#: config/tc-mips.c:9698
+#: config/tc-mips.c:9378
 #, c-format
 msgid "Lower code for %s not in range 0..1023 (%lu)"
 msgstr "Alempi koodi kohteelle %s ei ole lukualueella 0..1023 (%lu)"
 
-#: config/tc-mips.c:9710
+#: config/tc-mips.c:9390
 #, c-format
 msgid "Code for %s not in range 0..1048575 (%lu)"
 msgstr "Koodi kohteelle %s ei ole lukualueella 0..1048575 (%lu)"
 
-#: config/tc-mips.c:9723
+#: config/tc-mips.c:9403
 #, c-format
 msgid "Coproccesor code > 25 bits (%lu)"
 msgstr "Apuprosessorikoodi > 25 bittiä (%lu)"
 
-#: config/tc-mips.c:9737
+#: config/tc-mips.c:9417
 #, c-format
 msgid "Illegal 19-bit code (%lu)"
 msgstr "Luvaton 19-bittinen koodi (%lu)"
 
-#: config/tc-mips.c:9750
+#: config/tc-mips.c:9430
 #, c-format
 msgid "Invalid performance register (%lu)"
 msgstr "Virheellinen suorituskykyrekisteri (%lu)"
 
-#: config/tc-mips.c:9795
+#: config/tc-mips.c:9473 config/tc-mips.c:10386
+msgid "used $at without \".set noat\""
+msgstr "käytetty $at ilman �.set noat�"
+
+#: config/tc-mips.c:9475 config/tc-mips.c:10388
 #, c-format
-msgid "Used $%u with \".set at=$%u\""
-msgstr "Käytetty $%u asetuksella �.set at=$%u�"
+msgid "used $%u with \".set at=$%u\""
+msgstr "käytetty $%u asetuksella �.set at=$%u�"
 
-#: config/tc-mips.c:9822
-msgid "Source and destination must be different"
-msgstr "Lähteen ja kohteen on oltava erilaisia"
+#: config/tc-mips.c:9501
+msgid "source and destination must be different"
+msgstr "lähteen ja kohteen on oltava erilaisia"
 
-#: config/tc-mips.c:9828
-msgid "A destination register must be supplied"
-msgstr "Kohderekisterin on oltava tarjottu"
+#: config/tc-mips.c:9506
+msgid "a destination register must be supplied"
+msgstr "kohderekisterin on oltava tarjottu"
 
-#: config/tc-mips.c:9891
+#: config/tc-mips.c:9575
 #, c-format
 msgid "Improper align amount (%ld), using low bits"
 msgstr "Väärä tasausmäärä (%ld), käytetään alabittejä"
 
-#: config/tc-mips.c:9905
+#: config/tc-mips.c:9589
 #, c-format
 msgid "Invalid MDMX Immediate (%ld)"
 msgstr "Virheellinen MDMX -välitön arvo (%ld)"
 
-#: config/tc-mips.c:9943
+#: config/tc-mips.c:9627
 #, c-format
 msgid "Float register should be even, was %d"
 msgstr "Liukulukurekisterin pitäisi olla parillinen, se oli %d"
 
-#: config/tc-mips.c:9982
+#: config/tc-mips.c:9666
 #, c-format
 msgid "Bad element selector %ld"
 msgstr "Virheellinen elementtivalitsija %ld"
 
-#: config/tc-mips.c:9990
+#: config/tc-mips.c:9674
 #, c-format
 msgid "Expecting ']' found '%s'"
 msgstr "Odotettiin ’]’ löytyi ’%s’"
 
-#: config/tc-mips.c:10096
+#: config/tc-mips.c:9780
 #, c-format
 msgid "Bad floating point constant: %s"
 msgstr "Virheellinen liukulukuvakio: %s"
 
-#: config/tc-mips.c:10216
+#: config/tc-mips.c:9900
 msgid "Can't use floating point insn in this section"
 msgstr "Ei voi käyttää liukulukukäskyä tässä lohkossa"
 
-#: config/tc-mips.c:10275
-msgid "Expression out of range"
-msgstr "Lauseke lukualueen ulkopuolella"
+#: config/tc-mips.c:9959
+msgid "expression out of range"
+msgstr "lauseke lukualueen ulkopuolella"
 
-#: config/tc-mips.c:10319
-#, c-format
-msgid "lui expression (%lu) not in range 0..65535"
-msgstr "�lui�-lauseke (%lu) ei ole lukualueella 0..65535"
+#: config/tc-mips.c:10003
+msgid "lui expression not in range 0..65535"
+msgstr "�lui�-lauseke ei ole lukualueella 0..65535"
 
-#: config/tc-mips.c:10341
+#: config/tc-mips.c:10024
 #, c-format
 msgid "Condition code register should be even for %s, was %d"
 msgstr "Ehtokoodirekisterin pitäisi olla parillinen kohteelle %s, se oli %d"
 
-#: config/tc-mips.c:10347
+#: config/tc-mips.c:10029
 #, c-format
 msgid "Condition code register should be 0 or 4 for %s, was %d"
 msgstr "Ehtokoodirekisterin pitäisi olla 0 tai 4 kohteelle %s, se oli %d"
 
-#: config/tc-mips.c:10374
-msgid "Invalid coprocessor sub-selection value (0-7)"
-msgstr "Virheellinen apuprosessorin alivalinta-arvo (0-7)"
+#: config/tc-mips.c:10055
+msgid "invalid coprocessor sub-selection value (0-7)"
+msgstr "virheellinen apuprosessorin alivalinta-arvo (0-7)"
 
-#: config/tc-mips.c:10386 config/tc-mips.c:10403
+#: config/tc-mips.c:10067 config/tc-mips.c:10084
 #, c-format
 msgid "bad byte vector index (%ld)"
 msgstr "virheellinen tavuvektori-indeksi (%ld)"
 
-#: config/tc-mips.c:10414
+#: config/tc-mips.c:10095
 #, c-format
-msgid "Bad char = '%c'\n"
-msgstr "Virheellinen merkki = ’%c’\n"
+msgid "bad char = '%c'\n"
+msgstr "virheellinen merkki = ’%c’\n"
 
-#: config/tc-mips.c:10498 config/tc-score.c:2696 config/tc-score.c:2742
-msgid "unrecognized opcode"
-msgstr "tunnistamaton käskykoodi"
+#: config/tc-mips.c:10106 config/tc-mips.c:10111 config/tc-mips.c:10804
+msgid "illegal operands"
+msgstr "luvattomat operandit"
 
-#: config/tc-mips.c:10881 config/tc-mips.c:10962 config/tc-mips.c:10977
+#: config/tc-mips.c:10562 config/tc-mips.c:10643 config/tc-mips.c:10658
 msgid "can't parse register list"
 msgstr "ei voi jäsentää rekisteriluetteloa"
 
-#: config/tc-mips.c:10950
+#: config/tc-mips.c:10631
 msgid "more than one frame size in list"
 msgstr "enemmän kuin yksi kehys koko luettelossa"
 
-#: config/tc-mips.c:11005
+#: config/tc-mips.c:10686
 msgid "unexpected register in list"
 msgstr "odottamaton rekisteri luettelossa"
 
-#: config/tc-mips.c:11015
+#: config/tc-mips.c:10696
 msgid "arg/static registers overlap"
 msgstr "argumentit/staattiset rekisterit päällekkäin"
 
-#: config/tc-mips.c:11033
+#: config/tc-mips.c:10714
 msgid "invalid arg register list"
 msgstr "virheellinen argumenttirekisteriluettelo"
 
-#: config/tc-mips.c:11042 config/tc-mips.c:11065
+#: config/tc-mips.c:10723 config/tc-mips.c:10746
 msgid "invalid static register list"
 msgstr "virheellinen staattinen rekisteriluettelo"
 
-#: config/tc-mips.c:11072
+#: config/tc-mips.c:10753
 msgid "missing frame size"
 msgstr "puuttuva kehyskoko"
 
-#: config/tc-mips.c:11075
+#: config/tc-mips.c:10756
 msgid "invalid frame size"
 msgstr "virheellinen kehyskoko"
 
-#: config/tc-mips.c:11123
-msgid "illegal operands"
-msgstr "luvattomat operandit"
-
-#: config/tc-mips.c:11241
+#: config/tc-mips.c:10922
 msgid "extended operand requested but not required"
 msgstr "laajennettua operandia pyydetty, mutta ei vaadittu"
 
-#: config/tc-mips.c:11243
+#: config/tc-mips.c:10924
 msgid "invalid unextended operand value"
 msgstr "virheellinen laajentamaton operandiarvo"
 
-#: config/tc-mips.c:11271
+#: config/tc-mips.c:10952
 msgid "operand value out of range for instruction"
 msgstr "operandiarvo lukualueen ulkopuolella käskylle"
 
-#: config/tc-mips.c:11376
+#: config/tc-mips.c:11057
 #, c-format
 msgid "relocation %s isn't supported by the current ABI"
 msgstr "sijoitusta %s ei tueta nykyisessä ABI:ssa"
 
-#: config/tc-mips.c:11432
+#: config/tc-mips.c:11113
 msgid "unclosed '('"
 msgstr "sulkematon ’(’"
 
-#: config/tc-mips.c:11699
+#: config/tc-mips.c:11400
 #, c-format
 msgid "A different %s was already specified, is now %s"
 msgstr "Erilainen %s oli jo määritelty, on nyt %s"
 
-#: config/tc-mips.c:11970
+#: config/tc-mips.c:11671
 msgid "-call_shared is supported only for ELF format"
 msgstr "�-call_shared� on tuettu vain ELF-muodolle"
 
-#: config/tc-mips.c:11980
+#: config/tc-mips.c:11681
 msgid "-call_nonpic is supported only for ELF format"
 msgstr "�-call_nonpic� on tuettu vain ELF-muodolle"
 
-#: config/tc-mips.c:11990
+#: config/tc-mips.c:11691
 msgid "-non_shared is supported only for ELF format"
 msgstr "�-non_shared� on tuettu vain ELF-muodolle"
 
-#: config/tc-mips.c:12023
+#: config/tc-mips.c:11724
 msgid "-n32 is supported for ELF format only"
 msgstr "�-n32� on tuettu vain ELF-muodolle"
 
-#: config/tc-mips.c:12032
+#: config/tc-mips.c:11733
 msgid "-64 is supported for ELF format only"
 msgstr "�-64� on tuettu vain ELF-muodolle"
 
-#: config/tc-mips.c:12037 config/tc-mips.c:12090
+#: config/tc-mips.c:11738 config/tc-mips.c:11791
 msgid "No compiled in support for 64 bit object file format"
 msgstr "Ei käännetty tuessa 64-bittiselle objektitiedostomuodolle"
 
-#: config/tc-mips.c:12077
+#: config/tc-mips.c:11778
 msgid "-mabi is supported for ELF format only"
 msgstr "�-mabi� on tuettu vain ELF-muodolle"
 
-#: config/tc-mips.c:12097
+#: config/tc-mips.c:11798
 #, c-format
 msgid "invalid abi -mabi=%s"
 msgstr "virheellinen abi -mabi=%s"
 
-#: config/tc-mips.c:12177
+#: config/tc-mips.c:11878
 msgid "-G not supported in this configuration."
 msgstr "�-G� ei ole tuettu näissä asetuksissa."
 
-#: config/tc-mips.c:12203
+#: config/tc-mips.c:11904
 #, c-format
 msgid "-%s conflicts with the other architecture options, which imply -%s"
 msgstr "-%s on ristiriidassa muiden arkkitehtuurivalitsimien kanssa, mikä edellyttää -%s"
 
-#: config/tc-mips.c:12215
+#: config/tc-mips.c:11916
 #, c-format
 msgid "-march=%s is not compatible with the selected ABI"
 msgstr "-march=%s ei ole yhteensopiva valitun ABI-rajapinnan kanssa"
 
-#: config/tc-mips.c:12234
+#: config/tc-mips.c:11935
 msgid "-mgp64 used with a 32-bit processor"
 msgstr "�-mgp64� käytetty 32-bittisen prosessorin kanssa"
 
-#: config/tc-mips.c:12236
+#: config/tc-mips.c:11937
 msgid "-mgp32 used with a 64-bit ABI"
 msgstr "�-mgp32� käytetty 64-bittisen ABI:n kanssa"
 
-#: config/tc-mips.c:12238
+#: config/tc-mips.c:11939
 msgid "-mgp64 used with a 32-bit ABI"
 msgstr "�-mgp64� käytetty 32-bittisen ABI:n kanssa"
 
-#: config/tc-mips.c:12276
+#: config/tc-mips.c:11977
 msgid "-mfp64 used with a 32-bit fpu"
 msgstr "�-mfp64� käytetty 32-bittisen liukulukuyksikön kanssa"
 
-#: config/tc-mips.c:12279
+#: config/tc-mips.c:11980
 msgid "-mfp64 used with a 32-bit ABI"
 msgstr "�-mfp64� käytetty 32-bittisen ABI:n kanssa"
 
-#: config/tc-mips.c:12283
+#: config/tc-mips.c:11984
 msgid "-mfp32 used with a 64-bit ABI"
 msgstr "�-mfp32� käytetty 64-bittisen ABI:n kanssa"
 
-#: config/tc-mips.c:12297
+#: config/tc-mips.c:11998
 msgid "trap exception not supported at ISA 1"
 msgstr "trap-keskeytystä ei tueta ISA 1:ssä"
 
-#: config/tc-mips.c:12307
+#: config/tc-mips.c:12008
 msgid "-mfp32 used with -mips3d"
 msgstr "�-mfp32� käytetty �-mips3d�:n kanssa"
 
-#: config/tc-mips.c:12313
+#: config/tc-mips.c:12014
 msgid "-mfp32 used with -mdmx"
 msgstr "�-mfp32� käytetty �-mdmx�:n kanssa"
 
-#: config/tc-mips.c:12318
+#: config/tc-mips.c:12019
 #, c-format
 msgid "%s ISA does not support SmartMIPS"
 msgstr "%s ISA ei tue SmartMIPS-käskyjä"
 
-#: config/tc-mips.c:12324 config/tc-mips.c:13280
+#: config/tc-mips.c:12025 config/tc-mips.c:12983
 #, c-format
 msgid "%s ISA does not support DSP ASE"
 msgstr "%s ISA ei tue �DSP ASE�-käskyjä"
 
-#: config/tc-mips.c:12333 config/tc-mips.c:13293
+#: config/tc-mips.c:12034 config/tc-mips.c:12996
 #, c-format
 msgid "%s ISA does not support DSP R2 ASE"
 msgstr "%s ISA ei tue �DSP R2 ASE�-käskyjä"
 
-#: config/tc-mips.c:12339 config/tc-mips.c:13306
+#: config/tc-mips.c:12040 config/tc-mips.c:13009
 #, c-format
 msgid "%s ISA does not support MT ASE"
 msgstr "%s ISA ei tue �MT ASE�-käskyjä"
 
-#: config/tc-mips.c:12387
+#: config/tc-mips.c:12089
 msgid "PC relative MIPS16 instruction references a different section"
 msgstr "Ohjelmalaskurisuhteelliset MIPS16-käskyviitteet eri lohkoon"
 
-#: config/tc-mips.c:12685 config/tc-sparc.c:3184 config/tc-sparc.c:3191
+#: config/tc-mips.c:12387 config/tc-sparc.c:3184 config/tc-sparc.c:3191
 #: config/tc-sparc.c:3198 config/tc-sparc.c:3205 config/tc-sparc.c:3212
 #: config/tc-sparc.c:3221 config/tc-sparc.c:3232 config/tc-sparc.c:3254
-#: config/tc-sparc.c:3278 write.c:1138
+#: config/tc-sparc.c:3278 write.c:1132
 msgid "relocation overflow"
 msgstr "sijoitusylivuoto"
 
-#: config/tc-mips.c:12695
+#: config/tc-mips.c:12397
 #, c-format
 msgid "Branch to misaligned address (%lx)"
 msgstr "Haarautuminen tasaamattomaan osoitteeseen (%lx)"
 
-#: config/tc-mips.c:12742
+#: config/tc-mips.c:12444
 msgid "Branch out of range"
 msgstr "Haarautuminen lukualueen ulkopuolella"
 
-#: config/tc-mips.c:12824
+#: config/tc-mips.c:12526
 #, c-format
 msgid "Alignment too large: %d. assumed."
 msgstr "Tasaus on liian iso: %d. otaksuttu."
 
-#: config/tc-mips.c:12827
+#: config/tc-mips.c:12529
 msgid "Alignment negative: 0 assumed."
 msgstr "Tasaus negatiivinen: 0 otaksuttu."
 
-#: config/tc-mips.c:13085
+#: config/tc-mips.c:12788
 #, c-format
 msgid "%s: no such section"
 msgstr "%s: tuntematon lohko"
 
-#: config/tc-mips.c:13134
+#: config/tc-mips.c:12837
 #, c-format
 msgid ".option pic%d not supported"
 msgstr "�.option pic%d� ei ole tuettu"
 
-#: config/tc-mips.c:13139 config/tc-mips.c:13446
+#: config/tc-mips.c:12842 config/tc-mips.c:13149
 msgid "-G may not be used with SVR4 PIC code"
 msgstr "�-G� ei ehkä ole käytetty �SVR4 PIC�-koodin kanssa"
 
-#: config/tc-mips.c:13145
+#: config/tc-mips.c:12848
 #, c-format
 msgid "Unrecognized option \"%s\""
 msgstr "Tunnistamaton valitsin �%s�"
 
-#: config/tc-mips.c:13205
+#: config/tc-mips.c:12908
 msgid "`noreorder' must be set before `nomacro'"
 msgstr "�noreorder� on oltava asetettu ennen �nomacro�:a"
 
-#: config/tc-mips.c:13231
+#: config/tc-mips.c:12934
 #, c-format
 msgid "%s isa does not support 64-bit registers"
 msgstr "%s isa ei tue 64-bittirekistereitä"
 
-#: config/tc-mips.c:13242
+#: config/tc-mips.c:12945
 #, c-format
 msgid "%s isa does not support 64-bit floating point registers"
 msgstr "%s isa ei tue 64-bittisiä liukulukurekistereitä"
 
-#: config/tc-mips.c:13263
+#: config/tc-mips.c:12966
 #, c-format
 msgid "%s ISA does not support SmartMIPS ASE"
 msgstr "%s ISA ei tue �SmartMIPS ASE�-käskyjä"
 
-#: config/tc-mips.c:13330
+#: config/tc-mips.c:13033
 #, c-format
 msgid "unknown architecture %s"
 msgstr "tuntematon arkkitehtuuri %s"
 
-#: config/tc-mips.c:13343 config/tc-mips.c:13373
+#: config/tc-mips.c:13046 config/tc-mips.c:13076
 #, c-format
 msgid "unknown ISA level %s"
 msgstr "tuntematon ISA taso %s"
 
-#: config/tc-mips.c:13351
+#: config/tc-mips.c:13054
 #, c-format
 msgid "unknown ISA or architecture %s"
 msgstr "tuntematon ISA tai arkkitehtuuri %s"
 
-#: config/tc-mips.c:13401
+#: config/tc-mips.c:13104
 msgid ".set pop with no .set push"
 msgstr "�.set pop� ilman �.set push�"
 
-#: config/tc-mips.c:13430
+#: config/tc-mips.c:13133
 #, c-format
 msgid "Tried to set unrecognized symbol: %s\n"
 msgstr "Yritettiin asettaa tunnistamaton symboli: %s\n"
 
-#: config/tc-mips.c:13488
+#: config/tc-mips.c:13191
 msgid ".cpload not in noreorder section"
 msgstr "�.cpload� ei ole �noreorder�-lohkossa"
 
-#: config/tc-mips.c:13556 config/tc-mips.c:13575
+#: config/tc-mips.c:13259 config/tc-mips.c:13278
 msgid "missing argument separator ',' for .cpsetup"
 msgstr "puuttuva argumenttierotin ’,’ kohteelle �.cpsetup�"
 
-#: config/tc-mips.c:13733
+#: config/tc-mips.c:13436
 #, c-format
 msgid "Unsupported use of %s"
 msgstr "Tukematon %s-käyttö"
 
-#: config/tc-mips.c:13815 config/tc-score.c:6035
+#: config/tc-mips.c:13518 config/tc-score.c:6035
 msgid "Unsupported use of .gpword"
 msgstr "Tukematon �.gpword�-käyttö"
 
-#: config/tc-mips.c:13855
+#: config/tc-mips.c:13558
 msgid "Unsupported use of .gpdword"
 msgstr "Tukematon �.gpdword�-käyttö"
 
-#: config/tc-mips.c:13949
+#: config/tc-mips.c:13652
 #, c-format
 msgid "ignoring attempt to redefine symbol %s"
 msgstr "ei oteta huomioon yritystä määrittää symboli %s uudelleen"
 
-#: config/tc-mips.c:13964 ecoff.c:3378
+#: config/tc-mips.c:13667 ecoff.c:3378
 msgid "bad .weakext directive"
 msgstr "virheellinen �.weakext�-direktiivi"
 
-#: config/tc-mips.c:14200
+#: config/tc-mips.c:13903
 msgid "unsupported PC relative reference to different section"
 msgstr "tukematon ohjelmalaskurisuhteellinen viite eri lohkoon"
 
-#: config/tc-mips.c:14313 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
+#: config/tc-mips.c:14016 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
 msgid "unsupported relocation"
 msgstr "tukematon sijoitus"
 
-#: config/tc-mips.c:14571 config/tc-pdp11.c:1424
+#: config/tc-mips.c:14269 config/tc-pdp11.c:1431
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr "Ei voi edustaa %s sijoitusta tässä objektitiedostomuodossa"
 
-#: config/tc-mips.c:14656
-msgid "Relaxed out-of-range branch into a jump"
-msgstr "Lievennetty lukualueen ulkopuolinen haarautuminen hyppyyn"
+#: config/tc-mips.c:14354
+msgid "relaxed out-of-range branch into a jump"
+msgstr "lievennetty lukualueen ulkopuolinen haarautumienn hyppyyn"
 
-#: config/tc-mips.c:15217
+#: config/tc-mips.c:14901
 msgid "missing .end at end of assembly"
 msgstr "puuttuva �.end� assembly:n lopussa"
 
-#: config/tc-mips.c:15232 config/tc-score.c:5644
+#: config/tc-mips.c:14916 config/tc-score.c:5644
 msgid "expected simple number"
 msgstr "odotettiin simple-numeroa"
 
-#: config/tc-mips.c:15260 config/tc-score.c:5671
+#: config/tc-mips.c:14944 config/tc-score.c:5671
 msgid "invalid number"
 msgstr "virheellinen number"
 
-#: config/tc-mips.c:15428 config/tc-score.c:5710
+#: config/tc-mips.c:15112 config/tc-score.c:5710
 msgid "missing .end"
 msgstr "puuttuva �.end�"
 
-#: config/tc-mips.c:15480
+#: config/tc-mips.c:15164
 msgid "Bad .frame directive"
 msgstr "Virheellinen �.frame�-direktiivi"
 
-#: config/tc-mips.c:15512
+#: config/tc-mips.c:15196
 msgid ".mask/.fmask outside of .ent"
 msgstr "�.mask/.fmask� outside of �.ent�"
 
-#: config/tc-mips.c:15519
+#: config/tc-mips.c:15203
 msgid "Bad .mask/.fmask directive"
 msgstr "Virheellinen �.mask/.fmask�-direktiivi"
 
-#: config/tc-mips.c:15796
+#: config/tc-mips.c:15478
 #, c-format
 msgid "Bad value (%s) for %s"
 msgstr "Virheellinen arvo (%s) kohteelle %s"
 
-#: config/tc-mips.c:15860
+#: config/tc-mips.c:15542
 #, c-format
 msgid ""
 "MIPS options:\n"
@@ -10000,7 +9891,7 @@ msgstr ""
 "-G NUM\t\t\tsalli viittaaminen objekteihin aina NUM-tavuun\n"
 "\t\t\timplisiittisesti yleiskäyttörekisterien kanssa [oletus 8]\n"
 
-#: config/tc-mips.c:15867
+#: config/tc-mips.c:15549
 #, c-format
 msgid ""
 "-mips1\t\t\tgenerate MIPS ISA I instructions\n"
@@ -10025,7 +9916,7 @@ msgstr ""
 "-mips64r2               tuota MIPS64 release 2 ISA -käskyjä\n"
 "-march=CPU/-mtune=CPU\ttuota koodia/schedule prosessorille (CPU), missä prosessori on yksi seuraavista:\n"
 
-#: config/tc-mips.c:15886
+#: config/tc-mips.c:15568
 #, c-format
 msgid ""
 "-mCPU\t\t\tequivalent to -march=CPU -mtune=CPU. Deprecated.\n"
@@ -10036,7 +9927,7 @@ msgstr ""
 "-no-mCPU\t\tälä tuota prosessorikohtaista (CPU) koodia.\n"
 "\t\t\tKohteille -mCPU ja -no-mCPU, prosessorin (CPU) on oltava yksi seuraavista:\n"
 
-#: config/tc-mips.c:15899
+#: config/tc-mips.c:15581
 #, c-format
 msgid ""
 "-mips16\t\t\tgenerate mips16 instructions\n"
@@ -10045,7 +9936,7 @@ msgstr ""
 "-mips16\t\t\ttuota mips16-käskyjä\n"
 "-no-mips16\t\tälä tuota mips16-käskyjä\n"
 
-#: config/tc-mips.c:15902
+#: config/tc-mips.c:15584
 #, c-format
 msgid ""
 "-msmartmips\t\tgenerate smartmips instructions\n"
@@ -10054,7 +9945,7 @@ msgstr ""
 "-msmartmips\t\ttuota smartmips-käskyjä\n"
 "-mno-smartmips\t\tälä tuota smartmips-käskyjä\n"
 
-#: config/tc-mips.c:15905
+#: config/tc-mips.c:15587
 #, c-format
 msgid ""
 "-mdsp\t\t\tgenerate DSP instructions\n"
@@ -10063,7 +9954,7 @@ msgstr ""
 "-mdsp\t\t\ttuota DSP-käskyjä\n"
 "-mno-dsp\t\tälä tuota DSP-käskyjä\n"
 
-#: config/tc-mips.c:15908
+#: config/tc-mips.c:15590
 #, c-format
 msgid ""
 "-mdspr2\t\t\tgenerate DSP R2 instructions\n"
@@ -10072,7 +9963,7 @@ msgstr ""
 "-mdspr2\t\t\ttuota DSP R2 -käskyjä\n"
 "-mno-dspr2\t\tälä tuota DSP R2 -käskyjä\n"
 
-#: config/tc-mips.c:15911
+#: config/tc-mips.c:15593
 #, c-format
 msgid ""
 "-mmt\t\t\tgenerate MT instructions\n"
@@ -10081,7 +9972,7 @@ msgstr ""
 "-mmt\t\t\ttuota MT-käskyjä\n"
 "-mno-mt\t\t\tälä tuota MT-käskyjä\n"
 
-#: config/tc-mips.c:15914
+#: config/tc-mips.c:15596
 #, c-format
 msgid ""
 "-mfix-loongson2f-jump\twork around Loongson2F JUMP instructions\n"
@@ -10112,7 +10003,7 @@ msgstr ""
 "--trap, --no-break\tsieppaa nollalla jako- ja kertolaskun ylivuotopoikkeukset\n"
 "--break, --no-trap\thyppää pois nollalla jako- ja kertolaskun ylivuotopoikkeuksesta\n"
 
-#: config/tc-mips.c:15928
+#: config/tc-mips.c:15610
 #, c-format
 msgid ""
 "-mhard-float\t\tallow floating-point instructions\n"
@@ -10127,7 +10018,7 @@ msgstr ""
 "-mdouble-float\t\tsalli 32-bittiset ja 64-bittiset liukulukutoiminnot\n"
 "--[no-]construct-floats [älä]salli liukulukuarvojen rakentamista\n"
 
-#: config/tc-mips.c:15936
+#: config/tc-mips.c:15618
 #, c-format
 msgid ""
 "-KPIC, -call_shared\tgenerate SVR4 position independent code\n"
@@ -10150,7 +10041,7 @@ msgstr ""
 "                        paikkariippuvaiselle (ei-jaetulle) koodille\n"
 "-mabi=ABI\t\tluo ABI-yhteensopiva objektitiedosto kohteelle:\n"
 
-#: config/tc-mips.c:15957
+#: config/tc-mips.c:15639
 #, c-format
 msgid ""
 "-32\t\t\tcreate o32 ABI object file (default)\n"
@@ -10390,7 +10281,7 @@ msgstr "LOC-lausekkeen askellusta taaksepäin ei ole tuettu"
 #. We will only get here in rare cases involving #NO_APP,
 #. where the unterminated string is not recognized by the
 #. preformatting pass.
-#: config/tc-mmix.c:4034 config/tc-mmix.c:4192 config/tc-z80.c:1695
+#: config/tc-mmix.c:4034 config/tc-mmix.c:4192 config/tc-z80.c:1686
 msgid "unterminated string"
 msgstr "päättämätön merkkijono"
 
@@ -10773,15 +10664,17 @@ msgstr "käsky %s ei ehkä seuraa toista siirtokäskyä."
 msgid "%s may not occupy the delay slot of another branch insn."
 msgstr "%s ei ehkä varaa toisen haarautumiskäskyn viiveväliä."
 
+#  Tässä pitäisi ilmeisesti lukea instruction
 #: config/tc-mt.c:261
 #, c-format
-msgid "operand references R%ld of previous instruction."
-msgstr "edellisen käskyn operandiviitteet R%ld."
+msgid "operand references R%ld of previous instrutcion."
+msgstr "operandi viittaa edellisen käskyn R%ld."
 
+#  Tässä pitäisi ilmeisesti lukea instruction
 #: config/tc-mt.c:267
 #, c-format
-msgid "operand references R%ld of instruction before previous."
-msgstr "käskyn operandiviitteet R%ld ennen edellistä."
+msgid "operand references R%ld of instructcion before previous."
+msgstr "operandi viittaa edellistä edeltävän käskyn R%ld."
 
 #: config/tc-mt.c:281 config/tc-mt.c:286
 #, c-format
@@ -11023,63 +10916,67 @@ msgstr "Virhe lausekkeessa"
 msgid "Low order bits truncated in immediate float operand"
 msgstr "Alemman järjestyksen bitit typistetty suorassa muistiosoitusliukulukuoperandissa"
 
-#: config/tc-pdp11.c:611
+#: config/tc-pdp11.c:532
+msgid "Label expected"
+msgstr "Odotettiin nimiötä"
+
+#: config/tc-pdp11.c:618
 msgid "Float AC not legal as integer operand"
 msgstr "Liukulukuakkurekisteri ei ole luvallinen kokonaislukuoperandi"
 
-#: config/tc-pdp11.c:631
+#: config/tc-pdp11.c:638
 msgid "General register not legal as float operand"
 msgstr "Yleisrekisteri ei ole luvallinen liukulukuoperandi"
 
-#: config/tc-pdp11.c:664
+#: config/tc-pdp11.c:671
 msgid "No instruction found"
 msgstr "Käskyä ei löytynyt"
 
-#: config/tc-pdp11.c:674 config/tc-z80.c:1894 config/tc-z80.c:1907
+#: config/tc-pdp11.c:681 config/tc-z80.c:1885 config/tc-z80.c:1898
 #, c-format
 msgid "Unknown instruction '%s'"
 msgstr "Tuntematon käsky ’%s’"
 
-#: config/tc-pdp11.c:680
+#: config/tc-pdp11.c:687
 #, c-format
 msgid "Unsupported instruction set extension: %s"
 msgstr "Tukematon käskyjoukkolaajennus: %s"
 
-#: config/tc-pdp11.c:716
+#: config/tc-pdp11.c:723
 msgid "operand is not an absolute constant"
 msgstr "operandi ei ole  absoluuttinen vakio"
 
-#: config/tc-pdp11.c:724
+#: config/tc-pdp11.c:731
 msgid "3-bit immediate out of range"
 msgstr "3-bittinen välitön arvo on lukualueen ulkopuolella"
 
-#: config/tc-pdp11.c:731
+#: config/tc-pdp11.c:738
 msgid "6-bit immediate out of range"
 msgstr "6-bittinen välitön arvo on lukualueen ulkopuolella"
 
-#: config/tc-pdp11.c:738
+#: config/tc-pdp11.c:745
 msgid "8-bit immediate out of range"
 msgstr "8-bittinen välitön arvo on lukualueen ulkopuolella"
 
-#: config/tc-pdp11.c:755 config/tc-pdp11.c:948
+#: config/tc-pdp11.c:762 config/tc-pdp11.c:955
 msgid "Symbol expected"
 msgstr "Odotettiin symbolia"
 
-#: config/tc-pdp11.c:760
+#: config/tc-pdp11.c:767
 msgid "8-bit displacement out of range"
 msgstr "8-bittinen siirtymä on lukualueen ulkopuolella"
 
-#: config/tc-pdp11.c:802 config/tc-pdp11.c:823 config/tc-pdp11.c:840
-#: config/tc-pdp11.c:861 config/tc-pdp11.c:878 config/tc-pdp11.c:899
-#: config/tc-pdp11.c:918 config/tc-pdp11.c:939
+#: config/tc-pdp11.c:809 config/tc-pdp11.c:830 config/tc-pdp11.c:847
+#: config/tc-pdp11.c:868 config/tc-pdp11.c:885 config/tc-pdp11.c:906
+#: config/tc-pdp11.c:925 config/tc-pdp11.c:946
 msgid "Missing ','"
 msgstr "Puuttuva ’,’"
 
-#: config/tc-pdp11.c:953
+#: config/tc-pdp11.c:960
 msgid "6-bit displacement out of range"
 msgstr "6-bittinen siirtymä on lukualueen ulkopuolella"
 
-#: config/tc-pdp11.c:974 config/tc-vax.c:1944
+#: config/tc-pdp11.c:981 config/tc-vax.c:1944
 msgid "Too many operands"
 msgstr "Liian monia operandeja"
 
@@ -11091,9 +10988,10 @@ msgstr "sekoittavia sijoituslausekkeita"
 msgid "can't have relocation for ipush"
 msgstr "ei voi have sijoitus for ipush"
 
+#  Tässä pitäisi kai lukea expression
 #: config/tc-pj.c:289
-msgid "expected expression"
-msgstr "odotettu lauseke"
+msgid "expected expresssion"
+msgstr "odotettiin lauseketta"
 
 #: config/tc-pj.c:355
 #, c-format
@@ -11119,16 +11017,16 @@ msgstr "convert_frag\n"
 msgid "estimate size\n"
 msgstr "arvioi koko\n"
 
-#: config/tc-ppc.c:1119
+#: config/tc-ppc.c:1089
 #, c-format
 msgid "%s unsupported"
 msgstr "%s on tukematon"
 
-#: config/tc-ppc.c:1216
+#: config/tc-ppc.c:1186
 msgid "--nops needs a numeric argument"
 msgstr "�--nops�-valitsin tarvitsee numeerisen argumentin"
 
-#: config/tc-ppc.c:1230
+#: config/tc-ppc.c:1200
 #, c-format
 msgid ""
 "PowerPC options:\n"
@@ -11167,7 +11065,7 @@ msgstr ""
 "                        tuota koodia PowerPC 7400/7410/7450/7455:lle\n"
 "-m750cl                 tuota koodia PowerPC 750cl:lle\n"
 
-#: config/tc-ppc.c:1248
+#: config/tc-ppc.c:1218
 #, c-format
 msgid ""
 "-mppc64, -m620          generate code for PowerPC 620/625/630\n"
@@ -11195,7 +11093,7 @@ msgstr ""
 "-mcom                   tuota koodia Power/PowerPC-yhteiskäskyille\n"
 "-many                   tuota koodia mille tahansa arkkitehtuurille (PWR/PWRX/PPC)\n"
 
-#: config/tc-ppc.c:1261
+#: config/tc-ppc.c:1231
 #, c-format
 msgid ""
 "-maltivec               generate code for AltiVec\n"
@@ -11220,19 +11118,18 @@ msgstr ""
 "-mregnames              Salli symboliset nimet rekistereille\n"
 "-mno-regnames           Älä salli symbolisia nimiä rekistereille\n"
 
-#: config/tc-ppc.c:1273
+#: config/tc-ppc.c:1243
 #, c-format
 msgid ""
 "-mrelocatable           support for GCC's -mrelocatble option\n"
 "-mrelocatable-lib       support for GCC's -mrelocatble-lib option\n"
 "-memb                   set PPC_EMB bit in ELF flags\n"
-"-mlittle, -mlittle-endian, -le\n"
+"-mlittle, -mlittle-endian, -l, -le\n"
 "                        generate code for a little endian machine\n"
-"-mbig, -mbig-endian, -be\n"
+"-mbig, -mbig-endian, -b, -be\n"
 "                        generate code for a big endian machine\n"
 "-msolaris               generate code for Solaris\n"
 "-mno-solaris            do not generate code for Solaris\n"
-"-K PIC                  set EF_PPC_RELOCATABLE_LIB in ELF flags\n"
 "-V                      print assembler version number\n"
 "-Qy, -Qn                ignored\n"
 msgstr ""
@@ -11245,301 +11142,286 @@ msgstr ""
 "                        tuota koodia �big-endian�-koneelle\n"
 "-msolaris               tuota koodia Solaris-käyttöjärjestelmälle\n"
 "-mno-solaris            älä tuota koodia Solaris-käyttöjärjestelmälle\n"
-"-K PIC                  aseta EF_PPC_RELOCATABLE_LIB kohteessa ELF-liput\n"
 "-V                      tulosta assemblerin versionumero\n"
 "-Qy, -Qn                ei otettu huomioon\n"
 
-#: config/tc-ppc.c:1287
+#: config/tc-ppc.c:1256
 #, c-format
 msgid "-nops=count             when aligning, more than COUNT nops uses a branch\n"
 msgstr "-nops=count             kun tasataan, useammat kuin COUNT nop-käskyä käyttävät haarautumista\n"
 
-#: config/tc-ppc.c:1313
+#: config/tc-ppc.c:1282
 #, c-format
 msgid "Unknown default cpu = %s, os = %s"
 msgstr "Tuntematon oletusprosessori = %s, käyttöjärjestelmä = %s"
 
-#: config/tc-ppc.c:1339
+#: config/tc-ppc.c:1308
 msgid "Neither Power nor PowerPC opcodes were selected."
 msgstr "Ei Power- eikä PowerPC-käskykoodeja oltu valittu."
 
-#: config/tc-ppc.c:1420
+#: config/tc-ppc.c:1389
 #, c-format
 msgid "powerpc_operands[%d].bitm invalid"
 msgstr "�powerpc_operands[%d].bitm� virheellinen"
 
-#: config/tc-ppc.c:1427
+#: config/tc-ppc.c:1396
 #, c-format
 msgid "powerpc_operands[%d] duplicates powerpc_operands[%d]"
 msgstr "powerpc_operands[%d] on sama kuin powerpc_operands[%d]"
 
-#: config/tc-ppc.c:1449
+#: config/tc-ppc.c:1418
 #, c-format
 msgid "major opcode is not sorted for %s"
 msgstr "major-käskykoodia ei tueta kohteelle %s"
 
-#: config/tc-ppc.c:1485
+#: config/tc-ppc.c:1454
 #, c-format
 msgid "%s (%08lx %08lx) after %s (%08lx %08lx)"
 msgstr "%s (%08lx %08lx) jälkeen %s (%08lx %08lx)"
 
-#: config/tc-ppc.c:1494
+#: config/tc-ppc.c:1463
 #, c-format
 msgid "mask trims opcode bits for %s"
 msgstr "peite karsii käskykoodibittien lukumääräksi %s"
 
-#: config/tc-ppc.c:1503
+#: config/tc-ppc.c:1472
 #, c-format
 msgid "operand index error for %s"
 msgstr "operandi-indeksivirhe kohteelle %s"
 
-#: config/tc-ppc.c:1515
+#: config/tc-ppc.c:1484
 #, c-format
 msgid "operand %d overlap in %s"
 msgstr "operandi %d on päällekkäin kohteessa %s"
 
-#: config/tc-ppc.c:1532
+#: config/tc-ppc.c:1501
 #, c-format
 msgid "duplicate instruction %s"
 msgstr "kaksoiskappalekäsky %s"
 
-#: config/tc-ppc.c:1556
+#: config/tc-ppc.c:1525
 #, c-format
 msgid "duplicate macro %s"
 msgstr "kaksoiskappalemakro %s"
 
-#: config/tc-ppc.c:1913
+#: config/tc-ppc.c:1882
 msgid "symbol+offset not supported for got tls"
 msgstr "symboli+siirrososoite ei ole tuettu kohteelle �got tls�"
 
-#: config/tc-ppc.c:2168
+#: config/tc-ppc.c:2137
 msgid "Relocation cannot be done when using -mrelocatable"
 msgstr "Sijoitusta ei voida tehdä kun käytetään valitsinta -mrelocatable"
 
 #  TOC tarkoittaa ilmeisesti table of contents
-#: config/tc-ppc.c:2218
+#: config/tc-ppc.c:2187
 msgid "TOC section size exceeds 64k"
 msgstr "Sisällysluettelolohkon koko ylittää 64 kilotavua"
 
-#: config/tc-ppc.c:2299
+#: config/tc-ppc.c:2268
 #, c-format
 msgid "syntax error: invalid toc specifier `%s'"
 msgstr "syntaksivirhe: virheellinen toc-sisällysluettelotarkenne �%s�"
 
-#: config/tc-ppc.c:2313
+#: config/tc-ppc.c:2282
 #, c-format
 msgid "syntax error: expected `]', found  `%c'"
 msgstr "syntaksivirhe: odotettiin �]�, löydettiin �%c�"
 
-#: config/tc-ppc.c:2589
+#: config/tc-ppc.c:2558
 msgid "[tocv] symbol is not a toc symbol"
 msgstr "[tocv]-symboli ei ole sisällysluettelosymboli"
 
-#: config/tc-ppc.c:2600
+#: config/tc-ppc.c:2569
 msgid "Unimplemented toc32 expression modifier"
 msgstr "Toteuttamaton toc32-lausekemääre"
 
-#: config/tc-ppc.c:2605
+#: config/tc-ppc.c:2574
 msgid "Unimplemented toc64 expression modifier"
 msgstr "Toteuttamaton toc64-lausekemääre"
 
-#: config/tc-ppc.c:2609
+#: config/tc-ppc.c:2578
 #, c-format
 msgid "Unexpected return value [%d] from parse_toc_entry!\n"
 msgstr "Odottamaton paluuarvo [%d] funktiosta parse_toc_entry!\n"
 
-#: config/tc-ppc.c:2789
+#: config/tc-ppc.c:2758
 #, c-format
 msgid "@tls may not be used with \"%s\" operands"
 msgstr "@tls ei ehkä ole käytetty �%s�-operandien kanssa"
 
-#: config/tc-ppc.c:2792
+#: config/tc-ppc.c:2761
 msgid "@tls may only be used in last operand"
 msgstr "@tls saatetaan käyttää vain viimeisenä operandina"
 
-#: config/tc-ppc.c:2902
+#: config/tc-ppc.c:2871
 msgid "unsupported relocation for DS offset field"
 msgstr "tukematon sijoitus DS-siirrososoitekentälle"
 
-#: config/tc-ppc.c:2956
+#: config/tc-ppc.c:2925
 #, c-format
 msgid "syntax error; end of line, expected `%c'"
 msgstr "syntaksivirhe: rivin loppu, odotettiin �%c�"
 
-#: config/tc-ppc.c:2958
+#: config/tc-ppc.c:2927
 #, c-format
 msgid "syntax error; found `%c', expected `%c'"
 msgstr "syntaksivirhe: löydettiin �%c�, odotettiin �%c�"
 
-#: config/tc-ppc.c:2998 config/tc-ppc.h:94
+#: config/tc-ppc.c:2967 config/tc-ppc.h:94
 msgid "instruction address is not a multiple of 4"
 msgstr "käskyosoite ei ole neljän monikerta"
 
-#: config/tc-ppc.c:3247
+#: config/tc-ppc.c:3216
 msgid "missing size"
 msgstr "puuttuva koko"
 
-#: config/tc-ppc.c:3256
+#: config/tc-ppc.c:3225
 msgid "negative size"
 msgstr "negatiivinen koko"
 
-#: config/tc-ppc.c:3293
+#: config/tc-ppc.c:3262
 msgid "missing real symbol name"
 msgstr "puuttuva oikea symbolinimi"
 
-#: config/tc-ppc.c:3314
+#: config/tc-ppc.c:3283
 msgid "attempt to redefine symbol"
 msgstr "symboli yritettiin määritellä uudelleen"
 
-#: config/tc-ppc.c:3579
-#, c-format
-msgid "No known dwarf XCOFF section for flag 0x%08x\n"
-msgstr "Ei tunnettua �dwarf XCOFF�-lohkoa lipulle 0x%08x\n"
-
-#: config/tc-ppc.c:3592
-#, c-format
-msgid "label %s was not defined in this dwarf section"
-msgstr "nimiö %s ei oltu määritelty tässä dwarf-lohkossa"
-
-#: config/tc-ppc.c:3708
+#: config/tc-ppc.c:3525
 msgid "The XCOFF file format does not support arbitrary sections"
 msgstr "XCOFF-tiedostomuoto ei tue satunnaisia lohkoja"
 
-#: config/tc-ppc.c:3781
+#: config/tc-ppc.c:3598
 msgid ".ref outside .csect"
 msgstr "�.ref�-direktiivi on �.csect�-direktiivin ulkopuolella"
 
-#: config/tc-ppc.c:3803 config/tc-ppc.c:4005
+#: config/tc-ppc.c:3620 config/tc-ppc.c:3820
 msgid "missing symbol name"
 msgstr "puuttuva symbolinimi"
 
-#: config/tc-ppc.c:3834
+#: config/tc-ppc.c:3651
 msgid "missing rename string"
 msgstr "puuttuva uudelleennimeämismerkkijono"
 
-#: config/tc-ppc.c:3864 config/tc-ppc.c:4406 read.c:3364
+#: config/tc-ppc.c:3681 config/tc-ppc.c:4223 read.c:3375
 msgid "missing value"
 msgstr "puuttuva arvo"
 
-#: config/tc-ppc.c:3882
+#: config/tc-ppc.c:3699
 msgid "illegal .stabx expression; zero assumed"
 msgstr "luvaton �.stabx�-näennäiskäskylauseke: nolla otaksuttu"
 
-#: config/tc-ppc.c:3914
+#: config/tc-ppc.c:3731
 msgid "missing class"
 msgstr "puuttuva luokka"
 
-#: config/tc-ppc.c:3923
+#: config/tc-ppc.c:3740
 msgid "missing type"
 msgstr "puuttuva tyyppi"
 
-#: config/tc-ppc.c:3950
-msgid ".stabx of storage class stsym must be within .bs/.es"
-msgstr "varastoluokan stsym määrittelyn .stabx on oltava määrittelyjen .bs/.es sisäpuolella"
-
-#: config/tc-ppc.c:4193
+#: config/tc-ppc.c:4010
 msgid "nested .bs blocks"
 msgstr "sisäkkäiset �.bs�-lohkot"
 
-#: config/tc-ppc.c:4225
+#: config/tc-ppc.c:4042
 msgid ".es without preceding .bs"
 msgstr "�.es�-näennäiskäsky ilman edeltävää �.bs�-näennäiskäskyä"
 
-#: config/tc-ppc.c:4398
+#: config/tc-ppc.c:4215
 msgid "non-constant byte count"
 msgstr "ei-vakio tavulukumäärä"
 
-#: config/tc-ppc.c:4472
+#: config/tc-ppc.c:4262
 msgid ".tc not in .toc section"
 msgstr "�.tc�-näennäiskäsky ei ole �.toc�-lohkossa"
 
-#: config/tc-ppc.c:4491
+#: config/tc-ppc.c:4281
 msgid ".tc with no label"
 msgstr "�.tc�-näennäiskäsky ilman nimiötä"
 
-#: config/tc-ppc.c:4584 config/tc-s390.c:1843
+#: config/tc-ppc.c:4374
 msgid ".machine stack overflow"
 msgstr "�.machine�-näennäiskäskyn pinoylivuoto"
 
-#: config/tc-ppc.c:4591 config/tc-s390.c:1850
+#: config/tc-ppc.c:4381
 msgid ".machine stack underflow"
 msgstr "�.machine�-näennäiskäskyn pinovajaus"
 
 #  Parametri sisältää cpu-merkkijonon
-#: config/tc-ppc.c:4598 config/tc-s390.c:1857
+#: config/tc-ppc.c:4388
 #, c-format
 msgid "invalid machine `%s'"
 msgstr "virheellinen kone �%s�"
 
-#: config/tc-ppc.c:4649
+#: config/tc-ppc.c:4439
 msgid "No previous section to return to. Directive ignored."
 msgstr "Ei edellistä lohkoa johon palata. Direktiiviä ei otettu huomioon."
 
 #. Section Contents
 #. unknown
-#: config/tc-ppc.c:5059
+#: config/tc-ppc.c:4849
 msgid "Unsupported section attribute -- 'a'"
 msgstr "Tukematon lohkoattribuutti -- ’a’"
 
-#: config/tc-ppc.c:5243
+#: config/tc-ppc.c:5033
 msgid "bad symbol suffix"
 msgstr "virheellinen symboliloppuliite"
 
-#: config/tc-ppc.c:5336
+#: config/tc-ppc.c:5125
 msgid "Unrecognized symbol suffix"
 msgstr "Tunnistamaton symboliloppuliite"
 
-#: config/tc-ppc.c:5424
+#: config/tc-ppc.c:5213
 msgid "two .function pseudo-ops with no intervening .ef"
 msgstr "kaksi �.function�-näennäiskäskyä ilman välissä olevaa �.ef�-näennäiskäskyä"
 
-#: config/tc-ppc.c:5437
+#: config/tc-ppc.c:5226
 msgid ".ef with no preceding .function"
 msgstr "�.ef�-näennäiskäsky ilman edeltävää �.function�-näennäiskäskyä"
 
-#: config/tc-ppc.c:5566
+#: config/tc-ppc.c:5355
 #, c-format
 msgid "warning: symbol %s has no csect"
 msgstr "varoitus: symbolilla %s ei ole csect-apusymbolia"
 
-#: config/tc-ppc.c:5828
+#: config/tc-ppc.c:5600
 msgid "symbol in .toc does not match any .tc"
 msgstr "symboli �.toc�-lohkossa ei täsmää minkään �.tc�-lohkon kanssa"
 
-#: config/tc-ppc.c:6230
+#: config/tc-ppc.c:6002
 #, c-format
 msgid "unsupported relocation against %s"
 msgstr "sijoitus, jota ei tueta korjauksessa %s"
 
-#: config/tc-ppc.c:6303
+#: config/tc-ppc.c:6075
 #, c-format
 msgid "cannot emit PC relative %s relocation against %s"
 msgstr "ei voi lähettää ohjelmalaskurisuhteellista %s sijoitusta korjaukseen %s"
 
-#: config/tc-ppc.c:6308
+#: config/tc-ppc.c:6080
 #, c-format
 msgid "cannot emit PC relative %s relocation"
 msgstr "ei voida lähettää ohjelmalaskurisuhteellista %s-sijoitusta"
 
-#: config/tc-ppc.c:6497
+#: config/tc-ppc.c:6269
 #, c-format
 msgid "Unable to handle reference to symbol %s"
 msgstr "Ei kyetä käsittelemään viitettä symboliin %s"
 
-#: config/tc-ppc.c:6500
+#: config/tc-ppc.c:6272
 msgid "Unable to resolve expression"
 msgstr "Ei kyetä ratkaisemaan lauseketta"
 
-#: config/tc-ppc.c:6527
+#: config/tc-ppc.c:6299
 msgid "must branch to an address a multiple of 4"
 msgstr "täytyy haarautua osoitteeseen, joka on neljän monikerta"
 
-#: config/tc-ppc.c:6531
+#: config/tc-ppc.c:6303
 #, c-format
 msgid "@local or @plt branch destination is too far away, %ld bytes"
 msgstr "@local- tai @plt-haarautumiskohde on myös liian kaukana, %ld tavua"
 
-#: config/tc-ppc.c:6562
+#: config/tc-ppc.c:6334
 #, c-format
 msgid "Gas failure, reloc value %d\n"
 msgstr "Gas-häiriö, reloc-arvo %d\n"
@@ -11634,48 +11516,48 @@ msgstr "Näennäiskäskyä �.MACRO� ei ole toteutettu"
 msgid "The .BTEQU pseudo-op is not implemented."
 msgstr "Näennäiskäskyä �.BTEQU� ei ole toteutettu."
 
-#: config/tc-rx.c:1883
+#: config/tc-rx.c:1868
 msgid "invalid immediate size"
 msgstr "virheellinen välitön koko"
 
-#: config/tc-rx.c:1902
+#: config/tc-rx.c:1887
 msgid "invalid immediate field position"
 msgstr "virheellinen välitön kenttäsijainti"
 
-#: config/tc-rx.c:1951
+#: config/tc-rx.c:1936
 #, c-format
 msgid "bad frag at %p : fix %ld addr %ld %ld \n"
 msgstr "väärä osanen osoitteessa %p : korjaa %ld osoite %ld %ld \n"
 
-#: config/tc-rx.c:2018
+#: config/tc-rx.c:1999
 #, c-format
 msgid "unsupported constant size %d\n"
 msgstr "tukematon vakiokoko %d\n"
 
-#: config/tc-rx.c:2025
+#: config/tc-rx.c:2006
 msgid "difference of two symbols only supported with .long, .short, or .byte"
 msgstr "kahden symbolin eroa tuetaan vain kohteiden .long, .short, tai .byte kanssa"
 
-#: config/tc-rx.c:2069
+#: config/tc-rx.c:2050
 #, c-format
 msgid "jump not 3..10 bytes away (is %d)"
 msgstr "älä hyppää 3..10 tavua pois (on %d)"
 
-#: config/tc-rx.c:2215
+#: config/tc-rx.c:2196
 #, c-format
 msgid "Unknown reloc in md_apply_fix: %s"
 msgstr "Tuntematon reloc-tietue kohteessa �md_apply_fix�: %s"
 
-#: config/tc-s390.c:332 config/tc-sparc.c:272
+#: config/tc-s390.c:327 config/tc-sparc.c:272
 msgid "Invalid default architecture, broken assembler."
 msgstr "Virheellinen oletusarkkitehtuuri, rikkoutunut assembleri."
 
-#: config/tc-s390.c:439 config/tc-sparc.c:475
+#: config/tc-s390.c:425 config/tc-sparc.c:475
 #, c-format
 msgid "invalid architecture -A%s"
 msgstr "virheellinen arkkitehtuuri -A%s"
 
-#: config/tc-s390.c:462
+#: config/tc-s390.c:448
 #, c-format
 msgid ""
 "        S390 options:\n"
@@ -11692,7 +11574,7 @@ msgstr ""
 "        -m31              Aseta tiedostomuoto 31-bittiseen muotoon\n"
 "        -m64              Aseta tiedostomuoto 64-bittiseen muotoon\n"
 
-#: config/tc-s390.c:469
+#: config/tc-s390.c:455
 #, c-format
 msgid ""
 "        -V                print assembler version number\n"
@@ -11701,119 +11583,111 @@ msgstr ""
 "        -V                tulosta assemblerin versionumero\n"
 "        -Qy, -Qn          ei otettu huomioon\n"
 
-#: config/tc-s390.c:534
+#: config/tc-s390.c:474
 msgid "The 64 bit file format is used without esame instructions."
 msgstr "Käytetty 64-bittistä tiedostomuotoa ilman esame-käskyjä."
 
-#: config/tc-s390.c:550
+#: config/tc-s390.c:491
 #, c-format
 msgid "Internal assembler error for instruction format %s"
 msgstr "Sisäinen assembler-virhe käskymuodolle %s"
 
-#: config/tc-s390.c:596
+#: config/tc-s390.c:569
 #, c-format
 msgid "operand out of range (%s not between %ld and %ld)"
 msgstr "operandi lukualueen ulkopuolella (%s ei ole välillä %ld ... %ld)"
 
-#: config/tc-s390.c:778
+#: config/tc-s390.c:751
 #, c-format
 msgid "identifier+constant@%s means identifier@%s+constant"
 msgstr "tunniste+vakio@%s on sama kuin tunniste@%s+vakio"
 
-#: config/tc-s390.c:859
+#: config/tc-s390.c:832
 msgid "Can't handle O_big in s390_exp_compare"
 msgstr "Ei voi käsitellä O_big-lausekeoperaattoria funktiossa s390_exp_compare"
 
-#: config/tc-s390.c:940
+#: config/tc-s390.c:913
 msgid "Invalid suffix for literal pool entry"
 msgstr "Virheellinen loppuliite literaalivarantotulokohdalle"
 
-#: config/tc-s390.c:997
+#: config/tc-s390.c:970
 msgid "Big number is too big"
 msgstr "Big number -operaattori on liian suuri"
 
-#: config/tc-s390.c:1144
+#: config/tc-s390.c:1117
 msgid "relocation not applicable"
 msgstr "sijoitus ei ole käytettävissä"
 
-#: config/tc-s390.c:1261
+#: config/tc-s390.c:1234
 msgid "index register specified but zero"
 msgstr "indeksirekisteri määritelty, mutta se on nolla"
 
-#: config/tc-s390.c:1265
+#: config/tc-s390.c:1238
 msgid "base register specified but zero"
 msgstr "perusrekisteri määritelty, mutta se on nolla"
 
-#: config/tc-s390.c:1269
-msgid "odd numbered general purpose register specified as register pair"
-msgstr "paritonnumeroista yleisrekisteriä käytetty monirekisterikäskyn kohteena"
-
-#: config/tc-s390.c:1277
-msgid "invalid floating point register pair.  Valid fp register pair operands are 0, 1, 4, 5, 8, 9, 12 or 13."
-msgstr "virheellinen liukulukurekisteripari.  Kelvollisia liukulukurekisteriparioperandeja ovat 0, 1, 4, 5, 8, 9, 12 tai 13."
-
-#: config/tc-s390.c:1360
+#: config/tc-s390.c:1319
 msgid "invalid operand suffix"
 msgstr "virheellinen operandiloppuliite"
 
-#: config/tc-s390.c:1383
+#: config/tc-s390.c:1342
 msgid "syntax error; missing '(' after displacement"
 msgstr "syntaksivirhe: puuttuva ’(’ siirtymän jälkeen"
 
-#: config/tc-s390.c:1399 config/tc-s390.c:1443 config/tc-s390.c:1473
+#: config/tc-s390.c:1358 config/tc-s390.c:1402 config/tc-s390.c:1432
 msgid "syntax error; expected ,"
 msgstr "syntaksivirhe: odotettiin ’,’"
 
-#: config/tc-s390.c:1431
+#: config/tc-s390.c:1390
 msgid "syntax error; missing ')' after base register"
 msgstr "syntaksivirhe: puuttuva ’)’ perusrekisterin jälkeen"
 
-#: config/tc-s390.c:1460
+#: config/tc-s390.c:1419
 msgid "syntax error; ')' not allowed here"
 msgstr "syntaksivirhe: ’)’ ei ole sallittu tässä"
 
-#: config/tc-s390.c:1595
+#: config/tc-s390.c:1554
 #, c-format
 msgid "Opcode %s not available in this mode"
 msgstr "Käskykoodi %s ei ole käytettävissä tässä tilassa"
 
-#: config/tc-s390.c:1650 config/tc-s390.c:1673 config/tc-s390.c:1686
+#: config/tc-s390.c:1609 config/tc-s390.c:1632 config/tc-s390.c:1645
 msgid "Invalid .insn format\n"
 msgstr "Virheellinen �.insn�-näennäiskäskymuoto\n"
 
-#: config/tc-s390.c:1658
+#: config/tc-s390.c:1617
 #, c-format
 msgid "Unrecognized opcode format: `%s'"
 msgstr "Tunnistamaton käskykoodimuoto: �%s�"
 
-#: config/tc-s390.c:1689
+#: config/tc-s390.c:1648
 msgid "second operand of .insn not a constant\n"
 msgstr "�.insn�-näennäiskäskyn toinen operandi ei ole vakio\n"
 
-#: config/tc-s390.c:1692
+#: config/tc-s390.c:1651
 msgid "missing comma after insn constant\n"
 msgstr "puuttuva pilkku käskyvakion jälkeen\n"
 
-#: config/tc-s390.c:2050
+#: config/tc-s390.c:1943
 #, c-format
 msgid "cannot emit relocation %s against subsy symbol %s"
 msgstr "ei voi lähettää sijoitusta %s subsy-symbolia %s vastaan"
 
-#: config/tc-s390.c:2138
+#: config/tc-s390.c:2031
 msgid "unsupported relocation type"
 msgstr "tukematon sijoitustyyppi"
 
-#: config/tc-s390.c:2185
+#: config/tc-s390.c:2078
 #, c-format
 msgid "cannot emit PC relative %s relocation%s%s"
 msgstr "ei voida lähettää ohjelmalaskurisuhteellista %s-sijoitusta%s%s"
 
-#: config/tc-s390.c:2310
+#: config/tc-s390.c:2203
 #, c-format
 msgid "Gas failure, reloc type %s\n"
 msgstr "Gas-häiriö, reloc-tyyppi %s\n"
 
-#: config/tc-s390.c:2312
+#: config/tc-s390.c:2205
 #, c-format
 msgid "Gas failure, reloc type #%i\n"
 msgstr "Gas-häiriö, reloc-tyyppi #%i\n"
@@ -12036,7 +11910,7 @@ msgstr "�pce�-käskyvirhe (16 bittiä || 16 bittiä)’"
 msgid "score3d instruction."
 msgstr "score3d-käsky"
 
-#: config/tc-score.c:6126 read.c:1465
+#: config/tc-score.c:6126 read.c:1468
 msgid "missing size expression"
 msgstr "puuttuva kokolauseke"
 
@@ -12045,7 +11919,7 @@ msgstr "puuttuva kokolauseke"
 msgid "BSS length (%d) < 0 ignored"
 msgstr "BSS-pituus (%d) < 0 ei otettu huomioon"
 
-#: config/tc-score.c:6147 read.c:2298
+#: config/tc-score.c:6147 read.c:2311
 #, c-format
 msgid "error setting flags for \".sbss\": %s"
 msgstr "virhe asetettaessa lippuja �.sbss�-lohkolle: %s"
@@ -12059,12 +11933,12 @@ msgstr "puuttuva tasaus"
 msgid "alignment too large; %d assumed"
 msgstr "tasaus liian suuri: %d otaksuttu"
 
-#: config/tc-score.c:6203 read.c:2359
+#: config/tc-score.c:6203 read.c:2372
 msgid "alignment negative; 0 assumed"
 msgstr "tasaus negatiivinen: 0 otaksuttu"
 
-#: config/tc-score.c:6270 ecoff.c:3365 read.c:1484 read.c:1590 read.c:2476
-#: read.c:3098 read.c:3488 symbols.c:334 symbols.c:430
+#: config/tc-score.c:6270 ecoff.c:3365 read.c:1487 read.c:1600 read.c:2489
+#: read.c:3109 read.c:3502 symbols.c:337 symbols.c:433
 #, c-format
 msgid "symbol `%s' is already defined"
 msgstr "symboli �%s� on jo määritelty"
@@ -13045,7 +12919,7 @@ msgstr "tasaus liian suuri: otaksuttiin %d"
 msgid "negative alignment"
 msgstr "negatiivinen tasaus"
 
-#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1321 read.c:2371
+#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1324 read.c:2384
 msgid "alignment not a power of 2"
 msgstr "tasaus ei ole kahden potenssi"
 
@@ -13207,26 +13081,6 @@ msgstr "Sijoitus ei sovi. (sovitusarvo = 0x%lx)"
 msgid "spu convert_frag\n"
 msgstr "spu convert_frag\n"
 
-#: config/tc-tic30.c:37
-msgid "first"
-msgstr "ensimmäinen"
-
-#: config/tc-tic30.c:37
-msgid "second"
-msgstr "toinen"
-
-#: config/tc-tic30.c:37
-msgid "third"
-msgstr "kolmas"
-
-#: config/tc-tic30.c:37
-msgid "fourth"
-msgstr "neljäs"
-
-#: config/tc-tic30.c:37
-msgid "fifth"
-msgstr "viides"
-
 #: config/tc-tic30.c:483
 msgid "More than one AR register found in indirect reference"
 msgstr "Useampi kuin yksi AR-rekisteri löytyi epäsuorassa viitteessä"
@@ -14144,52 +13998,62 @@ msgstr "yritettiin siirtää �.space/.bes� taaksepäin? (%ld)"
 msgid "Invalid label '%s'"
 msgstr "Virheellinen nimiö ’%s’"
 
-#: config/tc-tic6x.c:233
+#: config/tc-tic6x.c:192
 #, c-format
 msgid "unknown architecture '%s'"
 msgstr "tuntematon arkkitehtuuri ’%s’"
 
-#: config/tc-tic6x.c:263
+#: config/tc-tic6x.c:222
 #, c-format
 msgid "unknown -mpid= argument '%s'"
 msgstr "tuntematon �-mpid=�-argumentti ’%s’"
 
-#: config/tc-tic6x.c:321
+#: config/tc-tic6x.c:288
 #, c-format
 msgid "TMS320C6000 options:\n"
 msgstr "TMS320C6000-valitsimet:\n"
 
-#: config/tc-tic6x.c:322
+#: config/tc-tic6x.c:289
 #, c-format
 msgid "  -march=ARCH             enable instructions from architecture ARCH\n"
 msgstr "  -march=ARCH             ota käyttöön käskyt arkkitehtuurista ARCH\n"
 
-#: config/tc-tic6x.c:323
+#: config/tc-tic6x.c:290
+#, c-format
+msgid "  -matomic                enable atomic operation instructions\n"
+msgstr "  -matomic                ota käyttöön atomiset toimintakäskyt\n"
+
+#: config/tc-tic6x.c:291
+#, c-format
+msgid "  -mno-atomic             disable atomic operation instructions\n"
+msgstr "  -mno-atomic             ota pois käytöstä atomiset toimintakäskyt\n"
+
+#: config/tc-tic6x.c:292
 #, c-format
 msgid "  -mbig-endian            generate big-endian code\n"
 msgstr "  -mbig-endian            tuota �big-endian�-koodia\n"
 
-#: config/tc-tic6x.c:324
+#: config/tc-tic6x.c:293
 #, c-format
 msgid "  -mlittle-endian         generate little-endian code\n"
 msgstr "  -mlittle-endian         tuota �little-endian�-koodia\n"
 
-#: config/tc-tic6x.c:325
+#: config/tc-tic6x.c:294
 #, c-format
 msgid "  -mdsbt                  code uses DSBT addressing\n"
 msgstr "  -mdsbt                  koodi käyttää DSBT-osoitteenmuodostusta\n"
 
-#: config/tc-tic6x.c:326
+#: config/tc-tic6x.c:295
 #, c-format
 msgid "  -mno-dsbt               code does not use DSBT addressing\n"
 msgstr "  -mno-dsbt               koodi ei käytä DSBT-osoitteenmuodostusta\n"
 
-#: config/tc-tic6x.c:327
+#: config/tc-tic6x.c:296
 #, c-format
 msgid "  -mpid=no                code uses position-dependent data addressing\n"
 msgstr "  -mpid=no                koodi käyttää sijaintiriippuvaista dataosoitteenmuodostusta\n"
 
-#: config/tc-tic6x.c:328
+#: config/tc-tic6x.c:297
 #, c-format
 msgid ""
 "  -mpid=near              code uses position-independent data addressing,\n"
@@ -14198,7 +14062,7 @@ msgstr ""
 "  -mpid=near                     koodi käyttää paikkariippumatonta dataosoitteenmuodostusta,\n"
 "                                   GOT-lukeminen käyttää �near DP�-osoiteenmuodostusta\n"
 
-#: config/tc-tic6x.c:330
+#: config/tc-tic6x.c:299
 #, c-format
 msgid ""
 "  -mpid=far               code uses position-independent data addressing,\n"
@@ -14207,422 +14071,318 @@ msgstr ""
 "  -mpid=far                      koodi käyttää paikkariippumatonta dataosoitteenmuodostusta,\n"
 "                                   GOT-lukeminen käyttää �far DP�-osoiteenmuodostusta\n"
 
-#: config/tc-tic6x.c:332
+#: config/tc-tic6x.c:301
 #, c-format
 msgid "  -mpic                   code addressing is position-independent\n"
 msgstr "  -mpic                   koodiosoitteenmuodostus on sijaintiriippumatonta\n"
 
-#: config/tc-tic6x.c:333
+#: config/tc-tic6x.c:302
 #, c-format
 msgid "  -mno-pic                code addressing is position-dependent\n"
 msgstr "  -mno-pic                koodiosoittenmuodostus on sijaintiriippuvaista\n"
 
-#: config/tc-tic6x.c:338
+#: config/tc-tic6x.c:307
 #, c-format
 msgid "Supported ARCH values are:"
 msgstr "Tuetut ARCH-arvot ovat:"
 
-#: config/tc-tic6x.c:387
-msgid "unexpected .cantunwind directive"
-msgstr "odottamaton �.cantunwind�-direktiivi"
-
-#: config/tc-tic6x.c:407
-msgid "unexpected .handlerdata directive"
-msgstr "odottamaton �.handlerdata�-direktiivi"
-
-#: config/tc-tic6x.c:419
-msgid "personality routine required before .handlerdata directive"
-msgstr "persoonallisuusrutiini vaadittu ennen �.handlerdata�-direktiiviä"
-
-#: config/tc-tic6x.c:535
-msgid "expected symbol"
-msgstr "odotettu symboli"
-
-#: config/tc-tic6x.c:592
-#, c-format
-msgid "invalid length for .scomm directive"
-msgstr "virheellinen pituus �.scomm�-direktiiville"
-
-#: config/tc-tic6x.c:606
-msgid "alignment is not a positive number"
-msgstr "tasaus ei ole positiivinen numero"
-
-#: config/tc-tic6x.c:618
-msgid "alignment is not a power of 2"
-msgstr "tasaus ei ole kahden potenssi"
-
-#: config/tc-tic6x.c:633
-#, c-format
-msgid "attempt to re-define symbol `%s'"
-msgstr "symboli �%s� yritettiin määritellä uudelleen"
-
-#: config/tc-tic6x.c:642
-#, c-format
-msgid "attempt to redefine `%s' with a different length"
-msgstr "yritys määritellä �%s� uudelleen eri pituudella"
-
-#: config/tc-tic6x.c:844
+#: config/tc-tic6x.c:531
 msgid "multiple '||' on same line"
 msgstr "useita ’||’ samalla rivillä"
 
-#: config/tc-tic6x.c:847
+#: config/tc-tic6x.c:534
 msgid "'||' after predicate"
 msgstr "’||’ predikaatin jälkeen"
 
-#: config/tc-tic6x.c:891
+#: config/tc-tic6x.c:578
 msgid "multiple predicates on same line"
 msgstr "useita predikaatteja samalla rivillä"
 
-#: config/tc-tic6x.c:897
+#: config/tc-tic6x.c:584
 #, c-format
 msgid "bad predicate '%s'"
 msgstr "virheellinen predikaatti ’%s’"
 
-#: config/tc-tic6x.c:908
+#: config/tc-tic6x.c:595
 msgid "predication on A0 not supported on this architecture"
 msgstr "predikaatiota kohteessa A0 ei tueta tässä arkkitehtuurissa"
 
-#: config/tc-tic6x.c:941
+#: config/tc-tic6x.c:628
 msgid "label after '||'"
 msgstr "nimiö ’||’-merkkien jälkeen"
 
-#: config/tc-tic6x.c:947
+#: config/tc-tic6x.c:634
 msgid "label after predicate"
 msgstr "nimiö predikaatin jälkeen"
 
-#: config/tc-tic6x.c:971
+#: config/tc-tic6x.c:658
 msgid "'||' not followed by instruction"
 msgstr "käskyn ei seuraa ’||’"
 
-#: config/tc-tic6x.c:977
+#: config/tc-tic6x.c:664
 msgid "predicate not followed by instruction"
 msgstr "käskyä ei seuraa predikaatti"
 
-#: config/tc-tic6x.c:1410
+#: config/tc-tic6x.c:1097
 #, c-format
 msgid "control register '%s' not supported on this architecture"
 msgstr "ohjausrekisteriä ’%s’ ei tueta tässä arkkitehtuurissa"
 
-#: config/tc-tic6x.c:1589 config/tc-tic6x.c:1592 config/tc-tic6x.c:1645
-#: config/tc-tic6x.c:1649
+#: config/tc-tic6x.c:1276 config/tc-tic6x.c:1279 config/tc-tic6x.c:1332
+#: config/tc-tic6x.c:1336
 #, c-format
 msgid "register number %u not supported on this architecture"
 msgstr "rekisterinumeroa %u ei tueta tässä arkkitehtuurissa"
 
-#: config/tc-tic6x.c:1620
+#: config/tc-tic6x.c:1307
 #, c-format
 msgid "register pair for operand %u of '%.*s' not a valid even/odd pair"
 msgstr "rekisteripari operandille %u kohteessa ’%.*s’  ei ole kelvollinen parillinen/pariton pari"
 
-#: config/tc-tic6x.c:1676
+#: config/tc-tic6x.c:1363
 #, c-format
 msgid "junk after operand %u of '%.*s'"
 msgstr "roskaa operandin %u jäljessä kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:1689
+#: config/tc-tic6x.c:1376
 #, c-format
 msgid "bad register or register pair for operand %u of '%.*s'"
 msgstr "väärä rekisteri tai rekisteripari operandille %u kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:1695
+#: config/tc-tic6x.c:1382
 #, c-format
 msgid "bad register for operand %u of '%.*s'"
 msgstr "virheellinen rekisteri operandille %u kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:1700
+#: config/tc-tic6x.c:1387
 #, c-format
 msgid "bad register pair for operand %u of '%.*s'"
 msgstr "väärä rekisteripari operandille %u kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:1705
+#: config/tc-tic6x.c:1392
 #, c-format
 msgid "bad functional unit for operand %u of '%.*s'"
 msgstr "väärä toiminnallinen yksikkö operandille %u kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:1710
+#: config/tc-tic6x.c:1397
 #, c-format
 msgid "bad operand %u of '%.*s'"
 msgstr "Väärä operandi %u kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:1842
+#: config/tc-tic6x.c:1496
 msgid "$DSBT_INDEX must be used with __c6xabi_DSBT_BASE"
 msgstr "$DSBT_INDEX on käytettävä kohteen __c6xabi_DSBT_BASE kanssa"
 
-#: config/tc-tic6x.c:1882
+#: config/tc-tic6x.c:1535
 msgid "$DSBT_INDEX not supported in this context"
 msgstr "$DSBT_INDEX ei tueta tässä konteksissa"
 
-#: config/tc-tic6x.c:1895
+#: config/tc-tic6x.c:1548
 msgid "$GOT not supported in this context"
 msgstr "$GOT ei tueta tässä konteksissa"
 
-#: config/tc-tic6x.c:1912
+#: config/tc-tic6x.c:1565
 msgid "$DPR_GOT not supported in this context"
 msgstr "$DPR_GOT ei tueta tässä konteksissa"
 
-#: config/tc-tic6x.c:1933
+#: config/tc-tic6x.c:1586
 msgid "$DPR_BYTE not supported in this context"
 msgstr "$DPR_BYTE ei tueta tässä konteksissa"
 
-#: config/tc-tic6x.c:1950
+#: config/tc-tic6x.c:1603
 msgid "$DPR_HWORD not supported in this context"
 msgstr "$DPR_HWORD ei tueta tässä konteksissa"
 
-#: config/tc-tic6x.c:1967
+#: config/tc-tic6x.c:1620
 msgid "$DPR_WORD not supported in this context"
 msgstr "$DPR_WORD ei tueta tässä konteksissa"
 
-#: config/tc-tic6x.c:1986
-msgid "$PCR_OFFSET not supported in this context"
-msgstr "$PCR_OFFSET ei tueta tässä konteksissa"
-
-#: config/tc-tic6x.c:1997
+#: config/tc-tic6x.c:1631
 msgid "invalid PC-relative operand"
 msgstr "virheellinen ohjelmalaskurisuhteellinen operandi"
 
-#: config/tc-tic6x.c:2035
+#: config/tc-tic6x.c:1668
 #, c-format
 msgid "no %d-byte relocations available"
 msgstr "ei %d-tavuista sijoitusta saatavilla"
 
-#: config/tc-tic6x.c:2522 config/tc-tic6x.c:2553 config/tc-tic6x.c:2571
-#: config/tc-tic6x.c:2977 config/tc-tic6x.c:2996 config/tc-tic6x.c:3028
+#: config/tc-tic6x.c:2146 config/tc-tic6x.c:2177 config/tc-tic6x.c:2195
+#: config/tc-tic6x.c:2601 config/tc-tic6x.c:2620 config/tc-tic6x.c:2652
 #, c-format
 msgid "operand %u of '%.*s' out of range"
 msgstr "operandi %u kohteessa ’%.*s’ on lukualueen ulkopuolella"
 
-#: config/tc-tic6x.c:2615 config/tc-tic6x.c:2816
+#: config/tc-tic6x.c:2239 config/tc-tic6x.c:2440
 #, c-format
 msgid "offset in operand %u of '%.*s' not divisible by %u"
 msgstr "siirrososoite operandissa %u kohteessa ’%.*s’ ei ole jaettava arvolla %u"
 
-#: config/tc-tic6x.c:2808 config/tc-tic6x.c:2841
+#: config/tc-tic6x.c:2432 config/tc-tic6x.c:2465
 #, c-format
 msgid "offset in operand %u of '%.*s' out of range"
 msgstr "siirrososoite operandissa %u kohteessa ’%.*s’ on lukualueen ulkopuolella"
 
-#: config/tc-tic6x.c:2923
+#: config/tc-tic6x.c:2547
 #, c-format
 msgid "functional unit already masked for operand %u of '%.*s'"
 msgstr "toiminnallinen yksikkö on jo peitetty operandille %u kohteessa ’%.*s’"
 
-#: config/tc-tic6x.c:2947 config/tc-tic6x.c:3706
+#: config/tc-tic6x.c:2571 config/tc-tic6x.c:3330
 #, c-format
 msgid "'%.*s' instruction not in a software pipelined loop"
 msgstr "’%.*s’-käsky ei ole ohjelmistoliukuhihnasilmukassa"
 
-#: config/tc-tic6x.c:3046
+#: config/tc-tic6x.c:2670
 #, c-format
 msgid "instruction '%.*s' cannot be predicated"
 msgstr "käsky ’%.*s’ ei voi olla predikaattina"
 
-#: config/tc-tic6x.c:3175
+#: config/tc-tic6x.c:2799
 #, c-format
 msgid "unknown opcode '%s'"
 msgstr "tuntematon käskykoodi ’%s’"
 
-#: config/tc-tic6x.c:3314
+#: config/tc-tic6x.c:2938
 #, c-format
 msgid "'%.*s' instruction not supported on this architecture"
 msgstr "’%.*s’-käskyä ei tueta tässä arkkitehtuurissa"
 
-#: config/tc-tic6x.c:3322
+#: config/tc-tic6x.c:2946
 #, c-format
 msgid "'%.*s' instruction not supported on this functional unit"
 msgstr "’%.*s’-käskyä ei tueta tässä toiminnallisessa yksikössä"
 
-#: config/tc-tic6x.c:3330
+#: config/tc-tic6x.c:2954
 #, c-format
 msgid "'%.*s' instruction not supported on this functional unit for this architecture"
 msgstr "’%.*s’-käskyä ei tueta tässä toiminnallisessa yksikössä tälle arkkitehtuurille"
 
-#: config/tc-tic6x.c:3350
+#: config/tc-tic6x.c:2974
 msgid "missing operand after comma"
 msgstr "puuttuva operandi pilkun jälkeen"
 
-#: config/tc-tic6x.c:3358 config/tc-tic6x.c:3376
+#: config/tc-tic6x.c:2982 config/tc-tic6x.c:3000
 #, c-format
 msgid "too many operands to '%.*s'"
 msgstr "liian monia operandeja kohteeseen ’%.*s’"
 
-#: config/tc-tic6x.c:3389
+#: config/tc-tic6x.c:3013
 #, c-format
 msgid "bad number of operands to '%.*s'"
 msgstr "väärä operandien lukumäärä kohteelle ’%.*s’"
 
-#: config/tc-tic6x.c:3461
+#: config/tc-tic6x.c:3085
 #, c-format
 msgid "operand %u of '%.*s' not constant"
 msgstr "operandi %u kohteessa ’%.*s’ ei ole vakio"
 
-#: config/tc-tic6x.c:3466
+#: config/tc-tic6x.c:3090
 #, c-format
 msgid "operand %u of '%.*s' on wrong side"
 msgstr "operandin %u kohteessa ’%.*s’ on väärällä puolella"
 
-#: config/tc-tic6x.c:3471
+#: config/tc-tic6x.c:3095
 #, c-format
 msgid "operand %u of '%.*s' not a valid return address register"
 msgstr "operandi %u kohteessa ’%.*s’ ei ole kelvollinen paluuosoiterekisteri"
 
-#: config/tc-tic6x.c:3477
+#: config/tc-tic6x.c:3101
 #, c-format
 msgid "operand %u of '%.*s' is write-only"
 msgstr "operandi %u kohteessa ’%.*s’ vain kirjoitettava"
 
-#: config/tc-tic6x.c:3482
+#: config/tc-tic6x.c:3106
 #, c-format
 msgid "operand %u of '%.*s' is read-only"
 msgstr "operandi %u kohteessa ’%.*s’ on kirjoitussuojattu"
 
-#: config/tc-tic6x.c:3487
+#: config/tc-tic6x.c:3111
 #, c-format
 msgid "operand %u of '%.*s' not a valid memory reference"
 msgstr "operandi %u kohteessa ’%.*s’ ei ole kelvollinen muistiviite"
 
-#: config/tc-tic6x.c:3493
+#: config/tc-tic6x.c:3117
 #, c-format
 msgid "operand %u of '%.*s' not a valid base address register"
 msgstr "operandi %u kohteessa ’%.*s’ ei ole kelvollinen perusosoiterekisteri"
 
-#: config/tc-tic6x.c:3579
+#: config/tc-tic6x.c:3203
 #, c-format
 msgid "bad operand combination for '%.*s'"
 msgstr "väärä operandiyhdistelmä kohteelle ’%.*s’"
 
-#: config/tc-tic6x.c:3625
+#: config/tc-tic6x.c:3249
 msgid "parallel instruction not following another instruction"
 msgstr "rinnakkaiskäsky ei seuraa toista käskyä"
 
-#: config/tc-tic6x.c:3631
+#: config/tc-tic6x.c:3255
 msgid "too many instructions in execute packet"
 msgstr "liian monta käskyä suorituspaketissa"
 
-#: config/tc-tic6x.c:3636
+#: config/tc-tic6x.c:3260
 msgid "label not at start of execute packet"
 msgstr "nimiö ei ole suorituspaketin alussa"
 
-#: config/tc-tic6x.c:3639
+#: config/tc-tic6x.c:3263
 #, c-format
 msgid "'%.*s' instruction not at start of execute packet"
 msgstr "’%.*s’-käsky ei ole suorituspaketin alussa"
 
-#: config/tc-tic6x.c:3687
+#: config/tc-tic6x.c:3311
 msgid "functional unit already used in this execute packet"
 msgstr "toiminnallista yksikköä käytetään jo tässä suorituspaketissa"
 
-#: config/tc-tic6x.c:3695
+#: config/tc-tic6x.c:3319
 msgid "nested software pipelined loop"
 msgstr "sisäkkäinen ohjelmistoliukuhihnasilmukka"
 
-#: config/tc-tic6x.c:3714
+#: config/tc-tic6x.c:3338
 msgid "'||^' without previous SPMASK"
 msgstr "’||^’ ilman edeltävää SPMASK-määrittelyä"
 
-#: config/tc-tic6x.c:3716
+#: config/tc-tic6x.c:3340
 msgid "cannot mask instruction using no functional unit"
 msgstr "ei voida peittää käskyä käyttäen ei-toiminnallista yksikköä"
 
-#: config/tc-tic6x.c:3728
+#: config/tc-tic6x.c:3352
 msgid "functional unit already masked"
 msgstr "toiminnallinen yksikkö on jo peitetty"
 
-#: config/tc-tic6x.c:3793
+#: config/tc-tic6x.c:3416
 msgid "value too large for 2-byte field"
 msgstr "arvo liian suuri 2-tavuiselle kentälle"
 
-#: config/tc-tic6x.c:3803
+#: config/tc-tic6x.c:3426
 msgid "value too large for 1-byte field"
 msgstr "arvo liian suuri 1-tavuiselle kentälle"
 
-#: config/tc-tic6x.c:3841 config/tc-tic6x.c:3906 config/tc-tic6x.c:3933
-#: config/tc-tic6x.c:3961
+#: config/tc-tic6x.c:3464 config/tc-tic6x.c:3516 config/tc-tic6x.c:3543
+#: config/tc-tic6x.c:3571
 msgid "immediate offset out of range"
 msgstr "välitön siirrosoite on lukualueen ulkopuolella"
 
-#: config/tc-tic6x.c:3930
+#: config/tc-tic6x.c:3540
 msgid "immediate offset not 2-byte-aligned"
 msgstr "välitön siirrososoite ei ole 2-tavutasattu"
 
-#: config/tc-tic6x.c:3958
+#: config/tc-tic6x.c:3568
 msgid "immediate offset not 4-byte-aligned"
 msgstr "välitön siirrososoite ei ole 4-tavutasattu"
 
-#: config/tc-tic6x.c:3972
+#: config/tc-tic6x.c:3582
 msgid "addend used with $DSBT_INDEX"
 msgstr "yhteenlaskettavaa käytetty kohteen $DSBT_INDEX kanssa"
 
-#: config/tc-tic6x.c:3986 config/tc-tic6x.c:4004 config/tc-tic6x.c:4022
-#: config/tc-tic6x.c:4040
+#: config/tc-tic6x.c:3596 config/tc-tic6x.c:3614 config/tc-tic6x.c:3632
+#: config/tc-tic6x.c:3650
 msgid "PC-relative offset not 4-byte-aligned"
 msgstr "Ohjelmalaskurisuhteellinen siirrososoite ei ole 4-tavutasattu"
 
-#: config/tc-tic6x.c:3989 config/tc-tic6x.c:4007 config/tc-tic6x.c:4025
-#: config/tc-tic6x.c:4043
+#: config/tc-tic6x.c:3599 config/tc-tic6x.c:3617 config/tc-tic6x.c:3635
+#: config/tc-tic6x.c:3653
 msgid "PC-relative offset out of range"
 msgstr "Ohjelmalaskurisuhteellinen siirrososoite on lukualueen ulkopuolella"
 
-#: config/tc-tic6x.c:4522
-#, c-format
-msgid "undefined symbol %s in PCR relocation"
-msgstr "määrittelemätön symboli �%s� PCR-sijoituksessa"
-
-#: config/tc-tic6x.c:4640
-#, c-format
-msgid "group section `%s' has no group signature"
-msgstr "ryhmälohkolla �%s� ei ole ryhmätunnistetta"
-
-#: config/tc-tic6x.c:4791
-msgid "missing .endp before .cfi_startproc"
-msgstr "puuttuva �.endp� ennen �.cfi_startproc�-direktiiviä"
-
-#: config/tc-tic6x.c:4895
-msgid "stack pointer offset too large for personality routine"
-msgstr "pino-osoitinsiirrososoite liian suuri henkilöllisyysrutiinille"
-
-#: config/tc-tic6x.c:4902
-msgid "stack frame layout does not match personality routine"
-msgstr "pinokehyssijoittelu ei täsmää henkilöllisyysrutiiniin"
-
-#: config/tc-tic6x.c:5036
-msgid "too many unwinding instructions"
-msgstr "liian monia unwinding-käskyjä"
-
-#: config/tc-tic6x.c:5111 config/tc-tic6x.c:5124 config/tc-tic6x.c:5132
-#, c-format
-msgid "unable to generate unwinding opcode for reg %d"
-msgstr "ei kyetä tuottamaan unwinding-käskykoodia rekisterille %d"
-
-#: config/tc-tic6x.c:5141
-msgid "unable to restore return address from previously restored reg"
-msgstr "ei kyetä palauttamaan paluuosoitetta aiemmin palautetusta rekisteristä"
-
-#: config/tc-tic6x.c:5153
-#, c-format
-msgid "unhandled CFA insn for unwinding (%d)"
-msgstr "käsittelemätön CFA-käsky unwinding (%d) -toiminnolle"
-
-#: config/tc-tic6x.c:5163
-#, c-format
-msgid "unable to generate unwinding opcode for frame pointer reg %d"
-msgstr "ei kyetä tuottamaan unwinding-käskykoodia kehysosoitinrekisterille %d"
-
-#: config/tc-tic6x.c:5172
-msgid "unable to generate unwinding opcode for frame pointer offset"
-msgstr "ei kyetä tuottamaan unwinding-käskykoodia kehysosoitinsiirrososoitteelle"
-
-#: config/tc-tic6x.c:5181
-msgid "unwound stack pointer not doubleword aligned"
-msgstr "unwound-pino-osoitin ei ole doubleword-tasattu"
-
-#: config/tc-tic6x.c:5326
-msgid "stack frame layout too complex for unwinder"
-msgstr "pinokehyssijoittelu liian mutkikas unwinder-toiminnolle"
-
-#: config/tc-tic6x.c:5343
-msgid "unwound frame has negative size"
-msgstr "unwound-kehyksellä on negatiivinen koko"
-
 #: config/tc-v850.c:286
 #, c-format
 msgid ".COMMon length (%d.) < 0! Ignored."
@@ -14678,8 +14438,9 @@ msgstr "järjestelmärekistereitä ei voida sisällyttää luetteloon"
 msgid "second register should follow dash in register list"
 msgstr "toisen rekisterin pitäisi seurata väliviivaa rekisteriluettelossa"
 
+#  Tässä pitäisi kai lukea than
 #: config/tc-v850.c:1279
-msgid "second register should be greater than first register"
+msgid "second register should greater tahn first register"
 msgstr "toisen rekisterin pitäisi olla suurempi kuin ensimmäisen rekisterin"
 
 #: config/tc-v850.c:1327
@@ -15736,7 +15497,7 @@ msgstr "lohko %s nimetty uudelleen useita kertoja"
 #: config/tc-xtensa.c:12021
 #, c-format
 msgid "multiple sections remapped to output section %s"
-msgstr "useita lohkoja kuvattu uudelleen tulostelohkoon %s"
+msgstr "useita lohkoja kartoitettu uudelleen tulostelohkoon %s"
 
 #: config/tc-z80.c:244
 msgid "-- unterminated string"
@@ -15762,45 +15523,41 @@ msgstr "virheellinen lausekesyntaksi"
 msgid "cannot make a relative jump to an absolute location"
 msgstr "ei voida tehdä suhteellista hyppyä absoluuttiseen sijaintiin"
 
-#: config/tc-z80.c:695
-msgid "offset too large"
-msgstr "siirrososoite on liian iso"
-
-#: config/tc-z80.c:697 config/tc-z80.c:1964
+#: config/tc-z80.c:697 config/tc-z80.c:1955
 msgid "overflow"
 msgstr "ylivuoto"
 
-#: config/tc-z80.c:1069 config/tc-z80.c:1112 config/tc-z80.c:1156
-#: config/tc-z80.c:1276 config/tc-z80.c:1330 config/tc-z80.c:1599
+#: config/tc-z80.c:1065 config/tc-z80.c:1108 config/tc-z80.c:1152
+#: config/tc-z80.c:1272 config/tc-z80.c:1326 config/tc-z80.c:1595
 msgid "bad intruction syntax"
 msgstr "virheellinen käskysyntaksi"
 
-#: config/tc-z80.c:1202
+#: config/tc-z80.c:1198
 msgid "condition code invalid for jr"
 msgstr "ehtokoodi virheellinen kohteelle jr"
 
-#: config/tc-z80.c:1224
+#: config/tc-z80.c:1220
 msgid "bad instruction syntax"
 msgstr "virheellinen käskysyntaksi"
 
-#: config/tc-z80.c:1708
+#: config/tc-z80.c:1699
 msgid "parentheses ignored"
 msgstr "sulkeita ei otettu huomioon"
 
-#: config/tc-z80.c:1913 read.c:3603
+#: config/tc-z80.c:1904 read.c:3617
 #, c-format
 msgid "junk at end of line, first unrecognized character is `%c'"
 msgstr "roskaa rivin lopussa, ensimmäinen tunnistamaton merkki on �%c�"
 
-#: config/tc-z80.c:1939 config/tc-z8k.c:1461 config/tc-z8k.c:1524
+#: config/tc-z80.c:1930 config/tc-z8k.c:1461 config/tc-z8k.c:1524
 msgid "relative jump out of range"
 msgstr "suhteellinen hyppy lukualueen ulkopuolella"
 
-#: config/tc-z80.c:1956
+#: config/tc-z80.c:1947
 msgid "index offset  out of range"
 msgstr "indeksisiirrososoite lukualueen ulkopuolella"
 
-#: config/tc-z80.c:1998 config/tc-z8k.c:1532
+#: config/tc-z80.c:1989 config/tc-z8k.c:1532
 #, c-format
 msgid "md_apply_fix: unknown r_type 0x%x\n"
 msgstr "md_apply_fix: tuntematon r_type 0x%x\n"
@@ -16016,119 +15773,110 @@ msgstr "ei voitu jäsentää INSN_REPL ’%s’"
 msgid "could not build transition for %s => %s"
 msgstr "ei voitu rakentaa siirtö kohteelle %s => %s"
 
-#: depend.c:195
+#: depend.c:194
 #, c-format
 msgid "can't open `%s' for writing"
 msgstr "ei voida avata �%s� kirjoittamista varten"
 
-#: depend.c:207
+#: depend.c:206
 #, c-format
 msgid "can't close `%s'"
 msgstr "ei voida sulkea �%s�"
 
-#: dw2gencfi.c:199 read.c:2272
-#, c-format
-msgid "bfd_set_section_flags: %s"
-msgstr "bfd_set_section_flags: %s"
-
-#: dw2gencfi.c:457
+#: dw2gencfi.c:329
 #, c-format
 msgid "register save offset not a multiple of %u"
 msgstr "rekisterin tallennussiirrososoite ei ole %u:n monikerta"
 
-#: dw2gencfi.c:540
+#: dw2gencfi.c:412
 msgid "CFI state restore without previous remember"
 msgstr "CFI-tila palautettu ilman edeltävää muistettavaa"
 
-#: dw2gencfi.c:589
+#: dw2gencfi.c:469
 msgid "missing separator"
 msgstr "puuttuva erotin"
 
-#: dw2gencfi.c:639
+#: dw2gencfi.c:519
 msgid "bad register expression"
 msgstr "virheellinen rekisterilauseke"
 
-#: dw2gencfi.c:660 dw2gencfi.c:783 dw2gencfi.c:821 dw2gencfi.c:891
-#: dw2gencfi.c:963
+#: dw2gencfi.c:540 dw2gencfi.c:663 dw2gencfi.c:701 dw2gencfi.c:771
+#: dw2gencfi.c:843
 msgid "CFI instruction used without previous .cfi_startproc"
 msgstr "CFI-käskyä käytetty ilman edeltävää �.cfi_startproc�"
 
-#: dw2gencfi.c:845
+#: dw2gencfi.c:725
 msgid "invalid or unsupported encoding in .cfi_personality"
 msgstr "virheellinen tai tukematon koodaus kohteessa �.cfi_personality�"
 
-#: dw2gencfi.c:852
+#: dw2gencfi.c:732
 msgid ".cfi_personality requires encoding and symbol arguments"
 msgstr ".cfi_personality vaatii koodauksen ja symboliargumentit"
 
-#: dw2gencfi.c:875
+#: dw2gencfi.c:755
 msgid "wrong second argument to .cfi_personality"
 msgstr "väärä toinen argumentti kohteeseen �.cfi_personality�"
 
-#: dw2gencfi.c:915 dw2gencfi.c:991
+#: dw2gencfi.c:795 dw2gencfi.c:871
 msgid "invalid or unsupported encoding in .cfi_lsda"
 msgstr "virheellinen tai ei-tuettu koodaus kohteessa �.cfi_lsda�"
 
-#: dw2gencfi.c:922
+#: dw2gencfi.c:802
 msgid ".cfi_lsda requires encoding and symbol arguments"
 msgstr "�.cfi_lsda� vaatii koodauksen ja symboliargumentit"
 
-#: dw2gencfi.c:947
+#: dw2gencfi.c:827
 msgid "wrong second argument to .cfi_lsda"
 msgstr "väärä toinen argumentti kohteeseen �.cfi_lsda�"
 
-#: dw2gencfi.c:1012
+#: dw2gencfi.c:892
 msgid "wrong third argument to .cfi_val_encoded_addr"
 msgstr "väärä kolmas argumentti kohteeseen �.cfi_val_encoded_addr�"
 
-#: dw2gencfi.c:1083
+#: dw2gencfi.c:957
 msgid "previous CFI entry not closed (missing .cfi_endproc)"
 msgstr "edellinen CFI-tulokohta ei ole suljettu (puuttuva �.cfi_endproc�)"
 
-#: dw2gencfi.c:1123
+#: dw2gencfi.c:992
 msgid ".cfi_endproc without corresponding .cfi_startproc"
 msgstr "�.cfi_endproc� ilman vastaavaa �.cfi_startproc�"
 
-#: dw2gencfi.c:1920 dw2gencfi.c:1983
+#: dw2gencfi.c:1709 dw2gencfi.c:1746
 msgid "open CFI at the end of file; missing .cfi_endproc directive"
 msgstr "avaa CFI tiedoston lopussa: puuttuva �.cfi_endproc�-direktiivi"
 
-#: dw2gencfi.c:2009
-msgid "CFI is not supported for this target"
-msgstr "CFI ei ole tuettu tälle kohteelle"
-
-#: dwarf2dbg.c:552 dwarf2dbg.c:587
+#: dwarf2dbg.c:548 dwarf2dbg.c:583
 msgid "file number less than one"
 msgstr "tiedostonumero on pienempi kuin yksi"
 
-#: dwarf2dbg.c:562
+#: dwarf2dbg.c:558
 #, c-format
 msgid "file number %ld already allocated"
 msgstr "tiedostonumero %ld on jo varattu"
 
-#: dwarf2dbg.c:592 dwarf2dbg.c:1345
+#: dwarf2dbg.c:588 dwarf2dbg.c:1341
 #, c-format
 msgid "unassigned file number %ld"
 msgstr "liittämätön tiedostonumero %ld"
 
-#: dwarf2dbg.c:661
+#: dwarf2dbg.c:657
 msgid "is_stmt value not 0 or 1"
 msgstr "�is_stmt�-arvo ei ole 0 eikä 1"
 
-#: dwarf2dbg.c:673
+#: dwarf2dbg.c:669
 msgid "isa number less than zero"
 msgstr "�isa�-numero pienempi kuin nolla"
 
-#: dwarf2dbg.c:685
+#: dwarf2dbg.c:681
 msgid "discriminator less than zero"
 msgstr "erottelija pienempi kuin nolla"
 
-#: dwarf2dbg.c:691
+#: dwarf2dbg.c:687
 #, c-format
 msgid "unknown .loc sub-directive `%s'"
 msgstr "tuntematon �.loc sub�-direktiivi �%s�"
 
-#: dwarf2dbg.c:1408
+#: dwarf2dbg.c:1404
 msgid "internal error: unknown dwarf2 format"
 msgstr "sisäinen virhe: tuntematon dwarf2-muoto"
 
@@ -16317,11 +16065,11 @@ msgstr "puuttuva �.end� tai �.bend� tiedoston lopussa"
 msgid "GP prologue size exceeds field size, using 0 instead"
 msgstr "GP-esitoimikoko ylittää kenttäkoon, käytetään sen sijaan arvoa 0"
 
-#: expr.c:87 read.c:3668
+#: expr.c:87 read.c:3682
 msgid "bignum invalid"
 msgstr "bignum-liukuluku on virheellinen"
 
-#: expr.c:89 read.c:3670 read.c:4147 read.c:5031
+#: expr.c:89 read.c:3684 read.c:4161 read.c:5045
 msgid "floating point number invalid"
 msgstr "liukulukunumero on virheellinen"
 
@@ -16359,58 +16107,58 @@ msgstr "merkkivakio on liian suuri"
 msgid "expr.c(operand): bad atof_generic return val %d"
 msgstr "expr.c(operandi): virheellinen �atof_generic�-paluuarvo %d"
 
-#: expr.c:966
+#: expr.c:969
 #, c-format
 msgid "missing '%c'"
 msgstr "�%c� puuttuu"
 
-#: expr.c:977 read.c:4513
+#: expr.c:980 read.c:4527
 msgid "EBCDIC constants are not supported"
 msgstr "EBCDIC-vakiot eivät ole tuettuja"
 
-#: expr.c:1099
+#: expr.c:1102
 #, c-format
 msgid "Unary operator %c ignored because bad operand follows"
 msgstr "Unaari-operaattoria %c ei otettu huomioon koska sitä seuraa virheellinen operandi"
 
-#: expr.c:1145 expr.c:1170
+#: expr.c:1148 expr.c:1173
 msgid "syntax error in .startof. or .sizeof."
 msgstr "syntaksivirhe kohteessa �.startof.� tai �.sizeof.�"
 
-#: expr.c:1251 expr.c:1612
+#: expr.c:1254 expr.c:1608
 #, c-format
 msgid "invalid use of operator \"%s\""
 msgstr "virheellinen operaattorin �%s� käyttö"
 
-#: expr.c:1757
+#: expr.c:1753
 msgid "missing operand; zero assumed"
 msgstr "operandi puuttuu: nolla otaksuttu"
 
-#: expr.c:1796
+#: expr.c:1792
 msgid "left operand is a bignum; integer 0 assumed"
 msgstr "vasen operandi on bignum-liukuluku: kokonaisluku 0 otaksuttu"
 
-#: expr.c:1798
+#: expr.c:1794
 msgid "left operand is a float; integer 0 assumed"
 msgstr "vasen operandi on float-liukuluku: kokonaisluku 0 otaksuttu"
 
-#: expr.c:1807
+#: expr.c:1803
 msgid "right operand is a bignum; integer 0 assumed"
 msgstr "oikea operandi on bignum-liukuluku: kokonaisluku 0 otaksuttu"
 
-#: expr.c:1809
+#: expr.c:1805
 msgid "right operand is a float; integer 0 assumed"
 msgstr "oikea operandi on float-liukuluku: kokonaisluku 0 otaksuttu"
 
-#: expr.c:1879 symbols.c:1379
+#: expr.c:1873 symbols.c:1358
 msgid "division by zero"
 msgstr "jako nollalla"
 
-#: expr.c:1885
+#: expr.c:1879
 msgid "shift count"
 msgstr "sivuttaissiirtolaskuri"
 
-#: expr.c:2002
+#: expr.c:1993
 msgid "operation combines symbols in different segments"
 msgstr "toiminto yhdistää symboleja eri segmenteissä"
 
@@ -16422,7 +16170,7 @@ msgstr "yritys varata tietoja absoluuttisessa lohkossa"
 msgid "attempt to allocate data in common section"
 msgstr "yritys varata tietoja yhteislohkossa"
 
-#: frags.c:112 write.c:1379
+#: frags.c:112 write.c:1372
 #, c-format
 msgid "can't extend frag %u chars"
 msgstr "ei voi laajentaa frag %u merkkiä"
@@ -16439,7 +16187,7 @@ msgstr "ei voi laajentaa frag %u merkkiä"
 #. line here (assuming of course that we actually have a line of
 #. input to read), so that it can be displayed in the listing
 #. that is produced at the end of the assembly.
-#: input-file.c:138 input-scrub.c:243 listing.c:338
+#: input-file.c:138 input-scrub.c:243 listing.c:337
 msgid "{standard input}"
 msgstr "{vakiosyöte}"
 
@@ -16448,12 +16196,12 @@ msgstr "{vakiosyöte}"
 msgid "can't open %s for reading: %s"
 msgstr "ei voi avata %s kohteen: %s lukemiseen"
 
-#: input-file.c:152 input-file.c:227 input-file.c:259
+#: input-file.c:152 input-file.c:215 input-file.c:241
 #, c-format
 msgid "can't read from %s: %s"
 msgstr "ei voi lukea kohteesta %s: %s"
 
-#: input-file.c:267 listing.c:1397 output-file.c:69
+#: input-file.c:249 listing.c:1396 output-file.c:69
 #, c-format
 msgid "can't close %s: %s"
 msgstr "ei voi sulkea %s: %s"
@@ -16462,7 +16210,7 @@ msgstr "ei voi sulkea %s: %s"
 msgid "macros nested too deeply"
 msgstr "makrot liian syvästi sisäkkäin"
 
-#: input-scrub.c:379 input-scrub.c:403
+#: input-scrub.c:377 input-scrub.c:401
 msgid "partial line at end of file ignored"
 msgstr "osittaista riviä tiedoston lopussa ei otettu huomioon"
 
@@ -16471,15 +16219,15 @@ msgstr "osittaista riviä tiedoston lopussa ei otettu huomioon"
 msgid "Unable to allocate memory for new instructions\n"
 msgstr "Ei voi varata muistia uusille käskyille\n"
 
-#: listing.c:244
+#: listing.c:243
 msgid "Warning:"
 msgstr "Varoitus:"
 
-#: listing.c:250
+#: listing.c:249
 msgid "Error:"
 msgstr "Virhe:"
 
-#: listing.c:1283
+#: listing.c:1282
 #, c-format
 msgid ""
 "\n"
@@ -16490,12 +16238,12 @@ msgstr ""
 " aikaleima     \t: %s\n"
 "\n"
 
-#: listing.c:1293
+#: listing.c:1292
 #, c-format
 msgid "%s "
 msgstr "%s "
 
-#: listing.c:1298
+#: listing.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -16504,7 +16252,7 @@ msgstr ""
 "\n"
 "\t%s "
 
-#: listing.c:1308
+#: listing.c:1307
 msgid ""
 "\n"
 " options passed\t: "
@@ -16512,7 +16260,7 @@ msgstr ""
 "\n"
 " valitsimet välitetty\t: "
 
-#: listing.c:1347
+#: listing.c:1346
 #, c-format
 msgid ""
 " GNU assembler version %s (%s)\n"
@@ -16521,7 +16269,7 @@ msgstr ""
 "GNU assembleriversio %s (%s)\n"
 "\t käyttää BFD-versiota %s."
 
-#: listing.c:1350
+#: listing.c:1349
 #, c-format
 msgid ""
 "\n"
@@ -16530,7 +16278,7 @@ msgstr ""
 "\n"
 " syötetiedosto \t: %s"
 
-#: listing.c:1351
+#: listing.c:1350
 #, c-format
 msgid ""
 "\n"
@@ -16539,7 +16287,7 @@ msgstr ""
 "\n"
 " tulostetiedosto\t: %s"
 
-#: listing.c:1352
+#: listing.c:1351
 #, c-format
 msgid ""
 "\n"
@@ -16548,16 +16296,16 @@ msgstr ""
 "\n"
 " kohde         \t: %s"
 
-#: listing.c:1376
+#: listing.c:1375
 #, c-format
 msgid "can't open %s: %s"
 msgstr "ei voi avata %s: %s"
 
-#: listing.c:1461
+#: listing.c:1460
 msgid "strange paper height, set to no form"
 msgstr "outo paperikorkeus, aseta arvoon �no form�"
 
-#: listing.c:1525
+#: listing.c:1524
 msgid "new line in title"
 msgstr "rivinvaihto otsakkeessa"
 
@@ -16567,101 +16315,101 @@ msgstr "rivinvaihto otsakkeessa"
 msgid "% operator needs absolute expression"
 msgstr "% operaattori tarvitsee absoluuttilausekkeen"
 
-#: macro.c:516
+#: macro.c:512
 #, c-format
 msgid "Missing parameter qualifier for `%s' in macro `%s'"
 msgstr "Puuttuva parametrimääre kohteelle �%s� makrossa �%s�"
 
-#: macro.c:526
+#: macro.c:522
 #, c-format
 msgid "`%s' is not a valid parameter qualifier for `%s' in macro `%s'"
 msgstr "�%s� ei ole kelvollinen parametrimääre kohteelle �%s� makrossa �%s�"
 
-#: macro.c:543
+#: macro.c:539
 #, c-format
 msgid "Pointless default value for required parameter `%s' in macro `%s'"
 msgstr "Pisteetön oletusarvo vaaditulle parametrille �%s� makrossa �%s�"
 
-#: macro.c:555
+#: macro.c:551
 #, c-format
 msgid "A parameter named `%s' already exists for macro `%s'"
 msgstr "Parametri nimeltään �%s� on jo makrolle �%s�"
 
-#: macro.c:592
+#: macro.c:588
 #, c-format
 msgid "Reserved word `%s' used as parameter in macro `%s'"
 msgstr "Varattua sanaa �%s� käytetty parametrina makrossa �%s�"
 
-#: macro.c:650
+#: macro.c:646
 #, c-format
 msgid "unexpected end of file in macro `%s' definition"
 msgstr "odottamaton tiedostoloppu makron �%s� määrittelyssä"
 
-#: macro.c:662
+#: macro.c:658
 #, c-format
 msgid "missing `)' after formals in macro definition `%s'"
 msgstr "puuttuva �)� muodollisen makromäärittelyn �%s� jälkeen"
 
-#: macro.c:677
+#: macro.c:673
 msgid "Missing macro name"
 msgstr "Makronimi puuttuu"
 
-#: macro.c:686
+#: macro.c:682
 #, c-format
 msgid "Bad parameter list for macro `%s'"
 msgstr "Virheellinen parametriluettelo makrolle �%s�"
 
-#: macro.c:692
+#: macro.c:688
 #, c-format
 msgid "Macro `%s' was already defined"
 msgstr "Makro �%s� oli jo määritelty"
 
-#: macro.c:816 macro.c:818
+#: macro.c:812 macro.c:814
 msgid "missing `)'"
 msgstr "’)’ puuttuu"
 
-#: macro.c:915
+#: macro.c:911
 #, c-format
 msgid "`%s' was already used as parameter (or another local) name"
 msgstr "�%s� oli jo käytetty parametrinimenä (tai muuna paikallisena nimenä)"
 
-#: macro.c:1073
+#: macro.c:1069
 msgid "confusion in formal parameters"
 msgstr "epäselvyyttä muodollisissa parametreissa"
 
-#: macro.c:1081
+#: macro.c:1077
 #, c-format
 msgid "Parameter named `%s' does not exist for macro `%s'"
 msgstr "Parametria nimeltään �%s� ei ole jo olemassa makrolle �%s�"
 
-#: macro.c:1092
+#: macro.c:1088
 #, c-format
 msgid "Value for parameter `%s' of macro `%s' was already specified"
 msgstr "Arvo parametrille �%s� makrossa �%s� oli jo määritelty"
 
-#: macro.c:1106
+#: macro.c:1102
 msgid "can't mix positional and keyword arguments"
 msgstr "ei voi sekoittaa sijainti- ja avainsana-argumentteja"
 
-#: macro.c:1117
+#: macro.c:1113
 msgid "too many positional arguments"
 msgstr "liian monta sijoitusargumenttia"
 
-#: macro.c:1165
+#: macro.c:1161
 #, c-format
 msgid "Missing value for required parameter `%s' of macro `%s'"
 msgstr "Puuttuva arvo vaaditulle parametrille �%s� makrossa �%s�"
 
-#: macro.c:1284
+#: macro.c:1280
 #, c-format
 msgid "Attempt to purge non-existant macro `%s'"
 msgstr "Yritys poistaa ei-olemassaoleva makro �%s�"
 
-#: macro.c:1303
+#: macro.c:1299
 msgid "unexpected end of file in irp or irpc"
 msgstr "odottamaton tiedoston loppu kohteissa �irp� tai �irpc�"
 
-#: macro.c:1311
+#: macro.c:1307
 msgid "missing model parameter"
 msgstr "malliparametri puuttuu"
 
@@ -16670,63 +16418,63 @@ msgstr "malliparametri puuttuu"
 msgid "Assembler messages:\n"
 msgstr "Assembleriviestit:\n"
 
-#: messages.c:160
+#: messages.c:150
 #, c-format
 msgid "Warning: "
 msgstr "Varoitus: "
 
-#: messages.c:226
+#: messages.c:211
 #, c-format
 msgid "Error: "
 msgstr "Virhe: "
 
-#: messages.c:282
+#: messages.c:267
 #, c-format
 msgid "Fatal error: "
 msgstr "Kohtalokas virhe: "
 
-#: messages.c:300
+#: messages.c:285
 #, c-format
 msgid "Internal error!\n"
 msgstr "Sisäinen virhe!\n"
 
-#: messages.c:302
+#: messages.c:287
 #, c-format
 msgid "Assertion failure in %s at %s line %d.\n"
 msgstr "Suoritusehtohäiriö kohteessa %s tiedostossa %s rivillä %d.\n"
 
-#: messages.c:305
+#: messages.c:290
 #, c-format
 msgid "Assertion failure at %s line %d.\n"
 msgstr "Suoritusehtohäiriö tiedostossa %s rivillä %d.\n"
 
-#: messages.c:306 messages.c:323
+#: messages.c:291 messages.c:308
 #, c-format
 msgid "Please report this bug.\n"
 msgstr "Ilmoita tästä viasta.\n"
 
-#: messages.c:318
+#: messages.c:303
 #, c-format
 msgid "Internal error, aborting at %s line %d in %s\n"
 msgstr "Sisäinen virhe, virhepoistuminen tiedostossa %s rivillä %d funktiossa %s\n"
 
-#: messages.c:321
+#: messages.c:306
 #, c-format
 msgid "Internal error, aborting at %s line %d\n"
 msgstr "Sisäinen virhe, virhepoistuminen tiedostossa %s rivillä %d\n"
 
-#: messages.c:370
+#: messages.c:355
 #, c-format
 msgid "%s out of domain (%d is not a multiple of %d)"
 msgstr "%s arvoalueen ulkopuolella (%d ei ole %d:n monikerta)"
 
-#: messages.c:388
+#: messages.c:373
 #, c-format
 msgid "%s out of range (%d is not between %d and %d)"
 msgstr "%s lukualueen ulkopuolella (%d ei ole välillä %d...%d)"
 
 #. xgettext:c-format.
-#: messages.c:411
+#: messages.c:396
 #, c-format
 msgid "%s out of range (0x%s is not between 0x%s and 0x%s)"
 msgstr "%s lukualueen ulkopuolella (0x%s ei ole välillä 0x%s...0x%s)"
@@ -16765,29 +16513,29 @@ msgstr "tuntematon näennäiskäskykoodi: �%s�"
 msgid "label \"%d$\" redefined"
 msgstr "nimiö �%d$� määritelty uudelleen"
 
-#: read.c:1221
+#: read.c:1224
 msgid ".abort detected.  Abandoning ship."
 msgstr ".abort havaittu. Jätä laiva."
 
-#: read.c:1239 read.c:2650
+#: read.c:1242 read.c:2661
 msgid "ignoring fill value in absolute section"
 msgstr "ei oteta huomioon täyttöarvoja absoluuttisessa lohkossa"
 
-#: read.c:1330
+#: read.c:1333
 #, c-format
 msgid "alignment too large: %u assumed"
 msgstr "tasaus liian suuri: %u otaksuttu"
 
-#: read.c:1362
+#: read.c:1365
 msgid "expected fill pattern missing"
 msgstr "odotettu täytemalli puuttuu"
 
-#: read.c:1471
+#: read.c:1474
 #, c-format
 msgid "size (%ld) out of range, ignored"
 msgstr "koko (%ld) lukualueen ulkopuolella, ei oteta huomioon"
 
-#: read.c:1500
+#: read.c:1503
 #, c-format
 msgid "size of \"%s\" is already %ld; not changing to %ld"
 msgstr "�%s�:n koko on jo %ld: ei muutosta arvoon %ld"
@@ -16801,332 +16549,341 @@ msgstr "�%s�:n koko on jo %ld: ei muutosta arvoon %ld"
 #. We do not want to barf on this, especially since such files are used
 #. in the GCC and GDB testsuites.  So we check for negative line numbers
 #. rather than non-positive line numbers.
-#: read.c:1742
+#: read.c:1755
 #, c-format
 msgid "line numbers must be positive; line number %d rejected"
 msgstr "rivinumeroiden on oltava positiivisia: rivinumero %d hylätty"
 
-#: read.c:1779
+#: read.c:1792
 #, c-format
 msgid "incompatible flag %i in line directive"
 msgstr "ei-yhteensopiva lippu %i rividirektiivissä"
 
-#: read.c:1791
+#: read.c:1804
 #, c-format
 msgid "unsupported flag %i in line directive"
 msgstr "ei-tuettu lippu %i rividirektiivissä"
 
-#: read.c:1830
+#: read.c:1843
 msgid "start address not supported"
 msgstr "alkuosoitetta ei tuettu"
 
-#: read.c:1839
+#: read.c:1852
 msgid ".err encountered"
 msgstr ".err kohdattu"
 
-#: read.c:1855
+#: read.c:1868
 msgid ".error directive invoked in source file"
 msgstr ".error-direktiiviä kutsuttu lähdekoodissa"
 
-#: read.c:1856
+#: read.c:1869
 msgid ".warning directive invoked in source file"
 msgstr ".warning-direktiiviä kutsuttu lähdekoodissa"
 
-#: read.c:1862
+#: read.c:1875
 #, c-format
 msgid "%s argument must be a string"
 msgstr "%s argumentin on oltava merkkijono"
 
-#: read.c:1894 read.c:1896
+#: read.c:1907 read.c:1909
 #, c-format
 msgid ".fail %ld encountered"
 msgstr ".fail %ld kohdattu"
 
-#: read.c:1936
+#: read.c:1949
 #, c-format
 msgid ".fill size clamped to %d"
 msgstr ".fill-koko puristettu kokoon %d"
 
-#: read.c:1941
+#: read.c:1954
 msgid "size negative; .fill ignored"
 msgstr "koko negatiivinen: �.fill� ei otettu huomioon"
 
-#: read.c:1947
+#: read.c:1960
 msgid "repeat < 0; .fill ignored"
 msgstr "toisto < 0: �.fill� ei otettu huomioon"
 
-#: read.c:2103
+#: read.c:2116
 #, c-format
 msgid "Attribute name not recognised: %s"
 msgstr "Attribuuttinimeä ei tunnisteta: %s"
 
-#: read.c:2118
+#: read.c:2131
 msgid "expected numeric constant"
 msgstr "odotettiin numerovakiota"
 
-#: read.c:2159
+#: read.c:2172
 msgid "bad string constant"
 msgstr "virheellinen merkkijonovakio"
 
-#: read.c:2163
+#: read.c:2176
 msgid "expected <tag> , <value>"
 msgstr "odotettiin <tunniste> , <arvo>"
 
-#: read.c:2238
+#: read.c:2251
 #, c-format
 msgid "unrecognized .linkonce type `%s'"
 msgstr "tunnistamaton �.linkonce�-tyyppi �%s�"
 
-#: read.c:2250
+#: read.c:2263
 msgid ".linkonce is not supported for this object file format"
 msgstr ".linkonce ei ole tuettu tällä objektitiedostomuodolla"
 
-#: read.c:2345
+#: read.c:2285
+#, c-format
+msgid "bfd_set_section_flags: %s"
+msgstr "bfd_set_section_flags: %s"
+
+#: read.c:2358
 msgid "expected alignment after size"
 msgstr "odotettiin tasausta koon jälkeen"
 
-#: read.c:2572
+#: read.c:2585
 #, c-format
 msgid "attempt to redefine pseudo-op `%s' ignored"
 msgstr "yritystä määritellä uudelleen näennäiskäsky �%s� ei otettu huomioon"
 
-#: read.c:2591
+#: read.c:2604
 msgid "ignoring macro exit outside a macro definition."
 msgstr "ohitetaan makropoistuminen makromäärittelyn ulkopuolella."
 
-#: read.c:2645
+#: read.c:2656
 #, c-format
 msgid "invalid segment \"%s\""
 msgstr "virheellinen segmentti �%s�"
 
-#: read.c:2653
+#: read.c:2664
 msgid "only constant offsets supported in absolute section"
 msgstr "vain vakiosiirrososoitteita tuetaan absoluuttisessa lohkossa"
 
-#: read.c:2692
+#: read.c:2703
 msgid "MRI style ORG pseudo-op not supported"
 msgstr "MRI-tyylistä ORG-näennäiskäskyä ei tueta"
 
-#: read.c:2845
+#: read.c:2856
 #, c-format
 msgid "unrecognized section type `%s'"
 msgstr "tunnistamaton lohkotyyppi �%s�"
 
-#: read.c:2859
+#: read.c:2870
 msgid "absolute sections are not supported"
 msgstr "absoluuttisia lohkoja ei tueta"
 
-#: read.c:2874
+#: read.c:2885
 #, c-format
 msgid "unrecognized section command `%s'"
 msgstr "tunnistamaton lohkokomento �%s�"
 
-#: read.c:2938
+#: read.c:2949
 #, c-format
-msgid ".end%c encountered without preceding %s"
+msgid ".end%c encountered without preceeding %s"
 msgstr ".end%c kohdattu ilman edeltävää %s"
 
-#: read.c:2968 read.c:2998
+#: read.c:2979 read.c:3009
 #, c-format
 msgid "%s without %s"
 msgstr "%s ilman %s"
 
-#: read.c:3247
+#: read.c:3258
 msgid "unsupported variable size or fill value"
 msgstr "ei-tuettu muuttujakoko tai täyttöarvo"
 
-#: read.c:3275
+#: read.c:3286
 msgid ".space repeat count is zero, ignored"
 msgstr ".space-toistolaskuri on nolla, ei otettu huomioon"
 
-#: read.c:3277
+#: read.c:3288
 msgid ".space repeat count is negative, ignored"
 msgstr ".space-toistolaskuri on negatiivinen, ei otettu huomioon"
 
-#: read.c:3306
+#: read.c:3317
 msgid "space allocation too complex in absolute section"
 msgstr "tilanvaraus liian mutkikasta absoluuttisessa lohkossa"
 
-#: read.c:3312
+#: read.c:3323
 msgid "space allocation too complex in common section"
 msgstr "tilanvaraus liian mutkikasta yhteislohkossa"
 
-#: read.c:3403 read.c:4759
+#: read.c:3414 read.c:4773
 #, c-format
 msgid "bad floating literal: %s"
 msgstr "virheellinen liukulukuliteraali: %s"
 
-#: read.c:3560
+#: read.c:3574
 #, c-format
 msgid "%s: would close weakref loop: %s"
 msgstr "%s: sulkisi weakref-silmukan: %s"
 
-#: read.c:3606
+#: read.c:3620
 #, c-format
 msgid "junk at end of line, first unrecognized character valued 0x%x"
 msgstr "roskaa rivin lopussa, ensimmäisen tunnistamattoman merkin arvo on 0x%x"
 
-#: read.c:3734
+#: read.c:3748
 #, c-format
 msgid "`%s' can't be equated to common symbol '%s'"
 msgstr "�%s� ei voi olla sama kuin yhteissymboli ’%s’"
 
-#: read.c:3871
+#: read.c:3873
+msgid "unexpected `\"' in expression"
+msgstr "odotettamaton ’\"’ lausekkeessa"
+
+#: read.c:3885
 msgid "rva without symbol"
 msgstr "rva-parametri ilman symbolia"
 
-#: read.c:3928
+#: read.c:3942
 msgid "missing or bad offset expression"
 msgstr "puuttuva tai virheellinen siirrososoitelauseke"
 
-#: read.c:3949
+#: read.c:3963
 msgid "missing reloc type"
 msgstr "puuttuva reloc-tyyppi"
 
-#: read.c:3961
+#: read.c:3975
 msgid "unrecognized reloc type"
 msgstr "tunnistamaton reloc-tyyppi"
 
-#: read.c:3977
+#: read.c:3991
 msgid "bad reloc expression"
 msgstr "virheellinen reloc-lauseke"
 
-#: read.c:4103
+#: read.c:4117
 msgid "attempt to store value in absolute section"
 msgstr "yritys tallentaa arvo absoluuttiseen lohkoon"
 
-#: read.c:4141 read.c:5025
+#: read.c:4155 read.c:5039
 msgid "zero assumed for missing expression"
 msgstr "nolla otaksuttu puuttuvalle lausekkeelle"
 
-#: read.c:4153 read.c:5037 write.c:266 write.c:987
+#: read.c:4167 read.c:5051 write.c:266 write.c:983
 msgid "register value used as expression"
 msgstr "rekisteriarvoa käytetty lausekkeena"
 
-#: read.c:4233
+#: read.c:4247
 #, c-format
 msgid "value 0x%llx truncated to 0x%llx"
 msgstr "arvo 0x%llx typistetty arvoksi 0x%llx"
 
-#: read.c:4236
+#: read.c:4250
 msgid "value 0x%I64x truncated to 0x%I64x"
 msgstr "arvo 0x%I64x typistetty arvoksi 0x%I64x"
 
-#: read.c:4240
+#: read.c:4254
 #, c-format
 msgid "value 0x%lx truncated to 0x%lx"
 msgstr "arvo 0x%lx typistetty arvoksi 0x%lx"
 
-#: read.c:4267
+#: read.c:4281
 #, c-format
 msgid "bignum truncated to %d bytes"
 msgstr "bignum-arvo typistetty %d tavuun"
 
-#: read.c:4586 read.c:4781
+#: read.c:4600 read.c:4795
 msgid "unresolvable or nonpositive repeat count; using 1"
 msgstr "ratkaisematon tai ei-positiivinen toistolaskuri: käytetään arvoa 1"
 
-#: read.c:4635
+#: read.c:4649
 #, c-format
 msgid "unknown floating type type '%c'"
 msgstr "tuntematon liukulukutyyppi ’%c’"
 
-#: read.c:4657
+#: read.c:4671
 msgid "floating point constant too large"
 msgstr "liukulukuvakio on liian suuri"
 
-#: read.c:5193
+#: read.c:5207
 msgid "strings must be placed into a section"
 msgstr "merkkijonojen on oltava sijoitettu lohkoon"
 
-#: read.c:5241
+#: read.c:5255
 msgid "expected <nn>"
 msgstr "odotettiin <nn>"
 
 #. To be compatible with BSD 4.2 as: give the luser a linefeed!!
-#: read.c:5274 read.c:5360
+#: read.c:5288 read.c:5374
 msgid "unterminated string; newline inserted"
 msgstr "päättämätön merkkijono: rivinvaihto lisätty"
 
-#: read.c:5368
+#: read.c:5382
 msgid "bad escaped character in string"
 msgstr "virheellinen koodinvaihtomerkki merkkijonossa"
 
-#: read.c:5393
+#: read.c:5407
 msgid "expected address expression"
 msgstr "odotettiin osoitelauseketta"
 
-#: read.c:5412
+#: read.c:5426
 #, c-format
 msgid "symbol \"%s\" undefined; zero assumed"
 msgstr "symboli �%s� määrittelemätön: nolla otaksuttu"
 
-#: read.c:5415
+#: read.c:5429
 msgid "some symbol undefined; zero assumed"
 msgstr "joku symboli määrittelemätön: nolla otaksuttu"
 
-#: read.c:5450
+#: read.c:5465
 msgid "this string may not contain '\\0'"
 msgstr "tämä merkkijono ei ehkä sisällä merkkiä ’\\0’"
 
-#: read.c:5486
+#: read.c:5501
 msgid "missing string"
 msgstr "puuttuva merkkijono"
 
 #  Parametri on tiedostonimi
-#: read.c:5577
+#: read.c:5592
 #, c-format
 msgid ".incbin count zero, ignoring `%s'"
 msgstr ".incbin-laskuri nolla, tiedostonimeä �%s� ei oteta huomioon"
 
-#: read.c:5603
+#: read.c:5618
 #, c-format
 msgid "file not found: %s"
 msgstr "tiedostoa ei löytynyt: %s"
 
-#: read.c:5617
+#: read.c:5632
 #, c-format
 msgid "seek to end of .incbin file failed `%s'"
 msgstr "tiedoston �.incbin� lopun etsintä ei onnistunut �%s�"
 
-#: read.c:5628
+#: read.c:5643
 #, c-format
 msgid "skip (%ld) or count (%ld) invalid for file size (%ld)"
 msgstr "ohita (%ld) tai laskuri (%ld) ovat virheellisiä tiedostokoolle (%ld)"
 
-#: read.c:5635
+#: read.c:5650
 #, c-format
 msgid "could not skip to %ld in file `%s'"
 msgstr "ei voitu ohittaa arvoon %ld tiedostossa �%s�"
 
-#: read.c:5644
+#: read.c:5659
 #, c-format
 msgid "truncated file `%s', %ld of %ld bytes read"
 msgstr "typistetty tiedosto �%s�, luettu %ld/%ld tavua"
 
-#: read.c:5803
+#: read.c:5818
 msgid "missing .func"
 msgstr "puuttuu funktion �.func�-tulopiste"
 
-#: read.c:5820
+#: read.c:5835
 msgid ".endfunc missing for previous .func"
 msgstr "funktion �.endfunc�-päättymispiste puuttuu edelliseltä �.func�-tulopisteeltä"
 
-#: read.c:5957
+#: read.c:5972
 #, c-format
 msgid "missing closing `%c'"
 msgstr "puuttuu sulkeva �%c�"
 
-#: read.c:5959
+#: read.c:5974
 msgid "stray `\\'"
 msgstr "orpo �\\�"
 
-#: remap.c:53
+#: remap.c:52
 #, c-format
 msgid "invalid argument '%s' to -fdebug-prefix-map"
 msgstr "virheellinen argumentti ’%s’ kohteeseen -fdebug-prefix-map"
 
-#: stabs.c:215 stabs.c:223 stabs.c:231 stabs.c:250
+#: stabs.c:214 stabs.c:222 stabs.c:230 stabs.c:249
 #, c-format
 msgid ".stab%c: missing comma"
 msgstr ".stab%c: näennäiskäskystä puuttuu pilkku"
@@ -17134,90 +16891,100 @@ msgstr ".stab%c: näennäiskäskystä puuttuu pilkku"
 #. This could happen for example with a source file with a huge
 #. number of lines.  The only cure is to use a different debug
 #. format, probably DWARF.
-#: stabs.c:243
+#: stabs.c:242
 #, c-format
 msgid ".stab%c: description field '%x' too big, try a different debug format"
 msgstr ".stab%c: kuvauskenttä ’%x’ on liian suuri, yritä erilaista vianjäljitysmuotoa"
 
-#: stabs.c:424
+#: stabs.c:423
 msgid "comma missing in .xstabs"
 msgstr "pilkku puuttuu näennäiskäskystä �.xstabs�"
 
-#: symbols.c:285
+#: symbols.c:288
 #, c-format
 msgid "cannot define symbol `%s' in absolute section"
 msgstr "ei voi määritellä symbolia �%s� absoluuttisessa lohkossa"
 
-#: symbols.c:415
+#: symbols.c:418
 #, c-format
 msgid "symbol `%s' is already defined as \"%s\"/%s%ld"
 msgstr "symboli �%s� on jo määritelty segmenttinä �%s�/%s%ld"
 
-#: symbols.c:490 symbols.c:497
+#: symbols.c:496 symbols.c:503
 #, c-format
 msgid "inserting \"%s\" into symbol table failed: %s"
 msgstr "symbolin �%s� lisääminen symbolitauluun epäonnistui: %s"
 
-#: symbols.c:1008
+#: symbols.c:966 symbols.c:970
+#, c-format
+msgid "undefined symbol `%s' in operation"
+msgstr "määrittelemätön symboli �%s� toiminnossa"
+
+#: symbols.c:977
 #, c-format
-msgid "invalid operands (%s and %s sections) for `%s'"
-msgstr "virheelliset operandit (%s ja %s -lohkot) kohteelle �%s�"
+msgid "invalid sections for operation on `%s' and `%s'"
+msgstr "virheelliset lohkot toiminnolle vasemmassa symbolissa �%s� ja oikeassa symbolissa �%s�"
 
-#: symbols.c:1012
+#: symbols.c:981
 #, c-format
-msgid "invalid operand (%s section) for `%s'"
-msgstr "virheellinen operandi (%s-lohko) kohteelle �%s�"
+msgid "invalid section for operation on `%s'"
+msgstr "virheellinen lohko toiminnolle vasemmassa symbolissa �%s�"
 
-#: symbols.c:1020
+#: symbols.c:989 symbols.c:992
 #, c-format
-msgid "invalid operands (%s and %s sections) for `%s' when setting `%s'"
-msgstr "virheelliset operandit (%s ja %s -lohkot) kohteelle �%s� kun asetetaan �%s�"
+msgid "undefined symbol `%s' in operation setting `%s'"
+msgstr "määrittelemätön symboli �%s� symbolin �%s� toimintoasetuksessa"
 
-#: symbols.c:1023
+#: symbols.c:998
 #, c-format
-msgid "invalid operand (%s section) for `%s' when setting `%s'"
-msgstr "virheellinen operandi (%s-lohko) kohteelle �%s� kun asetetaan �%s�"
+msgid "invalid sections for operation on `%s' and `%s' setting `%s'"
+msgstr "virheelliset lohkot toiminnolle vasemmassa symbolissa �%s� ja oikeassa symbolissa �%s� symbolin �%s� asetuksessa"
 
-#: symbols.c:1072
+#: symbols.c:1001
+#, c-format
+msgid "invalid section for operation on `%s' setting `%s'"
+msgstr "virheellinen lohko toiminnolle vasemmassa symbolissa �%s� symbolin �%s� asetuksessa"
+
+#: symbols.c:1051
 #, c-format
 msgid "symbol definition loop encountered at `%s'"
 msgstr "symbolimäärittelysilmukka kohdattu symbolissa �%s�"
 
-#: symbols.c:1099
+#: symbols.c:1078
 #, c-format
 msgid "cannot convert expression symbol %s to complex relocation"
 msgstr "ei voi muuntaa lausekesymbolia %s kompleksisijoitukseksi"
 
-#: symbols.c:1381
+#: symbols.c:1360
 #, c-format
 msgid "division by zero when setting `%s'"
 msgstr "jako nollalla kun asetetaan �%s�"
 
-#: symbols.c:1462 write.c:2048
+#: symbols.c:1441 write.c:2046
 #, c-format
 msgid "can't resolve value for symbol `%s'"
 msgstr "ei voi ratkaista arvoa symbolille �%s�"
 
-#: symbols.c:1909
+#: symbols.c:1888
 #, c-format
 msgid "\"%d\" (instance number %d of a %s label)"
 msgstr "�%d� (ilmentymänumero %d / %s -nimiö)"
 
-#: symbols.c:1938
+#: symbols.c:1917
 #, c-format
 msgid "attempt to get value of unresolved symbol `%s'"
 msgstr "yritettiin hakea ratkaisemattoman symbolin �%s� arvo"
 
-#: symbols.c:2213
+#: symbols.c:2192
 msgid "section symbols are already global"
 msgstr "lohkosymbolit on jo yleisiä"
 
-#: symbols.c:2326
+#: symbols.c:2305
 #, c-format
 msgid "Accessing function `%s' as thread-local object"
 msgstr "Kutsutaan funktiota �%s� säiepaikallisena objektina"
 
-#: symbols.c:2330
+#: symbols.c:2309
 #, c-format
 msgid "Accessing `%s' as thread-local object"
 msgstr "Kutsutaan �%s� säiepaikallisena objektina"
@@ -17240,140 +17007,111 @@ msgstr "virheellinen siirrososoitelauseke"
 msgid "invalid reloc expression"
 msgstr "virheellinen �reloc�-lauseke"
 
-#: write.c:1072
+#: write.c:1066
 #, c-format
 msgid "value of %s too large for field of %d bytes at %s"
 msgstr "puskurin %s arvo on liian suuri %d tavun kentälle puskurissa %s"
 
-#: write.c:1084
+#: write.c:1078
 #, c-format
 msgid "signed .word overflow; switch may be too large; %ld at 0x%lx"
 msgstr "etumerkillinen �.word�-ylivuoto; switch-arvo saattaa olla liian suuri: %ld osoitteessa 0x%lx"
 
-#: write.c:1128
+#: write.c:1122
 msgid "redefined symbol cannot be used on reloc"
 msgstr "uudelleenmääriteltyä symbolia ei voida käyttää reloc-tietueessa"
 
-#: write.c:1141
+#: write.c:1135
 msgid "relocation out of range"
 msgstr "siirros lukualueen ulkopuolella"
 
-#: write.c:1144
+#: write.c:1138
 #, c-format
 msgid "%s:%u: bad return from bfd_install_relocation: %x"
 msgstr "%s:%u: virheellinen paluuarvo kohteesta bfd_install_relocation: %x"
 
-#: write.c:1208
+#: write.c:1202
 msgid "internal error: fixup not contained within frag"
 msgstr "sisäinen virhe: korjaus ei ole palasen sisällä"
 
-#: write.c:1261
+#: write.c:1255
 msgid "reloc not within (fixed part of) section"
 msgstr "reloc-tietue ei ole (kiinteän lohko-osan tai) lohkon sisällä"
 
-#: write.c:1325 write.c:1455
+#: write.c:1319 write.c:1448
 msgid "can't extend frag"
 msgstr "ei voi laajentaa osasta"
 
-#: write.c:1517 write.c:1538
+#: write.c:1510 write.c:1531
 #, c-format
 msgid "can't write %s: %s"
 msgstr "ei voi kirjoittaa vakiotulostetiedostoon %s: %s"
 
-#: write.c:1568
-#, c-format
-msgid "cannot write to output file '%s': %s"
-msgstr "ei voi kirjoittaa tulostetiedostoon ’%s’: %s"
+#: write.c:1561
+msgid "cannot write to output file"
+msgstr "ei voi kirjoittaa tulostetiedostoon"
 
-#: write.c:1724
+#: write.c:1715
 #, c-format
 msgid "%d error%s, %d warning%s, generating bad object file"
 msgstr "%d virhe%s, %d varoitus%s, tuotetaan virheellinen objektitiedosto"
 
-#: write.c:1731
+#: write.c:1722
 #, c-format
 msgid "%d error%s, %d warning%s, no object file generated"
 msgstr "%d virhe%s, %d varoitus%s, ei tuotettu objektitiedostoa"
 
-#: write.c:1963
+#: write.c:1961
 #, c-format
 msgid "%s: global symbols not supported in common sections"
 msgstr "%s: yleissymboleita ei ole tuettu yhteislohkoissa"
 
-#: write.c:1977
+#: write.c:1975
 #, c-format
 msgid "local label `%s' is not defined"
 msgstr "paikallinen nimiö �%s� ei ole määritelty"
 
-#: write.c:1999
+#: write.c:1997
 #, c-format
 msgid "Local symbol `%s' can't be equated to common symbol `%s'"
 msgstr "Paikallinen symboli �%s� ei voi olla sama kuin yhteissymboli �%s�"
 
-#: write.c:2006
+#: write.c:2004
 #, c-format
 msgid "can't make global register symbol `%s'"
 msgstr "ei voi tehdä rekisterisymbolia �%s�"
 
-#: write.c:2299
+#: write.c:2297
 #, c-format
 msgid "alignment padding (%lu bytes) not a multiple of %ld"
 msgstr "tasaustäyte (%lu tavua) ei ole %ld:n monikerta"
 
-#: write.c:2461
+#: write.c:2459
 #, c-format
 msgid ".word %s-%s+%s didn't fit"
 msgstr "�.word� %s-%s+%s ei sopinut"
 
-#: write.c:2555
+#: write.c:2553
 msgid "padding added"
 msgstr "täyte lisätty"
 
-#: write.c:2605
+#: write.c:2603
 msgid "attempt to move .org backwards"
 msgstr "yritettiin siirtää �.org�-määrittelyä taaksepäin"
 
-#: write.c:2629
+#: write.c:2627
 msgid ".space specifies non-absolute value"
 msgstr "�.space� määrittelee ei-absoluuttisen arvon"
 
-#: write.c:2644
+#: write.c:2642
 msgid ".space or .fill with negative value, ignored"
 msgstr "�.space� tai �.fill� negatiivisella arvolla, ei oteta huomioon"
 
-#: write.c:2715
+#: write.c:2713
 #, c-format
 msgid "Infinite loop encountered whilst attempting to compute the addresses of symbols in section %s"
 msgstr "Kohdattiin päättymätön silmukka, kun yritettiin laskea symbolien osoitteet lohkossa %s"
 
-#~ msgid ".size expression too complicated to fix up"
-#~ msgstr "�.size�-lauseke liian mutkikas korjattavaksi"
-
-#~ msgid "Label expected"
-#~ msgstr "Odotettiin nimiötä"
-
-#~ msgid "  -matomic                enable atomic operation instructions\n"
-#~ msgstr "  -matomic                ota käyttöön atomiset toimintakäskyt\n"
-
-#~ msgid "  -mno-atomic             disable atomic operation instructions\n"
-#~ msgstr "  -mno-atomic             ota pois käytöstä atomiset toimintakäskyt\n"
-
-#  Tässä pitäisi kai lukea than
-#~ msgid "second register should greater tahn first register"
-#~ msgstr "toisen rekisterin pitäisi olla suurempi kuin ensimmäisen rekisterin"
-
-#~ msgid "invalid sections for operation on `%s' and `%s'"
-#~ msgstr "virheelliset lohkot toiminnolle vasemmassa symbolissa �%s� ja oikeassa symbolissa �%s�"
-
-#~ msgid "invalid section for operation on `%s'"
-#~ msgstr "virheellinen lohko toiminnolle vasemmassa symbolissa �%s�"
-
-#~ msgid "undefined symbol `%s' in operation setting `%s'"
-#~ msgstr "määrittelemätön symboli �%s� symbolin �%s� toimintoasetuksessa"
-
-#~ msgid "invalid sections for operation on `%s' and `%s' setting `%s'"
-#~ msgstr "virheelliset lohkot toiminnolle vasemmassa symbolissa �%s� ja oikeassa symbolissa �%s� symbolin �%s� asetuksessa"
-
 #~ msgid "base register should not be in register list when written back"
 #~ msgstr "perusrekisterin ei pitäisi olla rekisteriluettelossa kun kirjoitetaan takaisin"
 
@@ -17564,3 +17302,21 @@ msgstr "Kohdattiin päättymätön silmukka, kun yritettiin laskea symbolien oso
 
 #~ msgid "Internal Error : Can't Hash %s : %s"
 #~ msgstr "Sisäinen virhe: En voi sekasummata kohdetta %s: %s"
+
+#~ msgid "second register should greater than first register"
+#~ msgstr "toisen rekisterin pitäisi olla suurempi kuin ensimmäisen"
+
+#~ msgid "expected expression"
+#~ msgstr "odotettu lauseke"
+
+#~ msgid "operand references R%ld of instruction before previous."
+#~ msgstr "käskyn operandiviitteet R%ld ennen edellistä."
+
+#~ msgid "operand references R%ld of previous instruction."
+#~ msgstr "edellisen käskyn operandiviitteet R%ld."
+
+#~ msgid "                                         for constraint violations\n"
+#~ msgstr "                                         rajoiteristiriidoille\n"
+
+#~ msgid "                                         constraint violations\n"
+#~ msgstr "                                         rajoiteristiriidat\n"
diff --git a/gas/po/fr.po b/gas/po/fr.po
index c401b7dce4..847b320ec8 100644
--- a/gas/po/fr.po
+++ b/gas/po/fr.po
@@ -5,10 +5,10 @@
 # Frédéric Marchal <fmarchal@perso.be>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: gas-2.21.53\n"
+"Project-Id-Version: gas-2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-24 09:44+0200\n"
+"POT-Creation-Date: 2010-11-05 11:33+0100\n"
+"PO-Revision-Date: 2011-05-14 14:30+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: app.c:488 app.c:502
 msgid "end of file in comment"
@@ -56,26 +56,26 @@ msgstr "apostrophe de fermeture manquant; (assumé)"
 msgid "end of file in comment; newline inserted"
 msgstr "fin de fichier dans le commentaire; nouvelle ligne insérée"
 
-#: as.c:162
+#: as.c:161
 msgid "missing emulation mode name"
 msgstr "nom du mode d'émulation manquant"
 
-#: as.c:177
+#: as.c:176
 #, c-format
 msgid "unrecognized emulation name `%s'"
 msgstr "nom de l'émulation non reconnu « %s »"
 
-#: as.c:224
+#: as.c:223
 #, c-format
 msgid "GNU assembler version %s (%s) using BFD version %s\n"
 msgstr "Version de l'assembleur GNU %s (%s) utilisant la version BFD %s\n"
 
-#: as.c:231
+#: as.c:230
 #, c-format
 msgid "Usage: %s [option...] [asmfile...]\n"
 msgstr "Usage: %s [option...] [fichier-assembleur...]\n"
 
-#: as.c:233
+#: as.c:232
 #, c-format
 msgid ""
 "Options:\n"
@@ -104,12 +104,12 @@ msgstr ""
 "                      \t  s      inclure les symboles\n"
 "                      \t  =FICHIER  les lister dans le FICHIER (doit être la dernière sous-option)\n"
 
-#: as.c:247
+#: as.c:246
 #, c-format
 msgid "  --alternate             initially turn on alternate macro syntax\n"
 msgstr "  --alternate             active dès le départ la syntaxe alternée des macros\n"
 
-#: as.c:250
+#: as.c:249
 #, c-format
 msgid ""
 "  --compress-debug-sections\n"
@@ -118,7 +118,7 @@ msgstr ""
 "  --compress-debug-sections\n"
 "                          compresser les sections DWARF de débug avec zlib\n"
 
-#: as.c:253
+#: as.c:252
 #, c-format
 msgid ""
 "  --nocompress-debug-sections\n"
@@ -127,12 +127,12 @@ msgstr ""
 "  --nocompress-debug-sections\n"
 "                          ne pas compresser les sections de débug DWARF\n"
 
-#: as.c:257
+#: as.c:256
 #, c-format
 msgid "  -D                      produce assembler debugging messages\n"
 msgstr "  -D                      produire les messages de débug assembleur\n"
 
-#: as.c:259
+#: as.c:258
 #, c-format
 msgid ""
 "  --debug-prefix-map OLD=NEW\n"
@@ -141,127 +141,118 @@ msgstr ""
 "  --debug-prefix-map ANCIEN=NOUVEAU\n"
 "                          remplace ANCIEN par NOUVEAU dans les informations de débug\n"
 
-#: as.c:262
+#: as.c:261
 #, c-format
 msgid "  --defsym SYM=VAL        define symbol SYM to given value\n"
 msgstr "  --defsym SYMBOLE=VALEUR définir le SYMBOLE avec cette valeur\n"
 
-#: as.c:278
+#: as.c:277
 #, c-format
 msgid "                          emulate output (default %s)\n"
 msgstr "                          émuler la sortie (par défaut %s)\n"
 
-#: as.c:283
+#: as.c:282
 #, c-format
 msgid "  --execstack             require executable stack for this object\n"
 msgstr "  --execstack             requiert une pile exécutable pour cet objet\n"
 
-#: as.c:285
+#: as.c:284
 #, c-format
 msgid "  --noexecstack           don't require executable stack for this object\n"
 msgstr "  --noexecstack           ne requiert pas de pile exécutable pour cet objet\n"
 
 #: as.c:287
 #, c-format
-msgid ""
-"  --size-check=[error|warning]\n"
-"\t\t\t  ELF .size directive check (default --size-check=error)\n"
-msgstr ""
-"  --size-check=[error|warning]\n"
-"\t\t\t  vérifier la directive ELF .size (par défaut --size-check=error)\n"
-
-#: as.c:291
-#, c-format
 msgid "  -f                      skip whitespace and comment preprocessing\n"
 msgstr "  -f                      escamoter le prétraitement des espaces et des commentaires\n"
 
-#: as.c:293
+#: as.c:289
 #, c-format
 msgid "  -g --gen-debug          generate debugging information\n"
 msgstr "  -g --gen-debug          générer les informations de débug\n"
 
-#: as.c:295
+#: as.c:291
 #, c-format
 msgid "  --gstabs                generate STABS debugging information\n"
 msgstr "  --gstabs                générer les informations STABS de débug\n"
 
-#: as.c:297
+#: as.c:293
 #, c-format
 msgid "  --gstabs+               generate STABS debug info with GNU extensions\n"
 msgstr "  --gstabs+               générer les infos STABS de débug avec les extensions GNU\n"
 
-#: as.c:299
+#: as.c:295
 #, c-format
 msgid "  --gdwarf-2              generate DWARF2 debugging information\n"
 msgstr "  --gdwarf-2              générer les informations de débug DWARF2\n"
 
-#: as.c:301
+#: as.c:297
 #, c-format
 msgid "  --hash-size=<value>     set the hash table size close to <value>\n"
 msgstr "  --hash-size=<valeur>    fixer la taille de la table de hash proche de <valeur>\n"
 
-#: as.c:303
+#: as.c:299
 #, c-format
 msgid "  --help                  show this message and exit\n"
 msgstr "  --help                  afficher l'aide-mémoire et quitter\n"
 
-#: as.c:305
+#: as.c:301
 #, c-format
 msgid "  --target-help           show target specific options\n"
 msgstr "  --target-help           montrer les options spécifiques de la cible\n"
 
-#: as.c:307
+#: as.c:303
 #, c-format
 msgid "  -I DIR                  add DIR to search list for .include directives\n"
 msgstr ""
 "  -I RÉPERTOIRE           ajouter le RÉPERTOIRE à la liste de recherche\n"
 "des directives .include\n"
 
-#: as.c:309
+#: as.c:305
 #, c-format
 msgid "  -J                      don't warn about signed overflow\n"
 msgstr "  -J                      ne pas avertir lors d'un débordement signé\n"
 
-#: as.c:311
+#: as.c:307
 #, c-format
 msgid "  -K                      warn when differences altered for long displacements\n"
 msgstr "  -K                      avertir lorsque des différences sont altérées lors de longs déplacements\n"
 
-#: as.c:313
+#: as.c:309
 #, c-format
 msgid "  -L,--keep-locals        keep local symbols (e.g. starting with `L')\n"
 msgstr "  -L,--keep-locals        conserver les symboles locaux (i.e. débutant par « L »)\n"
 
-#: as.c:315
+#: as.c:311
 #, c-format
 msgid "  -M,--mri                assemble in MRI compatibility mode\n"
 msgstr "  -M,--mri                assembler en mode compatibilité MRI\n"
 
-#: as.c:317
+#: as.c:313
 #, c-format
 msgid "  --MD FILE               write dependency information in FILE (default none)\n"
 msgstr ""
 "  --MD FICHIER            écrire les information de dépendance dans le\n"
 "                          FICHIER (par défaut aucun)\n"
 
-#: as.c:319
+#: as.c:315
 #, c-format
 msgid "  -nocpp                  ignored\n"
 msgstr "  -nocpp                  ignorée\n"
 
-#: as.c:321
+#: as.c:317
 #, c-format
 msgid "  -o OBJFILE              name the object-file output OBJFILE (default a.out)\n"
 msgstr ""
 "  -o NOM                  nommer le fichier d'objets de sortie NOM\n"
 "                          (par défaut a.out)\n"
 
-#: as.c:323
+#: as.c:319
 #, c-format
 msgid "  -R                      fold data section into text section\n"
 msgstr "  -R                      joindre la section de données avec la section texte\n"
 
-#: as.c:325
+#: as.c:321
 #, c-format
 msgid ""
 "  --reduce-memory-overheads \n"
@@ -272,42 +263,42 @@ msgstr ""
 "                          favoriser l'utilisation réduite de la mémoire au\n"
 "                          détriment d'un temps d'assemblage accru\n"
 
-#: as.c:329
+#: as.c:325
 #, c-format
 msgid "  --statistics            print various measured statistics from execution\n"
 msgstr "  --statistics            afficher diverses mesures de statistiques de l'exécution\n"
 
-#: as.c:331
+#: as.c:327
 #, c-format
 msgid "  --strip-local-absolute  strip local absolute symbols\n"
 msgstr "  --strip-local-absolute  éliminer les symboles absolus locaux\n"
 
-#: as.c:333
+#: as.c:329
 #, c-format
 msgid "  --traditional-format    Use same format as native assembler when possible\n"
 msgstr "  --traditional-format    utiliser le même format que l'assembleur natif lorsque c'est possible\n"
 
-#: as.c:335
+#: as.c:331
 #, c-format
 msgid "  --version               print assembler version number and exit\n"
 msgstr "  --version               afficher le numéro de la version de l'assembleur et quitter\n"
 
-#: as.c:337
+#: as.c:333
 #, c-format
 msgid "  -W  --no-warn           suppress warnings\n"
 msgstr "  -W  --no-warn           supprimer les avertissements\n"
 
-#: as.c:339
+#: as.c:335
 #, c-format
 msgid "  --warn                  don't suppress warnings\n"
 msgstr "  --warn                  ne pas supprimer les avertissements\n"
 
-#: as.c:341
+#: as.c:337
 #, c-format
 msgid "  --fatal-warnings        treat warnings as errors\n"
 msgstr "  --fatal-warnings        traiter les avertissements comme des erreurs\n"
 
-#: as.c:344
+#: as.c:340
 #, c-format
 msgid ""
 "  --itbl INSTTBL          extend instruction set to include instructions\n"
@@ -317,22 +308,22 @@ msgstr ""
 "                          instructions concordants avec les spécifications\n"
 "                          définies dans le fichier INSTTBL\n"
 
-#: as.c:348
+#: as.c:344
 #, c-format
 msgid "  -w                      ignored\n"
 msgstr "  -w                      ignorée\n"
 
-#: as.c:350
+#: as.c:346
 #, c-format
 msgid "  -X                      ignored\n"
 msgstr "  -X                      ignorée\n"
 
-#: as.c:352
+#: as.c:348
 #, c-format
 msgid "  -Z                      generate object file even after errors\n"
 msgstr "  -Z                      générer le fichier objet même après des erreurs\n"
 
-#: as.c:354
+#: as.c:350
 #, c-format
 msgid ""
 "  --listing-lhs-width     set the width in words of the output data column of\n"
@@ -341,7 +332,7 @@ msgstr ""
 "  --listing-lhs-width     initialiser la largeur en mots de la colonne de données\n"
 "                          en sortie sur le listing\n"
 
-#: as.c:357
+#: as.c:353
 #, c-format
 msgid ""
 "  --listing-lhs-width2    set the width in words of the continuation lines\n"
@@ -352,7 +343,7 @@ msgstr ""
 "                          de la colonne de données en sortie; ignoré si plus petit que\n"
 "                          la largeur de la première ligne\n"
 
-#: as.c:361
+#: as.c:357
 #, c-format
 msgid ""
 "  --listing-rhs-width     set the max width in characters of the lines from\n"
@@ -361,7 +352,7 @@ msgstr ""
 "  --listing-rhs-width     initialiser la largeur maximale en caractères des lignes\n"
 "                          du fichier source\n"
 
-#: as.c:364
+#: as.c:360
 #, c-format
 msgid ""
 "  --listing-cont-lines    set the maximum number of continuation lines used\n"
@@ -370,33 +361,33 @@ msgstr ""
 "  --listing-cont-lines    initialiser le nombre maximal de lignes de continuation à utiliser\n"
 "                          pour la colonne de donnée en sortie dans le listing\n"
 
-#: as.c:367
+#: as.c:363
 #, c-format
 msgid "  @FILE                   read options from FILE\n"
 msgstr "  @FICHIER                lire les options dans le FICHIER\n"
 
-#: as.c:375
+#: as.c:371
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Rapporter toutes anomalies à %s\n"
 
-#: as.c:587
+#: as.c:581
 #, c-format
 msgid "unrecognized option -%c%s"
 msgstr "option non reconnue -%c%s"
 
 #. This output is intended to follow the GNU standards document.
-#: as.c:625
+#: as.c:619
 #, c-format
 msgid "GNU assembler %s\n"
 msgstr "Assembleur GNU %s\n"
 
-#: as.c:626
+#: as.c:620
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
-#: as.c:627
+#: as.c:621
 #, c-format
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
@@ -407,86 +398,81 @@ msgstr ""
 "version 3 de la licence GNU General Public License ou suivante.\n"
 "Ce programme n'est couvert par AUCUNE garantie.\n"
 
-#: as.c:631
+#: as.c:625
 #, c-format
 msgid "This assembler was configured for a target of `%s'.\n"
 msgstr "Cet assembleur a été configuré pour la cible « %s ».\n"
 
-#: as.c:638
+#: as.c:632
 msgid "multiple emulation names specified"
 msgstr "multiples noms d'émulation spécifiés"
 
-#: as.c:640
+#: as.c:634
 msgid "emulations not handled in this configuration"
 msgstr "émulations non traités dans cette configuration"
 
-#: as.c:645
+#: as.c:639
 #, c-format
 msgid "alias = %s\n"
 msgstr "alias = %s\n"
 
-#: as.c:646
+#: as.c:640
 #, c-format
 msgid "canonical = %s\n"
 msgstr "canonique = %s\n"
 
-#: as.c:647
+#: as.c:641
 #, c-format
 msgid "cpu-type = %s\n"
 msgstr "type de CPU = %s\n"
 
-#: as.c:649
+#: as.c:643
 #, c-format
 msgid "format = %s\n"
 msgstr "format = %s\n"
 
-#: as.c:652
+#: as.c:646
 #, c-format
 msgid "bfd-target = %s\n"
 msgstr "cible-bfd = %s\n"
 
-#: as.c:660
+#: as.c:654
 msgid "cannot compress debug sections (zlib not installed)"
 msgstr "impossible de compresser les sections de débug (zlib pas installé)"
 
-#: as.c:681
+#: as.c:675
 msgid "bad defsym; format is --defsym name=value"
 msgstr "defsym erroné; format est --defsym nom=valeur"
 
-#: as.c:701
+#: as.c:695
 msgid "no file name following -t option"
 msgstr "aucun nom de fichier après l'option -t"
 
-#: as.c:716
+#: as.c:710
 #, c-format
 msgid "failed to read instruction table %s\n"
 msgstr "échec de lecture de la table d'instructions %s\n"
 
-#: as.c:828
-#, c-format
-msgid "Invalid --size-check= option: `%s'"
-msgstr "Option --size-check= invalide: « %s »"
-
-#: as.c:896
+#: as.c:881
 #, c-format
 msgid "invalid listing option `%c'"
 msgstr "option de listage invalide « %c »"
 
-#: as.c:949
+#: as.c:934
 msgid "--hash-size needs a numeric argument"
 msgstr "--hash-size requiert un argument numérique"
 
-#: as.c:974
+#: as.c:959
 #, c-format
 msgid "%s: total time in assembly: %ld.%06ld\n"
 msgstr "%s: temps total d'assemblage: %ld.%06ld\n"
 
-#: as.c:977
+#: as.c:962
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: taille des données %ld\n"
 
-#: as.c:1289
+#: as.c:1272
 #, c-format
 msgid "%d warnings, treating warnings as errors"
 msgstr "%d avertissements, traitement des avertissements comme des erreurs"
@@ -506,9 +492,9 @@ msgstr "la vérification de l'état de santé a échoué"
 
 #: cgen.c:113 config/tc-alpha.c:2104 config/tc-alpha.c:2128
 #: config/tc-arc.c:1684 config/tc-d10v.c:552 config/tc-d30v.c:538
-#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2617
-#: config/tc-ppc.c:2768 config/tc-ppc.c:2910 config/tc-ppc.c:2921
-#: config/tc-s390.c:1250 config/tc-s390.c:1364 config/tc-s390.c:1493
+#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2586
+#: config/tc-ppc.c:2737 config/tc-ppc.c:2879 config/tc-ppc.c:2890
+#: config/tc-s390.c:1223 config/tc-s390.c:1323 config/tc-s390.c:1452
 #: config/tc-v850.c:2229 config/tc-v850.c:2300 config/tc-v850.c:2346
 #: config/tc-v850.c:2383 config/tc-v850.c:2420 config/tc-v850.c:2649
 msgid "too many fixups"
@@ -516,17 +502,17 @@ msgstr "trop de correctifs"
 
 #: cgen.c:400 cgen.c:420 config/tc-arc.c:1665 config/tc-d10v.c:463
 #: config/tc-d30v.c:454 config/tc-i370.c:2125 config/tc-mn10200.c:1042
-#: config/tc-mn10300.c:1676 config/tc-ppc.c:2656 config/tc-s390.c:1221
+#: config/tc-mn10300.c:1676 config/tc-ppc.c:2625 config/tc-s390.c:1194
 #: config/tc-v850.c:2337 config/tc-v850.c:2371 config/tc-v850.c:2411
 #: config/tc-v850.c:2622 config/tc-z80.c:417
 msgid "illegal operand"
 msgstr "opérande illégal"
 
-#: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:632 config/tc-d10v.c:465
+#: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:590 config/tc-d10v.c:465
 #: config/tc-d30v.c:456 config/tc-h8300.c:500 config/tc-i370.c:2127
 #: config/tc-mcore.c:662 config/tc-microblaze.c:579 config/tc-mmix.c:488
 #: config/tc-mn10200.c:1045 config/tc-mn10300.c:1679 config/tc-msp430.c:452
-#: config/tc-or32.c:307 config/tc-ppc.c:2658 config/tc-s390.c:1239
+#: config/tc-or32.c:307 config/tc-ppc.c:2627 config/tc-s390.c:1212
 #: config/tc-sh.c:1387 config/tc-sh64.c:2213 config/tc-v850.c:2341
 #: config/tc-v850.c:2375 config/tc-v850.c:2415 config/tc-v850.c:2625
 #: config/tc-z80.c:570 config/tc-z8k.c:350
@@ -542,18 +528,19 @@ msgid "operand mask overflow"
 msgstr "débordement du masque de l'opérande"
 
 #. We can't actually support subtracting a symbol.
-#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1645 config/tc-arm.c:9058
-#: config/tc-arm.c:9110 config/tc-arm.c:9357 config/tc-arm.c:10157
-#: config/tc-arm.c:11248 config/tc-arm.c:11288 config/tc-arm.c:11616
-#: config/tc-arm.c:11655 config/tc-avr.c:1165 config/tc-cris.c:4047
-#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4694
-#: config/tc-msp430.c:1936 config/tc-ppc.c:6102 config/tc-spu.c:957
+#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1631 config/tc-arm.c:8897
+#: config/tc-arm.c:8949 config/tc-arm.c:9196 config/tc-arm.c:9986
+#: config/tc-arm.c:11068 config/tc-arm.c:11108 config/tc-arm.c:11436
+#: config/tc-arm.c:11475 config/tc-avr.c:1108 config/tc-cris.c:4043
+#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4462
+#: config/tc-mips.c:5586 config/tc-mips.c:6557 config/tc-mips.c:7133
+#: config/tc-msp430.c:1936 config/tc-ppc.c:5874 config/tc-spu.c:957
 #: config/tc-spu.c:981 config/tc-v850.c:3084 config/tc-xstormy16.c:483
 #: config/tc-xtensa.c:5833 config/tc-xtensa.c:11830
 msgid "expression too complex"
 msgstr "expression trop complexe"
 
-#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:6227 config/tc-s390.c:2135
+#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:5999 config/tc-s390.c:2028
 #: config/tc-v850.c:3131 config/tc-xstormy16.c:537
 msgid "unresolved expression that must be resolved"
 msgstr "expression non résolue qui doit être résolue"
@@ -588,12 +575,12 @@ msgid "\".elseif\" after \".else\""
 msgstr "« .elseif » après « .else »"
 
 #: cond.c:314 cond.c:420
-msgid "here is the previous \".else\""
-msgstr "voici le « .else » précédent"
+msgid "here is the previous \"else\""
+msgstr "voici le « else » précédent"
 
 #: cond.c:317 cond.c:423
-msgid "here is the previous \".if\""
-msgstr "voici le « .if » précédent"
+msgid "here is the previous \"if\""
+msgstr "voici le « if » précédent"
 
 #: cond.c:346
 msgid "non-constant expression in \".elseif\" statement"
@@ -608,8 +595,8 @@ msgid "\".else\" without matching \".if\""
 msgstr "« .else » sans « .if » correspondant"
 
 #: cond.c:417
-msgid "duplicate \".else\""
-msgstr "« .else » en double"
+msgid "duplicate \"else\""
+msgstr "« else » en double"
 
 #: cond.c:468
 msgid ".ifeqs syntax error"
@@ -643,8 +630,8 @@ msgstr "NaNs ne sont pas supportés par cette cible\n"
 msgid "Infinities are not supported by this target\n"
 msgstr "Les nombres infinis ne sont pas supportés par cette cible\n"
 
-#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1036
-#: config/tc-ia64.c:11435 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
+#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1026
+#: config/tc-ia64.c:11433 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
 msgid "Unrecognized or unsupported floating point constant"
 msgstr "Constante décimale non reconnue ou non supportée"
 
@@ -658,104 +645,104 @@ msgstr "Tentative de placer un symbole commun dans l'ensemble %s"
 msgid "Attempt to put an undefined symbol into set %s"
 msgstr "Tentative de placer le symbole indéfini dans l'ensemble %s"
 
-#: config/obj-aout.c:115 config/obj-coff.c:1398
+#: config/obj-aout.c:115 config/obj-coff.c:1394
 #, c-format
 msgid "Symbol `%s' can not be both weak and common"
 msgstr "Symbole « %s» ne peut être à la fois « weak » et « common »"
 
-#: config/obj-coff.c:140 dw2gencfi.c:214
+#: config/obj-coff.c:136
 #, c-format
 msgid "Inserting \"%s\" into structure table failed: %s"
 msgstr "Insertion de « %s » dans la table de structure a échoué: %s"
 
-#: config/obj-coff.c:219 config/obj-coff.c:1695 config/tc-ppc.c:5147
-#: config/tc-tic54x.c:4008 read.c:2795
+#: config/obj-coff.c:215 config/obj-coff.c:1691 config/tc-ppc.c:4937
+#: config/tc-tic54x.c:4008 read.c:2806
 #, c-format
 msgid "error setting flags for \"%s\": %s"
 msgstr "erreur lors de l'initialisation des fanions de « %s »: %s"
 
 #. Zero is used as an end marker in the file.
-#: config/obj-coff.c:438
+#: config/obj-coff.c:434
 msgid "Line numbers must be positive integers\n"
 msgstr "Les numéros de lignes doivent être des entiers positifs\n"
 
-#: config/obj-coff.c:470
+#: config/obj-coff.c:466
 msgid ".ln pseudo-op inside .def/.endef: ignored."
 msgstr ".ln pseudo opérateur à l'intérieur de .def/.endef: ignoré."
 
-#: config/obj-coff.c:512 ecoff.c:3250
+#: config/obj-coff.c:508 ecoff.c:3250
 msgid ".loc outside of .text"
 msgstr ".loc à l'extérieur de .text"
 
-#: config/obj-coff.c:519
+#: config/obj-coff.c:515
 msgid ".loc pseudo-op inside .def/.endef: ignored."
 msgstr ".loc pseudo opérateur à l'intérieur de .def/.endef: ignoré."
 
-#: config/obj-coff.c:600
+#: config/obj-coff.c:596
 msgid ".def pseudo-op used inside of .def/.endef: ignored."
 msgstr ".def pseudo opérateur utilisé à l'intérieur de .def/.endef: ignoré."
 
-#: config/obj-coff.c:636
+#: config/obj-coff.c:632
 msgid ".endef pseudo-op used outside of .def/.endef: ignored."
 msgstr ".endef pseudo opérateur utilisé à l'extérieur de .def/.endef: ignoré."
 
-#: config/obj-coff.c:675
+#: config/obj-coff.c:671
 #, c-format
 msgid "`%s' symbol without preceding function"
 msgstr "« %s » symbole sans fonction qui la précède"
 
-#: config/obj-coff.c:762
+#: config/obj-coff.c:758
 #, c-format
 msgid "unexpected storage class %d"
 msgstr "classe de stockage inattendue %d"
 
-#: config/obj-coff.c:870
+#: config/obj-coff.c:866
 msgid ".dim pseudo-op used outside of .def/.endef: ignored."
 msgstr ".dim pseudo opérateur utilisé à l'extérieur de .def/.endef: ignoré."
 
-#: config/obj-coff.c:890
+#: config/obj-coff.c:886
 msgid "badly formed .dim directive ignored"
 msgstr "directive .dim mal composée est ignorée"
 
-#: config/obj-coff.c:939
+#: config/obj-coff.c:935
 msgid ".size pseudo-op used outside of .def/.endef ignored."
 msgstr ".size pseudo opérateur utilisé à l'extérieur de .def/.endef ignoré."
 
-#: config/obj-coff.c:954
+#: config/obj-coff.c:950
 msgid ".scl pseudo-op used outside of .def/.endef ignored."
 msgstr ".scl pseudo opérateur utilisé à l'extérieur de .def/.endef ignoré."
 
-#: config/obj-coff.c:971
+#: config/obj-coff.c:967
 msgid ".tag pseudo-op used outside of .def/.endef ignored."
 msgstr ".tag pseudo opérateur utilisé à l'extérieur de .def/.endef ignoré."
 
-#: config/obj-coff.c:989
+#: config/obj-coff.c:985
 #, c-format
 msgid "tag not found for .tag %s"
 msgstr "étiquette non repérée pour le .tag %s"
 
-#: config/obj-coff.c:1002
+#: config/obj-coff.c:998
 msgid ".type pseudo-op used outside of .def/.endef ignored."
 msgstr ".type pseudo opérateur utilisé à l'extérieur de .def/.endef ignoré."
 
-#: config/obj-coff.c:1021
+#: config/obj-coff.c:1017
 msgid ".val pseudo-op used outside of .def/.endef ignored."
 msgstr ".val pseudo opérateur utilisé à l'extérieur de .def/.endef ignoré."
 
-#: config/obj-coff.c:1178
+#: config/obj-coff.c:1174
 msgid "badly formed .weak directive ignored"
 msgstr "directive .dim mal composée est ignorée"
 
-#: config/obj-coff.c:1356
+#: config/obj-coff.c:1352
 msgid "mismatched .eb"
 msgstr ".eb ne concorde pas"
 
-#: config/obj-coff.c:1377
+#: config/obj-coff.c:1373
 #, c-format
 msgid "C_EFCN symbol for %s out of scope"
 msgstr "symbole C_EFCN pour %s hors limite"
 
-#: config/obj-coff.c:1431
+#: config/obj-coff.c:1427
 #, c-format
 msgid "Warning: internal error: forgetting to set endndx of %s"
 msgstr "Attention: erreur interne: on a oublié de fixer endndx de %s"
@@ -763,22 +750,22 @@ msgstr "Attention: erreur interne: on a oublié de fixer endndx de %s"
 #. STYP_INFO
 #. STYP_LIB
 #. STYP_OVER
-#: config/obj-coff.c:1661
+#: config/obj-coff.c:1657
 #, c-format
 msgid "unsupported section attribute '%c'"
 msgstr "attribut de section non supporté « %c »"
 
-#: config/obj-coff.c:1665 config/tc-ppc.c:5129
+#: config/obj-coff.c:1661 config/tc-ppc.c:4919
 #, c-format
 msgid "unknown section attribute '%c'"
 msgstr "attribut de section inconnu « %c »"
 
-#: config/obj-coff.c:1707
+#: config/obj-coff.c:1703
 #, c-format
 msgid "Ignoring changed section attributes for %s"
 msgstr "Ignore les changements des attributs de section pour %s"
 
-#: config/obj-coff.c:1847
+#: config/obj-coff.c:1838
 #, c-format
 msgid "0x%lx: \"%s\" type = %ld, class = %d, segment = %d\n"
 msgstr "0x%lx: « %s » type = %ld, classe = %d, segment = %d\n"
@@ -834,7 +821,7 @@ msgstr "changement d'entité de taille de section pour %s"
 msgid "unrecognized .section attribute: want a,e,w,x,M,S,G,T"
 msgstr "attribut .section non reconnu: a,e,w,x,M,S,G,T attendu"
 
-#: config/obj-elf.c:836 read.c:2779
+#: config/obj-elf.c:836 read.c:2790
 msgid "unrecognized section type"
 msgstr "type de section non reconnnu"
 
@@ -846,93 +833,92 @@ msgstr "attribut de section non reconnu"
 msgid "missing name"
 msgstr "nom manquant"
 
-#: config/obj-elf.c:1032
+#: config/obj-elf.c:1030
 msgid "invalid merge entity size"
 msgstr "mauvaise taille de fusion d'entité"
 
-#: config/obj-elf.c:1039
+#: config/obj-elf.c:1037
 msgid "entity size for SHF_MERGE not specified"
 msgstr "taille d'entité pour SHF_MERGE non spécifiée"
 
-#: config/obj-elf.c:1045
+#: config/obj-elf.c:1043
 msgid "? section flag ignored with G present"
 msgstr "fanion ? de section ignoré quand G est présent"
 
-#: config/obj-elf.c:1064
+#: config/obj-elf.c:1062
 msgid "group name for SHF_GROUP not specified"
 msgstr "nom de groupe pour SHF_GROUP non spécifié"
 
-#: config/obj-elf.c:1087
+#: config/obj-elf.c:1085
 msgid "character following name is not '#'"
 msgstr "caractère suivant le nom n'est pas « # »"
 
-#: config/obj-elf.c:1207
+#: config/obj-elf.c:1204
 msgid ".previous without corresponding .section; ignored"
 msgstr ".previous sans .section correspondante; ignoré"
 
-#: config/obj-elf.c:1233
+#: config/obj-elf.c:1230
 msgid ".popsection without corresponding .pushsection; ignored"
 msgstr ".popsection sans .pushsection correspondant; ignoré"
 
-#: config/obj-elf.c:1279
+#: config/obj-elf.c:1276
 msgid "expected comma after name in .symver"
 msgstr "virgule attendue après le nom dans .symver"
 
-#: config/obj-elf.c:1303
+#: config/obj-elf.c:1300
 #, c-format
 msgid "missing version name in `%s' for symbol `%s'"
 msgstr "nom de version manquant dans « %s» pour le symbole «%s »"
 
-#: config/obj-elf.c:1314
+#: config/obj-elf.c:1311
 #, c-format
 msgid "multiple versions [`%s'|`%s'] for symbol `%s'"
 msgstr "versions multiples [«%s»|«%s»] pour le symbole «%s»"
 
-#: config/obj-elf.c:1351
+#: config/obj-elf.c:1348
 #, c-format
 msgid "expected `%s' to have already been set for .vtable_inherit"
 msgstr "«%s» aurait déjà dû être fixé pour .vtable_inherit"
 
-#: config/obj-elf.c:1361
+#: config/obj-elf.c:1358
 msgid "expected comma after name in .vtable_inherit"
 msgstr "virgule attendue après le nom dans .vtable_inherit"
 
-#: config/obj-elf.c:1414
+#: config/obj-elf.c:1411
 msgid "expected comma after name in .vtable_entry"
 msgstr "virgule attendue après le nom dans .vtable_entry"
 
-#: config/obj-elf.c:1537
+#: config/obj-elf.c:1534
 msgid "expected quoted string"
 msgstr "chaîne entre apostrophes attendue"
 
-#: config/obj-elf.c:1557
+#: config/obj-elf.c:1554
 #, c-format
 msgid "expected comma after name `%s' in .size directive"
 msgstr "virgule attendue après le nom « %s » dans la directive .size"
 
-#: config/obj-elf.c:1566
+#: config/obj-elf.c:1563
 msgid "missing expression in .size directive"
 msgstr "expression manquante dans la directive .size"
 
-#: config/obj-elf.c:1690
+#: config/obj-elf.c:1687
 #, c-format
 msgid "symbol '%s' is already defined"
 msgstr "symbole « %s » déjà défini"
 
-#: config/obj-elf.c:1710 config/obj-elf.c:1722
+#: config/obj-elf.c:1707 config/obj-elf.c:1719
 #, c-format
 msgid "symbol type \"%s\" is supported only by GNU targets"
 msgstr "type de symbole « %s » n'est supporté que par les cibles GNU"
 
-#: config/obj-elf.c:1733
+#: config/obj-elf.c:1730
 #, c-format
 msgid "unrecognized symbol type \"%s\""
 msgstr "type de symbole non reconnu « %s »"
 
-#: config/obj-elf.c:1903 config/obj-elf.c:1906
-#, c-format
-msgid ".size expression for %s does not evaluate to a constant"
-msgstr "l'expression .size de %s n'est pas une constante"
+#: config/obj-elf.c:1906
+msgid ".size expression too complicated to fix up"
+msgstr "expression .size trop compliquée pour tenter de la corriger"
 
 #: config/obj-elf.c:1938
 #, c-format
@@ -954,17 +940,17 @@ msgstr "assume que tous les membres du groupe « %s » sont COMDAT"
 msgid "can't create group: %s"
 msgstr "ne peut créer le groupe: %s"
 
-#: config/obj-elf.c:2267
+#: config/obj-elf.c:2260
 #, c-format
 msgid "failed to set up debugging information: %s"
 msgstr "échec d'initialisation des informations de débug: %s"
 
-#: config/obj-elf.c:2287
+#: config/obj-elf.c:2280
 #, c-format
 msgid "can't start writing .mdebug section: %s"
 msgstr "ne peut débuter l'écriture de la section .mdebug: %s"
 
-#: config/obj-elf.c:2295
+#: config/obj-elf.c:2288
 #, c-format
 msgid "could not write .mdebug section: %s"
 msgstr "n'a pas pu écrire la section .mdebug: %s"
@@ -1077,7 +1063,7 @@ msgstr "arguments inappropriés pour l'opcode « %s »"
 msgid "opcode `%s' not supported for target %s"
 msgstr "opcode « %s » n'est pas supporté pour la cible %s"
 
-#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1441
+#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1384
 #: config/tc-msp430.c:1828
 #, c-format
 msgid "unknown opcode `%s'"
@@ -1159,7 +1145,7 @@ msgid "sequence number in use for !tlsgd!%ld"
 msgstr "numéro de séquence utilisé pour !tlsgd!%ld"
 
 #: config/tc-alpha.c:2001 config/tc-arc.c:292 config/tc-mn10200.c:856
-#: config/tc-mn10300.c:1148 config/tc-ppc.c:1730 config/tc-s390.c:638
+#: config/tc-mn10300.c:1148 config/tc-ppc.c:1699 config/tc-s390.c:611
 msgid "operand"
 msgstr "opérande"
 
@@ -1176,7 +1162,7 @@ msgid "can not resolve expression"
 msgstr "ne peut résoudre l'expression"
 
 #: config/tc-alpha.c:3524 config/tc-i370.c:1055 config/tc-microblaze.c:185
-#: config/tc-ppc.c:2055 config/tc-ppc.c:4892
+#: config/tc-ppc.c:2024 config/tc-ppc.c:4682
 #, c-format
 msgid ".COMMon length (%ld.) <0! Ignored."
 msgstr "longueur de .COMMon (%ld.) <0! Ignoré."
@@ -1185,7 +1171,7 @@ msgstr "longueur de .COMMon (%ld.) <0! Ignoré."
 msgid "Ignoring attempt to re-define symbol"
 msgstr "Ignore la tentative de redéfinition du symbole"
 
-#: config/tc-alpha.c:3627 config/tc-ppc.c:4929 config/tc-sparc.c:3828
+#: config/tc-alpha.c:3627 config/tc-ppc.c:4719 config/tc-sparc.c:3828
 #, c-format
 msgid "Length of .comm \"%s\" is already %ld. Not changed to %ld."
 msgstr "Longueur de .comm « %s » est déjà %ld. N'a pas été changé pour %ld."
@@ -1226,7 +1212,7 @@ msgstr "directive .fmask erronée"
 msgid "bad .mask directive"
 msgstr "directive .mask erronée"
 
-#: config/tc-alpha.c:3882 config/tc-mips.c:15469 config/tc-score.c:5743
+#: config/tc-alpha.c:3882 config/tc-mips.c:15153 config/tc-score.c:5743
 #: ecoff.c:3178
 msgid ".frame outside of .ent"
 msgstr ".frame à l'extérieur de .ent"
@@ -1358,37 +1344,37 @@ msgstr "Alignement trop grand: %d. assumé"
 msgid "Alignment negative: 0 assumed"
 msgstr "Alignement négatif: 0 assumé"
 
-#: config/tc-alpha.c:5163 config/tc-alpha.c:5656
+#: config/tc-alpha.c:5162 config/tc-alpha.c:5655
 #, c-format
 msgid "Unknown CPU identifier `%s'"
 msgstr "Identificateur de CPU inconnu « %s »"
 
-#: config/tc-alpha.c:5354
+#: config/tc-alpha.c:5353
 #, c-format
 msgid "Chose GP value of %lx\n"
 msgstr "Valeur GP choisie: %lx\n"
 
-#: config/tc-alpha.c:5368
+#: config/tc-alpha.c:5367
 msgid "bad .section directive: want a,s,w,x,M,S,G,T in string"
 msgstr "mauvaise directive .section: nécessite a,s,w,x,M,S,G,T dans la chaîne"
 
-#: config/tc-alpha.c:5457
+#: config/tc-alpha.c:5456
 #, c-format
 msgid "internal error: can't hash opcode `%s': %s"
 msgstr "erreur interne: l'opcode « %s » ne peut être hashé: %s"
 
-#: config/tc-alpha.c:5493
+#: config/tc-alpha.c:5492
 #, c-format
 msgid "internal error: can't hash macro `%s': %s"
 msgstr "erreur interne: la macro « %s » ne peut être hashé: %s"
 
-#: config/tc-alpha.c:5578 config/tc-arm.c:6746 config/tc-arm.c:6758
+#: config/tc-alpha.c:5577 config/tc-arm.c:6588 config/tc-arm.c:6600
 #: config/tc-i960.c:708 config/tc-xtensa.c:5315 config/tc-xtensa.c:5393
-#: config/tc-xtensa.c:5510 config/tc-z80.c:1897
+#: config/tc-xtensa.c:5510 config/tc-z80.c:1888
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: config/tc-alpha.c:5707
+#: config/tc-alpha.c:5706
 msgid ""
 "Alpha options:\n"
 "-32addr\t\t\ttreat addresses as 32-bit values\n"
@@ -1406,7 +1392,7 @@ msgstr ""
 "-m21064 | -m21066 | -m21164 | -m21164a | -m21164pc | -m21264 | -m 21264a | -m21264b\n"
 "                        ces variantes contiennent les opcodes PALcode\n"
 
-#: config/tc-alpha.c:5717
+#: config/tc-alpha.c:5716
 msgid ""
 "VMS options:\n"
 "-+\t\t\tencode (don't truncate) names longer than 64 characters\n"
@@ -1418,40 +1404,40 @@ msgstr ""
 "-H\t\t\tafficher les nouveaux symboles après une troncation du hachage\n"
 "-replace/-noreplace\tactiver ou non l'optimisation des appels de procédure\n"
 
-#: config/tc-alpha.c:5968
+#: config/tc-alpha.c:5967
 #, c-format
 msgid "unhandled relocation type %s"
 msgstr "type de réadressage non traité %s"
 
-#: config/tc-alpha.c:5981
+#: config/tc-alpha.c:5980
 msgid "non-absolute expression in constant field"
 msgstr "expression non absolue dams le champ de constante"
 
-#: config/tc-alpha.c:5995
+#: config/tc-alpha.c:5994
 #, c-format
 msgid "type %d reloc done?\n"
 msgstr "type de réadressage %d fait ?\n"
 
-#: config/tc-alpha.c:6042 config/tc-alpha.c:6049 config/tc-mips.c:9793
+#: config/tc-alpha.c:6041 config/tc-alpha.c:6048
 msgid "Used $at without \".set noat\""
 msgstr "Utilisation de $at sans \".set noat\""
 
-#: config/tc-alpha.c:6218
+#: config/tc-alpha.c:6217
 #, c-format
 msgid "!samegp reloc against symbol without .prologue: %s"
 msgstr "réadressage !samgp vers le symbole sans .prologue: %s"
 
-#: config/tc-alpha.c:6262 config/tc-xtensa.c:5999
+#: config/tc-alpha.c:6261 config/tc-xtensa.c:5999
 #, c-format
 msgid "cannot represent `%s' relocation in object file"
 msgstr "ne peut représenter le réadressage « %s » dans le fichier objet"
 
-#: config/tc-alpha.c:6268
+#: config/tc-alpha.c:6267
 #, c-format
 msgid "internal error? cannot generate `%s' relocation"
 msgstr "erreur interne ? ne peut générer le réadressage « %s »"
 
-#: config/tc-alpha.c:6364
+#: config/tc-alpha.c:6363
 #, c-format
 msgid "frame reg expected, using $%d."
 msgstr "registre de trame attendu, utilise $%d"
@@ -1459,15 +1445,15 @@ msgstr "registre de trame attendu, utilise $%d"
 #: config/tc-arc.c:194 config/tc-arc.c:215 config/tc-arc.c:992
 #: config/tc-h8300.c:77 config/tc-h8300.c:86 config/tc-h8300.c:96
 #: config/tc-h8300.c:106 config/tc-h8300.c:116 config/tc-h8300.c:127
-#: config/tc-h8300.c:244 config/tc-hppa.c:6887 config/tc-hppa.c:6893
-#: config/tc-hppa.c:6899 config/tc-hppa.c:6905 config/tc-hppa.c:8312
+#: config/tc-h8300.c:244 config/tc-hppa.c:6866 config/tc-hppa.c:6872
+#: config/tc-hppa.c:6878 config/tc-hppa.c:6884 config/tc-hppa.c:8291
 #: config/tc-lm32.c:198 config/tc-mn10300.c:937 config/tc-mn10300.c:942
 #: config/tc-mn10300.c:2433 config/tc-xc16x.c:79 config/tc-xc16x.c:86
 #: config/tc-xc16x.c:93
 msgid "could not set architecture and machine"
 msgstr "ne peut initialiser l'architecture et la machine"
 
-#: config/tc-arc.c:212 config/tc-arm.c:22240 config/tc-score.c:6303
+#: config/tc-arc.c:212 config/tc-arm.c:22001 config/tc-score.c:6303
 #: config/tc-score.c:6532 config/tc-score.c:6537
 msgid "virtual memory exhausted"
 msgstr "mémoire virtuelle épuisée"
@@ -1558,7 +1544,7 @@ msgstr "opcode 0x3 et SYNTAX_3OP invalides"
 msgid "unknown suffix class"
 msgstr "classe de suffix inconnu"
 
-#: config/tc-arc.c:862 config/tc-tic6x.c:582
+#: config/tc-arc.c:862
 msgid "expected comma after symbol name"
 msgstr "virgule attendue après le nom de symbole"
 
@@ -1629,7 +1615,7 @@ msgstr "symbole en tant que registre de destination"
 
 #. xgettext:c-format.
 #: config/tc-arc.c:1759 config/tc-i370.c:2207 config/tc-mn10200.c:1141
-#: config/tc-mn10300.c:1820 config/tc-ppc.c:2970 config/tc-s390.c:1506
+#: config/tc-mn10300.c:1820 config/tc-ppc.c:2939 config/tc-s390.c:1465
 #: config/tc-v850.c:2699
 #, c-format
 msgid "junk at end of line: `%s'"
@@ -1648,820 +1634,799 @@ msgstr "instruction de saut 8 byte avec une plage de délai"
 msgid "conditional branch follows set of flags"
 msgstr "un branchement conditionnel suit un ensemble de fanions"
 
-#: config/tc-arc.c:1893 config/tc-arm.c:16170
+#: config/tc-arc.c:1893 config/tc-arm.c:15965
 #, c-format
 msgid "bad instruction `%s'"
 msgstr "instruction « %s » erronée"
 
-#: config/tc-arm.c:539
+#: config/tc-arm.c:529
 msgid "ARM register expected"
 msgstr "registre ARM attendu"
 
-#: config/tc-arm.c:540
+#: config/tc-arm.c:530
 msgid "bad or missing co-processor number"
 msgstr "numéro de co-processeur erroné ou manquant"
 
-#: config/tc-arm.c:541
+#: config/tc-arm.c:531
 msgid "co-processor register expected"
 msgstr "registre de coprocesseur attendu"
 
-#: config/tc-arm.c:542
+#: config/tc-arm.c:532
 msgid "FPA register expected"
 msgstr "registre FPA attendu"
 
-#: config/tc-arm.c:543
+#: config/tc-arm.c:533
 msgid "VFP single precision register expected"
 msgstr "registre VFP en simple précision attendu"
 
-#: config/tc-arm.c:544
+#: config/tc-arm.c:534
 msgid "VFP/Neon double precision register expected"
 msgstr "registre VFP/Neon en double précision attendu"
 
-#: config/tc-arm.c:545
+#: config/tc-arm.c:535
 msgid "Neon quad precision register expected"
 msgstr "registre Neon en quadruple précision attendu"
 
-#: config/tc-arm.c:546
+#: config/tc-arm.c:536
 msgid "VFP single or double precision register expected"
 msgstr "registre VFP en simple ou double précision attendu"
 
-#: config/tc-arm.c:547
+#: config/tc-arm.c:537
 msgid "Neon double or quad precision register expected"
 msgstr "registre Neon en double ou quadruple précision attendu"
 
-#: config/tc-arm.c:548
+#: config/tc-arm.c:538
 msgid "VFP single, double or Neon quad precision register expected"
 msgstr "registre VFP en simple, double ou Neon en quadruple précision attendu"
 
-#: config/tc-arm.c:549
+#: config/tc-arm.c:539
 msgid "VFP system register expected"
 msgstr "registre système VFP attendu"
 
-#: config/tc-arm.c:550
+#: config/tc-arm.c:540
 msgid "Maverick MVF register expected"
 msgstr "registre Maverick MVF attendu"
 
-#: config/tc-arm.c:551
+#: config/tc-arm.c:541
 msgid "Maverick MVD register expected"
 msgstr "registre Maverick MVD attendu"
 
-#: config/tc-arm.c:552
+#: config/tc-arm.c:542
 msgid "Maverick MVFX register expected"
 msgstr "registre Maverick MVFX attendu"
 
-#: config/tc-arm.c:553
+#: config/tc-arm.c:543
 msgid "Maverick MVDX register expected"
 msgstr "registre Maverick MVDX attendu"
 
-#: config/tc-arm.c:554
+#: config/tc-arm.c:544
 msgid "Maverick MVAX register expected"
 msgstr "registre Maverick MVAX attendu"
 
-#: config/tc-arm.c:555
+#: config/tc-arm.c:545
 msgid "Maverick DSPSC register expected"
 msgstr "registre Maverick DSPSC attendu"
 
-#: config/tc-arm.c:556
+#: config/tc-arm.c:546
 msgid "iWMMXt data register expected"
 msgstr "registre de donnée iWMMXt attendu"
 
-#: config/tc-arm.c:557 config/tc-arm.c:6525
+#: config/tc-arm.c:547 config/tc-arm.c:6363
 msgid "iWMMXt control register expected"
 msgstr "registre de contrôle iWMMXt attendu"
 
-#: config/tc-arm.c:558
+#: config/tc-arm.c:548
 msgid "iWMMXt scalar register expected"
 msgstr "registre scalaire iWMMXt attendu"
 
-#: config/tc-arm.c:559
+#: config/tc-arm.c:549
 msgid "XScale accumulator register expected"
 msgstr "registre accumulateur XScale invalide"
 
 #. For score5u : div/mul will pop warning message, mmu/alw/asw will pop error message.
-#: config/tc-arm.c:708 config/tc-score.c:259
+#: config/tc-arm.c:698 config/tc-score.c:259
 msgid "bad arguments to instruction"
 msgstr "arguments erronés pour l'instruction"
 
-#: config/tc-arm.c:709
+#: config/tc-arm.c:699
 msgid "r13 not allowed here"
 msgstr "r13 n'est pas permis ici"
 
-#: config/tc-arm.c:710
+#: config/tc-arm.c:700
 msgid "r15 not allowed here"
 msgstr "r15 n'est pas permis ici"
 
-#: config/tc-arm.c:711
+#: config/tc-arm.c:701
 msgid "instruction cannot be conditional"
 msgstr "l'instruction ne peut pas être conditionnelle"
 
-#: config/tc-arm.c:712
+#: config/tc-arm.c:702
 msgid "registers may not be the same"
 msgstr "les registres ne peuvent pas être les mêmes"
 
-#: config/tc-arm.c:713
+#: config/tc-arm.c:703
 msgid "lo register required"
 msgstr "registre LO requis"
 
-#: config/tc-arm.c:714
+#: config/tc-arm.c:704
 msgid "instruction not supported in Thumb16 mode"
 msgstr "instruction pas supportée en mode Thumb16"
 
-#: config/tc-arm.c:715
+#: config/tc-arm.c:705
 msgid "instruction does not accept this addressing mode"
 msgstr "l'instruction n'accepte pas ce mode d'adressage"
 
-#: config/tc-arm.c:716
+#: config/tc-arm.c:706
 msgid "branch must be last instruction in IT block"
 msgstr "le branchement doit être la dernière instruction du bloc IT"
 
-#: config/tc-arm.c:717
+#: config/tc-arm.c:707
 msgid "instruction not allowed in IT block"
 msgstr "instruction non permise dans un bloc IT"
 
-#: config/tc-arm.c:718
+#: config/tc-arm.c:708
 msgid "selected FPU does not support instruction"
 msgstr "le FPU choisi ne supporte pas l'instruction"
 
-#: config/tc-arm.c:719
+#: config/tc-arm.c:709
 msgid "thumb conditional instruction should be in IT block"
 msgstr "l'instruction conditionnelle thumb devrait être dans le bloc IT"
 
-#: config/tc-arm.c:720
+#: config/tc-arm.c:710
 msgid "incorrect condition in IT block"
 msgstr "condition incorrect dans le bloc IT"
 
-#: config/tc-arm.c:721
+#: config/tc-arm.c:711
 msgid "IT falling in the range of a previous IT block"
 msgstr "IT atterri dans la plage d'un bloc IT précédent"
 
-#: config/tc-arm.c:722
+#: config/tc-arm.c:712
 msgid "missing .fnstart before unwinding directive"
 msgstr ".fnstart manquant avant la directive de déroulement"
 
-#: config/tc-arm.c:724
+#: config/tc-arm.c:714
 msgid "cannot use register index with PC-relative addressing"
 msgstr "ne peut pas utiliser un index de registre avec un adressage relatif au PC"
 
-#: config/tc-arm.c:726
+#: config/tc-arm.c:716
 msgid "cannot use writeback with PC-relative addressing"
 msgstr "la réécriture ne peut pas être utilisée avec un adressage relatif au PC"
 
-#: config/tc-arm.c:917
+#: config/tc-arm.c:907
 msgid "immediate expression requires a # prefix"
 msgstr "préfixe # attendu avec une expression immédiate"
 
-#: config/tc-arm.c:945 read.c:3664
+#: config/tc-arm.c:935 read.c:3678
 msgid "missing expression"
 msgstr "expression manquante"
 
-#: config/tc-arm.c:945 config/tc-score.c:6519 expr.c:1357 read.c:2456
+#: config/tc-arm.c:935 config/tc-score.c:6519 expr.c:1358 read.c:2469
 msgid "bad expression"
 msgstr "expression erronée"
 
-#: config/tc-arm.c:956 config/tc-i860.c:1004 config/tc-sparc.c:2880
+#: config/tc-arm.c:946 config/tc-i860.c:1004 config/tc-sparc.c:2880
 msgid "bad segment"
 msgstr "segment erroné"
 
-#: config/tc-arm.c:975 config/tc-arm.c:4848 config/tc-i960.c:1300
+#: config/tc-arm.c:965 config/tc-arm.c:4809 config/tc-i960.c:1300
 #: config/tc-score.c:1211
 msgid "invalid constant"
 msgstr "constante invalide"
 
-#: config/tc-arm.c:1105
+#: config/tc-arm.c:1095
 msgid "expected #constant"
 msgstr "#constante attendu"
 
-#: config/tc-arm.c:1266
+#: config/tc-arm.c:1256
 #, c-format
 msgid "unexpected character `%c' in type specifier"
 msgstr "caractère « %c » inattendu dans le spécificateur de type"
 
-#: config/tc-arm.c:1283
+#: config/tc-arm.c:1273
 #, c-format
 msgid "bad size %d in type specifier"
 msgstr "mauvaise taille %d dans le spécifieur de type"
 
-#: config/tc-arm.c:1333
+#: config/tc-arm.c:1323
 msgid "only one type should be specified for operand"
 msgstr "un type seulement devrait être spécifié pour l'opérande"
 
-#: config/tc-arm.c:1339
+#: config/tc-arm.c:1329
 msgid "vector type expected"
 msgstr "type vectoriel attendu"
 
-#: config/tc-arm.c:1411
+#: config/tc-arm.c:1401
 msgid "can't redefine type for operand"
 msgstr "le type ne peut pas être redéfini pour un opérande"
 
-#: config/tc-arm.c:1422
+#: config/tc-arm.c:1412
 msgid "only D registers may be indexed"
 msgstr "seulement les registres D peuvent être indexés"
 
-#: config/tc-arm.c:1428
+#: config/tc-arm.c:1418
 msgid "can't change index for operand"
 msgstr "l'index de l'opérande ne peut pas être changé"
 
-#: config/tc-arm.c:1444 config/tc-arm.c:3332 config/tc-arm.c:4430
+#: config/tc-arm.c:1434 config/tc-arm.c:3318 config/tc-arm.c:4391
 msgid "constant expression required"
 msgstr "expression constante attendue"
 
-#: config/tc-arm.c:1491
+#: config/tc-arm.c:1477
 msgid "register operand expected, but got scalar"
 msgstr "opérande de registre attendu mais on a trouvé un scalaire"
 
-#: config/tc-arm.c:1524
+#: config/tc-arm.c:1510
 msgid "scalar must have an index"
 msgstr "le scalaire doit avoir un indexe"
 
-#: config/tc-arm.c:1529 config/tc-arm.c:14756 config/tc-arm.c:14806
-#: config/tc-arm.c:15221
+#: config/tc-arm.c:1515 config/tc-arm.c:14574 config/tc-arm.c:14624
+#: config/tc-arm.c:15039
 msgid "scalar index out of range"
 msgstr "index scalaire hors limite"
 
-#: config/tc-arm.c:1577
+#: config/tc-arm.c:1563
 msgid "bad range in register list"
 msgstr "mauvaise limite dans la liste des registres"
 
-#: config/tc-arm.c:1585 config/tc-arm.c:1594 config/tc-arm.c:1635
+#: config/tc-arm.c:1571 config/tc-arm.c:1580 config/tc-arm.c:1621
 #, c-format
 msgid "Warning: duplicated register (r%d) in register list"
 msgstr "Attention: registre en double (r%d) dans la liste des registres"
 
-#: config/tc-arm.c:1597
+#: config/tc-arm.c:1583
 msgid "Warning: register range not in ascending order"
 msgstr "Attention: gamme de registres n'est pas en ordre croissant"
 
-#: config/tc-arm.c:1608
+#: config/tc-arm.c:1594
 msgid "missing `}'"
 msgstr "« } » manquant"
 
-#: config/tc-arm.c:1624
+#: config/tc-arm.c:1610
 msgid "invalid register mask"
 msgstr "masque de registre invalide"
 
-#: config/tc-arm.c:1706
+#: config/tc-arm.c:1692
 msgid "expecting {"
 msgstr "{ attendu"
 
-#: config/tc-arm.c:1761 config/tc-arm.c:1805
+#: config/tc-arm.c:1747 config/tc-arm.c:1791
 msgid "register out of range in list"
 msgstr "registre hors limite dans la liste"
 
-#: config/tc-arm.c:1777 config/tc-arm.c:1822 config/tc-h8300.c:1040
-#: config/tc-mips.c:10894 config/tc-mips.c:10916
+#: config/tc-arm.c:1763 config/tc-arm.c:1808 config/tc-h8300.c:1040
+#: config/tc-mips.c:10575 config/tc-mips.c:10597
 msgid "invalid register list"
 msgstr "liste de registres invalide"
 
-#: config/tc-arm.c:1783 config/tc-arm.c:3846 config/tc-arm.c:3979
+#: config/tc-arm.c:1769 config/tc-arm.c:3832 config/tc-arm.c:3965
 msgid "register list not in ascending order"
 msgstr "liste de registres n'est pas en ordre croissant"
 
-#: config/tc-arm.c:1814
+#: config/tc-arm.c:1800
 msgid "register range not in ascending order"
 msgstr "gamme de registres n'est pas en ordre croissant"
 
-#: config/tc-arm.c:1847
+#: config/tc-arm.c:1833
 msgid "non-contiguous register range"
 msgstr "game de registres non contiguë"
 
-#: config/tc-arm.c:1906
+#: config/tc-arm.c:1892
 msgid "register stride must be 1 or 2"
 msgstr "pas des registres doit être 1 ou 2"
 
-#: config/tc-arm.c:1907
+#: config/tc-arm.c:1893
 msgid "mismatched element/structure types in list"
 msgstr "types d'élément/structure en désaccord dans la liste"
 
-#: config/tc-arm.c:1971
+#: config/tc-arm.c:1957
 msgid "don't use Rn-Rm syntax with non-unit stride"
 msgstr "n'utilisez pas la syntaxe Rn-Rm avec un pas non unitaire"
 
-#: config/tc-arm.c:2026
+#: config/tc-arm.c:2012
 msgid "error parsing element/structure list"
 msgstr "erreur lors de l'analyse de la liste élément/structure"
 
-#: config/tc-arm.c:2032
+#: config/tc-arm.c:2018
 msgid "expected }"
 msgstr "} attendu"
 
-#: config/tc-arm.c:2089
+#: config/tc-arm.c:2075
 #, c-format
 msgid "ignoring attempt to redefine built-in register '%s'"
 msgstr "ignore la tentative de redéfinir le registre intégré « %s »"
 
-#: config/tc-arm.c:2094
+#: config/tc-arm.c:2080
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr "ignore la redéfinition de l'alias du registre « %s »"
 
-#: config/tc-arm.c:2122
+#: config/tc-arm.c:2108
 msgid "attempt to redefine typed alias"
 msgstr "tentative de redéfinition de l'alias typé"
 
-#: config/tc-arm.c:2161
+#: config/tc-arm.c:2147
 #, c-format
 msgid "unknown register '%s' -- .req ignored"
 msgstr "registre « %s » inconnu -- .req ignoré"
 
-#: config/tc-arm.c:2256
+#: config/tc-arm.c:2242
 msgid "bad type for register"
 msgstr "mauvais type pour le registre"
 
-#: config/tc-arm.c:2267
+#: config/tc-arm.c:2253
 msgid "expression must be constant"
 msgstr "l'expression doit être une constante"
 
-#: config/tc-arm.c:2284
+#: config/tc-arm.c:2270
 msgid "can't redefine the type of a register alias"
 msgstr "le type d'un alias de registre ne peut pas être redéfini"
 
-#: config/tc-arm.c:2291
+#: config/tc-arm.c:2277
 msgid "you must specify a single type only"
 msgstr "vous ne pouvez spécifier qu'un type unique"
 
-#: config/tc-arm.c:2304
+#: config/tc-arm.c:2290
 msgid "can't redefine the index of a scalar alias"
 msgstr "l'indexe d'un alias scalaire ne peut pas être redéfini"
 
-#: config/tc-arm.c:2312
+#: config/tc-arm.c:2298
 msgid "scalar index must be constant"
 msgstr "l'indexe scalaire doit être constant"
 
-#: config/tc-arm.c:2321
+#: config/tc-arm.c:2307
 msgid "expecting ]"
 msgstr "] attendu"
 
-#: config/tc-arm.c:2368
+#: config/tc-arm.c:2354
 msgid "invalid syntax for .req directive"
 msgstr "syntaxe invalide pour le directive .req"
 
-#: config/tc-arm.c:2374
+#: config/tc-arm.c:2360
 msgid "invalid syntax for .dn directive"
 msgstr "syntaxe invalide pour le directive .dn"
 
-#: config/tc-arm.c:2380
+#: config/tc-arm.c:2366
 msgid "invalid syntax for .qn directive"
 msgstr "syntaxe invalide pour le directive .qn"
 
-#: config/tc-arm.c:2406
+#: config/tc-arm.c:2392
 msgid "invalid syntax for .unreq directive"
 msgstr "syntaxe invalide pour le directive .unreq"
 
-#: config/tc-arm.c:2413
+#: config/tc-arm.c:2399
 #, c-format
 msgid "unknown register alias '%s'"
 msgstr "alias de registre « %s » inconnu"
 
-#: config/tc-arm.c:2415
+#: config/tc-arm.c:2401
 #, c-format
-msgid "ignoring attempt to use .unreq on fixed register name: '%s'"
-msgstr "ignore la tentative d'utiliser .unreq sur un nom de registre fixe: « %s »"
+msgid "ignoring attempt to undefine built-in register '%s'"
+msgstr "ignore la tentative d'annuler la définition du registre intégré « %s »"
 
-#: config/tc-arm.c:2666
+#: config/tc-arm.c:2652
 #, c-format
 msgid "Failed to find real start of function: %s\n"
 msgstr "impossible de trouver le début réel de la fonction: %s\n"
 
-#: config/tc-arm.c:2683
+#: config/tc-arm.c:2669
 msgid "selected processor does not support THUMB opcodes"
 msgstr "le processeur choisi ne supporte pas les opcodes THUMB"
 
-#: config/tc-arm.c:2696
+#: config/tc-arm.c:2682
 msgid "selected processor does not support ARM opcodes"
 msgstr "le processeur choisi ne supporte pas les opcodes ARM"
 
-#: config/tc-arm.c:2708
+#: config/tc-arm.c:2694
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr "taille d'instruction choisie invalide (%d)"
 
-#: config/tc-arm.c:2740
+#: config/tc-arm.c:2726
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr "opérande invalide pour la directive .code (%d) (attendu 16 ou 32)"
 
-#: config/tc-arm.c:2796
+#: config/tc-arm.c:2782
 #, c-format
 msgid "expected comma after name \"%s\""
 msgstr "virgule attendue après le nom « %s »"
 
-#: config/tc-arm.c:2846 config/tc-m32r.c:588
+#: config/tc-arm.c:2832 config/tc-m32r.c:588
 #, c-format
 msgid "symbol `%s' already defined"
 msgstr "symbole « %s » déjà défini"
 
-#: config/tc-arm.c:2880
+#: config/tc-arm.c:2866
 #, c-format
 msgid "unrecognized syntax mode \"%s\""
 msgstr "mode de syntaxe « %s » non reconnu"
 
-#: config/tc-arm.c:2901
+#: config/tc-arm.c:2887
 #, c-format
 msgid "alignment too large: %d assumed"
 msgstr "alignement trop grand: %d assumé"
 
-#: config/tc-arm.c:2904
+#: config/tc-arm.c:2890
 msgid "alignment negative. 0 assumed."
 msgstr "alignement négatif: 0 assumé."
 
-#: config/tc-arm.c:3054
+#: config/tc-arm.c:3040
 msgid "literal pool overflow"
 msgstr "débordement du pool de littéraux"
 
-#: config/tc-arm.c:3210 config/tc-arm.c:6460
+#: config/tc-arm.c:3196 config/tc-arm.c:6298
 msgid "unrecognized relocation suffix"
 msgstr "suffixe de réadressage non reconnu"
 
-#: config/tc-arm.c:3225
+#: config/tc-arm.c:3211
 msgid "(plt) is only valid on branch targets"
 msgstr "(plt) est seulement valable dans des cibles de branchements"
 
-#: config/tc-arm.c:3231 config/tc-s390.c:1134 config/tc-s390.c:1771
+#: config/tc-arm.c:3217 config/tc-s390.c:1107 config/tc-s390.c:1730
 #: config/tc-xtensa.c:1591
 #, c-format
 msgid "%s relocations do not fit in %d bytes"
 msgstr "réadressages %s n'entre pas dans %d octets"
 
-#: config/tc-arm.c:3308
+#: config/tc-arm.c:3294
 msgid ".inst.n operand too big. Use .inst.w instead"
 msgstr "opérande .inst.n trop grand. Utilisez plutôt .inst.w"
 
-#: config/tc-arm.c:3328
+#: config/tc-arm.c:3314
 msgid "cannot determine Thumb instruction size. Use .inst.n/.inst.w instead"
 msgstr "impossible de déterminer la taille de l'instruction Thumb. Utilisez plutôt .inst.n/.inst.w"
 
-#: config/tc-arm.c:3358
+#: config/tc-arm.c:3344
 msgid "width suffixes are invalid in ARM mode"
 msgstr "les suffixes de largeurs sont invalides en mode ARM"
 
-#: config/tc-arm.c:3400 dwarf2dbg.c:711
+#: config/tc-arm.c:3386 dwarf2dbg.c:707
 msgid "expected 0 or 1"
 msgstr "0 ou 1 attendu"
 
-#: config/tc-arm.c:3404
+#: config/tc-arm.c:3390
 msgid "missing comma"
 msgstr "virgule manquante"
 
-#: config/tc-arm.c:3437
+#: config/tc-arm.c:3423
 msgid "duplicate .fnstart directive"
 msgstr "directive .fnstart en double"
 
-#: config/tc-arm.c:3468 config/tc-tic6x.c:413
+#: config/tc-arm.c:3454
 msgid "duplicate .handlerdata directive"
 msgstr "directive .handlerdata en double"
 
-#: config/tc-arm.c:3487
+#: config/tc-arm.c:3473
 msgid ".fnend directive without .fnstart"
 msgstr "directive .fnend sans .fnstart"
 
-#: config/tc-arm.c:3553 config/tc-tic6x.c:394
+#: config/tc-arm.c:3539
 msgid "personality routine specified for cantunwind frame"
 msgstr "routine de personnalité spécifiée dans un cadre cantunwind"
 
-#: config/tc-arm.c:3570 config/tc-tic6x.c:455
+#: config/tc-arm.c:3556
 msgid "duplicate .personalityindex directive"
 msgstr "directive .personalityindex en double"
 
-#: config/tc-arm.c:3577 config/tc-tic6x.c:462
+#: config/tc-arm.c:3563
 msgid "bad personality routine number"
 msgstr "mauvais numéro de routine de personnalité"
 
-#: config/tc-arm.c:3599 config/tc-tic6x.c:479
+#: config/tc-arm.c:3585
 msgid "duplicate .personality directive"
 msgstr "directive .personality en double"
 
-#: config/tc-arm.c:3622 config/tc-arm.c:3750 config/tc-arm.c:3798
+#: config/tc-arm.c:3608 config/tc-arm.c:3736 config/tc-arm.c:3784
 msgid "expected register list"
 msgstr "liste de registre attendue"
 
-#: config/tc-arm.c:3704
+#: config/tc-arm.c:3690
 msgid "expected , <constant>"
 msgstr ", <constante> attendu"
 
-#: config/tc-arm.c:3713
+#: config/tc-arm.c:3699
 msgid "number of registers must be in the range [1:4]"
 msgstr "Le nombre de registres doit être compris dans l'intervalle [1:4]"
 
-#: config/tc-arm.c:3860 config/tc-arm.c:3993
+#: config/tc-arm.c:3846 config/tc-arm.c:3979
 msgid "bad register range"
 msgstr "mauvaise gamme de registre"
 
-#: config/tc-arm.c:4050
+#: config/tc-arm.c:4036
 msgid "register expected"
 msgstr "registre attendu"
 
-#: config/tc-arm.c:4060
+#: config/tc-arm.c:4046
 msgid "FPA .unwind_save does not take a register list"
 msgstr "FPA .unwind_save n'accepte pas une liste de registres"
 
-#: config/tc-arm.c:4079
+#: config/tc-arm.c:4065
 msgid ".unwind_save does not support this kind of register"
 msgstr ".unwind_save ne supporte pas ce type de registre"
 
-#: config/tc-arm.c:4118
+#: config/tc-arm.c:4104
 msgid "SP and PC not permitted in .unwind_movsp directive"
 msgstr "SP et PC pas permis dans la directive .unwind_movsp"
 
-#: config/tc-arm.c:4123
+#: config/tc-arm.c:4109
 msgid "unexpected .unwind_movsp directive"
 msgstr "directive .unwind_movsp inattendue"
 
-#: config/tc-arm.c:4150
+#: config/tc-arm.c:4136
 msgid "stack increment must be multiple of 4"
 msgstr "incrément de pile doit être un multiple de 4"
 
-#: config/tc-arm.c:4182
+#: config/tc-arm.c:4168
 msgid "expected <reg>, <reg>"
 msgstr "<reg>, <reg> attendu"
 
-#: config/tc-arm.c:4200
+#: config/tc-arm.c:4186
 msgid "register must be either sp or set by a previousunwind_movsp directive"
 msgstr "le registre doit être soit sp ou soit spécifié par une directive unwind_movsp précédente"
 
-#: config/tc-arm.c:4239
+#: config/tc-arm.c:4225
 msgid "expected <offset>, <opcode>"
 msgstr "<offset>, <opcode> attendu"
 
-#: config/tc-arm.c:4251
+#: config/tc-arm.c:4237
 msgid "unwind opcode too long"
 msgstr "opcode unwind trop long"
 
-#: config/tc-arm.c:4256
+#: config/tc-arm.c:4242
 msgid "invalid unwind opcode"
 msgstr "opcode unwind incorrect"
 
-#: config/tc-arm.c:4436 config/tc-arm.c:5346 config/tc-arm.c:9360
-#: config/tc-arm.c:9888 config/tc-arm.c:13218 config/tc-arm.c:21248
-#: config/tc-arm.c:21273 config/tc-arm.c:21281 config/tc-z8k.c:1144
+#: config/tc-arm.c:4397 config/tc-arm.c:5307 config/tc-arm.c:9199
+#: config/tc-arm.c:9724 config/tc-arm.c:13036 config/tc-arm.c:21030
+#: config/tc-arm.c:21055 config/tc-arm.c:21063 config/tc-z8k.c:1144
 #: config/tc-z8k.c:1154
 msgid "immediate value out of range"
 msgstr "valeur immédiate hors limite"
 
-#: config/tc-arm.c:4601
+#: config/tc-arm.c:4562
 msgid "invalid FPA immediate expression"
 msgstr "mauvaise expression FPA immédiate"
 
-#: config/tc-arm.c:4725 config/tc-arm.c:4734
+#: config/tc-arm.c:4686 config/tc-arm.c:4695
 msgid "shift expression expected"
 msgstr "expression de décalage attendu"
 
-#: config/tc-arm.c:4748
+#: config/tc-arm.c:4709
 msgid "'LSL' or 'ASR' required"
 msgstr "« LSL » ou « ASR » requis"
 
-#: config/tc-arm.c:4756
+#: config/tc-arm.c:4717
 msgid "'LSL' required"
 msgstr "« LSL » requis"
 
-#: config/tc-arm.c:4764
+#: config/tc-arm.c:4725
 msgid "'ASR' required"
 msgstr "« ASR » requis"
 
-#: config/tc-arm.c:4836 config/tc-arm.c:5340 config/tc-arm.c:7168
+#: config/tc-arm.c:4797 config/tc-arm.c:5301 config/tc-arm.c:7010
 msgid "constant expression expected"
 msgstr "expression constante attendue"
 
-#: config/tc-arm.c:4843
+#: config/tc-arm.c:4804
 msgid "invalid rotation"
 msgstr "rotation invalide"
 
-#: config/tc-arm.c:5003 config/tc-arm.c:5167
+#: config/tc-arm.c:4964 config/tc-arm.c:5128
 msgid "unknown group relocation"
 msgstr "réadressage de groupe inconnu"
 
-#: config/tc-arm.c:5039
+#: config/tc-arm.c:5000
 msgid "alignment must be constant"
 msgstr "l'alignement doit être une constante"
 
-#: config/tc-arm.c:5198
+#: config/tc-arm.c:5159
 msgid "this group relocation is not allowed on this instruction"
 msgstr "ce réadressage de groupe n'est pas permis sur cette instruction"
 
-#: config/tc-arm.c:5219 config/tc-arm.c:5747
+#: config/tc-arm.c:5180 config/tc-arm.c:5585
 msgid "']' expected"
 msgstr "« ] » attendu"
 
-#: config/tc-arm.c:5237
+#: config/tc-arm.c:5198
 msgid "'}' expected at end of 'option' field"
 msgstr "« } » attendu à la fin du champ « option »"
 
-#: config/tc-arm.c:5242
+#: config/tc-arm.c:5203
 msgid "cannot combine index with option"
 msgstr "index ne peut pas être combiné avec option"
 
-#: config/tc-arm.c:5255
+#: config/tc-arm.c:5216
 msgid "cannot combine pre- and post-indexing"
 msgstr "ne peut combiner pré et post indexation"
 
-#: config/tc-arm.c:5478
-msgid "unexpected bit specified after APSR"
-msgstr "bit inattendu après APSR"
-
-#: config/tc-arm.c:5490
-msgid "selected processor does not support DSP extension"
-msgstr "le processeur choisi ne supporte pas l'extension DSP"
-
-#: config/tc-arm.c:5502
-msgid "bad bitmask specified after APSR"
-msgstr "mauvais bitmask spécifié après APSR"
-
-#: config/tc-arm.c:5526
-msgid "writing to APSR without specifying a bitmask is deprecated"
-msgstr "écrire dans APSR sans spécifier de bitmask est réprouvé"
-
-#: config/tc-arm.c:5538 config/tc-arm.c:10977 config/tc-arm.c:11016
-#: config/tc-arm.c:11020
-msgid "selected processor does not support requested special purpose register"
-msgstr "le processeur sélectionné ne supporte pas le registre spécialisé demandé"
-
-#: config/tc-arm.c:5543
+#: config/tc-arm.c:5381
 msgid "flag for {c}psr instruction expected"
 msgstr "fanion pour instruction {c}psr attendu"
 
-#: config/tc-arm.c:5568
+#: config/tc-arm.c:5406
 msgid "unrecognized CPS flag"
 msgstr "fanion CPS non reconnu"
 
-#: config/tc-arm.c:5575
+#: config/tc-arm.c:5413
 msgid "missing CPS flags"
 msgstr "fanions CPS manquants"
 
-#: config/tc-arm.c:5598 config/tc-arm.c:5604
+#: config/tc-arm.c:5436 config/tc-arm.c:5442
 msgid "valid endian specifiers are be or le"
 msgstr "spécificateurs petit/gros boutistes possibles sont be ou le"
 
 # macro.c:559error setting flags for \".sbss\": %s"
-#: config/tc-arm.c:5626
+#: config/tc-arm.c:5464
 msgid "missing rotation field after comma"
 msgstr "champ de rotation manquant après la virgule"
 
-#: config/tc-arm.c:5641
+#: config/tc-arm.c:5479
 msgid "rotation can only be 0, 8, 16, or 24"
 msgstr "rotation ne peut être que 0, 8, 16 ou 24"
 
-#: config/tc-arm.c:5670
+#: config/tc-arm.c:5508
 msgid "condition required"
 msgstr "condition requise"
 
-#: config/tc-arm.c:5709 config/tc-arm.c:7755
+#: config/tc-arm.c:5547 config/tc-arm.c:7594
 msgid "'[' expected"
 msgstr "« [ » attendu"
 
-#: config/tc-arm.c:5722
+#: config/tc-arm.c:5560
 msgid "',' expected"
 msgstr "« , » attendu"
 
-#: config/tc-arm.c:5739
+#: config/tc-arm.c:5577
 msgid "invalid shift"
 msgstr "décalage invalide"
 
-#: config/tc-arm.c:5812
+#: config/tc-arm.c:5650
 msgid "can't use Neon quad register here"
 msgstr "un quadruple registre Neon ne peut pas être utilisé ici"
 
-#: config/tc-arm.c:5878
+#: config/tc-arm.c:5716
 msgid "expected <Rm> or <Dm> or <Qm> operand"
 msgstr "opérande <Rm> ou <Dm> ou <Qm> attendu"
 
-#: config/tc-arm.c:5958
+#: config/tc-arm.c:5796
 msgid "parse error"
 msgstr "erreur d'analyse"
 
-#: config/tc-arm.c:5968 read.c:2127
+#: config/tc-arm.c:5806 read.c:2140
 msgid "expected comma"
 msgstr "virgule attendue"
 
 #. ISB can only take SY as an option.
-#: config/tc-arm.c:6227
+#: config/tc-arm.c:6065
 msgid "invalid barrier type"
 msgstr "type de barrière invalide"
 
-#: config/tc-arm.c:6364
+#: config/tc-arm.c:6202
 msgid "immediate value is out of range"
 msgstr "valeur immédiate hors limite"
 
-#: config/tc-arm.c:6510
+#: config/tc-arm.c:6348
 msgid "iWMMXt data or control register expected"
 msgstr "registre de donnée ou de contrôle iWMMXt attendu"
 
-#: config/tc-arm.c:6550
+#: config/tc-arm.c:6392
 msgid "Banked registers are not available with this architecture."
 msgstr "Registres « Banked » non disponibles pour cette architecture"
 
-#: config/tc-arm.c:6675
+#: config/tc-arm.c:6517
 #, c-format
 msgid "unhandled operand code %d"
 msgstr "code d'opérande %d non géré"
 
-#: config/tc-arm.c:6772 config/tc-score.c:264
+#: config/tc-arm.c:6614 config/tc-score.c:264
 msgid "garbage following instruction"
 msgstr "instruction suivie de rebuts"
 
 #. If REG is R13 (the stack pointer), warn that its use is
 #. deprecated.
-#: config/tc-arm.c:6813
+#: config/tc-arm.c:6655
 msgid "use of r13 is deprecated"
 msgstr "utilisation de r13 est obsolète"
 
-#: config/tc-arm.c:6883
+#: config/tc-arm.c:6725
 msgid "D register out of range for selected VFP version"
 msgstr "registre D hors limite pour la version VFP choisie"
 
-#: config/tc-arm.c:6962
+#: config/tc-arm.c:6804
 msgid "instruction does not accept preindexed addressing"
 msgstr "l'instruction n'accepte pas un adressage pré indexé"
 
 #. unindexed - only for coprocessor
-#: config/tc-arm.c:6978 config/tc-arm.c:9153
+#: config/tc-arm.c:6820 config/tc-arm.c:8992
 msgid "instruction does not accept unindexed addressing"
 msgstr "l'instruction n'accepte pas un adressage désindexé"
 
-#: config/tc-arm.c:6986
+#: config/tc-arm.c:6828
 msgid "destination register same as write-back base"
 msgstr "le registre de destination est le même que la base de réécriture arrière"
 
-#: config/tc-arm.c:6987
+#: config/tc-arm.c:6829
 msgid "source register same as write-back base"
 msgstr "registre source identique à la base de réécriture arrière"
 
-#: config/tc-arm.c:7037
+#: config/tc-arm.c:6879
 msgid "use of PC in this instruction is deprecated"
 msgstr "l'utilisation de PC dans cette instruction est dépréciée"
 
-#: config/tc-arm.c:7055
+#: config/tc-arm.c:6897
 msgid "instruction does not accept scaled register index"
 msgstr "l'instruction n'accepte pas un index de registre mis à l'échelle"
 
-#: config/tc-arm.c:7101
+#: config/tc-arm.c:6943
 msgid "instruction does not support unindexed addressing"
 msgstr "l'instruction n'accepte pas l'adressage désindexé"
 
-#: config/tc-arm.c:7116
+#: config/tc-arm.c:6958
 msgid "pc may not be used with write-back"
 msgstr "PC ne peut être utilisé en mode réécriture"
 
-#: config/tc-arm.c:7121
+#: config/tc-arm.c:6963
 msgid "instruction does not support writeback"
 msgstr "l'instruction ne supporte pas la réécriture"
 
-#: config/tc-arm.c:7163
+#: config/tc-arm.c:7005
 msgid "invalid pseudo operation"
 msgstr "pseudo opération invalide"
 
-#: config/tc-arm.c:7209
+#: config/tc-arm.c:7051
 msgid "literal pool insertion failed"
 msgstr "insertion dans le pool littéral a échoué"
 
-#: config/tc-arm.c:7268
+#: config/tc-arm.c:7110
 msgid "Rn must not overlap other operands"
 msgstr "Rn ne peut pas recouvrir d'autres opérandes"
 
-#: config/tc-arm.c:7273
+#: config/tc-arm.c:7115
 msgid "swp{b} use is deprecated for this architecture"
 msgstr "swp{b} est déprécié pour cette architecture"
 
-#: config/tc-arm.c:7370 config/tc-arm.c:9720
+#: config/tc-arm.c:7212 config/tc-arm.c:9559
 msgid "bad barrier type"
 msgstr "mauvais type de barrière"
 
-#: config/tc-arm.c:7381 config/tc-arm.c:7400 config/tc-arm.c:7413
-#: config/tc-arm.c:9732 config/tc-arm.c:9763 config/tc-arm.c:9785
+#: config/tc-arm.c:7223 config/tc-arm.c:7242 config/tc-arm.c:7255
+#: config/tc-arm.c:9571 config/tc-arm.c:9602 config/tc-arm.c:9624
 msgid "bit-field extends past end of register"
 msgstr "le champ de bits s'étend au delà de la fin du registre"
 
-#: config/tc-arm.c:7443
-msgid "the only valid suffixes here are '(plt)' and '(tlscall)'"
-msgstr "les seuls suffixes valides ici sont « (plt) » et « (tlscall) »"
+#: config/tc-arm.c:7284
+msgid "the only suffix valid here is '(plt)'"
+msgstr "le seul suffixe valable ici est « (plt) »"
 
-#: config/tc-arm.c:7496
+#: config/tc-arm.c:7335
 msgid "use of r15 in blx in ARM mode is not really useful"
 msgstr "utilisation de r15 dans le blx en mode ARM n'est pas très utile"
 
-#: config/tc-arm.c:7518
+#: config/tc-arm.c:7357
 msgid "use of r15 in bx in ARM mode is not really useful"
 msgstr "utilisation de r15 dans le bx en mode ARM n'est pas très utile"
 
-#: config/tc-arm.c:7543
+#: config/tc-arm.c:7382
 msgid "use of r15 in bxj is not really useful"
 msgstr "utilisation de r15 dans le bxj n'est pas très utile"
 
-#: config/tc-arm.c:7722 config/tc-arm.c:7731
+#: config/tc-arm.c:7561 config/tc-arm.c:7570
 msgid "writeback of base register is UNPREDICTABLE"
 msgstr "réécriture arrière du registre de base est IMPRÉVISIBLE"
 
-#: config/tc-arm.c:7725
+#: config/tc-arm.c:7564
 msgid "writeback of base register when in register list is UNPREDICTABLE"
 msgstr "réécriture du registre de base en étant dans une liste de registres est IMPRÉVISBLE"
 
-#: config/tc-arm.c:7735
+#: config/tc-arm.c:7574
 msgid "if writeback register is in list, it must be the lowest reg in the list"
 msgstr "si le registre de réécriture est dans la liste, il doit être le plus bas dans la liste"
 
-#: config/tc-arm.c:7750
+#: config/tc-arm.c:7589
 msgid "first destination register must be even"
 msgstr "le premier registre de destination doit être pair"
 
-#: config/tc-arm.c:7753 config/tc-arm.c:7822
+#: config/tc-arm.c:7592 config/tc-arm.c:7661
 msgid "can only load two consecutive registers"
 msgstr "seuls deux registres consécutifs peuvent être chargés"
 
@@ -2469,1154 +2434,1155 @@ msgstr "seuls deux registres consécutifs peuvent être chargés"
 #. have been called in the first place.
 #. If op 2 were present and equal to PC, this function wouldn't
 #. have been called in the first place.
-#: config/tc-arm.c:7754 config/tc-arm.c:7825 config/tc-arm.c:8423
-#: config/tc-arm.c:10504
+#: config/tc-arm.c:7593 config/tc-arm.c:7664 config/tc-arm.c:8262
+#: config/tc-arm.c:10318
 msgid "r14 not allowed here"
 msgstr "r14 n'est pas permis ici"
 
-#: config/tc-arm.c:7768
+#: config/tc-arm.c:7607
 msgid "base register written back, and overlaps second destination register"
 msgstr "registre de base réécrit et recouvre le second registre de destination"
 
-#: config/tc-arm.c:7776
+#: config/tc-arm.c:7615
 msgid "index register overlaps destination register"
 msgstr "registre d'index recouvre le registre de destination"
 
-#: config/tc-arm.c:7806 config/tc-arm.c:8405
+#: config/tc-arm.c:7645 config/tc-arm.c:8244
 msgid "offset must be zero in ARM encoding"
 msgstr "l'offset doit être zéro dans l'encodage ARM"
 
-#: config/tc-arm.c:7819 config/tc-arm.c:8417
+#: config/tc-arm.c:7658 config/tc-arm.c:8256
 msgid "even register required"
 msgstr "numéro pair de registre requis"
 
-#: config/tc-arm.c:7850 config/tc-arm.c:7882
+#: config/tc-arm.c:7689 config/tc-arm.c:7721
 msgid "this instruction requires a post-indexed address"
 msgstr "cette instruction requiert un adresse post indexée"
 
-#: config/tc-arm.c:7909
+#: config/tc-arm.c:7748
 msgid "Rd and Rm should be different in mla"
 msgstr "Rd et Rm devraient être différents dans mla"
 
-#: config/tc-arm.c:7933 config/tc-arm.c:10848
+#: config/tc-arm.c:7772 config/tc-arm.c:10662
 msgid ":lower16: not allowed this instruction"
 msgstr ":lower16: pas permis dans cette instruction"
 
-#: config/tc-arm.c:7935
+#: config/tc-arm.c:7774
 msgid ":upper16: not allowed instruction"
 msgstr ":upper16: pas permis dans cette instruction"
 
-#: config/tc-arm.c:7954 config/tc-arm.c:7997
+#: config/tc-arm.c:7793 config/tc-arm.c:7836
 msgid "operand 1 must be FPSCR"
 msgstr "opérande 1 doit être FPSCR"
 
-#: config/tc-arm.c:8016
+#: config/tc-arm.c:7855
 msgid "operand 0 must be FPSCR"
 msgstr "opérande 0 doit être FPSCR"
 
-#: config/tc-arm.c:8036 config/tc-arm.c:10966
+#: config/tc-arm.c:7875 config/tc-arm.c:10780
 msgid "bad register for mrs"
 msgstr "mauvais registre pour mrs"
 
-#: config/tc-arm.c:8043 config/tc-arm.c:10983
-msgid "'APSR', 'CPSR' or 'SPSR' expected"
-msgstr "« APSR », « CPSR » ou « SPSR » attendus"
+#: config/tc-arm.c:7882 config/tc-arm.c:10803
+msgid "'CPSR' or 'SPSR' expected"
+msgstr "« CPSR » ou « SPSR » attendu"
 
-#: config/tc-arm.c:8084
+#: config/tc-arm.c:7923
 msgid "Rd and Rm should be different in mul"
 msgstr "Rd et Rm devraient être différents dans mul"
 
-#: config/tc-arm.c:8103 config/tc-arm.c:8350 config/tc-arm.c:11117
+#: config/tc-arm.c:7942 config/tc-arm.c:8189 config/tc-arm.c:10937
 msgid "rdhi and rdlo must be different"
 msgstr "rdhi et rdlo doivent être différents"
 
-#: config/tc-arm.c:8109
+#: config/tc-arm.c:7948
 msgid "rdhi, rdlo and rm must all be different"
 msgstr "rdhi, rdlo et rm doivent tous être différents"
 
-#: config/tc-arm.c:8175
+#: config/tc-arm.c:8014
 msgid "'[' expected after PLD mnemonic"
 msgstr "« [ » attendu après la mnémonique PLD"
 
-#: config/tc-arm.c:8177 config/tc-arm.c:8192
+#: config/tc-arm.c:8016 config/tc-arm.c:8031
 msgid "post-indexed expression used in preload instruction"
 msgstr "expression post-indexée utilisée dans une instruction de préchargement"
 
-#: config/tc-arm.c:8179 config/tc-arm.c:8194
+#: config/tc-arm.c:8018 config/tc-arm.c:8033
 msgid "writeback used in preload instruction"
 msgstr "réécriture utilisée dans une instruction de préchargement"
 
-#: config/tc-arm.c:8181 config/tc-arm.c:8196
+#: config/tc-arm.c:8020 config/tc-arm.c:8035
 msgid "unindexed addressing used in preload instruction"
 msgstr "expression désindexée utilisée dans une instruction de préchargement"
 
-#: config/tc-arm.c:8190
+#: config/tc-arm.c:8029
 msgid "'[' expected after PLI mnemonic"
 msgstr "« [ » attendu après la mnémonique PLI"
 
-#: config/tc-arm.c:8376
+#: config/tc-arm.c:8215
 msgid "SRS base register must be r13"
 msgstr "le registre de base SRS doit être r13"
 
-#: config/tc-arm.c:8420
+#: config/tc-arm.c:8259
 msgid "can only store two consecutive registers"
 msgstr "seuls deux registres consécutifs peuvent être stockés"
 
-#: config/tc-arm.c:8515 config/tc-arm.c:8532
+#: config/tc-arm.c:8354 config/tc-arm.c:8371
 msgid "only two consecutive VFP SP registers allowed here"
 msgstr "seuls deux registres consécutifs VFP SP sont permis ici"
 
-#: config/tc-arm.c:8560 config/tc-arm.c:8575
+#: config/tc-arm.c:8399 config/tc-arm.c:8414
 msgid "this addressing mode requires base-register writeback"
 msgstr "ce mode d'adressage requiert une réécriture du registre de base"
 
-#: config/tc-arm.c:8749
+#: config/tc-arm.c:8588
 msgid "this instruction does not support indexing"
 msgstr "cette instruction ne supporte pas l'indexage"
 
-#: config/tc-arm.c:8772
+#: config/tc-arm.c:8611
 msgid "only r15 allowed here"
 msgstr "seul r15 est permis ici"
 
-#: config/tc-arm.c:8907
+#: config/tc-arm.c:8746
 msgid "immediate operand requires iWMMXt2"
 msgstr "opérande immédiat requiert iwMMXt2"
 
-#: config/tc-arm.c:9051
+#: config/tc-arm.c:8890
 msgid "shift by register not allowed in thumb mode"
 msgstr "décalage par registre pas permis en mode thumb"
 
-#: config/tc-arm.c:9063 config/tc-arm.c:11660 config/tc-arm.c:20630
+#: config/tc-arm.c:8902 config/tc-arm.c:11480 config/tc-arm.c:20417
 msgid "shift expression is too large"
 msgstr "l'expression de décalage est trop grande"
 
-#: config/tc-arm.c:9090
+#: config/tc-arm.c:8929
 msgid "Instruction does not support =N addresses"
 msgstr "L'instruction ne supporte par les adresses =N"
 
-#: config/tc-arm.c:9096
+#: config/tc-arm.c:8935
 msgid "cannot use register index with this instruction"
 msgstr "un index de registre ne peut être utilisé avec cette instruction"
 
-#: config/tc-arm.c:9098
+#: config/tc-arm.c:8937
 msgid "Thumb does not support negative register indexing"
 msgstr "Thumb ne supporte pas l'indexation négative du registre"
 
-#: config/tc-arm.c:9100
+#: config/tc-arm.c:8939
 msgid "Thumb does not support register post-indexing"
 msgstr "Thumb ne supporte pas la post-indexation du registre"
 
-#: config/tc-arm.c:9102
+#: config/tc-arm.c:8941
 msgid "Thumb does not support register indexing with writeback"
 msgstr "Thumb ne supporte pas l'indexation du registre avec réécriture"
 
-#: config/tc-arm.c:9104
+#: config/tc-arm.c:8943
 msgid "Thumb supports only LSL in shifted register indexing"
 msgstr "Thumb supporte uniquement LSL dans l'indexation décalée du registre"
 
-#: config/tc-arm.c:9113 config/tc-arm.c:14558
+#: config/tc-arm.c:8952 config/tc-arm.c:14376
 msgid "shift out of range"
 msgstr "décalage hors limite"
 
-#: config/tc-arm.c:9122
+#: config/tc-arm.c:8961
 msgid "cannot use writeback with this instruction"
 msgstr "cette instruction ne peut pas utiliser la réécriture"
 
-#: config/tc-arm.c:9143
+#: config/tc-arm.c:8982
 msgid "cannot use post-indexing with PC-relative addressing"
 msgstr "le post-indexage ne peut pas être utilisé avec un adressage relatif au PC"
 
-#: config/tc-arm.c:9144
+#: config/tc-arm.c:8983
 msgid "cannot use post-indexing with this instruction"
 msgstr "le post-indexage ne peut pas être utilisé avec cette instruction"
 
-#: config/tc-arm.c:9355
+#: config/tc-arm.c:9194
 msgid "only SUBS PC, LR, #const allowed"
 msgstr "seulement SUBS PC, LR, #const permis"
 
-#: config/tc-arm.c:9434 config/tc-arm.c:9585 config/tc-arm.c:9682
-#: config/tc-arm.c:10927 config/tc-arm.c:11223
+#: config/tc-arm.c:9273 config/tc-arm.c:9424 config/tc-arm.c:9521
+#: config/tc-arm.c:10741 config/tc-arm.c:11043
 msgid "shift must be constant"
 msgstr "le décalage doit être constant"
 
-#: config/tc-arm.c:9461 config/tc-arm.c:9600 config/tc-arm.c:9697
-#: config/tc-arm.c:10940
+#: config/tc-arm.c:9300 config/tc-arm.c:9439 config/tc-arm.c:9536
+#: config/tc-arm.c:10754
 msgid "unshifted register required"
 msgstr "registre non décalé requis"
 
-#: config/tc-arm.c:9476 config/tc-arm.c:9708 config/tc-arm.c:11078
+#: config/tc-arm.c:9315 config/tc-arm.c:9547 config/tc-arm.c:10898
 msgid "dest must overlap one source register"
 msgstr "dest dois recouvrir un registre source"
 
-#: config/tc-arm.c:9603
+#: config/tc-arm.c:9442
 msgid "dest and source1 must be the same register"
 msgstr "dest et source1 doivent être le même registre"
 
-#: config/tc-arm.c:9884
+#: config/tc-arm.c:9720
 msgid "instruction is always unconditional"
 msgstr "l'instruction est toujours non-conditionnelle"
 
-#: config/tc-arm.c:9986
+#: config/tc-arm.c:9815
 msgid "selected processor does not support 'A' form of this instruction"
 msgstr "le processeur sélectionné ne supporte pas la forme « A » de cette instruction"
 
-#: config/tc-arm.c:9989
+#: config/tc-arm.c:9818
 msgid "Thumb does not support the 2-argument form of this instruction"
 msgstr "Thumb ne supporte pas la forme de cette instruction avec 2 arguments"
 
-#: config/tc-arm.c:10097
+#: config/tc-arm.c:9926
 msgid "SP not allowed in register list"
 msgstr "SP pas permis dans la liste des registres"
 
-#: config/tc-arm.c:10101 config/tc-arm.c:10207
+#: config/tc-arm.c:9930 config/tc-arm.c:10036
 msgid "having the base register in the register list when using write back is UNPREDICTABLE"
 msgstr "le résultat est IMPRÉVISIBLE si le registre de base est dans la liste des registres pendant une réécriture"
 
-#: config/tc-arm.c:10109
+#: config/tc-arm.c:9938
 msgid "LR and PC should not both be in register list"
 msgstr "LR et PC ne devraient pas être tous les deux dans la liste des registres"
 
-#: config/tc-arm.c:10117
+#: config/tc-arm.c:9946
 msgid "PC not allowed in register list"
 msgstr "PC pas permis dans la liste des registres"
 
-#: config/tc-arm.c:10159
+#: config/tc-arm.c:9988
 msgid "Thumb load/store multiple does not support {reglist}^"
 msgstr "Load/store multiples de Thumb ne supportent pas {reglist}"
 
-#: config/tc-arm.c:10184 config/tc-arm.c:10261
+#: config/tc-arm.c:10013 config/tc-arm.c:10090
 #, c-format
 msgid "value stored for r%d is UNKNOWN"
 msgstr "valeur stockée pour r%d est INCONNUE"
 
-#: config/tc-arm.c:10254
+#: config/tc-arm.c:10083
 msgid "Thumb-2 instruction only valid in unified syntax"
 msgstr "Instruction Thumb 2 seulement valide dans la syntaxe unifiée"
 
-#: config/tc-arm.c:10258 config/tc-arm.c:10268
+#: config/tc-arm.c:10087 config/tc-arm.c:10097
 msgid "this instruction will write back the base register"
 msgstr "cette instruction va réécrire le registre de base"
 
-#: config/tc-arm.c:10271
+#: config/tc-arm.c:10100
 msgid "this instruction will not write back the base register"
 msgstr "cette instruction ne va pas réécrire le registre de base"
 
-#: config/tc-arm.c:10302
+#: config/tc-arm.c:10131
 msgid "r14 not allowed as first register when second register is omitted"
 msgstr "r14 n'est pas permis comme premier registre quand le second registre est omis"
 
-#: config/tc-arm.c:10402
-msgid "This instruction may be unpredictable if executed on M-profile cores with interrupts enabled."
-msgstr "Cette instruction peut être imprévisible si elle est exécutée sur un cœur M-profile avec les interruptions activées."
-
-#: config/tc-arm.c:10427 config/tc-arm.c:10440 config/tc-arm.c:10476
+#: config/tc-arm.c:10241 config/tc-arm.c:10254 config/tc-arm.c:10290
 msgid "Thumb does not support this addressing mode"
 msgstr "Thumb ne supporte pas ce mode d'adressage"
 
-#: config/tc-arm.c:10444
+#: config/tc-arm.c:10258
 msgid "byte or halfword not valid for base register"
 msgstr "octet ou demi-mot non valide pour un registre de base"
 
-#: config/tc-arm.c:10447
+#: config/tc-arm.c:10261
 msgid "r15 based store not allowed"
 msgstr "r15 utilisé comme registre de base de stockage n'est pas permis"
 
-#: config/tc-arm.c:10449
+#: config/tc-arm.c:10263
 msgid "invalid base register for register offset"
 msgstr "registre de base invalide pour un registre de décalage"
 
-#: config/tc-arm.c:10631
+#: config/tc-arm.c:10445
 #, c-format
 msgid "Use of r%u as a source register is deprecated when r%u is the destination register."
 msgstr "L'utilisation de r%u en tant que registre source est dépréciée quand r%u est le registre destination"
 
-#: config/tc-arm.c:10804
+#: config/tc-arm.c:10618
 msgid "shifts in CMP/MOV instructions are only supported in unified syntax"
 msgstr "les décalages dans les instructions CMP/MOV sont uniquement supportées dans la syntaxe unifiée"
 
-#: config/tc-arm.c:10832
+#: config/tc-arm.c:10646
 msgid "only lo regs allowed with immediate"
 msgstr "seul les registres lo sont permis avec un immédiat"
 
-#: config/tc-arm.c:10853
+#: config/tc-arm.c:10667
 msgid ":upper16: not allowed this instruction"
 msgstr ":upper16: pas permis dans cette instruction"
 
-#: config/tc-arm.c:11001
+#: config/tc-arm.c:10793 config/tc-arm.c:10799 config/tc-arm.c:10832
+#: config/tc-arm.c:10838
+msgid "selected processor does not support requested special purpose register"
+msgstr "le processeur sélectionné ne supporte pas le registre spécialisé demandé"
+
+#: config/tc-arm.c:10822
 msgid "Thumb encoding does not support an immediate here"
 msgstr "encodage Thumb ne supporte pas un immédiat ici"
 
-#: config/tc-arm.c:11083
+#: config/tc-arm.c:10903
 msgid "Thumb-2 MUL must not set flags"
 msgstr "MUL sur Thumb-2 ne doit pas activer de fanion"
 
-#: config/tc-arm.c:11148
+#: config/tc-arm.c:10968
 msgid "Thumb does not support NOP with hints"
 msgstr "Thumb ne supporte pas NOP avec des indices"
 
-#: config/tc-arm.c:11286
+#: config/tc-arm.c:11106
 msgid "push/pop do not support {reglist}^"
 msgstr "push/pop ne supporte pas {reglist}^"
 
-#: config/tc-arm.c:11309
+#: config/tc-arm.c:11129
 msgid "invalid register list to push/pop instruction"
 msgstr "liste de registres invalide pour les instructions push/pop"
 
-#: config/tc-arm.c:11542
+#: config/tc-arm.c:11362
 msgid "source1 and dest must be same register"
 msgstr "source1 et dest doivent être le même registre"
 
-#: config/tc-arm.c:11563
+#: config/tc-arm.c:11383
 msgid "ror #imm not supported"
 msgstr "ror #imm n'est pas supportée"
 
-#: config/tc-arm.c:11614
+#: config/tc-arm.c:11434
 msgid "SMC is not permitted on this architecture"
 msgstr "SMC n'est pas permis sur cette architecture"
 
-#: config/tc-arm.c:11777
+#: config/tc-arm.c:11597
 msgid "Thumb encoding does not support rotation"
 msgstr "l'encodage Thumb ne supporte pas les rotations"
 
-#: config/tc-arm.c:11792
+#: config/tc-arm.c:11610
 msgid "SVC is not permitted on this architecture"
 msgstr "SVC pas permis sur cette architecture"
 
-#: config/tc-arm.c:11808
+#: config/tc-arm.c:11626
 msgid "instruction requires register index"
 msgstr "l'instruction requiert un index de registre"
 
-#: config/tc-arm.c:11817
+#: config/tc-arm.c:11635
 msgid "instruction does not allow shifted index"
 msgstr "l'instruction n'autorise pas un index décalé"
 
-#: config/tc-arm.c:11962
+#: config/tc-arm.c:11780
 msgid "invalid neon suffix for non neon instruction"
 msgstr "suffixe néon invalide pour une instruction non néon"
 
-#: config/tc-arm.c:12253 config/tc-arm.c:12588
+#: config/tc-arm.c:12071 config/tc-arm.c:12406
 msgid "invalid instruction shape"
 msgstr "mauvaise forme d'instruction"
 
-#: config/tc-arm.c:12497
+#: config/tc-arm.c:12315
 msgid "types specified in both the mnemonic and operands"
 msgstr "types spécifiés à la fois dans la mnémonique et les opérandes"
 
-#: config/tc-arm.c:12534
+#: config/tc-arm.c:12352
 msgid "operand types can't be inferred"
 msgstr "les types de l'opérande ne peuvent pas être inférés"
 
-#: config/tc-arm.c:12540
+#: config/tc-arm.c:12358
 msgid "type specifier has the wrong number of parts"
 msgstr "le spécificateur de type a le mauvais nombre de parties"
 
-#: config/tc-arm.c:12604 config/tc-arm.c:14299 config/tc-arm.c:14306
+#: config/tc-arm.c:12422 config/tc-arm.c:14117 config/tc-arm.c:14124
 msgid "operand size must match register width"
 msgstr "la taille de l'opérande doit correspondre à la largeur du registre"
 
-#: config/tc-arm.c:12615
+#: config/tc-arm.c:12433
 msgid "bad type in Neon instruction"
 msgstr "mauvais type dans une instruction Neon"
 
-#: config/tc-arm.c:12626
+#: config/tc-arm.c:12444
 msgid "inconsistent types in Neon instruction"
 msgstr "types inconsistants dans une instruction Neon"
 
-#: config/tc-arm.c:13443
+#: config/tc-arm.c:13261
 msgid "first and second operands shall be the same register"
 msgstr "le premier et second opérandes seront les mêmes registres"
 
-#: config/tc-arm.c:13711
+#: config/tc-arm.c:13529
 msgid "scalar out of range for multiply instruction"
 msgstr "scalaire hors limite pour une instruction de multiplication"
 
-#: config/tc-arm.c:13887 config/tc-arm.c:13899
+#: config/tc-arm.c:13705 config/tc-arm.c:13717
 msgid "immediate out of range for insert"
 msgstr "valeur immédiate hors limite pour une insertion"
 
-#: config/tc-arm.c:13911 config/tc-arm.c:14906
+#: config/tc-arm.c:13729 config/tc-arm.c:14724
 msgid "immediate out of range for shift"
 msgstr "valeur immédiate hors limite pour un décalage"
 
-#: config/tc-arm.c:13968 config/tc-arm.c:13995 config/tc-arm.c:14404
-#: config/tc-arm.c:14852
+#: config/tc-arm.c:13786 config/tc-arm.c:13813 config/tc-arm.c:14222
+#: config/tc-arm.c:14670
 msgid "immediate out of range"
 msgstr "valeur immédiate hors limite"
 
-#: config/tc-arm.c:14032
+#: config/tc-arm.c:13850
 msgid "immediate out of range for narrowing operation"
 msgstr "valeur immédiate hors limite pour une opération de rétrécissement"
 
-#: config/tc-arm.c:14157
+#: config/tc-arm.c:13975
 msgid "operands 0 and 1 must be the same register"
 msgstr "opérandes 0 et 1 doivent être le même registre"
 
-#: config/tc-arm.c:14378
+#: config/tc-arm.c:14196
 msgid "operand size must be specified for immediate VMOV"
 msgstr "la taille de l'opérande doit être spécifiée pour VMOV immédiat"
 
-#: config/tc-arm.c:14388
+#: config/tc-arm.c:14206
 msgid "immediate has bits set outside the operand size"
 msgstr "la valeur immédiate à des bits mis en dehors de la taille de l'opérande"
 
-#: config/tc-arm.c:14584
+#: config/tc-arm.c:14402
 msgid "elements must be smaller than reversal region"
 msgstr "les éléments doivent être plus petits que la région inversée"
 
-#: config/tc-arm.c:14755 config/tc-arm.c:14805
+#: config/tc-arm.c:14573 config/tc-arm.c:14623
 msgid "bad type for scalar"
 msgstr "mauvais type pour un scalaire"
 
-#: config/tc-arm.c:14869 config/tc-arm.c:14877
+#: config/tc-arm.c:14687 config/tc-arm.c:14695
 msgid "VFP registers must be adjacent"
 msgstr "les registres VFP doivent être adjacents"
 
-#: config/tc-arm.c:15018
+#: config/tc-arm.c:14836
 msgid "bad list length for table lookup"
 msgstr "mauvaise longueur de liste pour une recherche dans la table"
 
-#: config/tc-arm.c:15048
+#: config/tc-arm.c:14866
 msgid "writeback (!) must be used for VLDMDB and VSTMDB"
 msgstr "réécriture (!) doit être utilisée pour VLDMDB et VSTMDB"
 
-#: config/tc-arm.c:15051
+#: config/tc-arm.c:14869
 msgid "register list must contain at least 1 and at most 16 registers"
 msgstr "une liste de registres doit contenir au moins 1 registre et au plus 16 registres"
 
-#: config/tc-arm.c:15076
+#: config/tc-arm.c:14894
 msgid "Use of PC here is deprecated"
 msgstr "L'utilisation de PC ici est dépréciée"
 
-#: config/tc-arm.c:15078
+#: config/tc-arm.c:14896
 msgid "Use of PC here is UNPREDICTABLE"
 msgstr "L'utilisation de PC ici est IMPRÉVISIBLE"
 
-#: config/tc-arm.c:15141
+#: config/tc-arm.c:14959
 msgid "bad alignment"
 msgstr "mauvais alignement"
 
-#: config/tc-arm.c:15158
+#: config/tc-arm.c:14976
 msgid "bad list type for instruction"
 msgstr "mauvais type de liste pour l'instruction"
 
-#: config/tc-arm.c:15200
+#: config/tc-arm.c:15018
 msgid "unsupported alignment for instruction"
 msgstr "alignement non supporté pour l'instruction"
 
-#: config/tc-arm.c:15219 config/tc-arm.c:15313 config/tc-arm.c:15324
-#: config/tc-arm.c:15334 config/tc-arm.c:15348
+#: config/tc-arm.c:15037 config/tc-arm.c:15131 config/tc-arm.c:15142
+#: config/tc-arm.c:15152 config/tc-arm.c:15166
 msgid "bad list length"
 msgstr "mauvaise longueur de liste"
 
-#: config/tc-arm.c:15224
+#: config/tc-arm.c:15042
 msgid "stride of 2 unavailable when element size is 8"
 msgstr "pas de 2 pas disponible quand la taille de l'élément est 8"
 
-#: config/tc-arm.c:15257 config/tc-arm.c:15332
+#: config/tc-arm.c:15075 config/tc-arm.c:15150
 msgid "can't use alignment with this instruction"
 msgstr "un alignement ne peut pas être utilisé avec cette instruction"
 
-#: config/tc-arm.c:15399
+#: config/tc-arm.c:15217
 msgid "post-index must be a register"
 msgstr "le post-index doit être un registre"
 
-#: config/tc-arm.c:15401
+#: config/tc-arm.c:15219
 msgid "bad register for post-index"
 msgstr "mauvais registre pour un post-index"
 
-#: config/tc-arm.c:15737 config/tc-arm.c:15823
+#: config/tc-arm.c:15532 config/tc-arm.c:15618
 msgid "conditional infixes are deprecated in unified syntax"
 msgstr "les infixes conditionnels sont dépréciés dans la syntaxe unifiée"
 
-#: config/tc-arm.c:15971
+#: config/tc-arm.c:15766
 msgid "Warning: conditional outside an IT block for Thumb."
 msgstr "Attention: condition hors d'un bloc IT pour Thumb."
 
-#: config/tc-arm.c:16176
+#: config/tc-arm.c:15971
 msgid "s suffix on comparison instruction is deprecated"
 msgstr "suffixe s dans une instruction de comparaison est déprécié"
 
-#: config/tc-arm.c:16195
+#: config/tc-arm.c:15990
 #, c-format
 msgid "selected processor does not support Thumb mode `%s'"
 msgstr "le processeur choisi ne supporte pas le mode Thumb « %s »"
 
-#: config/tc-arm.c:16201
+#: config/tc-arm.c:15996
 msgid "Thumb does not support conditional execution"
 msgstr "Thumb ne supporte pas l'exécution conditionnelle"
 
-#: config/tc-arm.c:16220
+#: config/tc-arm.c:16015
 #, c-format
 msgid "selected processor does not support Thumb-2 mode `%s'"
 msgstr "le processeur choisi ne supporte pas le mode Thumb-2 « %s »"
 
-#: config/tc-arm.c:16245
+#: config/tc-arm.c:16040
 #, c-format
 msgid "cannot honor width suffix -- `%s'"
 msgstr "ne peut honorer le suffixe de largeur -- « %s »"
 
-#: config/tc-arm.c:16286
+#: config/tc-arm.c:16081
 #, c-format
 msgid "selected processor does not support ARM mode `%s'"
 msgstr "le processeur choisi ne supporte pas le mode ARM « %s »"
 
-#: config/tc-arm.c:16291
+#: config/tc-arm.c:16086
 #, c-format
 msgid "width suffixes are invalid in ARM mode -- `%s'"
 msgstr "les suffixes de largeur sont invalides en mode ARM -- « %s »"
 
-#: config/tc-arm.c:16324
+#: config/tc-arm.c:16119
 #, c-format
 msgid "attempt to use an ARM instruction on a Thumb-only processor -- `%s'"
 msgstr "tentative d'utiliser une instruction ARM sur un processeur ne supportant que Thumb -- « %s »"
 
-#: config/tc-arm.c:16341
+#: config/tc-arm.c:16136
 #, c-format
 msgid "section '%s' finished with an open IT block."
 msgstr "la section « %s » s'est terminée avec un bloc IT ouvert."
 
-#: config/tc-arm.c:16346
+#: config/tc-arm.c:16141
 msgid "file finished with an open IT block."
 msgstr "le fichier s'est terminé avec un bloc IT ouvert."
 
-#: config/tc-arm.c:19385
+#: config/tc-arm.c:19172
 #, c-format
 msgid "alignments greater than %d bytes not supported in .text sections."
 msgstr "alignements plus grand que %d octets ne sont pas supportés dans les sections .text"
 
-#: config/tc-arm.c:19653 config/tc-ia64.c:3469
+#: config/tc-arm.c:19440 config/tc-ia64.c:3469
 #, c-format
 msgid "Group section `%s' has no group signature"
 msgstr "La section de groupe « %s » n'a pas de signature de groupe"
 
-#: config/tc-arm.c:19698
+#: config/tc-arm.c:19485
 msgid "handlerdata in cantunwind frame"
 msgstr "handlerdata dans un cadre cantunwind"
 
-#: config/tc-arm.c:19715
+#: config/tc-arm.c:19502
 msgid "too many unwind opcodes for personality routine 0"
 msgstr "trop d'opcodes unwind pour la routine de personnalité 0"
 
-#: config/tc-arm.c:19747
+#: config/tc-arm.c:19534
 msgid "too many unwind opcodes"
 msgstr "trop d'opcodes unwind"
 
-#: config/tc-arm.c:20007
+#: config/tc-arm.c:19794
 msgid "GOT already in the symbol table"
 msgstr "GOT est déjà dans la table des symboles"
 
-#: config/tc-arm.c:20345 config/tc-arm.c:20387 config/tc-arm.c:20657
+#: config/tc-arm.c:20132 config/tc-arm.c:20174 config/tc-arm.c:20444
 #, c-format
 msgid "undefined symbol %s used as an immediate value"
 msgstr "symbole non défini %s utilisé comme valeur immédiate"
 
-#: config/tc-arm.c:20347 config/tc-arm.c:20389
+#: config/tc-arm.c:20134 config/tc-arm.c:20176
 #, c-format
 msgid "symbol %s is in a different section"
 msgstr "le symbole %s est dans une section différente"
 
-#: config/tc-arm.c:20349 config/tc-arm.c:20391
+#: config/tc-arm.c:20136 config/tc-arm.c:20178
 #, c-format
 msgid "symbol %s is weak and may be overridden later"
 msgstr "le symbole %s est faible et pourrait être remplacé plus tard"
 
-#: config/tc-arm.c:20368 config/tc-arm.c:20699
+#: config/tc-arm.c:20155 config/tc-arm.c:20486
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr "constante invalide (%lx) après le correctif"
 
-#: config/tc-arm.c:20424
+#: config/tc-arm.c:20211
 #, c-format
 msgid "unable to compute ADRL instructions for PC offset of 0x%lx"
 msgstr "incapable de calculer les instructions ADRL pour le décalage PC de 0x%lx"
 
-#: config/tc-arm.c:20459 config/tc-arm.c:20484
+#: config/tc-arm.c:20246 config/tc-arm.c:20271
 msgid "invalid literal constant: pool needs to be closer"
 msgstr "constante littéral invalide: le bassin doit être plus près"
 
-#: config/tc-arm.c:20462 config/tc-arm.c:20500
+#: config/tc-arm.c:20249 config/tc-arm.c:20287
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr "valeur immédiate erronée pour l'offset (%ld)"
 
-#: config/tc-arm.c:20486
+#: config/tc-arm.c:20273
 #, c-format
 msgid "bad immediate value for 8-bit offset (%ld)"
 msgstr "valeur immédiate erronée pour un offset 8 bits (%ld)"
 
-#: config/tc-arm.c:20541
+#: config/tc-arm.c:20328
 msgid "offset not a multiple of 4"
 msgstr "l'offset n'est pas un multiple de 4"
 
-#: config/tc-arm.c:20548 config/tc-arm.c:20563 config/tc-arm.c:20578
-#: config/tc-arm.c:20589 config/tc-arm.c:20612 config/tc-arm.c:21332
+#: config/tc-arm.c:20335 config/tc-arm.c:20350 config/tc-arm.c:20365
+#: config/tc-arm.c:20376 config/tc-arm.c:20399 config/tc-arm.c:21114
 #: config/tc-moxie.c:662 config/tc-pj.c:448 config/tc-sh.c:4281
 msgid "offset out of range"
 msgstr "offset hors limite"
 
-#: config/tc-arm.c:20715
+#: config/tc-arm.c:20502
 msgid "invalid smc expression"
 msgstr "expression smc invalide"
 
-#: config/tc-arm.c:20724
+#: config/tc-arm.c:20511
 msgid "invalid hvc expression"
 msgstr "expression hvc invalide"
 
-#: config/tc-arm.c:20735 config/tc-arm.c:20744
+#: config/tc-arm.c:20522 config/tc-arm.c:20531
 msgid "invalid swi expression"
 msgstr "expression swi invalide"
 
-#: config/tc-arm.c:20754
+#: config/tc-arm.c:20541
 msgid "invalid expression in load/store multiple"
 msgstr "expression invalide dans chargement/stockage multiples"
 
-#: config/tc-arm.c:20815
+#: config/tc-arm.c:20602
 #, c-format
 msgid "blx to '%s' an ARM ISA state function changed to bl"
 msgstr "blx vers « %s » dans la fonction d'état ARM ISA changé en bl"
 
-#: config/tc-arm.c:20834
+#: config/tc-arm.c:20621
 msgid "misaligned branch destination"
 msgstr "destination de branchement mal alignée"
 
-#: config/tc-arm.c:20838 config/tc-arm.c:20875 config/tc-arm.c:20889
-#: config/tc-arm.c:20902 config/tc-arm.c:21009 config/tc-arm.c:21027
+#: config/tc-arm.c:20625 config/tc-arm.c:20662 config/tc-arm.c:20676
+#: config/tc-arm.c:20689 config/tc-arm.c:20799 config/tc-arm.c:20817
 msgid "branch out of range"
 msgstr "branchement hors limite"
 
-#: config/tc-arm.c:20924
+#: config/tc-arm.c:20712
 msgid "conditional branch out of range"
 msgstr "branchement conditionnel hors limite"
 
-#: config/tc-arm.c:20959
+#: config/tc-arm.c:20748
 #, c-format
 msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl"
 msgstr "blx vers fonction Thumb « %s » depuis l'état Thumb ISA changé en bl"
 
-#: config/tc-arm.c:21015
+#: config/tc-arm.c:20805
 msgid "Thumb2 branch out of range"
 msgstr "branchement Thumb2 hors limite"
 
-#: config/tc-arm.c:21106
+#: config/tc-arm.c:20888
 msgid "rel31 relocation overflow"
 msgstr "débordement de réadressage rel31"
 
-#: config/tc-arm.c:21118 config/tc-arm.c:21141
+#: config/tc-arm.c:20900 config/tc-arm.c:20923
 msgid "co-processor offset out of range"
 msgstr "offset du coprocesseur hors limite"
 
-#: config/tc-arm.c:21158
+#: config/tc-arm.c:20940
 #, c-format
 msgid "invalid offset, target not word aligned (0x%08lX)"
 msgstr "offset invalide, cible n'est pas alignée sur une frontière de mot (0x%08lX)"
 
-#: config/tc-arm.c:21165 config/tc-arm.c:21174 config/tc-arm.c:21182
-#: config/tc-arm.c:21190 config/tc-arm.c:21198
+#: config/tc-arm.c:20947 config/tc-arm.c:20956 config/tc-arm.c:20964
+#: config/tc-arm.c:20972 config/tc-arm.c:20980
 #, c-format
 msgid "invalid offset, value too big (0x%08lX)"
 msgstr "offset invalide, valeur trop grande (0x%08lX)"
 
-#: config/tc-arm.c:21239
+#: config/tc-arm.c:21021
 msgid "invalid Hi register with immediate"
 msgstr "registre HI invalide avec une immédiat"
 
-#: config/tc-arm.c:21255
+#: config/tc-arm.c:21037
 msgid "invalid immediate for stack address calculation"
 msgstr "immédiat invalide pour un calcul d'adresse de pile"
 
-#: config/tc-arm.c:21263
+#: config/tc-arm.c:21045
 #, c-format
 msgid "invalid immediate for address calculation (value = 0x%08lX)"
 msgstr "immédiat invalide pour le calcul d'adresse (valeur = 0x%08lX)"
 
-#: config/tc-arm.c:21293
+#: config/tc-arm.c:21075
 #, c-format
 msgid "invalid immediate: %ld is out of range"
 msgstr "immédiat invalide: %ld est hors limite"
 
-#: config/tc-arm.c:21305
+#: config/tc-arm.c:21087
 #, c-format
 msgid "invalid shift value: %ld"
 msgstr "valeur de décalage illégale: %ld"
 
-#: config/tc-arm.c:21384
+#: config/tc-arm.c:21166
 #, c-format
 msgid "the offset 0x%08lX is not representable"
 msgstr "l'offset 0x%08lX n'est pas représentable"
 
-#: config/tc-arm.c:21424
+#: config/tc-arm.c:21206
 #, c-format
 msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)"
 msgstr "mauvais offset 0x%08lX (seulement 12 bits disponibles pour grandeur)"
 
-#: config/tc-arm.c:21463
+#: config/tc-arm.c:21245
 #, c-format
 msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)"
 msgstr "mauvais offset 0x%08lX (seulement 8 bits disponibles pour la grandeur)"
 
-#: config/tc-arm.c:21503
+#: config/tc-arm.c:21285
 #, c-format
 msgid "bad offset 0x%08lX (must be word-aligned)"
 msgstr "mauvais offset 0x%08lX (doit être aligné sur un mot)"
 
-#: config/tc-arm.c:21508
+#: config/tc-arm.c:21290
 #, c-format
 msgid "bad offset 0x%08lX (must be an 8-bit number of words)"
 msgstr "mauvais offset 0x%08lX (doit être un nombre 8-bits de mots)"
 
-#: config/tc-arm.c:21539 config/tc-score.c:7397
+#: config/tc-arm.c:21321 config/tc-score.c:7397
 #, c-format
 msgid "bad relocation fixup type (%d)"
 msgstr "type erroné de correctif de réadressage (%d)"
 
-#: config/tc-arm.c:21650
+#: config/tc-arm.c:21432
 msgid "literal referenced across section boundary"
 msgstr "littéral référencé à travers une frontière de section"
 
-#: config/tc-arm.c:21717
+#: config/tc-arm.c:21494
 msgid "internal relocation (type: IMMEDIATE) not fixed up"
 msgstr "réadressage interne (type: IMMÉDIAT) n'est pas corrigé"
 
-#: config/tc-arm.c:21722
+#: config/tc-arm.c:21499
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr "ADRL utilisé pour un symbole qui n'est pas défini dans le même fichier"
 
-#: config/tc-arm.c:21737
+#: config/tc-arm.c:21514
 #, c-format
 msgid "undefined local label `%s'"
 msgstr "label local « %s » non défini"
 
-#: config/tc-arm.c:21743
+#: config/tc-arm.c:21520
 msgid "internal_relocation (type: OFFSET_IMM) not fixed up"
 msgstr "réadressage interne (type: OFFSET_IMM) n'est pas corrigé"
 
-#: config/tc-arm.c:21765 config/tc-cris.c:3986 config/tc-mcore.c:1926
+#: config/tc-arm.c:21542 config/tc-cris.c:3984 config/tc-mcore.c:1926
 #: config/tc-microblaze.c:1833 config/tc-mmix.c:2867 config/tc-moxie.c:757
 #: config/tc-ns32k.c:2248 config/tc-score.c:7490
 msgid "<unknown>"
 msgstr "<inconnu>"
 
-#: config/tc-arm.c:21768 config/tc-arm.c:21789 config/tc-score.c:7492
+#: config/tc-arm.c:21545 config/tc-arm.c:21566 config/tc-score.c:7492
 #, c-format
 msgid "cannot represent %s relocation in this object file format"
 msgstr "ne peut représenter le réadressage %s dans ce format de fichier objet"
 
-#: config/tc-arm.c:22145
+#: config/tc-arm.c:21906
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr "%s: type de fonction inattendu: %d"
 
-#: config/tc-arm.c:22274
+#: config/tc-arm.c:22035
 msgid "use of old and new-style options to set CPU type"
 msgstr "utilise des vieux et nouveaux styles d'options pour définir le type de CPU"
 
-#: config/tc-arm.c:22284
+#: config/tc-arm.c:22045
 msgid "use of old and new-style options to set FPU type"
 msgstr "utilise des vieux et nouveaux styles d'options pour définir le type de FPU"
 
-#: config/tc-arm.c:22360
+#: config/tc-arm.c:22121
 msgid "hard-float conflicts with specified fpu"
 msgstr "nombres flottants matériel entrent en conflit avec le fpu spécifié"
 
-#: config/tc-arm.c:22547
+#: config/tc-arm.c:22308
 msgid "generate PIC code"
 msgstr "générer du code PIC"
 
-#: config/tc-arm.c:22548
+#: config/tc-arm.c:22309
 msgid "assemble Thumb code"
 msgstr "assembler en code Thumb"
 
-#: config/tc-arm.c:22549
+#: config/tc-arm.c:22310
 msgid "support ARM/Thumb interworking"
 msgstr "supporter l'interaction ARM/Thumb"
 
-#: config/tc-arm.c:22551
+#: config/tc-arm.c:22312
 msgid "code uses 32-bit program counter"
 msgstr "le code utilise un compteur de programme de 32 bits"
 
-#: config/tc-arm.c:22552
+#: config/tc-arm.c:22313
 msgid "code uses 26-bit program counter"
 msgstr "le code utilise un compteur de programme de 26 bits"
 
-#: config/tc-arm.c:22553
+#: config/tc-arm.c:22314
 msgid "floating point args are in fp regs"
 msgstr "arguments en virgule flottante sont dans les registres FP"
 
-#: config/tc-arm.c:22555
+#: config/tc-arm.c:22316
 msgid "re-entrant code"
 msgstr "code réentrant"
 
-#: config/tc-arm.c:22556
+#: config/tc-arm.c:22317
 msgid "code is ATPCS conformant"
 msgstr "code est conforme ATPCS"
 
-#: config/tc-arm.c:22557
+#: config/tc-arm.c:22318
 msgid "assemble for big-endian"
 msgstr "assembler pour un système à octets de poids fort"
 
-#: config/tc-arm.c:22558
+#: config/tc-arm.c:22319
 msgid "assemble for little-endian"
 msgstr "assembler pour un système à octets de poids faible"
 
 #. These are recognized by the assembler, but have no affect on code.
-#: config/tc-arm.c:22562
+#: config/tc-arm.c:22323
 msgid "use frame pointer"
 msgstr "utiliser le pointeur de trame"
 
-#: config/tc-arm.c:22563
+#: config/tc-arm.c:22324
 msgid "use stack size checking"
 msgstr "utiliser la vérification de la taille de la pile"
 
-#: config/tc-arm.c:22566
+#: config/tc-arm.c:22327
 msgid "do not warn on use of deprecated feature"
 msgstr "ne pas avertir en cas d'utilisation d'une fonctionnalité dépréciée"
 
 #. 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:22583 config/tc-arm.c:22584
+#: config/tc-arm.c:22344 config/tc-arm.c:22345
 msgid "use -mcpu=arm1"
 msgstr "utiliser -mcpu=arm1"
 
-#: config/tc-arm.c:22585 config/tc-arm.c:22586
+#: config/tc-arm.c:22346 config/tc-arm.c:22347
 msgid "use -mcpu=arm2"
 msgstr "utiliser -mcpu=arm2"
 
-#: config/tc-arm.c:22587 config/tc-arm.c:22588
+#: config/tc-arm.c:22348 config/tc-arm.c:22349
 msgid "use -mcpu=arm250"
 msgstr "utiliser -mcpu=arm250"
 
-#: config/tc-arm.c:22589 config/tc-arm.c:22590
+#: config/tc-arm.c:22350 config/tc-arm.c:22351
 msgid "use -mcpu=arm3"
 msgstr "utiliser -mcpu=arm3"
 
-#: config/tc-arm.c:22591 config/tc-arm.c:22592
+#: config/tc-arm.c:22352 config/tc-arm.c:22353
 msgid "use -mcpu=arm6"
 msgstr "utiliser -mcpu=arm6"
 
-#: config/tc-arm.c:22593 config/tc-arm.c:22594
+#: config/tc-arm.c:22354 config/tc-arm.c:22355
 msgid "use -mcpu=arm600"
 msgstr "utiliser -mcpu=arm600"
 
-#: config/tc-arm.c:22595 config/tc-arm.c:22596
+#: config/tc-arm.c:22356 config/tc-arm.c:22357
 msgid "use -mcpu=arm610"
 msgstr "utiliser -mcpu=arm610"
 
-#: config/tc-arm.c:22597 config/tc-arm.c:22598
+#: config/tc-arm.c:22358 config/tc-arm.c:22359
 msgid "use -mcpu=arm620"
 msgstr "utiliser -mcpu=arm620"
 
-#: config/tc-arm.c:22599 config/tc-arm.c:22600
+#: config/tc-arm.c:22360 config/tc-arm.c:22361
 msgid "use -mcpu=arm7"
 msgstr "utiliser -mcpu=arm7"
 
-#: config/tc-arm.c:22601 config/tc-arm.c:22602
+#: config/tc-arm.c:22362 config/tc-arm.c:22363
 msgid "use -mcpu=arm70"
 msgstr "utiliser -mcpu=arm70"
 
-#: config/tc-arm.c:22603 config/tc-arm.c:22604
+#: config/tc-arm.c:22364 config/tc-arm.c:22365
 msgid "use -mcpu=arm700"
 msgstr "utiliser -mcpu=arm700"
 
-#: config/tc-arm.c:22605 config/tc-arm.c:22606
+#: config/tc-arm.c:22366 config/tc-arm.c:22367
 msgid "use -mcpu=arm700i"
 msgstr "utiliser -mcpu=arm700i"
 
-#: config/tc-arm.c:22607 config/tc-arm.c:22608
+#: config/tc-arm.c:22368 config/tc-arm.c:22369
 msgid "use -mcpu=arm710"
 msgstr "utiliser -mcpu=arm710"
 
-#: config/tc-arm.c:22609 config/tc-arm.c:22610
+#: config/tc-arm.c:22370 config/tc-arm.c:22371
 msgid "use -mcpu=arm710c"
 msgstr "utiliser -mcpu=arm710c"
 
-#: config/tc-arm.c:22611 config/tc-arm.c:22612
+#: config/tc-arm.c:22372 config/tc-arm.c:22373
 msgid "use -mcpu=arm720"
 msgstr "utiliser -mcpu=arm720"
 
-#: config/tc-arm.c:22613 config/tc-arm.c:22614
+#: config/tc-arm.c:22374 config/tc-arm.c:22375
 msgid "use -mcpu=arm7d"
 msgstr "utiliser -mcpu=arm7d"
 
-#: config/tc-arm.c:22615 config/tc-arm.c:22616
+#: config/tc-arm.c:22376 config/tc-arm.c:22377
 msgid "use -mcpu=arm7di"
 msgstr "utiliser -mcpu=arm7di"
 
-#: config/tc-arm.c:22617 config/tc-arm.c:22618
+#: config/tc-arm.c:22378 config/tc-arm.c:22379
 msgid "use -mcpu=arm7m"
 msgstr "utiliser -mcpu=arm7m"
 
-#: config/tc-arm.c:22619 config/tc-arm.c:22620
+#: config/tc-arm.c:22380 config/tc-arm.c:22381
 msgid "use -mcpu=arm7dm"
 msgstr "utiliser -mcpu=arm7dm"
 
-#: config/tc-arm.c:22621 config/tc-arm.c:22622
+#: config/tc-arm.c:22382 config/tc-arm.c:22383
 msgid "use -mcpu=arm7dmi"
 msgstr "utiliser -mcpu=arm7dmi"
 
-#: config/tc-arm.c:22623 config/tc-arm.c:22624
+#: config/tc-arm.c:22384 config/tc-arm.c:22385
 msgid "use -mcpu=arm7100"
 msgstr "utiliser -mcpu=arm7100"
 
-#: config/tc-arm.c:22625 config/tc-arm.c:22626
+#: config/tc-arm.c:22386 config/tc-arm.c:22387
 msgid "use -mcpu=arm7500"
 msgstr "utiliser -mcpu=arm7500"
 
-#: config/tc-arm.c:22627 config/tc-arm.c:22628
+#: config/tc-arm.c:22388 config/tc-arm.c:22389
 msgid "use -mcpu=arm7500fe"
 msgstr "utiliser -mcpu=arm7500fe"
 
-#: config/tc-arm.c:22629 config/tc-arm.c:22630 config/tc-arm.c:22631
-#: config/tc-arm.c:22632
+#: config/tc-arm.c:22390 config/tc-arm.c:22391 config/tc-arm.c:22392
+#: config/tc-arm.c:22393
 msgid "use -mcpu=arm7tdmi"
 msgstr "utiliser -mcpu=arm7tdmi"
 
-#: config/tc-arm.c:22633 config/tc-arm.c:22634
+#: config/tc-arm.c:22394 config/tc-arm.c:22395
 msgid "use -mcpu=arm710t"
 msgstr "utiliser -mcpu=arm710t"
 
-#: config/tc-arm.c:22635 config/tc-arm.c:22636
+#: config/tc-arm.c:22396 config/tc-arm.c:22397
 msgid "use -mcpu=arm720t"
 msgstr "utiliser -mcpu=arm720t"
 
-#: config/tc-arm.c:22637 config/tc-arm.c:22638
+#: config/tc-arm.c:22398 config/tc-arm.c:22399
 msgid "use -mcpu=arm740t"
 msgstr "utiliser -mcpu=arm740t"
 
-#: config/tc-arm.c:22639 config/tc-arm.c:22640
+#: config/tc-arm.c:22400 config/tc-arm.c:22401
 msgid "use -mcpu=arm8"
 msgstr "utiliser -mcpu=arm8"
 
-#: config/tc-arm.c:22641 config/tc-arm.c:22642
+#: config/tc-arm.c:22402 config/tc-arm.c:22403
 msgid "use -mcpu=arm810"
 msgstr "utiliser -mcpu=arm810"
 
-#: config/tc-arm.c:22643 config/tc-arm.c:22644
+#: config/tc-arm.c:22404 config/tc-arm.c:22405
 msgid "use -mcpu=arm9"
 msgstr "utiliser -mcpu=arm9"
 
-#: config/tc-arm.c:22645 config/tc-arm.c:22646
+#: config/tc-arm.c:22406 config/tc-arm.c:22407
 msgid "use -mcpu=arm9tdmi"
 msgstr "utiliser -mcpu=arm9tdmi"
 
-#: config/tc-arm.c:22647 config/tc-arm.c:22648
+#: config/tc-arm.c:22408 config/tc-arm.c:22409
 msgid "use -mcpu=arm920"
 msgstr "utiliser -mcpu=arm920"
 
-#: config/tc-arm.c:22649 config/tc-arm.c:22650
+#: config/tc-arm.c:22410 config/tc-arm.c:22411
 msgid "use -mcpu=arm940"
 msgstr "utiliser -mcpu=arm940"
 
-#: config/tc-arm.c:22651
+#: config/tc-arm.c:22412
 msgid "use -mcpu=strongarm"
 msgstr "utiliser -mcpu=strongarm"
 
-#: config/tc-arm.c:22653
+#: config/tc-arm.c:22414
 msgid "use -mcpu=strongarm110"
 msgstr "utiliser -mcpu=strongarm110"
 
-#: config/tc-arm.c:22655
+#: config/tc-arm.c:22416
 msgid "use -mcpu=strongarm1100"
 msgstr "utiliser -mcpu=strongarm1100"
 
-#: config/tc-arm.c:22657
+#: config/tc-arm.c:22418
 msgid "use -mcpu=strongarm1110"
 msgstr "utiliser -mcpu=strongarm1110"
 
-#: config/tc-arm.c:22658
+#: config/tc-arm.c:22419
 msgid "use -mcpu=xscale"
 msgstr "utiliser -mcpu=xscale"
 
-#: config/tc-arm.c:22659
+#: config/tc-arm.c:22420
 msgid "use -mcpu=iwmmxt"
 msgstr "utiliser -mcpu=iwmmxt"
 
-#: config/tc-arm.c:22660
+#: config/tc-arm.c:22421
 msgid "use -mcpu=all"
 msgstr "utiliser -mcpu=all"
 
 #. Architecture variants -- don't add any more to this list either.
-#: config/tc-arm.c:22663 config/tc-arm.c:22664
+#: config/tc-arm.c:22424 config/tc-arm.c:22425
 msgid "use -march=armv2"
 msgstr "utiliser -march=armv2"
 
-#: config/tc-arm.c:22665 config/tc-arm.c:22666
+#: config/tc-arm.c:22426 config/tc-arm.c:22427
 msgid "use -march=armv2a"
 msgstr "utiliser -march=armv2a"
 
-#: config/tc-arm.c:22667 config/tc-arm.c:22668
+#: config/tc-arm.c:22428 config/tc-arm.c:22429
 msgid "use -march=armv3"
 msgstr "utiliser -march=armv3"
 
-#: config/tc-arm.c:22669 config/tc-arm.c:22670
+#: config/tc-arm.c:22430 config/tc-arm.c:22431
 msgid "use -march=armv3m"
 msgstr "utiliser -march=armv3m"
 
-#: config/tc-arm.c:22671 config/tc-arm.c:22672
+#: config/tc-arm.c:22432 config/tc-arm.c:22433
 msgid "use -march=armv4"
 msgstr "utiliser -march=armv4"
 
-#: config/tc-arm.c:22673 config/tc-arm.c:22674
+#: config/tc-arm.c:22434 config/tc-arm.c:22435
 msgid "use -march=armv4t"
 msgstr "utiliser -march=armv4t"
 
-#: config/tc-arm.c:22675 config/tc-arm.c:22676
+#: config/tc-arm.c:22436 config/tc-arm.c:22437
 msgid "use -march=armv5"
 msgstr "utiliser -march=armv5"
 
-#: config/tc-arm.c:22677 config/tc-arm.c:22678
+#: config/tc-arm.c:22438 config/tc-arm.c:22439
 msgid "use -march=armv5t"
 msgstr "utiliser -march=armv5t"
 
-#: config/tc-arm.c:22679 config/tc-arm.c:22680
+#: config/tc-arm.c:22440 config/tc-arm.c:22441
 msgid "use -march=armv5te"
 msgstr "utiliser -march=armv5te"
 
 #. Floating point variants -- don't add any more to this list either.
-#: config/tc-arm.c:22683
+#: config/tc-arm.c:22444
 msgid "use -mfpu=fpe"
 msgstr "utiliser -mfpu=fpe"
 
-#: config/tc-arm.c:22684
+#: config/tc-arm.c:22445
 msgid "use -mfpu=fpa10"
 msgstr "utiliser -mfpu=fpa10"
 
-#: config/tc-arm.c:22685
+#: config/tc-arm.c:22446
 msgid "use -mfpu=fpa11"
 msgstr "utiliser -mfpu=fpa11"
 
-#: config/tc-arm.c:22687
+#: config/tc-arm.c:22448
 msgid "use either -mfpu=softfpa or -mfpu=softvfp"
 msgstr "utiliser soit -mfpu=softfpa ou -mfpu=softvfp"
 
-#: config/tc-arm.c:23016
+#: config/tc-arm.c:22772
 msgid "invalid architectural extension"
 msgstr "extension d'architecture invalide"
 
-#: config/tc-arm.c:23049
+#: config/tc-arm.c:22805
 msgid "must specify extensions to add before specifying those to remove"
 msgstr "vous devez spécifier les extensions à ajouter avant celles à retirer"
 
-#: config/tc-arm.c:23057
+#: config/tc-arm.c:22813
 msgid "missing architectural extension"
 msgstr "extension d'architecture manquante"
 
-#: config/tc-arm.c:23072
+#: config/tc-arm.c:22828
 msgid "extension does not apply to the base architecture"
 msgstr "l'extension ne s'applique pas à l'architecture de base"
 
-#: config/tc-arm.c:23095
+#: config/tc-arm.c:22851
 #, c-format
 msgid "unknown architectural extension `%s'"
 msgstr "extension d'architecture inconnue « %s »"
 
-#: config/tc-arm.c:23097
+#: config/tc-arm.c:22853
 msgid "architectural extensions must be specified in alphabetical order"
 msgstr "les extensions d'architecture doivent être spécifiées dans l'ordre alphabétique"
 
-#: config/tc-arm.c:23129
+#: config/tc-arm.c:22885
 #, c-format
 msgid "missing cpu name `%s'"
 msgstr "nom de cpu manquant « %s »"
 
-#: config/tc-arm.c:23155 config/tc-arm.c:23651
+#: config/tc-arm.c:22911 config/tc-arm.c:23401
 #, c-format
 msgid "unknown cpu `%s'"
 msgstr "cpu inconnu « %s »"
 
-#: config/tc-arm.c:23173
+#: config/tc-arm.c:22929
 #, c-format
 msgid "missing architecture name `%s'"
 msgstr "nom d'architecture manquante « %s »"
 
-#: config/tc-arm.c:23190 config/tc-arm.c:23685 config/tc-arm.c:23716
-#: config/tc-arm.c:23767 config/tc-score.c:7727
+#: config/tc-arm.c:22946 config/tc-arm.c:23435 config/tc-arm.c:23466
+#: config/tc-arm.c:23517 config/tc-score.c:7727
 #, c-format
 msgid "unknown architecture `%s'\n"
 msgstr "architecture inconnue « %s »\n"
 
-#: config/tc-arm.c:23206 config/tc-arm.c:23798
+#: config/tc-arm.c:22962 config/tc-arm.c:23548
 #, c-format
 msgid "unknown floating point format `%s'\n"
 msgstr "format de virgule flottante inconnu « %s »\n"
 
-#: config/tc-arm.c:23222
+#: config/tc-arm.c:22978
 #, c-format
 msgid "unknown floating point abi `%s'\n"
 msgstr "ABI virgule flottante inconnue « %s »\n"
 
-#: config/tc-arm.c:23238
+#: config/tc-arm.c:22994
 #, c-format
 msgid "unknown EABI `%s'\n"
 msgstr "EABI inconnue « %s »\n"
 
-#: config/tc-arm.c:23258
+#: config/tc-arm.c:23014
 #, c-format
 msgid "unknown implicit IT mode `%s', should be arm, thumb, always, or never."
 msgstr "mode IT implicite « %s » inconnu, devrait être arm, thumb, always ou never."
 
-#: config/tc-arm.c:23268
+#: config/tc-arm.c:23024
 msgid "<cpu name>\t  assemble for CPU <cpu name>"
 msgstr "<nom cpu>\t  assembler pour le CPU <nom cpu>"
 
-#: config/tc-arm.c:23270
+#: config/tc-arm.c:23026
 msgid "<arch name>\t  assemble for architecture <arch name>"
 msgstr "<nom arch>\t  assembler pour l'architecture <nom arch>"
 
-#: config/tc-arm.c:23272
+#: config/tc-arm.c:23028
 msgid "<fpu name>\t  assemble for FPU architecture <fpu name>"
 msgstr "<nom fpu>\t  assembler pour l'architecture FPU <nom fpu>"
 
-#: config/tc-arm.c:23274
+#: config/tc-arm.c:23030
 msgid "<abi>\t  assemble for floating point ABI <abi>"
 msgstr "<abi>\t  assembler pour l'ABI virgule flottante <abi>"
 
-#: config/tc-arm.c:23277
+#: config/tc-arm.c:23033
 msgid "<ver>\t\t  assemble for eabi version <ver>"
 msgstr "<ver>\t\t  assembler pour la version eabi <ver>"
 
-#: config/tc-arm.c:23280
+#: config/tc-arm.c:23036
 msgid "<mode>\t  controls implicit insertion of IT instructions"
 msgstr "<mode>\t  contrôle l'insertion implicite d'instructions IT"
 
-#: config/tc-arm.c:23324 config/tc-arm.c:23342 config/tc-arm.c:23362
+#: config/tc-arm.c:23080 config/tc-arm.c:23098 config/tc-arm.c:23118
 #, c-format
 msgid "option `-%c%s' is deprecated: %s"
 msgstr "option « -%c%s » est dépréciée: %s"
 
-#: config/tc-arm.c:23382
+#: config/tc-arm.c:23138
 #, c-format
 msgid " ARM-specific assembler options:\n"
 msgstr "Options en assembleur spécifiques ARM:\n"
 
-#: config/tc-arm.c:23393
+#: config/tc-arm.c:23149
 #, c-format
 msgid "  -EB                     assemble code for a big-endian cpu\n"
 msgstr "  -EB                     assembler le code pour un système de poids fort\n"
 
-#: config/tc-arm.c:23398
+#: config/tc-arm.c:23154
 #, c-format
 msgid "  -EL                     assemble code for a little-endian cpu\n"
 msgstr "  -EL                     assembler le code pour un système de poids faible\n"
 
-#: config/tc-arm.c:23402
+#: config/tc-arm.c:23158
 #, c-format
 msgid "  --fix-v4bx              Allow BX in ARMv4 code\n"
 msgstr "  --fix-v4bx              Autoriser BX dans du code ARMv4\n"
 
-#: config/tc-arm.c:23749
+#: config/tc-arm.c:23499
 #, c-format
 msgid "architectural extension `%s' is not allowed for the current base architecture"
 msgstr "l'extension d'architecture « %s » n'est pas permise pour l'architecture de base actuelle"
 
-#: config/tc-avr.c:373
+#: config/tc-avr.c:336
 #, c-format
 msgid "Known MCU names:"
 msgstr "Noms MCU connus:"
 
-#: config/tc-avr.c:438
+#: config/tc-avr.c:401
 #, c-format
 msgid ""
-"AVR Assembler options:\n"
+"AVR options:\n"
 "  -mmcu=[avr-name] select microcontroller variant\n"
 "                   [avr-name] can be:\n"
 "                   avr1  - classic AVR core without data RAM\n"
@@ -3631,36 +3597,26 @@ msgid ""
 "                   avr5  - enhanced AVR core with up to 64K program memory\n"
 "                   avr51 - enhanced AVR core with up to 128K program memory\n"
 "                   avr6  - enhanced AVR core with up to 256K program memory\n"
-"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
-"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
-"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
-"                   avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
-"                   avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n"
 "                   or immediate microcontroller name.\n"
 msgstr ""
 "options AVR\n"
 "  -mmcu=[avr-nom] choisi la variante de microcontrôleur\n"
 "                   [avr-nom] peut être:\n"
-"                   avr1  - cœur AVR classique sans RAM données\n"
-"                   avr2  - cœur AVR classique avec jusqu'à 8K de mémoire programme\n"
-"                   avr25 - cœur AVR classique avec jusqu'à 8K de mémoire programme\n"
+"                   avr1  - coeur AVR classique dans RAM données\n"
+"                   avr2  - coeur AVR classique avec jusqu'à 8K de mémoire programme\n"
+"                   avr25 - coeur AVR classique avec jusqu'à 8K de mémoire programme\n"
 "                           plus l'instruction MOVW\n"
-"                   avr3  - cœur AVR classique avec jusqu'à 64K de mémoire programme\n"
-"                   avr31 - cœur AVR classique avec jusqu'à 128K de mémoire programme\n"
-"                   avr35 - cœur AVR classique avec jusqu'à 64K de mémoire programme\n"
+"                   avr3  - coeur AVR classique avec jusqu'à 64K de mémoire programme\n"
+"                   avr31 - coeur AVR classique avec jusqu'à 128K de mémoire programme\n"
+"                   avr35 - coeur AVR classique avec jusqu'à 64K de mémoire programme\n"
 "                           plus l'instruction MOVW\n"
-"                   avr4  - cœur AVR amélioré avec jusqu'à 8K de mémoire programme\n"
-"                   avr5  - cœur AVR amélioré avec jusqu'à 64K de mémoire programme\n"
-"                   avr51 - cœur AVR amélioré avec jusqu'à 128K de mémoire programme\n"
-"                   avr6  - cœur AVR amélioré avec jusqu'à 256K de mémoire programme\n"
-"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
-"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
-"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
-"                   avrxmega6 - XMEGA, > 128K, <= 256K FLASH, <= 64K RAM\n"
-"                   avrxmega7 - XMEGA, > 128K, <= 256K FLASH, > 64K RAM\n"
+"                   avr4  - coeur AVR amélioré avec jusqu'à 8K de mémoire programme\n"
+"                   avr5  - coeur AVR amélioré avec jusqu'à 64K de mémoire programme\n"
+"                   avr51 - coeur AVR amélioré avec jusqu'à 128K de mémoire programme\n"
+"                   avr6  - coeur AVR amélioré avec jusqu'à 256K de mémoire programme\n"
 "                   or immédiatement le nom du microcontrôleur.\n"
 
-#: config/tc-avr.c:460
+#: config/tc-avr.c:418
 #, c-format
 msgid ""
 "  -mall-opcodes    accept all AVR opcodes, even if not supported by MCU\n"
@@ -3675,153 +3631,153 @@ msgstr ""
 "  -mno-wrap        rejeter les instructions rjmp/rcall avec un emballage de 8K\n"
 "                   (par défaut pour avr3, avr5)\n"
 
-#: config/tc-avr.c:504 config/tc-msp430.c:743
+#: config/tc-avr.c:462 config/tc-msp430.c:743
 #, c-format
 msgid "unknown MCU: %s\n"
 msgstr "MCU inconnue: %s\n"
 
-#: config/tc-avr.c:513
+#: config/tc-avr.c:471
 #, c-format
 msgid "redefinition of mcu type `%s' to `%s'"
 msgstr "redéfinition du type MCU « %s » en « %s »"
 
-#: config/tc-avr.c:591
+#: config/tc-avr.c:549
 msgid "constant value required"
 msgstr "valeur constante requise"
 
-#: config/tc-avr.c:594
+#: config/tc-avr.c:552
 #, c-format
 msgid "number must be positive and less than %d"
 msgstr "le nombre doit être positif et plus petit que %d"
 
-#: config/tc-avr.c:620 config/tc-avr.c:757
+#: config/tc-avr.c:578 config/tc-avr.c:715
 #, c-format
 msgid "constant out of 8-bit range: %d"
 msgstr "constante hors limite pour les bornes de 8 bits: %d"
 
-#: config/tc-avr.c:688 config/tc-score.c:1200 read.c:3662
+#: config/tc-avr.c:646 config/tc-score.c:1200 read.c:3676
 msgid "illegal expression"
 msgstr "expression illégale"
 
-#: config/tc-avr.c:717 config/tc-avr.c:1508
+#: config/tc-avr.c:675 config/tc-avr.c:1451
 msgid "`)' required"
 msgstr "« ) » requis"
 
-#: config/tc-avr.c:812
+#: config/tc-avr.c:770
 msgid "register r16-r23 required"
 msgstr "registres r16-r23 requis"
 
-#: config/tc-avr.c:818
+#: config/tc-avr.c:776
 msgid "register number above 15 required"
 msgstr "numéro de registre au-dessus de 15 requis"
 
-#: config/tc-avr.c:824
+#: config/tc-avr.c:782
 msgid "even register number required"
 msgstr "numéro paire de registre requis"
 
-#: config/tc-avr.c:830
+#: config/tc-avr.c:788
 msgid "register r24, r26, r28 or r30 required"
 msgstr "registre r24, r26, r28 ou r30 requis"
 
-#: config/tc-avr.c:836
+#: config/tc-avr.c:794
 msgid "register name or number from 0 to 31 required"
 msgstr "nom de registre ou numéro de registre 0 à 31 requis"
 
-#: config/tc-avr.c:854
+#: config/tc-avr.c:812
 msgid "pointer register (X, Y or Z) required"
 msgstr "registre de pointeur (X, Y ou Z) requis"
 
-#: config/tc-avr.c:861
+#: config/tc-avr.c:819
 msgid "cannot both predecrement and postincrement"
 msgstr "ne peut pré-décrémenter et post-incrémenter en même temps"
 
-#: config/tc-avr.c:869
+#: config/tc-avr.c:827
 msgid "addressing mode not supported"
 msgstr "mode d'adressage non supporté"
 
-#: config/tc-avr.c:875
+#: config/tc-avr.c:833
 msgid "can't predecrement"
 msgstr "ne peut faire une pré-décrémentation"
 
-#: config/tc-avr.c:878
+#: config/tc-avr.c:836
 msgid "pointer register Z required"
 msgstr "registre de pointeur Z requis"
 
-#: config/tc-avr.c:897
+#: config/tc-avr.c:850
 msgid "postincrement not supported"
 msgstr "post-incrémentation pas supportée"
 
-#: config/tc-avr.c:907
+#: config/tc-avr.c:860
 msgid "pointer register (Y or Z) required"
 msgstr "registre de pointeur (Y ou Z) requis"
 
-#: config/tc-avr.c:1021
+#: config/tc-avr.c:964
 #, c-format
 msgid "unknown constraint `%c'"
 msgstr "contrainte inconnue « %c »"
 
-#: config/tc-avr.c:1073
+#: config/tc-avr.c:1016
 msgid "`,' required"
 msgstr "« , » requis"
 
-#: config/tc-avr.c:1091
+#: config/tc-avr.c:1034
 msgid "undefined combination of operands"
 msgstr "combinaison d'opérandes indéfinie"
 
-#: config/tc-avr.c:1100
+#: config/tc-avr.c:1043
 msgid "skipping two-word instruction"
 msgstr "escamotage d'une instruction de 2 mots"
 
-#: config/tc-avr.c:1192 config/tc-avr.c:1208 config/tc-avr.c:1329
+#: config/tc-avr.c:1135 config/tc-avr.c:1151 config/tc-avr.c:1272
 #: config/tc-msp430.c:1969 config/tc-msp430.c:1987
 #, c-format
 msgid "odd address operand: %ld"
 msgstr "opérande d'adresse impaire: %ld"
 
-#: config/tc-avr.c:1200 config/tc-avr.c:1219 config/tc-avr.c:1237
-#: config/tc-avr.c:1248 config/tc-avr.c:1255 config/tc-avr.c:1262
+#: config/tc-avr.c:1143 config/tc-avr.c:1162 config/tc-avr.c:1180
+#: config/tc-avr.c:1191 config/tc-avr.c:1198 config/tc-avr.c:1205
 #: config/tc-d10v.c:505 config/tc-d30v.c:554 config/tc-msp430.c:1977
 #: config/tc-msp430.c:1992 config/tc-msp430.c:2002
 #, c-format
 msgid "operand out of range: %ld"
 msgstr "opérande hors limite: %ld"
 
-#: config/tc-avr.c:1338 config/tc-d10v.c:1594 config/tc-d30v.c:2037
+#: config/tc-avr.c:1281 config/tc-d10v.c:1594 config/tc-d30v.c:2037
 #: config/tc-msp430.c:2020
 #, c-format
 msgid "line %d: unknown relocation type: 0x%x"
 msgstr "ligne %d: type de réadressage inconnu: 0x%x"
 
-#: config/tc-avr.c:1352
+#: config/tc-avr.c:1295
 msgid "only constant expression allowed"
 msgstr "seule une expression constante est permise"
 
 #. xgettext:c-format.
-#: config/tc-avr.c:1412 config/tc-bfin.c:833 config/tc-d10v.c:1466
+#: config/tc-avr.c:1355 config/tc-bfin.c:828 config/tc-d10v.c:1466
 #: config/tc-d30v.c:1774 config/tc-mn10200.c:781 config/tc-mn10300.c:2170
-#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6611
+#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6383
 #: config/tc-spu.c:879 config/tc-spu.c:1090 config/tc-v850.c:3000
-#: config/tc-z80.c:2021
+#: config/tc-z80.c:2012
 #, c-format
 msgid "reloc %d not supported by object file format"
 msgstr "réadressage %d n'est pas supporté dans le format du fichier objet"
 
-#: config/tc-avr.c:1435 config/tc-h8300.c:1935 config/tc-mcore.c:881
+#: config/tc-avr.c:1378 config/tc-h8300.c:1935 config/tc-mcore.c:881
 #: config/tc-microblaze.c:823 config/tc-moxie.c:178 config/tc-msp430.c:1820
 #: config/tc-pj.c:253 config/tc-sh.c:2590 config/tc-z8k.c:1216
 msgid "can't find opcode "
 msgstr "ne peut repérer l'opcode "
 
-#: config/tc-avr.c:1452
+#: config/tc-avr.c:1395
 #, c-format
 msgid "illegal opcode %s for mcu %s"
 msgstr "opcode %s illégal pour MCU %s"
 
-#: config/tc-avr.c:1463
+#: config/tc-avr.c:1406
 msgid "garbage at end of line"
 msgstr "rebut à la fin de la ligne"
 
-#: config/tc-avr.c:1537 config/tc-avr.c:1544
+#: config/tc-avr.c:1480 config/tc-avr.c:1487
 #, c-format
 msgid "illegal %srelocation size: %d"
 msgstr "taille des %sréadressages illégale: %d"
@@ -3830,283 +3786,283 @@ msgstr "taille des %sréadressages illégale: %d"
 msgid "missing ')'"
 msgstr "« ) » manquant"
 
-#: config/tc-bfin.c:442
+#: config/tc-bfin.c:437
 #, c-format
 msgid " Blackfin specific assembler options:\n"
 msgstr " Options en assembleur spécifiques Blackfin:\n"
 
-#: config/tc-bfin.c:443
+#: config/tc-bfin.c:438
 #, c-format
 msgid "  -mcpu=<cpu[-sirevision]> specify the name of the target CPU\n"
 msgstr "  -mcpu=<cpu[-sirevision]> spécifie le nom du CPU cible\n"
 
-#: config/tc-bfin.c:444
+#: config/tc-bfin.c:439
 #, c-format
 msgid "  -mfdpic                  assemble for the FDPIC ABI\n"
 msgstr "  -mfdpic                 assembler pour l'ABI FDPIC\n"
 
-#: config/tc-bfin.c:445
+#: config/tc-bfin.c:440
 #, c-format
 msgid "  -mno-fdpic/-mnopic       disable -mfdpic\n"
 msgstr "  -mno-fdpic/-mnopic       désactiver -mfdpic\n"
 
-#: config/tc-bfin.c:458
+#: config/tc-bfin.c:453
 msgid "Could not set architecture and machine."
 msgstr "N'a pu initialiser l'architecture et la machine"
 
-#: config/tc-bfin.c:607
+#: config/tc-bfin.c:602
 msgid "Parse failed."
 msgstr "L'analyse a échoué."
 
-#: config/tc-bfin.c:682
+#: config/tc-bfin.c:677
 msgid "pcrel too far BFD_RELOC_BFIN_10"
 msgstr "pcrel trop éloigné BFD_RELOC_BFIN_10"
 
-#: config/tc-bfin.c:698
+#: config/tc-bfin.c:693
 msgid "pcrel too far BFD_RELOC_BFIN_12"
 msgstr "pcrel trop éloigné BFD_RELOC_BFIN_12"
 
-#: config/tc-bfin.c:718
+#: config/tc-bfin.c:713
 msgid "pcrel too far BFD_RELOC_BFIN_24"
 msgstr "pcrel trop éloigné BFD_RELOC_BFIN_24"
 
-#: config/tc-bfin.c:733
+#: config/tc-bfin.c:728
 msgid "pcrel too far BFD_RELOC_BFIN_5"
 msgstr "pcrel trop éloigné BFD_RELOC_BFIN_5"
 
-#: config/tc-bfin.c:745
+#: config/tc-bfin.c:740
 msgid "pcrel too far BFD_RELOC_BFIN_11_PCREL"
 msgstr "pcrel trop éloigné BFD_RELOC_BFIN_11_PCREL"
 
-#: config/tc-bfin.c:755
+#: config/tc-bfin.c:750
 msgid "rel too far BFD_RELOC_8"
 msgstr "rel trop éloigné BFD_RELOC_8"
 
-#: config/tc-bfin.c:762
+#: config/tc-bfin.c:757
 msgid "rel too far BFD_RELOC_16"
 msgstr "rel trop éloigné BFD_RELOC_16"
 
-#: config/tc-cr16.c:165 read.c:4422
+#: config/tc-cr16.c:164 read.c:4436
 msgid "using a bit field width of zero"
 msgstr "utilise un champ de bits dont la largeur est zéro"
 
-#: config/tc-cr16.c:173 read.c:4430
+#: config/tc-cr16.c:172 read.c:4444
 #, c-format
 msgid "field width \"%s\" too complex for a bitfield"
 msgstr "largeur du champ « %s » trop complexe pour un champs de bits"
 
-#: config/tc-cr16.c:182 read.c:4438
+#: config/tc-cr16.c:181 read.c:4452
 #, c-format
 msgid "field width %lu too big to fit in %d bytes: truncated to %d bits"
 msgstr "largeur du champ %lu trop grande pour s'insérer dans %d octets: tronqué à %d bits"
 
-#: config/tc-cr16.c:204 read.c:4460
+#: config/tc-cr16.c:203 read.c:4474
 #, c-format
 msgid "field value \"%s\" too complex for a bitfield"
 msgstr "valeur du champ « %s » trop complexe pour un champ de bits"
 
-#: config/tc-cr16.c:385
+#: config/tc-cr16.c:384
 #, c-format
 msgid "Unknown register pair - index relative mode: `%d'"
 msgstr "Paire de registres inconnue - mode d'indexation relatif: « %d »"
 
-#: config/tc-cr16.c:571 config/tc-crx.c:345 config/tc-mn10200.c:768
-#: write.c:990
+#: config/tc-cr16.c:570 config/tc-crx.c:345 config/tc-mn10200.c:768
+#: write.c:986
 #, c-format
 msgid "can't resolve `%s' {%s section} - `%s' {%s section}"
 msgstr "ne peut résoudre « %s » {section %s} - « %s » {section %s}"
 
-#: config/tc-cr16.c:603 config/tc-crx.c:361
+#: config/tc-cr16.c:602 config/tc-crx.c:361
 #, c-format
 msgid "internal error: reloc %d (`%s') not supported by object file format"
 msgstr "erreur interne: réadressage %d (« %s ») n'est pas supporté dans le format du fichier objet"
 
-#: config/tc-cr16.c:696 config/tc-i386.c:8723 config/tc-s390.c:1911
+#: config/tc-cr16.c:695 config/tc-i386.c:8604 config/tc-s390.c:1804
 msgid "GOT already in symbol table"
 msgstr "GOT est déjà dans la table de symboles"
 
-#: config/tc-cr16.c:805 config/tc-cr16.c:828 config/tc-cris.c:1190
+#: config/tc-cr16.c:804 config/tc-cr16.c:827 config/tc-cris.c:1190
 #: config/tc-crx.c:535 config/tc-crx.c:562 config/tc-crx.c:580
 #: config/tc-pdp11.c:194
 msgid "Virtual memory exhausted"
 msgstr "Mémoire virtuelle épuisée"
 
-#: config/tc-cr16.c:813 config/tc-crx.c:572 config/tc-crx.c:591
-#: config/tc-m68k.c:4656
+#: config/tc-cr16.c:812 config/tc-crx.c:572 config/tc-crx.c:591
+#: config/tc-i386.c:2258 config/tc-i386.c:2280 config/tc-m68k.c:4656
 #, c-format
 msgid "Internal Error:  Can't hash %s: %s"
 msgstr "Erreur interne: ne peut adresser par hachage %s: %s"
 
-#: config/tc-cr16.c:839 config/tc-cris.c:1224 config/tc-crx.c:545
+#: config/tc-cr16.c:838 config/tc-cris.c:1224 config/tc-crx.c:545
 #, c-format
 msgid "Can't hash `%s': %s\n"
 msgstr "Ne peut adresser par hachage « %s »: %s\n"
 
-#: config/tc-cr16.c:840 config/tc-cris.c:1225 config/tc-crx.c:546
+#: config/tc-cr16.c:839 config/tc-cris.c:1225 config/tc-crx.c:546
 msgid "(unknown reason)"
 msgstr "(raison inconnue)"
 
 #. Missing or bad expr becomes absolute 0.
-#: config/tc-cr16.c:892 config/tc-crx.c:619
+#: config/tc-cr16.c:891 config/tc-crx.c:619
 #, c-format
 msgid "missing or invalid displacement expression `%s' taken as 0"
 msgstr "expression de déplacement invalide ou manquante « %s » alors 0 est assumé à sa place"
 
-#: config/tc-cr16.c:942
+#: config/tc-cr16.c:941
 #, c-format
 msgid "GOT bad expression with %s."
 msgstr "mauvaise expression GOT avec %s"
 
-#: config/tc-cr16.c:1053
+#: config/tc-cr16.c:1052
 #, c-format
 msgid "operand %d: illegal use expression: `%s`"
 msgstr "opérande %d: expression use illégale: « %s »"
 
-#: config/tc-cr16.c:1118 config/tc-crx.c:1127
+#: config/tc-cr16.c:1117 config/tc-crx.c:1127
 #, c-format
 msgid "Unknown register: `%d'"
 msgstr "Registre inconnu: « %d »."
 
 #. Issue a error message when register is illegal.
-#: config/tc-cr16.c:1126 config/tc-crx.c:1135
+#: config/tc-cr16.c:1125 config/tc-crx.c:1135
 #, c-format
 msgid "Illegal register (`%s') in Instruction: `%s'"
 msgstr "Registre illégal (« %s ») dans l'instruction: « %s »"
 
-#: config/tc-cr16.c:1197 config/tc-cr16.c:1272 config/tc-crx.c:757
+#: config/tc-cr16.c:1196 config/tc-cr16.c:1271 config/tc-crx.c:757
 #: config/tc-crx.c:777 config/tc-crx.c:792
 #, c-format
 msgid "Illegal register `%s' in Instruction `%s'"
 msgstr "Registre illégal « %s » dans l'instruction « %s »"
 
-#: config/tc-cr16.c:1225 config/tc-cr16.c:1236
+#: config/tc-cr16.c:1224 config/tc-cr16.c:1235
 #, c-format
 msgid "Illegal register pair `%s' in Instruction `%s'"
 msgstr "Paire de registres illégale « %s » dans l'instruction « %s »"
 
-#: config/tc-cr16.c:1261 config/tc-i960.c:835
+#: config/tc-cr16.c:1260 config/tc-i960.c:835
 msgid "unmatched '['"
 msgstr "« [ » non pairé"
 
-#: config/tc-cr16.c:1267 config/tc-i960.c:842
+#: config/tc-cr16.c:1266 config/tc-i960.c:842
 msgid "garbage after index spec ignored"
 msgstr "le rebut après la spécification d'index est ignoré"
 
-#: config/tc-cr16.c:1415 config/tc-crx.c:936
+#: config/tc-cr16.c:1414 config/tc-crx.c:936
 #, c-format
 msgid "Illegal operands (whitespace): `%s'"
 msgstr "Opérandes illégaux (espaces): « %s »"
 
-#: config/tc-cr16.c:1427 config/tc-cr16.c:1434 config/tc-cr16.c:1451
+#: config/tc-cr16.c:1426 config/tc-cr16.c:1433 config/tc-cr16.c:1450
 #: config/tc-crx.c:948 config/tc-crx.c:955 config/tc-crx.c:972
 #: config/tc-crx.c:1764
 #, c-format
 msgid "Missing matching brackets : `%s'"
 msgstr "Accolades pairées manquantes: « %s »"
 
-#: config/tc-cr16.c:1483 config/tc-crx.c:998
+#: config/tc-cr16.c:1482 config/tc-crx.c:998
 #, c-format
 msgid "Unknown exception: `%s'"
 msgstr "Exception inconnue: « %s »"
 
-#: config/tc-cr16.c:1570 config/tc-crx.c:1094
+#: config/tc-cr16.c:1569 config/tc-crx.c:1094
 #, c-format
 msgid "Illegal `cinv' parameter: `%c'"
 msgstr "Paramètre « cinv » illégal: « %c »"
 
-#: config/tc-cr16.c:1592 config/tc-cr16.c:1631
+#: config/tc-cr16.c:1591 config/tc-cr16.c:1630
 #, c-format
 msgid "Unknown register pair: `%d'"
 msgstr "Paire de registres inconnue: « %d »"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1600
+#: config/tc-cr16.c:1599
 #, c-format
 msgid "Illegal register pair (`%s') in Instruction: `%s'"
 msgstr "Paire de registres inconnue (« %s ») dans l'instruction: « %s »"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1639
+#: config/tc-cr16.c:1638
 #, c-format
 msgid "Illegal index register pair (`%s') in Instruction: `%s'"
 msgstr "Paire de registres d'index illégale (« %s ») dans l'instruction: « %s »"
 
-#: config/tc-cr16.c:1678
+#: config/tc-cr16.c:1677
 #, c-format
 msgid "Unknown processor register : `%d'"
 msgstr "Registre processeur inconnu: « %d »"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1686
+#: config/tc-cr16.c:1685
 #, c-format
 msgid "Illegal processor register (`%s') in Instruction: `%s'"
 msgstr "Registre processeur illégal (« %s ») dans l'instruction: « %s »"
 
-#: config/tc-cr16.c:1734
+#: config/tc-cr16.c:1733
 #, c-format
 msgid "Unknown processor register (32 bit) : `%d'"
 msgstr "Registre processeur (32 bits) inconnu: « %d »"
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1742
+#: config/tc-cr16.c:1741
 #, c-format
 msgid "Illegal 32 bit - processor register (`%s') in Instruction: `%s'"
 msgstr "Registre du processeur 32 bits illégal (« %s ») dans l'instruction: « %s »"
 
-#: config/tc-cr16.c:2106 config/tc-crx.c:1662 config/tc-crx.c:1679
+#: config/tc-cr16.c:2105 config/tc-crx.c:1662 config/tc-crx.c:1679
 #, c-format
 msgid "Same src/dest register is used (`r%d'), result is undefined"
 msgstr "Même registre src/dest est utilisé (« r%d »), le résultat est indéfini"
 
-#: config/tc-cr16.c:2127
+#: config/tc-cr16.c:2126
 msgid "RA register is saved twice."
 msgstr "Le registre RA est sauvegardé deux fois."
 
-#: config/tc-cr16.c:2131
+#: config/tc-cr16.c:2130
 #, c-format
 msgid "`%s' Illegal use of registers."
 msgstr "« %s » Utilisation illégale des registres."
 
-#: config/tc-cr16.c:2145
+#: config/tc-cr16.c:2144
 #, c-format
 msgid "`%s' Illegal count-register combination."
 msgstr "« %s » Combinaison de registres de comptage illégale."
 
-#: config/tc-cr16.c:2151
+#: config/tc-cr16.c:2150
 #, c-format
 msgid "`%s' Illegal use of register."
 msgstr "« %s » Utilisation de registre illégale."
 
-#: config/tc-cr16.c:2160 config/tc-crx.c:1671
+#: config/tc-cr16.c:2159 config/tc-crx.c:1671
 #, c-format
 msgid "`%s' has undefined result"
 msgstr "« %s » a un résultat indéfini"
 
-#: config/tc-cr16.c:2168
+#: config/tc-cr16.c:2167
 #, c-format
 msgid "Same src/dest register is used (`r%d'),result is undefined"
 msgstr "Même registre src/dest est utilisé (« r%d »), le résultat est indéfini"
 
-#: config/tc-cr16.c:2339 config/tc-crx.c:1576
+#: config/tc-cr16.c:2338 config/tc-crx.c:1576
 msgid "Incorrect number of operands"
 msgstr "Nombre d'opérandes incorrect"
 
-#: config/tc-cr16.c:2341 config/tc-crx.c:1578
+#: config/tc-cr16.c:2340 config/tc-crx.c:1578
 #, c-format
 msgid "Illegal type of operand (arg %d)"
 msgstr "Type d'opérande illégal (arg %d)"
 
-#: config/tc-cr16.c:2347 config/tc-crx.c:1584
+#: config/tc-cr16.c:2346 config/tc-crx.c:1584
 #, c-format
 msgid "Operand out of range (arg %d)"
 msgstr "Opérande hors limite (arg %d)"
 
-#: config/tc-cr16.c:2350 config/tc-crx.c:1587
+#: config/tc-cr16.c:2349 config/tc-crx.c:1587
 #, c-format
 msgid "Operand has odd displacement (arg %d)"
 msgstr "L'opérande a un déplacement impair (arg %d)"
 
-#: config/tc-cr16.c:2353 config/tc-cr16.c:2384 config/tc-crx.c:1600
+#: config/tc-cr16.c:2352 config/tc-cr16.c:2383 config/tc-crx.c:1600
 #: config/tc-crx.c:1631
 #, c-format
 msgid "Illegal operand (arg %d)"
@@ -4114,12 +4070,12 @@ msgstr "Opérande illégal (arg %d)"
 
 #. Give an error if a frag containing code is not aligned to a 2-byte
 #. boundary.
-#: config/tc-cr16.c:2486 config/tc-cr16.h:73 config/tc-crx.c:1953
+#: config/tc-cr16.c:2485 config/tc-cr16.h:73 config/tc-crx.c:1953
 #: config/tc-crx.h:76
 msgid "instruction address is not a multiple of 2"
 msgstr "l'adresse de l'instruction n'est pas un multiple de 2"
 
-#: config/tc-cr16.c:2563 config/tc-cris.c:1538 config/tc-cris.c:1546
+#: config/tc-cr16.c:2562 config/tc-cris.c:1538 config/tc-cris.c:1546
 #: config/tc-crx.c:1989 config/tc-dlx.c:685 config/tc-hppa.c:3244
 #: config/tc-hppa.c:3251 config/tc-i860.c:491 config/tc-i860.c:508
 #: config/tc-i860.c:988 config/tc-sparc.c:1410 config/tc-sparc.c:1418
@@ -4217,7 +4173,7 @@ msgstr "Registre « %s » spécifié n'est pas implémenté"
 
 #. We've come to the end of instructions with this
 #. opcode, so it must be an error.
-#: config/tc-cris.c:2079 config/tc-mips.c:10425 config/tc-mips.c:10430
+#: config/tc-cris.c:2079
 msgid "Illegal operands"
 msgstr "Opérandes illégaux"
 
@@ -4330,61 +4286,57 @@ msgstr "Veuillez utiliser --help pour connaître les options pour cet assembleur
 msgid "--no-underscore is invalid with a.out format"
 msgstr "--no-underscore est invalide pour une format a.out"
 
-#: config/tc-cris.c:3815
-msgid "--pic is invalid for this object format"
-msgstr "--pic est invalide pour ce format d'objet"
-
-#: config/tc-cris.c:3829
+#: config/tc-cris.c:3827
 #, c-format
 msgid "invalid <arch> in --march=<arch>: %s"
 msgstr "<arch> invalide dans --march=<arch>: %s"
 
-#: config/tc-cris.c:3938 config/tc-moxie.c:709
+#: config/tc-cris.c:3936 config/tc-moxie.c:709
 msgid "Semantics error.  This type of operand can not be relocated, it must be an assembly-time constant"
 msgstr "Erreur de sémantique.  Ce type d'opérande ne peut être relocalisé, il doit être une constante résolue au moment de l'assemblage"
 
-#: config/tc-cris.c:3987 config/tc-moxie.c:758
+#: config/tc-cris.c:3985 config/tc-moxie.c:758
 #, c-format
 msgid "Cannot generate relocation type for symbol %s, code %s"
 msgstr "Ne peut générer un type de réadressage pour le symbole %s, code %s"
 
 #. The messages are formatted to line up with the generic options.
-#: config/tc-cris.c:4000
+#: config/tc-cris.c:3998
 #, c-format
 msgid "CRIS-specific options:\n"
 msgstr "Options spécifiques CRIS:\n"
 
-#: config/tc-cris.c:4002
+#: config/tc-cris.c:4000
 msgid "  -h, -H                  Don't execute, print this help text.  Deprecated.\n"
 msgstr "  -h, -H                  Ne rien exécuter, afficher ce message d'aide.  Déprécié.\n"
 
-#: config/tc-cris.c:4004
+#: config/tc-cris.c:4002
 msgid "  -N                      Warn when branches are expanded to jumps.\n"
 msgstr "  -N                      Avertir lorsque l'expansion des branches est faite pour des sauts.\n"
 
-#: config/tc-cris.c:4006
+#: config/tc-cris.c:4004
 msgid "  --underscore            User symbols are normally prepended with underscore.\n"
 msgstr ""
 "  --underscore            Symboles utilisateurs sont normalement préfixés avec\n"
 "                          le caractère de soulignement.\n"
 
-#: config/tc-cris.c:4008
+#: config/tc-cris.c:4006
 msgid "                          Registers will not need any prefix.\n"
 msgstr "                          Registres n'ont pas besoin de préfixe\n"
 
-#: config/tc-cris.c:4010
+#: config/tc-cris.c:4008
 msgid "  --no-underscore         User symbols do not have any prefix.\n"
 msgstr "  --no-underscore         Les symboles utilisateurs n'ont pas de préfixe\n"
 
-#: config/tc-cris.c:4012
+#: config/tc-cris.c:4010
 msgid "                          Registers will require a `$'-prefix.\n"
 msgstr "                          Registres auront besoin du préfixe « $ »\n"
 
-#: config/tc-cris.c:4015
+#: config/tc-cris.c:4012
 msgid "  --pic\t\t\tEnable generation of position-independent code.\n"
 msgstr "  --pic\t\t\tPermettre la génération de code indépendant de la position.\n"
 
-#: config/tc-cris.c:4018
+#: config/tc-cris.c:4014
 msgid ""
 "  --march=<arch>\t\tGenerate code for <arch>.  Valid choices for <arch>\n"
 "\t\t\t\tare v0_v10, v10, v32 and common_v10_v32.\n"
@@ -4392,51 +4344,51 @@ msgstr ""
 "  --march=<arch>\t\tGénérer le code pour <arch>.  Choix possibles pour <arch>\n"
 "\t\t\t\tsont v0_v10, v10, v32 et common_v10_v32.\n"
 
-#: config/tc-cris.c:4039
+#: config/tc-cris.c:4035
 msgid "Invalid relocation"
 msgstr "Réadressage invalide"
 
-#: config/tc-cris.c:4076
+#: config/tc-cris.c:4072
 msgid "Invalid pc-relative relocation"
 msgstr "Réadressage relatif du PC invalide"
 
-#: config/tc-cris.c:4121
+#: config/tc-cris.c:4117
 #, c-format
 msgid "Adjusted signed .word (%ld) overflows: `switch'-statement too large."
 msgstr "A ajusté le débordement signé de .word (%ld): option -statement trop grande."
 
-#: config/tc-cris.c:4151
+#: config/tc-cris.c:4147
 #, c-format
 msgid ".syntax %s requires command-line option `--underscore'"
 msgstr ".syntax %s requiert l'option « --underscore »"
 
-#: config/tc-cris.c:4160
+#: config/tc-cris.c:4156
 #, c-format
 msgid ".syntax %s requires command-line option `--no-underscore'"
 msgstr ".syntax %s requiert  l'option « --no-underscore »"
 
-#: config/tc-cris.c:4197
+#: config/tc-cris.c:4193
 msgid "Unknown .syntax operand"
 msgstr "Opérande .syntax inconnu"
 
-#: config/tc-cris.c:4207
+#: config/tc-cris.c:4203
 msgid "Pseudodirective .file is only valid when generating ELF"
 msgstr "Pseudo-directive .file est valide seulement lors de la génération ELF"
 
-#: config/tc-cris.c:4219
+#: config/tc-cris.c:4215
 msgid "Pseudodirective .loc is only valid when generating ELF"
 msgstr "Pseudo-directive .loc est valide seulement lors de la génération ELF"
 
-#: config/tc-cris.c:4234
+#: config/tc-cris.c:4230
 #, c-format
 msgid "internal inconsistency problem: %s called for %d bytes"
 msgstr "problème interne d'inconsistance: %s appelé pour %d octets"
 
-#: config/tc-cris.c:4386
+#: config/tc-cris.c:4382
 msgid "unknown operand to .arch"
 msgstr "opérande inconnu pour .arch"
 
-#: config/tc-cris.c:4395
+#: config/tc-cris.c:4391
 msgid ".arch <arch> requires a matching --march=... option"
 msgstr ".arch <arch> requiert une option --march=... correspondante"
 
@@ -4822,14 +4774,14 @@ msgstr ".proc manquant"
 msgid ".endfunc missing for previous .proc"
 msgstr ".endfunc manquant pour la déclaration .proc précédente"
 
-#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1927
+#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1916
 #, c-format
 msgid "internal error: can't hash `%s': %s\n"
 msgstr "erreur interne: ne peut adresser par hachage « %s »: %s\n"
 
 #. Probably a memory allocation problem?  Give up now.
-#: config/tc-dlx.c:298 config/tc-hppa.c:8354 config/tc-mips.c:1930
-#: config/tc-mips.c:1984 config/tc-or32.c:211 config/tc-sparc.c:860
+#: config/tc-dlx.c:298 config/tc-hppa.c:8333 config/tc-mips.c:1919
+#: config/tc-mips.c:1973 config/tc-or32.c:211 config/tc-sparc.c:860
 msgid "Broken assembler.  No assembly attempted."
 msgstr "Assemblage cassé. Aucune tentative d'assemblage."
 
@@ -5183,7 +5135,7 @@ msgstr "opérandes invalides"
 msgid "operand/size mis-match"
 msgstr "tailles/opérandes ne concordent pas"
 
-#: config/tc-h8300.c:1952 config/tc-mips.c:10489 config/tc-sh.c:2971
+#: config/tc-h8300.c:1952 config/tc-mips.c:10170 config/tc-sh.c:2971
 #: config/tc-sh64.c:2795 config/tc-z8k.c:1226
 msgid "unknown opcode"
 msgstr "opcode inconnu"
@@ -5220,7 +5172,7 @@ msgid "Difference of symbols in different sections is not supported"
 msgstr "Des différences de symboles dans des sections différentes ne sont pas supportées"
 
 #: config/tc-h8300.c:2233 config/tc-mcore.c:2199 config/tc-microblaze.c:2294
-#: config/tc-pj.c:487 config/tc-sh.c:4468 config/tc-tic6x.c:4500
+#: config/tc-pj.c:487 config/tc-sh.c:4468 config/tc-tic6x.c:4103
 #: config/tc-xc16x.c:315
 #, c-format
 msgid "Cannot represent relocation type %s"
@@ -5302,7 +5254,7 @@ msgstr "Symbole non absolu: « %s »."
 msgid "Undefined absolute constant: '%s'."
 msgstr "Constante absolue indéfinie: « %s »."
 
-#: config/tc-hppa.c:2261 config/tc-hppa.c:5717
+#: config/tc-hppa.c:2261 config/tc-hppa.c:5696
 msgid "could not update architecture and machine"
 msgstr "ne peut mettre à jour l'architecture et la machine"
 
@@ -5335,334 +5287,330 @@ msgstr "Position d'argument invalide: %s\n"
 msgid "Invalid argument description: %d"
 msgstr "Description invalide de l'argument: %d"
 
-#: config/tc-hppa.c:3475
+#: config/tc-hppa.c:3474
 msgid "Invalid Indexed Load Completer."
 msgstr "Complèteur de chargement indexé invalide."
 
-#: config/tc-hppa.c:3480
+#: config/tc-hppa.c:3479
 msgid "Invalid Indexed Load Completer Syntax."
 msgstr "Syntaxe de complèteur de chargement indexé invalide."
 
-#: config/tc-hppa.c:3514
+#: config/tc-hppa.c:3513
 msgid "Invalid Short Load/Store Completer."
 msgstr "Complèteur Load/Store courts invalide."
 
-#: config/tc-hppa.c:3574 config/tc-hppa.c:3579
+#: config/tc-hppa.c:3573 config/tc-hppa.c:3578
 msgid "Invalid Store Bytes Short Completer"
 msgstr "Complèteur Store Bytes Short invalide"
 
-#: config/tc-hppa.c:3894 config/tc-hppa.c:3900
+#: config/tc-hppa.c:3889 config/tc-hppa.c:3895
 msgid "Invalid left/right combination completer"
 msgstr "Complèteur de combinaisons left/right invalide"
 
-#: config/tc-hppa.c:3949 config/tc-hppa.c:3956
+#: config/tc-hppa.c:3944 config/tc-hppa.c:3951
 msgid "Invalid permutation completer"
 msgstr "Complèteur de permutations invalide"
 
-#: config/tc-hppa.c:4056
+#: config/tc-hppa.c:4057
 #, c-format
 msgid "Invalid Add Condition: %s"
 msgstr "Condition d'addition invalide: %s"
 
-#: config/tc-hppa.c:4072 config/tc-hppa.c:4082
+#: config/tc-hppa.c:4068 config/tc-hppa.c:4078
 msgid "Invalid Add and Branch Condition"
 msgstr "Condition d'addition et de branchement invalide"
 
-#: config/tc-hppa.c:4103 config/tc-hppa.c:4248
+#: config/tc-hppa.c:4099 config/tc-hppa.c:4236
 msgid "Invalid Compare/Subtract Condition"
 msgstr "Condition comparaison/soustraction invalide"
 
-#: config/tc-hppa.c:4143
+#: config/tc-hppa.c:4139
 #, c-format
-msgid "Invalid Branch On Bit Condition: %c"
-msgstr "Branchement invalide sur la condition de bit: %c"
-
-#: config/tc-hppa.c:4146
-msgid "Missing Branch On Bit Condition"
-msgstr "Branchement manquant sur la condition de bit"
+msgid "Invalid Bit Branch Condition: %c"
+msgstr "Condition de bit de branchement invalide: %c"
 
-#: config/tc-hppa.c:4231
+#: config/tc-hppa.c:4224
 #, c-format
 msgid "Invalid Compare/Subtract Condition: %s"
 msgstr "Condition comparaison/soustraction invalide: %s"
 
-#: config/tc-hppa.c:4263
+#: config/tc-hppa.c:4251
 msgid "Invalid Compare and Branch Condition"
 msgstr "Condition comparaison et de branchement invalide"
 
-#: config/tc-hppa.c:4359
+#: config/tc-hppa.c:4347
 msgid "Invalid Logical Instruction Condition."
 msgstr "Condition d'instruction logique invalide."
 
-#: config/tc-hppa.c:4421
+#: config/tc-hppa.c:4405
 msgid "Invalid Shift/Extract/Deposit Condition."
 msgstr "Condition décalage/extraction/dépôt invalide."
 
-#: config/tc-hppa.c:4534
+#: config/tc-hppa.c:4517
 msgid "Invalid Unit Instruction Condition."
 msgstr "Condition d'instruction unaire (Unit) invalide."
 
-#: config/tc-hppa.c:5013 config/tc-hppa.c:5045 config/tc-hppa.c:5076
-#: config/tc-hppa.c:5106
+#: config/tc-hppa.c:4992 config/tc-hppa.c:5024 config/tc-hppa.c:5055
+#: config/tc-hppa.c:5085
 msgid "Branch to unaligned address"
 msgstr "Branchement sur une adresse non alignée"
 
-#: config/tc-hppa.c:5290
+#: config/tc-hppa.c:5269
 msgid "Invalid SFU identifier"
 msgstr "Identificateur SFU invalide"
 
-#: config/tc-hppa.c:5340
+#: config/tc-hppa.c:5319
 msgid "Invalid COPR identifier"
 msgstr "Identificateur COPR invalide"
 
-#: config/tc-hppa.c:5469
+#: config/tc-hppa.c:5448
 msgid "Invalid Floating Point Operand Format."
 msgstr "Format d'opérande en virgule flottante invalide."
 
-#: config/tc-hppa.c:5586 config/tc-hppa.c:5606 config/tc-hppa.c:5626
-#: config/tc-hppa.c:5646 config/tc-hppa.c:5666
+#: config/tc-hppa.c:5565 config/tc-hppa.c:5585 config/tc-hppa.c:5605
+#: config/tc-hppa.c:5625 config/tc-hppa.c:5645
 msgid "Invalid register for single precision fmpyadd or fmpysub"
 msgstr "Registre invalide pour la simple précision fmpyadd ou fmpysub"
 
-#: config/tc-hppa.c:5734
+#: config/tc-hppa.c:5713
 #, c-format
 msgid "Invalid operands %s"
 msgstr "Opérandes invalides %s"
 
-#: config/tc-hppa.c:5744
+#: config/tc-hppa.c:5723
 #, c-format
 msgid "Immediates %d and %d will give undefined behavior."
 msgstr "Les valeurs immédiates %d et %d vont donner lieu à un comportement indéfini."
 
-#: config/tc-hppa.c:5796 config/tc-hppa.c:7023 config/tc-hppa.c:7078
+#: config/tc-hppa.c:5775 config/tc-hppa.c:7002 config/tc-hppa.c:7057
 msgid "Missing function name for .PROC (corrupted label chain)"
 msgstr "Nom de fonction manquant pour .PROC (chaîne d'étiquette corrompue)"
 
-#: config/tc-hppa.c:5799 config/tc-hppa.c:7081
+#: config/tc-hppa.c:5778 config/tc-hppa.c:7060
 msgid "Missing function name for .PROC"
 msgstr "Nom de fonction manquant pour .PROC"
 
-#: config/tc-hppa.c:5858
+#: config/tc-hppa.c:5837
 msgid "Argument to .BLOCK/.BLOCKZ must be between 0 and 0x3fffffff"
 msgstr "L'argument à .BLOCK/.BLOCKZ doit être compris entre 0 et 0x3fffffff"
 
-#: config/tc-hppa.c:5954
+#: config/tc-hppa.c:5933
 #, c-format
 msgid "Invalid .CALL argument: %s"
 msgstr "Argument .CALL invalide: %s"
 
-#: config/tc-hppa.c:6102
+#: config/tc-hppa.c:6081
 msgid ".callinfo is not within a procedure definition"
 msgstr ".callinfo n'est pas à l'intérieur de la définition de procédure"
 
-#: config/tc-hppa.c:6122
+#: config/tc-hppa.c:6101
 #, c-format
 msgid "FRAME parameter must be a multiple of 8: %d\n"
 msgstr "Paramètre FRAME doit être un multiple de 8: %d\n"
 
-#: config/tc-hppa.c:6141
+#: config/tc-hppa.c:6120
 msgid "Value for ENTRY_GR must be in the range 3..18\n"
 msgstr "Valeur de ENTRY_GR doit être dans la plage 3..18\n"
 
-#: config/tc-hppa.c:6153
+#: config/tc-hppa.c:6132
 msgid "Value for ENTRY_FR must be in the range 12..21\n"
 msgstr "Valeur de ENTRY_FR doit être dans la plage 12..21\n"
 
-#: config/tc-hppa.c:6163
+#: config/tc-hppa.c:6142
 msgid "Value for ENTRY_SR must be 3\n"
 msgstr "Valeur de ENTRY_SR doit être 3\n"
 
-#: config/tc-hppa.c:6219
+#: config/tc-hppa.c:6198
 #, c-format
 msgid "Invalid .CALLINFO argument: %s"
 msgstr "Argument à .CALLINFO invalide: %s"
 
-#: config/tc-hppa.c:6329
+#: config/tc-hppa.c:6308
 msgid "The .ENTER pseudo-op is not supported"
 msgstr "Le pseudo-op .ENTER n'est pas supporté"
 
-#: config/tc-hppa.c:6345
+#: config/tc-hppa.c:6324
 msgid "Misplaced .entry. Ignored."
 msgstr ".entry mal positionné. Ignoré."
 
-#: config/tc-hppa.c:6349
+#: config/tc-hppa.c:6328
 msgid "Missing .callinfo."
 msgstr ".callinfo manquant."
 
-#: config/tc-hppa.c:6413
+#: config/tc-hppa.c:6392
 msgid ".REG expression must be a register"
 msgstr "Expression .REG doit être un registre"
 
-#: config/tc-hppa.c:6429
+#: config/tc-hppa.c:6408
 msgid "bad or irreducible absolute expression; zero assumed"
 msgstr "expression absolue erronée ou irréductible; zéro assumé"
 
-#: config/tc-hppa.c:6440
+#: config/tc-hppa.c:6419
 msgid ".REG must use a label"
 msgstr ".REG doit utiliser une étiquette"
 
-#: config/tc-hppa.c:6442
+#: config/tc-hppa.c:6421
 msgid ".EQU must use a label"
 msgstr ".EQU doit utiliser une étiquette"
 
-#: config/tc-hppa.c:6504
+#: config/tc-hppa.c:6483
 #, c-format
 msgid "Symbol '%s' could not be created."
 msgstr "Symbole « %s » n'a pu être créé."
 
-#: config/tc-hppa.c:6508
+#: config/tc-hppa.c:6487
 msgid "No memory for symbol name."
 msgstr "Pas de mémoire pour le nom de symbole."
 
-#: config/tc-hppa.c:6558
+#: config/tc-hppa.c:6537
 msgid ".EXIT must appear within a procedure"
 msgstr ".EXIT doit apparaître à l'intérieur d'une procédure"
 
-#: config/tc-hppa.c:6562
+#: config/tc-hppa.c:6541
 msgid "Missing .callinfo"
 msgstr ".callinfo manquant"
 
-#: config/tc-hppa.c:6566
+#: config/tc-hppa.c:6545
 msgid "No .ENTRY for this .EXIT"
 msgstr "Pas de .ENTRY pour ce .EXIT"
 
-#: config/tc-hppa.c:6606
+#: config/tc-hppa.c:6585
 #, c-format
 msgid "Using ENTRY rather than CODE in export directive for %s"
 msgstr "Utilise ENTRY plutôt que CODE dans la directive d'exportation pour %s"
 
-#: config/tc-hppa.c:6729
+#: config/tc-hppa.c:6708
 #, c-format
 msgid "Undefined .EXPORT/.IMPORT argument (ignored): %s"
 msgstr "Argument .EXPORT/.IMPORT non défini (ignoré): %s"
 
-#: config/tc-hppa.c:6753
+#: config/tc-hppa.c:6732
 #, c-format
 msgid "Cannot define export symbol: %s\n"
 msgstr "Ne peut définir un symbole d'exportation: %s\n"
 
-#: config/tc-hppa.c:6850
+#: config/tc-hppa.c:6829
 msgid "Missing label name on .LABEL"
 msgstr "Nom d'étiquette manquant pour .LABEL"
 
-#: config/tc-hppa.c:6855
+#: config/tc-hppa.c:6834
 msgid "extra .LABEL arguments ignored."
 msgstr "arguments superflus pour .LABEL sont ignorés."
 
-#: config/tc-hppa.c:6871
+#: config/tc-hppa.c:6850
 msgid "The .LEAVE pseudo-op is not supported"
 msgstr "Le pseudo-op .LEAVE n'est pas supporté"
 
-#: config/tc-hppa.c:6909
+#: config/tc-hppa.c:6888
 msgid "Unrecognized .LEVEL argument\n"
 msgstr "Argument .LEVEL non reconnu\n"
 
-#: config/tc-hppa.c:6943
+#: config/tc-hppa.c:6922
 #, c-format
 msgid "Cannot define static symbol: %s\n"
 msgstr "Ne peut définir le symbole statique: %s\n"
 
-#: config/tc-hppa.c:6977
+#: config/tc-hppa.c:6956
 msgid "Nested procedures"
 msgstr "Procédure imbriquées"
 
-#: config/tc-hppa.c:6987
+#: config/tc-hppa.c:6966
 msgid "Cannot allocate unwind descriptor\n"
 msgstr "Ne peut allouer un descripteur unwind\n"
 
-#: config/tc-hppa.c:7085
+#: config/tc-hppa.c:7064
 msgid "misplaced .procend"
 msgstr ".procend mal positionné"
 
-#: config/tc-hppa.c:7088
+#: config/tc-hppa.c:7067
 msgid "Missing .callinfo for this procedure"
 msgstr ".callinfo manquant pour cette procédure"
 
-#: config/tc-hppa.c:7091
+#: config/tc-hppa.c:7070
 msgid "Missing .EXIT for a .ENTRY"
 msgstr ".EXIT manquant pour un .ENTRY"
 
-#: config/tc-hppa.c:7128
+#: config/tc-hppa.c:7107
 msgid "Not in a space.\n"
 msgstr "N'est pas dans un espace.\n"
 
-#: config/tc-hppa.c:7131
+#: config/tc-hppa.c:7110
 msgid "Not in a subspace.\n"
 msgstr "N'est pas dans un sous-espace.\n"
 
-#: config/tc-hppa.c:7220
+#: config/tc-hppa.c:7199
 msgid "Invalid .SPACE argument"
 msgstr "Argument .SPACE invalide"
 
-#: config/tc-hppa.c:7266
+#: config/tc-hppa.c:7245
 msgid "Can't change spaces within a procedure definition. Ignored"
 msgstr "Ne peut changer les espace à l'intérieur d'une définition de procédure. Ignoré"
 
-#: config/tc-hppa.c:7394
+#: config/tc-hppa.c:7373
 #, c-format
 msgid "Undefined space: '%s' Assuming space number = 0."
 msgstr "Espace indéfini: « %s » Numéro d'espace assumé = 0."
 
-#: config/tc-hppa.c:7417
+#: config/tc-hppa.c:7396
 msgid "Must be in a space before changing or declaring subspaces.\n"
 msgstr "Doit être dans un espace avant de changer ou déclarer des sous-espaces.\n"
 
-#: config/tc-hppa.c:7421
+#: config/tc-hppa.c:7400
 msgid "Can't change subspaces within a procedure definition. Ignored"
 msgstr "Ne peut modifier des sous-espaces à l'intérieur de la définition d'une procédure. Ignoré"
 
-#: config/tc-hppa.c:7457
+#: config/tc-hppa.c:7436
 msgid "Parameters of an existing subspace can't be modified"
 msgstr "Paramètres de sous-espaces existants ne peuvent être modifiés"
 
-#: config/tc-hppa.c:7509
+#: config/tc-hppa.c:7488
 msgid "Alignment must be a power of 2"
 msgstr "Alignement doit être une puissance de 2"
 
-#: config/tc-hppa.c:7556
+#: config/tc-hppa.c:7535
 msgid "FIRST not supported as a .SUBSPACE argument"
 msgstr "FIRST n'est pas supporté comme un argument pour .SUBSPACE"
 
-#: config/tc-hppa.c:7558
+#: config/tc-hppa.c:7537
 msgid "Invalid .SUBSPACE argument"
 msgstr "argument .SUBSPACE invalide"
 
-#: config/tc-hppa.c:7747
+#: config/tc-hppa.c:7726
 #, c-format
 msgid "Internal error: Unable to find containing space for %s."
 msgstr "Erreur interne: incapable de repérer l'espace contenant pour %s."
 
-#: config/tc-hppa.c:7785
+#: config/tc-hppa.c:7764
 #, c-format
 msgid "Out of memory: could not allocate new space chain entry: %s\n"
 msgstr "Mémoire épuisé: ne peut allouer un nouvel espace pour une entrée de chaîne: %s\n"
 
-#: config/tc-hppa.c:7873
+#: config/tc-hppa.c:7852
 #, c-format
 msgid "Out of memory: could not allocate new subspace chain entry: %s\n"
 msgstr "Mémoire épuisé: ne peut allouer un nouveau sous-espace pour une entrée de chaîne: %s\n"
 
-#: config/tc-hppa.c:8318
+#: config/tc-hppa.c:8297
 msgid "-R option not supported on this target."
 msgstr "L'option -R n'est pas supportée pour cette cible."
 
-#: config/tc-hppa.c:8335 config/tc-sparc.c:815 config/tc-sparc.c:852
+#: config/tc-hppa.c:8314 config/tc-sparc.c:815 config/tc-sparc.c:852
 #, c-format
 msgid "Internal error: can't hash `%s': %s\n"
 msgstr "Erreur interne: ne peut adresser par hachage « %s »: %s\n"
 
-#: config/tc-hppa.c:8344 config/tc-i860.c:236
+#: config/tc-hppa.c:8323 config/tc-i860.c:236
 #, c-format
 msgid "internal error: losing opcode: `%s' \"%s\"\n"
 msgstr "erreur interne: perte de l'opcode: « %s» «%s »\n"
 
-#: config/tc-i370.c:419 config/tc-ppc.c:1185 config/tc-s390.c:420
-#: config/tc-s390.c:427
+#: config/tc-i370.c:419 config/tc-ppc.c:1155 config/tc-s390.c:406
+#: config/tc-s390.c:413
 #, c-format
 msgid "invalid switch -m%s"
 msgstr "option invalide -m%s"
 
-#: config/tc-i370.c:516 config/tc-s390.c:507
+#: config/tc-i370.c:516 config/tc-s390.c:515
 #, c-format
 msgid "Internal assembler error for instruction %s"
 msgstr "Erreur interne d'assembleur pour l'instruction %s"
@@ -5672,11 +5620,11 @@ msgstr "Erreur interne d'assembleur pour l'instruction %s"
 msgid "Internal assembler error for macro %s"
 msgstr "Erreur interne d'assembleur pour la macro %s"
 
-#: config/tc-i370.c:630 config/tc-ppc.c:1893
+#: config/tc-i370.c:630 config/tc-ppc.c:1862
 msgid "identifier+constant@got means identifier@got+constant"
 msgstr "identificateur+constante@got signifie identificateur@got+constante"
 
-#: config/tc-i370.c:684 config/tc-m68k.c:8077 config/tc-ppc.c:1982
+#: config/tc-i370.c:684 config/tc-m68k.c:8077 config/tc-ppc.c:1951
 #, c-format
 msgid "%s relocations do not fit in %d bytes\n"
 msgstr "Le réadressage %s n'entre pas dans %d octets\n"
@@ -5699,28 +5647,28 @@ msgid "this DS form not yet supported"
 msgstr "Ce DS n'est pas encore supportée"
 
 #: config/tc-i370.c:1046 config/tc-m32r.c:1493 config/tc-microblaze.c:177
-#: config/tc-ppc.c:2047 config/tc-ppc.c:4884
+#: config/tc-ppc.c:2016 config/tc-ppc.c:4674
 msgid "Expected comma after symbol-name: rest of line ignored."
 msgstr "Virgule attendue après le nom de symbole: reste de la ligne ignoré."
 
 #: config/tc-i370.c:1069 config/tc-m32r.c:1517 config/tc-microblaze.c:199
-#: config/tc-ppc.c:2069 config/tc-ppc.c:3272 config/tc-ppc.c:4908
+#: config/tc-ppc.c:2038 config/tc-ppc.c:3241 config/tc-ppc.c:4698
 msgid "ignoring bad alignment"
 msgstr "mauvais alignement ignoré"
 
 #: config/tc-i370.c:1080 config/tc-m32r.c:1544 config/tc-microblaze.c:210
-#: config/tc-ppc.c:2080 config/tc-ppc.c:4920
+#: config/tc-ppc.c:2049 config/tc-ppc.c:4710
 #, c-format
 msgid "Ignoring attempt to re-define symbol `%s'."
 msgstr "Tentative ignorée de redéfinition du symbole « %s »."
 
-#: config/tc-i370.c:1088 config/tc-microblaze.c:218 config/tc-ppc.c:2088
+#: config/tc-i370.c:1088 config/tc-microblaze.c:218 config/tc-ppc.c:2057
 #, c-format
 msgid "Length of .lcomm \"%s\" is already %ld. Not changed to %ld."
 msgstr "Longueur de .lcomm « %s » est déjà %ld. N'a pas été changé à %ld."
 
 #: config/tc-i370.c:1107 config/tc-m32r.c:1529 config/tc-microblaze.c:234
-#: config/tc-ppc.c:2106 config/tc-v850.c:375
+#: config/tc-ppc.c:2075 config/tc-v850.c:375
 msgid "Common alignment not a power of 2"
 msgstr "Alignement du commun n'est pas une puissance de 2"
 
@@ -5773,12 +5721,12 @@ msgstr "l'abandon du registre %d dans la section %s ne correspond pas à l'utili
 msgid "droping register %d in section %s previously used in section %s"
 msgstr "abandon du registre %d dans la section %s précédemment utilisé dans la section %s"
 
-#: config/tc-i370.c:1847 config/tc-ppc.c:3109
+#: config/tc-i370.c:1847 config/tc-ppc.c:3078
 msgid "wrong number of operands"
 msgstr "nombre d'opérandes erroné"
 
 #: config/tc-i370.c:1928 config/tc-mn10200.c:898 config/tc-mn10300.c:1251
-#: config/tc-ppc.c:2405 config/tc-s390.c:1590 config/tc-v850.c:2024
+#: config/tc-ppc.c:2374 config/tc-s390.c:1549 config/tc-v850.c:2024
 #, c-format
 msgid "Unrecognized opcode: `%s'"
 msgstr "Opcode non reconnu: « %s »"
@@ -5797,525 +5745,512 @@ msgstr "registre attendu pour l'opérande %d"
 msgid "Internal Error: bad instruction length"
 msgstr "Erreur interne: mauvaise longueur d'instruction"
 
-#: config/tc-i386.c:1873
+#: config/tc-i386.c:1848
 #, c-format
 msgid "%s shortened to %s"
 msgstr "%s réduit à %s"
 
-#: config/tc-i386.c:1959
+#: config/tc-i386.c:1934
 msgid "same type of prefix used twice"
 msgstr "même type de préfixe utilisé deux fois"
 
-#: config/tc-i386.c:1986
+#: config/tc-i386.c:1961
 #, c-format
 msgid "64bit mode not supported on `%s'."
 msgstr "mode 64 bits pas supporté sur « %s »"
 
-#: config/tc-i386.c:1995
+#: config/tc-i386.c:1970
 #, c-format
 msgid "32bit mode not supported on `%s'."
 msgstr "mode 32 bits pas supporté sur « %s »"
 
-#: config/tc-i386.c:2035
+#: config/tc-i386.c:2010
 msgid "bad argument to syntax directive."
 msgstr "mauvais argument pour la directive de syntaxe."
 
-#: config/tc-i386.c:2084
+#: config/tc-i386.c:2059
 msgid "bad argument to sse_check directive."
 msgstr "mauvais argument pour la directive sse_check."
 
-#: config/tc-i386.c:2088
+#: config/tc-i386.c:2063
 msgid "missing argument for sse_check directive"
 msgstr "argument manquant pour la directive sse_check"
 
-#: config/tc-i386.c:2118
+#: config/tc-i386.c:2093
 #, c-format
 msgid "`%s' is not supported on `%s'"
 msgstr "« %s » n'est pas supporté sur « %s »"
 
-#: config/tc-i386.c:2192
+#: config/tc-i386.c:2166
 #, c-format
 msgid "no such architecture: `%s'"
 msgstr "pas de telle architecture: « %s »"
 
-#: config/tc-i386.c:2197
+#: config/tc-i386.c:2171
 msgid "missing cpu architecture"
 msgstr "architecture cpu manquante"
 
-#: config/tc-i386.c:2211
+#: config/tc-i386.c:2185
 #, c-format
 msgid "no such architecture modifier: `%s'"
 msgstr "pas de tel modificateur d'architecture: « %s »"
 
-#: config/tc-i386.c:2226 config/tc-i386.c:2242
+#: config/tc-i386.c:2200 config/tc-i386.c:2215
 msgid "Intel L1OM is 64bit ELF only"
 msgstr "Intel L1OM supporte uniquement les ELF 64 bits"
 
-#: config/tc-i386.c:2253 config/tc-i386.c:8600
-msgid "unknown architecture"
-msgstr "architecture inconnue"
+#: config/tc-i386.c:2224 config/tc-i386.c:8494
+msgid "Unknown architecture"
+msgstr "Architecture inconnue"
 
-#: config/tc-i386.c:2287 config/tc-i386.c:2309
-#, c-format
-msgid "internal Error:  Can't hash %s: %s"
-msgstr "Erreur interne: ne peut hacher %s: %s"
-
-#: config/tc-i386.c:2604
+#: config/tc-i386.c:2570
 #, c-format
 msgid "unknown relocation (%u)"
 msgstr "réadressage inconnu (%u)"
 
-#: config/tc-i386.c:2606
+#: config/tc-i386.c:2572
 #, c-format
 msgid "%u-byte relocation cannot be applied to %u-byte field"
 msgstr "réadressage %u octets ne peut pas être appliqué sur un champ de %u octets"
 
-#: config/tc-i386.c:2610
+#: config/tc-i386.c:2576
 msgid "non-pc-relative relocation for pc-relative field"
 msgstr "réadressage non relatif au PC pour un champ relatif au PC"
 
-#: config/tc-i386.c:2615
+#: config/tc-i386.c:2581
 msgid "relocated field and relocation type differ in signedness"
 msgstr "le champ relocalisé et le type relocalisé diffèrent sur le signe"
 
-#: config/tc-i386.c:2624
+#: config/tc-i386.c:2590
 msgid "there are no unsigned pc-relative relocations"
 msgstr "il n'y a pas de réadressage non signé relative au PC"
 
-#: config/tc-i386.c:2632
+#: config/tc-i386.c:2598
 #, c-format
 msgid "cannot do %u byte pc-relative relocation"
 msgstr "ne peut faire un réadressage relatif au PC de %u octets"
 
-#: config/tc-i386.c:2649
+#: config/tc-i386.c:2615
 #, c-format
 msgid "cannot do %s %u byte relocation"
 msgstr "ne peut faire un réadressage %s %u octets"
 
-#: config/tc-i386.c:2933
+#: config/tc-i386.c:2899
 #, c-format
 msgid "can't use register '%s%s' as operand %d in '%s'."
 msgstr "ne peut utiliser le registre « %s%s » comme opérande %d dans « %s »."
 
-#: config/tc-i386.c:3045
+#: config/tc-i386.c:3011
 #, c-format
 msgid "SSE instruction `%s' is used"
 msgstr "instruction SSE « %s » est utilisée"
 
-#: config/tc-i386.c:3059 config/tc-i386.c:4489
+#: config/tc-i386.c:3025 config/tc-i386.c:4455
 #, c-format
 msgid "ambiguous operand size for `%s'"
 msgstr "taille d'opérande ambiguë pour « %s »"
 
-#: config/tc-i386.c:3076
+#: config/tc-i386.c:3042
 msgid "expecting lockable instruction after `lock'"
 msgstr "instruction verrouillable attendue après l'instruction « lock »"
 
 #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
-#: config/tc-i386.c:3127
+#: config/tc-i386.c:3093
 #, c-format
 msgid "translating to `%sp'"
 msgstr "traduction en « %sp »"
 
-#: config/tc-i386.c:3182
+#: config/tc-i386.c:3148
 #, c-format
 msgid "can't encode register '%s%s' in an instruction requiring REX prefix."
 msgstr "ne peut encoder le registre « %s%s » dans l'instruction nécessitant le préfixe REX."
 
-#: config/tc-i386.c:3225 config/tc-i386.c:3357
+#: config/tc-i386.c:3191 config/tc-i386.c:3323
 #, c-format
 msgid "no such instruction: `%s'"
 msgstr "pas de telle instruction: « %s »"
 
-#: config/tc-i386.c:3236 config/tc-i386.c:3390
+#: config/tc-i386.c:3202 config/tc-i386.c:3356
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr "caractère %s invalide dans la mnémonique"
 
-#: config/tc-i386.c:3243
+#: config/tc-i386.c:3209
 msgid "expecting prefix; got nothing"
 msgstr "préfixe attendu; rien de trouvé"
 
-#: config/tc-i386.c:3245
+#: config/tc-i386.c:3211
 msgid "expecting mnemonic; got nothing"
 msgstr "mnémonique attendue; rien de trouvé"
 
-#: config/tc-i386.c:3260 config/tc-i386.c:3408
+#: config/tc-i386.c:3226 config/tc-i386.c:3374
 #, c-format
 msgid "`%s' is only supported in 64-bit mode"
 msgstr "« %s » est uniquement supporté en mode 64 bits"
 
-#: config/tc-i386.c:3261 config/tc-i386.c:3407
+#: config/tc-i386.c:3227 config/tc-i386.c:3373
 #, c-format
 msgid "`%s' is not supported in 64-bit mode"
 msgstr "« %s » n'est pas supporté en mode 64 bits"
 
-#: config/tc-i386.c:3273
+#: config/tc-i386.c:3239
 #, c-format
 msgid "redundant %s prefix"
 msgstr "préfixe %s redondant"
 
-#: config/tc-i386.c:3414
+#: config/tc-i386.c:3380
 #, c-format
 msgid "`%s' is not supported on `%s%s'"
 msgstr "« %s » n'est pas supporté sur « %s%s »"
 
-#: config/tc-i386.c:3425
+#: config/tc-i386.c:3391
 msgid "use .code16 to ensure correct addressing mode"
 msgstr "utilisez .code16 pour assurer un mode d'adressage correct"
 
-#: config/tc-i386.c:3438
+#: config/tc-i386.c:3404
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr "chaîne d'instruction attendue après « %s »"
 
-#: config/tc-i386.c:3470
+#: config/tc-i386.c:3436
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr "caractère %s invalide avant l'opérande %d"
 
-#: config/tc-i386.c:3484
+#: config/tc-i386.c:3450
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr "parenthèses non pairées dans l'opérande %d."
 
-#: config/tc-i386.c:3487
+#: config/tc-i386.c:3453
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr "crochets non pairés dans l'opérande %d."
 
-#: config/tc-i386.c:3496
+#: config/tc-i386.c:3462
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr "caractère invalide %s dans l'opérande %d"
 
-#: config/tc-i386.c:3524
+#: config/tc-i386.c:3490
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr "opérandes parasites; (%d opérandes/instructions au maximum)"
 
-#: config/tc-i386.c:3547
+#: config/tc-i386.c:3513
 msgid "expecting operand after ','; got nothing"
 msgstr "opérande attendu après « , »; rien de trouvé"
 
-#: config/tc-i386.c:3552
+#: config/tc-i386.c:3518
 msgid "expecting operand before ','; got nothing"
 msgstr "opérande attendu avant « , »; rien de trouvé"
 
-#: config/tc-i386.c:4190
+#: config/tc-i386.c:4156
 msgid "operand size mismatch"
 msgstr "non concordance de la taille d'opérande"
 
-#: config/tc-i386.c:4193
+#: config/tc-i386.c:4159
 msgid "operand type mismatch"
 msgstr "non concordance du type d'opérande"
 
-#: config/tc-i386.c:4196
+#: config/tc-i386.c:4162
 msgid "register type mismatch"
 msgstr "non concordance du type de registre"
 
-#: config/tc-i386.c:4199
+#: config/tc-i386.c:4165
 msgid "number of operands mismatch"
 msgstr "non concordance du nombre d'opérandes"
 
-#: config/tc-i386.c:4202
+#: config/tc-i386.c:4168
 msgid "invalid instruction suffix"
 msgstr "suffixe d'instruction invalide"
 
-#: config/tc-i386.c:4205
+#: config/tc-i386.c:4171
 msgid "Imm4 isn't the first operand"
 msgstr "Imm4 n'est pas le premier opérande"
 
-#: config/tc-i386.c:4208
+#: config/tc-i386.c:4174
 msgid "only supported with old gcc"
 msgstr "uniquement supporté avec un ancien gcc"
 
-#: config/tc-i386.c:4211
+#: config/tc-i386.c:4177
 msgid "unsupported with Intel mnemonic"
 msgstr "non supporté avec les mnémoniques Intel"
 
-#: config/tc-i386.c:4214
+#: config/tc-i386.c:4180
 msgid "unsupported syntax"
 msgstr "syntaxe non supportée"
 
-#: config/tc-i386.c:4217
+#: config/tc-i386.c:4183
 msgid "unsupported"
 msgstr "non supporté"
 
-#: config/tc-i386.c:4220
+#: config/tc-i386.c:4186
 #, c-format
 msgid "%s for `%s'"
 msgstr "%s pour « %s »"
 
-#: config/tc-i386.c:4231
+#: config/tc-i386.c:4197
 #, c-format
 msgid "indirect %s without `*'"
 msgstr "%s indirect sans « * »"
 
 #. Warn them that a data or address size prefix doesn't
 #. affect assembly of the next line of code.
-#: config/tc-i386.c:4239
+#: config/tc-i386.c:4205
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr "préfixe « %s » autonome"
 
-#: config/tc-i386.c:4273 config/tc-i386.c:4289
+#: config/tc-i386.c:4239 config/tc-i386.c:4255
 #, c-format
 msgid "`%s' operand %d must use `%ses' segment"
 msgstr "« %s » opérande %d doit utiliser le segment « %ses »"
 
 #. We have to know the operand size for crc32.
-#: config/tc-i386.c:4343
+#: config/tc-i386.c:4309
 #, c-format
 msgid "ambiguous memory operand size for `%s`"
 msgstr "taille d'opérande mémoire ambigu pour « %s »"
 
-#: config/tc-i386.c:4462
+#: config/tc-i386.c:4428
 msgid "no instruction mnemonic suffix given and no register operands; can't size instruction"
 msgstr "aucun suffixe de mnémonique d'instruction fourni et pas d'opérande registre; ne peut déterminer la taille de l'instruction"
 
-#: config/tc-i386.c:4599 config/tc-i386.c:4674 config/tc-i386.c:4703
-#: config/tc-i386.c:4749 config/tc-i386.c:4787
+#: config/tc-i386.c:4565 config/tc-i386.c:4640 config/tc-i386.c:4669
+#: config/tc-i386.c:4715 config/tc-i386.c:4753
 #, c-format
-msgid "incorrect register `%s%s' used with `%c' suffix"
+msgid "Incorrect register `%s%s' used with `%c' suffix"
 msgstr "Registre incorrect « %s%s » utilisé avec le suffixe « %c »"
 
-#: config/tc-i386.c:4607 config/tc-i386.c:4681 config/tc-i386.c:4794
+#: config/tc-i386.c:4573 config/tc-i386.c:4647 config/tc-i386.c:4760
 #, c-format
 msgid "using `%s%s' instead of `%s%s' due to `%c' suffix"
 msgstr "utilise « %s%s » au lieu de « %s%s» en raison du suffixe « %c »"
 
-#: config/tc-i386.c:4633 config/tc-i386.c:4657 config/tc-i386.c:4725
-#: config/tc-i386.c:4770
+#: config/tc-i386.c:4599 config/tc-i386.c:4623 config/tc-i386.c:4691
+#: config/tc-i386.c:4736
 #, c-format
 msgid "`%s%s' not allowed with `%s%c'"
 msgstr "« %s%s» n'est pas permis avec « %s%c »"
 
-#: config/tc-i386.c:4859
+#: config/tc-i386.c:4825
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr "aucun suffixe de mnémonique d'instruction fourni; ne peut déterminer la taille de l'immédiat"
 
-#: config/tc-i386.c:4895
+#: config/tc-i386.c:4861
 #, c-format
 msgid "the last operand of `%s' must be `%s%s'"
 msgstr "le dernier opérande de « %s » doit être « %s%s »"
 
-#: config/tc-i386.c:4898
+#: config/tc-i386.c:4864
 #, c-format
 msgid "the first operand of `%s' must be `%s%s'"
 msgstr "le premier opérande de « %s » doit être « %s%s »"
 
-#: config/tc-i386.c:5046
+#: config/tc-i386.c:5012
 #, c-format
 msgid "you can't `pop %scs'"
 msgstr "vous ne pouvez pas utiliser « pop %scs »"
 
 #. Reversed arguments on faddp, fsubp, etc.
-#: config/tc-i386.c:5075
+#: config/tc-i386.c:5041
 #, c-format
 msgid "translating to `%s %s%s,%s%s'"
 msgstr "traduction en « %s %s%s,%s%s »"
 
 #. Extraneous `l' suffix on fp insn.
-#: config/tc-i386.c:5082
+#: config/tc-i386.c:5048
 #, c-format
 msgid "translating to `%s %s%s'"
 msgstr "traduction en « %s %s%s »"
 
-#: config/tc-i386.c:5110
+#: config/tc-i386.c:5076
 #, c-format
 msgid "segment override on `%s' is ineffectual"
 msgstr "écrasement de segment sur « %s » est inefficace"
 
-#: config/tc-i386.c:5807 config/tc-i386.c:5901 config/tc-i386.c:5946
+#: config/tc-i386.c:5734 config/tc-i386.c:5828 config/tc-i386.c:5873
 msgid "skipping prefixes on this instruction"
 msgstr "escamotage des préfixes sur cette instruction"
 
-#: config/tc-i386.c:5966
+#: config/tc-i386.c:5893
 msgid "16-bit jump out of range"
 msgstr "saut de 16 bits hors limite"
 
-#: config/tc-i386.c:5975
+#: config/tc-i386.c:5902
 #, c-format
 msgid "can't handle non absolute segment in `%s'"
 msgstr "ne peut traiter un segment non absolu dans « %s »"
 
-#: config/tc-i386.c:6555
+#: config/tc-i386.c:6482
 #, c-format
 msgid "@%s reloc is not supported with %d-bit output format"
 msgstr "réadressage @%s n'est pas supporté dans le format de sortie %d bits"
 
-#: config/tc-i386.c:6603
+#: config/tc-i386.c:6529
 #, c-format
 msgid "missing or invalid expression `%s'"
 msgstr "expression manquante ou invalide « %s »"
 
-#: config/tc-i386.c:6661
+#: config/tc-i386.c:6588
 #, c-format
 msgid "at most %d immediate operands are allowed"
 msgstr "au plus %d opérandes immédiats sont permis"
 
-#: config/tc-i386.c:6683 config/tc-i386.c:6930
+#: config/tc-i386.c:6610 config/tc-i386.c:6857
 #, c-format
 msgid "junk `%s' after expression"
 msgstr "rebuts « %s » après l'expression"
 
-#: config/tc-i386.c:6704
+#: config/tc-i386.c:6631
 #, c-format
 msgid "missing or invalid immediate expression `%s'"
 msgstr "expression immédiate manquante ou invalide « %s »"
 
-#: config/tc-i386.c:6727 config/tc-i386.c:7020
+#: config/tc-i386.c:6654 config/tc-i386.c:6947
 #, c-format
 msgid "unimplemented segment %s in operand"
 msgstr "segment %s non implémenté dans l'opérande"
 
-#: config/tc-i386.c:6734
+#: config/tc-i386.c:6661
 #, c-format
 msgid "illegal immediate register operand %s"
 msgstr "opérande de registre immédiat illégal %s"
 
-#: config/tc-i386.c:6782
+#: config/tc-i386.c:6709
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr "facteur d'échelle attendu de 1, 2, 4, ou 8: a obtenu « %s »"
 
-#: config/tc-i386.c:6791
+#: config/tc-i386.c:6718
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr "facteur d'échelle de %d sans registre d'index"
 
-#: config/tc-i386.c:6813
+#: config/tc-i386.c:6740
 #, c-format
 msgid "at most %d displacement operands are allowed"
 msgstr "au plus %d opérandes de déplacement sont permis"
 
-#: config/tc-i386.c:6986
+#: config/tc-i386.c:6913
 #, c-format
 msgid "missing or invalid displacement expression `%s'"
 msgstr "expression de déplacement manquante ou invalide « %s »"
 
-#: config/tc-i386.c:7003
+#: config/tc-i386.c:6930
 #, c-format
 msgid "0x%lx out range of signed 32bit displacement"
 msgstr "0x%lx hors limite pour un déplacement signé de 32 bits"
 
-#: config/tc-i386.c:7107
+#: config/tc-i386.c:7034
 #, c-format
 msgid "`%s' is not valid here (expected `%c%s%s%c')"
 msgstr "« %s » n'est pas valable ici (attendu « %c%s%s%c »)"
 
-#: config/tc-i386.c:7187
+#: config/tc-i386.c:7114
 #, c-format
 msgid "`%s' is not a valid %s expression"
 msgstr "« %s » n'est pas une expression %s valide"
 
-#: config/tc-i386.c:7192
+#: config/tc-i386.c:7119
 #, c-format
 msgid "`%s' is not a valid %s-bit %s expression"
 msgstr "« %s » n'est pas une expression de %s bits %s valide"
 
-#: config/tc-i386.c:7273
+#: config/tc-i386.c:7200
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr "opérande mémoire erroné « %s »"
 
-#: config/tc-i386.c:7288
+#: config/tc-i386.c:7215
 #, c-format
 msgid "junk `%s' after register"
 msgstr "rebut « %s » après le registre"
 
-#: config/tc-i386.c:7301 config/tc-i386.c:7417 config/tc-i386.c:7458
+#: config/tc-i386.c:7228 config/tc-i386.c:7344 config/tc-i386.c:7385
 #, c-format
 msgid "bad register name `%s'"
 msgstr "mauvais nom de registre « %s »"
 
-#: config/tc-i386.c:7309
+#: config/tc-i386.c:7236
 msgid "immediate operand illegal with absolute jump"
 msgstr "opérande immédiat illégal avec un saut absolu"
 
-#: config/tc-i386.c:7331
+#: config/tc-i386.c:7258
 #, c-format
 msgid "too many memory references for `%s'"
 msgstr "trop de références mémoires pour « %s »"
 
-#: config/tc-i386.c:7409
+#: config/tc-i386.c:7336
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr "« , » ou « ) » attendu après le registre d'index dans « %s »"
 
-#: config/tc-i386.c:7434
+#: config/tc-i386.c:7361
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr "« ) » attendu après le facteur d'échelle dans « %s »"
 
-#: config/tc-i386.c:7442
+#: config/tc-i386.c:7369
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr "registre d'index ou facteur d'échelle attendu après « , »; a obtenu « %c »"
 
-#: config/tc-i386.c:7450
+#: config/tc-i386.c:7377
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr "« , » ou « ) » attendu après le registre de base dans « %s »"
 
 #. It's not a memory operand; argh!
-#: config/tc-i386.c:7494
+#: config/tc-i386.c:7421
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr "caractère %s invalide au début de l'opérande %d « %s »"
 
-#: config/tc-i386.c:7676
+#: config/tc-i386.c:7603
 msgid "long jump required"
 msgstr "long saut (jump) requis"
 
-#: config/tc-i386.c:7731
+#: config/tc-i386.c:7658
 msgid "jump target out of range"
 msgstr "cible du saut hors limite"
 
-#: config/tc-i386.c:8249
-msgid "no compiled in support for x86_64"
-msgstr "pas compilé avec le support pour x86_64"
+#: config/tc-i386.c:8172
+msgid "No compiled in support for x86_64"
+msgstr "Pas compilé pour le support pour x86_64"
 
-#: config/tc-i386.c:8269
-msgid "no compiled in support for 32bit x86_64"
-msgstr "pas compilé avec le support pour x86_64 32 bits"
-
-#: config/tc-i386.c:8273
-msgid "32bit x86_64 is only supported for ELF"
-msgstr "x86_64 32 bits est uniquement supporté avec ELF"
-
-#: config/tc-i386.c:8303 config/tc-i386.c:8359
+#: config/tc-i386.c:8204 config/tc-i386.c:8259
 #, c-format
-msgid "invalid -march= option: `%s'"
-msgstr "option -march= invalide: « %s »"
+msgid "Invalid -march= option: `%s'"
+msgstr "Option -march= invalide: « %s »"
 
-#: config/tc-i386.c:8368 config/tc-i386.c:8380
+#: config/tc-i386.c:8268 config/tc-i386.c:8280
 #, c-format
-msgid "invalid -mtune= option: `%s'"
-msgstr "option -mtune= invalide: « %s »"
+msgid "Invalid -mtune= option: `%s'"
+msgstr "Option -mtune= invalide: « %s »"
 
-#: config/tc-i386.c:8389
+#: config/tc-i386.c:8289
 #, c-format
-msgid "invalid -mmnemonic= option: `%s'"
-msgstr "option -mmnemonic= invalide: « %s »"
+msgid "Invalid -mmnemonic= option: `%s'"
+msgstr "Option -mmnemonic= invalide: « %s »"
 
-#: config/tc-i386.c:8398
+#: config/tc-i386.c:8298
 #, c-format
-msgid "invalid -msyntax= option: `%s'"
-msgstr "option -msyntax= invalide: « %s »"
+msgid "Invalid -msyntax= option: `%s'"
+msgstr "Option -msyntax= invalide: « %s »"
 
-#: config/tc-i386.c:8425
+#: config/tc-i386.c:8325
 #, c-format
-msgid "invalid -msse-check= option: `%s'"
-msgstr "option -msse-check= invalide: « %s »"
+msgid "Invalid -msse-check= option: `%s'"
+msgstr "Option -msse-check= invalide: « %s »"
 
-#: config/tc-i386.c:8434
+#: config/tc-i386.c:8334
 #, c-format
-msgid "invalid -mavxscalar= option: `%s'"
-msgstr "option -mavxscalar= invalide: « %s »"
+msgid "Invalid -mavxscalar= option: `%s'"
+msgstr "Option -mavxscalar= invalide: « %s »"
 
-#: config/tc-i386.c:8526
+#: config/tc-i386.c:8426
 #, c-format
 msgid ""
 "  -Q                      ignored\n"
@@ -6326,7 +6261,7 @@ msgstr ""
 "  -V                      afficher la version de l'assembleur\n"
 "  -k                      ignoré\n"
 
-#: config/tc-i386.c:8531
+#: config/tc-i386.c:8431
 #, c-format
 msgid ""
 "  -n                      Do not optimize code alignment\n"
@@ -6335,27 +6270,27 @@ msgstr ""
 "  -n                      ne pas optimiser l'alignement du code\n"
 "  -q                      ne pas produire d'avertissement\n"
 
-#: config/tc-i386.c:8535
+#: config/tc-i386.c:8435
 #, c-format
 msgid "  -s                      ignored\n"
 msgstr "  -s                      ignoré\n"
 
-#: config/tc-i386.c:8540
+#: config/tc-i386.c:8440
 #, c-format
-msgid "  --32/--64/--x32         generate 32bit/64bit/x32 code\n"
-msgstr "  --32/--64/--x32         générer du code 32 bits/64 bits/x32\n"
+msgid "  --32/--64               generate 32bit/64bit code\n"
+msgstr "  --32/--64               générer du code 32/64 bits\n"
 
-#: config/tc-i386.c:8544
+#: config/tc-i386.c:8444
 #, c-format
 msgid "  --divide                do not treat `/' as a comment character\n"
 msgstr "  --divide                ne traite pas « / » comme un caractère de commentaire\n"
 
-#: config/tc-i386.c:8547
+#: config/tc-i386.c:8447
 #, c-format
 msgid "  --divide                ignored\n"
 msgstr "  --divide                ignoré\n"
 
-#: config/tc-i386.c:8550
+#: config/tc-i386.c:8450
 #, c-format
 msgid ""
 "  -march=CPU[,+EXTENSION...]\n"
@@ -6364,22 +6299,22 @@ msgstr ""
 "  -march=CPU[,+EXTENSION...]\n"
 "                          générer du code pour CPU et EXTENSION, CPU est l'un de ceux-ci:\n"
 
-#: config/tc-i386.c:8554
+#: config/tc-i386.c:8454
 #, c-format
 msgid "                          EXTENSION is combination of:\n"
 msgstr "                          EXTENSION est une combinaison de:\n"
 
-#: config/tc-i386.c:8557
+#: config/tc-i386.c:8457
 #, c-format
 msgid "  -mtune=CPU              optimize for CPU, CPU is one of:\n"
 msgstr "  -mtune=CPU              optimiser pour CPU, CPU est l'un de ceux-ci:\n"
 
-#: config/tc-i386.c:8560
+#: config/tc-i386.c:8460
 #, c-format
 msgid "  -msse2avx               encode SSE instructions with VEX prefix\n"
 msgstr "  -msse2avx               encoder les instructions SSE avec le préfixe VEX\n"
 
-#: config/tc-i386.c:8562
+#: config/tc-i386.c:8462
 #, c-format
 msgid ""
 "  -msse-check=[none|error|warning]\n"
@@ -6388,7 +6323,7 @@ msgstr ""
 "  -msse-check=[none|error|warning]\n"
 "                          vérifier les instructions SSE\n"
 
-#: config/tc-i386.c:8565
+#: config/tc-i386.c:8465
 #, c-format
 msgid ""
 "  -mavxscalar=[128|256]   encode scalar AVX instructions with specific vector\n"
@@ -6397,71 +6332,62 @@ msgstr ""
 "  -mavxscalar=[128|256]   encoder les instructions scalaires AVX avec une longueur de vecteur\n"
 "                           spécifique\n"
 
-#: config/tc-i386.c:8568
+#: config/tc-i386.c:8468
 #, c-format
 msgid "  -mmnemonic=[att|intel]  use AT&T/Intel mnemonic\n"
 msgstr "  -mmnemonic=[att|intel]  utiliser les mnémoniques AT&T/Intel\n"
 
-#: config/tc-i386.c:8570
+#: config/tc-i386.c:8470
 #, c-format
 msgid "  -msyntax=[att|intel]    use AT&T/Intel syntax\n"
 msgstr "  -msyntax=[att|intel]    utiliser la syntaxe AT&T/Intel\n"
 
-#: config/tc-i386.c:8572
+#: config/tc-i386.c:8472
 #, c-format
 msgid "  -mindex-reg             support pseudo index registers\n"
 msgstr "  -mindex-reg             supporter les registres pseudo index\n"
 
-#: config/tc-i386.c:8574
+#: config/tc-i386.c:8474
 #, c-format
 msgid "  -mnaked-reg             don't require `%%' prefix for registers\n"
 msgstr "  -mnaked-reg             n'exige pas le préfixe « %% » pour les registres\n"
 
-#: config/tc-i386.c:8576
+#: config/tc-i386.c:8476
 #, c-format
 msgid "  -mold-gcc               support old (<= 2.8.1) versions of gcc\n"
 msgstr "  -mold-gcc               supporter les anciennes (<= 2.8.1) versions de gcc\n"
 
-#: config/tc-i386.c:8650
+#: config/tc-i386.c:8530
 msgid "Intel L1OM is 64bit only"
 msgstr "Le L10M d'Intel est 64 bits uniquement"
 
-#: config/tc-i386.c:8872
+#: config/tc-i386.c:8753
 #, c-format
 msgid "can not do %d byte pc-relative relocation"
 msgstr "ne peut faire un réadressage relatif au PC de %d octets"
 
-#: config/tc-i386.c:8890
+#: config/tc-i386.c:8771
 #, c-format
 msgid "can not do %d byte relocation"
 msgstr "ne peut relocaliser %d octets"
 
-#: config/tc-i386.c:8959
-#, c-format
-msgid "cannot represent relocation type %s in x32 mode"
-msgstr "ne peut représenter le type de réadressage %s en mode x32"
-
-#: config/tc-i386.c:8994 config/tc-s390.c:2346
+#: config/tc-i386.c:8854 config/tc-s390.c:2239
 #, c-format
 msgid "cannot represent relocation type %s"
 msgstr "ne peut représenter le type de réadressage %s"
 
-#: config/tc-i386.c:9101
+#: config/tc-i386.c:8961
 msgid "bad .section directive: want a,l,w,x,M,S,G,T in string"
 msgstr "Directive .section erronée: nécessite a,l,w,x,M,S,G,T dans la chaîne"
 
-#: config/tc-i386.c:9104
+#: config/tc-i386.c:8964
 msgid "bad .section directive: want a,w,x,M,S,G,T in string"
 msgstr "Directive .section erronée: nécessite a,w,x,M,S,G,T dans la chaîne"
 
-#: config/tc-i386.c:9123
+#: config/tc-i386.c:8983
 msgid ".largecomm supported only in 64bit mode, producing .comm"
 msgstr ".largecomm supporté uniquement en mode 64 bits, .comm produit"
 
-#: config/tc-i386.c:9178 read.c:3859
-msgid "unexpected `\"' in expression"
-msgstr "« \" »  inattendue dans l'expression"
-
 #: config/tc-i860.c:122
 msgid "Directive .dual available only with -mintel-syntax option"
 msgstr "Directive .dual uniquement disponible avec l'option -mintel-syntax"
@@ -6752,7 +6678,7 @@ msgstr "La taille des registres de rotation dépasse la taille du cadre"
 msgid "Unwind directive not followed by an instruction."
 msgstr "directive unwind n'est pas suivie d'une instruction."
 
-#: config/tc-ia64.c:1017 config/tc-ia64.c:7449
+#: config/tc-ia64.c:1017 config/tc-ia64.c:7447
 msgid "qualifying predicate not followed by instruction"
 msgstr "le prédicat qualifiant n'est pas suivi d'une instruction"
 
@@ -7088,7 +7014,7 @@ msgstr "Virgule attendue"
 msgid "Expected '['"
 msgstr "« [ » attendu"
 
-#: config/tc-ia64.c:4514 config/tc-ia64.c:7584
+#: config/tc-ia64.c:4514 config/tc-ia64.c:7582
 msgid "Expected ']'"
 msgstr "« ] » attendu"
 
@@ -7155,7 +7081,7 @@ msgstr "Type de relation de prédicat non reconnu"
 msgid "Bad register range"
 msgstr "Gamme de registre erronée"
 
-#: config/tc-ia64.c:5001 config/tc-ia64.c:7529
+#: config/tc-ia64.c:5001 config/tc-ia64.c:7527
 msgid "Predicate register expected"
 msgstr "Registre de prédicat attendu"
 
@@ -7338,6 +7264,13 @@ msgid ""
 "  -mhint.b=[ok|warning|error]\n"
 "\t\t\t  hint.b check (default -mhint.b=error)\n"
 "  -x | -xexplicit\t  turn on dependency violation checking\n"
+"  -xauto\t\t  automagically remove dependency violations (default)\n"
+"  -xnone\t\t  turn off dependency violation checking\n"
+"  -xdebug\t\t  debug dependency violation checker\n"
+"  -xdebugn\t\t  debug dependency violation checker but turn off\n"
+"\t\t\t  dependency violation checking\n"
+"  -xdebugx\t\t  debug dependency violation checker and turn on\n"
+"\t\t\t  dependency violation checking\n"
 msgstr ""
 "Options IA-64:\n"
 "  --mconstant-gp                indiquer que le fichier utilise le modèle de constantes GP\n"
@@ -7352,258 +7285,246 @@ msgstr ""
 "                                vérifie la directive unwind (par défaut -munwind-check=warning)\n"
 "  -mint.b=[ok|warning|error]    vérifie hint.b (par défaut -mhint.b=error)\n"
 "  -x | -xexplicit               activer la vérification des violations de dépendances\n"
-"                                la vérification des violations de dépendances\n"
-
-#. Note for translators: "automagically" can be translated as "automatically" here.
-#: config/tc-ia64.c:7006
-msgid ""
-"  -xauto\t\t  automagically remove dependency violations (default)\n"
-"  -xnone\t\t  turn off dependency violation checking\n"
-"  -xdebug\t\t  debug dependency violation checker\n"
-"  -xdebugn\t\t  debug dependency violation checker but turn off\n"
-"\t\t\t  dependency violation checking\n"
-"  -xdebugx\t\t  debug dependency violation checker and turn on\n"
-"\t\t\t  dependency violation checking\n"
-msgstr ""
 "  -xauto                        enlever automatiquement les violations de dépendances (par défaut)\n"
 "  -xnone                        aucune vérification des violations de dépendances\n"
 "  -xdebug                       passer en mode débug le vérificateur de violations de dépendances\n"
 "  -xdebugn                      débug du vérificateur des violations des dépendances mais désactive\n"
 "                                la vérification des violations de dépendances\n"
 "  -xdebugx                      débug du vérificateur des violations des dépendances et active\n"
+"                                la vérification des violations de dépendances\n"
 
-#: config/tc-ia64.c:7021
+#: config/tc-ia64.c:7019
 msgid "--gstabs is not supported for ia64"
 msgstr "--gstabs n'est pas supporté pour ia64"
 
-#: config/tc-ia64.c:7259
+#: config/tc-ia64.c:7257
 #, c-format
 msgid "ia64.md_begin: can't hash `%s': %s"
 msgstr "ia64.md_begin: ne peut adresser par hachage « %s »: %s"
 
-#: config/tc-ia64.c:7320
+#: config/tc-ia64.c:7318
 #, c-format
 msgid "Inserting \"%s\" into constant hash table failed: %s"
 msgstr "Insertion de « %s » dans la table de hachage des constantes a échoué: %s"
 
-#: config/tc-ia64.c:7332 config/tc-mips.c:1916
+#: config/tc-ia64.c:7330 config/tc-mips.c:1905
 msgid "Could not set architecture and machine"
 msgstr "Ne peut initialiser l'architecture et la machine"
 
-#: config/tc-ia64.c:7464
+#: config/tc-ia64.c:7462
 msgid "Explicit stops are ignored in auto mode"
 msgstr "Les arrêts explicites sont ignorés en mode auto"
 
-#: config/tc-ia64.c:7473
+#: config/tc-ia64.c:7471
 msgid "Found '{' when manual bundling is already turned on"
 msgstr "« { » trouvé alors que le paquetage manuel est déjà activé"
 
-#: config/tc-ia64.c:7486
+#: config/tc-ia64.c:7484
 msgid "Found '{' after explicit switch to automatic mode"
 msgstr "« { » trouvé après un passage explicite en mode automatique"
 
-#: config/tc-ia64.c:7492
+#: config/tc-ia64.c:7490
 msgid "Found '}' when manual bundling is off"
 msgstr "« } » trouvé alors que le paquetage manuel est désactivé"
 
-#: config/tc-ia64.c:7519
+#: config/tc-ia64.c:7517
 msgid "Expected ')'"
 msgstr "« ) » attendu"
 
-#: config/tc-ia64.c:7524
+#: config/tc-ia64.c:7522
 msgid "Qualifying predicate expected"
 msgstr "Prédicat qualifiant attendu"
 
-#: config/tc-ia64.c:7543
+#: config/tc-ia64.c:7541
 msgid "Tag must come before qualifying predicate."
 msgstr "L'étiquette doit venir avant le prédicat qualifiant."
 
-#: config/tc-ia64.c:7573
+#: config/tc-ia64.c:7571
 msgid "Expected ':'"
 msgstr "« : » attendu"
 
-#: config/tc-ia64.c:7589
+#: config/tc-ia64.c:7587
 msgid "Tag name expected"
 msgstr "Nom d'étiquette attendu"
 
-#: config/tc-ia64.c:7691
+#: config/tc-ia64.c:7689
 msgid "Rotating register index must be a non-negative constant"
 msgstr "L'index du registre rotatif doit être une constante non négative"
 
-#: config/tc-ia64.c:7696
+#: config/tc-ia64.c:7694
 #, c-format
 msgid "Index out of range 0..%u"
 msgstr "Index hors de la gamme 0..%u"
 
-#: config/tc-ia64.c:7708
+#: config/tc-ia64.c:7706
 msgid "Indirect register index must be a general register"
 msgstr "L'index du registre indirect doit être un registre général"
 
-#: config/tc-ia64.c:7717
+#: config/tc-ia64.c:7715
 msgid "Index can only be applied to rotating or indirect registers"
 msgstr "L'index peut uniquement être appliqué aux registres rotatifs ou indirects"
 
-#: config/tc-ia64.c:7753 config/tc-xstormy16.c:146
+#: config/tc-ia64.c:7751 config/tc-xstormy16.c:146
 msgid "Expected '('"
 msgstr "« ( » attendu"
 
-#: config/tc-ia64.c:7761 config/tc-pdp11.c:448 config/tc-pdp11.c:512
-#: config/tc-pdp11.c:546 config/tc-xstormy16.c:155
+#: config/tc-ia64.c:7759 config/tc-pdp11.c:448 config/tc-pdp11.c:514
+#: config/tc-pdp11.c:553 config/tc-xstormy16.c:155
 msgid "Missing ')'"
 msgstr "« ) » manquante"
 
-#: config/tc-ia64.c:7779 config/tc-xstormy16.c:162
+#: config/tc-ia64.c:7777 config/tc-xstormy16.c:162
 msgid "Not a symbolic expression"
 msgstr "Pas une expression symbolique"
 
-#: config/tc-ia64.c:7784 config/tc-ia64.c:7798
+#: config/tc-ia64.c:7782 config/tc-ia64.c:7796
 msgid "Illegal combination of relocation functions"
 msgstr "Combinaison illégale de fonctions de réadressage"
 
-#: config/tc-ia64.c:7887
+#: config/tc-ia64.c:7885
 msgid "No current frame"
 msgstr "Pas de cadre actif"
 
-#: config/tc-ia64.c:7889
+#: config/tc-ia64.c:7887
 #, c-format
 msgid "Register number out of range 0..%u"
 msgstr "Numéro de registre hors de la gamme 0..%u"
 
-#: config/tc-ia64.c:7927
+#: config/tc-ia64.c:7925
 msgid "Standalone `#' is illegal"
 msgstr "« # » seul est illégal"
 
-#: config/tc-ia64.c:7930
+#: config/tc-ia64.c:7928
 msgid "Redundant `#' suffix operators"
 msgstr "Opérateurs de suffixe « # » redondant"
 
-#: config/tc-ia64.c:8088
+#: config/tc-ia64.c:8086
 #, c-format
 msgid "Unhandled dependency %s for %s (%s), note %d"
 msgstr "Dépendance non traitée %s pour %s (%s), noter %d"
 
-#: config/tc-ia64.c:9383
+#: config/tc-ia64.c:9381
 #, c-format
 msgid "Unrecognized dependency specifier %d\n"
 msgstr "Spécificateur de dépendance non reconnu %d\n"
 
-#: config/tc-ia64.c:10259
+#: config/tc-ia64.c:10257
 msgid "Only the first path encountering the conflict is reported"
 msgstr "Seul le premier chemin où le conflit est rencontré est rapporté"
 
-#: config/tc-ia64.c:10261
+#: config/tc-ia64.c:10259
 msgid "This is the location of the conflicting usage"
 msgstr "Voici la position de l'usage conflictuel"
 
-#: config/tc-ia64.c:10522
+#: config/tc-ia64.c:10520
 #, c-format
 msgid "Unknown opcode `%s'"
 msgstr "Opcode inconnu « %s »"
 
-#: config/tc-ia64.c:10600
+#: config/tc-ia64.c:10598
 #, c-format
 msgid "AR %d can only be accessed by %c-unit"
 msgstr "AR %d uniquement accessible par unité %c"
 
-#: config/tc-ia64.c:10612
+#: config/tc-ia64.c:10610
 msgid "hint.b may be treated as nop"
 msgstr "hint.b pourrait être traité comme un nop"
 
-#: config/tc-ia64.c:10615
+#: config/tc-ia64.c:10613
 msgid "hint.b shouldn't be used"
 msgstr "hint.b ne devrait pas être utilisé"
 
-#: config/tc-ia64.c:10654
+#: config/tc-ia64.c:10652
 #, c-format
 msgid "`%s' cannot be predicated"
 msgstr "« %s » ne peu pas être transformé en prédicat"
 
-#: config/tc-ia64.c:10726
+#: config/tc-ia64.c:10724
 msgid "Closing bracket missing"
 msgstr "Accolade fermante manquante"
 
-#: config/tc-ia64.c:10735
+#: config/tc-ia64.c:10733
 msgid "Index must be a general register"
 msgstr "L'index doit être un registre général"
 
-#: config/tc-ia64.c:10900
+#: config/tc-ia64.c:10898
 #, c-format
 msgid "Unsupported fixup size %d"
 msgstr "Taille du correctif %d non supportée"
 
 #. This should be an error, but since previously there wasn't any
 #. diagnostic here, don't make it fail because of this for now.
-#: config/tc-ia64.c:11172
+#: config/tc-ia64.c:11170
 #, c-format
 msgid "Cannot express %s%d%s relocation"
 msgstr "Ne peut exprimer le réadressage %s%d%s"
 
-#: config/tc-ia64.c:11191
+#: config/tc-ia64.c:11189
 msgid "No addend allowed in @fptr() relocation"
 msgstr "Pas d'addende autorisé dans le réadressage @fptr()"
 
-#: config/tc-ia64.c:11230
+#: config/tc-ia64.c:11228
 msgid "integer operand out of range"
 msgstr "Opérande entier hors limite"
 
-#: config/tc-ia64.c:11297
+#: config/tc-ia64.c:11295
 #, c-format
 msgid "%s must have a constant value"
 msgstr "%s doit avoir une valeur constante"
 
-#: config/tc-ia64.c:11317
+#: config/tc-ia64.c:11315
 msgid "cannot resolve @slotcount parameter"
 msgstr "ne peut résoudre le paramètre @slotcount"
 
-#: config/tc-ia64.c:11350
+#: config/tc-ia64.c:11348
 msgid "invalid @slotcount value"
 msgstr "valeur @slotcount invalide"
 
-#: config/tc-ia64.c:11387 config/tc-z8k.c:1372
+#: config/tc-ia64.c:11385 config/tc-z8k.c:1372
 #, c-format
 msgid "Cannot represent %s relocation in object file"
 msgstr "Ne peut représenter le réadressage « %s » dans le fichier objet"
 
-#: config/tc-ia64.c:11498
+#: config/tc-ia64.c:11496
 msgid "Can't add stop bit to mark end of instruction group"
 msgstr "Ne peut ajouter le bit de stop pour marquer la fin du groupe d'instructions"
 
-#: config/tc-ia64.c:11598 config/tc-score.c:6109 read.c:1448 read.c:2434
-#: read.c:3138 read.c:3476 read.c:3520
+#: config/tc-ia64.c:11596 config/tc-score.c:6109 read.c:1451 read.c:2447
+#: read.c:3149 read.c:3490 read.c:3534
 msgid "expected symbol name"
 msgstr "nom de symbole attendu"
 
-#: config/tc-ia64.c:11608 read.c:2444 read.c:3148 read.c:3504 stabs.c:469
+#: config/tc-ia64.c:11606 read.c:2457 read.c:3159 read.c:3518 stabs.c:468
 #, c-format
 msgid "expected comma after \"%s\""
 msgstr "virgule attendue après « %s »"
 
-#: config/tc-ia64.c:11650
+#: config/tc-ia64.c:11648
 #, c-format
 msgid "`%s' is already the alias of %s `%s'"
 msgstr "« %s » est déjà l'alias de %s « %s »"
 
-#: config/tc-ia64.c:11660
+#: config/tc-ia64.c:11658
 #, c-format
 msgid "%s `%s' already has an alias `%s'"
 msgstr "%s « %s » a déjà un alias « %s »"
 
-#: config/tc-ia64.c:11671
+#: config/tc-ia64.c:11669
 #, c-format
 msgid "inserting \"%s\" into %s alias hash table failed: %s"
 msgstr "insertion de « %s » dans la table de hachage des alias %s a échoué: %s"
 
-#: config/tc-ia64.c:11679
+#: config/tc-ia64.c:11677
 #, c-format
 msgid "inserting \"%s\" into %s name hash table failed: %s"
 msgstr "insertion de « %s » dans la table de hachage des noms %s a échoué: %s"
 
-#: config/tc-ia64.c:11705
+#: config/tc-ia64.c:11703
 #, c-format
 msgid "symbol `%s' aliased to `%s' is not used"
 msgstr "symbole « %s » ayant l'alias « %s » n'est pas utilisé"
 
-#: config/tc-ia64.c:11728
+#: config/tc-ia64.c:11726
 #, c-format
 msgid "section `%s' aliased to `%s' is not used"
 msgstr "section « %s » ayant l'alias « %s » n'est pas utilisée"
@@ -7647,19 +7568,19 @@ msgstr "l'instruction accède implicitement à R31 du chargement précédent."
 msgid "Unmatched high relocation"
 msgstr "Réadressage haut sans correspondant"
 
-#: config/tc-iq2000.c:829 config/tc-mips.c:15333 config/tc-score.c:5819
+#: config/tc-iq2000.c:829 config/tc-mips.c:15017 config/tc-score.c:5819
 msgid ".end not in text section"
 msgstr ".end n'est pas dans la section de texte"
 
-#: config/tc-iq2000.c:833 config/tc-mips.c:15337 config/tc-score.c:5822
+#: config/tc-iq2000.c:833 config/tc-mips.c:15021 config/tc-score.c:5822
 msgid ".end directive without a preceding .ent directive."
 msgstr "directive .end n'est pas précédée de la directive .ent."
 
-#: config/tc-iq2000.c:842 config/tc-mips.c:15346 config/tc-score.c:5830
+#: config/tc-iq2000.c:842 config/tc-mips.c:15030 config/tc-score.c:5830
 msgid ".end symbol does not match .ent symbol."
 msgstr "symbole .end n'a pas de correspondance avec le symbole .ent."
 
-#: config/tc-iq2000.c:845 config/tc-mips.c:15353 config/tc-score.c:5835
+#: config/tc-iq2000.c:845 config/tc-mips.c:15037 config/tc-score.c:5835
 msgid ".end directive missing or unknown symbol"
 msgstr "Directive .end manquante ou symbole inconnu"
 
@@ -7667,7 +7588,7 @@ msgstr "Directive .end manquante ou symbole inconnu"
 msgid "Expected simple number."
 msgstr "Nombre simple attendu."
 
-#: config/tc-iq2000.c:892 config/tc-mips.c:15258 config/tc-score.c:5670
+#: config/tc-iq2000.c:892 config/tc-mips.c:14942 config/tc-score.c:5670
 #, c-format
 msgid " *input_line_pointer == '%c' 0x%02x\n"
 msgstr " *input_line_pointer == « %c » 0x%02x\n"
@@ -7676,7 +7597,7 @@ msgstr " *input_line_pointer == « %c » 0x%02x\n"
 msgid "Invalid number"
 msgstr "Nombre invalide"
 
-#: config/tc-iq2000.c:928 config/tc-mips.c:15425 config/tc-score.c:5708
+#: config/tc-iq2000.c:928 config/tc-mips.c:15109 config/tc-score.c:5708
 msgid ".ent or .aent not in text section."
 msgstr ".ent ou .aent n'est pas dans la section texte."
 
@@ -7789,7 +7710,7 @@ msgstr "  -ignore-parallel-conflicts            ne vérifie pas les instructions
 
 #: config/tc-m32r.c:408
 #, c-format
-msgid "                                         for constraint violations\n"
+msgid "                                         fo contraint violations\n"
 msgstr "                                         pour des violations de contraintes\n"
 
 #: config/tc-m32r.c:410
@@ -7799,7 +7720,7 @@ msgstr "  -no-ignore-parallel-conflicts         vérifie les instructions parall
 
 #: config/tc-m32r.c:412
 #, c-format
-msgid "                                         constraint violations\n"
+msgid "                                         contraint violations\n"
 msgstr "                                         des violations de contraintes\n"
 
 #: config/tc-m32r.c:414
@@ -9184,796 +9105,759 @@ msgid "Absolute value in relaxation code.  Assembler error....."
 msgstr "Valeur absolue dans le code de relaxation. Erreur d'assembleur....."
 
 #: config/tc-microblaze.c:2363 config/tc-mn10300.c:1067 config/tc-sh.c:804
-#: config/tc-z80.c:666 read.c:4351
+#: config/tc-z80.c:666 read.c:4365
 #, c-format
 msgid "unsupported BFD relocation size %u"
 msgstr "taille de réadressage BFD non supportée %u"
 
 #. Prototypes for static functions.
-#: config/tc-mips.c:1064
+#: config/tc-mips.c:1060
 #, c-format
 msgid "internal Error, line %d, %s"
 msgstr "erreur interne, ligne %d, %s"
 
-#: config/tc-mips.c:1825 config/tc-mips.c:13188
+#: config/tc-mips.c:1814 config/tc-mips.c:12891
 #, c-format
 msgid "Unrecognized register name `%s'"
 msgstr "Nom de registre non reconnu « %s »"
 
-#: config/tc-mips.c:1911
+#: config/tc-mips.c:1900
 msgid "-G may not be used in position-independent code"
 msgstr "-G ne peut pas être utilisé dans du code indépendant de la position"
 
-#: config/tc-mips.c:1960
+#: config/tc-mips.c:1949
 #, c-format
 msgid "internal: can't hash `%s': %s"
 msgstr "erreur interne: ne peut adresser par hachage « %s »: %s"
 
-#: config/tc-mips.c:1968
+#: config/tc-mips.c:1957
 #, c-format
 msgid "internal error: bad mips16 opcode: %s %s\n"
 msgstr "erreur interne: opcode mips16 erroné: %s %s\n"
 
-#: config/tc-mips.c:2140
+#: config/tc-mips.c:2129
 #, c-format
 msgid "returned from mips_ip(%s) insn_opcode = 0x%x\n"
 msgstr "obtenu de mips_ip(%s) insn_opcode = 0x%x\n"
 
-#: config/tc-mips.c:3074 config/tc-mips.c:3082
+#: config/tc-mips.c:2958 config/tc-mips.c:14590
+msgid "extended instruction in delay slot"
+msgstr "instruction étendue dans la plage de délai"
+
+#: config/tc-mips.c:3022 config/tc-mips.c:3029
 #, c-format
 msgid "jump to misaligned address (0x%lx)"
 msgstr "saut vers une adresse mal alignée (0x%lx)"
 
-#: config/tc-mips.c:3093 config/tc-mips.c:4042
+#: config/tc-mips.c:3039 config/tc-mips.c:3810
 #, c-format
 msgid "branch to misaligned address (0x%lx)"
 msgstr "saut vers une adresse mal alignée (0x%lx)"
 
-#: config/tc-mips.c:3098 config/tc-mips.c:4045
+#: config/tc-mips.c:3044 config/tc-mips.c:3813
 #, c-format
 msgid "branch address range overflow (0x%lx)"
 msgstr "débordement de la gamme de saut d'adresses (0x%lx)"
 
-#: config/tc-mips.c:3253 config/tc-mips.c:14896
-msgid "extended instruction in delay slot"
-msgstr "instruction étendue dans la plage de délai"
-
 #. To reproduce this failure try assembling gas/testsuites/
 #. gas/mips/mips16-intermix.s with a mips-ecoff targeted
 #. assembler.
-#: config/tc-mips.c:3299
+#: config/tc-mips.c:3071
 #, c-format
 msgid "Unsupported MIPS relocation number %d"
 msgstr "Nombre de réadressage MIPS %d non supporté"
 
-#: config/tc-mips.c:3779
+#: config/tc-mips.c:3543
 msgid "Macro instruction expanded into multiple instructions in a branch delay slot"
 msgstr "L'instruction macro a été étendue en de multiples instructions dans un branchement de la plage de délai"
 
-#: config/tc-mips.c:3782
+#: config/tc-mips.c:3546
 msgid "Macro instruction expanded into multiple instructions"
 msgstr "Instruction macro étendue en de multiples instructions"
 
-#: config/tc-mips.c:4314
+#: config/tc-mips.c:4082 config/tc-mips.c:8005 config/tc-mips.c:8029
+#: config/tc-mips.c:8102 config/tc-mips.c:8125
 msgid "operand overflow"
 msgstr "débordement de l'opérande"
 
-#: config/tc-mips.c:4333 config/tc-mips.c:4933 config/tc-mips.c:8427
+#: config/tc-mips.c:4101 config/tc-mips.c:4701 config/tc-mips.c:8192
 msgid "Macro used $at after \".set noat\""
 msgstr "Macro utilisée $at après \".set noat\""
 
-#: config/tc-mips.c:4362
+#: config/tc-mips.c:4130
 msgid "unsupported large constant"
 msgstr "constante de grande taille non supportée"
 
-#: config/tc-mips.c:4364
+#: config/tc-mips.c:4132
 #, c-format
 msgid "Instruction %s requires absolute expression"
 msgstr "Instruction %s requiert une expression absolue"
 
-#: config/tc-mips.c:4497 config/tc-mips.c:6798 config/tc-mips.c:7390
+#: config/tc-mips.c:4265 config/tc-mips.c:6567 config/tc-mips.c:7143
 #, c-format
 msgid "Number (0x%s) larger than 32 bits"
 msgstr "Nombre (0x%s) plus grand que 32 bits"
 
-#: config/tc-mips.c:4517
+#: config/tc-mips.c:4285
 msgid "Number larger than 64 bits"
 msgstr "Nombre plus grand que 64 bits"
 
-#: config/tc-mips.c:4811 config/tc-mips.c:4839 config/tc-mips.c:4877
-#: config/tc-mips.c:4922 config/tc-mips.c:7012 config/tc-mips.c:7051
-#: config/tc-mips.c:7090 config/tc-mips.c:7485 config/tc-mips.c:7537
+#: config/tc-mips.c:4579 config/tc-mips.c:4607 config/tc-mips.c:4645
+#: config/tc-mips.c:4690 config/tc-mips.c:6776 config/tc-mips.c:6815
+#: config/tc-mips.c:6854 config/tc-mips.c:7239 config/tc-mips.c:7291
 msgid "PIC code offset overflow (max 16 signed bits)"
 msgstr "Débordement du décalage du code PIC (max 16 bits signés)"
 
-#: config/tc-mips.c:5244 config/tc-mips.c:5310 config/tc-mips.c:5398
-#: config/tc-mips.c:5445 config/tc-mips.c:5507 config/tc-mips.c:5556
-#: config/tc-mips.c:8521 config/tc-mips.c:8528 config/tc-mips.c:8535
-#: config/tc-mips.c:8642
+#: config/tc-mips.c:5012 config/tc-mips.c:5078 config/tc-mips.c:5166
+#: config/tc-mips.c:5213 config/tc-mips.c:5274 config/tc-mips.c:5322
+#: config/tc-mips.c:8286 config/tc-mips.c:8293 config/tc-mips.c:8300
+#: config/tc-mips.c:8407
 msgid "Unsupported large constant"
 msgstr "Constante de grande taille non supportée"
 
 #. result is always true
-#: config/tc-mips.c:5276
+#: config/tc-mips.c:5044
 #, c-format
 msgid "Branch %s is always true"
 msgstr "Branchement %s est toujours vrai"
 
-#: config/tc-mips.c:5518 config/tc-mips.c:5567 config/tc-mips.c:9297
-#: config/tc-mips.c:9454
+#: config/tc-mips.c:5285 config/tc-mips.c:5333 config/tc-mips.c:9058
+#: config/tc-mips.c:9215
 #, c-format
 msgid "Improper position (%lu)"
 msgstr "Position erronée (%lu)"
 
-#: config/tc-mips.c:5523 config/tc-mips.c:9364
+#: config/tc-mips.c:5291 config/tc-mips.c:9125
 #, c-format
 msgid "Improper extract size (%lu, position %lu)"
 msgstr "Taille d'extraction incorrecte (%lu, position %lu)"
 
-#: config/tc-mips.c:5572 config/tc-mips.c:9328
+#: config/tc-mips.c:5339 config/tc-mips.c:9089
 #, c-format
 msgid "Improper insert size (%lu, position %lu)"
 msgstr "Taille d'insertion incorrecte (%lu, position %lu)"
 
-#: config/tc-mips.c:5609 config/tc-mips.c:5706
+#: config/tc-mips.c:5376 config/tc-mips.c:5473
 msgid "Divide by zero."
 msgstr "Division par zéro."
 
-#: config/tc-mips.c:5792
+#: config/tc-mips.c:5559
 msgid "dla used to load 32-bit register"
 msgstr "dla utilisé pour charger un registre 32 bits"
 
-#: config/tc-mips.c:5795
+#: config/tc-mips.c:5562
 msgid "la used to load 64-bit address"
 msgstr "la utilisé pour charger une adresse 64 bits"
 
-#: config/tc-mips.c:5819 config/tc-mips.c:6788 config/tc-mips.c:7380
-msgid "Expression too complex"
-msgstr "Expression trop complexe"
-
-#: config/tc-mips.c:5907
-msgid "Offset too large"
-msgstr "Décalage trop grand"
+#: config/tc-mips.c:5674 config/tc-z80.c:695
+msgid "offset too large"
+msgstr "décalage d'adresse trop grand"
 
-#: config/tc-mips.c:6079 config/tc-mips.c:6354
+#: config/tc-mips.c:5846 config/tc-mips.c:6121
 msgid "PIC code offset overflow (max 32 signed bits)"
 msgstr "Débordement du décalage du code PIC (max 32 bits signés)"
 
-#: config/tc-mips.c:6432
+#: config/tc-mips.c:6204
 msgid "MIPS PIC call to register other than $25"
 msgstr "Appel PIC MIPS à un registre autre que $25"
 
-#: config/tc-mips.c:6438 config/tc-mips.c:6449 config/tc-mips.c:6573
-#: config/tc-mips.c:6584
+#: config/tc-mips.c:6210 config/tc-mips.c:6221 config/tc-mips.c:6345
+#: config/tc-mips.c:6356
 msgid "No .cprestore pseudo-op used in PIC code"
 msgstr "Pas de pseudo-op .cprestore utilisé dans le code PIC"
 
-#: config/tc-mips.c:6443 config/tc-mips.c:6578
+#: config/tc-mips.c:6215 config/tc-mips.c:6350
 msgid "No .frame pseudo-op used in PIC code"
 msgstr "Pas de pseudo-op .frame utilisé dans le code PIC"
 
-#: config/tc-mips.c:6599
+#: config/tc-mips.c:6371
 msgid "Non-PIC jump used in PIC library"
 msgstr "Saut non PIC utilisé dans la librairie PIC"
 
-#: config/tc-mips.c:6765
-#, c-format
-msgid "Opcode not supported on this processor: %s"
-msgstr "Opcode non supporté sur ce processeur: %s"
-
-#: config/tc-mips.c:7643
+#: config/tc-mips.c:6534 config/tc-mips.c:7397
 #, c-format
 msgid "opcode not supported on this processor: %s"
 msgstr "opcode non supporté sur ce processeur: %s"
 
-#: config/tc-mips.c:7790 config/tc-mips.c:7821 config/tc-mips.c:7873
-#: config/tc-mips.c:7903
+#: config/tc-mips.c:7544 config/tc-mips.c:7575 config/tc-mips.c:7627
+#: config/tc-mips.c:7657
 msgid "Improper rotate count"
 msgstr "Nombre de rotations erroné"
 
-#: config/tc-mips.c:7942
+#: config/tc-mips.c:7707
 #, c-format
 msgid "Instruction %s: result is always false"
 msgstr "Instruction %s: résultat est toujours faux"
 
-#: config/tc-mips.c:8103
+#: config/tc-mips.c:7868
 #, c-format
 msgid "Instruction %s: result is always true"
 msgstr "Instruction %s: résultat est toujours vrai"
 
-#: config/tc-mips.c:8240 config/tc-mips.c:8264 config/tc-mips.c:8337
-#: config/tc-mips.c:8360
-msgid "Operand overflow"
-msgstr "Débordement de l'opérande"
-
 #. FIXME: Check if this is one of the itbl macros, since they
 #. are added dynamically.
-#: config/tc-mips.c:8423
+#: config/tc-mips.c:8188
 #, c-format
 msgid "Macro %s not implemented yet"
 msgstr "Macro %s n'est pas encore implémentée"
 
-#: config/tc-mips.c:8673
+#: config/tc-mips.c:8438
 #, c-format
 msgid "internal: bad mips opcode (mask error): %s %s"
 msgstr "interne: opcode mips erroné (erreur de masque): %s %s"
 
-#: config/tc-mips.c:8718
+#: config/tc-mips.c:8478 config/tc-mips.c:9289
 #, c-format
 msgid "internal: bad mips opcode (unknown extension operand type `+%c'): %s %s"
 msgstr "interne: opcode mips erroné (type d'opérande d'extension inconnu « +%c »): %s %s"
 
-#: config/tc-mips.c:8797
+#: config/tc-mips.c:8557
 #, c-format
 msgid "internal: bad mips opcode (unknown operand type `%c'): %s %s"
 msgstr "interne: opcode mips erroné (type d'opérande inconnu « %c »): %s %s"
 
-#: config/tc-mips.c:8804
+#: config/tc-mips.c:8564
 #, c-format
 msgid "internal: bad mips opcode (bits 0x%lx undefined): %s %s"
 msgstr "interne: opcode mips erroné (bits 0x%lx indéfinis): %s %s"
 
-#: config/tc-mips.c:8927 config/tc-mips.c:8935
-msgid "Unrecognized opcode"
-msgstr "Opcode non reconnu"
+#: config/tc-mips.c:8687 config/tc-mips.c:8695 config/tc-mips.c:10179
+#: config/tc-score.c:2696 config/tc-score.c:2742
+msgid "unrecognized opcode"
+msgstr "opcode non reconnu"
 
-#: config/tc-mips.c:8962 config/tc-mips.c:10524
+#: config/tc-mips.c:8722 config/tc-mips.c:10205
 #, c-format
 msgid "opcode not supported on this processor: %s (%s)"
 msgstr "opcode non supporté sur ce processeur: %s (%s)"
 
-#: config/tc-mips.c:8996
+#: config/tc-mips.c:8756
 #, c-format
 msgid "BALIGN immediate not 1 or 3 (%lu)"
 msgstr "Immédiat BALIGN n'est pas 1 ou 3 (%lu)"
 
-#: config/tc-mips.c:9009 config/tc-mips.c:9022 config/tc-mips.c:9035
-#: config/tc-mips.c:9048 config/tc-mips.c:9074 config/tc-mips.c:9118
+#: config/tc-mips.c:8769 config/tc-mips.c:8782 config/tc-mips.c:8795
+#: config/tc-mips.c:8808 config/tc-mips.c:8834 config/tc-mips.c:8878
 #, c-format
 msgid "DSP immediate not in range 0..%d (%lu)"
 msgstr "Immédiat DSP n'est pas dans la gamme 0..%d (%lu)"
 
-#: config/tc-mips.c:9066 config/tc-mips.c:9093
+#: config/tc-mips.c:8826 config/tc-mips.c:8853
 msgid "Invalid dsp acc register"
 msgstr "Registre dsp acc invalide"
 
-#: config/tc-mips.c:9104 config/tc-mips.c:9135 config/tc-mips.c:9152
+#: config/tc-mips.c:8864 config/tc-mips.c:8895 config/tc-mips.c:8912
 #, c-format
 msgid "DSP immediate not in range %ld..%ld (%ld)"
 msgstr "Immédiat DSP n'est pas dans la gamme %ld..%ld (%ld)"
 
-#: config/tc-mips.c:9165
+#: config/tc-mips.c:8925
 #, c-format
 msgid "MT usermode bit not 0 or 1 (%lu)"
 msgstr "Bit usermode MT pas 0 ou 1 (%lu)"
 
-#: config/tc-mips.c:9176
+#: config/tc-mips.c:8936
 #, c-format
 msgid "MT load high bit not 0 or 1 (%lu)"
 msgstr "Bit load high MT n'est pas 0 ou 1 (%lu)"
 
-#: config/tc-mips.c:9193 config/tc-mips.c:9206
+#: config/tc-mips.c:8953 config/tc-mips.c:8966
 msgid "Invalid dsp/smartmips acc register"
 msgstr "Registre dsp/smartmips acc invalide"
 
-#: config/tc-mips.c:9270
+#: config/tc-mips.c:9031
 #, c-format
 msgid "Illegal %s number (%lu, 0x%lx)"
 msgstr "Nombre %s illégal (%lu, 0x%lx)"
 
-#: config/tc-mips.c:9383 config/tc-mips.c:10032
+#: config/tc-mips.c:9144 config/tc-mips.c:9716
 msgid "absolute expression required"
 msgstr "expression absolue requise"
 
-#: config/tc-mips.c:9406
+#: config/tc-mips.c:9167
 #, c-format
 msgid "Invalid register number (%d)"
 msgstr "Numéro de registre invalide (%d)"
 
-#: config/tc-mips.c:9414
+#: config/tc-mips.c:9175
 msgid "Invalid coprocessor 0 register number"
 msgstr "Numéro de registre du coprocesseur 0 invalide"
 
-#: config/tc-mips.c:9424
+#: config/tc-mips.c:9185
 #, c-format
 msgid "Improper bit index (%lu)"
 msgstr "Index de bit inopportun (%lu)"
 
-#: config/tc-mips.c:9485 config/tc-mips.c:9502
+#: config/tc-mips.c:9246 config/tc-mips.c:9263
 #, c-format
 msgid "Improper size (%lu)"
 msgstr "Taille inopportune (%lu)"
 
-#: config/tc-mips.c:9518
+#: config/tc-mips.c:9279
 #, c-format
 msgid "Improper immediate (%ld)"
 msgstr "Immédiat inopportun (%ld)"
 
-#: config/tc-mips.c:9535 config/tc-mips.c:9552 config/tc-mips.c:9572
-#, c-format
-msgid "Offset not in range %ld..%ld (%ld)"
-msgstr "Le décalage n'est pas dans la gamme %ld..%ld (%ld)"
-
-#: config/tc-mips.c:9578
-#, c-format
-msgid "Offset not 16 bytes alignment (%ld)"
-msgstr "Décalage pas aligné sur 16 octets (%ld)"
-
-#: config/tc-mips.c:9593 config/tc-mips.c:10705
-msgid "used $at without \".set noat\""
-msgstr "a utilisé $at sans « .set noat »"
-
-#: config/tc-mips.c:9595 config/tc-mips.c:10707
-#, c-format
-msgid "used $%u with \".set at=$%u\""
-msgstr "a utilisé $%u avec « .set at=$%u »"
-
-#: config/tc-mips.c:9608
-#, c-format
-msgid "Internal error: bad mips opcode (unknown extension operand type `+%c'): %s %s"
-msgstr "Erreur interne: opcode mips erroné (type d'opérande d'extension inconnu « +%c »): %s %s"
-
-#: config/tc-mips.c:9626
+#: config/tc-mips.c:9306
 #, c-format
 msgid "Improper shift amount (%lu)"
 msgstr "Nombre de décalages erroné (%lu)"
 
-#: config/tc-mips.c:9650 config/tc-mips.c:10845 config/tc-mips.c:11098
+#: config/tc-mips.c:9330 config/tc-mips.c:10526 config/tc-mips.c:10779
 #, c-format
 msgid "Invalid value for `%s' (%lu)"
 msgstr "Valeur invalide pour « %s » (%lu)"
 
-#: config/tc-mips.c:9686
+#: config/tc-mips.c:9366
 #, c-format
 msgid "Code for %s not in range 0..1023 (%lu)"
 msgstr "Code de %s n'est pas dans la gamme 0..1023 (%lu)"
 
-#: config/tc-mips.c:9698
+#: config/tc-mips.c:9378
 #, c-format
 msgid "Lower code for %s not in range 0..1023 (%lu)"
 msgstr "Code inférieur pour %s n'est pas dans la gamme 0..1023 (%lu)"
 
-#: config/tc-mips.c:9710
+#: config/tc-mips.c:9390
 #, c-format
 msgid "Code for %s not in range 0..1048575 (%lu)"
 msgstr "Code de %s n'est pas dans la gamme 0..1048575 (%lu)"
 
-#: config/tc-mips.c:9723
+#: config/tc-mips.c:9403
 #, c-format
 msgid "Coproccesor code > 25 bits (%lu)"
 msgstr "Code du coproccesseur > 25 bits (%lu)"
 
-#: config/tc-mips.c:9737
+#: config/tc-mips.c:9417
 #, c-format
 msgid "Illegal 19-bit code (%lu)"
 msgstr "Code 19 bits illégal (%lu)"
 
-#: config/tc-mips.c:9750
+#: config/tc-mips.c:9430
 #, c-format
 msgid "Invalid performance register (%lu)"
 msgstr "Registre de performance invalide (%lu)"
 
-#: config/tc-mips.c:9795
+#: config/tc-mips.c:9473 config/tc-mips.c:10386
+msgid "used $at without \".set noat\""
+msgstr "a utilisé $at sans « .set noat »"
+
+#: config/tc-mips.c:9475 config/tc-mips.c:10388
 #, c-format
-msgid "Used $%u with \".set at=$%u\""
-msgstr "$%u utilisé avec « .set at=$%u »"
+msgid "used $%u with \".set at=$%u\""
+msgstr "a utilisé $%u avec « .set at=$%u »"
 
-#: config/tc-mips.c:9822
-msgid "Source and destination must be different"
-msgstr "Source et destination doivent être différents"
+#: config/tc-mips.c:9501
+msgid "source and destination must be different"
+msgstr "source et destination doivent être différents"
 
-#: config/tc-mips.c:9828
-msgid "A destination register must be supplied"
-msgstr "Un registre de destination doit être fournis"
+#: config/tc-mips.c:9506
+msgid "a destination register must be supplied"
+msgstr "un registre de destination doit être fournis"
 
-#: config/tc-mips.c:9891
+#: config/tc-mips.c:9575
 #, c-format
 msgid "Improper align amount (%ld), using low bits"
 msgstr "Quantité d'alignement erronée (%ld), utilise les bits inférieurs"
 
-#: config/tc-mips.c:9905
+#: config/tc-mips.c:9589
 #, c-format
 msgid "Invalid MDMX Immediate (%ld)"
 msgstr "Immédiat MDMX invalide (%ld)"
 
-#: config/tc-mips.c:9943
+#: config/tc-mips.c:9627
 #, c-format
 msgid "Float register should be even, was %d"
 msgstr "Registre de virgule flottante devrait être pair, était %d"
 
-#: config/tc-mips.c:9982
+#: config/tc-mips.c:9666
 #, c-format
 msgid "Bad element selector %ld"
 msgstr "Élément erroné du sélecteur %ld"
 
-#: config/tc-mips.c:9990
+#: config/tc-mips.c:9674
 #, c-format
 msgid "Expecting ']' found '%s'"
 msgstr "Attendu « ] » trouvé « %s »"
 
-#: config/tc-mips.c:10096
+#: config/tc-mips.c:9780
 #, c-format
 msgid "Bad floating point constant: %s"
 msgstr "Constante en virgule flottante erronée: %s"
 
-#: config/tc-mips.c:10216
+#: config/tc-mips.c:9900
 msgid "Can't use floating point insn in this section"
 msgstr "Ne peut utiliser une instruction virgule flottante dans cette section"
 
-#: config/tc-mips.c:10275
-msgid "Expression out of range"
-msgstr "Expression hors limite"
+#: config/tc-mips.c:9959
+msgid "expression out of range"
+msgstr "expression hors limite"
 
-#: config/tc-mips.c:10319
-#, c-format
-msgid "lui expression (%lu) not in range 0..65535"
-msgstr "expression lui (%lu) n'est pas dans les bornes 0..65535"
+#: config/tc-mips.c:10003
+msgid "lui expression not in range 0..65535"
+msgstr "expression lui n'est pas dans les bornes 0..65535"
 
-#: config/tc-mips.c:10341
+#: config/tc-mips.c:10024
 #, c-format
 msgid "Condition code register should be even for %s, was %d"
 msgstr "Registre du code de condition devrait être pair pour %s, était %d"
 
-#: config/tc-mips.c:10347
+#: config/tc-mips.c:10029
 #, c-format
 msgid "Condition code register should be 0 or 4 for %s, was %d"
 msgstr "Registre du code de condition devrait être 0 ou 4 pour %s, était %d"
 
-#: config/tc-mips.c:10374
-msgid "Invalid coprocessor sub-selection value (0-7)"
-msgstr "Valeur de sous sélection du co-processeur invalide (0-7)"
+#: config/tc-mips.c:10055
+msgid "invalid coprocessor sub-selection value (0-7)"
+msgstr "valeur de sous sélection du co-processeur invalide (0-7)"
 
-#: config/tc-mips.c:10386 config/tc-mips.c:10403
+#: config/tc-mips.c:10067 config/tc-mips.c:10084
 #, c-format
 msgid "bad byte vector index (%ld)"
 msgstr "index de vecteur octet erroné (%ld)"
 
-#: config/tc-mips.c:10414
+#: config/tc-mips.c:10095
 #, c-format
-msgid "Bad char = '%c'\n"
-msgstr "Caractère erroné = « %c »\n"
+msgid "bad char = '%c'\n"
+msgstr "caractère erroné = « %c »\n"
 
-#: config/tc-mips.c:10498 config/tc-score.c:2696 config/tc-score.c:2742
-msgid "unrecognized opcode"
-msgstr "opcode non reconnu"
+#: config/tc-mips.c:10106 config/tc-mips.c:10111 config/tc-mips.c:10804
+msgid "illegal operands"
+msgstr "opérande illégal"
 
-#: config/tc-mips.c:10881 config/tc-mips.c:10962 config/tc-mips.c:10977
+#: config/tc-mips.c:10562 config/tc-mips.c:10643 config/tc-mips.c:10658
 msgid "can't parse register list"
 msgstr "ne peut analyser la liste de registres"
 
-#: config/tc-mips.c:10950
+#: config/tc-mips.c:10631
 msgid "more than one frame size in list"
 msgstr "plus d'une taille de cadre dans la liste"
 
-#: config/tc-mips.c:11005
+#: config/tc-mips.c:10686
 msgid "unexpected register in list"
 msgstr "registre inattendu dans la liste"
 
-#: config/tc-mips.c:11015
+#: config/tc-mips.c:10696
 msgid "arg/static registers overlap"
 msgstr "recouvrement des registres arg/static"
 
-#: config/tc-mips.c:11033
+#: config/tc-mips.c:10714
 msgid "invalid arg register list"
 msgstr "liste de registre arg invalide"
 
-#: config/tc-mips.c:11042 config/tc-mips.c:11065
+#: config/tc-mips.c:10723 config/tc-mips.c:10746
 msgid "invalid static register list"
 msgstr "liste de registres statiques invalide"
 
-#: config/tc-mips.c:11072
+#: config/tc-mips.c:10753
 msgid "missing frame size"
 msgstr "taille de cadre manquante"
 
-#: config/tc-mips.c:11075
+#: config/tc-mips.c:10756
 msgid "invalid frame size"
 msgstr "taille de cadre invalide"
 
-#: config/tc-mips.c:11123
-msgid "illegal operands"
-msgstr "opérande illégal"
-
-#: config/tc-mips.c:11241
+#: config/tc-mips.c:10922
 msgid "extended operand requested but not required"
 msgstr "opérande étendu demandé mais non requise"
 
-#: config/tc-mips.c:11243
+#: config/tc-mips.c:10924
 msgid "invalid unextended operand value"
 msgstr "valeur d'opérande non étendue invalide"
 
-#: config/tc-mips.c:11271
+#: config/tc-mips.c:10952
 msgid "operand value out of range for instruction"
 msgstr "valeur d'opérande hors limite pour l'instruction"
 
-#: config/tc-mips.c:11376
+#: config/tc-mips.c:11057
 #, c-format
 msgid "relocation %s isn't supported by the current ABI"
 msgstr "réadressage %s n'est pas supporté par l'ABI actuelle"
 
-#: config/tc-mips.c:11432
+#: config/tc-mips.c:11113
 msgid "unclosed '('"
 msgstr "« ( » non fermée"
 
-#: config/tc-mips.c:11699
+#: config/tc-mips.c:11400
 #, c-format
 msgid "A different %s was already specified, is now %s"
 msgstr "Un différent %s a déjà été spécifié, est maintenant %s"
 
-#: config/tc-mips.c:11970
+#: config/tc-mips.c:11671
 msgid "-call_shared is supported only for ELF format"
 msgstr "-call_shared est supporté seulement pour le format ELF"
 
-#: config/tc-mips.c:11980
+#: config/tc-mips.c:11681
 msgid "-call_nonpic is supported only for ELF format"
 msgstr "-call_nonpic est supporté seulement pour le format ELF"
 
-#: config/tc-mips.c:11990
+#: config/tc-mips.c:11691
 msgid "-non_shared is supported only for ELF format"
 msgstr "-non_shared est supporté seulement pour le format ELF"
 
-#: config/tc-mips.c:12023
+#: config/tc-mips.c:11724
 msgid "-n32 is supported for ELF format only"
 msgstr "-n32 est supporté seulement pour le format ELF"
 
-#: config/tc-mips.c:12032
+#: config/tc-mips.c:11733
 msgid "-64 is supported for ELF format only"
 msgstr "-64 est supporté seulement pour le format ELF"
 
-#: config/tc-mips.c:12037 config/tc-mips.c:12090
+#: config/tc-mips.c:11738 config/tc-mips.c:11791
 msgid "No compiled in support for 64 bit object file format"
 msgstr "Pas compilé pour le support de format de fichier objet de 64 bits"
 
-#: config/tc-mips.c:12077
+#: config/tc-mips.c:11778
 msgid "-mabi is supported for ELF format only"
 msgstr "-mabi est supporté seulement pour le format ELF"
 
-#: config/tc-mips.c:12097
+#: config/tc-mips.c:11798
 #, c-format
 msgid "invalid abi -mabi=%s"
 msgstr "abi invalide -mabi=%s"
 
-#: config/tc-mips.c:12177
+#: config/tc-mips.c:11878
 msgid "-G not supported in this configuration."
 msgstr "-G n'est pas supporté dans cette configuration."
 
-#: config/tc-mips.c:12203
+#: config/tc-mips.c:11904
 #, c-format
 msgid "-%s conflicts with the other architecture options, which imply -%s"
 msgstr "-%s en conflit avec d'autres options d'architecture, lequel implique -%s"
 
-#: config/tc-mips.c:12215
+#: config/tc-mips.c:11916
 #, c-format
 msgid "-march=%s is not compatible with the selected ABI"
 msgstr "-march=%s n'est pas compatible avec l'ABI sélectionnée"
 
-#: config/tc-mips.c:12234
+#: config/tc-mips.c:11935
 msgid "-mgp64 used with a 32-bit processor"
 msgstr "-mgp64 utilisé avec un processeur de 32 bits"
 
-#: config/tc-mips.c:12236
+#: config/tc-mips.c:11937
 msgid "-mgp32 used with a 64-bit ABI"
 msgstr "-mgp32 utilisé avec une ABI de 64 bits"
 
-#: config/tc-mips.c:12238
+#: config/tc-mips.c:11939
 msgid "-mgp64 used with a 32-bit ABI"
 msgstr "-mgp64 utilisé avec une ABI de 32 bits"
 
-#: config/tc-mips.c:12276
+#: config/tc-mips.c:11977
 msgid "-mfp64 used with a 32-bit fpu"
 msgstr "-mfp64 utilisé avec un fpu de 32 bits"
 
-#: config/tc-mips.c:12279
+#: config/tc-mips.c:11980
 msgid "-mfp64 used with a 32-bit ABI"
 msgstr "-mfp64 utilisé avec une ABI de 32 bits"
 
-#: config/tc-mips.c:12283
+#: config/tc-mips.c:11984
 msgid "-mfp32 used with a 64-bit ABI"
 msgstr "-mfp32 utilisé avec une ABI de 64 bits"
 
-#: config/tc-mips.c:12297
+#: config/tc-mips.c:11998
 msgid "trap exception not supported at ISA 1"
 msgstr "exception par trappe non supportée sur ISA 1"
 
-#: config/tc-mips.c:12307
+#: config/tc-mips.c:12008
 msgid "-mfp32 used with -mips3d"
 msgstr "-mfp32 utilisé avec -mips3d"
 
-#: config/tc-mips.c:12313
+#: config/tc-mips.c:12014
 msgid "-mfp32 used with -mdmx"
 msgstr "-mfp32 utilisé avec -mdmx"
 
-#: config/tc-mips.c:12318
+#: config/tc-mips.c:12019
 #, c-format
 msgid "%s ISA does not support SmartMIPS"
 msgstr "%s ISA ne supporte pas SmartMIPS"
 
-#: config/tc-mips.c:12324 config/tc-mips.c:13280
+#: config/tc-mips.c:12025 config/tc-mips.c:12983
 #, c-format
 msgid "%s ISA does not support DSP ASE"
 msgstr "%s ISA ne supporte pas DSP ASE"
 
-#: config/tc-mips.c:12333 config/tc-mips.c:13293
+#: config/tc-mips.c:12034 config/tc-mips.c:12996
 #, c-format
 msgid "%s ISA does not support DSP R2 ASE"
 msgstr "%s ISA ne supporte pas DSP R2 ASE"
 
-#: config/tc-mips.c:12339 config/tc-mips.c:13306
+#: config/tc-mips.c:12040 config/tc-mips.c:13009
 #, c-format
 msgid "%s ISA does not support MT ASE"
 msgstr "%s ISA ne supporte pas MT ASE"
 
-#: config/tc-mips.c:12387
+#: config/tc-mips.c:12089
 msgid "PC relative MIPS16 instruction references a different section"
 msgstr "Instruction MIPS16 relative au PC référence une section différente"
 
-#: config/tc-mips.c:12685 config/tc-sparc.c:3184 config/tc-sparc.c:3191
+#: config/tc-mips.c:12387 config/tc-sparc.c:3184 config/tc-sparc.c:3191
 #: config/tc-sparc.c:3198 config/tc-sparc.c:3205 config/tc-sparc.c:3212
 #: config/tc-sparc.c:3221 config/tc-sparc.c:3232 config/tc-sparc.c:3254
-#: config/tc-sparc.c:3278 write.c:1138
+#: config/tc-sparc.c:3278 write.c:1132
 msgid "relocation overflow"
 msgstr "débordement de réadressage"
 
-#: config/tc-mips.c:12695
+#: config/tc-mips.c:12397
 #, c-format
 msgid "Branch to misaligned address (%lx)"
 msgstr "Saut vers une adresse mal alignée (%lx)"
 
-#: config/tc-mips.c:12742
+#: config/tc-mips.c:12444
 msgid "Branch out of range"
 msgstr "Branchement hors limite"
 
-#: config/tc-mips.c:12824
+#: config/tc-mips.c:12526
 #, c-format
 msgid "Alignment too large: %d. assumed."
 msgstr "Alignement trop grand: %d. assumé."
 
-#: config/tc-mips.c:12827
+#: config/tc-mips.c:12529
 msgid "Alignment negative: 0 assumed."
 msgstr "Alignement négatif: 0 assumé."
 
-#: config/tc-mips.c:13085
+#: config/tc-mips.c:12788
 #, c-format
 msgid "%s: no such section"
 msgstr "%s: pas de telle section"
 
-#: config/tc-mips.c:13134
+#: config/tc-mips.c:12837
 #, c-format
 msgid ".option pic%d not supported"
 msgstr ".option pic%d n'est pas supportée"
 
-#: config/tc-mips.c:13139 config/tc-mips.c:13446
+#: config/tc-mips.c:12842 config/tc-mips.c:13149
 msgid "-G may not be used with SVR4 PIC code"
 msgstr "-G ne peut être utilisé avec du code PIC SVR4"
 
-#: config/tc-mips.c:13145
+#: config/tc-mips.c:12848
 #, c-format
 msgid "Unrecognized option \"%s\""
 msgstr "Option « %s » non reconnue"
 
-#: config/tc-mips.c:13205
+#: config/tc-mips.c:12908
 msgid "`noreorder' must be set before `nomacro'"
 msgstr "« noreorder » doit être initialisé avant « nomacro »"
 
-#: config/tc-mips.c:13231
+#: config/tc-mips.c:12934
 #, c-format
 msgid "%s isa does not support 64-bit registers"
 msgstr "%s ISA ne supporte pas les registres 64 bits"
 
-#: config/tc-mips.c:13242
+#: config/tc-mips.c:12945
 #, c-format
 msgid "%s isa does not support 64-bit floating point registers"
 msgstr "%s ISA ne supporte pas les registres en virgule flottante 64 bits"
 
-#: config/tc-mips.c:13263
+#: config/tc-mips.c:12966
 #, c-format
 msgid "%s ISA does not support SmartMIPS ASE"
 msgstr "%s ISA ne supporte pas SmartMIPS ASE"
 
-#: config/tc-mips.c:13330
+#: config/tc-mips.c:13033
 #, c-format
 msgid "unknown architecture %s"
 msgstr "architecture inconnue %s"
 
-#: config/tc-mips.c:13343 config/tc-mips.c:13373
+#: config/tc-mips.c:13046 config/tc-mips.c:13076
 #, c-format
 msgid "unknown ISA level %s"
 msgstr "niveau ISA inconnu %s"
 
-#: config/tc-mips.c:13351
+#: config/tc-mips.c:13054
 #, c-format
 msgid "unknown ISA or architecture %s"
 msgstr "ISA ou architecture inconnue %s"
 
-#: config/tc-mips.c:13401
+#: config/tc-mips.c:13104
 msgid ".set pop with no .set push"
 msgstr ".set pop sans .set push"
 
-#: config/tc-mips.c:13430
+#: config/tc-mips.c:13133
 #, c-format
 msgid "Tried to set unrecognized symbol: %s\n"
 msgstr "Tentative d'initialisation d'un symbole non reconnu: %s\n"
 
-#: config/tc-mips.c:13488
+#: config/tc-mips.c:13191
 msgid ".cpload not in noreorder section"
 msgstr ".cpload n'est pas dans la section « noreorder »"
 
-#: config/tc-mips.c:13556 config/tc-mips.c:13575
+#: config/tc-mips.c:13259 config/tc-mips.c:13278
 msgid "missing argument separator ',' for .cpsetup"
 msgstr "séparateur d'argument « , » manquant pour .cpsetup"
 
-#: config/tc-mips.c:13733
+#: config/tc-mips.c:13436
 #, c-format
 msgid "Unsupported use of %s"
 msgstr "Utilisation non supporté de %s"
 
-#: config/tc-mips.c:13815 config/tc-score.c:6035
+#: config/tc-mips.c:13518 config/tc-score.c:6035
 msgid "Unsupported use of .gpword"
 msgstr "Utilisation non supporté de .gpword"
 
-#: config/tc-mips.c:13855
+#: config/tc-mips.c:13558
 msgid "Unsupported use of .gpdword"
 msgstr "Utilisation non supportée de .gpdword"
 
-#: config/tc-mips.c:13949
+#: config/tc-mips.c:13652
 #, c-format
 msgid "ignoring attempt to redefine symbol %s"
 msgstr "tentative ignorée de redéfinition du symbole %s"
 
-#: config/tc-mips.c:13964 ecoff.c:3378
+#: config/tc-mips.c:13667 ecoff.c:3378
 msgid "bad .weakext directive"
 msgstr "directive .weakext erronée"
 
-#: config/tc-mips.c:14200
+#: config/tc-mips.c:13903
 msgid "unsupported PC relative reference to different section"
 msgstr "référence relative au PC non supportée pour un section différente"
 
-#: config/tc-mips.c:14313 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
+#: config/tc-mips.c:14016 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
 msgid "unsupported relocation"
 msgstr "réadressage non supporté"
 
-#: config/tc-mips.c:14571 config/tc-pdp11.c:1424
+#: config/tc-mips.c:14269 config/tc-pdp11.c:1431
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr "Ne peut représenter le réadressage %s dans ce format de fichier objet"
 
-#: config/tc-mips.c:14656
-msgid "Relaxed out-of-range branch into a jump"
-msgstr "Relâche d'un branchement hors limite dans le saut (jump)"
+#: config/tc-mips.c:14354
+msgid "relaxed out-of-range branch into a jump"
+msgstr "relâche d'un branchement hors limite dans le saut (jump)"
 
-#: config/tc-mips.c:15217
+#: config/tc-mips.c:14901
 msgid "missing .end at end of assembly"
 msgstr ".end manquant à la fin de l'assemblage"
 
-#: config/tc-mips.c:15232 config/tc-score.c:5644
+#: config/tc-mips.c:14916 config/tc-score.c:5644
 msgid "expected simple number"
 msgstr "nombre simple attendu"
 
-#: config/tc-mips.c:15260 config/tc-score.c:5671
+#: config/tc-mips.c:14944 config/tc-score.c:5671
 msgid "invalid number"
 msgstr "nombre invalide"
 
-#: config/tc-mips.c:15428 config/tc-score.c:5710
+#: config/tc-mips.c:15112 config/tc-score.c:5710
 msgid "missing .end"
 msgstr ".end manquant"
 
-#: config/tc-mips.c:15480
+#: config/tc-mips.c:15164
 msgid "Bad .frame directive"
 msgstr "Directive .frame erronée"
 
-#: config/tc-mips.c:15512
+#: config/tc-mips.c:15196
 msgid ".mask/.fmask outside of .ent"
 msgstr ".mask/.fmask à l'extérieur de .ent"
 
-#: config/tc-mips.c:15519
+#: config/tc-mips.c:15203
 msgid "Bad .mask/.fmask directive"
 msgstr "Directive .mask/.fmask erronée"
 
-#: config/tc-mips.c:15796
+#: config/tc-mips.c:15478
 #, c-format
 msgid "Bad value (%s) for %s"
 msgstr "Valeur invalide (%s) pour %s"
 
-#: config/tc-mips.c:15860
+#: config/tc-mips.c:15542
 #, c-format
 msgid ""
 "MIPS options:\n"
@@ -9990,7 +9874,7 @@ msgstr ""
 "-G NOMBRE               permettre la référence des objets jusqu'à NOMBRE d'octets\n"
 "                        implicitement avec le registre GP [par défaut 8]\n"
 
-#: config/tc-mips.c:15867
+#: config/tc-mips.c:15549
 #, c-format
 msgid ""
 "-mips1\t\t\tgenerate MIPS ISA I instructions\n"
@@ -10015,7 +9899,7 @@ msgstr ""
 "-mips64r2               générer des instructions MIPS64 version 2 ISA\n"
 "-march=CPU/-mtune=CPU   générer du code/planification pour le CPU, où CPU prend être:\n"
 
-#: config/tc-mips.c:15886
+#: config/tc-mips.c:15568
 #, c-format
 msgid ""
 "-mCPU\t\t\tequivalent to -march=CPU -mtune=CPU. Deprecated.\n"
@@ -10026,7 +9910,7 @@ msgstr ""
 "-no-mCPU                ne pas générer de code spécifique au CPU.\n"
 "                        Pour -mCPU et -no-mCPU, CPU doit être un des suivants:\n"
 
-#: config/tc-mips.c:15899
+#: config/tc-mips.c:15581
 #, c-format
 msgid ""
 "-mips16\t\t\tgenerate mips16 instructions\n"
@@ -10035,7 +9919,7 @@ msgstr ""
 "-mips16                 générer des instructions mips16\n"
 "-no-mips16              ne pas générer d'instruction mips16\n"
 
-#: config/tc-mips.c:15902
+#: config/tc-mips.c:15584
 #, c-format
 msgid ""
 "-msmartmips\t\tgenerate smartmips instructions\n"
@@ -10044,7 +9928,7 @@ msgstr ""
 "-msmartmips             générer des instructions smartmips\n"
 "-mno-smartmips          ne pas générer d'instruction smartmips\n"
 
-#: config/tc-mips.c:15905
+#: config/tc-mips.c:15587
 #, c-format
 msgid ""
 "-mdsp\t\t\tgenerate DSP instructions\n"
@@ -10053,7 +9937,7 @@ msgstr ""
 "-mdsp                   générer des instructions DSP\n"
 "-mno-dsp                ne pas générer d'instruction DSP\n"
 
-#: config/tc-mips.c:15908
+#: config/tc-mips.c:15590
 #, c-format
 msgid ""
 "-mdspr2\t\t\tgenerate DSP R2 instructions\n"
@@ -10062,7 +9946,7 @@ msgstr ""
 "-mdspr2                 générer des instructions DSR R2\n"
 "-mno-dspr2              ne pas générer d'instruction DSP R2\n"
 
-#: config/tc-mips.c:15911
+#: config/tc-mips.c:15593
 #, c-format
 msgid ""
 "-mmt\t\t\tgenerate MT instructions\n"
@@ -10071,7 +9955,7 @@ msgstr ""
 "-mmt                    générer des instructions MT\n"
 "-mno-mt                 ne pas générer d'instruction MT\n"
 
-#: config/tc-mips.c:15914
+#: config/tc-mips.c:15596
 #, c-format
 msgid ""
 "-mfix-loongson2f-jump\twork around Loongson2F JUMP instructions\n"
@@ -10102,7 +9986,7 @@ msgstr ""
 "--trap, --no-break\tcapturer les exceptions de division par 0 et les débordement de multiplication\n"
 "--break, --no-trap\tinterrompt les exceptions de division par 0 et les débordement de multiplication\n"
 
-#: config/tc-mips.c:15928
+#: config/tc-mips.c:15610
 #, c-format
 msgid ""
 "-mhard-float\t\tallow floating-point instructions\n"
@@ -10117,7 +10001,7 @@ msgstr ""
 "-mdouble-float\t\tautoriser les opérations en virgule flottante 32 bits et 64 bits\n"
 "--[no-]construct-floats autorise [ou non] la construction de valeurs en virgule flottante\n"
 
-#: config/tc-mips.c:15936
+#: config/tc-mips.c:15618
 #, c-format
 msgid ""
 "-KPIC, -call_shared\tgenerate SVR4 position independent code\n"
@@ -10140,7 +10024,7 @@ msgstr ""
 "                        code (non partagé) indépendant de la position\n"
 "-mabi=ABI\t\tcréer un fichier objet conforme à l'ABI pour:\n"
 
-#: config/tc-mips.c:15957
+#: config/tc-mips.c:15639
 #, c-format
 msgid ""
 "-32\t\t\tcreate o32 ABI object file (default)\n"
@@ -10383,7 +10267,7 @@ msgstr "expression LOC avec pas arrière n'est pas supportée"
 #. We will only get here in rare cases involving #NO_APP,
 #. where the unterminated string is not recognized by the
 #. preformatting pass.
-#: config/tc-mmix.c:4034 config/tc-mmix.c:4192 config/tc-z80.c:1695
+#: config/tc-mmix.c:4034 config/tc-mmix.c:4192 config/tc-z80.c:1686
 msgid "unterminated string"
 msgstr "chaîne non terminée"
 
@@ -10768,12 +10652,12 @@ msgstr "%s ne peut pas occuper la plage de délai d'une autre instruction de bra
 
 #: config/tc-mt.c:261
 #, c-format
-msgid "operand references R%ld of previous instruction."
+msgid "operand references R%ld of previous instrutcion."
 msgstr "l'opérande référence R%ld de l'instruction précédente."
 
 #: config/tc-mt.c:267
 #, c-format
-msgid "operand references R%ld of instruction before previous."
+msgid "operand references R%ld of instructcion before previous."
 msgstr "l'opérande référence R%ld de l'instruction avant la précédente."
 
 #: config/tc-mt.c:281 config/tc-mt.c:286
@@ -11016,63 +10900,67 @@ msgstr "Erreur dans l'expression"
 msgid "Low order bits truncated in immediate float operand"
 msgstr "Bits du bas tronqué dans l'opérande flottant immédiat"
 
-#: config/tc-pdp11.c:611
+#: config/tc-pdp11.c:532
+msgid "Label expected"
+msgstr "Étiquette attendue"
+
+#: config/tc-pdp11.c:618
 msgid "Float AC not legal as integer operand"
 msgstr "Flottant AC illégal en tant que opérande entier"
 
-#: config/tc-pdp11.c:631
+#: config/tc-pdp11.c:638
 msgid "General register not legal as float operand"
 msgstr "Registre général illégal en tant que opérande flottant"
 
-#: config/tc-pdp11.c:664
+#: config/tc-pdp11.c:671
 msgid "No instruction found"
 msgstr "Pas d'instruction trouvée"
 
-#: config/tc-pdp11.c:674 config/tc-z80.c:1894 config/tc-z80.c:1907
+#: config/tc-pdp11.c:681 config/tc-z80.c:1885 config/tc-z80.c:1898
 #, c-format
 msgid "Unknown instruction '%s'"
 msgstr "Instruction inconnue « %s »"
 
-#: config/tc-pdp11.c:680
+#: config/tc-pdp11.c:687
 #, c-format
 msgid "Unsupported instruction set extension: %s"
 msgstr "Extension du jeu d'instruction non supportée: %s"
 
-#: config/tc-pdp11.c:716
+#: config/tc-pdp11.c:723
 msgid "operand is not an absolute constant"
 msgstr "l'opérande n'est pas une constante absolue"
 
-#: config/tc-pdp11.c:724
+#: config/tc-pdp11.c:731
 msgid "3-bit immediate out of range"
 msgstr "valeur immédiate 3 bits hors limite"
 
-#: config/tc-pdp11.c:731
+#: config/tc-pdp11.c:738
 msgid "6-bit immediate out of range"
 msgstr "valeur immédiate 6 bit hors limite"
 
-#: config/tc-pdp11.c:738
+#: config/tc-pdp11.c:745
 msgid "8-bit immediate out of range"
 msgstr "valeur immédiate 8 bits hors limite"
 
-#: config/tc-pdp11.c:755 config/tc-pdp11.c:948
+#: config/tc-pdp11.c:762 config/tc-pdp11.c:955
 msgid "Symbol expected"
 msgstr "Symbole attendu"
 
-#: config/tc-pdp11.c:760
+#: config/tc-pdp11.c:767
 msgid "8-bit displacement out of range"
 msgstr "Déplacement 8 bits hors limite"
 
-#: config/tc-pdp11.c:802 config/tc-pdp11.c:823 config/tc-pdp11.c:840
-#: config/tc-pdp11.c:861 config/tc-pdp11.c:878 config/tc-pdp11.c:899
-#: config/tc-pdp11.c:918 config/tc-pdp11.c:939
+#: config/tc-pdp11.c:809 config/tc-pdp11.c:830 config/tc-pdp11.c:847
+#: config/tc-pdp11.c:868 config/tc-pdp11.c:885 config/tc-pdp11.c:906
+#: config/tc-pdp11.c:925 config/tc-pdp11.c:946
 msgid "Missing ','"
 msgstr "« , » manquante"
 
-#: config/tc-pdp11.c:953
+#: config/tc-pdp11.c:960
 msgid "6-bit displacement out of range"
 msgstr "Déplacement 6 bits hors limite"
 
-#: config/tc-pdp11.c:974 config/tc-vax.c:1944
+#: config/tc-pdp11.c:981 config/tc-vax.c:1944
 msgid "Too many operands"
 msgstr "Trop d'opérandes"
 
@@ -11085,7 +10973,7 @@ msgid "can't have relocation for ipush"
 msgstr "ne peut avoir de réadressage pour ipush"
 
 #: config/tc-pj.c:289
-msgid "expected expression"
+msgid "expected expresssion"
 msgstr "expression attendue"
 
 #: config/tc-pj.c:355
@@ -11112,16 +11000,16 @@ msgstr "convert_frag\n"
 msgid "estimate size\n"
 msgstr "taille estimée\n"
 
-#: config/tc-ppc.c:1119
+#: config/tc-ppc.c:1089
 #, c-format
 msgid "%s unsupported"
 msgstr "%s n'est pas supportée"
 
-#: config/tc-ppc.c:1216
+#: config/tc-ppc.c:1186
 msgid "--nops needs a numeric argument"
 msgstr "--nops requiert un argument numérique"
 
-#: config/tc-ppc.c:1230
+#: config/tc-ppc.c:1200
 #, c-format
 msgid ""
 "PowerPC options:\n"
@@ -11160,7 +11048,7 @@ msgstr ""
 "                         générer le code pour PowerPC 7400/7410/7450/7455\n"
 "-m750cl                  générer le code pour PowerPC 750cl\n"
 
-#: config/tc-ppc.c:1248
+#: config/tc-ppc.c:1218
 #, c-format
 msgid ""
 "-mppc64, -m620          generate code for PowerPC 620/625/630\n"
@@ -11189,7 +11077,7 @@ msgstr ""
 "-mcom                    générer le code pour les instructions communes Power/PowerPC\n"
 "-many                    générer le code pour n'importe quelle architecture (PWR/PWRX/PPC)\n"
 
-#: config/tc-ppc.c:1261
+#: config/tc-ppc.c:1231
 #, c-format
 msgid ""
 "-maltivec               generate code for AltiVec\n"
@@ -11214,324 +11102,308 @@ msgstr ""
 "-mregnames              autoriser des noms symboliques pour les registres\n"
 "-mno-regnames           interdit les noms symboliques pour les registres\n"
 
-#: config/tc-ppc.c:1273
+#: config/tc-ppc.c:1243
 #, c-format
 msgid ""
 "-mrelocatable           support for GCC's -mrelocatble option\n"
 "-mrelocatable-lib       support for GCC's -mrelocatble-lib option\n"
 "-memb                   set PPC_EMB bit in ELF flags\n"
-"-mlittle, -mlittle-endian, -le\n"
+"-mlittle, -mlittle-endian, -l, -le\n"
 "                        generate code for a little endian machine\n"
-"-mbig, -mbig-endian, -be\n"
+"-mbig, -mbig-endian, -b, -be\n"
 "                        generate code for a big endian machine\n"
 "-msolaris               generate code for Solaris\n"
 "-mno-solaris            do not generate code for Solaris\n"
-"-K PIC                  set EF_PPC_RELOCATABLE_LIB in ELF flags\n"
 "-V                      print assembler version number\n"
 "-Qy, -Qn                ignored\n"
 msgstr ""
 "-mrelocatable            support pour l'option GCC -mrelocatble\n"
 "-mrelocatable-lib        support pour l'option GCC -mrelocatble-lib\n"
 "-memb                    initialiser le bit PPC_EMB dans les fanions ELF\n"
-"-mlittle, -mlittle-endian, -le\n"
+"-mlittle, -mlittle-endian, -l, -le\n"
 "                         générer le code pour système à octets de poids faible\n"
-"-mbig, -mbig-endian, -be\n"
+"-mbig, -mbig-endian, -b, -be\n"
 "                         générer le code pour système à octets de poids fort\n"
 "-msolaris                générer le code pour Solaris\n"
 "-mno-solaris             ne pas générer le code pour Solaris\n"
-"-K PIC                   activer EF_PPC_RELOCATABLE_LIB dans les fanions ELF\n"
 "-V                       afficher la version de l'assembleur\n"
 "-Qy, -Qn                 ignoré\n"
 
-#: config/tc-ppc.c:1287
+#: config/tc-ppc.c:1256
 #, c-format
 msgid "-nops=count             when aligning, more than COUNT nops uses a branch\n"
 msgstr "-nops=num               si plus que num nops sont nécessaires pour un alignement, utiliser un branchement\n"
 
-#: config/tc-ppc.c:1313
+#: config/tc-ppc.c:1282
 #, c-format
 msgid "Unknown default cpu = %s, os = %s"
 msgstr "CPU par défaut inconnu = %s, système d'exploitation = %s"
 
-#: config/tc-ppc.c:1339
+#: config/tc-ppc.c:1308
 msgid "Neither Power nor PowerPC opcodes were selected."
 msgstr "Aucun opcode Power ou PowerPC n'a été sélectionné."
 
-#: config/tc-ppc.c:1420
+#: config/tc-ppc.c:1389
 #, c-format
 msgid "powerpc_operands[%d].bitm invalid"
 msgstr "powerpc_operands[%d].bitm invalide"
 
-#: config/tc-ppc.c:1427
+#: config/tc-ppc.c:1396
 #, c-format
 msgid "powerpc_operands[%d] duplicates powerpc_operands[%d]"
 msgstr "powerpc_operands[%d] double powerpc_operands[%d]"
 
-#: config/tc-ppc.c:1449
+#: config/tc-ppc.c:1418
 #, c-format
 msgid "major opcode is not sorted for %s"
 msgstr "l'opcode majeur n'est pas trié pour %s"
 
-#: config/tc-ppc.c:1485
+#: config/tc-ppc.c:1454
 #, c-format
 msgid "%s (%08lx %08lx) after %s (%08lx %08lx)"
 msgstr "%s (%08lx %08lx) après %s (%08lx %08lx)"
 
-#: config/tc-ppc.c:1494
+#: config/tc-ppc.c:1463
 #, c-format
 msgid "mask trims opcode bits for %s"
 msgstr "le masque élague les bits de l'opcode pour %s"
 
-#: config/tc-ppc.c:1503
+#: config/tc-ppc.c:1472
 #, c-format
 msgid "operand index error for %s"
 msgstr "erreur d'index d'opérande pour %s"
 
-#: config/tc-ppc.c:1515
+#: config/tc-ppc.c:1484
 #, c-format
 msgid "operand %d overlap in %s"
 msgstr "recouvrement de l'opérande %d dans %s"
 
-#: config/tc-ppc.c:1532
+#: config/tc-ppc.c:1501
 #, c-format
 msgid "duplicate instruction %s"
 msgstr "instruction %s en double"
 
-#: config/tc-ppc.c:1556
+#: config/tc-ppc.c:1525
 #, c-format
 msgid "duplicate macro %s"
 msgstr "macro %s en double"
 
-#: config/tc-ppc.c:1913
+#: config/tc-ppc.c:1882
 msgid "symbol+offset not supported for got tls"
 msgstr "symbole+offset non supporté dans le got tls"
 
-#: config/tc-ppc.c:2168
+#: config/tc-ppc.c:2137
 msgid "Relocation cannot be done when using -mrelocatable"
 msgstr "Réadressage ne peut être fait avec -mrelocatable"
 
-#: config/tc-ppc.c:2218
+#: config/tc-ppc.c:2187
 msgid "TOC section size exceeds 64k"
 msgstr "la taille de la section TOC excède 64k"
 
-#: config/tc-ppc.c:2299
+#: config/tc-ppc.c:2268
 #, c-format
 msgid "syntax error: invalid toc specifier `%s'"
 msgstr "erreur de syntaxe: spécificateur de table d'entrées « %s » invalide"
 
-#: config/tc-ppc.c:2313
+#: config/tc-ppc.c:2282
 #, c-format
 msgid "syntax error: expected `]', found  `%c'"
 msgstr "erreur de syntaxe: attendu « ] », obtenu « %c »"
 
-#: config/tc-ppc.c:2589
+#: config/tc-ppc.c:2558
 msgid "[tocv] symbol is not a toc symbol"
 msgstr "symbole [tocv] n'est pas un symbole toc"
 
-#: config/tc-ppc.c:2600
+#: config/tc-ppc.c:2569
 msgid "Unimplemented toc32 expression modifier"
 msgstr "Modificateur d'expression toc32 non implémenté"
 
-#: config/tc-ppc.c:2605
+#: config/tc-ppc.c:2574
 msgid "Unimplemented toc64 expression modifier"
 msgstr "Modificateur d'expression toc64 non implémenté"
 
-#: config/tc-ppc.c:2609
+#: config/tc-ppc.c:2578
 #, c-format
 msgid "Unexpected return value [%d] from parse_toc_entry!\n"
 msgstr "Valeur retournée inattendue [%d] à partir de parse_toc_entry !\n"
 
-#: config/tc-ppc.c:2789
+#: config/tc-ppc.c:2758
 #, c-format
 msgid "@tls may not be used with \"%s\" operands"
 msgstr "@tls ne peut pas être utilisé avec les opérandes « %s »"
 
-#: config/tc-ppc.c:2792
+#: config/tc-ppc.c:2761
 msgid "@tls may only be used in last operand"
 msgstr "@tls ne peut pas être utilisé dans le dernier opérande"
 
-#: config/tc-ppc.c:2902
+#: config/tc-ppc.c:2871
 msgid "unsupported relocation for DS offset field"
 msgstr "type de réadressage non supporté pour un décalage de champ DS"
 
-#: config/tc-ppc.c:2956
+#: config/tc-ppc.c:2925
 #, c-format
 msgid "syntax error; end of line, expected `%c'"
 msgstr "erreur de syntaxe; fin de ligne, attendait « %c »"
 
-#: config/tc-ppc.c:2958
+#: config/tc-ppc.c:2927
 #, c-format
 msgid "syntax error; found `%c', expected `%c'"
 msgstr "erreur de syntaxe; obtenu « %c », attendait « %c »"
 
-#: config/tc-ppc.c:2998 config/tc-ppc.h:94
+#: config/tc-ppc.c:2967 config/tc-ppc.h:94
 msgid "instruction address is not a multiple of 4"
 msgstr "l'adresse de l'instruction n'est pas un multiple de 4"
 
-#: config/tc-ppc.c:3247
+#: config/tc-ppc.c:3216
 msgid "missing size"
 msgstr "taille manquante"
 
-#: config/tc-ppc.c:3256
+#: config/tc-ppc.c:3225
 msgid "negative size"
 msgstr "taille négative"
 
-#: config/tc-ppc.c:3293
+#: config/tc-ppc.c:3262
 msgid "missing real symbol name"
 msgstr "nom de symbole réel manquant"
 
-#: config/tc-ppc.c:3314
+#: config/tc-ppc.c:3283
 msgid "attempt to redefine symbol"
 msgstr "tentative de redéfinition de symbole"
 
-#: config/tc-ppc.c:3579
-#, c-format
-msgid "No known dwarf XCOFF section for flag 0x%08x\n"
-msgstr "Aucune section dwarf XCOFF connue pour le fanion 0x%08x\n"
-
-#: config/tc-ppc.c:3592
-#, c-format
-msgid "label %s was not defined in this dwarf section"
-msgstr "l'étiquette « %s » n'a pas été définie dans cette section dwarf"
-
-#: config/tc-ppc.c:3708
+#: config/tc-ppc.c:3525
 msgid "The XCOFF file format does not support arbitrary sections"
 msgstr "Le format de fichier XCOFF ne supporte pas des sections arbitraires"
 
-#: config/tc-ppc.c:3781
+#: config/tc-ppc.c:3598
 msgid ".ref outside .csect"
 msgstr ".ref à l'extérieur de .csect"
 
-#: config/tc-ppc.c:3803 config/tc-ppc.c:4005
+#: config/tc-ppc.c:3620 config/tc-ppc.c:3820
 msgid "missing symbol name"
 msgstr "nom de symbole manquant"
 
-#: config/tc-ppc.c:3834
+#: config/tc-ppc.c:3651
 msgid "missing rename string"
 msgstr "chaîne renommée manquante"
 
-#: config/tc-ppc.c:3864 config/tc-ppc.c:4406 read.c:3364
+#: config/tc-ppc.c:3681 config/tc-ppc.c:4223 read.c:3375
 msgid "missing value"
 msgstr "valeur manquante"
 
-#: config/tc-ppc.c:3882
+#: config/tc-ppc.c:3699
 msgid "illegal .stabx expression; zero assumed"
 msgstr "expression .stabx illégale; zéro assumé"
 
-#: config/tc-ppc.c:3914
+#: config/tc-ppc.c:3731
 msgid "missing class"
 msgstr "classe manquante"
 
-#: config/tc-ppc.c:3923
+#: config/tc-ppc.c:3740
 msgid "missing type"
 msgstr "type manquant"
 
-#: config/tc-ppc.c:3950
-msgid ".stabx of storage class stsym must be within .bs/.es"
-msgstr ".stabx de la classe de stockage stsym doit être à l'intérieur de .bs/.es"
-
-#: config/tc-ppc.c:4193
+#: config/tc-ppc.c:4010
 msgid "nested .bs blocks"
 msgstr "blocs .bs imbriqués"
 
-#: config/tc-ppc.c:4225
+#: config/tc-ppc.c:4042
 msgid ".es without preceding .bs"
 msgstr ".es n'est pas précédé de .bs"
 
-#: config/tc-ppc.c:4398
+#: config/tc-ppc.c:4215
 msgid "non-constant byte count"
 msgstr "compteur d'octet n'est pas une constante"
 
-#: config/tc-ppc.c:4472
+#: config/tc-ppc.c:4262
 msgid ".tc not in .toc section"
 msgstr ".tc n'est pas dans la section .toc"
 
-#: config/tc-ppc.c:4491
+#: config/tc-ppc.c:4281
 msgid ".tc with no label"
 msgstr ".tc sans étiquette"
 
-#: config/tc-ppc.c:4584 config/tc-s390.c:1843
+#: config/tc-ppc.c:4374
 msgid ".machine stack overflow"
 msgstr "débordement de pile .machine"
 
-#: config/tc-ppc.c:4591 config/tc-s390.c:1850
+#: config/tc-ppc.c:4381
 msgid ".machine stack underflow"
 msgstr "dépassement négatif de la pile .machine"
 
-#: config/tc-ppc.c:4598 config/tc-s390.c:1857
+#: config/tc-ppc.c:4388
 #, c-format
 msgid "invalid machine `%s'"
 msgstr "machine invalide « %s »"
 
-#: config/tc-ppc.c:4649
+#: config/tc-ppc.c:4439
 msgid "No previous section to return to. Directive ignored."
 msgstr "Pas de section précédente pour y retourner. Directive ignorée."
 
 #. Section Contents
 #. unknown
-#: config/tc-ppc.c:5059
+#: config/tc-ppc.c:4849
 msgid "Unsupported section attribute -- 'a'"
 msgstr "Attribut de section non supporté -- « a »"
 
-#: config/tc-ppc.c:5243
+#: config/tc-ppc.c:5033
 msgid "bad symbol suffix"
 msgstr "mauvais suffixe de symbole"
 
-#: config/tc-ppc.c:5336
+#: config/tc-ppc.c:5125
 msgid "Unrecognized symbol suffix"
 msgstr "suffixe de symbole non reconnu"
 
-#: config/tc-ppc.c:5424
+#: config/tc-ppc.c:5213
 msgid "two .function pseudo-ops with no intervening .ef"
 msgstr "deux pseudo-op .function sans .ef intermédiaire"
 
-#: config/tc-ppc.c:5437
+#: config/tc-ppc.c:5226
 msgid ".ef with no preceding .function"
 msgstr ".ef n'est pas précédé de .function"
 
-#: config/tc-ppc.c:5566
+#: config/tc-ppc.c:5355
 #, c-format
 msgid "warning: symbol %s has no csect"
 msgstr "avertissement: symbole %s n'a pas de csect"
 
-#: config/tc-ppc.c:5828
+#: config/tc-ppc.c:5600
 msgid "symbol in .toc does not match any .tc"
 msgstr "symbole dans .toc ne concorde avec aucun .tc"
 
-#: config/tc-ppc.c:6230
+#: config/tc-ppc.c:6002
 #, c-format
 msgid "unsupported relocation against %s"
 msgstr "réadressage non supporté vers %s"
 
-#: config/tc-ppc.c:6303
+#: config/tc-ppc.c:6075
 #, c-format
 msgid "cannot emit PC relative %s relocation against %s"
 msgstr "ne peut produire un réadressage %s relatif au PC pour %s"
 
-#: config/tc-ppc.c:6308
+#: config/tc-ppc.c:6080
 #, c-format
 msgid "cannot emit PC relative %s relocation"
 msgstr "ne peut produire un réadressage %s relatif au PC"
 
-#: config/tc-ppc.c:6497
+#: config/tc-ppc.c:6269
 #, c-format
 msgid "Unable to handle reference to symbol %s"
 msgstr "Incapable de gérer la référence au symbole %s"
 
-#: config/tc-ppc.c:6500
+#: config/tc-ppc.c:6272
 msgid "Unable to resolve expression"
 msgstr "Ne peut résoudre l'expression"
 
-#: config/tc-ppc.c:6527
+#: config/tc-ppc.c:6299
 msgid "must branch to an address a multiple of 4"
 msgstr "doit faire un branchement vers une adresse qui est un multiple de 4"
 
-#: config/tc-ppc.c:6531
+#: config/tc-ppc.c:6303
 #, c-format
 msgid "@local or @plt branch destination is too far away, %ld bytes"
 msgstr "Destination @local ou branchement @plt est trop éloignée, %ld octets"
 
-#: config/tc-ppc.c:6562
+#: config/tc-ppc.c:6334
 #, c-format
 msgid "Gas failure, reloc value %d\n"
 msgstr "Échec de GAS, valeur de réadressage %d\n"
@@ -11626,48 +11498,48 @@ msgstr "Le pseudo-op .MACRO n'est pas implémenté"
 msgid "The .BTEQU pseudo-op is not implemented."
 msgstr "Le pseudo-op .BTEQU n'est pas implémenté."
 
-#: config/tc-rx.c:1883
+#: config/tc-rx.c:1868
 msgid "invalid immediate size"
 msgstr "taille immédiate invalide"
 
-#: config/tc-rx.c:1902
+#: config/tc-rx.c:1887
 msgid "invalid immediate field position"
 msgstr "position du champ immédiat invalide"
 
-#: config/tc-rx.c:1951
+#: config/tc-rx.c:1936
 #, c-format
 msgid "bad frag at %p : fix %ld addr %ld %ld \n"
 msgstr "mauvaise fragmentation à %p: correction %ld adresse %ld %ld \n"
 
-#: config/tc-rx.c:2018
+#: config/tc-rx.c:1999
 #, c-format
 msgid "unsupported constant size %d\n"
 msgstr "taille de constante %d non supportée\n"
 
-#: config/tc-rx.c:2025
+#: config/tc-rx.c:2006
 msgid "difference of two symbols only supported with .long, .short, or .byte"
 msgstr "différence de deux symboles uniquement supportée avec .long, .short ou .byte"
 
-#: config/tc-rx.c:2069
+#: config/tc-rx.c:2050
 #, c-format
 msgid "jump not 3..10 bytes away (is %d)"
 msgstr "saut pas à 3..10 octets (est %d)"
 
-#: config/tc-rx.c:2215
+#: config/tc-rx.c:2196
 #, c-format
 msgid "Unknown reloc in md_apply_fix: %s"
 msgstr "Réadressage inconnu dans md_apply_fix: %s"
 
-#: config/tc-s390.c:332 config/tc-sparc.c:272
+#: config/tc-s390.c:327 config/tc-sparc.c:272
 msgid "Invalid default architecture, broken assembler."
 msgstr "Architecture par défaut invalide, bris d'assemblage."
 
-#: config/tc-s390.c:439 config/tc-sparc.c:475
+#: config/tc-s390.c:425 config/tc-sparc.c:475
 #, c-format
 msgid "invalid architecture -A%s"
 msgstr "architecture invalide -A%s"
 
-#: config/tc-s390.c:462
+#: config/tc-s390.c:448
 #, c-format
 msgid ""
 "        S390 options:\n"
@@ -11684,7 +11556,7 @@ msgstr ""
 "        -m31              Définir le format de fichier à 32 bits\n"
 "        -m64              Définir le format de fichier à 64 bits\n"
 
-#: config/tc-s390.c:469
+#: config/tc-s390.c:455
 #, c-format
 msgid ""
 "        -V                print assembler version number\n"
@@ -11693,119 +11565,111 @@ msgstr ""
 "        -V                afficher la version de l'assembleur\n"
 "        -Qy, -Qn          ignoré\n"
 
-#: config/tc-s390.c:534
+#: config/tc-s390.c:474
 msgid "The 64 bit file format is used without esame instructions."
 msgstr "Le format de fichier 64 bits est utilisé sans les instructions esame."
 
-#: config/tc-s390.c:550
+#: config/tc-s390.c:491
 #, c-format
 msgid "Internal assembler error for instruction format %s"
 msgstr "Erreur interne d'assembleur pour le format d'instruction %s"
 
-#: config/tc-s390.c:596
+#: config/tc-s390.c:569
 #, c-format
 msgid "operand out of range (%s not between %ld and %ld)"
 msgstr "opérande hors limite (%s n'est pas entre %ld et %ld)"
 
-#: config/tc-s390.c:778
+#: config/tc-s390.c:751
 #, c-format
 msgid "identifier+constant@%s means identifier@%s+constant"
 msgstr "identificateur+constante@%s signifie identificateur@%s+constante"
 
-#: config/tc-s390.c:859
+#: config/tc-s390.c:832
 msgid "Can't handle O_big in s390_exp_compare"
 msgstr "Ne peut traiter O_big dans s390_exp_compare"
 
-#: config/tc-s390.c:940
+#: config/tc-s390.c:913
 msgid "Invalid suffix for literal pool entry"
 msgstr "Suffixe invalide pour le bassin d'entrées littérales"
 
-#: config/tc-s390.c:997
+#: config/tc-s390.c:970
 msgid "Big number is too big"
 msgstr "Grand nombre trop grand"
 
-#: config/tc-s390.c:1144
+#: config/tc-s390.c:1117
 msgid "relocation not applicable"
 msgstr "réadressage non applicable"
 
-#: config/tc-s390.c:1261
+#: config/tc-s390.c:1234
 msgid "index register specified but zero"
 msgstr "registre d'index spécifié mais est zéro"
 
-#: config/tc-s390.c:1265
+#: config/tc-s390.c:1238
 msgid "base register specified but zero"
 msgstr "registre de base spécifié mais est zéro"
 
-#: config/tc-s390.c:1269
-msgid "odd numbered general purpose register specified as register pair"
-msgstr "registre général impaire spécifié comme paire de registres"
-
-#: config/tc-s390.c:1277
-msgid "invalid floating point register pair.  Valid fp register pair operands are 0, 1, 4, 5, 8, 9, 12 or 13."
-msgstr "paire de registres en virgule flottante invalide. Les opérandes valables pour une paire de registres fp sont 0, 1, 4, 5, 8, 9, 12 ou 13."
-
-#: config/tc-s390.c:1360
+#: config/tc-s390.c:1319
 msgid "invalid operand suffix"
 msgstr "suffixe d'opérande invalide"
 
-#: config/tc-s390.c:1383
+#: config/tc-s390.c:1342
 msgid "syntax error; missing '(' after displacement"
 msgstr "erreur de syntaxe; « ( » manquante après le déplacement"
 
-#: config/tc-s390.c:1399 config/tc-s390.c:1443 config/tc-s390.c:1473
+#: config/tc-s390.c:1358 config/tc-s390.c:1402 config/tc-s390.c:1432
 msgid "syntax error; expected ,"
 msgstr "erreur de syntaxe: « , » attendue"
 
-#: config/tc-s390.c:1431
+#: config/tc-s390.c:1390
 msgid "syntax error; missing ')' after base register"
 msgstr "erreur de syntaxe: « ) » manquante après le registre de base"
 
-#: config/tc-s390.c:1460
+#: config/tc-s390.c:1419
 msgid "syntax error; ')' not allowed here"
 msgstr "erreur de syntaxes; « ) » n'est pas permis ici"
 
-#: config/tc-s390.c:1595
+#: config/tc-s390.c:1554
 #, c-format
 msgid "Opcode %s not available in this mode"
 msgstr "Opcode %s pas disponible dans ce mode"
 
-#: config/tc-s390.c:1650 config/tc-s390.c:1673 config/tc-s390.c:1686
+#: config/tc-s390.c:1609 config/tc-s390.c:1632 config/tc-s390.c:1645
 msgid "Invalid .insn format\n"
 msgstr "Format .insn invalide\n"
 
-#: config/tc-s390.c:1658
+#: config/tc-s390.c:1617
 #, c-format
 msgid "Unrecognized opcode format: `%s'"
 msgstr "Format de opcode non reconnu: « %s »"
 
-#: config/tc-s390.c:1689
+#: config/tc-s390.c:1648
 msgid "second operand of .insn not a constant\n"
 msgstr "second opérande de .insn n'est pas constante\n"
 
-#: config/tc-s390.c:1692
+#: config/tc-s390.c:1651
 msgid "missing comma after insn constant\n"
 msgstr "virgule manquante après la constante de insn\n"
 
-#: config/tc-s390.c:2050
+#: config/tc-s390.c:1943
 #, c-format
 msgid "cannot emit relocation %s against subsy symbol %s"
 msgstr "ne peut produire un réadressage %s sur le symbole subsy %s"
 
-#: config/tc-s390.c:2138
+#: config/tc-s390.c:2031
 msgid "unsupported relocation type"
 msgstr "type de réadressage non supporté"
 
-#: config/tc-s390.c:2185
+#: config/tc-s390.c:2078
 #, c-format
 msgid "cannot emit PC relative %s relocation%s%s"
 msgstr "ne peut produire le réadressage %s relatif au PC%s%s"
 
-#: config/tc-s390.c:2310
+#: config/tc-s390.c:2203
 #, c-format
 msgid "Gas failure, reloc type %s\n"
 msgstr "Échec de GAS, type de réadressage %s\n"
 
-#: config/tc-s390.c:2312
+#: config/tc-s390.c:2205
 #, c-format
 msgid "Gas failure, reloc type #%i\n"
 msgstr "Échec de GAS, type de réadressage #%i\n"
@@ -12027,7 +11891,7 @@ msgstr "erreur d'instruction pce (16 bits || 16 bits)'"
 msgid "score3d instruction."
 msgstr "instruction score3d."
 
-#: config/tc-score.c:6126 read.c:1465
+#: config/tc-score.c:6126 read.c:1468
 msgid "missing size expression"
 msgstr "expression de la taille manquante"
 
@@ -12036,7 +11900,7 @@ msgstr "expression de la taille manquante"
 msgid "BSS length (%d) < 0 ignored"
 msgstr "longueur BSS (%d) < 0 ignorée"
 
-#: config/tc-score.c:6147 read.c:2298
+#: config/tc-score.c:6147 read.c:2311
 #, c-format
 msgid "error setting flags for \".sbss\": %s"
 msgstr "erreur lors de l'initialisation des fanions pour « .sbss »: %s"
@@ -12050,12 +11914,12 @@ msgstr "alignement manquant"
 msgid "alignment too large; %d assumed"
 msgstr "alignement trop grand; %d assumé"
 
-#: config/tc-score.c:6203 read.c:2359
+#: config/tc-score.c:6203 read.c:2372
 msgid "alignment negative; 0 assumed"
 msgstr "alignement négatif; 0 assumé"
 
-#: config/tc-score.c:6270 ecoff.c:3365 read.c:1484 read.c:1590 read.c:2476
-#: read.c:3098 read.c:3488 symbols.c:334 symbols.c:430
+#: config/tc-score.c:6270 ecoff.c:3365 read.c:1487 read.c:1600 read.c:2489
+#: read.c:3109 read.c:3502 symbols.c:337 symbols.c:433
 #, c-format
 msgid "symbol `%s' is already defined"
 msgstr "symbole « %s » est déjà défini"
@@ -13036,7 +12900,7 @@ msgstr "alignment trop grand; %d assumé"
 msgid "negative alignment"
 msgstr "alignement négatif"
 
-#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1321 read.c:2371
+#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1324 read.c:2384
 msgid "alignment not a power of 2"
 msgstr "alignment n'est pas une puissance de 2"
 
@@ -13198,26 +13062,6 @@ msgstr "Le réadressage ne tient pas dans l'espace (valeur de réadressage = 0x%
 msgid "spu convert_frag\n"
 msgstr "spu convert_frag\n"
 
-#: config/tc-tic30.c:37
-msgid "first"
-msgstr "premier"
-
-#: config/tc-tic30.c:37
-msgid "second"
-msgstr "deuxième"
-
-#: config/tc-tic30.c:37
-msgid "third"
-msgstr "troisième"
-
-#: config/tc-tic30.c:37
-msgid "fourth"
-msgstr "quatrième"
-
-#: config/tc-tic30.c:37
-msgid "fifth"
-msgstr "cinquième"
-
 #: config/tc-tic30.c:483
 msgid "More than one AR register found in indirect reference"
 msgstr "Plus d'un registre AR trouvé dans une référence indirecte"
@@ -14136,52 +13980,62 @@ msgstr "tentative de marche arrière avec .space/.bes ? (%ld)"
 msgid "Invalid label '%s'"
 msgstr "Étiquette invalide « %s »"
 
-#: config/tc-tic6x.c:233
+#: config/tc-tic6x.c:192
 #, c-format
 msgid "unknown architecture '%s'"
 msgstr "architecture inconnue « %s »"
 
-#: config/tc-tic6x.c:263
+#: config/tc-tic6x.c:222
 #, c-format
 msgid "unknown -mpid= argument '%s'"
 msgstr "argument de -mpid= inconnu « %s »"
 
-#: config/tc-tic6x.c:321
+#: config/tc-tic6x.c:288
 #, c-format
 msgid "TMS320C6000 options:\n"
 msgstr "Options TMS320C6000:\n"
 
-#: config/tc-tic6x.c:322
+#: config/tc-tic6x.c:289
 #, c-format
 msgid "  -march=ARCH             enable instructions from architecture ARCH\n"
 msgstr "  -march=ARCH             activer les instructions de l'architecture ARCH\n"
 
-#: config/tc-tic6x.c:323
+#: config/tc-tic6x.c:290
+#, c-format
+msgid "  -matomic                enable atomic operation instructions\n"
+msgstr "  -matomic                activer les instructions d'opérations atomiques\n"
+
+#: config/tc-tic6x.c:291
+#, c-format
+msgid "  -mno-atomic             disable atomic operation instructions\n"
+msgstr "  -mno-atomic             désactiver les instructions d'opérations atomiques\n"
+
+#: config/tc-tic6x.c:292
 #, c-format
 msgid "  -mbig-endian            generate big-endian code\n"
 msgstr "  -mbig-endian            générer du code pour architectures à octets de poids fort\n"
 
-#: config/tc-tic6x.c:324
+#: config/tc-tic6x.c:293
 #, c-format
 msgid "  -mlittle-endian         generate little-endian code\n"
 msgstr "  -mlittle-endian         générer du code pour architectures à octets de poids faibles\n"
 
-#: config/tc-tic6x.c:325
+#: config/tc-tic6x.c:294
 #, c-format
 msgid "  -mdsbt                  code uses DSBT addressing\n"
 msgstr "  -mdsbt                  le code utilise l'adressage DSBT\n"
 
-#: config/tc-tic6x.c:326
+#: config/tc-tic6x.c:295
 #, c-format
 msgid "  -mno-dsbt               code does not use DSBT addressing\n"
 msgstr "  -mno-dsbt               le code n'utilise pas l'adressage DSBT\n"
 
-#: config/tc-tic6x.c:327
+#: config/tc-tic6x.c:296
 #, c-format
 msgid "  -mpid=no                code uses position-dependent data addressing\n"
 msgstr "  -mpid=no                le code utilise un adressage des données dépendant de la position\n"
 
-#: config/tc-tic6x.c:328
+#: config/tc-tic6x.c:297
 #, c-format
 msgid ""
 "  -mpid=near              code uses position-independent data addressing,\n"
@@ -14190,7 +14044,7 @@ msgstr ""
 "  -mpid=near              le code utilise un adressage des données indépendant de la position,\n"
 "                            les accès GOT utilisent l'adressage DP proche\n"
 
-#: config/tc-tic6x.c:330
+#: config/tc-tic6x.c:299
 #, c-format
 msgid ""
 "  -mpid=far               code uses position-independent data addressing,\n"
@@ -14199,423 +14053,319 @@ msgstr ""
 "  -mpid=far               le code utilise un adressage des données indépendant de la position,\n"
 "                            les accès GOT utilisent l'adressage DP lointain\n"
 
-#: config/tc-tic6x.c:332
+#: config/tc-tic6x.c:301
 #, c-format
 msgid "  -mpic                   code addressing is position-independent\n"
 msgstr "  -mpic                   l'adressage du code est indépendant de la position\n"
 
-#: config/tc-tic6x.c:333
+#: config/tc-tic6x.c:302
 #, c-format
 msgid "  -mno-pic                code addressing is position-dependent\n"
 msgstr "  -mno-pic                l'adressage du code est dépendant de la position\n"
 
-#: config/tc-tic6x.c:338
+#: config/tc-tic6x.c:307
 #, c-format
 msgid "Supported ARCH values are:"
 msgstr "Valeurs des ARCH supportées sont:"
 
-#: config/tc-tic6x.c:387
-msgid "unexpected .cantunwind directive"
-msgstr "directive .cantunwind inattendue"
-
-#: config/tc-tic6x.c:407
-msgid "unexpected .handlerdata directive"
-msgstr "directive .handlerdata inattendue"
-
-#: config/tc-tic6x.c:419
-msgid "personality routine required before .handlerdata directive"
-msgstr "routine de personnalité requise avant la directive .handlerdata"
-
-#: config/tc-tic6x.c:535
-msgid "expected symbol"
-msgstr "symbole attendu"
-
-#: config/tc-tic6x.c:592
-#, c-format
-msgid "invalid length for .scomm directive"
-msgstr "longueur invalide pour la directive .scomm"
-
-#: config/tc-tic6x.c:606
-msgid "alignment is not a positive number"
-msgstr "alignment n'est pas un nombre positif"
-
-#: config/tc-tic6x.c:618
-msgid "alignment is not a power of 2"
-msgstr "alignment n'est pas une puissance de 2"
-
-#: config/tc-tic6x.c:633
-#, c-format
-msgid "attempt to re-define symbol `%s'"
-msgstr "tentative de redéfinir le symbole « %s »"
-
-#: config/tc-tic6x.c:642
-#, c-format
-msgid "attempt to redefine `%s' with a different length"
-msgstr "tentative de redéfinir « %s » avec une longueur différente"
-
-#: config/tc-tic6x.c:844
+#: config/tc-tic6x.c:531
 msgid "multiple '||' on same line"
 msgstr "« || » multiples sur la même ligne"
 
-#: config/tc-tic6x.c:847
+#: config/tc-tic6x.c:534
 msgid "'||' after predicate"
 msgstr "« || » après le prédicat"
 
-#: config/tc-tic6x.c:891
+#: config/tc-tic6x.c:578
 msgid "multiple predicates on same line"
 msgstr "multiples prédicats sur la même ligne"
 
-#: config/tc-tic6x.c:897
+#: config/tc-tic6x.c:584
 #, c-format
 msgid "bad predicate '%s'"
 msgstr "mauvais prédicat « %s »"
 
-#: config/tc-tic6x.c:908
+#: config/tc-tic6x.c:595
 msgid "predication on A0 not supported on this architecture"
 msgstr "prédicat sur A0 n'est pas supporté sur cette architecture"
 
-#: config/tc-tic6x.c:941
+#: config/tc-tic6x.c:628
 msgid "label after '||'"
 msgstr "étiquette après « || »"
 
-#: config/tc-tic6x.c:947
+#: config/tc-tic6x.c:634
 msgid "label after predicate"
 msgstr "étiquette après le prédicat"
 
-#: config/tc-tic6x.c:971
+#: config/tc-tic6x.c:658
 msgid "'||' not followed by instruction"
 msgstr "« || » n'est pas suivi par une instruction"
 
-#: config/tc-tic6x.c:977
+#: config/tc-tic6x.c:664
 msgid "predicate not followed by instruction"
 msgstr "le prédicat n'est pas suivi d'une instruction."
 
-#: config/tc-tic6x.c:1410
+#: config/tc-tic6x.c:1097
 #, c-format
 msgid "control register '%s' not supported on this architecture"
 msgstr "registre de contrôle « %s » pas supporté sur cette architecture"
 
-#: config/tc-tic6x.c:1589 config/tc-tic6x.c:1592 config/tc-tic6x.c:1645
-#: config/tc-tic6x.c:1649
+#: config/tc-tic6x.c:1276 config/tc-tic6x.c:1279 config/tc-tic6x.c:1332
+#: config/tc-tic6x.c:1336
 #, c-format
 msgid "register number %u not supported on this architecture"
 msgstr "le registre numéro %u n'est pas supporté sur cette architecture"
 
-#: config/tc-tic6x.c:1620
+#: config/tc-tic6x.c:1307
 #, c-format
 msgid "register pair for operand %u of '%.*s' not a valid even/odd pair"
 msgstr "paire de registre pour l'opérande %u de « %.*s » n'est pas une paire pair/impair valide"
 
-#: config/tc-tic6x.c:1676
+#: config/tc-tic6x.c:1363
 #, c-format
 msgid "junk after operand %u of '%.*s'"
 msgstr "rebut après l'opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:1689
+#: config/tc-tic6x.c:1376
 #, c-format
 msgid "bad register or register pair for operand %u of '%.*s'"
 msgstr "mauvais registre ou paire de registres après l'opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:1695
+#: config/tc-tic6x.c:1382
 #, c-format
 msgid "bad register for operand %u of '%.*s'"
 msgstr "mauvais registre pour l'opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:1700
+#: config/tc-tic6x.c:1387
 #, c-format
 msgid "bad register pair for operand %u of '%.*s'"
 msgstr "mauvaise paire de registres pour l'opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:1705
+#: config/tc-tic6x.c:1392
 #, c-format
 msgid "bad functional unit for operand %u of '%.*s'"
 msgstr "mauvaise unité fonctionnelle pour l'opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:1710
+#: config/tc-tic6x.c:1397
 #, c-format
 msgid "bad operand %u of '%.*s'"
 msgstr "mauvais opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:1842
+#: config/tc-tic6x.c:1496
 msgid "$DSBT_INDEX must be used with __c6xabi_DSBT_BASE"
 msgstr "$DSBT_INDEX doit être utilisé avec __c6xabi_DSBT_BASE"
 
-#: config/tc-tic6x.c:1882
+#: config/tc-tic6x.c:1535
 msgid "$DSBT_INDEX not supported in this context"
 msgstr "$DSBT_INDEX n'est pas supporté dans ce contexte"
 
-#: config/tc-tic6x.c:1895
+#: config/tc-tic6x.c:1548
 msgid "$GOT not supported in this context"
 msgstr "$GOT n'est pas supporté dans ce contexte"
 
-#: config/tc-tic6x.c:1912
+#: config/tc-tic6x.c:1565
 msgid "$DPR_GOT not supported in this context"
 msgstr "$DPR_GOT n'est pas supporté dans ce contexte"
 
-#: config/tc-tic6x.c:1933
+#: config/tc-tic6x.c:1586
 msgid "$DPR_BYTE not supported in this context"
 msgstr "$DPR_BYTE n'est pas supporté dans ce contexte"
 
-#: config/tc-tic6x.c:1950
+#: config/tc-tic6x.c:1603
 msgid "$DPR_HWORD not supported in this context"
 msgstr "$DPR_HWORD n'est pas supporté dans ce contexte"
 
-#: config/tc-tic6x.c:1967
+#: config/tc-tic6x.c:1620
 msgid "$DPR_WORD not supported in this context"
 msgstr "$DPR_WORD n'est pas supporté dans ce contexte"
 
-#: config/tc-tic6x.c:1986
-msgid "$PCR_OFFSET not supported in this context"
-msgstr "$PCR_OFFSET n'est pas supporté dans ce contexte"
-
-#: config/tc-tic6x.c:1997
+#: config/tc-tic6x.c:1631
 msgid "invalid PC-relative operand"
 msgstr "opérande relatif au PC est invalide"
 
-#: config/tc-tic6x.c:2035
+#: config/tc-tic6x.c:1668
 #, c-format
 msgid "no %d-byte relocations available"
 msgstr "pas de réadressage sur %d octets"
 
-#: config/tc-tic6x.c:2522 config/tc-tic6x.c:2553 config/tc-tic6x.c:2571
-#: config/tc-tic6x.c:2977 config/tc-tic6x.c:2996 config/tc-tic6x.c:3028
+#: config/tc-tic6x.c:2146 config/tc-tic6x.c:2177 config/tc-tic6x.c:2195
+#: config/tc-tic6x.c:2601 config/tc-tic6x.c:2620 config/tc-tic6x.c:2652
 #, c-format
 msgid "operand %u of '%.*s' out of range"
 msgstr "l'opérande %u de « %.*s » est hors limite"
 
-#: config/tc-tic6x.c:2615 config/tc-tic6x.c:2816
+#: config/tc-tic6x.c:2239 config/tc-tic6x.c:2440
 #, c-format
 msgid "offset in operand %u of '%.*s' not divisible by %u"
 msgstr "l'offset dans l'opérande %u de « %.*s » n'est pas divisible par %u"
 
-#: config/tc-tic6x.c:2808 config/tc-tic6x.c:2841
+#: config/tc-tic6x.c:2432 config/tc-tic6x.c:2465
 #, c-format
 msgid "offset in operand %u of '%.*s' out of range"
 msgstr "l'offset dans l'opérande %u de « %.*s » est hors limite"
 
-#: config/tc-tic6x.c:2923
+#: config/tc-tic6x.c:2547
 #, c-format
 msgid "functional unit already masked for operand %u of '%.*s'"
 msgstr "l'unité fonctionelle est déjà masquée pour l'opérande %u de « %.*s »"
 
-#: config/tc-tic6x.c:2947 config/tc-tic6x.c:3706
+#: config/tc-tic6x.c:2571 config/tc-tic6x.c:3330
 #, c-format
 msgid "'%.*s' instruction not in a software pipelined loop"
 msgstr "« %.*s » instruction pas dans une boucle pipelinée par le logiciel"
 
-#: config/tc-tic6x.c:3046
+#: config/tc-tic6x.c:2670
 #, c-format
 msgid "instruction '%.*s' cannot be predicated"
 msgstr "instruction « %.*s » ne peut pas être transformée en prédicat"
 
-#: config/tc-tic6x.c:3175
+#: config/tc-tic6x.c:2799
 #, c-format
 msgid "unknown opcode '%s'"
 msgstr "opcode inconnu « %s »"
 
-#: config/tc-tic6x.c:3314
+#: config/tc-tic6x.c:2938
 #, c-format
 msgid "'%.*s' instruction not supported on this architecture"
 msgstr "« %.*s » instruction pas supportée sur cette architecture"
 
-#: config/tc-tic6x.c:3322
+#: config/tc-tic6x.c:2946
 #, c-format
 msgid "'%.*s' instruction not supported on this functional unit"
 msgstr "« %.*s » instruction pas supportée sur cette unité fonctionnelle"
 
-#: config/tc-tic6x.c:3330
+#: config/tc-tic6x.c:2954
 #, c-format
 msgid "'%.*s' instruction not supported on this functional unit for this architecture"
 msgstr "« %.*s » instruction pas supportée sur cette unité fonctionnelle pour cette architecture"
 
 # macro.c:559error setting flags for \".sbss\": %s"
-#: config/tc-tic6x.c:3350
+#: config/tc-tic6x.c:2974
 msgid "missing operand after comma"
 msgstr "opérande manquant après la virgule"
 
-#: config/tc-tic6x.c:3358 config/tc-tic6x.c:3376
+#: config/tc-tic6x.c:2982 config/tc-tic6x.c:3000
 #, c-format
 msgid "too many operands to '%.*s'"
 msgstr "trop d'opérandes à « %.*s »"
 
-#: config/tc-tic6x.c:3389
+#: config/tc-tic6x.c:3013
 #, c-format
 msgid "bad number of operands to '%.*s'"
 msgstr "mauvais nombre d'opérandes à « %.*s »"
 
-#: config/tc-tic6x.c:3461
+#: config/tc-tic6x.c:3085
 #, c-format
 msgid "operand %u of '%.*s' not constant"
 msgstr "opérande %u de « %.*s » n'est pas une constante"
 
-#: config/tc-tic6x.c:3466
+#: config/tc-tic6x.c:3090
 #, c-format
 msgid "operand %u of '%.*s' on wrong side"
 msgstr "opérande %u de « %.*s » du mauvais côté"
 
-#: config/tc-tic6x.c:3471
+#: config/tc-tic6x.c:3095
 #, c-format
 msgid "operand %u of '%.*s' not a valid return address register"
 msgstr "opérande %u de « %.*s » n'est pas valide comme registre d'adresse de retour"
 
-#: config/tc-tic6x.c:3477
+#: config/tc-tic6x.c:3101
 #, c-format
 msgid "operand %u of '%.*s' is write-only"
 msgstr "opérande %u de « %.*s » est en écriture seule"
 
-#: config/tc-tic6x.c:3482
+#: config/tc-tic6x.c:3106
 #, c-format
 msgid "operand %u of '%.*s' is read-only"
 msgstr "opérande %u de « %.*s » est en lecture seule"
 
-#: config/tc-tic6x.c:3487
+#: config/tc-tic6x.c:3111
 #, c-format
 msgid "operand %u of '%.*s' not a valid memory reference"
 msgstr "opérande %u de « %.*s » n'est pas une référence mémoire valide"
 
-#: config/tc-tic6x.c:3493
+#: config/tc-tic6x.c:3117
 #, c-format
 msgid "operand %u of '%.*s' not a valid base address register"
 msgstr "opérande %u de « %.*s » n'est pas un registre de base valide"
 
-#: config/tc-tic6x.c:3579
+#: config/tc-tic6x.c:3203
 #, c-format
 msgid "bad operand combination for '%.*s'"
 msgstr "mauvaise combinaison d'opérandes pour « %.*s »"
 
-#: config/tc-tic6x.c:3625
+#: config/tc-tic6x.c:3249
 msgid "parallel instruction not following another instruction"
 msgstr "l'instruction parallèle ne suit pas une autre instruction"
 
-#: config/tc-tic6x.c:3631
+#: config/tc-tic6x.c:3255
 msgid "too many instructions in execute packet"
 msgstr "trop d'instructions dans le paquet d'exécution"
 
-#: config/tc-tic6x.c:3636
+#: config/tc-tic6x.c:3260
 msgid "label not at start of execute packet"
 msgstr "étiquette pas au début du paquet d'exécution"
 
-#: config/tc-tic6x.c:3639
+#: config/tc-tic6x.c:3263
 #, c-format
 msgid "'%.*s' instruction not at start of execute packet"
 msgstr "« %.*s » instruction pas au début du paquet d'exécution"
 
-#: config/tc-tic6x.c:3687
+#: config/tc-tic6x.c:3311
 msgid "functional unit already used in this execute packet"
 msgstr "unité fonctionnelle déjà utilisée dans ce paquet d'exécution"
 
-#: config/tc-tic6x.c:3695
+#: config/tc-tic6x.c:3319
 msgid "nested software pipelined loop"
 msgstr "boucle pipelinée par le logiciel imbriquée"
 
-#: config/tc-tic6x.c:3714
+#: config/tc-tic6x.c:3338
 msgid "'||^' without previous SPMASK"
 msgstr "« ||^ » sans SPMASK précédent"
 
-#: config/tc-tic6x.c:3716
+#: config/tc-tic6x.c:3340
 msgid "cannot mask instruction using no functional unit"
 msgstr "une instruction qui n'utilise pas d'unité fonctionnelle ne peut pas être masquée"
 
-#: config/tc-tic6x.c:3728
+#: config/tc-tic6x.c:3352
 msgid "functional unit already masked"
 msgstr "unité fonctionnelle déjà masquée"
 
-#: config/tc-tic6x.c:3793
+#: config/tc-tic6x.c:3416
 msgid "value too large for 2-byte field"
 msgstr "valeur trop grande pour un champ de 2 octets"
 
-#: config/tc-tic6x.c:3803
+#: config/tc-tic6x.c:3426
 msgid "value too large for 1-byte field"
 msgstr "valeur trop grande pour un champ de 1 octet"
 
-#: config/tc-tic6x.c:3841 config/tc-tic6x.c:3906 config/tc-tic6x.c:3933
-#: config/tc-tic6x.c:3961
+#: config/tc-tic6x.c:3464 config/tc-tic6x.c:3516 config/tc-tic6x.c:3543
+#: config/tc-tic6x.c:3571
 msgid "immediate offset out of range"
 msgstr "offset immédiat est hors limite"
 
-#: config/tc-tic6x.c:3930
+#: config/tc-tic6x.c:3540
 msgid "immediate offset not 2-byte-aligned"
 msgstr "offset immédiat pas aligné sur 2 octets"
 
-#: config/tc-tic6x.c:3958
+#: config/tc-tic6x.c:3568
 msgid "immediate offset not 4-byte-aligned"
 msgstr "offset immédiat pas aligné sur 4 octets"
 
-#: config/tc-tic6x.c:3972
+#: config/tc-tic6x.c:3582
 msgid "addend used with $DSBT_INDEX"
 msgstr "addende utilisé sans $DSBT_INDEX"
 
-#: config/tc-tic6x.c:3986 config/tc-tic6x.c:4004 config/tc-tic6x.c:4022
-#: config/tc-tic6x.c:4040
+#: config/tc-tic6x.c:3596 config/tc-tic6x.c:3614 config/tc-tic6x.c:3632
+#: config/tc-tic6x.c:3650
 msgid "PC-relative offset not 4-byte-aligned"
 msgstr "offset relatif au PC n'est pas aligné sur 4 octets"
 
-#: config/tc-tic6x.c:3989 config/tc-tic6x.c:4007 config/tc-tic6x.c:4025
-#: config/tc-tic6x.c:4043
+#: config/tc-tic6x.c:3599 config/tc-tic6x.c:3617 config/tc-tic6x.c:3635
+#: config/tc-tic6x.c:3653
 msgid "PC-relative offset out of range"
 msgstr "saut relatif au PC hors limite"
 
-#: config/tc-tic6x.c:4522
-#, c-format
-msgid "undefined symbol %s in PCR relocation"
-msgstr "symbole « %s » indéfini dans le réadressage PCR"
-
-#: config/tc-tic6x.c:4640
-#, c-format
-msgid "group section `%s' has no group signature"
-msgstr "La section de groupe « %s » n'a pas de signature de groupe"
-
-#: config/tc-tic6x.c:4791
-msgid "missing .endp before .cfi_startproc"
-msgstr ".endp manquant avant .cfi_startproc"
-
-#: config/tc-tic6x.c:4895
-msgid "stack pointer offset too large for personality routine"
-msgstr "le décalage du pointeur de pile est trop grand pour la routine de personnalité"
-
-#: config/tc-tic6x.c:4902
-msgid "stack frame layout does not match personality routine"
-msgstr "la disposition de la trame de pile ne correspond pas à la routine de personnalité"
-
-#: config/tc-tic6x.c:5036
-msgid "too many unwinding instructions"
-msgstr "trop d'instructions unwind"
-
-#: config/tc-tic6x.c:5111 config/tc-tic6x.c:5124 config/tc-tic6x.c:5132
-#, c-format
-msgid "unable to generate unwinding opcode for reg %d"
-msgstr "impossible de produire l'opcode unwind pour le registre %d"
-
-#: config/tc-tic6x.c:5141
-msgid "unable to restore return address from previously restored reg"
-msgstr "impossible de rétablir l'adresse de retour à partir du registre précédemment rétabli"
-
-#: config/tc-tic6x.c:5153
-#, c-format
-msgid "unhandled CFA insn for unwinding (%d)"
-msgstr "instruction CFA non gérée pour le unwind (%d)"
-
-#: config/tc-tic6x.c:5163
-#, c-format
-msgid "unable to generate unwinding opcode for frame pointer reg %d"
-msgstr "impossible de produire l'opcode unwind pour le registre du pointeur de trame %d"
-
-#: config/tc-tic6x.c:5172
-msgid "unable to generate unwinding opcode for frame pointer offset"
-msgstr "impossible de produire l'opcode unwind pour le décalage du pointeur de trame"
-
-#: config/tc-tic6x.c:5181
-msgid "unwound stack pointer not doubleword aligned"
-msgstr "pointeur de pile déroulé n'est pas aligné sur un mot double"
-
-#: config/tc-tic6x.c:5326
-msgid "stack frame layout too complex for unwinder"
-msgstr "disposition de la trame de pile trop complexe pour le dérouleur"
-
-#: config/tc-tic6x.c:5343
-msgid "unwound frame has negative size"
-msgstr "la trame déroulée a une taille négative"
-
 #: config/tc-v850.c:286
 #, c-format
 msgid ".COMMon length (%d.) < 0! Ignored."
@@ -14672,7 +14422,7 @@ msgid "second register should follow dash in register list"
 msgstr "le second registre devrait suivre le tiret dans la liste de registres"
 
 #: config/tc-v850.c:1279
-msgid "second register should be greater than first register"
+msgid "second register should greater tahn first register"
 msgstr "le second registre devrait être plus grand que le premier registre"
 
 #: config/tc-v850.c:1327
@@ -15757,45 +15507,41 @@ msgstr "syntaxe de l'expression erronée"
 msgid "cannot make a relative jump to an absolute location"
 msgstr "impossible de faire un saut relatif vers une position absolue"
 
-#: config/tc-z80.c:695
-msgid "offset too large"
-msgstr "décalage d'adresse trop grand"
-
-#: config/tc-z80.c:697 config/tc-z80.c:1964
+#: config/tc-z80.c:697 config/tc-z80.c:1955
 msgid "overflow"
 msgstr "débordement"
 
-#: config/tc-z80.c:1069 config/tc-z80.c:1112 config/tc-z80.c:1156
-#: config/tc-z80.c:1276 config/tc-z80.c:1330 config/tc-z80.c:1599
+#: config/tc-z80.c:1065 config/tc-z80.c:1108 config/tc-z80.c:1152
+#: config/tc-z80.c:1272 config/tc-z80.c:1326 config/tc-z80.c:1595
 msgid "bad intruction syntax"
 msgstr "syntaxe de l'instruction erronée"
 
-#: config/tc-z80.c:1202
+#: config/tc-z80.c:1198
 msgid "condition code invalid for jr"
 msgstr "code de condition invalide pour jr"
 
-#: config/tc-z80.c:1224
+#: config/tc-z80.c:1220
 msgid "bad instruction syntax"
 msgstr "syntaxe de l'instruction erronée"
 
-#: config/tc-z80.c:1708
+#: config/tc-z80.c:1699
 msgid "parentheses ignored"
 msgstr "parenthèses ignorées"
 
-#: config/tc-z80.c:1913 read.c:3603
+#: config/tc-z80.c:1904 read.c:3617
 #, c-format
 msgid "junk at end of line, first unrecognized character is `%c'"
 msgstr "rebut à la fin de la ligne, premier caractère non reconnu est « %c »"
 
-#: config/tc-z80.c:1939 config/tc-z8k.c:1461 config/tc-z8k.c:1524
+#: config/tc-z80.c:1930 config/tc-z8k.c:1461 config/tc-z8k.c:1524
 msgid "relative jump out of range"
 msgstr "saut relatif hors limite"
 
-#: config/tc-z80.c:1956
+#: config/tc-z80.c:1947
 msgid "index offset  out of range"
 msgstr "offset d'index hors limite"
 
-#: config/tc-z80.c:1998 config/tc-z8k.c:1532
+#: config/tc-z80.c:1989 config/tc-z8k.c:1532
 #, c-format
 msgid "md_apply_fix: unknown r_type 0x%x\n"
 msgstr "md_apply_fix: r_type 0x%x inconnu\n"
@@ -16011,119 +15757,110 @@ msgstr "n'a pu analyser INSN_REPL « %s »"
 msgid "could not build transition for %s => %s"
 msgstr "n'a pu construire la transition de %s => %s"
 
-#: depend.c:195
+#: depend.c:194
 #, c-format
 msgid "can't open `%s' for writing"
 msgstr "ne peut ouvrir « %s » en écriture"
 
-#: depend.c:207
+#: depend.c:206
 #, c-format
 msgid "can't close `%s'"
 msgstr "ne peut fermer « %s »"
 
-#: dw2gencfi.c:199 read.c:2272
-#, c-format
-msgid "bfd_set_section_flags: %s"
-msgstr "bfd_set_section_flags: %s"
-
-#: dw2gencfi.c:457
+#: dw2gencfi.c:329
 #, c-format
 msgid "register save offset not a multiple of %u"
 msgstr "décalage de sauvegarde du registre n'est pas un multiple de %u"
 
-#: dw2gencfi.c:540
+#: dw2gencfi.c:412
 msgid "CFI state restore without previous remember"
 msgstr "récupération de l'état CFI sans mémorisation précédente"
 
-#: dw2gencfi.c:589
+#: dw2gencfi.c:469
 msgid "missing separator"
 msgstr "séparateur manquant"
 
-#: dw2gencfi.c:639
+#: dw2gencfi.c:519
 msgid "bad register expression"
 msgstr "mauvaise expression de registre"
 
-#: dw2gencfi.c:660 dw2gencfi.c:783 dw2gencfi.c:821 dw2gencfi.c:891
-#: dw2gencfi.c:963
+#: dw2gencfi.c:540 dw2gencfi.c:663 dw2gencfi.c:701 dw2gencfi.c:771
+#: dw2gencfi.c:843
 msgid "CFI instruction used without previous .cfi_startproc"
 msgstr "instruction CFI utilisée sans être précédé de .cfi_startproc"
 
-#: dw2gencfi.c:845
+#: dw2gencfi.c:725
 msgid "invalid or unsupported encoding in .cfi_personality"
 msgstr "encodage invalide ou non supporté dans .cfi_personality"
 
-#: dw2gencfi.c:852
+#: dw2gencfi.c:732
 msgid ".cfi_personality requires encoding and symbol arguments"
 msgstr ".cfi_personality exige des arguments d'encodage et de symbole"
 
-#: dw2gencfi.c:875
+#: dw2gencfi.c:755
 msgid "wrong second argument to .cfi_personality"
 msgstr "second argument erroné dans .cfi_personality"
 
-#: dw2gencfi.c:915 dw2gencfi.c:991
+#: dw2gencfi.c:795 dw2gencfi.c:871
 msgid "invalid or unsupported encoding in .cfi_lsda"
 msgstr "encodage invalide ou non supporté dans .cfi_lsda"
 
-#: dw2gencfi.c:922
+#: dw2gencfi.c:802
 msgid ".cfi_lsda requires encoding and symbol arguments"
 msgstr ".cfi_lsda exige des arguments d'encodage et de symbole"
 
-#: dw2gencfi.c:947
+#: dw2gencfi.c:827
 msgid "wrong second argument to .cfi_lsda"
 msgstr "second argument erroné dans .cfi_lsda"
 
-#: dw2gencfi.c:1012
+#: dw2gencfi.c:892
 msgid "wrong third argument to .cfi_val_encoded_addr"
 msgstr "troisième argument erroné dans .cfi_val_encoded_addr"
 
-#: dw2gencfi.c:1083
+#: dw2gencfi.c:957
 msgid "previous CFI entry not closed (missing .cfi_endproc)"
 msgstr "entrée CFI précédente n'est pas fermé (.cfi_endproc manquant)"
 
-#: dw2gencfi.c:1123
+#: dw2gencfi.c:992
 msgid ".cfi_endproc without corresponding .cfi_startproc"
 msgstr ".cfi_endproc sans directive correspondante .cfi_startproc"
 
-#: dw2gencfi.c:1920 dw2gencfi.c:1983
+#: dw2gencfi.c:1709 dw2gencfi.c:1746
 msgid "open CFI at the end of file; missing .cfi_endproc directive"
 msgstr "ouverture CFI à la fin du fichier; directive .cfi_endproc manquante"
 
-#: dw2gencfi.c:2009
-msgid "CFI is not supported for this target"
-msgstr "CFI n'est pas supporté pour cette cible"
-
-#: dwarf2dbg.c:552 dwarf2dbg.c:587
+#: dwarf2dbg.c:548 dwarf2dbg.c:583
 msgid "file number less than one"
 msgstr "le numéro du fichier est plus petit que un"
 
-#: dwarf2dbg.c:562
+#: dwarf2dbg.c:558
 #, c-format
 msgid "file number %ld already allocated"
 msgstr "numéro de fichier %ld est déjà alloué"
 
-#: dwarf2dbg.c:592 dwarf2dbg.c:1345
+#: dwarf2dbg.c:588 dwarf2dbg.c:1341
 #, c-format
 msgid "unassigned file number %ld"
 msgstr "numéro de fichier %ld non assigné"
 
-#: dwarf2dbg.c:661
+#: dwarf2dbg.c:657
 msgid "is_stmt value not 0 or 1"
 msgstr "valeur de is_stmt n'est pas 0 ou 1"
 
-#: dwarf2dbg.c:673
+#: dwarf2dbg.c:669
 msgid "isa number less than zero"
 msgstr "le numéro isa est plus petit que un"
 
-#: dwarf2dbg.c:685
+#: dwarf2dbg.c:681
 msgid "discriminator less than zero"
 msgstr "discrimateur plus petit que zéro"
 
-#: dwarf2dbg.c:691
+#: dwarf2dbg.c:687
 #, c-format
 msgid "unknown .loc sub-directive `%s'"
 msgstr "sous directive .loc inconnue « %s »"
 
-#: dwarf2dbg.c:1408
+#: dwarf2dbg.c:1404
 msgid "internal error: unknown dwarf2 format"
 msgstr "erreur interne: format DWARF2 inconnu"
 
@@ -16312,11 +16049,11 @@ msgstr ".end ou .bend manquant à la fin du fichier"
 msgid "GP prologue size exceeds field size, using 0 instead"
 msgstr "taille du prologue GP excède la taille du champ, utilise 0 à la place"
 
-#: expr.c:87 read.c:3668
+#: expr.c:87 read.c:3682
 msgid "bignum invalid"
 msgstr "grand nombre invalide"
 
-#: expr.c:89 read.c:3670 read.c:4147 read.c:5031
+#: expr.c:89 read.c:3684 read.c:4161 read.c:5045
 msgid "floating point number invalid"
 msgstr "nombre flottant invalide"
 
@@ -16354,58 +16091,58 @@ msgstr "constante de caractères trop grande"
 msgid "expr.c(operand): bad atof_generic return val %d"
 msgstr "expr.c(opérande): mauvaise valeur %d retournée par atof_generic"
 
-#: expr.c:966
+#: expr.c:969
 #, c-format
 msgid "missing '%c'"
 msgstr "« %c » manquant"
 
-#: expr.c:977 read.c:4513
+#: expr.c:980 read.c:4527
 msgid "EBCDIC constants are not supported"
 msgstr "Les constantes EBCDIC ne sont pas supportées."
 
-#: expr.c:1099
+#: expr.c:1102
 #, c-format
 msgid "Unary operator %c ignored because bad operand follows"
 msgstr "L'opérateur unaire %c est ignoré en raison d'opérandes erronés qui le suive"
 
-#: expr.c:1145 expr.c:1170
+#: expr.c:1148 expr.c:1173
 msgid "syntax error in .startof. or .sizeof."
 msgstr "erreur de syntaxe dans .startof. ou .sizeof."
 
-#: expr.c:1251 expr.c:1612
+#: expr.c:1254 expr.c:1608
 #, c-format
 msgid "invalid use of operator \"%s\""
 msgstr "utilisation invalide de l'opérateur « %s »"
 
-#: expr.c:1757
+#: expr.c:1753
 msgid "missing operand; zero assumed"
 msgstr "opérande manquant; zéro assumé"
 
-#: expr.c:1796
+#: expr.c:1792
 msgid "left operand is a bignum; integer 0 assumed"
 msgstr "opérande de gauche est un grand nombre; entier 0 assumé"
 
-#: expr.c:1798
+#: expr.c:1794
 msgid "left operand is a float; integer 0 assumed"
 msgstr "opérande de gauche est un nombre flottant; entier 0 assumé"
 
-#: expr.c:1807
+#: expr.c:1803
 msgid "right operand is a bignum; integer 0 assumed"
 msgstr "opérande de droite est un grand nombre; entier 0 assumé"
 
-#: expr.c:1809
+#: expr.c:1805
 msgid "right operand is a float; integer 0 assumed"
 msgstr "opérande de droite est un nombre flottant; entier 0 assumé"
 
-#: expr.c:1879 symbols.c:1379
+#: expr.c:1873 symbols.c:1358
 msgid "division by zero"
 msgstr "division par zéro"
 
-#: expr.c:1885
+#: expr.c:1879
 msgid "shift count"
 msgstr "nombre de décalages"
 
-#: expr.c:2002
+#: expr.c:1993
 msgid "operation combines symbols in different segments"
 msgstr "operation combine des symboles dans différents segments"
 
@@ -16417,7 +16154,7 @@ msgstr "tentative d'allouer des données dans une section absolue"
 msgid "attempt to allocate data in common section"
 msgstr "tentative d'allouer des données dans une section commune"
 
-#: frags.c:112 write.c:1379
+#: frags.c:112 write.c:1372
 #, c-format
 msgid "can't extend frag %u chars"
 msgstr "ne peut étendre la fragmentation de %u caractères"
@@ -16434,7 +16171,7 @@ msgstr "ne peut étendre la fragmentation de %u caractères"
 #. line here (assuming of course that we actually have a line of
 #. input to read), so that it can be displayed in the listing
 #. that is produced at the end of the assembly.
-#: input-file.c:138 input-scrub.c:243 listing.c:338
+#: input-file.c:138 input-scrub.c:243 listing.c:337
 msgid "{standard input}"
 msgstr "{entrée standard}"
 
@@ -16443,12 +16180,12 @@ msgstr "{entrée standard}"
 msgid "can't open %s for reading: %s"
 msgstr "ne peut ouvrir %s en lecture: %s"
 
-#: input-file.c:152 input-file.c:227 input-file.c:259
+#: input-file.c:152 input-file.c:215 input-file.c:241
 #, c-format
 msgid "can't read from %s: %s"
 msgstr "ne peut lire à partir de %s: %s"
 
-#: input-file.c:267 listing.c:1397 output-file.c:69
+#: input-file.c:249 listing.c:1396 output-file.c:69
 #, c-format
 msgid "can't close %s: %s"
 msgstr "ne peut fermer %s: %s"
@@ -16457,7 +16194,7 @@ msgstr "ne peut fermer %s: %s"
 msgid "macros nested too deeply"
 msgstr "macros imbriquées trop profondément"
 
-#: input-scrub.c:379 input-scrub.c:403
+#: input-scrub.c:377 input-scrub.c:401
 msgid "partial line at end of file ignored"
 msgstr "ligne partielle à la fin du fichier est ignorée"
 
@@ -16466,15 +16203,15 @@ msgstr "ligne partielle à la fin du fichier est ignorée"
 msgid "Unable to allocate memory for new instructions\n"
 msgstr "incapable d'allouer de la mémoire pour de nouvelles instructions\n"
 
-#: listing.c:244
+#: listing.c:243
 msgid "Warning:"
 msgstr "Avertissement:"
 
-#: listing.c:250
+#: listing.c:249
 msgid "Error:"
 msgstr "Erreur:"
 
-#: listing.c:1283
+#: listing.c:1282
 #, c-format
 msgid ""
 "\n"
@@ -16485,12 +16222,12 @@ msgstr ""
 " horodatage   \t: %s\n"
 "\n"
 
-#: listing.c:1293
+#: listing.c:1292
 #, c-format
 msgid "%s "
 msgstr "%s "
 
-#: listing.c:1298
+#: listing.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -16499,7 +16236,7 @@ msgstr ""
 "\n"
 "\t%s "
 
-#: listing.c:1308
+#: listing.c:1307
 msgid ""
 "\n"
 " options passed\t: "
@@ -16507,7 +16244,7 @@ msgstr ""
 "\n"
 " options passées\t: "
 
-#: listing.c:1347
+#: listing.c:1346
 #, c-format
 msgid ""
 " GNU assembler version %s (%s)\n"
@@ -16516,7 +16253,7 @@ msgstr ""
 " Version de l'assembleur GNU %s (%s)\n"
 "\t utilisant la version BFD %s."
 
-#: listing.c:1350
+#: listing.c:1349
 #, c-format
 msgid ""
 "\n"
@@ -16525,7 +16262,7 @@ msgstr ""
 "\n"
 " fichier d'entrée \t: %s"
 
-#: listing.c:1351
+#: listing.c:1350
 #, c-format
 msgid ""
 "\n"
@@ -16534,7 +16271,7 @@ msgstr ""
 "\n"
 " fichier de sortie\t: %s"
 
-#: listing.c:1352
+#: listing.c:1351
 #, c-format
 msgid ""
 "\n"
@@ -16543,16 +16280,16 @@ msgstr ""
 "\n"
 " cible         \t: %s"
 
-#: listing.c:1376
+#: listing.c:1375
 #, c-format
 msgid "can't open %s: %s"
 msgstr "ne peut ouvrir %s: %s"
 
-#: listing.c:1461
+#: listing.c:1460
 msgid "strange paper height, set to no form"
 msgstr "étrange hauteur de papier, initialisé sans format"
 
-#: listing.c:1525
+#: listing.c:1524
 msgid "new line in title"
 msgstr "saut de ligne dans le titre"
 
@@ -16562,102 +16299,102 @@ msgstr "saut de ligne dans le titre"
 msgid "% operator needs absolute expression"
 msgstr "opérateur % a besoin d'une expression absolue"
 
-#: macro.c:516
+#: macro.c:512
 #, c-format
 msgid "Missing parameter qualifier for `%s' in macro `%s'"
 msgstr "qualificateur de paramètre manquant pour « %s » dans la macro « %s »"
 
-#: macro.c:526
+#: macro.c:522
 #, c-format
 msgid "`%s' is not a valid parameter qualifier for `%s' in macro `%s'"
 msgstr "« %s » n'est pas un qualificateur de paramètre valable pour « %s » dans la macro « %s »"
 
-#: macro.c:543
+#: macro.c:539
 #, c-format
 msgid "Pointless default value for required parameter `%s' in macro `%s'"
 msgstr "Valeur par défaut inutile pour le paramètre requis « %s » dans la macro « %s »"
 
-#: macro.c:555
+#: macro.c:551
 #, c-format
 msgid "A parameter named `%s' already exists for macro `%s'"
 msgstr "Un paramètre nommé « %s » existe déjà pour la macro « %s »"
 
-#: macro.c:592
+#: macro.c:588
 #, c-format
 msgid "Reserved word `%s' used as parameter in macro `%s'"
 msgstr "Mot réservé « %s » utilisé comme paramètre dans la macro « %s »"
 
-#: macro.c:650
+#: macro.c:646
 #, c-format
 msgid "unexpected end of file in macro `%s' definition"
 msgstr "fin inattendue du fichier dans la définition de macro « %s »"
 
 # macro.c:559error setting flags for \".sbss\": %s"
-#: macro.c:662
+#: macro.c:658
 #, c-format
 msgid "missing `)' after formals in macro definition `%s'"
 msgstr "« ) » manquante après les paramètres formels dans la définition de la macro « %s »"
 
-#: macro.c:677
+#: macro.c:673
 msgid "Missing macro name"
 msgstr "Nom de macro manquant"
 
-#: macro.c:686
+#: macro.c:682
 #, c-format
 msgid "Bad parameter list for macro `%s'"
 msgstr "Mauvaise liste de paramètres pour la macro « %s »"
 
-#: macro.c:692
+#: macro.c:688
 #, c-format
 msgid "Macro `%s' was already defined"
 msgstr "Macro « %s » a déjà été définie"
 
-#: macro.c:816 macro.c:818
+#: macro.c:812 macro.c:814
 msgid "missing `)'"
 msgstr "« ) » manquante"
 
-#: macro.c:915
+#: macro.c:911
 #, c-format
 msgid "`%s' was already used as parameter (or another local) name"
 msgstr "« %s » a déjà été utilisé comme nom de paramètre (ou tout autre locale)"
 
-#: macro.c:1073
+#: macro.c:1069
 msgid "confusion in formal parameters"
 msgstr "confusion dans les paramètres formels"
 
-#: macro.c:1081
+#: macro.c:1077
 #, c-format
 msgid "Parameter named `%s' does not exist for macro `%s'"
 msgstr "Le paramètre nommé « %s » n'existe pas pour la macro « %s »"
 
-#: macro.c:1092
+#: macro.c:1088
 #, c-format
 msgid "Value for parameter `%s' of macro `%s' was already specified"
 msgstr "La valeur du paramètre « %s » de la macro « %s » a déjà été spécifiée"
 
-#: macro.c:1106
+#: macro.c:1102
 msgid "can't mix positional and keyword arguments"
 msgstr "ne peut mélanger des arguments positionnels et des mots clés"
 
-#: macro.c:1117
+#: macro.c:1113
 msgid "too many positional arguments"
 msgstr "trop d'arguments positionnels"
 
-#: macro.c:1165
+#: macro.c:1161
 #, c-format
 msgid "Missing value for required parameter `%s' of macro `%s'"
 msgstr "Valeur manquante pour le paramètre requis « %s » de la macro « %s »"
 
-#: macro.c:1284
+#: macro.c:1280
 #, c-format
 msgid "Attempt to purge non-existant macro `%s'"
 msgstr "Tentative de purger la macro inexistante « %s »"
 
-#: macro.c:1303
+#: macro.c:1299
 msgid "unexpected end of file in irp or irpc"
 msgstr "fin inattendue du fichier dans irp ou irpc"
 
-#: macro.c:1311
+#: macro.c:1307
 msgid "missing model parameter"
 msgstr "paramètre du modèle manquant"
 
@@ -16666,63 +16403,63 @@ msgstr "paramètre du modèle manquant"
 msgid "Assembler messages:\n"
 msgstr "Messages de l'assembleur:\n"
 
-#: messages.c:160
+#: messages.c:150
 #, c-format
 msgid "Warning: "
 msgstr "Avertissement: "
 
-#: messages.c:226
+#: messages.c:211
 #, c-format
 msgid "Error: "
 msgstr "Erreur: "
 
-#: messages.c:282
+#: messages.c:267
 #, c-format
 msgid "Fatal error: "
 msgstr "Erreur fatale: "
 
-#: messages.c:300
+#: messages.c:285
 #, c-format
 msgid "Internal error!\n"
 msgstr "Erreur interne!\n"
 
-#: messages.c:302
+#: messages.c:287
 #, c-format
 msgid "Assertion failure in %s at %s line %d.\n"
 msgstr "Échec d'assertion dans %s à %s ligne %d.\n"
 
-#: messages.c:305
+#: messages.c:290
 #, c-format
 msgid "Assertion failure at %s line %d.\n"
 msgstr "Échec d'assertion à %s ligne %d.\n"
 
-#: messages.c:306 messages.c:323
+#: messages.c:291 messages.c:308
 #, c-format
 msgid "Please report this bug.\n"
 msgstr "SVP rapporter cette anomalie.\n"
 
-#: messages.c:318
+#: messages.c:303
 #, c-format
 msgid "Internal error, aborting at %s line %d in %s\n"
 msgstr "Erreur interne, abandon à %s ligne %d dans %s\n"
 
-#: messages.c:321
+#: messages.c:306
 #, c-format
 msgid "Internal error, aborting at %s line %d\n"
 msgstr "Erreur interne, abandon à %s ligne %d\n"
 
-#: messages.c:370
+#: messages.c:355
 #, c-format
 msgid "%s out of domain (%d is not a multiple of %d)"
 msgstr "%s hors du domaine (%d n'est pas un multiple de %d)"
 
-#: messages.c:388
+#: messages.c:373
 #, c-format
 msgid "%s out of range (%d is not between %d and %d)"
 msgstr "%s hors limite (%d n'est pas entre %d et %d)"
 
 #. xgettext:c-format.
-#: messages.c:411
+#: messages.c:396
 #, c-format
 msgid "%s out of range (0x%s is not between 0x%s and 0x%s)"
 msgstr "%s hors limite (0x%s n'est pas entre 0x%s et 0x%s)"
@@ -16761,29 +16498,29 @@ msgstr "pseudo-op inconnu:  « %s »"
 msgid "label \"%d$\" redefined"
 msgstr "étiquette \"%d$\" redéfinie"
 
-#: read.c:1221
+#: read.c:1224
 msgid ".abort detected.  Abandoning ship."
 msgstr ".abort détecté.  Abandon."
 
-#: read.c:1239 read.c:2650
+#: read.c:1242 read.c:2661
 msgid "ignoring fill value in absolute section"
 msgstr "ignore la valeur de remplissage dans la section absolue"
 
-#: read.c:1330
+#: read.c:1333
 #, c-format
 msgid "alignment too large: %u assumed"
 msgstr "alignement trop grand: %u assumé"
 
-#: read.c:1362
+#: read.c:1365
 msgid "expected fill pattern missing"
 msgstr "le patron de remplissage attendu est manquant"
 
-#: read.c:1471
+#: read.c:1474
 #, c-format
 msgid "size (%ld) out of range, ignored"
 msgstr "taille (%ld) hors limite, ignoré"
 
-#: read.c:1500
+#: read.c:1503
 #, c-format
 msgid "size of \"%s\" is already %ld; not changing to %ld"
 msgstr "taille de « %s » est déjà %ld; n'a pas été changé en %ld"
@@ -16797,331 +16534,340 @@ msgstr "taille de « %s » est déjà %ld; n'a pas été changé en %ld"
 #. We do not want to barf on this, especially since such files are used
 #. in the GCC and GDB testsuites.  So we check for negative line numbers
 #. rather than non-positive line numbers.
-#: read.c:1742
+#: read.c:1755
 #, c-format
 msgid "line numbers must be positive; line number %d rejected"
 msgstr "numéros de lignes doivent être positifs; numéro de ligne %d rejeté"
 
-#: read.c:1779
+#: read.c:1792
 #, c-format
 msgid "incompatible flag %i in line directive"
 msgstr "fanion %i incompatible dans la directive de ligne"
 
-#: read.c:1791
+#: read.c:1804
 #, c-format
 msgid "unsupported flag %i in line directive"
 msgstr "fanion %i non supporté dans la directive de ligne"
 
-#: read.c:1830
+#: read.c:1843
 msgid "start address not supported"
 msgstr "adresse de départ non supportée"
 
-#: read.c:1839
+#: read.c:1852
 msgid ".err encountered"
 msgstr ".err rencontré"
 
-#: read.c:1855
+#: read.c:1868
 msgid ".error directive invoked in source file"
 msgstr "directive .error invoquée dans le fichier source"
 
-#: read.c:1856
+#: read.c:1869
 msgid ".warning directive invoked in source file"
 msgstr "directive .warning invoquée dans le fichier source"
 
-#: read.c:1862
+#: read.c:1875
 #, c-format
 msgid "%s argument must be a string"
 msgstr "%s l'argument doit être une chaîne de caractères"
 
-#: read.c:1894 read.c:1896
+#: read.c:1907 read.c:1909
 #, c-format
 msgid ".fail %ld encountered"
 msgstr ".fail %ld rencontré"
 
-#: read.c:1936
+#: read.c:1949
 #, c-format
 msgid ".fill size clamped to %d"
 msgstr "taille de .fill limitée à %d"
 
-#: read.c:1941
+#: read.c:1954
 msgid "size negative; .fill ignored"
 msgstr "taille négative; .fill ignoré"
 
-#: read.c:1947
+#: read.c:1960
 msgid "repeat < 0; .fill ignored"
 msgstr "compteur de répétition < 0; .fill ignoré"
 
-#: read.c:2103
+#: read.c:2116
 #, c-format
 msgid "Attribute name not recognised: %s"
 msgstr "Nom d'attribut pas reconnu: %s"
 
-#: read.c:2118
+#: read.c:2131
 msgid "expected numeric constant"
 msgstr "constante numérique attendue"
 
-#: read.c:2159
+#: read.c:2172
 msgid "bad string constant"
 msgstr "mauvaise constante en tant que chaîne de caractères"
 
-#: read.c:2163
+#: read.c:2176
 msgid "expected <tag> , <value>"
 msgstr "<étiquette> , <valeur> attendu"
 
-#: read.c:2238
+#: read.c:2251
 #, c-format
 msgid "unrecognized .linkonce type `%s'"
 msgstr "type .linkonce non reconnu « %s »"
 
-#: read.c:2250
+#: read.c:2263
 msgid ".linkonce is not supported for this object file format"
 msgstr ".linkonce n'est pas supporté pour ce format de fichier objet"
 
-#: read.c:2345
+#: read.c:2285
+#, c-format
+msgid "bfd_set_section_flags: %s"
+msgstr "bfd_set_section_flags: %s"
+
+#: read.c:2358
 msgid "expected alignment after size"
 msgstr "alignement attendu après la taille"
 
-#: read.c:2572
+#: read.c:2585
 #, c-format
 msgid "attempt to redefine pseudo-op `%s' ignored"
 msgstr "tentative de redéfinition du pseudo-op « %s » ignorée"
 
-#: read.c:2591
+#: read.c:2604
 msgid "ignoring macro exit outside a macro definition."
 msgstr "ignore la sortie de la macro en dehors d'une définition de macro."
 
-#: read.c:2645
+#: read.c:2656
 #, c-format
 msgid "invalid segment \"%s\""
 msgstr "segment invalide « %s »"
 
-#: read.c:2653
+#: read.c:2664
 msgid "only constant offsets supported in absolute section"
 msgstr "seul des constantes de décalage sont supportées dans une section absolue"
 
-#: read.c:2692
+#: read.c:2703
 msgid "MRI style ORG pseudo-op not supported"
 msgstr "pseudo-op MRI de style ORG n'est pas supporté"
 
-#: read.c:2845
+#: read.c:2856
 #, c-format
 msgid "unrecognized section type `%s'"
 msgstr "type de section non reconnu « %s »"
 
-#: read.c:2859
+#: read.c:2870
 msgid "absolute sections are not supported"
 msgstr "sections absolues ne sont pas supportées"
 
-#: read.c:2874
+#: read.c:2885
 #, c-format
 msgid "unrecognized section command `%s'"
 msgstr "commande de section n'est pas reconnue « %s »"
 
-#: read.c:2938
+#: read.c:2949
 #, c-format
-msgid ".end%c encountered without preceding %s"
+msgid ".end%c encountered without preceeding %s"
 msgstr ".end%c n'est pas précédé de %s"
 
-#: read.c:2968 read.c:2998
+#: read.c:2979 read.c:3009
 #, c-format
 msgid "%s without %s"
 msgstr "%s sans %s"
 
-#: read.c:3247
+#: read.c:3258
 msgid "unsupported variable size or fill value"
 msgstr "taille de variable ou valeur de remplissage non supportée"
 
-#: read.c:3275
+#: read.c:3286
 msgid ".space repeat count is zero, ignored"
 msgstr ".space compteur de répétition est zéro, ignoré"
 
-#: read.c:3277
+#: read.c:3288
 msgid ".space repeat count is negative, ignored"
 msgstr ".space compteur de répétition est négatif, ignoré"
 
-#: read.c:3306
+#: read.c:3317
 msgid "space allocation too complex in absolute section"
 msgstr "allocation d'espace trop complexe dans la section absolue"
 
-#: read.c:3312
+#: read.c:3323
 msgid "space allocation too complex in common section"
 msgstr "allocation d'espace trop complexe dans la section commune"
 
-#: read.c:3403 read.c:4759
+#: read.c:3414 read.c:4773
 #, c-format
 msgid "bad floating literal: %s"
 msgstr "littéral de virgule flottante erroné: %s"
 
-#: read.c:3560
+#: read.c:3574
 #, c-format
 msgid "%s: would close weakref loop: %s"
 msgstr "%s: fermerait la boucle weakref: %s"
 
-#: read.c:3606
+#: read.c:3620
 #, c-format
 msgid "junk at end of line, first unrecognized character valued 0x%x"
 msgstr "rebut à la fin de la ligne, premier caractère non reconnu évalué en 0x%x"
 
-#: read.c:3734
+#: read.c:3748
 #, c-format
 msgid "`%s' can't be equated to common symbol '%s'"
 msgstr "« %s » ne peut être rendu équivalent au symbole commun « %s »"
 
-#: read.c:3871
+#: read.c:3873
+msgid "unexpected `\"' in expression"
+msgstr "« \" »  inattendue dans l'expression"
+
+#: read.c:3885
 msgid "rva without symbol"
 msgstr "rva sans symbole"
 
-#: read.c:3928
+#: read.c:3942
 msgid "missing or bad offset expression"
 msgstr "expression d'offset manquante ou erronée"
 
-#: read.c:3949
+#: read.c:3963
 msgid "missing reloc type"
 msgstr "type de réadressage manquant"
 
-#: read.c:3961
+#: read.c:3975
 msgid "unrecognized reloc type"
 msgstr "type de réadressage non reconnu"
 
-#: read.c:3977
+#: read.c:3991
 msgid "bad reloc expression"
 msgstr "expression de réadressage erronée"
 
-#: read.c:4103
+#: read.c:4117
 msgid "attempt to store value in absolute section"
 msgstr "tentative de stockage d'une valeur dans une section absolue"
 
-#: read.c:4141 read.c:5025
+#: read.c:4155 read.c:5039
 msgid "zero assumed for missing expression"
 msgstr "zéro assumé pour l'expression manquante"
 
-#: read.c:4153 read.c:5037 write.c:266 write.c:987
+#: read.c:4167 read.c:5051 write.c:266 write.c:983
 msgid "register value used as expression"
 msgstr "valeur de registre utilisée comme expression"
 
-#: read.c:4233
+#: read.c:4247
 #, c-format
 msgid "value 0x%llx truncated to 0x%llx"
 msgstr "valeur 0x%llx tronquée à 0x%llx"
 
-#: read.c:4236
+#: read.c:4250
 msgid "value 0x%I64x truncated to 0x%I64x"
 msgstr "valeur 0x%I64x tronquée à 0x%I64x"
 
-#: read.c:4240
+#: read.c:4254
 #, c-format
 msgid "value 0x%lx truncated to 0x%lx"
 msgstr "valeur 0x%lx tronquée à 0x%lx"
 
-#: read.c:4267
+#: read.c:4281
 #, c-format
 msgid "bignum truncated to %d bytes"
 msgstr "grand nombre tronqué à %d octets"
 
-#: read.c:4586 read.c:4781
+#: read.c:4600 read.c:4795
 msgid "unresolvable or nonpositive repeat count; using 1"
 msgstr "compteur de répétition ne peut être résolu ou est non positif; utilise 1"
 
-#: read.c:4635
+#: read.c:4649
 #, c-format
 msgid "unknown floating type type '%c'"
 msgstr "type de virgule flottante inconnu « %c »"
 
-#: read.c:4657
+#: read.c:4671
 msgid "floating point constant too large"
 msgstr "constante en virgule flottante trop grande"
 
-#: read.c:5193
+#: read.c:5207
 msgid "strings must be placed into a section"
 msgstr "chaînes doivent être placées dans une section"
 
-#: read.c:5241
+#: read.c:5255
 msgid "expected <nn>"
 msgstr "<nn> attendu"
 
 #. To be compatible with BSD 4.2 as: give the luser a linefeed!!
-#: read.c:5274 read.c:5360
+#: read.c:5288 read.c:5374
 msgid "unterminated string; newline inserted"
 msgstr "chaîne non terminée; saut de ligne inséré"
 
-#: read.c:5368
+#: read.c:5382
 msgid "bad escaped character in string"
 msgstr "mauvais caractère d'échappement dans la chaîne"
 
-#: read.c:5393
+#: read.c:5407
 msgid "expected address expression"
 msgstr "expression d'adresse attendue"
 
-#: read.c:5412
+#: read.c:5426
 #, c-format
 msgid "symbol \"%s\" undefined; zero assumed"
 msgstr "symbole « %s » est indéfini; zéro assumé"
 
-#: read.c:5415
+#: read.c:5429
 msgid "some symbol undefined; zero assumed"
 msgstr "quelques symboles sont non définis; zéro assumé"
 
-#: read.c:5450
+#: read.c:5465
 msgid "this string may not contain '\\0'"
 msgstr "cette chaîne ne peut pas contenir « \\0 »"
 
-#: read.c:5486
+#: read.c:5501
 msgid "missing string"
 msgstr "chaîne manquante"
 
-#: read.c:5577
+#: read.c:5592
 #, c-format
 msgid ".incbin count zero, ignoring `%s'"
 msgstr ".incbin a un compte à zéro, « %s » est ignoré"
 
-#: read.c:5603
+#: read.c:5618
 #, c-format
 msgid "file not found: %s"
 msgstr "fichier non trouvé: %s"
 
-#: read.c:5617
+#: read.c:5632
 #, c-format
 msgid "seek to end of .incbin file failed `%s'"
 msgstr "recherche jusqu'à la fin de .incbin a échoué « %s »"
 
-#: read.c:5628
+#: read.c:5643
 #, c-format
 msgid "skip (%ld) or count (%ld) invalid for file size (%ld)"
 msgstr "escamotage (%ld) ou compte (%ld) invalide pour la taille du fichier (%ld)"
 
-#: read.c:5635
+#: read.c:5650
 #, c-format
 msgid "could not skip to %ld in file `%s'"
 msgstr "ne peut escamoter jusqu'à %ld dans le fichier « %s »"
 
-#: read.c:5644
+#: read.c:5659
 #, c-format
 msgid "truncated file `%s', %ld of %ld bytes read"
 msgstr "fichier « %s » tronqué, %ld de %ld octets lus"
 
-#: read.c:5803
+#: read.c:5818
 msgid "missing .func"
 msgstr ".func manquant"
 
-#: read.c:5820
+#: read.c:5835
 msgid ".endfunc missing for previous .func"
 msgstr ".endfunc manquant pour la déclaration .func précédente"
 
-#: read.c:5957
+#: read.c:5972
 #, c-format
 msgid "missing closing `%c'"
 msgstr "« %c » fermant manquant"
 
-#: read.c:5959
+#: read.c:5974
 msgid "stray `\\'"
 msgstr "« \\ » superflu"
 
-#: remap.c:53
+#: remap.c:52
 #, c-format
 msgid "invalid argument '%s' to -fdebug-prefix-map"
 msgstr "argument « %s » invalide pour -fdebug-prefix-map"
 
-#: stabs.c:215 stabs.c:223 stabs.c:231 stabs.c:250
+#: stabs.c:214 stabs.c:222 stabs.c:230 stabs.c:249
 #, c-format
 msgid ".stab%c: missing comma"
 msgstr ".stab%c: virgule manquante"
@@ -17129,90 +16875,100 @@ msgstr ".stab%c: virgule manquante"
 #. This could happen for example with a source file with a huge
 #. number of lines.  The only cure is to use a different debug
 #. format, probably DWARF.
-#: stabs.c:243
+#: stabs.c:242
 #, c-format
 msgid ".stab%c: description field '%x' too big, try a different debug format"
 msgstr ".stab%c: champ de description '%x' trop grand, essayez un format de débug différent"
 
-#: stabs.c:424
+#: stabs.c:423
 msgid "comma missing in .xstabs"
 msgstr "virgule manquante dans .xstabs"
 
-#: symbols.c:285
+#: symbols.c:288
 #, c-format
 msgid "cannot define symbol `%s' in absolute section"
 msgstr "ne peut définir le symbole « %s » dans la section absolue"
 
-#: symbols.c:415
+#: symbols.c:418
 #, c-format
 msgid "symbol `%s' is already defined as \"%s\"/%s%ld"
 msgstr "symbole « %s » est déjà défini comme « %s »/%s%ld"
 
-#: symbols.c:490 symbols.c:497
+#: symbols.c:496 symbols.c:503
 #, c-format
 msgid "inserting \"%s\" into symbol table failed: %s"
 msgstr "insertion de « %s » dans la table de symboles a échoué: %s"
 
-#: symbols.c:1008
+#: symbols.c:966 symbols.c:970
+#, c-format
+msgid "undefined symbol `%s' in operation"
+msgstr "symbole indéfini « %s » dans l'opération"
+
+#: symbols.c:977
+#, c-format
+msgid "invalid sections for operation on `%s' and `%s'"
+msgstr "sections invalides pour une opération sur « %s » et « %s »"
+
+#: symbols.c:981
 #, c-format
-msgid "invalid operands (%s and %s sections) for `%s'"
-msgstr "opérandes invalides (sections %s et %s) pour « %s »"
+msgid "invalid section for operation on `%s'"
+msgstr "section invalide pour une opération sur « %s »"
 
-#: symbols.c:1012
+#: symbols.c:989 symbols.c:992
 #, c-format
-msgid "invalid operand (%s section) for `%s'"
-msgstr "opérande invalide (section %s) pour « %s »"
+msgid "undefined symbol `%s' in operation setting `%s'"
+msgstr "symbole indéfini « %s » dans l'opération d'initialisation « %s »"
 
-#: symbols.c:1020
+#: symbols.c:998
 #, c-format
-msgid "invalid operands (%s and %s sections) for `%s' when setting `%s'"
-msgstr "opérandes invalides (sections %s et %s) pour « %s » en définissant « %s »"
+msgid "invalid sections for operation on `%s' and `%s' setting `%s'"
+msgstr "sections invalides pour une opération sur « %s » et « %s » initialisant « %s »"
 
-#: symbols.c:1023
+#: symbols.c:1001
 #, c-format
-msgid "invalid operand (%s section) for `%s' when setting `%s'"
-msgstr "opérande invalide (section %s) pour « %s » en définissant « %s »"
+msgid "invalid section for operation on `%s' setting `%s'"
+msgstr "section invalide pour une opération sur « %s » initialisant « %s »"
 
-#: symbols.c:1072
+#: symbols.c:1051
 #, c-format
 msgid "symbol definition loop encountered at `%s'"
 msgstr "boucle de définition de symbole rencontrée à « %s »"
 
-#: symbols.c:1099
+#: symbols.c:1078
 #, c-format
 msgid "cannot convert expression symbol %s to complex relocation"
 msgstr "ne peut convertir le symbole d'expression %s en réadressage complexe"
 
-#: symbols.c:1381
+#: symbols.c:1360
 #, c-format
 msgid "division by zero when setting `%s'"
 msgstr "division par zéro lors de l'initialisation de « %s »"
 
-#: symbols.c:1462 write.c:2048
+#: symbols.c:1441 write.c:2046
 #, c-format
 msgid "can't resolve value for symbol `%s'"
 msgstr "ne peut résoudre la valeur du symbole « %s »"
 
-#: symbols.c:1909
+#: symbols.c:1888
 #, c-format
 msgid "\"%d\" (instance number %d of a %s label)"
 msgstr "« %d » (instance d'un nombre %d d'une étiquette %s)"
 
-#: symbols.c:1938
+#: symbols.c:1917
 #, c-format
 msgid "attempt to get value of unresolved symbol `%s'"
 msgstr "tentative pour obtenir la valeur du symbole non résolu « %s »"
 
-#: symbols.c:2213
+#: symbols.c:2192
 msgid "section symbols are already global"
 msgstr "symboles de section sont déjà globaux"
 
-#: symbols.c:2326
+#: symbols.c:2305
 #, c-format
 msgid "Accessing function `%s' as thread-local object"
 msgstr "Accès à la fonction « %s » comme un objet thread local"
 
-#: symbols.c:2330
+#: symbols.c:2309
 #, c-format
 msgid "Accessing `%s' as thread-local object"
 msgstr "Accès à « %s » comme un objet de thread local"
@@ -17235,132 +16991,107 @@ msgstr "expression d'offset invalide"
 msgid "invalid reloc expression"
 msgstr "expression de réadressage invalide"
 
-#: write.c:1072
+#: write.c:1066
 #, c-format
 msgid "value of %s too large for field of %d bytes at %s"
 msgstr "valeur de %s est trop grande pour le champ de %d octets à %s"
 
-#: write.c:1084
+#: write.c:1078
 #, c-format
 msgid "signed .word overflow; switch may be too large; %ld at 0x%lx"
 msgstr "débordement de .word signé; commutation peut être trop grande; %ld à 0x%lx"
 
-#: write.c:1128
+#: write.c:1122
 msgid "redefined symbol cannot be used on reloc"
 msgstr "symbole redéfini ne peut être utilisé sur un réadressage"
 
-#: write.c:1141
+#: write.c:1135
 msgid "relocation out of range"
 msgstr "réadressage hors limite"
 
-#: write.c:1144
+#: write.c:1138
 #, c-format
 msgid "%s:%u: bad return from bfd_install_relocation: %x"
 msgstr "%s:%u: retour erroné de bfd_install_relocation: %x"
 
-#: write.c:1208
+#: write.c:1202
 msgid "internal error: fixup not contained within frag"
 msgstr "erreur interne: correctif non contenu à l'intérieur du fragment"
 
-#: write.c:1261
+#: write.c:1255
 msgid "reloc not within (fixed part of) section"
 msgstr "réadressage n'est pas dans une (partie corrigée de) section"
 
-#: write.c:1325 write.c:1455
+#: write.c:1319 write.c:1448
 msgid "can't extend frag"
 msgstr "ne peut étendre la fragmentation"
 
-#: write.c:1517 write.c:1538
+#: write.c:1510 write.c:1531
 #, c-format
 msgid "can't write %s: %s"
 msgstr "ne peut écrire %s: %s"
 
-#: write.c:1568
-#, c-format
-msgid "cannot write to output file '%s': %s"
-msgstr "ne peut écrire dans le fichier de sortie « %s »: %s"
+#: write.c:1561
+msgid "cannot write to output file"
+msgstr "ne peut écrire dans le fichier de sortie"
 
-#: write.c:1724
+#: write.c:1715
 #, c-format
 msgid "%d error%s, %d warning%s, generating bad object file"
 msgstr "%d erreurs%s, %d avertissements%s, génération d'un fichier objet erroné"
 
-#: write.c:1731
+#: write.c:1722
 #, c-format
 msgid "%d error%s, %d warning%s, no object file generated"
 msgstr "%d erreur%s, %d avertissement%s, pas de fichier objet généré"
 
-#: write.c:1963
+#: write.c:1961
 #, c-format
 msgid "%s: global symbols not supported in common sections"
 msgstr "%s: symboles globaux non supportés dans les sections communes"
 
-#: write.c:1977
+#: write.c:1975
 #, c-format
 msgid "local label `%s' is not defined"
 msgstr "étiquette locale « %s » n'est pas définie"
 
-#: write.c:1999
+#: write.c:1997
 #, c-format
 msgid "Local symbol `%s' can't be equated to common symbol `%s'"
 msgstr "Symbole local « %s » ne peut être rendu équivalent au symbole commun « %s »"
 
-#: write.c:2006
+#: write.c:2004
 #, c-format
 msgid "can't make global register symbol `%s'"
 msgstr "ne peut rendre global le symbol de registre « %s »"
 
-#: write.c:2299
+#: write.c:2297
 #, c-format
 msgid "alignment padding (%lu bytes) not a multiple of %ld"
 msgstr "remplissage pour alignement (%lu octets) n'est pas un multiple de %ld"
 
-#: write.c:2461
+#: write.c:2459
 #, c-format
 msgid ".word %s-%s+%s didn't fit"
 msgstr ".word %s-%s+%s n'avait pas la bonne taille"
 
-#: write.c:2555
+#: write.c:2553
 msgid "padding added"
 msgstr "bourrage ajouté"
 
-#: write.c:2605
+#: write.c:2603
 msgid "attempt to move .org backwards"
 msgstr "tentative de déplacement de .org vers l'arrière"
 
-#: write.c:2629
+#: write.c:2627
 msgid ".space specifies non-absolute value"
 msgstr ".space spécifie une valeur non absolue"
 
-#: write.c:2644
+#: write.c:2642
 msgid ".space or .fill with negative value, ignored"
 msgstr ".space ou .fill avec une valeur négative, ignoré"
 
-#: write.c:2715
+#: write.c:2713
 #, c-format
 msgid "Infinite loop encountered whilst attempting to compute the addresses of symbols in section %s"
 msgstr "Boucle infinie rencontrée lors du calcul des adresses des symboles de la section %s"
-
-#~ msgid ".size expression too complicated to fix up"
-#~ msgstr "expression .size trop compliquée pour tenter de la corriger"
-
-#~ msgid "Label expected"
-#~ msgstr "Étiquette attendue"
-
-#~ msgid "  -matomic                enable atomic operation instructions\n"
-#~ msgstr "  -matomic                activer les instructions d'opérations atomiques\n"
-
-#~ msgid "  -mno-atomic             disable atomic operation instructions\n"
-#~ msgstr "  -mno-atomic             désactiver les instructions d'opérations atomiques\n"
-
-#~ msgid "invalid sections for operation on `%s' and `%s'"
-#~ msgstr "sections invalides pour une opération sur « %s » et « %s »"
-
-#~ msgid "invalid section for operation on `%s'"
-#~ msgstr "section invalide pour une opération sur « %s »"
-
-#~ msgid "undefined symbol `%s' in operation setting `%s'"
-#~ msgstr "symbole indéfini « %s » dans l'opération d'initialisation « %s »"
-
-#~ msgid "invalid sections for operation on `%s' and `%s' setting `%s'"
-#~ msgstr "sections invalides pour une opération sur « %s » et « %s » initialisant « %s »"
diff --git a/gas/po/gas.pot b/gas/po/gas.pot
index f1eec3bd3d..50451b4481 100644
--- a/gas/po/gas.pot
+++ b/gas/po/gas.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-10-25 12:00+0100\n"
+"POT-Creation-Date: 2011-06-02 14:30+0100\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"
@@ -455,7 +455,7 @@ msgstr ""
 msgid "%s: data size %ld\n"
 msgstr ""
 
-#: as.c:1292
+#: as.c:1289
 #, c-format
 msgid "%d warnings, treating warnings as errors"
 msgstr ""
@@ -473,9 +473,9 @@ msgstr ""
 msgid "failed sanity check"
 msgstr ""
 
-#: cgen.c:113 config/tc-alpha.c:2101 config/tc-alpha.c:2125
+#: cgen.c:113 config/tc-alpha.c:2104 config/tc-alpha.c:2128
 #: config/tc-arc.c:1684 config/tc-d10v.c:552 config/tc-d30v.c:538
-#: config/tc-mn10200.c:1101 config/tc-mn10300.c:1751 config/tc-ppc.c:2617
+#: config/tc-mn10200.c:1100 config/tc-mn10300.c:1751 config/tc-ppc.c:2617
 #: config/tc-ppc.c:2768 config/tc-ppc.c:2910 config/tc-ppc.c:2921
 #: config/tc-s390.c:1250 config/tc-s390.c:1364 config/tc-s390.c:1493
 #: config/tc-v850.c:2229 config/tc-v850.c:2300 config/tc-v850.c:2346
@@ -484,7 +484,7 @@ msgid "too many fixups"
 msgstr ""
 
 #: cgen.c:400 cgen.c:420 config/tc-arc.c:1665 config/tc-d10v.c:463
-#: config/tc-d30v.c:454 config/tc-i370.c:2125 config/tc-mn10200.c:1043
+#: config/tc-d30v.c:454 config/tc-i370.c:2125 config/tc-mn10200.c:1042
 #: config/tc-mn10300.c:1676 config/tc-ppc.c:2656 config/tc-s390.c:1221
 #: config/tc-v850.c:2337 config/tc-v850.c:2371 config/tc-v850.c:2411
 #: config/tc-v850.c:2622 config/tc-z80.c:417
@@ -494,7 +494,7 @@ msgstr ""
 #: cgen.c:424 config/tc-arc.c:1667 config/tc-avr.c:632 config/tc-d10v.c:465
 #: config/tc-d30v.c:456 config/tc-h8300.c:500 config/tc-i370.c:2127
 #: config/tc-mcore.c:662 config/tc-microblaze.c:579 config/tc-mmix.c:488
-#: config/tc-mn10200.c:1046 config/tc-mn10300.c:1679 config/tc-msp430.c:452
+#: config/tc-mn10200.c:1045 config/tc-mn10300.c:1679 config/tc-msp430.c:452
 #: config/tc-or32.c:307 config/tc-ppc.c:2658 config/tc-s390.c:1239
 #: config/tc-sh.c:1387 config/tc-sh64.c:2213 config/tc-v850.c:2341
 #: config/tc-v850.c:2375 config/tc-v850.c:2415 config/tc-v850.c:2625
@@ -511,19 +511,18 @@ msgid "operand mask overflow"
 msgstr ""
 
 #. We can't actually support subtracting a symbol.
-#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1649 config/tc-arm.c:9195
-#: config/tc-arm.c:9247 config/tc-arm.c:9494 config/tc-arm.c:10301
-#: config/tc-arm.c:11396 config/tc-arm.c:11436 config/tc-arm.c:11776
-#: config/tc-arm.c:11815 config/tc-avr.c:1165 config/tc-cris.c:4047
-#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:5697
-#: config/tc-msp430.c:1936 config/tc-ppc.c:6072 config/tc-spu.c:957
-#: config/tc-spu.c:981 config/tc-tilegx.c:1421 config/tc-tilepro.c:1268
-#: config/tc-v850.c:3084 config/tc-xstormy16.c:483 config/tc-xtensa.c:5833
-#: config/tc-xtensa.c:11830
+#: cgen.c:886 config/tc-arc.c:1249 config/tc-arm.c:1645 config/tc-arm.c:9058
+#: config/tc-arm.c:9110 config/tc-arm.c:9357 config/tc-arm.c:10157
+#: config/tc-arm.c:11248 config/tc-arm.c:11288 config/tc-arm.c:11616
+#: config/tc-arm.c:11655 config/tc-avr.c:1165 config/tc-cris.c:4047
+#: config/tc-d10v.c:1511 config/tc-d30v.c:1915 config/tc-mips.c:4694
+#: config/tc-msp430.c:1936 config/tc-ppc.c:6102 config/tc-spu.c:957
+#: config/tc-spu.c:981 config/tc-v850.c:3084 config/tc-xstormy16.c:483
+#: config/tc-xtensa.c:5833 config/tc-xtensa.c:11830
 msgid "expression too complex"
 msgstr ""
 
-#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:6197 config/tc-s390.c:2135
+#: cgen.c:982 config/tc-arc.c:1310 config/tc-ppc.c:6227 config/tc-s390.c:2135
 #: config/tc-v850.c:3131 config/tc-xstormy16.c:537
 msgid "unresolved expression that must be resolved"
 msgstr ""
@@ -533,7 +532,7 @@ msgstr ""
 msgid "internal error: can't install fix for reloc type %d (`%s')"
 msgstr ""
 
-#: cgen.c:1060
+#: cgen.c:1037
 msgid "relocation is not supported"
 msgstr ""
 
@@ -613,7 +612,7 @@ msgstr ""
 msgid "Infinities are not supported by this target\n"
 msgstr ""
 
-#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1040
+#: config/atof-ieee.c:784 config/atof-vax.c:450 config/tc-arm.c:1036
 #: config/tc-ia64.c:11435 config/tc-tic30.c:1259 config/tc-tic4x.c:2598
 msgid "Unrecognized or unsupported floating point constant"
 msgstr ""
@@ -638,8 +637,8 @@ msgstr ""
 msgid "Inserting \"%s\" into structure table failed: %s"
 msgstr ""
 
-#: config/obj-coff.c:219 config/obj-coff.c:1701 config/obj-macho.c:202
-#: config/tc-ppc.c:5147 config/tc-tic54x.c:4008 read.c:2795
+#: config/obj-coff.c:219 config/obj-coff.c:1695 config/tc-ppc.c:5147
+#: config/tc-tic54x.c:4008 read.c:2795
 #, c-format
 msgid "error setting flags for \"%s\": %s"
 msgstr ""
@@ -733,22 +732,22 @@ msgstr ""
 #. STYP_INFO
 #. STYP_LIB
 #. STYP_OVER
-#: config/obj-coff.c:1667
+#: config/obj-coff.c:1661
 #, c-format
 msgid "unsupported section attribute '%c'"
 msgstr ""
 
-#: config/obj-coff.c:1671 config/tc-ppc.c:5129
+#: config/obj-coff.c:1665 config/tc-ppc.c:5129
 #, c-format
 msgid "unknown section attribute '%c'"
 msgstr ""
 
-#: config/obj-coff.c:1713 config/obj-macho.c:216
+#: config/obj-coff.c:1707
 #, c-format
 msgid "Ignoring changed section attributes for %s"
 msgstr ""
 
-#: config/obj-coff.c:1853
+#: config/obj-coff.c:1847
 #, c-format
 msgid "0x%lx: \"%s\" type = %ld, class = %d, segment = %d\n"
 msgstr ""
@@ -761,7 +760,7 @@ msgstr ""
 msgid "Can't set register masks"
 msgstr ""
 
-#: config/obj-elf.c:334 config/tc-sparc.c:4092 config/tc-v850.c:503
+#: config/obj-elf.c:334 config/tc-sparc.c:3949 config/tc-v850.c:503
 #, c-format
 msgid "bad .common segment %s"
 msgstr ""
@@ -816,173 +815,130 @@ msgstr ""
 msgid "missing name"
 msgstr ""
 
-#: config/obj-elf.c:1030
+#: config/obj-elf.c:1032
 msgid "invalid merge entity size"
 msgstr ""
 
-#: config/obj-elf.c:1037
+#: config/obj-elf.c:1039
 msgid "entity size for SHF_MERGE not specified"
 msgstr ""
 
-#: config/obj-elf.c:1043
+#: config/obj-elf.c:1045
 msgid "? section flag ignored with G present"
 msgstr ""
 
-#: config/obj-elf.c:1062
+#: config/obj-elf.c:1064
 msgid "group name for SHF_GROUP not specified"
 msgstr ""
 
-#: config/obj-elf.c:1085
+#: config/obj-elf.c:1087
 msgid "character following name is not '#'"
 msgstr ""
 
-#: config/obj-elf.c:1204
+#: config/obj-elf.c:1207
 msgid ".previous without corresponding .section; ignored"
 msgstr ""
 
-#: config/obj-elf.c:1230
+#: config/obj-elf.c:1233
 msgid ".popsection without corresponding .pushsection; ignored"
 msgstr ""
 
-#: config/obj-elf.c:1276
+#: config/obj-elf.c:1279
 msgid "expected comma after name in .symver"
 msgstr ""
 
-#: config/obj-elf.c:1300
+#: config/obj-elf.c:1303
 #, c-format
 msgid "missing version name in `%s' for symbol `%s'"
 msgstr ""
 
-#: config/obj-elf.c:1311
+#: config/obj-elf.c:1314
 #, c-format
 msgid "multiple versions [`%s'|`%s'] for symbol `%s'"
 msgstr ""
 
-#: config/obj-elf.c:1348
+#: config/obj-elf.c:1351
 #, c-format
 msgid "expected `%s' to have already been set for .vtable_inherit"
 msgstr ""
 
-#: config/obj-elf.c:1358
+#: config/obj-elf.c:1361
 msgid "expected comma after name in .vtable_inherit"
 msgstr ""
 
-#: config/obj-elf.c:1411
+#: config/obj-elf.c:1414
 msgid "expected comma after name in .vtable_entry"
 msgstr ""
 
-#: config/obj-elf.c:1534
+#: config/obj-elf.c:1537
 msgid "expected quoted string"
 msgstr ""
 
-#: config/obj-elf.c:1554
+#: config/obj-elf.c:1557
 #, c-format
 msgid "expected comma after name `%s' in .size directive"
 msgstr ""
 
-#: config/obj-elf.c:1563
+#: config/obj-elf.c:1566
 msgid "missing expression in .size directive"
 msgstr ""
 
-#: config/obj-elf.c:1687
+#: config/obj-elf.c:1690
 #, c-format
 msgid "symbol '%s' is already defined"
 msgstr ""
 
-#: config/obj-elf.c:1707 config/obj-elf.c:1719
+#: config/obj-elf.c:1710 config/obj-elf.c:1722
 #, c-format
 msgid "symbol type \"%s\" is supported only by GNU targets"
 msgstr ""
 
-#: config/obj-elf.c:1730
+#: config/obj-elf.c:1733
 #, c-format
 msgid "unrecognized symbol type \"%s\""
 msgstr ""
 
-#: config/obj-elf.c:1900 config/obj-elf.c:1903
+#: config/obj-elf.c:1903 config/obj-elf.c:1906
 #, c-format
 msgid ".size expression for %s does not evaluate to a constant"
 msgstr ""
 
-#: config/obj-elf.c:1935
+#: config/obj-elf.c:1938
 #, c-format
 msgid ""
 "invalid attempt to declare external version name as default in symbol `%s'"
 msgstr ""
 
-#: config/obj-elf.c:1996 ecoff.c:3608
+#: config/obj-elf.c:1999 ecoff.c:3608
 #, c-format
 msgid "symbol `%s' can not be both weak and common"
 msgstr ""
 
-#: config/obj-elf.c:2113
+#: config/obj-elf.c:2116
 #, c-format
 msgid "assuming all members of group `%s' are COMDAT"
 msgstr ""
 
-#: config/obj-elf.c:2125
+#: config/obj-elf.c:2128
 #, c-format
 msgid "can't create group: %s"
 msgstr ""
 
-#: config/obj-elf.c:2264
+#: config/obj-elf.c:2267
 #, c-format
 msgid "failed to set up debugging information: %s"
 msgstr ""
 
-#: config/obj-elf.c:2284
+#: config/obj-elf.c:2287
 #, c-format
 msgid "can't start writing .mdebug section: %s"
 msgstr ""
 
-#: config/obj-elf.c:2292
+#: config/obj-elf.c:2295
 #, c-format
 msgid "could not write .mdebug section: %s"
 msgstr ""
 
-#: config/obj-evax.c:129
-#, c-format
-msgid "no entry symbol for global function '%s'"
-msgstr ""
-
-#: config/obj-macho.c:77
-msgid "missing segment name"
-msgstr ""
-
-#: config/obj-macho.c:89
-msgid "missing comma after segment name"
-msgstr ""
-
-#: config/obj-macho.c:98
-msgid "missing section name"
-msgstr ""
-
-#: config/obj-macho.c:114
-msgid "missing section type name"
-msgstr ""
-
-#: config/obj-macho.c:124
-#, c-format
-msgid "unknown or invalid section type '%s'"
-msgstr ""
-
-#: config/obj-macho.c:140
-msgid "missing section attribute identifier"
-msgstr ""
-
-#: config/obj-macho.c:149
-#, c-format
-msgid "unknown or invalid section attribute '%s'"
-msgstr ""
-
-#: config/obj-macho.c:161
-msgid "unexpected sizeof_stub expression"
-msgstr ""
-
-#: config/obj-macho.c:166
-msgid "missing sizeof_stub expression"
-msgstr ""
-
 #: config/obj-som.c:58
 msgid "Only one .compiler pseudo-op per file!"
 msgstr ""
@@ -1022,248 +978,247 @@ msgstr ""
 msgid "attaching copyright header %s: %s"
 msgstr ""
 
-#: config/tc-alpha.c:655
+#: config/tc-alpha.c:656
 #, c-format
 msgid "No !literal!%ld was found"
 msgstr ""
 
-#: config/tc-alpha.c:662
+#: config/tc-alpha.c:663
 #, c-format
 msgid "No !tlsgd!%ld was found"
 msgstr ""
 
-#: config/tc-alpha.c:669
+#: config/tc-alpha.c:670
 #, c-format
 msgid "No !tlsldm!%ld was found"
 msgstr ""
 
-#: config/tc-alpha.c:678
+#: config/tc-alpha.c:679
 #, c-format
 msgid "No ldah !gpdisp!%ld was found"
 msgstr ""
 
-#: config/tc-alpha.c:728
+#: config/tc-alpha.c:729
 #, c-format
 msgid "too many !literal!%ld for %s"
 msgstr ""
 
-#: config/tc-alpha.c:758
+#: config/tc-alpha.c:759
 #, c-format
 msgid "No lda !gpdisp!%ld was found"
 msgstr ""
 
 #. Only support one relocation op per insn.
-#: config/tc-alpha.c:917
+#: config/tc-alpha.c:918
 msgid "More than one relocation op per insn"
 msgstr ""
 
-#: config/tc-alpha.c:933
+#: config/tc-alpha.c:934
 msgid "No relocation operand"
 msgstr ""
 
-#: config/tc-alpha.c:943
+#: config/tc-alpha.c:944
 #, c-format
 msgid "Unknown relocation operand: !%s"
 msgstr ""
 
-#: config/tc-alpha.c:953
+#: config/tc-alpha.c:954
 #, c-format
 msgid "no sequence number after !%s"
 msgstr ""
 
-#: config/tc-alpha.c:963
+#: config/tc-alpha.c:964
 #, c-format
 msgid "!%s does not use a sequence number"
 msgstr ""
 
-#: config/tc-alpha.c:973
+#: config/tc-alpha.c:974
 #, c-format
 msgid "Bad sequence number: !%s!%s"
 msgstr ""
 
-#: config/tc-alpha.c:1188 config/tc-alpha.c:3361
+#: config/tc-alpha.c:1189 config/tc-alpha.c:3364
 #, c-format
 msgid "inappropriate arguments for opcode `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:1190 config/tc-alpha.c:3363
+#: config/tc-alpha.c:1191 config/tc-alpha.c:3366
 #, c-format
 msgid "opcode `%s' not supported for target %s"
 msgstr ""
 
-#: config/tc-alpha.c:1194 config/tc-alpha.c:3367 config/tc-avr.c:1441
+#: config/tc-alpha.c:1195 config/tc-alpha.c:3370 config/tc-avr.c:1441
 #: config/tc-msp430.c:1828
 #, c-format
 msgid "unknown opcode `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:1275 config/tc-alpha.c:1534
+#: config/tc-alpha.c:1276 config/tc-alpha.c:1537
 msgid "overflow in literal (.lita) table"
 msgstr ""
 
-#: config/tc-alpha.c:1282 config/tc-alpha.c:1306 config/tc-alpha.c:1547
-#: config/tc-alpha.c:2234 config/tc-alpha.c:2279 config/tc-alpha.c:2348
-#: config/tc-alpha.c:2431 config/tc-alpha.c:2656 config/tc-alpha.c:2754
+#: config/tc-alpha.c:1283 config/tc-alpha.c:1307 config/tc-alpha.c:1550
+#: config/tc-alpha.c:2237 config/tc-alpha.c:2282 config/tc-alpha.c:2351
+#: config/tc-alpha.c:2434 config/tc-alpha.c:2659 config/tc-alpha.c:2757
 msgid "macro requires $at register while noat in effect"
 msgstr ""
 
-#: config/tc-alpha.c:1284 config/tc-alpha.c:1308 config/tc-alpha.c:1549
+#: config/tc-alpha.c:1285 config/tc-alpha.c:1309 config/tc-alpha.c:1552
 msgid "macro requires $at while $at in use"
 msgstr ""
 
-#: config/tc-alpha.c:1493
+#: config/tc-alpha.c:1495
 msgid "bignum invalid; zero assumed"
 msgstr ""
 
-#: config/tc-alpha.c:1495
+#: config/tc-alpha.c:1497
 msgid "floating point number invalid; zero assumed"
 msgstr ""
 
-#: config/tc-alpha.c:1500
+#: config/tc-alpha.c:1502
 msgid "can't handle expression"
 msgstr ""
 
-#: config/tc-alpha.c:1540
+#: config/tc-alpha.c:1543
 msgid "overflow in literal (.lit8) table"
 msgstr ""
 
-#: config/tc-alpha.c:1837
+#: config/tc-alpha.c:1840
 #, c-format
 msgid "too many ldah insns for !gpdisp!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1839 config/tc-alpha.c:1851
+#: config/tc-alpha.c:1842 config/tc-alpha.c:1854
 #, c-format
 msgid "both insns for !gpdisp!%ld must be in the same section"
 msgstr ""
 
-#: config/tc-alpha.c:1849
+#: config/tc-alpha.c:1852
 #, c-format
 msgid "too many lda insns for !gpdisp!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1905
+#: config/tc-alpha.c:1908
 #, c-format
 msgid "too many lituse insns for !lituse_tlsgd!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1908
+#: config/tc-alpha.c:1911
 #, c-format
 msgid "too many lituse insns for !lituse_tlsldm!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1925
+#: config/tc-alpha.c:1928
 #, c-format
 msgid "duplicate !tlsgd!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1927
+#: config/tc-alpha.c:1930
 #, c-format
 msgid "sequence number in use for !tlsldm!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1941
+#: config/tc-alpha.c:1944
 #, c-format
 msgid "duplicate !tlsldm!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1943
+#: config/tc-alpha.c:1946
 #, c-format
 msgid "sequence number in use for !tlsgd!%ld"
 msgstr ""
 
-#: config/tc-alpha.c:1998 config/tc-arc.c:292 config/tc-mn10200.c:857
+#: config/tc-alpha.c:2001 config/tc-arc.c:292 config/tc-mn10200.c:856
 #: config/tc-mn10300.c:1148 config/tc-ppc.c:1730 config/tc-s390.c:638
-#: config/tc-tilegx.c:408 config/tc-tilegx.c:471 config/tc-tilepro.c:369
 msgid "operand"
 msgstr ""
 
-#: config/tc-alpha.c:2137
+#: config/tc-alpha.c:2140
 msgid "invalid relocation for instruction"
 msgstr ""
 
-#: config/tc-alpha.c:2151
+#: config/tc-alpha.c:2154
 msgid "invalid relocation for field"
 msgstr ""
 
-#: config/tc-alpha.c:2982
+#: config/tc-alpha.c:2985
 msgid "can not resolve expression"
 msgstr ""
 
-#: config/tc-alpha.c:3516 config/tc-i370.c:1055 config/tc-microblaze.c:185
+#: config/tc-alpha.c:3524 config/tc-i370.c:1055 config/tc-microblaze.c:185
 #: config/tc-ppc.c:2055 config/tc-ppc.c:4892
 #, c-format
 msgid ".COMMon length (%ld.) <0! Ignored."
 msgstr ""
 
-#: config/tc-alpha.c:3527 config/tc-sparc.c:3963 config/tc-v850.c:298
+#: config/tc-alpha.c:3535 config/tc-sparc.c:3820 config/tc-v850.c:298
 msgid "Ignoring attempt to re-define symbol"
 msgstr ""
 
-#: config/tc-alpha.c:3619 config/tc-ppc.c:4929 config/tc-sparc.c:3971
+#: config/tc-alpha.c:3627 config/tc-ppc.c:4929 config/tc-sparc.c:3828
 #, c-format
 msgid "Length of .comm \"%s\" is already %ld. Not changed to %ld."
 msgstr ""
 
-#: config/tc-alpha.c:3722 ecoff.c:3064
+#: config/tc-alpha.c:3730 ecoff.c:3064
 msgid ".ent directive has no name"
 msgstr ""
 
-#: config/tc-alpha.c:3730
+#: config/tc-alpha.c:3738
 msgid "nested .ent directives"
 msgstr ""
 
-#: config/tc-alpha.c:3775 ecoff.c:3015
+#: config/tc-alpha.c:3783 ecoff.c:3015
 msgid ".end directive has no name"
 msgstr ""
 
-#: config/tc-alpha.c:3784
+#: config/tc-alpha.c:3792
 msgid ".end directive without matching .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3786
+#: config/tc-alpha.c:3794
 msgid ".end directive names different symbol than .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3829 ecoff.c:3150
+#: config/tc-alpha.c:3837 ecoff.c:3150
 msgid ".fmask outside of .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3831 config/tc-score.c:5598 ecoff.c:3214
+#: config/tc-alpha.c:3839 config/tc-score.c:5601 ecoff.c:3214
 msgid ".mask outside of .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3839 ecoff.c:3157
+#: config/tc-alpha.c:3847 ecoff.c:3157
 msgid "bad .fmask directive"
 msgstr ""
 
-#: config/tc-alpha.c:3841 ecoff.c:3221
+#: config/tc-alpha.c:3849 ecoff.c:3221
 msgid "bad .mask directive"
 msgstr ""
 
-#: config/tc-alpha.c:3874 config/tc-mips.c:18816 config/tc-score.c:5740
+#: config/tc-alpha.c:3882 config/tc-mips.c:15469 config/tc-score.c:5743
 #: ecoff.c:3178
 msgid ".frame outside of .ent"
 msgstr ""
 
-#: config/tc-alpha.c:3885 ecoff.c:3189
+#: config/tc-alpha.c:3893 ecoff.c:3189
 msgid "bad .frame directive"
 msgstr ""
 
-#: config/tc-alpha.c:3919
+#: config/tc-alpha.c:3927
 msgid ".prologue directive without a preceding .ent directive"
 msgstr ""
 
-#: config/tc-alpha.c:3937
+#: config/tc-alpha.c:3945
 #, c-format
 msgid "Invalid argument %d to .prologue."
 msgstr ""
 
-#: config/tc-alpha.c:4028
+#: config/tc-alpha.c:4036
 msgid "ECOFF debugging is disabled."
 msgstr ""
 
-#: config/tc-alpha.c:4042
+#: config/tc-alpha.c:4050
 msgid ".ent directive without matching .end"
 msgstr ""
 
@@ -1284,134 +1239,126 @@ msgstr ""
 msgid "unknown section attribute %s"
 msgstr ""
 
-#: config/tc-alpha.c:4370
-msgid "previous .ent not closed by a .end"
-msgstr ""
-
-#: config/tc-alpha.c:4391
+#: config/tc-alpha.c:4389
 msgid ".ent directive has no symbol"
 msgstr ""
 
-#: config/tc-alpha.c:4416
+#: config/tc-alpha.c:4418
 msgid ".handler directive has no name"
 msgstr ""
 
-#: config/tc-alpha.c:4445
+#: config/tc-alpha.c:4447
 msgid "Bad .frame directive 1./2. param"
 msgstr ""
 
-#: config/tc-alpha.c:4457
+#: config/tc-alpha.c:4459
 msgid "Bad .frame directive 3./4. param"
 msgstr ""
 
-#: config/tc-alpha.c:4494
+#: config/tc-alpha.c:4497
 msgid ".pdesc directive not in link (.link) section"
 msgstr ""
 
-#: config/tc-alpha.c:4501
+#: config/tc-alpha.c:4505
 msgid ".pdesc directive has no entry symbol"
 msgstr ""
 
-#: config/tc-alpha.c:4512
-msgid ".pdesc has a bad entry symbol"
-msgstr ""
-
 #: config/tc-alpha.c:4523
-msgid ".pdesc doesn't match with last .ent"
+msgid ".pdesc has no matching .ent"
 msgstr ""
 
-#: config/tc-alpha.c:4538
+#: config/tc-alpha.c:4541
 msgid "No comma after .pdesc <entryname>"
 msgstr ""
 
-#: config/tc-alpha.c:4558
+#: config/tc-alpha.c:4561
 msgid "unknown procedure kind"
 msgstr ""
 
-#: config/tc-alpha.c:4653
+#: config/tc-alpha.c:4673
 msgid ".name directive not in link (.link) section"
 msgstr ""
 
-#: config/tc-alpha.c:4661
+#: config/tc-alpha.c:4681
 msgid ".name directive has no symbol"
 msgstr ""
 
-#: config/tc-alpha.c:4695
+#: config/tc-alpha.c:4716
 msgid "No symbol after .linkage"
 msgstr ""
 
-#: config/tc-alpha.c:4743
+#: config/tc-alpha.c:4769
 msgid "No symbol after .code_address"
 msgstr ""
 
-#: config/tc-alpha.c:4769 config/tc-score.c:5604
+#: config/tc-alpha.c:4796 config/tc-score.c:5607
 msgid "Bad .mask directive"
 msgstr ""
 
-#: config/tc-alpha.c:4787
+#: config/tc-alpha.c:4814
 msgid "Bad .fmask directive"
 msgstr ""
 
-#: config/tc-alpha.c:4944
+#: config/tc-alpha.c:4971
 #, c-format
 msgid "Expected comma after name \"%s\""
 msgstr ""
 
-#: config/tc-alpha.c:4956
+#: config/tc-alpha.c:4983
 #, c-format
 msgid "unhandled: .proc %s,%d"
 msgstr ""
 
-#: config/tc-alpha.c:4990
+#: config/tc-alpha.c:5017
 #, c-format
 msgid "Tried to .set unrecognized mode `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:5016
+#: config/tc-alpha.c:5043
 #, c-format
 msgid "Bad base register, using $%d."
 msgstr ""
 
-#: config/tc-alpha.c:5037
+#: config/tc-alpha.c:5064
 #, c-format
 msgid "Alignment too large: %d. assumed"
 msgstr ""
 
-#: config/tc-alpha.c:5041 config/tc-d30v.c:2060
+#: config/tc-alpha.c:5068 config/tc-d30v.c:2060
 msgid "Alignment negative: 0 assumed"
 msgstr ""
 
-#: config/tc-alpha.c:5136 config/tc-alpha.c:5628
+#: config/tc-alpha.c:5163 config/tc-alpha.c:5656
 #, c-format
 msgid "Unknown CPU identifier `%s'"
 msgstr ""
 
-#: config/tc-alpha.c:5327
+#: config/tc-alpha.c:5354
 #, c-format
 msgid "Chose GP value of %lx\n"
 msgstr ""
 
-#: config/tc-alpha.c:5341
+#: config/tc-alpha.c:5368
 msgid "bad .section directive: want a,s,w,x,M,S,G,T in string"
 msgstr ""
 
-#: config/tc-alpha.c:5430
+#: config/tc-alpha.c:5457
 #, c-format
 msgid "internal error: can't hash opcode `%s': %s"
 msgstr ""
 
-#: config/tc-alpha.c:5466
+#: config/tc-alpha.c:5493
 #, c-format
 msgid "internal error: can't hash macro `%s': %s"
 msgstr ""
 
-#: config/tc-alpha.c:5550 config/tc-arm.c:6818 config/tc-arm.c:6830
+#: config/tc-alpha.c:5578 config/tc-arm.c:6746 config/tc-arm.c:6758
 #: config/tc-i960.c:708 config/tc-xtensa.c:5315 config/tc-xtensa.c:5393
 #: config/tc-xtensa.c:5510 config/tc-z80.c:1897
 msgid "syntax error"
 msgstr ""
 
-#: config/tc-alpha.c:5679
+#: config/tc-alpha.c:5707
 msgid ""
 "Alpha options:\n"
 "-32addr\t\t\ttreat addresses as 32-bit values\n"
@@ -1423,7 +1370,7 @@ msgid ""
 "\t\t\tthese variants include PALcode opcodes\n"
 msgstr ""
 
-#: config/tc-alpha.c:5689
+#: config/tc-alpha.c:5717
 msgid ""
 "VMS options:\n"
 "-+\t\t\tencode (don't truncate) names longer than 64 characters\n"
@@ -1431,42 +1378,40 @@ msgid ""
 "-replace/-noreplace\tenable or disable the optimization of procedure calls\n"
 msgstr ""
 
-#: config/tc-alpha.c:5940
+#: config/tc-alpha.c:5968
 #, c-format
 msgid "unhandled relocation type %s"
 msgstr ""
 
-#: config/tc-alpha.c:5953
+#: config/tc-alpha.c:5981
 msgid "non-absolute expression in constant field"
 msgstr ""
 
-#: config/tc-alpha.c:5967
+#: config/tc-alpha.c:5995
 #, c-format
 msgid "type %d reloc done?\n"
 msgstr ""
 
-#: config/tc-alpha.c:6014 config/tc-alpha.c:6021 config/tc-mips.c:11711
-#: config/tc-mips.c:12396
+#: config/tc-alpha.c:6042 config/tc-alpha.c:6049 config/tc-mips.c:9793
 msgid "Used $at without \".set noat\""
 msgstr ""
 
-#: config/tc-alpha.c:6190
+#: config/tc-alpha.c:6218
 #, c-format
 msgid "!samegp reloc against symbol without .prologue: %s"
 msgstr ""
 
-#: config/tc-alpha.c:6234 config/tc-tilegx.c:1700 config/tc-tilepro.c:1499
-#: config/tc-xtensa.c:5999
+#: config/tc-alpha.c:6262 config/tc-xtensa.c:5999
 #, c-format
 msgid "cannot represent `%s' relocation in object file"
 msgstr ""
 
-#: config/tc-alpha.c:6240
+#: config/tc-alpha.c:6268
 #, c-format
 msgid "internal error? cannot generate `%s' relocation"
 msgstr ""
 
-#: config/tc-alpha.c:6339
+#: config/tc-alpha.c:6364
 #, c-format
 msgid "frame reg expected, using $%d."
 msgstr ""
@@ -1482,8 +1427,8 @@ msgstr ""
 msgid "could not set architecture and machine"
 msgstr ""
 
-#: config/tc-arc.c:212 config/tc-arm.c:22402 config/tc-score.c:6299
-#: config/tc-score.c:6528 config/tc-score.c:6533
+#: config/tc-arc.c:212 config/tc-arm.c:22240 config/tc-score.c:6303
+#: config/tc-score.c:6532 config/tc-score.c:6537
 msgid "virtual memory exhausted"
 msgstr ""
 
@@ -1624,7 +1569,7 @@ msgid "missing ')' in %%-op"
 msgstr ""
 
 #: config/tc-arc.c:1364 config/tc-dlx.c:1201 config/tc-i960.c:2639
-#: config/tc-m32r.c:2281 config/tc-sparc.c:3651
+#: config/tc-m32r.c:2281 config/tc-sparc.c:3508
 #, c-format
 msgid "internal error: can't export reloc type %d (`%s')"
 msgstr ""
@@ -1643,7 +1588,7 @@ msgid "symbol as destination register"
 msgstr ""
 
 #. xgettext:c-format.
-#: config/tc-arc.c:1759 config/tc-i370.c:2207 config/tc-mn10200.c:1142
+#: config/tc-arc.c:1759 config/tc-i370.c:2207 config/tc-mn10200.c:1141
 #: config/tc-mn10300.c:1820 config/tc-ppc.c:2970 config/tc-s390.c:1506
 #: config/tc-v850.c:2699
 #, c-format
@@ -1663,7 +1608,7 @@ msgstr ""
 msgid "conditional branch follows set of flags"
 msgstr ""
 
-#: config/tc-arc.c:1893 config/tc-arm.c:16330
+#: config/tc-arc.c:1893 config/tc-arm.c:16170
 #, c-format
 msgid "bad instruction `%s'"
 msgstr ""
@@ -1740,7 +1685,7 @@ msgstr ""
 msgid "iWMMXt data register expected"
 msgstr ""
 
-#: config/tc-arm.c:557 config/tc-arm.c:6597
+#: config/tc-arm.c:557 config/tc-arm.c:6525
 msgid "iWMMXt control register expected"
 msgstr ""
 
@@ -1821,1841 +1766,1809 @@ msgstr ""
 msgid "cannot use writeback with PC-relative addressing"
 msgstr ""
 
-#: config/tc-arm.c:727
-msgid "branch out of range"
-msgstr ""
-
-#: config/tc-arm.c:921
+#: config/tc-arm.c:917
 msgid "immediate expression requires a # prefix"
 msgstr ""
 
-#: config/tc-arm.c:949 read.c:3663
+#: config/tc-arm.c:945 read.c:3664
 msgid "missing expression"
 msgstr ""
 
-#: config/tc-arm.c:949 config/tc-score.c:6515 expr.c:1357 read.c:2456
+#: config/tc-arm.c:945 config/tc-score.c:6519 expr.c:1357 read.c:2456
 msgid "bad expression"
 msgstr ""
 
-#: config/tc-arm.c:960 config/tc-i860.c:1004 config/tc-sparc.c:3023
+#: config/tc-arm.c:956 config/tc-i860.c:1004 config/tc-sparc.c:2880
 msgid "bad segment"
 msgstr ""
 
-#: config/tc-arm.c:979 config/tc-arm.c:4883 config/tc-i960.c:1300
-#: config/tc-score.c:1210
+#: config/tc-arm.c:975 config/tc-arm.c:4848 config/tc-i960.c:1300
+#: config/tc-score.c:1211
 msgid "invalid constant"
 msgstr ""
 
-#: config/tc-arm.c:1109
+#: config/tc-arm.c:1105
 msgid "expected #constant"
 msgstr ""
 
-#: config/tc-arm.c:1270
+#: config/tc-arm.c:1266
 #, c-format
 msgid "unexpected character `%c' in type specifier"
 msgstr ""
 
-#: config/tc-arm.c:1287
+#: config/tc-arm.c:1283
 #, c-format
 msgid "bad size %d in type specifier"
 msgstr ""
 
-#: config/tc-arm.c:1337
+#: config/tc-arm.c:1333
 msgid "only one type should be specified for operand"
 msgstr ""
 
-#: config/tc-arm.c:1343
+#: config/tc-arm.c:1339
 msgid "vector type expected"
 msgstr ""
 
-#: config/tc-arm.c:1415
+#: config/tc-arm.c:1411
 msgid "can't redefine type for operand"
 msgstr ""
 
-#: config/tc-arm.c:1426
+#: config/tc-arm.c:1422
 msgid "only D registers may be indexed"
 msgstr ""
 
-#: config/tc-arm.c:1432
+#: config/tc-arm.c:1428
 msgid "can't change index for operand"
 msgstr ""
 
-#: config/tc-arm.c:1448 config/tc-arm.c:3367 config/tc-arm.c:4465
+#: config/tc-arm.c:1444 config/tc-arm.c:3332 config/tc-arm.c:4430
 msgid "constant expression required"
 msgstr ""
 
-#: config/tc-arm.c:1495
+#: config/tc-arm.c:1491
 msgid "register operand expected, but got scalar"
 msgstr ""
 
-#: config/tc-arm.c:1528
+#: config/tc-arm.c:1524
 msgid "scalar must have an index"
 msgstr ""
 
-#: config/tc-arm.c:1533 config/tc-arm.c:14916 config/tc-arm.c:14966
-#: config/tc-arm.c:15381
+#: config/tc-arm.c:1529 config/tc-arm.c:14756 config/tc-arm.c:14806
+#: config/tc-arm.c:15221
 msgid "scalar index out of range"
 msgstr ""
 
-#: config/tc-arm.c:1581
+#: config/tc-arm.c:1577
 msgid "bad range in register list"
 msgstr ""
 
-#: config/tc-arm.c:1589 config/tc-arm.c:1598 config/tc-arm.c:1639
+#: config/tc-arm.c:1585 config/tc-arm.c:1594 config/tc-arm.c:1635
 #, c-format
 msgid "Warning: duplicated register (r%d) in register list"
 msgstr ""
 
-#: config/tc-arm.c:1601
+#: config/tc-arm.c:1597
 msgid "Warning: register range not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:1612
+#: config/tc-arm.c:1608
 msgid "missing `}'"
 msgstr ""
 
-#: config/tc-arm.c:1628
+#: config/tc-arm.c:1624
 msgid "invalid register mask"
 msgstr ""
 
-#: config/tc-arm.c:1710
+#: config/tc-arm.c:1706
 msgid "expecting {"
 msgstr ""
 
-#: config/tc-arm.c:1765 config/tc-arm.c:1809
+#: config/tc-arm.c:1761 config/tc-arm.c:1805
 msgid "register out of range in list"
 msgstr ""
 
-#: config/tc-arm.c:1781 config/tc-arm.c:1826 config/tc-h8300.c:1040
-#: config/tc-mips.c:13602 config/tc-mips.c:13624
+#: config/tc-arm.c:1777 config/tc-arm.c:1822 config/tc-h8300.c:1040
+#: config/tc-mips.c:10894 config/tc-mips.c:10916
 msgid "invalid register list"
 msgstr ""
 
-#: config/tc-arm.c:1787 config/tc-arm.c:3881 config/tc-arm.c:4014
+#: config/tc-arm.c:1783 config/tc-arm.c:3846 config/tc-arm.c:3979
 msgid "register list not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:1818
+#: config/tc-arm.c:1814
 msgid "register range not in ascending order"
 msgstr ""
 
-#: config/tc-arm.c:1851
+#: config/tc-arm.c:1847
 msgid "non-contiguous register range"
 msgstr ""
 
-#: config/tc-arm.c:1910
+#: config/tc-arm.c:1906
 msgid "register stride must be 1 or 2"
 msgstr ""
 
-#: config/tc-arm.c:1911
+#: config/tc-arm.c:1907
 msgid "mismatched element/structure types in list"
 msgstr ""
 
-#: config/tc-arm.c:1975
+#: config/tc-arm.c:1971
 msgid "don't use Rn-Rm syntax with non-unit stride"
 msgstr ""
 
-#: config/tc-arm.c:2030
+#: config/tc-arm.c:2026
 msgid "error parsing element/structure list"
 msgstr ""
 
-#: config/tc-arm.c:2036
+#: config/tc-arm.c:2032
 msgid "expected }"
 msgstr ""
 
-#: config/tc-arm.c:2093
+#: config/tc-arm.c:2089
 #, c-format
 msgid "ignoring attempt to redefine built-in register '%s'"
 msgstr ""
 
-#: config/tc-arm.c:2098
+#: config/tc-arm.c:2094
 #, c-format
 msgid "ignoring redefinition of register alias '%s'"
 msgstr ""
 
-#: config/tc-arm.c:2126
+#: config/tc-arm.c:2122
 msgid "attempt to redefine typed alias"
 msgstr ""
 
-#: config/tc-arm.c:2165
+#: config/tc-arm.c:2161
 #, c-format
 msgid "unknown register '%s' -- .req ignored"
 msgstr ""
 
-#: config/tc-arm.c:2260
+#: config/tc-arm.c:2256
 msgid "bad type for register"
 msgstr ""
 
-#: config/tc-arm.c:2271
+#: config/tc-arm.c:2267
 msgid "expression must be constant"
 msgstr ""
 
-#: config/tc-arm.c:2288
+#: config/tc-arm.c:2284
 msgid "can't redefine the type of a register alias"
 msgstr ""
 
-#: config/tc-arm.c:2295
+#: config/tc-arm.c:2291
 msgid "you must specify a single type only"
 msgstr ""
 
-#: config/tc-arm.c:2308
+#: config/tc-arm.c:2304
 msgid "can't redefine the index of a scalar alias"
 msgstr ""
 
-#: config/tc-arm.c:2316
+#: config/tc-arm.c:2312
 msgid "scalar index must be constant"
 msgstr ""
 
-#: config/tc-arm.c:2325
+#: config/tc-arm.c:2321
 msgid "expecting ]"
 msgstr ""
 
-#: config/tc-arm.c:2372
+#: config/tc-arm.c:2368
 msgid "invalid syntax for .req directive"
 msgstr ""
 
-#: config/tc-arm.c:2378
+#: config/tc-arm.c:2374
 msgid "invalid syntax for .dn directive"
 msgstr ""
 
-#: config/tc-arm.c:2384
+#: config/tc-arm.c:2380
 msgid "invalid syntax for .qn directive"
 msgstr ""
 
-#: config/tc-arm.c:2410
+#: config/tc-arm.c:2406
 msgid "invalid syntax for .unreq directive"
 msgstr ""
 
-#: config/tc-arm.c:2417
+#: config/tc-arm.c:2413
 #, c-format
 msgid "unknown register alias '%s'"
 msgstr ""
 
-#: config/tc-arm.c:2419
+#: config/tc-arm.c:2415
 #, c-format
 msgid "ignoring attempt to use .unreq on fixed register name: '%s'"
 msgstr ""
 
-#: config/tc-arm.c:2687
+#: config/tc-arm.c:2666
 #, c-format
 msgid "Failed to find real start of function: %s\n"
 msgstr ""
 
-#: config/tc-arm.c:2704
+#: config/tc-arm.c:2683
 msgid "selected processor does not support THUMB opcodes"
 msgstr ""
 
-#: config/tc-arm.c:2717
+#: config/tc-arm.c:2696
 msgid "selected processor does not support ARM opcodes"
 msgstr ""
 
-#: config/tc-arm.c:2729
+#: config/tc-arm.c:2708
 #, c-format
 msgid "invalid instruction size selected (%d)"
 msgstr ""
 
-#: config/tc-arm.c:2761
+#: config/tc-arm.c:2740
 #, c-format
 msgid "invalid operand to .code directive (%d) (expecting 16 or 32)"
 msgstr ""
 
-#: config/tc-arm.c:2817
+#: config/tc-arm.c:2796
 #, c-format
 msgid "expected comma after name \"%s\""
 msgstr ""
 
-#: config/tc-arm.c:2867 config/tc-m32r.c:588
+#: config/tc-arm.c:2846 config/tc-m32r.c:588
 #, c-format
 msgid "symbol `%s' already defined"
 msgstr ""
 
-#: config/tc-arm.c:2901
+#: config/tc-arm.c:2880
 #, c-format
 msgid "unrecognized syntax mode \"%s\""
 msgstr ""
 
-#: config/tc-arm.c:2922
+#: config/tc-arm.c:2901
 #, c-format
 msgid "alignment too large: %d assumed"
 msgstr ""
 
-#: config/tc-arm.c:2925
+#: config/tc-arm.c:2904
 msgid "alignment negative. 0 assumed."
 msgstr ""
 
-#: config/tc-arm.c:3075
+#: config/tc-arm.c:3054
 msgid "literal pool overflow"
 msgstr ""
 
-#: config/tc-arm.c:3245 config/tc-arm.c:6532
+#: config/tc-arm.c:3210 config/tc-arm.c:6460
 msgid "unrecognized relocation suffix"
 msgstr ""
 
-#: config/tc-arm.c:3260
+#: config/tc-arm.c:3225
 msgid "(plt) is only valid on branch targets"
 msgstr ""
 
-#: config/tc-arm.c:3266 config/tc-s390.c:1134 config/tc-s390.c:1771
+#: config/tc-arm.c:3231 config/tc-s390.c:1134 config/tc-s390.c:1771
 #: config/tc-xtensa.c:1591
 #, c-format
 msgid "%s relocations do not fit in %d bytes"
 msgstr ""
 
-#: config/tc-arm.c:3343
+#: config/tc-arm.c:3308
 msgid ".inst.n operand too big. Use .inst.w instead"
 msgstr ""
 
-#: config/tc-arm.c:3363
+#: config/tc-arm.c:3328
 msgid "cannot determine Thumb instruction size. Use .inst.n/.inst.w instead"
 msgstr ""
 
-#: config/tc-arm.c:3393
+#: config/tc-arm.c:3358
 msgid "width suffixes are invalid in ARM mode"
 msgstr ""
 
-#: config/tc-arm.c:3435 dwarf2dbg.c:744
+#: config/tc-arm.c:3400 dwarf2dbg.c:711
 msgid "expected 0 or 1"
 msgstr ""
 
-#: config/tc-arm.c:3439
+#: config/tc-arm.c:3404
 msgid "missing comma"
 msgstr ""
 
-#: config/tc-arm.c:3472
+#: config/tc-arm.c:3437
 msgid "duplicate .fnstart directive"
 msgstr ""
 
-#: config/tc-arm.c:3503 config/tc-tic6x.c:413
+#: config/tc-arm.c:3468 config/tc-tic6x.c:413
 msgid "duplicate .handlerdata directive"
 msgstr ""
 
-#: config/tc-arm.c:3522
+#: config/tc-arm.c:3487
 msgid ".fnend directive without .fnstart"
 msgstr ""
 
-#: config/tc-arm.c:3588 config/tc-tic6x.c:394
+#: config/tc-arm.c:3553 config/tc-tic6x.c:394
 msgid "personality routine specified for cantunwind frame"
 msgstr ""
 
-#: config/tc-arm.c:3605 config/tc-tic6x.c:455
+#: config/tc-arm.c:3570 config/tc-tic6x.c:455
 msgid "duplicate .personalityindex directive"
 msgstr ""
 
-#: config/tc-arm.c:3612 config/tc-tic6x.c:462
+#: config/tc-arm.c:3577 config/tc-tic6x.c:462
 msgid "bad personality routine number"
 msgstr ""
 
-#: config/tc-arm.c:3634 config/tc-tic6x.c:479
+#: config/tc-arm.c:3599 config/tc-tic6x.c:479
 msgid "duplicate .personality directive"
 msgstr ""
 
-#: config/tc-arm.c:3657 config/tc-arm.c:3785 config/tc-arm.c:3833
+#: config/tc-arm.c:3622 config/tc-arm.c:3750 config/tc-arm.c:3798
 msgid "expected register list"
 msgstr ""
 
-#: config/tc-arm.c:3739
+#: config/tc-arm.c:3704
 msgid "expected , <constant>"
 msgstr ""
 
-#: config/tc-arm.c:3748
+#: config/tc-arm.c:3713
 msgid "number of registers must be in the range [1:4]"
 msgstr ""
 
-#: config/tc-arm.c:3895 config/tc-arm.c:4028
+#: config/tc-arm.c:3860 config/tc-arm.c:3993
 msgid "bad register range"
 msgstr ""
 
-#: config/tc-arm.c:4085
+#: config/tc-arm.c:4050
 msgid "register expected"
 msgstr ""
 
-#: config/tc-arm.c:4095
+#: config/tc-arm.c:4060
 msgid "FPA .unwind_save does not take a register list"
 msgstr ""
 
-#: config/tc-arm.c:4114
+#: config/tc-arm.c:4079
 msgid ".unwind_save does not support this kind of register"
 msgstr ""
 
-#: config/tc-arm.c:4153
+#: config/tc-arm.c:4118
 msgid "SP and PC not permitted in .unwind_movsp directive"
 msgstr ""
 
-#: config/tc-arm.c:4158
+#: config/tc-arm.c:4123
 msgid "unexpected .unwind_movsp directive"
 msgstr ""
 
-#: config/tc-arm.c:4185
+#: config/tc-arm.c:4150
 msgid "stack increment must be multiple of 4"
 msgstr ""
 
-#: config/tc-arm.c:4217
+#: config/tc-arm.c:4182
 msgid "expected <reg>, <reg>"
 msgstr ""
 
-#: config/tc-arm.c:4235
+#: config/tc-arm.c:4200
 msgid "register must be either sp or set by a previousunwind_movsp directive"
 msgstr ""
 
-#: config/tc-arm.c:4274
+#: config/tc-arm.c:4239
 msgid "expected <offset>, <opcode>"
 msgstr ""
 
-#: config/tc-arm.c:4286
+#: config/tc-arm.c:4251
 msgid "unwind opcode too long"
 msgstr ""
 
-#: config/tc-arm.c:4291
+#: config/tc-arm.c:4256
 msgid "invalid unwind opcode"
 msgstr ""
 
-#: config/tc-arm.c:4471 config/tc-arm.c:5410 config/tc-arm.c:9497
-#: config/tc-arm.c:10032 config/tc-arm.c:13378 config/tc-arm.c:21410
-#: config/tc-arm.c:21435 config/tc-arm.c:21443 config/tc-z8k.c:1144
+#: config/tc-arm.c:4436 config/tc-arm.c:5346 config/tc-arm.c:9360
+#: config/tc-arm.c:9888 config/tc-arm.c:13218 config/tc-arm.c:21248
+#: config/tc-arm.c:21273 config/tc-arm.c:21281 config/tc-z8k.c:1144
 #: config/tc-z8k.c:1154
 msgid "immediate value out of range"
 msgstr ""
 
-#: config/tc-arm.c:4636
+#: config/tc-arm.c:4601
 msgid "invalid FPA immediate expression"
 msgstr ""
 
-#: config/tc-arm.c:4760 config/tc-arm.c:4769
+#: config/tc-arm.c:4725 config/tc-arm.c:4734
 msgid "shift expression expected"
 msgstr ""
 
-#: config/tc-arm.c:4783
+#: config/tc-arm.c:4748
 msgid "'LSL' or 'ASR' required"
 msgstr ""
 
-#: config/tc-arm.c:4791
+#: config/tc-arm.c:4756
 msgid "'LSL' required"
 msgstr ""
 
-#: config/tc-arm.c:4799
+#: config/tc-arm.c:4764
 msgid "'ASR' required"
 msgstr ""
 
-#: config/tc-arm.c:4871 config/tc-arm.c:5404 config/tc-arm.c:7259
+#: config/tc-arm.c:4836 config/tc-arm.c:5340 config/tc-arm.c:7168
 msgid "constant expression expected"
 msgstr ""
 
-#: config/tc-arm.c:4878
+#: config/tc-arm.c:4843
 msgid "invalid rotation"
 msgstr ""
 
-#: config/tc-arm.c:5037 config/tc-arm.c:5201
+#: config/tc-arm.c:5003 config/tc-arm.c:5167
 msgid "unknown group relocation"
 msgstr ""
 
-#: config/tc-arm.c:5073
+#: config/tc-arm.c:5039
 msgid "alignment must be constant"
 msgstr ""
 
-#: config/tc-arm.c:5232
+#: config/tc-arm.c:5198
 msgid "this group relocation is not allowed on this instruction"
 msgstr ""
 
-#: config/tc-arm.c:5269 config/tc-arm.c:5817
+#: config/tc-arm.c:5219 config/tc-arm.c:5747
 msgid "']' expected"
 msgstr ""
 
-#: config/tc-arm.c:5287
+#: config/tc-arm.c:5237
 msgid "'}' expected at end of 'option' field"
 msgstr ""
 
-#: config/tc-arm.c:5292
+#: config/tc-arm.c:5242
 msgid "cannot combine index with option"
 msgstr ""
 
-#: config/tc-arm.c:5305
+#: config/tc-arm.c:5255
 msgid "cannot combine pre- and post-indexing"
 msgstr ""
 
-#: config/tc-arm.c:5548
+#: config/tc-arm.c:5478
 msgid "unexpected bit specified after APSR"
 msgstr ""
 
-#: config/tc-arm.c:5560
+#: config/tc-arm.c:5490
 msgid "selected processor does not support DSP extension"
 msgstr ""
 
-#: config/tc-arm.c:5572
+#: config/tc-arm.c:5502
 msgid "bad bitmask specified after APSR"
 msgstr ""
 
-#: config/tc-arm.c:5596
+#: config/tc-arm.c:5526
 msgid "writing to APSR without specifying a bitmask is deprecated"
 msgstr ""
 
-#: config/tc-arm.c:5608 config/tc-arm.c:11125 config/tc-arm.c:11164
-#: config/tc-arm.c:11168
+#: config/tc-arm.c:5538 config/tc-arm.c:10977 config/tc-arm.c:11016
+#: config/tc-arm.c:11020
 msgid "selected processor does not support requested special purpose register"
 msgstr ""
 
-#: config/tc-arm.c:5613
+#: config/tc-arm.c:5543
 msgid "flag for {c}psr instruction expected"
 msgstr ""
 
-#: config/tc-arm.c:5638
+#: config/tc-arm.c:5568
 msgid "unrecognized CPS flag"
 msgstr ""
 
-#: config/tc-arm.c:5645
+#: config/tc-arm.c:5575
 msgid "missing CPS flags"
 msgstr ""
 
-#: config/tc-arm.c:5668 config/tc-arm.c:5674
+#: config/tc-arm.c:5598 config/tc-arm.c:5604
 msgid "valid endian specifiers are be or le"
 msgstr ""
 
-#: config/tc-arm.c:5696
+#: config/tc-arm.c:5626
 msgid "missing rotation field after comma"
 msgstr ""
 
-#: config/tc-arm.c:5711
+#: config/tc-arm.c:5641
 msgid "rotation can only be 0, 8, 16, or 24"
 msgstr ""
 
-#: config/tc-arm.c:5740
+#: config/tc-arm.c:5670
 msgid "condition required"
 msgstr ""
 
-#: config/tc-arm.c:5779 config/tc-arm.c:7846
+#: config/tc-arm.c:5709 config/tc-arm.c:7755
 msgid "'[' expected"
 msgstr ""
 
-#: config/tc-arm.c:5792
+#: config/tc-arm.c:5722
 msgid "',' expected"
 msgstr ""
 
-#: config/tc-arm.c:5809
+#: config/tc-arm.c:5739
 msgid "invalid shift"
 msgstr ""
 
-#: config/tc-arm.c:5882
+#: config/tc-arm.c:5812
 msgid "can't use Neon quad register here"
 msgstr ""
 
-#: config/tc-arm.c:5948
+#: config/tc-arm.c:5878
 msgid "expected <Rm> or <Dm> or <Qm> operand"
 msgstr ""
 
-#: config/tc-arm.c:6028
+#: config/tc-arm.c:5958
 msgid "parse error"
 msgstr ""
 
-#: config/tc-arm.c:6038 read.c:2127
+#: config/tc-arm.c:5968 read.c:2127
 msgid "expected comma"
 msgstr ""
 
 #. ISB can only take SY as an option.
-#: config/tc-arm.c:6298
+#: config/tc-arm.c:6227
 msgid "invalid barrier type"
 msgstr ""
 
-#: config/tc-arm.c:6435
+#: config/tc-arm.c:6364
 msgid "immediate value is out of range"
 msgstr ""
 
-#: config/tc-arm.c:6582
+#: config/tc-arm.c:6510
 msgid "iWMMXt data or control register expected"
 msgstr ""
 
-#: config/tc-arm.c:6622
+#: config/tc-arm.c:6550
 msgid "Banked registers are not available with this architecture."
 msgstr ""
 
-#: config/tc-arm.c:6747
+#: config/tc-arm.c:6675
 #, c-format
 msgid "unhandled operand code %d"
 msgstr ""
 
-#: config/tc-arm.c:6844 config/tc-score.c:264
+#: config/tc-arm.c:6772 config/tc-score.c:264
 msgid "garbage following instruction"
 msgstr ""
 
 #. If REG is R13 (the stack pointer), warn that its use is
 #. deprecated.
-#: config/tc-arm.c:6885
+#: config/tc-arm.c:6813
 msgid "use of r13 is deprecated"
 msgstr ""
 
-#: config/tc-arm.c:6955
+#: config/tc-arm.c:6883
 msgid "D register out of range for selected VFP version"
 msgstr ""
 
-#: config/tc-arm.c:7038
+#: config/tc-arm.c:6962
 msgid "instruction does not accept preindexed addressing"
 msgstr ""
 
 #. unindexed - only for coprocessor
-#: config/tc-arm.c:7054 config/tc-arm.c:9290
+#: config/tc-arm.c:6978 config/tc-arm.c:9153
 msgid "instruction does not accept unindexed addressing"
 msgstr ""
 
-#: config/tc-arm.c:7062
+#: config/tc-arm.c:6986
 msgid "destination register same as write-back base"
 msgstr ""
 
-#: config/tc-arm.c:7063
+#: config/tc-arm.c:6987
 msgid "source register same as write-back base"
 msgstr ""
 
-#: config/tc-arm.c:7113
+#: config/tc-arm.c:7037
 msgid "use of PC in this instruction is deprecated"
 msgstr ""
 
-#: config/tc-arm.c:7136
+#: config/tc-arm.c:7055
 msgid "instruction does not accept scaled register index"
 msgstr ""
 
-#: config/tc-arm.c:7188
+#: config/tc-arm.c:7101
 msgid "instruction does not support unindexed addressing"
 msgstr ""
 
-#: config/tc-arm.c:7203
+#: config/tc-arm.c:7116
 msgid "pc may not be used with write-back"
 msgstr ""
 
-#: config/tc-arm.c:7208
+#: config/tc-arm.c:7121
 msgid "instruction does not support writeback"
 msgstr ""
 
-#: config/tc-arm.c:7254
+#: config/tc-arm.c:7163
 msgid "invalid pseudo operation"
 msgstr ""
 
-#: config/tc-arm.c:7300
+#: config/tc-arm.c:7209
 msgid "literal pool insertion failed"
 msgstr ""
 
-#: config/tc-arm.c:7359
+#: config/tc-arm.c:7268
 msgid "Rn must not overlap other operands"
 msgstr ""
 
-#: config/tc-arm.c:7364
+#: config/tc-arm.c:7273
 msgid "swp{b} use is deprecated for this architecture"
 msgstr ""
 
-#: config/tc-arm.c:7461 config/tc-arm.c:9864
+#: config/tc-arm.c:7370 config/tc-arm.c:9720
 msgid "bad barrier type"
 msgstr ""
 
-#: config/tc-arm.c:7472 config/tc-arm.c:7491 config/tc-arm.c:7504
-#: config/tc-arm.c:9876 config/tc-arm.c:9907 config/tc-arm.c:9929
+#: config/tc-arm.c:7381 config/tc-arm.c:7400 config/tc-arm.c:7413
+#: config/tc-arm.c:9732 config/tc-arm.c:9763 config/tc-arm.c:9785
 msgid "bit-field extends past end of register"
 msgstr ""
 
-#: config/tc-arm.c:7534
+#: config/tc-arm.c:7443
 msgid "the only valid suffixes here are '(plt)' and '(tlscall)'"
 msgstr ""
 
-#: config/tc-arm.c:7587
+#: config/tc-arm.c:7496
 msgid "use of r15 in blx in ARM mode is not really useful"
 msgstr ""
 
-#: config/tc-arm.c:7609
+#: config/tc-arm.c:7518
 msgid "use of r15 in bx in ARM mode is not really useful"
 msgstr ""
 
-#: config/tc-arm.c:7634
+#: config/tc-arm.c:7543
 msgid "use of r15 in bxj is not really useful"
 msgstr ""
 
-#: config/tc-arm.c:7813 config/tc-arm.c:7822
+#: config/tc-arm.c:7722 config/tc-arm.c:7731
 msgid "writeback of base register is UNPREDICTABLE"
 msgstr ""
 
-#: config/tc-arm.c:7816
+#: config/tc-arm.c:7725
 msgid "writeback of base register when in register list is UNPREDICTABLE"
 msgstr ""
 
-#: config/tc-arm.c:7826
+#: config/tc-arm.c:7735
 msgid "if writeback register is in list, it must be the lowest reg in the list"
 msgstr ""
 
-#: config/tc-arm.c:7841
-msgid "first transfer register must be even"
+#: config/tc-arm.c:7750
+msgid "first destination register must be even"
 msgstr ""
 
-#: config/tc-arm.c:7844
-msgid "can only transfer two consecutive registers"
+#: config/tc-arm.c:7753 config/tc-arm.c:7822
+msgid "can only load two consecutive registers"
 msgstr ""
 
 #. If op 1 were present and equal to PC, this function wouldn't
 #. have been called in the first place.
 #. If op 2 were present and equal to PC, this function wouldn't
 #. have been called in the first place.
-#: config/tc-arm.c:7845 config/tc-arm.c:7915 config/tc-arm.c:8544
-#: config/tc-arm.c:10652
+#: config/tc-arm.c:7754 config/tc-arm.c:7825 config/tc-arm.c:8423
+#: config/tc-arm.c:10504
 msgid "r14 not allowed here"
 msgstr ""
 
-#: config/tc-arm.c:7857
-msgid "base register written back, and overlaps second transfer register"
+#: config/tc-arm.c:7768
+msgid "base register written back, and overlaps second destination register"
 msgstr ""
 
-#: config/tc-arm.c:7867
-msgid "index register overlaps transfer register"
+#: config/tc-arm.c:7776
+msgid "index register overlaps destination register"
 msgstr ""
 
-#: config/tc-arm.c:7896 config/tc-arm.c:8511
+#: config/tc-arm.c:7806 config/tc-arm.c:8405
 msgid "offset must be zero in ARM encoding"
 msgstr ""
 
-#: config/tc-arm.c:7909 config/tc-arm.c:8538
+#: config/tc-arm.c:7819 config/tc-arm.c:8417
 msgid "even register required"
 msgstr ""
 
-#: config/tc-arm.c:7912
-msgid "can only load two consecutive registers"
-msgstr ""
-
-#: config/tc-arm.c:7930
-msgid "ldr to register 15 must be 4-byte alligned"
-msgstr ""
-
-#: config/tc-arm.c:7953 config/tc-arm.c:7985
+#: config/tc-arm.c:7850 config/tc-arm.c:7882
 msgid "this instruction requires a post-indexed address"
 msgstr ""
 
-#: config/tc-arm.c:8012
+#: config/tc-arm.c:7909
 msgid "Rd and Rm should be different in mla"
 msgstr ""
 
-#: config/tc-arm.c:8036 config/tc-arm.c:10996
+#: config/tc-arm.c:7933 config/tc-arm.c:10848
 msgid ":lower16: not allowed this instruction"
 msgstr ""
 
-#: config/tc-arm.c:8038
+#: config/tc-arm.c:7935
 msgid ":upper16: not allowed instruction"
 msgstr ""
 
-#: config/tc-arm.c:8057 config/tc-arm.c:8100
+#: config/tc-arm.c:7954 config/tc-arm.c:7997
 msgid "operand 1 must be FPSCR"
 msgstr ""
 
-#: config/tc-arm.c:8119
+#: config/tc-arm.c:8016
 msgid "operand 0 must be FPSCR"
 msgstr ""
 
-#: config/tc-arm.c:8139 config/tc-arm.c:11114
+#: config/tc-arm.c:8036 config/tc-arm.c:10966
 msgid "bad register for mrs"
 msgstr ""
 
-#: config/tc-arm.c:8146 config/tc-arm.c:11131
+#: config/tc-arm.c:8043 config/tc-arm.c:10983
 msgid "'APSR', 'CPSR' or 'SPSR' expected"
 msgstr ""
 
-#: config/tc-arm.c:8187
+#: config/tc-arm.c:8084
 msgid "Rd and Rm should be different in mul"
 msgstr ""
 
-#: config/tc-arm.c:8206 config/tc-arm.c:8456 config/tc-arm.c:11265
+#: config/tc-arm.c:8103 config/tc-arm.c:8350 config/tc-arm.c:11117
 msgid "rdhi and rdlo must be different"
 msgstr ""
 
-#: config/tc-arm.c:8212
+#: config/tc-arm.c:8109
 msgid "rdhi, rdlo and rm must all be different"
 msgstr ""
 
-#: config/tc-arm.c:8278
+#: config/tc-arm.c:8175
 msgid "'[' expected after PLD mnemonic"
 msgstr ""
 
-#: config/tc-arm.c:8280 config/tc-arm.c:8295
+#: config/tc-arm.c:8177 config/tc-arm.c:8192
 msgid "post-indexed expression used in preload instruction"
 msgstr ""
 
-#: config/tc-arm.c:8282 config/tc-arm.c:8297
+#: config/tc-arm.c:8179 config/tc-arm.c:8194
 msgid "writeback used in preload instruction"
 msgstr ""
 
-#: config/tc-arm.c:8284 config/tc-arm.c:8299
+#: config/tc-arm.c:8181 config/tc-arm.c:8196
 msgid "unindexed addressing used in preload instruction"
 msgstr ""
 
-#: config/tc-arm.c:8293
+#: config/tc-arm.c:8190
 msgid "'[' expected after PLI mnemonic"
 msgstr ""
 
-#: config/tc-arm.c:8401 config/tc-arm.c:11639 config/tc-arm.c:11671
-#: config/tc-arm.c:11714
-msgid "extraneous shift as part of operand to shift insn"
-msgstr ""
-
-#: config/tc-arm.c:8482
+#: config/tc-arm.c:8376
 msgid "SRS base register must be r13"
 msgstr ""
 
-#: config/tc-arm.c:8541
+#: config/tc-arm.c:8420
 msgid "can only store two consecutive registers"
 msgstr ""
 
-#: config/tc-arm.c:8636 config/tc-arm.c:8653
+#: config/tc-arm.c:8515 config/tc-arm.c:8532
 msgid "only two consecutive VFP SP registers allowed here"
 msgstr ""
 
-#: config/tc-arm.c:8681 config/tc-arm.c:8696
+#: config/tc-arm.c:8560 config/tc-arm.c:8575
 msgid "this addressing mode requires base-register writeback"
 msgstr ""
 
-#. If srcsize is 16, inst.operands[1].imm must be in the range 0-16.
-#. i.e. immbits must be in range 0 - 16.
-#: config/tc-arm.c:8813
-msgid "immediate value out of range, expected range [0, 16]"
-msgstr ""
-
-#. If srcsize is 32, inst.operands[1].imm must be in the range 1-32.
-#. i.e. immbits must be in range 0 - 31.
-#: config/tc-arm.c:8820
-msgid "immediate value out of range, expected range [1, 32]"
-msgstr ""
-
-#: config/tc-arm.c:8886
+#: config/tc-arm.c:8749
 msgid "this instruction does not support indexing"
 msgstr ""
 
-#: config/tc-arm.c:8909
+#: config/tc-arm.c:8772
 msgid "only r15 allowed here"
 msgstr ""
 
-#: config/tc-arm.c:9044
+#: config/tc-arm.c:8907
 msgid "immediate operand requires iWMMXt2"
 msgstr ""
 
-#: config/tc-arm.c:9188
+#: config/tc-arm.c:9051
 msgid "shift by register not allowed in thumb mode"
 msgstr ""
 
-#: config/tc-arm.c:9200 config/tc-arm.c:11820 config/tc-arm.c:20800
+#: config/tc-arm.c:9063 config/tc-arm.c:11660 config/tc-arm.c:20630
 msgid "shift expression is too large"
 msgstr ""
 
-#: config/tc-arm.c:9227
+#: config/tc-arm.c:9090
 msgid "Instruction does not support =N addresses"
 msgstr ""
 
-#: config/tc-arm.c:9233
+#: config/tc-arm.c:9096
 msgid "cannot use register index with this instruction"
 msgstr ""
 
-#: config/tc-arm.c:9235
+#: config/tc-arm.c:9098
 msgid "Thumb does not support negative register indexing"
 msgstr ""
 
-#: config/tc-arm.c:9237
+#: config/tc-arm.c:9100
 msgid "Thumb does not support register post-indexing"
 msgstr ""
 
-#: config/tc-arm.c:9239
+#: config/tc-arm.c:9102
 msgid "Thumb does not support register indexing with writeback"
 msgstr ""
 
-#: config/tc-arm.c:9241
+#: config/tc-arm.c:9104
 msgid "Thumb supports only LSL in shifted register indexing"
 msgstr ""
 
-#: config/tc-arm.c:9250 config/tc-arm.c:14718
+#: config/tc-arm.c:9113 config/tc-arm.c:14558
 msgid "shift out of range"
 msgstr ""
 
-#: config/tc-arm.c:9259
+#: config/tc-arm.c:9122
 msgid "cannot use writeback with this instruction"
 msgstr ""
 
-#: config/tc-arm.c:9280
+#: config/tc-arm.c:9143
 msgid "cannot use post-indexing with PC-relative addressing"
 msgstr ""
 
-#: config/tc-arm.c:9281
+#: config/tc-arm.c:9144
 msgid "cannot use post-indexing with this instruction"
 msgstr ""
 
-#: config/tc-arm.c:9492
+#: config/tc-arm.c:9355
 msgid "only SUBS PC, LR, #const allowed"
 msgstr ""
 
-#: config/tc-arm.c:9574 config/tc-arm.c:9729 config/tc-arm.c:9826
-#: config/tc-arm.c:11075 config/tc-arm.c:11371
+#: config/tc-arm.c:9434 config/tc-arm.c:9585 config/tc-arm.c:9682
+#: config/tc-arm.c:10927 config/tc-arm.c:11223
 msgid "shift must be constant"
 msgstr ""
 
-#: config/tc-arm.c:9579
-msgid "shift value over 3 not allowed in thumb mode"
-msgstr ""
-
-#: config/tc-arm.c:9581
-msgid "only LSL shift allowed in thumb mode"
-msgstr ""
-
-#: config/tc-arm.c:9605 config/tc-arm.c:9744 config/tc-arm.c:9841
-#: config/tc-arm.c:11088
+#: config/tc-arm.c:9461 config/tc-arm.c:9600 config/tc-arm.c:9697
+#: config/tc-arm.c:10940
 msgid "unshifted register required"
 msgstr ""
 
-#: config/tc-arm.c:9620 config/tc-arm.c:9852 config/tc-arm.c:11226
+#: config/tc-arm.c:9476 config/tc-arm.c:9708 config/tc-arm.c:11078
 msgid "dest must overlap one source register"
 msgstr ""
 
-#: config/tc-arm.c:9747
+#: config/tc-arm.c:9603
 msgid "dest and source1 must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:10028
+#: config/tc-arm.c:9884
 msgid "instruction is always unconditional"
 msgstr ""
 
-#: config/tc-arm.c:10130
+#: config/tc-arm.c:9986
 msgid "selected processor does not support 'A' form of this instruction"
 msgstr ""
 
-#: config/tc-arm.c:10133
+#: config/tc-arm.c:9989
 msgid "Thumb does not support the 2-argument form of this instruction"
 msgstr ""
 
-#: config/tc-arm.c:10241
+#: config/tc-arm.c:10097
 msgid "SP not allowed in register list"
 msgstr ""
 
-#: config/tc-arm.c:10245 config/tc-arm.c:10351
+#: config/tc-arm.c:10101 config/tc-arm.c:10207
 msgid ""
 "having the base register in the register list when using write back is "
 "UNPREDICTABLE"
 msgstr ""
 
-#: config/tc-arm.c:10253
+#: config/tc-arm.c:10109
 msgid "LR and PC should not both be in register list"
 msgstr ""
 
-#: config/tc-arm.c:10261
+#: config/tc-arm.c:10117
 msgid "PC not allowed in register list"
 msgstr ""
 
-#: config/tc-arm.c:10303
+#: config/tc-arm.c:10159
 msgid "Thumb load/store multiple does not support {reglist}^"
 msgstr ""
 
-#: config/tc-arm.c:10328 config/tc-arm.c:10405
+#: config/tc-arm.c:10184 config/tc-arm.c:10261
 #, c-format
 msgid "value stored for r%d is UNKNOWN"
 msgstr ""
 
-#: config/tc-arm.c:10398
+#: config/tc-arm.c:10254
 msgid "Thumb-2 instruction only valid in unified syntax"
 msgstr ""
 
-#: config/tc-arm.c:10402 config/tc-arm.c:10412
+#: config/tc-arm.c:10258 config/tc-arm.c:10268
 msgid "this instruction will write back the base register"
 msgstr ""
 
-#: config/tc-arm.c:10415
+#: config/tc-arm.c:10271
 msgid "this instruction will not write back the base register"
 msgstr ""
 
-#: config/tc-arm.c:10446
+#: config/tc-arm.c:10302
 msgid "r14 not allowed as first register when second register is omitted"
 msgstr ""
 
-#: config/tc-arm.c:10546
+#: config/tc-arm.c:10402
 msgid ""
 "This instruction may be unpredictable if executed on M-profile cores with "
 "interrupts enabled."
 msgstr ""
 
-#: config/tc-arm.c:10575 config/tc-arm.c:10588 config/tc-arm.c:10624
+#: config/tc-arm.c:10427 config/tc-arm.c:10440 config/tc-arm.c:10476
 msgid "Thumb does not support this addressing mode"
 msgstr ""
 
-#: config/tc-arm.c:10592
+#: config/tc-arm.c:10444
 msgid "byte or halfword not valid for base register"
 msgstr ""
 
-#: config/tc-arm.c:10595
+#: config/tc-arm.c:10447
 msgid "r15 based store not allowed"
 msgstr ""
 
-#: config/tc-arm.c:10597
+#: config/tc-arm.c:10449
 msgid "invalid base register for register offset"
 msgstr ""
 
-#: config/tc-arm.c:10779
+#: config/tc-arm.c:10631
 #, c-format
 msgid ""
 "Use of r%u as a source register is deprecated when r%u is the destination "
 "register."
 msgstr ""
 
-#: config/tc-arm.c:10952
+#: config/tc-arm.c:10804
 msgid "shifts in CMP/MOV instructions are only supported in unified syntax"
 msgstr ""
 
-#: config/tc-arm.c:10980
+#: config/tc-arm.c:10832
 msgid "only lo regs allowed with immediate"
 msgstr ""
 
-#: config/tc-arm.c:11001
+#: config/tc-arm.c:10853
 msgid ":upper16: not allowed this instruction"
 msgstr ""
 
-#: config/tc-arm.c:11149
+#: config/tc-arm.c:11001
 msgid "Thumb encoding does not support an immediate here"
 msgstr ""
 
-#: config/tc-arm.c:11231
+#: config/tc-arm.c:11083
 msgid "Thumb-2 MUL must not set flags"
 msgstr ""
 
-#: config/tc-arm.c:11296
+#: config/tc-arm.c:11148
 msgid "Thumb does not support NOP with hints"
 msgstr ""
 
-#: config/tc-arm.c:11434
+#: config/tc-arm.c:11286
 msgid "push/pop do not support {reglist}^"
 msgstr ""
 
-#: config/tc-arm.c:11457
+#: config/tc-arm.c:11309
 msgid "invalid register list to push/pop instruction"
 msgstr ""
 
-#: config/tc-arm.c:11698
+#: config/tc-arm.c:11542
 msgid "source1 and dest must be same register"
 msgstr ""
 
-#: config/tc-arm.c:11723
+#: config/tc-arm.c:11563
 msgid "ror #imm not supported"
 msgstr ""
 
-#: config/tc-arm.c:11774
+#: config/tc-arm.c:11614
 msgid "SMC is not permitted on this architecture"
 msgstr ""
 
-#: config/tc-arm.c:11937
+#: config/tc-arm.c:11777
 msgid "Thumb encoding does not support rotation"
 msgstr ""
 
-#: config/tc-arm.c:11952
+#: config/tc-arm.c:11792
 msgid "SVC is not permitted on this architecture"
 msgstr ""
 
-#: config/tc-arm.c:11968
+#: config/tc-arm.c:11808
 msgid "instruction requires register index"
 msgstr ""
 
-#: config/tc-arm.c:11977
+#: config/tc-arm.c:11817
 msgid "instruction does not allow shifted index"
 msgstr ""
 
-#: config/tc-arm.c:12122
+#: config/tc-arm.c:11962
 msgid "invalid neon suffix for non neon instruction"
 msgstr ""
 
-#: config/tc-arm.c:12413 config/tc-arm.c:12748
+#: config/tc-arm.c:12253 config/tc-arm.c:12588
 msgid "invalid instruction shape"
 msgstr ""
 
-#: config/tc-arm.c:12657
+#: config/tc-arm.c:12497
 msgid "types specified in both the mnemonic and operands"
 msgstr ""
 
-#: config/tc-arm.c:12694
+#: config/tc-arm.c:12534
 msgid "operand types can't be inferred"
 msgstr ""
 
-#: config/tc-arm.c:12700
+#: config/tc-arm.c:12540
 msgid "type specifier has the wrong number of parts"
 msgstr ""
 
-#: config/tc-arm.c:12764 config/tc-arm.c:14459 config/tc-arm.c:14466
+#: config/tc-arm.c:12604 config/tc-arm.c:14299 config/tc-arm.c:14306
 msgid "operand size must match register width"
 msgstr ""
 
-#: config/tc-arm.c:12775
+#: config/tc-arm.c:12615
 msgid "bad type in Neon instruction"
 msgstr ""
 
-#: config/tc-arm.c:12786
+#: config/tc-arm.c:12626
 msgid "inconsistent types in Neon instruction"
 msgstr ""
 
-#: config/tc-arm.c:13603
+#: config/tc-arm.c:13443
 msgid "first and second operands shall be the same register"
 msgstr ""
 
-#: config/tc-arm.c:13871
+#: config/tc-arm.c:13711
 msgid "scalar out of range for multiply instruction"
 msgstr ""
 
-#: config/tc-arm.c:14047 config/tc-arm.c:14059
+#: config/tc-arm.c:13887 config/tc-arm.c:13899
 msgid "immediate out of range for insert"
 msgstr ""
 
-#: config/tc-arm.c:14071 config/tc-arm.c:15066
+#: config/tc-arm.c:13911 config/tc-arm.c:14906
 msgid "immediate out of range for shift"
 msgstr ""
 
-#: config/tc-arm.c:14128 config/tc-arm.c:14155 config/tc-arm.c:14564
-#: config/tc-arm.c:15012
+#: config/tc-arm.c:13968 config/tc-arm.c:13995 config/tc-arm.c:14404
+#: config/tc-arm.c:14852
 msgid "immediate out of range"
 msgstr ""
 
-#: config/tc-arm.c:14192
+#: config/tc-arm.c:14032
 msgid "immediate out of range for narrowing operation"
 msgstr ""
 
-#: config/tc-arm.c:14317
+#: config/tc-arm.c:14157
 msgid "operands 0 and 1 must be the same register"
 msgstr ""
 
-#: config/tc-arm.c:14538
+#: config/tc-arm.c:14378
 msgid "operand size must be specified for immediate VMOV"
 msgstr ""
 
-#: config/tc-arm.c:14548
+#: config/tc-arm.c:14388
 msgid "immediate has bits set outside the operand size"
 msgstr ""
 
-#: config/tc-arm.c:14744
+#: config/tc-arm.c:14584
 msgid "elements must be smaller than reversal region"
 msgstr ""
 
-#: config/tc-arm.c:14915 config/tc-arm.c:14965
+#: config/tc-arm.c:14755 config/tc-arm.c:14805
 msgid "bad type for scalar"
 msgstr ""
 
-#: config/tc-arm.c:15029 config/tc-arm.c:15037
+#: config/tc-arm.c:14869 config/tc-arm.c:14877
 msgid "VFP registers must be adjacent"
 msgstr ""
 
-#: config/tc-arm.c:15178
+#: config/tc-arm.c:15018
 msgid "bad list length for table lookup"
 msgstr ""
 
-#: config/tc-arm.c:15208
+#: config/tc-arm.c:15048
 msgid "writeback (!) must be used for VLDMDB and VSTMDB"
 msgstr ""
 
-#: config/tc-arm.c:15211
+#: config/tc-arm.c:15051
 msgid "register list must contain at least 1 and at most 16 registers"
 msgstr ""
 
-#: config/tc-arm.c:15236
+#: config/tc-arm.c:15076
 msgid "Use of PC here is deprecated"
 msgstr ""
 
-#: config/tc-arm.c:15238
+#: config/tc-arm.c:15078
 msgid "Use of PC here is UNPREDICTABLE"
 msgstr ""
 
-#: config/tc-arm.c:15301
+#: config/tc-arm.c:15141
 msgid "bad alignment"
 msgstr ""
 
-#: config/tc-arm.c:15318
+#: config/tc-arm.c:15158
 msgid "bad list type for instruction"
 msgstr ""
 
-#: config/tc-arm.c:15360
+#: config/tc-arm.c:15200
 msgid "unsupported alignment for instruction"
 msgstr ""
 
-#: config/tc-arm.c:15379 config/tc-arm.c:15473 config/tc-arm.c:15484
-#: config/tc-arm.c:15494 config/tc-arm.c:15508
+#: config/tc-arm.c:15219 config/tc-arm.c:15313 config/tc-arm.c:15324
+#: config/tc-arm.c:15334 config/tc-arm.c:15348
 msgid "bad list length"
 msgstr ""
 
-#: config/tc-arm.c:15384
+#: config/tc-arm.c:15224
 msgid "stride of 2 unavailable when element size is 8"
 msgstr ""
 
-#: config/tc-arm.c:15417 config/tc-arm.c:15492
+#: config/tc-arm.c:15257 config/tc-arm.c:15332
 msgid "can't use alignment with this instruction"
 msgstr ""
 
-#: config/tc-arm.c:15559
+#: config/tc-arm.c:15399
 msgid "post-index must be a register"
 msgstr ""
 
-#: config/tc-arm.c:15561
+#: config/tc-arm.c:15401
 msgid "bad register for post-index"
 msgstr ""
 
-#: config/tc-arm.c:15897 config/tc-arm.c:15983
+#: config/tc-arm.c:15737 config/tc-arm.c:15823
 msgid "conditional infixes are deprecated in unified syntax"
 msgstr ""
 
-#: config/tc-arm.c:16131
+#: config/tc-arm.c:15971
 msgid "Warning: conditional outside an IT block for Thumb."
 msgstr ""
 
-#: config/tc-arm.c:16336
+#: config/tc-arm.c:16176
 msgid "s suffix on comparison instruction is deprecated"
 msgstr ""
 
-#: config/tc-arm.c:16355
+#: config/tc-arm.c:16195
 #, c-format
 msgid "selected processor does not support Thumb mode `%s'"
 msgstr ""
 
-#: config/tc-arm.c:16361
+#: config/tc-arm.c:16201
 msgid "Thumb does not support conditional execution"
 msgstr ""
 
-#: config/tc-arm.c:16380
+#: config/tc-arm.c:16220
 #, c-format
 msgid "selected processor does not support Thumb-2 mode `%s'"
 msgstr ""
 
-#: config/tc-arm.c:16405
+#: config/tc-arm.c:16245
 #, c-format
 msgid "cannot honor width suffix -- `%s'"
 msgstr ""
 
-#: config/tc-arm.c:16446
+#: config/tc-arm.c:16286
 #, c-format
 msgid "selected processor does not support ARM mode `%s'"
 msgstr ""
 
-#: config/tc-arm.c:16451
+#: config/tc-arm.c:16291
 #, c-format
 msgid "width suffixes are invalid in ARM mode -- `%s'"
 msgstr ""
 
-#: config/tc-arm.c:16484
+#: config/tc-arm.c:16324
 #, c-format
 msgid "attempt to use an ARM instruction on a Thumb-only processor -- `%s'"
 msgstr ""
 
-#: config/tc-arm.c:16501
+#: config/tc-arm.c:16341
 #, c-format
 msgid "section '%s' finished with an open IT block."
 msgstr ""
 
-#: config/tc-arm.c:16506
+#: config/tc-arm.c:16346
 msgid "file finished with an open IT block."
 msgstr ""
 
-#: config/tc-arm.c:19545
+#: config/tc-arm.c:19385
 #, c-format
 msgid "alignments greater than %d bytes not supported in .text sections."
 msgstr ""
 
-#: config/tc-arm.c:19813 config/tc-ia64.c:3469
+#: config/tc-arm.c:19653 config/tc-ia64.c:3469
 #, c-format
 msgid "Group section `%s' has no group signature"
 msgstr ""
 
-#: config/tc-arm.c:19858
+#: config/tc-arm.c:19698
 msgid "handlerdata in cantunwind frame"
 msgstr ""
 
-#: config/tc-arm.c:19875
+#: config/tc-arm.c:19715
 msgid "too many unwind opcodes for personality routine 0"
 msgstr ""
 
-#: config/tc-arm.c:19907
+#: config/tc-arm.c:19747
 msgid "too many unwind opcodes"
 msgstr ""
 
-#: config/tc-arm.c:20167
+#: config/tc-arm.c:20007
 msgid "GOT already in the symbol table"
 msgstr ""
 
-#: config/tc-arm.c:20505 config/tc-arm.c:20547 config/tc-arm.c:20827
+#: config/tc-arm.c:20345 config/tc-arm.c:20387 config/tc-arm.c:20657
 #, c-format
 msgid "undefined symbol %s used as an immediate value"
 msgstr ""
 
-#: config/tc-arm.c:20507 config/tc-arm.c:20549
+#: config/tc-arm.c:20347 config/tc-arm.c:20389
 #, c-format
 msgid "symbol %s is in a different section"
 msgstr ""
 
-#: config/tc-arm.c:20509 config/tc-arm.c:20551
+#: config/tc-arm.c:20349 config/tc-arm.c:20391
 #, c-format
 msgid "symbol %s is weak and may be overridden later"
 msgstr ""
 
-#: config/tc-arm.c:20528 config/tc-arm.c:20869
+#: config/tc-arm.c:20368 config/tc-arm.c:20699
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr ""
 
-#: config/tc-arm.c:20584
+#: config/tc-arm.c:20424
 #, c-format
 msgid "unable to compute ADRL instructions for PC offset of 0x%lx"
 msgstr ""
 
-#: config/tc-arm.c:20619 config/tc-arm.c:20649
+#: config/tc-arm.c:20459 config/tc-arm.c:20484
 msgid "invalid literal constant: pool needs to be closer"
 msgstr ""
 
-#: config/tc-arm.c:20622 config/tc-arm.c:20670
+#: config/tc-arm.c:20462 config/tc-arm.c:20500
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:20651
+#: config/tc-arm.c:20486
 #, c-format
 msgid "bad immediate value for 8-bit offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:20711
+#: config/tc-arm.c:20541
 msgid "offset not a multiple of 4"
 msgstr ""
 
-#: config/tc-arm.c:20718 config/tc-arm.c:20733 config/tc-arm.c:20748
-#: config/tc-arm.c:20759 config/tc-arm.c:20782 config/tc-arm.c:21494
+#: config/tc-arm.c:20548 config/tc-arm.c:20563 config/tc-arm.c:20578
+#: config/tc-arm.c:20589 config/tc-arm.c:20612 config/tc-arm.c:21332
 #: config/tc-moxie.c:662 config/tc-pj.c:448 config/tc-sh.c:4281
 msgid "offset out of range"
 msgstr ""
 
-#: config/tc-arm.c:20885
+#: config/tc-arm.c:20715
 msgid "invalid smc expression"
 msgstr ""
 
-#: config/tc-arm.c:20894
+#: config/tc-arm.c:20724
 msgid "invalid hvc expression"
 msgstr ""
 
-#: config/tc-arm.c:20905 config/tc-arm.c:20914
+#: config/tc-arm.c:20735 config/tc-arm.c:20744
 msgid "invalid swi expression"
 msgstr ""
 
-#: config/tc-arm.c:20924
+#: config/tc-arm.c:20754
 msgid "invalid expression in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:20985
+#: config/tc-arm.c:20815
 #, c-format
 msgid "blx to '%s' an ARM ISA state function changed to bl"
 msgstr ""
 
-#: config/tc-arm.c:21004
+#: config/tc-arm.c:20834
 msgid "misaligned branch destination"
 msgstr ""
 
-#: config/tc-arm.c:21090
+#: config/tc-arm.c:20838 config/tc-arm.c:20875 config/tc-arm.c:20889
+#: config/tc-arm.c:20902 config/tc-arm.c:21009 config/tc-arm.c:21027
+msgid "branch out of range"
+msgstr ""
+
+#: config/tc-arm.c:20924
 msgid "conditional branch out of range"
 msgstr ""
 
-#: config/tc-arm.c:21124
+#: config/tc-arm.c:20959
 #, c-format
 msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl"
 msgstr ""
 
-#: config/tc-arm.c:21174
+#: config/tc-arm.c:21015
 msgid "Thumb2 branch out of range"
 msgstr ""
 
-#: config/tc-arm.c:21263
+#: config/tc-arm.c:21106
 msgid "rel31 relocation overflow"
 msgstr ""
 
-#: config/tc-arm.c:21275 config/tc-arm.c:21303
+#: config/tc-arm.c:21118 config/tc-arm.c:21141
 msgid "co-processor offset out of range"
 msgstr ""
 
-#: config/tc-arm.c:21320
+#: config/tc-arm.c:21158
 #, c-format
 msgid "invalid offset, target not word aligned (0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:21327 config/tc-arm.c:21336 config/tc-arm.c:21344
-#: config/tc-arm.c:21352 config/tc-arm.c:21360
+#: config/tc-arm.c:21165 config/tc-arm.c:21174 config/tc-arm.c:21182
+#: config/tc-arm.c:21190 config/tc-arm.c:21198
 #, c-format
 msgid "invalid offset, value too big (0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:21401
+#: config/tc-arm.c:21239
 msgid "invalid Hi register with immediate"
 msgstr ""
 
-#: config/tc-arm.c:21417
+#: config/tc-arm.c:21255
 msgid "invalid immediate for stack address calculation"
 msgstr ""
 
-#: config/tc-arm.c:21425
+#: config/tc-arm.c:21263
 #, c-format
 msgid "invalid immediate for address calculation (value = 0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:21455
+#: config/tc-arm.c:21293
 #, c-format
 msgid "invalid immediate: %ld is out of range"
 msgstr ""
 
-#: config/tc-arm.c:21467
+#: config/tc-arm.c:21305
 #, c-format
 msgid "invalid shift value: %ld"
 msgstr ""
 
-#: config/tc-arm.c:21546
+#: config/tc-arm.c:21384
 #, c-format
 msgid "the offset 0x%08lX is not representable"
 msgstr ""
 
-#: config/tc-arm.c:21586
+#: config/tc-arm.c:21424
 #, c-format
 msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)"
 msgstr ""
 
-#: config/tc-arm.c:21625
+#: config/tc-arm.c:21463
 #, c-format
 msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)"
 msgstr ""
 
-#: config/tc-arm.c:21665
+#: config/tc-arm.c:21503
 #, c-format
 msgid "bad offset 0x%08lX (must be word-aligned)"
 msgstr ""
 
-#: config/tc-arm.c:21670
+#: config/tc-arm.c:21508
 #, c-format
 msgid "bad offset 0x%08lX (must be an 8-bit number of words)"
 msgstr ""
 
-#: config/tc-arm.c:21701 config/tc-score.c:7392
+#: config/tc-arm.c:21539 config/tc-score.c:7397
 #, c-format
 msgid "bad relocation fixup type (%d)"
 msgstr ""
 
-#: config/tc-arm.c:21812
+#: config/tc-arm.c:21650
 msgid "literal referenced across section boundary"
 msgstr ""
 
-#: config/tc-arm.c:21879
+#: config/tc-arm.c:21717
 msgid "internal relocation (type: IMMEDIATE) not fixed up"
 msgstr ""
 
-#: config/tc-arm.c:21884
+#: config/tc-arm.c:21722
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr ""
 
-#: config/tc-arm.c:21899
+#: config/tc-arm.c:21737
 #, c-format
 msgid "undefined local label `%s'"
 msgstr ""
 
-#: config/tc-arm.c:21905
+#: config/tc-arm.c:21743
 msgid "internal_relocation (type: OFFSET_IMM) not fixed up"
 msgstr ""
 
-#: config/tc-arm.c:21927 config/tc-cris.c:3986 config/tc-mcore.c:1926
+#: config/tc-arm.c:21765 config/tc-cris.c:3986 config/tc-mcore.c:1926
 #: config/tc-microblaze.c:1833 config/tc-mmix.c:2867 config/tc-moxie.c:757
-#: config/tc-ns32k.c:2248 config/tc-score.c:7478
+#: config/tc-ns32k.c:2248 config/tc-score.c:7490
 msgid "<unknown>"
 msgstr ""
 
-#: config/tc-arm.c:21930 config/tc-arm.c:21951 config/tc-score.c:7480
+#: config/tc-arm.c:21768 config/tc-arm.c:21789 config/tc-score.c:7492
 #, c-format
 msgid "cannot represent %s relocation in this object file format"
 msgstr ""
 
-#: config/tc-arm.c:22307
+#: config/tc-arm.c:22145
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr ""
 
-#: config/tc-arm.c:22436
+#: config/tc-arm.c:22274
 msgid "use of old and new-style options to set CPU type"
 msgstr ""
 
-#: config/tc-arm.c:22446
+#: config/tc-arm.c:22284
 msgid "use of old and new-style options to set FPU type"
 msgstr ""
 
-#: config/tc-arm.c:22522
+#: config/tc-arm.c:22360
 msgid "hard-float conflicts with specified fpu"
 msgstr ""
 
-#: config/tc-arm.c:22709
+#: config/tc-arm.c:22547
 msgid "generate PIC code"
 msgstr ""
 
-#: config/tc-arm.c:22710
+#: config/tc-arm.c:22548
 msgid "assemble Thumb code"
 msgstr ""
 
-#: config/tc-arm.c:22711
+#: config/tc-arm.c:22549
 msgid "support ARM/Thumb interworking"
 msgstr ""
 
-#: config/tc-arm.c:22713
+#: config/tc-arm.c:22551
 msgid "code uses 32-bit program counter"
 msgstr ""
 
-#: config/tc-arm.c:22714
+#: config/tc-arm.c:22552
 msgid "code uses 26-bit program counter"
 msgstr ""
 
-#: config/tc-arm.c:22715
+#: config/tc-arm.c:22553
 msgid "floating point args are in fp regs"
 msgstr ""
 
-#: config/tc-arm.c:22717
+#: config/tc-arm.c:22555
 msgid "re-entrant code"
 msgstr ""
 
-#: config/tc-arm.c:22718
+#: config/tc-arm.c:22556
 msgid "code is ATPCS conformant"
 msgstr ""
 
-#: config/tc-arm.c:22719
+#: config/tc-arm.c:22557
 msgid "assemble for big-endian"
 msgstr ""
 
-#: config/tc-arm.c:22720
+#: config/tc-arm.c:22558
 msgid "assemble for little-endian"
 msgstr ""
 
 #. These are recognized by the assembler, but have no affect on code.
-#: config/tc-arm.c:22724
+#: config/tc-arm.c:22562
 msgid "use frame pointer"
 msgstr ""
 
-#: config/tc-arm.c:22725
+#: config/tc-arm.c:22563
 msgid "use stack size checking"
 msgstr ""
 
-#: config/tc-arm.c:22728
+#: config/tc-arm.c:22566
 msgid "do not warn on use of deprecated feature"
 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:22745 config/tc-arm.c:22746
+#: config/tc-arm.c:22583 config/tc-arm.c:22584
 msgid "use -mcpu=arm1"
 msgstr ""
 
-#: config/tc-arm.c:22747 config/tc-arm.c:22748
+#: config/tc-arm.c:22585 config/tc-arm.c:22586
 msgid "use -mcpu=arm2"
 msgstr ""
 
-#: config/tc-arm.c:22749 config/tc-arm.c:22750
+#: config/tc-arm.c:22587 config/tc-arm.c:22588
 msgid "use -mcpu=arm250"
 msgstr ""
 
-#: config/tc-arm.c:22751 config/tc-arm.c:22752
+#: config/tc-arm.c:22589 config/tc-arm.c:22590
 msgid "use -mcpu=arm3"
 msgstr ""
 
-#: config/tc-arm.c:22753 config/tc-arm.c:22754
+#: config/tc-arm.c:22591 config/tc-arm.c:22592
 msgid "use -mcpu=arm6"
 msgstr ""
 
-#: config/tc-arm.c:22755 config/tc-arm.c:22756
+#: config/tc-arm.c:22593 config/tc-arm.c:22594
 msgid "use -mcpu=arm600"
 msgstr ""
 
-#: config/tc-arm.c:22757 config/tc-arm.c:22758
+#: config/tc-arm.c:22595 config/tc-arm.c:22596
 msgid "use -mcpu=arm610"
 msgstr ""
 
-#: config/tc-arm.c:22759 config/tc-arm.c:22760
+#: config/tc-arm.c:22597 config/tc-arm.c:22598
 msgid "use -mcpu=arm620"
 msgstr ""
 
-#: config/tc-arm.c:22761 config/tc-arm.c:22762
+#: config/tc-arm.c:22599 config/tc-arm.c:22600
 msgid "use -mcpu=arm7"
 msgstr ""
 
-#: config/tc-arm.c:22763 config/tc-arm.c:22764
+#: config/tc-arm.c:22601 config/tc-arm.c:22602
 msgid "use -mcpu=arm70"
 msgstr ""
 
-#: config/tc-arm.c:22765 config/tc-arm.c:22766
+#: config/tc-arm.c:22603 config/tc-arm.c:22604
 msgid "use -mcpu=arm700"
 msgstr ""
 
-#: config/tc-arm.c:22767 config/tc-arm.c:22768
+#: config/tc-arm.c:22605 config/tc-arm.c:22606
 msgid "use -mcpu=arm700i"
 msgstr ""
 
-#: config/tc-arm.c:22769 config/tc-arm.c:22770
+#: config/tc-arm.c:22607 config/tc-arm.c:22608
 msgid "use -mcpu=arm710"
 msgstr ""
 
-#: config/tc-arm.c:22771 config/tc-arm.c:22772
+#: config/tc-arm.c:22609 config/tc-arm.c:22610
 msgid "use -mcpu=arm710c"
 msgstr ""
 
-#: config/tc-arm.c:22773 config/tc-arm.c:22774
+#: config/tc-arm.c:22611 config/tc-arm.c:22612
 msgid "use -mcpu=arm720"
 msgstr ""
 
-#: config/tc-arm.c:22775 config/tc-arm.c:22776
+#: config/tc-arm.c:22613 config/tc-arm.c:22614
 msgid "use -mcpu=arm7d"
 msgstr ""
 
-#: config/tc-arm.c:22777 config/tc-arm.c:22778
+#: config/tc-arm.c:22615 config/tc-arm.c:22616
 msgid "use -mcpu=arm7di"
 msgstr ""
 
-#: config/tc-arm.c:22779 config/tc-arm.c:22780
+#: config/tc-arm.c:22617 config/tc-arm.c:22618
 msgid "use -mcpu=arm7m"
 msgstr ""
 
-#: config/tc-arm.c:22781 config/tc-arm.c:22782
+#: config/tc-arm.c:22619 config/tc-arm.c:22620
 msgid "use -mcpu=arm7dm"
 msgstr ""
 
-#: config/tc-arm.c:22783 config/tc-arm.c:22784
+#: config/tc-arm.c:22621 config/tc-arm.c:22622
 msgid "use -mcpu=arm7dmi"
 msgstr ""
 
-#: config/tc-arm.c:22785 config/tc-arm.c:22786
+#: config/tc-arm.c:22623 config/tc-arm.c:22624
 msgid "use -mcpu=arm7100"
 msgstr ""
 
-#: config/tc-arm.c:22787 config/tc-arm.c:22788
+#: config/tc-arm.c:22625 config/tc-arm.c:22626
 msgid "use -mcpu=arm7500"
 msgstr ""
 
-#: config/tc-arm.c:22789 config/tc-arm.c:22790
+#: config/tc-arm.c:22627 config/tc-arm.c:22628
 msgid "use -mcpu=arm7500fe"
 msgstr ""
 
-#: config/tc-arm.c:22791 config/tc-arm.c:22792 config/tc-arm.c:22793
-#: config/tc-arm.c:22794
+#: config/tc-arm.c:22629 config/tc-arm.c:22630 config/tc-arm.c:22631
+#: config/tc-arm.c:22632
 msgid "use -mcpu=arm7tdmi"
 msgstr ""
 
-#: config/tc-arm.c:22795 config/tc-arm.c:22796
+#: config/tc-arm.c:22633 config/tc-arm.c:22634
 msgid "use -mcpu=arm710t"
 msgstr ""
 
-#: config/tc-arm.c:22797 config/tc-arm.c:22798
+#: config/tc-arm.c:22635 config/tc-arm.c:22636
 msgid "use -mcpu=arm720t"
 msgstr ""
 
-#: config/tc-arm.c:22799 config/tc-arm.c:22800
+#: config/tc-arm.c:22637 config/tc-arm.c:22638
 msgid "use -mcpu=arm740t"
 msgstr ""
 
-#: config/tc-arm.c:22801 config/tc-arm.c:22802
+#: config/tc-arm.c:22639 config/tc-arm.c:22640
 msgid "use -mcpu=arm8"
 msgstr ""
 
-#: config/tc-arm.c:22803 config/tc-arm.c:22804
+#: config/tc-arm.c:22641 config/tc-arm.c:22642
 msgid "use -mcpu=arm810"
 msgstr ""
 
-#: config/tc-arm.c:22805 config/tc-arm.c:22806
+#: config/tc-arm.c:22643 config/tc-arm.c:22644
 msgid "use -mcpu=arm9"
 msgstr ""
 
-#: config/tc-arm.c:22807 config/tc-arm.c:22808
+#: config/tc-arm.c:22645 config/tc-arm.c:22646
 msgid "use -mcpu=arm9tdmi"
 msgstr ""
 
-#: config/tc-arm.c:22809 config/tc-arm.c:22810
+#: config/tc-arm.c:22647 config/tc-arm.c:22648
 msgid "use -mcpu=arm920"
 msgstr ""
 
-#: config/tc-arm.c:22811 config/tc-arm.c:22812
+#: config/tc-arm.c:22649 config/tc-arm.c:22650
 msgid "use -mcpu=arm940"
 msgstr ""
 
-#: config/tc-arm.c:22813
+#: config/tc-arm.c:22651
 msgid "use -mcpu=strongarm"
 msgstr ""
 
-#: config/tc-arm.c:22815
+#: config/tc-arm.c:22653
 msgid "use -mcpu=strongarm110"
 msgstr ""
 
-#: config/tc-arm.c:22817
+#: config/tc-arm.c:22655
 msgid "use -mcpu=strongarm1100"
 msgstr ""
 
-#: config/tc-arm.c:22819
+#: config/tc-arm.c:22657
 msgid "use -mcpu=strongarm1110"
 msgstr ""
 
-#: config/tc-arm.c:22820
+#: config/tc-arm.c:22658
 msgid "use -mcpu=xscale"
 msgstr ""
 
-#: config/tc-arm.c:22821
+#: config/tc-arm.c:22659
 msgid "use -mcpu=iwmmxt"
 msgstr ""
 
-#: config/tc-arm.c:22822
+#: config/tc-arm.c:22660
 msgid "use -mcpu=all"
 msgstr ""
 
 #. Architecture variants -- don't add any more to this list either.
-#: config/tc-arm.c:22825 config/tc-arm.c:22826
+#: config/tc-arm.c:22663 config/tc-arm.c:22664
 msgid "use -march=armv2"
 msgstr ""
 
-#: config/tc-arm.c:22827 config/tc-arm.c:22828
+#: config/tc-arm.c:22665 config/tc-arm.c:22666
 msgid "use -march=armv2a"
 msgstr ""
 
-#: config/tc-arm.c:22829 config/tc-arm.c:22830
+#: config/tc-arm.c:22667 config/tc-arm.c:22668
 msgid "use -march=armv3"
 msgstr ""
 
-#: config/tc-arm.c:22831 config/tc-arm.c:22832
+#: config/tc-arm.c:22669 config/tc-arm.c:22670
 msgid "use -march=armv3m"
 msgstr ""
 
-#: config/tc-arm.c:22833 config/tc-arm.c:22834
+#: config/tc-arm.c:22671 config/tc-arm.c:22672
 msgid "use -march=armv4"
 msgstr ""
 
-#: config/tc-arm.c:22835 config/tc-arm.c:22836
+#: config/tc-arm.c:22673 config/tc-arm.c:22674
 msgid "use -march=armv4t"
 msgstr ""
 
-#: config/tc-arm.c:22837 config/tc-arm.c:22838
+#: config/tc-arm.c:22675 config/tc-arm.c:22676
 msgid "use -march=armv5"
 msgstr ""
 
-#: config/tc-arm.c:22839 config/tc-arm.c:22840
+#: config/tc-arm.c:22677 config/tc-arm.c:22678
 msgid "use -march=armv5t"
 msgstr ""
 
-#: config/tc-arm.c:22841 config/tc-arm.c:22842
+#: config/tc-arm.c:22679 config/tc-arm.c:22680
 msgid "use -march=armv5te"
 msgstr ""
 
 #. Floating point variants -- don't add any more to this list either.
-#: config/tc-arm.c:22845
+#: config/tc-arm.c:22683
 msgid "use -mfpu=fpe"
 msgstr ""
 
-#: config/tc-arm.c:22846
+#: config/tc-arm.c:22684
 msgid "use -mfpu=fpa10"
 msgstr ""
 
-#: config/tc-arm.c:22847
+#: config/tc-arm.c:22685
 msgid "use -mfpu=fpa11"
 msgstr ""
 
-#: config/tc-arm.c:22849
+#: config/tc-arm.c:22687
 msgid "use either -mfpu=softfpa or -mfpu=softvfp"
 msgstr ""
 
-#: config/tc-arm.c:23178
+#: config/tc-arm.c:23016
 msgid "invalid architectural extension"
 msgstr ""
 
-#: config/tc-arm.c:23211
+#: config/tc-arm.c:23049
 msgid "must specify extensions to add before specifying those to remove"
 msgstr ""
 
-#: config/tc-arm.c:23219
+#: config/tc-arm.c:23057
 msgid "missing architectural extension"
 msgstr ""
 
-#: config/tc-arm.c:23234
+#: config/tc-arm.c:23072
 msgid "extension does not apply to the base architecture"
 msgstr ""
 
-#: config/tc-arm.c:23257
+#: config/tc-arm.c:23095
 #, c-format
 msgid "unknown architectural extension `%s'"
 msgstr ""
 
-#: config/tc-arm.c:23259
+#: config/tc-arm.c:23097
 msgid "architectural extensions must be specified in alphabetical order"
 msgstr ""
 
-#: config/tc-arm.c:23291
+#: config/tc-arm.c:23129
 #, c-format
 msgid "missing cpu name `%s'"
 msgstr ""
 
-#: config/tc-arm.c:23317 config/tc-arm.c:23813
+#: config/tc-arm.c:23155 config/tc-arm.c:23651
 #, c-format
 msgid "unknown cpu `%s'"
 msgstr ""
 
-#: config/tc-arm.c:23335
+#: config/tc-arm.c:23173
 #, c-format
 msgid "missing architecture name `%s'"
 msgstr ""
 
-#: config/tc-arm.c:23352 config/tc-arm.c:23847 config/tc-arm.c:23878
-#: config/tc-arm.c:23929 config/tc-score.c:7715
+#: config/tc-arm.c:23190 config/tc-arm.c:23685 config/tc-arm.c:23716
+#: config/tc-arm.c:23767 config/tc-score.c:7727
 #, c-format
 msgid "unknown architecture `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:23368 config/tc-arm.c:23960
+#: config/tc-arm.c:23206 config/tc-arm.c:23798
 #, c-format
 msgid "unknown floating point format `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:23384
+#: config/tc-arm.c:23222
 #, c-format
 msgid "unknown floating point abi `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:23400
+#: config/tc-arm.c:23238
 #, c-format
 msgid "unknown EABI `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:23420
+#: config/tc-arm.c:23258
 #, c-format
 msgid "unknown implicit IT mode `%s', should be arm, thumb, always, or never."
 msgstr ""
 
-#: config/tc-arm.c:23430
+#: config/tc-arm.c:23268
 msgid "<cpu name>\t  assemble for CPU <cpu name>"
 msgstr ""
 
-#: config/tc-arm.c:23432
+#: config/tc-arm.c:23270
 msgid "<arch name>\t  assemble for architecture <arch name>"
 msgstr ""
 
-#: config/tc-arm.c:23434
+#: config/tc-arm.c:23272
 msgid "<fpu name>\t  assemble for FPU architecture <fpu name>"
 msgstr ""
 
-#: config/tc-arm.c:23436
+#: config/tc-arm.c:23274
 msgid "<abi>\t  assemble for floating point ABI <abi>"
 msgstr ""
 
-#: config/tc-arm.c:23439
+#: config/tc-arm.c:23277
 msgid "<ver>\t\t  assemble for eabi version <ver>"
 msgstr ""
 
-#: config/tc-arm.c:23442
+#: config/tc-arm.c:23280
 msgid "<mode>\t  controls implicit insertion of IT instructions"
 msgstr ""
 
-#: config/tc-arm.c:23486 config/tc-arm.c:23504 config/tc-arm.c:23524
+#: config/tc-arm.c:23324 config/tc-arm.c:23342 config/tc-arm.c:23362
 #, c-format
 msgid "option `-%c%s' is deprecated: %s"
 msgstr ""
 
-#: config/tc-arm.c:23544
+#: config/tc-arm.c:23382
 #, c-format
 msgid " ARM-specific assembler options:\n"
 msgstr ""
 
-#: config/tc-arm.c:23555
+#: config/tc-arm.c:23393
 #, c-format
 msgid "  -EB                     assemble code for a big-endian cpu\n"
 msgstr ""
 
-#: config/tc-arm.c:23560
+#: config/tc-arm.c:23398
 #, c-format
 msgid "  -EL                     assemble code for a little-endian cpu\n"
 msgstr ""
 
-#: config/tc-arm.c:23564
+#: config/tc-arm.c:23402
 #, c-format
 msgid "  --fix-v4bx              Allow BX in ARMv4 code\n"
 msgstr ""
 
-#: config/tc-arm.c:23911
+#: config/tc-arm.c:23749
 #, c-format
 msgid ""
 "architectural extension `%s' is not allowed for the current base architecture"
@@ -3726,7 +3639,7 @@ msgstr ""
 msgid "constant out of 8-bit range: %d"
 msgstr ""
 
-#: config/tc-avr.c:688 config/tc-score.c:1199 read.c:3661
+#: config/tc-avr.c:688 config/tc-score.c:1200 read.c:3662
 msgid "illegal expression"
 msgstr ""
 
@@ -3825,8 +3738,8 @@ msgstr ""
 
 #. xgettext:c-format.
 #: config/tc-avr.c:1412 config/tc-bfin.c:833 config/tc-d10v.c:1466
-#: config/tc-d30v.c:1774 config/tc-mn10200.c:782 config/tc-mn10300.c:2170
-#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6581
+#: config/tc-d30v.c:1774 config/tc-mn10200.c:781 config/tc-mn10300.c:2170
+#: config/tc-msp430.c:2055 config/tc-or32.c:957 config/tc-ppc.c:6611
 #: config/tc-spu.c:879 config/tc-spu.c:1090 config/tc-v850.c:3000
 #: config/tc-z80.c:2021
 #, c-format
@@ -3913,21 +3826,21 @@ msgstr ""
 msgid "rel too far BFD_RELOC_16"
 msgstr ""
 
-#: config/tc-cr16.c:165 read.c:4421
+#: config/tc-cr16.c:165 read.c:4422
 msgid "using a bit field width of zero"
 msgstr ""
 
-#: config/tc-cr16.c:173 read.c:4429
+#: config/tc-cr16.c:173 read.c:4430
 #, c-format
 msgid "field width \"%s\" too complex for a bitfield"
 msgstr ""
 
-#: config/tc-cr16.c:182 read.c:4437
+#: config/tc-cr16.c:182 read.c:4438
 #, c-format
 msgid "field width %lu too big to fit in %d bytes: truncated to %d bits"
 msgstr ""
 
-#: config/tc-cr16.c:204 read.c:4459
+#: config/tc-cr16.c:204 read.c:4460
 #, c-format
 msgid "field value \"%s\" too complex for a bitfield"
 msgstr ""
@@ -3937,203 +3850,203 @@ msgstr ""
 msgid "Unknown register pair - index relative mode: `%d'"
 msgstr ""
 
-#: config/tc-cr16.c:570 config/tc-crx.c:345 config/tc-mn10200.c:769
-#: write.c:1003
+#: config/tc-cr16.c:571 config/tc-crx.c:345 config/tc-mn10200.c:768
+#: write.c:990
 #, c-format
 msgid "can't resolve `%s' {%s section} - `%s' {%s section}"
 msgstr ""
 
-#: config/tc-cr16.c:600 config/tc-crx.c:361
+#: config/tc-cr16.c:603 config/tc-crx.c:361
 #, c-format
 msgid "internal error: reloc %d (`%s') not supported by object file format"
 msgstr ""
 
-#: config/tc-cr16.c:693 config/tc-i386.c:8839 config/tc-s390.c:1911
+#: config/tc-cr16.c:696 config/tc-i386.c:8723 config/tc-s390.c:1911
 msgid "GOT already in symbol table"
 msgstr ""
 
-#: config/tc-cr16.c:802 config/tc-cr16.c:825 config/tc-cris.c:1190
+#: config/tc-cr16.c:805 config/tc-cr16.c:828 config/tc-cris.c:1190
 #: config/tc-crx.c:535 config/tc-crx.c:562 config/tc-crx.c:580
 #: config/tc-pdp11.c:194
 msgid "Virtual memory exhausted"
 msgstr ""
 
-#: config/tc-cr16.c:810 config/tc-crx.c:572 config/tc-crx.c:591
-#: config/tc-m68k.c:4656 config/tc-tilegx.c:300 config/tc-tilepro.c:242
+#: config/tc-cr16.c:813 config/tc-crx.c:572 config/tc-crx.c:591
+#: config/tc-m68k.c:4656
 #, c-format
 msgid "Internal Error:  Can't hash %s: %s"
 msgstr ""
 
-#: config/tc-cr16.c:836 config/tc-cris.c:1224 config/tc-crx.c:545
+#: config/tc-cr16.c:839 config/tc-cris.c:1224 config/tc-crx.c:545
 #, c-format
 msgid "Can't hash `%s': %s\n"
 msgstr ""
 
-#: config/tc-cr16.c:837 config/tc-cris.c:1225 config/tc-crx.c:546
+#: config/tc-cr16.c:840 config/tc-cris.c:1225 config/tc-crx.c:546
 msgid "(unknown reason)"
 msgstr ""
 
 #. Missing or bad expr becomes absolute 0.
-#: config/tc-cr16.c:889 config/tc-crx.c:619
+#: config/tc-cr16.c:892 config/tc-crx.c:619
 #, c-format
 msgid "missing or invalid displacement expression `%s' taken as 0"
 msgstr ""
 
-#: config/tc-cr16.c:939
+#: config/tc-cr16.c:942
 #, c-format
 msgid "GOT bad expression with %s."
 msgstr ""
 
-#: config/tc-cr16.c:1050
+#: config/tc-cr16.c:1053
 #, c-format
 msgid "operand %d: illegal use expression: `%s`"
 msgstr ""
 
-#: config/tc-cr16.c:1115 config/tc-crx.c:1127
+#: config/tc-cr16.c:1118 config/tc-crx.c:1127
 #, c-format
 msgid "Unknown register: `%d'"
 msgstr ""
 
 #. Issue a error message when register is illegal.
-#: config/tc-cr16.c:1123 config/tc-crx.c:1135
+#: config/tc-cr16.c:1126 config/tc-crx.c:1135
 #, c-format
 msgid "Illegal register (`%s') in Instruction: `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1194 config/tc-cr16.c:1269 config/tc-crx.c:757
+#: config/tc-cr16.c:1197 config/tc-cr16.c:1272 config/tc-crx.c:757
 #: config/tc-crx.c:777 config/tc-crx.c:792
 #, c-format
 msgid "Illegal register `%s' in Instruction `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1222 config/tc-cr16.c:1233
+#: config/tc-cr16.c:1225 config/tc-cr16.c:1236
 #, c-format
 msgid "Illegal register pair `%s' in Instruction `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1258 config/tc-i960.c:835
+#: config/tc-cr16.c:1261 config/tc-i960.c:835
 msgid "unmatched '['"
 msgstr ""
 
-#: config/tc-cr16.c:1264 config/tc-i960.c:842
+#: config/tc-cr16.c:1267 config/tc-i960.c:842
 msgid "garbage after index spec ignored"
 msgstr ""
 
-#: config/tc-cr16.c:1412 config/tc-crx.c:936
+#: config/tc-cr16.c:1415 config/tc-crx.c:936
 #, c-format
 msgid "Illegal operands (whitespace): `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1424 config/tc-cr16.c:1431 config/tc-cr16.c:1448
+#: config/tc-cr16.c:1427 config/tc-cr16.c:1434 config/tc-cr16.c:1451
 #: config/tc-crx.c:948 config/tc-crx.c:955 config/tc-crx.c:972
 #: config/tc-crx.c:1764
 #, c-format
 msgid "Missing matching brackets : `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1480 config/tc-crx.c:998
+#: config/tc-cr16.c:1483 config/tc-crx.c:998
 #, c-format
 msgid "Unknown exception: `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1565 config/tc-crx.c:1094
+#: config/tc-cr16.c:1570 config/tc-crx.c:1094
 #, c-format
 msgid "Illegal `cinv' parameter: `%c'"
 msgstr ""
 
-#: config/tc-cr16.c:1586 config/tc-cr16.c:1625
+#: config/tc-cr16.c:1592 config/tc-cr16.c:1631
 #, c-format
 msgid "Unknown register pair: `%d'"
 msgstr ""
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1594
+#: config/tc-cr16.c:1600
 #, c-format
 msgid "Illegal register pair (`%s') in Instruction: `%s'"
 msgstr ""
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1633
+#: config/tc-cr16.c:1639
 #, c-format
 msgid "Illegal index register pair (`%s') in Instruction: `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1672
+#: config/tc-cr16.c:1678
 #, c-format
 msgid "Unknown processor register : `%d'"
 msgstr ""
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1680
+#: config/tc-cr16.c:1686
 #, c-format
 msgid "Illegal processor register (`%s') in Instruction: `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:1728
+#: config/tc-cr16.c:1734
 #, c-format
 msgid "Unknown processor register (32 bit) : `%d'"
 msgstr ""
 
 #. Issue a error message when register  pair is illegal.
-#: config/tc-cr16.c:1736
+#: config/tc-cr16.c:1742
 #, c-format
 msgid "Illegal 32 bit - processor register (`%s') in Instruction: `%s'"
 msgstr ""
 
-#: config/tc-cr16.c:2100 config/tc-crx.c:1662 config/tc-crx.c:1679
+#: config/tc-cr16.c:2106 config/tc-crx.c:1662 config/tc-crx.c:1679
 #, c-format
 msgid "Same src/dest register is used (`r%d'), result is undefined"
 msgstr ""
 
-#: config/tc-cr16.c:2121
+#: config/tc-cr16.c:2127
 msgid "RA register is saved twice."
 msgstr ""
 
-#: config/tc-cr16.c:2125
+#: config/tc-cr16.c:2131
 #, c-format
 msgid "`%s' Illegal use of registers."
 msgstr ""
 
-#: config/tc-cr16.c:2139
+#: config/tc-cr16.c:2145
 #, c-format
 msgid "`%s' Illegal count-register combination."
 msgstr ""
 
-#: config/tc-cr16.c:2145
+#: config/tc-cr16.c:2151
 #, c-format
 msgid "`%s' Illegal use of register."
 msgstr ""
 
-#: config/tc-cr16.c:2154 config/tc-crx.c:1671
+#: config/tc-cr16.c:2160 config/tc-crx.c:1671
 #, c-format
 msgid "`%s' has undefined result"
 msgstr ""
 
-#: config/tc-cr16.c:2162
+#: config/tc-cr16.c:2168
 #, c-format
 msgid "Same src/dest register is used (`r%d'),result is undefined"
 msgstr ""
 
-#: config/tc-cr16.c:2333 config/tc-crx.c:1576
+#: config/tc-cr16.c:2339 config/tc-crx.c:1576
 msgid "Incorrect number of operands"
 msgstr ""
 
-#: config/tc-cr16.c:2335 config/tc-crx.c:1578
+#: config/tc-cr16.c:2341 config/tc-crx.c:1578
 #, c-format
 msgid "Illegal type of operand (arg %d)"
 msgstr ""
 
-#: config/tc-cr16.c:2341 config/tc-crx.c:1584
+#: config/tc-cr16.c:2347 config/tc-crx.c:1584
 #, c-format
 msgid "Operand out of range (arg %d)"
 msgstr ""
 
-#: config/tc-cr16.c:2344 config/tc-crx.c:1587
+#: config/tc-cr16.c:2350 config/tc-crx.c:1587
 #, c-format
 msgid "Operand has odd displacement (arg %d)"
 msgstr ""
 
-#: config/tc-cr16.c:2347 config/tc-cr16.c:2378 config/tc-crx.c:1600
+#: config/tc-cr16.c:2353 config/tc-cr16.c:2384 config/tc-crx.c:1600
 #: config/tc-crx.c:1631
 #, c-format
 msgid "Illegal operand (arg %d)"
@@ -4141,15 +4054,15 @@ msgstr ""
 
 #. Give an error if a frag containing code is not aligned to a 2-byte
 #. boundary.
-#: config/tc-cr16.c:2480 config/tc-cr16.h:73 config/tc-crx.c:1953
+#: config/tc-cr16.c:2486 config/tc-cr16.h:73 config/tc-crx.c:1953
 #: config/tc-crx.h:76
 msgid "instruction address is not a multiple of 2"
 msgstr ""
 
-#: config/tc-cr16.c:2555 config/tc-cris.c:1538 config/tc-cris.c:1546
+#: config/tc-cr16.c:2563 config/tc-cris.c:1538 config/tc-cris.c:1546
 #: config/tc-crx.c:1989 config/tc-dlx.c:685 config/tc-hppa.c:3244
 #: config/tc-hppa.c:3251 config/tc-i860.c:491 config/tc-i860.c:508
-#: config/tc-i860.c:988 config/tc-sparc.c:1518 config/tc-sparc.c:1526
+#: config/tc-i860.c:988 config/tc-sparc.c:1410 config/tc-sparc.c:1418
 #, c-format
 msgid "Unknown opcode: `%s'"
 msgstr ""
@@ -4247,7 +4160,7 @@ msgstr ""
 
 #. We've come to the end of instructions with this
 #. opcode, so it must be an error.
-#: config/tc-cris.c:2079 config/tc-mips.c:13126
+#: config/tc-cris.c:2079 config/tc-mips.c:10425 config/tc-mips.c:10430
 msgid "Illegal operands"
 msgstr ""
 
@@ -4842,14 +4755,14 @@ msgstr ""
 msgid ".endfunc missing for previous .proc"
 msgstr ""
 
-#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:2321
+#: config/tc-dlx.c:291 config/tc-i860.c:227 config/tc-mips.c:1927
 #, c-format
 msgid "internal error: can't hash `%s': %s\n"
 msgstr ""
 
 #. Probably a memory allocation problem?  Give up now.
-#: config/tc-dlx.c:298 config/tc-hppa.c:8354 config/tc-mips.c:2324
-#: config/tc-mips.c:2416 config/tc-or32.c:211 config/tc-sparc.c:888
+#: config/tc-dlx.c:298 config/tc-hppa.c:8354 config/tc-mips.c:1930
+#: config/tc-mips.c:1984 config/tc-or32.c:211 config/tc-sparc.c:860
 msgid "Broken assembler.  No assembly attempted."
 msgstr ""
 
@@ -4919,40 +4832,6 @@ msgstr ""
 msgid "Invalid expression after # number\n"
 msgstr ""
 
-#: config/tc-epiphany.c:147
-#, c-format
-msgid "EPIPHANY specific command line options:\n"
-msgstr ""
-
-#: config/tc-epiphany.c:386
-msgid "register number too large for push/pop"
-msgstr ""
-
-#: config/tc-epiphany.c:390
-msgid "register is out of order"
-msgstr ""
-
-#: config/tc-epiphany.c:401 config/tc-m68k.c:6037 config/tc-m68k.c:6066
-msgid "bad register list"
-msgstr ""
-
-#: config/tc-epiphany.c:404
-msgid "malformed reglist in push/pop"
-msgstr ""
-
-#. Checks for behavioral restrictions on LD/ST instructions.
-#: config/tc-epiphany.c:505
-msgid "destination register modified by displacement-post-modified address"
-msgstr ""
-
-#: config/tc-epiphany.c:506
-msgid "ldrd/strd requires even:odd register pair"
-msgstr ""
-
-#: config/tc-epiphany.c:824 config/tc-m32r.c:1789
-msgid "Addend to unresolved symbol not on word boundary."
-msgstr ""
-
 #: config/tc-fr30.c:82
 #, c-format
 msgid " FR30 specific command line options:\n"
@@ -5245,7 +5124,7 @@ msgstr ""
 msgid "operand/size mis-match"
 msgstr ""
 
-#: config/tc-h8300.c:1952 config/tc-mips.c:13197 config/tc-sh.c:2971
+#: config/tc-h8300.c:1952 config/tc-mips.c:10489 config/tc-sh.c:2971
 #: config/tc-sh64.c:2795 config/tc-z8k.c:1226
 msgid "unknown opcode"
 msgstr ""
@@ -5708,7 +5587,7 @@ msgstr ""
 msgid "-R option not supported on this target."
 msgstr ""
 
-#: config/tc-hppa.c:8335 config/tc-sparc.c:843 config/tc-sparc.c:880
+#: config/tc-hppa.c:8335 config/tc-sparc.c:815 config/tc-sparc.c:852
 #, c-format
 msgid "Internal error: can't hash `%s': %s\n"
 msgstr ""
@@ -5839,7 +5718,7 @@ msgstr ""
 msgid "wrong number of operands"
 msgstr ""
 
-#: config/tc-i370.c:1928 config/tc-mn10200.c:899 config/tc-mn10300.c:1251
+#: config/tc-i370.c:1928 config/tc-mn10200.c:898 config/tc-mn10300.c:1251
 #: config/tc-ppc.c:2405 config/tc-s390.c:1590 config/tc-v850.c:2024
 #, c-format
 msgid "Unrecognized opcode: `%s'"
@@ -5859,539 +5738,527 @@ msgstr ""
 msgid "Internal Error: bad instruction length"
 msgstr ""
 
-#: config/tc-i386.c:1885
+#: config/tc-i386.c:1873
 #, c-format
 msgid "%s shortened to %s"
 msgstr ""
 
-#: config/tc-i386.c:1971
+#: config/tc-i386.c:1959
 msgid "same type of prefix used twice"
 msgstr ""
 
-#: config/tc-i386.c:1998
+#: config/tc-i386.c:1986
 #, c-format
 msgid "64bit mode not supported on `%s'."
 msgstr ""
 
-#: config/tc-i386.c:2007
+#: config/tc-i386.c:1995
 #, c-format
 msgid "32bit mode not supported on `%s'."
 msgstr ""
 
-#: config/tc-i386.c:2047
+#: config/tc-i386.c:2035
 msgid "bad argument to syntax directive."
 msgstr ""
 
-#: config/tc-i386.c:2096
+#: config/tc-i386.c:2084
 msgid "bad argument to sse_check directive."
 msgstr ""
 
-#: config/tc-i386.c:2100
+#: config/tc-i386.c:2088
 msgid "missing argument for sse_check directive"
 msgstr ""
 
-#: config/tc-i386.c:2135
+#: config/tc-i386.c:2118
 #, c-format
 msgid "`%s' is not supported on `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2209
+#: config/tc-i386.c:2192
 #, c-format
 msgid "no such architecture: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2214
+#: config/tc-i386.c:2197
 msgid "missing cpu architecture"
 msgstr ""
 
-#: config/tc-i386.c:2228
+#: config/tc-i386.c:2211
 #, c-format
 msgid "no such architecture modifier: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:2243 config/tc-i386.c:2266
+#: config/tc-i386.c:2226 config/tc-i386.c:2242
 msgid "Intel L1OM is 64bit ELF only"
 msgstr ""
 
-#: config/tc-i386.c:2250 config/tc-i386.c:2273
-msgid "Intel K1OM is 64bit ELF only"
-msgstr ""
-
-#: config/tc-i386.c:2284 config/tc-i386.c:8711
+#: config/tc-i386.c:2253 config/tc-i386.c:8600
 msgid "unknown architecture"
 msgstr ""
 
-#: config/tc-i386.c:2318 config/tc-i386.c:2340
+#: config/tc-i386.c:2287 config/tc-i386.c:2309
 #, c-format
 msgid "internal Error:  Can't hash %s: %s"
 msgstr ""
 
-#: config/tc-i386.c:2635
+#: config/tc-i386.c:2604
 #, c-format
 msgid "unknown relocation (%u)"
 msgstr ""
 
-#: config/tc-i386.c:2637
+#: config/tc-i386.c:2606
 #, c-format
 msgid "%u-byte relocation cannot be applied to %u-byte field"
 msgstr ""
 
-#: config/tc-i386.c:2641
+#: config/tc-i386.c:2610
 msgid "non-pc-relative relocation for pc-relative field"
 msgstr ""
 
-#: config/tc-i386.c:2646
+#: config/tc-i386.c:2615
 msgid "relocated field and relocation type differ in signedness"
 msgstr ""
 
-#: config/tc-i386.c:2655
+#: config/tc-i386.c:2624
 msgid "there are no unsigned pc-relative relocations"
 msgstr ""
 
-#: config/tc-i386.c:2663
+#: config/tc-i386.c:2632
 #, c-format
 msgid "cannot do %u byte pc-relative relocation"
 msgstr ""
 
-#: config/tc-i386.c:2680
+#: config/tc-i386.c:2649
 #, c-format
 msgid "cannot do %s %u byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:2964
+#: config/tc-i386.c:2933
 #, c-format
 msgid "can't use register '%s%s' as operand %d in '%s'."
 msgstr ""
 
-#: config/tc-i386.c:3076
+#: config/tc-i386.c:3045
 #, c-format
 msgid "SSE instruction `%s' is used"
 msgstr ""
 
-#: config/tc-i386.c:3090 config/tc-i386.c:4562
+#: config/tc-i386.c:3059 config/tc-i386.c:4489
 #, c-format
 msgid "ambiguous operand size for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3107
+#: config/tc-i386.c:3076
 msgid "expecting lockable instruction after `lock'"
 msgstr ""
 
 #. UnixWare fsub no args is alias for fsubp, fadd -> faddp, etc.
-#: config/tc-i386.c:3158
+#: config/tc-i386.c:3127
 #, c-format
 msgid "translating to `%sp'"
 msgstr ""
 
-#: config/tc-i386.c:3213
+#: config/tc-i386.c:3182
 #, c-format
 msgid "can't encode register '%s%s' in an instruction requiring REX prefix."
 msgstr ""
 
-#: config/tc-i386.c:3256 config/tc-i386.c:3388
+#: config/tc-i386.c:3225 config/tc-i386.c:3357
 #, c-format
 msgid "no such instruction: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3267 config/tc-i386.c:3421
+#: config/tc-i386.c:3236 config/tc-i386.c:3390
 #, c-format
 msgid "invalid character %s in mnemonic"
 msgstr ""
 
-#: config/tc-i386.c:3274
+#: config/tc-i386.c:3243
 msgid "expecting prefix; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:3276
+#: config/tc-i386.c:3245
 msgid "expecting mnemonic; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:3291 config/tc-i386.c:3439
+#: config/tc-i386.c:3260 config/tc-i386.c:3408
 #, c-format
 msgid "`%s' is only supported in 64-bit mode"
 msgstr ""
 
-#: config/tc-i386.c:3292 config/tc-i386.c:3438
+#: config/tc-i386.c:3261 config/tc-i386.c:3407
 #, c-format
 msgid "`%s' is not supported in 64-bit mode"
 msgstr ""
 
-#: config/tc-i386.c:3304
+#: config/tc-i386.c:3273
 #, c-format
 msgid "redundant %s prefix"
 msgstr ""
 
-#: config/tc-i386.c:3445
+#: config/tc-i386.c:3414
 #, c-format
 msgid "`%s' is not supported on `%s%s'"
 msgstr ""
 
-#: config/tc-i386.c:3456
+#: config/tc-i386.c:3425
 msgid "use .code16 to ensure correct addressing mode"
 msgstr ""
 
-#: config/tc-i386.c:3469
+#: config/tc-i386.c:3438
 #, c-format
 msgid "expecting string instruction after `%s'"
 msgstr ""
 
-#: config/tc-i386.c:3501
+#: config/tc-i386.c:3470
 #, c-format
 msgid "invalid character %s before operand %d"
 msgstr ""
 
-#: config/tc-i386.c:3515
+#: config/tc-i386.c:3484
 #, c-format
 msgid "unbalanced parenthesis in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:3518
+#: config/tc-i386.c:3487
 #, c-format
 msgid "unbalanced brackets in operand %d."
 msgstr ""
 
-#: config/tc-i386.c:3527
+#: config/tc-i386.c:3496
 #, c-format
 msgid "invalid character %s in operand %d"
 msgstr ""
 
-#: config/tc-i386.c:3555
+#: config/tc-i386.c:3524
 #, c-format
 msgid "spurious operands; (%d operands/instruction max)"
 msgstr ""
 
-#: config/tc-i386.c:3578
+#: config/tc-i386.c:3547
 msgid "expecting operand after ','; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:3583
+#: config/tc-i386.c:3552
 msgid "expecting operand before ','; got nothing"
 msgstr ""
 
-#: config/tc-i386.c:4257
+#: config/tc-i386.c:4190
 msgid "operand size mismatch"
 msgstr ""
 
-#: config/tc-i386.c:4260
+#: config/tc-i386.c:4193
 msgid "operand type mismatch"
 msgstr ""
 
-#: config/tc-i386.c:4263
+#: config/tc-i386.c:4196
 msgid "register type mismatch"
 msgstr ""
 
-#: config/tc-i386.c:4266
+#: config/tc-i386.c:4199
 msgid "number of operands mismatch"
 msgstr ""
 
-#: config/tc-i386.c:4269
+#: config/tc-i386.c:4202
 msgid "invalid instruction suffix"
 msgstr ""
 
-#: config/tc-i386.c:4272
+#: config/tc-i386.c:4205
 msgid "Imm4 isn't the first operand"
 msgstr ""
 
-#: config/tc-i386.c:4275
+#: config/tc-i386.c:4208
 msgid "only supported with old gcc"
 msgstr ""
 
-#: config/tc-i386.c:4278
+#: config/tc-i386.c:4211
 msgid "unsupported with Intel mnemonic"
 msgstr ""
 
-#: config/tc-i386.c:4281
+#: config/tc-i386.c:4214
 msgid "unsupported syntax"
 msgstr ""
 
-#: config/tc-i386.c:4284
+#: config/tc-i386.c:4217
 msgid "unsupported"
 msgstr ""
 
-#: config/tc-i386.c:4287
-msgid "invalid VSIB address"
-msgstr ""
-
-#: config/tc-i386.c:4290
-msgid "unsupported vector index register"
-msgstr ""
-
-#: config/tc-i386.c:4293
+#: config/tc-i386.c:4220
 #, c-format
 msgid "%s for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:4304
+#: config/tc-i386.c:4231
 #, 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:4312
+#: config/tc-i386.c:4239
 #, c-format
 msgid "stand-alone `%s' prefix"
 msgstr ""
 
-#: config/tc-i386.c:4346 config/tc-i386.c:4362
+#: config/tc-i386.c:4273 config/tc-i386.c:4289
 #, c-format
 msgid "`%s' operand %d must use `%ses' segment"
 msgstr ""
 
 #. We have to know the operand size for crc32.
-#: config/tc-i386.c:4416
+#: config/tc-i386.c:4343
 #, c-format
 msgid "ambiguous memory operand size for `%s`"
 msgstr ""
 
-#: config/tc-i386.c:4535
+#: config/tc-i386.c:4462
 msgid ""
 "no instruction mnemonic suffix given and no register operands; can't size "
 "instruction"
 msgstr ""
 
-#: config/tc-i386.c:4672 config/tc-i386.c:4747 config/tc-i386.c:4776
-#: config/tc-i386.c:4822 config/tc-i386.c:4860
+#: config/tc-i386.c:4599 config/tc-i386.c:4674 config/tc-i386.c:4703
+#: config/tc-i386.c:4749 config/tc-i386.c:4787
 #, c-format
 msgid "incorrect register `%s%s' used with `%c' suffix"
 msgstr ""
 
-#: config/tc-i386.c:4680 config/tc-i386.c:4754 config/tc-i386.c:4867
+#: config/tc-i386.c:4607 config/tc-i386.c:4681 config/tc-i386.c:4794
 #, c-format
 msgid "using `%s%s' instead of `%s%s' due to `%c' suffix"
 msgstr ""
 
-#: config/tc-i386.c:4706 config/tc-i386.c:4730 config/tc-i386.c:4798
-#: config/tc-i386.c:4843
+#: config/tc-i386.c:4633 config/tc-i386.c:4657 config/tc-i386.c:4725
+#: config/tc-i386.c:4770
 #, c-format
 msgid "`%s%s' not allowed with `%s%c'"
 msgstr ""
 
-#: config/tc-i386.c:4932
+#: config/tc-i386.c:4859
 msgid "no instruction mnemonic suffix given; can't determine immediate size"
 msgstr ""
 
-#: config/tc-i386.c:4968
+#: config/tc-i386.c:4895
 #, c-format
 msgid "the last operand of `%s' must be `%s%s'"
 msgstr ""
 
-#: config/tc-i386.c:4971
+#: config/tc-i386.c:4898
 #, c-format
 msgid "the first operand of `%s' must be `%s%s'"
 msgstr ""
 
-#: config/tc-i386.c:5119
+#: config/tc-i386.c:5046
 #, c-format
 msgid "you can't `pop %scs'"
 msgstr ""
 
 #. Reversed arguments on faddp, fsubp, etc.
-#: config/tc-i386.c:5148
+#: config/tc-i386.c:5075
 #, c-format
 msgid "translating to `%s %s%s,%s%s'"
 msgstr ""
 
 #. Extraneous `l' suffix on fp insn.
-#: config/tc-i386.c:5155
+#: config/tc-i386.c:5082
 #, c-format
 msgid "translating to `%s %s%s'"
 msgstr ""
 
-#: config/tc-i386.c:5183
+#: config/tc-i386.c:5110
 #, c-format
 msgid "segment override on `%s' is ineffectual"
 msgstr ""
 
-#: config/tc-i386.c:5923 config/tc-i386.c:6017 config/tc-i386.c:6062
+#: config/tc-i386.c:5807 config/tc-i386.c:5901 config/tc-i386.c:5946
 msgid "skipping prefixes on this instruction"
 msgstr ""
 
-#: config/tc-i386.c:6082
+#: config/tc-i386.c:5966
 msgid "16-bit jump out of range"
 msgstr ""
 
-#: config/tc-i386.c:6091
+#: config/tc-i386.c:5975
 #, c-format
 msgid "can't handle non absolute segment in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:6671
+#: config/tc-i386.c:6555
 #, c-format
 msgid "@%s reloc is not supported with %d-bit output format"
 msgstr ""
 
-#: config/tc-i386.c:6719
+#: config/tc-i386.c:6603
 #, c-format
 msgid "missing or invalid expression `%s'"
 msgstr ""
 
-#: config/tc-i386.c:6776
+#: config/tc-i386.c:6661
 #, c-format
 msgid "at most %d immediate operands are allowed"
 msgstr ""
 
-#: config/tc-i386.c:6798 config/tc-i386.c:7045
+#: config/tc-i386.c:6683 config/tc-i386.c:6930
 #, c-format
 msgid "junk `%s' after expression"
 msgstr ""
 
-#: config/tc-i386.c:6819
+#: config/tc-i386.c:6704
 #, c-format
 msgid "missing or invalid immediate expression `%s'"
 msgstr ""
 
-#: config/tc-i386.c:6842 config/tc-i386.c:7135
+#: config/tc-i386.c:6727 config/tc-i386.c:7020
 #, c-format
 msgid "unimplemented segment %s in operand"
 msgstr ""
 
-#: config/tc-i386.c:6849
+#: config/tc-i386.c:6734
 #, c-format
 msgid "illegal immediate register operand %s"
 msgstr ""
 
-#: config/tc-i386.c:6897
+#: config/tc-i386.c:6782
 #, c-format
 msgid "expecting scale factor of 1, 2, 4, or 8: got `%s'"
 msgstr ""
 
-#: config/tc-i386.c:6906
+#: config/tc-i386.c:6791
 #, c-format
 msgid "scale factor of %d without an index register"
 msgstr ""
 
-#: config/tc-i386.c:6928
+#: config/tc-i386.c:6813
 #, c-format
 msgid "at most %d displacement operands are allowed"
 msgstr ""
 
-#: config/tc-i386.c:7101
+#: config/tc-i386.c:6986
 #, c-format
 msgid "missing or invalid displacement expression `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7118
+#: config/tc-i386.c:7003
 #, c-format
 msgid "0x%lx out range of signed 32bit displacement"
 msgstr ""
 
-#: config/tc-i386.c:7222
+#: config/tc-i386.c:7107
 #, c-format
 msgid "`%s' is not valid here (expected `%c%s%s%c')"
 msgstr ""
 
-#: config/tc-i386.c:7306
+#: config/tc-i386.c:7187
 #, c-format
 msgid "`%s' is not a valid %s expression"
 msgstr ""
 
-#: config/tc-i386.c:7311
+#: config/tc-i386.c:7192
 #, c-format
 msgid "`%s' is not a valid %s-bit %s expression"
 msgstr ""
 
-#: config/tc-i386.c:7392
+#: config/tc-i386.c:7273
 #, c-format
 msgid "bad memory operand `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7407
+#: config/tc-i386.c:7288
 #, c-format
 msgid "junk `%s' after register"
 msgstr ""
 
-#: config/tc-i386.c:7420 config/tc-i386.c:7536 config/tc-i386.c:7577
+#: config/tc-i386.c:7301 config/tc-i386.c:7417 config/tc-i386.c:7458
 #, c-format
 msgid "bad register name `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7428
+#: config/tc-i386.c:7309
 msgid "immediate operand illegal with absolute jump"
 msgstr ""
 
-#: config/tc-i386.c:7450
+#: config/tc-i386.c:7331
 #, c-format
 msgid "too many memory references for `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7528
+#: config/tc-i386.c:7409
 #, c-format
 msgid "expecting `,' or `)' after index register in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7553
+#: config/tc-i386.c:7434
 #, c-format
 msgid "expecting `)' after scale factor in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7561
+#: config/tc-i386.c:7442
 #, c-format
 msgid "expecting index register or scale factor after `,'; got '%c'"
 msgstr ""
 
-#: config/tc-i386.c:7569
+#: config/tc-i386.c:7450
 #, c-format
 msgid "expecting `,' or `)' after base register in `%s'"
 msgstr ""
 
 #. It's not a memory operand; argh!
-#: config/tc-i386.c:7613
+#: config/tc-i386.c:7494
 #, c-format
 msgid "invalid char %s beginning operand %d `%s'"
 msgstr ""
 
-#: config/tc-i386.c:7791
+#: config/tc-i386.c:7676
 msgid "long jump required"
 msgstr ""
 
-#: config/tc-i386.c:7846
+#: config/tc-i386.c:7731
 msgid "jump target out of range"
 msgstr ""
 
-#: config/tc-i386.c:8360
+#: config/tc-i386.c:8249
 msgid "no compiled in support for x86_64"
 msgstr ""
 
-#: config/tc-i386.c:8380
+#: config/tc-i386.c:8269
 msgid "no compiled in support for 32bit x86_64"
 msgstr ""
 
-#: config/tc-i386.c:8384
+#: config/tc-i386.c:8273
 msgid "32bit x86_64 is only supported for ELF"
 msgstr ""
 
-#: config/tc-i386.c:8414 config/tc-i386.c:8470
+#: config/tc-i386.c:8303 config/tc-i386.c:8359
 #, c-format
 msgid "invalid -march= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:8479 config/tc-i386.c:8491
+#: config/tc-i386.c:8368 config/tc-i386.c:8380
 #, c-format
 msgid "invalid -mtune= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:8500
+#: config/tc-i386.c:8389
 #, c-format
 msgid "invalid -mmnemonic= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:8509
+#: config/tc-i386.c:8398
 #, c-format
 msgid "invalid -msyntax= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:8536
+#: config/tc-i386.c:8425
 #, c-format
 msgid "invalid -msse-check= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:8545
+#: config/tc-i386.c:8434
 #, c-format
 msgid "invalid -mavxscalar= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:8637
+#: config/tc-i386.c:8526
 #, c-format
 msgid ""
 "  -Q                      ignored\n"
@@ -6399,34 +6266,34 @@ msgid ""
 "  -k                      ignored\n"
 msgstr ""
 
-#: config/tc-i386.c:8642
+#: config/tc-i386.c:8531
 #, c-format
 msgid ""
 "  -n                      Do not optimize code alignment\n"
 "  -q                      quieten some warnings\n"
 msgstr ""
 
-#: config/tc-i386.c:8646
+#: config/tc-i386.c:8535
 #, c-format
 msgid "  -s                      ignored\n"
 msgstr ""
 
-#: config/tc-i386.c:8651
+#: config/tc-i386.c:8540
 #, c-format
 msgid "  --32/--64/--x32         generate 32bit/64bit/x32 code\n"
 msgstr ""
 
-#: config/tc-i386.c:8655
+#: config/tc-i386.c:8544
 #, c-format
 msgid "  --divide                do not treat `/' as a comment character\n"
 msgstr ""
 
-#: config/tc-i386.c:8658
+#: config/tc-i386.c:8547
 #, c-format
 msgid "  --divide                ignored\n"
 msgstr ""
 
-#: config/tc-i386.c:8661
+#: config/tc-i386.c:8550
 #, c-format
 msgid ""
 "  -march=CPU[,+EXTENSION...]\n"
@@ -6434,29 +6301,29 @@ msgid ""
 "of:\n"
 msgstr ""
 
-#: config/tc-i386.c:8665
+#: config/tc-i386.c:8554
 #, c-format
 msgid "                          EXTENSION is combination of:\n"
 msgstr ""
 
-#: config/tc-i386.c:8668
+#: config/tc-i386.c:8557
 #, c-format
 msgid "  -mtune=CPU              optimize for CPU, CPU is one of:\n"
 msgstr ""
 
-#: config/tc-i386.c:8671
+#: config/tc-i386.c:8560
 #, c-format
 msgid "  -msse2avx               encode SSE instructions with VEX prefix\n"
 msgstr ""
 
-#: config/tc-i386.c:8673
+#: config/tc-i386.c:8562
 #, c-format
 msgid ""
 "  -msse-check=[none|error|warning]\n"
 "                          check SSE instructions\n"
 msgstr ""
 
-#: config/tc-i386.c:8676
+#: config/tc-i386.c:8565
 #, c-format
 msgid ""
 "  -mavxscalar=[128|256]   encode scalar AVX instructions with specific "
@@ -6464,71 +6331,71 @@ msgid ""
 "                           length\n"
 msgstr ""
 
-#: config/tc-i386.c:8679
+#: config/tc-i386.c:8568
 #, c-format
 msgid "  -mmnemonic=[att|intel]  use AT&T/Intel mnemonic\n"
 msgstr ""
 
-#: config/tc-i386.c:8681
+#: config/tc-i386.c:8570
 #, c-format
 msgid "  -msyntax=[att|intel]    use AT&T/Intel syntax\n"
 msgstr ""
 
-#: config/tc-i386.c:8683
+#: config/tc-i386.c:8572
 #, c-format
 msgid "  -mindex-reg             support pseudo index registers\n"
 msgstr ""
 
-#: config/tc-i386.c:8685
+#: config/tc-i386.c:8574
 #, c-format
 msgid "  -mnaked-reg             don't require `%%' prefix for registers\n"
 msgstr ""
 
-#: config/tc-i386.c:8687
+#: config/tc-i386.c:8576
 #, c-format
 msgid "  -mold-gcc               support old (<= 2.8.1) versions of gcc\n"
 msgstr ""
 
-#: config/tc-i386.c:8761
+#: config/tc-i386.c:8650
 msgid "Intel L1OM is 64bit only"
 msgstr ""
 
-#: config/tc-i386.c:8767
-msgid "Intel K1OM is 64bit only"
-msgstr ""
-
-#: config/tc-i386.c:8984
+#: config/tc-i386.c:8872
 #, c-format
 msgid "can not do %d byte pc-relative relocation"
 msgstr ""
 
-#: config/tc-i386.c:9002
+#: config/tc-i386.c:8890
 #, c-format
 msgid "can not do %d byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:9070
+#: config/tc-i386.c:8959
 #, c-format
 msgid "cannot represent relocation type %s in x32 mode"
 msgstr ""
 
-#: config/tc-i386.c:9105 config/tc-s390.c:2346
+#: config/tc-i386.c:8994 config/tc-s390.c:2346
 #, c-format
 msgid "cannot represent relocation type %s"
 msgstr ""
 
-#: config/tc-i386.c:9222
+#: config/tc-i386.c:9101
 msgid "bad .section directive: want a,l,w,x,M,S,G,T in string"
 msgstr ""
 
-#: config/tc-i386.c:9225
+#: config/tc-i386.c:9104
 msgid "bad .section directive: want a,w,x,M,S,G,T in string"
 msgstr ""
 
-#: config/tc-i386.c:9244
+#: config/tc-i386.c:9123
 msgid ".largecomm supported only in 64bit mode, producing .comm"
 msgstr ""
 
+#: config/tc-i386.c:9178 read.c:3859
+msgid "unexpected `\"' in expression"
+msgstr ""
+
 #: config/tc-i860.c:122
 msgid "Directive .dual available only with -mintel-syntax option"
 msgstr ""
@@ -6550,7 +6417,7 @@ msgid "Defective assembler.  No assembly attempted."
 msgstr ""
 
 #: config/tc-i860.c:393 config/tc-i860.c:939 config/tc-m68k.c:3914
-#: config/tc-m68k.c:3946 config/tc-sparc.c:2824
+#: config/tc-m68k.c:3946 config/tc-sparc.c:2697
 msgid "failed sanity check."
 msgstr ""
 
@@ -7419,7 +7286,7 @@ msgstr ""
 msgid "Inserting \"%s\" into constant hash table failed: %s"
 msgstr ""
 
-#: config/tc-ia64.c:7332 config/tc-mips.c:2310
+#: config/tc-ia64.c:7332 config/tc-mips.c:1916
 msgid "Could not set architecture and machine"
 msgstr ""
 
@@ -7481,8 +7348,7 @@ msgid "Expected '('"
 msgstr ""
 
 #: config/tc-ia64.c:7761 config/tc-pdp11.c:448 config/tc-pdp11.c:512
-#: config/tc-pdp11.c:546 config/tc-tilegx.c:991 config/tc-tilepro.c:860
-#: config/tc-xstormy16.c:155
+#: config/tc-pdp11.c:546 config/tc-xstormy16.c:155
 msgid "Missing ')'"
 msgstr ""
 
@@ -7602,12 +7468,12 @@ msgstr ""
 msgid "Can't add stop bit to mark end of instruction group"
 msgstr ""
 
-#: config/tc-ia64.c:11598 config/tc-score.c:6105 read.c:1448 read.c:2434
-#: read.c:3137 read.c:3475 read.c:3519
+#: config/tc-ia64.c:11598 config/tc-score.c:6109 read.c:1448 read.c:2434
+#: read.c:3138 read.c:3476 read.c:3520
 msgid "expected symbol name"
 msgstr ""
 
-#: config/tc-ia64.c:11608 read.c:2444 read.c:3147 read.c:3503 stabs.c:469
+#: config/tc-ia64.c:11608 read.c:2444 read.c:3148 read.c:3504 stabs.c:469
 #, c-format
 msgid "expected comma after \"%s\""
 msgstr ""
@@ -7681,19 +7547,19 @@ msgstr ""
 msgid "Unmatched high relocation"
 msgstr ""
 
-#: config/tc-iq2000.c:829 config/tc-mips.c:18680 config/tc-score.c:5815
+#: config/tc-iq2000.c:829 config/tc-mips.c:15333 config/tc-score.c:5819
 msgid ".end not in text section"
 msgstr ""
 
-#: config/tc-iq2000.c:833 config/tc-mips.c:18684 config/tc-score.c:5818
+#: config/tc-iq2000.c:833 config/tc-mips.c:15337 config/tc-score.c:5822
 msgid ".end directive without a preceding .ent directive."
 msgstr ""
 
-#: config/tc-iq2000.c:842 config/tc-mips.c:18693 config/tc-score.c:5826
+#: config/tc-iq2000.c:842 config/tc-mips.c:15346 config/tc-score.c:5830
 msgid ".end symbol does not match .ent symbol."
 msgstr ""
 
-#: config/tc-iq2000.c:845 config/tc-mips.c:18700 config/tc-score.c:5831
+#: config/tc-iq2000.c:845 config/tc-mips.c:15353 config/tc-score.c:5835
 msgid ".end directive missing or unknown symbol"
 msgstr ""
 
@@ -7701,7 +7567,7 @@ msgstr ""
 msgid "Expected simple number."
 msgstr ""
 
-#: config/tc-iq2000.c:892 config/tc-mips.c:18605 config/tc-score.c:5667
+#: config/tc-iq2000.c:892 config/tc-mips.c:15258 config/tc-score.c:5670
 #, c-format
 msgid " *input_line_pointer == '%c' 0x%02x\n"
 msgstr ""
@@ -7710,7 +7576,7 @@ msgstr ""
 msgid "Invalid number"
 msgstr ""
 
-#: config/tc-iq2000.c:928 config/tc-mips.c:18772 config/tc-score.c:5705
+#: config/tc-iq2000.c:928 config/tc-mips.c:15425 config/tc-score.c:5708
 msgid ".ent or .aent not in text section."
 msgstr ""
 
@@ -7732,7 +7598,7 @@ msgstr ""
 msgid "Unrecognised option: -hidden"
 msgstr ""
 
-#: config/tc-m32r.c:358 config/tc-sparc.c:610
+#: config/tc-m32r.c:358 config/tc-sparc.c:583
 msgid "Unrecognized option following -K"
 msgstr ""
 
@@ -7953,6 +7819,10 @@ msgstr ""
 msgid "Length of .scomm \"%s\" is already %ld. Not changed to %ld."
 msgstr ""
 
+#: config/tc-m32r.c:1789
+msgid "Addend to unresolved symbol not on word boundary."
+msgstr ""
+
 #: config/tc-m32r.c:1930 config/tc-m32r.c:1983 config/tc-sh.c:775
 #: config/tc-sh.c:2456
 msgid "Invalid PIC expression."
@@ -8563,6 +8433,10 @@ msgstr ""
 msgid "missing label"
 msgstr ""
 
+#: config/tc-m68k.c:6037 config/tc-m68k.c:6066
+msgid "bad register list"
+msgstr ""
+
 #: config/tc-m68k.c:6039
 #, c-format
 msgid "bad register list: %s"
@@ -9179,893 +9053,798 @@ msgid "Absolute value in relaxation code.  Assembler error....."
 msgstr ""
 
 #: config/tc-microblaze.c:2363 config/tc-mn10300.c:1067 config/tc-sh.c:804
-#: config/tc-z80.c:666 read.c:4350
+#: config/tc-z80.c:666 read.c:4351
 #, c-format
 msgid "unsupported BFD relocation size %u"
 msgstr ""
 
 #. Prototypes for static functions.
-#: config/tc-mips.c:1315
+#: config/tc-mips.c:1064
 #, c-format
 msgid "internal Error, line %d, %s"
 msgstr ""
 
-#: config/tc-mips.c:1710
-msgid "48-bit microMIPS instructions are not supported"
-msgstr ""
-
-#: config/tc-mips.c:2119 config/tc-mips.c:16004
+#: config/tc-mips.c:1825 config/tc-mips.c:13188
 #, c-format
 msgid "Unrecognized register name `%s'"
 msgstr ""
 
-#: config/tc-mips.c:2305
+#: config/tc-mips.c:1911
 msgid "-G may not be used in position-independent code"
 msgstr ""
 
-#: config/tc-mips.c:2354 config/tc-mips.c:2387
+#: config/tc-mips.c:1960
 #, c-format
 msgid "internal: can't hash `%s': %s"
 msgstr ""
 
-#: config/tc-mips.c:2362
+#: config/tc-mips.c:1968
 #, c-format
 msgid "internal error: bad mips16 opcode: %s %s\n"
 msgstr ""
 
-#: config/tc-mips.c:2573
+#: config/tc-mips.c:2140
 #, c-format
 msgid "returned from mips_ip(%s) insn_opcode = 0x%x\n"
 msgstr ""
 
-#: config/tc-mips.c:4013
-#, c-format
-msgid "Wrong size instruction in a %u-bit branch delay slot"
-msgstr ""
-
-#: config/tc-mips.c:4061 config/tc-mips.c:4071
+#: config/tc-mips.c:3074 config/tc-mips.c:3082
 #, c-format
 msgid "jump to misaligned address (0x%lx)"
 msgstr ""
 
-#: config/tc-mips.c:4086 config/tc-mips.c:5016
+#: config/tc-mips.c:3093 config/tc-mips.c:4042
 #, c-format
 msgid "branch to misaligned address (0x%lx)"
 msgstr ""
 
-#: config/tc-mips.c:4092 config/tc-mips.c:5019
+#: config/tc-mips.c:3098 config/tc-mips.c:4045
 #, c-format
 msgid "branch address range overflow (0x%lx)"
 msgstr ""
 
-#: config/tc-mips.c:4294 config/tc-mips.c:18182
+#: config/tc-mips.c:3253 config/tc-mips.c:14896
 msgid "extended instruction in delay slot"
 msgstr ""
 
 #. To reproduce this failure try assembling gas/testsuites/
 #. gas/mips/mips16-intermix.s with a mips-ecoff targeted
 #. assembler.
-#: config/tc-mips.c:4350
+#: config/tc-mips.c:3299
 #, c-format
 msgid "Unsupported MIPS relocation number %d"
 msgstr ""
 
-#: config/tc-mips.c:4645
+#: config/tc-mips.c:3779
 msgid ""
 "Macro instruction expanded into multiple instructions in a branch delay slot"
 msgstr ""
 
-#: config/tc-mips.c:4648
+#: config/tc-mips.c:3782
 msgid "Macro instruction expanded into multiple instructions"
 msgstr ""
 
-#: config/tc-mips.c:4652
-msgid ""
-"Macro instruction expanded into a wrong size instruction in a 16-bit branch "
-"delay slot"
-msgstr ""
-
-#: config/tc-mips.c:4654
-msgid ""
-"Macro instruction expanded into a wrong size instruction in a 32-bit branch "
-"delay slot"
-msgstr ""
-
-#: config/tc-mips.c:5317
+#: config/tc-mips.c:4314
 msgid "operand overflow"
 msgstr ""
 
-#: config/tc-mips.c:5336 config/tc-mips.c:5936 config/tc-mips.c:9932
+#: config/tc-mips.c:4333 config/tc-mips.c:4933 config/tc-mips.c:8427
 msgid "Macro used $at after \".set noat\""
 msgstr ""
 
-#: config/tc-mips.c:5365
+#: config/tc-mips.c:4362
 msgid "unsupported large constant"
 msgstr ""
 
-#: config/tc-mips.c:5367
+#: config/tc-mips.c:4364
 #, c-format
 msgid "Instruction %s requires absolute expression"
 msgstr ""
 
-#: config/tc-mips.c:5500 config/tc-mips.c:8267 config/tc-mips.c:8900
+#: config/tc-mips.c:4497 config/tc-mips.c:6798 config/tc-mips.c:7390
 #, c-format
 msgid "Number (0x%s) larger than 32 bits"
 msgstr ""
 
-#: config/tc-mips.c:5520
+#: config/tc-mips.c:4517
 msgid "Number larger than 64 bits"
 msgstr ""
 
-#: config/tc-mips.c:5814 config/tc-mips.c:5842 config/tc-mips.c:5880
-#: config/tc-mips.c:5925 config/tc-mips.c:8522 config/tc-mips.c:8561
-#: config/tc-mips.c:8600 config/tc-mips.c:8995 config/tc-mips.c:9047
+#: config/tc-mips.c:4811 config/tc-mips.c:4839 config/tc-mips.c:4877
+#: config/tc-mips.c:4922 config/tc-mips.c:7012 config/tc-mips.c:7051
+#: config/tc-mips.c:7090 config/tc-mips.c:7485 config/tc-mips.c:7537
 msgid "PIC code offset overflow (max 16 signed bits)"
 msgstr ""
 
-#: config/tc-mips.c:6484 config/tc-mips.c:6554 config/tc-mips.c:6640
-#: config/tc-mips.c:6686 config/tc-mips.c:6748 config/tc-mips.c:6797
-#: config/tc-mips.c:10026 config/tc-mips.c:10033 config/tc-mips.c:10040
-#: config/tc-mips.c:10147
+#: config/tc-mips.c:5244 config/tc-mips.c:5310 config/tc-mips.c:5398
+#: config/tc-mips.c:5445 config/tc-mips.c:5507 config/tc-mips.c:5556
+#: config/tc-mips.c:8521 config/tc-mips.c:8528 config/tc-mips.c:8535
+#: config/tc-mips.c:8642
 msgid "Unsupported large constant"
 msgstr ""
 
 #. result is always true
-#: config/tc-mips.c:6518
+#: config/tc-mips.c:5276
 #, c-format
 msgid "Branch %s is always true"
 msgstr ""
 
-#: config/tc-mips.c:6759 config/tc-mips.c:6808 config/tc-mips.c:11085
-#: config/tc-mips.c:11249
+#: config/tc-mips.c:5518 config/tc-mips.c:5567 config/tc-mips.c:9297
+#: config/tc-mips.c:9454
 #, c-format
 msgid "Improper position (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:6764 config/tc-mips.c:11153
+#: config/tc-mips.c:5523 config/tc-mips.c:9364
 #, c-format
 msgid "Improper extract size (%lu, position %lu)"
 msgstr ""
 
-#: config/tc-mips.c:6813 config/tc-mips.c:11117
+#: config/tc-mips.c:5572 config/tc-mips.c:9328
 #, c-format
 msgid "Improper insert size (%lu, position %lu)"
 msgstr ""
 
-#: config/tc-mips.c:6850 config/tc-mips.c:6960
+#: config/tc-mips.c:5609 config/tc-mips.c:5706
 msgid "Divide by zero."
 msgstr ""
 
-#: config/tc-mips.c:7051
+#: config/tc-mips.c:5792
 msgid "dla used to load 32-bit register"
 msgstr ""
 
-#: config/tc-mips.c:7054
+#: config/tc-mips.c:5795
 msgid "la used to load 64-bit address"
 msgstr ""
 
-#: config/tc-mips.c:7078 config/tc-mips.c:8257 config/tc-mips.c:8890
+#: config/tc-mips.c:5819 config/tc-mips.c:6788 config/tc-mips.c:7380
 msgid "Expression too complex"
 msgstr ""
 
-#: config/tc-mips.c:7166
+#: config/tc-mips.c:5907
 msgid "Offset too large"
 msgstr ""
 
-#: config/tc-mips.c:7338 config/tc-mips.c:7613
+#: config/tc-mips.c:6079 config/tc-mips.c:6354
 msgid "PIC code offset overflow (max 32 signed bits)"
 msgstr ""
 
-#: config/tc-mips.c:7713
+#: config/tc-mips.c:6432
 msgid "MIPS PIC call to register other than $25"
 msgstr ""
 
-#: config/tc-mips.c:7724 config/tc-mips.c:7735 config/tc-mips.c:7863
-#: config/tc-mips.c:7874
+#: config/tc-mips.c:6438 config/tc-mips.c:6449 config/tc-mips.c:6573
+#: config/tc-mips.c:6584
 msgid "No .cprestore pseudo-op used in PIC code"
 msgstr ""
 
-#: config/tc-mips.c:7729 config/tc-mips.c:7868
+#: config/tc-mips.c:6443 config/tc-mips.c:6578
 msgid "No .frame pseudo-op used in PIC code"
 msgstr ""
 
-#: config/tc-mips.c:7889
+#: config/tc-mips.c:6599
 msgid "Non-PIC jump used in PIC library"
 msgstr ""
 
-#: config/tc-mips.c:8249
+#: config/tc-mips.c:6765
 #, c-format
 msgid "Opcode not supported on this processor: %s"
 msgstr ""
 
-#: config/tc-mips.c:9154
+#: config/tc-mips.c:7643
 #, c-format
 msgid "opcode not supported on this processor: %s"
 msgstr ""
 
-#: config/tc-mips.c:9311 config/tc-mips.c:9342 config/tc-mips.c:9394
-#: config/tc-mips.c:9424
+#: config/tc-mips.c:7790 config/tc-mips.c:7821 config/tc-mips.c:7873
+#: config/tc-mips.c:7903
 msgid "Improper rotate count"
 msgstr ""
 
-#: config/tc-mips.c:9463
+#: config/tc-mips.c:7942
 #, c-format
 msgid "Instruction %s: result is always false"
 msgstr ""
 
-#: config/tc-mips.c:9624
+#: config/tc-mips.c:8103
 #, c-format
 msgid "Instruction %s: result is always true"
 msgstr ""
 
-#: config/tc-mips.c:9819
+#: config/tc-mips.c:8240 config/tc-mips.c:8264 config/tc-mips.c:8337
+#: config/tc-mips.c:8360
 msgid "Operand overflow"
 msgstr ""
 
 #. FIXME: Check if this is one of the itbl macros, since they
 #. are added dynamically.
-#: config/tc-mips.c:9928
+#: config/tc-mips.c:8423
 #, c-format
 msgid "Macro %s not implemented yet"
 msgstr ""
 
-#: config/tc-mips.c:10178
+#: config/tc-mips.c:8673
 #, c-format
 msgid "internal: bad mips opcode (mask error): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:10223
+#: config/tc-mips.c:8718
 #, c-format
 msgid "internal: bad mips opcode (unknown extension operand type `+%c'): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:10304
+#: config/tc-mips.c:8797
 #, c-format
 msgid "internal: bad mips opcode (unknown operand type `%c'): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:10311
+#: config/tc-mips.c:8804
 #, c-format
 msgid "internal: bad mips opcode (bits 0x%lx undefined): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:10337
-#, c-format
-msgid "Internal error: bad microMIPS opcode (mask error): %s %s"
-msgstr ""
-
-#: config/tc-mips.c:10344
-#, c-format
-msgid "Internal error: bad microMIPS opcode (incorrect length: %u): %s %s"
-msgstr ""
-
-#: config/tc-mips.c:10352
-#, c-format
-msgid "Internal error: bad microMIPS opcode (opcode/length mismatch): %s %s"
-msgstr ""
-
-#: config/tc-mips.c:10383 config/tc-mips.c:10436
-#, c-format
-msgid ""
-"Internal error: bad mips opcode (unknown extension operand type `%c%c'): %s "
-"%s"
-msgstr ""
-
-#: config/tc-mips.c:10483
-#, c-format
-msgid "Internal error: bad microMIPS opcode (unknown operand type `%c'): %s %s"
-msgstr ""
-
-#: config/tc-mips.c:10492
-#, c-format
-msgid "Internal error: bad microMIPS opcode (bits 0x%lx undefined): %s %s"
-msgstr ""
-
-#: config/tc-mips.c:10496
-#, c-format
-msgid "Internal error: bad microMIPS opcode (bits 0x%lx defined): %s %s"
-msgstr ""
-
-#: config/tc-mips.c:10654
+#: config/tc-mips.c:8927 config/tc-mips.c:8935
 msgid "Unrecognized opcode"
 msgstr ""
 
-#: config/tc-mips.c:10703 config/tc-mips.c:13232
+#: config/tc-mips.c:8962 config/tc-mips.c:10524
 #, c-format
 msgid "opcode not supported on this processor: %s (%s)"
 msgstr ""
 
-#: config/tc-mips.c:10707
-#, c-format
-msgid "Unrecognized %u-bit version of microMIPS opcode"
-msgstr ""
-
-#: config/tc-mips.c:10738
+#: config/tc-mips.c:8996
 #, c-format
 msgid "BALIGN immediate not 1 or 3 (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:10752 config/tc-mips.c:10766 config/tc-mips.c:10780
-#: config/tc-mips.c:10794 config/tc-mips.c:10822 config/tc-mips.c:10869
+#: config/tc-mips.c:9009 config/tc-mips.c:9022 config/tc-mips.c:9035
+#: config/tc-mips.c:9048 config/tc-mips.c:9074 config/tc-mips.c:9118
 #, c-format
 msgid "DSP immediate not in range 0..%d (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:10813 config/tc-mips.c:10842
+#: config/tc-mips.c:9066 config/tc-mips.c:9093
 msgid "Invalid dsp acc register"
 msgstr ""
 
-#: config/tc-mips.c:10854 config/tc-mips.c:10887 config/tc-mips.c:10905
+#: config/tc-mips.c:9104 config/tc-mips.c:9135 config/tc-mips.c:9152
 #, c-format
 msgid "DSP immediate not in range %ld..%ld (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:10919
+#: config/tc-mips.c:9165
 #, c-format
 msgid "MT usermode bit not 0 or 1 (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:10931
+#: config/tc-mips.c:9176
 #, c-format
 msgid "MT load high bit not 0 or 1 (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:10949 config/tc-mips.c:10963
+#: config/tc-mips.c:9193 config/tc-mips.c:9206
 msgid "Invalid dsp/smartmips acc register"
 msgstr ""
 
-#: config/tc-mips.c:10975
-#, c-format
-msgid "Bit position for %s not in range 0..%lu (%lu)"
-msgstr ""
-
-#: config/tc-mips.c:11058
+#: config/tc-mips.c:9270
 #, c-format
 msgid "Illegal %s number (%lu, 0x%lx)"
 msgstr ""
 
-#: config/tc-mips.c:11173 config/tc-mips.c:11975
+#: config/tc-mips.c:9383 config/tc-mips.c:10032
 msgid "absolute expression required"
 msgstr ""
 
-#: config/tc-mips.c:11198
+#: config/tc-mips.c:9406
 #, c-format
 msgid "Invalid register number (%d)"
 msgstr ""
 
-#: config/tc-mips.c:11206
+#: config/tc-mips.c:9414
 msgid "Invalid coprocessor 0 register number"
 msgstr ""
 
-#: config/tc-mips.c:11217
+#: config/tc-mips.c:9424
 #, c-format
 msgid "Improper bit index (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11282 config/tc-mips.c:11300
+#: config/tc-mips.c:9485 config/tc-mips.c:9502
 #, c-format
 msgid "Improper size (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11317
+#: config/tc-mips.c:9518
 #, c-format
 msgid "Improper immediate (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:11335 config/tc-mips.c:11353 config/tc-mips.c:11374
+#: config/tc-mips.c:9535 config/tc-mips.c:9552 config/tc-mips.c:9572
 #, c-format
 msgid "Offset not in range %ld..%ld (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:11380
+#: config/tc-mips.c:9578
 #, c-format
 msgid "Offset not 16 bytes alignment (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:11397 config/tc-mips.c:13413
+#: config/tc-mips.c:9593 config/tc-mips.c:10705
 msgid "used $at without \".set noat\""
 msgstr ""
 
-#: config/tc-mips.c:11399 config/tc-mips.c:13415
+#: config/tc-mips.c:9595 config/tc-mips.c:10707
 #, c-format
 msgid "used $%u with \".set at=$%u\""
 msgstr ""
 
-#: config/tc-mips.c:11413
+#: config/tc-mips.c:9608
 #, c-format
 msgid ""
-"Internal error: bad %s opcode (unknown extension operand type `+%c'): %s %s"
+"Internal error: bad mips opcode (unknown extension operand type `+%c'): %s %s"
 msgstr ""
 
-#: config/tc-mips.c:11467
+#: config/tc-mips.c:9626
 #, c-format
 msgid "Improper shift amount (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11493 config/tc-mips.c:13553 config/tc-mips.c:13806
+#: config/tc-mips.c:9650 config/tc-mips.c:10845 config/tc-mips.c:11098
 #, c-format
 msgid "Invalid value for `%s' (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11543 config/tc-mips.c:11581
+#: config/tc-mips.c:9686
+#, c-format
+msgid "Code for %s not in range 0..1023 (%lu)"
+msgstr ""
+
+#: config/tc-mips.c:9698
 #, c-format
-msgid "Code for %s not in range 0..%lu (%lu)"
+msgid "Lower code for %s not in range 0..1023 (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11562
+#: config/tc-mips.c:9710
 #, c-format
-msgid "Lower code for %s not in range 0..%lu (%lu)"
+msgid "Code for %s not in range 0..1048575 (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11602
+#: config/tc-mips.c:9723
 #, c-format
-msgid "Coproccesor code > %u bits (%lu)"
+msgid "Coproccesor code > 25 bits (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11618
+#: config/tc-mips.c:9737
 #, c-format
 msgid "Illegal 19-bit code (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11632
+#: config/tc-mips.c:9750
 #, c-format
 msgid "Invalid performance register (%lu)"
 msgstr ""
 
-#: config/tc-mips.c:11713 config/tc-mips.c:12398
+#: config/tc-mips.c:9795
 #, c-format
 msgid "Used $%u with \".set at=$%u\""
 msgstr ""
 
-#: config/tc-mips.c:11740 config/tc-mips.c:12424
+#: config/tc-mips.c:9822
 msgid "Source and destination must be different"
 msgstr ""
 
-#: config/tc-mips.c:11746 config/tc-mips.c:12430
+#: config/tc-mips.c:9828
 msgid "A destination register must be supplied"
 msgstr ""
 
-#: config/tc-mips.c:11828
+#: config/tc-mips.c:9891
 #, c-format
 msgid "Improper align amount (%ld), using low bits"
 msgstr ""
 
-#: config/tc-mips.c:11843
+#: config/tc-mips.c:9905
 #, c-format
 msgid "Invalid MDMX Immediate (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:11882
+#: config/tc-mips.c:9943
 #, c-format
 msgid "Float register should be even, was %d"
 msgstr ""
 
-#: config/tc-mips.c:11923
+#: config/tc-mips.c:9982
 #, c-format
 msgid "Bad element selector %ld"
 msgstr ""
 
-#: config/tc-mips.c:11931
+#: config/tc-mips.c:9990
 #, c-format
 msgid "Expecting ']' found '%s'"
 msgstr ""
 
-#: config/tc-mips.c:12039
+#: config/tc-mips.c:10096
 #, c-format
 msgid "Bad floating point constant: %s"
 msgstr ""
 
-#: config/tc-mips.c:12159
+#: config/tc-mips.c:10216
 msgid "Can't use floating point insn in this section"
 msgstr ""
 
-#: config/tc-mips.c:12218
+#: config/tc-mips.c:10275
 msgid "Expression out of range"
 msgstr ""
 
-#: config/tc-mips.c:12262
+#: config/tc-mips.c:10319
 #, c-format
 msgid "lui expression (%lu) not in range 0..65535"
 msgstr ""
 
-#: config/tc-mips.c:12284
+#: config/tc-mips.c:10341
 #, c-format
 msgid "Condition code register should be even for %s, was %d"
 msgstr ""
 
-#: config/tc-mips.c:12290
+#: config/tc-mips.c:10347
 #, c-format
 msgid "Condition code register should be 0 or 4 for %s, was %d"
 msgstr ""
 
-#: config/tc-mips.c:12317
+#: config/tc-mips.c:10374
 msgid "Invalid coprocessor sub-selection value (0-7)"
 msgstr ""
 
-#: config/tc-mips.c:12330 config/tc-mips.c:12348
+#: config/tc-mips.c:10386 config/tc-mips.c:10403
 #, c-format
 msgid "bad byte vector index (%ld)"
 msgstr ""
 
-#: config/tc-mips.c:13058
-#, c-format
-msgid ""
-"Internal error: bad microMIPS opcode (unknown extension operand type `m%c'): "
-"%s %s"
-msgstr ""
-
-#: config/tc-mips.c:13110
-#, c-format
-msgid "Trap code (%lu) for %s not in 0..15 range"
-msgstr ""
-
-#: config/tc-mips.c:13119
+#: config/tc-mips.c:10414
 #, c-format
 msgid "Bad char = '%c'\n"
 msgstr ""
 
-#: config/tc-mips.c:13206 config/tc-score.c:2691 config/tc-score.c:2737
+#: config/tc-mips.c:10498 config/tc-score.c:2696 config/tc-score.c:2742
 msgid "unrecognized opcode"
 msgstr ""
 
-#: config/tc-mips.c:13589 config/tc-mips.c:13670 config/tc-mips.c:13685
+#: config/tc-mips.c:10881 config/tc-mips.c:10962 config/tc-mips.c:10977
 msgid "can't parse register list"
 msgstr ""
 
-#: config/tc-mips.c:13658
+#: config/tc-mips.c:10950
 msgid "more than one frame size in list"
 msgstr ""
 
-#: config/tc-mips.c:13713
+#: config/tc-mips.c:11005
 msgid "unexpected register in list"
 msgstr ""
 
-#: config/tc-mips.c:13723
+#: config/tc-mips.c:11015
 msgid "arg/static registers overlap"
 msgstr ""
 
-#: config/tc-mips.c:13741
+#: config/tc-mips.c:11033
 msgid "invalid arg register list"
 msgstr ""
 
-#: config/tc-mips.c:13750 config/tc-mips.c:13773
+#: config/tc-mips.c:11042 config/tc-mips.c:11065
 msgid "invalid static register list"
 msgstr ""
 
-#: config/tc-mips.c:13780
+#: config/tc-mips.c:11072
 msgid "missing frame size"
 msgstr ""
 
-#: config/tc-mips.c:13783
+#: config/tc-mips.c:11075
 msgid "invalid frame size"
 msgstr ""
 
-#: config/tc-mips.c:13831
+#: config/tc-mips.c:11123
 msgid "illegal operands"
 msgstr ""
 
-#: config/tc-mips.c:13949
+#: config/tc-mips.c:11241
 msgid "extended operand requested but not required"
 msgstr ""
 
-#: config/tc-mips.c:13951
+#: config/tc-mips.c:11243
 msgid "invalid unextended operand value"
 msgstr ""
 
-#: config/tc-mips.c:13979
+#: config/tc-mips.c:11271
 msgid "operand value out of range for instruction"
 msgstr ""
 
-#: config/tc-mips.c:14084
+#: config/tc-mips.c:11376
 #, c-format
 msgid "relocation %s isn't supported by the current ABI"
 msgstr ""
 
-#: config/tc-mips.c:14140
+#: config/tc-mips.c:11432
 msgid "unclosed '('"
 msgstr ""
 
-#: config/tc-mips.c:14415
+#: config/tc-mips.c:11699
 #, c-format
 msgid "A different %s was already specified, is now %s"
 msgstr ""
 
-#: config/tc-mips.c:14592
-msgid "-mmicromips cannot be used with -mips16"
-msgstr ""
-
-#: config/tc-mips.c:14607
-msgid "-mips16 cannot be used with -micromips"
-msgstr ""
-
-#: config/tc-mips.c:14714
+#: config/tc-mips.c:11970
 msgid "-call_shared is supported only for ELF format"
 msgstr ""
 
-#: config/tc-mips.c:14724
+#: config/tc-mips.c:11980
 msgid "-call_nonpic is supported only for ELF format"
 msgstr ""
 
-#: config/tc-mips.c:14734
+#: config/tc-mips.c:11990
 msgid "-non_shared is supported only for ELF format"
 msgstr ""
 
-#: config/tc-mips.c:14767
+#: config/tc-mips.c:12023
 msgid "-n32 is supported for ELF format only"
 msgstr ""
 
-#: config/tc-mips.c:14776
+#: config/tc-mips.c:12032
 msgid "-64 is supported for ELF format only"
 msgstr ""
 
-#: config/tc-mips.c:14781 config/tc-mips.c:14834
+#: config/tc-mips.c:12037 config/tc-mips.c:12090
 msgid "No compiled in support for 64 bit object file format"
 msgstr ""
 
-#: config/tc-mips.c:14821
+#: config/tc-mips.c:12077
 msgid "-mabi is supported for ELF format only"
 msgstr ""
 
-#: config/tc-mips.c:14841
+#: config/tc-mips.c:12097
 #, c-format
 msgid "invalid abi -mabi=%s"
 msgstr ""
 
-#: config/tc-mips.c:14921
+#: config/tc-mips.c:12177
 msgid "-G not supported in this configuration."
 msgstr ""
 
-#: config/tc-mips.c:14947
+#: config/tc-mips.c:12203
 #, c-format
 msgid "-%s conflicts with the other architecture options, which imply -%s"
 msgstr ""
 
-#: config/tc-mips.c:14959
+#: config/tc-mips.c:12215
 #, c-format
 msgid "-march=%s is not compatible with the selected ABI"
 msgstr ""
 
-#: config/tc-mips.c:14978
+#: config/tc-mips.c:12234
 msgid "-mgp64 used with a 32-bit processor"
 msgstr ""
 
-#: config/tc-mips.c:14980
+#: config/tc-mips.c:12236
 msgid "-mgp32 used with a 64-bit ABI"
 msgstr ""
 
-#: config/tc-mips.c:14982
+#: config/tc-mips.c:12238
 msgid "-mgp64 used with a 32-bit ABI"
 msgstr ""
 
-#: config/tc-mips.c:15020
+#: config/tc-mips.c:12276
 msgid "-mfp64 used with a 32-bit fpu"
 msgstr ""
 
-#: config/tc-mips.c:15023
+#: config/tc-mips.c:12279
 msgid "-mfp64 used with a 32-bit ABI"
 msgstr ""
 
-#: config/tc-mips.c:15027
+#: config/tc-mips.c:12283
 msgid "-mfp32 used with a 64-bit ABI"
 msgstr ""
 
-#: config/tc-mips.c:15041
+#: config/tc-mips.c:12297
 msgid "trap exception not supported at ISA 1"
 msgstr ""
 
-#: config/tc-mips.c:15053
+#: config/tc-mips.c:12307
 msgid "-mfp32 used with -mips3d"
 msgstr ""
 
-#: config/tc-mips.c:15059
+#: config/tc-mips.c:12313
 msgid "-mfp32 used with -mdmx"
 msgstr ""
 
-#: config/tc-mips.c:15064
+#: config/tc-mips.c:12318
 #, c-format
 msgid "%s ISA does not support SmartMIPS"
 msgstr ""
 
-#: config/tc-mips.c:15070 config/tc-mips.c:16108
+#: config/tc-mips.c:12324 config/tc-mips.c:13280
 #, c-format
 msgid "%s ISA does not support DSP ASE"
 msgstr ""
 
-#: config/tc-mips.c:15079 config/tc-mips.c:16121
+#: config/tc-mips.c:12333 config/tc-mips.c:13293
 #, c-format
 msgid "%s ISA does not support DSP R2 ASE"
 msgstr ""
 
-#: config/tc-mips.c:15085 config/tc-mips.c:16134
+#: config/tc-mips.c:12339 config/tc-mips.c:13306
 #, c-format
 msgid "%s ISA does not support MT ASE"
 msgstr ""
 
-#: config/tc-mips.c:15091
-#, c-format
-msgid "%s ISA does not support MCU ASE"
-msgstr ""
-
-#: config/tc-mips.c:15147
+#: config/tc-mips.c:12387
 msgid "PC relative MIPS16 instruction references a different section"
 msgstr ""
 
-#: config/tc-mips.c:15484 config/tc-sparc.c:3327 config/tc-sparc.c:3334
-#: config/tc-sparc.c:3341 config/tc-sparc.c:3348 config/tc-sparc.c:3355
-#: config/tc-sparc.c:3364 config/tc-sparc.c:3375 config/tc-sparc.c:3397
-#: config/tc-sparc.c:3421 write.c:1151
+#: config/tc-mips.c:12685 config/tc-sparc.c:3184 config/tc-sparc.c:3191
+#: config/tc-sparc.c:3198 config/tc-sparc.c:3205 config/tc-sparc.c:3212
+#: config/tc-sparc.c:3221 config/tc-sparc.c:3232 config/tc-sparc.c:3254
+#: config/tc-sparc.c:3278 write.c:1138
 msgid "relocation overflow"
 msgstr ""
 
-#: config/tc-mips.c:15497
+#: config/tc-mips.c:12695
 #, c-format
 msgid "Branch to misaligned address (%lx)"
 msgstr ""
 
-#: config/tc-mips.c:15544
+#: config/tc-mips.c:12742
 msgid "Branch out of range"
 msgstr ""
 
-#: config/tc-mips.c:15640
+#: config/tc-mips.c:12824
 #, c-format
 msgid "Alignment too large: %d. assumed."
 msgstr ""
 
-#: config/tc-mips.c:15643
+#: config/tc-mips.c:12827
 msgid "Alignment negative: 0 assumed."
 msgstr ""
 
-#: config/tc-mips.c:15901
+#: config/tc-mips.c:13085
 #, c-format
 msgid "%s: no such section"
 msgstr ""
 
-#: config/tc-mips.c:15950
+#: config/tc-mips.c:13134
 #, c-format
 msgid ".option pic%d not supported"
 msgstr ""
 
-#: config/tc-mips.c:15955 config/tc-mips.c:16278
+#: config/tc-mips.c:13139 config/tc-mips.c:13446
 msgid "-G may not be used with SVR4 PIC code"
 msgstr ""
 
-#: config/tc-mips.c:15961
+#: config/tc-mips.c:13145
 #, c-format
 msgid "Unrecognized option \"%s\""
 msgstr ""
 
-#: config/tc-mips.c:16021
+#: config/tc-mips.c:13205
 msgid "`noreorder' must be set before `nomacro'"
 msgstr ""
 
-#: config/tc-mips.c:16047
+#: config/tc-mips.c:13231
 #, c-format
 msgid "%s isa does not support 64-bit registers"
 msgstr ""
 
-#: config/tc-mips.c:16058
+#: config/tc-mips.c:13242
 #, c-format
 msgid "%s isa does not support 64-bit floating point registers"
 msgstr ""
 
-#: config/tc-mips.c:16074
-msgid "`mips16' cannot be used with `micromips'"
-msgstr ""
-
-#: config/tc-mips.c:16083
-msgid "`micromips' cannot be used with `mips16'"
-msgstr ""
-
-#: config/tc-mips.c:16091
+#: config/tc-mips.c:13263
 #, c-format
 msgid "%s ISA does not support SmartMIPS ASE"
 msgstr ""
 
-#: config/tc-mips.c:16162
+#: config/tc-mips.c:13330
 #, c-format
 msgid "unknown architecture %s"
 msgstr ""
 
-#: config/tc-mips.c:16175 config/tc-mips.c:16205
+#: config/tc-mips.c:13343 config/tc-mips.c:13373
 #, c-format
 msgid "unknown ISA level %s"
 msgstr ""
 
-#: config/tc-mips.c:16183
+#: config/tc-mips.c:13351
 #, c-format
 msgid "unknown ISA or architecture %s"
 msgstr ""
 
-#: config/tc-mips.c:16233
+#: config/tc-mips.c:13401
 msgid ".set pop with no .set push"
 msgstr ""
 
-#: config/tc-mips.c:16262
+#: config/tc-mips.c:13430
 #, c-format
 msgid "Tried to set unrecognized symbol: %s\n"
 msgstr ""
 
-#: config/tc-mips.c:16320
+#: config/tc-mips.c:13488
 msgid ".cpload not in noreorder section"
 msgstr ""
 
-#: config/tc-mips.c:16388 config/tc-mips.c:16407
+#: config/tc-mips.c:13556 config/tc-mips.c:13575
 msgid "missing argument separator ',' for .cpsetup"
 msgstr ""
 
-#: config/tc-mips.c:16565
+#: config/tc-mips.c:13733
 #, c-format
 msgid "Unsupported use of %s"
 msgstr ""
 
-#: config/tc-mips.c:16647 config/tc-score.c:6031
+#: config/tc-mips.c:13815 config/tc-score.c:6035
 msgid "Unsupported use of .gpword"
 msgstr ""
 
-#: config/tc-mips.c:16687
+#: config/tc-mips.c:13855
 msgid "Unsupported use of .gpdword"
 msgstr ""
 
-#: config/tc-mips.c:16781
+#: config/tc-mips.c:13949
 #, c-format
 msgid "ignoring attempt to redefine symbol %s"
 msgstr ""
 
-#: config/tc-mips.c:16796 ecoff.c:3378
+#: config/tc-mips.c:13964 ecoff.c:3378
 msgid "bad .weakext directive"
 msgstr ""
 
-#: config/tc-mips.c:17032
+#: config/tc-mips.c:14200
 msgid "unsupported PC relative reference to different section"
 msgstr ""
 
-#: config/tc-mips.c:17145 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
+#: config/tc-mips.c:14313 config/tc-xtensa.c:1583 config/tc-xtensa.c:1859
 msgid "unsupported relocation"
 msgstr ""
 
-#: config/tc-mips.c:17577 config/tc-pdp11.c:1424
+#: config/tc-mips.c:14571 config/tc-pdp11.c:1424
 #, c-format
 msgid "Can not represent %s relocation in this object file format"
 msgstr ""
 
-#: config/tc-mips.c:17676 config/tc-mips.c:17970
+#: config/tc-mips.c:14656
 msgid "Relaxed out-of-range branch into a jump"
 msgstr ""
 
-#: config/tc-mips.c:18564
+#: config/tc-mips.c:15217
 msgid "missing .end at end of assembly"
 msgstr ""
 
-#: config/tc-mips.c:18579 config/tc-score.c:5641
+#: config/tc-mips.c:15232 config/tc-score.c:5644
 msgid "expected simple number"
 msgstr ""
 
-#: config/tc-mips.c:18607 config/tc-score.c:5668
+#: config/tc-mips.c:15260 config/tc-score.c:5671
 msgid "invalid number"
 msgstr ""
 
-#: config/tc-mips.c:18775 config/tc-score.c:5707
+#: config/tc-mips.c:15428 config/tc-score.c:5710
 msgid "missing .end"
 msgstr ""
 
-#: config/tc-mips.c:18827
+#: config/tc-mips.c:15480
 msgid "Bad .frame directive"
 msgstr ""
 
-#: config/tc-mips.c:18859
+#: config/tc-mips.c:15512
 msgid ".mask/.fmask outside of .ent"
 msgstr ""
 
-#: config/tc-mips.c:18866
+#: config/tc-mips.c:15519
 msgid "Bad .mask/.fmask directive"
 msgstr ""
 
-#: config/tc-mips.c:19145
+#: config/tc-mips.c:15796
 #, c-format
 msgid "Bad value (%s) for %s"
 msgstr ""
 
-#: config/tc-mips.c:19209
+#: config/tc-mips.c:15860
 #, c-format
 msgid ""
 "MIPS options:\n"
@@ -10076,7 +9855,7 @@ msgid ""
 "\t\t\timplicitly with the gp register [default 8]\n"
 msgstr ""
 
-#: config/tc-mips.c:19216
+#: config/tc-mips.c:15867
 #, c-format
 msgid ""
 "-mips1\t\t\tgenerate MIPS ISA I instructions\n"
@@ -10091,7 +9870,7 @@ msgid ""
 "-march=CPU/-mtune=CPU\tgenerate code/schedule for CPU, where CPU is one of:\n"
 msgstr ""
 
-#: config/tc-mips.c:19235
+#: config/tc-mips.c:15886
 #, c-format
 msgid ""
 "-mCPU\t\t\tequivalent to -march=CPU -mtune=CPU. Deprecated.\n"
@@ -10099,56 +9878,42 @@ msgid ""
 "\t\t\tFor -mCPU and -no-mCPU, CPU must be one of:\n"
 msgstr ""
 
-#: config/tc-mips.c:19248
+#: config/tc-mips.c:15899
 #, c-format
 msgid ""
 "-mips16\t\t\tgenerate mips16 instructions\n"
 "-no-mips16\t\tdo not generate mips16 instructions\n"
 msgstr ""
 
-#: config/tc-mips.c:19251
-#, c-format
-msgid ""
-"-mmicromips\t\tgenerate microMIPS instructions\n"
-"-mno-micromips\t\tdo not generate microMIPS instructions\n"
-msgstr ""
-
-#: config/tc-mips.c:19254
+#: config/tc-mips.c:15902
 #, c-format
 msgid ""
 "-msmartmips\t\tgenerate smartmips instructions\n"
 "-mno-smartmips\t\tdo not generate smartmips instructions\n"
 msgstr ""
 
-#: config/tc-mips.c:19257
+#: config/tc-mips.c:15905
 #, c-format
 msgid ""
 "-mdsp\t\t\tgenerate DSP instructions\n"
 "-mno-dsp\t\tdo not generate DSP instructions\n"
 msgstr ""
 
-#: config/tc-mips.c:19260
+#: config/tc-mips.c:15908
 #, c-format
 msgid ""
 "-mdspr2\t\t\tgenerate DSP R2 instructions\n"
 "-mno-dspr2\t\tdo not generate DSP R2 instructions\n"
 msgstr ""
 
-#: config/tc-mips.c:19263
+#: config/tc-mips.c:15911
 #, c-format
 msgid ""
 "-mmt\t\t\tgenerate MT instructions\n"
 "-mno-mt\t\t\tdo not generate MT instructions\n"
 msgstr ""
 
-#: config/tc-mips.c:19266
-#, c-format
-msgid ""
-"-mmcu\t\t\tgenerate MCU instructions\n"
-"-mno-mcu\t\tdo not generate MCU instructions\n"
-msgstr ""
-
-#: config/tc-mips.c:19269
+#: config/tc-mips.c:15914
 #, c-format
 msgid ""
 "-mfix-loongson2f-jump\twork around Loongson2F JUMP instructions\n"
@@ -10166,7 +9931,7 @@ msgid ""
 "--break, --no-trap\tbreak exception on div by 0 and mult overflow\n"
 msgstr ""
 
-#: config/tc-mips.c:19283
+#: config/tc-mips.c:15928
 #, c-format
 msgid ""
 "-mhard-float\t\tallow floating-point instructions\n"
@@ -10176,7 +9941,7 @@ msgid ""
 "--[no-]construct-floats [dis]allow floating point values to be constructed\n"
 msgstr ""
 
-#: config/tc-mips.c:19291
+#: config/tc-mips.c:15936
 #, c-format
 msgid ""
 "-KPIC, -call_shared\tgenerate SVR4 position independent code\n"
@@ -10190,7 +9955,7 @@ msgid ""
 "-mabi=ABI\t\tcreate ABI conformant object file for:\n"
 msgstr ""
 
-#: config/tc-mips.c:19312
+#: config/tc-mips.c:15957
 #, c-format
 msgid ""
 "-32\t\t\tcreate o32 ABI object file (default)\n"
@@ -11082,8 +10847,7 @@ msgstr ""
 msgid "6-bit displacement out of range"
 msgstr ""
 
-#: config/tc-pdp11.c:974 config/tc-tilegx.c:1160 config/tc-tilepro.c:1023
-#: config/tc-vax.c:1944
+#: config/tc-pdp11.c:974 config/tc-vax.c:1944
 msgid "Too many operands"
 msgstr ""
 
@@ -11370,7 +11134,7 @@ msgstr ""
 msgid "missing rename string"
 msgstr ""
 
-#: config/tc-ppc.c:3864 config/tc-ppc.c:4406 read.c:3363
+#: config/tc-ppc.c:3864 config/tc-ppc.c:4406 read.c:3364
 msgid "missing value"
 msgstr ""
 
@@ -11441,203 +11205,188 @@ msgstr ""
 msgid "Unrecognized symbol suffix"
 msgstr ""
 
-#: config/tc-ppc.c:5425
+#: config/tc-ppc.c:5424
 msgid "two .function pseudo-ops with no intervening .ef"
 msgstr ""
 
-#: config/tc-ppc.c:5438
+#: config/tc-ppc.c:5437
 msgid ".ef with no preceding .function"
 msgstr ""
 
-#: config/tc-ppc.c:5567
+#: config/tc-ppc.c:5566
 #, c-format
 msgid "warning: symbol %s has no csect"
 msgstr ""
 
-#: config/tc-ppc.c:5829
+#: config/tc-ppc.c:5828
 msgid "symbol in .toc does not match any .tc"
 msgstr ""
 
-#: config/tc-ppc.c:6200
+#: config/tc-ppc.c:6230
 #, c-format
 msgid "unsupported relocation against %s"
 msgstr ""
 
-#: config/tc-ppc.c:6273
+#: config/tc-ppc.c:6303
 #, c-format
 msgid "cannot emit PC relative %s relocation against %s"
 msgstr ""
 
-#: config/tc-ppc.c:6278
+#: config/tc-ppc.c:6308
 #, c-format
 msgid "cannot emit PC relative %s relocation"
 msgstr ""
 
-#: config/tc-ppc.c:6467
+#: config/tc-ppc.c:6497
 #, c-format
 msgid "Unable to handle reference to symbol %s"
 msgstr ""
 
-#: config/tc-ppc.c:6470
+#: config/tc-ppc.c:6500
 msgid "Unable to resolve expression"
 msgstr ""
 
-#: config/tc-ppc.c:6497
+#: config/tc-ppc.c:6527
 msgid "must branch to an address a multiple of 4"
 msgstr ""
 
-#: config/tc-ppc.c:6501
+#: config/tc-ppc.c:6531
 #, c-format
 msgid "@local or @plt branch destination is too far away, %ld bytes"
 msgstr ""
 
-#: config/tc-ppc.c:6532
+#: config/tc-ppc.c:6562
 #, c-format
 msgid "Gas failure, reloc value %d\n"
 msgstr ""
 
-#: config/tc-rx.c:151
+#: config/tc-rx.c:133
 #, c-format
 msgid " RX specific command line options:\n"
 msgstr ""
 
-#: config/tc-rx.c:152
+#: config/tc-rx.c:134
 #, c-format
 msgid "  --mbig-endian-data\n"
 msgstr ""
 
-#: config/tc-rx.c:153
+#: config/tc-rx.c:135
 #, c-format
 msgid "  --mlittle-endian-data [default]\n"
 msgstr ""
 
-#: config/tc-rx.c:154
+#: config/tc-rx.c:136
 #, c-format
 msgid "  --m32bit-doubles [default]\n"
 msgstr ""
 
-#: config/tc-rx.c:155
+#: config/tc-rx.c:137
 #, c-format
 msgid "  --m64bit-doubles\n"
 msgstr ""
 
-#: config/tc-rx.c:156
+#: config/tc-rx.c:138
 #, c-format
 msgid "  --muse-conventional-section-names\n"
 msgstr ""
 
-#: config/tc-rx.c:157
+#: config/tc-rx.c:139
 #, c-format
 msgid "  --muse-renesas-section-names [default]\n"
 msgstr ""
 
-#: config/tc-rx.c:158
+#: config/tc-rx.c:140
 #, c-format
 msgid "  --msmall-data-limit\n"
 msgstr ""
 
-#: config/tc-rx.c:159
-#, c-format
-msgid "  --mrelax\n"
-msgstr ""
-
-#: config/tc-rx.c:160
-#, c-format
-msgid "  --mpid\n"
-msgstr ""
-
-#: config/tc-rx.c:161
-#, c-format
-msgid "  --mint-register=<value>\n"
-msgstr ""
-
-#: config/tc-rx.c:241
+#: config/tc-rx.c:220
 msgid "no filename following .INCLUDE pseudo-op"
 msgstr ""
 
-#: config/tc-rx.c:344
+#: config/tc-rx.c:323
 #, c-format
 msgid "unable to locate include file: %s"
 msgstr ""
 
-#: config/tc-rx.c:395
+#: config/tc-rx.c:374
 #, c-format
 msgid "unrecognised alignment value in .SECTION directive: %s"
 msgstr ""
 
-#: config/tc-rx.c:412
+#: config/tc-rx.c:391
 #, c-format
 msgid "unknown parameter following .SECTION directive: %s"
 msgstr ""
 
-#: config/tc-rx.c:501
+#: config/tc-rx.c:480
 msgid "expecting either ON or OFF after .list"
 msgstr ""
 
-#: config/tc-rx.c:537
+#: config/tc-rx.c:516
 #, c-format
 msgid "The \".%s\" pseudo-op is not implemented\n"
 msgstr ""
 
-#: config/tc-rx.c:797
+#: config/tc-rx.c:748
 #, c-format
 msgid "Value %d doesn't fit in unsigned %d-bit field"
 msgstr ""
 
-#: config/tc-rx.c:803
+#: config/tc-rx.c:754
 #, c-format
 msgid "Value %d doesn't fit in signed %d-bit field"
 msgstr ""
 
-#: config/tc-rx.c:1003
+#: config/tc-rx.c:954
 msgid "The .DEFINE pseudo-op is not implemented"
 msgstr ""
 
-#: config/tc-rx.c:1005
+#: config/tc-rx.c:956
 msgid "The .MACRO pseudo-op is not implemented"
 msgstr ""
 
-#: config/tc-rx.c:1007
+#: config/tc-rx.c:958
 msgid "The .BTEQU pseudo-op is not implemented."
 msgstr ""
 
-#: config/tc-rx.c:1932
+#: config/tc-rx.c:1883
 msgid "invalid immediate size"
 msgstr ""
 
-#: config/tc-rx.c:1951
+#: config/tc-rx.c:1902
 msgid "invalid immediate field position"
 msgstr ""
 
-#: config/tc-rx.c:2000
+#: config/tc-rx.c:1951
 #, c-format
 msgid "bad frag at %p : fix %ld addr %ld %ld \n"
 msgstr ""
 
-#: config/tc-rx.c:2067
+#: config/tc-rx.c:2018
 #, c-format
 msgid "unsupported constant size %d\n"
 msgstr ""
 
-#: config/tc-rx.c:2074
+#: config/tc-rx.c:2025
 msgid "difference of two symbols only supported with .long, .short, or .byte"
 msgstr ""
 
-#: config/tc-rx.c:2118
+#: config/tc-rx.c:2069
 #, c-format
 msgid "jump not 3..10 bytes away (is %d)"
 msgstr ""
 
-#: config/tc-rx.c:2264
+#: config/tc-rx.c:2215
 #, c-format
 msgid "Unknown reloc in md_apply_fix: %s"
 msgstr ""
 
-#: config/tc-s390.c:332 config/tc-sparc.c:296
+#: config/tc-s390.c:332 config/tc-sparc.c:272
 msgid "Invalid default architecture, broken assembler."
 msgstr ""
 
-#: config/tc-s390.c:439 config/tc-sparc.c:499
+#: config/tc-s390.c:439 config/tc-sparc.c:475
 #, c-format
 msgid "invalid architecture -A%s"
 msgstr ""
@@ -11803,7 +11552,7 @@ msgstr ""
 msgid "S+core co-processor register expected"
 msgstr ""
 
-#: config/tc-score.c:1074 config/tc-score.c:2068
+#: config/tc-score.c:1074 config/tc-score.c:2073
 msgid "Using temp register(r1)"
 msgstr ""
 
@@ -11812,343 +11561,343 @@ msgstr ""
 msgid "register expected, not '%.100s'"
 msgstr ""
 
-#: config/tc-score.c:1149 config/tc-score.c:5485
+#: config/tc-score.c:1149 config/tc-score.c:5488
 msgid "rd must be even number."
 msgstr ""
 
-#: config/tc-score.c:1513 config/tc-score.c:1520
+#: config/tc-score.c:1520 config/tc-score.c:1527
 #, c-format
 msgid "invalid constant: %d bit expression not in range %u..%u"
 msgstr ""
 
-#: config/tc-score.c:1526 config/tc-score.c:1533 config/tc-score.c:2895
-#: config/tc-score.c:2900 config/tc-score.c:3165 config/tc-score.c:3170
-#: config/tc-score.c:3462
+#: config/tc-score.c:1533 config/tc-score.c:1540 config/tc-score.c:2900
+#: config/tc-score.c:2905 config/tc-score.c:3172 config/tc-score.c:3177
+#: config/tc-score.c:3470
 #, c-format
 msgid "invalid constant: %d bit expression not in range %d..%d"
 msgstr ""
 
-#: config/tc-score.c:1558
+#: config/tc-score.c:1565
 msgid "invalid constant: bit expression not defined"
 msgstr ""
 
-#: config/tc-score.c:2082
+#: config/tc-score.c:2087
 #, c-format
 msgid "low register(r0-r15)expected, not '%.100s'"
 msgstr ""
 
-#: config/tc-score.c:2144 config/tc-score.c:3482 config/tc-score.c:3650
-#: config/tc-score.c:3695
+#: config/tc-score.c:2149 config/tc-score.c:3491 config/tc-score.c:3659
+#: config/tc-score.c:3704
 #, c-format
 msgid "missing ["
 msgstr ""
 
-#: config/tc-score.c:2158 config/tc-score.c:3103 config/tc-score.c:3305
-#: config/tc-score.c:3321 config/tc-score.c:3392 config/tc-score.c:3447
-#: config/tc-score.c:3671 config/tc-score.c:3716 config/tc-score.c:3865
-#: config/tc-score.c:3919 config/tc-score.c:3965
+#: config/tc-score.c:2163 config/tc-score.c:3110 config/tc-score.c:3312
+#: config/tc-score.c:3328 config/tc-score.c:3399 config/tc-score.c:3455
+#: config/tc-score.c:3680 config/tc-score.c:3725 config/tc-score.c:3874
+#: config/tc-score.c:3928 config/tc-score.c:3974
 #, c-format
 msgid "missing ]"
 msgstr ""
 
-#: config/tc-score.c:2347
+#: config/tc-score.c:2352
 #, c-format
 msgid "Fix data dependency: %s %s -- %s %s  (insert %d nop!/%d)"
 msgstr ""
 
-#: config/tc-score.c:2366
+#: config/tc-score.c:2371
 #, c-format
 msgid "Fix data dependency: %s %s -- %s %s  (insert 1 pflush/%d)"
 msgstr ""
 
-#: config/tc-score.c:2382 config/tc-score.c:2389
+#: config/tc-score.c:2387 config/tc-score.c:2394
 #, c-format
 msgid "data dependency: %s %s -- %s %s  (%d/%d bubble)"
 msgstr ""
 
-#: config/tc-score.c:2750 config/tc-score.c:6504
+#: config/tc-score.c:2755 config/tc-score.c:6508
 #, c-format
 msgid "%s -- `%s'"
 msgstr ""
 
-#: config/tc-score.c:2838
+#: config/tc-score.c:2843
 msgid "address offset must be half word alignment"
 msgstr ""
 
-#: config/tc-score.c:2846
+#: config/tc-score.c:2851
 msgid "address offset must be word alignment"
 msgstr ""
 
-#: config/tc-score.c:2986 config/tc-score.c:3123
+#: config/tc-score.c:2993 config/tc-score.c:3130
 msgid "register same as write-back base"
 msgstr ""
 
-#: config/tc-score.c:3093
+#: config/tc-score.c:3100
 msgid "pre-indexed expression expected"
 msgstr ""
 
-#: config/tc-score.c:3422
+#: config/tc-score.c:3430
 #, c-format
 msgid "invalid register number: %d is not in [r0--r7]"
 msgstr ""
 
-#: config/tc-score.c:3439
+#: config/tc-score.c:3447
 msgid "comma is  expected"
 msgstr ""
 
-#: config/tc-score.c:3470
+#: config/tc-score.c:3478
 #, c-format
 msgid "invalid constant: %d is not word align integer"
 msgstr ""
 
-#: config/tc-score.c:3509 config/tc-score.c:3552
+#: config/tc-score.c:3518 config/tc-score.c:3561
 msgid "invalid constant: 32 bit expression not word align"
 msgstr ""
 
-#: config/tc-score.c:3518 config/tc-score.c:3561
+#: config/tc-score.c:3527 config/tc-score.c:3570
 msgid "invalid constant: 32 bit expression not in range [0, 0xffffffff]"
 msgstr ""
 
-#: config/tc-score.c:3594
+#: config/tc-score.c:3603
 msgid ""
 "invalid constant: 32 bit expression not in range [-0x80000000, 0x7fffffff]"
 msgstr ""
 
-#: config/tc-score.c:3783 config/tc-score.c:3811
+#: config/tc-score.c:3792 config/tc-score.c:3820
 msgid "imm5 should >= 2"
 msgstr ""
 
-#: config/tc-score.c:3788 config/tc-score.c:3817
+#: config/tc-score.c:3797 config/tc-score.c:3826
 msgid "reg should <= 31"
 msgstr ""
 
-#: config/tc-score.c:3859 config/tc-score.c:3910
+#: config/tc-score.c:3868 config/tc-score.c:3919
 msgid "missing +"
 msgstr ""
 
-#: config/tc-score.c:3903
+#: config/tc-score.c:3912
 #, c-format
 msgid "%s register same as write-back base"
 msgstr ""
 
-#: config/tc-score.c:3905
+#: config/tc-score.c:3914
 msgid "destination"
 msgstr ""
 
-#: config/tc-score.c:3905
+#: config/tc-score.c:3914
 msgid "source"
 msgstr ""
 
-#: config/tc-score.c:4235 config/tc-score.c:4311 config/tc-score.c:4946
+#: config/tc-score.c:4244 config/tc-score.c:4320 config/tc-score.c:4949
 msgid "expression error"
 msgstr ""
 
-#: config/tc-score.c:4241
+#: config/tc-score.c:4250
 msgid "value not in range [0, 0xffffffff]"
 msgstr ""
 
-#: config/tc-score.c:4317
+#: config/tc-score.c:4326
 msgid "value not in range [-0xffffffff, 0xffffffff]"
 msgstr ""
 
-#: config/tc-score.c:4345
+#: config/tc-score.c:4354
 msgid "li rd label isn't correct instruction form"
 msgstr ""
 
-#: config/tc-score.c:4515 config/tc-score.c:4670 config/tc-score.c:5197
-#: config/tc-score.c:5225
+#: config/tc-score.c:4523 config/tc-score.c:4674 config/tc-score.c:5200
+#: config/tc-score.c:5228
 msgid "lacking label  "
 msgstr ""
 
-#: config/tc-score.c:4896
+#: config/tc-score.c:4899
 msgid "s3_PIC code offset overflow (max 16 signed bits)"
 msgstr ""
 
-#: config/tc-score.c:4952
+#: config/tc-score.c:4955
 msgid "value not in range [0, 0x7fffffff]"
 msgstr ""
 
-#: config/tc-score.c:4957
+#: config/tc-score.c:4960
 msgid "end on line error"
 msgstr ""
 
-#: config/tc-score.c:5204
+#: config/tc-score.c:5207
 msgid "invalid constant: 25 bit expression not in range [-16777216, 16777215]"
 msgstr ""
 
-#: config/tc-score.c:5231
+#: config/tc-score.c:5234
 msgid "invalid constant: 20 bit expression not in range -2^19..2^19"
 msgstr ""
 
-#: config/tc-score.c:5264
+#: config/tc-score.c:5267
 msgid "lacking label"
 msgstr ""
 
-#: config/tc-score.c:5269
+#: config/tc-score.c:5272
 msgid "invalid constant: 10 bit expression not in range [-2^9, 2^9-1]"
 msgstr ""
 
-#: config/tc-score.c:5365
+#: config/tc-score.c:5368
 msgid "pce instruction error (16 bit || 16 bit)'"
 msgstr ""
 
-#: config/tc-score.c:5383 config/tc-score.c:5407 config/tc-score.c:5434
-#: config/tc-score.c:5463 config/tc-score.c:5512
+#: config/tc-score.c:5386 config/tc-score.c:5410 config/tc-score.c:5437
+#: config/tc-score.c:5466 config/tc-score.c:5515
 msgid "score3d instruction."
 msgstr ""
 
-#: config/tc-score.c:6122 read.c:1465
+#: config/tc-score.c:6126 read.c:1465
 msgid "missing size expression"
 msgstr ""
 
-#: config/tc-score.c:6128
+#: config/tc-score.c:6132
 #, c-format
 msgid "BSS length (%d) < 0 ignored"
 msgstr ""
 
-#: config/tc-score.c:6143 read.c:2298
+#: config/tc-score.c:6147 read.c:2298
 #, c-format
 msgid "error setting flags for \".sbss\": %s"
 msgstr ""
 
-#: config/tc-score.c:6157 config/tc-sparc.c:3838
+#: config/tc-score.c:6161 config/tc-sparc.c:3695
 msgid "missing alignment"
 msgstr ""
 
-#: config/tc-score.c:6194
+#: config/tc-score.c:6198
 #, c-format
 msgid "alignment too large; %d assumed"
 msgstr ""
 
-#: config/tc-score.c:6199 read.c:2359
+#: config/tc-score.c:6203 read.c:2359
 msgid "alignment negative; 0 assumed"
 msgstr ""
 
-#: config/tc-score.c:6266 ecoff.c:3365 read.c:1484 read.c:1590 read.c:2476
-#: read.c:3097 read.c:3487 symbols.c:336 symbols.c:432
+#: config/tc-score.c:6270 ecoff.c:3365 read.c:1484 read.c:1590 read.c:2476
+#: read.c:3098 read.c:3488 symbols.c:334 symbols.c:430
 #, c-format
 msgid "symbol `%s' is already defined"
 msgstr ""
 
 #. Error routine.
-#: config/tc-score.c:6608 config/tc-score.c:6632
+#: config/tc-score.c:6612 config/tc-score.c:6636
 msgid "size is not 4 or 6"
 msgstr ""
 
-#: config/tc-score.c:6691
+#: config/tc-score.c:6695
 msgid "bad call to MD_ATOF()"
 msgstr ""
 
-#: config/tc-score.c:7198
+#: config/tc-score.c:7203
 #, c-format
 msgid " branch relocation truncate (0x%x) [-2^9 ~ 2^9]"
 msgstr ""
 
-#: config/tc-score.c:7213 config/tc-score.c:7242 config/tc-score.c:7294
+#: config/tc-score.c:7218 config/tc-score.c:7247 config/tc-score.c:7299
 #, c-format
 msgid " branch relocation truncate (0x%x) [-2^19 ~ 2^19]"
 msgstr ""
 
-#: config/tc-score.c:7264 config/tc-score.c:7319
+#: config/tc-score.c:7269 config/tc-score.c:7324
 #, c-format
 msgid " branch relocation truncate (0x%x)  [-2^9 ~ 2^9]"
 msgstr ""
 
-#: config/tc-score.c:7488
+#: config/tc-score.c:7500
 #, c-format
 msgid "cannot represent %s relocation in this object file format1"
 msgstr ""
 
-#: config/tc-score.c:7779
+#: config/tc-score.c:7791
 #, c-format
 msgid "Sunplus-v2-0-0-20060510\n"
 msgstr ""
 
-#: config/tc-score.c:7799
+#: config/tc-score.c:7811
 #, c-format
 msgid " Score-specific assembler options:\n"
 msgstr ""
 
-#: config/tc-score.c:7801
+#: config/tc-score.c:7813
 #, c-format
 msgid "        -EB\t\tassemble code for a big-endian cpu\n"
 msgstr ""
 
-#: config/tc-score.c:7806
+#: config/tc-score.c:7818
 #, c-format
 msgid "        -EL\t\tassemble code for a little-endian cpu\n"
 msgstr ""
 
-#: config/tc-score.c:7810
+#: config/tc-score.c:7822
 #, c-format
 msgid "        -FIXDD\t\tassemble code for fix data dependency\n"
 msgstr ""
 
-#: config/tc-score.c:7812
+#: config/tc-score.c:7824
 #, c-format
 msgid ""
 "        -NWARN\t\tassemble code for no warning message for fix data "
 "dependency\n"
 msgstr ""
 
-#: config/tc-score.c:7814
+#: config/tc-score.c:7826
 #, c-format
 msgid "        -SCORE5\t\tassemble code for target is SCORE5\n"
 msgstr ""
 
-#: config/tc-score.c:7816
+#: config/tc-score.c:7828
 #, c-format
 msgid "        -SCORE5U\tassemble code for target is SCORE5U\n"
 msgstr ""
 
-#: config/tc-score.c:7818
+#: config/tc-score.c:7830
 #, c-format
 msgid ""
 "        -SCORE7\t\tassemble code for target is SCORE7, this is default "
 "setting\n"
 msgstr ""
 
-#: config/tc-score.c:7820
+#: config/tc-score.c:7832
 #, c-format
 msgid "        -SCORE3\t\tassemble code for target is SCORE3\n"
 msgstr ""
 
-#: config/tc-score.c:7822
+#: config/tc-score.c:7834
 #, c-format
 msgid ""
 "        -march=score7\tassemble code for target is SCORE7, this is default "
 "setting\n"
 msgstr ""
 
-#: config/tc-score.c:7824
+#: config/tc-score.c:7836
 #, c-format
 msgid "        -march=score3\tassemble code for target is SCORE3\n"
 msgstr ""
 
-#: config/tc-score.c:7826
+#: config/tc-score.c:7838
 #, c-format
 msgid ""
 "        -USE_R1\t\tassemble code for no warning message when using temp "
 "register r1\n"
 msgstr ""
 
-#: config/tc-score.c:7828
+#: config/tc-score.c:7840
 #, c-format
 msgid "        -KPIC\t\tassemble code for PIC\n"
 msgstr ""
 
-#: config/tc-score.c:7830
+#: config/tc-score.c:7842
 #, c-format
 msgid "        -O0\t\tassembler will not perform any optimizations\n"
 msgstr ""
 
-#: config/tc-score.c:7832
+#: config/tc-score.c:7844
 #, c-format
 msgid ""
 "        -G gpnum\tassemble code for setting gpsize and default is 8 byte\n"
 msgstr ""
 
-#: config/tc-score.c:7834
+#: config/tc-score.c:7846
 #, c-format
 msgid "        -V \t\tSunplus release version \n"
 msgstr ""
@@ -12441,8 +12190,8 @@ msgstr ""
 msgid "overflow in branch to %s; converted into longer instruction sequence"
 msgstr ""
 
-#: config/tc-sh.c:3749 config/tc-sh.c:3796 config/tc-sparc.c:4345
-#: config/tc-sparc.c:4369
+#: config/tc-sh.c:3749 config/tc-sh.c:3796 config/tc-sparc.c:4202
+#: config/tc-sparc.c:4226
 msgid "misaligned data"
 msgstr ""
 
@@ -12644,26 +12393,26 @@ msgstr ""
 msgid "Invalid DataLabel expression"
 msgstr ""
 
-#: config/tc-sparc.c:300 config/tc-sparc.c:505
+#: config/tc-sparc.c:276 config/tc-sparc.c:481
 msgid "Bad opcode table, broken assembler."
 msgstr ""
 
-#: config/tc-sparc.c:497
+#: config/tc-sparc.c:473
 #, c-format
 msgid "invalid architecture -xarch=%s"
 msgstr ""
 
-#: config/tc-sparc.c:569
+#: config/tc-sparc.c:542
 #, c-format
 msgid "No compiled in support for %d bit object file format"
 msgstr ""
 
-#: config/tc-sparc.c:650
+#: config/tc-sparc.c:623
 #, c-format
 msgid "SPARC options:\n"
 msgstr ""
 
-#: config/tc-sparc.c:679
+#: config/tc-sparc.c:652
 #, c-format
 msgid ""
 "\n"
@@ -12675,24 +12424,24 @@ msgid ""
 "-no-relax\t\tavoid changing any jumps and branches\n"
 msgstr ""
 
-#: config/tc-sparc.c:687
+#: config/tc-sparc.c:660
 #, c-format
 msgid "-k\t\t\tgenerate PIC\n"
 msgstr ""
 
-#: config/tc-sparc.c:691
+#: config/tc-sparc.c:664
 #, c-format
 msgid ""
 "-32\t\t\tcreate 32 bit object file\n"
 "-64\t\t\tcreate 64 bit object file\n"
 msgstr ""
 
-#: config/tc-sparc.c:694
+#: config/tc-sparc.c:667
 #, c-format
 msgid "\t\t\t[default is %d]\n"
 msgstr ""
 
-#: config/tc-sparc.c:696
+#: config/tc-sparc.c:669
 #, c-format
 msgid ""
 "-TSO\t\t\tuse Total Store Ordering\n"
@@ -12700,12 +12449,12 @@ msgid ""
 "-RMO\t\t\tuse Relaxed Memory Ordering\n"
 msgstr ""
 
-#: config/tc-sparc.c:700
+#: config/tc-sparc.c:673
 #, c-format
 msgid "\t\t\t[default is %s]\n"
 msgstr ""
 
-#: config/tc-sparc.c:702
+#: config/tc-sparc.c:675
 #, c-format
 msgid ""
 "-KPIC\t\t\tgenerate PIC\n"
@@ -12719,7 +12468,7 @@ msgid ""
 "-s\t\t\tignored\n"
 msgstr ""
 
-#: config/tc-sparc.c:714
+#: config/tc-sparc.c:687
 #, c-format
 msgid ""
 "-EL\t\t\tgenerate code for a little endian machine\n"
@@ -12728,321 +12477,316 @@ msgid ""
 "                        instructions and little endian data.\n"
 msgstr ""
 
-#: config/tc-sparc.c:851
+#: config/tc-sparc.c:823
 #, c-format
 msgid "Internal error: losing opcode: `%s' \"%s\"\n"
 msgstr ""
 
-#: config/tc-sparc.c:870
+#: config/tc-sparc.c:842
 #, c-format
 msgid "Internal error: can't find opcode `%s' for `%s'\n"
 msgstr ""
 
-#: config/tc-sparc.c:1053
+#: config/tc-sparc.c:983
 msgid "Support for 64-bit arithmetic not compiled in."
 msgstr ""
 
-#: config/tc-sparc.c:1099
+#: config/tc-sparc.c:1029
 msgid "set: number not in 0..4294967295 range"
 msgstr ""
 
-#: config/tc-sparc.c:1106
+#: config/tc-sparc.c:1036
 msgid "set: number not in -2147483648..4294967295 range"
 msgstr ""
 
-#: config/tc-sparc.c:1165
+#: config/tc-sparc.c:1095
 msgid "setsw: number not in -2147483648..4294967295 range"
 msgstr ""
 
-#: config/tc-sparc.c:1213
+#: config/tc-sparc.c:1143
 msgid "setx: temporary register same as destination register"
 msgstr ""
 
-#: config/tc-sparc.c:1284
+#: config/tc-sparc.c:1214
 msgid "setx: illegal temporary register g0"
 msgstr ""
 
-#: config/tc-sparc.c:1381
+#: config/tc-sparc.c:1311
 msgid "FP branch in delay slot"
 msgstr ""
 
-#: config/tc-sparc.c:1396
+#: config/tc-sparc.c:1326
 msgid "FP branch preceded by FP instruction; NOP inserted"
 msgstr ""
 
-#: config/tc-sparc.c:1436
+#: config/tc-sparc.c:1366
 msgid "failed special case insn sanity check"
 msgstr ""
 
-#: config/tc-sparc.c:1562
+#: config/tc-sparc.c:1454
 msgid ": invalid membar mask name"
 msgstr ""
 
-#: config/tc-sparc.c:1578
+#: config/tc-sparc.c:1470
 msgid ": invalid membar mask expression"
 msgstr ""
 
-#: config/tc-sparc.c:1583
+#: config/tc-sparc.c:1475
 msgid ": invalid membar mask number"
 msgstr ""
 
-#: config/tc-sparc.c:1598
+#: config/tc-sparc.c:1490
 msgid ": invalid siam mode expression"
 msgstr ""
 
-#: config/tc-sparc.c:1603
+#: config/tc-sparc.c:1495
 msgid ": invalid siam mode number"
 msgstr ""
 
-#: config/tc-sparc.c:1619
+#: config/tc-sparc.c:1511
 msgid ": invalid prefetch function name"
 msgstr ""
 
-#: config/tc-sparc.c:1627
+#: config/tc-sparc.c:1519
 msgid ": invalid prefetch function expression"
 msgstr ""
 
-#: config/tc-sparc.c:1632
+#: config/tc-sparc.c:1524
 msgid ": invalid prefetch function number"
 msgstr ""
 
-#: config/tc-sparc.c:1660 config/tc-sparc.c:1672
+#: config/tc-sparc.c:1552 config/tc-sparc.c:1564
 msgid ": unrecognizable privileged register"
 msgstr ""
 
-#: config/tc-sparc.c:1696 config/tc-sparc.c:1708
+#: config/tc-sparc.c:1588 config/tc-sparc.c:1600
 msgid ": unrecognizable hyperprivileged register"
 msgstr ""
 
-#: config/tc-sparc.c:1732 config/tc-sparc.c:1757
+#: config/tc-sparc.c:1624 config/tc-sparc.c:1649
 msgid ": unrecognizable v9a or v9b ancillary state register"
 msgstr ""
 
-#: config/tc-sparc.c:1737
+#: config/tc-sparc.c:1629
 msgid ": rd on write only ancillary state register"
 msgstr ""
 
 #. %sys_tick and %sys_tick_cmpr are v9bnotv9a
-#: config/tc-sparc.c:1745
+#: config/tc-sparc.c:1637
 msgid ": unrecognizable v9a ancillary state register"
 msgstr ""
 
-#: config/tc-sparc.c:1781
+#: config/tc-sparc.c:1673
 msgid ": asr number must be between 16 and 31"
 msgstr ""
 
-#: config/tc-sparc.c:1789
+#: config/tc-sparc.c:1681
 msgid ": asr number must be between 0 and 31"
 msgstr ""
 
-#: config/tc-sparc.c:1799
+#: config/tc-sparc.c:1691
 #, c-format
 msgid ": expecting %asrN"
 msgstr ""
 
-#: config/tc-sparc.c:1986 config/tc-sparc.c:2024 config/tc-sparc.c:2454
-#: config/tc-sparc.c:2490
+#: config/tc-sparc.c:1878 config/tc-sparc.c:1916 config/tc-sparc.c:2329
+#: config/tc-sparc.c:2365
 #, c-format
 msgid "Illegal operands: %%%s requires arguments in ()"
 msgstr ""
 
-#: config/tc-sparc.c:1992
+#: config/tc-sparc.c:1884
 #, c-format
 msgid ""
 "Illegal operands: %%%s cannot be used together with other relocs in the insn "
 "()"
 msgstr ""
 
-#: config/tc-sparc.c:2003
+#: config/tc-sparc.c:1895
 #, c-format
 msgid "Illegal operands: %%%s can be only used with call __tls_get_addr"
 msgstr ""
 
-#: config/tc-sparc.c:2210
+#: config/tc-sparc.c:2102
 msgid "detected global register use not covered by .register pseudo-op"
 msgstr ""
 
-#: config/tc-sparc.c:2285
+#: config/tc-sparc.c:2173
 msgid ": There are only 64 f registers; [0-63]"
 msgstr ""
 
-#: config/tc-sparc.c:2287 config/tc-sparc.c:2305
+#: config/tc-sparc.c:2175 config/tc-sparc.c:2193
 msgid ": There are only 32 f registers; [0-31]"
 msgstr ""
 
-#: config/tc-sparc.c:2297
+#: config/tc-sparc.c:2185
 msgid ": There are only 32 single precision f registers; [0-31]"
 msgstr ""
 
-#: config/tc-sparc.c:2502
+#: config/tc-sparc.c:2377
 #, c-format
 msgid ""
 "Illegal operands: Can't do arithmetics other than + and - involving %%%s()"
 msgstr ""
 
-#: config/tc-sparc.c:2614
+#: config/tc-sparc.c:2487
 #, c-format
 msgid "Illegal operands: Can't add non-constant expression to %%%s()"
 msgstr ""
 
-#: config/tc-sparc.c:2624
+#: config/tc-sparc.c:2497
 #, c-format
 msgid ""
 "Illegal operands: Can't do arithmetics involving %%%s() of a relocatable "
 "symbol"
 msgstr ""
 
-#: config/tc-sparc.c:2642
+#: config/tc-sparc.c:2515
 msgid ": PC-relative operand can't be a constant"
 msgstr ""
 
-#: config/tc-sparc.c:2649
+#: config/tc-sparc.c:2522
 msgid ": TLS operand can't be a constant"
 msgstr ""
 
-#: config/tc-sparc.c:2682
+#: config/tc-sparc.c:2555
 msgid ": invalid ASI name"
 msgstr ""
 
-#: config/tc-sparc.c:2690
+#: config/tc-sparc.c:2563
 msgid ": invalid ASI expression"
 msgstr ""
 
-#: config/tc-sparc.c:2695
+#: config/tc-sparc.c:2568
 msgid ": invalid ASI number"
 msgstr ""
 
-#: config/tc-sparc.c:2792
+#: config/tc-sparc.c:2665
 msgid "OPF immediate operand out of range (0-0x1ff)"
 msgstr ""
 
-#: config/tc-sparc.c:2797
+#: config/tc-sparc.c:2670
 msgid "non-immediate OPF operand, ignored"
 msgstr ""
 
-#: config/tc-sparc.c:2816
+#: config/tc-sparc.c:2689
 msgid ": invalid cpreg name"
 msgstr ""
 
-#: config/tc-sparc.c:2845
+#: config/tc-sparc.c:2718
 #, c-format
 msgid "Illegal operands%s"
 msgstr ""
 
-#: config/tc-sparc.c:2884
+#: config/tc-sparc.c:2752
 #, c-format
 msgid "architecture bumped from \"%s\" to \"%s\" on \"%s\""
 msgstr ""
 
-#: config/tc-sparc.c:2920
+#: config/tc-sparc.c:2788
 #, c-format
 msgid "Architecture mismatch on \"%s\"."
 msgstr ""
 
-#: config/tc-sparc.c:2921
+#: config/tc-sparc.c:2789
 #, c-format
 msgid " (Requires %s; requested architecture is %s.)"
 msgstr ""
 
-#: config/tc-sparc.c:2933
-#, c-format
-msgid "Hardware capability \"%s\" not enabled for \"%s\"."
-msgstr ""
-
-#: config/tc-sparc.c:3467
+#: config/tc-sparc.c:3324
 #, c-format
 msgid "bad or unhandled relocation type: 0x%02x"
 msgstr ""
 
-#: config/tc-sparc.c:3800
+#: config/tc-sparc.c:3657
 msgid "Expected comma after name"
 msgstr ""
 
-#: config/tc-sparc.c:3809
+#: config/tc-sparc.c:3666
 #, c-format
 msgid "BSS length (%d.) <0! Ignored."
 msgstr ""
 
-#: config/tc-sparc.c:3821
+#: config/tc-sparc.c:3678
 msgid "bad .reserve segment -- expected BSS segment"
 msgstr ""
 
-#: config/tc-sparc.c:3849
+#: config/tc-sparc.c:3706
 #, c-format
 msgid "alignment too large; assuming %d"
 msgstr ""
 
-#: config/tc-sparc.c:3855 config/tc-sparc.c:4005
+#: config/tc-sparc.c:3712 config/tc-sparc.c:3862
 msgid "negative alignment"
 msgstr ""
 
-#: config/tc-sparc.c:3865 config/tc-sparc.c:4027 read.c:1321 read.c:2371
+#: config/tc-sparc.c:3722 config/tc-sparc.c:3884 read.c:1321 read.c:2371
 msgid "alignment not a power of 2"
 msgstr ""
 
-#: config/tc-sparc.c:3918
+#: config/tc-sparc.c:3775
 #, c-format
 msgid "Ignoring attempt to re-define symbol %s"
 msgstr ""
 
-#: config/tc-sparc.c:3942 config/tc-v850.c:275
+#: config/tc-sparc.c:3799 config/tc-v850.c:275
 msgid "Expected comma after symbol-name"
 msgstr ""
 
-#: config/tc-sparc.c:3952
+#: config/tc-sparc.c:3809
 #, c-format
 msgid ".COMMon length (%lu) out of range ignored"
 msgstr ""
 
-#: config/tc-sparc.c:3985
+#: config/tc-sparc.c:3842
 msgid "Expected comma after common length"
 msgstr ""
 
-#: config/tc-sparc.c:3999
+#: config/tc-sparc.c:3856
 #, c-format
 msgid "alignment too large; assuming %ld"
 msgstr ""
 
-#: config/tc-sparc.c:4142
+#: config/tc-sparc.c:3999
 msgid "Unknown segment type"
 msgstr ""
 
-#: config/tc-sparc.c:4217 config/tc-sparc.c:4227
+#: config/tc-sparc.c:4074 config/tc-sparc.c:4084
 #, c-format
 msgid "register syntax is .register %%g[2367],{#scratch|symbolname|#ignore}"
 msgstr ""
 
-#: config/tc-sparc.c:4245
+#: config/tc-sparc.c:4102
 msgid "redefinition of global register"
 msgstr ""
 
-#: config/tc-sparc.c:4256
+#: config/tc-sparc.c:4113
 #, c-format
 msgid "Register symbol %s already defined."
 msgstr ""
 
-#: config/tc-sparc.c:4460
+#: config/tc-sparc.c:4317
 #, c-format
 msgid "Illegal operands: %%r_plt in %d-byte data field"
 msgstr ""
 
-#: config/tc-sparc.c:4470
+#: config/tc-sparc.c:4327
 #, c-format
 msgid "Illegal operands: %%r_tls_dtpoff in %d-byte data field"
 msgstr ""
 
-#: config/tc-sparc.c:4507 config/tc-vax.c:3312
+#: config/tc-sparc.c:4364 config/tc-vax.c:3312
 #, c-format
 msgid "Illegal operands: Only %%r_%s%d allowed in %d-byte data fields"
 msgstr ""
 
-#: config/tc-sparc.c:4515 config/tc-sparc.c:4546 config/tc-sparc.c:4555
+#: config/tc-sparc.c:4372 config/tc-sparc.c:4403 config/tc-sparc.c:4412
 #: config/tc-vax.c:3320 config/tc-vax.c:3351 config/tc-vax.c:3360
 #, c-format
 msgid "Illegal operands: %%r_%s%d requires arguments in ()"
 msgstr ""
 
-#: config/tc-sparc.c:4564 config/tc-vax.c:3369
+#: config/tc-sparc.c:4421 config/tc-vax.c:3369
 #, c-format
 msgid "Illegal operands: garbage after %%r_%s%d()"
 msgstr ""
@@ -14545,118 +14289,6 @@ msgstr ""
 msgid "unwound frame has negative size"
 msgstr ""
 
-#: config/tc-tilegx.c:126
-#, c-format
-msgid ""
-"  -Q                      ignored\n"
-"  -V                      print assembler version number\n"
-"  --32/--64               generate 32bit/64bit code\n"
-msgstr ""
-
-#: config/tc-tilegx.c:685 config/tc-tilepro.c:554
-msgid "Invalid operator for operand."
-msgstr ""
-
-#: config/tc-tilegx.c:696 config/tc-tilepro.c:565
-msgid "Operator may only be applied to symbols."
-msgstr ""
-
-#: config/tc-tilegx.c:766 config/tc-tilepro.c:635
-#, c-format
-msgid "Writes to register '%s' are not allowed."
-msgstr ""
-
-#: config/tc-tilegx.c:793 config/tc-tilepro.c:662
-#, c-format
-msgid ""
-"Two instructions in the same bundle both write to register %s, which is not "
-"allowed."
-msgstr ""
-
-#: config/tc-tilegx.c:858 config/tc-tilepro.c:726
-#, c-format
-msgid "'%s' may not be bundled with other instructions."
-msgstr ""
-
-#: config/tc-tilegx.c:888 config/tc-tilepro.c:756
-msgid "Invalid combination of instructions for bundle."
-msgstr ""
-
-#: config/tc-tilegx.c:923 config/tc-tilepro.c:791
-msgid "instruction address is not a multiple of 8"
-msgstr ""
-
-#: config/tc-tilegx.c:1000 config/tc-tilepro.c:869
-msgid "Invalid expression."
-msgstr ""
-
-#: config/tc-tilegx.c:1043 config/tc-tilepro.c:911
-#, c-format
-msgid "Expected register, got '%s'."
-msgstr ""
-
-#: config/tc-tilegx.c:1052 config/tc-tilepro.c:918
-#, c-format
-msgid "Found use of non-canonical register name %s; use %s instead."
-msgstr ""
-
-#: config/tc-tilegx.c:1114 config/tc-tilepro.c:977
-#, c-format
-msgid "Too few operands to '%s'."
-msgstr ""
-
-#: config/tc-tilegx.c:1119 config/tc-tilepro.c:982
-#, c-format
-msgid "Unexpected character '%c' after operand %d to %s."
-msgstr ""
-
-#: config/tc-tilegx.c:1140 config/tc-tilepro.c:1003
-msgid "Expected immediate expression"
-msgstr ""
-
-#: config/tc-tilegx.c:1153 config/tc-tilegx.c:1762 config/tc-tilepro.c:1016
-#: config/tc-tilepro.c:1561
-msgid "Found '}' when not bundling."
-msgstr ""
-
-#: config/tc-tilegx.c:1194 config/tc-tilepro.c:1056
-#, c-format
-msgid "Unknown opcode `%.*s'."
-msgstr ""
-
-#: config/tc-tilegx.c:1205 config/tc-tilepro.c:1067
-msgid "Too many instructions for bundle."
-msgstr ""
-
-#: config/tc-tilegx.c:1291 config/tc-tilepro.c:1152
-msgid "Bad call to md_atof ()"
-msgstr ""
-
-#: config/tc-tilegx.c:1367 config/tc-tilepro.c:1215
-msgid "This operator only produces two byte values."
-msgstr ""
-
-#: config/tc-tilegx.c:1393 config/tc-tilepro.c:1241
-#, c-format
-msgid "unsupported BFD relocation size %d"
-msgstr ""
-
-#: config/tc-tilegx.c:1707 config/tc-tilepro.c:1506
-#, c-format
-msgid "internal error? cannot generate `%s' relocation (%d, %d)"
-msgstr ""
-
-#: config/tc-tilegx.c:1750 config/tc-tilepro.c:1549
-msgid "Found '{' when already bundling."
-msgstr ""
-
-#: config/tc-tilepro.c:99
-#, c-format
-msgid ""
-"  -Q                      ignored\n"
-"  -V                      print assembler version number\n"
-msgstr ""
-
 #: config/tc-v850.c:286
 #, c-format
 msgid ".COMMon length (%d.) < 0! Ignored."
@@ -15817,7 +15449,7 @@ msgstr ""
 msgid "parentheses ignored"
 msgstr ""
 
-#: config/tc-z80.c:1913 read.c:3602
+#: config/tc-z80.c:1913 read.c:3603
 #, c-format
 msgid "junk at end of line, first unrecognized character is `%c'"
 msgstr ""
@@ -16123,38 +15755,38 @@ msgstr ""
 msgid "CFI is not supported for this target"
 msgstr ""
 
-#: dwarf2dbg.c:585 dwarf2dbg.c:620
+#: dwarf2dbg.c:552 dwarf2dbg.c:587
 msgid "file number less than one"
 msgstr ""
 
-#: dwarf2dbg.c:595
+#: dwarf2dbg.c:562
 #, c-format
 msgid "file number %ld already allocated"
 msgstr ""
 
-#: dwarf2dbg.c:625 dwarf2dbg.c:1378
+#: dwarf2dbg.c:592 dwarf2dbg.c:1345
 #, c-format
 msgid "unassigned file number %ld"
 msgstr ""
 
-#: dwarf2dbg.c:694
+#: dwarf2dbg.c:661
 msgid "is_stmt value not 0 or 1"
 msgstr ""
 
-#: dwarf2dbg.c:706
+#: dwarf2dbg.c:673
 msgid "isa number less than zero"
 msgstr ""
 
-#: dwarf2dbg.c:718
+#: dwarf2dbg.c:685
 msgid "discriminator less than zero"
 msgstr ""
 
-#: dwarf2dbg.c:724
+#: dwarf2dbg.c:691
 #, c-format
 msgid "unknown .loc sub-directive `%s'"
 msgstr ""
 
-#: dwarf2dbg.c:1441
+#: dwarf2dbg.c:1408
 msgid "internal error: unknown dwarf2 format"
 msgstr ""
 
@@ -16344,11 +15976,11 @@ msgstr ""
 msgid "GP prologue size exceeds field size, using 0 instead"
 msgstr ""
 
-#: expr.c:87 read.c:3667
+#: expr.c:87 read.c:3668
 msgid "bignum invalid"
 msgstr ""
 
-#: expr.c:89 read.c:3669 read.c:4146 read.c:5030
+#: expr.c:89 read.c:3670 read.c:4147 read.c:5031
 msgid "floating point number invalid"
 msgstr ""
 
@@ -16392,7 +16024,7 @@ msgstr ""
 msgid "missing '%c'"
 msgstr ""
 
-#: expr.c:977 read.c:4512
+#: expr.c:977 read.c:4513
 msgid "EBCDIC constants are not supported"
 msgstr ""
 
@@ -16430,7 +16062,7 @@ msgstr ""
 msgid "right operand is a float; integer 0 assumed"
 msgstr ""
 
-#: expr.c:1879 symbols.c:1381
+#: expr.c:1879 symbols.c:1379
 msgid "division by zero"
 msgstr ""
 
@@ -16450,7 +16082,7 @@ msgstr ""
 msgid "attempt to allocate data in common section"
 msgstr ""
 
-#: frags.c:102 write.c:1422
+#: frags.c:112 write.c:1379
 #, c-format
 msgid "can't extend frag %u chars"
 msgstr ""
@@ -16481,7 +16113,7 @@ msgstr ""
 msgid "can't read from %s: %s"
 msgstr ""
 
-#: input-file.c:267 listing.c:1397 output-file.c:72
+#: input-file.c:267 listing.c:1397 output-file.c:69
 #, c-format
 msgid "can't close %s: %s"
 msgstr ""
@@ -16944,196 +16576,192 @@ msgstr ""
 msgid "%s without %s"
 msgstr ""
 
-#: read.c:3246
+#: read.c:3247
 msgid "unsupported variable size or fill value"
 msgstr ""
 
-#: read.c:3274
+#: read.c:3275
 msgid ".space repeat count is zero, ignored"
 msgstr ""
 
-#: read.c:3276
+#: read.c:3277
 msgid ".space repeat count is negative, ignored"
 msgstr ""
 
-#: read.c:3305
+#: read.c:3306
 msgid "space allocation too complex in absolute section"
 msgstr ""
 
-#: read.c:3311
+#: read.c:3312
 msgid "space allocation too complex in common section"
 msgstr ""
 
-#: read.c:3402 read.c:4758
+#: read.c:3403 read.c:4759
 #, c-format
 msgid "bad floating literal: %s"
 msgstr ""
 
-#: read.c:3559
+#: read.c:3560
 #, c-format
 msgid "%s: would close weakref loop: %s"
 msgstr ""
 
-#: read.c:3605
+#: read.c:3606
 #, c-format
 msgid "junk at end of line, first unrecognized character valued 0x%x"
 msgstr ""
 
-#: read.c:3733
+#: read.c:3734
 #, c-format
 msgid "`%s' can't be equated to common symbol '%s'"
 msgstr ""
 
-#: read.c:3858
-msgid "unexpected `\"' in expression"
-msgstr ""
-
-#: read.c:3870
+#: read.c:3871
 msgid "rva without symbol"
 msgstr ""
 
-#: read.c:3927
+#: read.c:3928
 msgid "missing or bad offset expression"
 msgstr ""
 
-#: read.c:3948
+#: read.c:3949
 msgid "missing reloc type"
 msgstr ""
 
-#: read.c:3960
+#: read.c:3961
 msgid "unrecognized reloc type"
 msgstr ""
 
-#: read.c:3976
+#: read.c:3977
 msgid "bad reloc expression"
 msgstr ""
 
-#: read.c:4102
+#: read.c:4103
 msgid "attempt to store value in absolute section"
 msgstr ""
 
-#: read.c:4140 read.c:5024
+#: read.c:4141 read.c:5025
 msgid "zero assumed for missing expression"
 msgstr ""
 
-#: read.c:4152 read.c:5036 write.c:266 write.c:1000
+#: read.c:4153 read.c:5037 write.c:266 write.c:987
 msgid "register value used as expression"
 msgstr ""
 
-#: read.c:4232
+#: read.c:4233
 #, c-format
 msgid "value 0x%llx truncated to 0x%llx"
 msgstr ""
 
-#: read.c:4235
+#: read.c:4236
 msgid "value 0x%I64x truncated to 0x%I64x"
 msgstr ""
 
-#: read.c:4239
+#: read.c:4240
 #, c-format
 msgid "value 0x%lx truncated to 0x%lx"
 msgstr ""
 
-#: read.c:4266
+#: read.c:4267
 #, c-format
 msgid "bignum truncated to %d bytes"
 msgstr ""
 
-#: read.c:4585 read.c:4780
+#: read.c:4586 read.c:4781
 msgid "unresolvable or nonpositive repeat count; using 1"
 msgstr ""
 
-#: read.c:4634
+#: read.c:4635
 #, c-format
 msgid "unknown floating type type '%c'"
 msgstr ""
 
-#: read.c:4656
+#: read.c:4657
 msgid "floating point constant too large"
 msgstr ""
 
-#: read.c:5192
+#: read.c:5193
 msgid "strings must be placed into a section"
 msgstr ""
 
-#: read.c:5240
+#: read.c:5241
 msgid "expected <nn>"
 msgstr ""
 
 #. To be compatible with BSD 4.2 as: give the luser a linefeed!!
-#: read.c:5273 read.c:5359
+#: read.c:5274 read.c:5360
 msgid "unterminated string; newline inserted"
 msgstr ""
 
-#: read.c:5367
+#: read.c:5368
 msgid "bad escaped character in string"
 msgstr ""
 
-#: read.c:5392
+#: read.c:5393
 msgid "expected address expression"
 msgstr ""
 
-#: read.c:5411
+#: read.c:5412
 #, c-format
 msgid "symbol \"%s\" undefined; zero assumed"
 msgstr ""
 
-#: read.c:5414
+#: read.c:5415
 msgid "some symbol undefined; zero assumed"
 msgstr ""
 
-#: read.c:5449
+#: read.c:5450
 msgid "this string may not contain '\\0'"
 msgstr ""
 
-#: read.c:5485
+#: read.c:5486
 msgid "missing string"
 msgstr ""
 
-#: read.c:5576
+#: read.c:5577
 #, c-format
 msgid ".incbin count zero, ignoring `%s'"
 msgstr ""
 
-#: read.c:5602
+#: read.c:5603
 #, c-format
 msgid "file not found: %s"
 msgstr ""
 
-#: read.c:5616
+#: read.c:5617
 #, c-format
 msgid "seek to end of .incbin file failed `%s'"
 msgstr ""
 
-#: read.c:5627
+#: read.c:5628
 #, c-format
 msgid "skip (%ld) or count (%ld) invalid for file size (%ld)"
 msgstr ""
 
-#: read.c:5634
+#: read.c:5635
 #, c-format
 msgid "could not skip to %ld in file `%s'"
 msgstr ""
 
-#: read.c:5643
+#: read.c:5644
 #, c-format
 msgid "truncated file `%s', %ld of %ld bytes read"
 msgstr ""
 
-#: read.c:5802
+#: read.c:5803
 msgid "missing .func"
 msgstr ""
 
-#: read.c:5819
+#: read.c:5820
 msgid ".endfunc missing for previous .func"
 msgstr ""
 
-#: read.c:5956
+#: read.c:5957
 #, c-format
 msgid "missing closing `%c'"
 msgstr ""
 
-#: read.c:5958
+#: read.c:5959
 msgid "stray `\\'"
 msgstr ""
 
@@ -17159,81 +16787,81 @@ msgstr ""
 msgid "comma missing in .xstabs"
 msgstr ""
 
-#: symbols.c:287
+#: symbols.c:285
 #, c-format
 msgid "cannot define symbol `%s' in absolute section"
 msgstr ""
 
-#: symbols.c:417
+#: symbols.c:415
 #, c-format
 msgid "symbol `%s' is already defined as \"%s\"/%s%ld"
 msgstr ""
 
-#: symbols.c:492 symbols.c:499
+#: symbols.c:490 symbols.c:497
 #, c-format
 msgid "inserting \"%s\" into symbol table failed: %s"
 msgstr ""
 
-#: symbols.c:1010
+#: symbols.c:1008
 #, c-format
 msgid "invalid operands (%s and %s sections) for `%s'"
 msgstr ""
 
-#: symbols.c:1014
+#: symbols.c:1012
 #, c-format
 msgid "invalid operand (%s section) for `%s'"
 msgstr ""
 
-#: symbols.c:1022
+#: symbols.c:1020
 #, c-format
 msgid "invalid operands (%s and %s sections) for `%s' when setting `%s'"
 msgstr ""
 
-#: symbols.c:1025
+#: symbols.c:1023
 #, c-format
 msgid "invalid operand (%s section) for `%s' when setting `%s'"
 msgstr ""
 
-#: symbols.c:1074
+#: symbols.c:1072
 #, c-format
 msgid "symbol definition loop encountered at `%s'"
 msgstr ""
 
-#: symbols.c:1101
+#: symbols.c:1099
 #, c-format
 msgid "cannot convert expression symbol %s to complex relocation"
 msgstr ""
 
-#: symbols.c:1383
+#: symbols.c:1381
 #, c-format
 msgid "division by zero when setting `%s'"
 msgstr ""
 
-#: symbols.c:1464 write.c:2091
+#: symbols.c:1462 write.c:2048
 #, c-format
 msgid "can't resolve value for symbol `%s'"
 msgstr ""
 
-#: symbols.c:1911
+#: symbols.c:1909
 #, c-format
 msgid "\"%d\" (instance number %d of a %s label)"
 msgstr ""
 
-#: symbols.c:1940
+#: symbols.c:1938
 #, c-format
 msgid "attempt to get value of unresolved symbol `%s'"
 msgstr ""
 
-#: symbols.c:2226
+#: symbols.c:2213
 msgid "section symbols are already global"
 msgstr ""
 
-#: symbols.c:2339
+#: symbols.c:2326
 #, c-format
 msgid "Accessing function `%s' as thread-local object"
 msgstr ""
 
-#: symbols.c:2343
+#: symbols.c:2330
 #, c-format
 msgid "Accessing `%s' as thread-local object"
 msgstr ""
@@ -17256,108 +16884,108 @@ msgstr ""
 msgid "invalid reloc expression"
 msgstr ""
 
-#: write.c:1085
+#: write.c:1072
 #, c-format
 msgid "value of %s too large for field of %d bytes at %s"
 msgstr ""
 
-#: write.c:1097
+#: write.c:1084
 #, c-format
 msgid "signed .word overflow; switch may be too large; %ld at 0x%lx"
 msgstr ""
 
-#: write.c:1141
+#: write.c:1128
 msgid "redefined symbol cannot be used on reloc"
 msgstr ""
 
-#: write.c:1154
+#: write.c:1141
 msgid "relocation out of range"
 msgstr ""
 
-#: write.c:1157
+#: write.c:1144
 #, c-format
 msgid "%s:%u: bad return from bfd_install_relocation: %x"
 msgstr ""
 
-#: write.c:1180
-msgid "reloc not within (fixed part of) section"
+#: write.c:1208
+msgid "internal error: fixup not contained within frag"
 msgstr ""
 
-#: write.c:1250
-msgid "internal error: fixup not contained within frag"
+#: write.c:1261
+msgid "reloc not within (fixed part of) section"
 msgstr ""
 
-#: write.c:1368 write.c:1498
+#: write.c:1325 write.c:1455
 msgid "can't extend frag"
 msgstr ""
 
-#: write.c:1560 write.c:1581
+#: write.c:1517 write.c:1538
 #, c-format
 msgid "can't write %s: %s"
 msgstr ""
 
-#: write.c:1611
+#: write.c:1568
 #, c-format
 msgid "cannot write to output file '%s': %s"
 msgstr ""
 
-#: write.c:1767
+#: write.c:1724
 #, c-format
 msgid "%d error%s, %d warning%s, generating bad object file"
 msgstr ""
 
-#: write.c:1774
+#: write.c:1731
 #, c-format
 msgid "%d error%s, %d warning%s, no object file generated"
 msgstr ""
 
-#: write.c:2006
+#: write.c:1963
 #, c-format
 msgid "%s: global symbols not supported in common sections"
 msgstr ""
 
-#: write.c:2020
+#: write.c:1977
 #, c-format
 msgid "local label `%s' is not defined"
 msgstr ""
 
-#: write.c:2042
+#: write.c:1999
 #, c-format
 msgid "Local symbol `%s' can't be equated to common symbol `%s'"
 msgstr ""
 
-#: write.c:2049
+#: write.c:2006
 #, c-format
 msgid "can't make global register symbol `%s'"
 msgstr ""
 
-#: write.c:2342
+#: write.c:2299
 #, c-format
 msgid "alignment padding (%lu bytes) not a multiple of %ld"
 msgstr ""
 
-#: write.c:2504
+#: write.c:2461
 #, c-format
 msgid ".word %s-%s+%s didn't fit"
 msgstr ""
 
-#: write.c:2598
+#: write.c:2555
 msgid "padding added"
 msgstr ""
 
-#: write.c:2648
+#: write.c:2605
 msgid "attempt to move .org backwards"
 msgstr ""
 
-#: write.c:2672
+#: write.c:2629
 msgid ".space specifies non-absolute value"
 msgstr ""
 
-#: write.c:2687
+#: write.c:2644
 msgid ".space or .fill with negative value, ignored"
 msgstr ""
 
-#: write.c:2758
+#: write.c:2715
 #, c-format
 msgid ""
 "Infinite loop encountered whilst attempting to compute the addresses of "
diff --git a/gas/read.c b/gas/read.c
index 4ff33132f8..445caa1489 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -1,7 +1,7 @@
 /* read.c - read a source file -
    Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
    1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012  Free Software Foundation, Inc.
+   2010, 2011  Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -209,31 +209,6 @@ static int dwarf_file_string;
 #endif
 #endif
 
-/* If the target defines the md_frag_max_var hook then we know
-   enough to implement the .bundle_align_mode features.  */
-#ifdef md_frag_max_var
-# define HANDLE_BUNDLE
-#endif
-
-#ifdef HANDLE_BUNDLE
-/* .bundle_align_mode sets this.  Normally it's zero.  When nonzero,
-   it's the exponent of the bundle size, and aligned instruction bundle
-   mode is in effect.  */
-static unsigned int bundle_align_p2;
-
-/* These are set by .bundle_lock and .bundle_unlock.  .bundle_lock sets
-   bundle_lock_frag to frag_now and then starts a new frag with
-   frag_align_code.  At the same time, bundle_lock_frain gets frchain_now,
-   so that .bundle_unlock can verify that we didn't change segments.
-   .bundle_unlock resets both to NULL.  If we detect a bundling violation,
-   then we reset bundle_lock_frchain to NULL as an indicator that we've
-   already diagnosed the error with as_bad and don't need a cascade of
-   redundant errors, but bundle_lock_frag remains set to indicate that
-   we are expecting to see .bundle_unlock.  */
-static fragS *bundle_lock_frag;
-static frchainS *bundle_lock_frchain;
-#endif
-
 static void do_s_func (int end_p, const char *default_prefix);
 static void do_align (int, char *, int, int);
 static void s_align (int, int);
@@ -302,11 +277,6 @@ static const pseudo_typeS potable[] = {
   {"balignw", s_align_bytes, -2},
   {"balignl", s_align_bytes, -4},
 /* block  */
-#ifdef HANDLE_BUNDLE
-  {"bundle_align_mode", s_bundle_align_mode, 0},
-  {"bundle_lock", s_bundle_lock, 0},
-  {"bundle_unlock", s_bundle_unlock, 0},
-#endif
   {"byte", cons, 1},
   {"comm", s_comm, 0},
   {"common", s_mri_common, 0},
@@ -613,128 +583,6 @@ try_macro (char term, const char *line)
   return 0;
 }
 
-#ifdef HANDLE_BUNDLE
-/* Start a new instruction bundle.  Returns the rs_align_code frag that
-   will be used to align the new bundle.  */
-static fragS *
-start_bundle (void)
-{
-  fragS *frag = frag_now;
-
-  frag_align_code (0, 0);
-
-  while (frag->fr_type != rs_align_code)
-    frag = frag->fr_next;
-
-  gas_assert (frag != frag_now);
-
-  return frag;
-}
-
-/* Calculate the maximum size after relaxation of the region starting
-   at the given frag and extending through frag_now (which is unfinished).  */
-static unsigned int
-pending_bundle_size (fragS *frag)
-{
-  unsigned int offset = frag->fr_fix;
-  unsigned int size = 0;
-
-  gas_assert (frag != frag_now);
-  gas_assert (frag->fr_type == rs_align_code);
-
-  while (frag != frag_now)
-    {
-      /* This should only happen in what will later become an error case.  */
-      if (frag == NULL)
-	return 0;
-
-      size += frag->fr_fix;
-      if (frag->fr_type == rs_machine_dependent)
-	size += md_frag_max_var (frag);
-
-      frag = frag->fr_next;
-    }
-
-  gas_assert (frag == frag_now);
-  size += frag_now_fix ();
-  if (frag->fr_type == rs_machine_dependent)
-    size += md_frag_max_var (frag);
-
-  gas_assert (size >= offset);
-
-  return size - offset;
-}
-
-/* Finish off the frag created to ensure bundle alignment.  */
-static void
-finish_bundle (fragS *frag, unsigned int size)
-{
-  gas_assert (bundle_align_p2 > 0);
-  gas_assert (frag->fr_type == rs_align_code);
-
-  if (size > 1)
-    {
-      /* If there is more than a single byte, then we need to set up the
-	 alignment frag.  Otherwise we leave it at its initial state from
-	 calling frag_align_code (0, 0), so that it does nothing.  */
-      frag->fr_offset = bundle_align_p2;
-      frag->fr_subtype = size - 1;
-    }
-
-  /* We do this every time rather than just in s_bundle_align_mode
-     so that we catch any affected section without needing hooks all
-     over for all paths that do section changes.  It's cheap enough.  */
-  record_alignment (now_seg, bundle_align_p2 - OCTETS_PER_BYTE_POWER);
-}
-
-/* Assemble one instruction.  This takes care of the bundle features
-   around calling md_assemble.  */
-static void
-assemble_one (char *line)
-{
-  fragS *insn_start_frag = NULL;
-
-  if (bundle_lock_frchain != NULL && bundle_lock_frchain != frchain_now)
-    {
-      as_bad (_("cannot change section or subsection inside .bundle_lock"));
-      /* Clearing this serves as a marker that we have already complained.  */
-      bundle_lock_frchain = NULL;
-    }
-
-  if (bundle_lock_frchain == NULL && bundle_align_p2 > 0)
-    insn_start_frag = start_bundle ();
-
-  md_assemble (line);
-
-  if (bundle_lock_frchain != NULL)
-    {
-      /* Make sure this hasn't pushed the locked sequence
-	 past the bundle size.  */
-      unsigned int bundle_size = pending_bundle_size (bundle_lock_frag);
-      if (bundle_size > (1U << bundle_align_p2))
-	as_bad (_("\
-.bundle_lock sequence at %u bytes but .bundle_align_mode limit is %u bytes"),
-		bundle_size, 1U << bundle_align_p2);
-    }
-  else if (bundle_align_p2 > 0)
-    {
-      unsigned int insn_size = pending_bundle_size (insn_start_frag);
-
-      if (insn_size > (1U << bundle_align_p2))
-	as_bad (_("\
-single instruction is %u bytes long but .bundle_align_mode limit is %u"),
-		(unsigned int) insn_size, 1U << bundle_align_p2);
-
-      finish_bundle (insn_start_frag, insn_size);
-    }
-}
-
-#else  /* !HANDLE_BUNDLE */
-
-# define assemble_one(line) md_assemble(line)
-
-#endif  /* HANDLE_BUNDLE */
-
 /* We read the file, putting things into a web that represents what we
    have been reading.  */
 void
@@ -947,7 +795,7 @@ read_a_source_file (char *name)
 		  /* Input_line_pointer->after ':'.  */
 		  SKIP_WHITESPACE ();
 		}
-	      else if ((c == '=' && input_line_pointer[1] == '=')
+              else if ((c == '=' && input_line_pointer[1] == '=')
 		       || ((c == ' ' || c == '\t')
 			   && input_line_pointer[1] == '='
 			   && input_line_pointer[2] == '='))
@@ -955,13 +803,13 @@ read_a_source_file (char *name)
 		  equals (s, -1);
 		  demand_empty_rest_of_line ();
 		}
-	      else if ((c == '='
-		       || ((c == ' ' || c == '\t')
-			    && input_line_pointer[1] == '='))
+              else if ((c == '='
+                       || ((c == ' ' || c == '\t')
+                            && input_line_pointer[1] == '='))
 #ifdef TC_EQUAL_IN_INSN
-			   && !TC_EQUAL_IN_INSN (c, s)
+                           && !TC_EQUAL_IN_INSN (c, s)
 #endif
-			   )
+                           )
 		{
 		  equals (s, 1);
 		  demand_empty_rest_of_line ();
@@ -1099,7 +947,7 @@ read_a_source_file (char *name)
 			    }
 			}
 
-		      assemble_one (s); /* Assemble 1 instruction.  */
+		      md_assemble (s);	/* Assemble 1 instruction.  */
 
 		      *input_line_pointer++ = c;
 
@@ -1280,16 +1128,6 @@ read_a_source_file (char *name)
  quit:
   symbol_set_value_now (&dot_symbol);
 
-#ifdef HANDLE_BUNDLE
-  if (bundle_lock_frag != NULL)
-    {
-      as_bad_where (bundle_lock_frag->fr_file, bundle_lock_frag->fr_line,
-		    _(".bundle_lock with no matching .bundle_unlock"));
-      bundle_lock_frag = NULL;
-      bundle_lock_frchain = NULL;
-    }
-#endif
-
 #ifdef md_cleanup
   md_cleanup ();
 #endif
@@ -1896,7 +1734,7 @@ s_app_line (int appline)
        Besides, it's silly.  GCC however will generate a line number of
        zero when it is pre-processing builtins for assembler-with-cpp files:
 
-	  # 0 "<built-in>"
+          # 0 "<built-in>"
 
        We do not want to barf on this, especially since such files are used
        in the GCC and GDB testsuites.  So we check for negative line numbers
@@ -1925,7 +1763,7 @@ s_app_line (int appline)
 		    /* From GCC's cpp documentation:
 		       1: start of a new file.
 		       2: returning to a file after having included
-			  another file.
+		          another file.
 		       3: following text comes from a system header file.
 		       4: following text should be treated as extern "C".
 
@@ -3768,7 +3606,7 @@ demand_empty_rest_of_line (void)
 		 *input_line_pointer);
       ignore_rest_of_line ();
     }
-
+  
   /* Return pointing just after end-of-line.  */
   know (is_end_of_line[(unsigned char) input_line_pointer[-1]]);
 }
@@ -4014,7 +3852,7 @@ cons_worker (int nbytes,	/* 1=.byte, 2=.word, 4=.long.  */
 	parse_mri_cons (&exp, (unsigned int) nbytes);
       else
 #endif
-	{
+        {
 	  if (*input_line_pointer == '"')
 	    {
 	      as_bad (_("unexpected `\"' in expression"));
@@ -5853,7 +5691,7 @@ s_include (int arg ATTRIBUTE_UNUSED)
 
   demand_empty_rest_of_line ();
   path = (char *) xmalloc ((unsigned long) i
-			   + include_dir_maxlen + 5 /* slop */ );
+                           + include_dir_maxlen + 5 /* slop */ );
 
   for (i = 0; i < include_dir_count; i++)
     {
@@ -6029,78 +5867,6 @@ do_s_func (int end_p, const char *default_prefix)
   demand_empty_rest_of_line ();
 }
 
-#ifdef HANDLE_BUNDLE
-
-void
-s_bundle_align_mode (int arg ATTRIBUTE_UNUSED)
-{
-  unsigned int align = get_absolute_expression ();
-  SKIP_WHITESPACE ();
-  demand_empty_rest_of_line ();
-
-  if (align > (unsigned int) TC_ALIGN_LIMIT)
-    as_fatal (_(".bundle_align_mode alignment too large (maximum %u)"),
-	      (unsigned int) TC_ALIGN_LIMIT);
-
-  if (bundle_lock_frag != NULL)
-    {
-      as_bad (_("cannot change .bundle_align_mode inside .bundle_lock"));
-      return;
-    }
-
-  bundle_align_p2 = align;
-}
-
-void
-s_bundle_lock (int arg ATTRIBUTE_UNUSED)
-{
-  demand_empty_rest_of_line ();
-
-  if (bundle_align_p2 == 0)
-    {
-      as_bad (_(".bundle_lock is meaningless without .bundle_align_mode"));
-      return;
-    }
-
-  if (bundle_lock_frag != NULL)
-    {
-      as_bad (_("second .bundle_lock without .bundle_unlock"));
-      return;
-    }
-
-  bundle_lock_frchain = frchain_now;
-  bundle_lock_frag = start_bundle ();
-}
-
-void
-s_bundle_unlock (int arg ATTRIBUTE_UNUSED)
-{
-  unsigned int size;
-
-  demand_empty_rest_of_line ();
-
-  if (bundle_lock_frag == NULL)
-    {
-      as_bad (_(".bundle_unlock without preceding .bundle_lock"));
-      return;
-    }
-
-  gas_assert (bundle_align_p2 > 0);
-
-  size = pending_bundle_size (bundle_lock_frag);
-
-  if (size > (1U << bundle_align_p2))
-    as_bad (_(".bundle_lock sequence is %u bytes, but bundle size only %u"),
-	    size, 1 << bundle_align_p2);
-  else
-    finish_bundle (bundle_lock_frag, size);
-
-  bundle_lock_frag = NULL;
-  bundle_lock_frchain = NULL;
-}
-
-#endif  /* HANDLE_BUNDLE */
-
 void
 s_ignore (int arg ATTRIBUTE_UNUSED)
 {
diff --git a/gas/read.h b/gas/read.h
index 4e5d1bbd2d..82ccc759ee 100644
--- a/gas/read.h
+++ b/gas/read.h
@@ -1,6 +1,6 @@
 /* read.h - of read.c
    Copyright 1986, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2012
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -143,9 +143,6 @@ extern symbolS *s_lcomm_internal (int, symbolS *, addressT);
 extern void s_app_file_string (char *, int);
 extern void s_app_file (int);
 extern void s_app_line (int);
-extern void s_bundle_align_mode (int);
-extern void s_bundle_lock (int);
-extern void s_bundle_unlock (int);
 extern void s_comm (int);
 extern void s_data (int);
 extern void s_desc (int);
diff --git a/gas/rx-parse.c b/gas/rx-parse.c
new file mode 100644
index 0000000000..c43f41cf0a
--- /dev/null
+++ b/gas/rx-parse.c
@@ -0,0 +1,4129 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* Substitute the variable and function names.  */
+#define yyparse rx_parse
+#define yylex   rx_lex
+#define yyerror rx_error
+#define yylval  rx_lval
+#define yychar  rx_char
+#define yydebug rx_debug
+#define yynerrs rx_nerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     REG = 258,
+     FLAG = 259,
+     CREG = 260,
+     EXPR = 261,
+     UNKNOWN_OPCODE = 262,
+     IS_OPCODE = 263,
+     DOT_S = 264,
+     DOT_B = 265,
+     DOT_W = 266,
+     DOT_L = 267,
+     DOT_A = 268,
+     DOT_UB = 269,
+     DOT_UW = 270,
+     ABS = 271,
+     ADC = 272,
+     ADD = 273,
+     AND_ = 274,
+     BCLR = 275,
+     BCND = 276,
+     BMCND = 277,
+     BNOT = 278,
+     BRA = 279,
+     BRK = 280,
+     BSET = 281,
+     BSR = 282,
+     BTST = 283,
+     CLRPSW = 284,
+     CMP = 285,
+     DBT = 286,
+     DIV = 287,
+     DIVU = 288,
+     EDIV = 289,
+     EDIVU = 290,
+     EMUL = 291,
+     EMULU = 292,
+     FADD = 293,
+     FCMP = 294,
+     FDIV = 295,
+     FMUL = 296,
+     FREIT = 297,
+     FSUB = 298,
+     FTOI = 299,
+     INT = 300,
+     ITOF = 301,
+     JMP = 302,
+     JSR = 303,
+     MACHI = 304,
+     MACLO = 305,
+     MAX = 306,
+     MIN = 307,
+     MOV = 308,
+     MOVU = 309,
+     MUL = 310,
+     MULHI = 311,
+     MULLO = 312,
+     MULU = 313,
+     MVFACHI = 314,
+     MVFACMI = 315,
+     MVFACLO = 316,
+     MVFC = 317,
+     MVTACHI = 318,
+     MVTACLO = 319,
+     MVTC = 320,
+     MVTIPL = 321,
+     NEG = 322,
+     NOP = 323,
+     NOT = 324,
+     OR = 325,
+     POP = 326,
+     POPC = 327,
+     POPM = 328,
+     PUSH = 329,
+     PUSHA = 330,
+     PUSHC = 331,
+     PUSHM = 332,
+     RACW = 333,
+     REIT = 334,
+     REVL = 335,
+     REVW = 336,
+     RMPA = 337,
+     ROLC = 338,
+     RORC = 339,
+     ROTL = 340,
+     ROTR = 341,
+     ROUND = 342,
+     RTE = 343,
+     RTFI = 344,
+     RTS = 345,
+     RTSD = 346,
+     SAT = 347,
+     SATR = 348,
+     SBB = 349,
+     SCCND = 350,
+     SCMPU = 351,
+     SETPSW = 352,
+     SHAR = 353,
+     SHLL = 354,
+     SHLR = 355,
+     SMOVB = 356,
+     SMOVF = 357,
+     SMOVU = 358,
+     SSTR = 359,
+     STNZ = 360,
+     STOP = 361,
+     STZ = 362,
+     SUB = 363,
+     SUNTIL = 364,
+     SWHILE = 365,
+     TST = 366,
+     WAIT = 367,
+     XCHG = 368,
+     XOR = 369
+   };
+#endif
+/* Tokens.  */
+#define REG 258
+#define FLAG 259
+#define CREG 260
+#define EXPR 261
+#define UNKNOWN_OPCODE 262
+#define IS_OPCODE 263
+#define DOT_S 264
+#define DOT_B 265
+#define DOT_W 266
+#define DOT_L 267
+#define DOT_A 268
+#define DOT_UB 269
+#define DOT_UW 270
+#define ABS 271
+#define ADC 272
+#define ADD 273
+#define AND_ 274
+#define BCLR 275
+#define BCND 276
+#define BMCND 277
+#define BNOT 278
+#define BRA 279
+#define BRK 280
+#define BSET 281
+#define BSR 282
+#define BTST 283
+#define CLRPSW 284
+#define CMP 285
+#define DBT 286
+#define DIV 287
+#define DIVU 288
+#define EDIV 289
+#define EDIVU 290
+#define EMUL 291
+#define EMULU 292
+#define FADD 293
+#define FCMP 294
+#define FDIV 295
+#define FMUL 296
+#define FREIT 297
+#define FSUB 298
+#define FTOI 299
+#define INT 300
+#define ITOF 301
+#define JMP 302
+#define JSR 303
+#define MACHI 304
+#define MACLO 305
+#define MAX 306
+#define MIN 307
+#define MOV 308
+#define MOVU 309
+#define MUL 310
+#define MULHI 311
+#define MULLO 312
+#define MULU 313
+#define MVFACHI 314
+#define MVFACMI 315
+#define MVFACLO 316
+#define MVFC 317
+#define MVTACHI 318
+#define MVTACLO 319
+#define MVTC 320
+#define MVTIPL 321
+#define NEG 322
+#define NOP 323
+#define NOT 324
+#define OR 325
+#define POP 326
+#define POPC 327
+#define POPM 328
+#define PUSH 329
+#define PUSHA 330
+#define PUSHC 331
+#define PUSHM 332
+#define RACW 333
+#define REIT 334
+#define REVL 335
+#define REVW 336
+#define RMPA 337
+#define ROLC 338
+#define RORC 339
+#define ROTL 340
+#define ROTR 341
+#define ROUND 342
+#define RTE 343
+#define RTFI 344
+#define RTS 345
+#define RTSD 346
+#define SAT 347
+#define SATR 348
+#define SBB 349
+#define SCCND 350
+#define SCMPU 351
+#define SETPSW 352
+#define SHAR 353
+#define SHLL 354
+#define SHLR 355
+#define SMOVB 356
+#define SMOVF 357
+#define SMOVU 358
+#define SSTR 359
+#define STNZ 360
+#define STOP 361
+#define STZ 362
+#define SUB 363
+#define SUNTIL 364
+#define SWHILE 365
+#define TST 366
+#define WAIT 367
+#define XCHG 368
+#define XOR 369
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 21 "rx-parse.y"
+
+
+#include "as.h"
+#include "safe-ctype.h"
+#include "rx-defs.h"
+
+static int rx_lex (void);
+
+#define COND_EQ	0
+#define COND_NE	1
+
+#define MEMEX 0x06
+
+#define BSIZE 0
+#define WSIZE 1
+#define LSIZE 2
+
+/*                       .sb    .sw    .l     .uw   */
+static int sizemap[] = { BSIZE, WSIZE, LSIZE, WSIZE };
+
+/* Ok, here are the rules for using these macros...
+
+   B*() is used to specify the base opcode bytes.  Fields to be filled
+        in later, leave zero.  Call this first.
+
+   F() and FE() are used to fill in fields within the base opcode bytes.  You MUST
+        call B*() before any F() or FE().
+
+   [UN]*O*(), PC*() appends operands to the end of the opcode.  You
+        must call P() and B*() before any of these, so that the fixups
+        have the right byte location.
+        O = signed, UO = unsigned, NO = negated, PC = pcrel
+
+   IMM() adds an immediate and fills in the field for it.
+   NIMM() same, but negates the immediate.
+   NBIMM() same, but negates the immediate, for sbb.
+   DSP() adds a displacement, and fills in the field for it.
+
+   Note that order is significant for the O, IMM, and DSP macros, as
+   they append their data to the operand buffer in the order that you
+   call them.
+
+   Use "disp" for displacements whenever possible; this handles the
+   "0" case properly.  */
+
+#define B1(b1)             rx_base1 (b1)
+#define B2(b1, b2)         rx_base2 (b1, b2)
+#define B3(b1, b2, b3)     rx_base3 (b1, b2, b3)
+#define B4(b1, b2, b3, b4) rx_base4 (b1, b2, b3, b4)
+
+/* POS is bits from the MSB of the first byte to the LSB of the last byte.  */
+#define F(val,pos,sz)      rx_field (val, pos, sz)
+#define FE(exp,pos,sz)	   rx_field (exp_val (exp), pos, sz);
+
+#define O1(v)              rx_op (v, 1, RXREL_SIGNED)
+#define O2(v)              rx_op (v, 2, RXREL_SIGNED)
+#define O3(v)              rx_op (v, 3, RXREL_SIGNED)
+#define O4(v)              rx_op (v, 4, RXREL_SIGNED)
+
+#define UO1(v)             rx_op (v, 1, RXREL_UNSIGNED)
+#define UO2(v)             rx_op (v, 2, RXREL_UNSIGNED)
+#define UO3(v)             rx_op (v, 3, RXREL_UNSIGNED)
+#define UO4(v)             rx_op (v, 4, RXREL_UNSIGNED)
+
+#define NO1(v)             rx_op (v, 1, RXREL_NEGATIVE)
+#define NO2(v)             rx_op (v, 2, RXREL_NEGATIVE)
+#define NO3(v)             rx_op (v, 3, RXREL_NEGATIVE)
+#define NO4(v)             rx_op (v, 4, RXREL_NEGATIVE)
+
+#define PC1(v)             rx_op (v, 1, RXREL_PCREL)
+#define PC2(v)             rx_op (v, 2, RXREL_PCREL)
+#define PC3(v)             rx_op (v, 3, RXREL_PCREL)
+
+#define IMM(v,pos)	   F (immediate (v, RXREL_SIGNED, pos), pos, 2); \
+			   if (v.X_op != O_constant && v.X_op != O_big) rx_linkrelax_imm (pos)
+#define NIMM(v,pos)	   F (immediate (v, RXREL_NEGATIVE, pos), pos, 2)
+#define NBIMM(v,pos)	   F (immediate (v, RXREL_NEGATIVE_BORROW, pos), pos, 2)
+#define DSP(v,pos,msz)	   if (!v.X_md) rx_relax (RX_RELAX_DISP, pos); \
+			   else rx_linkrelax_dsp (pos); \
+			   F (displacement (v, msz), pos, 2)
+
+#define id24(a,b2,b3)	   B3 (0xfb+a, b2, b3)
+
+static int         rx_intop (expressionS, int);
+static int         rx_uintop (expressionS, int);
+static int         rx_disp3op (expressionS);
+static int         rx_disp5op (expressionS *, int);
+static int         rx_disp5op0 (expressionS *, int);
+static int         exp_val (expressionS exp);
+static expressionS zero_expr (void);
+static int         immediate (expressionS, int, int);
+static int         displacement (expressionS, int);
+static void        rtsd_immediate (expressionS);
+
+static int    need_flag = 0;
+static int    rx_in_brackets = 0;
+static int    rx_last_token = 0;
+static char * rx_init_start;
+static char * rx_last_exp_start = 0;
+static int    sub_op;
+static int    sub_op2;
+
+#define YYDEBUG 1
+#define YYERROR_VERBOSE 1
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 130 "rx-parse.y"
+{
+  int regno;
+  expressionS exp;
+}
+/* Line 193 of yacc.c.  */
+#line 444 "rx-parse.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 216 of yacc.c.  */
+#line 457 "rx-parse.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  216
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   602
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  121
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  57
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  237
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  594
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   369
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,   115,     2,     2,     2,     2,
+       2,     2,     2,   120,   116,   119,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   117,     2,   118,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     7,     9,    11,    13,    16,    20,
+      24,    27,    31,    35,    39,    43,    47,    51,    55,    58,
+      68,    78,    88,    96,   101,   110,   119,   125,   133,   142,
+     148,   154,   160,   166,   172,   178,   185,   191,   195,   196,
+     200,   201,   205,   206,   210,   215,   220,   228,   232,   238,
+     244,   250,   253,   256,   259,   263,   266,   269,   272,   275,
+     278,   281,   284,   288,   292,   294,   296,   298,   300,   303,
+     306,   309,   312,   314,   316,   318,   320,   324,   333,   342,
+     350,   361,   373,   379,   387,   397,   407,   417,   424,   425,
+     429,   430,   434,   435,   439,   440,   444,   445,   449,   450,
+     454,   455,   459,   460,   464,   465,   469,   470,   474,   475,
+     479,   480,   484,   485,   489,   490,   494,   495,   499,   500,
+     504,   505,   509,   510,   514,   515,   519,   524,   529,   534,
+     539,   548,   557,   566,   575,   576,   580,   581,   585,   586,
+     590,   591,   595,   596,   600,   601,   605,   606,   610,   614,
+     621,   631,   641,   646,   651,   656,   661,   664,   667,   670,
+     673,   676,   680,   689,   698,   707,   716,   725,   734,   735,
+     739,   740,   744,   745,   749,   750,   754,   759,   764,   770,
+     776,   782,   788,   794,   804,   814,   824,   825,   829,   830,
+     834,   835,   839,   840,   844,   845,   849,   855,   859,   867,
+     875,   881,   885,   893,   901,   906,   908,   910,   912,   914,
+     918,   926,   934,   938,   943,   950,   952,   957,   959,   963,
+     971,   972,   974,   975,   978,   980,   982,   983,   985,   987,
+     988,   990,   992,   994,   995,   997,   999,  1000
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     122,     0,    -1,     7,    -1,    25,    -1,    31,    -1,    90,
+      -1,    68,    -1,    24,     6,    -1,    24,    13,     6,    -1,
+      24,     9,     6,    -1,    27,     6,    -1,    27,    13,     6,
+      -1,    21,     9,     6,    -1,    21,    10,     6,    -1,    24,
+      10,     6,    -1,    24,    11,     6,    -1,    27,    11,     6,
+      -1,    21,    11,     6,    -1,    21,     6,    -1,    53,    10,
+     115,     6,   116,   171,   117,     3,   118,    -1,    53,    11,
+     115,     6,   116,   171,   117,     3,   118,    -1,    53,    12,
+     115,     6,   116,   171,   117,     3,   118,    -1,    91,   115,
+       6,   116,     3,   119,     3,    -1,    30,     3,   116,     3,
+      -1,    30,   171,   117,     3,   118,    14,   116,     3,    -1,
+      30,   171,   117,     3,   118,   174,   116,     3,    -1,    54,
+     176,     3,   116,     3,    -1,    54,   176,   117,     3,   118,
+     116,     3,    -1,    54,   176,     6,   117,     3,   118,   116,
+       3,    -1,   108,   115,     6,   116,     3,    -1,    30,   115,
+       6,   116,     3,    -1,    18,   115,     6,   116,     3,    -1,
+      55,   115,     6,   116,     3,    -1,    19,   115,     6,   116,
+       3,    -1,    70,   115,     6,   116,     3,    -1,    53,    12,
+     115,     6,   116,     3,    -1,    53,   115,     6,   116,     3,
+      -1,    91,   115,     6,    -1,    -1,   100,   123,   168,    -1,
+      -1,    98,   124,   168,    -1,    -1,    99,   125,   168,    -1,
+      77,     3,   119,     3,    -1,    73,     3,   119,     3,    -1,
+      18,   115,     6,   116,     3,   116,     3,    -1,    45,   115,
+       6,    -1,    26,   115,     6,   116,     3,    -1,    20,   115,
+       6,   116,     3,    -1,    28,   115,     6,   116,     3,    -1,
+      92,     3,    -1,    84,     3,    -1,    83,     3,    -1,    74,
+     175,     3,    -1,    71,     3,    -1,    76,     5,    -1,    72,
+       5,    -1,    97,   172,    -1,    29,   172,    -1,    47,     3,
+      -1,    48,     3,    -1,    24,   177,     3,    -1,    27,   177,
+       3,    -1,    96,    -1,   103,    -1,   101,    -1,   102,    -1,
+     109,   175,    -1,   110,   175,    -1,   104,   175,    -1,    82,
+     175,    -1,    89,    -1,    88,    -1,   112,    -1,    93,    -1,
+      66,   115,     6,    -1,    53,   175,     3,   116,     6,   117,
+       3,   118,    -1,    53,   175,     6,   117,     3,   118,   116,
+       3,    -1,    53,   175,     3,   116,   117,     3,   118,    -1,
+      53,   175,   117,     3,   118,   116,   171,   117,     3,   118,
+      -1,    53,   175,     6,   117,     3,   118,   116,   171,   117,
+       3,   118,    -1,    53,   175,     3,   116,     3,    -1,    53,
+     175,   117,     3,   118,   116,     3,    -1,    26,   115,     6,
+     116,   171,   117,     3,   118,    10,    -1,    20,   115,     6,
+     116,   171,   117,     3,   118,    10,    -1,    28,   115,     6,
+     116,   171,   117,     3,   118,    10,    -1,    74,   175,   171,
+     117,     3,   118,    -1,    -1,    94,   126,   162,    -1,    -1,
+      67,   127,   165,    -1,    -1,    17,   128,   164,    -1,    -1,
+      16,   129,   165,    -1,    -1,    51,   130,   164,    -1,    -1,
+      52,   131,   164,    -1,    -1,    36,   132,   163,    -1,    -1,
+      37,   133,   163,    -1,    -1,    32,   134,   164,    -1,    -1,
+      33,   135,   164,    -1,    -1,   111,   136,   164,    -1,    -1,
+     114,   137,   164,    -1,    -1,    69,   138,   165,    -1,    -1,
+     107,   139,   163,    -1,    -1,   105,   140,   163,    -1,    -1,
+      36,   141,   166,    -1,    -1,    37,   142,   166,    -1,    -1,
+     113,   143,   166,    -1,    -1,    46,   144,   166,    -1,    26,
+       3,   116,     3,    -1,    20,     3,   116,     3,    -1,    28,
+       3,   116,     3,    -1,    23,     3,   116,     3,    -1,    26,
+       3,   116,   171,   117,     3,   118,    10,    -1,    20,     3,
+     116,   171,   117,     3,   118,    10,    -1,    28,     3,   116,
+     171,   117,     3,   118,    10,    -1,    23,     3,   116,   171,
+     117,     3,   118,    10,    -1,    -1,    43,   145,   169,    -1,
+      -1,    39,   146,   169,    -1,    -1,    38,   147,   169,    -1,
+      -1,    41,   148,   169,    -1,    -1,    40,   149,   169,    -1,
+      -1,    44,   150,   170,    -1,    -1,    87,   151,   170,    -1,
+      95,    12,     3,    -1,    95,   175,   171,   117,     3,   118,
+      -1,    22,   115,     6,   116,   171,   117,     3,   118,    10,
+      -1,    23,   115,     6,   116,   171,   117,     3,   118,    10,
+      -1,    56,     3,   116,     3,    -1,    57,     3,   116,     3,
+      -1,    49,     3,   116,     3,    -1,    50,     3,   116,     3,
+      -1,    63,     3,    -1,    64,     3,    -1,    59,     3,    -1,
+      60,     3,    -1,    61,     3,    -1,    78,   115,     6,    -1,
+      53,   175,     3,   116,   117,     3,   120,   118,    -1,    53,
+     175,     3,   116,   117,   119,     3,   118,    -1,    53,   175,
+     117,     3,   120,   118,   116,     3,    -1,    53,   175,   117,
+     119,     3,   118,   116,     3,    -1,    54,   176,   117,     3,
+     120,   118,   116,     3,    -1,    54,   176,   117,   119,     3,
+     118,   116,     3,    -1,    -1,    85,   152,   167,    -1,    -1,
+      86,   153,   167,    -1,    -1,    81,   154,   167,    -1,    -1,
+      80,   155,   167,    -1,    65,     3,   116,     5,    -1,    62,
+       5,   116,     3,    -1,    85,   115,     6,   116,     3,    -1,
+      86,   115,     6,   116,     3,    -1,    65,   115,     6,   116,
+       5,    -1,    22,   115,     6,   116,     3,    -1,    23,   115,
+       6,   116,     3,    -1,    53,   175,     3,   116,   117,     3,
+     116,     3,   118,    -1,    53,   175,   117,     3,   116,     3,
+     118,   116,     3,    -1,    54,   176,   117,     3,   116,     3,
+     118,   116,     3,    -1,    -1,   108,   156,   161,    -1,    -1,
+      18,   157,   161,    -1,    -1,    55,   158,   161,    -1,    -1,
+      19,   159,   161,    -1,    -1,    70,   160,   161,    -1,    94,
+     115,     6,   116,     3,    -1,     3,   116,     3,    -1,   171,
+     117,     3,   118,    14,   116,     3,    -1,   171,   117,     3,
+     118,   174,   116,     3,    -1,     3,   116,     3,   116,     3,
+      -1,     3,   116,     3,    -1,   171,   117,     3,   118,    14,
+     116,     3,    -1,   171,   117,     3,   118,   174,   116,     3,
+      -1,   115,     6,   116,     3,    -1,   162,    -1,   163,    -1,
+     162,    -1,     3,    -1,     3,   116,     3,    -1,   171,   117,
+       3,   118,    14,   116,     3,    -1,   171,   117,     3,   118,
+     174,   116,     3,    -1,     3,   116,     3,    -1,   115,     6,
+     116,     3,    -1,   115,     6,   116,     3,   116,     3,    -1,
+     167,    -1,   115,     6,   116,     3,    -1,   170,    -1,     3,
+     116,     3,    -1,   171,   117,     3,   118,   177,   116,     3,
+      -1,    -1,     6,    -1,    -1,   173,     4,    -1,    10,    -1,
+      11,    -1,    -1,    12,    -1,    15,    -1,    -1,    10,    -1,
+      11,    -1,    12,    -1,    -1,    10,    -1,    11,    -1,    -1,
+      12,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   170,   170,   175,   178,   181,   184,   189,   204,   207,
+     212,   221,   226,   234,   237,   242,   244,   246,   251,   269,
+     277,   283,   291,   300,   305,   308,   313,   318,   321,   329,
+     336,   344,   350,   356,   362,   368,   376,   386,   391,   391,
+     392,   392,   393,   393,   397,   410,   423,   428,   433,   435,
+     440,   445,   447,   449,   454,   459,   464,   472,   480,   482,
+     487,   489,   491,   493,   498,   500,   502,   504,   509,   511,
+     513,   518,   523,   525,   527,   529,   534,   540,   548,   562,
+     567,   572,   577,   582,   587,   589,   591,   596,   601,   601,
+     602,   602,   603,   603,   604,   604,   605,   605,   606,   606,
+     607,   607,   608,   608,   609,   609,   610,   610,   611,   611,
+     612,   612,   613,   613,   614,   614,   615,   615,   619,   619,
+     620,   620,   621,   621,   622,   622,   626,   628,   630,   632,
+     635,   637,   639,   641,   646,   646,   647,   647,   648,   648,
+     649,   649,   650,   650,   651,   651,   652,   652,   656,   658,
+     663,   669,   675,   677,   679,   681,   687,   689,   691,   693,
+     695,   698,   709,   711,   716,   718,   723,   725,   730,   730,
+     731,   731,   732,   732,   733,   733,   737,   743,   748,   750,
+     755,   760,   766,   771,   774,   777,   782,   782,   783,   783,
+     784,   784,   785,   785,   786,   786,   791,   801,   803,   805,
+     807,   814,   816,   818,   824,   829,   830,   834,   835,   841,
+     843,   845,   852,   856,   858,   860,   866,   868,   871,   873,
+     879,   880,   883,   883,   888,   889,   890,   891,   892,   895,
+     896,   897,   898,   901,   902,   903,   906,   907
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "REG", "FLAG", "CREG", "EXPR",
+  "UNKNOWN_OPCODE", "IS_OPCODE", "DOT_S", "DOT_B", "DOT_W", "DOT_L",
+  "DOT_A", "DOT_UB", "DOT_UW", "ABS", "ADC", "ADD", "AND_", "BCLR", "BCND",
+  "BMCND", "BNOT", "BRA", "BRK", "BSET", "BSR", "BTST", "CLRPSW", "CMP",
+  "DBT", "DIV", "DIVU", "EDIV", "EDIVU", "EMUL", "EMULU", "FADD", "FCMP",
+  "FDIV", "FMUL", "FREIT", "FSUB", "FTOI", "INT", "ITOF", "JMP", "JSR",
+  "MACHI", "MACLO", "MAX", "MIN", "MOV", "MOVU", "MUL", "MULHI", "MULLO",
+  "MULU", "MVFACHI", "MVFACMI", "MVFACLO", "MVFC", "MVTACHI", "MVTACLO",
+  "MVTC", "MVTIPL", "NEG", "NOP", "NOT", "OR", "POP", "POPC", "POPM",
+  "PUSH", "PUSHA", "PUSHC", "PUSHM", "RACW", "REIT", "REVL", "REVW",
+  "RMPA", "ROLC", "RORC", "ROTL", "ROTR", "ROUND", "RTE", "RTFI", "RTS",
+  "RTSD", "SAT", "SATR", "SBB", "SCCND", "SCMPU", "SETPSW", "SHAR", "SHLL",
+  "SHLR", "SMOVB", "SMOVF", "SMOVU", "SSTR", "STNZ", "STOP", "STZ", "SUB",
+  "SUNTIL", "SWHILE", "TST", "WAIT", "XCHG", "XOR", "'#'", "','", "'['",
+  "']'", "'-'", "'+'", "$accept", "statement", "@1", "@2", "@3", "@4",
+  "@5", "@6", "@7", "@8", "@9", "@10", "@11", "@12", "@13", "@14", "@15",
+  "@16", "@17", "@18", "@19", "@20", "@21", "@22", "@23", "@24", "@25",
+  "@26", "@27", "@28", "@29", "@30", "@31", "@32", "@33", "@34", "@35",
+  "@36", "@37", "@38", "op_subadd", "op_dp20_rm", "op_dp20_i",
+  "op_dp20_rim", "op_dp20_rms", "op_xchg", "op_shift_rot", "op_shift",
+  "float2_op", "float2_op_ni", "disp", "flag", "@39", "memex", "bwl", "bw",
+  "opt_l", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,    35,    44,    91,    93,    45,
+      43
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   121,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   123,   122,
+     124,   122,   125,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   126,   122,
+     127,   122,   128,   122,   129,   122,   130,   122,   131,   122,
+     132,   122,   133,   122,   134,   122,   135,   122,   136,   122,
+     137,   122,   138,   122,   139,   122,   140,   122,   141,   122,
+     142,   122,   143,   122,   144,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   145,   122,   146,   122,   147,   122,
+     148,   122,   149,   122,   150,   122,   151,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   122,   122,   152,   122,
+     153,   122,   154,   122,   155,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   122,   122,   156,   122,   157,   122,
+     158,   122,   159,   122,   160,   122,   122,   161,   161,   161,
+     161,   162,   162,   162,   163,   164,   164,   165,   165,   166,
+     166,   166,   167,   168,   168,   168,   169,   169,   170,   170,
+     171,   171,   173,   172,   174,   174,   174,   174,   174,   175,
+     175,   175,   175,   176,   176,   176,   177,   177
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     1,     1,     1,     2,     3,     3,
+       2,     3,     3,     3,     3,     3,     3,     3,     2,     9,
+       9,     9,     7,     4,     8,     8,     5,     7,     8,     5,
+       5,     5,     5,     5,     5,     6,     5,     3,     0,     3,
+       0,     3,     0,     3,     4,     4,     7,     3,     5,     5,
+       5,     2,     2,     2,     3,     2,     2,     2,     2,     2,
+       2,     2,     3,     3,     1,     1,     1,     1,     2,     2,
+       2,     2,     1,     1,     1,     1,     3,     8,     8,     7,
+      10,    11,     5,     7,     9,     9,     9,     6,     0,     3,
+       0,     3,     0,     3,     0,     3,     0,     3,     0,     3,
+       0,     3,     0,     3,     0,     3,     0,     3,     0,     3,
+       0,     3,     0,     3,     0,     3,     0,     3,     0,     3,
+       0,     3,     0,     3,     0,     3,     4,     4,     4,     4,
+       8,     8,     8,     8,     0,     3,     0,     3,     0,     3,
+       0,     3,     0,     3,     0,     3,     0,     3,     3,     6,
+       9,     9,     4,     4,     4,     4,     2,     2,     2,     2,
+       2,     3,     8,     8,     8,     8,     8,     8,     0,     3,
+       0,     3,     0,     3,     0,     3,     4,     4,     5,     5,
+       5,     5,     5,     9,     9,     9,     0,     3,     0,     3,
+       0,     3,     0,     3,     0,     3,     5,     3,     7,     7,
+       5,     3,     7,     7,     4,     1,     1,     1,     1,     3,
+       7,     7,     3,     4,     6,     1,     4,     1,     3,     7,
+       0,     1,     0,     2,     1,     1,     0,     1,     1,     0,
+       1,     1,     1,     0,     1,     1,     0,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     2,    94,    92,   188,   192,     0,     0,     0,     0,
+     236,     3,     0,   236,     0,   222,   220,     4,   104,   106,
+     118,   120,   138,   136,   142,   140,   134,   144,     0,   124,
+       0,     0,     0,     0,    96,    98,   229,   233,   190,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    90,
+       6,   112,   194,     0,     0,     0,   229,     0,     0,     0,
+     174,   172,   229,     0,     0,   168,   170,   146,    73,    72,
+       5,     0,     0,    75,    88,   229,    64,   222,    40,    42,
+      38,    66,    67,    65,   229,   116,   114,   186,   229,   229,
+     108,    74,   122,   110,     0,   220,   220,     0,   220,     0,
+     220,     0,     0,    18,     0,     0,     0,     0,     0,     0,
+       7,     0,     0,     0,   237,     0,     0,     0,     0,    10,
+       0,     0,     0,     0,     0,    59,     0,     0,   221,     0,
+       0,   220,   220,     0,   220,     0,   220,   220,   220,   220,
+     220,   220,   220,     0,   220,    60,    61,     0,     0,   220,
+     220,   230,   231,   232,     0,     0,   234,   235,     0,     0,
+     220,     0,     0,   158,   159,   160,     0,   156,   157,     0,
+       0,     0,   220,   220,     0,   220,    55,    57,     0,   230,
+     231,   232,   220,    56,     0,     0,     0,     0,    71,    53,
+      52,     0,     0,     0,     0,   220,     0,    51,     0,   220,
+     232,   220,    58,     0,     0,     0,    70,     0,     0,     0,
+     220,    68,    69,   220,   220,   220,     1,   208,   207,    95,
+       0,     0,     0,   205,   206,    93,     0,     0,   189,     0,
+       0,   193,   220,     0,    12,    13,    17,     0,   220,     0,
+       9,    14,    15,     8,    62,   220,     0,    16,    11,    63,
+     220,     0,   223,     0,     0,     0,   105,   107,   101,     0,
+     119,     0,   103,   121,     0,     0,   139,   217,     0,   137,
+     143,   141,   135,   145,    47,   125,     0,     0,    97,    99,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   191,     0,     0,     0,     0,     0,    76,    91,   113,
+       0,   195,     0,    54,     0,     0,   161,     0,   175,   173,
+       0,   169,     0,   171,   147,    37,     0,    89,   148,     0,
+       0,   215,    41,    43,    39,   117,   115,     0,   187,   109,
+     123,   111,     0,     0,     0,     0,     0,     0,     0,   127,
+       0,   220,   220,   129,     0,   220,   126,     0,   220,   128,
+       0,   220,    23,     0,     0,     0,     0,     0,     0,     0,
+     154,   155,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   152,   153,   177,   176,     0,
+       0,    45,     0,    44,     0,     0,     0,     0,     0,     0,
+       0,     0,   201,     0,     0,    31,   197,     0,    33,     0,
+      49,     0,   181,     0,     0,   182,     0,     0,    48,     0,
+       0,    50,     0,    30,   226,   209,     0,   218,     0,     0,
+     220,   220,   220,    36,    82,     0,     0,     0,     0,     0,
+       0,     0,    26,     0,     0,     0,     0,     0,    32,   180,
+      34,     0,   212,   178,   179,     0,   196,     0,     0,    29,
+     226,   204,     0,     0,   226,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   224,   225,   227,     0,   228,     0,
+     226,   216,   236,     0,     0,    35,     0,     0,     0,     0,
+       0,     0,   220,     0,     0,     0,     0,     0,     0,     0,
+      87,     0,   149,   213,     0,     0,    46,   200,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    79,
+       0,     0,   220,     0,    83,     0,     0,     0,     0,     0,
+      27,     0,     0,    22,     0,     0,     0,     0,     0,   131,
+       0,     0,   133,     0,   130,     0,   132,     0,    24,    25,
+       0,     0,     0,     0,     0,     0,    77,     0,   162,   163,
+      78,     0,     0,     0,   164,   165,    28,     0,   166,   167,
+     214,   202,   203,   198,   199,    85,   150,   151,    84,    86,
+     210,   211,   219,    19,    20,    21,   183,     0,   184,     0,
+     185,     0,    80,    81
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    94,   205,   203,   204,   199,   172,    96,    95,   149,
+     150,   133,   135,   131,   132,   213,   215,   173,   208,   207,
+     134,   136,   214,   144,   141,   138,   137,   140,   139,   142,
+     195,   192,   194,   187,   186,   210,    98,   160,   100,   175,
+     228,   223,   224,   225,   219,   260,   321,   322,   266,   267,
+     220,   125,   126,   469,   155,   158,   116
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -415
+static const yytype_int16 yypact[] =
+{
+     464,  -415,  -415,  -415,   -67,   -62,    24,    94,   -54,    25,
+      83,  -415,    26,    39,    27,  -415,    18,  -415,  -415,  -415,
+     -32,   -30,  -415,  -415,  -415,  -415,  -415,  -415,    -6,  -415,
+     112,   114,   129,   134,  -415,  -415,    -4,     4,    34,   150,
+     154,   173,   179,   192,   203,   200,   206,    28,    95,  -415,
+    -415,  -415,    96,   209,   208,   211,    57,   210,   214,   103,
+    -415,  -415,    57,   216,   217,   106,   108,  -415,  -415,  -415,
+    -415,   109,   222,  -415,   111,   195,  -415,  -415,  -415,  -415,
+    -415,  -415,  -415,  -415,    57,  -415,  -415,   113,    57,    57,
+    -415,  -415,  -415,  -415,   227,    40,    19,   224,   152,   225,
+     152,   116,   229,  -415,   230,   231,   232,   233,   117,   234,
+    -415,   235,   236,   237,  -415,   238,   242,   130,   241,  -415,
+     243,   244,   245,   135,   246,  -415,   249,   138,  -415,   250,
+     140,    19,    19,   143,   161,   143,   161,    20,    20,    20,
+      20,    20,   162,   253,   161,  -415,  -415,   139,   144,    19,
+      19,   146,   147,   148,   258,    -1,  -415,  -415,    13,   259,
+     152,   151,   153,  -415,  -415,  -415,   155,  -415,  -415,   156,
+     260,   262,    40,    40,   264,   152,  -415,  -415,   157,  -415,
+    -415,  -415,   166,  -415,   158,   267,   271,   271,  -415,  -415,
+    -415,   269,   271,   272,   271,   162,   273,  -415,   274,   167,
+     278,   276,  -415,    30,    30,    30,  -415,   143,   143,   277,
+     152,  -415,  -415,    19,   161,    19,  -415,   169,  -415,  -415,
+     170,   169,   280,  -415,  -415,  -415,   175,   176,  -415,   171,
+     177,  -415,   168,   181,  -415,  -415,  -415,   182,   172,   183,
+    -415,  -415,  -415,  -415,  -415,   174,   187,  -415,  -415,  -415,
+     178,   188,  -415,   281,   189,   286,  -415,  -415,  -415,   191,
+    -415,   193,  -415,  -415,   197,   284,  -415,  -415,   199,  -415,
+    -415,  -415,  -415,  -415,  -415,  -415,   291,   292,  -415,  -415,
+     290,   294,   295,   201,   202,   204,     0,   207,   205,     8,
+     212,  -415,   299,   303,   305,   304,   215,  -415,  -415,  -415,
+     218,  -415,   308,  -415,   213,   309,  -415,   220,  -415,  -415,
+     221,  -415,   223,  -415,  -415,   226,   228,  -415,  -415,   239,
+     313,  -415,  -415,  -415,  -415,  -415,  -415,   247,  -415,  -415,
+    -415,  -415,   311,   312,   248,   317,   321,   324,   330,  -415,
+     240,   180,   184,  -415,   251,   185,  -415,   252,   186,  -415,
+     254,   190,  -415,   335,   255,   337,   338,   340,   256,   342,
+    -415,  -415,   261,   263,   265,   343,    14,   344,   -81,   345,
+     346,   347,    -8,   348,   349,  -415,  -415,  -415,  -415,   350,
+     351,  -415,   355,  -415,   356,   357,   358,   359,   362,   363,
+     266,   364,  -415,   257,   367,   268,   270,   275,  -415,   371,
+    -415,   279,  -415,   282,   373,  -415,   283,   375,  -415,   285,
+     377,  -415,   293,  -415,    48,  -415,   289,  -415,   380,   296,
+     276,   276,   194,  -415,  -415,   298,    10,   300,   382,   287,
+     301,   302,  -415,   306,   384,   297,   307,   310,  -415,  -415,
+    -415,   314,  -415,  -415,  -415,   315,  -415,   318,   385,  -415,
+      66,  -415,   386,   387,    87,   319,   388,   389,   320,   391,
+     322,   392,   323,   394,  -415,  -415,  -415,   326,  -415,   327,
+     136,  -415,   341,   316,   328,  -415,   329,   395,    36,   398,
+     331,   332,   196,   333,   336,   339,   352,   405,   353,   360,
+    -415,   406,  -415,   361,   383,   423,  -415,  -415,   427,   454,
+     401,   354,   404,   402,   461,   407,   462,   411,   463,   413,
+     419,   466,   467,   468,   420,   424,   426,   469,   428,  -415,
+     470,   471,   198,   474,  -415,   334,   432,   436,   441,   475,
+    -415,   445,   450,  -415,   451,   453,   455,   456,   458,  -415,
+     416,   447,  -415,   452,  -415,   457,  -415,   465,  -415,  -415,
+     460,   476,   495,   477,   478,   479,  -415,   480,  -415,  -415,
+    -415,   482,   582,   583,  -415,  -415,  -415,   589,  -415,  -415,
+    -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,
+    -415,  -415,  -415,  -415,  -415,  -415,  -415,   590,  -415,   483,
+    -415,   484,  -415,  -415
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,
+    -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,
+    -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,
+    -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,  -415,
+     -96,   -86,  -101,   -77,   -98,  -126,  -145,  -114,    22,  -130,
+     -16,   396,  -415,  -414,   -18,  -415,   -12
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -103
+static const yytype_int16 yytable[] =
+{
+     130,   122,   284,   368,   231,   285,   151,   152,   153,   218,
+     263,   372,   273,   478,   156,   157,   287,   424,   275,   288,
+     425,   127,   221,   264,   128,   128,   128,   101,   108,   117,
+     123,   169,   258,   307,   262,   428,   495,   429,   182,   430,
+     499,   308,   309,   217,   188,   119,   128,   311,    97,   313,
+     120,   114,   121,    99,   256,   257,   512,   201,   464,   465,
+     466,   107,   467,   468,   291,   314,   206,   179,   180,   181,
+     211,   212,   278,   279,   298,   299,   464,   465,   466,   301,
+     494,   468,   229,  -100,   229,  -102,   218,   218,   330,   110,
+     323,   324,   111,   112,   113,   114,   115,   464,   465,   466,
+     103,   498,   468,   104,   105,   106,   325,   326,   434,   143,
+     435,   154,   436,   317,   328,   145,   286,   146,   261,   369,
+     261,   268,   268,   268,   268,   268,   268,   373,   261,   479,
+     289,   426,   147,   129,   222,   265,   329,   148,   331,   102,
+     109,   118,   124,   170,   229,   320,   464,   465,   466,   159,
+     511,   468,   518,   161,   519,   227,   520,   162,   128,   229,
+     269,   270,   271,   272,   259,   264,   304,   128,   128,   303,
+     221,   339,   128,   128,   128,   343,   163,   346,   128,   268,
+     128,   349,   164,   400,   128,   319,   128,   402,   405,   408,
+     128,   128,   128,   411,   229,   165,   128,   475,   261,   524,
+     128,   560,   128,   167,   128,   179,   180,   200,   166,   168,
+     171,   174,   176,   177,   178,   183,   340,   184,   185,   189,
+     190,   191,   344,   193,   196,   197,   198,   216,   209,   347,
+     226,   230,   232,   238,   350,   233,   234,   235,   236,   237,
+     239,   240,   241,   242,   243,   244,   245,   246,   249,   247,
+     248,   250,   251,   252,   253,   276,   254,   255,   222,   274,
+     277,   280,   281,   282,   283,   290,   296,   292,   297,   293,
+     300,   294,   295,   306,   307,   310,   302,   305,   312,   315,
+     316,   318,   128,   327,   352,   332,   334,   333,   337,   354,
+     358,   335,   336,   338,   360,   361,   362,   341,   342,   345,
+     363,   364,   375,   348,   351,   353,   376,   355,   377,   378,
+     356,   381,   383,   357,   392,   393,   359,   365,   366,   390,
+     395,   367,   371,   370,   396,   401,   403,   397,   374,   406,
+     382,   379,   409,   398,   380,   412,   384,   385,   413,   386,
+     415,   416,   387,   417,   388,   419,   423,   427,   431,   432,
+     433,   437,   438,   114,   440,   439,   389,   399,   441,   442,
+     443,   444,   445,   391,   394,   446,   447,   449,   404,   407,
+     451,   410,   418,   414,   455,   450,   458,   420,   460,   421,
+     462,   422,   448,   471,   452,   481,   453,   486,   493,   496,
+     497,   501,   502,   454,   504,   506,   456,   508,   517,   457,
+     459,   521,   461,   482,   473,   474,   476,   470,   530,   533,
+     463,   539,   542,   487,   472,   477,   548,   544,   480,   483,
+     484,   546,   549,   553,   485,   488,   575,   554,   489,   555,
+       0,   557,   490,   514,   491,   564,   492,   500,   503,   565,
+     505,   507,   509,   510,   566,   515,   516,   522,   568,   526,
+     523,   563,   527,   569,   570,   528,   571,   576,   572,   573,
+     513,   574,   577,   580,     0,     0,   525,   578,     0,   531,
+     529,     1,   540,   202,     0,   579,   532,   534,     0,   581,
+       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,   582,   535,
+      20,    21,    22,    23,    24,    25,   561,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,   541,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,   536,
+      57,    58,    59,   537,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+     538,    86,    87,    88,    89,    90,    91,    92,    93,   543,
+     545,   547,   550,   551,   552,   588,   589,   556,   558,   559,
+     562,   567,   590,   591,     0,   583,   584,   585,   586,   587,
+       0,   592,   593
+};
+
+static const yytype_int16 yycheck[] =
+{
+      16,    13,     3,     3,   100,     6,    10,    11,    12,    95,
+     136,     3,   142,     3,    10,    11,     3,     3,   144,     6,
+       6,     3,     3,     3,     6,     6,     6,     3,     3,     3,
+       3,     3,   133,     3,   135,   116,   450,   118,    56,   120,
+     454,   186,   187,     3,    62,     6,     6,   192,   115,   194,
+      11,    12,    13,   115,   131,   132,   470,    75,    10,    11,
+      12,   115,    14,    15,   160,   195,    84,    10,    11,    12,
+      88,    89,   149,   150,   172,   173,    10,    11,    12,   175,
+      14,    15,    98,   115,   100,   115,   172,   173,   214,     6,
+     204,   205,     9,    10,    11,    12,    13,    10,    11,    12,
+       6,    14,    15,     9,    10,    11,   207,   208,   116,   115,
+     118,   115,   120,   199,   210,     3,   117,     3,   134,   119,
+     136,   137,   138,   139,   140,   141,   142,   119,   144,   119,
+     117,   117,     3,   115,   115,   115,   213,     3,   215,   115,
+     115,   115,   115,   115,   160,   115,    10,    11,    12,   115,
+      14,    15,   116,     3,   118,     3,   120,     3,     6,   175,
+     138,   139,   140,   141,     3,     3,   182,     6,     6,     3,
+       3,     3,     6,     6,     6,     3,     3,     3,     6,   195,
+       6,     3,     3,     3,     6,   201,     6,     3,     3,     3,
+       6,     6,     6,     3,   210,     3,     6,     3,   214,     3,
+       6,     3,     6,     3,     6,    10,    11,    12,     5,     3,
+     115,   115,     3,     5,     3,     5,   232,     3,   115,     3,
+       3,   115,   238,   115,   115,     3,   115,     0,   115,   245,
+       6,     6,   116,   116,   250,     6,     6,     6,     6,     6,
+       6,     6,     6,     6,     6,     3,   116,     6,     3,     6,
+       6,   116,     6,     4,   116,   116,     6,   117,   115,     6,
+     116,   115,   115,   115,     6,     6,     6,   116,     6,   116,
+       6,   116,   116,     6,     3,     6,   119,   119,     6,     6,
+       6,     3,     6,     6,     3,   116,     6,   117,   117,     3,
+       6,   116,   116,   116,     3,     3,     6,   116,   116,   116,
+       6,     6,     3,   116,   116,   116,     3,   116,     3,     5,
+     117,     3,     3,   116,     3,     3,   117,   116,   116,     6,
+       3,   117,   117,   116,     3,   341,   342,     3,   116,   345,
+     117,   116,   348,     3,   116,   351,   116,   116,     3,   116,
+       3,     3,   116,     3,   116,     3,     3,     3,     3,     3,
+       3,     3,     3,    12,     3,     5,   117,   117,     3,     3,
+       3,     3,     3,   116,   116,     3,     3,     3,   117,   117,
+       3,   117,   116,   118,     3,   118,     3,   116,     3,   116,
+       3,   116,   116,     3,   116,     3,   116,     3,     3,     3,
+       3,     3,     3,   118,     3,     3,   117,     3,     3,   117,
+     117,     3,   117,   116,   420,   421,   422,   118,     3,     3,
+     117,    10,    10,   116,   118,   117,     3,    10,   118,   118,
+     118,    10,     3,     3,   118,   118,    10,     3,   118,     3,
+      -1,     3,   118,   117,   119,     3,   118,   118,   118,     3,
+     118,   118,   116,   116,     3,   117,   117,   116,     3,   116,
+     118,   117,   116,     3,     3,   116,     3,    10,     3,     3,
+     472,     3,    10,     3,    -1,    -1,   482,    10,    -1,   116,
+     118,     7,   118,    77,    -1,    10,   116,   116,    -1,     3,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,     3,   116,
+      36,    37,    38,    39,    40,    41,   522,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,   118,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,   116,
+      76,    77,    78,   116,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     116,   107,   108,   109,   110,   111,   112,   113,   114,   118,
+     118,   118,   116,   116,   116,     3,     3,   118,   118,   118,
+     116,   116,     3,     3,    -1,   118,   118,   118,   118,   117,
+      -1,   118,   118
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     7,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      36,    37,    38,    39,    40,    41,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    76,    77,    78,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   107,   108,   109,   110,
+     111,   112,   113,   114,   122,   129,   128,   115,   157,   115,
+     159,     3,   115,     6,     9,    10,    11,   115,     3,   115,
+       6,     9,    10,    11,    12,    13,   177,     3,   115,     6,
+      11,    13,   177,     3,   115,   172,   173,     3,     6,   115,
+     171,   134,   135,   132,   141,   133,   142,   147,   146,   149,
+     148,   145,   150,   115,   144,     3,     3,     3,     3,   130,
+     131,    10,    11,    12,   115,   175,    10,    11,   176,   115,
+     158,     3,     3,     3,     3,     3,     5,     3,     3,     3,
+     115,   115,   127,   138,   115,   160,     3,     5,     3,    10,
+      11,    12,   175,     5,     3,   115,   155,   154,   175,     3,
+       3,   115,   152,   115,   153,   151,   115,     3,   115,   126,
+      12,   175,   172,   124,   125,   123,   175,   140,   139,   115,
+     156,   175,   175,   136,   143,   137,     0,     3,   162,   165,
+     171,     3,   115,   162,   163,   164,     6,     3,   161,   171,
+       6,   161,   116,     6,     6,     6,     6,     6,   116,     6,
+       6,     6,     6,     6,     3,   116,     6,     6,     6,     3,
+     116,     6,     4,   116,     6,   117,   164,   164,   163,     3,
+     166,   171,   163,   166,     3,   115,   169,   170,   171,   169,
+     169,   169,   169,   170,     6,   166,   116,   116,   164,   164,
+     115,   115,   115,     6,     3,     6,   117,     3,     6,   117,
+       6,   161,   116,   116,   116,   116,     6,     6,   165,   165,
+       6,   161,   119,     3,   171,   119,     6,     3,   167,   167,
+       6,   167,     6,   167,   170,     6,     6,   162,     3,   171,
+     115,   167,   168,   168,   168,   163,   163,     6,   161,   164,
+     166,   164,   116,   117,     6,   116,   116,   117,   116,     3,
+     171,   116,   116,     3,   171,   116,     3,   171,   116,     3,
+     171,   116,     3,   116,     3,   116,   117,   116,     6,   117,
+       3,     3,     6,     6,     6,   116,   116,   117,     3,   119,
+     116,   117,     3,   119,   116,     3,     3,     3,     5,   116,
+     116,     3,   117,     3,   116,   116,   116,   116,   116,   117,
+       6,   116,     3,     3,   116,     3,     3,     3,     3,   117,
+       3,   171,     3,   171,   117,     3,   171,   117,     3,   171,
+     117,     3,   171,     3,   118,     3,     3,     3,   116,     3,
+     116,   116,   116,     3,     3,     6,   117,     3,   116,   118,
+     120,     3,     3,     3,   116,   118,   120,     3,     3,     5,
+       3,     3,     3,     3,     3,     3,     3,     3,   116,     3,
+     118,     3,   116,   116,   118,     3,   117,   117,     3,   117,
+       3,   117,     3,   117,    10,    11,    12,    14,    15,   174,
+     118,     3,   118,   171,   171,     3,   171,   117,     3,   119,
+     118,     3,   116,   118,   118,   118,     3,   116,   118,   118,
+     118,   119,   118,     3,    14,   174,     3,     3,    14,   174,
+     118,     3,     3,   118,     3,   118,     3,   118,     3,   116,
+     116,    14,   174,   177,   117,   117,   117,     3,   116,   118,
+     120,     3,   116,   118,     3,   171,   116,   116,   116,   118,
+       3,   116,   116,     3,   116,   116,   116,   116,   116,    10,
+     118,   118,    10,   118,    10,   118,    10,   118,     3,     3,
+     116,   116,   116,     3,     3,     3,   118,     3,   118,   118,
+       3,   171,   116,   117,     3,     3,     3,   116,     3,     3,
+       3,     3,     3,     3,     3,    10,    10,    10,    10,    10,
+       3,     3,     3,   118,   118,   118,   118,   117,     3,     3,
+       3,     3,   118,   118
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 171 "rx-parse.y"
+    { as_bad (_("Unknown opcode: %s"), rx_init_start); }
+    break;
+
+  case 3:
+#line 176 "rx-parse.y"
+    { B1 (0x00); }
+    break;
+
+  case 4:
+#line 179 "rx-parse.y"
+    { B1 (0x01); }
+    break;
+
+  case 5:
+#line 182 "rx-parse.y"
+    { B1 (0x02); }
+    break;
+
+  case 6:
+#line 185 "rx-parse.y"
+    { B1 (0x03); }
+    break;
+
+  case 7:
+#line 190 "rx-parse.y"
+    { if (rx_disp3op ((yyvsp[(2) - (2)].exp)))
+	      { B1 (0x08); rx_disp3 ((yyvsp[(2) - (2)].exp), 5); }
+	    else if (rx_intop ((yyvsp[(2) - (2)].exp), 8))
+	      { B1 (0x2e); PC1 ((yyvsp[(2) - (2)].exp)); }
+	    else if (rx_intop ((yyvsp[(2) - (2)].exp), 16))
+	      { B1 (0x38); PC2 ((yyvsp[(2) - (2)].exp)); }
+	    else if (rx_intop ((yyvsp[(2) - (2)].exp), 24))
+	      { B1 (0x04); PC3 ((yyvsp[(2) - (2)].exp)); }
+	    else
+	      { rx_relax (RX_RELAX_BRANCH, 0);
+		rx_linkrelax_branch ();
+		/* We'll convert this to a longer one later if needed.  */
+		B1 (0x08); rx_disp3 ((yyvsp[(2) - (2)].exp), 5); } }
+    break;
+
+  case 8:
+#line 205 "rx-parse.y"
+    { B1 (0x04); PC3 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 9:
+#line 208 "rx-parse.y"
+    { B1 (0x08); rx_disp3 ((yyvsp[(3) - (3)].exp), 5); }
+    break;
+
+  case 10:
+#line 213 "rx-parse.y"
+    { if (rx_intop ((yyvsp[(2) - (2)].exp), 16))
+	      { B1 (0x39); PC2 ((yyvsp[(2) - (2)].exp)); }
+	    else if (rx_intop ((yyvsp[(2) - (2)].exp), 24))
+	      { B1 (0x05); PC3 ((yyvsp[(2) - (2)].exp)); }
+	    else
+	      { rx_relax (RX_RELAX_BRANCH, 0);
+		rx_linkrelax_branch ();
+		B1 (0x39); PC2 ((yyvsp[(2) - (2)].exp)); } }
+    break;
+
+  case 11:
+#line 222 "rx-parse.y"
+    { B1 (0x05), PC3 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 12:
+#line 227 "rx-parse.y"
+    { if ((yyvsp[(1) - (3)].regno) == COND_EQ || (yyvsp[(1) - (3)].regno) == COND_NE)
+	      { B1 ((yyvsp[(1) - (3)].regno) == COND_EQ ? 0x10 : 0x18); rx_disp3 ((yyvsp[(3) - (3)].exp), 5); }
+	    else
+	      as_bad (_("Only BEQ and BNE may have .S")); }
+    break;
+
+  case 13:
+#line 235 "rx-parse.y"
+    { B1 (0x20); F ((yyvsp[(1) - (3)].regno), 4, 4); PC1 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 14:
+#line 238 "rx-parse.y"
+    { B1 (0x2e), PC1 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 15:
+#line 243 "rx-parse.y"
+    { B1 (0x38), PC2 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 16:
+#line 245 "rx-parse.y"
+    { B1 (0x39), PC2 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 17:
+#line 247 "rx-parse.y"
+    { if ((yyvsp[(1) - (3)].regno) == COND_EQ || (yyvsp[(1) - (3)].regno) == COND_NE)
+	      { B1 ((yyvsp[(1) - (3)].regno) == COND_EQ ? 0x3a : 0x3b); PC2 ((yyvsp[(3) - (3)].exp)); }
+	    else
+	      as_bad (_("Only BEQ and BNE may have .W")); }
+    break;
+
+  case 18:
+#line 252 "rx-parse.y"
+    { if ((yyvsp[(1) - (2)].regno) == COND_EQ || (yyvsp[(1) - (2)].regno) == COND_NE)
+	      {
+		rx_relax (RX_RELAX_BRANCH, 0);
+		rx_linkrelax_branch ();
+		B1 ((yyvsp[(1) - (2)].regno) == COND_EQ ? 0x10 : 0x18); rx_disp3 ((yyvsp[(2) - (2)].exp), 5);
+	      }
+	    else
+	      {
+		rx_relax (RX_RELAX_BRANCH, 0);
+		/* This is because we might turn it into a
+		   jump-over-jump long branch.  */
+		rx_linkrelax_branch ();
+	        B1 (0x20); F ((yyvsp[(1) - (2)].regno), 4, 4); PC1 ((yyvsp[(2) - (2)].exp));
+	      } }
+    break;
+
+  case 19:
+#line 271 "rx-parse.y"
+    { if ((yyvsp[(8) - (9)].regno) <= 7 && rx_uintop ((yyvsp[(4) - (9)].exp), 8) && rx_disp5op0 (&(yyvsp[(6) - (9)].exp), BSIZE))
+	      { B2 (0x3c, 0); rx_field5s2 ((yyvsp[(6) - (9)].exp)); F ((yyvsp[(8) - (9)].regno), 9, 3); O1 ((yyvsp[(4) - (9)].exp)); }
+	    else
+	      { B2 (0xf8, 0x04); F ((yyvsp[(8) - (9)].regno), 8, 4); DSP ((yyvsp[(6) - (9)].exp), 6, BSIZE); O1 ((yyvsp[(4) - (9)].exp));
+	      if ((yyvsp[(4) - (9)].exp).X_op != O_constant && (yyvsp[(4) - (9)].exp).X_op != O_big) rx_linkrelax_imm (12); } }
+    break;
+
+  case 20:
+#line 278 "rx-parse.y"
+    { if ((yyvsp[(8) - (9)].regno) <= 7 && rx_uintop ((yyvsp[(4) - (9)].exp), 8) && rx_disp5op0 (&(yyvsp[(6) - (9)].exp), WSIZE))
+	      { B2 (0x3d, 0); rx_field5s2 ((yyvsp[(6) - (9)].exp)); F ((yyvsp[(8) - (9)].regno), 9, 3); O1 ((yyvsp[(4) - (9)].exp)); }
+	    else
+	      { B2 (0xf8, 0x01); F ((yyvsp[(8) - (9)].regno), 8, 4); DSP ((yyvsp[(6) - (9)].exp), 6, WSIZE); IMM ((yyvsp[(4) - (9)].exp), 12); } }
+    break;
+
+  case 21:
+#line 284 "rx-parse.y"
+    { if ((yyvsp[(8) - (9)].regno) <= 7 && rx_uintop ((yyvsp[(4) - (9)].exp), 8) && rx_disp5op0 (&(yyvsp[(6) - (9)].exp), LSIZE))
+	      { B2 (0x3e, 0); rx_field5s2 ((yyvsp[(6) - (9)].exp)); F ((yyvsp[(8) - (9)].regno), 9, 3); O1 ((yyvsp[(4) - (9)].exp)); }
+	    else
+	      { B2 (0xf8, 0x02); F ((yyvsp[(8) - (9)].regno), 8, 4); DSP ((yyvsp[(6) - (9)].exp), 6, LSIZE); IMM ((yyvsp[(4) - (9)].exp), 12); } }
+    break;
+
+  case 22:
+#line 292 "rx-parse.y"
+    { B2 (0x3f, 0); F ((yyvsp[(5) - (7)].regno), 8, 4); F ((yyvsp[(7) - (7)].regno), 12, 4); rtsd_immediate ((yyvsp[(3) - (7)].exp));
+	    if ((yyvsp[(5) - (7)].regno) == 0)
+	      rx_error (_("RTSD cannot pop R0"));
+	    if ((yyvsp[(5) - (7)].regno) > (yyvsp[(7) - (7)].regno))
+	      rx_error (_("RTSD first reg must be <= second reg")); }
+    break;
+
+  case 23:
+#line 301 "rx-parse.y"
+    { B2 (0x47, 0); F ((yyvsp[(2) - (4)].regno), 8, 4); F ((yyvsp[(4) - (4)].regno), 12, 4); }
+    break;
+
+  case 24:
+#line 306 "rx-parse.y"
+    { B2 (0x44, 0); F ((yyvsp[(4) - (8)].regno), 8, 4); F ((yyvsp[(8) - (8)].regno), 12, 4); DSP ((yyvsp[(2) - (8)].exp), 6, BSIZE); }
+    break;
+
+  case 25:
+#line 309 "rx-parse.y"
+    { B3 (MEMEX, 0x04, 0); F ((yyvsp[(6) - (8)].regno), 8, 2);  F ((yyvsp[(4) - (8)].regno), 16, 4); F ((yyvsp[(8) - (8)].regno), 20, 4); DSP ((yyvsp[(2) - (8)].exp), 14, sizemap[(yyvsp[(6) - (8)].regno)]); }
+    break;
+
+  case 26:
+#line 314 "rx-parse.y"
+    { B2 (0x5b, 0x00); F ((yyvsp[(2) - (5)].regno), 5, 1); F ((yyvsp[(3) - (5)].regno), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+    break;
+
+  case 27:
+#line 319 "rx-parse.y"
+    { B2 (0x58, 0x00); F ((yyvsp[(2) - (7)].regno), 5, 1); F ((yyvsp[(4) - (7)].regno), 8, 4); F ((yyvsp[(7) - (7)].regno), 12, 4); }
+    break;
+
+  case 28:
+#line 322 "rx-parse.y"
+    { if ((yyvsp[(5) - (8)].regno) <= 7 && (yyvsp[(8) - (8)].regno) <= 7 && rx_disp5op (&(yyvsp[(3) - (8)].exp), (yyvsp[(2) - (8)].regno)))
+	      { B2 (0xb0, 0); F ((yyvsp[(2) - (8)].regno), 4, 1); F ((yyvsp[(5) - (8)].regno), 9, 3); F ((yyvsp[(8) - (8)].regno), 13, 3); rx_field5s ((yyvsp[(3) - (8)].exp)); }
+	    else
+	      { B2 (0x58, 0x00); F ((yyvsp[(2) - (8)].regno), 5, 1); F ((yyvsp[(5) - (8)].regno), 8, 4); F ((yyvsp[(8) - (8)].regno), 12, 4); DSP ((yyvsp[(3) - (8)].exp), 6, (yyvsp[(2) - (8)].regno)); } }
+    break;
+
+  case 29:
+#line 330 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x60, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else
+	      /* This is really an add, but we negate the immediate.  */
+	      { B2 (0x70, 0); F ((yyvsp[(5) - (5)].regno), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); NIMM ((yyvsp[(3) - (5)].exp), 6); } }
+    break;
+
+  case 30:
+#line 337 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x61, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else if (rx_uintop ((yyvsp[(3) - (5)].exp), 8))
+	      { B2 (0x75, 0x50); F ((yyvsp[(5) - (5)].regno), 12, 4); UO1 ((yyvsp[(3) - (5)].exp)); }
+	    else
+	      { B2 (0x74, 0x00); F ((yyvsp[(5) - (5)].regno), 12, 4); IMM ((yyvsp[(3) - (5)].exp), 6); } }
+    break;
+
+  case 31:
+#line 345 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x62, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else
+	      { B2 (0x70, 0); F ((yyvsp[(5) - (5)].regno), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); IMM ((yyvsp[(3) - (5)].exp), 6); } }
+    break;
+
+  case 32:
+#line 351 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x63, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else
+	      { B2 (0x74, 0x10); F ((yyvsp[(5) - (5)].regno), 12, 4); IMM ((yyvsp[(3) - (5)].exp), 6); } }
+    break;
+
+  case 33:
+#line 357 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x64, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else
+	      { B2 (0x74, 0x20); F ((yyvsp[(5) - (5)].regno), 12, 4); IMM ((yyvsp[(3) - (5)].exp), 6); } }
+    break;
+
+  case 34:
+#line 363 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x65, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else
+	      { B2 (0x74, 0x30); F ((yyvsp[(5) - (5)].regno), 12, 4); IMM ((yyvsp[(3) - (5)].exp), 6); } }
+    break;
+
+  case 35:
+#line 369 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(4) - (6)].exp), 4))
+	      { B2 (0x66, 0); FE ((yyvsp[(4) - (6)].exp), 8, 4); F ((yyvsp[(6) - (6)].regno), 12, 4); }
+	    else if (rx_uintop ((yyvsp[(4) - (6)].exp), 8))
+	      { B2 (0x75, 0x40); F ((yyvsp[(6) - (6)].regno), 12, 4); UO1 ((yyvsp[(4) - (6)].exp)); }
+	    else
+	      { B2 (0xfb, 0x02); F ((yyvsp[(6) - (6)].regno), 8, 4); IMM ((yyvsp[(4) - (6)].exp), 12); } }
+    break;
+
+  case 36:
+#line 377 "rx-parse.y"
+    { if (rx_uintop ((yyvsp[(3) - (5)].exp), 4))
+	      { B2 (0x66, 0); FE ((yyvsp[(3) - (5)].exp), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+	    else if (rx_uintop ((yyvsp[(3) - (5)].exp), 8))
+	      { B2 (0x75, 0x40); F ((yyvsp[(5) - (5)].regno), 12, 4); UO1 ((yyvsp[(3) - (5)].exp)); }
+	    else
+	      { B2 (0xfb, 0x02); F ((yyvsp[(5) - (5)].regno), 8, 4); IMM ((yyvsp[(3) - (5)].exp), 12); } }
+    break;
+
+  case 37:
+#line 387 "rx-parse.y"
+    { B1 (0x67); rtsd_immediate ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 38:
+#line 391 "rx-parse.y"
+    { sub_op = 0; }
+    break;
+
+  case 40:
+#line 392 "rx-parse.y"
+    { sub_op = 1; }
+    break;
+
+  case 42:
+#line 393 "rx-parse.y"
+    { sub_op = 2; }
+    break;
+
+  case 44:
+#line 398 "rx-parse.y"
+    {
+	    if ((yyvsp[(2) - (4)].regno) == (yyvsp[(4) - (4)].regno))
+	      { B2 (0x7e, 0x80); F (LSIZE, 10, 2); F ((yyvsp[(2) - (4)].regno), 12, 4); }
+	    else
+	     { B2 (0x6e, 0); F ((yyvsp[(2) - (4)].regno), 8, 4); F ((yyvsp[(4) - (4)].regno), 12, 4); }
+	    if ((yyvsp[(2) - (4)].regno) == 0)
+	      rx_error (_("PUSHM cannot push R0"));
+	    if ((yyvsp[(2) - (4)].regno) > (yyvsp[(4) - (4)].regno))
+	      rx_error (_("PUSHM first reg must be <= second reg")); }
+    break;
+
+  case 45:
+#line 411 "rx-parse.y"
+    {
+	    if ((yyvsp[(2) - (4)].regno) == (yyvsp[(4) - (4)].regno))
+	      { B2 (0x7e, 0xb0); F ((yyvsp[(2) - (4)].regno), 12, 4); }
+	    else
+	      { B2 (0x6f, 0); F ((yyvsp[(2) - (4)].regno), 8, 4); F ((yyvsp[(4) - (4)].regno), 12, 4); }
+	    if ((yyvsp[(2) - (4)].regno) == 0)
+	      rx_error (_("POPM cannot pop R0"));
+	    if ((yyvsp[(2) - (4)].regno) > (yyvsp[(4) - (4)].regno))
+	      rx_error (_("POPM first reg must be <= second reg")); }
+    break;
+
+  case 46:
+#line 424 "rx-parse.y"
+    { B2 (0x70, 0x00); F ((yyvsp[(5) - (7)].regno), 8, 4); F ((yyvsp[(7) - (7)].regno), 12, 4); IMM ((yyvsp[(3) - (7)].exp), 6); }
+    break;
+
+  case 47:
+#line 429 "rx-parse.y"
+    { B2(0x75, 0x60), UO1 ((yyvsp[(3) - (3)].exp)); }
+    break;
+
+  case 48:
+#line 434 "rx-parse.y"
+    { B2 (0x78, 0); FE ((yyvsp[(3) - (5)].exp), 7, 5); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+    break;
+
+  case 49:
+#line 436 "rx-parse.y"
+    { B2 (0x7a, 0); FE ((yyvsp[(3) - (5)].exp), 7, 5); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+    break;
+
+  case 50:
+#line 441 "rx-parse.y"
+    { B2 (0x7c, 0x00); FE ((yyvsp[(3) - (5)].exp), 7, 5); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+    break;
+
+  case 51:
+#line 446 "rx-parse.y"
+    { B2 (0x7e, 0x30); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 52:
+#line 448 "rx-parse.y"
+    { B2 (0x7e, 0x40); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 53:
+#line 450 "rx-parse.y"
+    { B2 (0x7e, 0x50); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 54:
+#line 455 "rx-parse.y"
+    { B2 (0x7e, 0x80); F ((yyvsp[(2) - (3)].regno), 10, 2); F ((yyvsp[(3) - (3)].regno), 12, 4); }
+    break;
+
+  case 55:
+#line 460 "rx-parse.y"
+    { B2 (0x7e, 0xb0); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 56:
+#line 465 "rx-parse.y"
+    { if ((yyvsp[(2) - (2)].regno) < 16)
+	      { B2 (0x7e, 0xc0); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+	    else
+	      as_bad (_("PUSHC can only push the first 16 control registers")); }
+    break;
+
+  case 57:
+#line 473 "rx-parse.y"
+    { if ((yyvsp[(2) - (2)].regno) < 16)
+	      { B2 (0x7e, 0xe0); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+	    else
+	      as_bad (_("POPC can only pop the first 16 control registers")); }
+    break;
+
+  case 58:
+#line 481 "rx-parse.y"
+    { B2 (0x7f, 0xa0); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 59:
+#line 483 "rx-parse.y"
+    { B2 (0x7f, 0xb0); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 60:
+#line 488 "rx-parse.y"
+    { B2 (0x7f, 0x00); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 61:
+#line 490 "rx-parse.y"
+    { B2 (0x7f, 0x10); F ((yyvsp[(2) - (2)].regno), 12, 4); }
+    break;
+
+  case 62:
+#line 492 "rx-parse.y"
+    { B2 (0x7f, 0x40); F ((yyvsp[(3) - (3)].regno), 12, 4); }
+    break;
+
+  case 63:
+#line 494 "rx-parse.y"
+    { B2 (0x7f, 0x50); F ((yyvsp[(3) - (3)].regno), 12, 4); }
+    break;
+
+  case 64:
+#line 499 "rx-parse.y"
+    { B2 (0x7f, 0x83); }
+    break;
+
+  case 65:
+#line 501 "rx-parse.y"
+    { B2 (0x7f, 0x87); }
+    break;
+
+  case 66:
+#line 503 "rx-parse.y"
+    { B2 (0x7f, 0x8b); }
+    break;
+
+  case 67:
+#line 505 "rx-parse.y"
+    { B2 (0x7f, 0x8f); }
+    break;
+
+  case 68:
+#line 510 "rx-parse.y"
+    { B2 (0x7f, 0x80); F ((yyvsp[(2) - (2)].regno), 14, 2); }
+    break;
+
+  case 69:
+#line 512 "rx-parse.y"
+    { B2 (0x7f, 0x84); F ((yyvsp[(2) - (2)].regno), 14, 2); }
+    break;
+
+  case 70:
+#line 514 "rx-parse.y"
+    { B2 (0x7f, 0x88); F ((yyvsp[(2) - (2)].regno), 14, 2); }
+    break;
+
+  case 71:
+#line 519 "rx-parse.y"
+    { B2 (0x7f, 0x8c); F ((yyvsp[(2) - (2)].regno), 14, 2); }
+    break;
+
+  case 72:
+#line 524 "rx-parse.y"
+    { B2 (0x7f, 0x94); }
+    break;
+
+  case 73:
+#line 526 "rx-parse.y"
+    { B2 (0x7f, 0x95); }
+    break;
+
+  case 74:
+#line 528 "rx-parse.y"
+    { B2 (0x7f, 0x96); }
+    break;
+
+  case 75:
+#line 530 "rx-parse.y"
+    { B2 (0x7f, 0x93); }
+    break;
+
+  case 76:
+#line 535 "rx-parse.y"
+    { B3 (0x75, 0x70, 0x00); FE ((yyvsp[(3) - (3)].exp), 20, 4); }
+    break;
+
+  case 77:
+#line 541 "rx-parse.y"
+    { if ((yyvsp[(3) - (8)].regno) <= 7 && (yyvsp[(7) - (8)].regno) <= 7 && rx_disp5op (&(yyvsp[(5) - (8)].exp), (yyvsp[(2) - (8)].regno)))
+	      { B2 (0x80, 0); F ((yyvsp[(2) - (8)].regno), 2, 2); F ((yyvsp[(7) - (8)].regno), 9, 3); F ((yyvsp[(3) - (8)].regno), 13, 3); rx_field5s ((yyvsp[(5) - (8)].exp)); }
+	    else
+	      { B2 (0xc3, 0x00); F ((yyvsp[(2) - (8)].regno), 2, 2); F ((yyvsp[(7) - (8)].regno), 8, 4); F ((yyvsp[(3) - (8)].regno), 12, 4); DSP ((yyvsp[(5) - (8)].exp), 4, (yyvsp[(2) - (8)].regno)); }}
+    break;
+
+  case 78:
+#line 549 "rx-parse.y"
+    { if ((yyvsp[(5) - (8)].regno) <= 7 && (yyvsp[(8) - (8)].regno) <= 7 && rx_disp5op (&(yyvsp[(3) - (8)].exp), (yyvsp[(2) - (8)].regno)))
+	      { B2 (0x88, 0); F ((yyvsp[(2) - (8)].regno), 2, 2); F ((yyvsp[(5) - (8)].regno), 9, 3); F ((yyvsp[(8) - (8)].regno), 13, 3); rx_field5s ((yyvsp[(3) - (8)].exp)); }
+	    else
+	      { B2 (0xcc, 0x00); F ((yyvsp[(2) - (8)].regno), 2, 2); F ((yyvsp[(5) - (8)].regno), 8, 4); F ((yyvsp[(8) - (8)].regno), 12, 4); DSP ((yyvsp[(3) - (8)].exp), 6, (yyvsp[(2) - (8)].regno)); } }
+    break;
+
+  case 79:
+#line 563 "rx-parse.y"
+    { B2 (0xc3, 0x00); F ((yyvsp[(2) - (7)].regno), 2, 2); F ((yyvsp[(6) - (7)].regno), 8, 4); F ((yyvsp[(3) - (7)].regno), 12, 4); }
+    break;
+
+  case 80:
+#line 568 "rx-parse.y"
+    { B2 (0xc0, 0); F ((yyvsp[(2) - (10)].regno), 2, 2); F ((yyvsp[(4) - (10)].regno), 8, 4); F ((yyvsp[(9) - (10)].regno), 12, 4); DSP ((yyvsp[(7) - (10)].exp), 4, (yyvsp[(2) - (10)].regno)); }
+    break;
+
+  case 81:
+#line 573 "rx-parse.y"
+    { B2 (0xc0, 0x00); F ((yyvsp[(2) - (11)].regno), 2, 2); F ((yyvsp[(5) - (11)].regno), 8, 4); F ((yyvsp[(10) - (11)].regno), 12, 4); DSP ((yyvsp[(3) - (11)].exp), 6, (yyvsp[(2) - (11)].regno)); DSP ((yyvsp[(8) - (11)].exp), 4, (yyvsp[(2) - (11)].regno)); }
+    break;
+
+  case 82:
+#line 578 "rx-parse.y"
+    { B2 (0xcf, 0x00); F ((yyvsp[(2) - (5)].regno), 2, 2); F ((yyvsp[(3) - (5)].regno), 8, 4); F ((yyvsp[(5) - (5)].regno), 12, 4); }
+    break;
+
+  case 83:
+#line 583 "rx-parse.y"
+    { B2 (0xcc, 0x00); F ((yyvsp[(2) - (7)].regno), 2, 2); F ((yyvsp[(4) - (7)].regno), 8, 4); F ((yyvsp[(7) - (7)].regno), 12, 4); }
+    break;
+
+  case 84:
+#line 588 "rx-parse.y"
+    { B2 (0xf0, 0x00); F ((yyvsp[(7) - (9)].regno), 8, 4); FE ((yyvsp[(3) - (9)].exp), 13, 3); DSP ((yyvsp[(5) - (9)].exp), 6, BSIZE); }
+    break;
+
+  case 85:
+#line 590 "rx-parse.y"
+    { B2 (0xf0, 0x08); F ((yyvsp[(7) - (9)].regno), 8, 4); FE ((yyvsp[(3) - (9)].exp), 13, 3); DSP ((yyvsp[(5) - (9)].exp), 6, BSIZE); }
+    break;
+
+  case 86:
+#line 592 "rx-parse.y"
+    { B2 (0xf4, 0x00); F ((yyvsp[(7) - (9)].regno), 8, 4); FE ((yyvsp[(3) - (9)].exp), 13, 3); DSP ((yyvsp[(5) - (9)].exp), 6, BSIZE); }
+    break;
+
+  case 87:
+#line 597 "rx-parse.y"
+    { B2 (0xf4, 0x08); F ((yyvsp[(2) - (6)].regno), 14, 2); F ((yyvsp[(5) - (6)].regno), 8, 4); DSP ((yyvsp[(3) - (6)].exp), 6, (yyvsp[(2) - (6)].regno)); }
+    break;
+
+  case 88:
+#line 601 "rx-parse.y"
+    { sub_op = 0; }
+    break;
+
+  case 90:
+#line 602 "rx-parse.y"
+    { sub_op = 1; sub_op2 = 1; }
+    break;
+
+  case 92:
+#line 603 "rx-parse.y"
+    { sub_op = 2; }
+    break;
+
+  case 94:
+#line 604 "rx-parse.y"
+    { sub_op = 3; sub_op2 = 2; }
+    break;
+
+  case 96:
+#line 605 "rx-parse.y"
+    { sub_op = 4; }
+    break;
+
+  case 98:
+#line 606 "rx-parse.y"
+    { sub_op = 5; }
+    break;
+
+  case 100:
+#line 607 "rx-parse.y"
+    { sub_op = 6; }
+    break;
+
+  case 102:
+#line 608 "rx-parse.y"
+    { sub_op = 7; }
+    break;
+
+  case 104:
+#line 609 "rx-parse.y"
+    { sub_op = 8; }
+    break;
+
+  case 106:
+#line 610 "rx-parse.y"
+    { sub_op = 9; }
+    break;
+
+  case 108:
+#line 611 "rx-parse.y"
+    { sub_op = 12; }
+    break;
+
+  case 110:
+#line 612 "rx-parse.y"
+    { sub_op = 13; }
+    break;
+
+  case 112:
+#line 613 "rx-parse.y"
+    { sub_op = 14; sub_op2 = 0; }
+    break;
+
+  case 114:
+#line 614 "rx-parse.y"
+    { sub_op = 14; }
+    break;
+
+  case 116:
+#line 615 "rx-parse.y"
+    { sub_op = 15; }
+    break;
+
+  case 118:
+#line 619 "rx-parse.y"
+    { sub_op = 6; }
+    break;
+
+  case 120:
+#line 620 "rx-parse.y"
+    { sub_op = 7; }
+    break;
+
+  case 122:
+#line 621 "rx-parse.y"
+    { sub_op = 16; }
+    break;
+
+  case 124:
+#line 622 "rx-parse.y"
+    { sub_op = 17; }
+    break;
+
+  case 126:
+#line 627 "rx-parse.y"
+    { id24 (1, 0x63, 0x00); F ((yyvsp[(4) - (4)].regno), 16, 4); F ((yyvsp[(2) - (4)].regno), 20, 4); }
+    break;
+
+  case 127:
+#line 629 "rx-parse.y"
+    { id24 (1, 0x67, 0x00); F ((yyvsp[(4) - (4)].regno), 16, 4); F ((yyvsp[(2) - (4)].regno), 20, 4); }
+    break;
+
+  case 128:
+#line 631 "rx-parse.y"
+    { id24 (1, 0x6b, 0x00); F ((yyvsp[(4) - (4)].regno), 16, 4); F ((yyvsp[(2) - (4)].regno), 20, 4); }
+    break;
+
+  case 129:
+#line 633 "rx-parse.y"
+    { id24 (1, 0x6f, 0x00); F ((yyvsp[(4) - (4)].regno), 16, 4); F ((yyvsp[(2) - (4)].regno), 20, 4); }
+    break;
+
+  case 130:
+#line 636 "rx-parse.y"
+    { id24 (1, 0x60, 0x00); F ((yyvsp[(6) - (8)].regno), 16, 4); F ((yyvsp[(2) - (8)].regno), 20, 4); DSP ((yyvsp[(4) - (8)].exp), 14, BSIZE); }
+    break;
+
+  case 131:
+#line 638 "rx-parse.y"
+    { id24 (1, 0x64, 0x00); F ((yyvsp[(6) - (8)].regno), 16, 4); F ((yyvsp[(2) - (8)].regno), 20, 4); DSP ((yyvsp[(4) - (8)].exp), 14, BSIZE); }
+    break;
+
+  case 132:
+#line 640 "rx-parse.y"
+    { id24 (1, 0x68, 0x00); F ((yyvsp[(6) - (8)].regno), 16, 4); F ((yyvsp[(2) - (8)].regno), 20, 4); DSP ((yyvsp[(4) - (8)].exp), 14, BSIZE); }
+    break;
+
+  case 133:
+#line 642 "rx-parse.y"
+    { id24 (1, 0x6c, 0x00); F ((yyvsp[(6) - (8)].regno), 16, 4); F ((yyvsp[(2) - (8)].regno), 20, 4); DSP ((yyvsp[(4) - (8)].exp), 14, BSIZE); }
+    break;
+
+  case 134:
+#line 646 "rx-parse.y"
+    { sub_op = 0; }
+    break;
+
+  case 136:
+#line 647 "rx-parse.y"
+    { sub_op = 1; }
+    break;
+
+  case 138:
+#line 648 "rx-parse.y"
+    { sub_op = 2; }
+    break;
+
+  case 140:
+#line 649 "rx-parse.y"
+    { sub_op = 3; }
+    break;
+
+  case 142:
+#line 650 "rx-parse.y"
+    { sub_op = 4; }
+    break;
+
+  case 144:
+#line 651 "rx-parse.y"
+    { sub_op = 5; }
+    break;
+
+  case 146:
+#line 652 "rx-parse.y"
+    { sub_op = 6; }
+    break;
+
+  case 148:
+#line 657 "rx-parse.y"
+    { id24 (1, 0xdb, 0x00); F ((yyvsp[(1) - (3)].regno), 20, 4); F ((yyvsp[(3) - (3)].regno), 16, 4); }
+    break;
+
+  case 149:
+#line 659 "rx-parse.y"
+    { id24 (1, 0xd0, 0x00); F ((yyvsp[(1) - (6)].regno), 20, 4); F ((yyvsp[(2) - (6)].regno), 12, 2); F ((yyvsp[(5) - (6)].regno), 16, 4); DSP ((yyvsp[(3) - (6)].exp), 14, (yyvsp[(2) - (6)].regno)); }
+    break;
+
+  case 150:
+#line 664 "rx-parse.y"
+    { id24 (1, 0xe0, 0x00); F ((yyvsp[(1) - (9)].regno), 20, 4); FE ((yyvsp[(3) - (9)].exp), 11, 3);
+	      F ((yyvsp[(7) - (9)].regno), 16, 4); DSP ((yyvsp[(5) - (9)].exp), 14, BSIZE); }
+    break;
+
+  case 151:
+#line 670 "rx-parse.y"
+    { id24 (1, 0xe0, 0x0f); FE ((yyvsp[(3) - (9)].exp), 11, 3); F ((yyvsp[(7) - (9)].regno), 16, 4);
+	      DSP ((yyvsp[(5) - (9)].exp), 14, BSIZE); }
+    break;
+
+  case 152:
+#line 676 "rx-parse.y"
+    { id24 (2, 0x00, 0x00); F ((yyvsp[(2) - (4)].regno), 16, 4); F ((yyvsp[(4) - (4)].regno), 20, 4); }
+    break;
+
+  case 153:
+#line 678 "rx-parse.y"
+    { id24 (2, 0x01, 0x00); F ((yyvsp[(2) - (4)].regno), 16, 4); F ((yyvsp[(4) - (4)].regno), 20, 4); }
+    break;
+
+  case 154:
+#line 680 "rx-parse.y"
+    { id24 (2, 0x04, 0x00); F ((yyvsp[(2) - (4)].regno), 16, 4); F ((yyvsp[(4) - (4)].regno), 20, 4); }
+    break;
+
+  case 155:
+#line 682 "rx-parse.y"
+    { id24 (2, 0x05, 0x00); F ((yyvsp[(2) - (4)].regno), 16, 4); F ((yyvsp[(4) - (4)].regno), 20, 4); }
+    break;
+
+  case 156:
+#line 688 "rx-parse.y"
+    { id24 (2, 0x17, 0x00); F ((yyvsp[(2) - (2)].regno), 20, 4); }
+    break;
+
+  case 157:
+#line 690 "rx-parse.y"
+    { id24 (2, 0x17, 0x10); F ((yyvsp[(2) - (2)].regno), 20, 4); }
+    break;
+
+  case 158:
+#line 692 "rx-parse.y"
+    { id24 (2, 0x1f, 0x00); F ((yyvsp[(2) - (2)].regno), 20, 4); }
+    break;
+
+  case 159:
+#line 694 "rx-parse.y"
+    { id24 (2, 0x1f, 0x20); F ((yyvsp[(2) - (2)].regno), 20, 4); }
+    break;
+
+  case 160:
+#line 696 "rx-parse.y"
+    { id24 (2, 0x1f, 0x10); F ((yyvsp[(2) - (2)].regno), 20, 4); }
+    break;
+
+  case 161:
+#line 699 "rx-parse.y"
+    { id24 (2, 0x18, 0x00);
+	    if (rx_uintop ((yyvsp[(3) - (3)].exp), 4) && (yyvsp[(3) - (3)].exp).X_add_number == 1)
+	      ;
+	    else if (rx_uintop ((yyvsp[(3) - (3)].exp), 4) && (yyvsp[(3) - (3)].exp).X_add_number == 2)
+	      F (1, 19, 1);
+	    else
+	      as_bad (_("RACW expects #1 or #2"));}
+    break;
+
+  case 162:
+#line 710 "rx-parse.y"
+    { id24 (2, 0x20, 0); F ((yyvsp[(2) - (8)].regno), 14, 2); F ((yyvsp[(6) - (8)].regno), 16, 4); F ((yyvsp[(3) - (8)].regno), 20, 4); }
+    break;
+
+  case 163:
+#line 712 "rx-parse.y"
+    { id24 (2, 0x24, 0); F ((yyvsp[(2) - (8)].regno), 14, 2); F ((yyvsp[(7) - (8)].regno), 16, 4); F ((yyvsp[(3) - (8)].regno), 20, 4); }
+    break;
+
+  case 164:
+#line 717 "rx-parse.y"
+    { id24 (2, 0x28, 0); F ((yyvsp[(2) - (8)].regno), 14, 2); F ((yyvsp[(4) - (8)].regno), 16, 4); F ((yyvsp[(8) - (8)].regno), 20, 4); }
+    break;
+
+  case 165:
+#line 719 "rx-parse.y"
+    { id24 (2, 0x2c, 0); F ((yyvsp[(2) - (8)].regno), 14, 2); F ((yyvsp[(5) - (8)].regno), 16, 4); F ((yyvsp[(8) - (8)].regno), 20, 4); }
+    break;
+
+  case 166:
+#line 724 "rx-parse.y"
+    { id24 (2, 0x38, 0); F ((yyvsp[(2) - (8)].regno), 15, 1); F ((yyvsp[(4) - (8)].regno), 16, 4); F ((yyvsp[(8) - (8)].regno), 20, 4); }
+    break;
+
+  case 167:
+#line 726 "rx-parse.y"
+    { id24 (2, 0x3c, 0); F ((yyvsp[(2) - (8)].regno), 15, 1); F ((yyvsp[(5) - (8)].regno), 16, 4); F ((yyvsp[(8) - (8)].regno), 20, 4); }
+    break;
+
+  case 168:
+#line 730 "rx-parse.y"
+    { sub_op = 6; }
+    break;
+
+  case 170:
+#line 731 "rx-parse.y"
+    { sub_op = 4; }
+    break;
+
+  case 172:
+#line 732 "rx-parse.y"
+    { sub_op = 5; }
+    break;
+
+  case 174:
+#line 733 "rx-parse.y"
+    { sub_op = 7; }
+    break;
+
+  case 176:
+#line 738 "rx-parse.y"
+    { id24 (2, 0x68, 0x00); F ((yyvsp[(4) - (4)].regno) % 16, 20, 4); F ((yyvsp[(4) - (4)].regno) / 16, 15, 1);
+	    F ((yyvsp[(2) - (4)].regno), 16, 4); }
+    break;
+
+  case 177:
+#line 744 "rx-parse.y"
+    { id24 (2, 0x6a, 0); F ((yyvsp[(2) - (4)].regno), 15, 5); F ((yyvsp[(4) - (4)].regno), 20, 4); }
+    break;
+
+  case 178:
+#line 749 "rx-parse.y"
+    { id24 (2, 0x6e, 0); FE ((yyvsp[(3) - (5)].exp), 15, 5); F ((yyvsp[(5) - (5)].regno), 20, 4); }
+    break;
+
+  case 179:
+#line 751 "rx-parse.y"
+    { id24 (2, 0x6c, 0); FE ((yyvsp[(3) - (5)].exp), 15, 5); F ((yyvsp[(5) - (5)].regno), 20, 4); }
+    break;
+
+  case 180:
+#line 756 "rx-parse.y"
+    { id24 (2, 0x73, 0x00); F ((yyvsp[(5) - (5)].regno), 19, 5); IMM ((yyvsp[(3) - (5)].exp), 12); }
+    break;
+
+  case 181:
+#line 761 "rx-parse.y"
+    { id24 (2, 0xe0, 0x00); F ((yyvsp[(1) - (5)].regno), 16, 4); FE ((yyvsp[(3) - (5)].exp), 11, 5);
+	      F ((yyvsp[(5) - (5)].regno), 20, 4); }
+    break;
+
+  case 182:
+#line 767 "rx-parse.y"
+    { id24 (2, 0xe0, 0xf0); FE ((yyvsp[(3) - (5)].exp), 11, 5); F ((yyvsp[(5) - (5)].regno), 20, 4); }
+    break;
+
+  case 183:
+#line 772 "rx-parse.y"
+    { id24 (3, 0x00, 0); F ((yyvsp[(2) - (9)].regno), 10, 2); F ((yyvsp[(6) - (9)].regno), 12, 4); F ((yyvsp[(8) - (9)].regno), 16, 4); F ((yyvsp[(3) - (9)].regno), 20, 4); }
+    break;
+
+  case 184:
+#line 775 "rx-parse.y"
+    { id24 (3, 0x40, 0); F ((yyvsp[(2) - (9)].regno), 10, 2); F ((yyvsp[(4) - (9)].regno), 12, 4); F ((yyvsp[(6) - (9)].regno), 16, 4); F ((yyvsp[(9) - (9)].regno), 20, 4); }
+    break;
+
+  case 185:
+#line 778 "rx-parse.y"
+    { id24 (3, 0xc0, 0); F ((yyvsp[(2) - (9)].regno), 10, 2); F ((yyvsp[(4) - (9)].regno), 12, 4); F ((yyvsp[(6) - (9)].regno), 16, 4); F ((yyvsp[(9) - (9)].regno), 20, 4); }
+    break;
+
+  case 186:
+#line 782 "rx-parse.y"
+    { sub_op = 0; }
+    break;
+
+  case 188:
+#line 783 "rx-parse.y"
+    { sub_op = 2; }
+    break;
+
+  case 190:
+#line 784 "rx-parse.y"
+    { sub_op = 3; }
+    break;
+
+  case 192:
+#line 785 "rx-parse.y"
+    { sub_op = 4; }
+    break;
+
+  case 194:
+#line 786 "rx-parse.y"
+    { sub_op = 5; }
+    break;
+
+  case 196:
+#line 792 "rx-parse.y"
+    { id24 (2, 0x70, 0x20); F ((yyvsp[(5) - (5)].regno), 20, 4); NBIMM ((yyvsp[(3) - (5)].exp), 12); }
+    break;
+
+  case 197:
+#line 802 "rx-parse.y"
+    { B2 (0x43 + (sub_op<<2), 0); F ((yyvsp[(1) - (3)].regno), 8, 4); F ((yyvsp[(3) - (3)].regno), 12, 4); }
+    break;
+
+  case 198:
+#line 804 "rx-parse.y"
+    { B2 (0x40 + (sub_op<<2), 0); F ((yyvsp[(3) - (7)].regno), 8, 4); F ((yyvsp[(7) - (7)].regno), 12, 4); DSP ((yyvsp[(1) - (7)].exp), 6, BSIZE); }
+    break;
+
+  case 199:
+#line 806 "rx-parse.y"
+    { B3 (MEMEX, sub_op<<2, 0); F ((yyvsp[(5) - (7)].regno), 8, 2); F ((yyvsp[(3) - (7)].regno), 16, 4); F ((yyvsp[(7) - (7)].regno), 20, 4); DSP ((yyvsp[(1) - (7)].exp), 14, sizemap[(yyvsp[(5) - (7)].regno)]); }
+    break;
+
+  case 200:
+#line 808 "rx-parse.y"
+    { id24 (4, sub_op<<4, 0), F ((yyvsp[(5) - (5)].regno), 12, 4), F ((yyvsp[(1) - (5)].regno), 16, 4), F ((yyvsp[(3) - (5)].regno), 20, 4); }
+    break;
+
+  case 201:
+#line 815 "rx-parse.y"
+    { id24 (1, 0x03 + (sub_op<<2), 0x00); F ((yyvsp[(1) - (3)].regno), 16, 4); F ((yyvsp[(3) - (3)].regno), 20, 4); }
+    break;
+
+  case 202:
+#line 817 "rx-parse.y"
+    { id24 (1, 0x00 + (sub_op<<2), 0x00); F ((yyvsp[(3) - (7)].regno), 16, 4); F ((yyvsp[(7) - (7)].regno), 20, 4); DSP ((yyvsp[(1) - (7)].exp), 14, BSIZE); }
+    break;
+
+  case 203:
+#line 819 "rx-parse.y"
+    { B4 (MEMEX, 0x20 + ((yyvsp[(5) - (7)].regno) << 6), 0x00 + sub_op, 0x00);
+	  F ((yyvsp[(3) - (7)].regno), 24, 4); F ((yyvsp[(7) - (7)].regno), 28, 4); DSP ((yyvsp[(1) - (7)].exp), 14, sizemap[(yyvsp[(5) - (7)].regno)]); }
+    break;
+
+  case 204:
+#line 825 "rx-parse.y"
+    { id24 (2, 0x70, sub_op<<4); F ((yyvsp[(4) - (4)].regno), 20, 4); IMM ((yyvsp[(2) - (4)].exp), 12); }
+    break;
+
+  case 208:
+#line 836 "rx-parse.y"
+    { B2 (0x7e, sub_op2 << 4); F ((yyvsp[(1) - (1)].regno), 12, 4); }
+    break;
+
+  case 209:
+#line 842 "rx-parse.y"
+    { id24 (1, 0x03 + (sub_op<<2), 0); F ((yyvsp[(1) - (3)].regno), 16, 4); F ((yyvsp[(3) - (3)].regno), 20, 4); }
+    break;
+
+  case 210:
+#line 844 "rx-parse.y"
+    { id24 (1, 0x00 + (sub_op<<2), 0); F ((yyvsp[(3) - (7)].regno), 16, 4); F ((yyvsp[(7) - (7)].regno), 20, 4); DSP ((yyvsp[(1) - (7)].exp), 14, BSIZE); }
+    break;
+
+  case 211:
+#line 846 "rx-parse.y"
+    { B4 (MEMEX, 0x20, 0x00 + sub_op, 0); F ((yyvsp[(5) - (7)].regno), 8, 2); F ((yyvsp[(3) - (7)].regno), 24, 4); F ((yyvsp[(7) - (7)].regno), 28, 4);
+	    DSP ((yyvsp[(1) - (7)].exp), 14, sizemap[(yyvsp[(5) - (7)].regno)]); }
+    break;
+
+  case 212:
+#line 853 "rx-parse.y"
+    { id24 (2, 0x60 + sub_op, 0); F ((yyvsp[(1) - (3)].regno), 16, 4); F ((yyvsp[(3) - (3)].regno), 20, 4); }
+    break;
+
+  case 213:
+#line 857 "rx-parse.y"
+    { B2 (0x68 + (sub_op<<1), 0); FE ((yyvsp[(2) - (4)].exp), 7, 5); F ((yyvsp[(4) - (4)].regno), 12, 4); }
+    break;
+
+  case 214:
+#line 859 "rx-parse.y"
+    { id24 (2, 0x80 + (sub_op << 5), 0); FE ((yyvsp[(2) - (6)].exp), 11, 5); F ((yyvsp[(4) - (6)].regno), 16, 4); F ((yyvsp[(6) - (6)].regno), 20, 4); }
+    break;
+
+  case 216:
+#line 867 "rx-parse.y"
+    { id24 (2, 0x72, sub_op << 4); F ((yyvsp[(4) - (4)].regno), 20, 4); O4 ((yyvsp[(2) - (4)].exp)); }
+    break;
+
+  case 218:
+#line 872 "rx-parse.y"
+    { id24 (1, 0x83 + (sub_op << 2), 0); F ((yyvsp[(1) - (3)].regno), 16, 4); F ((yyvsp[(3) - (3)].regno), 20, 4); }
+    break;
+
+  case 219:
+#line 874 "rx-parse.y"
+    { id24 (1, 0x80 + (sub_op << 2), 0); F ((yyvsp[(3) - (7)].regno), 16, 4); F ((yyvsp[(7) - (7)].regno), 20, 4); DSP ((yyvsp[(1) - (7)].exp), 14, LSIZE); }
+    break;
+
+  case 220:
+#line 879 "rx-parse.y"
+    { (yyval.exp) = zero_expr (); }
+    break;
+
+  case 221:
+#line 880 "rx-parse.y"
+    { (yyval.exp) = (yyvsp[(1) - (1)].exp); }
+    break;
+
+  case 222:
+#line 883 "rx-parse.y"
+    { need_flag = 1; }
+    break;
+
+  case 223:
+#line 883 "rx-parse.y"
+    { need_flag = 0; (yyval.regno) = (yyvsp[(2) - (2)].regno); }
+    break;
+
+  case 224:
+#line 888 "rx-parse.y"
+    { (yyval.regno) = 0; }
+    break;
+
+  case 225:
+#line 889 "rx-parse.y"
+    { (yyval.regno) = 1; }
+    break;
+
+  case 226:
+#line 890 "rx-parse.y"
+    { (yyval.regno) = 2; }
+    break;
+
+  case 227:
+#line 891 "rx-parse.y"
+    { (yyval.regno) = 2; }
+    break;
+
+  case 228:
+#line 892 "rx-parse.y"
+    { (yyval.regno) = 3; }
+    break;
+
+  case 229:
+#line 895 "rx-parse.y"
+    { (yyval.regno) = LSIZE; }
+    break;
+
+  case 230:
+#line 896 "rx-parse.y"
+    { (yyval.regno) = BSIZE; }
+    break;
+
+  case 231:
+#line 897 "rx-parse.y"
+    { (yyval.regno) = WSIZE; }
+    break;
+
+  case 232:
+#line 898 "rx-parse.y"
+    { (yyval.regno) = LSIZE; }
+    break;
+
+  case 233:
+#line 901 "rx-parse.y"
+    { (yyval.regno) = 1; }
+    break;
+
+  case 234:
+#line 902 "rx-parse.y"
+    { (yyval.regno) = 0; }
+    break;
+
+  case 235:
+#line 903 "rx-parse.y"
+    { (yyval.regno) = 1; }
+    break;
+
+  case 236:
+#line 906 "rx-parse.y"
+    {}
+    break;
+
+  case 237:
+#line 907 "rx-parse.y"
+    {}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 3269 "rx-parse.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+#line 910 "rx-parse.y"
+
+/* ====================================================================== */
+
+static struct
+{
+  const char * string;
+  int          token;
+  int          val;
+}
+token_table[] =
+{
+  { "r0", REG, 0 },
+  { "r1", REG, 1 },
+  { "r2", REG, 2 },
+  { "r3", REG, 3 },
+  { "r4", REG, 4 },
+  { "r5", REG, 5 },
+  { "r6", REG, 6 },
+  { "r7", REG, 7 },
+  { "r8", REG, 8 },
+  { "r9", REG, 9 },
+  { "r10", REG, 10 },
+  { "r11", REG, 11 },
+  { "r12", REG, 12 },
+  { "r13", REG, 13 },
+  { "r14", REG, 14 },
+  { "r15", REG, 15 },
+
+  { "psw", CREG, 0 },
+  { "pc", CREG, 1 },
+  { "usp", CREG, 2 },
+  { "fpsw", CREG, 3 },
+  /* reserved */
+  /* reserved */
+  /* reserved */
+  { "wr", CREG, 7 },
+
+  { "bpsw", CREG, 8 },
+  { "bpc", CREG, 9 },
+  { "isp", CREG, 10 },
+  { "fintv", CREG, 11 },
+  { "intb", CREG, 12 },
+
+  { "pbp", CREG, 16 },
+  { "pben", CREG, 17 },
+
+  { "bbpsw", CREG, 24 },
+  { "bbpc", CREG, 25 },
+
+  { ".s", DOT_S, 0 },
+  { ".b", DOT_B, 0 },
+  { ".w", DOT_W, 0 },
+  { ".l", DOT_L, 0 },
+  { ".a", DOT_A , 0},
+  { ".ub", DOT_UB, 0 },
+  { ".uw", DOT_UW , 0},
+
+  { "c", FLAG, 0 },
+  { "z", FLAG, 1 },
+  { "s", FLAG, 2 },
+  { "o", FLAG, 3 },
+  { "i", FLAG, 8 },
+  { "u", FLAG, 9 },
+
+#define OPC(x) { #x, x, IS_OPCODE }
+  OPC(ABS),
+  OPC(ADC),
+  OPC(ADD),
+  { "and", AND_, IS_OPCODE },
+  OPC(BCLR),
+  OPC(BCND),
+  OPC(BMCND),
+  OPC(BNOT),
+  OPC(BRA),
+  OPC(BRK),
+  OPC(BSET),
+  OPC(BSR),
+  OPC(BTST),
+  OPC(CLRPSW),
+  OPC(CMP),
+  OPC(DBT),
+  OPC(DIV),
+  OPC(DIVU),
+  OPC(EDIV),
+  OPC(EDIVU),
+  OPC(EMUL),
+  OPC(EMULU),
+  OPC(FADD),
+  OPC(FCMP),
+  OPC(FDIV),
+  OPC(FMUL),
+  OPC(FREIT),
+  OPC(FSUB),
+  OPC(FTOI),
+  OPC(INT),
+  OPC(ITOF),
+  OPC(JMP),
+  OPC(JSR),
+  OPC(MVFACHI),
+  OPC(MVFACMI),
+  OPC(MVFACLO),
+  OPC(MVFC),
+  OPC(MVTACHI),
+  OPC(MVTACLO),
+  OPC(MVTC),
+  OPC(MVTIPL),
+  OPC(MACHI),
+  OPC(MACLO),
+  OPC(MAX),
+  OPC(MIN),
+  OPC(MOV),
+  OPC(MOVU),
+  OPC(MUL),
+  OPC(MULHI),
+  OPC(MULLO),
+  OPC(MULU),
+  OPC(NEG),
+  OPC(NOP),
+  OPC(NOT),
+  OPC(OR),
+  OPC(POP),
+  OPC(POPC),
+  OPC(POPM),
+  OPC(PUSH),
+  OPC(PUSHA),
+  OPC(PUSHC),
+  OPC(PUSHM),
+  OPC(RACW),
+  OPC(REIT),
+  OPC(REVL),
+  OPC(REVW),
+  OPC(RMPA),
+  OPC(ROLC),
+  OPC(RORC),
+  OPC(ROTL),
+  OPC(ROTR),
+  OPC(ROUND),
+  OPC(RTE),
+  OPC(RTFI),
+  OPC(RTS),
+  OPC(RTSD),
+  OPC(SAT),
+  OPC(SATR),
+  OPC(SBB),
+  OPC(SCCND),
+  OPC(SCMPU),
+  OPC(SETPSW),
+  OPC(SHAR),
+  OPC(SHLL),
+  OPC(SHLR),
+  OPC(SMOVB),
+  OPC(SMOVF),
+  OPC(SMOVU),
+  OPC(SSTR),
+  OPC(STNZ),
+  OPC(STOP),
+  OPC(STZ),
+  OPC(SUB),
+  OPC(SUNTIL),
+  OPC(SWHILE),
+  OPC(TST),
+  OPC(WAIT),
+  OPC(XCHG),
+  OPC(XOR),
+};
+
+#define NUM_TOKENS (sizeof (token_table) / sizeof (token_table[0]))
+
+static struct
+{
+  char * string;
+  int    token;
+}
+condition_opcode_table[] =
+{
+  { "b", BCND },
+  { "bm", BMCND },
+  { "sc", SCCND },
+};
+
+#define NUM_CONDITION_OPCODES (sizeof (condition_opcode_table) / sizeof (condition_opcode_table[0]))
+
+static struct
+{
+  char * string;
+  int    val;
+}
+condition_table[] =
+{
+  { "z", 0 },
+  { "eq", 0 },
+  { "geu",  2 },
+  { "c",  2 },
+  { "gtu", 4 },
+  { "pz", 6 },
+  { "ge", 8 },
+  { "gt", 10 },
+  { "o",  12},
+  /* always = 14 */
+  { "nz", 1 },
+  { "ne", 1 },
+  { "ltu", 3 },
+  { "nc", 3 },
+  { "leu", 5 },
+  { "n", 7 },
+  { "lt", 9 },
+  { "le", 11 },
+  { "no", 13 }
+  /* never = 15 */
+};
+
+#define NUM_CONDITIONS (sizeof (condition_table) / sizeof (condition_table[0]))
+
+void
+rx_lex_init (char * beginning, char * ending)
+{
+  rx_init_start = beginning;
+  rx_lex_start = beginning;
+  rx_lex_end = ending;
+  rx_in_brackets = 0;
+  rx_last_token = 0;
+
+  setbuf (stdout, 0);
+}
+
+static int
+check_condition (char * base)
+{
+  char * cp;
+  unsigned int i;
+
+  if ((unsigned) (rx_lex_end - rx_lex_start) < strlen (base) + 1)
+    return 0;
+  if (memcmp (rx_lex_start, base, strlen (base)))
+    return 0;
+  cp = rx_lex_start + strlen (base);
+  for (i = 0; i < NUM_CONDITIONS; i ++)
+    {
+      if (strcasecmp (cp, condition_table[i].string) == 0)
+	{
+	  rx_lval.regno = condition_table[i].val;
+	  return 1;
+	}
+    }
+  return 0;
+}
+
+static int
+rx_lex (void)
+{
+  unsigned int ci;
+  char * save_input_pointer;
+
+  while (ISSPACE (*rx_lex_start)
+	 && rx_lex_start != rx_lex_end)
+    rx_lex_start ++;
+
+  rx_last_exp_start = rx_lex_start;
+
+  if (rx_lex_start == rx_lex_end)
+    return 0;
+
+  if (ISALPHA (*rx_lex_start)
+      || (*rx_lex_start == '.' && ISALPHA (rx_lex_start[1])))
+    {
+      unsigned int i;
+      char * e;
+      char save;
+
+      for (e = rx_lex_start + 1;
+	   e < rx_lex_end && ISALNUM (*e);
+	   e ++)
+	;
+      save = *e;
+      *e = 0;
+
+      if (rx_last_token == 0)
+	for (ci = 0; ci < NUM_CONDITION_OPCODES; ci ++)
+	  if (check_condition (condition_opcode_table[ci].string))
+	    {
+	      *e = save;
+	      rx_lex_start = e;
+	      rx_last_token = condition_opcode_table[ci].token;
+	      return condition_opcode_table[ci].token;
+	    }
+
+      for (i = 0; i < NUM_TOKENS; i++)
+	if (strcasecmp (rx_lex_start, token_table[i].string) == 0
+	    && !(token_table[i].val == IS_OPCODE && rx_last_token != 0)
+	    && !(token_table[i].token == FLAG && !need_flag))
+	  {
+	    rx_lval.regno = token_table[i].val;
+	    *e = save;
+	    rx_lex_start = e;
+	    rx_last_token = token_table[i].token;
+	    return token_table[i].token;
+	  }
+      *e = save;
+    }
+
+  if (rx_last_token == 0)
+    {
+      rx_last_token = UNKNOWN_OPCODE;
+      return UNKNOWN_OPCODE;
+    }
+
+  if (rx_last_token == UNKNOWN_OPCODE)
+    return 0;
+
+  if (*rx_lex_start == '[')
+    rx_in_brackets = 1;
+  if (*rx_lex_start == ']')
+    rx_in_brackets = 0;
+
+  if (rx_in_brackets
+      || rx_last_token == REG
+      || strchr ("[],#", *rx_lex_start))
+    {
+      rx_last_token = *rx_lex_start;
+      return *rx_lex_start ++;
+    }
+
+  save_input_pointer = input_line_pointer;
+  input_line_pointer = rx_lex_start;
+  rx_lval.exp.X_md = 0;
+  expression (&rx_lval.exp);
+
+  /* We parse but ignore any :<size> modifier on expressions.  */
+  if (*input_line_pointer == ':')
+    {
+      char *cp;
+
+      for (cp  = input_line_pointer + 1; *cp && cp < rx_lex_end; cp++)
+	if (!ISDIGIT (*cp))
+	  break;
+      if (cp > input_line_pointer+1)
+	input_line_pointer = cp;
+    }
+
+  rx_lex_start = input_line_pointer;
+  input_line_pointer = save_input_pointer;
+  rx_last_token = EXPR;
+  return EXPR;
+}
+
+int
+rx_error (char * str)
+{
+  int len;
+
+  len = rx_last_exp_start - rx_init_start;
+
+  as_bad ("%s", rx_init_start);
+  as_bad ("%*s^ %s", len, "", str);
+  return 0;
+}
+
+static int
+rx_intop (expressionS exp, int nbits)
+{
+  long v;
+
+  if (exp.X_op == O_big && nbits == 32)
+      return 1;
+  if (exp.X_op != O_constant)
+    return 0;
+  v = exp.X_add_number;
+
+  switch (nbits)
+    {
+    case 4:
+      return -0x8 <= v && v <= 0x7;
+    case 5:
+      return -0x10 <= v && v <= 0x17;
+    case 8:
+      return -0x80 <= v && v <= 0x7f;
+    case 16:
+      return -0x8000 <= v && v <= 0x7fff;
+    case 24:
+      return -0x800000 <= v && v <= 0x7fffff;
+    case 32:
+      return 1;
+    default:
+      printf ("rx_intop passed %d\n", nbits);
+      abort ();
+    }
+  return 1;
+}
+
+static int
+rx_uintop (expressionS exp, int nbits)
+{
+  unsigned long v;
+
+  if (exp.X_op != O_constant)
+    return 0;
+  v = exp.X_add_number;
+
+  switch (nbits)
+    {
+    case 4:
+      return v <= 0xf;
+    case 8:
+      return v <= 0xff;
+    case 16:
+      return v <= 0xffff;
+    case 24:
+      return v <= 0xffffff;
+    default:
+      printf ("rx_uintop passed %d\n", nbits);
+      abort ();
+    }
+  return 1;
+}
+
+static int
+rx_disp3op (expressionS exp)
+{
+  unsigned long v;
+
+  if (exp.X_op != O_constant)
+    return 0;
+  v = exp.X_add_number;
+  if (v < 3 || v > 10)
+    return 0;
+  return 1;
+}
+
+static int
+rx_disp5op (expressionS * exp, int msize)
+{
+  long v;
+
+  if (exp->X_op != O_constant)
+    return 0;
+  v = exp->X_add_number;
+
+  switch (msize)
+    {
+    case BSIZE:
+      if (0 < v && v <= 31)
+	return 1;
+      break;
+    case WSIZE:
+      if (v & 1)
+	return 0;
+      if (0 < v && v <= 63)
+	{
+	  exp->X_add_number >>= 1;
+	  return 1;
+	}
+      break;
+    case LSIZE:
+      if (v & 3)
+	return 0;
+      if (0 < v && v <= 127)
+	{
+	  exp->X_add_number >>= 2;
+	  return 1;
+	}
+      break;
+    }
+  return 0;
+}
+
+/* Just like the above, but allows a zero displacement.  */
+
+static int
+rx_disp5op0 (expressionS * exp, int msize)
+{
+  if (exp->X_op != O_constant)
+    return 0;
+  if (exp->X_add_number == 0)
+    return 1;
+  return rx_disp5op (exp, msize);
+}
+
+static int
+exp_val (expressionS exp)
+{
+  if (exp.X_op != O_constant)
+  {
+    rx_error (_("constant expected"));
+    return 0;
+  }
+  return exp.X_add_number;
+}
+
+static expressionS
+zero_expr (void)
+{
+  /* Static, so program load sets it to all zeros, which is what we want.  */
+  static expressionS zero;
+  zero.X_op = O_constant;
+  return zero;
+}
+
+static int
+immediate (expressionS exp, int type, int pos)
+{
+  /* We will emit constants ourself here, so negate them.  */
+  if (type == RXREL_NEGATIVE && exp.X_op == O_constant)
+    exp.X_add_number = - exp.X_add_number;
+  if (type == RXREL_NEGATIVE_BORROW)
+    {
+      if (exp.X_op == O_constant)
+	exp.X_add_number = - exp.X_add_number - 1;
+      else
+	rx_error (_("sbb cannot use symbolic immediates"));
+    }
+
+  if (rx_intop (exp, 8))
+    {
+      rx_op (exp, 1, type);
+      return 1;
+    }
+  else if (rx_intop (exp, 16))
+    {
+      rx_op (exp, 2, type);
+      return 2;
+    }
+  else if (rx_intop (exp, 24))
+    {
+      rx_op (exp, 3, type);
+      return 3;
+    }
+  else if (rx_intop (exp, 32))
+    {
+      rx_op (exp, 4, type);
+      return 0;
+    }
+  else if (type == RXREL_SIGNED)
+    {
+      /* This is a symbolic immediate, we will relax it later.  */
+      rx_relax (RX_RELAX_IMM, pos);
+      rx_op (exp, linkrelax ? 4 : 1, type);
+      return 1;
+    }
+  else
+    {
+      /* Let the linker deal with it.  */
+      rx_op (exp, 4, type);
+      return 0;
+    }
+}
+
+static int
+displacement (expressionS exp, int msize)
+{
+  int val;
+  int vshift = 0;
+
+  if (exp.X_op == O_symbol
+      && exp.X_md)
+    {
+      switch (exp.X_md)
+	{
+	case BFD_RELOC_GPREL16:
+	  switch (msize)
+	    {
+	    case BSIZE:
+	      exp.X_md = BFD_RELOC_RX_GPRELB;
+	      break;
+	    case WSIZE:
+	      exp.X_md = BFD_RELOC_RX_GPRELW;
+	      break;
+	    case LSIZE:
+	      exp.X_md = BFD_RELOC_RX_GPRELL;
+	      break;
+	    }
+	  O2 (exp);
+	  return 2;
+	}
+    }
+
+  if (exp.X_op != O_constant)
+    {
+      rx_error (_("displacements must be constants"));
+      return -1;
+    }
+  val = exp.X_add_number;
+
+  if (val == 0)
+    return 0;
+
+  switch (msize)
+    {
+    case BSIZE:
+      break;
+    case WSIZE:
+      if (val & 1)
+	rx_error (_("word displacement not word-aligned"));
+      vshift = 1;
+      break;
+    case LSIZE:
+      if (val & 3)
+	rx_error (_("long displacement not long-aligned"));
+      vshift = 2;
+      break;
+    default:
+      as_bad (_("displacement with unknown size (internal bug?)\n"));
+      break;
+    }
+
+  val >>= vshift;
+  exp.X_add_number = val;
+
+  if (0 <= val && val <= 255 )
+    {
+      O1 (exp);
+      return 1;
+    }
+
+  if (0 <= val && val <= 65535)
+    {
+      O2 (exp);
+      return 2;
+    }
+  if (val < 0)
+    rx_error (_("negative displacements not allowed"));
+  else
+    rx_error (_("displacement too large"));
+  return -1;
+}
+
+static void
+rtsd_immediate (expressionS exp)
+{
+  int val;
+
+  if (exp.X_op != O_constant)
+    {
+      rx_error (_("rtsd size must be constant"));
+      return;
+    }
+  val = exp.X_add_number;
+  if (val & 3)
+    rx_error (_("rtsd size must be multiple of 4"));
+
+  if (val < 0 || val > 1020)
+    rx_error (_("rtsd size must be 0..1020"));
+
+  val >>= 2;
+  exp.X_add_number = val;
+  O1 (exp);
+}
+
diff --git a/gas/rx-parse.h b/gas/rx-parse.h
new file mode 100644
index 0000000000..b57b1d4b66
--- /dev/null
+++ b/gas/rx-parse.h
@@ -0,0 +1,289 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program 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.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     REG = 258,
+     FLAG = 259,
+     CREG = 260,
+     EXPR = 261,
+     UNKNOWN_OPCODE = 262,
+     IS_OPCODE = 263,
+     DOT_S = 264,
+     DOT_B = 265,
+     DOT_W = 266,
+     DOT_L = 267,
+     DOT_A = 268,
+     DOT_UB = 269,
+     DOT_UW = 270,
+     ABS = 271,
+     ADC = 272,
+     ADD = 273,
+     AND_ = 274,
+     BCLR = 275,
+     BCND = 276,
+     BMCND = 277,
+     BNOT = 278,
+     BRA = 279,
+     BRK = 280,
+     BSET = 281,
+     BSR = 282,
+     BTST = 283,
+     CLRPSW = 284,
+     CMP = 285,
+     DBT = 286,
+     DIV = 287,
+     DIVU = 288,
+     EDIV = 289,
+     EDIVU = 290,
+     EMUL = 291,
+     EMULU = 292,
+     FADD = 293,
+     FCMP = 294,
+     FDIV = 295,
+     FMUL = 296,
+     FREIT = 297,
+     FSUB = 298,
+     FTOI = 299,
+     INT = 300,
+     ITOF = 301,
+     JMP = 302,
+     JSR = 303,
+     MACHI = 304,
+     MACLO = 305,
+     MAX = 306,
+     MIN = 307,
+     MOV = 308,
+     MOVU = 309,
+     MUL = 310,
+     MULHI = 311,
+     MULLO = 312,
+     MULU = 313,
+     MVFACHI = 314,
+     MVFACMI = 315,
+     MVFACLO = 316,
+     MVFC = 317,
+     MVTACHI = 318,
+     MVTACLO = 319,
+     MVTC = 320,
+     MVTIPL = 321,
+     NEG = 322,
+     NOP = 323,
+     NOT = 324,
+     OR = 325,
+     POP = 326,
+     POPC = 327,
+     POPM = 328,
+     PUSH = 329,
+     PUSHA = 330,
+     PUSHC = 331,
+     PUSHM = 332,
+     RACW = 333,
+     REIT = 334,
+     REVL = 335,
+     REVW = 336,
+     RMPA = 337,
+     ROLC = 338,
+     RORC = 339,
+     ROTL = 340,
+     ROTR = 341,
+     ROUND = 342,
+     RTE = 343,
+     RTFI = 344,
+     RTS = 345,
+     RTSD = 346,
+     SAT = 347,
+     SATR = 348,
+     SBB = 349,
+     SCCND = 350,
+     SCMPU = 351,
+     SETPSW = 352,
+     SHAR = 353,
+     SHLL = 354,
+     SHLR = 355,
+     SMOVB = 356,
+     SMOVF = 357,
+     SMOVU = 358,
+     SSTR = 359,
+     STNZ = 360,
+     STOP = 361,
+     STZ = 362,
+     SUB = 363,
+     SUNTIL = 364,
+     SWHILE = 365,
+     TST = 366,
+     WAIT = 367,
+     XCHG = 368,
+     XOR = 369
+   };
+#endif
+/* Tokens.  */
+#define REG 258
+#define FLAG 259
+#define CREG 260
+#define EXPR 261
+#define UNKNOWN_OPCODE 262
+#define IS_OPCODE 263
+#define DOT_S 264
+#define DOT_B 265
+#define DOT_W 266
+#define DOT_L 267
+#define DOT_A 268
+#define DOT_UB 269
+#define DOT_UW 270
+#define ABS 271
+#define ADC 272
+#define ADD 273
+#define AND_ 274
+#define BCLR 275
+#define BCND 276
+#define BMCND 277
+#define BNOT 278
+#define BRA 279
+#define BRK 280
+#define BSET 281
+#define BSR 282
+#define BTST 283
+#define CLRPSW 284
+#define CMP 285
+#define DBT 286
+#define DIV 287
+#define DIVU 288
+#define EDIV 289
+#define EDIVU 290
+#define EMUL 291
+#define EMULU 292
+#define FADD 293
+#define FCMP 294
+#define FDIV 295
+#define FMUL 296
+#define FREIT 297
+#define FSUB 298
+#define FTOI 299
+#define INT 300
+#define ITOF 301
+#define JMP 302
+#define JSR 303
+#define MACHI 304
+#define MACLO 305
+#define MAX 306
+#define MIN 307
+#define MOV 308
+#define MOVU 309
+#define MUL 310
+#define MULHI 311
+#define MULLO 312
+#define MULU 313
+#define MVFACHI 314
+#define MVFACMI 315
+#define MVFACLO 316
+#define MVFC 317
+#define MVTACHI 318
+#define MVTACLO 319
+#define MVTC 320
+#define MVTIPL 321
+#define NEG 322
+#define NOP 323
+#define NOT 324
+#define OR 325
+#define POP 326
+#define POPC 327
+#define POPM 328
+#define PUSH 329
+#define PUSHA 330
+#define PUSHC 331
+#define PUSHM 332
+#define RACW 333
+#define REIT 334
+#define REVL 335
+#define REVW 336
+#define RMPA 337
+#define ROLC 338
+#define RORC 339
+#define ROTL 340
+#define ROTR 341
+#define ROUND 342
+#define RTE 343
+#define RTFI 344
+#define RTS 345
+#define RTSD 346
+#define SAT 347
+#define SATR 348
+#define SBB 349
+#define SCCND 350
+#define SCMPU 351
+#define SETPSW 352
+#define SHAR 353
+#define SHLL 354
+#define SHLR 355
+#define SMOVB 356
+#define SMOVF 357
+#define SMOVU 358
+#define SSTR 359
+#define STNZ 360
+#define STOP 361
+#define STZ 362
+#define SUB 363
+#define SUNTIL 364
+#define SWHILE 365
+#define TST 366
+#define WAIT 367
+#define XCHG 368
+#define XOR 369
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 130 "rx-parse.y"
+{
+  int regno;
+  expressionS exp;
+}
+/* Line 1529 of yacc.c.  */
+#line 282 "rx-parse.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+extern YYSTYPE rx_lval;
+
diff --git a/gas/struc-symbol.h b/gas/struc-symbol.h
index 1dbb9d2c35..e31703b68f 100644
--- a/gas/struc-symbol.h
+++ b/gas/struc-symbol.h
@@ -22,22 +22,33 @@
 #ifndef __struc_symbol_h__
 #define __struc_symbol_h__
 
-struct symbol_flags
+/* The information we keep for a symbol.  Note that the symbol table
+   holds pointers both to this and to local_symbol structures.  See
+   below.  */
+
+struct symbol
 {
-  /* Wether the symbol is a local_symbol.  */
-  unsigned int sy_local_symbol : 1;
+  /* BFD symbol */
+  asymbol *bsym;
 
-  /* Wether symbol has been written.  */
-  unsigned int sy_written : 1;
+  /* The value of the symbol.  */
+  expressionS sy_value;
 
+  /* Forwards and (optionally) backwards chain pointers.  */
+  struct symbol *sy_next;
+  struct symbol *sy_previous;
+
+  /* Pointer to the frag this symbol is attached to, if any.
+     Otherwise, NULL.  */
+  struct frag *sy_frag;
+
+  unsigned int written : 1;
   /* Whether symbol value has been completely resolved (used during
      final pass over symbol table).  */
   unsigned int sy_resolved : 1;
-
   /* Whether the symbol value is currently being resolved (used to
      detect loops in symbol dependencies).  */
   unsigned int sy_resolving : 1;
-
   /* Whether the symbol value is used in a reloc.  This is used to
      ensure that symbols used in relocs are written out, even if they
      are local and would otherwise not be.  */
@@ -69,30 +80,6 @@ struct symbol_flags
      before.  It is cleared as soon as any direct reference to the
      symbol is present.  */
   unsigned int sy_weakrefd : 1;
-};
-
-/* The information we keep for a symbol.  Note that the symbol table
-   holds pointers both to this and to local_symbol structures.  See
-   below.  */
-
-struct symbol
-{
-  /* Symbol flags.  */
-  struct symbol_flags sy_flags;
-
-  /* BFD symbol */
-  asymbol *bsym;
-
-  /* The value of the symbol.  */
-  expressionS sy_value;
-
-  /* Forwards and (optionally) backwards chain pointers.  */
-  struct symbol *sy_next;
-  struct symbol *sy_previous;
-
-  /* Pointer to the frag this symbol is attached to, if any.
-     Otherwise, NULL.  */
-  struct frag *sy_frag;
 
 #ifdef OBJ_SYMFIELD_TYPE
   OBJ_SYMFIELD_TYPE sy_obj;
@@ -120,8 +107,9 @@ struct symbol
 
 struct local_symbol
 {
-  /* Symbol flags.  Only sy_local_symbol and sy_resolved are relevant.  */
-  struct symbol_flags lsy_flags;
+  /* This pointer is always NULL to indicate that this is a local
+     symbol.  */
+  asymbol *lsy_marker;
 
   /* The symbol section.  This also serves as a flag.  If this is
      reg_section, then this symbol has been converted into a regular
@@ -132,7 +120,8 @@ struct local_symbol
   const char *lsy_name;
 
   /* The symbol frag or the real symbol, depending upon the value in
-     lsy_section.  */
+     lsy_section.  If the symbol has been fully resolved, lsy_frag is
+     set to NULL.  */
   union
   {
     fragS *lsy_frag;
@@ -149,8 +138,8 @@ struct local_symbol
 
 #define local_symbol_converted_p(l) ((l)->lsy_section == reg_section)
 #define local_symbol_mark_converted(l) ((l)->lsy_section = reg_section)
-#define local_symbol_resolved_p(l) ((l)->lsy_flags.sy_resolved)
-#define local_symbol_mark_resolved(l) ((l)->lsy_flags.sy_resolved = 1)
+#define local_symbol_resolved_p(l) ((l)->u.lsy_frag == NULL)
+#define local_symbol_mark_resolved(l) ((l)->u.lsy_frag = NULL)
 #define local_symbol_get_frag(l) ((l)->u.lsy_frag)
 #define local_symbol_set_frag(l, f) ((l)->u.lsy_frag = (f))
 #define local_symbol_get_real_symbol(l) ((l)->u.lsy_sym)
diff --git a/gas/symbols.c b/gas/symbols.c
index 679534d48a..086e01d6a5 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -180,7 +180,7 @@ static unsigned long local_symbol_conversion_count;
    changes its argument to the real symbol.  */
 
 #define LOCAL_SYMBOL_CHECK(s)						\
-  (s->sy_flags.sy_local_symbol 						\
+  (s->bsym == NULL							\
    ? (local_symbol_converted_p ((struct local_symbol *) s)		\
       ? (s = local_symbol_get_real_symbol ((struct local_symbol *) s),	\
 	 0)								\
@@ -200,8 +200,7 @@ local_symbol_make (const char *name, segT section, valueT val, fragS *frag)
   name_copy = save_symbol_name (name);
 
   ret = (struct local_symbol *) obstack_alloc (&notes, sizeof *ret);
-  ret->lsy_flags.sy_local_symbol = 1;
-  ret->lsy_flags.sy_resolved = 0;
+  ret->lsy_marker = NULL;
   ret->lsy_name = name_copy;
   ret->lsy_section = section;
   local_symbol_set_frag (ret, frag);
@@ -220,7 +219,7 @@ local_symbol_convert (struct local_symbol *locsym)
 {
   symbolS *ret;
 
-  gas_assert (locsym->lsy_flags.sy_local_symbol);
+  gas_assert (locsym->lsy_marker == NULL);
   if (local_symbol_converted_p (locsym))
     return local_symbol_get_real_symbol (locsym);
 
@@ -230,10 +229,10 @@ local_symbol_convert (struct local_symbol *locsym)
 		    local_symbol_get_frag (locsym));
 
   if (local_symbol_resolved_p (locsym))
-    ret->sy_flags.sy_resolved = 1;
+    ret->sy_resolved = 1;
 
   /* Local symbols are always either defined or used.  */
-  ret->sy_flags.sy_used = 1;
+  ret->sy_used = 1;
 
 #ifdef TC_LOCAL_SYMFIELD_CONVERT
   TC_LOCAL_SYMFIELD_CONVERT (locsym, ret);
@@ -317,10 +316,6 @@ colon (/* Just seen "x:" - rattle symbols & frags.  */
     }
 #endif /* WORKING_DOT_WORD */
 
-#ifdef obj_frob_colon
-  obj_frob_colon (sym_name);
-#endif
-
   if ((symbolP = symbol_find (sym_name)) != 0)
     {
       S_CLEAR_WEAKREFR (symbolP);
@@ -466,7 +461,7 @@ colon (/* Just seen "x:" - rattle symbols & frags.  */
       symbolP->sy_value.X_add_number = S_GET_VALUE (mri_common_symbol);
       symbolP->sy_frag = &zero_address_frag;
       S_SET_SEGMENT (symbolP, expr_section);
-      symbolP->sy_flags.sy_mri_common = 1;
+      symbolP->sy_mri_common = 1;
     }
 
 #ifdef tc_frob_label
@@ -633,7 +628,7 @@ symbol_clone_if_forward_ref (symbolS *symbolP, int is_forward)
       symbolS *add_symbol = symbolP->sy_value.X_add_symbol;
       symbolS *op_symbol = symbolP->sy_value.X_op_symbol;
 
-      if (symbolP->sy_flags.sy_forward_ref)
+      if (symbolP->sy_forward_ref)
 	is_forward = 1;
 
       if (is_forward)
@@ -649,24 +644,23 @@ symbol_clone_if_forward_ref (symbolS *symbolP, int is_forward)
 
       /* Re-using sy_resolving here, as this routine cannot get called from
 	 symbol resolution code.  */
-      if ((symbolP->bsym->section == expr_section
-           || symbolP->sy_flags.sy_forward_ref)
-	  && !symbolP->sy_flags.sy_resolving)
+      if ((symbolP->bsym->section == expr_section || symbolP->sy_forward_ref)
+	  && !symbolP->sy_resolving)
 	{
-	  symbolP->sy_flags.sy_resolving = 1;
+	  symbolP->sy_resolving = 1;
 	  add_symbol = symbol_clone_if_forward_ref (add_symbol, is_forward);
 	  op_symbol = symbol_clone_if_forward_ref (op_symbol, is_forward);
-	  symbolP->sy_flags.sy_resolving = 0;
+	  symbolP->sy_resolving = 0;
 	}
 
-      if (symbolP->sy_flags.sy_forward_ref
+      if (symbolP->sy_forward_ref
 	  || add_symbol != symbolP->sy_value.X_add_symbol
 	  || op_symbol != symbolP->sy_value.X_op_symbol)
 	{
 	  if (symbolP != &dot_symbol)
 	    {
 	      symbolP = symbol_clone (symbolP, 0);
-	      symbolP->sy_flags.sy_resolving = 0;
+	      symbolP->sy_resolving = 0;
 	    }
 	  else
 	    {
@@ -901,7 +895,6 @@ verify_symbol_chain (symbolS *rootP, symbolS *lastP)
   for (; symbol_next (symbolP) != NULL; symbolP = symbol_next (symbolP))
     {
       gas_assert (symbolP->bsym != NULL);
-      gas_assert (symbolP->sy_flags.sy_local_symbol == 0);
       gas_assert (symbolP->sy_next->sy_previous == symbolP);
     }
 
@@ -1064,7 +1057,7 @@ resolve_symbol_value (symbolS *symp)
       return final_val;
     }
 
-  if (symp->sy_flags.sy_resolved)
+  if (symp->sy_resolved)
     {
       if (symp->sy_value.X_op == O_constant)
 	return (valueT) symp->sy_value.X_add_number;
@@ -1075,7 +1068,7 @@ resolve_symbol_value (symbolS *symp)
   resolved = 0;
   final_seg = S_GET_SEGMENT (symp);
 
-  if (symp->sy_flags.sy_resolving)
+  if (symp->sy_resolving)
     {
       if (finalize_syms)
 	as_bad (_("symbol definition loop encountered at `%s'"),
@@ -1138,7 +1131,7 @@ resolve_symbol_value (symbolS *symp)
       operatorT op;
       int move_seg_ok;
 
-      symp->sy_flags.sy_resolving = 1;
+      symp->sy_resolving = 1;
 
       /* Help out with CSE.  */
       add_symbol = symp->sy_value.X_add_symbol;
@@ -1187,7 +1180,7 @@ resolve_symbol_value (symbolS *symp)
 		}
 	    }
 
-	  if (symp->sy_flags.sy_mri_common)
+	  if (symp->sy_mri_common)
 	    {
 	      /* This is a symbol inside an MRI common section.  The
 		 relocation routines are going to handle it specially.
@@ -1227,7 +1220,7 @@ resolve_symbol_value (symbolS *symp)
 	      final_seg = seg_left;
 	      final_val = 0;
 	      resolved = symbol_resolved_p (add_symbol);
-	      symp->sy_flags.sy_resolving = 0;
+	      symp->sy_resolving = 0;
 	      goto exit_dont_set_value;
 	    }
 	  else if (finalize_syms
@@ -1246,7 +1239,7 @@ resolve_symbol_value (symbolS *symp)
 	      final_seg = seg_left;
 	      final_val += symp->sy_frag->fr_address + left;
 	      resolved = symbol_resolved_p (add_symbol);
-	      symp->sy_flags.sy_resolving = 0;
+	      symp->sy_resolving = 0;
 	      goto exit_dont_set_value;
 	    }
 	  else
@@ -1450,7 +1443,7 @@ resolve_symbol_value (symbolS *symp)
 	  break;
 	}
 
-      symp->sy_flags.sy_resolving = 0;
+      symp->sy_resolving = 0;
     }
 
   if (finalize_syms)
@@ -1465,12 +1458,12 @@ exit_dont_set_value:
   if (finalize_syms)
     {
       if (resolved)
-	symp->sy_flags.sy_resolved = 1;
+	symp->sy_resolved = 1;
       else if (S_GET_SEGMENT (symp) != expr_section)
 	{
 	  as_bad (_("can't resolve value for symbol `%s'"),
 		  S_GET_NAME (symp));
-	  symp->sy_flags.sy_resolved = 1;
+	  symp->sy_resolved = 1;
 	}
     }
 
@@ -1516,15 +1509,15 @@ snapshot_symbol (symbolS **symbolPP, valueT *valueP, segT *segP, fragS **fragPP)
     {
       expressionS exp = symbolP->sy_value;
 
-      if (!symbolP->sy_flags.sy_resolved && exp.X_op != O_illegal)
+      if (!symbolP->sy_resolved && exp.X_op != O_illegal)
 	{
 	  int resolved;
 
-	  if (symbolP->sy_flags.sy_resolving)
+	  if (symbolP->sy_resolving)
 	    return 0;
-	  symbolP->sy_flags.sy_resolving = 1;
+	  symbolP->sy_resolving = 1;
 	  resolved = resolve_expression (&exp);
-	  symbolP->sy_flags.sy_resolving = 0;
+	  symbolP->sy_resolving = 0;
 	  if (!resolved)
 	    return 0;
 
@@ -1930,7 +1923,7 @@ S_GET_VALUE (symbolS *s)
   if (LOCAL_SYMBOL_CHECK (s))
     return resolve_symbol_value (s);
 
-  if (!s->sy_flags.sy_resolved)
+  if (!s->sy_resolved)
     {
       valueT val = resolve_symbol_value (s);
       if (!finalize_syms)
@@ -1941,7 +1934,7 @@ S_GET_VALUE (symbolS *s)
 
   if (s->sy_value.X_op != O_constant)
     {
-      if (! s->sy_flags.sy_resolved
+      if (! s->sy_resolved
 	  || s->sy_value.X_op != O_symbol
 	  || (S_IS_DEFINED (s) && ! S_IS_COMMON (s)))
 	as_bad (_("attempt to get value of unresolved symbol `%s'"),
@@ -2039,7 +2032,7 @@ S_IS_WEAKREFR (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_weakrefr != 0;
+  return s->sy_weakrefr != 0;
 }
 
 int
@@ -2047,7 +2040,7 @@ S_IS_WEAKREFD (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_weakrefd != 0;
+  return s->sy_weakrefd != 0;
 }
 
 int
@@ -2158,7 +2151,7 @@ S_IS_VOLATILE (const symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_volatile;
+  return s->sy_volatile;
 }
 
 int
@@ -2166,7 +2159,7 @@ S_IS_FORWARD_REF (const symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_forward_ref;
+  return s->sy_forward_ref;
 }
 
 const char *
@@ -2281,14 +2274,14 @@ S_SET_WEAKREFR (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_weakrefr = 1;
+  s->sy_weakrefr = 1;
   /* If the alias was already used, make sure we mark the target as
      used as well, otherwise it might be dropped from the symbol
      table.  This may have unintended side effects if the alias is
      later redirected to another symbol, such as keeping the unused
      previous target in the symbol table.  Since it will be weak, it's
      not a big deal.  */
-  if (s->sy_flags.sy_used)
+  if (s->sy_used)
     symbol_mark_used (s->sy_value.X_add_symbol);
 }
 
@@ -2297,7 +2290,7 @@ S_CLEAR_WEAKREFR (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  s->sy_flags.sy_weakrefr = 0;
+  s->sy_weakrefr = 0;
 }
 
 void
@@ -2305,7 +2298,7 @@ S_SET_WEAKREFD (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_weakrefd = 1;
+  s->sy_weakrefd = 1;
   S_SET_WEAK (s);
 }
 
@@ -2314,9 +2307,9 @@ S_CLEAR_WEAKREFD (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  if (s->sy_flags.sy_weakrefd)
+  if (s->sy_weakrefd)
     {
-      s->sy_flags.sy_weakrefd = 0;
+      s->sy_weakrefd = 0;
       /* If a weakref target symbol is weak, then it was never
 	 referenced directly before, not even in a .global directive,
 	 so decay it to local.  If it remains undefined, it will be
@@ -2367,14 +2360,14 @@ S_SET_VOLATILE (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_volatile = 1;
+  s->sy_volatile = 1;
 }
 
 void
 S_CLEAR_VOLATILE (symbolS *s)
 {
   if (!LOCAL_SYMBOL_CHECK (s))
-    s->sy_flags.sy_volatile = 0;
+    s->sy_volatile = 0;
 }
 
 void
@@ -2382,7 +2375,7 @@ S_SET_FORWARD_REF (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_forward_ref = 1;
+  s->sy_forward_ref = 1;
 }
 
 /* Return the previous symbol in a chain.  */
@@ -2431,10 +2424,10 @@ symbol_set_value_expression (symbolS *s, const expressionS *exp)
 int
 symbol_same_p (symbolS *s1, symbolS *s2)
 {
-  if (s1->sy_flags.sy_local_symbol
+  if (s1->bsym == NULL
       && local_symbol_converted_p ((struct local_symbol *) s1))
     s1 = local_symbol_get_real_symbol ((struct local_symbol *) s1);
-  if (s2->sy_flags.sy_local_symbol
+  if (s2->bsym == NULL
       && local_symbol_converted_p ((struct local_symbol *) s2))
     s2 = local_symbol_get_real_symbol ((struct local_symbol *) s2);
   return s1 == s2;
@@ -2492,7 +2485,7 @@ symbol_mark_used (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  s->sy_flags.sy_used = 1;
+  s->sy_used = 1;
   if (S_IS_WEAKREFR (s))
     symbol_mark_used (s->sy_value.X_add_symbol);
 }
@@ -2504,7 +2497,7 @@ symbol_clear_used (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_used = 0;
+  s->sy_used = 0;
 }
 
 /* Return whether a symbol has been used.  */
@@ -2514,7 +2507,7 @@ symbol_used_p (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 1;
-  return s->sy_flags.sy_used;
+  return s->sy_used;
 }
 
 /* Mark a symbol as having been used in a reloc.  */
@@ -2524,7 +2517,7 @@ symbol_mark_used_in_reloc (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_used_in_reloc = 1;
+  s->sy_used_in_reloc = 1;
 }
 
 /* Clear the mark of whether a symbol has been used in a reloc.  */
@@ -2534,7 +2527,7 @@ symbol_clear_used_in_reloc (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  s->sy_flags.sy_used_in_reloc = 0;
+  s->sy_used_in_reloc = 0;
 }
 
 /* Return whether a symbol has been used in a reloc.  */
@@ -2544,7 +2537,7 @@ symbol_used_in_reloc_p (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_used_in_reloc;
+  return s->sy_used_in_reloc;
 }
 
 /* Mark a symbol as an MRI common symbol.  */
@@ -2554,7 +2547,7 @@ symbol_mark_mri_common (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     s = local_symbol_convert ((struct local_symbol *) s);
-  s->sy_flags.sy_mri_common = 1;
+  s->sy_mri_common = 1;
 }
 
 /* Clear the mark of whether a symbol is an MRI common symbol.  */
@@ -2564,7 +2557,7 @@ symbol_clear_mri_common (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  s->sy_flags.sy_mri_common = 0;
+  s->sy_mri_common = 0;
 }
 
 /* Return whether a symbol is an MRI common symbol.  */
@@ -2574,7 +2567,7 @@ symbol_mri_common_p (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_mri_common;
+  return s->sy_mri_common;
 }
 
 /* Mark a symbol as having been written.  */
@@ -2584,7 +2577,7 @@ symbol_mark_written (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  s->sy_flags.sy_written = 1;
+  s->written = 1;
 }
 
 /* Clear the mark of whether a symbol has been written.  */
@@ -2594,7 +2587,7 @@ symbol_clear_written (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return;
-  s->sy_flags.sy_written = 0;
+  s->written = 0;
 }
 
 /* Return whether a symbol has been written.  */
@@ -2604,7 +2597,7 @@ symbol_written_p (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return 0;
-  return s->sy_flags.sy_written;
+  return s->written;
 }
 
 /* Mark a symbol has having been resolved.  */
@@ -2617,7 +2610,7 @@ symbol_mark_resolved (symbolS *s)
       local_symbol_mark_resolved ((struct local_symbol *) s);
       return;
     }
-  s->sy_flags.sy_resolved = 1;
+  s->sy_resolved = 1;
 }
 
 /* Return whether a symbol has been resolved.  */
@@ -2627,7 +2620,7 @@ symbol_resolved_p (symbolS *s)
 {
   if (LOCAL_SYMBOL_CHECK (s))
     return local_symbol_resolved_p ((struct local_symbol *) s);
-  return s->sy_flags.sy_resolved;
+  return s->sy_resolved;
 }
 
 /* Return whether a symbol is a section symbol.  */
@@ -2665,7 +2658,7 @@ symbol_equated_reloc_p (symbolS *s)
 #if defined (OBJ_COFF) && defined (TE_PE)
 	  && ! S_IS_WEAK (s)
 #endif
-	  && ((s->sy_flags.sy_resolved && s->sy_value.X_op_symbol != NULL)
+	  && ((s->sy_resolved && s->sy_value.X_op_symbol != NULL)
 	      || ! S_IS_DEFINED (s)
 	      || S_IS_COMMON (s)));
 }
@@ -2794,7 +2787,7 @@ dot_symbol_init (void)
   if (dot_symbol.bsym == NULL)
     as_fatal ("bfd_make_empty_symbol: %s", bfd_errmsg (bfd_get_error ()));
   dot_symbol.bsym->name = ".";
-  dot_symbol.sy_flags.sy_forward_ref = 1;
+  dot_symbol.sy_forward_ref = 1;
   dot_symbol.sy_value.X_op = O_constant;
 }
 
@@ -2835,15 +2828,15 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
 	  fprintf (file, " frag ");
 	  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym->sy_frag));
 	}
-      if (sym->sy_flags.sy_written)
+      if (sym->written)
 	fprintf (file, " written");
-      if (sym->sy_flags.sy_resolved)
+      if (sym->sy_resolved)
 	fprintf (file, " resolved");
-      else if (sym->sy_flags.sy_resolving)
+      else if (sym->sy_resolving)
 	fprintf (file, " resolving");
-      if (sym->sy_flags.sy_used_in_reloc)
+      if (sym->sy_used_in_reloc)
 	fprintf (file, " used-in-reloc");
-      if (sym->sy_flags.sy_used)
+      if (sym->sy_used)
 	fprintf (file, " used");
       if (S_IS_LOCAL (sym))
 	fprintf (file, " local");
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5fc356706d..06315720f7 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,290 +1,1219 @@
-2012-03-20  Nick Clifton  <nickc@redhat.com>
-
-	* gas/arm/vfp1xD.s: Add tests of the VMSR ad VMRS instructions in
-	priviledged modes.
-	* gas/arm/vfp1xD.d: Update expected output.
-
-2012-03-16  Matthew Gretton-Dann  <matther.gretton-dann@arm.com>
-
-	* gas/testsuite/gas/arm/any-idiv.d: New testcase.
-	* gas/testsuite/gas/arm/any-idiv.s: Likewise.
-	* gas/arm/attr-any-armv4t.d: Update expected output.
-	* gas/arm/attr-any-thumbv6.d: Likewise.
-	* gas/arm/attr-cpu-directive.d: Likewise.
-	* gas/arm/attr-default.d: Likewise.
-	* gas/arm/attr-march-armv1.d: Likewise.
-	* gas/arm/attr-march-armv2.d: Likewise.
-	* gas/arm/attr-march-armv2a.d: Likewise.
-	* gas/arm/attr-march-armv2s.d: Likewise.
-	* gas/arm/attr-march-armv3.d: Likewise.
-	* gas/arm/attr-march-armv3m.d: Likewise.
-	* gas/arm/attr-march-armv4.d: Likewise.
-	* gas/arm/attr-march-armv4t.d: Likewise.
-	* gas/arm/attr-march-armv4txm.d: Likewise.
-	* gas/arm/attr-march-armv4xm.d: Likewise.
-	* gas/arm/attr-march-armv5.d: Likewise.
-	* gas/arm/attr-march-armv5t.d: Likewise.
-	* gas/arm/attr-march-armv5te.d: Likewise.
-	* gas/arm/attr-march-armv5tej.d: Likewise.
-	* gas/arm/attr-march-armv5texp.d: Likewise.
-	* gas/arm/attr-march-armv5txm.d: Likewise.
-	* gas/arm/attr-march-armv6-m+os.d: Likewise.
-	* gas/arm/attr-march-armv6-m.d: Likewise.
-	* gas/arm/attr-march-armv6.d: Likewise.
-	* gas/arm/attr-march-armv6j.d: Likewise.
-	* gas/arm/attr-march-armv6k+sec.d: Likewise.
-	* gas/arm/attr-march-armv6k.d: Likewise.
-	* gas/arm/attr-march-armv6kt2.d: Likewise.
-	* gas/arm/attr-march-armv6s-m.d: Likewise.
-	* gas/arm/attr-march-armv6t2.d: Likewise.
-	* gas/arm/attr-march-armv6z.d: Likewise.
-	* gas/arm/attr-march-armv6zk.d: Likewise.
-	* gas/arm/attr-march-armv6zkt2.d: Likewise.
-	* gas/arm/attr-march-armv6zt2.d: Likewise.
-	* gas/arm/attr-march-armv7-a+mp.d: Likewise.
-	* gas/arm/attr-march-armv7-a+sec.d: Likewise.
-	* gas/arm/attr-march-armv7-a.d: Likewise.
-	* gas/arm/attr-march-armv7.d: Likewise.
-	* gas/arm/attr-march-armv7a.d: Likewise.
-	* gas/arm/attr-march-iwmmxt.d: Likewise.
-	* gas/arm/attr-march-iwmmxt2.d: Likewise.
-	* gas/arm/attr-march-xscale.d: Likewise.
-	* gas/arm/attr-mcpu.d: Likewise.
-	* gas/arm/attr-mfpu-arm1020e.d: Likewise.
-	* gas/arm/attr-mfpu-arm1020t.d: Likewise.
-	* gas/arm/attr-mfpu-arm1136jf-s.d: Likewise.
-	* gas/arm/attr-mfpu-arm1136jfs.d: Likewise.
-	* gas/arm/attr-mfpu-arm7500fe.d: Likewise.
-	* gas/arm/attr-mfpu-fpa.d: Likewise.
-	* gas/arm/attr-mfpu-fpa10.d: Likewise.
-	* gas/arm/attr-mfpu-fpa11.d: Likewise.
-	* gas/arm/attr-mfpu-fpe.d: Likewise.
-	* gas/arm/attr-mfpu-fpe2.d: Likewise.
-	* gas/arm/attr-mfpu-fpe3.d: Likewise.
-	* gas/arm/attr-mfpu-maverick.d: Likewise.
-	* gas/arm/attr-mfpu-neon-fp16.d: Likewise.
-	* gas/arm/attr-mfpu-neon.d: Likewise.
-	* gas/arm/attr-mfpu-softfpa.d: Likewise.
-	* gas/arm/attr-mfpu-softvfp+vfp.d: Likewise.
-	* gas/arm/attr-mfpu-softvfp.d: Likewise.
-	* gas/arm/attr-mfpu-vfp.d: Likewise.
-	* gas/arm/attr-mfpu-vfp10-r0.d: Likewise.
-	* gas/arm/attr-mfpu-vfp10.d: Likewise.
-	* gas/arm/attr-mfpu-vfp3.d: Likewise.
-	* gas/arm/attr-mfpu-vfp9.d: Likewise.
-	* gas/arm/attr-mfpu-vfpv2.d: Likewise.
-	* gas/arm/attr-mfpu-vfpv3-d16.d: Likewise.
-	* gas/arm/attr-mfpu-vfpv3.d: Likewise.
-	* gas/arm/attr-mfpu-vfpv4-d16.d: Likewise.
-	* gas/arm/attr-mfpu-vfpv4.d: Likewise.
-	* gas/arm/attr-mfpu-vfpxd.d: Likewise.
-	* gas/arm/attr-order.d: Likewise.
-	* gas/arm/attr-override-cpu-directive.d: Likewise.
-	* gas/arm/attr-override-mcpu.d: Likewise.
-	* gas/arm/eabi_attr_1.d: Likewise.
-	* gas/arm/mov-highregs-any.d: Likewise.
-	* gas/arm/mov-lowregs-any.d: Likewise.
-	* gas/arm/pr12198-1.d: Likewise.
-	* gas/arm/pr12198-2.d: Likewise.
-
-2012-03-15  Alan Modra  <amodra@gmail.com>
-
-	* gas/i386/bundle-lock.d: Ignore trailing nops.
-	* gas/i386/bundle.d: Likewise.
-	* gas/i386/x86-64-bundle.d: Likewise.
-
-2012-03-13  Roland McGrath  <mcgrathr@google.com>
-
-	* gas/i386/bundle-bad.s: New file.
-	* gas/i386/bundle-bad.d: New file.
-	* gas/i386/bundle-bad.l: New file.
-	* gas/i386/i386.exp: Run it.
-
-	* gas/arm/bundle.s: New file.
-	* gas/arm/bundle.d: New file.
-	* gas/arm/bundle-lock.s: New file.
-	* gas/arm/bundle-lock.d: New file.
-
-	* gas/i386/bundle.s: New file.
-	* gas/i386/bundle.d: New file.
-	* gas/i386/x86-64-bundle.s: New file.
-	* gas/i386/x86-64-bundle.d: New file.
-	* gas/i386/bundle-lock.s: New file.
-	* gas/i386/bundle-lock.d: New file.
-	* gas/i386/i386.exp: Run them.
-
-2012-03-10  Edmar Wienskoski  <edmar@freescale.com>
-
-	* gas/ppc/e500mc64_nop.s: New test case for e500mc family
-	termination nops.
-	* gas/ppc/e500mc64_nop.d: Likewise.
-	* gas/ppc/e5500_nop.s: Likewise.
-	* gas/ppc/e5500_nop.d: Likewise.
-	* gas/ppc/e6500_nop.s: Likewise.
-	* gas/ppc/e6500_nop.d: Likewise.
-	* gas/ppc/e6500.s: New.
-	* gas/ppc/e6500.d: Likewise.
-	* gas/ppc/ppc.exp: Run e6500, e500mc64_nop, e5500_nop, and e6500_nop.
-
-2012-03-08  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
-
-	* gas/s390/esa-g5.d: Move length field to the second operand.
-	* gas/s390/esa-g5.s: Likewise.
+2011-11-14  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	Apply mainline patches
+	2011-11-14  Maciej W. Rozycki  <macro@codesourcery.com>
+	* gas/mips/relax-swap3.d: New test.
+	* gas/mips/mips16@relax-swap3.d: Likewise.
+	* gas/mips/micromips@relax-swap3.d: Likewise.
+	* gas/mips/relax-swap3.s: New test source.
+	* gas/mips/mips.exp: Run the new tests.
+
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-09-28  Jan Beulich  <jbeulich@suse.com>
+	* gas/ppc/476.s: Fix lswi first operand.
+	* gas/ppc/476.d: Adjust expected output.
+	* gas/ppc/a2.s: Fix lswi first operand.
+	* gas/ppc/a2.d: Adjust expected output.
+	* gas/ppc/power6.s: Fix lfdpx first operand.
+	* gas/ppc/power6.d: Adjust expected output.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* gas/sparc/hpcvis3.s: Update for fixed fchksum16 mnemonic.
+	* gas/sparc/hpcvis3.d: Likewise.
+
+	* gas/sparc/imm-plus-rreg.d: Fix address regex for 64-bit.
+	* gas/sparc/save-args.d: Likewise.
+	* gas/sparc/ticc-imm-reg.d: Likewise, add -32 to options.
+	* gas/sparc/v8-movwr-imm.d: Likewise.
+
+	* gas/sparc/hpcvis3.d: Pass '-Av9v'.
+
+2011-09-08  Mark Fortescue <mark@mtfhpc.demon.co.uk>
 
-2012-02-14  Alan Modra  <amodra@gmail.com>
+	* gas/sparc/imm-plus-rreg.[sd]: New test.
+	* gas/sparc/sparc.exp: Run new test.
 
-	* gas/elf/bad-group.s: Add section attributes.
-	* gas/elf/elf.exp (groupautoa, groupautob): Don't run for hppa64-hpux.
-	(ifunc-1, type): Don't run for hpux.
-	* gas/elf/type-noifunc.e: Accept ANSI_COM.
-	* gas/elf/section7.s: Always have whitespace before directives.
-	* gas/elf/warn-2.s: Likewise.
-	* gas/i386/ifunc-3.s: Move .size directive.
+	* gas/sparc/ticc-imm-reg.[sd]: New test.
+	* gas/sparc/v8-movwr-imm.[sd]: New test.
+	* gas/sparc/sparc.exp: Run new tests.
 
-2012-02-13  Alan Modra  <amodra@gmail.com>
-
-	* gas/all/gas.exp (redef2): xfail m6811 and m6812.
-	* gas/elf/elf.exp: Use is_elf_format.
-	* gas/symver/symver.exp: Likewise.
-	* gas/m68hc11/m68hc11.exp: Simplify target test.
-	Add -m68hc11 to error tests that pass for hc12.
+	* gas/sparc/save-args.[sd]: New test.
+	* gas/sparc/sparc.exp: Run new test.
 
-2012-02-11  Kai Tietz  <ktietz@redhat.com>
-
-	* gas/i386/disp32.d: Adjust label pattern.
-
-2012-02-08  Kai Tietz  <ktietz@redhat.com>
-
-	* gas/i386/x86-64-disp32.d: Fix lable-pattern.
-
-2012-02-08  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* gas/i386/hle-intel.d: New.
-	* gas/i386/hle.d: Likewise.
-	* gas/i386/hle.s: Likewise.
-	* gas/i386/hlebad.l: Likewise.
-	* gas/i386/hlebad.s: Likewise.
-	* gas/i386/rtm-intel.d: Likewise.
-	* gas/i386/rtm.d: Likewise.
-	* gas/i386/rtm.s: Likewise.
-	* gas/i386/x86-64-hle-intel.d: Likewise.
-	* gas/i386/x86-64-hle.d: Likewise.
-	* gas/i386/x86-64-hle.s: Likewise.
-	* gas/i386/x86-64-hlebad.l: Likewise.
-	* gas/i386/x86-64-hlebad.s: Likewise.
-	* gas/i386/x86-64-rtm-intel.d: Likewise.
-	* gas/i386/x86-64-rtm.d: Likewise.
-	* gas/i386/x86-64-rtm.s: Likewise.
-
-	* gas/i386/i386.exp: Run hle, hle-intel, hlebad x86-64-hle, rtm,
-	rtm-intel, x86-64-hle-intel, x86-64-hlebad, x86-64-rtm and
-	x86-64-rtm-intel.
-
-2012-01-20  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* gas/i386/disp32.s: Add tests for .d8 suffix.
-	* gas/i386/x86-64-disp32.s: Likewise.
-
-	* gas/i386/disp32.d: Updated.
-	* gas/i386/x86-64-disp32.d: Likewise.
-
-2012-01-17  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* gas/m68k/pmove.s, gas/m68k/pmove.d: New test.
-	* gas/m68k/all.exp: Run it.
-
-2012-01-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* gas/i386/i386.exp: Run vmfunc and x86-64-vmfunc.
-
-	* gas/i386/vmfunc.d: New.
-	* gas/i386/vmfunc.s: Likewise.
-	* gas/i386/x86-64-vmfunc.d: Likewise.
-
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* gas/all/redef2.d: Skip for Darwin.
-	* gas/all/redef3.d: Likewise.
-	* gas/all/weakref1.d: Likewise.
-	* gas/macros/irp.d: Likewise.
-	* gas/macros/repeat.d: Likewise.
-	* gas/macros/rept.d: Likewise.
-	* gas/macros/test2.d: Likewise.
-	* gas/macros/vararg.d: Likewise.
-	* gas/mach-o/macro-irp.d: New.
-	* gas/mach-o/macro-repeat.d: New.
-	* gas/mach-o/macro-rept.d: New.
-	* gas/mach-o/macro-test2.d: New.
-	* gas/mach-o/macro-vararg.d: New.
-	* gas/mach-o/redef2.d: New.
-	* gas/mach-o/redef3.d: New.
-
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* gas/mach-o/dysymtab-3.d: New.
-	* gas/mach-o/symbols-7.s: New.
-
-2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* gas/mach-o/dysymtab-2.d: Update to include the set VMA.
-	* gas/mach-o/symbols-1-64.d: Likewise.
-	* gas/mach-o/symbols-1.d: Likewise.
-	* gas/mach-o/symbols-6.d: Likewise.
-	* gas/mach-o/zerofill-1.d: Likewise.
-	* gas/mach-o/zerofill-2.d: Likewise.
-
-2012-01-12  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* gas/mach-o/dysymtab-2.d: New.
-	* gas/mach-o/err-syms-4.s: New.
-	* gas/mach-o/err-syms-5.s: New.
-	* gas/mach-o/err-syms-6.s: New.
-	* gas/mach-o/symbols-6-64.d: New.
-	* gas/mach-o/symbols-6-64.s: New.
-	* gas/mach-o/symbols-6.d: New.
-	* gas/mach-o/symbols-6.s: New.
-
-2012-01-09  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* gas/mach-o/err-syms-1.s: New.
-	* gas/mach-o/err-syms-2.s: New.
-	* gas/mach-o/err-syms-3.s: New.
-	* gas/mach-o/symbols-2.d: New.
-	* gas/mach-o/symbols-2.s: New.
-	* gas/mach-o/symbols-3.s: New.
-	* gas/mach-o/symbols-4.s: New.
-	* gas/mach-o/symbols-5.d: New.
-	* gas/mach-o/symbols-5.s: New.
-
-2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
-
-	* gas/mips/tls-relw.s, gas/mips/tls-relw.d: New test.
+2011-09-08  David S. Miller  <davem@davemloft.net>
+
+	* gas/sparc/hpcvis3.s: Correct pdistn test.
+	* gas/sparc/hpcvis3.d: Likewise.
+
+2011-09-08  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR gas/13167
+	* gas/ia64/pr13167.d, gas/ia64/pr13167.s: New test.
+	* gas/ia64/ia64.exp: Run it.
+
+2011-09-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+	PR gas/13145
+	* gas/m68k/all.exp: Run "mode5" test also with -mcpu=5200.
+	* gas/m68k/mode5.s: Add moveml testcases.
+	* gas/m68k/mode5.d: Update.
+
+2011-09-05  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/loc-swap-2.s, gas/mips/loc-swap-2.d,
+	gas/mips/micromips@loc-swap-2.d,
+	gas/mips/mips16@loc-swap-2.d: New test.
 	* gas/mips/mips.exp: Run it.
 
-2012-01-08  Richard Sandiford  <rdsandiford@googlemail.com>
+2011-08-19  Sergey A. Guriev  <sergeya.a.guriev@intel.com>
+
+	* gas/i386/avx-gather-intel.d: Added missing vpgather tests.
+	* gas/i386/avx-gather.d: Likewise.
+	* gas/i386/x86-64-avx-gather-intel.d: Likewise.
+	* gas/i386/x86-64-avx-gather.d: Likewise.
+
+	* gas/i386/avx-intel.d: Added missing vpinsrd and removed
+	duplicated vpinsrb instructions.
+	* gas/i386/avx.d: Likewise.
+	* gas/i386/avx.s: Likewise.
+	* gas/i386/ilp32/x86-64-avx-intel.d: Likewise.
+	* gas/i386/ilp32/x86-64-avx.d: Likewise.
+	* gas/i386/x86-64-avx-intel.d: Likewise.
+	* gas/i386/x86-64-avx.d: Likewise.
+	* gas/i386/x86-64-avx.s: Likewise.
+
+2011-08-10  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/micromips@mips5.d: Rename to...
+	* gas/mips/micromips@mips5-fp.d: ... this.
+	* gas/mips/mips5.d: Rename to...
+	* gas/mips/mips5-fp.d: ... this.
+	* gas/mips/mips5.l: Rename to...
+	* gas/mips/mips5-fp.l: ... this.
+	* gas/mips/mips5.s: Rename to...
+	* gas/mips/mips5-fp.s: ... this.
+	* gas/mips/mips.exp: Update accordingly.
+
+2011-08-10  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/mips.exp: Define new "fpisa3", "fpisa4" and "fpisa5"
+	architecture properties adding them to "mips3", "mips4", "mips5"
+	and "mips32r2" architectures.  Use the new properties for the
+	"24k-triple-stores-1", "24k-triple-stores-3", "mips4-fp",
+	"mips5" and "alnv_ps-swap" tests.
+
+2011-08-09  Maciej W. Rozycki  <macro@codesourcery.com>
+            Chao-ying Fu  <fu@mips.com>
+
+	* gas/mips/micromips@mcu.d: New test.
+	* gas/mips/mcu.d: Likewise.
+	* gas/mips/mcu.s: New test source.
+	* gas/mips/mips.exp: Run the new tests.
+
+2011-08-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/micromips.d: Update according to changes to enable
+	microMIPS branch swapping.
+	* gas/mips/micromips-trap.d: Likewise.
+	* gas/mips/micromips@jal-svr4pic.d: Likewise.
+	* gas/mips/micromips@loc-swap.d: Likewise.
+	* gas/mips/micromips@loc-swap-dis.d: Likewise.
+
+2011-08-05  David S. Miller  <davem@davemloft.net>
+
+	* gas/sparc/hpcvis3.d: New test.
+	* gas/sparc/hpcvis3.s: New test source.
+	* gas/sparc/sparc.exp: Run new test.
+
+2011-08-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/x86-64-branch.d: Pass -dw to objdump and support
+	win64.
+
+2011-08-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/elf/bad-group.d: New.
+	* gas/elf/bad-group.err: Likewise.
+	* gas/elf/bad-group.s: Likewise.
+
+	* gas/elf/elf.exp: Run bad-group.
+
+2011-08-03  James Greenhalgh  <james.greenhalgh@arm.com>
+
+	* gas/arm/strex-bad-t.d: New testcase.
+	* gas/arm/strex-bad-t.s: Likewise.
+	* gas/arm/strex-bad-t.l: Likewise.
+	* gas/arm/strex-t.s: Likewise.
+	* gas/arm/strex-t.d: Likewise.
+
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13048
+	* gas/i386/ilp32/ilp32.exp: Don't run inval.
+
+	* gas/i386/ilp32/inval.l: Removed.
+	* gas/i386/ilp32/inval.s: Likewise.
+
+	* gas/i386/ilp32/quad.d: Expect R_X86_64_64 instead of
+	R_X86_64_32.
+
+	* gas/i386/ilp32/x86-64-pcrel.s: Add tests for movabs.
+	* gas/i386/ilp32/x86-64-pcrel.d: Updated.
+
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/13046
+	* gas/i386/x86-64-branch.s: Add tests for direct branch.
+	* gas/i386/x86-64-branch.d: Updated.
+	* gas/i386/ilp32/x86-64-branch.d: Likewise.
+
+2011-07-29  Nick Clifton  <nickc@redhat.com>
+
+	* gas/elf/warn-2.s: Add other types of NOP insn.
+
+2011-07-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* gas/elf/warn-2.s: New.
+	* gas/elf/elf.exp: Run the new test.
+
+2011-07-26  Kazuhiro Inaoka  <kazuhiro.inaoka.ud@renesas.com>
+
+	* gas/rx/r-bcc.d: Update expected disassembly of synthetic beq.a
+	instruction.
+
+2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+            Chao-ying Fu  <fu@mips.com>
+	    Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/micromips.d: New test.
+	* gas/mips/micromips-branch-delay.d: Likewise.
+	* gas/mips/micromips-branch-relax.d: Likewise.
+	* gas/mips/micromips-branch-relax-pic.d: Likewise.
+	* gas/mips/micromips-size-1.d: Likewise.
+	* gas/mips/micromips-trap.d: Likewise.
+	* gas/mips/micromips.l: New stderr output.
+	* gas/mips/micromips-branch-delay.l: Likewise.
+	* gas/mips/micromips-branch-relax.l: Likewise.
+	* gas/mips/micromips-branch-relax-pic.l: Likewise.
+	* gas/mips/micromips-size-0.l: New list test.
+	* gas/mips/micromips-size-1.l: New stderr output.
+	* gas/mips/micromips.s: New test source.
+	* gas/mips/micromips-branch-delay.s: Likewise.
+	* gas/mips/micromips-branch-relax.s: Likewise.
+	* gas/mips/micromips-size-0.s: Likewise.
+	* gas/mips/micromips-size-1.s: Likewise.
+	* gas/mips/mips.exp: Run the new tests.
+
+	* gas/mips/dli.s: Use .p2align.
+	* gas/mips/elf_ase_micromips.d: New test.
+	* gas/mips/elf_ase_micromips-2.d: Likewise.
+	* gas/mips/micromips@abs.d: Likewise.
+	* gas/mips/micromips@add.d: Likewise.
+	* gas/mips/micromips@alnv_ps-swap.d: Likewise.
+	* gas/mips/micromips@and.d: Likewise.
+	* gas/mips/micromips@beq.d: Likewise.
+	* gas/mips/micromips@bge.d: Likewise.
+	* gas/mips/micromips@bgeu.d: Likewise.
+	* gas/mips/micromips@blt.d: Likewise.
+	* gas/mips/micromips@bltu.d: Likewise.
+	* gas/mips/micromips@branch-likely.d: Likewise.
+	* gas/mips/micromips@branch-misc-1.d: Likewise.
+	* gas/mips/micromips@branch-misc-2-64.d: Likewise.
+	* gas/mips/micromips@branch-misc-2.d: Likewise.
+	* gas/mips/micromips@branch-misc-2pic-64.d: Likewise.
+	* gas/mips/micromips@branch-misc-2pic.d: Likewise.
+	* gas/mips/micromips@branch-misc-4-64.d: Likewise.
+	* gas/mips/micromips@branch-misc-4.d: Likewise.
+	* gas/mips/micromips@branch-self.d: Likewise.
+	* gas/mips/micromips@cache.d: Likewise.
+	* gas/mips/micromips@daddi.d: Likewise.
+	* gas/mips/micromips@dli.d: Likewise.
+	* gas/mips/micromips@elf-jal.d: Likewise.
+	* gas/mips/micromips@elf-rel2.d: Likewise.
+	* gas/mips/micromips@elfel-rel2.d: Likewise.
+	* gas/mips/micromips@elf-rel4.d: Likewise.
+	* gas/mips/micromips@jal-svr4pic.d: Likewise.
+	* gas/mips/micromips@jal-svr4pic-noreorder.d: Likewise.
+	* gas/mips/micromips@lb-svr4pic-ilocks.d: Likewise.
+	* gas/mips/micromips@li.d: Likewise.
+	* gas/mips/micromips@loc-swap-dis.d: Likewise.
+	* gas/mips/micromips@loc-swap.d: Likewise.
+	* gas/mips/micromips@mips1-fp.d: Likewise.
+	* gas/mips/micromips@mips32-cp2.d: Likewise.
+	* gas/mips/micromips@mips32-imm.d: Likewise.
+	* gas/mips/micromips@mips32-sf32.d: Likewise.
+	* gas/mips/micromips@mips32.d: Likewise.
+	* gas/mips/micromips@mips32r2-cp2.d: Likewise.
+	* gas/mips/micromips@mips32r2-fp32.d: Likewise.
+	* gas/mips/micromips@mips32r2-sync.d: Likewise.
+	* gas/mips/micromips@mips32r2.d: Likewise.
+	* gas/mips/micromips@mips4-branch-likely.d: Likewise.
+	* gas/mips/micromips@mips4-fp.d: Likewise.
+	* gas/mips/micromips@mips4.d: Likewise.
+	* gas/mips/micromips@mips5.d: Likewise.
+	* gas/mips/micromips@mips64-cp2.d: Likewise.
+	* gas/mips/micromips@mips64.d: Likewise.
+	* gas/mips/micromips@mips64r2.d: Likewise.
+	* gas/mips/micromips@pref.d: Likewise.
+	* gas/mips/micromips@relax-at.d: Likewise.
+	* gas/mips/micromips@relax.d: Likewise.
+	* gas/mips/micromips@rol-hw.d: Likewise.
+	* gas/mips/micromips@uld2-eb.d: Likewise.
+	* gas/mips/micromips@uld2-el.d: Likewise.
+	* gas/mips/micromips@ulh2-eb.d: Likewise.
+	* gas/mips/micromips@ulh2-el.d: Likewise.
+	* gas/mips/micromips@ulw2-eb-ilocks.d: Likewise.
+	* gas/mips/micromips@ulw2-el-ilocks.d: Likewise.
+	* gas/mips/cache.d: Likewise.
+	* gas/mips/daddi.d: Likewise.
+	* gas/mips/mips32-imm.d: Likewise.
+	* gas/mips/pref.d: Likewise.
+	* gas/mips/elf-rel27.d: Handle microMIPS ASE.
+	* gas/mips/l_d.d: Likewise.
+	* gas/mips/l_d-n32.d: Likewise.
+	* gas/mips/l_d-n64.d: Likewise.
+	* gas/mips/ld.d: Likewise.
+	* gas/mips/ld-n32.d: Likewise.
+	* gas/mips/ld-n64.d: Likewise.
+	* gas/mips/s_d.d: Likewise.
+	* gas/mips/s_d-n32.d: Likewise.
+	* gas/mips/s_d-n64.d: Likewise.
+	* gas/mips/sd.d: Likewise.
+	* gas/mips/sd-n32.d: Likewise.
+	* gas/mips/sd-n64.d: Likewise.
+	* gas/mips/mips32.d: Update immediates.
+	* gas/mips/micromips@mips32-cp2.s: New test source.
+	* gas/mips/micromips@mips32-imm.s: Likewise.
+	* gas/mips/micromips@mips32r2-cp2.s: Likewise.
+	* gas/mips/micromips@mips64-cp2.s: Likewise.
+	* gas/mips/cache.s: Likewise.
+	* gas/mips/daddi.s: Likewise.
+	* gas/mips/mips32-imm.s: Likewise.
+	* gas/mips/elf-rel4.s: Handle microMIPS ASE.
+	* gas/mips/lb-pic.s: Likewise.
+	* gas/mips/ld.s: Likewise.
+	* gas/mips/mips32.s: Likewise.
+	* gas/mips/mips.exp: Add the micromips arch.  Exclude mips16e
+	from micromips.  Run mips32-imm.
+
+	* gas/mips/jal-mask-11.d: New test.
+	* gas/mips/jal-mask-12.d: Likewise.
+	* gas/mips/micromips@jal-mask-11.d: Likewise.
+	* gas/mips/jal-mask-1.s: Source for the new tests.
+	* gas/mips/jal-mask-21.d: New test.
+	* gas/mips/jal-mask-22.d: Likewise.
+	* gas/mips/micromips@jal-mask-12.d: Likewise.
+	* gas/mips/jal-mask-2.s: Source for the new tests.
+	* gas/mips/mips.exp: Run the new tests.
+
+	* gas/mips/mips16-e.d: Add --special-syms to `objdump'.
+	* gas/mips/tmips16-e.d: Likewise.
+	* gas/mips/mipsel16-e.d: Likewise.
+	* gas/mips/tmipsel16-e.d: Likewise.
+
+	* gas/mips/and.s: Adjust padding.
+	* gas/mips/beq.s: Likewise.
+	* gas/mips/bge.s: Likewise.
+	* gas/mips/bgeu.s: Likewise.
+	* gas/mips/blt.s: Likewise.
+	* gas/mips/bltu.s: Likewise.
+	* gas/mips/branch-misc-2.s: Likewise.
+	* gas/mips/jal.s: Likewise.
+	* gas/mips/li.s: Likewise.
+	* gas/mips/mips4.s: Likewise.
+	* gas/mips/mips4-fp.s: Likewise.
+	* gas/mips/relax.s: Likewise.
+	* gas/mips/and.d: Update accordingly.
+	* gas/mips/elf-jal.d: Likewise.
+	* gas/mips/jal.d: Likewise.
+	* gas/mips/li.d: Likewise.
+	* gas/mips/relax-at.d: Likewise.
+	* gas/mips/relax.d: Likewise.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/k1om.d: New.
+	* gas/i386/k1om-inval.l: Likewise.
+	* gas/i386/k1om-inval.s: Likewise.
+
+	* gas/i386/i386.exp: Run k1om-inval and k1om.
+
+2011-07-04  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/loc-swap.d: New test case for DWARF-2 location with
+	branch swapping.
+	* gas/mips/loc-swap-dis.d: Likewise.
+	* gas/mips/mips16@loc-swap.d: Likewise, MIPS16 version.
+	* gas/mips/mips16@loc-swap-dis.d: Likewise.
+	* gas/mips/loc-swap.s: Source for the new tests.
+	* gas/mips/mips.exp: Run the new tests.
+
+2011-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	AVX Programming Reference (June, 2011)
+	* gas/i386/bmi2.s: Correct rorx tests.
+	* gas/i386/x86-64-bmi2.s: Likewise.
+
+	* gas/i386/bmi2-intel.d: Updated.
+	* gas/i386/bmi2.d: Likewise.
+	* gas/i386/x86-64-bmi2-intel.d: Likewise.
+	* gas/i386/x86-64-bmi2.d: Likewise.
+
+2011-06-30  Paul Carroll  <pcarroll@codesourcery.com>
+
+	* gas/arm/addthumb2err.s: New test file.
+	* gas/arm/addthumb2err.d: Test control file.
+	* gas/arm/addthumb2err.l: Expected error messages.
+
+2011-06-30  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12931
+	* gas/arm/blx-bad.d: Add exrta nop at end of disassembly.
+	* gas/arm/inst-po-be.d: Add exrta nop at end of disassembly.
+	* gas/arm/inst-po.d: Add exrta nop at end of disassembly.
+
+2011-06-30  Nick Clifton  <nickc@redhat.com>
 
-	* gas/mips/align3.s, gas/mips/align3.d: New testcase.
+	PR gas/12848
+	* gas/arm/thumb-b-bad.s: New test.
+	* gas/arm/thumb-b-bad.d: Test control file.
+	* gas/arm/thumb-b-bad.l: Expected error output.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/mips16-e.d, gas/mips/mips16-f.d,
+	gas/mips/mipsel16-e.d, gas/mips/mipsel16-f.d,
+	gas/mips/tmips16-e.d, gas/mips/tmips16-f.d,
+	gas/mips/tmipsel16-e.d, gas/mips/tmipsel16-f.d: Fix GPR mask.
+	* gas/mips/reginfo-1.s, gas/mips/reginfo-1a.d,
+	gas/mips/reginfo-1b.d: New tests.
+	* gas/mips/mips.exp: Run them.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/24k-triple-stores-9.d: Add -z to dump options and
+	explicitly match one nop.
+	* gas/mips/24k-triple-stores-10.d: Likewise.
+	* gas/mips/24k-triple-stores-11.d: Likewise.
+	* gas/mips/lifloat.d: Likewise.
+	* gas/mips/trunc.d: Likewise 1 extra nop.
+	* gas/mips/vr4111.d: Likewise 2 nops.
+
+2011-06-26  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/24k-branch-delay-1.d: Do not allow stores to be put
+	into delay slots.
+	* gas/mips/24k-triple-stores-1.d: Put the first nop after the
+	second store, rather than the first.
+	* gas/mips/24k-triple-stores-2.d: Likewise.
+	* gas/mips/24k-triple-stores-4.d: Likewise.
+	* gas/mips/24k-triple-stores-8.d: Likewise.
+	* gas/mips/24k-triple-stores-3.d: Remove first nop.
+	* gas/mips/24k-triple-stores-5.d: Likewise.
+	* gas/mips/24k-triple-stores-6.d: Likewise.
+	* gas/mips/24k-triple-stores-7.d: Likewise.
+	* gas/mips/24k-triple-stores-9.d: Add a nop after the second store.
+	Expect a nop at the end.
+	* gas/mips/24k-triple-stores-10.d: Put the first nop after the
+	second store, rather than the first.  Expect a nop at the end.
+
+2011-06-25  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/vr4130.s: Add some more ".set noreorder" tests.
+	* gas/mips/vr4130.d: Update accordingly.
+
+2011-06-23  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/pr12915.s, gas/mips/pr12915.d: New test.
 	* gas/mips/mips.exp: Run it.
 
-2012-01-04  Iain Sandoe  <idsandoe@googlemail.com>
+2011-06-21  Sameera Deshpande  <sameera.deshpande@arm.com>
+
+	* gas/arm/vcvt-bad.d: New test.
+	* gas/arm/vcvt-bad.l: Likewise.
+	* gas/arm/vcvt-bad.s: Likewise.
+	* gas/arm/vcvt.d: Likewise.
+	* gas/arm/vcvt.s: Likewise.
+
+2011-06-14  Tristan Gingold  <gingold@adacore.com>
+
+	* gas/ppc/test1xcoff32.d: Adjust for csect anchor.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* gas/tilepro/t_constants.s: New file.
+	* gas/tilepro/t_constants.d: Likewise.
+	* gas/tilepro/t_insns.s: Likewise.
+	* gas/tilepro/tilepro.exp: Likewise.
+	* gas/tilepro/t_insns.d: Likewise.
+	* gas/tilegx/tilegx.exp: Likewise.
+	* gas/tilegx/t_insns.d: Likewise.
+	* gas/tilegx/t_insns.s: Likewise.
+
+2011-06-13  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12854
+	* gas/arm/shift-bad.s: New test.
+	* gas/arm/shift-bad.l: Expcted error output.
+	* gas/arm/shift-bad.s: New control file.
+
+2011-06-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/arch-10-lzcnt.d: Updated.
+	* gas/i386/x86-64-arch-2-lzcnt.d: Likewise.
+
+2011-06-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	AVX Programming Reference (June, 2011)
+	* gas/i386/arch-10-1.l: Updated.
+	* gas/i386/arch-10-2.l: Likewise.
+	* gas/i386/arch-10-3.l: Likewise.
+	* gas/i386/arch-10-4.l: Likewise.
+
+	* gas/i386/arch-10.s: Add LZCNT to comments.
+	* gas/i386/x86-64-arch-2.s: Likewise.
+
+	* gas/i386/arch-10-lzcnt.d: New.
+	* gas/i386/avx-gather-intel.d: Likewise.
+	* gas/i386/avx-gather.d: Likewise.
+	* gas/i386/avx-gather.s: Likewise.
+	* gas/i386/avx2-intel.d: Likewise.
+	* gas/i386/avx2.d: Likewise.
+	* gas/i386/avx2.s: Likewise
+	* gas/i386/avx256int-intel.d: Likewise.
+	* gas/i386/avx256int.d: Likewise.
+	* gas/i386/avx256int.s: Likewise.
+	* gas/i386/bmi2-intel.d: Likewise.
+	* gas/i386/bmi2.d: Likewise.
+	* gas/i386/bmi2.s: Likewise.
+	* gas/i386/inval-invpcid.l:Likewise.
+	* gas/i386/inval-invpcid.s: Likewise.
+	* gas/i386/invpcid-intel.d: Likewise.
+	* gas/i386/invpcid.d: Likewise.
+	* gas/i386/invpcid.s: Likewise.
+	* gas/i386/x86-64-arch-2-lzcnt.d: Likewise.
+	* gas/i386/x86-64-avx-gather-intel.d: Likewise.
+	* gas/i386/x86-64-avx-gather.d: Likewise.
+	* gas/i386/x86-64-avx-gather.s: Likewise.
+	* gas/i386/x86-64-avx2-intel.d: Likewise.
+	* gas/i386/x86-64-avx2.d: Likewise.
+	* gas/i386/x86-64-avx2.s: Likewise.
+	* gas/i386/x86-64-avx256int-intel.d: Likewise.
+	* gas/i386/x86-64-avx256int.d: Likewise.
+	* gas/i386/x86-64-avx256int.s: Likewise.
+	* gas/i386/x86-64-bmi2-intel.d: Likewise.
+	* gas/i386/x86-64-bmi2.d: Likewise.
+	* gas/i386/x86-64-bmi2.s: Likewise.
+	* gas/i386/x86-64-inval-invpcid.l: Likewise.
+	* gas/i386/x86-64-inval-invpcid.s: Likewise.
+	* gas/i386/x86-64-invpcid-intel.d: Likewise.
+	* gas/i386/x86-64-invpcid.d: Likewise.
+	* gas/i386/x86-64-invpcid.s: Likewise.
+
+2011-06-09  James Greenhalgh  <james.greenhalgh@arm.com>
+
+	* gas/arm/ldrd-unpredicatble.d: New testcase.
+	* gas/arm/ldrd-unpredicatble.s: Likewise.
+	* gas/arm/ldrd-unpredicatble.l: Likewise.
+
+2011-06-02  Jie Zhang <jie@codesourcery.com>
+	    Nathan Sidwell <nathan@codesourcery.com>
+
+	* gas/arm/inst.d: Adjust for signed zero offsets.
+	* gas/arm/ldst-offset0.d: New test.
+	* gas/arm/ldst-offset0.s: New test.
+	* gas/arm/offset-1.d: New test.
+	* gas/arm/offset-1.s: New test.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* gas/arm/arm-idiv-bad.d: New test.
+	* gas/arm/arm-idiv-bad.s: New test.
+	* gas/arm/arm-idiv-bad.l: New test.
+	* gas/arm/arm-idiv.d: New test.
+	* gas/arm/arm-idiv.s: New test.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* gas/arm/ldr-global.d: New test.
+	* gas/arm/ldr-global.s: New test.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* arm/t2-branch-global.d: New test.
+	* arm/t2-branch-global.s: New test.
+
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* gas/s390/esa-g5.d: Fix fp register pair operands.
+	* gas/s390/esa-g5.s: Likewise.
+	* gas/s390/zarch-z196.d: Likewise.
+	* gas/s390/zarch-z196.s: Likewise.
+	* gas/s390/zarch-z9-109.d: Likewise.
+	* gas/s390/zarch-z9-109.s: Likewise.
+	* gas/s390/zarch-z9-ec.d: Likewise.
+	* gas/s390/zarch-z9-ec.s: Likewise.
+
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* gas/s390/esa-g5.d: Fix register pair operands.
+	* gas/s390/esa-g5.s: Likewise.
+	* gas/s390/esa-z9-109.d: Likewise.
+	* gas/s390/esa-z9-109.s: Likewise.
+	* gas/s390/zarch-z196.d: Likewise.
+	* gas/s390/zarch-z196.s: Likewise.
+	* gas/s390/zarch-z9-109.d: Likewise.
+	* gas/s390/zarch-z9-109.s: Likewise.
+	* gas/s390/zarch-z900.d: Likewise.
+	* gas/s390/zarch-z900.s: Likewise.
+	* gas/s390/zarch-z990.d: Likewise.
+	* gas/s390/zarch-z990.s: Likewise.
+
+2011-05-20  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* gas/tic6x/pcr-relocs.d: New test.
+	* gas/tic6x/pcr-relocs.s: New test.
+	* gas/tic6x/pcr-relocs-undef.d: New test.
+	* gas/tic6x/pcr-relocs-undef.s: New test.
+	* gas/tic6x/reloc-bad-2.s: Update for pcr_offset.
+	* gas/tic6x/reloc-bad-2.l: Update for pcr_offset.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	* gas/arm/req.l: Updated expected warning message.
+
+2011-05-18  Tristan Gingold  <gingold@adacore.com>
+
+	* gas/ppc/xcoff-dwsect-1-32.d: New test.
+	* gas/ppc/xcoff-dwsect-1-64.d: Ditto.
+	* gas/ppc/xcoff-dwsect-1.s: New file.
+	* gas/ppc/aix.exp (do_align_test): Add tests.
+
+2011-05-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gas/cris/rd-brokw-pic-1.d, gas/cris/rd-brokw-pic-2.d,
+	gas/cris/rd-fragtest-pic.d: Gate on targets cris-*-*elf* and
+	cris-*-linux-gnu.
+	* gas/cris/pic-err-2.s, gas/cris/pic-err-3.s: New tests.
+
+2011-05-14  Alan Modra  <amodra@gmail.com>
+
+	* gas/all/gas.exp: Fix typo last change.
+
+2011-05-13  Alan Modra  <amodra@gmail.com>
+
+	* gas/all/gas.exp: Remove some xfails on redef2 and redef3 tests.
+	Update comments.
+	* gas/hppa/unsorted/unsorted.exp: Run globalbug test on appropriate
+	targets rather than xfailing.
+
+2011-05-12  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	PR gas/12715
+	* gas/arm/neon-const.s: Add testcase for 64-bit Neon constants.
+	* gas/arm/neon-const.d: Likewise.
+
+2011-05-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/24k-branch-delay-1.d: Allow 64-bit addresses.  Stub out
+	function names.
+	* gas/mips/24k-triple-stores-1.d: Likewise.
+	* gas/mips/24k-triple-stores-2.d: Likewise.
+	* gas/mips/24k-triple-stores-3.d: Likewise.
+	* gas/mips/24k-triple-stores-4.d: Likewise.
+	* gas/mips/24k-triple-stores-5.d: Likewise.
+	* gas/mips/24k-triple-stores-7.d: Likewise.
+	* gas/mips/24k-triple-stores-8.d: Likewise.
+	* gas/mips/24k-triple-stores-9.d: Likewise.
+	* gas/mips/24k-triple-stores-10.d: Likewise.
+	* gas/mips/24k-triple-stores-11.d: Likewise.
+	* gas/mips/24k-triple-stores-6.d: Likewise.  Add -EB.
+	* gas/mips/mips.exp: Only run 24k-triple-stores-11.d on ELF targets.
+
+2011-05-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/24k-branch-delay-1.d: Add -32 to assembler options.
+	* gas/mips/24k-triple-stores-1.d: Likewise.
+	* gas/mips/24k-triple-stores-2.d: Likewise.
+	* gas/mips/24k-triple-stores-3.d: Likewise.
+	* gas/mips/24k-triple-stores-4.d: Likewise.
+	* gas/mips/24k-triple-stores-5.d: Likewise.
+	* gas/mips/24k-triple-stores-6.d: Likewise.
+	* gas/mips/24k-triple-stores-7.d: Likewise.
+	* gas/mips/24k-triple-stores-8.d: Likewise.
+	* gas/mips/24k-triple-stores-9.d: Likewise.
+	* gas/mips/24k-triple-stores-10.d: Likewise.
+	* gas/mips/24k-triple-stores-11.d: Likewise.
+
+2011-05-11  Tejas Belagod  <tejas.belagod@arm.com>
+
+	* gas/arm/ld-sp-warn-cortex-m3.d: New test.
+	* gas/arm/ld-sp-warn-cortex-m3.l: New test.
+	* gas/arm/ld-sp-warn-cortex-m4.d: New test.
+	* gas/arm/ld-sp-warn-cortex-m4.l: New test.
+	* gas/arm/ld-sp-warn-v7.d: New test.
+	* gas/arm/ld-sp-warn-v7.l: New test.
+	* gas/arm/ld-sp-warn-v7a.d: New test.
+	* gas/arm/ld-sp-warn-v7a.l: New test.
+	* gas/arm/ld-sp-warn-v7e-m.l: New test.
+	* gas/arm/ld-sp-warn-v7em.d: New test.
+	* gas/arm/ld-sp-warn-v7m.d: New test.
+	* gas/arm/ld-sp-warn-v7m.l: New test.
+	* gas/arm/ld-sp-warn-v7r.d: New test.
+	* gas/arm/ld-sp-warn-v7r.l: New test.
+	* gas/arm/ld-sp-warn.s: New test.
+
+2010-05-10  Quentin Neill  <quentin.neill@amd.com>
+
+	* gas/i386/i386.exp: Add new bdver2 test cases.
+	* gas/i386/nops-1-bdver2.d: New.
+	* gas/i386/x86-64-nops-1-bdver2.d: New.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* gas/tic6x/unwind-1.d: New test.
+	* gas/tic6x/unwind-1.s: New test.
+	* gas/tic6x/unwind-2.d: New test.
+	* gas/tic6x/unwind-2.s: New test.
+	* gas/tic6x/unwind-3.d: New test.
+	* gas/tic6x/unwind-3.s: New test.
+	* gas/tic6x/unwind-bad-1.d: New test.
+	* gas/tic6x/unwind-bad-1.s: New test.
+	* gas/tic6x/unwind-bad-1.l: New test.
+	* gas/tic6x/unwind-bad-2.d: New test.
+	* gas/tic6x/unwind-bad-2.s: New test.
+	* gas/tic6x/unwind-bad-2.l: New test.
+
+2011-04-29  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gas/elf/dwarf2-1.d, gas/elf/dwarf2-2.d: Adjust for change in
+	output format.
+	* gas/i386/dw2-compress-1.d: Ditto.
+
+2011-04-20  Catherine Moore  <clm@codesourcery.com>
+            David Ung <davidu@mips.com>
+
+	* gas/mips/24k-branch-delay-1.d: New.
+	* gas/mips/24k-branch-delay-1.s: New.
+	* gas/mips/24k-triple-stores-1.d: New.
+	* gas/mips/24k-triple-stores-1.s: New.
+	* gas/mips/24k-triple-stores-2.d: New.
+	* gas/mips/24k-triple-stores-2.s: New.
+	* gas/mips/24k-triple-stores-3.d: New.
+	* gas/mips/24k-triple-stores-3.s: New.
+	* gas/mips/24k-triple-stores-4.s: New.
+	* gas/mips/24k-triple-stores-4.d: New.
+	* gas/mips/24k-triple-stores-5.d: New.
+	* gas/mips/24k-triple-stores-5.s: New.
+	* gas/mips/24k-triple-stores-6.d: New.
+	* gas/mips/24k-triple-stores-6.s: New.
+	* gas/mips/24k-triple-stores-7.d: New.
+	* gas/mips/24k-triple-stores-7.s: New.
+	* gas/mips/24k-triple-stores-8.d: New.
+	* gas/mips/24k-triple-stores-8.s: New.
+	* gas/mips/24k-triple-stores-9.d: New.
+	* gas/mips/24k-triple-stores-9.s: New.
+	* gas/mips/24k-triple-stores-10.d: New.
+	* gas/mips/24k-triple-stores-10.s: New.
+	* gas/mips/24k-triple-stores-11.d: New.
+	* gas/mips/24k-triple-stores-11.s: New.
+	* gas/mips/mips.exp: Invoke new tests.
+
+2011-04-19  Nick Clifton  <nickc@redhat.com>
+
+	* gas/arm/mrs-msr-thumb-v7e-m.s: Restore name of basepri_max
+	register.
+	* gas/arm/mrs-msr-thumb-v7e-m.d: Likewise.
+	* gas/arm/arch7.d: Likewise.
+	* gas/arm/arch7.s: Likewise.
+
+2011-04-18  Nick Clifton  <nickc@redhat.com>
+
+	* gas/arm/arch7.s: Fix typo basepri_max should be basepri_mask.
+	* gas/arm/mrs-msr-thumb-v7e-m.s: Likewise.
+	* gas/arm/arch7.d: Update expected disassembly.
+	* gas/arm/attr-march-armv7.d: Remove Microcontroller tag.
+	* gas/arm/blx-bad.d: Only run for ELF based targets.
+	* gas/arm/mrs-msr-thumb-v6t2.d: Likewise.
+	* gas/arm/vldm-arm.d: Likewise.
+	* gas/arm/mrs-msr-thumb-v7-m.d: Likewise.
+	Remove qualifiers from PSR and IAPSR regsiter names.
+	* gas/arm/mrs-msr-thumb-v7e-m.d: Likewise.
+	* gas/arm/thumb2_bcond.d: Update expected disassembly to allow for
+	relaxing of branch insns.
+	* gas/arm/thumb32.d: Fix whitespace problems in disassembly.
+
+2011-04-18  Tristan Gingold  <gingold@adacore.com>
+
+	* gas/macros/app1.s: Export symbol
+	* gas/macros/app2.s: Ditto
+	* gas/macros/app3.s: Ditto
+	* gas/macros/app4.s: Ditto
+	* gas/macros/app4b.s: Ditto
+	* gas/macros/app1.d: Adjust.
+	* gas/macros/app2.d: Ditto.
+	* gas/macros/app3.d: Ditto.
+	* gas/macros/app4.d: Ditto.
+
+2011-04-18  Tristan Gingold  <gingold@adacore.com>
+
+	* lib/gas-defs.exp (get_standard_section_names): Add names for
+	alpha vms.
+	* gas/all/gas.exp: Do not test diff1.s on alpha-vms.
+
+2011-04-14  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* gas/s390/zarch-machine.s: New testcase.
+	* gas/s390/zarch-machine.d: New testcase output.
+	* gas/s390/s390.exp: Execute the new testcase.
+
+2011-04-13  Nick Clifton  <nickc@redhat.com>
+
+	* gas/v850/v850e1.s: Add a insn using reg+offset addressing.
+	* gas/v850/v850e1.d: Add expected disassembly.
+
+2011-04-12  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12534
+	* gas/arm/thumb32.s: Add PC relative LDRD and STRD insns.
+	* gas/arm/thumb32.l: Update expected output.
+	* gas/arm/thumb32.d: Update expected disassembly.
+
+	PR gas/12532
+	* gas/arm/plt-1.d: Update expected disassembly.
+	* gas/arm/thumb2_bcond.d: Likewise.
+	* gas/arm/weakdef-1.d: Likewise.
+
+2011-04-12  Alan Modra  <amodra@gmail.com>
+
+	* gas/all/gas.exp (do_930509a): Don't xfail h8300 and mn10200.
+
+2011-04-11  Julian Brown  <julian@codesourcery.com>
+
+	* gas/arm/mrs-msr-thumb-v7-m.s: New.
+	* gas/arm/mrs-msr-thumb-v7-m.d: New.
+	* gas/arm/mrs-msr-thumb-v7-m-bad.d: New.
+	* gas/arm/mrs-msr-thumb-v7-m-bad.l: New.
+	* gas/arm/mrs-msr-thumb-v7-m-bad.s: New.
+	* gas/arm/mrs-msr-thumb-v7e-m.d: New.
+	* gas/arm/mrs-msr-thumb-v7e-m.s: New.
+	* gas/arm/mrs-msr-arm-v7-a-bad.d: New.
+	* gas/arm/mrs-msr-arm-v7-a-bad.l: New.
+	* gas/arm/mrs-msr-arm-v7-a-bad.s: New.
+	* gas/arm/mrs-msr-arm-v7-a.d: New.
+	* gas/arm/mrs-msr-arm-v7-a.s: New.
+	* gas/arm/mrs-msr-arm-v6.d: New.
+	* gas/arm/mrs-msr-arm-v6.s: New.
+	* gas/arm/mrs-msr-thumb-v6t2.d: New.
+	* gas/arm/mrs-msr-thumb-v6t2.s: New.
+	* gas/arm/arch7.d: Fix typo in disassembly for BASEPRI_MAX,
+	bitmasks for IAPSR etc.
+	* gas/arm/arch7.s: Specify bitmask for APSR writes.
+	* gas/arm/archv6m.s: Likewise.
+	* msr-imm-bad.l: Tweak expected disassembly in error message.
+	* msr-reg-bad.l: Likewise.
+	* msr-imm.d: Tweak expected disassembly.
+	* msr-reg.d: Likewise.
+	* msr-reg-thumb.d: Likewise.
+	* msr-imm.s: Specify bitmask on APSR writes.
+	* msr-reg.s: Add comment about deprecated usage.
+
+2011-04-11  Dan McDonald  <dan@wellkeeper.com>
+
+	PR gas/12296
+	* gas/arm/arch7.s: Add SVC insn.
+	* gas/arm/arch7.d: Add disassembly of SVC insn.
+	* gas/arm/attr-march-armv7.d: Add arch profile tag.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* gas/all/gas.exp (*arm*-*-coff): Change to arm*-*-coff.
+	(thumb*-*-coff, thumb*-*-pe*): Don;t handle.
+	* gas/arm/arm.exp (*arm*-*-*): Change to arm*-*-*.
+	(*xscale*-*-*): Don't handle.
+	* gas/cfi/cfi.exp (xscale*-*): Don't handle.
+	* gas/elf/elf.exp (*arm*-*-*): Change to arm*-*-*.
+	(xscale*-*-*): Don't handle.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* gas/tic6x/scomm-directive-1.s: New test.
+	* gas/tic6x/scomm-directive-1.d: New test.
+	* gas/tic6x/scomm-directive-2.s: New test.
+	* gas/tic6x/scomm-directive-2.d: New test.
+	* gas/tic6x/scomm-directive-3.s: New test.
+	* gas/tic6x/scomm-directive-3.d: New test.
+	* gas/tic6x/scomm-directive-4.s: New test.
+	* gas/tic6x/scomm-directive-4.d: New test.
+	* gas/tic6x/scomm-directive-5.s: New test.
+	* gas/tic6x/scomm-directive-5.d: New test.
+	* gas/tic6x/scomm-directive-6.s: New test.
+	* gas/tic6x/scomm-directive-6.d: New test.
+	* gas/tic6x/scomm-directive-7.s: New test.
+	* gas/tic6x/scomm-directive-7.d: New test.
+	* gas/tic6x/scomm-directive-8.s: New test.
+	* gas/tic6x/scomm-directive-8.d: New test.
+
+2011-03-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/quad.d: Add tests for multiple operands.
+	* gas/i386/ilp32/quad.s: Likewise.
+
+2011-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid BYTEUNPACK insn tests.
+	* gas/bfin/expected_errors.l: Add new error messages.
+
+2011-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid BYTEOP16M insn tests.
+	* gas/bfin/expected_errors.l: Add new error messages.
+
+2011-03-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid BYTEOP16P insn tests.
+	* gas/bfin/expected_errors.l: Add new error messages.
+
+2011-03-28  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid 16bit acc add insn tests.
+	* gas/bfin/expected_errors.l: Add new error messages.
+	* testsuite/gas/bfin/video2.s: Drop invalid 16bit acc add insn.
+	* testsuite/gas/bfin/video2.d: Updated disassembly output.
+
+2011-03-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/inval.s: Remove .quad.
+	* gas/i386/ilp32/inval.l: Updated.
+
+	* gas/i386/ilp32/quad.d: New.
+	* gas/i386/ilp32/quad.s: Likewise.
+
+2011-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid vector add/sub insn tests.
+	* gas/bfin/expected_errors.l: Add new error messages.
+
+2011-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/16bit_illegals.d, gas/bfin/16bit_illegals.s: Delete.
+	* gas/bfin/allinsn16.d, gas/bfin/allinsn16.s: New files.
+	* gas/bfin/bfin.exp: Change 16bit_illegals to allinsn16.
+
+2011-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid dsp mult insn tests.
+	* gas/bfin/expected_errors.l: Add new error messages.
+
+2011-03-23  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/expected_errors.s: Add invalid SEARCH/BITMUX insns.
+	* gas/bfin/expected_errors.l: Add expected errors.
+
+2011-03-18  Alan Modra  <amodra@gmail.com>
+
+	* gas/elf/bad-size.err: Adjust expected error.
+	* gas/i386/bad-size.warn: Likewise.
+	* gas/i386/inval-equ-2.l: Likewise.
+	* gas/symver/symver2.l: Likewise.
+
+2011-03-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/12589
+	* gas/i386/pr12589-1.d: New.
+	* gas/i386/pr12589-1.s: Likewise.
+
+	* gas/i386/i386.exp: Run pr12589-1.
+
+2011-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/bad-size.d: New.
+	* gas/i386/bad-size.s: Likewise.
+	* gas/i386/bad-size.warn: Likewise.
+
+	* gas/i386/i386.exp: Run bad-size for ELF targets.
+
+2011-03-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/elf/bad-size.err: Revert the last change.
+
+2011-03-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/elf/bad-size.err: Updated.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/alnv_ps-swap.d: New test for ALNV.PS instruction
+	branch swapping.
+	* gas/mips/alnv_ps-swap.s: Source for the new test.
+	* gas/mips/mips.exp: Run the new test.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/relax-bposge.l: New test for DSP branch relaxation.
+	* gas/mips/relax-bposge.s: Source for the new test.
+	* gas/mips/mips.exp: Run the new test.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/relax-at.d: New test for branch relaxation with .set
+	at.
+	* gas/mips/relax.s: Update to support the new test.
+	* gas/mips/relax.l: Update accordingly.
+	* gas/mips/relax.d: Update for multi-arch invocation.
+	* gas/mips/mips.exp: Run the new test.  Adjust to run "relax"
+	across all applicable architectures.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/branch-misc-2.d: Adjust for relocation change.
+	* gas/mips/branch-misc-2pic.d: Likewise.
+	* gas/mips/branch-misc-4.d: New test for PC-relative relocation
+	overflow.
+	* gas/mips/branch-misc-4-64.d: Likewise.
+	* gas/mips/branch-misc-4.s: Source for the new tests.
+	* testsuite/gas/mips/mips.exp: Run the new tests.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/relax-swap1.l: Adjust for message capitalization
+	correction.
+	* gas/mips/relax-swap2.l: Likewise.
+	* gas/mips/relax.l: Likewise.
+
+2011-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/ilp32.exp: Run reloc64.
+
+	* gas/i386/ilp32/reloc64.s: Allow TLS relocations with 32bit
+	register destinations.
+	* gas/i386/ilp32/reloc64.d: Updated.
+
+	* gas/i386/ilp32/reloc64.l: New.
+
+2011-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/12519
+	* gas/elf/bad-size.d: New.
+	* gas/elf/bad-size.err: Likewise.
+	* gas/elf/bad-size.s: Likewise.
+
+	* gas/elf/elf.exp: Run bad-size.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/arithmetic.d, gas/bfin/parallel.d: Change A0 to A1.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/arithmetic.d, gas/bfin/parallel.d, gas/bfin/parallel3.d,
+	gas/bfin/vector.d, gas/bfin/vector2.d: Add ".L" to dsp mult insns.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* gas/bfin/video.d, gas/bfin/video.s, gas/bfin/video2.d,
+	gas/bfin/video2.s: Remove BYTEOP2M insns.
+
+2011-02-10  Kai Tietz  <kai.tietz@onevision.com>
+
+	* gas/cfi/cfi-x86_64.d: Adjust for x64 PE+.
+
+2011-02-10  Vincent Rivière  <vincent.riviere@freesbee.fr>
+
+	* gas/m68k/cpu32.d: Set explicit architecture for objdump.
+	* gas/m68k/mcf-coproc.d: Likewise.
+	* gas/m68k/mcf-wdebug.d: Likewise.
+
+2011-02-10  Alan Modra  <amodra@gmail.com>
+
+	* gas/elf/dwarf2-4.s: Don't use @.
+
+2011-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/6957
+	* gas/i386/nops-1-i686.d: Updated.
+	* gas/i386/nops-3-i686.d: Likewise.
+	* gas/i386/nops-4-i686.d: Likewise.
+
+2011-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/i386.exp: Run nops-4a-i686 and nops-6.
+
+	* gas/i386/nops-4a-i686.d: New.
+	* gas/i386/nops-6.d: Likewise.
+	* gas/i386/nops-6.s: Likewise.
+
+2011-02-07  Vincent Riviere  <vincent.riviere@freesbee.fr>
+
+	PR gas/3041
+	* gas/m68k/p3041pcrel.s, * gas/m68k/p3041pcrel.d: New test.
+	* gas/m68k/all.exp: Add "p3041pcrel" and enable p3041 tests for
+	all m68k-aout targets.
+
+2011-02-04  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* gas/tic6x/dir-junk.l: Remove tests for .atomic and .noatomic.
+	* gas/tic6x/dir-junk.s: Likewise.
+	* gas/tic6x/insns-c674x-bad.d: Remove test.
+	* gas/tic6x/insns-c674x-bad.l: Likewise.
+	* gas/tic6x/insns-c674x-bad.s: Likewise.
+	* gas/tic6x/insns-atomic.d: Remove "-matomic" switch.
+
+2011-01-31  Nick Clifton  <nickc@redhat.com>
+
+	* gas/all/align.d: Skip for the RX.
+	* gas/elf/group1a.d: Likewise.
+	* gas/elf/groupautoa.d: Likewise.
+	* gas/elf/elf.exp: Do not run section5 test for the RX port.
+	* gas/elf/section4.d: Likewise.
+	* gas/elf/section7.d: Likewise.
+	* gas/macros/semi.s: Fill with a non-zero pattern.
+	* gas/macros/semi.d: Expect non-zero fill value.
+	* gas/rx/bcnd.d: Update expected disassembly.
+	* gas/rx/bra.d: Likewise.
+	* gas/rx/macros.inc: Add reg1 macro.
+	* gas/rx/max.sm: Use reg1 macro to avoid generating illegal NOP
+	instruction.
+	* gas/rx/mov.sm: Likewise.
+	* gas/rx/max.d: Update expected disassembly.
+	* gas/rx/mov.d: Likewise.
+	* gas/rx/rx-asm-good.s: Use Renesas section names.
+	* gas/rx/rx-asm-good.d: Update expected disassembly.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/12409
+	* gas/elf/dwarf2-4.d: New.
+	* gas/elf/dwarf2-4.s: Likewise.
+
+	* gas/elf/elf.exp: Run dwarf2-4.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/intel.d: Updated.
+	* gas/i386/opcode-intel.d: Likewise.
+	* gas/i386/opcode-suffix.d: Likewise.
+	* gas/i386/opcode.d: Likewise.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/x86-64-arch-2.d: Add tbm flag and TBM instruction
+	pattern.
+
+2011-01-17  Quentin Neill  <quentin.neill@amd.com>
+
+	* gas/i386/tbm.s: New.
+	* gas/i386/tbm.d: New.
+	* gas/i386/tbm-intel.d: New.
+	* gas/i386/x86-64-tbm.s: New.
+	* gas/i386/x86-64-tbm.d: New.
+	* gas/i386/x86-64-tbm-intel.d: New.
+	* gas/i386/arch-10.d: Add tbm flag and TBM instruction pattern.
+	* gas/i386/arch-10.s: Add a TBM instruction.
+	* gas/i386/arch-10-1.l: Add TBM instruction pattern.
+	* gas/i386/arch-10-2.l: Likewise.
+	* gas/i386/arch-10-3.l: Likewise.
+	* gas/i386/arch-10-4.l: Likewise.
+	* gas/i386/x86-64-arch-2.s: Likewise.
+	* gas/i386/x86-64-arch-2.d: Likewise.
+
+2011-01-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/immed64.s: New.
+	* gas/i386/ilp32/reloc64.s: Likewise.
+	* gas/i386/ilp32/x86-64-pcrel.s: Likewise.
+
+	* gas/i386/ilp32/inval.s: Add more tests.
+
+	* gas/i386/ilp32/immed64.d: Updated.
+	* gas/i386/ilp32/inval.l: Likewise.
+	* gas/i386/ilp32/reloc64.d: Likewise.
+	* gas/i386/ilp32/x86-64-pcrel.d: Likewise.
+
+2011-01-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/ilp32.exp: Run inval.
+
+	* gas/i386/ilp32/inval.l: New.
+	* gas/i386/ilp32/inval.s: Likewise.
+	* gas/i386/ilp32/x86-64.s: Likewise.
+
+	* gas/i386/ilp32/x86-64.d: Don't use ../x86_64.s.  Updated.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/cfi/ilp32.exp: Replace --n32 with --x32.
+	* gas/i386/ilp32/elf/ilp32.exp: Likewise.
+	* gas/i386/ilp32/ilp32.exp: Likewise.
+	* gas/i386/ilp32/lns/ilp32.exp: Likewise.
+
+2011-01-11  Mingjie Xing  <mingjie.xing@gmail.com>
+
+	* mips/loongson-3a-2.s, mips/loongson-3a-2.d: Use the real offset
+	value in assembly.
+
+2011-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+	    Glauber de Oliveira Costa  <glommer@gmail.com>
+
+	* gas/arm/tls.s: Add tlsdesc tests.
+	* gas/arm/tls.d: Adjust.
+
+2011-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/ilp32/x86-64-arch-2.d: Add bmi flag and BMI instruction
+	pattern.
+
+2011-01-07  Quentin Neill  <quentin.neill@amd.com>
+
+	* gas/i386/arch-10.s: Add a BMI instruction.
+	* gas/i386/x86-64-arch-2.s: Likewise.
+	* gas/i386/arch-10.d: Add bmi flag and BMI instruction pattern.
+	* gas/i386/x86-64-arch-2.d: Likewise.
+	* gas/i386/arch-10-1.l: Add BMI instruction pattern.
+	* gas/i386/arch-10-2.l: Likewise.
+	* gas/i386/arch-10-3.l: Likewise.
+	* gas/i386/arch-10-4.l: Likewise.
+
+2011-01-06  Paul Koning  <ni1d@arrl.net>
+
+	* gas/pdp11/pdp11.exp: Add run of absreloc.
+
+2011-01-06  Paul Koning  <ni1d@arrl.net>
+
+	* gas/pdp11/absreloc.s: New.
+	* gas/pdp11/absreloc.d: New.
+
+2011-01-06  Paul Koning  <ni1d@arrl.net>
+
+	* gas/pdp11/opcode.d: Fix expected output for sec instruction.
+
+2011-01-05  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* gas/arm/blx-bad.s: New.
+	* gas/arm/blx-bad.d: New.
 
-	* gas/mach-o/zerofill-2.d: New.
+2011-01-04  H.J. Lu  <hongjiu.lu@intel.com>
 
-2012-01-04  Iain Sandoe  <idsandoe@googlemail.com>
+	* gas/i386/bmi-intel.d: New.
+	* gas/i386/bmi.d: Likewise.
+	* gas/i386/bmi.s: Likewise.
+	* gas/i386/x86-64-bmi-intel.d: Likewise.
+	* gas/i386/x86-64-bmi.d: Likewise.
+	* gas/i386/x86-64-bmi.s: Likewise.
 
-	* gas/mach-o/zerofill-1.d: New.
-	* gas/mach-o/zerofill-1.s: New.
+	* gas/i386/i386.exp: Run bmi, bmi-intel, x86-64-bmi and
+	x86-64-bmi-intel.
 
-2012-01-03  Iain Sandoe  <idsandoe@googlemail.com>
+2011-01-01  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* gas/mach-o/dysymtab-1-64.d: New.
-	* gas/mach-o/dysymtab-1.d: New.
-	* gas/mach-o/symbols-1-64.d: New.
-	* gas/mach-o/symbols-1.d: New.
-	* gas/mach-o/symbols-base-64.s: New.
-	* gas/mach-o/symbols-base.s: New.
+	* gas/i386/ilp32/lns/lns-common-1.d: Also expect .zdebug in
+	section name.
+	* gas/i386/ilp32/lns/lns-duplicate.d: Likewise.
 
-For older changes see ChangeLog-2011
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index 169fdb4660..5bcefcf29f 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -132,11 +132,9 @@ case $target_triplet in {
 	run_dump_test redef
 	# These targets fail redef2 because they disallow redefined
 	# symbols on relocs.
-	setup_xfail "m68hc1*-*-*" "m6811-*-*" "m6812-*-*"
-	setup_xfail "rx-*-*" "vax*-*-*" "z8k-*-*"
+	setup_xfail "m68hc*-*-*" "rx-*-*" "vax*-*-*" "z8k-*-*"
 	run_dump_test redef2
-	setup_xfail "m68hc1*-*-*" "m6811-*-*" "m6812-*-*"
-	setup_xfail "rx-*-*" "vax*-*-*" "z8k-*-*"
+	setup_xfail "m68hc*-*-*" "rx-*-*" "vax*-*-*" "z8k-*-*"
 	# rs6000-aix disallows redefinition via .comm.
 	setup_xfail "*-*-aix*"
 	# SOM uses a different syntax for .comm
diff --git a/gas/testsuite/gas/all/redef2.d b/gas/testsuite/gas/all/redef2.d
index c50cd6c94c..244d33dd68 100644
--- a/gas/testsuite/gas/all/redef2.d
+++ b/gas/testsuite/gas/all/redef2.d
@@ -1,6 +1,5 @@
 #objdump: -rs -j .data -j "\$DATA\$"
 #name: .equ redefinitions (2)
-#not-target: *-*-darwin*
 
 .*: .*
 
diff --git a/gas/testsuite/gas/all/redef3.d b/gas/testsuite/gas/all/redef3.d
index a16fac3c9b..566f9c95d5 100644
--- a/gas/testsuite/gas/all/redef3.d
+++ b/gas/testsuite/gas/all/redef3.d
@@ -1,6 +1,6 @@
 #objdump: -rsj .data
 #name: .equ redefinitions (3)
-#not-target: arc-*-* *-*darwin*
+#not-target: arc-*-*
 
 .*: .*
 
diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
index b44d1fced4..ee37d97700 100644
--- a/gas/testsuite/gas/all/weakref1.d
+++ b/gas/testsuite/gas/all/weakref1.d
@@ -2,9 +2,8 @@
 #name: weakref tests, relocations
 # ecoff (OSF/alpha) lacks .weak support
 # pdp11 lacks .long
-# darwin (mach-o) reverses the order of relocs.
 # the following must be present in all weakref1*.d
-#not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout *-*-darwin*
+#not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout
 
 #...
 RELOCATION RECORDS FOR \[(\.text|\$CODE\$)\]:
diff --git a/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d
index 6276e8d2f3..3261311c92 100644
--- a/gas/testsuite/gas/arm/adrl.d
+++ b/gas/testsuite/gas/arm/adrl.d
@@ -8,9 +8,9 @@
 Disassembly of section .text:
 	...
 0+2000 <.*> e24f0008 	sub	r0, pc, #8
-0+2004 <.*> e2400c20 	sub	r0, r0, #32, 24	; 0x2000
+0+2004 <.*> e2400c20 	sub	r0, r0, #8192	; 0x2000
 0+2008 <.*> e28f0020 	add	r0, pc, #32
-0+200c <.*> e2800c20 	add	r0, r0, #32, 24	; 0x2000
+0+200c <.*> e2800c20 	add	r0, r0, #8192	; 0x2000
 0+2010 <.*> e24f0018 	sub	r0, pc, #24
 0+2014 <.*> e1a00000 	nop			; \(mov r0, r0\)
 0+2018 <.*> e28f0008 	add	r0, pc, #8
@@ -18,7 +18,7 @@ Disassembly of section .text:
 0+2020 <.*> 028f0000 	addeq	r0, pc, #0
 0+2024 <.*> e1a00000 	nop			; \(mov r0, r0\)
 0+2028 <.*> e24f0030 	sub	r0, pc, #48	; 0x30
-0+202c <.*> e2400c20 	sub	r0, r0, #32, 24	; 0x2000
+0+202c <.*> e2400c20 	sub	r0, r0, #8192	; 0x2000
 0+2030 <.*> e28f0c21 	add	r0, pc, #8448	; 0x2100
 0+2034 <.*> e1a00000 	nop			; \(mov r0, r0\)
 	...
diff --git a/gas/testsuite/gas/arm/attr-cpu-directive.d b/gas/testsuite/gas/arm/attr-cpu-directive.d
index f3c1081d2c..db0edfeb69 100644
--- a/gas/testsuite/gas/arm/attr-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-cpu-directive.d
@@ -12,4 +12,5 @@ File Attributes
   Tag_CPU_arch_profile: Application
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-default.d b/gas/testsuite/gas/arm/attr-default.d
index 4439180dfe..93d5bf636f 100644
--- a/gas/testsuite/gas/arm/attr-default.d
+++ b/gas/testsuite/gas/arm/attr-default.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv1.d b/gas/testsuite/gas/arm/attr-march-armv1.d
index 4867087637..8c09564f70 100644
--- a/gas/testsuite/gas/arm/attr-march-armv1.d
+++ b/gas/testsuite/gas/arm/attr-march-armv1.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "1"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv2.d b/gas/testsuite/gas/arm/attr-march-armv2.d
index 352e38f1f7..0ed663a45e 100644
--- a/gas/testsuite/gas/arm/attr-march-armv2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "2"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv2a.d b/gas/testsuite/gas/arm/attr-march-armv2a.d
index 956f6fd304..862ec74d14 100644
--- a/gas/testsuite/gas/arm/attr-march-armv2a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2a.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "2A"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv2s.d b/gas/testsuite/gas/arm/attr-march-armv2s.d
index 67ba746148..6db9d34ed0 100644
--- a/gas/testsuite/gas/arm/attr-march-armv2s.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2s.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "2S"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv3.d b/gas/testsuite/gas/arm/attr-march-armv3.d
index e3b606c1f7..aea9cf7ef5 100644
--- a/gas/testsuite/gas/arm/attr-march-armv3.d
+++ b/gas/testsuite/gas/arm/attr-march-armv3.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "3"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv3m.d b/gas/testsuite/gas/arm/attr-march-armv3m.d
index b3878cdbba..a7df5a2d41 100644
--- a/gas/testsuite/gas/arm/attr-march-armv3m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv3m.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "3M"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv4.d b/gas/testsuite/gas/arm/attr-march-armv4.d
index c0c3b92bd4..649d02c1fe 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "4"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv4t.d b/gas/testsuite/gas/arm/attr-march-armv4t.d
index c2a5d98a1d..0ac758ffbb 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4t.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4t.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v4T
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv4txm.d b/gas/testsuite/gas/arm/attr-march-armv4txm.d
index 2b29db5f85..260e6a696c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4txm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4txm.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v4T
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv4xm.d b/gas/testsuite/gas/arm/attr-march-armv4xm.d
index b1966019cc..dea944bfcd 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4xm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4xm.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "4XM"
   Tag_CPU_arch: v4
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv5.d b/gas/testsuite/gas/arm/attr-march-armv5.d
index 2ed81c9603..c21d80b50c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "5"
   Tag_CPU_arch: v5T
   Tag_ARM_ISA_use: Yes
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv5t.d b/gas/testsuite/gas/arm/attr-march-armv5t.d
index 23e132468e..1270fd4271 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5t.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5t.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v5T
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv5te.d b/gas/testsuite/gas/arm/attr-march-armv5te.d
index 25699959cb..2601545819 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5te.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5te.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v5TE
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv5tej.d b/gas/testsuite/gas/arm/attr-march-armv5tej.d
index 780a9f98a9..3b4b636cb7 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5tej.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5tej.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v5TEJ
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv5texp.d b/gas/testsuite/gas/arm/attr-march-armv5texp.d
index 4f3a75f013..67a773070f 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5texp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5texp.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v5TE
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv5txm.d b/gas/testsuite/gas/arm/attr-march-armv5txm.d
index e78ca3fe7e..e4d75c2012 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5txm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5txm.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v5T
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6-m+os.d b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
index e5d320851c..7dd7a73f24 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6S-M
   Tag_CPU_arch_profile: Microcontroller
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6-m.d b/gas/testsuite/gas/arm/attr-march-armv6-m.d
index ad79347398..36ac3c8c77 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6-m.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6-M
   Tag_CPU_arch_profile: Microcontroller
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6.d b/gas/testsuite/gas/arm/attr-march-armv6.d
index f509d5faea..a8561e1233 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6j.d b/gas/testsuite/gas/arm/attr-march-armv6j.d
index d8b37ec8cd..627986c251 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6j.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6j.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6k+sec.d b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
index a50e8d4cb0..cff3f3acf3 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
@@ -11,4 +11,5 @@ File Attributes
   Tag_CPU_arch: v6KZ
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-march-armv6k.d b/gas/testsuite/gas/arm/attr-march-armv6k.d
index 4ff70574b0..321ecf2af7 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6k.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6k.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6K
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6kt2.d b/gas/testsuite/gas/arm/attr-march-armv6kt2.d
index 43db36b19e..db2fe9aa63 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6kt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6kt2.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6T2
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6s-m.d b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
index ad79347398..36ac3c8c77 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6s-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6-M
   Tag_CPU_arch_profile: Microcontroller
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6t2.d b/gas/testsuite/gas/arm/attr-march-armv6t2.d
index d0074f13a6..ac2aa238f6 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6t2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6t2.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v6T2
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv6z.d b/gas/testsuite/gas/arm/attr-march-armv6z.d
index 97b14df991..6464be049c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6z.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6z.d
@@ -11,4 +11,5 @@ File Attributes
   Tag_CPU_arch: v6KZ
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zk.d b/gas/testsuite/gas/arm/attr-march-armv6zk.d
index 85f639b44b..47b8ea8194 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6zk.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zk.d
@@ -11,4 +11,5 @@ File Attributes
   Tag_CPU_arch: v6KZ
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zkt2.d b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
index 5bc1c722b6..326acdec51 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
@@ -11,4 +11,5 @@ File Attributes
   Tag_CPU_arch: v6T2
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zt2.d b/gas/testsuite/gas/arm/attr-march-armv6zt2.d
index 14e2c1202f..e07dca52f5 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6zt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zt2.d
@@ -11,4 +11,5 @@ File Attributes
   Tag_CPU_arch: v6T2
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
index 74ff80dc3d..663a889ecd 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
@@ -13,3 +13,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
   Tag_MPextension_use: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
index 1d5ed4eb6a..190189ee3c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
@@ -12,4 +12,5 @@ File Attributes
   Tag_CPU_arch_profile: Application
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a.d b/gas/testsuite/gas/arm/attr-march-armv7-a.d
index da687a75f0..3a6fb3b516 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_CPU_arch_profile: Application
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv7.d b/gas/testsuite/gas/arm/attr-march-armv7.d
index 8ca9e7d6d5..57e021e1fa 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "7"
   Tag_CPU_arch: v7
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-armv7a.d b/gas/testsuite/gas/arm/attr-march-armv7a.d
index 055b3cfcad..6ce60ef70c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7a.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_CPU_arch_profile: Application
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-iwmmxt.d b/gas/testsuite/gas/arm/attr-march-iwmmxt.d
index ccc496164a..b647147382 100644
--- a/gas/testsuite/gas/arm/attr-march-iwmmxt.d
+++ b/gas/testsuite/gas/arm/attr-march-iwmmxt.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_WMMX_arch: WMMXv1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-iwmmxt2.d b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
index be46d22153..69c3ef80cc 100644
--- a/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
+++ b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_WMMX_arch: WMMXv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-march-xscale.d b/gas/testsuite/gas/arm/attr-march-xscale.d
index 5c80a6d86c..7b1761766a 100644
--- a/gas/testsuite/gas/arm/attr-march-xscale.d
+++ b/gas/testsuite/gas/arm/attr-march-xscale.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v5TE
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d
index 32da24887e..459f94ab05 100644
--- a/gas/testsuite/gas/arm/attr-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-mcpu.d
@@ -14,4 +14,5 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-2
   Tag_FP_arch: VFPv3
   Tag_Advanced_SIMD_arch: NEONv1
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
index 95ea725dd0..b6db97db98 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
index 19b001b926..efc2cd534e 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
index f25aebe212..ed065e7db8 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
index 4b8fce6bdf..f2de9befe2 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d b/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
index 5e14e3f69c..5f1ca3032b 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa.d b/gas/testsuite/gas/arm/attr-mfpu-fpa.d
index 425e44df1d..da56a7d601 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpa.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa10.d b/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
index 339daf08b4..6399fff4dd 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa11.d b/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
index 5b94ac5115..1a4b9e701c 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe.d b/gas/testsuite/gas/arm/attr-mfpu-fpe.d
index 416bb5bd0b..87283b3731 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpe.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe2.d b/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
index a34cc6f82b..bfcfb4afcc 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe3.d b/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
index c9174549e9..a578f750e2 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-maverick.d b/gas/testsuite/gas/arm/attr-mfpu-maverick.d
index afbbc6ce2e..994d4b69ca 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-maverick.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-maverick.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
index 3866572b28..6f401bfbc3 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_FP_arch: VFPv3
   Tag_Advanced_SIMD_arch: NEONv1
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon.d b/gas/testsuite/gas/arm/attr-mfpu-neon.d
index 1d7d33b801..1dd33a5881 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-neon.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-neon.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
   Tag_Advanced_SIMD_arch: NEONv1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softfpa.d b/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
index d46115bc35..abe315afbd 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
index d0524c29ae..462bc139b9 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
index bab19b607d..8d9a894241 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp.d b/gas/testsuite/gas/arm/attr-mfpu-vfp.d
index 331b81a180..9c66044e80 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
index 6f89e6abe0..bc44861f21 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
index 37af075817..6f16f12b99 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
index f02d2cdb54..5c0964c369 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
index 57f5df7eb2..516b8b6e93 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
index 678eb9eeb6..b259b8207b 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv2
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
index 36d9914bde..88d9ca7382 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3-D16
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
index b6cf496d7d..9b22499af7 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
index 967e912a54..3ec64bd3d7 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4-D16
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
index fd92773a6a..4d2726f0b1 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
index 6896d17669..9a1a9f5547 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv1
   Tag_ABI_HardFP_use: SP only
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-order.d b/gas/testsuite/gas/arm/attr-order.d
index 83f9f68bff..99ecd7ba48 100644
--- a/gas/testsuite/gas/arm/attr-order.d
+++ b/gas/testsuite/gas/arm/attr-order.d
@@ -13,6 +13,7 @@ File Attributes
   Tag_CPU_arch: v4T
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
   Tag_unknown_63: "val"
   Tag_also_compatible_with: v6-M
   Tag_T2EE_use: Allowed
diff --git a/gas/testsuite/gas/arm/attr-override-cpu-directive.d b/gas/testsuite/gas/arm/attr-override-cpu-directive.d
index 54c5e37bb1..9423392ffa 100644
--- a/gas/testsuite/gas/arm/attr-override-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-override-cpu-directive.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_name: "custom name"
   Tag_CPU_arch: v7
   Tag_THUMB_ISA_use: \?\?\? \(10\)
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/attr-override-mcpu.d b/gas/testsuite/gas/arm/attr-override-mcpu.d
index cfa11b9d7f..425f0959ff 100644
--- a/gas/testsuite/gas/arm/attr-override-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-override-mcpu.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_CPU_arch: v4T
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/eabi_attr_1.d b/gas/testsuite/gas/arm/eabi_attr_1.d
index e3e3982d41..a8762ff29b 100644
--- a/gas/testsuite/gas/arm/eabi_attr_1.d
+++ b/gas/testsuite/gas/arm/eabi_attr_1.d
@@ -10,5 +10,6 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_ABI_VFP_args: VFP registers
   Tag_compatibility: flag = 3, vendor = GNU
+  Tag_DIV_use: Not allowed
   Tag_unknown_128: 1234 \(0x4d2\)
   Tag_unknown_129: "bar"
diff --git a/gas/testsuite/gas/arm/neon-suffix-bad.l b/gas/testsuite/gas/arm/neon-suffix-bad.l
index 091429dc11..4c44f6b1cb 100644
--- a/gas/testsuite/gas/arm/neon-suffix-bad.l
+++ b/gas/testsuite/gas/arm/neon-suffix-bad.l
@@ -2,8 +2,6 @@
 [^:]*:3: Error: invalid neon suffix for non neon instruction
 [^:]*:4: Error: invalid neon suffix for non neon instruction
 [^:]*:5: Error: invalid neon suffix for non neon instruction
-[^:]*:6: Error: invalid instruction shape -- `vcvt.f64.s32 d0,s0,#11'
+[^:]*:8: Error: invalid neon suffix for non neon instruction
 [^:]*:9: Error: invalid neon suffix for non neon instruction
 [^:]*:10: Error: invalid neon suffix for non neon instruction
-[^:]*:11: Error: invalid neon suffix for non neon instruction
-[^:]*:12: Error: invalid instruction shape -- `vcvt.f64.s32 d0,s0,#11'
diff --git a/gas/testsuite/gas/arm/neon-suffix-bad.s b/gas/testsuite/gas/arm/neon-suffix-bad.s
index 20c60fe89f..288dba762b 100644
--- a/gas/testsuite/gas/arm/neon-suffix-bad.s
+++ b/gas/testsuite/gas/arm/neon-suffix-bad.s
@@ -3,11 +3,10 @@
 add.f32 r0, r0, r0
 faddd.f32 d0, d0, d0
 faddd.f64 d0, d0, d0
-vcvt.f64.s32 d0, s0, #11
 
 .thumb
 add.f32 r0, r0, r0
 faddd.f32 d0, d0, d0
 faddd.f64 d0, d0, d0
-vcvt.f64.s32 d0, s0, #11
+
 
diff --git a/gas/testsuite/gas/arm/pic.d b/gas/testsuite/gas/arm/pic.d
index ac2a65d7e8..f5232a3699 100644
--- a/gas/testsuite/gas/arm/pic.d
+++ b/gas/testsuite/gas/arm/pic.d
@@ -13,7 +13,7 @@ Disassembly of section .text:
 00+0 <[^>]*> eb...... 	bl	00+. <[^>]*>
 			0: R_ARM_(PC24|CALL)	foo.*
 00+4 <[^>]*> eb...... 	bl	0[0123456789abcdef]+ <[^>]*>
-			4: R_ARM_(PLT32|CALL)	foo
+			4: R_ARM_PLT32	foo
 	\.\.\.
 			8: R_ARM_ABS32	sym
 			c: R_ARM_GOT32	sym
diff --git a/gas/testsuite/gas/arm/pr12198-1.d b/gas/testsuite/gas/arm/pr12198-1.d
index 5bbd828b2d..c5f7718745 100644
--- a/gas/testsuite/gas/arm/pr12198-1.d
+++ b/gas/testsuite/gas/arm/pr12198-1.d
@@ -9,3 +9,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_CPU_arch: v4T
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/pr12198-2.d b/gas/testsuite/gas/arm/pr12198-2.d
index 6935bcfea9..39465c8883 100644
--- a/gas/testsuite/gas/arm/pr12198-2.d
+++ b/gas/testsuite/gas/arm/pr12198-2.d
@@ -10,3 +10,4 @@ File Attributes
   Tag_CPU_arch: v6S-M
   Tag_CPU_arch_profile: Microcontroller
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/gas/testsuite/gas/arm/sp-pc-usage-t.d b/gas/testsuite/gas/arm/sp-pc-usage-t.d
index 6dedc00ce4..706f2a17e7 100644
--- a/gas/testsuite/gas/arm/sp-pc-usage-t.d
+++ b/gas/testsuite/gas/arm/sp-pc-usage-t.d
@@ -22,61 +22,62 @@ Disassembly of section .text:
 0000002e <foo\+0x2e> f8dd d000 	ldr.w	sp, \[sp\]
 00000032 <foo\+0x32> f8dd f000 	ldr.w	pc, \[sp\]
 00000036 <foo\+0x36> f8df d000 	ldr.w	sp, \[pc\]	; 00000038 <foo\+0x38>
-0000003a <foo\+0x3a> 9000      	str	r0, \[sp, #0\]
-0000003c <foo\+0x3c> f8c0 d000 	str.w	sp, \[r0\]
-00000040 <foo\+0x40> f8cd d000 	str.w	sp, \[sp\]
-00000044 <foo\+0x44> 4468      	add	r0, sp
-00000046 <foo\+0x46> eb1d 0000 	adds.w	r0, sp, r0
-0000004a <foo\+0x4a> eb0d 0040 	add.w	r0, sp, r0, lsl #1
-0000004e <foo\+0x4e> eb1d 0040 	adds.w	r0, sp, r0, lsl #1
-00000052 <foo\+0x52> f11d 0f00 	cmn.w	sp, #0
-00000056 <foo\+0x56> eb1d 0f00 	cmn.w	sp, r0
-0000005a <foo\+0x5a> eb1d 0f40 	cmn.w	sp, r0, lsl #1
-0000005e <foo\+0x5e> f1bd 0f00 	cmp.w	sp, #0
-00000062 <foo\+0x62> 4585      	cmp	sp, r0
-00000064 <foo\+0x64> ebbd 0f40 	cmp.w	sp, r0, lsl #1
-00000068 <foo\+0x68> b080      	sub	sp, #0
-0000006a <foo\+0x6a> f1bd 0d00 	subs.w	sp, sp, #0
-0000006e <foo\+0x6e> f1ad 0000 	sub.w	r0, sp, #0
-00000072 <foo\+0x72> f1bd 0000 	subs.w	r0, sp, #0
-00000076 <foo\+0x76> b001      	add	sp, #4
-00000078 <foo\+0x78> a801      	add	r0, sp, #4
-0000007a <foo\+0x7a> f11d 0d04 	adds.w	sp, sp, #4
-0000007e <foo\+0x7e> f11d 0004 	adds.w	r0, sp, #4
-00000082 <foo\+0x82> f20d 0004 	addw	r0, sp, #4
-00000086 <foo\+0x86> b001      	add	sp, #4
-00000088 <foo\+0x88> f11d 0d04 	adds.w	sp, sp, #4
-0000008c <foo\+0x8c> f20d 0d04 	addw	sp, sp, #4
-00000090 <foo\+0x90> 4485      	add	sp, r0
-00000092 <foo\+0x92> 4468      	add	r0, sp
-00000094 <foo\+0x94> eb0d 0040 	add.w	r0, sp, r0, lsl #1
-00000098 <foo\+0x98> eb1d 0d00 	adds.w	sp, sp, r0
-0000009c <foo\+0x9c> eb1d 0000 	adds.w	r0, sp, r0
-000000a0 <foo\+0xa0> eb1d 0040 	adds.w	r0, sp, r0, lsl #1
-000000a4 <foo\+0xa4> 4485      	add	sp, r0
-000000a6 <foo\+0xa6> eb0d 0d40 	add.w	sp, sp, r0, lsl #1
-000000aa <foo\+0xaa> eb1d 0d00 	adds.w	sp, sp, r0
-000000ae <foo\+0xae> eb1d 0d40 	adds.w	sp, sp, r0, lsl #1
-000000b2 <foo\+0xb2> 44ed      	add	sp, sp
-000000b4 <foo\+0xb4> f1ad 0000 	sub.w	r0, sp, #0
-000000b8 <foo\+0xb8> f1bd 0000 	subs.w	r0, sp, #0
-000000bc <foo\+0xbc> f2ad 0000 	subw	r0, sp, #0
-000000c0 <foo\+0xc0> b080      	sub	sp, #0
-000000c2 <foo\+0xc2> f1bd 0d00 	subs.w	sp, sp, #0
-000000c6 <foo\+0xc6> f2ad 0d00 	subw	sp, sp, #0
-000000ca <foo\+0xca> b080      	sub	sp, #0
-000000cc <foo\+0xcc> f1bd 0d00 	subs.w	sp, sp, #0
-000000d0 <foo\+0xd0> ebad 0040 	sub.w	r0, sp, r0, lsl #1
-000000d4 <foo\+0xd4> ebbd 0040 	subs.w	r0, sp, r0, lsl #1
-000000d8 <foo\+0xd8> ebad 0d40 	sub.w	sp, sp, r0, lsl #1
-000000dc <foo\+0xdc> ebbd 0d40 	subs.w	sp, sp, r0, lsl #1
-000000e0 <foo\+0xe0> a001      	add	r0, pc, #4	; \(adr r0, 000000e8 <foo\+0xe8>\)
-000000e2 <foo\+0xe2> f2af 0004 	subw	r0, pc, #4
-000000e6 <foo\+0xe6> f20f 0004 	addw	r0, pc, #4
+0000003a <foo\+0x3a> f850 d00f 	ldr.w	sp, \[r0, pc\]
+0000003e <foo\+0x3e> 9000      	str	r0, \[sp, #0\]
+00000040 <foo\+0x40> f8c0 d000 	str.w	sp, \[r0\]
+00000044 <foo\+0x44> f8cd d000 	str.w	sp, \[sp\]
+00000048 <foo\+0x48> f840 d00f 	str.w	sp, \[r0, pc\]
+0000004c <foo\+0x4c> 4468      	add	r0, sp
+0000004e <foo\+0x4e> eb1d 0000 	adds.w	r0, sp, r0
+00000052 <foo\+0x52> eb0d 0040 	add.w	r0, sp, r0, lsl #1
+00000056 <foo\+0x56> eb1d 0040 	adds.w	r0, sp, r0, lsl #1
+0000005a <foo\+0x5a> f11d 0f00 	cmn.w	sp, #0
+0000005e <foo\+0x5e> eb1d 0f00 	cmn.w	sp, r0
+00000062 <foo\+0x62> eb1d 0f40 	cmn.w	sp, r0, lsl #1
+00000066 <foo\+0x66> f1bd 0f00 	cmp.w	sp, #0
+0000006a <foo\+0x6a> 4585      	cmp	sp, r0
+0000006c <foo\+0x6c> ebbd 0f40 	cmp.w	sp, r0, lsl #1
+00000070 <foo\+0x70> b080      	sub	sp, #0
+00000072 <foo\+0x72> f1bd 0d00 	subs.w	sp, sp, #0
+00000076 <foo\+0x76> f1ad 0000 	sub.w	r0, sp, #0
+0000007a <foo\+0x7a> f1bd 0000 	subs.w	r0, sp, #0
+0000007e <foo\+0x7e> b001      	add	sp, #4
+00000080 <foo\+0x80> a801      	add	r0, sp, #4
+00000082 <foo\+0x82> f11d 0d04 	adds.w	sp, sp, #4
+00000086 <foo\+0x86> f11d 0004 	adds.w	r0, sp, #4
+0000008a <foo\+0x8a> f20d 0004 	addw	r0, sp, #4
+0000008e <foo\+0x8e> b001      	add	sp, #4
+00000090 <foo\+0x90> f11d 0d04 	adds.w	sp, sp, #4
+00000094 <foo\+0x94> f20d 0d04 	addw	sp, sp, #4
+00000098 <foo\+0x98> 4485      	add	sp, r0
+0000009a <foo\+0x9a> 4468      	add	r0, sp
+0000009c <foo\+0x9c> eb0d 0040 	add.w	r0, sp, r0, lsl #1
+000000a0 <foo\+0xa0> eb1d 0d00 	adds.w	sp, sp, r0
+000000a4 <foo\+0xa4> eb1d 0000 	adds.w	r0, sp, r0
+000000a8 <foo\+0xa8> eb1d 0040 	adds.w	r0, sp, r0, lsl #1
+000000ac <foo\+0xac> 4485      	add	sp, r0
+000000ae <foo\+0xae> eb0d 0d40 	add.w	sp, sp, r0, lsl #1
+000000b2 <foo\+0xb2> eb1d 0d00 	adds.w	sp, sp, r0
+000000b6 <foo\+0xb6> eb1d 0d40 	adds.w	sp, sp, r0, lsl #1
+000000ba <foo\+0xba> 44ed      	add	sp, sp
+000000bc <foo\+0xbc> f1ad 0000 	sub.w	r0, sp, #0
+000000c0 <foo\+0xc0> f1bd 0000 	subs.w	r0, sp, #0
+000000c4 <foo\+0xc4> f2ad 0000 	subw	r0, sp, #0
+000000c8 <foo\+0xc8> b080      	sub	sp, #0
+000000ca <foo\+0xca> f1bd 0d00 	subs.w	sp, sp, #0
+000000ce <foo\+0xce> f2ad 0d00 	subw	sp, sp, #0
+000000d2 <foo\+0xd2> b080      	sub	sp, #0
+000000d4 <foo\+0xd4> f1bd 0d00 	subs.w	sp, sp, #0
+000000d8 <foo\+0xd8> ebad 0040 	sub.w	r0, sp, r0, lsl #1
+000000dc <foo\+0xdc> ebbd 0040 	subs.w	r0, sp, r0, lsl #1
+000000e0 <foo\+0xe0> ebad 0d40 	sub.w	sp, sp, r0, lsl #1
+000000e4 <foo\+0xe4> ebbd 0d40 	subs.w	sp, sp, r0, lsl #1
+000000e8 <foo\+0xe8> a001      	add	r0, pc, #4	; \(adr r0, 000000f0 <foo\+0xf0>\)
 000000ea <foo\+0xea> f2af 0004 	subw	r0, pc, #4
 000000ee <foo\+0xee> f20f 0004 	addw	r0, pc, #4
 000000f2 <foo\+0xf2> f2af 0004 	subw	r0, pc, #4
-000000f6 <foo\+0xf6> bf00      	nop
-000000f8 <foo\+0xf8> bf00      	nop
-000000fa <foo\+0xfa> bf00      	nop
-
+000000f6 <foo\+0xf6> f20f 0004 	addw	r0, pc, #4
+000000fa <foo\+0xfa> f2af 0004 	subw	r0, pc, #4
+000000fe <foo\+0xfe> bf00[ 	]+nop
+00000100 <foo\+0x100> bf00[ 	]+nop
+00000102 <foo\+0x102> bf00[ 	]+nop
diff --git a/gas/testsuite/gas/arm/sp-pc-usage-t.s b/gas/testsuite/gas/arm/sp-pc-usage-t.s
index 6cfebed4a6..1756866586 100644
--- a/gas/testsuite/gas/arm/sp-pc-usage-t.s
+++ b/gas/testsuite/gas/arm/sp-pc-usage-t.s
@@ -35,10 +35,12 @@ ldr	pc, [pc]
 ldr	sp, [sp]
 ldr	pc, [sp]
 ldr	sp, [pc]
+ldr	sp, [r0, +pc]
 
 str	r0, [sp]
 str	sp, [r0]
 str	sp, [sp]
+str	sp, [r0, +pc]
 
 @ R13 as the first operand <Rn> in any add{s}, cmn, cmp, or sub{s} instruction.
 
diff --git a/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
index d20f1c5d98..120f6f3f7c 100644
--- a/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
+++ b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
@@ -37,213 +37,207 @@
 [^:]*:76: Error: r13 not allowed here -- `ldrbt sp,\[r0,#4\]'
 [^:]*:79: Error: r15 not allowed here -- `ldrd pc,r0,\[r1\]'
 [^:]*:80: Error: r13 not allowed here -- `ldrd sp,r0,\[r1\]'
-[^:]*:81: Error: r12 not allowed here -- `ldrd r12,\[r1\]'
-[^:]*:82: Error: r14 not allowed here -- `ldrd r14,\[r1\]'
-[^:]*:83: Error: r15 not allowed here -- `ldrd r0,pc,\[r1\]'
-[^:]*:84: Error: r13 not allowed here -- `ldrd r0,sp,\[r1\]'
-[^:]*:85: Error: r15 not allowed here -- `ldrd pc,r0,\[r1\],#4'
-[^:]*:86: Error: r13 not allowed here -- `ldrd sp,r0,\[r1\],#4'
-[^:]*:87: Error: r15 not allowed here -- `ldrd r0,pc,\[r1\],#4'
-[^:]*:88: Error: r13 not allowed here -- `ldrd r0,sp,\[r1\],#4'
-[^:]*:89: Error: r12 not allowed here -- `ldrd r12,\[r1\],#4'
-[^:]*:90: Error: r14 not allowed here -- `ldrd r14,\[r1\],#4'
-[^:]*:91: Error: r15 not allowed here -- `ldrd pc,r0,\[r1,#4\]!'
-[^:]*:92: Error: r13 not allowed here -- `ldrd sp,r0,\[r1,#4\]!'
-[^:]*:93: Error: r15 not allowed here -- `ldrd r0,pc,\[r1,#4\]!'
-[^:]*:94: Error: r13 not allowed here -- `ldrd r0,sp,\[r1,#4\]!'
-[^:]*:95: Error: r12 not allowed here -- `ldrd r12,\[r1,#4\]!'
-[^:]*:96: Error: r14 not allowed here -- `ldrd r14,\[r1,#4\]!'
-[^:]*:99: Error: r15 not allowed here -- `ldrd pc,r0,label'
-[^:]*:100: Error: r13 not allowed here -- `ldrd sp,r0,label'
-[^:]*:101: Error: r15 not allowed here -- `ldrd r0,pc,label'
-[^:]*:102: Error: r13 not allowed here -- `ldrd r0,sp,label'
-[^:]*:103: Error: r15 not allowed here -- `ldrd pc,r0,\[pc,#-0\]'
-[^:]*:104: Error: r13 not allowed here -- `ldrd sp,r0,\[pc,#-0\]'
-[^:]*:105: Error: r15 not allowed here -- `ldrd r0,pc,\[pc,#-0\]'
-[^:]*:106: Error: r13 not allowed here -- `ldrd r0,sp,\[pc,#-0\]'
-[^:]*:111: Error: r15 not allowed here -- `ldrex pc,\[r0\]'
-[^:]*:112: Error: r13 not allowed here -- `ldrex sp,\[r0\]'
-[^:]*:113: Error: r15 not allowed here -- `ldrex r0,\[pc\]'
-[^:]*:114: Error: r15 not allowed here -- `ldrexb pc,\[r0\]'
-[^:]*:115: Error: r13 not allowed here -- `ldrexb sp,\[r0\]'
-[^:]*:116: Error: r15 not allowed here -- `ldrexb r0,\[pc\]'
-[^:]*:117: Error: r15 not allowed here -- `ldrexd pc,r0,\[r1\]'
-[^:]*:118: Error: r13 not allowed here -- `ldrexd sp,r0,\[r1\]'
-[^:]*:119: Error: r15 not allowed here -- `ldrexd r0,pc,\[r1\]'
-[^:]*:120: Error: r13 not allowed here -- `ldrexd r0,sp,\[r1\]'
-[^:]*:121: Error: r15 not allowed here -- `ldrexd r0,r1,\[pc\]'
-[^:]*:122: Error: r15 not allowed here -- `ldrexh pc,\[r0\]'
-[^:]*:123: Error: r13 not allowed here -- `ldrexh sp,\[r0\]'
-[^:]*:124: Error: r15 not allowed here -- `ldrexh r0,\[pc\]'
-[^:]*:127: Error: r15 not allowed here -- `ldrh pc,\[r0\]'
-[^:]*:128: Error: r15 not allowed here -- `ldrh pc,\[r0,#4\]'
-[^:]*:131: Error: r15 not allowed here -- `ldrh.w pc,\[r0\]'
-[^:]*:132: Error: r15 not allowed here -- `ldrh.w pc,\[r0,#4\]'
-[^:]*:133: Error: r13 not allowed here -- `ldrh.w sp,\[r0\]'
-[^:]*:134: Error: r13 not allowed here -- `ldrh.w sp,\[r0,#4\]'
-[^:]*:135: Error: r15 not allowed here -- `ldrh pc,\[r0,#-3\]'
-[^:]*:137: Error: r15 not allowed here -- `ldrh pc,\[r0\],#4'
-[^:]*:138: Error: r13 not allowed here -- `ldrh sp,\[r0\],#4'
-[^:]*:139: Error: r15 not allowed here -- `ldrh pc,\[r0,#4\]!'
-[^:]*:140: Error: r13 not allowed here -- `ldrh sp,\[r0,#4\]!'
-[^:]*:143: Error: r15 not allowed here -- `ldrh pc,label'
-[^:]*:144: Error: r15 not allowed here -- `ldrh pc,\[pc,#-0\]'
-[^:]*:145: Error: r13 not allowed here -- `ldrh sp,label'
-[^:]*:146: Error: r13 not allowed here -- `ldrh sp,\[pc,#-0\]'
-[^:]*:149: Error: r15 not allowed here -- `ldrh pc,\[r0,r1\]'
-[^:]*:150: Error: cannot use register index with PC-relative addressing -- `ldrh r0,\[pc,r1\]'
-[^:]*:151: Error: r15 not allowed here -- `ldrh r0,\[r1,pc\]'
-[^:]*:152: Error: r15 not allowed here -- `ldrh.w pc,\[r0,r1,LSL#1\]'
-[^:]*:153: Error: r13 not allowed here -- `ldrh.w sp,\[r0,r1,LSL#1\]'
-[^:]*:154: Error: r15 not allowed here -- `ldrh.w r2,\[r0,pc,LSL#1\]'
-[^:]*:155: Error: r13 not allowed here -- `ldrh.w r2,\[r0,sp,LSL#1\]'
-[^:]*:158: Error: r15 not allowed here -- `ldrht pc,\[r0,#4\]'
-[^:]*:159: Error: r13 not allowed here -- `ldrht sp,\[r0,#4\]'
-[^:]*:162: Error: r15 not allowed here -- `ldrsb pc,\[r0,#4\]'
-[^:]*:164: Error: r13 not allowed here -- `ldrsb sp,\[r0,#4\]'
-[^:]*:165: Error: r15 not allowed here -- `ldrsb pc,\[r0,#-4\]'
-[^:]*:166: Error: r13 not allowed here -- `ldrsb sp,\[r0,#-4\]'
-[^:]*:167: Error: r15 not allowed here -- `ldrsb pc,\[r0\],#4'
-[^:]*:168: Error: r13 not allowed here -- `ldrsb sp,\[r0\],#4'
-[^:]*:169: Error: r15 not allowed here -- `ldrsb pc,\[r0,#4\]!'
-[^:]*:170: Error: r13 not allowed here -- `ldrsb sp,\[r0,#4\]!'
-[^:]*:173: Error: r15 not allowed here -- `ldrsb pc,label'
-[^:]*:174: Error: r15 not allowed here -- `ldrsb pc,\[pc,#-0\]'
-[^:]*:175: Error: r13 not allowed here -- `ldrsb sp,label'
-[^:]*:176: Error: r13 not allowed here -- `ldrsb sp,\[pc,#-0\]'
-[^:]*:179: Error: r15 not allowed here -- `ldrsb pc,\[r0,r1\]'
-[^:]*:180: Error: cannot use register index with PC-relative addressing -- `ldrsb r0,\[pc,r1\]'
-[^:]*:181: Error: r15 not allowed here -- `ldrsb r0,\[r1,pc\]'
-[^:]*:182: Error: r15 not allowed here -- `ldrsb.w pc,\[r0,r1,LSL#2\]'
-[^:]*:184: Error: r13 not allowed here -- `ldrsb.w sp,\[r0,r1,LSL#2\]'
-[^:]*:185: Error: r15 not allowed here -- `ldrsb.w r2,\[r0,pc,LSL#2\]'
-[^:]*:186: Error: r13 not allowed here -- `ldrsb.w r2,\[r0,sp,LSL#2\]'
-[^:]*:190: Error: r15 not allowed here -- `ldrsbt pc,\[r0,#4\]'
-[^:]*:191: Error: r13 not allowed here -- `ldrsbt sp,\[r0,#4\]'
-[^:]*:195: Error: r15 not allowed here -- `ldrsh pc,\[r0,#4\]'
-[^:]*:196: Error: r13 not allowed here -- `ldrsh sp,\[r0,#4\]'
-[^:]*:197: Error: r15 not allowed here -- `ldrsh pc,\[r0,#-4\]'
-[^:]*:198: Error: r15 not allowed here -- `ldrsh pc,\[r0\],#4'
-[^:]*:199: Error: r15 not allowed here -- `ldrsh pc,\[r0,#4\]!'
-[^:]*:200: Error: r13 not allowed here -- `ldrsh sp,\[r0,#-4\]'
-[^:]*:201: Error: r13 not allowed here -- `ldrsh sp,\[r0\],#4'
-[^:]*:202: Error: r13 not allowed here -- `ldrsh sp,\[r0,#4\]!'
-[^:]*:205: Error: r15 not allowed here -- `ldrsh pc,label'
-[^:]*:206: Error: r13 not allowed here -- `ldrsh sp,label'
-[^:]*:207: Error: r13 not allowed here -- `ldrsh sp,\[pc,#-0\]'
-[^:]*:210: Error: r15 not allowed here -- `ldrsh pc,\[r0,r1\]'
-[^:]*:211: Error: cannot use register index with PC-relative addressing -- `ldrsh r0,\[pc,r1\]'
-[^:]*:212: Error: r15 not allowed here -- `ldrsh r0,\[r1,pc\]'
-[^:]*:214: Error: r15 not allowed here -- `ldrsh.w pc,\[r0,r1,LSL#3\]'
-[^:]*:215: Error: r13 not allowed here -- `ldrsh.w sp,\[r0,r1,LSL#3\]'
-[^:]*:216: Error: r13 not allowed here -- `ldrsh.w r0,\[r1,sp,LSL#3\]'
-[^:]*:217: Error: r15 not allowed here -- `ldrsh.w r0,\[r1,pc,LSL#3\]'
-[^:]*:221: Error: r15 not allowed here -- `ldrsht pc,\[r0,#4\]'
-[^:]*:222: Error: r13 not allowed here -- `ldrsht sp,\[r0,#4\]'
-[^:]*:226: Error: r15 not allowed here -- `ldrt pc,\[r0,#4\]'
-[^:]*:227: Error: r13 not allowed here -- `ldrt sp,\[r0,#4\]'
-[^:]*:232: Error: r15 not allowed here -- `str pc,\[r0,#4\]'
-[^:]*:233: Error: cannot use register index with PC-relative addressing -- `str.w r0,\[pc,#4\]'
-[^:]*:234: Error: cannot use register index with PC-relative addressing -- `str r0,\[pc,#-4\]'
-[^:]*:235: Error: cannot use post-indexing with PC-relative addressing -- `str r0,\[pc\],#4'
-[^:]*:236: Error: cannot use writeback with PC-relative addressing -- `str r0,\[pc,#4\]!'
-[^:]*:239: Error: cannot use register index with PC-relative addressing -- `str.w r0,\[pc,r1\]'
-[^:]*:240: Error: cannot use register index with PC-relative addressing -- `str.w r0,\[pc,r1,LSL#2\]'
-[^:]*:246: Error: cannot use register index with PC-relative addressing -- `strb.w r0,\[pc,#4\]'
-[^:]*:247: Error: r15 not allowed here -- `strb.w pc,\[r0,#4\]'
-[^:]*:248: Error: r13 not allowed here -- `strb.w sp,\[r0,#4\]'
-[^:]*:249: Error: cannot use register index with PC-relative addressing -- `strb r0,\[pc,#-4\]'
-[^:]*:250: Error: cannot use post-indexing with PC-relative addressing -- `strb r0,\[pc\],#4'
-[^:]*:251: Error: cannot use writeback with PC-relative addressing -- `strb r0,\[pc,#4\]!'
-[^:]*:252: Error: r15 not allowed here -- `strb pc,\[r0,#-4\]'
-[^:]*:253: Error: r15 not allowed here -- `strb pc,\[r0\],#4'
-[^:]*:254: Error: r15 not allowed here -- `strb pc,\[r0,#4\]!'
-[^:]*:255: Error: r13 not allowed here -- `strb sp,\[r0,#-4\]'
-[^:]*:256: Error: r13 not allowed here -- `strb sp,\[r0\],#4'
-[^:]*:257: Error: r13 not allowed here -- `strb sp,\[r0,#4\]!'
-[^:]*:260: Error: cannot use register index with PC-relative addressing -- `strb.w r0,\[pc,r1\]'
-[^:]*:261: Error: cannot use register index with PC-relative addressing -- `strb.w r0,\[pc,r1,LSL#2\]'
-[^:]*:262: Error: r15 not allowed here -- `strb.w pc,\[r0,r1\]'
-[^:]*:263: Error: r15 not allowed here -- `strb.w pc,\[r0,r1,LSL#2\]'
-[^:]*:264: Error: r13 not allowed here -- `strb.w sp,\[r0,r1\]'
-[^:]*:265: Error: r13 not allowed here -- `strb.w sp,\[r0,r1,LSL#2\]'
-[^:]*:266: Error: r15 not allowed here -- `strb.w r0,\[r1,pc\]'
-[^:]*:267: Error: r15 not allowed here -- `strb.w r0,\[r1,pc,LSL#2\]'
-[^:]*:268: Error: r13 not allowed here -- `strb.w r0,\[r1,sp\]'
-[^:]*:269: Error: r13 not allowed here -- `strb.w r0,\[r1,sp,LSL#2\]'
-[^:]*:272: Error: cannot use register index with PC-relative addressing -- `strbt r0,\[pc,#4\]'
-[^:]*:273: Error: r15 not allowed here -- `strbt pc,\[r0,#4\]'
-[^:]*:274: Error: r13 not allowed here -- `strbt sp,\[r0,#4\]'
-[^:]*:277: Error: cannot use register index with PC-relative addressing -- `strd r0,r1,\[pc,#4\]'
-[^:]*:278: Error: cannot use post-indexing with PC-relative addressing -- `strd r0,r1,\[pc\],#4'
-[^:]*:279: Error: cannot use writeback with PC-relative addressing -- `strd r0,r1,\[pc,#4\]!'
-[^:]*:280: Error: r15 not allowed here -- `strd pc,r0,\[r1,#4\]'
-[^:]*:281: Error: r15 not allowed here -- `strd pc,r0,\[r1\],#4'
-[^:]*:282: Error: r15 not allowed here -- `strd pc,r0,\[r1,#4\]!'
-[^:]*:283: Error: r13 not allowed here -- `strd sp,r0,\[r1,#4\]'
-[^:]*:284: Error: r13 not allowed here -- `strd sp,r0,\[r1\],#4'
-[^:]*:285: Error: r13 not allowed here -- `strd sp,r0,\[r1,#4\]!'
-[^:]*:286: Error: r15 not allowed here -- `strd r0,pc,\[r1,#4\]'
-[^:]*:287: Error: r15 not allowed here -- `strd r0,pc,\[r1\],#4'
-[^:]*:288: Error: r15 not allowed here -- `strd r0,pc,\[r1,#4\]!'
-[^:]*:289: Error: r13 not allowed here -- `strd r0,sp,\[r1,#4\]'
-[^:]*:290: Error: r13 not allowed here -- `strd r0,sp,\[r1\],#4'
-[^:]*:291: Error: r13 not allowed here -- `strd r0,sp,\[r1,#4\]!'
-[^:]*:297: Error: r15 not allowed here -- `strex pc,r0,\[r1\]'
-[^:]*:298: Error: r15 not allowed here -- `strex pc,r0,\[r1,#4\]'
-[^:]*:299: Error: r13 not allowed here -- `strex sp,r0,\[r1\]'
-[^:]*:300: Error: r13 not allowed here -- `strex sp,r0,\[r1,#4\]'
-[^:]*:301: Error: r15 not allowed here -- `strex r0,pc,\[r1\]'
-[^:]*:302: Error: r15 not allowed here -- `strex r0,pc,\[r1,#4\]'
-[^:]*:303: Error: r13 not allowed here -- `strex r0,sp,\[r1\]'
-[^:]*:304: Error: r13 not allowed here -- `strex r0,sp,\[r1,#4\]'
-[^:]*:305: Error: r15 not allowed here -- `strex r0,r1,\[pc\]'
-[^:]*:306: Error: r15 not allowed here -- `strex r0,r1,\[pc,#4\]'
-[^:]*:309: Error: r15 not allowed here -- `strexb pc,r0,\[r1\]'
-[^:]*:310: Error: r13 not allowed here -- `strexb sp,r0,\[r1\]'
-[^:]*:311: Error: r15 not allowed here -- `strexb r0,pc,\[r1\]'
-[^:]*:312: Error: r13 not allowed here -- `strexb r0,sp,\[r1\]'
-[^:]*:313: Error: r15 not allowed here -- `strexb r0,r1,\[pc\]'
-[^:]*:316: Error: r15 not allowed here -- `strexd pc,r0,r1,\[r2\]'
-[^:]*:317: Error: r13 not allowed here -- `strexd sp,r0,r1,\[r2\]'
-[^:]*:318: Error: r15 not allowed here -- `strexd r0,pc,r1,\[r2\]'
-[^:]*:319: Error: r13 not allowed here -- `strexd r0,sp,r1,\[r2\]'
-[^:]*:320: Error: r15 not allowed here -- `strexd r0,r1,pc,\[r2\]'
-[^:]*:321: Error: r13 not allowed here -- `strexd r0,r1,sp,\[r2\]'
-[^:]*:322: Error: r15 not allowed here -- `strexd r0,r1,r2,\[pc\]'
-[^:]*:325: Error: r15 not allowed here -- `strexh pc,r0,\[r1\]'
-[^:]*:326: Error: r13 not allowed here -- `strexh sp,r0,\[r1\]'
-[^:]*:327: Error: r15 not allowed here -- `strexh r0,pc,\[r1\]'
-[^:]*:328: Error: r13 not allowed here -- `strexh r0,sp,\[r1\]'
-[^:]*:329: Error: r15 not allowed here -- `strexh r0,r1,\[pc\]'
-[^:]*:332: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc\]'
-[^:]*:333: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc,#4\]'
-[^:]*:334: Error: cannot use register index with PC-relative addressing -- `strh r0,\[pc,#-4\]'
-[^:]*:335: Error: cannot use post-indexing with PC-relative addressing -- `strh r0,\[pc\],#4'
-[^:]*:336: Error: cannot use writeback with PC-relative addressing -- `strh r0,\[pc,#4\]!'
-[^:]*:339: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc,r1\]'
-[^:]*:340: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc,r1,LSL#2\]'
-[^:]*:341: Error: r15 not allowed here -- `strh.w pc,\[r0,#4\]'
-[^:]*:342: Error: r15 not allowed here -- `strh.w pc,\[r0\]'
-[^:]*:343: Error: r13 not allowed here -- `strh.w sp,\[r0,#4\]'
-[^:]*:344: Error: r13 not allowed here -- `strh.w sp,\[r0\]'
-[^:]*:345: Error: r15 not allowed here -- `strh pc,\[r0,#-4\]'
-[^:]*:346: Error: r15 not allowed here -- `strh pc,\[r0\],#4'
-[^:]*:347: Error: r15 not allowed here -- `strh pc,\[r0,#4\]!'
-[^:]*:348: Error: r13 not allowed here -- `strh sp,\[r0,#-4\]'
-[^:]*:349: Error: r13 not allowed here -- `strh sp,\[r0\],#4'
-[^:]*:350: Error: r13 not allowed here -- `strh sp,\[r0,#4\]!'
-[^:]*:351: Error: r15 not allowed here -- `strh.w pc,\[r0,r1\]'
-[^:]*:352: Error: r13 not allowed here -- `strh.w sp,\[r0,r1\]'
-[^:]*:353: Error: r15 not allowed here -- `strh.w r0,\[r1,pc\]'
-[^:]*:354: Error: r13 not allowed here -- `strh.w r0,\[r1,sp\]'
-[^:]*:355: Error: r15 not allowed here -- `strh.w pc,\[r0,r1,LSL#2\]'
-[^:]*:356: Error: r13 not allowed here -- `strh.w sp,\[r0,r1,LSL#2\]'
-[^:]*:357: Error: r15 not allowed here -- `strh.w r0,\[r1,pc,LSL#2\]'
-[^:]*:358: Error: r13 not allowed here -- `strh.w r0,\[r1,sp,LSL#2\]'
-[^:]*:361: Error: cannot use register index with PC-relative addressing -- `strht r0,\[pc,#4\]'
-[^:]*:362: Error: r15 not allowed here -- `strht pc,\[r0,#4\]'
-[^:]*:363: Error: r13 not allowed here -- `strht sp,\[pc,#4\]'
-[^:]*:366: Error: cannot use register index with PC-relative addressing -- `strt r0,\[pc,#4\]'
-[^:]*:367: Error: r15 not allowed here -- `strt pc,\[r0,#4\]'
-[^:]*:368: Error: r13 not allowed here -- `strt sp,\[r0,#4\]'
+[^:]*:81: Error: r15 not allowed here -- `ldrd r0,pc,\[r1\]'
+[^:]*:82: Error: r13 not allowed here -- `ldrd r0,sp,\[r1\]'
+[^:]*:83: Error: r15 not allowed here -- `ldrd pc,r0,\[r1\],#4'
+[^:]*:84: Error: r13 not allowed here -- `ldrd sp,r0,\[r1\],#4'
+[^:]*:85: Error: r15 not allowed here -- `ldrd r0,pc,\[r1\],#4'
+[^:]*:86: Error: r13 not allowed here -- `ldrd r0,sp,\[r1\],#4'
+[^:]*:87: Error: r15 not allowed here -- `ldrd pc,r0,\[r1,#4\]!'
+[^:]*:88: Error: r13 not allowed here -- `ldrd sp,r0,\[r1,#4\]!'
+[^:]*:89: Error: r15 not allowed here -- `ldrd r0,pc,\[r1,#4\]!'
+[^:]*:90: Error: r13 not allowed here -- `ldrd r0,sp,\[r1,#4\]!'
+[^:]*:93: Error: r15 not allowed here -- `ldrd pc,r0,label'
+[^:]*:94: Error: r13 not allowed here -- `ldrd sp,r0,label'
+[^:]*:95: Error: r15 not allowed here -- `ldrd r0,pc,label'
+[^:]*:96: Error: r13 not allowed here -- `ldrd r0,sp,label'
+[^:]*:97: Error: r15 not allowed here -- `ldrd pc,r0,\[pc,#-0\]'
+[^:]*:98: Error: r13 not allowed here -- `ldrd sp,r0,\[pc,#-0\]'
+[^:]*:99: Error: r15 not allowed here -- `ldrd r0,pc,\[pc,#-0\]'
+[^:]*:100: Error: r13 not allowed here -- `ldrd r0,sp,\[pc,#-0\]'
+[^:]*:105: Error: r15 not allowed here -- `ldrex pc,\[r0\]'
+[^:]*:106: Error: r13 not allowed here -- `ldrex sp,\[r0\]'
+[^:]*:107: Error: r15 not allowed here -- `ldrex r0,\[pc\]'
+[^:]*:108: Error: r15 not allowed here -- `ldrexb pc,\[r0\]'
+[^:]*:109: Error: r13 not allowed here -- `ldrexb sp,\[r0\]'
+[^:]*:110: Error: r15 not allowed here -- `ldrexb r0,\[pc\]'
+[^:]*:111: Error: r15 not allowed here -- `ldrexd pc,r0,\[r1\]'
+[^:]*:112: Error: r13 not allowed here -- `ldrexd sp,r0,\[r1\]'
+[^:]*:113: Error: r15 not allowed here -- `ldrexd r0,pc,\[r1\]'
+[^:]*:114: Error: r13 not allowed here -- `ldrexd r0,sp,\[r1\]'
+[^:]*:115: Error: r15 not allowed here -- `ldrexd r0,r1,\[pc\]'
+[^:]*:116: Error: r15 not allowed here -- `ldrexh pc,\[r0\]'
+[^:]*:117: Error: r13 not allowed here -- `ldrexh sp,\[r0\]'
+[^:]*:118: Error: r15 not allowed here -- `ldrexh r0,\[pc\]'
+[^:]*:121: Error: r15 not allowed here -- `ldrh pc,\[r0\]'
+[^:]*:122: Error: r15 not allowed here -- `ldrh pc,\[r0,#4\]'
+[^:]*:125: Error: r15 not allowed here -- `ldrh.w pc,\[r0\]'
+[^:]*:126: Error: r15 not allowed here -- `ldrh.w pc,\[r0,#4\]'
+[^:]*:127: Error: r13 not allowed here -- `ldrh.w sp,\[r0\]'
+[^:]*:128: Error: r13 not allowed here -- `ldrh.w sp,\[r0,#4\]'
+[^:]*:129: Error: r15 not allowed here -- `ldrh pc,\[r0,#-3\]'
+[^:]*:131: Error: r15 not allowed here -- `ldrh pc,\[r0\],#4'
+[^:]*:132: Error: r13 not allowed here -- `ldrh sp,\[r0\],#4'
+[^:]*:133: Error: r15 not allowed here -- `ldrh pc,\[r0,#4\]!'
+[^:]*:134: Error: r13 not allowed here -- `ldrh sp,\[r0,#4\]!'
+[^:]*:137: Error: r15 not allowed here -- `ldrh pc,label'
+[^:]*:138: Error: r15 not allowed here -- `ldrh pc,\[pc,#-0\]'
+[^:]*:139: Error: r13 not allowed here -- `ldrh sp,label'
+[^:]*:140: Error: r13 not allowed here -- `ldrh sp,\[pc,#-0\]'
+[^:]*:143: Error: r15 not allowed here -- `ldrh pc,\[r0,r1\]'
+[^:]*:144: Error: cannot use register index with PC-relative addressing -- `ldrh r0,\[pc,r1\]'
+[^:]*:145: Error: r15 not allowed here -- `ldrh r0,\[r1,pc\]'
+[^:]*:146: Error: r15 not allowed here -- `ldrh.w pc,\[r0,r1,LSL#1\]'
+[^:]*:147: Error: r13 not allowed here -- `ldrh.w sp,\[r0,r1,LSL#1\]'
+[^:]*:148: Error: r15 not allowed here -- `ldrh.w r2,\[r0,pc,LSL#1\]'
+[^:]*:149: Error: r13 not allowed here -- `ldrh.w r2,\[r0,sp,LSL#1\]'
+[^:]*:152: Error: r15 not allowed here -- `ldrht pc,\[r0,#4\]'
+[^:]*:153: Error: r13 not allowed here -- `ldrht sp,\[r0,#4\]'
+[^:]*:156: Error: r15 not allowed here -- `ldrsb pc,\[r0,#4\]'
+[^:]*:158: Error: r13 not allowed here -- `ldrsb sp,\[r0,#4\]'
+[^:]*:159: Error: r15 not allowed here -- `ldrsb pc,\[r0,#-4\]'
+[^:]*:160: Error: r13 not allowed here -- `ldrsb sp,\[r0,#-4\]'
+[^:]*:161: Error: r15 not allowed here -- `ldrsb pc,\[r0\],#4'
+[^:]*:162: Error: r13 not allowed here -- `ldrsb sp,\[r0\],#4'
+[^:]*:163: Error: r15 not allowed here -- `ldrsb pc,\[r0,#4\]!'
+[^:]*:164: Error: r13 not allowed here -- `ldrsb sp,\[r0,#4\]!'
+[^:]*:167: Error: r15 not allowed here -- `ldrsb pc,label'
+[^:]*:168: Error: r15 not allowed here -- `ldrsb pc,\[pc,#-0\]'
+[^:]*:169: Error: r13 not allowed here -- `ldrsb sp,label'
+[^:]*:170: Error: r13 not allowed here -- `ldrsb sp,\[pc,#-0\]'
+[^:]*:173: Error: r15 not allowed here -- `ldrsb pc,\[r0,r1\]'
+[^:]*:174: Error: cannot use register index with PC-relative addressing -- `ldrsb r0,\[pc,r1\]'
+[^:]*:175: Error: r15 not allowed here -- `ldrsb r0,\[r1,pc\]'
+[^:]*:176: Error: r15 not allowed here -- `ldrsb.w pc,\[r0,r1,LSL#2\]'
+[^:]*:178: Error: r13 not allowed here -- `ldrsb.w sp,\[r0,r1,LSL#2\]'
+[^:]*:179: Error: r15 not allowed here -- `ldrsb.w r2,\[r0,pc,LSL#2\]'
+[^:]*:180: Error: r13 not allowed here -- `ldrsb.w r2,\[r0,sp,LSL#2\]'
+[^:]*:184: Error: r15 not allowed here -- `ldrsbt pc,\[r0,#4\]'
+[^:]*:185: Error: r13 not allowed here -- `ldrsbt sp,\[r0,#4\]'
+[^:]*:189: Error: r15 not allowed here -- `ldrsh pc,\[r0,#4\]'
+[^:]*:190: Error: r13 not allowed here -- `ldrsh sp,\[r0,#4\]'
+[^:]*:191: Error: r15 not allowed here -- `ldrsh pc,\[r0,#-4\]'
+[^:]*:192: Error: r15 not allowed here -- `ldrsh pc,\[r0\],#4'
+[^:]*:193: Error: r15 not allowed here -- `ldrsh pc,\[r0,#4\]!'
+[^:]*:194: Error: r13 not allowed here -- `ldrsh sp,\[r0,#-4\]'
+[^:]*:195: Error: r13 not allowed here -- `ldrsh sp,\[r0\],#4'
+[^:]*:196: Error: r13 not allowed here -- `ldrsh sp,\[r0,#4\]!'
+[^:]*:199: Error: r15 not allowed here -- `ldrsh pc,label'
+[^:]*:200: Error: r13 not allowed here -- `ldrsh sp,label'
+[^:]*:201: Error: r13 not allowed here -- `ldrsh sp,\[pc,#-0\]'
+[^:]*:204: Error: r15 not allowed here -- `ldrsh pc,\[r0,r1\]'
+[^:]*:205: Error: cannot use register index with PC-relative addressing -- `ldrsh r0,\[pc,r1\]'
+[^:]*:206: Error: r15 not allowed here -- `ldrsh r0,\[r1,pc\]'
+[^:]*:208: Error: r15 not allowed here -- `ldrsh.w pc,\[r0,r1,LSL#3\]'
+[^:]*:209: Error: r13 not allowed here -- `ldrsh.w sp,\[r0,r1,LSL#3\]'
+[^:]*:210: Error: r13 not allowed here -- `ldrsh.w r0,\[r1,sp,LSL#3\]'
+[^:]*:211: Error: r15 not allowed here -- `ldrsh.w r0,\[r1,pc,LSL#3\]'
+[^:]*:215: Error: r15 not allowed here -- `ldrsht pc,\[r0,#4\]'
+[^:]*:216: Error: r13 not allowed here -- `ldrsht sp,\[r0,#4\]'
+[^:]*:220: Error: r15 not allowed here -- `ldrt pc,\[r0,#4\]'
+[^:]*:221: Error: r13 not allowed here -- `ldrt sp,\[r0,#4\]'
+[^:]*:226: Error: r15 not allowed here -- `str pc,\[r0,#4\]'
+[^:]*:227: Error: cannot use register index with PC-relative addressing -- `str.w r0,\[pc,#4\]'
+[^:]*:228: Error: cannot use register index with PC-relative addressing -- `str r0,\[pc,#-4\]'
+[^:]*:229: Error: cannot use post-indexing with PC-relative addressing -- `str r0,\[pc\],#4'
+[^:]*:230: Error: cannot use writeback with PC-relative addressing -- `str r0,\[pc,#4\]!'
+[^:]*:233: Error: cannot use register index with PC-relative addressing -- `str.w r0,\[pc,r1\]'
+[^:]*:234: Error: cannot use register index with PC-relative addressing -- `str.w r0,\[pc,r1,LSL#2\]'
+[^:]*:240: Error: cannot use register index with PC-relative addressing -- `strb.w r0,\[pc,#4\]'
+[^:]*:241: Error: r15 not allowed here -- `strb.w pc,\[r0,#4\]'
+[^:]*:242: Error: r13 not allowed here -- `strb.w sp,\[r0,#4\]'
+[^:]*:243: Error: cannot use register index with PC-relative addressing -- `strb r0,\[pc,#-4\]'
+[^:]*:244: Error: cannot use post-indexing with PC-relative addressing -- `strb r0,\[pc\],#4'
+[^:]*:245: Error: cannot use writeback with PC-relative addressing -- `strb r0,\[pc,#4\]!'
+[^:]*:246: Error: r15 not allowed here -- `strb pc,\[r0,#-4\]'
+[^:]*:247: Error: r15 not allowed here -- `strb pc,\[r0\],#4'
+[^:]*:248: Error: r15 not allowed here -- `strb pc,\[r0,#4\]!'
+[^:]*:249: Error: r13 not allowed here -- `strb sp,\[r0,#-4\]'
+[^:]*:250: Error: r13 not allowed here -- `strb sp,\[r0\],#4'
+[^:]*:251: Error: r13 not allowed here -- `strb sp,\[r0,#4\]!'
+[^:]*:254: Error: cannot use register index with PC-relative addressing -- `strb.w r0,\[pc,r1\]'
+[^:]*:255: Error: cannot use register index with PC-relative addressing -- `strb.w r0,\[pc,r1,LSL#2\]'
+[^:]*:256: Error: r15 not allowed here -- `strb.w pc,\[r0,r1\]'
+[^:]*:257: Error: r15 not allowed here -- `strb.w pc,\[r0,r1,LSL#2\]'
+[^:]*:258: Error: r13 not allowed here -- `strb.w sp,\[r0,r1\]'
+[^:]*:259: Error: r13 not allowed here -- `strb.w sp,\[r0,r1,LSL#2\]'
+[^:]*:260: Error: r15 not allowed here -- `strb.w r0,\[r1,pc\]'
+[^:]*:261: Error: r15 not allowed here -- `strb.w r0,\[r1,pc,LSL#2\]'
+[^:]*:262: Error: r13 not allowed here -- `strb.w r0,\[r1,sp\]'
+[^:]*:263: Error: r13 not allowed here -- `strb.w r0,\[r1,sp,LSL#2\]'
+[^:]*:266: Error: cannot use register index with PC-relative addressing -- `strbt r0,\[pc,#4\]'
+[^:]*:267: Error: r15 not allowed here -- `strbt pc,\[r0,#4\]'
+[^:]*:268: Error: r13 not allowed here -- `strbt sp,\[r0,#4\]'
+[^:]*:271: Error: cannot use register index with PC-relative addressing -- `strd r0,r1,\[pc,#4\]'
+[^:]*:272: Error: cannot use post-indexing with PC-relative addressing -- `strd r0,r1,\[pc\],#4'
+[^:]*:273: Error: cannot use writeback with PC-relative addressing -- `strd r0,r1,\[pc,#4\]!'
+[^:]*:274: Error: r15 not allowed here -- `strd pc,r0,\[r1,#4\]'
+[^:]*:275: Error: r15 not allowed here -- `strd pc,r0,\[r1\],#4'
+[^:]*:276: Error: r15 not allowed here -- `strd pc,r0,\[r1,#4\]!'
+[^:]*:277: Error: r13 not allowed here -- `strd sp,r0,\[r1,#4\]'
+[^:]*:278: Error: r13 not allowed here -- `strd sp,r0,\[r1\],#4'
+[^:]*:279: Error: r13 not allowed here -- `strd sp,r0,\[r1,#4\]!'
+[^:]*:280: Error: r15 not allowed here -- `strd r0,pc,\[r1,#4\]'
+[^:]*:281: Error: r15 not allowed here -- `strd r0,pc,\[r1\],#4'
+[^:]*:282: Error: r15 not allowed here -- `strd r0,pc,\[r1,#4\]!'
+[^:]*:283: Error: r13 not allowed here -- `strd r0,sp,\[r1,#4\]'
+[^:]*:284: Error: r13 not allowed here -- `strd r0,sp,\[r1\],#4'
+[^:]*:285: Error: r13 not allowed here -- `strd r0,sp,\[r1,#4\]!'
+[^:]*:291: Error: r15 not allowed here -- `strex pc,r0,\[r1\]'
+[^:]*:292: Error: r15 not allowed here -- `strex pc,r0,\[r1,#4\]'
+[^:]*:293: Error: r13 not allowed here -- `strex sp,r0,\[r1\]'
+[^:]*:294: Error: r13 not allowed here -- `strex sp,r0,\[r1,#4\]'
+[^:]*:295: Error: r15 not allowed here -- `strex r0,pc,\[r1\]'
+[^:]*:296: Error: r15 not allowed here -- `strex r0,pc,\[r1,#4\]'
+[^:]*:297: Error: r13 not allowed here -- `strex r0,sp,\[r1\]'
+[^:]*:298: Error: r13 not allowed here -- `strex r0,sp,\[r1,#4\]'
+[^:]*:299: Error: r15 not allowed here -- `strex r0,r1,\[pc\]'
+[^:]*:300: Error: r15 not allowed here -- `strex r0,r1,\[pc,#4\]'
+[^:]*:303: Error: r15 not allowed here -- `strexb pc,r0,\[r1\]'
+[^:]*:304: Error: r13 not allowed here -- `strexb sp,r0,\[r1\]'
+[^:]*:305: Error: r15 not allowed here -- `strexb r0,pc,\[r1\]'
+[^:]*:306: Error: r13 not allowed here -- `strexb r0,sp,\[r1\]'
+[^:]*:307: Error: r15 not allowed here -- `strexb r0,r1,\[pc\]'
+[^:]*:310: Error: r15 not allowed here -- `strexd pc,r0,r1,\[r2\]'
+[^:]*:311: Error: r13 not allowed here -- `strexd sp,r0,r1,\[r2\]'
+[^:]*:312: Error: r15 not allowed here -- `strexd r0,pc,r1,\[r2\]'
+[^:]*:313: Error: r13 not allowed here -- `strexd r0,sp,r1,\[r2\]'
+[^:]*:314: Error: r15 not allowed here -- `strexd r0,r1,pc,\[r2\]'
+[^:]*:315: Error: r13 not allowed here -- `strexd r0,r1,sp,\[r2\]'
+[^:]*:316: Error: r15 not allowed here -- `strexd r0,r1,r2,\[pc\]'
+[^:]*:319: Error: r15 not allowed here -- `strexh pc,r0,\[r1\]'
+[^:]*:320: Error: r13 not allowed here -- `strexh sp,r0,\[r1\]'
+[^:]*:321: Error: r15 not allowed here -- `strexh r0,pc,\[r1\]'
+[^:]*:322: Error: r13 not allowed here -- `strexh r0,sp,\[r1\]'
+[^:]*:323: Error: r15 not allowed here -- `strexh r0,r1,\[pc\]'
+[^:]*:326: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc\]'
+[^:]*:327: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc,#4\]'
+[^:]*:328: Error: cannot use register index with PC-relative addressing -- `strh r0,\[pc,#-4\]'
+[^:]*:329: Error: cannot use post-indexing with PC-relative addressing -- `strh r0,\[pc\],#4'
+[^:]*:330: Error: cannot use writeback with PC-relative addressing -- `strh r0,\[pc,#4\]!'
+[^:]*:333: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc,r1\]'
+[^:]*:334: Error: cannot use register index with PC-relative addressing -- `strh.w r0,\[pc,r1,LSL#2\]'
+[^:]*:335: Error: r15 not allowed here -- `strh.w pc,\[r0,#4\]'
+[^:]*:336: Error: r15 not allowed here -- `strh.w pc,\[r0\]'
+[^:]*:337: Error: r13 not allowed here -- `strh.w sp,\[r0,#4\]'
+[^:]*:338: Error: r13 not allowed here -- `strh.w sp,\[r0\]'
+[^:]*:339: Error: r15 not allowed here -- `strh pc,\[r0,#-4\]'
+[^:]*:340: Error: r15 not allowed here -- `strh pc,\[r0\],#4'
+[^:]*:341: Error: r15 not allowed here -- `strh pc,\[r0,#4\]!'
+[^:]*:342: Error: r13 not allowed here -- `strh sp,\[r0,#-4\]'
+[^:]*:343: Error: r13 not allowed here -- `strh sp,\[r0\],#4'
+[^:]*:344: Error: r13 not allowed here -- `strh sp,\[r0,#4\]!'
+[^:]*:345: Error: r15 not allowed here -- `strh.w pc,\[r0,r1\]'
+[^:]*:346: Error: r13 not allowed here -- `strh.w sp,\[r0,r1\]'
+[^:]*:347: Error: r15 not allowed here -- `strh.w r0,\[r1,pc\]'
+[^:]*:348: Error: r13 not allowed here -- `strh.w r0,\[r1,sp\]'
+[^:]*:349: Error: r15 not allowed here -- `strh.w pc,\[r0,r1,LSL#2\]'
+[^:]*:350: Error: r13 not allowed here -- `strh.w sp,\[r0,r1,LSL#2\]'
+[^:]*:351: Error: r15 not allowed here -- `strh.w r0,\[r1,pc,LSL#2\]'
+[^:]*:352: Error: r13 not allowed here -- `strh.w r0,\[r1,sp,LSL#2\]'
+[^:]*:355: Error: cannot use register index with PC-relative addressing -- `strht r0,\[pc,#4\]'
+[^:]*:356: Error: r15 not allowed here -- `strht pc,\[r0,#4\]'
+[^:]*:357: Error: r13 not allowed here -- `strht sp,\[pc,#4\]'
+[^:]*:360: Error: cannot use register index with PC-relative addressing -- `strt r0,\[pc,#4\]'
+[^:]*:361: Error: r15 not allowed here -- `strt pc,\[r0,#4\]'
+[^:]*:362: Error: r13 not allowed here -- `strt sp,\[r0,#4\]'
diff --git a/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
index 0b155fbdff..4252cba0b6 100644
--- a/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
+++ b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
@@ -78,22 +78,16 @@ ldrbt	sp, [r0, #4]			@ ditto
 @ LDRD (immediate)
 ldrd pc, r0, [r1]			@ BadReg
 ldrd sp, r0, [r1]			@ ditto
-ldrd r12, [r1]				@ ditto
-ldrd r14, [r1]				@ ditto
 ldrd r0, pc, [r1]			@ ditto
 ldrd r0, sp, [r1]			@ ditto
 ldrd pc, r0, [r1], #4			@ ditto
 ldrd sp, r0, [r1], #4			@ ditto
 ldrd r0, pc, [r1], #4			@ ditto
 ldrd r0, sp, [r1], #4			@ ditto
-ldrd r12, [r1], #4			@ ditto
-ldrd r14, [r1], #4			@ ditto
 ldrd pc, r0, [r1, #4]!			@ ditto
 ldrd sp, r0, [r1, #4]!			@ ditto
 ldrd r0, pc, [r1, #4]!			@ ditto
 ldrd r0, sp, [r1, #4]!			@ ditto
-ldrd r12, [r1, #4]!			@ ditto
-ldrd r14, [r1, #4]!			@ ditto
 
 @ LDRD (literal)
 ldrd pc, r0, label			@ BadReg
diff --git a/gas/testsuite/gas/arm/vfp1xD.d b/gas/testsuite/gas/arm/vfp1xD.d
index 62b19570c8..eebc72bdae 100644
--- a/gas/testsuite/gas/arm/vfp1xD.d
+++ b/gas/testsuite/gas/arm/vfp1xD.d
@@ -278,12 +278,5 @@ Disassembly of section .text:
 0+430 <[^>]*> eee1ba10 	vmsr	fpscr, fp
 0+434 <[^>]*> eee1ca10 	vmsr	fpscr, ip
 0+438 <[^>]*> eee1ea10 	vmsr	fpscr, lr
-0+43c <[^>]*> eee01a10 	vmsr	fpsid, r1
-0+440 <[^>]*> eee82a10 	vmsr	fpexc, r2
-0+444 <[^>]*> eef03a10 	vmrs	r3, fpsid
-0+448 <[^>]*> eef64a10 	vmrs	r4, mvfr1
-0+44c <[^>]*> eef75a10 	vmrs	r5, mvfr0
-0+450 <[^>]*> eef86a10 	vmrs	r6, fpexc
-0+454 <[^>]*> e1a00000 	nop			; \(mov r0, r0\)
-0+458 <[^>]*> e1a00000 	nop			; \(mov r0, r0\)
-0+45c <[^>]*> e1a00000 	nop			; \(mov r0, r0\)
+0+43c <[^>]*> e1a00000 	nop			; \(mov r0, r0\)
+
diff --git a/gas/testsuite/gas/arm/vfp1xD.s b/gas/testsuite/gas/arm/vfp1xD.s
index 0bf58b244f..274a0b1ebc 100644
--- a/gas/testsuite/gas/arm/vfp1xD.s
+++ b/gas/testsuite/gas/arm/vfp1xD.s
@@ -381,14 +381,4 @@ F:
 	vmsr	FPSCR, r12
 	vmsr	FPSCR, r14
 
-	@ Priviledged externsions to VMSR/VMRS instructions
-	vmsr	FPSID, r1
-	vmsr	FPEXC, r2
-	vmrs	r3, FPSID
-	vmrs	r4, MVFR1
-	vmrs	r5, MVFR0
-	vmrs	r6, FPEXC
-	
-	nop
-	nop
 	nop
diff --git a/gas/testsuite/gas/bfin/move.d b/gas/testsuite/gas/bfin/move.d
index 7dc8dbb84c..d81f81fe90 100644
--- a/gas/testsuite/gas/bfin/move.d
+++ b/gas/testsuite/gas/bfin/move.d
@@ -56,8 +56,8 @@ Disassembly of section .text:
 00000066 <move_register_half>:
   66:	09 c4 28 40 	A0.X = R5.L;
   6a:	09 c4 10 c0 	A1.X = R2.L;
-  6e:	0a c4 3f 00 	R0.L = A0.X;
-  72:	0a c4 3f 4e 	R7.L = A1.X;
+  6e:	0a c4 [0|3][0|6] 00 	R0.L = A0.X;
+  72:	0a c4 [0|3][0|6] 4e 	R7.L = A1.X;
   76:	09 c4 18 00 	A0.L = R3.L;
   7a:	09 c4 20 80 	A1.L = R4.L;
   7e:	29 c4 30 00 	A0.H = R6.H;
diff --git a/gas/testsuite/gas/bfin/move2.d b/gas/testsuite/gas/bfin/move2.d
index 1e8217962a..5c64252dfa 100644
--- a/gas/testsuite/gas/bfin/move2.d
+++ b/gas/testsuite/gas/bfin/move2.d
@@ -279,12 +279,12 @@ Disassembly of section .text:
  248:	09 c4 08 40 	A0.X = R1.L;
  24c:	09 c4 00 c0 	A1.X = R0.L;
  250:	09 c4 08 c0 	A1.X = R1.L;
- 254:	0a c4 3f 00 	R0.L = A0.X;
- 258:	0a c4 3f 02 	R1.L = A0.X;
- 25c:	0a c4 3f 0e 	R7.L = A0.X;
- 260:	0a c4 3f 40 	R0.L = A1.X;
- 264:	0a c4 3f 42 	R1.L = A1.X;
- 268:	0a c4 3f 4e 	R7.L = A1.X;
+ 254:	0a c4 [0|3][0|6] 00 	R0.L = A0.X;
+ 258:	0a c4 [0|3][0|6] 02 	R1.L = A0.X;
+ 25c:	0a c4 [0|3][0|6] 0e 	R7.L = A0.X;
+ 260:	0a c4 [0|3][0|6] 40 	R0.L = A1.X;
+ 264:	0a c4 [0|3][0|6] 42 	R1.L = A1.X;
+ 268:	0a c4 [0|3][0|6] 4e 	R7.L = A1.X;
  26c:	09 c4 00 00 	A0.L = R0.L;
  270:	09 c4 08 00 	A0.L = R1.L;
  274:	09 c4 30 00 	A0.L = R6.L;
diff --git a/gas/testsuite/gas/bfin/parallel.d b/gas/testsuite/gas/bfin/parallel.d
index 6445bd3aa2..bd4269cde7 100644
--- a/gas/testsuite/gas/bfin/parallel.d
+++ b/gas/testsuite/gas/bfin/parallel.d
@@ -29,15 +29,15 @@ Disassembly of section .text:
   54:	f8 90 00 00 
   58:	06 ce 02 ce 	R7.L = ONES R2 \|\| P1 = \[P5 \+ 0x18\] \|\| NOP;
   5c:	a9 ad 00 00 
-  60:	10 cc 3f 00 	A0 = ABS A0 \|\| P2 = \[SP \+ 0x3c\] \|\| R0 = \[I0\];
+  60:	10 cc 00 00 	A0 = ABS A0 \|\| P2 = \[SP \+ 0x3c\] \|\| R0 = \[I0\];
   64:	f2 af 00 9d 
-  68:	10 cc 3f 40 	A0 = ABS A1 \|\| P3 = \[FP -0x3c\] \|\| R1 = \[I1 \+\+ M0\];
+  68:	10 cc 00 40 	A0 = ABS A1 \|\| P3 = \[FP -0x3c\] \|\| R1 = \[I1 \+\+ M0\];
   6c:	1b b9 89 9d 
-  70:	30 cc 3f 00 	A1 = ABS A0 \|\| P4 = \[FP -0x4\] \|\| R2 = \[I1\+\+\];
+  70:	30 cc 00 00 	A1 = ABS A0 \|\| P4 = \[FP -0x4\] \|\| R2 = \[I1\+\+\];
   74:	fc b9 0a 9c 
-  78:	30 cc 3f 40 	A1 = ABS A1 \|\| FP = \[SP\] \|\| R3 = \[I2--\];
+  78:	30 cc 00 40 	A1 = ABS A1 \|\| FP = \[SP\] \|\| R3 = \[I2--\];
   7c:	77 91 93 9c 
-  80:	10 cc 3f c0 	A1 = ABS A1, A0 = ABS A0 \|\| R4 = \[P5 \+ 0x38\] \|\| R0.H = W\[I0\];
+  80:	10 cc 00 c0 	A1 = ABS A1, A0 = ABS A0 \|\| R4 = \[P5 \+ 0x38\] \|\| R0.H = W\[I0\];
   84:	ac a3 40 9d 
   88:	07 cc 10 80 	R0 = ABS R2 \|\| B\[SP\] = R0 \|\| R1.H = W\[I1\+\+\];
   8c:	30 9b 49 9c 
@@ -75,19 +75,19 @@ Disassembly of section .text:
  10c:	12 9b 08 9c 
  110:	07 cc 38 48 	R4 = MIN \(R7, R0\) \|\| B\[P3\] = R2 \|\| R1 = \[I1\+\+\];
  114:	1a 9b 09 9c 
- 118:	0b cc 3f c0 	A0 -= A1 \|\| B\[P4\] = R2 \|\| R2 = \[I1\+\+\];
+ 118:	0b cc 00 c0 	A0 -= A1 \|\| B\[P4\] = R2 \|\| R2 = \[I1\+\+\];
  11c:	22 9b 0a 9c 
- 120:	0b cc 3f e0 	A0 -= A1 \(W32\) \|\| B\[P5\] = R2 \|\| R3 = \[I1\+\+\];
+ 120:	0b cc 00 e0 	A0 -= A1 \(W32\) \|\| B\[P5\] = R2 \|\| R3 = \[I1\+\+\];
  124:	2a 9b 0b 9c 
- 128:	0b cc 3f 80 	A0 \+= A1 \|\| B\[SP\] = R2 \|\| R4 = \[I1\+\+\];
+ 128:	0b cc 00 80 	A0 \+= A1 \|\| B\[SP\] = R2 \|\| R4 = \[I1\+\+\];
  12c:	32 9b 0c 9c 
- 130:	0b cc 3f a0 	A0 \+= A1 \(W32\) \|\| B\[FP\] = R2 \|\| R5 = \[I1\+\+\];
+ 130:	0b cc 00 a0 	A0 \+= A1 \(W32\) \|\| B\[FP\] = R2 \|\| R5 = \[I1\+\+\];
  134:	3a 9b 0d 9c 
- 138:	0b cc 3f 0e 	R7 = \(A0 \+= A1\) \|\| B\[SP\] = R3 \|\| R6 = \[I1\+\+\];
+ 138:	0b cc 00 0e 	R7 = \(A0 \+= A1\) \|\| B\[SP\] = R3 \|\| R6 = \[I1\+\+\];
  13c:	33 9b 0e 9c 
- 140:	0b cc 3f 4c 	R6.L = \(A0 \+= A1\) \|\| B\[FP\] = R3 \|\| R7 = \[I1\+\+\];
+ 140:	0b cc 00 4c 	R6.L = \(A0 \+= A1\) \|\| B\[FP\] = R3 \|\| R7 = \[I1\+\+\];
  144:	3b 9b 0f 9c 
- 148:	2b cc 3f 40 	R0.H = \(A0 \+= A1\) \|\| B\[P0\] = R3 \|\| R7 = \[I0\+\+\];
+ 148:	2b cc 00 40 	R0.H = \(A0 \+= A1\) \|\| B\[P0\] = R3 \|\| R7 = \[I0\+\+\];
  14c:	03 9b 07 9c 
  150:	00 ca 0a 24 	R0.L = R1.H \* R2.L \|\| B\[P1\] = R3 \|\| R1 = \[I0\+\+\];
  154:	0b 9b 01 9c 
@@ -189,25 +189,25 @@ Disassembly of section .text:
  2d4:	c0 8a 2e 9c 
  2d8:	07 cc 10 ee 	R7 = -R2 \(S\) \|\| W\[P0\] = R4.L \|\| R5.L = W\[I2\+\+\];
  2dc:	00 8b 35 9c 
- 2e0:	0e cc 3f 00 	A0 = -A0 \|\| W\[P0\] = R5.L \|\| R4.L = W\[I3\+\+\];
+ 2e0:	0e cc 00 00 	A0 = -A0 \|\| W\[P0\] = R5.L \|\| R4.L = W\[I3\+\+\];
  2e4:	40 8b 3c 9c 
- 2e8:	0e cc 3f 40 	A0 = -A1 \|\| W\[P0\] = R6.L \|\| R3.L = W\[I3--\];
+ 2e8:	0e cc 00 40 	A0 = -A1 \|\| W\[P0\] = R6.L \|\| R3.L = W\[I3--\];
  2ec:	80 8b bb 9c 
- 2f0:	2e cc 3f 00 	A1 = -A0 \|\| W\[P0\] = R7.L \|\| R2.L = W\[I1\+\+\];
+ 2f0:	2e cc 00 00 	A1 = -A0 \|\| W\[P0\] = R7.L \|\| R2.L = W\[I1\+\+\];
  2f4:	c0 8b 2a 9c 
- 2f8:	2e cc 3f 40 	A1 = -A1 \|\| W\[P1\] = R0 \|\| R1.L = W\[I2--\];
+ 2f8:	2e cc 00 40 	A1 = -A1 \|\| W\[P1\] = R0 \|\| R1.L = W\[I2--\];
  2fc:	08 97 b1 9c 
- 300:	0e cc 3f c0 	A1 = -A1, A0 = -A0 \|\| W\[P1\] = R1 \|\| R0.L = W\[I1--\];
+ 300:	0e cc 00 c0 	A1 = -A1, A0 = -A0 \|\| W\[P1\] = R1 \|\| R0.L = W\[I1--\];
  304:	09 97 a8 9c 
  308:	0c cc 18 ca 	R5.L = R3 \(RND\) \|\| W\[P1\] = R2 \|\| R0 = \[I0 \+\+ M3\];
  30c:	0a 97 e0 9d 
  310:	2c cc 00 cc 	R6.H = R0 \(RND\) \|\| W\[P1\] = R3 \|\| R1 = \[I1 \+\+ M2\];
  314:	0b 97 c9 9d 
- 318:	08 cc 3f 20 	A0 = A0 \(S\) \|\| W\[P1\] = R4 \|\| R2 = \[I2 \+\+ M1\];
+ 318:	08 cc 00 20 	A0 = A0 \(S\) \|\| W\[P1\] = R4 \|\| R2 = \[I2 \+\+ M1\];
  31c:	0c 97 b2 9d 
- 320:	08 cc 3f 60 	A1 = A1 \(S\) \|\| W\[P1\] = R5 \|\| R3 = \[I3 \+\+ M0\];
+ 320:	08 cc 00 60 	A1 = A1 \(S\) \|\| W\[P1\] = R5 \|\| R3 = \[I3 \+\+ M0\];
  324:	0d 97 9b 9d 
- 328:	08 cc 3f a0 	A1 = A1 \(S\), A0 = A0 \(S\) \|\| R6 = W\[P1\] \(Z\) \|\| \[I0\] = R0;
+ 328:	08 cc 00 a0 	A1 = A1 \(S\), A0 = A0 \(S\) \|\| R6 = W\[P1\] \(Z\) \|\| \[I0\] = R0;
  32c:	0e 95 00 9f 
  330:	05 ce 00 0a 	R5.L = SIGNBITS R0 \|\| R7 = W\[P1\] \(Z\) \|\| \[I1\] = R0;
  334:	0f 95 08 9f 
@@ -225,15 +225,15 @@ Disassembly of section .text:
  364:	01 9c 00 00 
  368:	03 c8 00 18 	MNOP \|\| P0 = \[FP \+ 0x14\] \|\| R0 = \[I2\+\+\];
  36c:	78 ad 10 9c 
- 370:	0a cc 3f 08 	R4.L = A0.X \|\| R6 = \[FP \+ 0x3c\] \|\| R4.H = W\[I1\+\+\];
+ 370:	0a cc 00 08 	R4.L = A0.X \|\| R6 = \[FP \+ 0x3c\] \|\| R4.H = W\[I1\+\+\];
  374:	fe a3 4c 9c 
- 378:	0a cc 3f 08 	R4.L = A0.X \|\| R4.H = W\[I1\+\+\] \|\| W\[I0\] = R4.H;
+ 378:	0a cc 00 08 	R4.L = A0.X \|\| R4.H = W\[I1\+\+\] \|\| W\[I0\] = R4.H;
  37c:	4c 9c 44 9f 
- 380:	0a cc 3f 08 	R4.L = A0.X \|\| W\[I1\+\+\] = R4.L \|\| R4.H = W\[I0--\];
+ 380:	0a cc 00 08 	R4.L = A0.X \|\| W\[I1\+\+\] = R4.L \|\| R4.H = W\[I0--\];
  384:	2c 9e c4 9c 
- 388:	0a cc 3f 48 	R4.L = A1.X \|\| R6 = B\[SP--\] \(Z\) \|\| R4.H = W\[I1\+\+\];
+ 388:	0a cc 00 48 	R4.L = A1.X \|\| R6 = B\[SP--\] \(Z\) \|\| R4.H = W\[I1\+\+\];
  38c:	b6 98 4c 9c 
- 390:	0b cc 3f a0 	A0 \+= A1 \(W32\) \|\| R3.L = W\[I0\] \|\| R0 = \[I0 \+\+ M3\];
+ 390:	0b cc 00 a0 	A0 \+= A1 \(W32\) \|\| R3.L = W\[I0\] \|\| R0 = \[I0 \+\+ M3\];
  394:	23 9d e0 9d 
- 398:	0b cc 3f c0 	A0 -= A1 \|\| R0 = W\[P0\+\+\] \(X\) \|\| W\[I0\+\+\] = R3.L;
+ 398:	0b cc 00 c0 	A0 -= A1 \|\| R0 = W\[P0\+\+\] \(X\) \|\| W\[I0\+\+\] = R3.L;
  39c:	40 94 23 9e 
diff --git a/gas/testsuite/gas/bfin/parallel2.d b/gas/testsuite/gas/bfin/parallel2.d
index 3ec0dcacf2..3a07b8686f 100644
--- a/gas/testsuite/gas/bfin/parallel2.d
+++ b/gas/testsuite/gas/bfin/parallel2.d
@@ -5,9 +5,9 @@
 Disassembly of section .text:
 
 00000000 <.text>:
-   0:	08 cc 3f c0 	A0 = A1 \|\| P0 = \[SP \+ 0x14\] \|\| NOP;
+   0:	08 cc 00 c0 	A0 = A1 \|\| P0 = \[SP \+ 0x14\] \|\| NOP;
    4:	70 ad 00 00 
-   8:	08 cc 3f e0 	A1 = A0 \|\| P0 = \[P5 \+ 0x18\] \|\| NOP;
+   8:	08 cc 00 e0 	A1 = A0 \|\| P0 = \[P5 \+ 0x18\] \|\| NOP;
    c:	a8 ad 00 00 
   10:	09 cc 00 20 	A0 = R0 \|\| P0 = \[P4 \+ 0x1c\] \|\| NOP;
   14:	e0 ad 00 00 
@@ -29,9 +29,9 @@ Disassembly of section .text:
   54:	e0 af 00 00 
   58:	09 cc 10 c0 	A1.X = R2.L \|\| R0 = \[I0 \+\+ M0\] \|\| NOP;
   5c:	80 9d 00 00 
-  60:	0a cc 3f 00 	R0.L = A0.X \|\| R1 = \[I0 \+\+ M1\] \|\| NOP;
+  60:	0a cc 00 00 	R0.L = A0.X \|\| R1 = \[I0 \+\+ M1\] \|\| NOP;
   64:	a1 9d 00 00 
-  68:	0a cc 3f 4e 	R7.L = A1.X \|\| R0 = \[I0 \+\+ M2\] \|\| NOP;
+  68:	0a cc 00 4e 	R7.L = A1.X \|\| R0 = \[I0 \+\+ M2\] \|\| NOP;
   6c:	c0 9d 00 00 
   70:	09 cc 18 00 	A0.L = R3.L \|\| R0 = \[I0 \+\+ M3\] \|\| NOP;
   74:	e0 9d 00 00 
diff --git a/gas/testsuite/gas/bfin/parallel3.d b/gas/testsuite/gas/bfin/parallel3.d
index aa3669c0c3..9f23c594a3 100644
--- a/gas/testsuite/gas/bfin/parallel3.d
+++ b/gas/testsuite/gas/bfin/parallel3.d
@@ -47,9 +47,9 @@ Disassembly of section .text:
   9c:	58 93 00 00 
   a0:	04 cc 39 a6 	R0 = R7 \+ R1, R3 = R7 - R1 \(S\) \|\| \[P3\+\+\] = P0 \|\| NOP;
   a4:	58 92 00 00 
-  a8:	11 cc ff 0b 	R7 = A1 \+ A0, R5 = A1 - A0 \(NS\) \|\| \[P3--\] = P0 \|\| NOP;
+  a8:	11 cc c0 0b 	R7 = A1 \+ A0, R5 = A1 - A0 \(NS\) \|\| \[P3--\] = P0 \|\| NOP;
   ac:	d8 92 00 00 
-  b0:	11 cc ff 6c 	R3 = A0 \+ A1, R6 = A0 - A1 \(S\) \|\| \[P3 \+ 0x1c\] = P0 \|\| NOP;
+  b0:	11 cc c0 6c 	R3 = A0 \+ A1, R6 = A0 - A1 \(S\) \|\| \[P3 \+ 0x1c\] = P0 \|\| NOP;
   b4:	d8 bd 00 00 
   b8:	81 ce 8b 03 	R1 = R3 >>> 0xf \(V\) \|\| \[P3 \+ 0x18\] = P0 \|\| NOP;
   bc:	98 bd 00 00 
diff --git a/gas/testsuite/gas/bfin/parallel4.d b/gas/testsuite/gas/bfin/parallel4.d
index 0e1c37cfa0..02863f9b22 100644
--- a/gas/testsuite/gas/bfin/parallel4.d
+++ b/gas/testsuite/gas/bfin/parallel4.d
@@ -21,7 +21,7 @@ Disassembly of section .text:
   34:	10 9f 00 00 
   38:	37 cc 02 24 	R2 = BYTEOP3P \(R1:0, R3:2\) \(HI, R\) \|\| \[I2\+\+\] = R0 \|\| NOP;
   3c:	10 9e 00 00 
-  40:	0c cc 7f 45 	R5 = A1.L \+ A1.H, R2 = A0.L \+ A0.H \|\| \[I2--\] = R0 \|\| NOP;
+  40:	0c cc 40 45 	R5 = A1.L \+ A1.H, R2 = A0.L \+ A0.H \|\| \[I2--\] = R0 \|\| NOP;
   44:	90 9e 00 00 
   48:	15 cc 82 06 	\(R2, R3\) = BYTEOP16P \(R1:0, R3:2\) \|\| \[I3\] = R0 \|\| NOP;
   4c:	18 9f 00 00 
diff --git a/gas/testsuite/gas/bfin/video.d b/gas/testsuite/gas/bfin/video.d
index 4c16866387..0fafc06587 100644
--- a/gas/testsuite/gas/bfin/video.d
+++ b/gas/testsuite/gas/bfin/video.d
@@ -18,7 +18,7 @@ Disassembly of section .text:
 [ 0-9a-f]+:	37 c4 02 24 	R2 = BYTEOP3P \(R1:0, R3:2\) \(HI, R\);
 
 [0-9a-f]+ <dual16>:
-[ 0-9a-f]+:	0c c4 7f 45 	R5 = A1.L \+ A1.H, R2 = A0.L \+ A0.H;
+[ 0-9a-f]+:	0c c4 40 45 	R5 = A1.L \+ A1.H, R2 = A0.L \+ A0.H;
 
 [0-9a-f]+ <byteop16p>:
 [ 0-9a-f]+:	15 c4 82 06 	\(R2, R3\) = BYTEOP16P \(R1:0, R3:2\);
diff --git a/gas/testsuite/gas/bfin/video2.d b/gas/testsuite/gas/bfin/video2.d
index eba54fe24c..98f22395fd 100644
--- a/gas/testsuite/gas/bfin/video2.d
+++ b/gas/testsuite/gas/bfin/video2.d
@@ -50,10 +50,10 @@ Disassembly of section .text:
 [ 0-9a-f]+:	37 c4 10 0a 	R5 = BYTEOP3P \(R3:2, R1:0\) \(HI\);
 [ 0-9a-f]+:	17 c4 10 2c 	R6 = BYTEOP3P \(R3:2, R1:0\) \(LO, R\);
 [ 0-9a-f]+:	37 c4 10 2e 	R7 = BYTEOP3P \(R3:2, R1:0\) \(HI, R\);
-[ 0-9a-f]+:	0c c4 3f 42 	R0 = A1.L \+ A1.H, R1 = A0.L \+ A0.H;
-[ 0-9a-f]+:	0c c4 bf 46 	R2 = A1.L \+ A1.H, R3 = A0.L \+ A0.H;
-[ 0-9a-f]+:	0c c4 3f 4b 	R4 = A1.L \+ A1.H, R5 = A0.L \+ A0.H;
-[ 0-9a-f]+:	0c c4 bf 4f 	R6 = A1.L \+ A1.H, R7 = A0.L \+ A0.H;
+[ 0-9a-f]+:	0c c4 00 42 	R0 = A1.L \+ A1.H, R1 = A0.L \+ A0.H;
+[ 0-9a-f]+:	0c c4 80 46 	R2 = A1.L \+ A1.H, R3 = A0.L \+ A0.H;
+[ 0-9a-f]+:	0c c4 00 4b 	R4 = A1.L \+ A1.H, R5 = A0.L \+ A0.H;
+[ 0-9a-f]+:	0c c4 80 4f 	R6 = A1.L \+ A1.H, R7 = A0.L \+ A0.H;
 [ 0-9a-f]+:	15 c4 d0 01 	\(R7, R0\) = BYTEOP16P \(R3:2, R1:0\);
 [ 0-9a-f]+:	15 c4 50 04 	\(R1, R2\) = BYTEOP16P \(R3:2, R1:0\);
 [ 0-9a-f]+:	15 c4 10 02 	\(R0, R1\) = BYTEOP16P \(R3:2, R1:0\);
diff --git a/gas/testsuite/gas/elf/bad-group.s b/gas/testsuite/gas/elf/bad-group.s
index dc927c62d0..69710c72aa 100644
--- a/gas/testsuite/gas/elf/bad-group.s
+++ b/gas/testsuite/gas/elf/bad-group.s
@@ -3,7 +3,7 @@
 main:
 	.type	main, @function
 .LFB0:
-	.section	.text.unlikely,"ax",%progbits
+	.section	.text.unlikely
 .L5:
 	.globl __gxx_personality_v0
 	.section	.gcc_except_table,"a",%progbits
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 9b7cc8f389..b6b1f0a287 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -37,7 +37,19 @@ proc run_elf_list_test { name suffix opts readelf_opts readelf_pipe } {
 }
 
 # We're testing bits in obj-elf -- don't run on anything else.
-if { [is_elf_format] } then {
+if { ([istarget "*-*-*elf*"]
+      || [istarget "*-*-linux*"]
+      || [istarget "*-*-gnu*"]
+      || [istarget "m6811-*"]
+      || [istarget "m6812-*"]
+      || [istarget "sparc*-*-solaris*"]
+      || [istarget "mips*-*-irix6*"]
+      || [istarget "arm*-*-eabi"])
+     && ![istarget *-*-linux*aout*]
+     && ![istarget *-*-linux*coff*]
+     && ![istarget *-*-linux*oldld*]
+     && ![istarget sh64*-*-linux*]
+} then {
     set target_machine ""
     if {[istarget "mips*-*-*"]} then {
 	set target_machine -mips
@@ -95,14 +107,8 @@ if { [is_elf_format] } then {
     run_dump_test "group0c"
     run_dump_test "group1a"
     run_dump_test "group1b"
+    run_dump_test "groupautoa"
     case $target_triplet in {
-	{ hppa64*-*-hpux* } { }
-	default {
-	    run_dump_test "groupautoa"
-	}
-    }
-    case $target_triplet in {
-	{ hppa64*-*-hpux* } { }
 	{ xtensa*-*-* } { }
 	default {
 	    run_dump_test "groupautob"
@@ -153,21 +159,16 @@ if { [is_elf_format] } then {
     }
     run_dump_test "symver"
 
-    # No indirect functions on non-GNU targets.
     # The MSP port sets the ELF header's OSABI field to ELFOSABI_STANDALONE.
     # The non-eabi ARM ports sets it to ELFOSABI_ARM.
     # So for these targets we cannot include an IFUNC symbol type
     # in the symbol type test.
-    if { [istarget "*-*-hpux*"]
-	 || [istarget "msp*-*-*"]
-	 || [istarget "arm*-*-*"]} then {
-	# hppa64 has a non-standard common directive
-	if { ![istarget "hppa64*-*-hpux*"] } then {
+    if {   [istarget "msp*-*-*"]
+	|| [istarget "arm*-*-*"]} then {
 	    run_elf_list_test "type-noifunc" "" "" "-s" "| grep \"1 *\\\[FONTC\\\]\""
-	}
     } else {
-	run_dump_test ifunc-1
-	run_elf_list_test "type" "" "" "-s" "| grep \"1 *\\\[FIONTCU\\\]\""
+    	    run_dump_test ifunc-1
+	    run_elf_list_test "type" "" "" "-s" "| grep \"1 *\\\[FIONTCU\\\]\""
     }
 
     run_dump_test "section6"
diff --git a/gas/testsuite/gas/elf/section7.s b/gas/testsuite/gas/elf/section7.s
index 2d637b47a9..fe9aaa1040 100644
--- a/gas/testsuite/gas/elf/section7.s
+++ b/gas/testsuite/gas/elf/section7.s
@@ -1,38 +1,38 @@
 	.section .bar,"a"
 	.byte 0
- .pushsection .bar1,2,"a"
+.pushsection .bar1,2,"a"
 	.byte 2
- .popsection
+.popsection
 	.byte 0
- .pushsection .bar2,3,"a"
+.pushsection .bar2,3,"a"
 	.byte 2
- .popsection
+.popsection
 	.byte 0
- .pushsection .bar3,2,"a", %progbits
+.pushsection .bar3,2,"a", %progbits
 	.byte 3
- .popsection
+.popsection
 	.byte 0
- .pushsection .bar4
+.pushsection .bar4
 	.byte 4
- .popsection
+.popsection
 	.byte 0
- .pushsection        .text,1,"axG",%progbits,foo,comdat
+.pushsection        .text,1,"axG",%progbits,foo,comdat
 	.byte -1
- .popsection
+.popsection
 	.byte 0
- .pushsection        .text,"axG",%progbits,foo,comdat
+.pushsection        .text,"axG",%progbits,foo,comdat
 	.byte -2
- .popsection
+.popsection
 	.byte 0
- .pushsection .bar1,"a"
+.pushsection .bar1,"a"
 	.byte 1
- .popsection
+.popsection
 	.byte 0
- .pushsection .bar3,"a", %progbits
+.pushsection .bar3,"a", %progbits
 	.byte 1
- .popsection
+.popsection
 	.byte 0
- .pushsection .bar2,"a"
+.pushsection .bar2,"a"
 	.byte 1
- .popsection
+.popsection
 	.byte 0
diff --git a/gas/testsuite/gas/elf/type-noifunc.e b/gas/testsuite/gas/elf/type-noifunc.e
index ddeadd7d3a..8b2a6bcc73 100644
--- a/gas/testsuite/gas/elf/type-noifunc.e
+++ b/gas/testsuite/gas/elf/type-noifunc.e
@@ -2,4 +2,4 @@
  +.: 0+0 +1 +OBJECT +LOCAL +DEFAULT +. object
  +.: 0+1 +1 +TLS +LOCAL +DEFAULT +. tls_object
  +..: 0+2 +1 +NOTYPE +LOCAL +DEFAULT +. notype
- +..: 0+1 +1 +(COMMON|OBJECT) +GLOBAL +DEFAULT +(ANSI_|)COM common
+ +..: 0+1 +1 +(COMMON|OBJECT) +GLOBAL +DEFAULT +COM common
diff --git a/gas/testsuite/gas/elf/warn-2.s b/gas/testsuite/gas/elf/warn-2.s
index 7783f9d9dd..12b71390ea 100644
--- a/gas/testsuite/gas/elf/warn-2.s
+++ b/gas/testsuite/gas/elf/warn-2.s
@@ -6,18 +6,18 @@
 
 	.offset 40
 	
- .ifeq nop_type - 1
+.ifeq nop_type - 1
 	nop 0
- .else
- .ifeq nop_type - 2
+.else
+.ifeq nop_type - 2
 	l.nop 0
- .else
- .ifeq nop_type - 3
+.else
+.ifeq nop_type - 3
 	nopr 1
- .else
+.else
 	nop
- .endif
- .endif
- .endif
+.endif
+.endif
+.endif
 
 ;# { dg-warning "Warning: dwarf line number information for .* ignored" "" { xfail i370-*-* mcore-*-* mn10200-*-* moxie-*-* openrisc-*-* or32-*-* v850-*-* } 0 }
diff --git a/gas/testsuite/gas/frv/allinsn.exp b/gas/testsuite/gas/frv/allinsn.exp
index 4796b8a33b..b6950aeb61 100644
--- a/gas/testsuite/gas/frv/allinsn.exp
+++ b/gas/testsuite/gas/frv/allinsn.exp
@@ -17,6 +17,4 @@ if [istarget frv*-*-*] {
     run_list_test "fr450-media-issue" "-mcpu=fr450"
 
     run_dump_test "fr550-pack1"
-
-    run_dump_test "immediates"
 }
diff --git a/gas/testsuite/gas/i386/disp32.d b/gas/testsuite/gas/i386/disp32.d
index a3255fa137..68fd3e861a 100644
--- a/gas/testsuite/gas/i386/disp32.d
+++ b/gas/testsuite/gas/i386/disp32.d
@@ -8,23 +8,12 @@
 Disassembly of section .text:
 
 0+ <.*>:
-[ 	]*[a-f0-9]+:	8b 18                	mov    \(%eax\),%ebx
 [ 	]*[a-f0-9]+:	8b 58 03             	mov    0x3\(%eax\),%ebx
-[ 	]*[a-f0-9]+:	8b 58 00             	mov    0x0\(%eax\),%ebx
-[ 	]*[a-f0-9]+:	8b 58 03             	mov    0x3\(%eax\),%ebx
-[ 	]*[a-f0-9]+:	8b 98 ff 0f 00 00    	mov    0xfff\(%eax\),%ebx
-[ 	]*[a-f0-9]+:	8b 98 00 00 00 00    	mov    0x0\(%eax\),%ebx
 [ 	]*[a-f0-9]+:	8b 98 03 00 00 00    	mov    0x3\(%eax\),%ebx
-[ 	]*[a-f0-9]+:	eb 07                	jmp    26 <foo>
-[ 	]*[a-f0-9]+:	eb 05                	jmp    26 <foo>
-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    26 <foo>
+[ 	]*[a-f0-9]+:	eb 05                	jmp    10 <foo>
+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    10 <foo>
 
-0+26 <foo>:
-[ 	]*[a-f0-9]+:	89 18                	mov    %ebx,\(%eax\)
-[ 	]*[a-f0-9]+:	89 58 03             	mov    %ebx,0x3\(%eax\)
-[ 	]*[a-f0-9]+:	89 98 ff 0f 00 00    	mov    %ebx,0xfff\(%eax\)
-[ 	]*[a-f0-9]+:	89 58 00             	mov    %ebx,0x0\(%eax\)
+0+10 <foo>:
 [ 	]*[a-f0-9]+:	89 58 03             	mov    %ebx,0x3\(%eax\)
-[ 	]*[a-f0-9]+:	89 98 00 00 00 00    	mov    %ebx,0x0\(%eax\)
 [ 	]*[a-f0-9]+:	89 98 03 00 00 00    	mov    %ebx,0x3\(%eax\)
 #pass
diff --git a/gas/testsuite/gas/i386/disp32.s b/gas/testsuite/gas/i386/disp32.s
index c3bec3a823..de34f41884 100644
--- a/gas/testsuite/gas/i386/disp32.s
+++ b/gas/testsuite/gas/i386/disp32.s
@@ -1,26 +1,11 @@
 	.text
-	mov (%eax),%ebx
 	mov 3(%eax),%ebx
-
-	mov.d8 (%eax),%ebx
-	mov.d8 3(%eax),%ebx
-	mov.d8 0xfff(%eax),%ebx
-
-	mov.d32 (%eax),%ebx
 	mov.d32 3(%eax),%ebx
 
 	jmp foo
-	jmp.d8 foo
 	jmp.d32 foo
 foo:
 
 	.intel_syntax noprefix
-	mov DWORD PTR [eax], ebx
 	mov DWORD PTR [eax+3], ebx
-	mov DWORD PTR [eax+0xfff], ebx
-
-	mov.d8 DWORD PTR [eax], ebx
-	mov.d8 DWORD PTR [eax+3], ebx
-
-	mov.d32 DWORD PTR [eax], ebx
 	mov.d32 DWORD PTR [eax+3], ebx
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index fc67db08e6..e38cd27ba1 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -54,7 +54,6 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "disp-intel"
     run_dump_test "disp32"
     run_dump_test "vmx"
-    run_dump_test "vmfunc"
     run_dump_test "smx"
     run_dump_test "suffix"
     run_dump_test "immed32"
@@ -186,11 +185,6 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "fma-intel"
     run_dump_test "fma-scalar"
     run_dump_test "fma-scalar-intel"
-    run_dump_test "hle"
-    run_dump_test "hle-intel"
-    run_list_test "hlebad" "-al"
-    run_dump_test "rtm"
-    run_dump_test "rtm-intel"
     run_dump_test "fma4"
     run_dump_test "lwp"
     run_dump_test "xop"
@@ -204,9 +198,6 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "fsgs-intel"
     run_dump_test "rdrnd"
     run_dump_test "rdrnd-intel"
-    run_dump_test "bundle"
-    run_dump_test "bundle-lock"
-    run_dump_test "bundle-bad"
 
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.
@@ -311,7 +302,6 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "svme64"
     run_dump_test "x86-64-amdfam10"
     run_dump_test "x86-64-vmx"
-    run_dump_test "x86-64-vmfunc"
     run_dump_test "immed64"
     run_dump_test "x86-64-sse3"
     run_dump_test "x86-64-crx"
@@ -417,11 +407,6 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-fma-intel"
     run_dump_test "x86-64-fma-scalar"
     run_dump_test "x86-64-fma-scalar-intel"
-    run_dump_test "x86-64-hle"
-    run_dump_test "x86-64-hle-intel"
-    run_list_test "x86-64-hlebad" "-al"
-    run_dump_test "x86-64-rtm"
-    run_dump_test "x86-64-rtm-intel"
     run_dump_test "x86-64-fma4"
     run_dump_test "x86-64-lwp"
     run_dump_test "x86-64-xop"
@@ -435,7 +420,6 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-fsgs-intel"
     run_dump_test "x86-64-rdrnd"
     run_dump_test "x86-64-rdrnd-intel"
-    run_dump_test "x86-64-bundle"
 
     if { ![istarget "*-*-aix*"]
       && ![istarget "*-*-beos*"]
diff --git a/gas/testsuite/gas/i386/ifunc-3.s b/gas/testsuite/gas/i386/ifunc-3.s
index 18fd4d6167..dbcf4945b0 100644
--- a/gas/testsuite/gas/i386/ifunc-3.s
+++ b/gas/testsuite/gas/i386/ifunc-3.s
@@ -8,10 +8,9 @@ start1:
 	.long	bar1-base
 
 	.type	bar1,%gnu_indirect_function
-	.size	bar1,.Lendbar1-bar1
 bar1:
 	ret
-.Lendbar1:
+	.size	bar1,.-bar1
 	.align	4
 
 	.long	bar1-.
diff --git a/gas/testsuite/gas/i386/x86-64-disp32.d b/gas/testsuite/gas/i386/x86-64-disp32.d
index 8e307ee671..c3d70a186a 100644
--- a/gas/testsuite/gas/i386/x86-64-disp32.d
+++ b/gas/testsuite/gas/i386/x86-64-disp32.d
@@ -8,23 +8,12 @@
 Disassembly of section .text:
 
 0+ <.*>:
-[ 	]*[a-f0-9]+:	8b 18                	mov    \(%rax\),%ebx
 [ 	]*[a-f0-9]+:	8b 58 03             	mov    0x3\(%rax\),%ebx
-[ 	]*[a-f0-9]+:	8b 58 00             	mov    0x0\(%rax\),%ebx
-[ 	]*[a-f0-9]+:	8b 58 03             	mov    0x3\(%rax\),%ebx
-[ 	]*[a-f0-9]+:	8b 98 ff 0f 00 00    	mov    0xfff\(%rax\),%ebx
-[ 	]*[a-f0-9]+:	8b 98 00 00 00 00    	mov    0x0\(%rax\),%ebx
 [ 	]*[a-f0-9]+:	8b 98 03 00 00 00    	mov    0x3\(%rax\),%ebx
-[ 	]*[a-f0-9]+:	eb 07                	jmp    26 <foo>
-[ 	]*[a-f0-9]+:	eb 05                	jmp    26 <foo>
-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   26 <foo>
+[ 	]*[a-f0-9]+:	eb 05                	jmp    10 <foo>
+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   10 <foo>
 
-0+26 <foo>:
-[ 	]*[a-f0-9]+:	89 18                	mov    %ebx,\(%rax\)
-[ 	]*[a-f0-9]+:	89 58 03             	mov    %ebx,0x3\(%rax\)
-[ 	]*[a-f0-9]+:	89 98 ff 0f 00 00    	mov    %ebx,0xfff\(%rax\)
-[ 	]*[a-f0-9]+:	89 58 00             	mov    %ebx,0x0\(%rax\)
+0+10 <foo>:
 [ 	]*[a-f0-9]+:	89 58 03             	mov    %ebx,0x3\(%rax\)
-[ 	]*[a-f0-9]+:	89 98 00 00 00 00    	mov    %ebx,0x0\(%rax\)
 [ 	]*[a-f0-9]+:	89 98 03 00 00 00    	mov    %ebx,0x3\(%rax\)
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-disp32.s b/gas/testsuite/gas/i386/x86-64-disp32.s
index 08563396a5..b0e83e172b 100644
--- a/gas/testsuite/gas/i386/x86-64-disp32.s
+++ b/gas/testsuite/gas/i386/x86-64-disp32.s
@@ -1,26 +1,11 @@
 	.text
-	mov (%rax),%ebx
 	mov 3(%rax),%ebx
-
-	mov.d8 (%rax),%ebx
-	mov.d8 3(%rax),%ebx
-	mov.d8 0xfff(%rax),%ebx
-
-	mov.d32 (%rax),%ebx
 	mov.d32 3(%rax),%ebx
 
 	jmp foo
-	jmp.d8 foo
 	jmp.d32 foo
 foo:
 
 	.intel_syntax noprefix
-	mov DWORD PTR [rax], ebx
 	mov DWORD PTR [rax+3], ebx
-	mov DWORD PTR [rax+0xfff], ebx
-
-	mov.d8 DWORD PTR [rax], ebx
-	mov.d8 DWORD PTR [rax+3], ebx
-
-	mov.d32 DWORD PTR [rax], ebx
 	mov.d32 DWORD PTR [rax+3], ebx
diff --git a/gas/testsuite/gas/m68hc11/m68hc11.exp b/gas/testsuite/gas/m68hc11/m68hc11.exp
index 84dc83de35..89ad226dde 100644
--- a/gas/testsuite/gas/m68hc11/m68hc11.exp
+++ b/gas/testsuite/gas/m68hc11/m68hc11.exp
@@ -1,10 +1,14 @@
 #
 # Some generic m68HC11 tests
 #
-if { ![istarget "m68hc1*-*-*"]
-     && ![istarget "m6811-*-*"]
-     && ![istarget "m6812-*-*"] } then {
-    return
+if ![istarget "m68hc11-*-*"] then {
+    if ![istarget "m6811-*-*"] then {
+	if ![istarget "m68hc12-*-*"] then {
+	    if ![istarget "m6812-*-*"] then {
+		return
+	    }
+	}
+    }
 }
 
 # Simple test for --print-opcodes (list of supported opcodes)
@@ -76,21 +80,21 @@ proc gas_m68hc11_warning { options line expect } {
 
 # ------------------
 # 68HC11 error tests
-gas_m68hc11_error "-m68hc11" "puld\n" "Opcode .puld. is not recognized"
+gas_m68hc11_error "" "puld\n" "Opcode .puld. is not recognized"
 gas_m68hc11_error "" "ldab\n" "Invalid operand for .ldab."
-gas_m68hc11_error "-m68hc11" "ldab 256,x\n" "Operand out of 8-bit range:.*256"
-gas_m68hc11_error "-m68hc11" "ldab 257,y\n" "Operand out of 8-bit range:.*257"
-gas_m68hc11_error "-m68hc11" "ldab -1,y\n" "Operand out of 8-bit range:.*-1"
-gas_m68hc11_error "-m68hc11" "ldab bar,y\nbar=300" "value of 300 too large for field of 1 byte"
+gas_m68hc11_error "" "ldab 256,x\n" "Operand out of 8-bit range:.*256"
+gas_m68hc11_error "" "ldab 257,y\n" "Operand out of 8-bit range:.*257"
+gas_m68hc11_error "" "ldab -1,y\n" "Operand out of 8-bit range:.*-1"
+gas_m68hc11_error "" "ldab bar,y\nbar=300" "value of 300 too large for field of 1 byte"
 gas_m68hc11_error "" "jmp \#23\n" "Immediate operand is not allowed"
-gas_m68hc11_error "-m68hc11" "ldab \[d,pc\]\n" "Indirect indexed addressing is not valid for 68HC11"
+gas_m68hc11_error "" "ldab \[d,pc\]\n" "Indirect indexed addressing is not valid for 68HC11"
 gas_m68hc11_error "" "ldab ,t\n" "Spurious .,. or bad indirect register"
 gas_m68hc11_error "" "ldab 1,t\n" "Garbage at end of instruction:.*,t"
 gas_m68hc11_error "" "ldab 1,,x\n" "Garbage at end of instruction:.*,x"
-gas_m68hc11_error "-m68hc11" "ldab 1,+x\n" "Pre-increment mode is not valid"
-gas_m68hc11_error "-m68hc11" "ldab 1,-x\n" "Pre-increment mode is not valid"
-gas_m68hc11_error "-m68hc11" "ldab 1,x+\n" "Post-increment mode is not valid"
-gas_m68hc11_error "-m68hc11" "ldab 1,x-\n" "Post-decrement mode is not valid"
+gas_m68hc11_error "" "ldab 1,+x\n" "Pre-increment mode is not valid"
+gas_m68hc11_error "" "ldab 1,-x\n" "Pre-increment mode is not valid"
+gas_m68hc11_error "" "ldab 1,x+\n" "Post-increment mode is not valid"
+gas_m68hc11_error "" "ldab 1,x-\n" "Post-decrement mode is not valid"
 gas_m68hc11_error "" "ldd \#65536\n" "Operand out of 16-bit range"
 gas_m68hc11_error "--short-branchs" "bne 200\n" \
     "Operand out of range for a relative branch"
diff --git a/gas/testsuite/gas/m68k/all.exp b/gas/testsuite/gas/m68k/all.exp
index 2bcce35e8b..bf06d4e7fc 100644
--- a/gas/testsuite/gas/m68k/all.exp
+++ b/gas/testsuite/gas/m68k/all.exp
@@ -52,8 +52,6 @@ if { [istarget m68*-*-*] || [istarget fido*-*-*] } then {
     run_dump_test mcf-movsr
     run_dump_test mode5
     run_dump_test mode5 "{name {cf}} {as {-mcpu=5200}}"
-    run_dump_test movem-offset
-    run_dump_test movem-offset "{name {cf}} {as {-mcpu=5485}}"
     run_dump_test mcf-mac
     run_dump_test mcf-emac
     run_dump_test mcf-coproc
@@ -99,8 +97,6 @@ if { [istarget m68*-*-*] || [istarget fido*-*-*] } then {
     }
 
     run_dump_test pr11676
-
-    run_dump_test pmove
 }
 if [info exists errorInfo] then {
     unset errorInfo
diff --git a/gas/testsuite/gas/macros/irp.d b/gas/testsuite/gas/macros/irp.d
index 2c07f8eecb..e6d7bcfd40 100644
--- a/gas/testsuite/gas/macros/irp.d
+++ b/gas/testsuite/gas/macros/irp.d
@@ -1,7 +1,5 @@
 #objdump: -r
 #name: macro irp
-#darwin (mach-o) reverses relocs.
-#not-target: *-*-darwin*
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/macros/repeat.d b/gas/testsuite/gas/macros/repeat.d
index 1e6e42220f..272e441d02 100644
--- a/gas/testsuite/gas/macros/repeat.d
+++ b/gas/testsuite/gas/macros/repeat.d
@@ -1,7 +1,5 @@
 #objdump: -r
 #name: nested irp/irpc/rept
-# darwin (mach-o) reverse relocs.
-#not-target: *-*-darwin*
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/macros/rept.d b/gas/testsuite/gas/macros/rept.d
index df2ed9648e..0022d5f95d 100644
--- a/gas/testsuite/gas/macros/rept.d
+++ b/gas/testsuite/gas/macros/rept.d
@@ -1,7 +1,5 @@
 #objdump: -r
 #name: macro rept
-#darwin (mach-o) reverses relocs.
-#not-target: *-*-darwin*
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/macros/test2.d b/gas/testsuite/gas/macros/test2.d
index e5041cd1ff..9a7d41481d 100644
--- a/gas/testsuite/gas/macros/test2.d
+++ b/gas/testsuite/gas/macros/test2.d
@@ -1,7 +1,5 @@
 #objdump: -r
 #name: macro test 2
-# darwin(mach-o) reverses the order of relocs.
-#not-target: *-*-darwin*
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/macros/vararg.d b/gas/testsuite/gas/macros/vararg.d
index 94c1511260..4b943fd18f 100644
--- a/gas/testsuite/gas/macros/vararg.d
+++ b/gas/testsuite/gas/macros/vararg.d
@@ -1,7 +1,5 @@
 #objdump: -r
 #name: macro vararg
-# darwin (mach-o) reverses relocs.
-#not-target: *-*-darwin*
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-1.s b/gas/testsuite/gas/mips/24k-triple-stores-1.s
index 87c67a9bac..8e26544139 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-1.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-1.s
@@ -1,6 +1,5 @@
 # integer stores
 
-foo:
 	sb      $2,0($sp)
 	sb      $3,8($sp)
 	sb      $4,16($sp)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-10.s b/gas/testsuite/gas/mips/24k-triple-stores-10.s
index dee2ed7b0f..43809d686b 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-10.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-10.s
@@ -1,5 +1,4 @@
 	.text
-foo:
 	sb $2,0($8)
 	sb $3,8($8)
 	.data
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-11.s b/gas/testsuite/gas/mips/24k-triple-stores-11.s
index d88332414a..05aeb94d6d 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-11.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-11.s
@@ -1,5 +1,4 @@
 	.text
-foo:
 	add   $4,$4,$4
 	add   $4,$4,$4
 	add   $4,$4,$4
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-2.s b/gas/testsuite/gas/mips/24k-triple-stores-2.s
index f1402c0a39..2984d1f7b0 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-2.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-2.s
@@ -1,6 +1,5 @@
 # Check for range
 
-foo:
 	sb      $2,0($sp)
 	sb      $3,10($sp)
 	sb      $4,31($sp)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-3.s b/gas/testsuite/gas/mips/24k-triple-stores-3.s
index 1a54c643b7..8914ebcabc 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-3.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-3.s
@@ -1,7 +1,6 @@
 # Assume to be on the same line (within 32bytes)
 # Check for individual different double words
 
-foo:
 	# safe
 	sb      $2,11($sp)
 	sb      $3,11($sp)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-4.s b/gas/testsuite/gas/mips/24k-triple-stores-4.s
index 0b0e50fd6d..56127ed66c 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-4.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-4.s
@@ -1,6 +1,5 @@
 	# Range check for safe case after alignment its range >= 32.
-
-foo:
+	
 	sb       $s3,10($t0)
 	sh       $s3,1($t0)
 	sb       $s3,32($t0)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-5.s b/gas/testsuite/gas/mips/24k-triple-stores-5.s
index eb0e92e1ac..bb260d4d0a 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-5.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-5.s
@@ -1,6 +1,5 @@
 # Mix byte/half/word sizes with arbitary base register.
 
-foo:
 	# safe
 	sh      $2,7($8)
 	sb      $3,0($8)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-6.s b/gas/testsuite/gas/mips/24k-triple-stores-6.s
index eb087e17b0..5db0fbab29 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-6.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-6.s
@@ -1,6 +1,5 @@
 	# Store macros
 
-foo:
 	usw      $ra,80($sp)
 	usw      $s3,88($sp)
 	usw      $s8,96($sp)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-7.s b/gas/testsuite/gas/mips/24k-triple-stores-7.s
index d110c451eb..3e0dc6acd3 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-7.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-7.s
@@ -1,4 +1,3 @@
-foo:
 	# range check
 	sb       $s3,4($t0)
 	sw       $s3,8($t0)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-8.s b/gas/testsuite/gas/mips/24k-triple-stores-8.s
index ab25b4f5a4..386b333851 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-8.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-8.s
@@ -1,6 +1,5 @@
 	# Range check after alignment between adjacent offsets >= 24 ??
-
-foo:
+	
 	sb       $s3,0($t0)
 	sb       $s3,1($t0)
 	sb       $s3,24($t0)
diff --git a/gas/testsuite/gas/mips/24k-triple-stores-9.s b/gas/testsuite/gas/mips/24k-triple-stores-9.s
index a7ffff0cbc..e985569961 100644
--- a/gas/testsuite/gas/mips/24k-triple-stores-9.s
+++ b/gas/testsuite/gas/mips/24k-triple-stores-9.s
@@ -1,5 +1,4 @@
 	.text
-foo:
 	sb $2,0($8)
 	.data
 	.word 1
diff --git a/gas/testsuite/gas/mips/micromips@loc-swap-2.d b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
index a531626032..79da5144f8 100644
--- a/gas/testsuite/gas/mips/micromips@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
@@ -39,11 +39,11 @@ Raw dump of debug contents of section .debug_line:
  Line Number Statements:
   Extended opcode 2: set Address to 0x1
   Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
-  Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9
-  Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10
-  Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13
-  Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14
-  Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15
-  Special opcode 63: advance Address by 4 to 0xb and Line by 2 to 17
-  Advance PC by 1 to 0xc
+  Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9
+  Special opcode 6: advance Address by 0 to 0x3 and Line by 1 to 10
+  Special opcode 64: advance Address by 4 to 0x7 and Line by 3 to 13
+  Special opcode 34: advance Address by 2 to 0x9 and Line by 1 to 14
+  Special opcode 6: advance Address by 0 to 0x9 and Line by 1 to 15
+  Special opcode 63: advance Address by 4 to 0xd and Line by 2 to 17
+  Advance PC by 1 to 0xe
   Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/micromips@mips32r2.d b/gas/testsuite/gas/mips/micromips@mips32r2.d
index 3e0bf9c940..c898e58d3b 100644
--- a/gas/testsuite/gas/mips/micromips@mips32r2.d
+++ b/gas/testsuite/gas/mips/micromips@mips32r2.d
@@ -41,5 +41,4 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 000a 577c 	ei	\$10
 [0-9a-f]+ <[^>]*> 0159 e17c 	rdpgpr	\$10,\$25
 [0-9a-f]+ <[^>]*> 0159 f17c 	wrpgpr	\$10,\$25
-[0-9a-f]+ <[^>]*> 0000 2800 	pause
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mips-double-float-flag.l b/gas/testsuite/gas/mips/mips-double-float-flag.l
index 572b69d0df..d17a00fe98 100644
--- a/gas/testsuite/gas/mips/mips-double-float-flag.l
+++ b/gas/testsuite/gas/mips/mips-double-float-flag.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*:8: Error: Opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
-.*:17: Error: Opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
+.*:8: Error: opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
+.*:17: Error: opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
diff --git a/gas/testsuite/gas/mips/mips-hard-float-flag.l b/gas/testsuite/gas/mips/mips-hard-float-flag.l
index cf500851bd..f1bcaea9a9 100644
--- a/gas/testsuite/gas/mips/mips-hard-float-flag.l
+++ b/gas/testsuite/gas/mips/mips-hard-float-flag.l
@@ -1,5 +1,5 @@
 .*: Assembler messages:
-.*:7: Error: Opcode not supported on this processor: .* \(.*\) `add.s \$f2,\$f2,\$f2'
-.*:8: Error: Opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
-.*:16: Error: Opcode not supported on this processor: .* \(.*\) `add.s \$f2,\$f2,\$f2'
-.*:17: Error: Opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
+.*:7: Error: opcode not supported on this processor: .* \(.*\) `add.s \$f2,\$f2,\$f2'
+.*:8: Error: opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
+.*:16: Error: opcode not supported on this processor: .* \(.*\) `add.s \$f2,\$f2,\$f2'
+.*:17: Error: opcode not supported on this processor: .* \(.*\) `add.d \$f2,\$f2,\$f2'
diff --git a/gas/testsuite/gas/mips/mips-macro-ill-nofp.l b/gas/testsuite/gas/mips/mips-macro-ill-nofp.l
index 21cb0381d2..75e7defe65 100644
--- a/gas/testsuite/gas/mips/mips-macro-ill-nofp.l
+++ b/gas/testsuite/gas/mips/mips-macro-ill-nofp.l
@@ -1,19 +1,19 @@
 .*: Assembler messages:
-.*:5: Error: Opcode not supported on this processor: .* \(.*\) `ldc1 \$f2,d'
-.*:6: Error: Opcode not supported on this processor: .* \(.*\) `ldc1 \$22,d'
-.*:7: Error: Opcode not supported on this processor: .* \(.*\) `l.d \$f2,d'
-.*:8: Error: Opcode not supported on this processor: .* \(.*\) `li.d \$f2,1.2'
-.*:9: Error: Opcode not supported on this processor: .* \(.*\) `li.d \$22,1.2'
-.*:11: Error: Opcode not supported on this processor: .* \(.*\) `sdc1 \$f2,d'
-.*:12: Error: Opcode not supported on this processor: .* \(.*\) `sdc1 \$22,d'
-.*:13: Error: Opcode not supported on this processor: .* \(.*\) `s.d \$f2,d'
-.*:15: Error: Opcode not supported on this processor: .* \(.*\) `trunc.w.d \$f4,\$f6,\$4'
-.*:18: Error: Opcode not supported on this processor: .* \(.*\) `lwc1 \$f2,d'
-.*:19: Error: Opcode not supported on this processor: .* \(.*\) `lwc1 \$22,d'
-.*:20: Error: Opcode not supported on this processor: .* \(.*\) `l.s \$f2,d'
-.*:21: Error: Opcode not supported on this processor: .* \(.*\) `li.s \$f2,1.2'
-.*:22: Error: Opcode not supported on this processor: .* \(.*\) `li.s \$22,1.2'
-.*:24: Error: Opcode not supported on this processor: .* \(.*\) `sdc1 \$f2,d'
-.*:25: Error: Opcode not supported on this processor: .* \(.*\) `sdc1 \$22,d'
-.*:26: Error: Opcode not supported on this processor: .* \(.*\) `s.d \$f2,d'
-.*:28: Error: Opcode not supported on this processor: .* \(.*\) `trunc.w.s \$f4,\$f6,\$4'
+.*:5: Error: opcode not supported on this processor: .* \(.*\) `ldc1 \$f2,d'
+.*:6: Error: opcode not supported on this processor: .* \(.*\) `ldc1 \$22,d'
+.*:7: Error: opcode not supported on this processor: .* \(.*\) `l.d \$f2,d'
+.*:8: Error: opcode not supported on this processor: .* \(.*\) `li.d \$f2,1.2'
+.*:9: Error: opcode not supported on this processor: .* \(.*\) `li.d \$22,1.2'
+.*:11: Error: opcode not supported on this processor: .* \(.*\) `sdc1 \$f2,d'
+.*:12: Error: opcode not supported on this processor: .* \(.*\) `sdc1 \$22,d'
+.*:13: Error: opcode not supported on this processor: .* \(.*\) `s.d \$f2,d'
+.*:15: Error: opcode not supported on this processor: .* \(.*\) `trunc.w.d \$f4,\$f6,\$4'
+.*:18: Error: opcode not supported on this processor: .* \(.*\) `lwc1 \$f2,d'
+.*:19: Error: opcode not supported on this processor: .* \(.*\) `lwc1 \$22,d'
+.*:20: Error: opcode not supported on this processor: .* \(.*\) `l.s \$f2,d'
+.*:21: Error: opcode not supported on this processor: .* \(.*\) `li.s \$f2,1.2'
+.*:22: Error: opcode not supported on this processor: .* \(.*\) `li.s \$22,1.2'
+.*:24: Error: opcode not supported on this processor: .* \(.*\) `sdc1 \$f2,d'
+.*:25: Error: opcode not supported on this processor: .* \(.*\) `sdc1 \$22,d'
+.*:26: Error: opcode not supported on this processor: .* \(.*\) `s.d \$f2,d'
+.*:28: Error: opcode not supported on this processor: .* \(.*\) `trunc.w.s \$f4,\$f6,\$4'
diff --git a/gas/testsuite/gas/mips/mips-macro-ill-sfp.l b/gas/testsuite/gas/mips/mips-macro-ill-sfp.l
index 1e374b2e7a..9c496db496 100644
--- a/gas/testsuite/gas/mips/mips-macro-ill-sfp.l
+++ b/gas/testsuite/gas/mips/mips-macro-ill-sfp.l
@@ -1,10 +1,10 @@
 .*: Assembler messages:
-.*:5: Error: Opcode not supported on this processor: .* \(.*\) `ldc1 \$f2,d'
-.*:6: Error: Opcode not supported on this processor: .* \(.*\) `ldc1 \$22,d'
-.*:7: Error: Opcode not supported on this processor: .* \(.*\) `l.d \$f2,d'
-.*:8: Error: Opcode not supported on this processor: .* \(.*\) `li.d \$f2,1.2'
-.*:9: Error: Opcode not supported on this processor: .* \(.*\) `li.d \$22,1.2'
-.*:11: Error: Opcode not supported on this processor: .* \(.*\) `sdc1 \$f2,d'
-.*:12: Error: Opcode not supported on this processor: .* \(.*\) `sdc1 \$22,d'
-.*:13: Error: Opcode not supported on this processor: .* \(.*\) `s.d \$f2,d'
-.*:15: Error: Opcode not supported on this processor: .* \(.*\) `trunc.w.d \$f4,\$f6,\$4'
+.*:5: Error: opcode not supported on this processor: .* \(.*\) `ldc1 \$f2,d'
+.*:6: Error: opcode not supported on this processor: .* \(.*\) `ldc1 \$22,d'
+.*:7: Error: opcode not supported on this processor: .* \(.*\) `l.d \$f2,d'
+.*:8: Error: opcode not supported on this processor: .* \(.*\) `li.d \$f2,1.2'
+.*:9: Error: opcode not supported on this processor: .* \(.*\) `li.d \$22,1.2'
+.*:11: Error: opcode not supported on this processor: .* \(.*\) `sdc1 \$f2,d'
+.*:12: Error: opcode not supported on this processor: .* \(.*\) `sdc1 \$22,d'
+.*:13: Error: opcode not supported on this processor: .* \(.*\) `s.d \$f2,d'
+.*:15: Error: opcode not supported on this processor: .* \(.*\) `trunc.w.d \$f4,\$f6,\$4'
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 92de0faabd..cbaaa70e8d 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -286,11 +286,10 @@ proc mips_arch_list_matching {args} {
 
 # The functions below facilitate running various types of tests.
 
-# run_dump_test_arch NAME OPTS ARCH
+# run_dump_test_arch NAME ARCH
 #
-# Invoke "run_dump_test" for test NAME with additional assembler options OPTS.
-# Add the assembler and disassembler flags that are associated with
-# architecture ARCH.
+# Invoke "run_dump_test" for test NAME, with extra assembler and
+# disassembler flags to test architecture ARCH.
 #
 # You can override the expected output for particular architectures
 # and file formats.  The possible test names are, in order of preference:
@@ -303,19 +302,13 @@ proc mips_arch_list_matching {args} {
 # where CARCH is the "canonical" name of architecture ARCH as recorded
 # in its associated property list, and where FORMAT is the target's
 # file format (one of "elf", "ecoff" or "aout").
-proc run_dump_test_arch { name opts arch } {
+proc run_dump_test_arch { name arch } {
     upvar elf elf ecoff ecoff aout aout
     global subdir srcdir
 
     set format [expr { $elf ? "elf" : $ecoff ? "ecoff" : "aout" }]
     set proparch [lindex [mips_arch_properties $arch 0] 0]
-    set prefixes [list ${proparch}@${format}@ ${proparch}@ ]
-    if { [ string match "octeon*" $proparch ] && $proparch != "octeon" } {
-      lappend prefixes octeon@
-      lappend prefixes octeon@${format}@
-    }
-    lappend prefixes ${format}@
-    foreach prefix ${prefixes} {
+    foreach prefix [list ${proparch}@${format}@ ${proparch}@ ${format}@] {
 	set archname ${prefix}${name}
 	if { [file exists "$srcdir/$subdir/${archname}.d"] } {
 	    set name $archname
@@ -324,61 +317,45 @@ proc run_dump_test_arch { name opts arch } {
     }
 
     if [catch {run_dump_test $name \
-		   "{name    {([concat $opts [mips_arch_displayname $arch]])}}
-		    {objdump {[mips_arch_objdump_flags $arch]}}
-		    {as      {[concat $opts [mips_arch_as_flags $arch]]}}"} rv] {
+			     "{name    {([mips_arch_displayname $arch])}}
+			      {objdump {[mips_arch_objdump_flags $arch]}}
+			      {as      {[mips_arch_as_flags $arch]}}"} rv] {
         perror "$rv"
         untested "$subdir/$name ($arch)"
     }
 }
 
-# run_dump_test_arches NAME [OPTS] ARCH_LIST
+# run_dump_test_arches NAME ARCH_LIST
 #
 # Invoke "run_dump_test_arch" for test NAME, for each architecture
-# listed in ARCH_LIST.  OPTS, if specified, is a list of additional
-# assembler options that should be used for all architectures.
-proc run_dump_test_arches { name args } {
+# listed in ARCH_LIST.
+proc run_dump_test_arches { name arch_list } {
     upvar elf elf ecoff ecoff aout aout
-    set opts ""
-    if { [llength $args] > 1 } {
-	set opts [lindex $args 0]
-	set args [lrange $args 1 end]
-    }
-    set arch_list [lindex $args 0]
     foreach arch $arch_list {
-	run_dump_test_arch $name $opts $arch
+	run_dump_test_arch "$name" "$arch"
     }
 }
 
 # run_list_test_arch NAME OPTS ARCH
 #
-# Invoke "run_list_test" for test NAME with additional assembler options OPTS.
-# Add the assembler flags that are associated with architecture ARCH.
+# Invoke "run_list_test" for test NAME with options OPTS, with extra
+# assembler flags to test architecture ARCH.
 proc run_list_test_arch { name opts arch } {
     global subdir
 
-    set testname "MIPS $name ([concat $opts [mips_arch_displayname $arch]])"
-    if [catch {run_list_test \
-		   $name \
-		   [concat $opts [mips_arch_as_flags $arch]] \
-		   $testname} rv] {
+    set testname "MIPS $name ([mips_arch_displayname $arch])"
+    if [catch {run_list_test "$name" "$opts [mips_arch_as_flags $arch]" \
+			     "$testname"} rv] {
         perror "$rv"
         untested "$testname"
     }
 }
 
-# run_list_test_arches NAME [OPTS] ARCH_LIST
+# run_list_test_arches NAME OPTS ARCH_LIST
 #
-# Invoke "run_list_test_arch" for test NAME, for each architecture listed
-# in ARCH_LIST.  OPTS, if specified, is a list of additional assembler
-# options that should be used for all architectures.
-proc run_list_test_arches { name args } {
-    set opts ""
-    if { [llength $args] > 1 } {
-	set opts [lindex $args 0]
-	set args [lrange $args 1 end]
-    }
-    set arch_list [lindex $args 0]
+# Invoke "run_list_test_arch" for test NAME with options OPTS, for each
+# architecture listed in ARCH_LIST.
+proc run_list_test_arches { name opts arch_list } {
     foreach arch $arch_list {
 	run_list_test_arch "$name" "$opts" "$arch"
     }
@@ -435,12 +412,6 @@ mips_arch_create sb1 	64	mips64	{ mips3d } \
 mips_arch_create octeon 64	mips64r2 {} \
 			{ -march=octeon -mtune=octeon } { -mmips:octeon } \
 			{ mips64octeon*-*-* }
-mips_arch_create octeonp 64	octeon {} \
-			{ -march=octeon+ -mtune=octeon+ } { -mmips:octeon+ } \
-			{ }
-mips_arch_create octeon2 64	octeonp {} \
-			{ -march=octeon2 -mtune=octeon2 } { -mmips:octeon2 } \
-			{ }
 mips_arch_create xlr 	64	mips64	{} \
 			{ -march=xlr -mtune=xlr } { -mmips:xlr }
 
@@ -523,30 +494,30 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "eret-2"
     run_dump_test "eret-3"
     run_dump_test_arches "24k-branch-delay-1" \
-					[mips_arch_list_matching mips1]
+	[mips_arch_list_matching mips1 !micromips]
     run_dump_test_arches "24k-triple-stores-1" \
-				[mips_arch_list_matching fpisa5 !octeon]
+	[mips_arch_list_matching fpisa5 !octeon !micromips]
     run_dump_test_arches "24k-triple-stores-2" \
-					[mips_arch_list_matching mips2]
+	[mips_arch_list_matching mips2 !micromips]
     run_dump_test_arches "24k-triple-stores-3" \
-					[mips_arch_list_matching mips2]
+	[mips_arch_list_matching mips2 !micromips]
     run_dump_test_arches "24k-triple-stores-4" \
-					[mips_arch_list_matching mips2]
+	[mips_arch_list_matching mips2 !micromips]
     run_dump_test_arches "24k-triple-stores-5" \
-					[mips_arch_list_matching mips1]
+	[mips_arch_list_matching mips1 !micromips]
     run_dump_test_arches "24k-triple-stores-6" \
-					[mips_arch_list_matching mips2]
+	[mips_arch_list_matching mips2 !micromips]
     run_dump_test_arches "24k-triple-stores-7" \
-					[mips_arch_list_matching mips2]
+	[mips_arch_list_matching mips2 !micromips]
     run_dump_test_arches "24k-triple-stores-8" \
-					[mips_arch_list_matching mips1]
+	[mips_arch_list_matching mips1 !micromips]
     run_dump_test_arches "24k-triple-stores-9" \
-					[mips_arch_list_matching mips1]
+	[mips_arch_list_matching mips1 !micromips]
     run_dump_test_arches "24k-triple-stores-10" \
-					[mips_arch_list_matching mips1]
+	[mips_arch_list_matching mips1 !micromips]
     if $elf {
 	run_dump_test_arches "24k-triple-stores-11" \
-	    				[mips_arch_list_matching mips1]
+	    [mips_arch_list_matching mips1 !micromips]
     }
 
     if $elf {
@@ -656,20 +627,14 @@ if { [istarget mips*-*-vxworks*] } {
     if $elf { run_dump_test "lif-svr4pic" }
     if $elf { run_dump_test "lif-xgot" }
     run_dump_test_arches "mips4"	[mips_arch_list_matching mips4]
-    run_dump_test_arches "mips4-fp" "-32" \
-					[mips_arch_list_matching fpisa4]
-    run_dump_test_arches "mips4-fp" "-mabi=o64" \
-					[mips_arch_list_matching fpisa4 gpr64]
+    run_dump_test_arches "mips4-fp"	[mips_arch_list_matching fpisa4]
     run_list_test_arches "mips4-fp" "-32 -msoft-float" \
 					[mips_arch_list_matching fpisa4]
     run_dump_test_arches "mips4-branch-likely" \
 					[mips_arch_list_matching mips4]
     run_list_test_arches "mips4-branch-likely" "-32 -msoft-float" \
 					[mips_arch_list_matching mips4]
-    run_dump_test_arches "mips5-fp" "-32" \
-					[mips_arch_list_matching fpisa5]
-    run_dump_test_arches "mips5-fp" "-mabi=o64" \
-					[mips_arch_list_matching fpisa5 gpr64]
+    run_dump_test_arches "mips5-fp"	[mips_arch_list_matching fpisa5]
     run_dump_test "mul"
 
     run_dump_test_arches "rol"		[mips_arch_list_matching mips1 !ror]
@@ -765,7 +730,7 @@ if { [istarget mips*-*-vxworks*] } {
 					    !octeon]
 
     run_dump_test_arches "mips64r2"	[mips_arch_list_matching mips64r2]
-    run_list_test_arches "mips64r2-ill"	[mips_arch_list_matching mips64r2]
+    run_list_test_arches "mips64r2-ill" "" [mips_arch_list_matching mips64r2]
 
     run_dump_test "set-arch"
 
@@ -913,7 +878,6 @@ if { [istarget mips*-*-vxworks*] } {
 
 	run_list_test "tls-ill" "-32"
 	run_dump_test "tls-o32"
-	run_dump_test "tls-relw"
 	run_dump_test "jalr2"
 
 	run_dump_test_arches "aent"	[mips_arch_list_matching mips1]
@@ -1017,10 +981,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "loongson-3a-3"
 
     run_dump_test_arches "octeon"	[mips_arch_list_matching octeon]
-    run_dump_test_arches "octeon-saa-saad" [mips_arch_list_matching octeonp]
-    run_list_test_arches "octeon-ill"	[mips_arch_list_matching octeon]
+    run_list_test_arches "octeon-ill" "" \
+					[mips_arch_list_matching octeon]
     run_dump_test_arches "octeon-pref"	[mips_arch_list_matching octeon]
-    run_dump_test_arches "octeon2"	[mips_arch_list_matching octeon2]
 
     run_dump_test "smartmips"
     run_dump_test "mips32-dsp"
@@ -1050,7 +1013,6 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "align"
     run_dump_test "align2"
     run_dump_test "align2-el"
-    run_dump_test "align3"
     run_dump_test "odd-float"
 
     run_list_test_arches "mips-macro-ill-sfp" "-32 -msingle-float" \
diff --git a/gas/testsuite/gas/mips/mips1-fp.l b/gas/testsuite/gas/mips/mips1-fp.l
index b156525d76..72ed043371 100644
--- a/gas/testsuite/gas/mips/mips1-fp.l
+++ b/gas/testsuite/gas/mips/mips1-fp.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*:6: Error: Opcode not supported on this processor: .* \(.*\) `add.s \$f0,\$f2,\$f4'
-.*:7: Error: Opcode not supported on this processor: .* \(.*\) `cfc1 \$2,\$0'
+.*:6: Error: opcode not supported on this processor: .* \(.*\) `add.s \$f0,\$f2,\$f4'
+.*:7: Error: opcode not supported on this processor: .* \(.*\) `cfc1 \$2,\$0'
diff --git a/gas/testsuite/gas/mips/mips16e-64.l b/gas/testsuite/gas/mips/mips16e-64.l
index 1202212fe9..8df0c0575a 100644
--- a/gas/testsuite/gas/mips/mips16e-64.l
+++ b/gas/testsuite/gas/mips/mips16e-64.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*: Error: Opcode not supported on this processor: .* (.*) `sew'
-.*: Error: Opcode not supported on this processor: .* (.*) `zew'
+.*: Error: opcode not supported on this processor: .* (.*) `sew'
+.*: Error: opcode not supported on this processor: .* (.*) `zew'
diff --git a/gas/testsuite/gas/mips/mips32-mt.d b/gas/testsuite/gas/mips/mips32-mt.d
index f2807f9abf..e1c4cf3f10 100644
--- a/gas/testsuite/gas/mips/mips32-mt.d
+++ b/gas/testsuite/gas/mips/mips32-mt.d
@@ -631,5 +631,4 @@ Disassembly of section .text:
 0+09b0 <[^>]*> 418d7035 	mttr	t5,t6,1,5,1
 0+09b4 <[^>]*> 418d7036 	mttr	t5,t6,1,6,1
 0+09b8 <[^>]*> 418d7037 	mttr	t5,t6,1,7,1
-0+09bc <[^>]*> 00000140 	pause
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mips32-mt.s b/gas/testsuite/gas/mips/mips32-mt.s
index 9819cb1f0d..8363256c68 100644
--- a/gas/testsuite/gas/mips/mips32-mt.s
+++ b/gas/testsuite/gas/mips/mips32-mt.s
@@ -630,7 +630,5 @@ text_label:
 	mttr		$13,$14,1,6,1
 	mttr		$13,$14,1,7,1
 
-	pause
-
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
 	.space	8
diff --git a/gas/testsuite/gas/mips/mips32-sf32.l b/gas/testsuite/gas/mips/mips32-sf32.l
index b2980aed4a..d55f890c7f 100644
--- a/gas/testsuite/gas/mips/mips32-sf32.l
+++ b/gas/testsuite/gas/mips/mips32-sf32.l
@@ -1,8 +1,8 @@
 .*: Assembler messages:
-.*:5: Error: Opcode not supported on this processor: .* \(.*\) `li.s \$f1,1.0'
-.*:6: Error: Opcode not supported on this processor: .* \(.*\) `li.s \$f3,1.9'
-.*:7: Error: Opcode not supported on this processor: .* \(.*\) `add.s \$f5,\$f1,\$f3'
-.*:8: Error: Opcode not supported on this processor: .* \(.*\) `cvt.d.s \$f8,\$f7'
-.*:9: Error: Opcode not supported on this processor: .* \(.*\) `cvt.d.w \$f8,\$f7'
-.*:10: Error: Opcode not supported on this processor: .* \(.*\) `cvt.s.d \$f7,\$f8'
-.*:11: Error: Opcode not supported on this processor: .* \(.*\) `trunc.w.d \$f7,\$f8'
+.*:5: Error: opcode not supported on this processor: .* \(.*\) `li.s \$f1,1.0'
+.*:6: Error: opcode not supported on this processor: .* \(.*\) `li.s \$f3,1.9'
+.*:7: Error: opcode not supported on this processor: .* \(.*\) `add.s \$f5,\$f1,\$f3'
+.*:8: Error: opcode not supported on this processor: .* \(.*\) `cvt.d.s \$f8,\$f7'
+.*:9: Error: opcode not supported on this processor: .* \(.*\) `cvt.d.w \$f8,\$f7'
+.*:10: Error: opcode not supported on this processor: .* \(.*\) `cvt.s.d \$f7,\$f8'
+.*:11: Error: opcode not supported on this processor: .* \(.*\) `trunc.w.d \$f7,\$f8'
diff --git a/gas/testsuite/gas/mips/mips32r2-fp32.l b/gas/testsuite/gas/mips/mips32r2-fp32.l
index 261f3e43f0..c8fd76a14a 100644
--- a/gas/testsuite/gas/mips/mips32r2-fp32.l
+++ b/gas/testsuite/gas/mips/mips32r2-fp32.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*:12: Error: Opcode not supported on this processor: .* \(.*\) `mfhc1 \$17,\$f0'
-.*:13: Error: Opcode not supported on this processor: .* \(.*\) `mthc1 \$17,\$f0'
+.*:12: Error: opcode not supported on this processor: .* \(.*\) `mfhc1 \$17,\$f0'
+.*:13: Error: opcode not supported on this processor: .* \(.*\) `mthc1 \$17,\$f0'
diff --git a/gas/testsuite/gas/mips/mips32r2.d b/gas/testsuite/gas/mips/mips32r2.d
index 0b04de62e7..5d72709e98 100644
--- a/gas/testsuite/gas/mips/mips32r2.d
+++ b/gas/testsuite/gas/mips/mips32r2.d
@@ -40,5 +40,4 @@ Disassembly of section .text:
 0+0078 <[^>]*> 416a6020 	ei	\$10
 0+007c <[^>]*> 41595000 	rdpgpr	\$10,\$25
 0+0080 <[^>]*> 41d95000 	wrpgpr	\$10,\$25
-0+0084 <[^>]*> 00000140 	pause
 	...
diff --git a/gas/testsuite/gas/mips/mips32r2.s b/gas/testsuite/gas/mips/mips32r2.s
index a91a8fc996..8dc6a51b2d 100644
--- a/gas/testsuite/gas/mips/mips32r2.s
+++ b/gas/testsuite/gas/mips/mips32r2.s
@@ -63,7 +63,5 @@ text_label:
 
 	wrpgpr	$10, $25
 
-	pause
-
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
 	.space  8
diff --git a/gas/testsuite/gas/mips/mips4-branch-likely.l b/gas/testsuite/gas/mips/mips4-branch-likely.l
index d0da34e70d..0e0cc587e0 100644
--- a/gas/testsuite/gas/mips/mips4-branch-likely.l
+++ b/gas/testsuite/gas/mips/mips4-branch-likely.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*:5: Error: Opcode not supported on this processor: .* \(.*\) `bc1fl \$fcc1,text_label'
-.*:6: Error: Opcode not supported on this processor: .* \(.*\) `bc1tl \$fcc2,text_label'
+.*:5: Error: opcode not supported on this processor: .* \(.*\) `bc1fl \$fcc1,text_label'
+.*:6: Error: opcode not supported on this processor: .* \(.*\) `bc1tl \$fcc2,text_label'
diff --git a/gas/testsuite/gas/mips/mips4-fp.l b/gas/testsuite/gas/mips/mips4-fp.l
index 2d8b1f513f..908e29f77d 100644
--- a/gas/testsuite/gas/mips/mips4-fp.l
+++ b/gas/testsuite/gas/mips/mips4-fp.l
@@ -1,33 +1,33 @@
 .*: Assembler messages:
-.*:4: Error: Opcode not supported on this processor: .* \(.*\) `bc1f text_label'
-.*:5: Error: Opcode not supported on this processor: .* \(.*\) `bc1f \$fcc1,text_label'
-.*:6: Error: Opcode not supported on this processor: .* \(.*\) `bc1t \$fcc1,text_label'
-.*:7: Error: Opcode not supported on this processor: .* \(.*\) `c.f.d \$f4,\$f6'
-.*:8: Error: Opcode not supported on this processor: .* \(.*\) `c.f.d \$fcc1,\$f4,\$f6'
-.*:9: Error: Opcode not supported on this processor: .* \(.*\) `ldxc1 \$f2,\$4\(\$5\)'
-.*:10: Error: Opcode not supported on this processor: .* \(.*\) `lwxc1 \$f2,\$4\(\$5\)'
-.*:11: Error: Opcode not supported on this processor: .* \(.*\) `madd.d \$f0,\$f2,\$f4,\$f6'
-.*:13: Error: Opcode not supported on this processor: .* \(.*\) `madd.s \$f10,\$f8,\$f2,\$f0'
-.*:14: Error: Opcode not supported on this processor: .* \(.*\) `movf \$4,\$5,\$fcc4'
-.*:15: Error: Opcode not supported on this processor: .* \(.*\) `movf.d \$f4,\$f6,\$fcc0'
-.*:16: Error: Opcode not supported on this processor: .* \(.*\) `movf.s \$f4,\$f6,\$fcc0'
-.*:17: Error: Opcode not supported on this processor: .* \(.*\) `movn.d \$f4,\$f6,\$6'
-.*:18: Error: Opcode not supported on this processor: .* \(.*\) `movn.s \$f4,\$f6,\$6'
-.*:19: Error: Opcode not supported on this processor: .* \(.*\) `movt \$4,\$5,\$fcc4'
-.*:20: Error: Opcode not supported on this processor: .* \(.*\) `movt.d \$f4,\$f6,\$fcc0'
-.*:21: Error: Opcode not supported on this processor: .* \(.*\) `movt.s \$f4,\$f6,\$fcc0'
-.*:22: Error: Opcode not supported on this processor: .* \(.*\) `movz.d \$f4,\$f6,\$6'
-.*:23: Error: Opcode not supported on this processor: .* \(.*\) `movz.s \$f4,\$f6,\$6'
-.*:24: Error: Opcode not supported on this processor: .* \(.*\) `msub.d \$f0,\$f2,\$f4,\$f6'
-.*:25: Error: Opcode not supported on this processor: .* \(.*\) `msub.s \$f0,\$f2,\$f4,\$f6'
-.*:26: Error: Opcode not supported on this processor: .* \(.*\) `nmadd.d \$f0,\$f2,\$f4,\$f6'
-.*:27: Error: Opcode not supported on this processor: .* \(.*\) `nmadd.s \$f0,\$f2,\$f4,\$f6'
-.*:28: Error: Opcode not supported on this processor: .* \(.*\) `nmsub.d \$f0,\$f2,\$f4,\$f6'
-.*:29: Error: Opcode not supported on this processor: .* \(.*\) `nmsub.s \$f0,\$f2,\$f4,\$f6'
-.*:31: Error: Opcode not supported on this processor: .* \(.*\) `prefx 4,\$4\(\$5\)'
-.*:32: Error: Opcode not supported on this processor: .* \(.*\) `recip.d \$f4,\$f6'
-.*:33: Error: Opcode not supported on this processor: .* \(.*\) `recip.s \$f4,\$f6'
-.*:34: Error: Opcode not supported on this processor: .* \(.*\) `rsqrt.d \$f4,\$f6'
-.*:35: Error: Opcode not supported on this processor: .* \(.*\) `rsqrt.s \$f4,\$f6'
-.*:36: Error: Opcode not supported on this processor: .* \(.*\) `sdxc1 \$f4,\$4\(\$5\)'
-.*:37: Error: Opcode not supported on this processor: .* \(.*\) `swxc1 \$f4,\$4\(\$5\)'
+.*:4: Error: opcode not supported on this processor: .* \(.*\) `bc1f text_label'
+.*:5: Error: opcode not supported on this processor: .* \(.*\) `bc1f \$fcc1,text_label'
+.*:6: Error: opcode not supported on this processor: .* \(.*\) `bc1t \$fcc1,text_label'
+.*:7: Error: opcode not supported on this processor: .* \(.*\) `c.f.d \$f4,\$f6'
+.*:8: Error: opcode not supported on this processor: .* \(.*\) `c.f.d \$fcc1,\$f4,\$f6'
+.*:9: Error: opcode not supported on this processor: .* \(.*\) `ldxc1 \$f2,\$4\(\$5\)'
+.*:10: Error: opcode not supported on this processor: .* \(.*\) `lwxc1 \$f2,\$4\(\$5\)'
+.*:11: Error: opcode not supported on this processor: .* \(.*\) `madd.d \$f0,\$f2,\$f4,\$f6'
+.*:13: Error: opcode not supported on this processor: .* \(.*\) `madd.s \$f10,\$f8,\$f2,\$f0'
+.*:14: Error: opcode not supported on this processor: .* \(.*\) `movf \$4,\$5,\$fcc4'
+.*:15: Error: opcode not supported on this processor: .* \(.*\) `movf.d \$f4,\$f6,\$fcc0'
+.*:16: Error: opcode not supported on this processor: .* \(.*\) `movf.s \$f4,\$f6,\$fcc0'
+.*:17: Error: opcode not supported on this processor: .* \(.*\) `movn.d \$f4,\$f6,\$6'
+.*:18: Error: opcode not supported on this processor: .* \(.*\) `movn.s \$f4,\$f6,\$6'
+.*:19: Error: opcode not supported on this processor: .* \(.*\) `movt \$4,\$5,\$fcc4'
+.*:20: Error: opcode not supported on this processor: .* \(.*\) `movt.d \$f4,\$f6,\$fcc0'
+.*:21: Error: opcode not supported on this processor: .* \(.*\) `movt.s \$f4,\$f6,\$fcc0'
+.*:22: Error: opcode not supported on this processor: .* \(.*\) `movz.d \$f4,\$f6,\$6'
+.*:23: Error: opcode not supported on this processor: .* \(.*\) `movz.s \$f4,\$f6,\$6'
+.*:24: Error: opcode not supported on this processor: .* \(.*\) `msub.d \$f0,\$f2,\$f4,\$f6'
+.*:25: Error: opcode not supported on this processor: .* \(.*\) `msub.s \$f0,\$f2,\$f4,\$f6'
+.*:26: Error: opcode not supported on this processor: .* \(.*\) `nmadd.d \$f0,\$f2,\$f4,\$f6'
+.*:27: Error: opcode not supported on this processor: .* \(.*\) `nmadd.s \$f0,\$f2,\$f4,\$f6'
+.*:28: Error: opcode not supported on this processor: .* \(.*\) `nmsub.d \$f0,\$f2,\$f4,\$f6'
+.*:29: Error: opcode not supported on this processor: .* \(.*\) `nmsub.s \$f0,\$f2,\$f4,\$f6'
+.*:31: Error: opcode not supported on this processor: .* \(.*\) `prefx 4,\$4\(\$5\)'
+.*:32: Error: opcode not supported on this processor: .* \(.*\) `recip.d \$f4,\$f6'
+.*:33: Error: opcode not supported on this processor: .* \(.*\) `recip.s \$f4,\$f6'
+.*:34: Error: opcode not supported on this processor: .* \(.*\) `rsqrt.d \$f4,\$f6'
+.*:35: Error: opcode not supported on this processor: .* \(.*\) `rsqrt.s \$f4,\$f6'
+.*:36: Error: opcode not supported on this processor: .* \(.*\) `sdxc1 \$f4,\$4\(\$5\)'
+.*:37: Error: opcode not supported on this processor: .* \(.*\) `swxc1 \$f4,\$4\(\$5\)'
diff --git a/gas/testsuite/gas/mips/octeon-ill.l b/gas/testsuite/gas/mips/octeon-ill.l
index 49c16c8185..d9315f0073 100644
--- a/gas/testsuite/gas/mips/octeon-ill.l
+++ b/gas/testsuite/gas/mips/octeon-ill.l
@@ -8,22 +8,22 @@
 .*:18: Error: Improper size \(25\)
 .*:20: Error: Improper position \(64\)
 .*:21: Error: Improper size \(14\)
-.*:23: Error: Opcode not supported on this processor.*
-.*:24: Error: Opcode not supported on this processor.*
-.*:25: Error: Opcode not supported on this processor.*
-.*:26: Error: Opcode not supported on this processor.*
-.*:27: Error: Opcode not supported on this processor.*
-.*:28: Error: Opcode not supported on this processor.*
-.*:29: Error: Opcode not supported on this processor.*
+.*:23: Error: opcode not supported on this processor.*
+.*:24: Error: opcode not supported on this processor.*
+.*:25: Error: opcode not supported on this processor.*
+.*:26: Error: opcode not supported on this processor.*
+.*:27: Error: opcode not supported on this processor.*
+.*:28: Error: opcode not supported on this processor.*
+.*:29: Error: opcode not supported on this processor.*
 .*:30: Error: Opcode not supported on this processor.*
 .*:31: Error: Opcode not supported on this processor.*
-.*:32: Error: Opcode not supported on this processor.*
-.*:33: Error: Opcode not supported on this processor.*
-.*:34: Error: Opcode not supported on this processor.*
-.*:35: Error: Opcode not supported on this processor.*
+.*:32: Error: opcode not supported on this processor.*
+.*:33: Error: opcode not supported on this processor.*
+.*:34: Error: opcode not supported on this processor.*
+.*:35: Error: opcode not supported on this processor.*
 .*:36: Error: Opcode not supported on this processor.*
 .*:37: Error: Opcode not supported on this processor.*
-.*:39: Error: Opcode not supported on this processor.*
+.*:39: Error: opcode not supported on this processor.*
 .*:40: Error: Opcode not supported on this processor.*
 .*:41: Error: Opcode not supported on this processor.*
 .*:42: Error: Opcode not supported on this processor.*
diff --git a/gas/testsuite/gas/mips/octeon-pref.d b/gas/testsuite/gas/mips/octeon-pref.d
index 0b536d6f5c..6dcb1848d1 100644
--- a/gas/testsuite/gas/mips/octeon-pref.d
+++ b/gas/testsuite/gas/mips/octeon-pref.d
@@ -1,4 +1,4 @@
-#as: -64 -mfix-cn63xxp1
+#as: -march=octeon -64 -mfix-cn63xxp1
 #objdump: -M reg-names=numeric -dr
 #name: MIPS octeon-pref mfix-cn63xxp1
 
diff --git a/gas/testsuite/gas/mips/octeon.d b/gas/testsuite/gas/mips/octeon.d
index a0e15d8af4..79b4001440 100644
--- a/gas/testsuite/gas/mips/octeon.d
+++ b/gas/testsuite/gas/mips/octeon.d
@@ -1,4 +1,4 @@
-#as: -64
+#as: -march=octeon -64
 #objdump: -M reg-names=numeric -dr
 #name: MIPS octeon instructions
 
diff --git a/gas/testsuite/gas/pe/pe.exp b/gas/testsuite/gas/pe/pe.exp
index 870df11a5e..d5506e9e81 100755
--- a/gas/testsuite/gas/pe/pe.exp
+++ b/gas/testsuite/gas/pe/pe.exp
@@ -35,7 +35,6 @@ run_dump_test "aligncomm-d"
 
 run_dump_test "section-align-1"
 run_dump_test "section-align-3"
-run_dump_test "section-exclude"
 
 # SEH related tests
 
diff --git a/gas/testsuite/gas/ppc/ppc.exp b/gas/testsuite/gas/ppc/ppc.exp
index ecff35550e..3db0ade2b7 100644
--- a/gas/testsuite/gas/ppc/ppc.exp
+++ b/gas/testsuite/gas/ppc/ppc.exp
@@ -42,10 +42,6 @@ if { [istarget powerpc*-*-*] } then {
 	run_list_test "range" "-a32"
 	run_dump_test "ppc750ps"
 	run_dump_test "e500mc"
-	run_dump_test "e6500"
-	run_dump_test "e500mc64_nop"
-	run_dump_test "e5500_nop"
-	run_dump_test "e6500_nop"
 	run_dump_test "a2"
 	run_dump_test "cell"
 	run_dump_test "common"
diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index 2896966354..ca77038a2a 100644
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -345,7 +345,7 @@ Disassembly of section .text:
 .*:	b2 2e 00 69 [	 ]*pgin	%r6,%r9
 .*:	b2 2f 00 69 [	 ]*pgout	%r6,%r9
 .*:	e9 1f 5f ff af ff [	 ]*pka	4095\(%r5\),4095\(32,%r10\)
-.*:	e1 ff 5f ff af ff [	 ]*pku	4095\(%r5\),4095\(256,%r10\)
+.*:	e1 ff 5f ff af ff [	 ]*pku	4095\(256,%r5\),4095\(%r10\)
 .*:	ee 69 5f ff af ff [	 ]*plo	%r6,4095\(%r5\),%r9,4095\(%r10\)
 .*:	01 01 [	 ]*pr
 .*:	b2 28 00 69 [	 ]*pt	%r6,%r9
diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
index d0bfb20d94..e34e4b32b1 100644
--- a/gas/testsuite/gas/s390/esa-g5.s
+++ b/gas/testsuite/gas/s390/esa-g5.s
@@ -339,7 +339,7 @@ foo:
 	pgin	%r6,%r9
 	pgout	%r6,%r9
 	pka	4095(%r5),4095(32,%r10)
-	pku	4095(%r5),4095(256,%r10)
+	pku	4095(256,%r5),4095(%r10)
 	plo	%r6,4095(%r5),%r9,4095(%r10)
 	pr
 	pt	%r6,%r9
diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index d9807ed59c..2ea258d704 100644
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -374,15 +374,4 @@ Disassembly of section .text:
 .*:	b9 bf 00 67 [ 	]*trte	%r6,%r7,0
 .*:	b9 bd a0 67 [ 	]*trtre	%r6,%r7,10
 .*:	b9 bd 00 67 [ 	]*trtre	%r6,%r7,0
-.*:	b2 ed 00 67 [ 	]*ecpga	%r6,%r7
-.*:	b2 e4 00 67 [ 	]*ecctr	%r6,%r7
-.*:	b2 e5 00 67 [ 	]*epctr	%r6,%r7
-.*:	b2 84 6d 05 [ 	]*lcctl	3333\(%r6\)
-.*:	b2 85 6d 05 [ 	]*lpctl	3333\(%r6\)
-.*:	b2 87 6d 05 [ 	]*lsctl	3333\(%r6\)
-.*:	b2 8e 6d 05 [ 	]*qctri	3333\(%r6\)
-.*:	b2 86 6d 05 [ 	]*qsi	3333\(%r6\)
-.*:	b2 e0 00 67 [ 	]*scctr	%r6,%r7
-.*:	b2 e1 00 67 [ 	]*spctr	%r6,%r7
-.*:	b2 80 6d 05 [ 	]*lpp	3333\(%r6\)
-.*:	07 07 [ 	]*nopr	%r7
+.*:	07 07 [ 	]*nopr	%r7
\ No newline at end of file
diff --git a/gas/testsuite/gas/s390/zarch-z10.s b/gas/testsuite/gas/s390/zarch-z10.s
index bd292e998a..3bf39902be 100644
--- a/gas/testsuite/gas/s390/zarch-z10.s
+++ b/gas/testsuite/gas/s390/zarch-z10.s
@@ -368,14 +368,3 @@ foo:
 	trte	%r6,%r7
 	trtre	%r6,%r7,10
 	trtre	%r6,%r7
-	ecpga	%r6,%r7
-	ecctr	%r6,%r7
-	epctr	%r6,%r7
-	lcctl	3333(%r6)
-	lpctl	3333(%r6)
-	lsctl	3333(%r6)
-	qctri	3333(%r6)
-	qsi	3333(%r6)
-	scctr	%r6,%r7
-	spctr	%r6,%r7
-	lpp	3333(%r6)
diff --git a/gas/testsuite/gas/sparc/hpcvis3.d b/gas/testsuite/gas/sparc/hpcvis3.d
index f4606ac20a..faa3137c9d 100644
--- a/gas/testsuite/gas/sparc/hpcvis3.d
+++ b/gas/testsuite/gas/sparc/hpcvis3.d
@@ -41,7 +41,7 @@ Disassembly of section .text:
   7c:	95 f9 11 c6 	fnumaddd  %f4, %f6, %f8, %f10
   80:	8f b1 42 26 	addxc  %g5, %g6, %g7
   84:	97 b2 42 6a 	addxccc  %o1, %o2, %o3
-  88:	8d b0 02 a0 	random  %f6
+  88:	99 b0 02 a0 	random  %o4
   8c:	9f b3 42 ce 	umulxhi  %o5, %sp, %o7
   90:	b5 b0 02 f9 	lzd  %i1, %i2
   94:	81 b0 03 7b 	cmask8  %i3
diff --git a/gas/testsuite/gas/sparc/hpcvis3.s b/gas/testsuite/gas/sparc/hpcvis3.s
index 9f3ac368ec..8da08f4218 100644
--- a/gas/testsuite/gas/sparc/hpcvis3.s
+++ b/gas/testsuite/gas/sparc/hpcvis3.s
@@ -34,7 +34,7 @@
 	fnumaddd %f4, %f6, %f8, %f10
 	addxc	%g5, %g6, %g7
 	addxccc	%o1, %o2, %o3
-	random	%f6
+	random	%o4
 	umulxhi	%o5, %o6, %o7
 	lzd	%i1, %i2
 	cmask8	%i3
diff --git a/gas/testsuite/gas/sparc/sparc.exp b/gas/testsuite/gas/sparc/sparc.exp
index 65e84ced57..faba8e4ebe 100644
--- a/gas/testsuite/gas/sparc/sparc.exp
+++ b/gas/testsuite/gas/sparc/sparc.exp
@@ -61,7 +61,6 @@ if [istarget sparc*-*-*] {
     run_dump_test "v9branch5"
     run_dump_test "pc2210"
     run_dump_test "hpcvis3"
-    run_dump_test "ima"
 
     run_list_test "pr4587" ""
 }
diff --git a/gas/testsuite/gas/symver/symver.exp b/gas/testsuite/gas/symver/symver.exp
index 5aef3ae8bd..6fcae0edab 100644
--- a/gas/testsuite/gas/symver/symver.exp
+++ b/gas/testsuite/gas/symver/symver.exp
@@ -15,7 +15,13 @@ proc run_error_test { name opts } {
 }
 
 # symver is only supported by ELF targets.
-if { [is_elf_format] } then {
+if { ([istarget "*-*-elf*"]		
+      || [istarget "m6811-*"]
+      || [istarget "m6812-*"]
+      || [istarget "*-*-linux*"]
+      || [istarget "*-*-gnu*"])
+     && ![istarget *-*-linux*aout*]
+     && ![istarget *-*-linux*oldld*] } then {
 
     if {[istarget "ia64-*"]} then {
       return
diff --git a/gas/write.c b/gas/write.c
index 23d4334289..a1e0205f86 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -1,7 +1,7 @@
 /* write.c - emit .o file
    Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
    1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010, 2011, 2012 Free Software Foundation, Inc.
+   2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -151,7 +151,7 @@ fix_new_internal (fragS *frag,		/* Which frag?  */
 		  symbolS *sub_symbol,	/* X_op_symbol.  */
 		  offsetT offset,	/* X_add_number.  */
 		  int pcrel,		/* TRUE if PC-relative relocation.  */
-		  RELOC_ENUM r_type	/* Relocation type.  */,
+		  RELOC_ENUM r_type ATTRIBUTE_UNUSED /* Relocation type.  */,
 		  int at_beginning)	/* Add to the start of the list?  */
 {
   fixS *fixP;
@@ -1767,10 +1767,6 @@ write_object_file (void)
   fragS *fragP;			/* Track along all frags.  */
 #endif
 
-#ifdef md_pre_output_hook
-  md_pre_output_hook;
-#endif
-
   /* Do we really want to write it?  */
   {
     int n_warns, n_errs;
@@ -1794,10 +1790,6 @@ write_object_file (void)
       }
   }
 
-#ifdef md_pre_relax_hook
-  md_pre_relax_hook;
-#endif
-
   /* From now on, we don't care about sub-segments.  Build one frag chain
      for each segment. Linked thru fr_next.  */
 
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 9d63bba07f..7f91606990 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,394 +1,3 @@
-2012-03-21  Cary Coutant  <ccoutant@google.com>
-
-	* Makefile.am: Add gdb-index.cc, gdb-index.h.
-	* Makefile.in: Regenerate.
-	* dwarf_reader.cc (Sized_elf_reloc_mapper::do_initialize): New function.
-	(Sized_elf_reloc_mapper::symbol_section): New function.
-	(Sized_elf_reloc_mapper::do_get_reloc_target): New function.
-	(make_elf_reloc_mapper): New function.
-	(Dwarf_abbrev_table::clear_abbrev_codes): New function.
-	(Dwarf_abbrev_table::do_read_abbrevs): New function.
-	(Dwarf_abbrev_table::do_get_abbrev): New function.
-	(Dwarf_ranges_table::read_ranges_table): New function.
-	(Dwarf_ranges_table::read_range_list): New function.
-	(Dwarf_pubnames_table::read_section): New function.
-	(Dwarf_pubnames_table::read_header): New function.
-	(Dwarf_pubnames_table::next_name): New function.
-	(Dwarf_die::Dwarf_die): New function.
-	(Dwarf_die::read_attributes): New function.
-	(Dwarf_die::skip_attributes): New function.
-	(Dwarf_die::set_name): New function.
-	(Dwarf_die::set_linkage_name): New function.
-	(Dwarf_die::attribute): New function.
-	(Dwarf_die::string_attribute): New function.
-	(Dwarf_die::int_attribute): New function.
-	(Dwarf_die::uint_attribute): New function.
-	(Dwarf_die::ref_attribute): New function.
-	(Dwarf_die::child_offset): New function.
-	(Dwarf_die::sibling_offset): New function.
-	(Dwarf_info_reader::check_buffer): New function.
-	(Dwarf_info_reader::parse): New function.
-	(Dwarf_info_reader::do_parse): New function.
-	(Dwarf_info_reader::do_read_string_table): New function.
-	(Dwarf_info_reader::lookup_reloc): New function.
-	(Dwarf_info_reader::get_string): New function.
-	(Dwarf_info_reader::visit_compilation_unit): New function.
-	(Dwarf_info_reader::visit_type_unit): New function.
-	(Sized_dwarf_line_info::Sized_dwarf_line_info): Use
-	Sized_elf_reloc_mapper.
-	(Sized_dwarf_line_info::symbol_section): Remove function.
-	(Sized_dwarf_line_info::read_relocs): Use Sized_elf_reloc_mapper.
-	(Sized_dwarf_line_info::read_line_mappings): Remove object
-	parameter, adjust callers.
-	(Sized_dwarf_line_info::format_file_lineno): Fix type of cast.
-	* dwarf_reader.h: Include <sys/types.h>.
-	(class Track_relocs): Remove forward declaration.
-	(class Elf_reloc_mapper): New class.
-	(class Sized_elf_reloc_mapper): New class.
-	(class Dwarf_abbrev_table): New class.
-	(class Dwarf_range_list): New class.
-	(class Dwarf_ranges_table): New class.
-	(class Dwarf_pubnames_table): New class.
-	(class Dwarf_die): New class.
-	(class Dwarf_info_reader): New class.
-	(Sized_dwarf_line_info::read_line_mappings): Remove object parameter.
-	(Sized_dwarf_line_info::symbol_section): Remove member function.
-	* dynobj.h (Sized_dynobj::do_section_contents): Refactor code from
-	base class.
-	* gdb-index.cc: New source file.
-	* gdb-index.h: New source file.
-	* incremental.cc (Sized_relobj_incr::do_layout): Track .debug_info
-	and .debug_types sections, call Layout::add_to_gdb_index.
-	(Sized_relobj_incr::do_section_name): Implement.
-	(Sized_relobj_incr::do_section_contents): Adjust parameter list and
-	return type; Implement.
-	(Sized_incr_dynobj::do_section_contents): Adjust parameter list and
-	return type.
-	* incremental.h (Sized_relobj_incr::do_section_contents): Adjust
-	parameter list and return type.
-	(Sized_incr_dynobj::do_section_contents): Likewise.
-	* layout.cc: Include gdb-index.h.
-	(Layout::Layout): Initialize gdb_index_data_.
-	(Layout::init_fixed_output_section): Check for .gdb_index section.
-	(Layout::add_to_gdb_index): New function. Instantiate.
-	* layout.h: Add forward declaration for class Gdb_index.
-	(Layout::add_to_gdb_index): New member function.
-	(Layout::gdb_index_data_): New data member.
-	* main.cc: Include gdb-index.h.
-	(main): Print statistics for gdb index.
-	* object.cc (Object::section_contents): Move code into
-	do_section_contents.
-	(need_decompressed_section): Check for sections needed when building
-	gdb index.
-	(build_compressed_section_map): Likewise.
-	(Sized_relobj_file::do_read_symbols): Need local symbols when building
-	gdb index.
-	(Sized_relobj_file::do_layout): Track .debug_info and .debug_types
-	sections; call Layout::add_to_gdb_index.
-	(Sized_relobj_file::do_decompressed_section_contents): Call
-	do_section_contents directly.
-	* object.h (Object::do_section_contents): Adjust parameter list and
-	return type.
-	(Object::do_decompressed_section_contents): Call do_section_contents
-	directly.
-	(Sized_relobj_file::do_section_contents): Adjust parameter list and
-	return type.
-	* options.h (class General_options): Add --gdb-index option.
-	* plugin.cc (Sized_pluginobj::do_section_contents): Adjust parameter
-	list and return type.
-	* plugin.h (Sized_pluginobj::do_section_contents): Likewise.
-	* reloc.h (Track_relocs::checkpoint): New function.
-	(Track_relocs::reset): New function.
-
-	* testsuite/Makefile.am (gdb_index_test_1.sh, gdb_index_test_2.sh):
-	New test cases.
-	* testsuite/Makefile.in: Regenerate.
-	* testsuite/gdb_index_test.cc: New test source file.
-	* testsuite/gdb_index_test_1.sh: New test source file.
-	* testsuite/gdb_index_test_2.sh: New test source file.
-
-2012-03-19  Doug Kwan  <dougkwan@google.com>
-
-	* arm.cc (Target_arm::do_define_standard_symbols): New method.
- 	(Target_arm::do_finalize_sections): Remove code which defines
-	__exidx_start and __exidx_end.  Make symbol table parameter
-	anonymous as it is not used.
-	* gold.cc (queue_middle_tasks): Call target hook to define any
-	target-specific symbols.
-	* target.h (Target::define_standard_symbols): New method.
-	(Target::do_define_standard_symbols): Same.
-	* testsuite/Makefile.am (arm_exidx_test): Dump relocations also.
-	* testsuite/Makefile.in: Regenerate.
-	* testsuite/arm_exidx.s: Generate data relocations for __exidx_start
-	and __exidx_end.
-	* testsuite/arm_exidx_test.sh: Check that no unused dynamic
-	relocations are generated for __exidx_start and __exidx_end.
-
-2012-03-16  Doug Kwan  <dougkwan@google.com>
-
-	* testsuite/Makefile.am: Disable test initpri3b.
-	* testsuite/Makefile.in: Regenerate.
-
-2012-03-15  Doug Kwan  <dougkwan@google.com>
-
-	* arm.cc (Target_arm::got_section): Make .got section read-only
-	if -z now is given.
-
-2012-03-15  Ian Lance Taylor  <iant@google.com>
-
-	PR gold/13850
-	* layout.cc (Layout::make_output_section): Correctly mark
-	SHT_INIT_ARRAY, et. al., as relro.
-
-2012-03-14  Doug Kwan  <dougkwan@google.com>
-
-	* gold/arm.cc (Target_arm::Scan::global): Generate R_ARM_GLOB_DAT
-	dynamic relocations for protected symbols in shared objects.
-
-2012-03-13  Ian Lance Taylor  <iant@google.com>
-
-	* resolve.cc (Symbol_table::resolve): When merging common symbols,
-	keep the larger alignment.
-
-2012-03-12  Cary Coutant  <ccoutant@google.com>
-
-	* dwarf_reader.cc (Sized_dwarf_line_info::process_one_opcode): Fix
-	handling of DW_LNE_define_file.
-
-2012-03-12  Cary Coutant  <ccoutant@google.com>
-
-	* reduced_debug_output.cc
-	(Output_reduced_debug_info_section::get_die_end): Add new FORM
-	codes to switch.
-
-2012-02-29  Cary Coutant  <ccoutant@google.com>
-
-	* object.cc (need_decompressed_section): Add #ifdef ENABLE_THREADS.
-
-2012-02-29  Cary Coutant  <ccoutant@google.com>
-
-	* dwarf_reader.cc (Sized_dwarf_line_info::Sized_dwarf_line_info):
-	Call Object::decompressed_section_contents.
-	* dwarf_reader.h (Sized_dwarf_line_info::~Sized_dwarf_line_info):
-	New dtor.
-	(Sized_dwarf_line_info::buffer_start_): New data member.
-	* merge.cc (Output_merge_data::do_add_input_section): Call
-	Object::decompressed_section_contents.
-	(Output_merge_string::do_add_input_section): Likewise.
-	* object.cc (need_decompressed_section): New function.
-	(build_compressed_section_map): Decompress sections needed later.
-	(Sized_relobj_file::do_decompressed_section_contents): New function.
-	(Sized_relobj_file::do_discard_decompressed_sections): New function.
-	* object.h (Object::decompressed_section_contents): New function.
-	(Object::discard_decompressed_sections): New function.
-	(Object::do_decompressed_section_contents): New function.
-	(Object::do_discard_decompressed_sections): New function.
-	(Compressed_section_info): New type.
-	(Compressed_section_map): Include decompressed section contents.
-	(Sized_relobj_file::do_decompressed_section_contents): New function.
-	(Sized_relobj_file::do_discard_decompressed_sections): New function.
-
-2012-02-16  Cary Coutant  <ccoutant@google.com>
-
-	* testsuite/Makefile.am (initpri2): Add --ctors-in-init-array option.
-	* testsuite/Makefile.in: Regenerate.
-
-2012-02-14  Cary Coutant  <ccoutant@google.com>
-
-	* options.cc (General_options::finalize): Disallow -pie and -static.
-
-2012-02-03  Doug Kwan  <dougkwan@google.com>
-
-	* arm.cc (Arm_relocate_functions::abs8,
-	Arm_relocate_functions::abs16): Use
-	Bits::has_signed_unsigned_overflow32.
-	(Arm_relocate_functions::thm_abs8): Correct range of
-	overflow check.
-	* reloc.h (Bits class): Change minimum number of bits from 0 to 1
-	in assertions.
-
-2012-02-02  Doug Kwan  <dougkwan@google.com>
-
-	* arm.cc (Reloc_stub::stub_type_for_reloc): Use PIC stubs in all
-	position independent outputs, not just shared objects.
-
-2012-01-30  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* configure.ac: Check if -fpic -mtls-dialect=gnu2 works.
-	* configure: Regenerated.
-
-2012-01-27  Ian Lance Taylor  <iant@google.com>
-
-	* reloc.h (Bits): New class with static functions, copied from
-	namespace utils in arm.cc.
-	* arm.cc (namespace utils): Remove.  Rewrite all uses to use Bits
-	instead.
-
-2012-01-27  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* incremental.cc (write_info_blocks): Correct relocation offset.
-
-2012-01-27  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* x86_64.cc (Relocate::tls_gd_to_ie): Support x32.
-	(Relocate::tls_gd_to_le): Likewise.
-
-2012-01-27  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* x86_64.cc (Scan::global): Support x32 IFUNC function pointer.
-
-2012-01-27  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* configure.ac: Check if -mcmodel=medium works.
-	* configure: Regenerated.
-
-2012-01-24  Cary Coutant  <ccoutant@google.com>
-
-	* int_encoding.cc (read_unsigned_LEB_128): Replaced with inline
-	definition and ...
-	(read_unsigned_LEB_128_x): ... this new function.
-	(read_signed_LEB_128): Replaced with inline definition and ...
-	(read_signed_LEB_128_x): ... this new function.
-	* int_encoding.h  (read_unsigned_LEB_128_x): New function.
-	(read_unsigned_LEB_128): Add inline definition.
-	(read_signed_LEB_128_x): New function.
-	(read_signed_LEB_128): Add inline definition.
-	* testsuite/Makefile.am (leb128_unittest): New unit test.
-	* testsuite/Makefile.in: Regenerate.
-	* testsuite/leb128_unittest.cc: New unit test.
-
-2012-01-23  Ian Lance Taylor  <iant@google.com>
-
-	PR gold/13617
-	* i386.cc (Target_i386::do_code_fill): When using a jmp
-	instruction, pad with nop instructions.
-	* x86_64.cc (Target_x86_64::do_code_fill): Likewise.
-
-2012-01-22  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* x86_64.cc (gc_process_relocs): Add typename on types used in
-	template.
-	(scan_relocs): Likewise.
-	(relocate_section): Likewise.
-	(apply_relocation): Likewise.
-
-2012-01-10  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* x86_64.cc (Scan::check_non_pic): Allow R_X86_64_32 for x32.
-	(Scan::local): Use R_X86_64_RELATIVE relocation for R_X86_64_32
-	under x32.
-
-2012-01-09  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* x86_64.cc: Initial support for x32.
-
-2012-01-03  Cary Coutant  <ccoutant@google.com>
-
-	* gold/incremental.cc (Sized_incremental_binary::do_process_got_plt):
-	Use abstract base class for GOT.
-	* gold/output.h (class Output_data_got_base): New abstract base class.
-	(class Output_data_got): Derive from new base class, adjust ctors.
-	(Output_data_got::reserve_slot): Make virtual; rename to
-	do_reserve_slot; Adjust callers.
-	* gold/target.h (Sized_target::init_got_plt_for_update): Return
-	pointer to abstract base class.
-	* gold/x86_64.cc (Target_x86_64::init_got_plt_for_update): Likewise.
-
-2011-12-18  Ian Lance Taylor  <iant@google.com>
-
-	* object.h (Relobj::local_symbol_value): New function.
-	(Relobj::local_plt_offset): New function.
-	(Relobj::local_has_got_offset): New function.
-	(Relobj::local_got_offset): New function.
-	(Relobj::set_local_got_offset): New function.
-	(Relobj::do_local_symbol_value): New pure virtual function.
-	(Relobj::do_local_plt_offset): Likewise.
-	(Relobj::do_local_has_got_offset): Likewise.
-	(Relobj::do_local_got_offset): Likewise.
-	(Relobj::do_set_local_got_offset): Likewise.
-	(Sized_relobj::do_local_has_got_offset): Rename from
-	local_has_got_offset.
-	(Sized_relobj::do_local_got_offset): Rename from local_got_offset.
-	(Sized_relobj::do_set_local_got_offset): Rename from
-	set_local_got_offset.
-	(Sized_relobj_file::do_local_plt_offset): Rename from
-	local_plt_offset.
-	(Sized_relobj_file::do_local_symbol_value): New function.
-	* object.cc (Sized_relobj_file::do_local_plt_offset): Rename from
-	local_plt_offset.
-	* output.cc (Output_data_got::Got_entry::write): Change object to
-	Relobj.  Use local_symbol_value.
-	(Output_data_got::add_global_with_rel): Change rel_dyn to
-	Output_data_reloc_generic*.  Use add_global_generic.
-	(Output_data_got::add_global_with_rela): Remove.  Change all
-	callers to use add_global_with_rel.
-	(Output_data_got::add_global_pair_with_rel): Change rel_dyn to
-	Output_data_reloc_generic*.  Use add_global_generic.
-	(Output_data_got::add_global_pair_with_rela): Remove.  Change all
-	callers to use add_global_pair_with_rel.
-	(Output_data_got::add_local): Change object to Relobj*.
-	(Output_data_got::add_local_plt): Likewise.
-	(Output_data_got::add_local_with_rel): Change object to Relobj*,
-	change rel_dyn to Output_data_reloc_generic*.  Use
-	add_local_generic.
-	(Output_data_got::add_local_with_rela): Remove.  Change all
-	callers to use all_local_with_rel.
-	(Output_data_got::add_local_pair_with_rel): Change object to
-	Relobj*, change rel_dyn to Output_data_reloc_generic*.  Use
-	add_output_section_generic.
-	(Output_data_got::add_local_pair_with_rela): Remove.  Change all
-	callers to use add_local_pair_with_rel.
-	(Output_data_got::reserve_local): Change object to Relobj*.
-	* output.h: (class Output_data_reloc_generic): Add pure virtual
-	declarations for add_global_generic, add_local_generic,
-	add_output_section_generic.
-	(class Output_data_reloc) [SHT_REL, SHT_RELA]: Implement new
-	functions for Output_data_reloc_generic.  Update declarations for
-	changes listed in output.cc.
-	(class Output_data_got): Change template parameter to got_size.
-	Don't define Rel_dyn or Rela_dyn.  Update declarations per above.
-	* incremental.h (Sized_relobj_incr::do_local_symbol_value): New
-	function.
-	(Sized_relobj_incr::do_local_plt_offset): New function.
-	* copy-relocs.cc (Copy_relocs::Copy_reloc_entry::emit): Call
-	add_global_generic.
-
-2011-12-17  Cary Coutant  <ccoutant@google.com>
-
-	* dwarf_reader.cc (Sized_dwarf_line_info::read_lines): Add casts.
-	* resolve.cc (Symbol_table::resolve): Likewise.
-	* i386.cc (Target_i386::do_code_fill): Use char constants for nop
-	arrays.
-	* x86_64.cc (Target_x86_64::do_code_fill): Likewise.
-
-2011-12-16  Ian Lance Taylor  <iant@google.com>
-
-	* output.h (Output_data_reloc_generic::add): Only call
-	add_dynamic_reloc if this is a dynamic reloc section.
-
-2011-12-15  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR gold/13505
-	* target-reloc.h (apply_relocation): Replace <64, false> with
-	<size, big_endian>.
-
-2011-11-25  Nick Clifton  <nickc@redhat.com>
-
-	* po/it.po: New Italian translation.
-
-2011-11-17  Sterling Augustine  <saugustine@google.com>
-
-	* script.cc (script_include_directive): Implement.
-	(read_script_file): New local variables name and search_path. Update
-	comment. Call IS_ABSOLUTE_PATH and Dirsearch::find_file_in_dir_list.
-	* dirsearch.h (Dirsearch::find_file_in_dir_list): Declare new method.
-	* dirsearch.cc (Dirsearch::find_file_in_dir_list): Implement it.
-
-2011-11-11  Sterling Augustine  <saugustine@google.com>
-
-	* yyscript.y (section_cmd): Add support for INCLUDE directive.
-	(file_or_sections_cmd): Likewise.
-
 2011-11-11  Doug Kwan  <dougkwan@google.com>
 
 	* arm.cc (Target_arm::do_make_elf_object): Allow executable also
@@ -404,39 +13,10 @@
 	(Relocate_functions::rel32_unaligned): Ditto.
 	(Relocate_functions::pcrel32_unaligned): Ditto.
 
-2011-11-09  Doug Kwan  <dougkwan@google.com>
-
-	PR gold/13362
-	* arm.cc (Arm_scan_relocatable_relocs::Default_scan_relocatable_relocs):
-	Use unaligned 4-byte relocs for static 32-bit data as required by EABI.
-	* reloc.h (Relocatable_relocs::Reloc_strategy): New enum
-	RELOC_ADJUST_FOR_SECTION_4_UNALIGNED.
-	(Relocate_functions::rel_unaligned): New.
-	(Relocate_functions::rel32_unaligned): New.
-	* target-reloc.h (relocate_for_relocatable): Add code to handle
-	RELOC_ADJUST_FOR_SECTION_4_UNALIGNED.
-	* testsuite/Makefile.am (arm_unaligned_reloc_r.stdout,
-	arm_unaligned_reloc_r): New targets.
-	* testsuite/Makefile.in: Regenerate.
-	* arm_unaligned_reloc.sh: Check unaligned relocs in relocatable
-	linking.
-
-2011-11-02  Ian Lance Taylor  <iant@google.com>
-
-	* configure.ac: Add --with-lib-path option.  Define LIB_PATH and
-	NATIVE_LINKER.
-	* Makefile.am (AM_CPPFLAGS): Define TOOLLIBDIR.
-	* options.cc (General_options::finalize): Use library search path
-	from configure script if specified.  If not native and no sysroot,
-	only search TOOLLIBDIR.
-	* options.h (Search_directory::Search_directory): Change name to
-	const std::string&.
-	(General_options::add_to_library_path_with_sysroot): Change arg to
-	const std::string&.
-	* configure, Makefile.in, config.in: Rebuild.
-
-2011-11-02  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+2011-11-15  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
+	Apply mainline patches.
+	2011-11-02  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 	* arm.cc (Target_arm::may_use_v5t_interworking): Check whether
 	we are working around the ARM1176 Erratum.
 	* options.h (General_options::fix_arm1176): Add option.
@@ -445,9 +25,7 @@
 	* testsuite/Makefile.in: Regenerate.
 	* testsuite/arm_fix_1176.s: New file.
 	* testsuite/arm_fix_1176.sh: Likewise.
-
-2011-11-02  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
-
+	2011-11-02  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 	* arm.cc (Target_arm::Target_arm): Remove initialisation of
 	may_use_blx_.
 	(Target_arm::may_use_blx): Remove method.
@@ -471,68 +49,25 @@
 	* testsuite/arm_farcall_thumb_thumb.s: Likewise.
 	* testsuite/arm_farcall_thumb_thumb.sh: Likewise.
 
-2011-10-31  Cary Coutant  <ccoutant@google.com>
+2011-10-25  Alan Modra  <amodra@gmail.com>
 
-	PR gold/13023
-	* expression.cc (Expression::eval_with_dot): Add
-	is_section_dot_assignment parameter.
-	(Expression::eval_maybe_dot): Likewise.  Adjust value when rhs is
-	absolute and assigning to dot within a section.
-	* script-sections.cc
-	(Output_section_element_assignment::set_section_addresses): Pass
-	dot_section to set_if_absolute.
-	(Output_section_element_dot_assignment::finalize_symbols): Pass TRUE
-	as is_section_dot_assignment flag to eval_with_dot.
-	(Output_section_element_dot_assignment::set_section_addresses):
-	Likewise.
-	* script.cc (Symbol_assignment::set_if_absolute): Add dot_section
-	parameter.  Also set value if relative to dot_section; set the
-	symbol's output_section.
-	* script.h (Expression::eval_with_dot): Add is_section_dot_assignment
-	parameter.  Adjust all callers.
-	(Expression::eval_maybe_dot): Likewise.
-	(Symbol_assignment::set_if_absolute): Add dot_section parameter.
-	Adjust all callers.
-	* testsuite/script_test_2.t: Test assignment of an absolute value
-	to dot within an output section element.
-
-2011-10-31  Cary Coutant  <ccoutant@google.com>
-
-	* options.h (class General_options): Add --[no-]gnu-unique options.
-	* symtab.cc (Symbol_table::sized_write_globals): Convert
-	STB_GNU_UNIQUE to STB_GLOBAL if --no-gnu-unique.
-
-2011-10-31  Cary Coutant  <ccoutant@google.com>
-
-	PR gold/13359
-	* i386.cc (Target_i386::Relocate::relocate_tls): Remove
-	unnecessary assertion.
-	* x86_64.cc (Target_x86_64::Relocate::relocate_tls): Likewise.
-
-2011-10-31 Sriraman Tallam  <tmsriram@google.com>
-
-	* symtab.h (Symbol_table::gc_mark_symbol_for_shlib): Rename to
-	gc_mark_symbol.
-	* symtab.cc (Symbol_table::gc_mark_symbol_for_shlib): Rename to
-	gc_mark_symbol.
-	Change to just keep the section associated with symbol.
-	(Symbol_table::add_from_relobj): Mark symbols as not garbage when
-	they are externally visible and --export-dynamic is turned on.
-	(Symbol_table::gc_mark_dyn_syms): Call gc_mark_symbol.
-
-2011-10-19  Ian Lance Taylor  <iant@google.com>
-
-	PR gold/13163
-	* script-sections.cc
-	(Output_section_element_dot_assignment::needs_output_section): New
-	function.
-
-2011-10-19  Ian Lance Taylor  <iant@google.com>
-
-	PR gold/13204
-	* layout.cc (Layout::segment_precedes): Don't assert failure if a
-	--section-start option was seen.
-	* options.h (General_options::any_section_start): New function.
+	Apply mainline patches.
+	2011-09-26  Cary Coutant  <ccoutant@google.com>
+	gcc PR lto/47247
+	* plugin.cc (get_symbols_v2): New function.
+	(Plugin::load): Add LDPT_GET_SYMBOLS_V2.
+	(is_referenced_from_outside): New function.
+	(Pluginobj::get_symbol_resolution_info): Add version parameter, return
+	LDPR_PREVAILING_DEF_IRONLY_EXP when using new version.
+	(get_symbols): Pass version parameter.
+	(get_symbols_v2): New function.
+	* plugin.h (Pluginobj::get_symbol_resolution_info): Add version
+	parameter.
+	* testsuite/plugin_test.c (get_symbols_v2): New static variable.
+	(onload): Add LDPT_GET_SYMBOLS_V2.
+	(all_symbols_read_hook): Use get_symbols_v2; check for
+	LDPR_PREVAILING_DEF_IRONLY_EXP.
+	* testsuite/plugin_test_3.sh: Update expected results.
 
 2011-10-18  David S. Miller  <davem@davemloft.net>
 
@@ -547,160 +82,12 @@
 	__tls_get_addr call delay slot instruction forward 4 bytes when
 	performing relaxation.
 
-2011-10-18  Cary Coutant  <ccoutant@google.com>
-
-	* output.cc (posix_fallocate): Return 0 on success, errno on failure.
-	(Output_file::map_no_anonymous): Check for non-zero
-	return code from posix_fallocate.
-
-2011-10-17  Cary Coutant  <ccoutant@google.com>
-
-	PR gold/13245
-	* plugin.cc (is_visible_from_outside): Check for symbols
-	referenced from dynamic objects.
-	* resolve.cc (Symbol_table::resolve): Don't count references
-	from dynamic objects as references from real ELF files.
-	* testsuite/plugin_test_2.sh: Adjust expected result.
-
-2011-10-17  Cary Coutant  <ccoutant@google.com>
-
-	* gold.cc: Include timer.h.
-	(queue_middle_tasks): Stamp time.
-	(queue_final_tasks): Likewise.
-	* main.cc (main): Store timer in parameters.  Print timers
-	for each pass.
-	* parameters.cc (Parameters::Parameters): Initialize timer_.
-	(Parameters::set_timer): New function.
-	(set_parameters_timer): New function.
-	* parameters.h (Parameters::set_timer): New function.
-	(Parameters::timer): New function.
-	(Parameters::timer_): New data member.
-	(set_parameters_timer): New function.
-	* timer.cc (Timer::stamp): New function.
-	(Timer::get_pass_time): New function.
-	* timer.h (Timer::stamp): New function.
-	(Timer::get_pass_time): New function.
-	(Timer::pass_times_): New data member.
-
-2011-10-17  Cary Coutant  <ccoutant@google.com>
-
-	* readsyms.cc (Read_symbols::run): Don't queue an unblocker
-	task for members of lib groups.
-
-2011-10-17  Cary Coutant  <ccoutant@google.com>
-
-	PR gold/13288
-	* fileread.cc (File_read::find_view): Add assert.
-	(File_read::make_view): Move bounds check (replace with assert)...
-	(File_read::find_or_make_view): ... to here.
-
-2011-10-12  Cary Coutant  <ccoutant@google.com>
-
-	* output.cc (Output_file::open_base_file): Handle case where
-	::read returns less than requested size.
-
-2011-10-10  Cary Coutant  <ccoutant@google.com>
-
-	* incremental.cc (Sized_relobj_incr::Sized_relobj_incr):
-	Initialize defined_count_.
-	(Sized_relobj_incr::do_add_symbols): Count defined symbols.
-	(Sized_relobj_incr::do_get_global_symbol_counts): Rewrite.
-	(Sized_incr_dynobj::Sized_incr_dynobj): Initialize defined_count_.
-	(Sized_incr_dynobj::do_add_symbols): Count defined symbols.
-	(Sized_incr_dynobj::do_get_global_symbol_counts): Rewrite.
-	* incremental.h (Sized_relobj_incr::defined_count_): New data
-	member.
-	(Sized_incr_dynobj::defined_count_): New data member.
-	* plugin.cc (Sized_pluginobj::do_get_global_symbol_counts):
-	Return zeroes instead of internal error.
-
-2011-10-10  Cary Coutant  <ccoutant@google.com>
-
-	PR gold/13249
-	* output.cc (Output_reloc::Output_reloc): Add use_plt_offset flag.
-	(Output_reloc::symbol_value): Return PLT offset if flag is set.
-	* output.h (class Output_reloc): Add use_plt_offset flag.
-	(Output_reloc::type_): Adjust size of bit field.
-	(Output_reloc::use_plt_offset_): New bit field.
-	(class Output_data_reloc): Adjust all calls to Output_reloc_type.
-	(Output_data_reloc::add_local_relative): (RELA only) Add use_plt_offset
-	flag.  Adjust all callers.
-	* x86_64.cc (Target_x86_64::Scan::local): Check for IFUNC when
-	creating RELATIVE relocations.
-
-2011-10-10  Nick Clifton  <nickc@redhat.com>
-
-	* po/es.po: Updated Spanish translation.
-	* po/fi.po: Updated Finnish translation.
-
-2011-10-03   Diego Novillo  <dnovillo@google.com>
-
-	* options.cc (parse_uint): Fix dereference of RETVAL.
-
-2011-09-29  Sriraman Tallam  <tmsriram@google.com>
-
-	* layout.h (section_order_map_): New member.
-	(get_section_order_map): New member function.
-	* output.cc (Output_section::add_input_section): Check for patterns
-	only when --section-ordering-file is specified.
-	* gold.cc (queue_middle_tasks): Delay updating order of sections till
-	output_sections have been formed.
-	* layout.cc (Layout_Layout): Initialize section_order_map_.
-	* plugin.cc (update_section_order): Store order in order_map. Do not
-	update the order.
-	* testsuite/Makefile.am: Add test case for plugin_final_layout.
-	* testsuite/Makefile.in: Regenerate.
-	* testsuite/plugin_section_order.c: New file.
-	* testsuite/plugin_final_layout.cc: New file.
-	* testsuite/plugin_final_layout.sh: New file.
-
-2011-09-29  Cary Coutant  <ccoutant@google.com>
-
-	* incremental.cc (Sized_incremental_binary::do_process_got_plt):
-	Check for NULL.
-	* symtab.cc (Symbol_table::add_from_relobj): Ignore version
-	symbols during incremental update.
-	(Symbol_table::add_from_dynobj): Likewise.
-
 2011-09-27  Viktor Kutuzov  <vkutuzov@accesssoftek.com>
 	    Ian Lance Taylor  <iant@google.com>
 
 	* symtab.cc (Symbol_table::define_special_symbol): Always
 	canonicalize version string.
 
-2011-09-26  Cary Coutant  <ccoutant@google.com>
-
-	* gold.cc (queue_initial_tasks): Move option checks ...
-	* options.cc (General_options::finalize): ... to here. Disable
-	some options; make others fatal.
-
-2011-09-26  Cary Coutant  <ccoutant@google.com>
-
-	gcc PR lto/47247
-	* plugin.cc (get_symbols_v2): New function.
-	(Plugin::load): Add LDPT_GET_SYMBOLS_V2.
-	(is_referenced_from_outside): New function.
-	(Pluginobj::get_symbol_resolution_info): Add version parameter, return
-	LDPR_PREVAILING_DEF_IRONLY_EXP when using new version.
-	(get_symbols): Pass version parameter.
-	(get_symbols_v2): New function.
-	* plugin.h (Pluginobj::get_symbol_resolution_info): Add version
-	parameter.
-	* testsuite/plugin_test.c (get_symbols_v2): New static variable.
-	(onload): Add LDPT_GET_SYMBOLS_V2.
-	(all_symbols_read_hook): Use get_symbols_v2; check for
-	LDPR_PREVAILING_DEF_IRONLY_EXP.
-	* testsuite/plugin_test_3.sh: Update expected results.
-
-2011-09-23  Simon Baldwin  <simonb@google.com>
-
-	* configure.ac: Add new --with-gold-ldadd and --with-gold-ldflags
-	configuration options.
-	* configure: Regenerate.
-	* Makefile.am: Handle GOLD_LDADD and GOLD_LDFLAGS.
-	* Makefile.in: Regenerate.
-	* testsuite/Makefile.in: Regenerate.
-
 2011-09-19  Sriraman Tallam  <tmsriram@google.com>
 
 	* plugin.h (should_defer_layout): Modify to check for any_claimed_.
diff --git a/gold/Makefile.am b/gold/Makefile.am
index 7d4b7254b2..df5e66c6b5 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
 	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
-	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
+	@INCINTL@
 
 LIBIBERTY = ../libiberty/libiberty.a
 
@@ -55,7 +55,6 @@ CCFILES = \
 	expression.cc \
 	fileread.cc \
         gc.cc \
-        gdb-index.cc \
 	gold.cc \
 	gold-threads.cc \
 	icf.cc \
@@ -103,7 +102,6 @@ HFILES = \
 	fileread.h \
 	freebsd.h \
         gc.h \
-        gdb-index.h \
 	gold.h \
 	gold-threads.h \
 	icf.h \
@@ -153,14 +151,12 @@ libgold_a_LIBADD = $(LIBOBJS)
 
 sources_var = main.cc
 deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
-ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
+ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
 	 $(THREADSLIB) $(LIBDL)
-ldflags_var = $(GOLD_LDFLAGS)
 
 ld_new_SOURCES = $(sources_var)
 ld_new_DEPENDENCIES = $(deps_var)
 ld_new_LDADD = $(ldadd_var)
-ld_new_LDFLAGS = $(ldflags_var)
 
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 
diff --git a/gold/Makefile.in b/gold/Makefile.in
index 2998b7bf61..1c33fe6a33 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -77,11 +77,11 @@ am__objects_1 = archive.$(OBJEXT) attributes.$(OBJEXT) \
 	descriptors.$(OBJEXT) dirsearch.$(OBJEXT) dynobj.$(OBJEXT) \
 	dwarf_reader.$(OBJEXT) ehframe.$(OBJEXT) errors.$(OBJEXT) \
 	expression.$(OBJEXT) fileread.$(OBJEXT) gc.$(OBJEXT) \
-	gdb-index.$(OBJEXT) gold.$(OBJEXT) gold-threads.$(OBJEXT) \
-	icf.$(OBJEXT) incremental.$(OBJEXT) int_encoding.$(OBJEXT) \
-	layout.$(OBJEXT) mapfile.$(OBJEXT) merge.$(OBJEXT) \
-	object.$(OBJEXT) options.$(OBJEXT) output.$(OBJEXT) \
-	parameters.$(OBJEXT) plugin.$(OBJEXT) readsyms.$(OBJEXT) \
+	gold.$(OBJEXT) gold-threads.$(OBJEXT) icf.$(OBJEXT) \
+	incremental.$(OBJEXT) int_encoding.$(OBJEXT) layout.$(OBJEXT) \
+	mapfile.$(OBJEXT) merge.$(OBJEXT) object.$(OBJEXT) \
+	options.$(OBJEXT) output.$(OBJEXT) parameters.$(OBJEXT) \
+	plugin.$(OBJEXT) readsyms.$(OBJEXT) \
 	reduced_debug_output.$(OBJEXT) reloc.$(OBJEXT) \
 	resolve.$(OBJEXT) script-sections.$(OBJEXT) script.$(OBJEXT) \
 	stringpool.$(OBJEXT) symtab.$(OBJEXT) target.$(OBJEXT) \
@@ -101,9 +101,7 @@ am_ld_new_OBJECTS = $(am__objects_4)
 ld_new_OBJECTS = $(am_ld_new_OBJECTS)
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) libgold.a $(LIBIBERTY) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-ld_new_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld_new_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(am__DEPENDENCIES_1)
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am_ld1_OBJECTS = $(am__objects_4)
 ld1_OBJECTS = $(am_ld1_OBJECTS)
 ld1_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ld1_LDFLAGS) \
@@ -253,8 +251,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
-GOLD_LDADD = @GOLD_LDADD@
-GOLD_LDFLAGS = @GOLD_LDFLAGS@
 GREP = @GREP@
 INCINTL = @INCINTL@
 INSTALL = @INSTALL@
@@ -369,7 +365,7 @@ AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
 	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
-	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
+	@INCINTL@
 
 LIBIBERTY = ../libiberty/libiberty.a
 @PLUGINS_TRUE@LIBDL = -ldl
@@ -399,7 +395,6 @@ CCFILES = \
 	expression.cc \
 	fileread.cc \
         gc.cc \
-        gdb-index.cc \
 	gold.cc \
 	gold-threads.cc \
 	icf.cc \
@@ -447,7 +442,6 @@ HFILES = \
 	fileread.h \
 	freebsd.h \
         gc.h \
-        gdb-index.h \
 	gold.h \
 	gold-threads.h \
 	icf.h \
@@ -494,14 +488,12 @@ libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES)
 libgold_a_LIBADD = $(LIBOBJS)
 sources_var = main.cc
 deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
-ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
+ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
 	 $(THREADSLIB) $(LIBDL)
 
-ldflags_var = $(GOLD_LDFLAGS)
 ld_new_SOURCES = $(sources_var)
 ld_new_DEPENDENCIES = $(deps_var)
 ld_new_LDADD = $(ldadd_var)
-ld_new_LDFLAGS = $(ldflags_var)
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 incremental_dump_SOURCES = incremental-dump.cc
 incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
@@ -609,7 +601,7 @@ incremental-dump$(EXEEXT): $(incremental_dump_OBJECTS) $(incremental_dump_DEPEND
 	$(CXXLINK) $(incremental_dump_OBJECTS) $(incremental_dump_LDADD) $(LIBS)
 ld-new$(EXEEXT): $(ld_new_OBJECTS) $(ld_new_DEPENDENCIES) 
 	@rm -f ld-new$(EXEEXT)
-	$(ld_new_LINK) $(ld_new_OBJECTS) $(ld_new_LDADD) $(LIBS)
+	$(CXXLINK) $(ld_new_OBJECTS) $(ld_new_LDADD) $(LIBS)
 ld1$(EXEEXT): $(ld1_OBJECTS) $(ld1_DEPENDENCIES) 
 	@rm -f ld1$(EXEEXT)
 	$(ld1_LINK) $(ld1_OBJECTS) $(ld1_LDADD) $(LIBS)
@@ -652,7 +644,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expression.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdb-index.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gold-threads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gold.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386.Po@am__quote@
diff --git a/gold/arm.cc b/gold/arm.cc
index dc6e64a742..72c3670d15 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -1,6 +1,6 @@
 // arm.cc -- arm target support for gold.
 
-// Copyright 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+// Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
 // Written by Doug Kwan <dougkwan@google.com> based on the i386 code
 // by Ian Lance Taylor <iant@google.com>.
 // This file also contains borrowed and adapted code from
@@ -2103,6 +2103,65 @@ class Arm_scan_relocatable_relocs :
   }
 };
 
+// Utilities for manipulating integers of up to 32-bits
+
+namespace utils
+{
+  // Sign extend an n-bit unsigned integer stored in an uint32_t into
+  // an int32_t.  NO_BITS must be between 1 to 32.
+  template<int no_bits>
+  static inline int32_t
+  sign_extend(uint32_t bits)
+  {
+    gold_assert(no_bits >= 0 && no_bits <= 32);
+    if (no_bits == 32)
+      return static_cast<int32_t>(bits);
+    uint32_t mask = (~((uint32_t) 0)) >> (32 - no_bits);
+    bits &= mask;
+    uint32_t top_bit = 1U << (no_bits - 1);
+    int32_t as_signed = static_cast<int32_t>(bits);
+    return (bits & top_bit) ? as_signed + (-top_bit * 2) : as_signed;
+  }
+
+  // Detects overflow of an NO_BITS integer stored in a uint32_t.
+  template<int no_bits>
+  static inline bool
+  has_overflow(uint32_t bits)
+  {
+    gold_assert(no_bits >= 0 && no_bits <= 32);
+    if (no_bits == 32)
+      return false;
+    int32_t max = (1 << (no_bits - 1)) - 1;
+    int32_t min = -(1 << (no_bits - 1));
+    int32_t as_signed = static_cast<int32_t>(bits);
+    return as_signed > max || as_signed < min;
+  }
+
+  // Detects overflow of an NO_BITS integer stored in a uint32_t when it
+  // fits in the given number of bits as either a signed or unsigned value.
+  // For example, has_signed_unsigned_overflow<8> would check
+  // -128 <= bits <= 255
+  template<int no_bits>
+  static inline bool
+  has_signed_unsigned_overflow(uint32_t bits)
+  {
+    gold_assert(no_bits >= 2 && no_bits <= 32);
+    if (no_bits == 32)
+      return false;
+    int32_t max = static_cast<int32_t>((1U << no_bits) - 1);
+    int32_t min = -(1 << (no_bits - 1));
+    int32_t as_signed = static_cast<int32_t>(bits);
+    return as_signed > max || as_signed < min;
+  }
+
+  // Select bits from A and B using bits in MASK.  For each n in [0..31],
+  // the n-th bit in the result is chosen from the n-th bits of A and B.
+  // A zero selects A and a one selects B.
+  static inline uint32_t
+  bit_select(uint32_t a, uint32_t b, uint32_t mask)
+  { return (a & ~mask) | (b & mask); }
+};
+
 template<bool big_endian>
 class Target_arm : public Sized_target<32, big_endian>
 {
@@ -2515,9 +2574,6 @@ class Target_arm : public Sized_target<32, big_endian>
 	    && Target::do_section_may_have_icf_unsafe_pointers(section_name));
   }
   
-  virtual void
-  do_define_standard_symbols(Symbol_table*, Layout*);
-
  private:
   // The class which scans relocations.
   class Scan
@@ -2959,7 +3015,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
   {
     // According to the Elf ABI for ARM Architecture the immediate
     // field is sign-extended to form the addend.
-    return Bits<16>::sign_extend32(((val >> 4) & 0xf000) | (val & 0xfff));
+    return utils::sign_extend<16>(((val >> 4) & 0xf000) | (val & 0xfff));
   }
 
   // Insert X into VAL based on the ARM instruction encoding described
@@ -2993,10 +3049,10 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
   {
     // According to the Elf ABI for ARM Architecture the immediate
     // field is sign-extended to form the addend.
-    return Bits<16>::sign_extend32(((val >> 4) & 0xf000)
-				   | ((val >> 15) & 0x0800)
-				   | ((val >> 4) & 0x0700)
-				   | (val & 0x00ff));
+    return utils::sign_extend<16>(((val >> 4) & 0xf000)
+				  | ((val >> 15) & 0x0800)
+				  | ((val >> 4) & 0x0700)
+				  | (val & 0x00ff));
   }
 
   // Insert X into VAL based on the Thumb2 instruction encoding
@@ -3104,8 +3160,8 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     uint32_t i1 = j1 ^ s ? 0 : 1;
     uint32_t i2 = j2 ^ s ? 0 : 1;
 
-    return Bits<25>::sign_extend32((s << 24) | (i1 << 23) | (i2 << 22)
-				   | (upper << 12) | (lower << 1));
+    return utils::sign_extend<25>((s << 24) | (i1 << 23) | (i2 << 22)
+				  | (upper << 12) | (lower << 1));
   }
 
   // Insert OFFSET to a 32-bit THUMB branch and return the upper instruction.
@@ -3143,7 +3199,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     uint32_t lower = (lower_insn & 0x07ffU);
     uint32_t upper = (s << 8) | (j2 << 7) | (j1 << 6) | (upper_insn & 0x003fU);
 
-    return Bits<21>::sign_extend32((upper << 12) | (lower << 1));
+    return utils::sign_extend<21>((upper << 12) | (lower << 1));
   }
 
   // Insert OFFSET to a 32-bit THUMB conditional branch and return the upper
@@ -3180,13 +3236,14 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     typedef typename elfcpp::Swap<8, big_endian>::Valtype Valtype;
     Valtype* wv = reinterpret_cast<Valtype*>(view);
     Valtype val = elfcpp::Swap<8, big_endian>::readval(wv);
-    int32_t addend = Bits<8>::sign_extend32(val);
+    int32_t addend = utils::sign_extend<8>(val);
     Arm_address x = psymval->value(object, addend);
-    val = Bits<32>::bit_select32(val, x, 0xffU);
+    val = utils::bit_select(val, x, 0xffU);
     elfcpp::Swap<8, big_endian>::writeval(wv, val);
 
     // R_ARM_ABS8 permits signed or unsigned results.
-    return (Bits<8>::has_signed_unsigned_overflow32(x)
+    int signed_x = static_cast<int32_t>(x);
+    return ((signed_x < -128 || signed_x > 255)
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3203,9 +3260,12 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     Valtype val = elfcpp::Swap<16, big_endian>::readval(wv);
     Reltype addend = (val & 0x7e0U) >> 6;
     Reltype x = psymval->value(object, addend);
-    val = Bits<32>::bit_select32(val, x << 6, 0x7e0U);
+    val = utils::bit_select(val, x << 6, 0x7e0U);
     elfcpp::Swap<16, big_endian>::writeval(wv, val);
-    return (Bits<5>::has_overflow32(x)
+
+    // R_ARM_ABS16 permits signed or unsigned results.
+    int signed_x = static_cast<int32_t>(x);
+    return ((signed_x < -32768 || signed_x > 65535)
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3222,9 +3282,9 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     Valtype val = elfcpp::Swap<32, big_endian>::readval(wv);
     Reltype addend = val & 0x0fffU;
     Reltype x = psymval->value(object, addend);
-    val = Bits<32>::bit_select32(val, x, 0x0fffU);
+    val = utils::bit_select(val, x, 0x0fffU);
     elfcpp::Swap<32, big_endian>::writeval(wv, val);
-    return (Bits<12>::has_overflow32(x)
+    return (utils::has_overflow<12>(x)
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3238,13 +3298,14 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     typedef typename elfcpp::Swap_unaligned<16, big_endian>::Valtype Valtype;
     typedef typename elfcpp::Swap<32, big_endian>::Valtype Reltype;
     Valtype val = elfcpp::Swap_unaligned<16, big_endian>::readval(view);
-    int32_t addend = Bits<16>::sign_extend32(val);
+    int32_t addend = utils::sign_extend<16>(val);
     Arm_address x = psymval->value(object, addend);
-    val = Bits<32>::bit_select32(val, x, 0xffffU);
+    val = utils::bit_select(val, x, 0xffffU);
     elfcpp::Swap_unaligned<16, big_endian>::writeval(view, val);
 
     // R_ARM_ABS16 permits signed or unsigned results.
-    return (Bits<16>::has_signed_unsigned_overflow32(x)
+    int signed_x = static_cast<int32_t>(x);
+    return ((signed_x < -32768 || signed_x > 65536)
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3316,12 +3377,12 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     typedef typename elfcpp::Swap<16, big_endian>::Valtype Valtype;
     Valtype* wv = reinterpret_cast<Valtype*>(view);
     Valtype val = elfcpp::Swap<16, big_endian>::readval(wv);
-    int32_t addend = Bits<8>::sign_extend32((val & 0x00ff) << 1);
+    int32_t addend = utils::sign_extend<8>((val & 0x00ff) << 1);
     int32_t x = (psymval->value(object, addend) - address);
     elfcpp::Swap<16, big_endian>::writeval(wv, ((val & 0xff00)
                                                 | ((x & 0x01fe) >> 1)));
     // We do a 9-bit overflow check because x is right-shifted by 1 bit.
-    return (Bits<9>::has_overflow32(x)
+    return (utils::has_overflow<9>(x)
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3336,12 +3397,12 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     typedef typename elfcpp::Swap<16, big_endian>::Valtype Valtype;
     Valtype* wv = reinterpret_cast<Valtype*>(view);
     Valtype val = elfcpp::Swap<16, big_endian>::readval(wv);
-    int32_t addend = Bits<11>::sign_extend32((val & 0x07ff) << 1);
+    int32_t addend = utils::sign_extend<11>((val & 0x07ff) << 1);
     int32_t x = (psymval->value(object, addend) - address);
     elfcpp::Swap<16, big_endian>::writeval(wv, ((val & 0xf800)
                                                 | ((x & 0x0ffe) >> 1)));
     // We do a 12-bit overflow check because x is right-shifted by 1 bit.
-    return (Bits<12>::has_overflow32(x)
+    return (utils::has_overflow<12>(x)
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3394,13 +3455,12 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
   {
     typedef typename elfcpp::Swap_unaligned<32, big_endian>::Valtype Valtype;
     Valtype val = elfcpp::Swap_unaligned<32, big_endian>::readval(view);
-    Valtype addend = Bits<31>::sign_extend32(val);
+    Valtype addend = utils::sign_extend<31>(val);
     Valtype x = (psymval->value(object, addend) | thumb_bit) - address;
-    val = Bits<32>::bit_select32(val, x, 0x7fffffffU);
+    val = utils::bit_select(val, x, 0x7fffffffU);
     elfcpp::Swap_unaligned<32, big_endian>::writeval(view, val);
-    return (Bits<31>::has_overflow32(x)
-	    ? This::STATUS_OVERFLOW
-	    : This::STATUS_OKAY);
+    return (utils::has_overflow<31>(x) ?
+	    This::STATUS_OVERFLOW : This::STATUS_OKAY);
   }
 
   // R_ARM_MOVW_ABS_NC: (S + A) | T	(relative address base is )
@@ -3423,7 +3483,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
 		 - relative_address_base);
     val = This::insert_val_arm_movw_movt(val, x);
     elfcpp::Swap<32, big_endian>::writeval(wv, val);
-    return ((check_overflow && Bits<16>::has_overflow32(x))
+    return ((check_overflow && utils::has_overflow<16>(x))
 	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3471,7 +3531,7 @@ class Arm_relocate_functions : public Relocate_functions<32, big_endian>
     val = This::insert_val_thumb_movw_movt(val, x);
     elfcpp::Swap<16, big_endian>::writeval(wv, val >> 16);
     elfcpp::Swap<16, big_endian>::writeval(wv + 1, val & 0xffff);
-    return ((check_overflow && Bits<16>::has_overflow32(x))
+    return ((check_overflow && utils::has_overflow<16>(x))
     	    ? This::STATUS_OVERFLOW
 	    : This::STATUS_OKAY);
   }
@@ -3903,7 +3963,7 @@ Arm_relocate_functions<big_endian>::arm_branch_common(
       return This::STATUS_OKAY;
     }
  
-  Valtype addend = Bits<26>::sign_extend32(val << 2);
+  Valtype addend = utils::sign_extend<26>(val << 2);
   Valtype branch_target = psymval->value(object, addend);
   int32_t branch_offset = branch_target - address;
 
@@ -3913,7 +3973,7 @@ Arm_relocate_functions<big_endian>::arm_branch_common(
   Reloc_stub* stub = NULL;
 
   if (!parameters->options().relocatable()
-      && (Bits<26>::has_overflow32(branch_offset)
+      && (utils::has_overflow<26>(branch_offset)
 	  || ((thumb_bit != 0)
 	      && !(may_use_blx && r_type == elfcpp::R_ARM_CALL))))
     {
@@ -3935,7 +3995,7 @@ Arm_relocate_functions<big_endian>::arm_branch_common(
 	  thumb_bit = stub->stub_template()->entry_in_thumb_mode() ? 1 : 0;
 	  branch_target = stub_table->address() + stub->offset() + addend;
 	  branch_offset = branch_target - address;
-	  gold_assert(!Bits<26>::has_overflow32(branch_offset));
+	  gold_assert(!utils::has_overflow<26>(branch_offset));
 	}
     }
 
@@ -3948,11 +4008,10 @@ Arm_relocate_functions<big_endian>::arm_branch_common(
       val = (val & 0xffffff) | 0xfa000000 | ((branch_offset & 2) << 23);
     }
 
-  val = Bits<32>::bit_select32(val, (branch_offset >> 2), 0xffffffUL);
+  val = utils::bit_select(val, (branch_offset >> 2), 0xffffffUL);
   elfcpp::Swap<32, big_endian>::writeval(wv, val);
-  return (Bits<26>::has_overflow32(branch_offset)
-	  ? This::STATUS_OVERFLOW
-	  : This::STATUS_OKAY);
+  return (utils::has_overflow<26>(branch_offset)
+	  ? This::STATUS_OVERFLOW : This::STATUS_OKAY);
 }
 
 // Relocate THUMB long branches.  This handles relocation types
@@ -4043,7 +4102,7 @@ Arm_relocate_functions<big_endian>::thumb_branch_common(
   // For BLX, bit 1 of target address comes from bit 1 of base address.
   bool may_use_blx = arm_target->may_use_v5t_interworking();
   if (thumb_bit == 0 && may_use_blx)
-    branch_target = Bits<32>::bit_select32(branch_target, address, 0x2);
+    branch_target = utils::bit_select(branch_target, address, 0x2);
 
   int32_t branch_offset = branch_target - address;
 
@@ -4051,8 +4110,8 @@ Arm_relocate_functions<big_endian>::thumb_branch_common(
   // to switch mode.
   bool thumb2 = arm_target->using_thumb2();
   if (!parameters->options().relocatable()
-      && ((!thumb2 && Bits<23>::has_overflow32(branch_offset))
-	  || (thumb2 && Bits<25>::has_overflow32(branch_offset))
+      && ((!thumb2 && utils::has_overflow<23>(branch_offset))
+	  || (thumb2 && utils::has_overflow<25>(branch_offset))
 	  || ((thumb_bit == 0)
 	      && (((r_type == elfcpp::R_ARM_THM_CALL) && !may_use_blx)
 		  || r_type == elfcpp::R_ARM_THM_JUMP24))))
@@ -4076,7 +4135,7 @@ Arm_relocate_functions<big_endian>::thumb_branch_common(
 	  thumb_bit = stub->stub_template()->entry_in_thumb_mode() ? 1 : 0;
 	  branch_target = stub_table->address() + stub->offset() + addend;
 	  if (thumb_bit == 0 && may_use_blx) 
-	    branch_target = Bits<32>::bit_select32(branch_target, address, 0x2);
+	    branch_target = utils::bit_select(branch_target, address, 0x2);
 	  branch_offset = branch_target - address;
 	}
     }
@@ -4113,11 +4172,11 @@ Arm_relocate_functions<big_endian>::thumb_branch_common(
   elfcpp::Swap<16, big_endian>::writeval(wv, upper_insn);
   elfcpp::Swap<16, big_endian>::writeval(wv + 1, lower_insn);
 
-  gold_assert(!Bits<25>::has_overflow32(branch_offset));
+  gold_assert(!utils::has_overflow<25>(branch_offset));
 
   return ((thumb2
-	   ? Bits<25>::has_overflow32(branch_offset)
-	   : Bits<23>::has_overflow32(branch_offset))
+	   ? utils::has_overflow<25>(branch_offset)
+	   : utils::has_overflow<23>(branch_offset))
 	  ? This::STATUS_OVERFLOW
 	  : This::STATUS_OKAY);
 }
@@ -4162,7 +4221,7 @@ Arm_relocate_functions<big_endian>::thm_jump19(
   elfcpp::Swap<16, big_endian>::writeval(wv, upper_insn);
   elfcpp::Swap<16, big_endian>::writeval(wv + 1, lower_insn);
 
-  return (Bits<21>::has_overflow32(branch_offset)
+  return (utils::has_overflow<21>(branch_offset)
 	  ? This::STATUS_OVERFLOW
 	  : This::STATUS_OKAY);
 }
@@ -4177,22 +4236,11 @@ Target_arm<big_endian>::got_section(Symbol_table* symtab, Layout* layout)
     {
       gold_assert(symtab != NULL && layout != NULL);
 
-      // When using -z now, we can treat .got as a relro section.
-      // Without -z now, it is modified after program startup by lazy
-      // PLT relocations.
-      bool is_got_relro = parameters->options().now();
-      Output_section_order got_order = (is_got_relro
-					? ORDER_RELRO_LAST
-					: ORDER_DATA);
-
-      // Unlike some targets (.e.g x86), ARM does not use separate .got and
-      // .got.plt sections in output.  The output .got section contains both
-      // PLT and non-PLT GOT entries.
       this->got_ = new Arm_output_data_got<big_endian>(symtab, layout);
 
       layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
 				      (elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE),
-				      this->got_, got_order, is_got_relro);
+				      this->got_, ORDER_DATA, false);
 
       // The old GNU linker creates a .got.plt section.  We just
       // create another set of data in the .got section.  Note that we
@@ -4201,7 +4249,7 @@ Target_arm<big_endian>::got_section(Symbol_table* symtab, Layout* layout)
       this->got_plt_ = new Output_data_space(4, "** GOT PLT");
       layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
 				      (elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE),
-				      this->got_plt_, got_order, is_got_relro);
+				      this->got_plt_, ORDER_DATA, false);
 
       // The first three entries are reserved.
       this->got_plt_->set_current_data_size(3 * 4);
@@ -4451,14 +4499,12 @@ Reloc_stub::stub_type_for_reloc(
     }
 
   int64_t branch_offset;
-  bool output_is_position_independent =
-      parameters->options().output_is_position_independent();
   if (r_type == elfcpp::R_ARM_THM_CALL || r_type == elfcpp::R_ARM_THM_JUMP24)
     {
       // For THUMB BLX instruction, bit 1 of target comes from bit 1 of the
       // base address (instruction address + 4).
       if ((r_type == elfcpp::R_ARM_THM_CALL) && may_use_blx && !target_is_thumb)
-	destination = Bits<32>::bit_select32(destination, location, 0x2);
+	destination = utils::bit_select(destination, location, 0x2);
       branch_offset = static_cast<int64_t>(destination) - location;
 	
       // Handle cases where:
@@ -4481,7 +4527,7 @@ Reloc_stub::stub_type_for_reloc(
 	      // Thumb to thumb.
 	      if (!thumb_only)
 		{
-		  stub_type = (output_is_position_independent
+		  stub_type = (parameters->options().shared()
 			       || should_force_pic_veneer)
 		    // PIC stubs.
 		    ? ((may_use_blx
@@ -4502,7 +4548,7 @@ Reloc_stub::stub_type_for_reloc(
 		}
 	      else
 		{
-		  stub_type = (output_is_position_independent
+		  stub_type = (parameters->options().shared()
 			       || should_force_pic_veneer)
 		    ? arm_stub_long_branch_thumb_only_pic	// PIC stub.
 		    : arm_stub_long_branch_thumb_only;	// non-PIC stub.
@@ -4515,7 +4561,7 @@ Reloc_stub::stub_type_for_reloc(
 	      // FIXME: We should check that the input section is from an
 	      // object that has interwork enabled.
 
-	      stub_type = (output_is_position_independent
+	      stub_type = (parameters->options().shared()
 			   || should_force_pic_veneer)
 		// PIC stubs.
 		? ((may_use_blx
@@ -4557,7 +4603,7 @@ Reloc_stub::stub_type_for_reloc(
 	      || (r_type == elfcpp::R_ARM_JUMP24)
 	      || (r_type == elfcpp::R_ARM_PLT32))
 	    {
-	      stub_type = (output_is_position_independent
+	      stub_type = (parameters->options().shared()
 			   || should_force_pic_veneer)
 		// PIC stubs.
 		? (may_use_blx
@@ -4576,7 +4622,7 @@ Reloc_stub::stub_type_for_reloc(
 	  if (branch_offset > ARM_MAX_FWD_BRANCH_OFFSET
 	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET))
 	    {
-	      stub_type = (output_is_position_independent
+	      stub_type = (parameters->options().shared()
 			   || should_force_pic_veneer)
 		? arm_stub_long_branch_any_arm_pic	// PIC stubs.
 		: arm_stub_long_branch_any_any;		/// non-PIC.
@@ -5231,7 +5277,7 @@ Arm_exidx_cantunwind::do_fixed_endian_write(Output_file* of)
   // or after the end of a text section.  The second word is the special
   // EXIDX_CANTUNWIND value.
   uint32_t prel31_offset = output_address - this->address();
-  if (Bits<31>::has_overflow32(offset))
+  if (utils::has_overflow<31>(offset))
     gold_error(_("PREL31 overflow in EXIDX_CANTUNWIND entry"));
   elfcpp::Swap_unaligned<32, big_endian>::writeval(oview,
 						   prel31_offset & 0x7fffffffU);
@@ -7004,7 +7050,7 @@ Stub_addend_reader<elfcpp::SHT_REL, big_endian>::operator()(
 	typedef typename elfcpp::Swap<32, big_endian>::Valtype Valtype;
 	const Valtype* wv = reinterpret_cast<const Valtype*>(view);
 	Valtype val = elfcpp::Swap<32, big_endian>::readval(wv);
-	return Bits<26>::sign_extend32(val << 2);
+	return utils::sign_extend<26>(val << 2);
       }
 
     case elfcpp::R_ARM_THM_CALL:
@@ -8328,9 +8374,7 @@ Target_arm<big_endian>::Scan::global(Symbol_table* symtab,
 	    Reloc_section* rel_dyn = target->rel_dyn_section(layout);
 	    if (gsym->is_from_dynobj()
 		|| gsym->is_undefined()
-		|| gsym->is_preemptible()
-		|| (gsym->visibility() == elfcpp::STV_PROTECTED
-		    && parameters->options().shared()))
+		|| gsym->is_preemptible())
 	      got->add_global_with_rel(gsym, GOT_TYPE_STANDARD,
 				       rel_dyn, elfcpp::R_ARM_GLOB_DAT);
 	    else
@@ -8538,7 +8582,7 @@ void
 Target_arm<big_endian>::do_finalize_sections(
     Layout* layout,
     const Input_objects* input_objects,
-    Symbol_table*)
+    Symbol_table* symtab)
 {
   bool merged_any_attributes = false;
   // Merge processor-specific flags.
@@ -8625,6 +8669,18 @@ Target_arm<big_endian>::do_finalize_sections(
       if (exidx_section != NULL
           && exidx_section->type() == elfcpp::SHT_ARM_EXIDX)
         {
+          // Create __exidx_start and __exidx_end symbols.
+          symtab->define_in_output_data("__exidx_start", NULL,
+                                        Symbol_table::PREDEFINED,
+                                        exidx_section, 0, 0, elfcpp::STT_OBJECT,
+                                        elfcpp::STB_GLOBAL, elfcpp::STV_HIDDEN,
+                                        0, false, true);
+          symtab->define_in_output_data("__exidx_end", NULL,
+                                        Symbol_table::PREDEFINED,
+                                        exidx_section, 0, 0, elfcpp::STT_OBJECT,
+                                        elfcpp::STB_GLOBAL, elfcpp::STV_HIDDEN,
+                                        0, true, true);
+
           // For the ARM target, we need to add a PT_ARM_EXIDX segment for
           // the .ARM.exidx section.
           if (!layout->script_options()->saw_phdrs_clause())
@@ -8638,6 +8694,19 @@ Target_arm<big_endian>::do_finalize_sections(
                                                            elfcpp::PF_R);
             }
         }
+      else
+        {
+          symtab->define_as_constant("__exidx_start", NULL,
+                                     Symbol_table::PREDEFINED,
+                                     0, 0, elfcpp::STT_OBJECT,
+                                     elfcpp::STB_GLOBAL, elfcpp::STV_HIDDEN, 0,
+                                     true, false);
+          symtab->define_as_constant("__exidx_end", NULL,
+                                     Symbol_table::PREDEFINED,
+                                     0, 0, elfcpp::STT_OBJECT,
+                                     elfcpp::STB_GLOBAL, elfcpp::STV_HIDDEN, 0,
+                                     true, false);
+        }
     }
 
   // Create an .ARM.attributes section if we have merged any attributes
@@ -11832,7 +11901,7 @@ Target_arm<big_endian>::apply_cortex_a8_workaround(
 	branch_offset = (branch_offset + 2) & ~3;
 
       // Put BRANCH_OFFSET back into the insn.
-      gold_assert(!Bits<25>::has_overflow32(branch_offset));
+      gold_assert(!utils::has_overflow<25>(branch_offset));
       upper_insn = RelocFuncs::thumb32_branch_upper(upper_insn, branch_offset);
       lower_insn = RelocFuncs::thumb32_branch_lower(lower_insn, branch_offset);
       break;
@@ -11925,61 +11994,6 @@ Target_arm<big_endian>::fix_exidx_coverage(
 				    merge_exidx_entries(), task);
 }
 
-template<bool big_endian>
-void
-Target_arm<big_endian>::do_define_standard_symbols(
-    Symbol_table* symtab,
-    Layout* layout)
-{
-  // Handle the .ARM.exidx section.
-  Output_section* exidx_section = layout->find_output_section(".ARM.exidx");
-
-  if (exidx_section != NULL)
-    {
-      // Create __exidx_start and __exidx_end symbols.
-      symtab->define_in_output_data("__exidx_start",
-				    NULL, // version
-				    Symbol_table::PREDEFINED,
-				    exidx_section,
-				    0, // value
-				    0, // symsize
-				    elfcpp::STT_NOTYPE,
-				    elfcpp::STB_GLOBAL,
-				    elfcpp::STV_HIDDEN,
-				    0, // nonvis
-				    false, // offset_is_from_end
-				    true); // only_if_ref
-
-      symtab->define_in_output_data("__exidx_end",
-				    NULL, // version
-				    Symbol_table::PREDEFINED,
-				    exidx_section,
-			 	    0, // value
-				    0, // symsize
-				    elfcpp::STT_NOTYPE,
-				    elfcpp::STB_GLOBAL,
-				    elfcpp::STV_HIDDEN,
-				    0, // nonvis
-				    true, // offset_is_from_end
-				    true); // only_if_ref
-    }
-  else
-    {
-      // Define __exidx_start and __exidx_end even when .ARM.exidx
-      // section is missing to match ld's behaviour.
-      symtab->define_as_constant("__exidx_start", NULL,
-                                 Symbol_table::PREDEFINED,
-                                 0, 0, elfcpp::STT_OBJECT,
-                                 elfcpp::STB_GLOBAL, elfcpp::STV_HIDDEN, 0,
-                                 true, false);
-      symtab->define_as_constant("__exidx_end", NULL,
-                                 Symbol_table::PREDEFINED,
-                                 0, 0, elfcpp::STT_OBJECT,
-                                 elfcpp::STB_GLOBAL, elfcpp::STV_HIDDEN, 0,
-                                 true, false);
-    }
-}
-
 Target_selector_arm<false> target_selector_arm;
 Target_selector_arm<true> target_selector_armbe;
 
diff --git a/gold/config.in b/gold/config.in
index 2854620ec9..86113763d9 100644
--- a/gold/config.in
+++ b/gold/config.in
@@ -165,12 +165,6 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
-/* Default library search path */
-#undef LIB_PATH
-
-/* Whether configured as a native linker */
-#undef NATIVE_LINKER
-
 /* Name of package */
 #undef PACKAGE
 
diff --git a/gold/configure b/gold/configure
index b1744a837b..e0a91f89dd 100755
--- a/gold/configure
+++ b/gold/configure
@@ -599,8 +599,6 @@ HAVE_ZLIB_FALSE
 HAVE_ZLIB_TRUE
 LIBOBJS
 LFS_CFLAGS
-GOLD_LDADD
-GOLD_LDFLAGS
 WARN_CXXFLAGS
 NO_WERROR
 WARN_CFLAGS
@@ -775,13 +773,10 @@ enable_gold
 enable_threads
 enable_plugins
 enable_targets
-with_lib_path
 enable_dependency_tracking
 enable_nls
 enable_werror
 enable_build_warnings
-with_gold_ldflags
-with_gold_ldadd
 enable_maintainer_mode
 '
       ac_precious_vars='build_alias
@@ -1436,9 +1431,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-sysroot=DIR    search for usr/lib et al within DIR
-  --with-lib-path=dir1:dir2...  set default LIB_PATH
-  --with-gold-ldflags=FLAGS  additional link flags for gold
-  --with-gold-ldadd=LIBS     additional libraries for gold
 
 Some influential environment variables:
   CC          C compiler command
@@ -3537,29 +3529,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-
-# Check whether --with-lib-path was given.
-if test "${with_lib_path+set}" = set; then :
-  withval=$with_lib_path; case "$withval" in
- yes) LIB_PATH='"/lib:/usr/lib"' ;;
- no) LIB_PATH='""' ;;
- *) LIB_PATH='"'"$withval"'"' ;;
- esac
-else
-  LIB_PATH='"::DEFAULT::"'
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define LIB_PATH $LIB_PATH
-_ACEOF
-
-if test "x$target_alias" = "x" -o "x$host_alias" = "x$target_alias"; then
-
-$as_echo "#define NATIVE_LINKER 1" >>confdefs.h
-
-fi
-
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nm; ac_word=$2
@@ -6312,20 +6281,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gold_cv_prog_gcc41" >&5
 $as_echo "$gold_cv_prog_gcc41" >&6; }
 
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -mcmodel=medium"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int i;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  have_mcmodel_medium=yes
-else
-  have_mcmodel_medium=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CFLAGS="$save_CFLAGS"
- if test "$target_cpu" = "x86_64" -a "$have_mcmodel_medium" = "yes" -a "$gold_cv_prog_gcc41" = "yes"; then
+ if test "$target_cpu" = "x86_64" -a "$gold_cv_prog_gcc41" = "yes"; then
   MCMODEL_MEDIUM_TRUE=
   MCMODEL_MEDIUM_FALSE='#'
 else
@@ -6437,16 +6393,10 @@ fi
 
 
 save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fpic -mtls-dialect=gnu2"
+CFLAGS="$CFLAGS -mtls-dialect=gnu2"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-__thread int i;
-void foo (void)
-{
-  i = 10;
-}
-
+int i;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   have_tls_gnu2=yes
@@ -6669,34 +6619,6 @@ fi
 WARN_CXXFLAGS=`echo ${WARN_CFLAGS} | sed -e 's/-Wstrict-prototypes//' -e 's/-Wmissing-prototypes//' -e 's/-Wshadow//'`
 
 
-
-# Check whether --with-gold-ldflags was given.
-if test "${with_gold_ldflags+set}" = set; then :
-  withval=$with_gold_ldflags; if test "$withval" = "no" -o "$withval" = "yes"; then
-   GOLD_LDFLAGS=
- else
-   GOLD_LDFLAGS=$withval
- fi
-else
-  GOLD_LDFLAGS=
-fi
-
-
-
-
-# Check whether --with-gold-ldadd was given.
-if test "${with_gold_ldadd+set}" = set; then :
-  withval=$with_gold_ldadd; if test "$withval" = "no" -o "$withval" = "yes"; then
-   GOLD_LDADD=
- else
-   GOLD_LDADD=$withval
- fi
-else
-  GOLD_LDADD=
-fi
-
-
-
 LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 
diff --git a/gold/configure.ac b/gold/configure.ac
index edc591737f..685e85bbbb 100644
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -238,20 +238,6 @@ AC_DEFINE_UNQUOTED(GOLD_DEFAULT_BIG_ENDIAN, $default_big_endian,
 AC_DEFINE_UNQUOTED(GOLD_DEFAULT_OSABI, $default_osabi,
 		   [Default OSABI code])
 
-AC_ARG_WITH(lib-path,
-[  --with-lib-path=dir1:dir2...  set default LIB_PATH],
-[case "$withval" in
- yes) LIB_PATH='"/lib:/usr/lib"' ;;
- no) LIB_PATH='""' ;;
- *) LIB_PATH='"'"$withval"'"' ;;
- esac],
-[LIB_PATH='"::DEFAULT::"'])
-AC_DEFINE_UNQUOTED(LIB_PATH, $LIB_PATH,
-		   [Default library search path])
-if test "x$target_alias" = "x" -o "x$host_alias" = "x$target_alias"; then
-  AC_DEFINE(NATIVE_LINKER, 1, [Whether configured as a native linker])
-fi
-
 AC_CHECK_TOOL(NM, nm)
 
 AC_PROG_CC
@@ -312,13 +298,9 @@ error
 #endif
 ], [gold_cv_prog_gcc41=yes], [gold_cv_prog_gcc41=no])])
 
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -mcmodel=medium"
-AC_COMPILE_IFELSE([int i;], [have_mcmodel_medium=yes], [have_mcmodel_medium=no])
-CFLAGS="$save_CFLAGS"
 dnl Whether we can test -mcmodel=medium.
 AM_CONDITIONAL(MCMODEL_MEDIUM,
-[test "$target_cpu" = "x86_64" -a "$have_mcmodel_medium" = "yes" -a "$gold_cv_prog_gcc41" = "yes"])
+[test "$target_cpu" = "x86_64" -a "$gold_cv_prog_gcc41" = "yes"])
 
 dnl Test for __thread support.
 AC_CACHE_CHECK([for thread support], [gold_cv_c_thread],
@@ -359,14 +341,8 @@ AM_CONDITIONAL(OMP_SUPPORT, test "$gold_cv_c_threadprivate" = "yes")
 
 dnl Test for the -ftls-dialect=gnu2 option.
 save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fpic -mtls-dialect=gnu2"
-AC_COMPILE_IFELSE([
-__thread int i;
-void foo (void)
-{
-  i = 10;
-}
-], [have_tls_gnu2=yes], [have_tls_gnu2=no])
+CFLAGS="$CFLAGS -mtls-dialect=gnu2"
+AC_COMPILE_IFELSE([int i;], [have_tls_gnu2=yes], [have_tls_gnu2=no])
 CFLAGS="$save_CFLAGS"
 AM_CONDITIONAL(TLS_GNU2_DIALECT, test "$have_tls_gnu2" = "yes")
 
@@ -433,26 +409,6 @@ AM_BINUTILS_WARNINGS
 WARN_CXXFLAGS=`echo ${WARN_CFLAGS} | sed -e 's/-Wstrict-prototypes//' -e 's/-Wmissing-prototypes//' -e 's/-Wshadow//'`
 AC_SUBST(WARN_CXXFLAGS)
 
-AC_ARG_WITH(gold-ldflags,
-[  --with-gold-ldflags=FLAGS  additional link flags for gold],
-[if test "$withval" = "no" -o "$withval" = "yes"; then
-   GOLD_LDFLAGS=
- else
-   GOLD_LDFLAGS=$withval
- fi],
-[GOLD_LDFLAGS=])
-AC_SUBST(GOLD_LDFLAGS)
-
-AC_ARG_WITH(gold-ldadd,
-[  --with-gold-ldadd=LIBS     additional libraries for gold],
-[if test "$withval" = "no" -o "$withval" = "yes"; then
-   GOLD_LDADD=
- else
-   GOLD_LDADD=$withval
- fi],
-[GOLD_LDADD=])
-AC_SUBST(GOLD_LDADD)
-
 dnl Force support for large files by default.  This may need to be
 dnl host dependent.  If build == host, we can check getconf LFS_CFLAGS.
 LFS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
diff --git a/gold/copy-relocs.cc b/gold/copy-relocs.cc
index 92c5aeaad3..20b110dba2 100644
--- a/gold/copy-relocs.cc
+++ b/gold/copy-relocs.cc
@@ -1,6 +1,6 @@
 // copy-relocs.cc -- handle COPY relocations for gold.
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -41,10 +41,10 @@ Copy_relocs<sh_type, size, big_endian>::Copy_reloc_entry::emit(
   // emitted a COPY relocation, and we do not want to emit this
   // dynamic relocation.
   if (this->sym_->is_from_dynobj())
-    reloc_section->add_global_generic(this->sym_, this->reloc_type_,
-				      this->output_section_, this->relobj_,
-				      this->shndx_, this->address_,
-				      this->addend_);
+    reloc_section->add_global(this->sym_, this->reloc_type_,
+			      this->output_section_, this->relobj_,
+			      this->shndx_, this->address_,
+			      this->addend_);
 }
 
 // Copy_relocs methods.
@@ -115,8 +115,7 @@ Copy_relocs<sh_type, size, big_endian>::emit_copy_reloc(
   symtab->define_with_copy_reloc(sym, posd, offset);
 
   // Add the COPY relocation to the dynamic reloc section.
-  reloc_section->add_global_generic(sym, this->copy_reloc_type_, posd,
-				    offset, 0);
+  reloc_section->add_global(sym, this->copy_reloc_type_, posd, offset, 0);
 }
 
 // Make a COPY relocation for SYM and emit it.
diff --git a/gold/dirsearch.cc b/gold/dirsearch.cc
index a6114a442d..1ae2055dc4 100644
--- a/gold/dirsearch.cc
+++ b/gold/dirsearch.cc
@@ -25,7 +25,6 @@
 #include <cerrno>
 #include <cstring>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 
 #include "debug.h"
@@ -278,28 +277,4 @@ Dirsearch::find(const std::vector<std::string>& names,
   return std::string();
 }
 
-// Search for a file in a directory list.  This is a low-level function and
-// therefore can be used before options and parameters are set.
-
-std::string
-Dirsearch::find_file_in_dir_list(const std::string& name,
-                                 const General_options::Dir_list& directories,
-                                 const std::string& extra_search_dir)
-{
-  struct stat buf;
-  std::string extra_name = extra_search_dir + '/' + name;
-
-  if (stat(extra_name.c_str(), &buf) == 0)
-    return extra_name;
-  for (General_options::Dir_list::const_iterator dir = directories.begin();
-       dir != directories.end();
-       ++dir)
-    {
-      std::string full_name = dir->name() + '/' + name;
-      if (stat(full_name.c_str(), &buf) == 0)
-        return full_name;
-    }
-  return name;
-}
-
 } // End namespace gold.
diff --git a/gold/dirsearch.h b/gold/dirsearch.h
index ebc0b5b392..270cef6d8f 100644
--- a/gold/dirsearch.h
+++ b/gold/dirsearch.h
@@ -67,13 +67,6 @@ class Dirsearch
   token()
   { return &this->token_; }
 
-  // Search for a file in a directory list.  This is a low-level function and
-  // therefore can be used before options and parameters are set.
-  static std::string
-  find_file_in_dir_list(const std::string& name,
-                        const General_options::Dir_list& directories,
-                        const std::string& extra_search_dir);
-
  private:
   // We can not copy this class.
   Dirsearch(const Dirsearch&);
diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc
index eaf35bfdfa..3dc33e4e10 100644
--- a/gold/dwarf_reader.cc
+++ b/gold/dwarf_reader.cc
@@ -1,6 +1,6 @@
 // dwarf_reader.cc -- parse dwarf2/3 debug information
 
-// Copyright 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+// Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -36,1367 +36,6 @@
 
 namespace gold {
 
-// Class Sized_elf_reloc_mapper
-
-// Initialize the relocation tracker for section RELOC_SHNDX.
-
-template<int size, bool big_endian>
-bool
-Sized_elf_reloc_mapper<size, big_endian>::do_initialize(
-    unsigned int reloc_shndx, unsigned int reloc_type)
-{
-  this->reloc_type_ = reloc_type;
-  return this->track_relocs_.initialize(this->object_, reloc_shndx,
-					reloc_type);
-}
-
-// Looks in the symtab to see what section a symbol is in.
-
-template<int size, bool big_endian>
-unsigned int
-Sized_elf_reloc_mapper<size, big_endian>::symbol_section(
-    unsigned int symndx, Address* value, bool* is_ordinary)
-{
-  const int symsize = elfcpp::Elf_sizes<size>::sym_size;
-  gold_assert((symndx + 1) * symsize <= this->symtab_size_);
-  elfcpp::Sym<size, big_endian> elfsym(this->symtab_ + symndx * symsize);
-  *value = elfsym.get_st_value();
-  return this->object_->adjust_sym_shndx(symndx, elfsym.get_st_shndx(),
-					 is_ordinary);
-}
-
-// Return the section index and offset within the section of
-// the target of the relocation for RELOC_OFFSET.
-
-template<int size, bool big_endian>
-unsigned int
-Sized_elf_reloc_mapper<size, big_endian>::do_get_reloc_target(
-    off_t reloc_offset, off_t* target_offset)
-{
-  this->track_relocs_.advance(reloc_offset);
-  if (reloc_offset != this->track_relocs_.next_offset())
-    return 0;
-  unsigned int symndx = this->track_relocs_.next_symndx();
-  typename elfcpp::Elf_types<size>::Elf_Addr value;
-  bool is_ordinary;
-  unsigned int target_shndx = this->symbol_section(symndx, &value,
-						   &is_ordinary);
-  if (!is_ordinary)
-    return 0;
-  if (this->reloc_type_ == elfcpp::SHT_RELA)
-    value += this->track_relocs_.next_addend();
-  *target_offset = value;
-  return target_shndx;
-}
-
-static inline Elf_reloc_mapper*
-make_elf_reloc_mapper(Object* object, const unsigned char* symtab,
-		      off_t symtab_size)
-{
-  switch (parameters->size_and_endianness())
-    {
-#ifdef HAVE_TARGET_32_LITTLE
-      case Parameters::TARGET_32_LITTLE:
-	return new Sized_elf_reloc_mapper<32, false>(object, symtab,
-						     symtab_size);
-#endif
-#ifdef HAVE_TARGET_32_BIG
-      case Parameters::TARGET_32_BIG:
-	return new Sized_elf_reloc_mapper<32, true>(object, symtab,
-						    symtab_size);
-#endif
-#ifdef HAVE_TARGET_64_LITTLE
-      case Parameters::TARGET_64_LITTLE:
-	return new Sized_elf_reloc_mapper<64, false>(object, symtab,
-						     symtab_size);
-#endif
-#ifdef HAVE_TARGET_64_BIG
-      case Parameters::TARGET_64_BIG:
-	return new Sized_elf_reloc_mapper<64, true>(object, symtab,
-						    symtab_size);
-#endif
-      default:
-	gold_unreachable();
-    }
-}
-
-// class Dwarf_abbrev_table
-
-void
-Dwarf_abbrev_table::clear_abbrev_codes()
-{
-  for (unsigned int code = 0; code < this->low_abbrev_code_max_; ++code)
-    {
-      if (this->low_abbrev_codes_[code] != NULL)
-	{
-	  delete this->low_abbrev_codes_[code];
-	  this->low_abbrev_codes_[code] = NULL;
-	}
-    }
-  for (Abbrev_code_table::iterator it = this->high_abbrev_codes_.begin();
-       it != this->high_abbrev_codes_.end();
-       ++it)
-    {
-      if (it->second != NULL)
-	delete it->second;
-    }
-  this->high_abbrev_codes_.clear();
-}
-
-// Read the abbrev table from an object file.
-
-bool
-Dwarf_abbrev_table::do_read_abbrevs(
-    Relobj* object,
-    unsigned int abbrev_shndx,
-    off_t abbrev_offset)
-{
-  this->clear_abbrev_codes();
-
-  // If we don't have relocations, abbrev_shndx will be 0, and
-  // we'll have to hunt for the .debug_abbrev section.
-  if (abbrev_shndx == 0 && this->abbrev_shndx_ > 0)
-    abbrev_shndx = this->abbrev_shndx_;
-  else if (abbrev_shndx == 0)
-    {
-      for (unsigned int i = 1; i < object->shnum(); ++i)
-	{
-	  std::string name = object->section_name(i);
-	  if (name == ".debug_abbrev")
-	    {
-	      abbrev_shndx = i;
-	      // Correct the offset.  For incremental update links, we have a
-	      // relocated offset that is relative to the output section, but
-	      // here we need an offset relative to the input section.
-	      abbrev_offset -= object->output_section_offset(i);
-	      break;
-	    }
-	}
-      if (abbrev_shndx == 0)
-	return false;
-    }
-
-  // Get the section contents and decompress if necessary.
-  if (abbrev_shndx != this->abbrev_shndx_)
-    {
-      if (this->owns_buffer_ && this->buffer_ != NULL)
-        {
-	  delete[] this->buffer_;
-	  this->owns_buffer_ = false;
-        }
-
-      section_size_type buffer_size;
-      this->buffer_ =
-	  object->decompressed_section_contents(abbrev_shndx,
-						&buffer_size,
-						&this->owns_buffer_);
-      this->buffer_end_ = this->buffer_ + buffer_size;
-      this->abbrev_shndx_ = abbrev_shndx;
-    }
-
-  this->buffer_pos_ = this->buffer_ + abbrev_offset;
-  return true;
-}
-
-// Lookup the abbrev code entry for CODE.  This function is called
-// only when the abbrev code is not in the direct lookup table.
-// It may be in the hash table, it may not have been read yet,
-// or it may not exist in the abbrev table.
-
-const Dwarf_abbrev_table::Abbrev_code*
-Dwarf_abbrev_table::do_get_abbrev(unsigned int code)
-{
-  // See if the abbrev code is already in the hash table.
-  Abbrev_code_table::const_iterator it = this->high_abbrev_codes_.find(code);
-  if (it != this->high_abbrev_codes_.end())
-    return it->second;
-
-  // Read and store abbrev code definitions until we find the
-  // one we're looking for.
-  for (;;)
-    {
-      // Read the abbrev code.  A zero here indicates the end of the
-      // abbrev table.
-      size_t len;
-      if (this->buffer_pos_ >= this->buffer_end_)
-	return NULL;
-      uint64_t nextcode = read_unsigned_LEB_128(this->buffer_pos_, &len);
-      if (nextcode == 0)
-	{
-	  this->buffer_pos_ = this->buffer_end_;
-	  return NULL;
-	}
-      this->buffer_pos_ += len;
-
-      // Read the tag.
-      if (this->buffer_pos_ >= this->buffer_end_)
-	return NULL;
-      uint64_t tag = read_unsigned_LEB_128(this->buffer_pos_, &len);
-      this->buffer_pos_ += len;
-
-      // Read the has_children flag.
-      if (this->buffer_pos_ >= this->buffer_end_)
-	return NULL;
-      bool has_children = *this->buffer_pos_ == elfcpp::DW_CHILDREN_yes;
-      this->buffer_pos_ += 1;
-
-      // Read the list of (attribute, form) pairs.
-      Abbrev_code* entry = new Abbrev_code(tag, has_children);
-      for (;;)
-	{
-	  // Read the attribute.
-	  if (this->buffer_pos_ >= this->buffer_end_)
-	    return NULL;
-	  uint64_t attr = read_unsigned_LEB_128(this->buffer_pos_, &len);
-	  this->buffer_pos_ += len;
-
-	  // Read the form.
-	  if (this->buffer_pos_ >= this->buffer_end_)
-	    return NULL;
-	  uint64_t form = read_unsigned_LEB_128(this->buffer_pos_, &len);
-	  this->buffer_pos_ += len;
-
-	  // A (0,0) pair terminates the list.
-	  if (attr == 0 && form == 0)
-	    break;
-
-	  if (attr == elfcpp::DW_AT_sibling)
-	    entry->has_sibling_attribute = true;
-
-	  entry->add_attribute(attr, form);
-	}
-
-      this->store_abbrev(nextcode, entry);
-      if (nextcode == code)
-	return entry;
-    }
-
-  return NULL;
-}
-
-// class Dwarf_ranges_table
-
-// Read the ranges table from an object file.
-
-bool
-Dwarf_ranges_table::read_ranges_table(
-    Relobj* object,
-    const unsigned char* symtab,
-    off_t symtab_size,
-    unsigned int ranges_shndx)
-{
-  // If we've already read this abbrev table, return immediately.
-  if (this->ranges_shndx_ > 0
-      && this->ranges_shndx_ == ranges_shndx)
-    return true;
-
-  // If we don't have relocations, ranges_shndx will be 0, and
-  // we'll have to hunt for the .debug_ranges section.
-  if (ranges_shndx == 0 && this->ranges_shndx_ > 0)
-    ranges_shndx = this->ranges_shndx_;
-  else if (ranges_shndx == 0)
-    {
-      for (unsigned int i = 1; i < object->shnum(); ++i)
-	{
-	  std::string name = object->section_name(i);
-	  if (name == ".debug_ranges")
-	    {
-	      ranges_shndx = i;
-	      this->output_section_offset_ = object->output_section_offset(i);
-	      break;
-	    }
-	}
-      if (ranges_shndx == 0)
-	return false;
-    }
-
-  // Get the section contents and decompress if necessary.
-  if (ranges_shndx != this->ranges_shndx_)
-    {
-      if (this->owns_ranges_buffer_ && this->ranges_buffer_ != NULL)
-        {
-	  delete[] this->ranges_buffer_;
-	  this->owns_ranges_buffer_ = false;
-        }
-
-      section_size_type buffer_size;
-      this->ranges_buffer_ =
-	  object->decompressed_section_contents(ranges_shndx,
-						&buffer_size,
-						&this->owns_ranges_buffer_);
-      this->ranges_buffer_end_ = this->ranges_buffer_ + buffer_size;
-      this->ranges_shndx_ = ranges_shndx;
-    }
-
-  if (this->ranges_reloc_mapper_ != NULL)
-    {
-      delete this->ranges_reloc_mapper_;
-      this->ranges_reloc_mapper_ = NULL;
-    }
-
-  // For incremental objects, we have no relocations.
-  if (object->is_incremental())
-    return true;
-
-  // Find the relocation section for ".debug_ranges".
-  unsigned int reloc_shndx = 0;
-  unsigned int reloc_type = 0;
-  for (unsigned int i = 0; i < object->shnum(); ++i)
-    {
-      reloc_type = object->section_type(i);
-      if ((reloc_type == elfcpp::SHT_REL
-	   || reloc_type == elfcpp::SHT_RELA)
-	  && object->section_info(i) == ranges_shndx)
-	{
-	  reloc_shndx = i;
-	  break;
-	}
-    }
-
-  this->ranges_reloc_mapper_ = make_elf_reloc_mapper(object, symtab,
-						     symtab_size);
-  this->ranges_reloc_mapper_->initialize(reloc_shndx, reloc_type);
-
-  return true;
-}
-
-// Read a range list from section RANGES_SHNDX at offset RANGES_OFFSET.
-
-Dwarf_range_list*
-Dwarf_ranges_table::read_range_list(
-    Relobj* object,
-    const unsigned char* symtab,
-    off_t symtab_size,
-    unsigned int addr_size,
-    unsigned int ranges_shndx,
-    off_t offset)
-{
-  Dwarf_range_list* ranges;
-
-  if (!this->read_ranges_table(object, symtab, symtab_size, ranges_shndx))
-    return NULL;
-
-  // Correct the offset.  For incremental update links, we have a
-  // relocated offset that is relative to the output section, but
-  // here we need an offset relative to the input section.
-  offset -= this->output_section_offset_;
-
-  // Read the range list at OFFSET.
-  ranges = new Dwarf_range_list();
-  off_t base = 0;
-  for (;
-       this->ranges_buffer_ + offset < this->ranges_buffer_end_;
-       offset += 2 * addr_size)
-    {
-      off_t start;
-      off_t end;
-
-      // Read the raw contents of the section.
-      if (addr_size == 4)
-	{
-	  start = read_from_pointer<32>(this->ranges_buffer_ + offset);
-	  end = read_from_pointer<32>(this->ranges_buffer_ + offset + 4);
-	}
-      else
-	{
-	  start = read_from_pointer<64>(this->ranges_buffer_ + offset);
-	  end = read_from_pointer<64>(this->ranges_buffer_ + offset + 8);
-	}
-
-      // Check for relocations and adjust the values.
-      unsigned int shndx1 = 0;
-      unsigned int shndx2 = 0;
-      if (this->ranges_reloc_mapper_ != NULL)
-        {
-	  shndx1 =
-	      this->ranges_reloc_mapper_->get_reloc_target(offset, &start);
-	  shndx2 =
-	      this->ranges_reloc_mapper_->get_reloc_target(offset + addr_size,
-							   &end);
-        }
-
-      // End of list is marked by a pair of zeroes.
-      if (shndx1 == 0 && start == 0 && end == 0)
-        break;
-
-      // A "base address selection entry" is identified by
-      // 0xffffffff for the first value of the pair.  The second
-      // value is used as a base for subsequent range list entries.
-      if (shndx1 == 0 && start == -1)
-	base = end;
-      else if (shndx1 == shndx2)
-	{
-	  if (shndx1 == 0 || object->is_section_included(shndx1))
-	    ranges->add(shndx1, base + start, base + end);
-	}
-      else
-	gold_warning(_("%s: DWARF info may be corrupt; offsets in a "
-		       "range list entry are in different sections"),
-		     object->name().c_str());
-    }
-
-  return ranges;
-}
-
-// class Dwarf_pubnames_table
-
-// Read the pubnames section SHNDX from the object file.
-
-bool
-Dwarf_pubnames_table::read_section(Relobj* object, unsigned int shndx)
-{
-  section_size_type buffer_size;
-
-  // If we don't have relocations, shndx will be 0, and
-  // we'll have to hunt for the .debug_pubnames/pubtypes section.
-  if (shndx == 0)
-    {
-      const char* name = (this->is_pubtypes_
-			  ? ".debug_pubtypes"
-			  : ".debug_pubnames");
-      for (unsigned int i = 1; i < object->shnum(); ++i)
-	{
-	  if (object->section_name(i) == name)
-	    {
-	      shndx = i;
-	      this->output_section_offset_ = object->output_section_offset(i);
-	      break;
-	    }
-	}
-      if (shndx == 0)
-	return false;
-    }
-
-  this->buffer_ = object->decompressed_section_contents(shndx,
-							&buffer_size,
-							&this->owns_buffer_);
-  if (this->buffer_ == NULL)
-    return false;
-  this->buffer_end_ = this->buffer_ + buffer_size;
-  return true;
-}
-
-// Read the header for the set at OFFSET.
-
-bool
-Dwarf_pubnames_table::read_header(off_t offset)
-{
-  // Correct the offset.  For incremental update links, we have a
-  // relocated offset that is relative to the output section, but
-  // here we need an offset relative to the input section.
-  offset -= this->output_section_offset_;
-
-  if (offset < 0 || offset + 14 >= this->buffer_end_ - this->buffer_)
-    return false;
-
-  const unsigned char* pinfo = this->buffer_ + offset;
-
-  // Read the unit_length field.
-  uint32_t unit_length = read_from_pointer<32>(pinfo);
-  pinfo += 4;
-  if (unit_length == 0xffffffff)
-    {
-      unit_length = read_from_pointer<64>(pinfo);
-      pinfo += 8;
-      this->offset_size_ = 8;
-    }
-  else
-    this->offset_size_ = 4;
-
-  // Check the version.
-  unsigned int version = read_from_pointer<16>(pinfo);
-  pinfo += 2;
-  if (version != 2)
-    return false;
-  
-  // Skip the debug_info_offset and debug_info_size fields.
-  pinfo += 2 * this->offset_size_;
-
-  if (pinfo >= this->buffer_end_)
-    return false;
-
-  this->pinfo_ = pinfo;
-  return true;
-}
-
-// Read the next name from the set.
-
-const char*
-Dwarf_pubnames_table::next_name()
-{
-  const unsigned char* pinfo = this->pinfo_;
-
-  // Read the offset within the CU.  If this is zero, we have reached
-  // the end of the list.
-  uint32_t offset;
-  if (this->offset_size_ == 4)
-    offset = read_from_pointer<32>(&pinfo);
-  else
-    offset = read_from_pointer<64>(&pinfo);
-  if (offset == 0)
-    return NULL;
-
-  // Return a pointer to the string at the current location,
-  // and advance the pointer to the next entry.
-  const char* ret = reinterpret_cast<const char*>(pinfo);
-  while (pinfo < this->buffer_end_ && *pinfo != '\0')
-    ++pinfo;
-  if (pinfo < this->buffer_end_)
-    ++pinfo;
-
-  this->pinfo_ = pinfo;
-  return ret;
-}
-
-// class Dwarf_die
-
-Dwarf_die::Dwarf_die(
-    Dwarf_info_reader* dwinfo,
-    off_t die_offset,
-    Dwarf_die* parent)
-  : dwinfo_(dwinfo), parent_(parent), die_offset_(die_offset),
-    child_offset_(0), sibling_offset_(0), abbrev_code_(NULL), attributes_(),
-    attributes_read_(false), name_(NULL), name_off_(-1), linkage_name_(NULL),
-    linkage_name_off_(-1), string_shndx_(0), specification_(0),
-    abstract_origin_(0)
-{
-  size_t len;
-  const unsigned char* pdie = dwinfo->buffer_at_offset(die_offset);
-  if (pdie == NULL)
-    return;
-  unsigned int code = read_unsigned_LEB_128(pdie, &len);
-  if (code == 0)
-    {
-      if (parent != NULL)
-	parent->set_sibling_offset(die_offset + len);
-      return;
-    }
-  this->attr_offset_ = len;
-
-  // Lookup the abbrev code in the abbrev table.
-  this->abbrev_code_ = dwinfo->get_abbrev(code);
-}
-
-// Read all the attributes of the DIE.
-
-bool
-Dwarf_die::read_attributes()
-{
-  if (this->attributes_read_)
-    return true;
-
-  gold_assert(this->abbrev_code_ != NULL);
-
-  const unsigned char* pdie =
-      this->dwinfo_->buffer_at_offset(this->die_offset_);
-  if (pdie == NULL)
-    return false;
-  const unsigned char* pattr = pdie + this->attr_offset_;
-
-  unsigned int nattr = this->abbrev_code_->attributes.size();
-  this->attributes_.reserve(nattr);
-  for (unsigned int i = 0; i < nattr; ++i)
-    {
-      size_t len;
-      unsigned int attr = this->abbrev_code_->attributes[i].attr;
-      unsigned int form = this->abbrev_code_->attributes[i].form;
-      if (form == elfcpp::DW_FORM_indirect)
-        {
-          form = read_unsigned_LEB_128(pattr, &len);
-          pattr += len;
-        }
-      off_t attr_off = this->die_offset_ + (pattr - pdie);
-      bool ref_form = false;
-      Attribute_value attr_value;
-      attr_value.attr = attr;
-      attr_value.form = form;
-      attr_value.aux.shndx = 0;
-      switch(form)
-	{
-	  case elfcpp::DW_FORM_null:
-	    attr_value.val.intval = 0;
-	    break;
-	  case elfcpp::DW_FORM_flag_present:
-	    attr_value.val.intval = 1;
-	    break;
-	  case elfcpp::DW_FORM_strp:
-	    {
-	      off_t str_off;
-	      if (this->dwinfo_->offset_size() == 4)
-		str_off = read_from_pointer<32>(&pattr);
-	      else
-		str_off = read_from_pointer<64>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &str_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.refval = str_off;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_sec_offset:
-	    {
-	      off_t sec_off;
-	      if (this->dwinfo_->offset_size() == 4)
-		sec_off = read_from_pointer<32>(&pattr);
-	      else
-		sec_off = read_from_pointer<64>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &sec_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.refval = sec_off;
-	      ref_form = true;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_addr:
-	  case elfcpp::DW_FORM_ref_addr:
-	    {
-	      off_t sec_off;
-	      if (this->dwinfo_->address_size() == 4)
-		sec_off = read_from_pointer<32>(&pattr);
-	      else
-		sec_off = read_from_pointer<64>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &sec_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.refval = sec_off;
-	      ref_form = true;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_block1:
-	    attr_value.aux.blocklen = *pattr++;
-	    attr_value.val.blockval = pattr;
-	    pattr += attr_value.aux.blocklen;
-	    break;
-	  case elfcpp::DW_FORM_block2:
-	    attr_value.aux.blocklen = read_from_pointer<16>(&pattr);
-	    attr_value.val.blockval = pattr;
-	    pattr += attr_value.aux.blocklen;
-	    break;
-	  case elfcpp::DW_FORM_block4:
-	    attr_value.aux.blocklen = read_from_pointer<32>(&pattr);
-	    attr_value.val.blockval = pattr;
-	    pattr += attr_value.aux.blocklen;
-	    break;
-	  case elfcpp::DW_FORM_block:
-	  case elfcpp::DW_FORM_exprloc:
-	    attr_value.aux.blocklen = read_unsigned_LEB_128(pattr, &len);
-	    attr_value.val.blockval = pattr + len;
-	    pattr += len + attr_value.aux.blocklen;
-	    break;
-	  case elfcpp::DW_FORM_data1:
-	  case elfcpp::DW_FORM_flag:
-	    attr_value.val.intval = *pattr++;
-	    break;
-	  case elfcpp::DW_FORM_ref1:
-	    attr_value.val.refval = *pattr++;
-	    ref_form = true;
-	    break;
-	  case elfcpp::DW_FORM_data2:
-	    attr_value.val.intval = read_from_pointer<16>(&pattr);
-	    break;
-	  case elfcpp::DW_FORM_ref2:
-	    attr_value.val.refval = read_from_pointer<16>(&pattr);
-	    ref_form = true;
-	    break;
-	  case elfcpp::DW_FORM_data4:
-	    {
-	      off_t sec_off;
-	      sec_off = read_from_pointer<32>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &sec_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.intval = sec_off;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_ref4:
-	    {
-	      off_t sec_off;
-	      sec_off = read_from_pointer<32>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &sec_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.refval = sec_off;
-	      ref_form = true;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_data8:
-	    {
-	      off_t sec_off;
-	      sec_off = read_from_pointer<64>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &sec_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.intval = sec_off;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_ref_sig8:
-	    attr_value.val.uintval = read_from_pointer<64>(&pattr);
-	    break;
-	  case elfcpp::DW_FORM_ref8:
-	    {
-	      off_t sec_off;
-	      sec_off = read_from_pointer<64>(&pattr);
-	      unsigned int shndx =
-		  this->dwinfo_->lookup_reloc(attr_off, &sec_off);
-	      attr_value.aux.shndx = shndx;
-	      attr_value.val.refval = sec_off;
-	      ref_form = true;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_ref_udata:
-	    attr_value.val.refval = read_unsigned_LEB_128(pattr, &len);
-	    ref_form = true;
-	    pattr += len;
-	    break;
-	  case elfcpp::DW_FORM_udata:
-	    attr_value.val.uintval = read_unsigned_LEB_128(pattr, &len);
-	    pattr += len;
-	    break;
-	  case elfcpp::DW_FORM_sdata:
-	    attr_value.val.intval = read_signed_LEB_128(pattr, &len);
-	    pattr += len;
-	    break;
-	  case elfcpp::DW_FORM_string:
-	    attr_value.val.stringval = reinterpret_cast<const char*>(pattr);
-	    len = strlen(attr_value.val.stringval);
-	    pattr += len + 1;
-	    break;
-	  default:
-	    return false;
-	}
-
-      // Cache the most frequently-requested attributes.
-      switch (attr)
-	{
-	  case elfcpp::DW_AT_name:
-	    if (form == elfcpp::DW_FORM_string)
-	      this->name_ = attr_value.val.stringval;
-	    else if (form == elfcpp::DW_FORM_strp)
-	      {
-		// All indirect strings should refer to the same
-		// string section, so we just save the last one seen.
-		this->string_shndx_ = attr_value.aux.shndx;
-		this->name_off_ = attr_value.val.refval;
-	      }
-	    break;
-	  case elfcpp::DW_AT_linkage_name:
-	  case elfcpp::DW_AT_MIPS_linkage_name:
-	    if (form == elfcpp::DW_FORM_string)
-	      this->linkage_name_ = attr_value.val.stringval;
-	    else if (form == elfcpp::DW_FORM_strp)
-	      {
-		// All indirect strings should refer to the same
-		// string section, so we just save the last one seen.
-		this->string_shndx_ = attr_value.aux.shndx;
-		this->linkage_name_off_ = attr_value.val.refval;
-	      }
-	    break;
-	  case elfcpp::DW_AT_specification:
-	    if (ref_form)
-	      this->specification_ = attr_value.val.refval;
-	    break;
-	  case elfcpp::DW_AT_abstract_origin:
-	    if (ref_form)
-	      this->abstract_origin_ = attr_value.val.refval;
-	    break;
-	  case elfcpp::DW_AT_sibling:
-	    if (ref_form && attr_value.aux.shndx == 0)
-	      this->sibling_offset_ = attr_value.val.refval;
-	  default:
-	    break;
-	}
-
-      this->attributes_.push_back(attr_value);
-    }
-
-  // Now that we know where the next DIE begins, record the offset
-  // to avoid later recalculation.
-  if (this->has_children())
-    this->child_offset_ = this->die_offset_ + (pattr - pdie);
-  else
-    this->sibling_offset_ = this->die_offset_ + (pattr - pdie);
-
-  this->attributes_read_ = true;
-  return true;
-}
-
-// Skip all the attributes of the DIE and return the offset of the next DIE.
-
-off_t
-Dwarf_die::skip_attributes()
-{
-  typedef Dwarf_abbrev_table::Attribute Attribute;
-
-  gold_assert(this->abbrev_code_ != NULL);
-
-  const unsigned char* pdie =
-      this->dwinfo_->buffer_at_offset(this->die_offset_);
-  if (pdie == NULL)
-    return 0;
-  const unsigned char* pattr = pdie + this->attr_offset_;
-
-  for (unsigned int i = 0; i < this->abbrev_code_->attributes.size(); ++i)
-    {
-      size_t len;
-      unsigned int form = this->abbrev_code_->attributes[i].form;
-      if (form == elfcpp::DW_FORM_indirect)
-        {
-          form = read_unsigned_LEB_128(pattr, &len);
-          pattr += len;
-        }
-      switch(form)
-	{
-	  case elfcpp::DW_FORM_null:
-	  case elfcpp::DW_FORM_flag_present:
-	    break;
-	  case elfcpp::DW_FORM_strp:
-	  case elfcpp::DW_FORM_sec_offset:
-	    pattr += this->dwinfo_->offset_size();
-	    break;
-	  case elfcpp::DW_FORM_addr:
-	  case elfcpp::DW_FORM_ref_addr:
-	    pattr += this->dwinfo_->address_size();
-	    break;
-	  case elfcpp::DW_FORM_block1:
-	    pattr += 1 + *pattr;
-	    break;
-	  case elfcpp::DW_FORM_block2:
-	    {
-	      uint16_t block_size;
-	      block_size = read_from_pointer<16>(&pattr);
-	      pattr += block_size;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_block4:
-	    {
-	      uint32_t block_size;
-	      block_size = read_from_pointer<32>(&pattr);
-	      pattr += block_size;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_block:
-	  case elfcpp::DW_FORM_exprloc:
-	    {
-	      uint64_t block_size;
-	      block_size = read_unsigned_LEB_128(pattr, &len);
-	      pattr += len + block_size;
-	      break;
-	    }
-	  case elfcpp::DW_FORM_data1:
-	  case elfcpp::DW_FORM_ref1:
-	  case elfcpp::DW_FORM_flag:
-	    pattr += 1;
-	    break;
-	  case elfcpp::DW_FORM_data2:
-	  case elfcpp::DW_FORM_ref2:
-	    pattr += 2;
-	    break;
-	  case elfcpp::DW_FORM_data4:
-	  case elfcpp::DW_FORM_ref4:
-	    pattr += 4;
-	    break;
-	  case elfcpp::DW_FORM_data8:
-	  case elfcpp::DW_FORM_ref8:
-	  case elfcpp::DW_FORM_ref_sig8:
-	    pattr += 8;
-	    break;
-	  case elfcpp::DW_FORM_ref_udata:
-	  case elfcpp::DW_FORM_udata:
-	    read_unsigned_LEB_128(pattr, &len);
-	    pattr += len;
-	    break;
-	  case elfcpp::DW_FORM_sdata:
-	    read_signed_LEB_128(pattr, &len);
-	    pattr += len;
-	    break;
-	  case elfcpp::DW_FORM_string:
-	    len = strlen(reinterpret_cast<const char*>(pattr));
-	    pattr += len + 1;
-	    break;
-	  default:
-	    return 0;
-	}
-    }
-
-  return this->die_offset_ + (pattr - pdie);
-}
-
-// Get the name of the DIE and cache it.
-
-void
-Dwarf_die::set_name()
-{
-  if (this->name_ != NULL || !this->read_attributes())
-    return;
-  if (this->name_off_ != -1)
-    this->name_ = this->dwinfo_->get_string(this->name_off_,
-					    this->string_shndx_);
-}
-
-// Get the linkage name of the DIE and cache it.
-
-void
-Dwarf_die::set_linkage_name()
-{
-  if (this->linkage_name_ != NULL || !this->read_attributes())
-    return;
-  if (this->linkage_name_off_ != -1)
-    this->linkage_name_ = this->dwinfo_->get_string(this->linkage_name_off_,
-						    this->string_shndx_);
-}
-
-// Return the value of attribute ATTR.
-
-const Dwarf_die::Attribute_value*
-Dwarf_die::attribute(unsigned int attr)
-{
-  if (!this->read_attributes())
-    return NULL;
-  for (unsigned int i = 0; i < this->attributes_.size(); ++i)
-    {
-      if (this->attributes_[i].attr == attr)
-        return &this->attributes_[i];
-    }
-  return NULL;
-}
-
-const char*
-Dwarf_die::string_attribute(unsigned int attr)
-{
-  const Attribute_value* attr_val = this->attribute(attr);
-  if (attr_val == NULL)
-    return NULL;
-  switch (attr_val->form)
-    {
-      case elfcpp::DW_FORM_string:
-        return attr_val->val.stringval;
-      case elfcpp::DW_FORM_strp:
-	return this->dwinfo_->get_string(attr_val->val.refval,
-					 attr_val->aux.shndx);
-      default:
-        return NULL;
-    }
-}
-
-int64_t
-Dwarf_die::int_attribute(unsigned int attr)
-{
-  const Attribute_value* attr_val = this->attribute(attr);
-  if (attr_val == NULL)
-    return 0;
-  switch (attr_val->form)
-    {
-      case elfcpp::DW_FORM_null:
-      case elfcpp::DW_FORM_flag_present:
-      case elfcpp::DW_FORM_data1:
-      case elfcpp::DW_FORM_flag:
-      case elfcpp::DW_FORM_data2:
-      case elfcpp::DW_FORM_data4:
-      case elfcpp::DW_FORM_data8:
-      case elfcpp::DW_FORM_sdata:
-        return attr_val->val.intval;
-      default:
-        return 0;
-    }
-}
-
-uint64_t
-Dwarf_die::uint_attribute(unsigned int attr)
-{
-  const Attribute_value* attr_val = this->attribute(attr);
-  if (attr_val == NULL)
-    return 0;
-  switch (attr_val->form)
-    {
-      case elfcpp::DW_FORM_null:
-      case elfcpp::DW_FORM_flag_present:
-      case elfcpp::DW_FORM_data1:
-      case elfcpp::DW_FORM_flag:
-      case elfcpp::DW_FORM_data4:
-      case elfcpp::DW_FORM_data8:
-      case elfcpp::DW_FORM_ref_sig8:
-      case elfcpp::DW_FORM_udata:
-        return attr_val->val.uintval;
-      default:
-        return 0;
-    }
-}
-
-off_t
-Dwarf_die::ref_attribute(unsigned int attr, unsigned int* shndx)
-{
-  const Attribute_value* attr_val = this->attribute(attr);
-  if (attr_val == NULL)
-    return -1;
-  switch (attr_val->form)
-    {
-      case elfcpp::DW_FORM_sec_offset:
-      case elfcpp::DW_FORM_addr:
-      case elfcpp::DW_FORM_ref_addr:
-      case elfcpp::DW_FORM_ref1:
-      case elfcpp::DW_FORM_ref2:
-      case elfcpp::DW_FORM_ref4:
-      case elfcpp::DW_FORM_ref8:
-      case elfcpp::DW_FORM_ref_udata:
-        *shndx = attr_val->aux.shndx;
-        return attr_val->val.refval;
-      case elfcpp::DW_FORM_ref_sig8:
-        *shndx = attr_val->aux.shndx;
-        return attr_val->val.uintval;
-      case elfcpp::DW_FORM_data4:
-      case elfcpp::DW_FORM_data8:
-        *shndx = attr_val->aux.shndx;
-        return attr_val->val.intval;
-      default:
-        return -1;
-    }
-}
-
-// Return the offset of this DIE's first child.
-
-off_t
-Dwarf_die::child_offset()
-{
-  gold_assert(this->abbrev_code_ != NULL);
-  if (!this->has_children())
-    return 0;
-  if (this->child_offset_ == 0)
-    this->child_offset_ = this->skip_attributes();
-  return this->child_offset_;
-}
-
-// Return the offset of this DIE's next sibling.
-
-off_t
-Dwarf_die::sibling_offset()
-{
-  gold_assert(this->abbrev_code_ != NULL);
-
-  if (this->sibling_offset_ != 0)
-    return this->sibling_offset_;
-
-  if (!this->has_children())
-    {
-      this->sibling_offset_ = this->skip_attributes();
-      return this->sibling_offset_;
-    }
-
-  if (this->has_sibling_attribute())
-    {
-      if (!this->read_attributes())
-	return 0;
-      if (this->sibling_offset_ != 0)
-	return this->sibling_offset_;
-    }
-
-  // Skip over the children.
-  off_t child_offset = this->child_offset();
-  while (child_offset > 0)
-    {
-      Dwarf_die die(this->dwinfo_, child_offset, this);
-      // The Dwarf_die ctor will set this DIE's sibling offset
-      // when it reads a zero abbrev code.
-      if (die.tag() == 0)
-	break;
-      child_offset = die.sibling_offset();
-    }
-
-  // This should be set by now.  If not, there was a problem reading
-  // the DWARF info, and we return 0.
-  return this->sibling_offset_;
-}
-
-// class Dwarf_info_reader
-
-// Check that the pointer P is within the current compilation unit.
-
-inline bool
-Dwarf_info_reader::check_buffer(const unsigned char* p) const
-{
-  if (p > this->buffer_ + this->cu_offset_ + this->cu_length_)
-    {
-      gold_warning(_("%s: corrupt debug info in %s"),
-		   this->object_->name().c_str(),
-		   this->object_->section_name(this->shndx_).c_str());
-      return false;
-    }
-  return true;
-}
-
-// Begin parsing the debug info.  This calls visit_compilation_unit()
-// or visit_type_unit() for each compilation or type unit found in the
-// section, and visit_die() for each top-level DIE.
-
-void
-Dwarf_info_reader::parse()
-{
-  switch (parameters->size_and_endianness())
-    {
-#ifdef HAVE_TARGET_32_LITTLE
-      case Parameters::TARGET_32_LITTLE:
-        this->do_parse<false>();
-        break;
-#endif
-#ifdef HAVE_TARGET_32_BIG
-      case Parameters::TARGET_32_BIG:
-        this->do_parse<true>();
-        break;
-#endif
-#ifdef HAVE_TARGET_64_LITTLE
-      case Parameters::TARGET_64_LITTLE:
-        this->do_parse<false>();
-        break;
-#endif
-#ifdef HAVE_TARGET_64_BIG
-      case Parameters::TARGET_64_BIG:
-        this->do_parse<true>();
-        break;
-#endif
-      default:
-	gold_unreachable();
-    }
-}
-
-template<bool big_endian>
-void
-Dwarf_info_reader::do_parse()
-{
-  // Get the section contents and decompress if necessary.
-  section_size_type buffer_size;
-  bool buffer_is_new;
-  this->buffer_ = this->object_->decompressed_section_contents(this->shndx_,
-							       &buffer_size,
-							       &buffer_is_new);
-  if (this->buffer_ == NULL || buffer_size == 0)
-    return;
-  this->buffer_end_ = this->buffer_ + buffer_size;
-
-  // The offset of this input section in the output section.
-  off_t section_offset = this->object_->output_section_offset(this->shndx_);
-
-  // Start tracking relocations for this section.
-  this->reloc_mapper_ = make_elf_reloc_mapper(this->object_, this->symtab_,
-					      this->symtab_size_);
-  this->reloc_mapper_->initialize(this->reloc_shndx_, this->reloc_type_);
-
-  // Loop over compilation units (or type units).
-  unsigned int abbrev_shndx = 0;
-  off_t abbrev_offset = 0;
-  const unsigned char* pinfo = this->buffer_;
-  while (pinfo < this->buffer_end_)
-    {
-      // Read the compilation (or type) unit header.
-      const unsigned char* cu_start = pinfo;
-      this->cu_offset_ = cu_start - this->buffer_;
-      this->cu_length_ = this->buffer_end_ - cu_start;
-
-      // Read unit_length (4 or 12 bytes).
-      if (!this->check_buffer(pinfo + 4))
-	break;
-      uint32_t unit_length =
-          elfcpp::Swap_unaligned<32, big_endian>::readval(pinfo);
-      pinfo += 4;
-      if (unit_length == 0xffffffff)
-	{
-	  if (!this->check_buffer(pinfo + 8))
-	    break;
-	  unit_length = elfcpp::Swap_unaligned<64, big_endian>::readval(pinfo);
-	  pinfo += 8;
-	  this->offset_size_ = 8;
-	}
-      else
-	this->offset_size_ = 4;
-      if (!this->check_buffer(pinfo + unit_length))
-	break;
-      const unsigned char* cu_end = pinfo + unit_length;
-      this->cu_length_ = cu_end - cu_start;
-      if (!this->check_buffer(pinfo + 2 + this->offset_size_ + 1))
-	break;
-
-      // Read version (2 bytes).
-      this->cu_version_ =
-	  elfcpp::Swap_unaligned<16, big_endian>::readval(pinfo);
-      pinfo += 2;
-
-      // Read debug_abbrev_offset (4 or 8 bytes).
-      if (this->offset_size_ == 4)
-	abbrev_offset = elfcpp::Swap_unaligned<32, big_endian>::readval(pinfo);
-      else
-	abbrev_offset = elfcpp::Swap_unaligned<64, big_endian>::readval(pinfo);
-      if (this->reloc_shndx_ > 0)
-	{
-	  off_t reloc_offset = pinfo - this->buffer_;
-	  off_t value;
-	  abbrev_shndx =
-	      this->reloc_mapper_->get_reloc_target(reloc_offset, &value);
-	  if (abbrev_shndx == 0)
-	    return;
-	  if (this->reloc_type_ == elfcpp::SHT_REL)
-	    abbrev_offset += value;
-	  else
-	    abbrev_offset = value;
-	}
-      pinfo += this->offset_size_;
-
-      // Read address_size (1 byte).
-      this->address_size_ = *pinfo++;
-
-      // For type units, read the two extra fields.
-      uint64_t signature = 0;
-      off_t type_offset = 0;
-      if (this->is_type_unit_)
-        {
-	  if (!this->check_buffer(pinfo + 8 + this->offset_size_))
-	    break;
-
-	  // Read type_signature (8 bytes).
-	  signature = elfcpp::Swap_unaligned<64, big_endian>::readval(pinfo);
-	  pinfo += 8;
-
-	  // Read type_offset (4 or 8 bytes).
-	  if (this->offset_size_ == 4)
-	    type_offset =
-		elfcpp::Swap_unaligned<32, big_endian>::readval(pinfo);
-	  else
-	    type_offset =
-		elfcpp::Swap_unaligned<64, big_endian>::readval(pinfo);
-	  pinfo += this->offset_size_;
-	}
-
-      // Read the .debug_abbrev table.
-      this->abbrev_table_.read_abbrevs(this->object_, abbrev_shndx,
-				       abbrev_offset);
-
-      // Visit the root DIE.
-      Dwarf_die root_die(this,
-			 pinfo - (this->buffer_ + this->cu_offset_),
-			 NULL);
-      if (root_die.tag() != 0)
-	{
-	  // Visit the CU or TU.
-	  if (this->is_type_unit_)
-	    this->visit_type_unit(section_offset + this->cu_offset_,
-				  type_offset, signature, &root_die);
-	  else
-	    this->visit_compilation_unit(section_offset + this->cu_offset_,
-					 cu_end - cu_start, &root_die);
-	}
-
-      // Advance to the next CU.
-      pinfo = cu_end;
-    }
-
-  if (buffer_is_new)
-    {
-      delete[] this->buffer_;
-      this->buffer_ = NULL;
-    }
-}
-
-// Read the DWARF string table.
-
-bool
-Dwarf_info_reader::do_read_string_table(unsigned int string_shndx)
-{
-  Relobj* object = this->object_;
-
-  // If we don't have relocations, string_shndx will be 0, and
-  // we'll have to hunt for the .debug_str section.
-  if (string_shndx == 0)
-    {
-      for (unsigned int i = 1; i < this->object_->shnum(); ++i)
-	{
-	  std::string name = object->section_name(i);
-	  if (name == ".debug_str")
-	    {
-	      string_shndx = i;
-	      this->string_output_section_offset_ =
-		  object->output_section_offset(i);
-	      break;
-	    }
-	}
-      if (string_shndx == 0)
-	return false;
-    }
-
-  if (this->owns_string_buffer_ && this->string_buffer_ != NULL)
-    {
-      delete[] this->string_buffer_;
-      this->owns_string_buffer_ = false;
-    }
-
-  // Get the secton contents and decompress if necessary.
-  section_size_type buffer_size;
-  const unsigned char* buffer =
-      object->decompressed_section_contents(string_shndx,
-					    &buffer_size,
-					    &this->owns_string_buffer_);
-  this->string_buffer_ = reinterpret_cast<const char*>(buffer);
-  this->string_buffer_end_ = this->string_buffer_ + buffer_size;
-  this->string_shndx_ = string_shndx;
-  return true;
-}
-
-// Look for a relocation at offset ATTR_OFF in the dwarf info,
-// and return the section index and offset of the target.
-
-unsigned int
-Dwarf_info_reader::lookup_reloc(off_t attr_off, off_t* target_off)
-{
-  off_t value;
-  attr_off += this->cu_offset_;
-  unsigned int shndx = this->reloc_mapper_->get_reloc_target(attr_off, &value);
-  if (shndx == 0)
-    return 0;
-  if (this->reloc_type_ == elfcpp::SHT_REL)
-    *target_off += value;
-  else
-    *target_off = value;
-  return shndx;
-}
-
-// Return a string from the DWARF string table.
-
-const char*
-Dwarf_info_reader::get_string(off_t str_off, unsigned int string_shndx)
-{
-  if (!this->read_string_table(string_shndx))
-    return NULL;
-
-  // Correct the offset.  For incremental update links, we have a
-  // relocated offset that is relative to the output section, but
-  // here we need an offset relative to the input section.
-  str_off -= this->string_output_section_offset_;
-
-  const char* p = this->string_buffer_ + str_off;
-
-  if (p < this->string_buffer_ || p >= this->string_buffer_end_)
-    return NULL;
-
-  return p;
-}
-
-// The following are default, do-nothing, implementations of the
-// hook methods normally provided by a derived class.  We provide
-// default implementations rather than no implementation so that
-// a derived class needs to implement only the hooks that it needs
-// to use.
-
-// Process a compilation unit and parse its child DIE.
-
-void
-Dwarf_info_reader::visit_compilation_unit(off_t, off_t, Dwarf_die*)
-{
-}
-
-// Process a type unit and parse its child DIE.
-
-void
-Dwarf_info_reader::visit_type_unit(off_t, off_t, uint64_t, Dwarf_die*)
-{
-}
-
-// class Sized_dwarf_line_info
-
 struct LineStateMachine
 {
   int file_num;
@@ -1423,15 +62,12 @@ ResetLineStateMachine(struct LineStateMachine* lsm, bool default_is_stmt)
 }
 
 template<int size, bool big_endian>
-Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(
-    Object* object,
-    unsigned int read_shndx)
-  : data_valid_(false), buffer_(NULL), buffer_start_(NULL),
-    reloc_mapper_(NULL), symtab_buffer_(NULL), directories_(), files_(),
-    current_header_index_(-1)
+Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(Object* object,
+                                                               unsigned int read_shndx)
+  : data_valid_(false), buffer_(NULL), symtab_buffer_(NULL),
+    directories_(), files_(), current_header_index_(-1)
 {
   unsigned int debug_shndx;
-
   for (debug_shndx = 1; debug_shndx < object->shnum(); ++debug_shndx)
     {
       // FIXME: do this more efficiently: section_name() isn't super-fast
@@ -1439,12 +75,8 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(
       if (name == ".debug_line" || name == ".zdebug_line")
 	{
 	  section_size_type buffer_size;
-	  bool is_new = false;
-	  this->buffer_ = object->decompressed_section_contents(debug_shndx,
-								&buffer_size,
-								&is_new);
-	  if (is_new)
-	    this->buffer_start_ = this->buffer_;
+	  this->buffer_ = object->section_contents(debug_shndx, &buffer_size,
+						   false);
 	  this->buffer_end_ = this->buffer_ + buffer_size;
 	  break;
 	}
@@ -1452,48 +84,59 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(
   if (this->buffer_ == NULL)
     return;
 
+  section_size_type uncompressed_size = 0;
+  unsigned char* uncompressed_data = NULL;
+  if (object->section_is_compressed(debug_shndx, &uncompressed_size))
+    {
+      uncompressed_data = new unsigned char[uncompressed_size];
+      if (!decompress_input_section(this->buffer_,
+				    this->buffer_end_ - this->buffer_,
+				    uncompressed_data,
+				    uncompressed_size))
+	object->error(_("could not decompress section %s"),
+		      object->section_name(debug_shndx).c_str());
+      this->buffer_ = uncompressed_data;
+      this->buffer_end_ = this->buffer_ + uncompressed_size;
+    }
+
   // Find the relocation section for ".debug_line".
   // We expect these for relobjs (.o's) but not dynobjs (.so's).
-  unsigned int reloc_shndx = 0;
-  for (unsigned int i = 0; i < object->shnum(); ++i)
+  bool got_relocs = false;
+  for (unsigned int reloc_shndx = 0;
+       reloc_shndx < object->shnum();
+       ++reloc_shndx)
     {
-      unsigned int reloc_sh_type = object->section_type(i);
+      unsigned int reloc_sh_type = object->section_type(reloc_shndx);
       if ((reloc_sh_type == elfcpp::SHT_REL
 	   || reloc_sh_type == elfcpp::SHT_RELA)
-	  && object->section_info(i) == debug_shndx)
+	  && object->section_info(reloc_shndx) == debug_shndx)
 	{
-	  reloc_shndx = i;
+	  got_relocs = this->track_relocs_.initialize(object, reloc_shndx,
+                                                      reloc_sh_type);
 	  this->track_relocs_type_ = reloc_sh_type;
 	  break;
 	}
     }
 
   // Finally, we need the symtab section to interpret the relocs.
-  if (reloc_shndx != 0)
+  if (got_relocs)
     {
       unsigned int symtab_shndx;
       for (symtab_shndx = 0; symtab_shndx < object->shnum(); ++symtab_shndx)
         if (object->section_type(symtab_shndx) == elfcpp::SHT_SYMTAB)
           {
-	    this->symtab_buffer_ = object->section_contents(
-		symtab_shndx, &this->symtab_buffer_size_, false);
+            this->symtab_buffer_ = object->section_contents(
+                symtab_shndx, &this->symtab_buffer_size_, false);
             break;
           }
       if (this->symtab_buffer_ == NULL)
         return;
     }
 
-  this->reloc_mapper_ =
-      new Sized_elf_reloc_mapper<size, big_endian>(object,
-						   this->symtab_buffer_,
-						   this->symtab_buffer_size_);
-  if (!this->reloc_mapper_->initialize(reloc_shndx, this->track_relocs_type_))
-    return;
-
   // Now that we have successfully read all the data, parse the debug
   // info.
   this->data_valid_ = true;
-  this->read_line_mappings(read_shndx);
+  this->read_line_mappings(object, read_shndx);
 }
 
 // Read the DWARF header.
@@ -1779,16 +422,17 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode(
               start += templen;
 
               uint64_t dirindex = read_unsigned_LEB_128(start, &templen);
+              oplen += templen;
 
               if (dirindex >= this->directories_.back().size())
                 dirindex = 0;
 	      int dirindexi = static_cast<int>(dirindex);
 
-              // This opcode takes two additional ULEB128 parameters
-              // (mod_time and filelength), but we don't use those
-              // values.  Because OPLEN already tells us how far to
-              // skip to the next opcode, we don't need to read
-              // them at all.
+              read_unsigned_LEB_128(start, &templen);   // mod_time
+              oplen += templen;
+
+              read_unsigned_LEB_128(start, &templen);   // filelength
+              oplen += templen;
 
               this->files_.back().push_back(std::make_pair(dirindexi,
 							   filename));
@@ -1847,10 +491,8 @@ Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr
               && (shndx == -1U || lsm.shndx == -1U || shndx == lsm.shndx))
             {
               Offset_to_lineno_entry entry
-                  = { static_cast<off_t>(lsm.address),
-		      this->current_header_index_,
-		      static_cast<unsigned int>(lsm.file_num),
-		      true, lsm.line_num };
+                  = { lsm.address, this->current_header_index_,
+                      lsm.file_num, true, lsm.line_num };
 	      std::vector<Offset_to_lineno_entry>&
 		map(this->line_number_map_[lsm.shndx]);
 	      // If we see two consecutive entries with the same
@@ -1870,28 +512,51 @@ Sized_dwarf_line_info<size, big_endian>::read_lines(unsigned const char* lineptr
   return lengthstart + header_.total_length;
 }
 
+// Looks in the symtab to see what section a symbol is in.
+
+template<int size, bool big_endian>
+unsigned int
+Sized_dwarf_line_info<size, big_endian>::symbol_section(
+    Object* object,
+    unsigned int sym,
+    typename elfcpp::Elf_types<size>::Elf_Addr* value,
+    bool* is_ordinary)
+{
+  const int symsize = elfcpp::Elf_sizes<size>::sym_size;
+  gold_assert(sym * symsize < this->symtab_buffer_size_);
+  elfcpp::Sym<size, big_endian> elfsym(this->symtab_buffer_ + sym * symsize);
+  *value = elfsym.get_st_value();
+  return object->adjust_sym_shndx(sym, elfsym.get_st_shndx(), is_ordinary);
+}
+
 // Read the relocations into a Reloc_map.
 
 template<int size, bool big_endian>
 void
-Sized_dwarf_line_info<size, big_endian>::read_relocs()
+Sized_dwarf_line_info<size, big_endian>::read_relocs(Object* object)
 {
   if (this->symtab_buffer_ == NULL)
     return;
 
-  off_t value;
+  typename elfcpp::Elf_types<size>::Elf_Addr value;
   off_t reloc_offset;
-  while ((reloc_offset = this->reloc_mapper_->next_offset()) != -1)
+  while ((reloc_offset = this->track_relocs_.next_offset()) != -1)
     {
-      const unsigned int shndx =
-          this->reloc_mapper_->get_reloc_target(reloc_offset, &value);
+      const unsigned int sym = this->track_relocs_.next_symndx();
+
+      bool is_ordinary;
+      const unsigned int shndx = this->symbol_section(object, sym, &value,
+						      &is_ordinary);
 
       // There is no reason to record non-ordinary section indexes, or
       // SHN_UNDEF, because they will never match the real section.
-      if (shndx != 0)
-	this->reloc_map_[reloc_offset] = std::make_pair(shndx, value);
+      if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+	{
+	  value += this->track_relocs_.next_addend();
+	  this->reloc_map_[reloc_offset] = std::make_pair(shndx, value);
+	}
 
-      this->reloc_mapper_->advance(reloc_offset + 1);
+      this->track_relocs_.advance(reloc_offset + 1);
     }
 }
 
@@ -1899,11 +564,12 @@ Sized_dwarf_line_info<size, big_endian>::read_relocs()
 
 template<int size, bool big_endian>
 void
-Sized_dwarf_line_info<size, big_endian>::read_line_mappings(unsigned int shndx)
+Sized_dwarf_line_info<size, big_endian>::read_line_mappings(Object* object,
+							    unsigned int shndx)
 {
   gold_assert(this->data_valid_ == true);
 
-  this->read_relocs();
+  this->read_relocs(object);
   while (this->buffer_ < this->buffer_end_)
     {
       const unsigned char* lineptr = this->buffer_;
@@ -2107,7 +773,7 @@ Sized_dwarf_line_info<size, big_endian>::format_file_lineno(
 
   gold_assert(loc.header_num < static_cast<int>(this->files_.size()));
   gold_assert(loc.file_num
-	      < static_cast<unsigned int>(this->files_[loc.header_num].size()));
+	      < static_cast<int>(this->files_[loc.header_num].size()));
   const std::pair<int, std::string>& filename_pair
       = this->files_[loc.header_num][loc.file_num];
   const std::string& filename = filename_pair.second;
diff --git a/gold/dwarf_reader.h b/gold/dwarf_reader.h
index 0c3dab6eec..3f92dd3eea 100644
--- a/gold/dwarf_reader.h
+++ b/gold/dwarf_reader.h
@@ -1,6 +1,6 @@
 // dwarf_reader.h -- parse dwarf2/3 debug information for gold  -*- C++ -*-
 
-// Copyright 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+// Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -26,7 +26,6 @@
 #include <vector>
 #include <map>
 #include <limits.h>
-#include <sys/types.h>
 
 #include "elfcpp.h"
 #include "elfcpp_swap.h"
@@ -36,814 +35,9 @@
 namespace gold
 {
 
-class Dwarf_info_reader;
-struct LineStateMachine;
-
-// This class is used to extract the section index and offset of
-// the target of a relocation for a given offset within the section.
-
-class Elf_reloc_mapper
-{
- public:
-  Elf_reloc_mapper()
-  { }
-
-  virtual
-  ~Elf_reloc_mapper()
-  { }
-
-  // Initialize the relocation tracker for section RELOC_SHNDX.
-  bool
-  initialize(unsigned int reloc_shndx, unsigned int reloc_type)
-  { return this->do_initialize(reloc_shndx, reloc_type); }
-
-  // Return the next reloc_offset.
-  off_t
-  next_offset()
-  { return this->do_next_offset(); }
-
-  // Advance to the next relocation past OFFSET.
-  void
-  advance(off_t offset)
-  { this->do_advance(offset); }
-
-  // Return the section index and offset within the section of the target
-  // of the relocation for RELOC_OFFSET in the referring section.
-  unsigned int
-  get_reloc_target(off_t reloc_offset, off_t* target_offset)
-  { return this->do_get_reloc_target(reloc_offset, target_offset); }
-
-  // Checkpoint the current position in the reloc section.
-  uint64_t
-  checkpoint() const
-  { return this->do_checkpoint(); }
-
-  // Reset the current position to the CHECKPOINT.
-  void
-  reset(uint64_t checkpoint)
-  { this->do_reset(checkpoint); }
-
- protected:
-  virtual bool
-  do_initialize(unsigned int, unsigned int) = 0;
-
-  // Return the next reloc_offset.
-  virtual off_t
-  do_next_offset() = 0;
-
-  // Advance to the next relocation past OFFSET.
-  virtual void
-  do_advance(off_t offset) = 0;
-
-  virtual unsigned int
-  do_get_reloc_target(off_t reloc_offset, off_t* target_offset) = 0;
-
-  // Checkpoint the current position in the reloc section.
-  virtual uint64_t
-  do_checkpoint() const = 0;
-
-  // Reset the current position to the CHECKPOINT.
-  virtual void
-  do_reset(uint64_t checkpoint) = 0;
-};
-
 template<int size, bool big_endian>
-class Sized_elf_reloc_mapper : public Elf_reloc_mapper
-{
- public:
-  Sized_elf_reloc_mapper(Object* object, const unsigned char* symtab,
-			 off_t symtab_size)
-    : object_(object), symtab_(symtab), symtab_size_(symtab_size),
-      reloc_type_(0), track_relocs_()
-  { }
-
- protected:
-  bool
-  do_initialize(unsigned int reloc_shndx, unsigned int reloc_type);
-
-  // Return the next reloc_offset.
-  virtual off_t
-  do_next_offset()
-  { return this->track_relocs_.next_offset(); }
-
-  // Advance to the next relocation past OFFSET.
-  virtual void
-  do_advance(off_t offset)
-  { this->track_relocs_.advance(offset); }
-
-  unsigned int
-  do_get_reloc_target(off_t reloc_offset, off_t* target_offset);
-
-  // Checkpoint the current position in the reloc section.
-  uint64_t
-  do_checkpoint() const
-  { return this->track_relocs_.checkpoint(); }
-
-  // Reset the current position to the CHECKPOINT.
-  void
-  do_reset(uint64_t checkpoint)
-  { this->track_relocs_.reset(checkpoint); }
-
- private:
-  typedef typename elfcpp::Elf_types<size>::Elf_Addr Address;
-
-  // Return the section index of symbol SYMNDX, and copy its value to *VALUE.
-  // Set *IS_ORDINARY true if the section index is an ordinary section index.
-  unsigned int
-  symbol_section(unsigned int symndx, Address* value, bool* is_ordinary);
-
-  // The object file.
-  Object* object_;
-  // The ELF symbol table.
-  const unsigned char* symtab_;
-  // The size of the ELF symbol table.
-  off_t symtab_size_;
-  // Type of the relocation section (SHT_REL or SHT_RELA).
-  unsigned int reloc_type_;
-  // Relocations for the referring section.
-  Track_relocs<size, big_endian> track_relocs_;
-};
-
-// This class is used to read the abbreviations table from the
-// .debug_abbrev section of the object file.
-
-class Dwarf_abbrev_table
-{
- public:
-  // An attribute list entry.
-  struct Attribute
-  {
-    Attribute(unsigned int a, unsigned int f)
-      : attr(a), form(f)
-    { }
-    unsigned int attr;
-    unsigned int form;
-  };
-
-  // An abbrev code entry.
-  struct Abbrev_code
-  {
-    Abbrev_code(unsigned int t, bool hc)
-      : tag(t), has_children(hc), has_sibling_attribute(false), attributes()
-    {
-      this->attributes.reserve(10);
-    }
-
-    void
-    add_attribute(unsigned int attr, unsigned int form)
-    {
-      this->attributes.push_back(Attribute(attr, form));
-    }
-
-    // The DWARF tag.
-    unsigned int tag;
-    // True if the DIE has children.
-    bool has_children : 1;
-    // True if the DIE has a sibling attribute.
-    bool has_sibling_attribute : 1;
-    // The list of attributes and forms.
-    std::vector<Attribute> attributes;
-  };
-
-  Dwarf_abbrev_table()
-    : abbrev_shndx_(0), abbrev_offset_(0), buffer_(NULL), buffer_end_(NULL),
-      owns_buffer_(false), buffer_pos_(NULL), high_abbrev_codes_()
-  {
-    memset(this->low_abbrev_codes_, 0, sizeof(this->low_abbrev_codes_));
-  }
-
-  ~Dwarf_abbrev_table()
-  {
-    if (this->owns_buffer_ && this->buffer_ != NULL)
-      delete[] this->buffer_;
-    this->clear_abbrev_codes();
-  }
-
-  // Read the abbrev table from an object file.
-  bool
-  read_abbrevs(Relobj* object,
-	       unsigned int abbrev_shndx,
-	       off_t abbrev_offset)
-  {
-    // If we've already read this abbrev table, return immediately.
-    if (this->abbrev_shndx_ > 0
-	&& this->abbrev_shndx_ == abbrev_shndx
-	&& this->abbrev_offset_ == abbrev_offset)
-      return true;
-    return this->do_read_abbrevs(object, abbrev_shndx, abbrev_offset);
-  }
-
-  // Return the abbrev code entry for CODE.  This is a fast path for
-  // abbrev codes that are in the direct lookup table.  If not found
-  // there, we call do_get_abbrev() to do the hard work.
-  const Abbrev_code*
-  get_abbrev(unsigned int code)
-  {
-    if (code < this->low_abbrev_code_max_
-	&& this->low_abbrev_codes_[code] != NULL)
-      return this->low_abbrev_codes_[code];
-    return this->do_get_abbrev(code);
-  }
-
- private:
-  // Read the abbrev table from an object file.
-  bool
-  do_read_abbrevs(Relobj* object,
-		  unsigned int abbrev_shndx,
-		  off_t abbrev_offset);
-
-  // Lookup the abbrev code entry for CODE.
-  const Abbrev_code*
-  do_get_abbrev(unsigned int code);
-
-  // Store an abbrev code entry for CODE.
-  void
-  store_abbrev(unsigned int code, const Abbrev_code* entry)
-  {
-    if (code < this->low_abbrev_code_max_)
-      this->low_abbrev_codes_[code] = entry;
-    else
-      this->high_abbrev_codes_[code] = entry;
-  }
-
-  // Clear the abbrev code table and release the memory it uses.
-  void
-  clear_abbrev_codes();
-
-  typedef Unordered_map<unsigned int, const Abbrev_code*> Abbrev_code_table;
-
-  // The section index of the current abbrev table.
-  unsigned int abbrev_shndx_;
-  // The offset within the section of the current abbrev table.
-  off_t abbrev_offset_;
-  // The buffer containing the .debug_abbrev section.
-  const unsigned char* buffer_;
-  const unsigned char* buffer_end_;
-  // True if this object owns the buffer and needs to delete it.
-  bool owns_buffer_;
-  // Pointer to the current position in the buffer.
-  const unsigned char* buffer_pos_;
-  // The table of abbrev codes.
-  // We use a direct-lookup array for low abbrev codes,
-  // and store the rest in a hash table.
-  static const unsigned int low_abbrev_code_max_ = 256;
-  const Abbrev_code* low_abbrev_codes_[low_abbrev_code_max_];
-  Abbrev_code_table high_abbrev_codes_;
-};
-
-// A DWARF range list.  The start and end offsets are relative
-// to the input section SHNDX.  Each range must lie entirely
-// within a single section.
-
-class Dwarf_range_list
-{
- public:
-  struct Range
-  {
-    Range(unsigned int a_shndx, off_t a_start, off_t a_end)
-      : shndx(a_shndx), start(a_start), end(a_end)
-    { }
-
-    unsigned int shndx;
-    off_t start;
-    off_t end;
-  };
-
-  Dwarf_range_list()
-    : range_list_()
-  { }
-
-  void
-  add(unsigned int shndx, off_t start, off_t end)
-  { this->range_list_.push_back(Range(shndx, start, end)); }
-
-  size_t
-  size() const
-  { return this->range_list_.size(); }
-
-  const Range&
-  operator[](off_t i) const
-  { return this->range_list_[i]; }
-
- private:
-  std::vector<Range> range_list_;
-};
-
-// This class is used to read the ranges table from the
-// .debug_ranges section of the object file.
-
-class Dwarf_ranges_table
-{
- public:
-  Dwarf_ranges_table()
-    : ranges_shndx_(0), ranges_buffer_(NULL), ranges_buffer_end_(NULL),
-      owns_ranges_buffer_(false), ranges_reloc_mapper_(NULL),
-      output_section_offset_(0)
-  { }
-
-  ~Dwarf_ranges_table()
-  {
-    if (this->owns_ranges_buffer_ && this->ranges_buffer_ != NULL)
-      delete[] this->ranges_buffer_;
-    if (this->ranges_reloc_mapper_ != NULL)
-      delete this->ranges_reloc_mapper_;
-  }
-
-  // Read the ranges table from an object file.
-  bool
-  read_ranges_table(Relobj* object,
-		    const unsigned char* symtab,
-		    off_t symtab_size,
-		    unsigned int ranges_shndx);
-
-  // Read the range table from an object file.
-  Dwarf_range_list*
-  read_range_list(Relobj* object,
-		  const unsigned char* symtab,
-		  off_t symtab_size,
-		  unsigned int address_size,
-		  unsigned int ranges_shndx,
-		  off_t ranges_offset);
-
- private:
-  // The section index of the ranges table.
-  unsigned int ranges_shndx_;
-  // The buffer containing the .debug_ranges section.
-  const unsigned char* ranges_buffer_;
-  const unsigned char* ranges_buffer_end_;
-  // True if this object owns the buffer and needs to delete it.
-  bool owns_ranges_buffer_;
-  // Relocation mapper for the .debug_ranges section.
-  Elf_reloc_mapper* ranges_reloc_mapper_;
-  // For incremental update links, this will hold the offset of the
-  // input section within the output section.  Offsets read from
-  // relocated data will be relative to the output section, and need
-  // to be corrected before reading data from the input section.
-  uint64_t output_section_offset_;
-};
-
-// This class is used to read the pubnames and pubtypes tables from the
-// .debug_pubnames and .debug_pubtypes sections of the object file.
-
-class Dwarf_pubnames_table
-{
- public:
-  Dwarf_pubnames_table(bool is_pubtypes)
-    : buffer_(NULL), buffer_end_(NULL), owns_buffer_(false),
-      offset_size_(0), pinfo_(NULL), is_pubtypes_(is_pubtypes),
-      output_section_offset_(0)
-  { }
-
-  ~Dwarf_pubnames_table()
-  {
-    if (this->owns_buffer_ && this->buffer_ != NULL)
-      delete[] this->buffer_;
-  }
-
-  // Read the pubnames section SHNDX from the object file.
-  bool
-  read_section(Relobj* object, unsigned int shndx);
-
-  // Read the header for the set at OFFSET.
-  bool
-  read_header(off_t offset);
-
-  // Read the next name from the set.
-  const char*
-  next_name();
-
- private:
-  // The buffer containing the .debug_ranges section.
-  const unsigned char* buffer_;
-  const unsigned char* buffer_end_;
-  // True if this object owns the buffer and needs to delete it.
-  bool owns_buffer_;
-  // The size of a DWARF offset for the current set.
-  unsigned int offset_size_;
-  // The current position within the buffer.
-  const unsigned char* pinfo_;
-  // TRUE if this is a .debug_pubtypes section.
-  bool is_pubtypes_;
-  // For incremental update links, this will hold the offset of the
-  // input section within the output section.  Offsets read from
-  // relocated data will be relative to the output section, and need
-  // to be corrected before reading data from the input section.
-  uint64_t output_section_offset_;
-};
-
-// This class represents a DWARF Debug Info Entry (DIE).
-
-class Dwarf_die
-{
- public:
-  // An attribute value.
-  struct Attribute_value
-  {
-    unsigned int attr;
-    unsigned int form;
-    union
-    {
-      int64_t intval;
-      uint64_t uintval;
-      const char* stringval;
-      const unsigned char* blockval;
-      off_t refval;
-    } val;
-    union
-    {
-      // Section index for reference forms.
-      unsigned int shndx;
-      // Block length for block forms.
-      unsigned int blocklen;
-      // Attribute offset for DW_FORM_strp.
-      unsigned int attr_off;
-    } aux;
-  };
-
-  // A list of attribute values.
-  typedef std::vector<Attribute_value> Attributes;
-
-  Dwarf_die(Dwarf_info_reader* dwinfo,
-	    off_t die_offset,
-	    Dwarf_die* parent);
-
-  // Return the DWARF tag for this DIE.
-  unsigned int
-  tag() const
-  {
-    if (this->abbrev_code_ == NULL)
-      return 0;
-    return this->abbrev_code_->tag;
-  }
-
-  // Return true if this DIE has children.
-  bool
-  has_children() const
-  {
-    gold_assert(this->abbrev_code_ != NULL);
-    return this->abbrev_code_->has_children;
-  }
-
-  // Return true if this DIE has a sibling attribute.
-  bool
-  has_sibling_attribute() const
-  {
-    gold_assert(this->abbrev_code_ != NULL);
-    return this->abbrev_code_->has_sibling_attribute;
-  }
-
-  // Return the value of attribute ATTR.
-  const Attribute_value*
-  attribute(unsigned int attr);
-
-  // Return the value of the DW_AT_name attribute.
-  const char*
-  name()
-  {
-    if (this->name_ == NULL)
-      this->set_name();
-    return this->name_;
-  }
-
-  // Return the value of the DW_AT_linkage_name
-  // or DW_AT_MIPS_linkage_name attribute.
-  const char*
-  linkage_name()
-  {
-    if (this->linkage_name_ == NULL)
-      this->set_linkage_name();
-    return this->linkage_name_;
-  }
-
-  // Return the value of the DW_AT_specification attribute.
-  off_t
-  specification()
-  {
-    if (!this->attributes_read_)
-      this->read_attributes();
-    return this->specification_;
-  }
-
-  // Return the value of the DW_AT_abstract_origin attribute.
-  off_t
-  abstract_origin()
-  {
-    if (!this->attributes_read_)
-      this->read_attributes();
-    return this->abstract_origin_;
-  }
-
-  // Return the value of attribute ATTR as a string.
-  const char*
-  string_attribute(unsigned int attr);
-
-  // Return the value of attribute ATTR as an integer.
-  int64_t
-  int_attribute(unsigned int attr);
-
-  // Return the value of attribute ATTR as an unsigned integer.
-  uint64_t
-  uint_attribute(unsigned int attr);
-
-  // Return the value of attribute ATTR as a reference.
-  off_t
-  ref_attribute(unsigned int attr,
-		unsigned int* shndx);
-
-  // Return the value of attribute ATTR as a flag.
-  bool
-  flag_attribute(unsigned int attr)
-  { return this->int_attribute(attr) != 0; }
-
-  // Return true if this DIE is a declaration.
-  bool
-  is_declaration()
-  { return this->flag_attribute(elfcpp::DW_AT_declaration); }
-
-  // Return the parent of this DIE.
-  Dwarf_die*
-  parent() const
-  { return this->parent_; }
-
-  // Return the offset of this DIE.
-  off_t
-  offset() const
-  { return this->die_offset_; }
-
-  // Return the offset of this DIE's first child.
-  off_t
-  child_offset();
-
-  // Set the offset of this DIE's next sibling.
-  void
-  set_sibling_offset(off_t sibling_offset)
-  { this->sibling_offset_ = sibling_offset; }
-
-  // Return the offset of this DIE's next sibling.
-  off_t
-  sibling_offset();
-
- private:
-  typedef Dwarf_abbrev_table::Abbrev_code Abbrev_code;
-
-  // Read all the attributes of the DIE.
-  bool
-  read_attributes();
-
-  // Set the name of the DIE if present.
-  void
-  set_name();
-
-  // Set the linkage name if present.
-  void
-  set_linkage_name();
-
-  // Skip all the attributes of the DIE and return the offset
-  // of the next DIE.
-  off_t
-  skip_attributes();
-
-  // The Dwarf_info_reader, for reading attributes.
-  Dwarf_info_reader* dwinfo_;
-  // The parent of this DIE.
-  Dwarf_die* parent_;
-  // Offset of this DIE within its compilation unit.
-  off_t die_offset_;
-  // Offset of the first attribute, relative to the beginning of the DIE.
-  off_t attr_offset_;
-  // Offset of the first child, relative to the compilation unit.
-  off_t child_offset_;
-  // Offset of the next sibling, relative to the compilation unit.
-  off_t sibling_offset_;
-  // The abbreviation table entry.
-  const Abbrev_code* abbrev_code_;
-  // The list of attributes.
-  Attributes attributes_;
-  // True if the attributes have been read.
-  bool attributes_read_;
-  // The following fields hold common attributes to avoid a linear
-  // search through the attribute list.
-  // The DIE name (DW_AT_name).
-  const char* name_;
-  // Offset of the name in the string table (for DW_FORM_strp).
-  off_t name_off_;
-  // The linkage name (DW_AT_linkage_name or DW_AT_MIPS_linkage_name).
-  const char* linkage_name_;
-  // Offset of the linkage name in the string table (for DW_FORM_strp).
-  off_t linkage_name_off_;
-  // Section index of the string table (for DW_FORM_strp).
-  unsigned int string_shndx_;
-  // The value of a DW_AT_specification attribute.
-  off_t specification_;
-  // The value of a DW_AT_abstract_origin attribute.
-  off_t abstract_origin_;
-};
-
-// This class is used to read the debug info from the .debug_info
-// or .debug_types sections.  This is a base class that implements
-// the generic parsing of the compilation unit header and DIE
-// structure.  The parse() method parses the entire section, and
-// calls the various visit_xxx() methods for each header.  Clients
-// should derive a new class from this one and implement the
-// visit_compilation_unit() and visit_type_unit() functions.
-
-class Dwarf_info_reader
-{
- public:
-  Dwarf_info_reader(bool is_type_unit,
-		    Relobj* object,
-		    const unsigned char* symtab,
-		    off_t symtab_size,
-		    unsigned int shndx,
-		    unsigned int reloc_shndx,
-		    unsigned int reloc_type)
-    : is_type_unit_(is_type_unit), object_(object), symtab_(symtab),
-      symtab_size_(symtab_size), shndx_(shndx), reloc_shndx_(reloc_shndx),
-      reloc_type_(reloc_type), string_shndx_(0), buffer_(NULL),
-      buffer_end_(NULL), cu_offset_(0), cu_length_(0), offset_size_(0),
-      address_size_(0), cu_version_(0), type_signature_(0), type_offset_(0),
-      abbrev_table_(), reloc_mapper_(NULL), string_buffer_(NULL),
-      string_buffer_end_(NULL), owns_string_buffer_(false),
-      string_output_section_offset_(0)
-  { }
-
-  virtual
-  ~Dwarf_info_reader()
-  {
-    if (this->reloc_mapper_ != NULL)
-      delete this->reloc_mapper_;
-    if (this->owns_string_buffer_ && this->string_buffer_ != NULL)
-      delete[] this->string_buffer_;
-  }
-
-  // Begin parsing the debug info.  This calls visit_compilation_unit()
-  // or visit_type_unit() for each compilation or type unit found in the
-  // section, and visit_die() for each top-level DIE.
-  void
-  parse();
-
-  // Return the abbrev code entry for a CODE.
-  const Dwarf_abbrev_table::Abbrev_code*
-  get_abbrev(unsigned int code)
-  { return this->abbrev_table_.get_abbrev(code); }
-
-  // Return a pointer to the DWARF info buffer at OFFSET.
-  const unsigned char*
-  buffer_at_offset(off_t offset) const
-  {
-    const unsigned char* p = this->buffer_ + this->cu_offset_ + offset;
-    if (this->check_buffer(p + 1))
-      return p;
-    return NULL;
-  }
-
-  // Look for a relocation at offset ATTR_OFF in the dwarf info,
-  // and return the section index and offset of the target.
-  unsigned int
-  lookup_reloc(off_t attr_off, off_t* target_off);
-
-  // Return a string from the DWARF string table.
-  const char*
-  get_string(off_t str_off, unsigned int string_shndx);
-
-  // Return the size of a DWARF offset.
-  unsigned int
-  offset_size() const
-  { return this->offset_size_; }
-
-  // Return the size of an address.
-  unsigned int
-  address_size() const
-  { return this->address_size_; }
-
- protected:
-  // Begin parsing the debug info.  This calls visit_compilation_unit()
-  // or visit_type_unit() for each compilation or type unit found in the
-  // section, and visit_die() for each top-level DIE.
-  template<bool big_endian>
-  void
-  do_parse();
-
-  // The following methods are hooks that are meant to be implemented
-  // by a derived class.  A default, do-nothing, implementation of
-  // each is provided for this base class.
-
-  // Visit a compilation unit.
-  virtual void
-  visit_compilation_unit(off_t cu_offset, off_t cu_length, Dwarf_die* root_die);
-
-  // Visit a type unit.
-  virtual void
-  visit_type_unit(off_t tu_offset, off_t type_offset, uint64_t signature,
-		  Dwarf_die* root_die);
-
-  // Read the range table.
-  Dwarf_range_list*
-  read_range_list(unsigned int ranges_shndx, off_t ranges_offset)
-  {
-    return this->ranges_table_.read_range_list(this->object_,
-					       this->symtab_,
-					       this->symtab_size_,
-					       this->address_size_,
-					       ranges_shndx,
-					       ranges_offset);
-  }
-
-  // Return the object.
-  Relobj*
-  object() const
-  { return this->object_; }
-
-  // Return a pointer to the object file's ELF symbol table.
-  const unsigned char*
-  symtab() const
-  { return this->symtab_; }
-
-  // Return the size of the object file's ELF symbol table.
-  off_t
-  symtab_size() const
-  { return this->symtab_size_; }
-
-  // Checkpoint the relocation tracker.
-  uint64_t
-  get_reloc_checkpoint() const
-  { return this->reloc_mapper_->checkpoint(); }
-
-  // Reset the relocation tracker to the CHECKPOINT.
-  void
-  reset_relocs(uint64_t checkpoint)
-  { this->reloc_mapper_->reset(checkpoint); }
-
- private:
-  // Check that P is within the bounds of the current section.
-  bool
-  check_buffer(const unsigned char* p) const;
-
-  // Read the DWARF string table.
-  bool
-  read_string_table(unsigned int string_shndx)
-  {
-    // If we've already read this string table, return immediately.
-    if (this->string_shndx_ > 0 && this->string_shndx_ == string_shndx)
-      return true;
-    if (string_shndx == 0 && this->string_shndx_ > 0)
-      return true;
-    return this->do_read_string_table(string_shndx);
-  }
-
-  bool
-  do_read_string_table(unsigned int string_shndx);
-
-  // True if this is a type unit; false for a compilation unit.
-  bool is_type_unit_;
-  // The object containing the .debug_info or .debug_types input section.
-  Relobj* object_;
-  // The ELF symbol table.
-  const unsigned char* symtab_;
-  // The size of the ELF symbol table.
-  off_t symtab_size_;
-  // Index of the .debug_info or .debug_types section.
-  unsigned int shndx_;
-  // Index of the relocation section.
-  unsigned int reloc_shndx_;
-  // Type of the relocation section (SHT_REL or SHT_RELA).
-  unsigned int reloc_type_;
-  // Index of the .debug_str section.
-  unsigned int string_shndx_;
-  // The buffer for the debug info.
-  const unsigned char* buffer_;
-  const unsigned char* buffer_end_;
-  // Offset of the current compilation unit.
-  off_t cu_offset_;
-  // Length of the current compilation unit.
-  off_t cu_length_;
-  // Size of a DWARF offset for the current compilation unit.
-  unsigned int offset_size_;
-  // Size of an address for the target architecture.
-  unsigned int address_size_;
-  // Compilation unit version number.
-  unsigned int cu_version_;
-  // Type signature (for a type unit).
-  uint64_t type_signature_;
-  // Offset from the type unit header to the type DIE (for a type unit).
-  off_t type_offset_;
-  // Abbreviations table for current compilation unit.
-  Dwarf_abbrev_table abbrev_table_;
-  // Ranges table for the current compilation unit.
-  Dwarf_ranges_table ranges_table_;
-  // Relocation mapper for the section.
-  Elf_reloc_mapper* reloc_mapper_;
-  // The buffer for the debug string table.
-  const char* string_buffer_;
-  const char* string_buffer_end_;
-  // True if this object owns the buffer and needs to delete it.
-  bool owns_string_buffer_;
-  // For incremental update links, this will hold the offset of the
-  // input .debug_str section within the output section.  Offsets read
-  // from relocated data will be relative to the output section, and need
-  // to be corrected before reading data from the input section.
-  uint64_t string_output_section_offset_;
-};
+class Track_relocs;
+struct LineStateMachine;
 
 // We can't do better than to keep the offsets in a sorted vector.
 // Here, offset is the key, and file_num/line_num is the value.
@@ -926,13 +120,6 @@ class Sized_dwarf_line_info : public Dwarf_line_info
   // information that pertains to the specified section.
   Sized_dwarf_line_info(Object* object, unsigned int read_shndx = -1U);
 
-  virtual
-  ~Sized_dwarf_line_info()
-  {
-    if (this->buffer_start_ != NULL)
-      delete[] this->buffer_start_;
-  }
-
  private:
   std::string
   do_addr2line(unsigned int shndx, off_t offset,
@@ -946,12 +133,18 @@ class Sized_dwarf_line_info : public Dwarf_line_info
   // If SHNDX is non-negative, only store debug information that
   // pertains to the specified section.
   void
-  read_line_mappings(unsigned int shndx);
+  read_line_mappings(Object*, unsigned int shndx);
 
   // Reads the relocation section associated with .debug_line and
   // stores relocation information in reloc_map_.
   void
-  read_relocs();
+  read_relocs(Object*);
+
+  // Looks in the symtab to see what section a symbol is in.
+  unsigned int
+  symbol_section(Object*, unsigned int sym,
+                 typename elfcpp::Elf_types<size>::Elf_Addr* value,
+		 bool* is_ordinary);
 
   // Reads the DWARF2/3 header for this line info.  Each takes as input
   // a starting buffer position, and returns the ending position.
@@ -1006,13 +199,9 @@ class Sized_dwarf_line_info : public Dwarf_line_info
   // the line info to read is.
   const unsigned char* buffer_;
   const unsigned char* buffer_end_;
-  // If the buffer was allocated temporarily, and therefore must be
-  // deallocated in the dtor, this contains a pointer to the start
-  // of the buffer.
-  const unsigned char* buffer_start_;
 
   // This has relocations that point into buffer.
-  Sized_elf_reloc_mapper<size, big_endian>* reloc_mapper_;
+  Track_relocs<size, big_endian> track_relocs_;
   // The type of the reloc section in track_relocs_--SHT_REL or SHT_RELA.
   unsigned int track_relocs_type_;
 
@@ -1032,7 +221,9 @@ class Sized_dwarf_line_info : public Dwarf_line_info
 
   // A sorted map from offset of the relocation target to the shndx
   // and addend for the relocation.
-  typedef std::map<off_t, std::pair<unsigned int, off_t> >
+  typedef std::map<typename elfcpp::Elf_types<size>::Elf_Addr,
+                   std::pair<unsigned int,
+                             typename elfcpp::Elf_types<size>::Elf_Swxword> >
   Reloc_map;
   Reloc_map reloc_map_;
 
diff --git a/gold/dynobj.h b/gold/dynobj.h
index e027485f38..186b67cf7e 100644
--- a/gold/dynobj.h
+++ b/gold/dynobj.h
@@ -208,19 +208,9 @@ class Sized_dynobj : public Dynobj
 
   // Return a view of the contents of a section.  Set *PLEN to the
   // size.
-  const unsigned char*
-  do_section_contents(unsigned int shndx, section_size_type* plen,
-		      bool cache)
-  {
-    Location loc(this->elf_file_.section_contents(shndx));
-    *plen = convert_to_section_size_type(loc.data_size);
-    if (*plen == 0)
-      {
-	static const unsigned char empty[1] = { '\0' };
-	return empty;
-      }
-    return this->get_view(loc.file_offset, *plen, true, cache);
-  }
+  Object::Location
+  do_section_contents(unsigned int shndx)
+  { return this->elf_file_.section_contents(shndx); }
 
   // Return section flags.
   uint64_t
diff --git a/gold/expression.cc b/gold/expression.cc
index e31c151c0d..e527b5e382 100644
--- a/gold/expression.cc
+++ b/gold/expression.cc
@@ -1,6 +1,6 @@
 // expression.cc -- expressions in linker scripts for gold
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -77,7 +77,7 @@ Expression::eval(const Symbol_table* symtab, const Layout* layout,
 		 bool check_assertions)
 {
   return this->eval_maybe_dot(symtab, layout, check_assertions,
-			      false, 0, NULL, NULL, NULL, false);
+			      false, 0, NULL, NULL, NULL);
 }
 
 // Evaluate an expression which may refer to the dot symbol.
@@ -87,13 +87,11 @@ Expression::eval_with_dot(const Symbol_table* symtab, const Layout* layout,
 			  bool check_assertions, uint64_t dot_value,
 			  Output_section* dot_section,
 			  Output_section** result_section_pointer,
-			  uint64_t* result_alignment_pointer,
-			  bool is_section_dot_assignment)
+			  uint64_t* result_alignment_pointer)
 {
   return this->eval_maybe_dot(symtab, layout, check_assertions, true,
 			      dot_value, dot_section, result_section_pointer,
-			      result_alignment_pointer,
-			      is_section_dot_assignment);
+			      result_alignment_pointer);
 }
 
 // Evaluate an expression which may or may not refer to the dot
@@ -104,8 +102,7 @@ Expression::eval_maybe_dot(const Symbol_table* symtab, const Layout* layout,
 			   bool check_assertions, bool is_dot_available,
 			   uint64_t dot_value, Output_section* dot_section,
 			   Output_section** result_section_pointer,
-			   uint64_t* result_alignment_pointer,
-			   bool is_section_dot_assignment)
+			   uint64_t* result_alignment_pointer)
 {
   Expression_eval_info eei;
   eei.symtab = symtab;
@@ -116,24 +113,14 @@ Expression::eval_maybe_dot(const Symbol_table* symtab, const Layout* layout,
   eei.dot_section = dot_section;
 
   // We assume the value is absolute, and only set this to a section
-  // if we find a section-relative reference.
+  // if we find a section relative reference.
   if (result_section_pointer != NULL)
     *result_section_pointer = NULL;
   eei.result_section_pointer = result_section_pointer;
 
   eei.result_alignment_pointer = result_alignment_pointer;
 
-  uint64_t val = this->value(&eei);
-
-  // If this is an assignment to dot within a section, and the value
-  // is absolute, treat it as a section-relative offset.
-  if (is_section_dot_assignment && *result_section_pointer == NULL)
-    {
-      gold_assert(dot_section != NULL);
-      val += dot_section->address();
-      *result_section_pointer = dot_section;
-    }
-  return val;
+  return this->value(&eei);
 }
 
 // A number.
@@ -270,8 +257,7 @@ class Unary_expression : public Expression
 				      eei->dot_value,
 				      eei->dot_section,
 				      arg_section_pointer,
-				      eei->result_alignment_pointer,
-				      false);
+				      eei->result_alignment_pointer);
   }
 
   void
@@ -350,8 +336,7 @@ class Binary_expression : public Expression
 				       eei->dot_value,
 				       eei->dot_section,
 				       section_pointer,
-				       alignment_pointer,
-				       false);
+				       alignment_pointer);
   }
 
   uint64_t
@@ -365,8 +350,7 @@ class Binary_expression : public Expression
 					eei->dot_value,
 					eei->dot_section,
 					section_pointer,
-					alignment_pointer,
-					false);
+					alignment_pointer);
   }
 
   void
@@ -516,8 +500,7 @@ class Trinary_expression : public Expression
 				       eei->dot_value,
 				       eei->dot_section,
 				       section_pointer,
-				       NULL,
-				       false);
+				       NULL);
   }
 
   uint64_t
@@ -531,8 +514,7 @@ class Trinary_expression : public Expression
 				       eei->dot_value,
 				       eei->dot_section,
 				       section_pointer,
-				       alignment_pointer,
-				       false);
+				       alignment_pointer);
   }
 
   uint64_t
@@ -546,8 +528,7 @@ class Trinary_expression : public Expression
 				       eei->dot_value,
 				       eei->dot_section,
 				       section_pointer,
-				       alignment_pointer,
-				       false);
+				       alignment_pointer);
   }
 
   void
diff --git a/gold/fileread.cc b/gold/fileread.cc
index c5dc320c34..80ddfbc09f 100644
--- a/gold/fileread.cc
+++ b/gold/fileread.cc
@@ -329,10 +329,6 @@ inline File_read::View*
 File_read::find_view(off_t start, section_size_type size,
 		     unsigned int byteshift, File_read::View** vshifted) const
 {
-  gold_assert(start <= this->size_
-	      && (static_cast<unsigned long long>(size)
-		  <= static_cast<unsigned long long>(this->size_ - start)));
-
   if (vshifted != NULL)
     *vshifted = NULL;
 
@@ -460,9 +456,16 @@ File_read::make_view(off_t start, section_size_type size,
 		     unsigned int byteshift, bool cache)
 {
   gold_assert(size > 0);
-  gold_assert(start <= this->size_
-	      && (static_cast<unsigned long long>(size)
-		  <= static_cast<unsigned long long>(this->size_ - start)));
+
+  // Check that start and end of the view are within the file.
+  if (start > this->size_
+      || (static_cast<unsigned long long>(size)
+          > static_cast<unsigned long long>(this->size_ - start)))
+    gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
+                 "size of file; the file may be corrupt"),
+		   this->filename().c_str(),
+		   static_cast<long long>(size),
+		   static_cast<long long>(start));
 
   off_t poff = File_read::page_offset(start);
 
@@ -520,16 +523,6 @@ File_read::View*
 File_read::find_or_make_view(off_t offset, off_t start,
 			     section_size_type size, bool aligned, bool cache)
 {
-  // Check that start and end of the view are within the file.
-  if (start > this->size_
-      || (static_cast<unsigned long long>(size)
-          > static_cast<unsigned long long>(this->size_ - start)))
-    gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
-                 "size of file; the file may be corrupt"),
-		   this->filename().c_str(),
-		   static_cast<long long>(size),
-		   static_cast<long long>(start));
-
   unsigned int byteshift;
   if (offset == 0)
     byteshift = 0;
diff --git a/gold/gold.cc b/gold/gold.cc
index f810bf913b..12f25b7c41 100644
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -45,7 +45,6 @@
 #include "gc.h"
 #include "icf.h"
 #include "incremental.h"
-#include "timer.h"
 
 namespace gold
 {
@@ -198,28 +197,45 @@ queue_initial_tasks(const General_options& options,
   // For incremental links, the base output file.
   Incremental_binary* ibase = NULL;
 
-  if (parameters->incremental_update())
-    {
-      Output_file* of = new Output_file(options.output_file_name());
-      if (of->open_base_file(options.incremental_base(), true))
+  if (parameters->incremental())
+    {
+      if (options.relocatable())
+	gold_error(_("incremental linking is incompatible with -r"));
+      if (options.emit_relocs())
+	gold_error(_("incremental linking is incompatible with --emit-relocs"));
+      if (options.gc_sections())
+	gold_error(_("incremental linking is incompatible with --gc-sections"));
+      if (options.icf_enabled())
+	gold_error(_("incremental linking is incompatible with --icf"));
+      if (options.has_plugins())
+	gold_error(_("incremental linking is incompatible with --plugin"));
+      if (strcmp(options.compress_debug_sections(), "none") != 0)
+	gold_error(_("incremental linking is incompatible with "
+		     "--compress-debug-sections"));
+
+      if (parameters->incremental_update())
 	{
-	  ibase = open_incremental_binary(of);
-	  if (ibase != NULL
-	      && ibase->check_inputs(cmdline, layout->incremental_inputs()))
-	    ibase->init_layout(layout);
-	  else
+	  Output_file* of = new Output_file(options.output_file_name());
+	  if (of->open_base_file(options.incremental_base(), true))
 	    {
-	      delete ibase;
-	      ibase = NULL;
-	      of->close();
+	      ibase = open_incremental_binary(of);
+	      if (ibase != NULL
+		  && ibase->check_inputs(cmdline, layout->incremental_inputs()))
+		ibase->init_layout(layout);
+	      else
+		{
+		  delete ibase;
+		  ibase = NULL;
+		  of->close();
+		}
+	    }
+	  if (ibase == NULL)
+	    {
+	      if (set_parameters_incremental_full())
+		gold_info(_("linking with --incremental-full"));
+	      else
+		gold_fallback(_("restart link with --incremental-full"));
 	    }
-	}
-      if (ibase == NULL)
-	{
-	  if (set_parameters_incremental_full())
-	    gold_info(_("linking with --incremental-full"));
-	  else
-	    gold_fallback(_("restart link with --incremental-full"));
 	}
     }
 
@@ -488,10 +504,6 @@ queue_middle_tasks(const General_options& options,
 		   Workqueue* workqueue,
 		   Mapfile* mapfile)
 {
-  Timer* timer = parameters->timer();
-  if (timer != NULL)
-    timer->stamp(0);
-
   // Add any symbols named with -u options to the symbol table.
   symtab->add_undefined_symbols_from_command_line(layout);
 
@@ -544,20 +556,6 @@ queue_middle_tasks(const General_options& options,
         }
     }
 
-  /* If plugins have specified a section order, re-arrange input sections
-     according to a specified section order.  If --section-ordering-file is
-     also specified, do not do anything here.  */
-  if (parameters->options().has_plugins()
-      && layout->is_section_ordering_specified()
-      && !parameters->options().section_ordering_file ())
-    {
-      for (Layout::Section_list::const_iterator p
-	     = layout->section_list().begin();
-           p != layout->section_list().end();
-           ++p)
-        (*p)->update_section_layout(layout->get_section_order_map());
-    }
-
   // Layout deferred objects due to plugins.
   if (parameters->options().has_plugins())
     {
@@ -679,8 +677,6 @@ queue_middle_tasks(const General_options& options,
   // Attach sections to segments.
   layout->attach_sections_to_segments();
 
-  // TODO(csilvers): figure out a more principled way to get the target
-  Target* target = const_cast<Target*>(&parameters->target());
   if (!parameters->options().relocatable())
     {
       // Predefine standard symbols.
@@ -689,9 +685,6 @@ queue_middle_tasks(const General_options& options,
       // Define __start and __stop symbols for output sections where
       // appropriate.
       layout->define_section_symbols(symtab);
-
-      // Define target-specific symbols.
-      target->define_standard_symbols(symtab, layout);
     }
 
   // Make sure we have symbols for any required group signatures.
@@ -773,6 +766,8 @@ queue_middle_tasks(const General_options& options,
 
   // When all those tasks are complete, we can start laying out the
   // output file.
+  // TODO(csilvers): figure out a more principled way to get the target
+  Target* target = const_cast<Target*>(&parameters->target());
   workqueue->queue(new Task_function(new Layout_task_runner(options,
 							    input_objects,
 							    symtab,
@@ -794,10 +789,6 @@ queue_final_tasks(const General_options& options,
 		  Workqueue* workqueue,
 		  Output_file* of)
 {
-  Timer* timer = parameters->timer();
-  if (timer != NULL)
-    timer->stamp(1);
-
   int thread_count = options.thread_count_final();
   if (thread_count == 0)
     thread_count = std::max(2, input_objects->number_of_input_objects());
diff --git a/gold/i386.cc b/gold/i386.cc
index b4174bc57f..445bc68a94 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -1,7 +1,6 @@
 // i386.cc -- i386 target support for gold.
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
-// Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -2710,6 +2709,12 @@ Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo,
             }
           if (optimized_type == tls::TLSOPT_TO_IE)
 	    {
+	      if (tls_segment == NULL)
+		{
+		  gold_assert(parameters->errors()->error_count() > 0
+			      || issue_undefined_symbol_error(gsym));
+		  return;
+		}
 	      this->tls_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
                                  got_offset, view, view_size);
               break;
@@ -3471,55 +3476,46 @@ Target_i386::do_code_fill(section_size_type length) const
       jmp[0] = 0xe9;
       elfcpp::Swap_unaligned<32, false>::writeval(jmp + 1, length - 5);
       return (std::string(reinterpret_cast<char*>(&jmp[0]), 5)
-              + std::string(length - 5, static_cast<char>(0x90)));
+              + std::string(length - 5, '\0'));
     }
 
   // Nop sequences of various lengths.
-  const char nop1[1] = { '\x90' };                   // nop
-  const char nop2[2] = { '\x66', '\x90' };           // xchg %ax %ax
-  const char nop3[3] = { '\x8d', '\x76', '\x00' };   // leal 0(%esi),%esi
-  const char nop4[4] = { '\x8d', '\x74', '\x26',     // leal 0(%esi,1),%esi
-			 '\x00'};
-  const char nop5[5] = { '\x90', '\x8d', '\x74',     // nop
-  			 '\x26', '\x00' };           // leal 0(%esi,1),%esi
-  const char nop6[6] = { '\x8d', '\xb6', '\x00',     // leal 0L(%esi),%esi
-  			 '\x00', '\x00', '\x00' };
-  const char nop7[7] = { '\x8d', '\xb4', '\x26',     // leal 0L(%esi,1),%esi
-  			 '\x00', '\x00', '\x00',
-			 '\x00' };
-  const char nop8[8] = { '\x90', '\x8d', '\xb4',     // nop
-  			 '\x26', '\x00', '\x00',     // leal 0L(%esi,1),%esi
-			 '\x00', '\x00' };
-  const char nop9[9] = { '\x89', '\xf6', '\x8d',     // movl %esi,%esi
-  			 '\xbc', '\x27', '\x00',     // leal 0L(%edi,1),%edi
-			 '\x00', '\x00', '\x00' };
-  const char nop10[10] = { '\x8d', '\x76', '\x00',   // leal 0(%esi),%esi
-  			   '\x8d', '\xbc', '\x27',   // leal 0L(%edi,1),%edi
-			   '\x00', '\x00', '\x00',
-			   '\x00' };
-  const char nop11[11] = { '\x8d', '\x74', '\x26',   // leal 0(%esi,1),%esi
-  			   '\x00', '\x8d', '\xbc',   // leal 0L(%edi,1),%edi
-			   '\x27', '\x00', '\x00',
-			   '\x00', '\x00' };
-  const char nop12[12] = { '\x8d', '\xb6', '\x00',   // leal 0L(%esi),%esi
-  			   '\x00', '\x00', '\x00',   // leal 0L(%edi),%edi
-			   '\x8d', '\xbf', '\x00',
-			   '\x00', '\x00', '\x00' };
-  const char nop13[13] = { '\x8d', '\xb6', '\x00',   // leal 0L(%esi),%esi
-  			   '\x00', '\x00', '\x00',   // leal 0L(%edi,1),%edi
-			   '\x8d', '\xbc', '\x27',
-			   '\x00', '\x00', '\x00',
-                           '\x00' };
-  const char nop14[14] = { '\x8d', '\xb4', '\x26',   // leal 0L(%esi,1),%esi
-  			   '\x00', '\x00', '\x00',   // leal 0L(%edi,1),%edi
-			   '\x00', '\x8d', '\xbc',
-			   '\x27', '\x00', '\x00',
-                           '\x00', '\x00' };
-  const char nop15[15] = { '\xeb', '\x0d', '\x90',   // jmp .+15
-  			   '\x90', '\x90', '\x90',   // nop,nop,nop,...
-			   '\x90', '\x90', '\x90',
-			   '\x90', '\x90', '\x90',
-                           '\x90', '\x90', '\x90' };
+  const char nop1[1] = { 0x90 };                   // nop
+  const char nop2[2] = { 0x66, 0x90 };             // xchg %ax %ax
+  const char nop3[3] = { 0x8d, 0x76, 0x00 };       // leal 0(%esi),%esi
+  const char nop4[4] = { 0x8d, 0x74, 0x26, 0x00};  // leal 0(%esi,1),%esi
+  const char nop5[5] = { 0x90, 0x8d, 0x74, 0x26,   // nop
+                         0x00 };                   // leal 0(%esi,1),%esi
+  const char nop6[6] = { 0x8d, 0xb6, 0x00, 0x00,   // leal 0L(%esi),%esi
+                         0x00, 0x00 };
+  const char nop7[7] = { 0x8d, 0xb4, 0x26, 0x00,   // leal 0L(%esi,1),%esi
+                         0x00, 0x00, 0x00 };
+  const char nop8[8] = { 0x90, 0x8d, 0xb4, 0x26,   // nop
+                         0x00, 0x00, 0x00, 0x00 }; // leal 0L(%esi,1),%esi
+  const char nop9[9] = { 0x89, 0xf6, 0x8d, 0xbc,   // movl %esi,%esi
+                         0x27, 0x00, 0x00, 0x00,   // leal 0L(%edi,1),%edi
+                         0x00 };
+  const char nop10[10] = { 0x8d, 0x76, 0x00, 0x8d, // leal 0(%esi),%esi
+                           0xbc, 0x27, 0x00, 0x00, // leal 0L(%edi,1),%edi
+                           0x00, 0x00 };
+  const char nop11[11] = { 0x8d, 0x74, 0x26, 0x00, // leal 0(%esi,1),%esi
+                           0x8d, 0xbc, 0x27, 0x00, // leal 0L(%edi,1),%edi
+                           0x00, 0x00, 0x00 };
+  const char nop12[12] = { 0x8d, 0xb6, 0x00, 0x00, // leal 0L(%esi),%esi
+                           0x00, 0x00, 0x8d, 0xbf, // leal 0L(%edi),%edi
+                           0x00, 0x00, 0x00, 0x00 };
+  const char nop13[13] = { 0x8d, 0xb6, 0x00, 0x00, // leal 0L(%esi),%esi
+                           0x00, 0x00, 0x8d, 0xbc, // leal 0L(%edi,1),%edi
+                           0x27, 0x00, 0x00, 0x00,
+                           0x00 };
+  const char nop14[14] = { 0x8d, 0xb4, 0x26, 0x00, // leal 0L(%esi,1),%esi
+                           0x00, 0x00, 0x00, 0x8d, // leal 0L(%edi,1),%edi
+                           0xbc, 0x27, 0x00, 0x00,
+                           0x00, 0x00 };
+  const char nop15[15] = { 0xeb, 0x0d, 0x90, 0x90, // jmp .+15
+                           0x90, 0x90, 0x90, 0x90, // nop,nop,nop,...
+                           0x90, 0x90, 0x90, 0x90,
+                           0x90, 0x90, 0x90 };
 
   const char* nops[16] = {
     NULL,
diff --git a/gold/incremental.cc b/gold/incremental.cc
index 60097a8ebc..b422827e5a 100644
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -632,7 +632,7 @@ Sized_incremental_binary<size, big_endian>::do_process_got_plt(
   // Tell the target how big the GOT and PLT sections are.
   unsigned int got_count = got_plt_reader.get_got_entry_count();
   unsigned int plt_count = got_plt_reader.get_plt_entry_count();
-  Output_data_got_base* got =
+  Output_data_got<size, big_endian>* got =
       target->init_got_plt_for_update(symtab, layout, got_count, plt_count);
 
   // Read the GOT entries from the base file and build the outgoing GOT.
@@ -685,7 +685,7 @@ Sized_incremental_binary<size, big_endian>::do_process_got_plt(
       gold_assert(plt_desc >= first_global && plt_desc < symtab_count);
       Symbol* sym = this->global_symbol(plt_desc - first_global);
       // Add the PLT entry only if the symbol is still referenced.
-      if (sym != NULL && sym->in_reg())
+      if (sym->in_reg())
 	{
 	  gold_debug(DEBUG_INCREMENTAL,
 		     "PLT entry %d: %s",
@@ -1632,8 +1632,7 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(
 		Swap32::writeval(pov + 4, shndx);
 		Swap32::writeval(pov + 8, chain);
 		Swap32::writeval(pov + 12, nrelocs);
-		Swap32::writeval(pov + 16,
-				 first_reloc * (8 + 2 * sizeof_addr));
+		Swap32::writeval(pov + 16, first_reloc * 3 * sizeof_addr);
 		pov += 20;
 	      }
 
@@ -1967,9 +1966,8 @@ Sized_relobj_incr<size, big_endian>::Sized_relobj_incr(
     input_reader_(ibase->inputs_reader().input_file(input_file_index)),
     local_symbol_count_(0), output_local_dynsym_count_(0),
     local_symbol_index_(0), local_symbol_offset_(0), local_dynsym_offset_(0),
-    symbols_(), defined_count_(0), incr_reloc_offset_(-1U),
-    incr_reloc_count_(0), incr_reloc_output_index_(0), incr_relocs_(NULL),
-    local_symbols_()
+    symbols_(), incr_reloc_offset_(-1U), incr_reloc_count_(0),
+    incr_reloc_output_index_(0), incr_relocs_(NULL), local_symbols_()
 {
   if (this->input_reader_.is_in_system_directory())
     this->set_is_in_system_directory();
@@ -2002,11 +2000,6 @@ Sized_relobj_incr<size, big_endian>::do_layout(
   Output_sections& out_sections(this->output_sections());
   out_sections.resize(shnum);
   this->section_offsets().resize(shnum);
-
-  // Keep track of .debug_info and .debug_types sections.
-  std::vector<unsigned int> debug_info_sections;
-  std::vector<unsigned int> debug_types_sections;
-
   for (unsigned int i = 1; i < shnum; i++)
     {
       typename Input_entry_reader::Input_section_info sect =
@@ -2020,18 +2013,6 @@ Sized_relobj_incr<size, big_endian>::do_layout(
       gold_assert(os != NULL);
       out_sections[i] = os;
       this->section_offsets()[i] = static_cast<Address>(sect.sh_offset);
-
-      // When generating a .gdb_index section, we do additional
-      // processing of .debug_info and .debug_types sections after all
-      // the other sections.
-      if (parameters->options().gdb_index())
-	{
-	  const char* name = os->name();
-	  if (strcmp(name, ".debug_info") == 0)
-	    debug_info_sections.push_back(i);
-	  else if (strcmp(name, ".debug_types") == 0)
-	    debug_types_sections.push_back(i);
-	}
     }
 
   // Process the COMDAT groups.
@@ -2049,25 +2030,6 @@ Sized_relobj_incr<size, big_endian>::do_layout(
         this->error(_("COMDAT group %s included twice in incremental link"),
 		    signature);
     }
-
-  // When building a .gdb_index section, scan the .debug_info and
-  // .debug_types sections.
-  for (std::vector<unsigned int>::const_iterator p
-	   = debug_info_sections.begin();
-       p != debug_info_sections.end();
-       ++p)
-    {
-      unsigned int i = *p;
-      layout->add_to_gdb_index(false, this, NULL, 0, i, 0, 0);
-    }
-  for (std::vector<unsigned int>::const_iterator p
-	   = debug_types_sections.begin();
-       p != debug_types_sections.end();
-       ++p)
-    {
-      unsigned int i = *p;
-      layout->add_to_gdb_index(true, this, 0, 0, i, 0, 0);
-    }
 }
 
 // Layout sections whose layout was deferred while waiting for
@@ -2158,9 +2120,6 @@ Sized_relobj_incr<size, big_endian>::do_add_symbols(
 
       Symbol* res = symtab->add_from_incrobj(this, name, NULL, &sym);
 
-      if (shndx != elfcpp::SHN_UNDEF)
-        ++this->defined_count_;
-
       // If this is a linker-defined symbol that hasn't yet been defined,
       // define it now.
       if (input_shndx == -1U && !res->is_defined())
@@ -2229,39 +2188,22 @@ Sized_relobj_incr<size, big_endian>::do_section_size(unsigned int)
   gold_unreachable();
 }
 
-// Get the name of a section.  This returns the name of the output
-// section, because we don't usually track the names of the input
-// sections.
+// Get the name of a section.
 
 template<int size, bool big_endian>
 std::string
-Sized_relobj_incr<size, big_endian>::do_section_name(unsigned int shndx)
+Sized_relobj_incr<size, big_endian>::do_section_name(unsigned int)
 {
-  Output_sections& out_sections(this->output_sections());
-  Output_section* os = out_sections[shndx];
-  if (os == NULL)
-    return NULL;
-  return os->name();
+  gold_unreachable();
 }
 
 // Return a view of the contents of a section.
 
 template<int size, bool big_endian>
-const unsigned char*
-Sized_relobj_incr<size, big_endian>::do_section_contents(
-    unsigned int shndx,
-    section_size_type* plen,
-    bool)
+Object::Location
+Sized_relobj_incr<size, big_endian>::do_section_contents(unsigned int)
 {
-  Output_sections& out_sections(this->output_sections());
-  Output_section* os = out_sections[shndx];
-  gold_assert(os != NULL);
-  off_t section_offset = os->offset();
-  typename Input_entry_reader::Input_section_info sect =
-      this->input_reader_.get_input_section(shndx - 1);
-  section_offset += sect.sh_offset;
-  *plen = sect.sh_size;
-  return this->ibase_->view(section_offset, sect.sh_size).data();
+  gold_unreachable();
 }
 
 // Return section flags.
@@ -2341,21 +2283,9 @@ Sized_relobj_incr<size, big_endian>::do_initialize_xindex()
 template<int size, bool big_endian>
 void
 Sized_relobj_incr<size, big_endian>::do_get_global_symbol_counts(
-    const Symbol_table*,
-    size_t* defined,
-    size_t* used) const
-{
-  *defined = this->defined_count_;
-  size_t count = 0;
-  for (typename Symbols::const_iterator p = this->symbols_.begin();
-       p != this->symbols_.end();
-       ++p)
-    if (*p != NULL
-	&& (*p)->source() == Symbol::FROM_OBJECT
-	&& (*p)->object() == this
-	&& (*p)->is_defined())
-      ++count;
-  *used = count;
+    const Symbol_table*, size_t*, size_t*) const
+{
+  gold_unreachable();
 }
 
 // Read the relocs.
@@ -2649,7 +2579,7 @@ Sized_incr_dynobj<size, big_endian>::Sized_incr_dynobj(
   : Dynobj(name, NULL), ibase_(ibase),
     input_file_index_(input_file_index),
     input_reader_(ibase->inputs_reader().input_file(input_file_index)),
-    symbols_(), defined_count_(0)
+    symbols_()
 {
   if (this->input_reader_.is_in_system_directory())
     this->set_is_in_system_directory();
@@ -2747,7 +2677,6 @@ Sized_incr_dynobj<size, big_endian>::do_add_symbols(
 	  // is meaningless, as long as it's not SHN_UNDEF.
 	  shndx = 1;
 	  v = gsym.get_st_value();
-	  ++this->defined_count_;
 	}
 
       osym.put_st_name(0);
@@ -2833,11 +2762,8 @@ Sized_incr_dynobj<size, big_endian>::do_section_name(unsigned int)
 // Return a view of the contents of a section.
 
 template<int size, bool big_endian>
-const unsigned char*
-Sized_incr_dynobj<size, big_endian>::do_section_contents(
-    unsigned int,
-    section_size_type*,
-    bool)
+Object::Location
+Sized_incr_dynobj<size, big_endian>::do_section_contents(unsigned int)
 {
   gold_unreachable();
 }
@@ -2919,22 +2845,9 @@ Sized_incr_dynobj<size, big_endian>::do_initialize_xindex()
 template<int size, bool big_endian>
 void
 Sized_incr_dynobj<size, big_endian>::do_get_global_symbol_counts(
-    const Symbol_table*,
-    size_t* defined,
-    size_t* used) const
-{
-  *defined = this->defined_count_;
-  size_t count = 0;
-  for (typename Symbols::const_iterator p = this->symbols_.begin();
-       p != this->symbols_.end();
-       ++p)
-    if (*p != NULL
-	&& (*p)->source() == Symbol::FROM_OBJECT
-	&& (*p)->object() == this
-	&& (*p)->is_defined()
-	&& (*p)->dynsym_index() != -1U)
-      ++count;
-  *used = count;
+    const Symbol_table*, size_t*, size_t*) const
+{
+  gold_unreachable();
 }
 
 // Allocate an incremental object of the appropriate size and endianness.
diff --git a/gold/incremental.h b/gold/incremental.h
index b631ae225f..e6732df5ac 100644
--- a/gold/incremental.h
+++ b/gold/incremental.h
@@ -1,6 +1,6 @@
 // inremental.h -- incremental linking support for gold   -*- C++ -*-
 
-// Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2009, 2010 Free Software Foundation, Inc.
 // Written by Mikolaj Zalewski <mikolajz@google.com>.
 
 // This file is part of gold.
@@ -1880,9 +1880,8 @@ class Sized_relobj_incr : public Sized_relobj<size, big_endian>
   do_section_name(unsigned int shndx);
 
   // Return a view of the contents of a section.
-  const unsigned char*
-  do_section_contents(unsigned int shndx, section_size_type* plen,
-		      bool cache);
+  Object::Location
+  do_section_contents(unsigned int shndx);
 
   // Return section flags.
   uint64_t
@@ -1925,15 +1924,6 @@ class Sized_relobj_incr : public Sized_relobj<size, big_endian>
   do_get_global_symbols() const
   { return &this->symbols_; }
 
-  // Return the value of a local symbol.
-  uint64_t
-  do_local_symbol_value(unsigned int, uint64_t) const
-  { gold_unreachable(); }
-
-  unsigned int
-  do_local_plt_offset(unsigned int) const
-  { gold_unreachable(); }
-
   // Return the number of local symbols.
   unsigned int
   do_local_symbol_count() const
@@ -2006,8 +1996,6 @@ class Sized_relobj_incr : public Sized_relobj<size, big_endian>
   unsigned int local_dynsym_offset_;
   // The entries in the symbol table for the external symbols.
   Symbols symbols_;
-  // Number of symbols defined in object file itself.
-  size_t defined_count_;
   // The offset of the first incremental relocation for this object.
   unsigned int incr_reloc_offset_;
   // The number of incremental relocations for this object.
@@ -2087,9 +2075,8 @@ class Sized_incr_dynobj : public Dynobj
   do_section_name(unsigned int shndx);
 
   // Return a view of the contents of a section.
-  const unsigned char*
-  do_section_contents(unsigned int shndx, section_size_type* plen,
-		      bool cache);
+  Object::Location
+  do_section_contents(unsigned int shndx);
 
   // Return section flags.
   uint64_t
@@ -2140,8 +2127,6 @@ class Sized_incr_dynobj : public Dynobj
   Input_entry_reader input_reader_;
   // The entries in the symbol table for the external symbols.
   Symbols symbols_;
-  // Number of symbols defined in object file itself.
-  size_t defined_count_;
 };
 
 // Allocate an incremental object of the appropriate size and endianness.
diff --git a/gold/int_encoding.cc b/gold/int_encoding.cc
index 78874779b2..6d635ac267 100644
--- a/gold/int_encoding.cc
+++ b/gold/int_encoding.cc
@@ -32,20 +32,19 @@ namespace gold {
 
 // Read an unsigned LEB128 number.  Each byte contains 7 bits of
 // information, plus one bit saying whether the number continues or
-// not.  BYTE contains the first byte of the number, and is guaranteed
-// to have the continuation bit set.
+// not.
 
 uint64_t
-read_unsigned_LEB_128_x(const unsigned char* buffer, size_t* len,
-			unsigned char byte)
+read_unsigned_LEB_128(const unsigned char* buffer, size_t* len)
 {
-  uint64_t result = static_cast<uint64_t>(byte & 0x7f);
-  size_t num_read = 1;
-  unsigned int shift = 7;
+  uint64_t result = 0;
+  size_t num_read = 0;
+  unsigned int shift = 0;
+  unsigned char byte;
 
   do
     {
-      if (num_read > 64 / 7 + 1)
+      if (num_read >= 64 / 7) 
         {
           gold_warning(_("Unusually large LEB128 decoded, "
 			 "debug information may be corrupted"));
@@ -65,20 +64,18 @@ read_unsigned_LEB_128_x(const unsigned char* buffer, size_t* len,
 
 // Read a signed LEB128 number.  These are like regular LEB128
 // numbers, except the last byte may have a sign bit set.
-// BYTE contains the first byte of the number, and is guaranteed
-// to have the continuation bit set.
 
 int64_t
-read_signed_LEB_128_x(const unsigned char* buffer, size_t* len,
-		      unsigned char byte)
+read_signed_LEB_128(const unsigned char* buffer, size_t* len)
 {
-  int64_t result = static_cast<uint64_t>(byte & 0x7f);
-  int shift = 7;
-  size_t num_read = 1;
+  int64_t result = 0;
+  int shift = 0;
+  size_t num_read = 0;
+  unsigned char byte;
 
   do
     {
-      if (num_read > 64 / 7 + 1)
+      if (num_read >= 64 / 7) 
         {
           gold_warning(_("Unusually large LEB128 decoded, "
 			 "debug information may be corrupted"));
diff --git a/gold/int_encoding.h b/gold/int_encoding.h
index 467d2244ce..6485a93107 100644
--- a/gold/int_encoding.h
+++ b/gold/int_encoding.h
@@ -38,48 +38,16 @@ namespace gold
 //
 
 // Read a ULEB 128 encoded integer from BUFFER.  Return the length of the
-// encoded integer at the location PLEN.  The common case of a single-byte
-// value is handled inline, and multi-byte values are processed by the _x
-// routine, where BYTE is the first byte of the value.
+// encoded integer at the location PLEN. 
 
 uint64_t
-read_unsigned_LEB_128_x(const unsigned char* buffer, size_t* plen,
-			unsigned char byte);
-
-inline uint64_t
-read_unsigned_LEB_128(const unsigned char* buffer, size_t* plen)
-{
-  unsigned char byte = *buffer++;
-
-  if ((byte & 0x80) != 0)
-    return read_unsigned_LEB_128_x(buffer, plen, byte);
-
-  *plen = 1;
-  return static_cast<uint64_t>(byte);
-}
+read_unsigned_LEB_128(const unsigned char* buffer, size_t* plen);
 
 // Read an SLEB 128 encoded integer from BUFFER.  Return the length of the
-// encoded integer at the location PLEN.  The common case of a single-byte
-// value is handled inline, and multi-byte values are processed by the _x
-// routine, where BYTE is the first byte of the value.
+// encoded integer at the location PLEN. 
 
 int64_t
-read_signed_LEB_128_x(const unsigned char* buffer, size_t* plen,
-		      unsigned char byte);
-
-inline int64_t
-read_signed_LEB_128(const unsigned char* buffer, size_t* plen)
-{
-  unsigned char byte = *buffer++;
-
-  if ((byte & 0x80) != 0)
-    return read_signed_LEB_128_x(buffer, plen, byte);
-
-  *plen = 1;
-  if (byte & 0x40)
-    return -(static_cast<int64_t>(1) << 7) | static_cast<int64_t>(byte);
-  return static_cast<int64_t>(byte);
-}
+read_signed_LEB_128(const unsigned char* buffer, size_t* plen);
 
 // Write a ULEB 128 encoded VALUE to BUFFER.
 
diff --git a/gold/layout.cc b/gold/layout.cc
index 65d1432d7b..1c32bcfd06 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -44,7 +44,6 @@
 #include "symtab.h"
 #include "dynobj.h"
 #include "ehframe.h"
-#include "gdb-index.h"
 #include "compressed_output.h"
 #include "reduced_debug_output.h"
 #include "object.h"
@@ -391,7 +390,6 @@ Layout::Layout(int number_of_input_files, Script_options* script_options)
     eh_frame_data_(NULL),
     added_eh_frame_data_(false),
     eh_frame_hdr_section_(NULL),
-    gdb_index_data_(NULL),
     build_id_note_(NULL),
     debug_abbrev_(NULL),
     debug_info_(NULL),
@@ -412,7 +410,6 @@ Layout::Layout(int number_of_input_files, Script_options* script_options)
     script_output_section_data_list_(),
     segment_states_(NULL),
     relaxation_debug_check_(NULL),
-    section_order_map_(),
     input_section_position_(),
     input_section_glob_(),
     incremental_base_(NULL),
@@ -907,13 +904,6 @@ Layout::init_fixed_output_section(const char* name,
   if (!can_incremental_update(sh_type))
     return NULL;
 
-  // If we're generating a .gdb_index section, we need to regenerate
-  // it from scratch.
-  if (parameters->options().gdb_index()
-      && sh_type == elfcpp::SHT_PROGBITS
-      && strcmp(name, ".gdb_index") == 0)
-    return NULL;
-
   typename elfcpp::Elf_types<size>::Elf_Addr sh_addr = shdr.get_sh_addr();
   typename elfcpp::Elf_types<size>::Elf_Off sh_offset = shdr.get_sh_offset();
   typename elfcpp::Elf_types<size>::Elf_WXword sh_size = shdr.get_sh_size();
@@ -1301,38 +1291,6 @@ Layout::add_eh_frame_for_plt(Output_data* plt, const unsigned char* cie_data,
     }
 }
 
-// Scan a .debug_info or .debug_types section, and add summary
-// information to the .gdb_index section.
-
-template<int size, bool big_endian>
-void
-Layout::add_to_gdb_index(bool is_type_unit,
-			 Sized_relobj<size, big_endian>* object,
-			 const unsigned char* symbols,
-			 off_t symbols_size,
-			 unsigned int shndx,
-			 unsigned int reloc_shndx,
-			 unsigned int reloc_type)
-{
-  if (this->gdb_index_data_ == NULL)
-    {
-      Output_section* os = this->choose_output_section(NULL, ".gdb_index",
-						       elfcpp::SHT_PROGBITS, 0,
-						       false, ORDER_INVALID,
-						       false);
-      if (os == NULL)
-        return;
-
-      this->gdb_index_data_ = new Gdb_index(os);
-      os->add_output_section_data(this->gdb_index_data_);
-      os->set_after_input_sections();
-    }
-
-  this->gdb_index_data_->scan_debug_info(is_type_unit, object, symbols,
-					 symbols_size, shndx, reloc_shndx,
-					 reloc_type);
-}
-
 // Add POSD to an output section using NAME, TYPE, and FLAGS.  Return
 // the output section.
 
@@ -1420,27 +1378,25 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
   bool is_relro_local = false;
   if (!this->script_options_->saw_sections_clause()
       && parameters->options().relro()
+      && type == elfcpp::SHT_PROGBITS
       && (flags & elfcpp::SHF_ALLOC) != 0
       && (flags & elfcpp::SHF_WRITE) != 0)
     {
-      if (type == elfcpp::SHT_PROGBITS)
+      if (strcmp(name, ".data.rel.ro") == 0)
+	is_relro = true;
+      else if (strcmp(name, ".data.rel.ro.local") == 0)
 	{
-	  if (strcmp(name, ".data.rel.ro") == 0)
-	    is_relro = true;
-	  else if (strcmp(name, ".data.rel.ro.local") == 0)
-	    {
-	      is_relro = true;
-	      is_relro_local = true;
-	    }
-	  else if (strcmp(name, ".ctors") == 0
-		   || strcmp(name, ".dtors") == 0
-		   || strcmp(name, ".jcr") == 0)
-	    is_relro = true;
+	  is_relro = true;
+	  is_relro_local = true;
 	}
       else if (type == elfcpp::SHT_INIT_ARRAY
 	       || type == elfcpp::SHT_FINI_ARRAY
 	       || type == elfcpp::SHT_PREINIT_ARRAY)
 	is_relro = true;
+      else if (strcmp(name, ".ctors") == 0
+	       || strcmp(name, ".dtors") == 0
+	       || strcmp(name, ".jcr") == 0)
+	is_relro = true;
     }
 
   if (is_relro)
@@ -3019,9 +2975,8 @@ Layout::segment_precedes(const Output_segment* seg1,
 
   // We shouldn't get here--we shouldn't create segments which we
   // can't distinguish.  Unless of course we are using a weird linker
-  // script or overlapping --section-start options.
-  gold_assert(this->script_options_->saw_phdrs_clause()
-	      || parameters->options().any_section_start());
+  // script.
+  gold_assert(this->script_options_->saw_phdrs_clause());
   return false;
 }
 
@@ -5338,52 +5293,4 @@ Layout::layout_eh_frame<64, true>(Sized_relobj_file<64, true>* object,
 				  off_t* off);
 #endif
 
-#ifdef HAVE_TARGET_32_LITTLE
-template
-void
-Layout::add_to_gdb_index(bool is_type_unit,
-			 Sized_relobj<32, false>* object,
-			 const unsigned char* symbols,
-			 off_t symbols_size,
-			 unsigned int shndx,
-			 unsigned int reloc_shndx,
-			 unsigned int reloc_type);
-#endif
-
-#ifdef HAVE_TARGET_32_BIG
-template
-void
-Layout::add_to_gdb_index(bool is_type_unit,
-			 Sized_relobj<32, true>* object,
-			 const unsigned char* symbols,
-			 off_t symbols_size,
-			 unsigned int shndx,
-			 unsigned int reloc_shndx,
-			 unsigned int reloc_type);
-#endif
-
-#ifdef HAVE_TARGET_64_LITTLE
-template
-void
-Layout::add_to_gdb_index(bool is_type_unit,
-			 Sized_relobj<64, false>* object,
-			 const unsigned char* symbols,
-			 off_t symbols_size,
-			 unsigned int shndx,
-			 unsigned int reloc_shndx,
-			 unsigned int reloc_type);
-#endif
-
-#ifdef HAVE_TARGET_64_BIG
-template
-void
-Layout::add_to_gdb_index(bool is_type_unit,
-			 Sized_relobj<64, true>* object,
-			 const unsigned char* symbols,
-			 off_t symbols_size,
-			 unsigned int shndx,
-			 unsigned int reloc_shndx,
-			 unsigned int reloc_type);
-#endif
-
 } // End namespace gold.
diff --git a/gold/layout.h b/gold/layout.h
index f81ea3b9a7..05cb50fa6a 100644
--- a/gold/layout.h
+++ b/gold/layout.h
@@ -58,7 +58,6 @@ class Output_symtab_xindex;
 class Output_reduced_debug_abbrev_section;
 class Output_reduced_debug_info_section;
 class Eh_frame;
-class Gdb_index;
 class Target;
 struct Timespec;
 
@@ -523,10 +522,6 @@ class Layout
 	 const char* name, const elfcpp::Shdr<size, big_endian>& shdr,
 	 unsigned int reloc_shndx, unsigned int reloc_type, off_t* offset);
 
-  std::map<Section_id, unsigned int>*
-  get_section_order_map()
-  { return &this->section_order_map_; }
- 
   bool
   is_section_ordering_specified()
   { return this->section_ordering_specified_; }
@@ -602,18 +597,6 @@ class Layout
 		       size_t cie_length, const unsigned char* fde_data,
 		       size_t fde_length);
 
-  // Scan a .debug_info or .debug_types section, and add summary
-  // information to the .gdb_index section.
-  template<int size, bool big_endian>
-  void
-  add_to_gdb_index(bool is_type_unit,
-		   Sized_relobj<size, big_endian>* object,
-		   const unsigned char* symbols,
-		   off_t symbols_size,
-		   unsigned int shndx,
-		   unsigned int reloc_shndx,
-		   unsigned int reloc_type);
-
   // Handle a GNU stack note.  This is called once per input object
   // file.  SEEN_GNU_STACK is true if the object file has a
   // .note.GNU-stack section.  GNU_STACK_FLAGS is the section flags
@@ -1294,8 +1277,6 @@ class Layout
   bool added_eh_frame_data_;
   // The exception frame header output section if there is one.
   Output_section* eh_frame_hdr_section_;
-  // The data for the .gdb_index section.
-  Gdb_index* gdb_index_data_;
   // The space for the build ID checksum if there is one.
   Output_section_data* build_id_note_;
   // The output section containing dwarf abbreviations
@@ -1341,9 +1322,6 @@ class Layout
   Segment_states* segment_states_;
   // A relaxation debug checker.  We only create one when in debugging mode.
   Relaxation_debug_check* relaxation_debug_check_;
-  // Plugins specify section_ordering using this map.  This is set in
-  // update_section_order in plugin.cc
-  std::map<Section_id, unsigned int> section_order_map_;
   // Hash a pattern to its position in the section ordering file.
   Unordered_map<std::string, unsigned int> input_section_position_;
   // Vector of glob only patterns in the section_ordering file.
diff --git a/gold/main.cc b/gold/main.cc
index d3292981f8..f6e7609eef 100644
--- a/gold/main.cc
+++ b/gold/main.cc
@@ -47,7 +47,6 @@
 #include "gc.h"
 #include "icf.h"
 #include "incremental.h"
-#include "gdb-index.h"
 #include "timer.h"
 
 using namespace gold;
@@ -166,10 +165,7 @@ main(int argc, char** argv)
 
   Timer timer;
   if (command_line.options().stats())
-    {
-      timer.start();
-      set_parameters_timer(&timer);
-    }
+    timer.start();
 
   // Store some options in the globally accessible parameters.
   set_parameters_options(&command_line.options());
@@ -256,32 +252,7 @@ main(int argc, char** argv)
 
   if (command_line.options().stats())
     {
-      timer.stamp(2);
-      Timer::TimeStats elapsed = timer.get_pass_time(0);
-      fprintf(stderr,
-             _("%s: initial tasks run time: " \
-               "(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)\n"),
-              program_name,
-              elapsed.user / 1000, (elapsed.user % 1000) * 1000,
-              elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
-              elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
-      elapsed = timer.get_pass_time(1);
-      fprintf(stderr,
-             _("%s: middle tasks run time: " \
-               "(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)\n"),
-              program_name,
-              elapsed.user / 1000, (elapsed.user % 1000) * 1000,
-              elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
-              elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
-      elapsed = timer.get_pass_time(2);
-      fprintf(stderr,
-             _("%s: final tasks run time: " \
-               "(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)\n"),
-              program_name,
-              elapsed.user / 1000, (elapsed.user % 1000) * 1000,
-              elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
-              elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
-      elapsed = timer.get_elapsed_time();
+      Timer::TimeStats elapsed = timer.get_elapsed_time();
       fprintf(stderr,
              _("%s: total run time: " \
                "(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)\n"),
@@ -302,7 +273,6 @@ main(int argc, char** argv)
 	      program_name, static_cast<long long>(layout.output_file_size()));
       symtab.print_stats();
       layout.print_stats();
-      Gdb_index::print_stats();
       Free_list::print_stats();
     }
 
diff --git a/gold/merge.cc b/gold/merge.cc
index dde43e9b12..093b6fc692 100644
--- a/gold/merge.cc
+++ b/gold/merge.cc
@@ -406,16 +406,27 @@ bool
 Output_merge_data::do_add_input_section(Relobj* object, unsigned int shndx)
 {
   section_size_type len;
-  bool is_new;
-  const unsigned char* p = object->decompressed_section_contents(shndx, &len,
-								 &is_new);
+  section_size_type uncompressed_size = 0;
+  unsigned char* uncompressed_data = NULL;
+  const unsigned char* p = object->section_contents(shndx, &len, false);
+
+  if (object->section_is_compressed(shndx, &uncompressed_size))
+    {
+      uncompressed_data = new unsigned char[uncompressed_size];
+      if (!decompress_input_section(p, len, uncompressed_data,
+				    uncompressed_size))
+	object->error(_("could not decompress section %s"),
+		      object->section_name(shndx).c_str());
+      p = uncompressed_data;
+      len = uncompressed_size;
+    }
 
   section_size_type entsize = convert_to_section_size_type(this->entsize());
 
   if (len % entsize != 0)
     {
-      if (is_new)
-	delete[] p;
+      if (uncompressed_data != NULL)
+	delete[] uncompressed_data;
       return false;
     }
 
@@ -446,8 +457,8 @@ Output_merge_data::do_add_input_section(Relobj* object, unsigned int shndx)
   if (this->keeps_input_sections())
     record_input_section(object, shndx);
 
-  if (is_new)
-    delete[] p;
+  if (uncompressed_data != NULL)
+    delete[] uncompressed_data;
 
   return true;
 }
@@ -506,10 +517,20 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
 						     unsigned int shndx)
 {
   section_size_type len;
-  bool is_new;
-  const unsigned char* pdata = object->decompressed_section_contents(shndx,
-								     &len,
-								     &is_new);
+  section_size_type uncompressed_size = 0;
+  unsigned char* uncompressed_data = NULL;
+  const unsigned char* pdata = object->section_contents(shndx, &len, false);
+
+  if (object->section_is_compressed(shndx, &uncompressed_size))
+    {
+      uncompressed_data = new unsigned char[uncompressed_size];
+      if (!decompress_input_section(pdata, len, uncompressed_data,
+				    uncompressed_size))
+	object->error(_("could not decompress section %s"),
+		      object->section_name(shndx).c_str());
+      pdata = uncompressed_data;
+      len = uncompressed_size;
+    }
 
   const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
   const Char_type* pend = p + len / sizeof(Char_type);
@@ -519,8 +540,8 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
     {
       object->error(_("mergeable string section length not multiple of "
 		      "character size"));
-      if (is_new)
-	delete[] pdata;
+      if (uncompressed_data != NULL)
+	delete[] uncompressed_data;
       return false;
     }
 
@@ -585,8 +606,8 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
   if (this->keeps_input_sections())
     record_input_section(object, shndx);
 
-  if (is_new)
-    delete[] pdata;
+  if (uncompressed_data != NULL)
+    delete[] uncompressed_data;
 
   return true;
 }
diff --git a/gold/object.cc b/gold/object.cc
index 15e5d05407..84a9646791 100644
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -178,7 +178,16 @@ Object::error(const char* format, ...) const
 const unsigned char*
 Object::section_contents(unsigned int shndx, section_size_type* plen,
 			 bool cache)
-{ return this->do_section_contents(shndx, plen, cache); }
+{
+  Location loc(this->do_section_contents(shndx));
+  *plen = convert_to_section_size_type(loc.data_size);
+  if (*plen == 0)
+    {
+      static const unsigned char empty[1] = { '\0' };
+      return empty;
+    }
+  return this->get_view(loc.file_offset, *plen, true, cache);
+}
 
 // Read the section data into SD.  This is code common to Sized_relobj_file
 // and Sized_dynobj, so we put it into Object.
@@ -541,57 +550,8 @@ Sized_relobj_file<size, big_endian>::find_eh_frame(
   return false;
 }
 
-// Return TRUE if this is a section whose contents will be needed in the
-// Add_symbols task.  This function is only called for sections that have
-// already passed the test in is_compressed_debug_section(), so we know
-// that the section name begins with ".zdebug".
-
-static bool
-need_decompressed_section(const char* name)
-{
-  // Skip over the ".zdebug" and a quick check for the "_".
-  name += 7;
-  if (*name++ != '_')
-    return false;
-
-#ifdef ENABLE_THREADS
-  // Decompressing these sections now will help only if we're
-  // multithreaded.
-  if (parameters->options().threads())
-    {
-      // We will need .zdebug_str if this is not an incremental link
-      // (i.e., we are processing string merge sections) or if we need
-      // to build a gdb index.
-      if ((!parameters->incremental() || parameters->options().gdb_index())
-	  && strcmp(name, "str") == 0)
-	return true;
-
-      // We will need these other sections when building a gdb index.
-      if (parameters->options().gdb_index()
-	  && (strcmp(name, "info") == 0
-	      || strcmp(name, "types") == 0
-	      || strcmp(name, "pubnames") == 0
-	      || strcmp(name, "pubtypes") == 0
-	      || strcmp(name, "ranges") == 0
-	      || strcmp(name, "abbrev") == 0))
-	return true;
-    }
-#endif
-
-  // Even when single-threaded, we will need .zdebug_str if this is
-  // not an incremental link and we are building a gdb index.
-  // Otherwise, we would decompress the section twice: once for
-  // string merge processing, and once for building the gdb index.
-  if (!parameters->incremental()
-      && parameters->options().gdb_index()
-      && strcmp(name, "str") == 0)
-    return true;
-
-  return false;
-}
-
 // Build a table for any compressed debug sections, mapping each section index
-// to the uncompressed size and (if needed) the decompressed contents.
+// to the uncompressed size.
 
 template<int size, bool big_endian>
 Compressed_section_map*
@@ -602,10 +562,9 @@ build_compressed_section_map(
     section_size_type names_size,
     Sized_relobj_file<size, big_endian>* obj)
 {
-  Compressed_section_map* uncompressed_map = new Compressed_section_map();
+  Compressed_section_map* uncompressed_sizes = new Compressed_section_map();
   const unsigned int shdr_size = elfcpp::Elf_sizes<size>::shdr_size;
   const unsigned char* p = pshdrs + shdr_size;
-
   for (unsigned int i = 1; i < shnum; ++i, p += shdr_size)
     {
       typename elfcpp::Shdr<size, big_endian> shdr(p);
@@ -626,28 +585,13 @@ build_compressed_section_map(
 	      const unsigned char* contents =
 		  obj->section_contents(i, &len, false);
 	      uint64_t uncompressed_size = get_uncompressed_size(contents, len);
-	      Compressed_section_info info;
-	      info.size = convert_to_section_size_type(uncompressed_size);
-	      info.contents = NULL;
 	      if (uncompressed_size != -1ULL)
-		{
-		  unsigned char* uncompressed_data = NULL;
-		  if (need_decompressed_section(name))
-		    {
-		      uncompressed_data = new unsigned char[uncompressed_size];
-		      if (decompress_input_section(contents, len,
-						   uncompressed_data,
-						   uncompressed_size))
-			info.contents = uncompressed_data;
-		      else
-			delete[] uncompressed_data;
-		    }
-		  (*uncompressed_map)[i] = info;
-		}
+		(*uncompressed_sizes)[i] =
+		    convert_to_section_size_type(uncompressed_size);
 	    }
 	}
     }
-  return uncompressed_map;
+  return uncompressed_sizes;
 }
 
 // Read the sections and symbols from an object file.
@@ -656,8 +600,6 @@ template<int size, bool big_endian>
 void
 Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
-  bool need_local_symbols = false;
-
   this->read_section_data(&this->elf_file_, sd);
 
   const unsigned char* const pshdrs = sd->section_headers->data();
@@ -676,14 +618,6 @@ Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
         build_compressed_section_map(pshdrs, this->shnum(), names,
 				     sd->section_names_size, this);
 
-  if (this->has_eh_frame_
-      || (!parameters->options().relocatable()
-	  && parameters->options().gdb_index()
-	  && (memmem(names, sd->section_names_size, "debug_info", 12) == 0
-	      || memmem(names, sd->section_names_size, "debug_types",
-			13) == 0)))
-    need_local_symbols = true;
-
   sd->symbols = NULL;
   sd->symbols_size = 0;
   sd->external_symbols_offset = 0;
@@ -701,8 +635,7 @@ Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 				 + this->symtab_shndx_ * This::shdr_size);
   gold_assert(symtabshdr.get_sh_type() == elfcpp::SHT_SYMTAB);
 
-  // If this object has a .eh_frame section, or if building a .gdb_index
-  // section and there is debug info, we need all the symbols.
+  // If this object has a .eh_frame section, we need all the symbols.
   // Otherwise we only need the external symbols.  While it would be
   // simpler to just always read all the symbols, I've seen object
   // files with well over 2000 local symbols, which for a 64-bit
@@ -720,8 +653,8 @@ Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
   off_t extoff = dataoff + locsize;
   section_size_type extsize = datasize - locsize;
 
-  off_t readoff = need_local_symbols ? dataoff : extoff;
-  section_size_type readsize = need_local_symbols ? datasize : extsize;
+  off_t readoff = this->has_eh_frame_ ? dataoff : extoff;
+  section_size_type readsize = this->has_eh_frame_ ? datasize : extsize;
 
   if (readsize == 0)
     {
@@ -753,7 +686,7 @@ Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 
   sd->symbols = fvsymtab;
   sd->symbols_size = readsize;
-  sd->external_symbols_offset = need_local_symbols ? locsize : 0;
+  sd->external_symbols_offset = this->has_eh_frame_ ? locsize : 0;
   sd->symbol_names = fvstrtab;
   sd->symbol_names_size =
     convert_to_section_size_type(strtabshdr.get_sh_size());
@@ -1340,10 +1273,6 @@ Sized_relobj_file<size, big_endian>::do_layout(Symbol_table* symtab,
   // Keep track of .eh_frame sections.
   std::vector<unsigned int> eh_frame_sections;
 
-  // Keep track of .debug_info and .debug_types sections.
-  std::vector<unsigned int> debug_info_sections;
-  std::vector<unsigned int> debug_types_sections;
-
   // Skip the first, dummy, section.
   pshdrs = shdrs + This::shdr_size;
   for (unsigned int i = 1; i < shnum; ++i, pshdrs += This::shdr_size)
@@ -1584,21 +1513,6 @@ Sized_relobj_file<size, big_endian>::do_layout(Symbol_table* symtab,
           // only happens in the second call.
           this->layout_section(layout, i, name, shdr, reloc_shndx[i],
                                reloc_type[i]);
-
-	  // When generating a .gdb_index section, we do additional
-	  // processing of .debug_info and .debug_types sections after all
-	  // the other sections for the same reason as above.
-	  if (!relocatable
-	      && parameters->options().gdb_index()
-	      && !(shdr.get_sh_flags() & elfcpp::SHF_ALLOC))
-	    {
-	      if (strcmp(name, ".debug_info") == 0
-		  || strcmp(name, ".zdebug_info") == 0)
-		debug_info_sections.push_back(i);
-	      else if (strcmp(name, ".debug_types") == 0
-		       || strcmp(name, ".zdebug_types") == 0)
-		debug_types_sections.push_back(i);
-	    }
         }
     }
 
@@ -1679,29 +1593,6 @@ Sized_relobj_file<size, big_endian>::do_layout(Symbol_table* symtab,
 				    reloc_type[i]);
     }
 
-  // When building a .gdb_index section, scan the .debug_info and
-  // .debug_types sections.
-  gold_assert(!is_gc_pass_one
-	      || (debug_info_sections.empty() && debug_types_sections.empty()));
-  for (std::vector<unsigned int>::const_iterator p
-	   = debug_info_sections.begin();
-       p != debug_info_sections.end();
-       ++p)
-    {
-      unsigned int i = *p;
-      layout->add_to_gdb_index(false, this, symbols_data, symbols_size,
-			       i, reloc_shndx[i], reloc_type[i]);
-    }
-  for (std::vector<unsigned int>::const_iterator p
-	   = debug_types_sections.begin();
-       p != debug_types_sections.end();
-       ++p)
-    {
-      unsigned int i = *p;
-      layout->add_to_gdb_index(true, this, symbols_data, symbols_size,
-			       i, reloc_shndx[i], reloc_type[i]);
-    }
-
   if (is_gc_pass_two)
     {
       delete[] gc_sd->section_headers_data;
@@ -1928,8 +1819,7 @@ Sized_relobj_file<size, big_endian>::local_has_plt_offset(
 
 template<int size, bool big_endian>
 unsigned int
-Sized_relobj_file<size, big_endian>::do_local_plt_offset(
-    unsigned int symndx) const
+Sized_relobj_file<size, big_endian>::local_plt_offset(unsigned int symndx) const
 {
   typename Local_plt_offsets::const_iterator p =
     this->local_plt_offsets_.find(symndx);
@@ -2666,85 +2556,6 @@ Sized_relobj_file<size, big_endian>::do_get_global_symbol_counts(
   *used = count;
 }
 
-// Return a view of the decompressed contents of a section.  Set *PLEN
-// to the size.  Set *IS_NEW to true if the contents need to be freed
-// by the caller.
-
-template<int size, bool big_endian>
-const unsigned char*
-Sized_relobj_file<size, big_endian>::do_decompressed_section_contents(
-    unsigned int shndx,
-    section_size_type* plen,
-    bool* is_new)
-{
-  section_size_type buffer_size;
-  const unsigned char* buffer = this->do_section_contents(shndx, &buffer_size,
-							  false);
-
-  if (this->compressed_sections_ == NULL)
-    {
-      *plen = buffer_size;
-      *is_new = false;
-      return buffer;
-    }
-
-  Compressed_section_map::const_iterator p =
-      this->compressed_sections_->find(shndx);
-  if (p == this->compressed_sections_->end())
-    {
-      *plen = buffer_size;
-      *is_new = false;
-      return buffer;
-    }
-
-  section_size_type uncompressed_size = p->second.size;
-  if (p->second.contents != NULL)
-    {
-      *plen = uncompressed_size;
-      *is_new = false;
-      return p->second.contents;
-    }
-
-  unsigned char* uncompressed_data = new unsigned char[uncompressed_size];
-  if (!decompress_input_section(buffer,
-				buffer_size,
-				uncompressed_data,
-				uncompressed_size))
-    this->error(_("could not decompress section %s"),
-		this->do_section_name(shndx).c_str());
-
-  // We could cache the results in p->second.contents and store
-  // false in *IS_NEW, but build_compressed_section_map() would
-  // have done so if it had expected it to be profitable.  If
-  // we reach this point, we expect to need the contents only
-  // once in this pass.
-  *plen = uncompressed_size;
-  *is_new = true;
-  return uncompressed_data;
-}
-
-// Discard any buffers of uncompressed sections.  This is done
-// at the end of the Add_symbols task.
-
-template<int size, bool big_endian>
-void
-Sized_relobj_file<size, big_endian>::do_discard_decompressed_sections()
-{
-  if (this->compressed_sections_ == NULL)
-    return;
-
-  for (Compressed_section_map::iterator p = this->compressed_sections_->begin();
-       p != this->compressed_sections_->end();
-       ++p)
-    {
-      if (p->second.contents != NULL)
-        {
-          delete[] p->second.contents;
-          p->second.contents = NULL;
-        }
-    }
-}
-
 // Input_objects methods.
 
 // Add a regular relocatable object to the list.  Return false if this
diff --git a/gold/object.h b/gold/object.h
index 82517d5703..a389c54a1f 100644
--- a/gold/object.h
+++ b/gold/object.h
@@ -725,20 +725,6 @@ class Object
 			section_size_type* uncompressed_size) const
   { return this->do_section_is_compressed(shndx, uncompressed_size); }
 
-  // Return a view of the decompressed contents of a section.  Set *PLEN
-  // to the size.  Set *IS_NEW to true if the contents need to be freed
-  // by the caller.
-  const unsigned char*
-  decompressed_section_contents(unsigned int shndx, section_size_type* plen,
-				bool* is_cached)
-  { return this->do_decompressed_section_contents(shndx, plen, is_cached); }
-
-  // Discard any buffers of decompressed sections.  This is done
-  // at the end of the Add_symbols task.
-  void
-  discard_decompressed_sections()
-  { this->do_discard_decompressed_sections(); }
-
   // Return the index of the first incremental relocation for symbol SYMNDX.
   unsigned int
   get_incremental_reloc_base(unsigned int symndx) const
@@ -805,9 +791,8 @@ class Object
 
   // Return the location of the contents of a section.  Implemented by
   // child class.
-  virtual const unsigned char*
-  do_section_contents(unsigned int shndx, section_size_type* plen,
-		      bool cache) = 0;
+  virtual Location
+  do_section_contents(unsigned int shndx) = 0;
 
   // Get the size of a section--implemented by child class.
   virtual uint64_t
@@ -907,27 +892,6 @@ class Object
   do_section_is_compressed(unsigned int, section_size_type*) const
   { return false; }
 
-  // Return a view of the decompressed contents of a section.  Set *PLEN
-  // to the size.  This default implementation simply returns the
-  // raw section contents and sets *IS_NEW to false to indicate
-  // that the contents do not need to be freed by the caller.
-  // This function must be overridden for any types of object files
-  // that might contain compressed sections.
-  virtual const unsigned char*
-  do_decompressed_section_contents(unsigned int shndx,
-				   section_size_type* plen,
-				   bool* is_new)
-  {
-    *is_new = false;
-    return this->do_section_contents(shndx, plen, false);
-  }
-
-  // Discard any buffers of decompressed sections.  This is done
-  // at the end of the Add_symbols task.
-  virtual void
-  do_discard_decompressed_sections()
-  { }
-
   // Return the index of the first incremental relocation for symbol SYMNDX--
   // implemented by child class.
   virtual unsigned int
@@ -1045,39 +1009,6 @@ class Relobj : public Object
   scan_relocs(Symbol_table* symtab, Layout* layout, Read_relocs_data* rd)
   { return this->do_scan_relocs(symtab, layout, rd); }
 
-  // Return the value of the local symbol whose index is SYMNDX, plus
-  // ADDEND.  ADDEND is passed in so that we can correctly handle the
-  // section symbol for a merge section.
-  uint64_t
-  local_symbol_value(unsigned int symndx, uint64_t addend) const
-  { return this->do_local_symbol_value(symndx, addend); }
-
-  // Return the PLT offset for a local symbol.  It is an error to call
-  // this if it doesn't have one.
-  unsigned int
-  local_plt_offset(unsigned int symndx) const
-  { return this->do_local_plt_offset(symndx); }
-
-  // Return whether the local symbol SYMNDX has a GOT offset of type
-  // GOT_TYPE.
-  bool
-  local_has_got_offset(unsigned int symndx, unsigned int got_type) const
-  { return this->do_local_has_got_offset(symndx, got_type); }
-
-  // Return the GOT offset of type GOT_TYPE of the local symbol
-  // SYMNDX.  It is an error to call this if the symbol does not have
-  // a GOT offset of the specified type.
-  unsigned int
-  local_got_offset(unsigned int symndx, unsigned int got_type) const
-  { return this->do_local_got_offset(symndx, got_type); }
-
-  // Set the GOT offset with type GOT_TYPE of the local symbol SYMNDX
-  // to GOT_OFFSET.
-  void
-  set_local_got_offset(unsigned int symndx, unsigned int got_type,
-		       unsigned int got_offset)
-  { this->do_set_local_got_offset(symndx, got_type, got_offset); }
-
   // The number of local symbols in the input symbol table.
   virtual unsigned int
   local_symbol_count() const
@@ -1236,28 +1167,6 @@ class Relobj : public Object
   virtual void
   do_scan_relocs(Symbol_table*, Layout*, Read_relocs_data*) = 0;
 
-  // Return the value of a local symbol.
-  virtual uint64_t
-  do_local_symbol_value(unsigned int symndx, uint64_t addend) const = 0;
-
-  // Return the PLT offset of a local symbol.
-  virtual unsigned int
-  do_local_plt_offset(unsigned int symndx) const = 0;
-
-  // Return whether a local symbol has a GOT offset of a given type.
-  virtual bool
-  do_local_has_got_offset(unsigned int symndx,
-			  unsigned int got_type) const = 0;
-
-  // Return the GOT offset of a given type of a local symbol.
-  virtual unsigned int
-  do_local_got_offset(unsigned int symndx, unsigned int got_type) const = 0;
-
-  // Set the GOT offset with a given type for a local symbol.
-  virtual void
-  do_set_local_got_offset(unsigned int symndx, unsigned int got_type,
-			  unsigned int got_offset) = 0;
-
   // Return the number of local symbols--implemented by child class.
   virtual unsigned int
   do_local_symbol_count() const = 0;
@@ -1811,14 +1720,9 @@ class Reloc_symbol_changes
   std::vector<Symbol*> vec_;
 };
 
-// Type for mapping section index to uncompressed size and contents.
+// Type for mapping section index to uncompressed size.
 
-struct Compressed_section_info
-{
-  section_size_type size;
-  const unsigned char* contents;
-};
-typedef std::map<unsigned int, Compressed_section_info> Compressed_section_map;
+typedef std::map<unsigned int, section_size_type> Compressed_section_map;
 
 // Abstract base class for a regular object file, either a real object file
 // or an incremental (unchanged) object.  This is size and endian specific.
@@ -1871,6 +1775,47 @@ class Sized_relobj : public Relobj
     return this->section_offsets_[shndx];
   }
 
+  // Return whether the local symbol SYMNDX has a GOT offset.
+  // For TLS symbols, the GOT entry will hold its tp-relative offset.
+  bool
+  local_has_got_offset(unsigned int symndx, unsigned int got_type) const
+  {
+    Local_got_offsets::const_iterator p =
+        this->local_got_offsets_.find(symndx);
+    return (p != this->local_got_offsets_.end()
+            && p->second->get_offset(got_type) != -1U);
+  }
+
+  // Return the GOT offset of the local symbol SYMNDX.
+  unsigned int
+  local_got_offset(unsigned int symndx, unsigned int got_type) const
+  {
+    Local_got_offsets::const_iterator p =
+        this->local_got_offsets_.find(symndx);
+    gold_assert(p != this->local_got_offsets_.end());
+    unsigned int off = p->second->get_offset(got_type);
+    gold_assert(off != -1U);
+    return off;
+  }
+
+  // Set the GOT offset of the local symbol SYMNDX to GOT_OFFSET.
+  void
+  set_local_got_offset(unsigned int symndx, unsigned int got_type,
+                       unsigned int got_offset)
+  {
+    Local_got_offsets::const_iterator p =
+        this->local_got_offsets_.find(symndx);
+    if (p != this->local_got_offsets_.end())
+      p->second->set_offset(got_type, got_offset);
+    else
+      {
+        Got_offset_list* g = new Got_offset_list(got_type, got_offset);
+        std::pair<Local_got_offsets::iterator, bool> ins =
+            this->local_got_offsets_.insert(std::make_pair(symndx, g));
+        gold_assert(ins.second);
+      }
+  }
+
   // Iterate over local symbols, calling a visitor class V for each GOT offset
   // associated with a local symbol.
   void
@@ -1910,49 +1855,6 @@ class Sized_relobj : public Relobj
        : convert_types<Address, uint64_t>(off));
   }
 
-  // Return whether the local symbol SYMNDX has a GOT offset of type
-  // GOT_TYPE.
-  bool
-  do_local_has_got_offset(unsigned int symndx, unsigned int got_type) const
-  {
-    Local_got_offsets::const_iterator p =
-        this->local_got_offsets_.find(symndx);
-    return (p != this->local_got_offsets_.end()
-            && p->second->get_offset(got_type) != -1U);
-  }
-
-  // Return the GOT offset of type GOT_TYPE of the local symbol
-  // SYMNDX.
-  unsigned int
-  do_local_got_offset(unsigned int symndx, unsigned int got_type) const
-  {
-    Local_got_offsets::const_iterator p =
-        this->local_got_offsets_.find(symndx);
-    gold_assert(p != this->local_got_offsets_.end());
-    unsigned int off = p->second->get_offset(got_type);
-    gold_assert(off != -1U);
-    return off;
-  }
-
-  // Set the GOT offset with type GOT_TYPE of the local symbol SYMNDX
-  // to GOT_OFFSET.
-  void
-  do_set_local_got_offset(unsigned int symndx, unsigned int got_type,
-			  unsigned int got_offset)
-  {
-    Local_got_offsets::const_iterator p =
-        this->local_got_offsets_.find(symndx);
-    if (p != this->local_got_offsets_.end())
-      p->second->set_offset(got_type, got_offset);
-    else
-      {
-        Got_offset_list* g = new Got_offset_list(got_type, got_offset);
-        std::pair<Local_got_offsets::iterator, bool> ins =
-            this->local_got_offsets_.insert(std::make_pair(symndx, g));
-        gold_assert(ins.second);
-      }
-  }
-
  private:
   // The GOT offsets of local symbols. This map also stores GOT offsets
   // for tp-relative offsets for TLS symbols.
@@ -2098,6 +2000,11 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
   bool
   local_has_plt_offset(unsigned int symndx) const;
 
+  // Return the PLT offset for a local symbol.  It is an error to call
+  // this if it doesn't have one.
+  unsigned int
+  local_plt_offset(unsigned int symndx) const;
+
   // Set the PLT offset of the local symbol SYMNDX.
   void
   set_local_plt_offset(unsigned int symndx, unsigned int plt_offset);
@@ -2143,19 +2050,6 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
   void
   do_read_symbols(Read_symbols_data*);
 
-  // Return the value of a local symbol.
-  uint64_t
-  do_local_symbol_value(unsigned int symndx, uint64_t addend) const
-  {
-    const Symbol_value<size>* symval = this->local_symbol(symndx);
-    return symval->value(this, addend);
-  }
-
-  // Return the PLT offset for a local symbol.  It is an error to call
-  // this if it doesn't have one.
-  unsigned int
-  do_local_plt_offset(unsigned int symndx) const;
-
   // Return the number of local symbols.
   unsigned int
   do_local_symbol_count() const
@@ -2238,19 +2132,9 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
   { return this->elf_file_.section_name(shndx); }
 
   // Return the location of the contents of a section.
-  const unsigned char*
-  do_section_contents(unsigned int shndx, section_size_type* plen,
-		      bool cache)
-  {
-    Object::Location loc(this->elf_file_.section_contents(shndx));
-    *plen = convert_to_section_size_type(loc.data_size);
-    if (*plen == 0)
-      {
-	static const unsigned char empty[1] = { '\0' };
-	return empty;
-      }
-    return this->get_view(loc.file_offset, *plen, true, cache);
-  }
+  Object::Location
+  do_section_contents(unsigned int shndx)
+  { return this->elf_file_.section_contents(shndx); }
 
   // Return section flags.
   uint64_t
@@ -2370,25 +2254,12 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
     if (p != this->compressed_sections_->end())
       {
 	if (uncompressed_size != NULL)
-	  *uncompressed_size = p->second.size;
+	  *uncompressed_size = p->second;
 	return true;
       }
     return false;
   }
 
-  // Return a view of the uncompressed contents of a section.  Set *PLEN
-  // to the size.  Set *IS_NEW to true if the contents need to be deleted
-  // by the caller.
-  const unsigned char*
-  do_decompressed_section_contents(unsigned int shndx,
-				   section_size_type* plen,
-				   bool* is_new);
-
-  // Discard any buffers of decompressed sections.  This is done
-  // at the end of the Add_symbols task.
-  void
-  do_discard_decompressed_sections();
-
  private:
   // For convenience.
   typedef Sized_relobj_file<size, big_endian> This;
@@ -2673,8 +2544,7 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
   std::vector<Deferred_layout> deferred_layout_;
   // The list of relocation sections whose layout was deferred.
   std::vector<Deferred_layout> deferred_layout_relocs_;
-  // For compressed debug sections, map section index to uncompressed size
-  // and contents.
+  // For compressed debug sections, map section index to uncompressed size.
   Compressed_section_map* compressed_sections_;
 };
 
diff --git a/gold/options.cc b/gold/options.cc
index fe9a00e023..be3264554a 100644
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -198,7 +198,7 @@ parse_uint(const char* option_name, const char* arg, int* retval)
 {
   char* endptr;
   *retval = strtol(arg, &endptr, 0);
-  if (*endptr != '\0' || *retval < 0)
+  if (*endptr != '\0' || retval < 0)
     gold_fatal(_("%s: invalid option value (expected an integer): %s"),
                option_name, arg);
 }
@@ -1121,48 +1121,33 @@ General_options::finalize()
                  program_name);
 #endif
 
-  std::string libpath;
   if (this->user_set_Y())
     {
-      libpath = this->Y();
-      if (libpath.compare(0, 2, "P,") == 0)
-	libpath.erase(0, 2);
-    }
-  else if (!this->nostdlib())
-    {
-#ifndef NATIVE_LINKER
-#define NATIVE_LINKER 0
-#endif
-      const char* p = LIB_PATH;
-      if (strcmp(p, "::DEFAULT::") != 0)
-	libpath = p;
-      else if (NATIVE_LINKER
-	       || this->user_set_sysroot()
-	       || *TARGET_SYSTEM_ROOT != '\0')
-	{
-	  this->add_to_library_path_with_sysroot("/lib");
-	  this->add_to_library_path_with_sysroot("/usr/lib");
-	}
-      else
-	this->add_to_library_path_with_sysroot(TOOLLIBDIR);
-    }
+      std::string s = this->Y();
+      if (s.compare(0, 2, "P,") == 0)
+	s.erase(0, 2);
 
-  if (!libpath.empty())
-    {
       size_t pos = 0;
       size_t next_pos;
       do
 	{
-	  next_pos = libpath.find(':', pos);
+	  next_pos = s.find(':', pos);
 	  size_t len = (next_pos == std::string::npos
 			? next_pos
 			: next_pos - pos);
 	  if (len != 0)
-	    this->add_to_library_path_with_sysroot(libpath.substr(pos, len));
+	    this->add_to_library_path_with_sysroot(s.substr(pos, len).c_str());
 	  pos = next_pos + 1;
 	}
       while (next_pos != std::string::npos);
     }
+  else if (!this->nostdlib())
+    {
+      // Even if they don't specify it, we add -L /lib and -L /usr/lib.
+      // FIXME: We should only do this when configured in native mode.
+      this->add_to_library_path_with_sysroot("/lib");
+      this->add_to_library_path_with_sysroot("/usr/lib");
+    }
 
   // Parse the contents of -retain-symbols-file into a set.
   if (this->retain_symbols_file())
@@ -1203,8 +1188,6 @@ General_options::finalize()
     gold_fatal(_("-shared and -static are incompatible"));
   if (this->shared() && this->pie())
     gold_fatal(_("-shared and -pie are incompatible"));
-  if (this->pie() && this->is_static())
-    gold_fatal(_("-pie and -static are incompatible"));
 
   if (this->shared() && this->relocatable())
     gold_fatal(_("-shared and -r are incompatible"));
@@ -1241,37 +1224,6 @@ General_options::finalize()
     gold_fatal(_("Options --incremental-changed, --incremental-unchanged, "
                  "--incremental-unknown require the use of --incremental"));
 
-  // Check for options that are not compatible with incremental linking.
-  // Where an option can be disabled without seriously changing the semantics
-  // of the link, we turn the option off; otherwise, we issue a fatal error.
-
-  if (this->incremental_mode_ != INCREMENTAL_OFF)
-    {
-      if (this->relocatable())
-	gold_fatal(_("incremental linking is not compatible with -r"));
-      if (this->emit_relocs())
-	gold_fatal(_("incremental linking is not compatible with "
-		     "--emit-relocs"));
-      if (this->has_plugins())
-	gold_fatal(_("incremental linking is not compatible with --plugin"));
-      if (this->gc_sections())
-	{
-	  gold_warning(_("ignoring --gc-sections for an incremental link"));
-	  this->set_gc_sections(false);
-	}
-      if (this->icf_enabled())
-	{
-	  gold_warning(_("ignoring --icf for an incremental link"));
-	  this->set_icf_status(ICF_NONE);
-	}
-      if (strcmp(this->compress_debug_sections(), "none") != 0)
-	{
-	  gold_warning(_("ignoring --compress-debug-sections for an "
-			 "incremental link"));
-	  this->set_compress_debug_sections("none");
-	}
-    }
-
   // FIXME: we can/should be doing a lot more sanity checking here.
 }
 
diff --git a/gold/options.h b/gold/options.h
index b5df3ebf2a..768df9c6eb 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -543,7 +543,7 @@ class Search_directory
   { }
 
   // This is the usual constructor.
-  Search_directory(const std::string& name, bool put_in_sysroot)
+  Search_directory(const char* name, bool put_in_sysroot)
     : name_(name), put_in_sysroot_(put_in_sysroot), is_in_sysroot_(false)
   {
     if (this->name_.empty())
@@ -791,14 +791,6 @@ class General_options
   DEFINE_bool(g, options::EXACTLY_ONE_DASH, '\0', false,
 	      N_("Ignored"), NULL);
 
-  DEFINE_bool(gdb_index, options::TWO_DASHES, '\0', false,
-	      N_("Generate .gdb_index section"),
-	      N_("Do not generate .gdb_index section"));
-
-  DEFINE_bool(gnu_unique, options::TWO_DASHES, '\0', true,
-	      N_("Enable STB_GNU_UNIQUE symbol binding (default)"),
-	      N_("Disable STB_GNU_UNIQUE symbol binding"));
-
   DEFINE_string(soname, options::ONE_DASH, 'h', NULL,
                 N_("Set shared library name"), N_("FILENAME"));
 
@@ -1393,11 +1385,6 @@ class General_options
   bool
   section_start(const char* secname, uint64_t* paddr) const;
 
-  // Return whether any --section-start option was used.
-  bool
-  any_section_start() const
-  { return !this->section_starts_.empty(); }
-
   enum Fix_v4bx
   {
     // Leave original instruction.
@@ -1467,7 +1454,7 @@ class General_options
 
   // These are called by finalize() to set up the search-path correctly.
   void
-  add_to_library_path_with_sysroot(const std::string& arg)
+  add_to_library_path_with_sysroot(const char* arg)
   { this->add_search_directory_to_library_path(Search_directory(arg, true)); }
 
   // Apply any sysroot to the directory lists.
diff --git a/gold/output.cc b/gold/output.cc
index ca190392d1..29d8e3d581 100644
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -119,9 +119,7 @@ extern "C" void *gold_mremap(void *, size_t, size_t, int);
 static int
 posix_fallocate(int o, off_t offset, off_t len)
 {
-  if (ftruncate(o, offset + len) < 0)
-    return errno;
-  return 0;
+  return ftruncate(o, offset + len);
 }
 #endif // !defined(HAVE_POSIX_FALLOCATE)
 
@@ -708,7 +706,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     bool is_symbolless)
   : address_(address), local_sym_index_(GSYM_CODE), type_(type),
     is_relative_(is_relative), is_symbolless_(is_symbolless),
-    is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE)
+    is_section_symbol_(false), shndx_(INVALID_CODE)
 {
   // this->type_ is a bitfield; make sure TYPE fits.
   gold_assert(this->type_ == type);
@@ -729,7 +727,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     bool is_symbolless)
   : address_(address), local_sym_index_(GSYM_CODE), type_(type),
     is_relative_(is_relative), is_symbolless_(is_symbolless),
-    is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx)
+    is_section_symbol_(false), shndx_(shndx)
 {
   gold_assert(shndx != INVALID_CODE);
   // this->type_ is a bitfield; make sure TYPE fits.
@@ -751,12 +749,10 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address,
     bool is_relative,
     bool is_symbolless,
-    bool is_section_symbol,
-    bool use_plt_offset)
+    bool is_section_symbol)
   : address_(address), local_sym_index_(local_sym_index), type_(type),
     is_relative_(is_relative), is_symbolless_(is_symbolless),
-    is_section_symbol_(is_section_symbol), use_plt_offset_(use_plt_offset),
-    shndx_(INVALID_CODE)
+    is_section_symbol_(is_section_symbol), shndx_(INVALID_CODE)
 {
   gold_assert(local_sym_index != GSYM_CODE
               && local_sym_index != INVALID_CODE);
@@ -777,12 +773,10 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address,
     bool is_relative,
     bool is_symbolless,
-    bool is_section_symbol,
-    bool use_plt_offset)
+    bool is_section_symbol)
   : address_(address), local_sym_index_(local_sym_index), type_(type),
     is_relative_(is_relative), is_symbolless_(is_symbolless),
-    is_section_symbol_(is_section_symbol), use_plt_offset_(use_plt_offset),
-    shndx_(shndx)
+    is_section_symbol_(is_section_symbol), shndx_(shndx)
 {
   gold_assert(local_sym_index != GSYM_CODE
               && local_sym_index != INVALID_CODE);
@@ -805,7 +799,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address)
   : address_(address), local_sym_index_(SECTION_CODE), type_(type),
     is_relative_(false), is_symbolless_(false),
-    is_section_symbol_(true), use_plt_offset_(false), shndx_(INVALID_CODE)
+    is_section_symbol_(true), shndx_(INVALID_CODE)
 {
   // this->type_ is a bitfield; make sure TYPE fits.
   gold_assert(this->type_ == type);
@@ -826,7 +820,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address)
   : address_(address), local_sym_index_(SECTION_CODE), type_(type),
     is_relative_(false), is_symbolless_(false),
-    is_section_symbol_(true), use_plt_offset_(false), shndx_(shndx)
+    is_section_symbol_(true), shndx_(shndx)
 {
   gold_assert(shndx != INVALID_CODE);
   // this->type_ is a bitfield; make sure TYPE fits.
@@ -848,7 +842,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address)
   : address_(address), local_sym_index_(0), type_(type),
     is_relative_(false), is_symbolless_(false),
-    is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE)
+    is_section_symbol_(false), shndx_(INVALID_CODE)
 {
   // this->type_ is a bitfield; make sure TYPE fits.
   gold_assert(this->type_ == type);
@@ -864,7 +858,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address)
   : address_(address), local_sym_index_(0), type_(type),
     is_relative_(false), is_symbolless_(false),
-    is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx)
+    is_section_symbol_(false), shndx_(shndx)
 {
   gold_assert(shndx != INVALID_CODE);
   // this->type_ is a bitfield; make sure TYPE fits.
@@ -883,7 +877,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address)
   : address_(address), local_sym_index_(TARGET_CODE), type_(type),
     is_relative_(false), is_symbolless_(false),
-    is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE)
+    is_section_symbol_(false), shndx_(INVALID_CODE)
 {
   // this->type_ is a bitfield; make sure TYPE fits.
   gold_assert(this->type_ == type);
@@ -900,7 +894,7 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::Output_reloc(
     Address address)
   : address_(address), local_sym_index_(TARGET_CODE), type_(type),
     is_relative_(false), is_symbolless_(false),
-    is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx)
+    is_section_symbol_(false), shndx_(shndx)
 {
   gold_assert(shndx != INVALID_CODE);
   // this->type_ is a bitfield; make sure TYPE fits.
@@ -1127,12 +1121,6 @@ Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::symbol_value(
   Sized_relobj_file<size, big_endian>* relobj =
       this->u1_.relobj->sized_relobj();
   gold_assert(relobj != NULL);
-  if (this->use_plt_offset_)
-    {
-      uint64_t plt_address =
-	  parameters->target().plt_address_for_local(relobj, lsi);
-      return plt_address + relobj->local_plt_offset(lsi);
-    }
   const Symbol_value<size>* symval = relobj->local_symbol(lsi);
   return symval->value(relobj, addend);
 }
@@ -1387,13 +1375,11 @@ Output_data_got<size, big_endian>::Got_entry::write(unsigned char* pov) const
 
     default:
       {
-	const Relobj* object = this->u_.object;
+	const Sized_relobj_file<size, big_endian>* object = this->u_.object;
         const unsigned int lsi = this->local_sym_index_;
+        const Symbol_value<size>* symval = object->local_symbol(lsi);
 	if (!this->use_plt_offset_)
-	  {
-	    uint64_t lval = object->local_symbol_value(lsi, 0);
-	    val = convert_types<Valtype, uint64_t>(lval);
-	  }
+	  val = symval->value(this->u_.object, 0);
 	else
 	  {
 	    uint64_t plt_address =
@@ -1450,7 +1436,7 @@ void
 Output_data_got<size, big_endian>::add_global_with_rel(
     Symbol* gsym,
     unsigned int got_type,
-    Output_data_reloc_generic* rel_dyn,
+    Rel_dyn* rel_dyn,
     unsigned int r_type)
 {
   if (gsym->has_got_offset(got_type))
@@ -1458,7 +1444,23 @@ Output_data_got<size, big_endian>::add_global_with_rel(
 
   unsigned int got_offset = this->add_got_entry(Got_entry());
   gsym->set_got_offset(got_type, got_offset);
-  rel_dyn->add_global_generic(gsym, r_type, this, got_offset, 0);
+  rel_dyn->add_global(gsym, r_type, this, got_offset);
+}
+
+template<int size, bool big_endian>
+void
+Output_data_got<size, big_endian>::add_global_with_rela(
+    Symbol* gsym,
+    unsigned int got_type,
+    Rela_dyn* rela_dyn,
+    unsigned int r_type)
+{
+  if (gsym->has_got_offset(got_type))
+    return;
+
+  unsigned int got_offset = this->add_got_entry(Got_entry());
+  gsym->set_got_offset(got_type, got_offset);
+  rela_dyn->add_global(gsym, r_type, this, got_offset, 0);
 }
 
 // Add a pair of entries for a global symbol to the GOT, and add
@@ -1469,7 +1471,7 @@ void
 Output_data_got<size, big_endian>::add_global_pair_with_rel(
     Symbol* gsym,
     unsigned int got_type,
-    Output_data_reloc_generic* rel_dyn,
+    Rel_dyn* rel_dyn,
     unsigned int r_type_1,
     unsigned int r_type_2)
 {
@@ -1478,11 +1480,30 @@ Output_data_got<size, big_endian>::add_global_pair_with_rel(
 
   unsigned int got_offset = this->add_got_entry_pair(Got_entry(), Got_entry());
   gsym->set_got_offset(got_type, got_offset);
-  rel_dyn->add_global_generic(gsym, r_type_1, this, got_offset, 0);
+  rel_dyn->add_global(gsym, r_type_1, this, got_offset);
 
   if (r_type_2 != 0)
-    rel_dyn->add_global_generic(gsym, r_type_2, this,
-				got_offset + size / 8, 0);
+    rel_dyn->add_global(gsym, r_type_2, this, got_offset + size / 8);
+}
+
+template<int size, bool big_endian>
+void
+Output_data_got<size, big_endian>::add_global_pair_with_rela(
+    Symbol* gsym,
+    unsigned int got_type,
+    Rela_dyn* rela_dyn,
+    unsigned int r_type_1,
+    unsigned int r_type_2)
+{
+  if (gsym->has_got_offset(got_type))
+    return;
+
+  unsigned int got_offset = this->add_got_entry_pair(Got_entry(), Got_entry());
+  gsym->set_got_offset(got_type, got_offset);
+  rela_dyn->add_global(gsym, r_type_1, this, got_offset, 0);
+
+  if (r_type_2 != 0)
+    rela_dyn->add_global(gsym, r_type_2, this, got_offset + size / 8, 0);
 }
 
 // Add an entry for a local symbol to the GOT.  This returns true if
@@ -1492,7 +1513,7 @@ Output_data_got<size, big_endian>::add_global_pair_with_rel(
 template<int size, bool big_endian>
 bool
 Output_data_got<size, big_endian>::add_local(
-    Relobj* object,
+    Sized_relobj_file<size, big_endian>* object,
     unsigned int symndx,
     unsigned int got_type)
 {
@@ -1510,7 +1531,7 @@ Output_data_got<size, big_endian>::add_local(
 template<int size, bool big_endian>
 bool
 Output_data_got<size, big_endian>::add_local_plt(
-    Relobj* object,
+    Sized_relobj_file<size, big_endian>* object,
     unsigned int symndx,
     unsigned int got_type)
 {
@@ -1529,10 +1550,27 @@ Output_data_got<size, big_endian>::add_local_plt(
 template<int size, bool big_endian>
 void
 Output_data_got<size, big_endian>::add_local_with_rel(
-    Relobj* object,
+    Sized_relobj_file<size, big_endian>* object,
+    unsigned int symndx,
+    unsigned int got_type,
+    Rel_dyn* rel_dyn,
+    unsigned int r_type)
+{
+  if (object->local_has_got_offset(symndx, got_type))
+    return;
+
+  unsigned int got_offset = this->add_got_entry(Got_entry());
+  object->set_local_got_offset(symndx, got_type, got_offset);
+  rel_dyn->add_local(object, symndx, r_type, this, got_offset);
+}
+
+template<int size, bool big_endian>
+void
+Output_data_got<size, big_endian>::add_local_with_rela(
+    Sized_relobj_file<size, big_endian>* object,
     unsigned int symndx,
     unsigned int got_type,
-    Output_data_reloc_generic* rel_dyn,
+    Rela_dyn* rela_dyn,
     unsigned int r_type)
 {
   if (object->local_has_got_offset(symndx, got_type))
@@ -1540,7 +1578,7 @@ Output_data_got<size, big_endian>::add_local_with_rel(
 
   unsigned int got_offset = this->add_got_entry(Got_entry());
   object->set_local_got_offset(symndx, got_type, got_offset);
-  rel_dyn->add_local_generic(object, symndx, r_type, this, got_offset, 0);
+  rela_dyn->add_local(object, symndx, r_type, this, got_offset, 0);
 }
 
 // Add a pair of entries for a local symbol to the GOT, and add
@@ -1549,11 +1587,11 @@ Output_data_got<size, big_endian>::add_local_with_rel(
 template<int size, bool big_endian>
 void
 Output_data_got<size, big_endian>::add_local_pair_with_rel(
-    Relobj* object,
+    Sized_relobj_file<size, big_endian>* object,
     unsigned int symndx,
     unsigned int shndx,
     unsigned int got_type,
-    Output_data_reloc_generic* rel_dyn,
+    Rel_dyn* rel_dyn,
     unsigned int r_type_1,
     unsigned int r_type_2)
 {
@@ -1565,11 +1603,35 @@ Output_data_got<size, big_endian>::add_local_pair_with_rel(
 			       Got_entry(object, symndx, false));
   object->set_local_got_offset(symndx, got_type, got_offset);
   Output_section* os = object->output_section(shndx);
-  rel_dyn->add_output_section_generic(os, r_type_1, this, got_offset, 0);
+  rel_dyn->add_output_section(os, r_type_1, this, got_offset);
 
   if (r_type_2 != 0)
-    rel_dyn->add_output_section_generic(os, r_type_2, this,
-					got_offset + size / 8, 0);
+    rel_dyn->add_output_section(os, r_type_2, this, got_offset + size / 8);
+}
+
+template<int size, bool big_endian>
+void
+Output_data_got<size, big_endian>::add_local_pair_with_rela(
+    Sized_relobj_file<size, big_endian>* object,
+    unsigned int symndx,
+    unsigned int shndx,
+    unsigned int got_type,
+    Rela_dyn* rela_dyn,
+    unsigned int r_type_1,
+    unsigned int r_type_2)
+{
+  if (object->local_has_got_offset(symndx, got_type))
+    return;
+
+  unsigned int got_offset =
+      this->add_got_entry_pair(Got_entry(),
+			       Got_entry(object, symndx, false));
+  object->set_local_got_offset(symndx, got_type, got_offset);
+  Output_section* os = object->output_section(shndx);
+  rela_dyn->add_output_section(os, r_type_1, this, got_offset, 0);
+
+  if (r_type_2 != 0)
+    rela_dyn->add_output_section(os, r_type_2, this, got_offset + size / 8, 0);
 }
 
 // Reserve a slot in the GOT for a local symbol or the second slot of a pair.
@@ -1578,11 +1640,11 @@ template<int size, bool big_endian>
 void
 Output_data_got<size, big_endian>::reserve_local(
     unsigned int i,
-    Relobj* object,
+    Sized_relobj<size, big_endian>* object,
     unsigned int sym_index,
     unsigned int got_type)
 {
-  this->do_reserve_slot(i);
+  this->reserve_slot(i);
   object->set_local_got_offset(sym_index, got_type, this->got_offset(i));
 }
 
@@ -1595,7 +1657,7 @@ Output_data_got<size, big_endian>::reserve_global(
     Symbol* gsym,
     unsigned int got_type)
 {
-  this->do_reserve_slot(i);
+  this->reserve_slot(i);
   gsym->set_got_offset(got_type, this->got_offset(i));
 }
 
@@ -2414,10 +2476,7 @@ Output_section::add_input_section(Layout* layout,
       || layout->is_section_ordering_specified())
     {
       Input_section isecn(object, shndx, input_section_size, addralign);
-      /* If section ordering is requested by specifying a ordering file,
-	 using --section-ordering-file, match the section name with
-	 a pattern.  */
-      if (parameters->options().section_ordering_file())
+      if (layout->is_section_ordering_specified())
         {
           unsigned int section_order_index =
             layout->find_section_order_index(std::string(secname));
@@ -3426,7 +3485,7 @@ Output_section::Input_section_sort_section_order_index_compare::operator()(
 
 void
 Output_section::update_section_layout(
-  const Section_layout_order* order_map)
+  const Section_layout_order& order_map)
 {
   for (Input_section_list::iterator p = this->input_sections_.begin();
        p != this->input_sections_.end();
@@ -3440,8 +3499,8 @@ Output_section::update_section_layout(
 		         : p->relaxed_input_section()->relobj());
 	  unsigned int shndx = p->shndx();
 	  Section_layout_order::const_iterator it
-	    = order_map->find(Section_id(obj, shndx));
-	  if (it == order_map->end())
+	    = order_map.find(Section_id(obj, shndx));
+	  if (it == order_map.end())
 	    continue;
 	  unsigned int section_order_index = it->second;
 	  if (section_order_index != 0)
@@ -4821,27 +4880,17 @@ Output_file::open_base_file(const char* base_name, bool writable)
   if (use_base_file)
     {
       this->open(s.st_size);
-      ssize_t bytes_to_read = s.st_size;
-      unsigned char* p = this->base_;
-      while (bytes_to_read > 0)
-	{
-	  ssize_t len = ::read(o, p, bytes_to_read);
-	  if (len < 0)
-	    {
-	      gold_info(_("%s: read failed: %s"), base_name, strerror(errno));
-	      return false;
-	    }
-	  if (len == 0)
-	    {
-	      gold_info(_("%s: file too short: read only %lld of %lld bytes"),
-			base_name,
-			static_cast<long long>(s.st_size - bytes_to_read),
-			static_cast<long long>(s.st_size));
-	      return false;
-	    }
-	  p += len;
-	  bytes_to_read -= len;
-	}
+      ssize_t len = ::read(o, this->base_, s.st_size);
+      if (len < 0)
+        {
+	  gold_info(_("%s: read failed: %s"), base_name, strerror(errno));
+	  return false;
+        }
+      if (len < s.st_size)
+        {
+	  gold_info(_("%s: file too short"), base_name);
+	  return false;
+        }
       ::close(o);
       return true;
     }
@@ -5003,12 +5052,8 @@ Output_file::map_no_anonymous(bool writable)
   // output file will wind up incomplete, but we will have already
   // exited.  The alternative to fallocate would be to use fdatasync,
   // but that would be a more significant performance hit.
-  if (writable)
-    {
-      int err = ::posix_fallocate(o, 0, this->file_size_);
-      if (err != 0)
-       gold_fatal(_("%s: %s"), this->name_, strerror(err));
-    }
+  if (writable && ::posix_fallocate(o, 0, this->file_size_) < 0)
+    gold_fatal(_("%s: %s"), this->name_, strerror(errno));
 
   // Map the file into memory.
   int prot = PROT_READ;
diff --git a/gold/output.h b/gold/output.h
index 838ca3d4dd..1bec2c0039 100644
--- a/gold/output.h
+++ b/gold/output.h
@@ -1033,14 +1033,12 @@ class Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
   Output_reloc(Sized_relobj<size, big_endian>* relobj,
 	       unsigned int local_sym_index, unsigned int type,
 	       Output_data* od, Address address, bool is_relative,
-               bool is_symbolless, bool is_section_symbol,
-               bool use_plt_offset);
+               bool is_symbolless, bool is_section_symbol);
 
   Output_reloc(Sized_relobj<size, big_endian>* relobj,
 	       unsigned int local_sym_index, unsigned int type,
 	       unsigned int shndx, Address address, bool is_relative,
-               bool is_symbolless, bool is_section_symbol,
-               bool use_plt_offset);
+               bool is_symbolless, bool is_section_symbol);
 
   // A reloc against the STT_SECTION symbol of an output section.
 
@@ -1218,7 +1216,7 @@ class Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
   // input file.
   unsigned int local_sym_index_;
   // The reloc type--a processor specific code.
-  unsigned int type_ : 28;
+  unsigned int type_ : 29;
   // True if the relocation is a RELATIVE relocation.
   bool is_relative_ : 1;
   // True if the relocation is one which should not use
@@ -1226,10 +1224,6 @@ class Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
   bool is_symbolless_ : 1;
   // True if the relocation is against a section symbol.
   bool is_section_symbol_ : 1;
-  // True if the addend should be the PLT offset.  This is used only
-  // for RELATIVE relocations to local symbols.
-  // (Used only for RELA, but stored here for space.)
-  bool use_plt_offset_ : 1;
   // If the reloc address is an input section in an object, the
   // section index.  This is INVALID_CODE if the reloc address is
   // specified in some other way.
@@ -1274,10 +1268,9 @@ class Output_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 	       unsigned int local_sym_index, unsigned int type,
 	       Output_data* od, Address address,
 	       Addend addend, bool is_relative,
-	       bool is_symbolless, bool is_section_symbol,
-	       bool use_plt_offset)
+	       bool is_symbolless, bool is_section_symbol)
     : rel_(relobj, local_sym_index, type, od, address, is_relative,
-           is_symbolless, is_section_symbol, use_plt_offset),
+           is_symbolless, is_section_symbol),
       addend_(addend)
   { }
 
@@ -1285,10 +1278,9 @@ class Output_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 	       unsigned int local_sym_index, unsigned int type,
 	       unsigned int shndx, Address address,
 	       Addend addend, bool is_relative,
-	       bool is_symbolless, bool is_section_symbol,
-	       bool use_plt_offset)
+	       bool is_symbolless, bool is_section_symbol)
     : rel_(relobj, local_sym_index, type, shndx, address, is_relative,
-           is_symbolless, is_section_symbol, use_plt_offset),
+           is_symbolless, is_section_symbol),
       addend_(addend)
   { }
 
@@ -1397,55 +1389,6 @@ class Output_data_reloc_generic : public Output_section_data_build
   sort_relocs() const
   { return this->sort_relocs_; }
 
-  // Add a reloc of type TYPE against the global symbol GSYM.  The
-  // relocation applies to the data at offset ADDRESS within OD.
-  virtual void
-  add_global_generic(Symbol* gsym, unsigned int type, Output_data* od,
-		     uint64_t address, uint64_t addend) = 0;
-
-  // Add a reloc of type TYPE against the global symbol GSYM.  The
-  // relocation applies to data at offset ADDRESS within section SHNDX
-  // of object file RELOBJ.  OD is the associated output section.
-  virtual void
-  add_global_generic(Symbol* gsym, unsigned int type, Output_data* od,
-		     Relobj* relobj, unsigned int shndx, uint64_t address,
-		     uint64_t addend) = 0;
-
-  // Add a reloc of type TYPE against the local symbol LOCAL_SYM_INDEX
-  // in RELOBJ.  The relocation applies to the data at offset ADDRESS
-  // within OD.
-  virtual void
-  add_local_generic(Relobj* relobj, unsigned int local_sym_index,
-		    unsigned int type, Output_data* od, uint64_t address,
-		    uint64_t addend) = 0;
-
-  // Add a reloc of type TYPE against the local symbol LOCAL_SYM_INDEX
-  // in RELOBJ.  The relocation applies to the data at offset ADDRESS
-  // within section SHNDX of RELOBJ.  OD is the associated output
-  // section.
-  virtual void
-  add_local_generic(Relobj* relobj, unsigned int local_sym_index,
-		    unsigned int type, Output_data* od, unsigned int shndx,
-		    uint64_t address, uint64_t addend) = 0;
-
-  // Add a reloc of type TYPE against the STT_SECTION symbol of the
-  // output section OS.  The relocation applies to the data at offset
-  // ADDRESS within OD.
-  virtual void
-  add_output_section_generic(Output_section *os, unsigned int type,
-			     Output_data* od, uint64_t address,
-			     uint64_t addend) = 0;
-
-  // Add a reloc of type TYPE against the STT_SECTION symbol of the
-  // output section OS.  The relocation applies to the data at offset
-  // ADDRESS within section SHNDX of RELOBJ.  OD is the associated
-  // output section.
-  virtual void
-  add_output_section_generic(Output_section* os, unsigned int type,
-			     Output_data* od, Relobj* relobj,
-			     unsigned int shndx, uint64_t address,
-			     uint64_t addend) = 0;
-
  protected:
   // Note that we've added another relative reloc.
   void
@@ -1507,8 +1450,7 @@ class Output_data_reloc_base : public Output_data_reloc_generic
   {
     this->relocs_.push_back(reloc);
     this->set_current_data_size(this->relocs_.size() * reloc_size);
-    if (dynamic)
-      od->add_dynamic_reloc();
+    od->add_dynamic_reloc();
     if (reloc.is_relative())
       this->bump_relative_reloc_count();
     Sized_relobj<size, big_endian>* relobj = reloc.get_relobj();
@@ -1567,27 +1509,23 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
   { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
                                     false, false)); }
 
+  // These are to simplify the Copy_relocs class.
+
   void
-  add_global_generic(Symbol* gsym, unsigned int type, Output_data* od,
-		     uint64_t address, uint64_t addend)
+  add_global(Symbol* gsym, unsigned int type, Output_data* od, Address address,
+	     Address addend)
   {
     gold_assert(addend == 0);
-    this->add(od, Output_reloc_type(gsym, type, od,
-				    convert_types<Address, uint64_t>(address),
-				    false, false));
+    this->add_global(gsym, type, od, address);
   }
 
   void
-  add_global_generic(Symbol* gsym, unsigned int type, Output_data* od,
-		     Relobj* relobj, unsigned int shndx, uint64_t address,
-		     uint64_t addend)
+  add_global(Symbol* gsym, unsigned int type, Output_data* od,
+             Sized_relobj<size, big_endian>* relobj,
+	     unsigned int shndx, Address address, Address addend)
   {
     gold_assert(addend == 0);
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian>*>(relobj);
-    this->add(od, Output_reloc_type(gsym, type, sized_relobj, shndx,
-				    convert_types<Address, uint64_t>(address),
-				    false, false));
+    this->add_global(gsym, type, od, relobj, shndx, address);
   }
 
   // Add a RELATIVE reloc against a global symbol.  The final relocation
@@ -1633,7 +1571,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
 	    Output_data* od, Address address)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, od,
-                                    address, false, false, false, false));
+                                    address, false, false, false));
   }
 
   void
@@ -1642,33 +1580,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
 	    Output_data* od, unsigned int shndx, Address address)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
-				    address, false, false, false, false));
-  }
-
-  void
-  add_local_generic(Relobj* relobj, unsigned int local_sym_index,
-		    unsigned int type, Output_data* od, uint64_t address,
-		    uint64_t addend)
-  {
-    gold_assert(addend == 0);
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian> *>(relobj);
-    this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, od,
-				    convert_types<Address, uint64_t>(address),
-				    false, false, false, false));
-  }
-
-  void
-  add_local_generic(Relobj* relobj, unsigned int local_sym_index,
-		    unsigned int type, Output_data* od, unsigned int shndx,
-		    uint64_t address, uint64_t addend)
-  {
-    gold_assert(addend == 0);
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian>*>(relobj);
-    this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, shndx,
-				    convert_types<Address, uint64_t>(address),
-				    false, false, false, false));
+				    address, false, false, false));
   }
 
   // Add a RELATIVE reloc against a local symbol.
@@ -1679,7 +1591,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
 	             Output_data* od, Address address)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, od,
-                                    address, true, true, false, false));
+                                    address, true, true, false));
   }
 
   void
@@ -1688,7 +1600,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
 	             Output_data* od, unsigned int shndx, Address address)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
-				    address, true, true, false, false));
+				    address, true, true, false));
   }
 
   // Add a local relocation which does not use a symbol for the relocation,
@@ -1700,7 +1612,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
 			      Output_data* od, Address address)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, od,
-                                    address, false, true, false, false));
+                                    address, false, true, false));
   }
 
   void
@@ -1710,7 +1622,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
 			      Address address)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
-				    address, false, true, false, false));
+				    address, false, true, false));
   }
 
   // Add a reloc against a local section symbol.  This will be
@@ -1723,7 +1635,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
                     Output_data* od, Address address)
   {
     this->add(od, Output_reloc_type(relobj, input_shndx, type, od,
-                                    address, false, false, true, false));
+                                    address, false, false, true));
   }
 
   void
@@ -1732,7 +1644,7 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
                     Output_data* od, unsigned int shndx, Address address)
   {
     this->add(od, Output_reloc_type(relobj, input_shndx, type, shndx,
-                                    address, false, false, true, false));
+                                    address, false, false, true));
   }
 
   // A reloc against the STT_SECTION symbol of an output section.
@@ -1750,29 +1662,6 @@ class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
                      unsigned int shndx, Address address)
   { this->add(od, Output_reloc_type(os, type, relobj, shndx, address)); }
 
-  void
-  add_output_section_generic(Output_section* os, unsigned int type,
-			     Output_data* od, uint64_t address,
-			     uint64_t addend)
-  {
-    gold_assert(addend == 0);
-    this->add(od, Output_reloc_type(os, type, od,
-				    convert_types<Address, uint64_t>(address)));
-  }
-
-  void
-  add_output_section_generic(Output_section* os, unsigned int type,
-			     Output_data* od, Relobj* relobj,
-			     unsigned int shndx, uint64_t address,
-			     uint64_t addend)
-  {
-    gold_assert(addend == 0);
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian>*>(relobj);
-    this->add(od, Output_reloc_type(os, type, sized_relobj, shndx,
-				    convert_types<Address, uint64_t>(address)));
-  }
-
   // Add an absolute relocation.
 
   void
@@ -1835,29 +1724,6 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
   { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
                                     addend, false, false)); }
 
-  void
-  add_global_generic(Symbol* gsym, unsigned int type, Output_data* od,
-		     uint64_t address, uint64_t addend)
-  {
-    this->add(od, Output_reloc_type(gsym, type, od,
-				    convert_types<Address, uint64_t>(address),
-				    convert_types<Addend, uint64_t>(addend),
-				    false, false));
-  }
-
-  void
-  add_global_generic(Symbol* gsym, unsigned int type, Output_data* od,
-		     Relobj* relobj, unsigned int shndx, uint64_t address,
-		     uint64_t addend)
-  {
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian>*>(relobj);
-    this->add(od, Output_reloc_type(gsym, type, sized_relobj, shndx,
-				    convert_types<Address, uint64_t>(address),
-				    convert_types<Addend, uint64_t>(addend),
-				    false, false));
-  }
-
   // Add a RELATIVE reloc against a global symbol.  The final output
   // relocation will not reference the symbol, but we must keep the symbol
   // information long enough to set the addend of the relocation correctly
@@ -1901,7 +1767,7 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 	    Output_data* od, Address address, Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address,
-				    addend, false, false, false, false));
+				    addend, false, false, false));
   }
 
   void
@@ -1911,34 +1777,7 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 	    Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
-                                    address, addend, false, false, false,
-                                    false));
-  }
-
-  void
-  add_local_generic(Relobj* relobj, unsigned int local_sym_index,
-		    unsigned int type, Output_data* od, uint64_t address,
-		    uint64_t addend)
-  {
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian> *>(relobj);
-    this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, od,
-				    convert_types<Address, uint64_t>(address),
-				    convert_types<Addend, uint64_t>(addend),
-				    false, false, false, false));
-  }
-
-  void
-  add_local_generic(Relobj* relobj, unsigned int local_sym_index,
-		    unsigned int type, Output_data* od, unsigned int shndx,
-		    uint64_t address, uint64_t addend)
-  {
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian>*>(relobj);
-    this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, shndx,
-				    convert_types<Address, uint64_t>(address),
-				    convert_types<Addend, uint64_t>(addend),
-				    false, false, false, false));
+                                    address, addend, false, false, false));
   }
 
   // Add a RELATIVE reloc against a local symbol.
@@ -1946,23 +1785,20 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
   void
   add_local_relative(Sized_relobj<size, big_endian>* relobj,
 	             unsigned int local_sym_index, unsigned int type,
-	             Output_data* od, Address address, Addend addend,
-	             bool use_plt_offset)
+	             Output_data* od, Address address, Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address,
-				    addend, true, true, false,
-				    use_plt_offset));
+				    addend, true, true, false));
   }
 
   void
   add_local_relative(Sized_relobj<size, big_endian>* relobj,
 	             unsigned int local_sym_index, unsigned int type,
 	             Output_data* od, unsigned int shndx, Address address,
-	             Addend addend, bool use_plt_offset)
+	             Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
-                                    address, addend, true, true, false,
-                                    use_plt_offset));
+                                    address, addend, true, true, false));
   }
 
   // Add a local relocation which does not use a symbol for the relocation,
@@ -1974,7 +1810,7 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 			      Output_data* od, Address address, Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address,
-				    addend, false, true, false, false));
+				    addend, false, true, false));
   }
 
   void
@@ -1984,8 +1820,7 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 			      Address address, Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
-                                    address, addend, false, true, false,
-                                    false));
+                                    address, addend, false, true, false));
   }
 
   // Add a reloc against a local section symbol.  This will be
@@ -1998,7 +1833,7 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
                     Output_data* od, Address address, Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, input_shndx, type, od, address,
-				    addend, false, false, true, false));
+				    addend, false, false, true));
   }
 
   void
@@ -2008,8 +1843,7 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
 		    Addend addend)
   {
     this->add(od, Output_reloc_type(relobj, input_shndx, type, shndx,
-                                    address, addend, false, false, true,
-                                    false));
+                                    address, addend, false, false, true));
   }
 
   // A reloc against the STT_SECTION symbol of an output section.
@@ -2026,29 +1860,6 @@ class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
   { this->add(od, Output_reloc_type(os, type, relobj, shndx, address,
                                     addend)); }
 
-  void
-  add_output_section_generic(Output_section* os, unsigned int type,
-			     Output_data* od, uint64_t address,
-			     uint64_t addend)
-  {
-    this->add(od, Output_reloc_type(os, type, od,
-				    convert_types<Address, uint64_t>(address),
-				    convert_types<Addend, uint64_t>(addend)));
-  }
-
-  void
-  add_output_section_generic(Output_section* os, unsigned int type,
-			     Output_data* od, Relobj* relobj,
-			     unsigned int shndx, uint64_t address,
-			     uint64_t addend)
-  {
-    Sized_relobj<size, big_endian>* sized_relobj =
-      static_cast<Sized_relobj<size, big_endian>*>(relobj);
-    this->add(od, Output_reloc_type(os, type, sized_relobj, shndx,
-				    convert_types<Address, uint64_t>(address),
-				    convert_types<Addend, uint64_t>(addend)));
-  }
-
   // Add an absolute relocation.
 
   void
@@ -2148,50 +1959,29 @@ class Output_data_group : public Output_section_data
 // Output_data_got is used to manage a GOT.  Each entry in the GOT is
 // for one symbol--either a global symbol or a local symbol in an
 // object.  The target specific code adds entries to the GOT as
-// needed.  The GOT_SIZE template parameter is the size in bits of a
-// GOT entry, typically 32 or 64.
-
-class Output_data_got_base : public Output_section_data_build
-{
- public:
-  Output_data_got_base(uint64_t align)
-    : Output_section_data_build(align)
-  { }
-
-  Output_data_got_base(off_t data_size, uint64_t align)
-    : Output_section_data_build(data_size, align)
-  { }
-
-  // Reserve the slot at index I in the GOT.
-  void
-  reserve_slot(unsigned int i)
-  { this->do_reserve_slot(i); }
+// needed.
 
- protected:
-  // Reserve the slot at index I in the GOT.
-  virtual void
-  do_reserve_slot(unsigned int i) = 0;
-};
-
-template<int got_size, bool big_endian>
-class Output_data_got : public Output_data_got_base
+template<int size, bool big_endian>
+class Output_data_got : public Output_section_data_build
 {
  public:
-  typedef typename elfcpp::Elf_types<got_size>::Elf_Addr Valtype;
+  typedef typename elfcpp::Elf_types<size>::Elf_Addr Valtype;
+  typedef Output_data_reloc<elfcpp::SHT_REL, true, size, big_endian> Rel_dyn;
+  typedef Output_data_reloc<elfcpp::SHT_RELA, true, size, big_endian> Rela_dyn;
 
   Output_data_got()
-    : Output_data_got_base(Output_data::default_alignment_for_size(got_size)),
+    : Output_section_data_build(Output_data::default_alignment_for_size(size)),
       entries_(), free_list_()
   { }
 
   Output_data_got(off_t data_size)
-    : Output_data_got_base(data_size,
-			   Output_data::default_alignment_for_size(got_size)),
+    : Output_section_data_build(data_size,
+				Output_data::default_alignment_for_size(size)),
       entries_(), free_list_()
   {
     // For an incremental update, we have an existing GOT section.
     // Initialize the list of entries and the free list.
-    this->entries_.resize(data_size / (got_size / 8));
+    this->entries_.resize(data_size / (size / 8));
     this->free_list_.init(data_size, false);
   }
 
@@ -2209,39 +1999,62 @@ class Output_data_got : public Output_data_got_base
   // relocation of type R_TYPE for the GOT entry.
   void
   add_global_with_rel(Symbol* gsym, unsigned int got_type,
-                      Output_data_reloc_generic* rel_dyn, unsigned int r_type);
+                      Rel_dyn* rel_dyn, unsigned int r_type);
+
+  void
+  add_global_with_rela(Symbol* gsym, unsigned int got_type,
+                       Rela_dyn* rela_dyn, unsigned int r_type);
 
   // Add a pair of entries for a global symbol to the GOT, and add
   // dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively.
   void
   add_global_pair_with_rel(Symbol* gsym, unsigned int got_type,
-                           Output_data_reloc_generic* rel_dyn,
-			   unsigned int r_type_1, unsigned int r_type_2);
+                           Rel_dyn* rel_dyn, unsigned int r_type_1,
+                           unsigned int r_type_2);
+
+  void
+  add_global_pair_with_rela(Symbol* gsym, unsigned int got_type,
+                            Rela_dyn* rela_dyn, unsigned int r_type_1,
+                            unsigned int r_type_2);
 
   // Add an entry for a local symbol to the GOT.  This returns true if
   // this is a new GOT entry, false if the symbol already has a GOT
   // entry.
   bool
-  add_local(Relobj* object, unsigned int sym_index, unsigned int got_type);
+  add_local(Sized_relobj_file<size, big_endian>* object, unsigned int sym_index,
+            unsigned int got_type);
 
   // Like add_local, but use the PLT offset of the local symbol if it
   // has one.
   bool
-  add_local_plt(Relobj* object, unsigned int sym_index, unsigned int got_type);
+  add_local_plt(Sized_relobj_file<size, big_endian>* object,
+		unsigned int sym_index,
+		unsigned int got_type);
 
   // Add an entry for a local symbol to the GOT, and add a dynamic
   // relocation of type R_TYPE for the GOT entry.
   void
-  add_local_with_rel(Relobj* object, unsigned int sym_index,
-		     unsigned int got_type, Output_data_reloc_generic* rel_dyn,
-		     unsigned int r_type);
+  add_local_with_rel(Sized_relobj_file<size, big_endian>* object,
+                     unsigned int sym_index, unsigned int got_type,
+                     Rel_dyn* rel_dyn, unsigned int r_type);
+
+  void
+  add_local_with_rela(Sized_relobj_file<size, big_endian>* object,
+                      unsigned int sym_index, unsigned int got_type,
+                      Rela_dyn* rela_dyn, unsigned int r_type);
 
   // Add a pair of entries for a local symbol to the GOT, and add
   // dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively.
   void
-  add_local_pair_with_rel(Relobj* object, unsigned int sym_index,
-			  unsigned int shndx, unsigned int got_type,
-			  Output_data_reloc_generic* rel_dyn,
+  add_local_pair_with_rel(Sized_relobj_file<size, big_endian>* object,
+                          unsigned int sym_index, unsigned int shndx,
+                          unsigned int got_type, Rel_dyn* rel_dyn,
+                          unsigned int r_type_1, unsigned int r_type_2);
+
+  void
+  add_local_pair_with_rela(Sized_relobj_file<size, big_endian>* object,
+                          unsigned int sym_index, unsigned int shndx,
+                          unsigned int got_type, Rela_dyn* rela_dyn,
                           unsigned int r_type_1, unsigned int r_type_2);
 
   // Add a constant to the GOT.  This returns the offset of the new
@@ -2253,10 +2066,15 @@ class Output_data_got : public Output_data_got_base
     return got_offset;
   }
 
+  // Reserve a slot in the GOT.
+  void
+  reserve_slot(unsigned int i)
+  { this->free_list_.remove(i * size / 8, (i + 1) * size / 8); }
+
   // Reserve a slot in the GOT for a local symbol.
   void
-  reserve_local(unsigned int i, Relobj* object, unsigned int sym_index,
-		unsigned int got_type);
+  reserve_local(unsigned int i, Sized_relobj<size, big_endian>* object,
+		unsigned int sym_index, unsigned int got_type);
 
   // Reserve a slot in the GOT for a global symbol.
   void
@@ -2272,11 +2090,6 @@ class Output_data_got : public Output_data_got_base
   do_print_to_mapfile(Mapfile* mapfile) const
   { mapfile->print_output_data(this, _("** GOT")); }
 
-  // Reserve the slot at index I in the GOT.
-  virtual void
-  do_reserve_slot(unsigned int i)
-  { this->free_list_.remove(i * got_size / 8, (i + 1) * got_size / 8); }
-
  private:
   // This POD class holds a single GOT entry.
   class Got_entry
@@ -2293,8 +2106,8 @@ class Output_data_got : public Output_data_got_base
     { this->u_.gsym = gsym; }
 
     // Create a local symbol entry.
-    Got_entry(Relobj* object, unsigned int local_sym_index,
-	      bool use_plt_offset)
+    Got_entry(Sized_relobj_file<size, big_endian>* object,
+              unsigned int local_sym_index, bool use_plt_offset)
       : local_sym_index_(local_sym_index), use_plt_offset_(use_plt_offset)
     {
       gold_assert(local_sym_index != GSYM_CODE
@@ -2325,7 +2138,7 @@ class Output_data_got : public Output_data_got_base
     union
     {
       // For a local symbol, the object.
-      Relobj* object;
+      Sized_relobj_file<size, big_endian>* object;
       // For a global symbol, the symbol.
       Symbol* gsym;
       // For a constant, the constant.
@@ -2351,7 +2164,7 @@ class Output_data_got : public Output_data_got_base
   // Return the offset into the GOT of GOT entry I.
   unsigned int
   got_offset(unsigned int i) const
-  { return i * (got_size / 8); }
+  { return i * (size / 8); }
 
   // Return the offset into the GOT of the last entry added.
   unsigned int
@@ -2948,7 +2761,7 @@ class Output_section : public Output_data
   typedef std::map<Section_id, unsigned int> Section_layout_order;
 
   void
-  update_section_layout(const Section_layout_order* order_map);
+  update_section_layout(const Section_layout_order& order_map);
 
   // Update the output section flags based on input section flags.
   void
diff --git a/gold/parameters.cc b/gold/parameters.cc
index 7fc5730ee7..c14bd1e826 100644
--- a/gold/parameters.cc
+++ b/gold/parameters.cc
@@ -64,7 +64,7 @@ Set_parameters_target_once set_parameters_target_once(&static_parameters);
 // Class Parameters.
 
 Parameters::Parameters()
-   : errors_(NULL), timer_(NULL), options_(NULL), target_(NULL),
+   : errors_(NULL), options_(NULL), target_(NULL),
      doing_static_link_valid_(false), doing_static_link_(false),
      debug_(0), incremental_mode_(General_options::INCREMENTAL_OFF),
      set_parameters_target_once_(&set_parameters_target_once)
@@ -79,13 +79,6 @@ Parameters::set_errors(Errors* errors)
 }
 
 void
-Parameters::set_timer(Timer* timer)
-{
-  gold_assert(this->timer_ == NULL);
-  this->timer_ = timer;
-}
-
-void
 Parameters::set_options(const General_options* options)
 {
   gold_assert(!this->options_valid());
@@ -277,10 +270,6 @@ set_parameters_errors(Errors* errors)
 { static_parameters.set_errors(errors); }
 
 void
-set_parameters_timer(Timer* timer)
-{ static_parameters.set_timer(timer); }
-
-void
 set_parameters_options(const General_options* options)
 { static_parameters.set_options(options); }
 
diff --git a/gold/parameters.h b/gold/parameters.h
index 10de2ae7fa..09b0516b78 100644
--- a/gold/parameters.h
+++ b/gold/parameters.h
@@ -28,7 +28,6 @@ namespace gold
 
 class General_options;
 class Errors;
-class Timer;
 class Target;
 template<int size, bool big_endian>
 class Sized_target;
@@ -58,9 +57,6 @@ class Parameters
   set_errors(Errors* errors);
 
   void
-  set_timer(Timer* timer);
-
-  void
   set_options(const General_options* options);
 
   void
@@ -74,11 +70,6 @@ class Parameters
   errors() const
   { return this->errors_; }
 
-  // Return the timer object.
-  Timer*
-  timer() const
-  { return this->timer_; }
-
   // Whether the options are valid.  This should not normally be
   // called, but it is needed by gold_exit.
   bool
@@ -186,7 +177,6 @@ class Parameters
   friend class Set_parameters_target_once;
 
   Errors* errors_;
-  Timer* timer_;
   const General_options* options_;
   Target* target_;
   bool doing_static_link_valid_;
@@ -206,9 +196,6 @@ extern void
 set_parameters_errors(Errors* errors);
 
 extern void
-set_parameters_timer(Timer* timer);
-
-extern void
 set_parameters_options(const General_options* options);
 
 extern void
diff --git a/gold/plugin.cc b/gold/plugin.cc
index 63d0974c6a..3ccd8d0807 100644
--- a/gold/plugin.cc
+++ b/gold/plugin.cc
@@ -818,9 +818,7 @@ Pluginobj::Pluginobj(const std::string& name, Input_file* input_file,
 }
 
 // Return TRUE if a defined symbol is referenced from outside the
-// universe of claimed objects.  Only references from relocatable,
-// non-IR (unclaimed) objects count as a reference.  References from
-// dynamic objects count only as "visible".
+// universe of claimed objects.
 
 static inline bool
 is_referenced_from_outside(Symbol* lsym)
@@ -840,8 +838,6 @@ is_referenced_from_outside(Symbol* lsym)
 static inline bool
 is_visible_from_outside(Symbol* lsym)
 {
-  if (lsym->in_dyn())
-    return true;
   if (parameters->options().export_dynamic() || parameters->options().shared())
     return lsym->is_externally_visible();
   return false;
@@ -1159,14 +1155,13 @@ Sized_pluginobj<size, big_endian>::do_section_name(unsigned int)
 // Return a view of the contents of a section.  Not used for plugin objects.
 
 template<int size, bool big_endian>
-const unsigned char*
-Sized_pluginobj<size, big_endian>::do_section_contents(
-    unsigned int,
-    section_size_type*,
-    bool)
+Object::Location
+Sized_pluginobj<size, big_endian>::do_section_contents(unsigned int)
 {
+  Location loc(0, 0);
+
   gold_unreachable();
-  return NULL;
+  return loc;
 }
 
 // Return section flags.  Not used for plugin objects.
@@ -1249,18 +1244,14 @@ Sized_pluginobj<size, big_endian>::do_initialize_xindex()
   return NULL;
 }
 
-// Get symbol counts.  Don't count plugin objects; the replacement
-// files will provide the counts.
+// Get symbol counts.  Not used for plugin objects.
 
 template<int size, bool big_endian>
 void
-Sized_pluginobj<size, big_endian>::do_get_global_symbol_counts(
-    const Symbol_table*,
-    size_t* defined,
-    size_t* used) const
+Sized_pluginobj<size, big_endian>::do_get_global_symbol_counts(const Symbol_table*,
+                                                   size_t*, size_t*) const
 {
-  *defined = 0;
-  *used = 0;
+  gold_unreachable();
 }
 
 // Get symbols.  Not used for plugin objects.
@@ -1639,7 +1630,7 @@ get_input_section_contents(const struct ld_plugin_section section,
 // which they should appear in the final layout.
 
 static enum ld_plugin_status
-update_section_order(const struct ld_plugin_section* section_list,
+update_section_order(const struct ld_plugin_section *section_list,
 		     unsigned int num_sections)
 {
   gold_assert(parameters->options().has_plugins());
@@ -1650,14 +1641,8 @@ update_section_order(const struct ld_plugin_section* section_list,
   if (section_list == NULL)
     return LDPS_ERR;
 
-  Layout* layout = parameters->options().plugins()->layout();
-  gold_assert (layout != NULL);
+  std::map<Section_id, unsigned int> order_map;
 
-  std::map<Section_id, unsigned int>* order_map
-    = layout->get_section_order_map();
-
-  /* Store the mapping from Section_id to section position in layout's
-     order_map to consult after output sections are added.  */
   for (unsigned int i = 0; i < num_sections; ++i)
     {
       Object* obj = parameters->options().plugins()->get_elf_object(
@@ -1666,9 +1651,17 @@ update_section_order(const struct ld_plugin_section* section_list,
 	return LDPS_BAD_HANDLE;
       unsigned int shndx = section_list[i].shndx;
       Section_id secn_id(obj, shndx);
-      (*order_map)[secn_id] = i + 1;
+      order_map[secn_id] = i + 1;
     }
 
+  Layout* layout = parameters->options().plugins()->layout();
+  gold_assert (layout != NULL);
+
+  for (Layout::Section_list::const_iterator p = layout->section_list().begin();
+       p != layout->section_list().end();
+       ++p)
+    (*p)->update_section_layout(order_map);
+
   return LDPS_OK;
 }
 
diff --git a/gold/plugin.h b/gold/plugin.h
index 1891d6ba40..32ffe35fc3 100644
--- a/gold/plugin.h
+++ b/gold/plugin.h
@@ -493,9 +493,8 @@ class Sized_pluginobj : public Pluginobj
   do_section_name(unsigned int shndx);
 
   // Return a view of the contents of a section.
-  const unsigned char*
-  do_section_contents(unsigned int shndx, section_size_type* plen,
-		      bool cache);
+  Object::Location
+  do_section_contents(unsigned int shndx);
 
   // Return section flags.
   uint64_t
diff --git a/gold/po/es.po b/gold/po/es.po
index d203329408..6825c3ef5f 100644
--- a/gold/po/es.po
+++ b/gold/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para gold 2.21.53.
+# Mensajes en español para gold 2.20.90.
 # Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gold 2.21.53\n"
+"Project-Id-Version: gold 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
 "POT-Creation-Date: 2010-03-03 15:08+0100\n"
-"PO-Revision-Date: 2011-09-25 20:48-0500\n"
+"PO-Revision-Date: 2011-08-24 11:49-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
diff --git a/gold/po/fi.po b/gold/po/fi.po
index 59f28eba68..0f2cfed0f0 100644
--- a/gold/po/fi.po
+++ b/gold/po/fi.po
@@ -1,171 +1,81 @@
 # Finnish messages for gold.
-# Copyright © 2010, 2011 Free Software Foundation, Inc.
+# Copyright © 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010-2011.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gold 2.21.53\n"
-"Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2010-03-03 15:08+0100\n"
-"PO-Revision-Date: 2011-09-23 13:25+0200\n"
+"Project-Id-Version: gold 2.20\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-09 17:16+0930\n"
+"PO-Revision-Date: 2010-03-02 17:04+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: archive.cc:119
+#: archive.cc:107
 #, c-format
 msgid "%s: no archive symbol table (run ranlib)"
 msgstr "%s: ei arkistosymbolitaulua (suorita ranlib)"
 
-#: archive.cc:204
+#: archive.cc:189
 #, c-format
 msgid "%s: bad archive symbol table names"
 msgstr "%s: virheelliset arkistosymbolitaulunimet"
 
-#: archive.cc:236
+#: archive.cc:221
 #, c-format
 msgid "%s: malformed archive header at %zu"
 msgstr "%s: vääränmuotoinen arkisto-otsake siirrososoitteessa %zu"
 
-#: archive.cc:256
+#: archive.cc:241
 #, c-format
 msgid "%s: malformed archive header size at %zu"
 msgstr "%s: vääränmuotoinen arkisto-otsakekoko siirrososoitteessa %zu"
 
-#: archive.cc:267
+#: archive.cc:252
 #, c-format
 msgid "%s: malformed archive header name at %zu"
 msgstr "%s: vääränmuotoinen arkisto-otsakenimi siirrososoitteessa %zu"
 
-#: archive.cc:297
+#: archive.cc:282
 #, c-format
 msgid "%s: bad extended name index at %zu"
 msgstr "%s: väärä laajennettu nimi-indeksi siirrososoitteessa %zu"
 
-#: archive.cc:307
+#: archive.cc:292
 #, c-format
 msgid "%s: bad extended name entry at header %zu"
 msgstr "%s: väärä laajennettu nimimerkintä otsakeosoitteessa %zu"
 
-#: archive.cc:404
+#: archive.cc:389
 #, c-format
 msgid "%s: short archive header at %zu"
 msgstr "%s: lyhyt arkisto-otsake siirrososoitteessa %zu"
 
-#: archive.cc:560
+#: archive.cc:530 archive.cc:545
 #, c-format
 msgid "%s: member at %zu is not an ELF object"
 msgstr "%s: jäsen siirrososoitteessa %zu ei ole ELF-objekti"
 
-#: archive.cc:879
+#: archive.cc:775
 #, c-format
 msgid "%s: archive libraries: %u\n"
 msgstr "%s: arkistokirjastot: %u\n"
 
-#: archive.cc:881
+#: archive.cc:777
 #, c-format
 msgid "%s: total archive members: %u\n"
 msgstr "%s: yhteensä arkistojäseniä: %u\n"
 
-#: archive.cc:883
+#: archive.cc:779
 #, c-format
 msgid "%s: loaded archive members: %u\n"
 msgstr "%s: ladattuja arkistojäseniä: %u\n"
 
-#: arm.cc:1149 i386.cc:536 sparc.cc:1087 x86_64.cc:565
-msgid "** PLT"
-msgstr "** PLT"
-
-#  Report an unsupported relocation against a local symbol.
-#: arm.cc:1364 i386.cc:880 powerpc.cc:1014 sparc.cc:1502 x86_64.cc:955
-#: x86_64.cc:1265
-#, c-format
-msgid "%s: unsupported reloc %u against local symbol"
-msgstr "%s: tukematon sijoitus %u paikallista symbolia kohtaan"
-
-#: arm.cc:1404 powerpc.cc:1105 sparc.cc:1592 x86_64.cc:992
-msgid "requires unsupported dynamic reloc; recompile with -fPIC"
-msgstr "vaatii tukematonta dynaamista reloc-tietuetta, käännä uudelleen valitsimella -fPIC"
-
-#. These are relocations which should only be seen by the
-#. dynamic linker, and should never be seen here.
-#: arm.cc:1519 arm.cc:1739 arm.cc:2354 i386.cc:1002 i386.cc:1334
-#: powerpc.cc:1223 powerpc.cc:1432 sparc.cc:1877 sparc.cc:2238 x86_64.cc:1145
-#: x86_64.cc:1453
-#, c-format
-msgid "%s: unexpected reloc %u in object file"
-msgstr "%s: odottamaton sijoitus %u objektitiedostossa"
-
-#  Report an unsupported relocation against a global symbol.
-#: arm.cc:1538 i386.cc:1171 powerpc.cc:1242 sparc.cc:1896 x86_64.cc:1279
-#: x86_64.cc:1571
-#, c-format
-msgid "%s: unsupported reloc %u against global symbol %s"
-msgstr "%s: tukematon sijoitus %u yleissymbolia %s kohtaan"
-
-#  Scan relocations for a section.
-#: arm.cc:1804 i386.cc:1542
-#, c-format
-msgid "%s: unsupported RELA reloc section"
-msgstr "%s: tukematon RELA-sijoituslohko"
-
-#: arm.cc:2047
-msgid "relocation R_ARM_MOVW_ABS_NC cannot be used when makinga shared object; recompile with -fPIC"
-msgstr "sijoitusta R_ARM_MOVW_ABS_NC ei voi käyttää kun tehdään jaettua objektia: käännä uudelleen valitsimella -fPIC"
-
-#: arm.cc:2056
-msgid "relocation R_ARM_MOVT_ABS cannot be used when makinga shared object; recompile with -fPIC"
-msgstr "sijoitusta R_ARM_MOVT_ABS ei voi käyttää kun tehdään jaettua objektia: käännä uudelleen valitsimella -fPIC"
-
-#: arm.cc:2067
-msgid "relocation R_ARM_THM_MOVW_ABS_NC cannot be used whenmaking a shared object; recompile with -fPIC"
-msgstr "sijoitusta R_ARM_THM_MOVW_ABS_NC ei voi käyttää kun tehdään jaettua objektia: käännä uudelleen valitsimella -fPIC"
-
-#: arm.cc:2077
-msgid "relocation R_ARM_THM_MOVT_ABS cannot be used whenmaking a shared object; recompile with -fPIC"
-msgstr "sijoitusta  R_ARM_THM_MOVT_ABS ei voi käyttää kun tehdään jaettua objektia: käännä uudelleen valitsimella -fPIC"
-
-#: arm.cc:2141
-msgid "cannot find origin of R_ARM_BASE_PREL"
-msgstr "ei voida löytää R_ARM_BASE_PREL-alkua"
-
-#: arm.cc:2169
-msgid "cannot find origin of R_ARM_BASE_ABS"
-msgstr "ei voida löytää R_ARM_BASE_ABS-alkua"
-
-#: arm.cc:2230 i386.cc:1820 i386.cc:2521 powerpc.cc:1798 sparc.cc:2711
-#: x86_64.cc:1935 x86_64.cc:2518
-#, c-format
-msgid "unexpected reloc %u in object file"
-msgstr "tukematon sijoitus %u objektitiedostossa"
-
-#: arm.cc:2236 i386.cc:1852 i386.cc:1931 i386.cc:1983 i386.cc:2014
-#: i386.cc:2076 powerpc.cc:1804 sparc.cc:2717 sparc.cc:2900 sparc.cc:2961
-#: sparc.cc:3068 x86_64.cc:1956 x86_64.cc:2039 x86_64.cc:2094 x86_64.cc:2119
-#, c-format
-msgid "unsupported reloc %u"
-msgstr "tukematon sijoitus %u"
-
-#: arm.cc:2248
-#, c-format
-msgid "relocation overflow in relocation %u"
-msgstr "sijoitusylivuoto sijoituksessa %u"
-
-#: arm.cc:2256
-#, c-format
-msgid "unexpected opcode while processing relocation %u"
-msgstr "odottamaton käskykoodi käsiteltäessä sijoitusta %u"
-
-#: arm.cc:2359 i386.cc:2535
-#, c-format
-msgid "unsupported reloc %u in object file"
-msgstr "tukematon sijoitus %u objektitiedostossa"
-
 #: binary.cc:129
 #, c-format
 msgid "cannot open %s: %s:"
@@ -180,16 +90,16 @@ msgstr "ei tiivistetä lohkodataa: zlib-virhe"
 msgid "cannot open symbol count file %s: %s"
 msgstr "ei voi avata symbolilukumäärätiedostoa %s: %s"
 
-#: descriptors.cc:116
+#: descriptors.cc:94
 #, c-format
 msgid "file %s was removed during the link"
 msgstr "tiedosto %s poistettiin linkityksen aikana"
 
-#: descriptors.cc:169
+#: descriptors.cc:133
 msgid "out of file descriptors and couldn't close any"
 msgstr "ei ole enää tiedostokuvaajia eikä voitu sulkea yhtään"
 
-#: descriptors.cc:190 descriptors.cc:226
+#: descriptors.cc:154 descriptors.cc:189
 #, c-format
 msgid "while closing %s: %s"
 msgstr "suljetaessa tiedostokuvaajaa %s: %s"
@@ -203,115 +113,115 @@ msgstr "%s: ei voi lukea hakemistoa: %s"
 msgid "Unusually large LEB128 decoded, debug information may be corrupted"
 msgstr "Epätavallisen iso LEB128 dekoodattu, vianjäljitystiedot saattavat olla vääristyneitä"
 
-#: dynobj.cc:164
+#: dynobj.cc:169
 #, c-format
 msgid "unexpected duplicate type %u section: %u, %u"
 msgstr "odottamaton kaksoiskappaletyyppi %u lohko: %u, %u"
 
-#: dynobj.cc:200
+#: dynobj.cc:205
 #, c-format
 msgid "unexpected link in section %u header: %u != %u"
 msgstr "odottamaton linkitys lohkossa %u otsake: %u != %u"
 
-#: dynobj.cc:236
+#: dynobj.cc:241
 #, c-format
 msgid "DYNAMIC section %u link out of range: %u"
 msgstr "DYNAAMINEN lohko %u linkki lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:244
+#: dynobj.cc:249
 #, c-format
 msgid "DYNAMIC section %u link %u is not a strtab"
 msgstr "DYNAAMINEN lohko %u linkki %u ei ole �strtab�"
 
-#: dynobj.cc:273
+#: dynobj.cc:278
 #, c-format
 msgid "DT_SONAME value out of range: %lld >= %lld"
 msgstr "DT_SONAME-arvo lukualueen ulkopuolella: %lld >= %lld"
 
-#: dynobj.cc:285
+#: dynobj.cc:290
 #, c-format
 msgid "DT_NEEDED value out of range: %lld >= %lld"
 msgstr "DT_NEEDED-arvo lukualueen ulkopuolella: %lld >= %lld"
 
-#: dynobj.cc:298
+#: dynobj.cc:303
 msgid "missing DT_NULL in dynamic segment"
 msgstr "puuttuva DT_NULL dynaamisessa segmentissä"
 
-#: dynobj.cc:344
+#: dynobj.cc:349
 #, c-format
 msgid "invalid dynamic symbol table name index: %u"
 msgstr "virheellinen dynaaminen symbolitaulunimi-indeksi: %u"
 
-#: dynobj.cc:351
+#: dynobj.cc:356
 #, c-format
 msgid "dynamic symbol table name section has wrong type: %u"
 msgstr "dynaamisella symbolitaulunimilohkolla on väärä tyyppi: %u"
 
-#: dynobj.cc:438 object.cc:463 object.cc:1106
+#: dynobj.cc:443 object.cc:376 object.cc:884
 #, c-format
 msgid "bad section name offset for section %u: %lu"
 msgstr "väärä lohkonimisiirrososoite lohkolle %u: %lu"
 
-#: dynobj.cc:468
+#: dynobj.cc:472
 #, c-format
 msgid "duplicate definition for version %u"
 msgstr "kaksoiskappalemäärittely versiolle %u"
 
-#: dynobj.cc:497
+#: dynobj.cc:501
 #, c-format
 msgid "unexpected verdef version %u"
 msgstr "odottamaton verdef-versio %u"
 
-#: dynobj.cc:513
+#: dynobj.cc:517
 #, c-format
 msgid "verdef vd_cnt field too small: %u"
 msgstr "verdef vd_cnt-kenttä liian pieni: %u"
 
-#: dynobj.cc:521
+#: dynobj.cc:525
 #, c-format
 msgid "verdef vd_aux field out of range: %u"
 msgstr "verdef vd_aux-kenttä lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:532
+#: dynobj.cc:536
 #, c-format
 msgid "verdaux vda_name field out of range: %u"
 msgstr "verdaux vda_name -kenttä lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:542
+#: dynobj.cc:546
 #, c-format
 msgid "verdef vd_next field out of range: %u"
-msgstr "verdef vd_next -kenttä lukualueen ulkopuolella: %u"
+msgstr "verdef vd_next -kenttää lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:576
+#: dynobj.cc:580
 #, c-format
 msgid "unexpected verneed version %u"
 msgstr "odottamaton verneed-versio %u"
 
-#: dynobj.cc:585
+#: dynobj.cc:589
 #, c-format
 msgid "verneed vn_aux field out of range: %u"
 msgstr "verneed vn_aux-kenttä lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:599
+#: dynobj.cc:603
 #, c-format
 msgid "vernaux vna_name field out of range: %u"
 msgstr "vernaux vna_name-kenttä lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:610
+#: dynobj.cc:614
 #, c-format
 msgid "verneed vna_next field out of range: %u"
 msgstr "verneed vna_next-kenttä lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:621
+#: dynobj.cc:625
 #, c-format
 msgid "verneed vn_next field out of range: %u"
 msgstr "verneed vn_next-kenttä lukualueen ulkopuolella: %u"
 
-#: dynobj.cc:670
+#: dynobj.cc:673
 msgid "size of dynamic symbols is not multiple of symbol size"
 msgstr "dynaamisten symbolien koko ei ole symbolikoon monikerta"
 
-#: dynobj.cc:1435
+#: dynobj.cc:1425
 #, c-format
 msgid "symbol %s has undefined version %s"
 msgstr "symbolilla %s on määrittelemätön versio %s"
@@ -324,42 +234,27 @@ msgstr "** eh_frame_hdr"
 msgid "** eh_frame"
 msgstr "** eh_frame"
 
-#: errors.cc:81
-#, c-format
-msgid "%s: fatal error: "
-msgstr "%s: kohtalokas virhe: "
-
-#: errors.cc:92
-#, c-format
-msgid "%s: error: "
-msgstr "%s: virhe: "
-
-#: errors.cc:104
+#: errors.cc:106
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: varoitus: "
 
-#: errors.cc:128
-#, c-format
-msgid "%s: %s: error: "
-msgstr "%s: %s: virhe: "
-
-#: errors.cc:144
+#: errors.cc:146
 #, c-format
 msgid "%s: %s: warning: "
 msgstr "%s: %s: varoitus: "
 
-#: errors.cc:167
+#: errors.cc:172
 #, c-format
-msgid "%s: %s: error: undefined reference to '%s'\n"
-msgstr "%s: %s: virhe: määrittelemätön viite kohteeseen ’%s’\n"
+msgid "%s: %s: undefined reference to '%s'\n"
+msgstr "%s: %s: määrittelemätön viite kohteeseen ’%s’\n"
 
-#: errors.cc:172
+#: errors.cc:176
 #, c-format
-msgid "%s: %s: error: undefined reference to '%s', version '%s'\n"
-msgstr "%s: %s: virhe: määrittelemätön viite kohteeseen ’%s’, versio ’%s’\n"
+msgid "%s: %s: undefined reference to '%s', version '%s'\n"
+msgstr "%s: %s: määrittelemätön viite kohteeseen ’%s’, versio ’%s’\n"
 
-#: errors.cc:182
+#: errors.cc:186
 #, c-format
 msgid "%s: "
 msgstr "%s: "
@@ -379,6 +274,10 @@ msgstr "virheellinen viite dot-symboliin SECTIONS-lauseen ulkopuolella"
 msgid "unary "
 msgstr "unaari "
 
+#: expression.cc:278 expression.cc:400
+msgid " applied to section relative value"
+msgstr " sovellettu lohkosuhteelliseen arvoon"
+
 #. Handle binary operators.  We use a preprocessor macro as a hack to
 #. capture the C operator.  KEEP_LEFT means that if the left operand
 #. is section relative and the right operand is not, the result uses
@@ -424,85 +323,75 @@ msgstr "ORIGIN on toteuttamatta"
 msgid "LENGTH not implemented"
 msgstr "LENGTH on toteuttamatta"
 
-#: fileread.cc:65
+#: fileread.cc:55
 #, c-format
 msgid "munmap failed: %s"
 msgstr "munmap epäonnistui: %s"
 
-#: fileread.cc:129
+#: fileread.cc:119
 #, c-format
 msgid "%s: fstat failed: %s"
 msgstr "%s: fstat epäonnistui: %s"
 
-#: fileread.cc:169
+#: fileread.cc:159
 #, c-format
 msgid "could not reopen file %s"
 msgstr "ei voitu avata uudelleen tiedostoa %s"
 
-#: fileread.cc:302
+#: fileread.cc:292
 #, c-format
 msgid "%s: pread failed: %s"
 msgstr "%s: pread epäonnistui: %s"
 
-#: fileread.cc:308
+#: fileread.cc:298
 #, c-format
 msgid "%s: file too short: read only %lld of %lld bytes at %lld"
 msgstr "%s: tiedosto on liian lyhyt: lue vain %lld / %lld tavua osoitteesta %lld"
 
-#: fileread.cc:372
-#, c-format
-msgid "%s: attempt to map %lld bytes at offset %lld exceeds size of file; the file may be corrupt"
-msgstr "%s: yritys kuvata %lld tavua siirrososoitteessa %lld ylittää tiedoston koon; tiedosto on ehkä rikkinäinen"
-
-#: fileread.cc:402
+#: fileread.cc:382
 #, c-format
 msgid "%s: mmap offset %lld size %lld failed: %s"
 msgstr "%s: mmap siirrososoite %lld koko %lld epäonnistui: %s"
 
-#: fileread.cc:548
+#: fileread.cc:528
 #, c-format
 msgid "%s: lseek failed: %s"
 msgstr "%s: lseek epäonnistui: %s"
 
-#: fileread.cc:554
+#: fileread.cc:534
 #, c-format
 msgid "%s: readv failed: %s"
 msgstr "%s: readv epäonnistui: %s"
 
-#: fileread.cc:557
+#: fileread.cc:537
 #, c-format
 msgid "%s: file too short: read only %zd of %zd bytes at %lld"
 msgstr "%s: tiedosto on liian lyhyt: lue vain %zd / %zd tavua osoitteesta %lld"
 
-#: fileread.cc:706
+#: fileread.cc:686
 #, c-format
 msgid "%s: total bytes mapped for read: %llu\n"
-msgstr "%s: yhteensä tavuja kuvattu lukemista varten: %llu\n"
+msgstr "%s: yhteensä tavuja kartoitettu lukemista varten: %llu\n"
 
-#: fileread.cc:708
+#: fileread.cc:688
 #, c-format
 msgid "%s: maximum bytes mapped for read at one time: %llu\n"
-msgstr "%s: maksimitavuja kuvattu kertalukemista varten: %llu\n"
-
-#: fileread.cc:791
-#, c-format
-msgid "%s: stat failed: %s"
-msgstr "%s: stat epäonnistui: %s"
+msgstr "%s: maksimitavuja kartoitettu lukemista varten kerrallaan: %llu\n"
 
-#: fileread.cc:849
+#: fileread.cc:783
 #, c-format
-msgid "cannot find %s%s"
-msgstr "ei voi löytää kohdetta %s%s"
+msgid "cannot find -l%s"
+msgstr "ei voi löytää -l%s"
 
-#: fileread.cc:880
+#: fileread.cc:810
 #, c-format
 msgid "cannot find %s"
-msgstr "ei voi löytää kohdetta %s"
+msgstr "ei voi löytää %s"
 
-#: fileread.cc:904
+#: fileread.cc:833
 #, c-format
 msgid "cannot open %s: %s"
-msgstr "ei voi avata kohdetta %s: %s"
+msgstr "ei voi avata %s: %s"
 
 #: gold-threads.cc:103
 #, c-format
@@ -529,12 +418,12 @@ msgstr "pthread_mutexattr_destroy epäonnistui: %s"
 msgid "pthread_mutex_destroy failed: %s"
 msgstr "pthread_mutex_destroy epäonnistui: %s"
 
-#: gold-threads.cc:131 gold-threads.cc:382
+#: gold-threads.cc:131
 #, c-format
 msgid "pthread_mutex_lock failed: %s"
 msgstr "pthread_mutex_lock epäonnistui: %s"
 
-#: gold-threads.cc:139 gold-threads.cc:394
+#: gold-threads.cc:139
 #, c-format
 msgid "pthread_mutex_unlock failed: %s"
 msgstr "pthread_mutex_unlock epäonnistui: %s"
@@ -564,156 +453,124 @@ msgstr "pthread_cond_signal epäonnistui: %s"
 msgid "pthread_cond_broadcast failed: %s"
 msgstr "pthread_cond_broadcast epäonnistui: %s"
 
-#: gold-threads.cc:388
-#, c-format
-msgid "pthread_once failed: %s"
-msgstr "pthread_once epäonnistui: %s"
-
-#: gold.cc:91
+#: gold.cc:83
 #, c-format
 msgid "%s: internal error in %s, at %s:%d\n"
 msgstr "%s: sisäinen virhe funktiossa %s, tiedostossa %s:%d\n"
 
-#: gold.cc:173
+#: gold.cc:130
 msgid "no input files"
 msgstr "ei syötetiedostoja"
 
-#: gold.cc:226
-msgid "cannot mix -r with --gc-sections or --icf"
-msgstr "ei voi sekoittaa valitsinta -r valitsimen --gc-sections tai --icf kanssa"
-
-#: gold.cc:407
+#. We print out just the first .so we see; there may be others.
+#: gold.cc:195
 #, c-format
 msgid "cannot mix -static with dynamic object %s"
 msgstr "ei voi sekoittaa valitsinta -static dynaamisen objektin %s kanssa"
 
-#: gold.cc:411
+#: gold.cc:199
 #, c-format
 msgid "cannot mix -r with dynamic object %s"
 msgstr "ei voi sekoittaa valitsinta -r dynaamisen objektin %s kanssa"
 
-#: gold.cc:415
+#: gold.cc:203
 #, c-format
 msgid "cannot use non-ELF output format with dynamic object %s"
 msgstr "ei voi käyttää ei-ELF-tulostemuotoa dynaamisen objektin %s kanssa"
 
-#: gold.cc:427
-#, c-format
-msgid "cannot mix split-stack '%s' and non-split-stack '%s' when using -r"
-msgstr "ei voida sekoittaa jaettua pinoa ’%s’ ja ei-jaettua pinoa ’%s’ kun käytetään valitsinta -r"
-
 #. FIXME: This needs to specify the location somehow.
-#: i386.cc:232 i386.cc:1669 sparc.cc:234 sparc.cc:2395 x86_64.cc:237
-#: x86_64.cc:1732
+#: i386.cc:193 i386.cc:1588 sparc.cc:211 sparc.cc:2322 x86_64.cc:208
+#: x86_64.cc:1656
 msgid "missing expected TLS relocation"
 msgstr "puuttuu odotettu TLS-sijoitus"
 
-#: i386.cc:944 x86_64.cc:1068
+#: i386.cc:503 sparc.cc:1066 x86_64.cc:533
+msgid "** PLT"
+msgstr "** PLT"
+
+#  Report an unsupported relocation against a local symbol.
+#: i386.cc:843 powerpc.cc:996 sparc.cc:1480 x86_64.cc:921 x86_64.cc:1230
+#, c-format
+msgid "%s: unsupported reloc %u against local symbol"
+msgstr "%s: tukematon sijoitus %u paikallista symbolia kohtaan"
+
+#: i386.cc:907 x86_64.cc:1033
 #, c-format
 msgid "section symbol %u has bad shndx %u"
 msgstr "lohkosymbolilla %u on virheellinen shndx-lohko %u"
 
-#: i386.cc:1036 i386.cc:1060 sparc.cc:1777 x86_64.cc:1176 x86_64.cc:1204
+#  These are relocations which ...
+#: i386.cc:965 i386.cc:1297 powerpc.cc:1204 powerpc.cc:1413 sparc.cc:1852
+#: sparc.cc:2204 x86_64.cc:1110 x86_64.cc:1418
 #, c-format
-msgid "local symbol %u has bad shndx %u"
-msgstr "paikallisella symbolilla %u on virheellinen shndx-lohko %u"
-
-#: i386.cc:1991
-msgid "both SUN and GNU model TLS relocations"
-msgstr "sekä SUN- että GNU-mallisia TLS-sijoituksia"
+msgid "%s: unexpected reloc %u in object file"
+msgstr "%s: odottamaton sijoitus %u objektitiedostossa"
 
-#: i386.cc:2730 x86_64.cc:2719
+#: i386.cc:999 i386.cc:1023 sparc.cc:1753 x86_64.cc:1141 x86_64.cc:1169
 #, c-format
-msgid "failed to match split-stack sequence at section %u offset %0zx"
-msgstr "jaetun pinon täsmääminen epäonnistui lohkossa %u siirros %0zx"
+msgid "local symbol %u has bad shndx %u"
+msgstr "paikallisella symbolilla %u on virheellinen shndx-lohko %u"
 
-#: icf.cc:616
+#  Report an unsupported relocation against a global symbol.
+#: i386.cc:1134 powerpc.cc:1223 sparc.cc:1871 x86_64.cc:1244 x86_64.cc:1536
 #, c-format
-msgid "%s: ICF Converged after %u iteration(s)"
-msgstr "%s: ICF lähentyi %u iteroinnin jälkeen"
+msgid "%s: unsupported reloc %u against global symbol %s"
+msgstr "%s: tukematon sijoitus %u yleissymbolia %s kohtaan"
 
-#: icf.cc:619
+#  Scan relocations for a section.
+#: i386.cc:1473
 #, c-format
-msgid "%s: ICF stopped after %u iteration(s)"
-msgstr "%s: ICF pysähtyi %u iteroinnin jälkeen"
+msgid "%s: unsupported RELA reloc section"
+msgstr "%s: tukematon RELA-sijoituslohko"
 
-#: icf.cc:633
+#: i386.cc:1735 i386.cc:2429 powerpc.cc:1740 sparc.cc:2637 x86_64.cc:1859
+#: x86_64.cc:2435
 #, c-format
-msgid "Could not find symbol %s to unfold\n"
-msgstr "Ei voitu löytää symbolia %s paljastettavaksi\n"
+msgid "unexpected reloc %u in object file"
+msgstr "tukematon sijoitus %u objektitiedostossa"
 
-#: incremental.cc:242
+#: i386.cc:1767 i386.cc:1846 i386.cc:1898 i386.cc:1929 i386.cc:1986
+#: powerpc.cc:1746 sparc.cc:2643 sparc.cc:2826 sparc.cc:2887 sparc.cc:2994
+#: x86_64.cc:1880 x86_64.cc:1963 x86_64.cc:2018 x86_64.cc:2043
 #, c-format
-msgid "the link might take longer: cannot perform incremental link: %s"
-msgstr "linkki ei ehkä enää toimi: ei voida suorittaa askelkasvatuslinkitystä: %s"
-
-#: incremental.cc:302
-msgid "no incremental data from previous build"
-msgstr "ei askelkasvatusdataa edellisestä rakentamisesta"
-
-#: incremental.cc:309 incremental.cc:332
-msgid "invalid incremental build data"
-msgstr "virheellinen askelkasvatusrakentamisdata"
-
-#: incremental.cc:321
-msgid "different version of incremental build data"
-msgstr "askelkasvatusrakentamisdatan eri versio"
+msgid "unsupported reloc %u"
+msgstr "tukematon sijoitus %u"
 
-#: incremental.cc:338
-msgid "command line changed"
-msgstr "komentorivi vaihtunut"
+#: i386.cc:1906
+msgid "both SUN and GNU model TLS relocations"
+msgstr "sekä SUN- että GNU-mallisia TLS-sijoituksia"
 
-#: incremental.cc:362
+#: i386.cc:2443
 #, c-format
-msgid "unsupported ELF machine number %d"
-msgstr "tukematon ELF-konenumero %d"
-
-#: incremental.cc:387
-msgid "output is not an ELF file."
-msgstr "tuloste ei ole ELF-tiedosto."
-
-#: incremental.cc:410
-msgid "unsupported file: 32-bit, big-endian"
-msgstr "tukematon tiedosto: 32-bittinen, big-endian"
-
-#: incremental.cc:419
-msgid "unsupported file: 32-bit, little-endian"
-msgstr "tukematon tiedosto: 32-bittinen, little-endian"
-
-#: incremental.cc:431
-msgid "unsupported file: 64-bit, big-endian"
-msgstr "tukematon tiedosto: 64-bittinen, big-endian"
-
-#: incremental.cc:440
-msgid "unsupported file: 64-bit, little-endian"
-msgstr "tukematon tiedosto: 64-bittinen, little-endian"
+msgid "unsupported reloc %u in object file"
+msgstr "tukematon sijoitus %u objektitiedostossa"
 
-#: layout.cc:1887
+#: layout.cc:1511
 #, c-format
 msgid "--build-id=uuid failed: could not open /dev/urandom: %s"
 msgstr "--build-id=uuid epäonnistui: ei voitu avata merkkierikoistiedostoa /dev/urandom: %s"
 
-#: layout.cc:1894
+#: layout.cc:1518
 #, c-format
 msgid "/dev/urandom: read failed: %s"
 msgstr "/dev/urandom: lukeminen epäonnistui: %s"
 
-#: layout.cc:1896
+#: layout.cc:1520
 #, c-format
 msgid "/dev/urandom: expected %zu bytes, got %zd bytes"
 msgstr "/dev/urandom: odotettiin %zu tavua, saatiin %zd tavua"
 
-#: layout.cc:1918
+#: layout.cc:1542
 #, c-format
 msgid "--build-id argument '%s' not a valid hex number"
 msgstr "--build-id argumentti ’%s’ ei ole oikea heksadesimaalinumero"
 
-#: layout.cc:1924
+#: layout.cc:1548
 #, c-format
 msgid "unrecognized --build-id argument '%s'"
 msgstr "tunnistamaton --build-id argumentti ’%s’"
 
-#: layout.cc:2337
+#: layout.cc:1866
 #, c-format
 msgid "load segment overlap [0x%llx -> 0x%llx] and [0x%llx -> 0x%llx]"
 msgstr "lataa segmenttilimitys [0x%llx -> 0x%llx] ja [0x%llx -> 0x%llx]"
@@ -721,12 +578,12 @@ msgstr "lataa segmenttilimitys [0x%llx -> 0x%llx] ja [0x%llx -> 0x%llx]"
 #: mapfile.cc:70
 #, c-format
 msgid "cannot open map file %s: %s"
-msgstr "ei voi avata kuvaustiedostoa %s: %s"
+msgstr "ei voi avata map-tiedostoa %s: %s"
 
 #: mapfile.cc:84
 #, c-format
 msgid "cannot close map file: %s"
-msgstr "ei voi sulkea kuvaustiedostoa: %s"
+msgstr "ei voi sulkea map-tiedostoa: %s"
 
 #: mapfile.cc:116
 #, c-format
@@ -763,7 +620,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Muistikuvaus\n"
+"Muistikartta\n"
 "\n"
 
 #: mapfile.cc:361
@@ -777,162 +634,185 @@ msgstr ""
 "Hylätyt syötelohkot\n"
 "\n"
 
-#: merge.cc:455
+#: merge.cc:449
 #, c-format
 msgid "%s: %s merged constants size: %lu; input: %zu; output: %zu\n"
 msgstr "%s: %s yhdistetty vakioiden koko: %lu; syöte: %zu; tuloste: %zu\n"
 
-#: merge.cc:478
+#: merge.cc:472
 msgid "mergeable string section length not multiple of character size"
 msgstr "yhdistettävän merkkijonolohkon pituus ei ole merkkikoon monikerta"
 
-#: merge.cc:494
-#, c-format
-msgid "%s: last entry in mergeable string section '%s' not null terminated"
-msgstr "%s: viimeinen alkio yhdistettävässä merkkijonolohkossa ’%s’ ei ole null-päätteinen"
+#: merge.cc:488
+msgid "entry in mergeable string section not null terminated"
+msgstr "alkio yhdistettävässä merkkijonolohkossa ei ole null-päätteinen"
 
-#: merge.cc:613
+#: merge.cc:605
 #, c-format
 msgid "%s: %s input: %zu\n"
 msgstr "%s: %s syöte: %zu\n"
 
-#: merge.h:300
+#: merge.h:289
 msgid "** merge constants"
 msgstr "** yhdistä vakiot"
 
-#: merge.h:422
+#: merge.h:411
 msgid "** merge strings"
 msgstr "** yhdistä merkkijonot"
 
-#: object.cc:75
+#: object.cc:73
 msgid "missing SHT_SYMTAB_SHNDX section"
 msgstr "puuttuva SHT_SYMTAB_SHNDX-lohko"
 
-#: object.cc:119
+#: object.cc:117
 #, c-format
 msgid "symbol %u out of range for SHT_SYMTAB_SHNDX section"
 msgstr "symboli %u lukualueen ulkopuolella lohkolle SHT_SYMTAB_SHNDX"
 
-#: object.cc:126
+#: object.cc:124
 #, c-format
 msgid "extended index for symbol %u out of range: %u"
 msgstr "laajennettu hakemisto symbolille %u lukualueen ulkopuolella: %u"
 
-#: object.cc:148 object.cc:2331 output.cc:4052
+#: object.cc:141
+#, c-format
+msgid "%s: unsupported ELF machine number %d"
+msgstr "%s: tukematon ELF-konenumero %d"
+
+#: object.cc:159
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: object.cc:190
+#: object.cc:196
 #, c-format
 msgid "section name section has wrong type: %u"
 msgstr "lohkonimilohko on väärän tyyppinen: %u"
 
-#: object.cc:546
+#: object.cc:459
 #, c-format
 msgid "invalid symbol table name index: %u"
 msgstr "virheellinen symbolitaulunimi-indeksi: %u"
 
-#: object.cc:552
+#: object.cc:465
 #, c-format
 msgid "symbol table name section has wrong type: %u"
 msgstr "symbolitaulunimilohko on väärän tyyppinen: %u"
 
-#: object.cc:641
+#: object.cc:554
 #, c-format
 msgid "section group %u info %u out of range"
 msgstr "lohkoryhmä %u tiedot %u lukualueen ulkopuolella"
 
-#: object.cc:660
+#: object.cc:573
 #, c-format
 msgid "symbol %u name offset %u out of range"
 msgstr "symbolin %u nimisiirros %u lukualueen ulkopuolella"
 
-#: object.cc:678
+#: object.cc:591
 #, c-format
 msgid "symbol %u invalid section index %u"
 msgstr "symboli %u virheellinen lohkoindeksi %u"
 
-#: object.cc:723
+#: object.cc:644
 #, c-format
 msgid "section %u in section group %u out of range"
 msgstr "lohko %u lohkoryhmässä %u lukualueen ulkopuolella"
 
-#: object.cc:731
+#: object.cc:652
 #, c-format
 msgid "invalid section group %u refers to earlier section %u"
 msgstr "virheellinen lohkoryhmä %u viittaa aikaisempaan lohkoon %u"
 
-#: object.cc:1037 reloc.cc:271 reloc.cc:838
+#: object.cc:827 reloc.cc:215 reloc.cc:723
 #, c-format
 msgid "relocation section %u has bad info %u"
-msgstr "sijoituslohkolla %u on väärät tiedot %u"
-
-#: object.cc:1231
-#, c-format
-msgid "%s: removing unused section from '%s' in file '%s'"
-msgstr "%s: poistetaan käyttämättömät lohkot kohteesta ’%s’ tiedostossa ’%s’"
-
-#: object.cc:1257
-#, c-format
-msgid "%s: ICF folding section '%s' in file '%s'into '%s' in file '%s'"
-msgstr "%s: ICF-laskostumislohko ’%s’ tiedostossa ’%s’ kohteeseen ’%s’ tiedostossa ’%s’"
+msgstr "uudelleensijoituslohkolla %u on väärät tiedot %u"
 
-#: object.cc:1454
+#: object.cc:1080
 msgid "size of symbols is not multiple of symbol size"
 msgstr "symboleiden koko ei ole symbolikoon monikerta"
 
-#: object.cc:1563
+#: object.cc:1187
 #, c-format
 msgid "local symbol %u section name out of range: %u >= %u"
 msgstr "paikallisen symbolin %u lohkonimi lukualueen ulkopuolella: %u >= %u"
 
-#: object.cc:1652
+#: object.cc:1245
 #, c-format
 msgid "unknown section index %u for local symbol %u"
 msgstr "tuntematon lohkoindeksi %u paikalliselle symbolille %u"
 
-#: object.cc:1661
+#: object.cc:1254
 #, c-format
 msgid "local symbol %u section index %u out of range"
 msgstr "paikallisen symbolin %u lohkoindeksi %u lukualueen ulkopuolella"
 
-#: object.cc:2169
+#: object.cc:1619
+msgid "incompatible target"
+msgstr "yhteensopimaton kohde"
+
+#: object.cc:1816
 #, c-format
-msgid "%s is not supported but is required for %s in %s"
-msgstr "%s ei ole tuettu, mutta vaaditaan kohteelle %s kohteessa %s"
+msgid "%s: unsupported ELF file type %d"
+msgstr "%s: tukematon ELF-tiedostotyyppi %d"
 
-#: object.cc:2273
+#: object.cc:1835 object.cc:1881 object.cc:1915
 #, c-format
-msgid "%s: unsupported ELF machine number %d"
-msgstr "%s: tukematon ELF-konenumero %d"
+msgid "%s: ELF file too short"
+msgstr "%s: ELF-tiedosto on liian lyhyt"
+
+#: object.cc:1843
+#, c-format
+msgid "%s: invalid ELF version 0"
+msgstr "%s: virheellinen ELF-versio 0"
+
+#: object.cc:1845
+#, c-format
+msgid "%s: unsupported ELF version %d"
+msgstr "%s: tukematon ELF-versio %d"
+
+#: object.cc:1852
+#, c-format
+msgid "%s: invalid ELF class 0"
+msgstr "%s: virheellinen ELF-luokka 0"
+
+#: object.cc:1858
+#, c-format
+msgid "%s: unsupported ELF class %d"
+msgstr "%s: tukematon ELF-luokka %d"
+
+#: object.cc:1865
+#, c-format
+msgid "%s: invalid ELF data encoding"
+msgstr "%s: virheellinen ELF-datakoodaus"
 
-#: object.cc:2283
+#: object.cc:1871
 #, c-format
-msgid "%s: incompatible target"
-msgstr "%s: yhteensopimaton kohde"
+msgid "%s: unsupported ELF data encoding %d"
+msgstr "%s: tukematon ELF-datakoodaus %d"
 
-#: object.cc:2347 plugin.cc:1019
+#: object.cc:1891
 #, c-format
 msgid "%s: not configured to support 32-bit big-endian object"
 msgstr "%s: ei ole asetettu tukemaan 32-bittistä big-endian-objektia"
 
-#: object.cc:2363 plugin.cc:1028
+#: object.cc:1904
 #, c-format
 msgid "%s: not configured to support 32-bit little-endian object"
 msgstr "%s: ei ole asetettu tukemaan 32-bittistä little-endian-objektia"
 
-#: object.cc:2382 plugin.cc:1040
+#: object.cc:1925
 #, c-format
 msgid "%s: not configured to support 64-bit big-endian object"
 msgstr "%s: ei ole asetettu tukemaan 64-bittistä big-endian-objektia"
 
-#: object.cc:2398 plugin.cc:1049
+#: object.cc:1938
 #, c-format
 msgid "%s: not configured to support 64-bit little-endian object"
 msgstr "%s: ei ole asetettu tukemaan 64-bittistä little-endian-objektia"
 
-#: options.cc:156
+#: options.cc:142
 #, c-format
 msgid ""
 "Usage: %s [options] file...\n"
@@ -943,1294 +823,1036 @@ msgstr ""
 
 #. config.guess and libtool.m4 look in ld --help output for the
 #. string "supported targets".
-#: options.cc:164
+#: options.cc:150
 #, c-format
 msgid "%s: supported targets:"
 msgstr "%s: tuetut kohteet:"
 
-#: options.cc:176
+#: options.cc:162
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 "Ilmoita virheistä (englanniksi) osoitteeseen %s\n"
 "Ilmoita suomennosvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>\n"
 
-#: options.cc:193 options.cc:203 options.cc:213
+#: options.cc:179 options.cc:189
 #, c-format
 msgid "%s: invalid option value (expected an integer): %s"
 msgstr "%s: virheellinen valitsinarvo (odotettiin kokonaislukua): %s"
 
-#: options.cc:223
+#: options.cc:199
 #, c-format
 msgid "%s: invalid option value (expected a floating point number): %s"
 msgstr "%s: virheellinen valitsinarvo (odotettiin liukulukunumeroa): %s"
 
-#: options.cc:232
+#: options.cc:208
 #, c-format
 msgid "%s: must take a non-empty argument"
 msgstr "%s: täytyy olla ei-tyhjä argumentti"
 
-#: options.cc:273
+#: options.cc:249
 #, c-format
 msgid "%s: must take one of the following arguments: %s"
 msgstr "%s: täytyy olla yksi seuraavista argumenteista: %s"
 
-#: options.cc:300
+#: options.cc:275
 #, c-format
 msgid "  Supported targets:\n"
 msgstr "  Tuetut kohteet:\n"
 
-#: options.cc:409
+#: options.cc:329
 #, c-format
 msgid "unable to parse script file %s"
 msgstr "ei kyetä jäsentämään skriptitiedostoa %s"
 
-#: options.cc:417
+#: options.cc:337
 #, c-format
 msgid "unable to parse version script file %s"
 msgstr "ei kyetä jäsentämään versioskriptitiedostoa %s"
 
-#: options.cc:425
-#, c-format
-msgid "unable to parse dynamic-list script file %s"
-msgstr "ei kyetä jäsentämään dynaamisluetteloista skriptitiedostoa %s"
-
-#: options.cc:522
-#, c-format
-msgid "format '%s' not supported; treating as elf (supported formats: elf, binary)"
-msgstr "muotoa ’%s’ ei tueta; käsitellään elf-objektina (tuetut muodot: elf, binaari)"
-
-#: options.cc:538
+#: options.cc:363
 #, c-format
 msgid "%s: use the --help option for usage information\n"
 msgstr "%s: käytä valitsinta --help käyttötietojen saamiseksi\n"
 
-#: options.cc:547
+#: options.cc:372
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: options.cc:651
+#: options.cc:393
+#, c-format
+msgid "format '%s' not supported; treating as elf (supported formats: elf, binary)"
+msgstr "muotoa ’%s’ ei tueta; käsitellään elf-objektina (tuetut muodot: elf, binääri)"
+
+#: options.cc:499
 msgid "unexpected argument"
 msgstr "odottamaton argumentti"
 
-#: options.cc:664 options.cc:725
+#: options.cc:512 options.cc:573
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: options.cc:736
+#: options.cc:584
 msgid "unknown -z option"
 msgstr "tuntematon valitsin -z"
 
-#: options.cc:935
+#: options.cc:727
 #, c-format
 msgid "ignoring --threads: %s was compiled without thread support"
 msgstr "ei oteta huomioon valitsinta --threads: %s käännettiin ilman säietukea"
 
-#: options.cc:942
+#: options.cc:734
 #, c-format
 msgid "ignoring --thread-count: %s was compiled without thread support"
 msgstr "ohitetaan --thread-count: %s käännettiin ilman säietukea"
 
-#: options.cc:981
-#, c-format
-msgid "unable to open -retain-symbols-file file %s: %s"
-msgstr "ei kyetä avaamaan -retain-symbols-file -tiedostoa %s: %s"
-
-#: options.cc:1003
-msgid "-shared and -static are incompatible"
-msgstr "valitsimet -shared ja -static ovat yhteensopimattomat"
-
-#: options.cc:1005
-msgid "-shared and -pie are incompatible"
-msgstr "valitsimet -shared ja -pie ovat yhteensopimattomat"
-
-#: options.cc:1008
+#: options.cc:776
 msgid "-shared and -r are incompatible"
 msgstr "valitsimet -shared ja -r ovat yhteensopimattomat"
 
-#: options.cc:1010
-msgid "-pie and -r are incompatible"
-msgstr "valitsimet -pie ja -r ovat yhteensopimattomat"
-
-#: options.cc:1014
-msgid "-retain-symbols-file does not yet work with -r"
-msgstr "-retain-symbols-file ei vielä toimi valitsimen -r kanssa"
-
-#: options.cc:1020
-msgid "binary output format not compatible with -shared or -pie or -r"
-msgstr "binaaritulostemuoto ei ole yhteensopiva valitsimien -shared, -pie tai -r kanssa"
+#: options.cc:780
+msgid "binary output format not compatible with -shared or -r"
+msgstr "binääritulostemuoto ei ole yhteensopiva valitsimien -shared tai -r kanssa"
 
-#: options.cc:1026
+#: options.cc:785
 #, c-format
 msgid "--hash-bucket-empty-fraction value %g out of range [0.0, 1.0)"
 msgstr "--hash-bucket-empty-fraction arvo %g lukualueen ulkopuolella [0.0, 1.0)"
 
-#: options.cc:1031
-msgid "Options --incremental-changed, --incremental-unchanged, --incremental-unknown require the use of --incremental"
-msgstr "Valitsimet --incremental-changed, --incremental-unchanged, --incremental-unknown vaativat valitsimen --incremental käytön"
-
-#: options.cc:1097
+#: options.cc:852
 msgid "May not nest groups"
 msgstr "Ei saa sisäkkäistää ryhmiä"
 
-#: options.cc:1109
+#: options.cc:864
 msgid "Group end without group start"
 msgstr "Ryhmäloppu ilman ryhmäalkua"
 
 #. I guess it's neither a long option nor a short option.
-#: options.cc:1174
+#: options.cc:922
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: options.cc:1201
+#: options.cc:948
 #, c-format
 msgid "%s: missing group end\n"
 msgstr "%s: puuttuva ryhmäloppu\n"
 
-#: options.h:571
+#: options.h:536
 msgid "Report usage information"
 msgstr "Ilmoita käyttötiedot"
 
-#: options.h:573
+#: options.h:538
 msgid "Report version information"
 msgstr "Ilmoita versiotiedot"
 
-#: options.h:575
+#: options.h:540
 msgid "Report version and target information"
 msgstr "Ilmoita versio- ja kohdetiedot"
 
-#: options.h:584 options.h:635
-msgid "Not supported"
-msgstr "Ei tuettu"
-
-#: options.h:585 options.h:636
-msgid "Do not copy DT_NEEDED tags from shared libraries"
-msgstr "Älä kopioi DT_NEEDED-tunnisteita jaettuihin kirjastoihin"
-
-#: options.h:588
+#: options.h:549
 msgid "Allow unresolved references in shared libraries"
 msgstr "Salli ratkaisemattomat viitteet jaettuihin kirjastoihin"
 
-#: options.h:589
+#: options.h:550
 msgid "Do not allow unresolved references in shared libraries"
 msgstr "Älä salli ratkaisemattomia viitteitä jaettuihin kirjastoihin"
 
-#: options.h:592
-msgid "Only set DT_NEEDED for shared libraries if used"
-msgstr "Aseta DT_NEEDED jaetuille kirjastoille vain jos käytetty"
+#: options.h:553
+msgid "Only set DT_NEEDED for dynamic libs if used"
+msgstr "Aseta DT_NEEDED dynaamisille kirjastoille vain jos käytetty"
 
-#: options.h:593
-msgid "Always DT_NEEDED for shared libraries"
-msgstr "Aina DT_NEEDED jaetuille kirjastoille"
+#: options.h:554
+msgid "Always DT_NEEDED for dynamic libs"
+msgstr "Aina DT_NEEDED dynaamisille kirjastoille"
 
-#: options.h:600
+#: options.h:561
 msgid "Set input format"
 msgstr "Aseta syötemuoto"
 
-#: options.h:603
+#: options.h:564
 msgid "-l searches for shared libraries"
 msgstr "-l etsii jaettuja kirjastoja"
 
-#: options.h:605
+#: options.h:566
 msgid "-l does not search for shared libraries"
 msgstr "-l ei etsi jaettuja kirjastoja"
 
-#: options.h:609
+#: options.h:570
 msgid "Bind defined symbols locally"
 msgstr "Sido määritellyt symbolit paikallisesti"
 
-#: options.h:612
+#: options.h:573
 msgid "Bind defined function symbols locally"
 msgstr "Sido määritellyt funktiosymbolit paikallisesti"
 
-#: options.h:615
+#: options.h:576
 msgid "Generate build ID note"
 msgstr "Tuota rakentamistunnisteilmoitus"
 
-#: options.h:616 options.h:655
+#: options.h:577 options.h:612
 msgid "[=STYLE]"
 msgstr "[=TYYLI]"
 
-#: options.h:619
+#: options.h:580
 msgid "Check segment addresses for overlaps (default)"
 msgstr "Tarkista segmenttiosoitteet päällekkäisyyksien varalta (oletus)"
 
-#: options.h:620
+#: options.h:581
 msgid "Do not check segment addresses for overlaps"
 msgstr "Älä tarkista segmenttiosoitteiden päällekkäisyyksiä"
 
-#: options.h:624 options.h:629
+#: options.h:585 options.h:590
 msgid "Compress .debug_* sections in the output file"
 msgstr "Tiivistä .debug_* -lohkot tulostetiedostossa"
 
-#: options.h:630
+#: options.h:591
 msgid "[none]"
 msgstr "[ei mitään]"
 
-#: options.h:639
+#: options.h:596
 msgid "Define common symbols"
 msgstr "Anna yhteissymbolit"
 
-#: options.h:640
+#: options.h:597
 msgid "Do not define common symbols"
 msgstr "Älä anna yhteissymboleja"
 
-#: options.h:642 options.h:644
+#: options.h:599 options.h:601
 msgid "Alias for -d"
 msgstr "Alias valitsimelle -d"
 
-#: options.h:647
+#: options.h:604
 msgid "Turn on debugging"
 msgstr "Käännä päälle vianjäljitys"
 
-#: options.h:648
+#: options.h:605
 msgid "[all,files,script,task][,...]"
 msgstr "[kaikki,tiedostot,skripti,tehtävä][,...]"
 
-#: options.h:651
+#: options.h:608
 msgid "Define a symbol"
 msgstr "Määrittele symboli"
 
-#: options.h:651
+#: options.h:608
 msgid "SYMBOL=EXPRESSION"
 msgstr "SYMBOLI=LAUSEKE"
 
-#: options.h:654
+#: options.h:611
 msgid "Demangle C++ symbols in log messages"
 msgstr "Elvytä C++ -symbolit lokiviesteissä"
 
-#: options.h:658
+#: options.h:615
 msgid "Do not demangle C++ symbols in log messages"
 msgstr "Älä elvytä C++ -symboleja lokiviesteissä"
 
-#: options.h:662
+#: options.h:619
 msgid "Try to detect violations of the One Definition Rule"
 msgstr "Yritä havaita yhden määrittelysäännön rikkomukset"
 
-#: options.h:666
-msgid "Delete all temporary local symbols"
-msgstr "Poista kaikki tilapäiset paikalliset symbolit"
-
-#: options.h:669
-msgid "Add data symbols to dynamic symbols"
-msgstr "Lisää datasymbolit dynaamisiin symboleihin"
-
-#: options.h:672
-msgid "Add C++ operator new/delete to dynamic symbols"
-msgstr "Lisää C++-operaattori new/delete dynaamisiin symboleihin"
-
-#: options.h:675
-msgid "Add C++ typeinfo to dynamic symbols"
-msgstr "Lisää C++-typeinfo dynaamisiin symboleihin"
-
-#: options.h:678
-msgid "Read a list of dynamic symbols"
-msgstr "Lue dynaamisten symbolien luettelo"
-
-#: options.h:678 options.h:732 options.h:766 options.h:893 options.h:921
-msgid "FILE"
-msgstr "TIEDOSTO"
-
-#: options.h:681
+#: options.h:623
 msgid "Set program start address"
 msgstr "Aseta ohjelman aloitusosoite"
 
-#: options.h:681 options.h:908 options.h:910 options.h:912
+#: options.h:623 options.h:766 options.h:768 options.h:770
 msgid "ADDRESS"
 msgstr "OSOITE"
 
-#: options.h:684
-msgid "Exclude libraries from automatic export"
-msgstr "Jätä kirjastot pois automaattisesta viennistä"
-
-#: options.h:688
+#: options.h:626
 msgid "Export all dynamic symbols"
 msgstr "Vie kaikki dynaamiset symbolit"
 
-#: options.h:689
-msgid "Do not export all dynamic symbols (default)"
-msgstr "Älä vie kaikkia dynaamisia symboleita (oletus)"
-
-#: options.h:692
+#: options.h:629
 msgid "Create exception frame header"
 msgstr "Luo poikkeuskehysotsake"
 
-#: options.h:695
+#: options.h:632
 msgid "Treat warnings as errors"
 msgstr "Käsittele varoituksia virheinä"
 
-#: options.h:696
+#: options.h:633
 msgid "Do not treat warnings as errors"
 msgstr "Älä käsittele varoituksia virheinä"
 
-#: options.h:699
-msgid "Call SYMBOL at unload-time"
-msgstr "Kutsu SYMBOLIa sulkemishetkellä"
-
-#: options.h:699 options.h:729 options.h:873 options.h:915 options.h:936
-#: options.h:939
-msgid "SYMBOL"
-msgstr "SYMBOLI"
-
-#: options.h:702
+#: options.h:636
 msgid "Set shared library name"
 msgstr "Aseta jaettu kirjastonimi"
 
-#: options.h:702 options.h:792
+#: options.h:636 options.h:696
 msgid "FILENAME"
 msgstr "TIEDOSTONIMI"
 
-#: options.h:705
+#: options.h:639
 msgid "Min fraction of empty buckets in dynamic hash"
 msgstr "Tyhjien lohkojen pienin murto-osa dynaamisessa hash-funktiossa"
 
-#: options.h:706
+#: options.h:640
 msgid "FRACTION"
-msgstr "MURTO-OSA"
+msgstr "FRACTION"
 
-#: options.h:709
+#: options.h:643
 msgid "Dynamic hash style"
 msgstr "Dynaaminen hash-tyyli"
 
-#: options.h:709
+#: options.h:643
 msgid "[sysv,gnu,both]"
 msgstr "[sysv,gnu,both]"
 
-#: options.h:713
+#: options.h:647
 msgid "Set dynamic linker path"
 msgstr "Aseta dynaaminen linkittäjäpolku"
 
-#: options.h:713
+#: options.h:647
 msgid "PROGRAM"
 msgstr "OHJELMA"
 
-#: options.h:716
-msgid "Work in progress; do not use"
-msgstr "Työ käynnissä; älä käytä"
-
-#: options.h:717
-msgid "Do a full build"
-msgstr "Tee täysi rakentaminen"
-
-#: options.h:720
-msgid "Assume files changed"
-msgstr "Otaksu tiedostojen muuttuneen"
-
-#: options.h:723
-msgid "Assume files didn't change"
-msgstr "Otaksu, että tiedostot eivät ole muuttuneet"
-
-#: options.h:726
-msgid "Use timestamps to check files (default)"
-msgstr "Käytä aikaleimoja tiedostojen tarkistamiseen (oletus)"
-
-#: options.h:729
-msgid "Call SYMBOL at load-time"
-msgstr "Kutsu SYMBOLIa latausaikana"
-
-#: options.h:732
+#: options.h:650
 msgid "Read only symbol values from FILE"
 msgstr "Lue vain symboliarvot TIEDOSTOsta"
 
-#: options.h:735
+#: options.h:650 options.h:684 options.h:751 options.h:779
+msgid "FILE"
+msgstr "TIEDOSTO"
+
+#: options.h:653
 msgid "Search for library LIBNAME"
 msgstr "Haku kirjastolle LIBNAME"
 
-#: options.h:735
+#: options.h:653
 msgid "LIBNAME"
 msgstr "LIBNAME"
 
-#: options.h:738
+#: options.h:656
 msgid "Add directory to search path"
 msgstr "Lisää hakemisto hakupolkuun"
 
-#: options.h:738 options.h:813 options.h:816 options.h:820 options.h:887
+#: options.h:656 options.h:714 options.h:717 options.h:721 options.h:745
 msgid "DIR"
 msgstr "DIR"
 
-#: options.h:741
+#: options.h:659
 msgid "Ignored for compatibility"
 msgstr "Ei oteta huomioon yhteensopivuussyistä"
 
-#: options.h:741
+#: options.h:659
 msgid "EMULATION"
 msgstr "EMULOINTI"
 
-#: options.h:744
+#: options.h:662
 msgid "Write map file on standard output"
-msgstr "Kirjoita kuvaustiedosto vakiotulosteeseen"
+msgstr "Kirjoita karttatiedosto vakiotulosteeseen"
 
-#: options.h:745
+#: options.h:663
 msgid "Write map file"
-msgstr "Kirjoita kuvaustiedosto"
+msgstr "Kirjoita map-tiedosto"
 
-#: options.h:746
+#: options.h:664
 msgid "MAPFILENAME"
-msgstr "KUVAUSTIEDOSTONIMI"
+msgstr "MAPFILENAME"
 
-#: options.h:749
+#: options.h:667
 msgid "Do not page align data"
 msgstr "Älä tasaa dataa sivun kokoisiin osiin"
 
-#: options.h:751
+#: options.h:669
 msgid "Do not page align data, do not make text readonly"
 msgstr "Älä tasaa dataa sivun kokoisiin osiin, älä kirjoitussuojaa tekstiä"
 
-#: options.h:752
+#: options.h:670
 msgid "Page align data, make text readonly"
 msgstr "Sivutasausdataa, tee tekstistä kirjoitussuojattu"
 
-#: options.h:755
+#: options.h:673
 msgid "Enable use of DT_RUNPATH and DT_FLAGS"
 msgstr "Ota käyttöön DT_RUNPATH-hakemistot ja DT_FLAGS-liput"
 
-#: options.h:756
+#: options.h:674
 msgid "Disable use of DT_RUNPATH and DT_FLAGS"
 msgstr "Ota pois käytöstä DT_RUNPATH-hakemistot ja DT_FLAGS-liput"
 
-#: options.h:759
+#: options.h:677
 msgid "Create an output file even if errors occur"
 msgstr "Luo tulostetiedosto myös silloin kun tapahtuu virhe"
 
-#: options.h:762 options.h:958
+#: options.h:680 options.h:808
 msgid "Report undefined symbols (even with --shared)"
 msgstr "Ilmoita määrittelemättömistä symboleista (jopa valitsimella --shared)"
 
-#: options.h:766
+#: options.h:684
 msgid "Set output file name"
 msgstr "Aseta tulostetiedostonimi"
 
-#: options.h:769
+#: options.h:687
 msgid "Optimize output file size"
 msgstr "Optimoi tulostetiedostokoko"
 
-#: options.h:769
+#: options.h:687
 msgid "LEVEL"
 msgstr "TASO"
 
-#: options.h:772
+#: options.h:690
 msgid "Set output format"
 msgstr "Aseta tulostusmuoto"
 
-#: options.h:772
+#: options.h:690
 msgid "[binary]"
 msgstr "[binaari]"
 
-#: options.h:775 options.h:777
-msgid "Create a position independent executable"
-msgstr "Luo paikkariippumaton suoritettava tiedosto"
-
-#: options.h:782
-msgid "Load a plugin library"
-msgstr "Lataa lisäosakirjasto"
-
-#: options.h:782
-msgid "PLUGIN"
-msgstr "LISÄOSA"
-
-#: options.h:784
-msgid "Pass an option to the plugin"
-msgstr "Välitä valitsin lisäosalle"
-
-#: options.h:784
-msgid "OPTION"
-msgstr "VALITSIN"
-
-#: options.h:788
+#: options.h:693
 msgid "Preread archive symbols when multi-threaded"
 msgstr "Ennakkoluetut arkistosymbolit monisäikeitä käytettäessä"
 
-#: options.h:791
+#: options.h:695
 msgid "Print symbols defined and used for each input"
 msgstr "Tulosta jokaiselle syötteelle määritellyt ja käytetyt symbolit"
 
-#: options.h:795
+#: options.h:699
 msgid "Ignored for SVR4 compatibility"
 msgstr "Älä ota huomioon SVR4-yhteensopivuutta"
 
-#: options.h:798
+#: options.h:702
 msgid "Generate relocations in output"
-msgstr "Tuota sijoitukset tulosteeseen"
+msgstr "Luo sijoitukset tulosteeseen"
 
-#: options.h:801
+#: options.h:705
 msgid "Generate relocatable output"
-msgstr "Tuota sijoitettava tuloste"
+msgstr "Tuota uudelleensijoitettava tuloste"
 
-#: options.h:804
+#: options.h:708
 msgid "Relax branches on certain targets"
 msgstr "Relax-projektin haarat tietyissä kohteissa"
 
-#: options.h:807
-msgid "keep only symbols listed in this file"
-msgstr "pidä vain tässä tiedostossa luetellut symbolit"
-
-#: options.h:807
-msgid "[file]"
-msgstr "[tiedosto]"
-
-#: options.h:813 options.h:816
+#: options.h:714 options.h:717
 msgid "Add DIR to runtime search path"
 msgstr "Lisää DIR ajoaikaiseen hakupolkuun"
 
-#: options.h:819
+#: options.h:720
 msgid "Add DIR to link time shared library search path"
 msgstr "Lisää DIR linkitysaikana jaettuun kirjastohakupolkuun"
 
-#: options.h:823
+#: options.h:724
 msgid "Strip all symbols"
 msgstr "Riisu kaikki symbolit"
 
-#: options.h:825
+#: options.h:726
 msgid "Strip debugging information"
 msgstr "Riisu vianjäljitystiedot"
 
-#: options.h:827
+#: options.h:728
 msgid "Emit only debug line number information"
 msgstr "Lähetä vain vianjäljitysrivinumerotiedot"
 
-#: options.h:829
+#: options.h:730
 msgid "Strip debug symbols that are unused by gdb (at least versions <= 6.7)"
 msgstr "Riisu vianjäljityssymbolit, joita gdb ei käytä (vähintään versioissa <= 6.7)"
 
-#: options.h:832
-msgid "Strip LTO intermediate code sections"
-msgstr "Riisu LTO-keskikoodilohkot"
-
-#: options.h:835
-msgid "(ARM only) The maximum distance from instructions in a group of sections to their stubs.  Negative values mean stubs are always after the group. 1 means using default size.\n"
-msgstr "(vain ARM) Käskyjen enimmäisetäisyys niiden stub-koodeihin lohkojen ryhmässä.  Negatiiviset arvot tarkoittavat, että stub-koodit ovat ryhmän jäljessä. 1 tarkoittaa oletuskokoa.\n"
-
-#: options.h:838 options.h:852 options.h:956 options.h:975
-msgid "SIZE"
-msgstr "KOKO"
-
-#: options.h:841
-msgid "Use less memory and more disk I/O (included only for compatibility with GNU ld)"
-msgstr "Käytä vähemmän muistia ja enemmän levysiirräntää (sisällytetty GNU ld -yhteensopivuussyistä)"
-
-#: options.h:845 options.h:848
+#: options.h:734
 msgid "Generate shared library"
 msgstr "Tuota jaettu kirjasto"
 
-#: options.h:851
-msgid "Stack size when -fsplit-stack function calls non-split"
-msgstr "Pinokoko kun -fsplit-stack -funktio kutsuu non-split -pinoa"
-
-#: options.h:857
+#: options.h:739
 msgid "Do not link against shared libraries"
 msgstr "Älä linkitä jaettuihin kirjastoihin"
 
-#: options.h:860
-msgid "Identical Code Folding. '--icf=safe' folds only ctors and dtors."
-msgstr "Identtinen koodilaskostuminen. ’--icf=safe’ laskostaa vain kohteet ctors ja dtors."
-
-#: options.h:866
-msgid "Number of iterations of ICF (default 2)"
-msgstr "ICF-iterointien lukumäärä (oletus 2)"
-
-#: options.h:866 options.h:899 options.h:901 options.h:903 options.h:905
-msgid "COUNT"
-msgstr "LASKURI"
-
-#: options.h:869
-msgid "List folded identical sections on stderr"
-msgstr "Luettele laskostetut identtiset lohkot vakiovirheessä"
-
-#: options.h:870
-msgid "Do not list folded identical sections"
-msgstr "Älä luettele laskostettuja identtisiä lohkoja"
-
-#: options.h:873
-msgid "Do not fold this symbol during ICF"
-msgstr "Älä laskosta tätä symbolia ICF:n aikana"
-
-#: options.h:876
-msgid "Remove unused sections"
-msgstr "Poista käyttämättömät lohkot"
-
-#: options.h:877
-msgid "Don't remove unused sections (default)"
-msgstr "Älä poista käyttämättömiä lohkoja (oletus)"
-
-#: options.h:880
-msgid "List removed unused sections on stderr"
-msgstr "Luettele poistetut käyttämättömät lohkot vakiovirheessä"
-
-#: options.h:881
-msgid "Do not list removed unused sections"
-msgstr "Älä luettele poistettuja käyttämättömiä lohkoja"
-
-#: options.h:884
+#: options.h:742
 msgid "Print resource usage statistics"
 msgstr "Tulosta resurssikäyttötilastot"
 
-#: options.h:887
+#: options.h:745
 msgid "Set target system root directory"
 msgstr "Aseta kohdejärjestelmän juurihakemisto"
 
-#: options.h:890
+#: options.h:748
 msgid "Print the name of each input file"
 msgstr "Tulosta jokaisen syötetiedoston nimi"
 
-#: options.h:893
+#: options.h:751
 msgid "Read linker script"
 msgstr "Lue linkkeriskripti"
 
-#: options.h:896
+#: options.h:754
 msgid "Run the linker multi-threaded"
 msgstr "Suorita linkkeri monisäikeisesti"
 
-#: options.h:897
+#: options.h:755
 msgid "Do not run the linker multi-threaded"
 msgstr "Älä suorita linkkeriä monisäikeisesti"
 
-#: options.h:899
+#: options.h:757
 msgid "Number of threads to use"
 msgstr "Käytettävien säikeiden lukumäärä"
 
-#: options.h:901
+#: options.h:757 options.h:759 options.h:761 options.h:763
+msgid "COUNT"
+msgstr "LASKURI"
+
+#: options.h:759
 msgid "Number of threads to use in initial pass"
 msgstr "Alustavassa ajossa käytettyjen säikeiden lukumäärä"
 
-#: options.h:903
+#: options.h:761
 msgid "Number of threads to use in middle pass"
 msgstr "Keskimmäisessä ajossa käytettyjen säikeiden lukumäärä"
 
-#: options.h:905
+#: options.h:763
 msgid "Number of threads to use in final pass"
 msgstr "Lopullisessa ajossa käytettyjen säikeiden lukumäärä"
 
-#: options.h:908
+#: options.h:766
 msgid "Set the address of the bss segment"
 msgstr "Aseta bss-lohkon osoite"
 
-#: options.h:910
+#: options.h:768
 msgid "Set the address of the data segment"
 msgstr "Aseta data-segmentin osoite"
 
-#: options.h:912
+#: options.h:770
 msgid "Set the address of the text segment"
 msgstr "Aseta text-segmentin osoite"
 
-#: options.h:915
+#: options.h:773
 msgid "Create undefined reference to SYMBOL"
 msgstr "Luo määrittelemätön viite SYMBOLIin"
 
-#: options.h:918
+#: options.h:773 options.h:786 options.h:789
+msgid "SYMBOL"
+msgstr "SYMBOLI"
+
+#: options.h:776
 msgid "Synonym for --debug=files"
 msgstr "Synonyymi valitsimelle --debug=tiedostot"
 
-#: options.h:921
+#: options.h:779
 msgid "Read version script"
 msgstr "Lue versioskripti"
 
-#: options.h:924
-msgid "Warn about duplicate common symbols"
-msgstr "Varoita yhteissymbolien kaksoiskappaleista"
-
-#: options.h:925
-msgid "Do not warn about duplicate common symbols (default)"
-msgstr "Älä varoita yhteissymbolien kaksoiskappaleista (oletus)"
-
-#: options.h:928
-msgid "Warn when skipping an incompatible library"
-msgstr "Varoita, kun ohitetaan yhteensopimaton kirjasto"
-
-#: options.h:929
-msgid "Don't warn when skipping an incompatible library"
-msgstr "Älä varoita, kun ohitetaan yhteensopimaton kirjasto"
-
-#: options.h:932
+#: options.h:782
 msgid "Include all archive contents"
 msgstr "Sisällytä kaikki arkistosisällöt"
 
-#: options.h:933
+#: options.h:783
 msgid "Include only needed archive contents"
 msgstr "Sisällytä vain tarvitut arkistosisällöt"
 
-#: options.h:936
+#: options.h:786
 msgid "Use wrapper functions for SYMBOL"
 msgstr "Käytä käärinfunktioita symbolille SYMBOLI"
 
-#: options.h:939
+#: options.h:789
 msgid "Trace references to symbol"
 msgstr "Jäljitä viitteet symboliin"
 
-#: options.h:942
+#: options.h:792
 msgid "Default search path for Solaris compatibility"
 msgstr "Oletushakupolku Solaris-yhteensopivuutta varten"
 
-#: options.h:943
+#: options.h:793
 msgid "PATH"
 msgstr "POLKU"
 
-#: options.h:946
+#: options.h:796
 msgid "Start a library search group"
 msgstr "Aloita kirjastonetsimisryhmä"
 
-#: options.h:948
+#: options.h:798
 msgid "End a library search group"
 msgstr "Lopeta kirjastonetsimisryhmä"
 
-#: options.h:953
+#: options.h:803
 msgid "Sort dynamic relocs"
 msgstr "Lajittele dynaamiset relocs-tietueet"
 
-#: options.h:954
+#: options.h:804
 msgid "Do not sort dynamic relocs"
 msgstr "Älä lajittele dynaamisia relocs-tietueita"
 
-#: options.h:956
+#: options.h:806
 msgid "Set common page size to SIZE"
 msgstr "Aseta yhteissivun kooksi KOKO"
 
-#: options.h:961
+#: options.h:806 options.h:813
+msgid "SIZE"
+msgstr "KOKO"
+
+#: options.h:811
 msgid "Mark output as requiring executable stack"
 msgstr "Merkitse tuloste vaadittuna suoritettavassa pinossa"
 
+#: options.h:813
+msgid "Set maximum page size to SIZE"
+msgstr "Aseta suurimmaksi sivukooksi KOKO"
+
+#: options.h:815
+msgid "Mark output as not requiring executable stack"
+msgstr "Merkitse, että tuloste ei vaadi suoritettavaa pinoa"
+
 #  DSO on ilmeisesti Dynamic shared object
-#: options.h:963
+#: options.h:817
 msgid "Mark DSO to be initialized first at runtime"
 msgstr "Merkitse dynaamisesti jaetut objektit alustettavaksi ensimmäiseksi ajoaikana"
 
-#: options.h:966
+#: options.h:820
 msgid "Mark object to interpose all DSOs but executable"
 msgstr "Merkitse objekti kaikkien dynaamisesti jaettujen objektien väliin paitsi suoritettavien"
 
-#: options.h:969
-msgid "Mark object for lazy runtime binding (default)"
-msgstr "Merkitse objekti lazy-ajoaikaista sidontaa varten (oletus)"
-
-#: options.h:972
+#: options.h:823
 msgid "Mark object requiring immediate process"
 msgstr "Merkitse, että objekti vaatii välitöntä käsittelyä"
 
-#: options.h:975
-msgid "Set maximum page size to SIZE"
-msgstr "Aseta suurimmaksi sivukooksi KOKO"
-
-#: options.h:978
-msgid "Do not create copy relocs"
-msgstr "Älä luo kopio-relocs-tietueita"
-
-#: options.h:980
+#: options.h:826
 msgid "Mark object not to use default search paths"
 msgstr "Merkitse, että objekti ei käytä oletushakupolkuja"
 
-#: options.h:983
+#: options.h:829
 msgid "Mark DSO non-deletable at runtime"
 msgstr "Merkitse dynaamisesti jaettu objekti ei-poistettavaksi ajoaikana"
 
-#: options.h:986
+#: options.h:832
 msgid "Mark DSO not available to dlopen"
 msgstr "Merkitse, että dynaamisesti jaettu objekti ei ole saatavilla funktiolle dlopen"
 
-#: options.h:989
+#: options.h:835
 msgid "Mark DSO not available to dldump"
 msgstr "Merkitse, että dynaamisesti jaettu objekti ei saatavilla funktiolle dldump"
 
-#: options.h:992
-msgid "Mark output as not requiring executable stack"
-msgstr "Merkitse, että tuloste ei vaadi suoritettavaa pinoa"
-
-#: options.h:994
-msgid "Mark object for immediate function binding"
-msgstr "Merkitse, että objekti vaatii välitöntä funktion sidontaa"
-
-#: options.h:997
-msgid "Mark DSO to indicate that needs immediate $ORIGIN processing at runtime"
-msgstr "Merkitse DSO osoittamaan, että se tarvitsee välittömän $ORIGIN-käsittelyn ajoaikaisesti"
-
-#: options.h:1000
+#: options.h:838
 msgid "Where possible mark variables read-only after relocation"
-msgstr "Missä mahdollista, merkitse muuttuja kirjoitussuojatuiksi sijoituksen jälkeen"
+msgstr "Missä mahdollista, merkitse muuttuja kirjoitussuojatuiksi uudelleensijoituksen jälkeen"
 
-#: options.h:1001
+#: options.h:839
 msgid "Don't mark variables read-only after relocation"
 msgstr "Älä merkitse muuttujia kirjoitussuojatuiksi siirroksen jälkeen"
 
-#: output.cc:1132
+#: output.cc:1098
 msgid "section group retained but group element discarded"
 msgstr "lohkoryhmä palautettu, mutta ryhmän elementti hylätty"
 
-#: output.cc:1860
+#: output.cc:1800
 #, c-format
 msgid "invalid alignment %lu for section \"%s\""
 msgstr "virheellinen tasaus %lu lohkolle �%s�"
 
-#: output.cc:3573
-#, c-format
-msgid "dot moves backward in linker script from 0x%llx to 0x%llx"
-msgstr "piste siirtyy taaksepäin linkkeriskriptissä osoitteesta 0x%llx osoitteeseen 0x%llx"
-
-#: output.cc:3576
-#, c-format
-msgid "address of section '%s' moves backward from 0x%llx to 0x%llx"
-msgstr "lohkon ’%s’ osoite siirtyy taaksepäin osoitteesta 0x%llx osoitteeseen 0x%llx"
-
-#: output.cc:3755
+#: output.cc:3159
 #, c-format
 msgid "nobits section %s may not precede progbits section %s in same segment"
 msgstr "nobits-lohko %s ei voi edeltää progbits-lohkoa %s samassa segmentissä"
 
-#: output.cc:3907 output.cc:3975
+#: output.cc:3329
 #, c-format
 msgid "%s: open: %s"
 msgstr "%s: avaa tiedosto: %s"
 
-#: output.cc:3996
+#: output.cc:3350
 #, c-format
 msgid "%s: mremap: %s"
 msgstr "%s: mremap epäonnistui: %s"
 
-#: output.cc:4005
+#  Tätä ei löydy enää lähdekoodista
+#: output.cc:3387
 #, c-format
-msgid "%s: mmap: %s"
-msgstr "%s: mmap epäonnistui: %s"
+msgid "%s: lseek: %s"
+msgstr "%s: lseek epäonnistui: %s"
 
-#: output.cc:4085
+#: output.cc:3390 output.cc:3427
 #, c-format
-msgid "%s: mmap: failed to allocate %lu bytes for output file: %s"
-msgstr "%s: mmap: epäonnistuttiin varaamaan %lu tavua tulostetiedostolle: %s"
+msgid "%s: write: %s"
+msgstr "%s: write epäonnistui: %s"
+
+#: output.cc:3398
+#, c-format
+msgid "%s: mmap: %s"
+msgstr "%s: mmap epäonnistui: %s"
 
-#: output.cc:4096
+#: output.cc:3408
 #, c-format
 msgid "%s: munmap: %s"
 msgstr "%s: munmap epäonnistui: %s"
 
-#: output.cc:4115
+#: output.cc:3425
 #, c-format
 msgid "%s: write: unexpected 0 return-value"
 msgstr "%s: write: odottamaton 0-paluuarvo"
 
-#: output.cc:4117
-#, c-format
-msgid "%s: write: %s"
-msgstr "%s: write epäonnistui: %s"
-
-#: output.cc:4132
+#: output.cc:3439
 #, c-format
 msgid "%s: close: %s"
 msgstr "%s: close epäonnistui: %s"
 
-#: output.h:520
+#: output.h:415
 msgid "** section headers"
 msgstr "** lohko-otsakkeet"
 
-#: output.h:565
+#: output.h:451
 msgid "** segment headers"
 msgstr "** segmenttiotsakkeet"
 
-#: output.h:613
+#: output.h:490
 msgid "** file header"
 msgstr "** tiedosto-otsake"
 
-#: output.h:833
+#: output.h:696
 msgid "** fill"
 msgstr "** täyte"
 
-#: output.h:987
+#: output.h:850
 msgid "** string table"
 msgstr "** merkkijonotaulu"
 
-#: output.h:1300
+#: output.h:1161
 msgid "** dynamic relocs"
 msgstr "** dynaamiset sijoitukset"
 
-#: output.h:1301 output.h:1637
+#: output.h:1162 output.h:1498
 msgid "** relocs"
 msgstr "** sijoitukset"
 
-#: output.h:1662
+#: output.h:1523
 msgid "** group"
 msgstr "** ryhmä"
 
-#: output.h:1774
+#: output.h:1630
 msgid "** GOT"
 msgstr "** GOT"
 
-#: output.h:1916
+#: output.h:1772
 msgid "** dynamic"
 msgstr "** dynaaminen"
 
-#: output.h:2039
+#: output.h:1890
 msgid "** symtab xindex"
 msgstr "** symtab xindex"
 
-#: parameters.cc:172
+#: parameters.cc:87
 #, c-format
 msgid "unrecognized output format %s"
 msgstr "tunnistamaton tulostemuoto %s"
 
-#: plugin.cc:106
-#, c-format
-msgid "%s: could not load plugin library"
-msgstr "%s: ei voitu ladata lisäosakirjastoa"
-
-#: plugin.cc:116
-#, c-format
-msgid "%s: could not find onload entry point"
-msgstr "%s: ei kyetty löytämään sulkemistulokohtaa"
-
-#: plugin.cc:426
-msgid "Input files added by plug-ins in --incremental mode not supported yet.\n"
-msgstr "Lisäosien lisäämiä syötetiedostoja ei tueta vielä --incremental -tilassa.\n"
+#: powerpc.cc:1086 sparc.cc:1569 x86_64.cc:957
+msgid "requires unsupported dynamic reloc; recompile with -fPIC"
+msgstr "vaatii tukematonta dynaamista reloc-tietuetta, käännä uudelleen valitsimella -fPIC"
 
-#: powerpc.cc:1502 sparc.cc:2307 x86_64.cc:1632
+#: powerpc.cc:1447 sparc.cc:2237 x86_64.cc:1561
 #, c-format
 msgid "%s: unsupported REL reloc section"
 msgstr "%s: tukematon REL-sijoituslohko"
 
-#: readsyms.cc:191
+#: readsyms.cc:150
 #, c-format
 msgid "%s: file is empty"
 msgstr "%s: tiedosto on tyhjä"
 
 #. Here we have to handle any other input file types we need.
-#: readsyms.cc:575
+#: readsyms.cc:471
 #, c-format
 msgid "%s: not an object or archive"
 msgstr "%s: ei ole objekti tai arkisto"
 
-#: reduced_debug_output.cc:236
+#: reduced_debug_output.cc:240
 msgid "Debug abbreviations extend beyond .debug_abbrev section; failed to reduce debug abbreviations"
 msgstr "Vianjäljityslyhennykset laajenevat .debug_abbrev-lohkon ylitse; vianjäljityslyhenteiden vähentäminen epäonnistui"
 
-#: reduced_debug_output.cc:322
+#: reduced_debug_output.cc:326
 msgid "Extremely large compile unit in debug info; failed to reduce debug info"
 msgstr "Äärimmäisen laaja käännösyksikkö vianjäljitystiedoissa; vianjäljitystietojen vähentäminen epäonnistui"
 
-#: reduced_debug_output.cc:330
+#: reduced_debug_output.cc:334
 msgid "Debug info extends beyond .debug_info section;failed to reduce debug info"
 msgstr "Vianjäljitystiedot laajentuvat .debug_info-lohkon ylitse; vianjäljitystietojen vähentäminen epäonnistui"
 
-#: reduced_debug_output.cc:350 reduced_debug_output.cc:392
+#: reduced_debug_output.cc:354 reduced_debug_output.cc:396
 msgid "Invalid DIE in debug info; failed to reduce debug info"
 msgstr "Virheellinen DIE vianjäljitystiedoissa; vianjäljitystietojen vähentäminen epäonnistui"
 
-#: reduced_debug_output.cc:373
+#: reduced_debug_output.cc:377
 msgid "Debug info extends beyond .debug_info section; failed to reduce debug info"
 msgstr "Vianjäljitystiedot laajenevat .debug_info-lohkon ylitse; vianjäljitystietojen vähentäminen epäonnistui"
 
-#: reloc.cc:297 reloc.cc:858
+#: reloc.cc:239 reloc.cc:743
 #, c-format
 msgid "relocation section %u uses unexpected symbol table %u"
-msgstr "sijoituslohko %u käyttää odottomatonta symbolitaulua %u"
+msgstr "uudelleensijoituslohko %u käyttää odottomatonta symbolitaulua %u"
 
-#: reloc.cc:312 reloc.cc:875
+#: reloc.cc:254 reloc.cc:761
 #, c-format
 msgid "unexpected entsize for reloc section %u: %lu != %u"
 msgstr "odottamaton entsize reloc-lohkolle %u: %lu != %u"
 
-#: reloc.cc:321 reloc.cc:884
+#: reloc.cc:263 reloc.cc:770
 #, c-format
 msgid "reloc section %u size %lu uneven"
 msgstr "reloc-lohko %u koko %lu pariton"
 
-#: reloc.cc:1203
-#, c-format
-msgid "could not convert call to '%s' to '%s'"
-msgstr "ei voitu muuntaa kutsua kohteeseen ’%s’ kutsuksi kohteeseen ’%s’"
-
-#: reloc.cc:1343
+#: reloc.cc:992
 #, c-format
 msgid "reloc section size %zu is not a multiple of reloc size %d\n"
 msgstr "reloc-lohkokoko %zu ei ole reloc-koon %d monikerta\n"
 
 #. We should only see externally visible symbols in the symbol
 #. table.
-#: resolve.cc:191
+#: resolve.cc:170
 msgid "invalid STB_LOCAL symbol in external symbols"
 msgstr "virheellinen STB_LOCAL-symboli ulkoisissa symboleissa"
 
 #. Any target which wants to handle STB_LOOS, etc., needs to
 #. define a resolve method.
-#: resolve.cc:197
+#: resolve.cc:176
 msgid "unsupported symbol binding"
 msgstr "tukematon symbolisidos"
 
-#. A dynamic object cannot reference a hidden or internal symbol
-#. defined in another object.
-#: resolve.cc:266
-#, c-format
-msgid "%s symbol '%s' in %s is referenced by DSO %s"
-msgstr "%s symboli ’%s’ kohteessa %s on DSO %s:n viittaama"
-
-#: resolve.cc:326
-#, c-format
-msgid "common of '%s' overriding smaller common"
-msgstr "’%s’-yhteissymboli korvaa pienemmän yhteissymbolin"
-
-#: resolve.cc:331
-#, c-format
-msgid "common of '%s' overidden by larger common"
-msgstr "’%s’-yhteissymboli korvattu laajemmalla yhteissymbolilla"
-
-#: resolve.cc:336
-#, c-format
-msgid "multiple common of '%s'"
-msgstr "useita ’%s’-yhteissymboleja."
-
-#: resolve.cc:442
-#, c-format
-msgid "multiple definition of '%s'"
-msgstr "useita ’%s’-määrittelyjä"
-
-#: resolve.cc:481
-#, c-format
-msgid "definition of '%s' overriding common"
-msgstr "’%s’-määrittely korvaa yhteissymbolin"
-
-#: resolve.cc:516
-#, c-format
-msgid "definition of '%s' overriding dynamic common definition"
-msgstr "’%s’-määrittely korvaa dynaamisen yhteismäärittelyn"
-
-#: resolve.cc:636
+#. FIXME: Do a better job of reporting locations.
+#: resolve.cc:367
 #, c-format
-msgid "common '%s' overridden by previous definition"
-msgstr "yhteinen ’%s’ korvattu edellisellä määrittelyllä"
+msgid "%s: multiple definition of %s"
+msgstr "%s: useita %s-määrittelyjä"
 
-#: resolve.cc:766 resolve.cc:778
+#: resolve.cc:368 resolve.cc:373
 msgid "command line"
 msgstr "komentorivi"
 
-#: script-sections.cc:690
+#: resolve.cc:370
+#, c-format
+msgid "%s: previous definition here"
+msgstr "%s: edellinen määrittely tässä"
+
+#: script-sections.cc:432
 msgid "dot may not move backward"
 msgstr "piste ei voi siirtyä taaksepäin"
 
-#: script-sections.cc:757
+#: script-sections.cc:498
 msgid "** expression"
 msgstr "** lauseke"
 
-#: script-sections.cc:941
+#: script-sections.cc:684
 msgid "fill value is not absolute"
 msgstr "täytearvo ei ole absoluuttinen"
 
-#: script-sections.cc:1913
+#: script-sections.cc:1693
 #, c-format
 msgid "alignment of section %s is not absolute"
 msgstr "lohkon %s tasaus ei ole absoluuttinen"
 
-#: script-sections.cc:1957
+#: script-sections.cc:1737
 #, c-format
 msgid "subalign of section %s is not absolute"
 msgstr "lohkon %s alitasaus ei ole absoluuttinen"
 
-#: script-sections.cc:1972
+#: script-sections.cc:1752
 #, c-format
 msgid "fill of section %s is not absolute"
 msgstr "lohkon %s täyte ei ole absoluuttinen"
 
-#: script-sections.cc:2048
+#: script-sections.cc:1828
 msgid "SPECIAL constraints are not implemented"
 msgstr "SPECIAL-rajoitteita ei ole toteutettu"
 
-#: script-sections.cc:2090
+#: script-sections.cc:1870
 msgid "mismatched definition for constrained sections"
 msgstr "täsmäämätön määrittely rajoitetuille lohkoille"
 
 #  DATA_SEGMENT_ALIGN on sisäänrakennettu funktio linkittäjän skriptikielessä.
-#: script-sections.cc:2634
+#: script-sections.cc:2395
 msgid "DATA_SEGMENT_ALIGN may only appear once in a linker script"
 msgstr "DATA_SEGMENT_ALIGN-funktio voi esiintyä vain kerran linkkeriskriptissä"
 
-#: script-sections.cc:2649
+#: script-sections.cc:2406
 msgid "DATA_SEGMENT_RELRO_END may only appear once in a linker script"
 msgstr "DATA_SEGMENT_RELRO_END-funktio voi esiintyä vain kerran linkkeriskriptissä"
 
-#: script-sections.cc:2654
+#: script-sections.cc:2411
 msgid "DATA_SEGMENT_RELRO_END must follow DATA_SEGMENT_ALIGN"
 msgstr "DATA_SEGMENT_RELRO_END-funktion on seurattava DATA_SEGMENT_ALIGN-funktiota"
 
-#: script-sections.cc:2826
+#: script-sections.cc:2570
 msgid "no matching section constraint"
 msgstr "ei täsmäävää lohkorajoitusta"
 
-#: script-sections.cc:3151
+#: script-sections.cc:2890
 msgid "TLS sections are not adjacent"
 msgstr "TLS-lohkot eivät ole vierekkäisiä"
 
-#: script-sections.cc:3280
+#: script-sections.cc:3016
 msgid "allocated section not in any segment"
 msgstr "varattu lohko ei ole missään segmentissä"
 
-#: script-sections.cc:3309
+#: script-sections.cc:3048
 #, c-format
 msgid "no segment %s"
 msgstr "ei segmenttiä %s"
 
-#: script-sections.cc:3323
+#: script-sections.cc:3058
 msgid "section in two PT_LOAD segments"
 msgstr "lohko kahdessa PT_LOAD-segmentissä"
 
-#: script-sections.cc:3330
+#: script-sections.cc:3065
 msgid "allocated section not in any PT_LOAD segment"
 msgstr "varattu lohko ei ole missään PT_LOAD-segmentissä"
 
-#: script-sections.cc:3358
+#: script-sections.cc:3093
 msgid "may only specify load address for PT_LOAD segment"
 msgstr "voi vain antaa latausosoitteen PT_LOAD-segmentille"
 
-#: script-sections.cc:3382
+#: script-sections.cc:3117
 #, c-format
 msgid "PHDRS load address overrides section %s load address"
 msgstr "PHDRS-komennon latausosoite korvaa lohkon %s latausosoitteen"
 
 #. We could support this if we wanted to.
-#: script-sections.cc:3393
+#: script-sections.cc:3128
 msgid "using only one of FILEHDR and PHDRS is not currently supported"
 msgstr "vain yhden avainsanoista FILEHDR ja PHDRS käyttämistä ei nykyisin tueta"
 
-#: script-sections.cc:3408
+#: script-sections.cc:3143
 msgid "sections loaded on first page without room for file and program headers are not supported"
 msgstr "ei tueta ensimmäisellä sivulla ladattuja lohkoja ilman tilaa tiedostolle ja ohjelmaotsakkeille"
 
-#: script-sections.cc:3414
+#: script-sections.cc:3149
 msgid "using FILEHDR and PHDRS on more than one PT_LOAD segment is not currently supported"
 msgstr "avainsanojen FILEHDR ja PHDRS käyttämistä useammassa kuin yhdessä PT_LOAD-segmentissä ei nykyisin tueta"
 
-#: script.cc:1072
+#: script.cc:1063
 msgid "invalid use of PROVIDE for dot symbol"
 msgstr "virheellinen PROVIDE-käyttö dot-symbolille"
 
-#: script.cc:2132
+#: script.cc:1065
+msgid "invalid assignment to dot outside of SECTIONS"
+msgstr "virheellinen arvonasetus dot-symbolille SECTIONS-lauseen ulkopuolella"
+
+#: script.cc:1995
 #, c-format
 msgid "%s:%d:%d: %s"
 msgstr "%s:%d:%d: %s"
 
 #. There are some options that we could handle here--e.g.,
 #. -lLIBRARY.  Should we bother?
-#: script.cc:2297
+#: script.cc:2143
 #, c-format
 msgid "%s:%d:%d: ignoring command OPTION; OPTION is only valid for scripts specified via -T/--script"
 msgstr "%s:%d:%d: ohitetaan komento OPTION; OPTION on kelvollinen vain skripteillä, jotka määritellään valitsimilla -T/--script"
 
-#: script.cc:2362
+#: script.cc:2168
 #, c-format
 msgid "%s:%d:%d: ignoring SEARCH_DIR; SEARCH_DIR is only valid for scripts specified via -T/--script"
 msgstr "%s:%d:%d: ohitetaan SEARCH_DIR; SEARCH_DIR on kelvollinen vain skripteille, jotka on määritelty valitsimien -T/--script kautta"
 
-#: script.cc:2606 script.cc:2620
+#: script.cc:2411 script.cc:2425
 #, c-format
 msgid "%s:%d:%d: DATA_SEGMENT_ALIGN not in SECTIONS clause"
 msgstr "%s:%d:%d: DATA_SEGMENT_ALIGN-funktio ei ole SECTIONS-lauseessa"
 
-#: script.cc:2739
+#: script.cc:2543
 msgid "unknown PHDR type (try integer)"
 msgstr "tuntematon PHDR-tyyppi (yritä kokonaislukua)"
 
 #  Esimerkiksi puhelinluettelossa A-kirjaimella alkavat nimet muodostavat yhden bucketin, B-kirjaimella alkavat toisen jne. A ja B ovat hash key -avaimia.
-#: stringpool.cc:528
+#: stringpool.cc:526
 #, c-format
 msgid "%s: %s entries: %zu; buckets: %zu\n"
 msgstr "%s: %s alkiota: %zu; lohkot: %zu\n"
 
-#: stringpool.cc:532
+#: stringpool.cc:530
 #, c-format
 msgid "%s: %s entries: %zu\n"
 msgstr "%s: %s alkiota: %zu\n"
 
-#: stringpool.cc:535
+#: stringpool.cc:533
 #, c-format
 msgid "%s: %s Stringdata structures: %zu\n"
 msgstr "%s: %s Stringdata-rakenteet: %zu\n"
 
 #  ensimmäinen argumentti on objektinimi, toinen nimi
-#: symtab.cc:857
+#: symtab.cc:623
 #, c-format
 msgid "%s: reference to %s"
 msgstr "%s: viite nimeen %s"
 
 #  ensimmäinen argumentti on objektinimi, toinen nimi
-#: symtab.cc:859
+#: symtab.cc:625
 #, c-format
 msgid "%s: definition of %s"
 msgstr "%s: %s-määrittely"
 
-#: symtab.cc:1052
+#: symtab.cc:860
 #, c-format
 msgid "bad global symbol name offset %u at %zu"
 msgstr "väärä yleissymbolinimisiirros %u osoitteessa %zu"
 
-#: symtab.cc:1278
+#: symtab.cc:999
 msgid "--just-symbols does not make sense with a shared object"
 msgstr "--just-symbols ei tunnu järkevältä jaetuille objekteille"
 
-#: symtab.cc:1284
+#: symtab.cc:1005
 msgid "too few symbol versions"
 msgstr "liian harvoja symboliversioita"
 
-#: symtab.cc:1333
+#: symtab.cc:1054
 #, c-format
 msgid "bad symbol name offset %u at %zu"
 msgstr "väärä symbolinimisiirros %u osoitteessa %zu"
 
-#: symtab.cc:1396
+#: symtab.cc:1117
 #, c-format
 msgid "versym for symbol %zu out of range: %u"
 msgstr "versym symbolille %zu lukualueen ulkopuolella: %u"
 
-#: symtab.cc:1404
+#: symtab.cc:1125
 #, c-format
 msgid "versym for symbol %zu has no name: %u"
 msgstr "versym symbolille %zu ei ole nimeä: %u"
 
-#: symtab.cc:2549 symtab.cc:2681
+#: symtab.cc:2035 symtab.cc:2251
 #, c-format
 msgid "%s: unsupported symbol section 0x%x"
 msgstr "%s: tukematon symbolilohko 0x%x"
 
-#: symtab.cc:2933
+#: symtab.cc:2409
+#, c-format
+msgid "%s: undefined reference to '%s', version '%s'"
+msgstr "%s: määrittelemätön viite kohteeseen ’%s’, versio ’%s’"
+
+#: symtab.cc:2414
+#, c-format
+msgid "%s: undefined reference to '%s'"
+msgstr "%s: määrittelemätön viite kohteeseen ’%s’"
+
+#: symtab.cc:2498
 #, c-format
 msgid "%s: symbol table entries: %zu; buckets: %zu\n"
 msgstr "%s: symbolitaulualkiot: %zu; lohkot: %zu\n"
 
-#: symtab.cc:2936
+#: symtab.cc:2501
 #, c-format
 msgid "%s: symbol table entries: %zu\n"
 msgstr "%s: symbolitaulutuloja: %zu\n"
 
-#: symtab.cc:3007
+#: symtab.cc:2572
 #, c-format
 msgid "while linking %s: symbol '%s' defined in multiple places (possible ODR violation):"
 msgstr "kun linkitetään %s: symboli ’%s’ määritellään useissa paikoissa (mahdollinen ODR-ristiriita):"
 
-#: target-reloc.h:259
-msgid "relocation refers to discarded comdat section"
-msgstr "sijoitus viittaa hylättyyn comdat-lohkoon"
+#: target-reloc.h:247
+msgid "Relocation refers to discarded comdat section"
+msgstr "Uudelleensijoitus viittaa hylättyyn comdat-lohkoon"
 
-#: target-reloc.h:298
+#: target-reloc.h:278
 #, c-format
 msgid "reloc has bad offset %zu"
 msgstr "reloc-tietueella on väärä siirros %zu"
 
-#: target.cc:90
-#, c-format
-msgid "%s: unsupported ELF file type %d"
-msgstr "%s: tukematon ELF-tiedostotyyppi %d"
-
-#: target.cc:157
-#, c-format
-msgid "linker does not include stack split support required by %s"
-msgstr "linkkeri ei sisällä kohteen %s vaatiman pinojakamisen tukea"
-
 #: tls.h:59
 msgid "TLS relocation out of range"
-msgstr "TLS-sijoitus lukualueen ulkopuolella"
+msgstr "TLS-uudelleensijoitus lukualueen ulkopuolella"
 
 #: tls.h:73
 msgid "TLS relocation against invalid instruction"
-msgstr "TLS-sijoitus virheellistä käskyä vastaan"
+msgstr "TLS-uudelleensijoitus virhellistä käskyä vastaan"
 
 #. This output is intended to follow the GNU standards.
-#: version.cc:65
+#: version.cc:64
 #, c-format
 msgid "Copyright 2008 Free Software Foundation, Inc.\n"
 msgstr "Copyright 2008 Free Software Foundation, Inc.\n"
 
-#: version.cc:66
+#: version.cc:65
 #, c-format
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
@@ -2246,39 +1868,24 @@ msgstr ""
 msgid "%s failed: %s"
 msgstr "%s epäonnistui: %s"
 
-#: x86_64.cc:2184
+#: x86_64.cc:2104
 #, c-format
 msgid "unsupported reloc type %u"
 msgstr "tukematon reloc-tietuetyyppi %u"
 
-#: x86_64.cc:2524
+#: x86_64.cc:2441
 #, c-format
 msgid "unsupported reloc %u against local symbol"
 msgstr "tukematon reloc %u -tietue paikallista symbolia vastaan"
 
-#~ msgid " applied to section relative value"
-#~ msgstr " sovellettu lohkosuhteelliseen arvoon"
-
-#~ msgid "cannot find -l%s"
-#~ msgstr "ei voi löytää -l%s"
-
-#~ msgid "%s: ELF file too short"
-#~ msgstr "%s: ELF-tiedosto on liian lyhyt"
-
-#~ msgid "%s: invalid ELF version 0"
-#~ msgstr "%s: virheellinen ELF-versio 0"
-
-#~ msgid "%s: unsupported ELF version %d"
-#~ msgstr "%s: tukematon ELF-versio %d"
-
-#~ msgid "%s: invalid ELF class 0"
-#~ msgstr "%s: virheellinen ELF-luokka 0"
+#~ msgid "Copyright 2009 Free Software Foundation, Inc.\n"
+#~ msgstr "Copyright 2009 Free Software Foundation, Inc.\n"
 
-#~ msgid "%s: unsupported ELF class %d"
-#~ msgstr "%s: tukematon ELF-luokka %d"
+#~ msgid "symbols %s %zu %zu\n"
+#~ msgstr "symbolit %s %zu %zu\n"
 
-#~ msgid "%s: invalid ELF data encoding"
-#~ msgstr "%s: virheellinen ELF-datakoodaus"
+#~ msgid "archive %s %zu %zu\n"
+#~ msgstr "arkisto %s %zu %zu\n"
 
-#~ msgid "%s: unsupported ELF data encoding %d"
-#~ msgstr "%s: tukematon ELF-datakoodaus %d"
+#~ msgid "Incremental linking might be possible (not implemented yet)\n"
+#~ msgstr "Kasvava linkitys saattaisi olla mahdollista (ei ole vielä toteutettu)\n"
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 372443ffa6..45783c3933 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -1329,7 +1329,7 @@ Target_powerpc<size, big_endian>::Scan::local(
               rela_dyn->add_local_relative(object, r_sym, r_type,
 					   output_section, data_shndx,
 					   reloc.get_r_offset(),
-					   reloc.get_r_addend(), false);
+					   reloc.get_r_addend());
             }
         }
       break;
@@ -1372,7 +1372,7 @@ Target_powerpc<size, big_endian>::Scan::local(
 		object->set_local_got_offset(r_sym, GOT_TYPE_STANDARD, off);
 		rela_dyn->add_local_relative(object, r_sym,
 					     elfcpp::R_POWERPC_RELATIVE,
-					     got, off, 0, false);
+					     got, off, 0);
 	      }
           }
 	else
@@ -1566,8 +1566,8 @@ Target_powerpc<size, big_endian>::Scan::global(
             if (gsym->is_from_dynobj()
                 || gsym->is_undefined()
                 || gsym->is_preemptible())
-              got->add_global_with_rel(gsym, GOT_TYPE_STANDARD, rela_dyn,
-				       elfcpp::R_POWERPC_GLOB_DAT);
+              got->add_global_with_rela(gsym, GOT_TYPE_STANDARD, rela_dyn,
+                                        elfcpp::R_POWERPC_GLOB_DAT);
             else if (!gsym->has_got_offset(GOT_TYPE_STANDARD))
               {
 		unsigned int off = got->add_constant(0);
diff --git a/gold/readsyms.cc b/gold/readsyms.cc
index 8e52ccb7f9..1e50942a28 100644
--- a/gold/readsyms.cc
+++ b/gold/readsyms.cc
@@ -161,10 +161,8 @@ void
 Read_symbols::run(Workqueue* workqueue)
 {
   // If we didn't queue a new task, then we need to explicitly unblock
-  // the token. If the object is a member of a lib group, however,
-  // the token was already added to the list of locks for the task,
-  // and it will be unblocked automatically at the end of the task.
-  if (!this->do_read_symbols(workqueue) && this->member_ == NULL)
+  // the token.
+  if (!this->do_read_symbols(workqueue))
     workqueue->queue_soon(new Unblock_token(this->this_blocker_,
 					    this->next_blocker_));
 }
@@ -602,7 +600,6 @@ Add_symbols::run(Workqueue*)
 
   if (!this->input_objects_->add_object(this->object_))
     {
-      this->object_->discard_decompressed_sections();
       gold_assert(this->sd_ != NULL);
       delete this->sd_;
       this->sd_ = NULL;
@@ -633,7 +630,6 @@ Add_symbols::run(Workqueue*)
 	}
       this->object_->layout(this->symtab_, this->layout_, this->sd_);
       this->object_->add_symbols(this->symtab_, this->sd_, this->layout_);
-      this->object_->discard_decompressed_sections();
       delete this->sd_;
       this->sd_ = NULL;
       this->object_->release();
diff --git a/gold/reduced_debug_output.cc b/gold/reduced_debug_output.cc
index 31eaf779cd..93757bfa1c 100644
--- a/gold/reduced_debug_output.cc
+++ b/gold/reduced_debug_output.cc
@@ -61,10 +61,8 @@ Output_reduced_debug_info_section::get_die_end(
       switch(form)
         {
           case elfcpp::DW_FORM_null:
-          case elfcpp::DW_FORM_flag_present:
             break;
           case elfcpp::DW_FORM_strp:
-          case elfcpp::DW_FORM_sec_offset:
             die += is64 ? 8 : 4;
             break;
           case elfcpp::DW_FORM_addr:
@@ -90,7 +88,6 @@ Output_reduced_debug_info_section::get_die_end(
               break;
             }
           case elfcpp::DW_FORM_block:
-          case elfcpp::DW_FORM_exprloc:
             LEB_decoded = read_unsigned_LEB_128(die, &LEB_size);
             die += (LEB_decoded + LEB_size);
             break;
@@ -109,7 +106,6 @@ Output_reduced_debug_info_section::get_die_end(
             break;
           case elfcpp::DW_FORM_data8:
           case elfcpp::DW_FORM_ref8:
-          case elfcpp::DW_FORM_ref_sig8:
             die += 8;
             break;
           case elfcpp::DW_FORM_ref_udata:
@@ -117,20 +113,14 @@ Output_reduced_debug_info_section::get_die_end(
             read_unsigned_LEB_128(die, &LEB_size);
             die += LEB_size;
             break;
-          case elfcpp::DW_FORM_sdata:
-            read_signed_LEB_128(die, &LEB_size);
-            die += LEB_size;
-            break;
           case elfcpp::DW_FORM_string:
             {
               size_t length = strlen(reinterpret_cast<char*>(die));
               die += length + 1;
               break;
             }
+          case elfcpp::DW_FORM_sdata:
           case elfcpp::DW_FORM_indirect:
-          case elfcpp::DW_FORM_GNU_ref_index:
-          case elfcpp::DW_FORM_GNU_addr_index:
-          case elfcpp::DW_FORM_GNU_str_index:
             return false;
       }
     }
diff --git a/gold/reloc.h b/gold/reloc.h
index 4827600b38..02f91a4335 100644
--- a/gold/reloc.h
+++ b/gold/reloc.h
@@ -1,7 +1,6 @@
 // reloc.h -- relocate input files for gold   -*- C++ -*-
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
-// Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -716,122 +715,6 @@ public:
   { This::template pcrela<64>(view, object, psymval, addend, address); }
 };
 
-// Integer manipulation functions used by various targets when
-// performing relocations.
-
-template<int bits>
-class Bits
-{
- public:
-  // Sign extend an n-bit unsigned integer stored in a uint32_t into
-  // an int32_t.  BITS must be between 1 and 32.
-  static inline int32_t
-  sign_extend32(uint32_t val)
-  {
-    gold_assert(bits > 0 && bits <= 32);
-    if (bits == 32)
-      return static_cast<int32_t>(val);
-    uint32_t mask = (~static_cast<uint32_t>(0)) >> (32 - bits);
-    val &= mask;
-    uint32_t top_bit = 1U << (bits - 1);
-    int32_t as_signed = static_cast<int32_t>(val);
-    if ((val & top_bit) != 0)
-      as_signed -= static_cast<int32_t>(top_bit * 2);
-    return as_signed;    
-  }
-
-  // Return true if VAL (stored in a uint32_t) has overflowed a signed
-  // value with BITS bits.
-  static inline bool
-  has_overflow32(uint32_t val)
-  {
-    gold_assert(bits > 0 && bits <= 32);
-    if (bits == 32)
-      return false;
-    int32_t max = (1 << (bits - 1)) - 1;
-    int32_t min = -(1 << (bits - 1));
-    int32_t as_signed = static_cast<int32_t>(val);
-    return as_signed > max || as_signed < min;
-  }
-
-  // Return true if VAL (stored in a uint32_t) has overflowed both a
-  // signed and an unsigned value.  E.g.,
-  // Bits<8>::has_signed_unsigned_overflow32 would check -128 <= VAL <
-  // 255.
-  static inline bool
-  has_signed_unsigned_overflow32(uint32_t val)
-  {
-    gold_assert(bits > 0 && bits <= 32);
-    if (bits == 32)
-      return false;
-    int32_t max = static_cast<int32_t>((1U << bits) - 1);
-    int32_t min = -(1 << (bits - 1));
-    int32_t as_signed = static_cast<int32_t>(val);
-    return as_signed > max || as_signed < min;
-  }
-
-  // Select bits from A and B using bits in MASK.  For each n in
-  // [0..31], the n-th bit in the result is chosen from the n-th bits
-  // of A and B.  A zero selects A and a one selects B.
-  static inline uint32_t
-  bit_select32(uint32_t a, uint32_t b, uint32_t mask)
-  { return (a & ~mask) | (b & mask); }
-
-  // Sign extend an n-bit unsigned integer stored in a uint64_t into
-  // an int64_t.  BITS must be between 1 and 64.
-  static inline int64_t
-  sign_extend(uint64_t val)
-  {
-    gold_assert(bits > 0 && bits <= 64);
-    if (bits == 64)
-      return static_cast<int64_t>(val);
-    uint64_t mask = (~static_cast<uint64_t>(0)) >> (64 - bits);
-    val &= mask;
-    uint64_t top_bit = static_cast<uint64_t>(1) << (bits - 1);
-    int64_t as_signed = static_cast<int64_t>(val);
-    if ((val & top_bit) != 0)
-      as_signed -= static_cast<int64_t>(top_bit * 2);
-    return as_signed;    
-  }
-
-  // Return true if VAL (stored in a uint64_t) has overflowed a signed
-  // value with BITS bits.
-  static inline bool
-  has_overflow(uint64_t val)
-  {
-    gold_assert(bits > 0 && bits <= 64);
-    if (bits == 64)
-      return false;
-    int64_t max = (static_cast<int64_t>(1) << (bits - 1)) - 1;
-    int64_t min = -(static_cast<int64_t>(1) << (bits - 1));
-    int64_t as_signed = static_cast<int64_t>(val);
-    return as_signed > max || as_signed < min;
-  }
-
-  // Return true if VAL (stored in a uint64_t) has overflowed both a
-  // signed and an unsigned value.  E.g.,
-  // Bits<8>::has_signed_unsigned_overflow would check -128 <= VAL <
-  // 255.
-  static inline bool
-  has_signed_unsigned_overflow64(uint64_t val)
-  {
-    gold_assert(bits > 0 && bits <= 64);
-    if (bits == 64)
-      return false;
-    int64_t max = static_cast<int64_t>((static_cast<uint64_t>(1) << bits) - 1);
-    int64_t min = -(static_cast<int64_t>(1) << (bits - 1));
-    int64_t as_signed = static_cast<int64_t>(val);
-    return as_signed > max || as_signed < min;
-  }
-
-  // Select bits from A and B using bits in MASK.  For each n in
-  // [0..31], the n-th bit in the result is chosen from the n-th bits
-  // of A and B.  A zero selects A and a one selects B.
-  static inline uint64_t
-  bit_select64(uint64_t a, uint64_t b, uint64_t mask)
-  { return (a & ~mask) | (b & mask); }
-};
-
 // Track relocations while reading a section.  This lets you ask for
 // the relocation at a certain offset, and see how relocs occur
 // between points of interest.
@@ -873,16 +756,6 @@ class Track_relocs
   int
   advance(off_t offset);
 
-  // Checkpoint the current position in the reloc section.
-  section_size_type
-  checkpoint() const
-  { return this->pos_; }
-
-  // Reset the position to CHECKPOINT.
-  void
-  reset(section_size_type checkpoint)
-  { this->pos_ = checkpoint; }
-
  private:
   // The contents of the input object's reloc section.
   const unsigned char* prelocs_;
diff --git a/gold/resolve.cc b/gold/resolve.cc
index 0da8da2218..03288eccf1 100644
--- a/gold/resolve.cc
+++ b/gold/resolve.cc
@@ -296,7 +296,7 @@ Symbol_table::resolve(Sized_symbol<size>* to,
 
   // Record if we've seen this symbol in a real ELF object (i.e., the
   // symbol is referenced from outside the world known to the plugin).
-  if (object->pluginobj() == NULL && !object->is_dynamic())
+  if (object->pluginobj() == NULL)
     to->set_in_real_elf();
 
   // If we're processing replacement files, allow new symbols to override
@@ -336,9 +336,9 @@ Symbol_table::resolve(Sized_symbol<size>* to,
       && to->name()[0] == '_' && to->name()[1] == 'Z')
     {
       Symbol_location fromloc
-          = { object, orig_st_shndx, static_cast<off_t>(sym.get_st_value()) };
+          = { object, orig_st_shndx, sym.get_st_value() };
       Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary),
-				static_cast<off_t>(to->value()) };
+				to->value() };
       this->candidate_odr_violations_[to->name()].insert(fromloc);
       this->candidate_odr_violations_[to->name()].insert(toloc);
     }
@@ -356,15 +356,9 @@ Symbol_table::resolve(Sized_symbol<size>* to,
 				    &adjust_dyndef))
     {
       elfcpp::STB tobinding = to->binding();
-      typename Sized_symbol<size>::Value_type tovalue = to->value();
       this->override(to, sym, st_shndx, is_ordinary, object, version);
-      if (adjust_common_sizes)
-	{
-	  if (tosize > to->symsize())
-	    to->set_symsize(tosize);
-	  if (tovalue > to->value())
-	    to->set_value(tovalue);
-	}
+      if (adjust_common_sizes && tosize > to->symsize())
+        to->set_symsize(tosize);
       if (adjust_dyndef)
 	{
 	  // We are overriding an UNDEF or WEAK UNDEF with a DYN DEF.
@@ -374,13 +368,8 @@ Symbol_table::resolve(Sized_symbol<size>* to,
     }
   else
     {
-      if (adjust_common_sizes)
-	{
-	  if (sym.get_st_size() > tosize)
-	    to->set_symsize(sym.get_st_size());
-	  if (sym.get_st_value() > to->value())
-	    to->set_value(sym.get_st_value());
-	}
+      if (adjust_common_sizes && sym.get_st_size() > tosize)
+        to->set_symsize(sym.get_st_size());
       if (adjust_dyndef)
 	{
 	  // We are keeping a DYN DEF after seeing an UNDEF or WEAK UNDEF.
diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index f90c0b3752..1fad88dd81 100644
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -680,7 +680,7 @@ class Sections_element_assignment : public Sections_element
   set_section_addresses(Symbol_table* symtab, Layout* layout,
 			uint64_t* dot_value, uint64_t*, uint64_t*)
   {
-    this->assignment_.set_if_absolute(symtab, layout, true, *dot_value, NULL);
+    this->assignment_.set_if_absolute(symtab, layout, true, *dot_value);
   }
 
   // Print for debugging.
@@ -714,7 +714,7 @@ class Sections_element_dot_assignment : public Sections_element
     // output section definition the dot symbol is always considered
     // to be absolute.
     *dot_value = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
-					   NULL, NULL, NULL, false);
+					   NULL, NULL, NULL);
   }
 
   // Update the dot symbol while setting section addresses.
@@ -724,7 +724,7 @@ class Sections_element_dot_assignment : public Sections_element
 			uint64_t* load_address)
   {
     *dot_value = this->val_->eval_with_dot(symtab, layout, false, *dot_value,
-					   NULL, NULL, dot_alignment, false);
+					   NULL, NULL, dot_alignment);
     *load_address = *dot_value;
   }
 
@@ -866,11 +866,9 @@ class Output_section_element_assignment : public Output_section_element
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
 			uint64_t, uint64_t* dot_value, uint64_t*,
-			Output_section** dot_section, std::string*,
-			Input_section_list*)
+			Output_section**, std::string*, Input_section_list*)
   {
-    this->assignment_.set_if_absolute(symtab, layout, true, *dot_value,
-				      *dot_section);
+    this->assignment_.set_if_absolute(symtab, layout, true, *dot_value);
   }
 
   // Print for debugging.
@@ -894,28 +892,20 @@ class Output_section_element_dot_assignment : public Output_section_element
     : val_(val)
   { }
 
-  // An assignment to dot within an output section is enough to force
-  // the output section to exist.
-  bool
-  needs_output_section() const
-  { return true; }
-
   // Finalize the symbol.
   void
   finalize_symbols(Symbol_table* symtab, const Layout* layout,
 		   uint64_t* dot_value, Output_section** dot_section)
   {
     *dot_value = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
-					   *dot_section, dot_section, NULL,
-					   true);
+					   *dot_section, dot_section, NULL);
   }
 
   // Update the dot symbol while setting section addresses.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
 			uint64_t, uint64_t* dot_value, uint64_t*,
-			Output_section** dot_section, std::string*,
-			Input_section_list*);
+			Output_section**, std::string*, Input_section_list*);
 
   // Print for debugging.
   void
@@ -946,8 +936,7 @@ Output_section_element_dot_assignment::set_section_addresses(
 {
   uint64_t next_dot = this->val_->eval_with_dot(symtab, layout, false,
 						*dot_value, *dot_section,
-						dot_section, dot_alignment,
-						true);
+						dot_section, dot_alignment);
   if (next_dot < *dot_value)
     gold_error(_("dot may not move backward"));
   if (next_dot > *dot_value && output_section != NULL)
@@ -1048,8 +1037,7 @@ Output_data_expression::do_write_to_buffer(unsigned char* buf)
 {
   uint64_t val = this->val_->eval_with_dot(this->symtab_, this->layout_,
 					   true, this->dot_value_,
-					   this->dot_section_, NULL, NULL,
-					   false);
+					   this->dot_section_, NULL, NULL);
 
   if (parameters->target().is_big_endian())
     this->endian_write_to_buffer<true>(val, buf);
@@ -1199,7 +1187,7 @@ class Output_section_element_fill : public Output_section_element
     Output_section* fill_section;
     uint64_t fill_val = this->val_->eval_with_dot(symtab, layout, false,
 						  *dot_value, *dot_section,
-						  &fill_section, NULL, false);
+						  &fill_section, NULL);
     if (fill_section != NULL)
       gold_warning(_("fill value is not absolute"));
     // FIXME: The GNU linker supports fill values of arbitrary length.
@@ -2120,13 +2108,13 @@ Output_section_definition::finalize_symbols(Symbol_table* symtab,
 	{
 	  address = this->address_->eval_with_dot(symtab, layout, true,
 						  *dot_value, NULL,
-						  NULL, NULL, false);
+						  NULL, NULL);
 	}
       if (this->align_ != NULL)
 	{
 	  uint64_t align = this->align_->eval_with_dot(symtab, layout, true,
 						       *dot_value, NULL,
-						       NULL, NULL, false);
+						       NULL, NULL);
 	  address = align_address(address, align);
 	}
       *dot_value = address;
@@ -2315,7 +2303,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
   else
     address = this->address_->eval_with_dot(symtab, layout, true,
 					    *dot_value, NULL, NULL,
-					    dot_alignment, false);
+					    dot_alignment);
   uint64_t align;
   if (this->align_ == NULL)
     {
@@ -2328,7 +2316,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
     {
       Output_section* align_section;
       align = this->align_->eval_with_dot(symtab, layout, true, *dot_value,
-					  NULL, &align_section, NULL, false);
+					  NULL, &align_section, NULL);
       if (align_section != NULL)
 	gold_warning(_("alignment of section %s is not absolute"),
 		     this->name_.c_str());
@@ -2413,7 +2401,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
       laddr = this->load_address_->eval_with_dot(symtab, layout, true,
 						 *dot_value,
 						 this->output_section_,
-						 NULL, NULL, false);
+						 NULL, NULL);
       if (this->output_section_ != NULL)
         this->output_section_->set_load_address(laddr);
     }
@@ -2428,8 +2416,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
       Output_section* subalign_section;
       subalign = this->subalign_->eval_with_dot(symtab, layout, true,
 						*dot_value, NULL,
-						&subalign_section, NULL,
-						false);
+						&subalign_section, NULL);
       if (subalign_section != NULL)
 	gold_warning(_("subalign of section %s is not absolute"),
 		     this->name_.c_str());
@@ -2444,7 +2431,7 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
       uint64_t fill_val = this->fill_->eval_with_dot(symtab, layout, true,
 						     *dot_value,
 						     NULL, &fill_section,
-						     NULL, false);
+						     NULL);
       if (fill_section != NULL)
 	gold_warning(_("fill of section %s is not absolute"),
 		     this->name_.c_str());
diff --git a/gold/script.cc b/gold/script.cc
index 6a10c40e20..7df0c9e9dc 100644
--- a/gold/script.cc
+++ b/gold/script.cc
@@ -983,20 +983,18 @@ Symbol_assignment::sized_finalize(Symbol_table* symtab, const Layout* layout,
   uint64_t final_val = this->val_->eval_maybe_dot(symtab, layout, true,
 						  is_dot_available,
 						  dot_value, dot_section,
-						  &section, NULL, false);
+						  &section, NULL);
   Sized_symbol<size>* ssym = symtab->get_sized_symbol<size>(this->sym_);
   ssym->set_value(final_val);
   if (section != NULL)
     ssym->set_output_section(section);
 }
 
-// Set the symbol value if the expression yields an absolute value or
-// a value relative to DOT_SECTION.
+// Set the symbol value if the expression yields an absolute value.
 
 void
 Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
-				   bool is_dot_available, uint64_t dot_value,
-				   Output_section* dot_section)
+				   bool is_dot_available, uint64_t dot_value)
 {
   if (this->sym_ == NULL)
     return;
@@ -1004,9 +1002,8 @@ Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
   Output_section* val_section;
   uint64_t val = this->val_->eval_maybe_dot(symtab, layout, false,
 					    is_dot_available, dot_value,
-					    dot_section, &val_section, NULL,
-					    false);
-  if (val_section != NULL && val_section != dot_section)
+					    NULL, &val_section, NULL);
+  if (val_section != NULL)
     return;
 
   if (parameters->target().get_size() == 32)
@@ -1029,8 +1026,6 @@ Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
     }
   else
     gold_unreachable();
-  if (val_section != NULL)
-    this->sym_->set_output_section(val_section);
 }
 
 // Print for debugging.
@@ -1220,7 +1215,7 @@ Script_options::set_section_addresses(Symbol_table* symtab, Layout* layout)
   for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
        p != this->symbol_assignments_.end();
        ++p)
-    (*p)->set_if_absolute(symtab, layout, false, 0, NULL);
+    (*p)->set_if_absolute(symtab, layout, false, 0);
 
   return this->script_sections_.set_section_addresses(symtab, layout);
 }
@@ -1535,26 +1530,18 @@ read_input_script(Workqueue* workqueue, Symbol_table* symtab, Layout* layout,
   return true;
 }
 
-// Helper function for read_version_script(), read_commandline_script() and
-// script_include_directive().  Processes the given file in the mode indicated
-// by first_token and lex_mode.
+// Helper function for read_version_script() and
+// read_commandline_script().  Processes the given file in the mode
+// indicated by first_token and lex_mode.
 
 static bool
 read_script_file(const char* filename, Command_line* cmdline,
                  Script_options* script_options,
                  int first_token, Lex::Mode lex_mode)
 {
+  // TODO: if filename is a relative filename, search for it manually
+  // using "." + cmdline->options()->search_path() -- not dirsearch.
   Dirsearch dirsearch;
-  std::string name = filename;
-
-  // If filename is a relative filename, search for it manually using "." +
-  // cmdline->options()->library_path() -- not dirsearch.
-  if (!IS_ABSOLUTE_PATH(filename))
-    {
-      const General_options::Dir_list& search_path =
-          cmdline->options().library_path();
-      name = Dirsearch::find_file_in_dir_list(name, search_path, ".");
-    }
 
   // The file locking code wants to record a Task, but we haven't
   // started the workqueue yet.  This is only for debugging purposes,
@@ -1565,7 +1552,7 @@ read_script_file(const char* filename, Command_line* cmdline,
   Position_dependent_options posdep = cmdline->position_dependent_options();
   if (posdep.format_enum() == General_options::OBJECT_FORMAT_BINARY)
     posdep.set_format_enum(General_options::OBJECT_FORMAT_ELF);
-  Input_file_argument input_argument(name.c_str(),
+  Input_file_argument input_argument(filename,
 				     Input_file_argument::INPUT_FILE_TYPE_FILE,
 				     "", false, posdep);
   Input_file input_file(&input_argument);
@@ -3359,13 +3346,10 @@ script_parse_memory_attr(void* closurev, const char* attrs, size_t attrlen,
 }
 
 extern "C" void
-script_include_directive(void* closurev, const char* filename, size_t length)
+script_include_directive(void* closurev, const char*, size_t)
 {
-  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  std::string name(filename, length);
-  Command_line* cmdline = closure->command_line();
-  read_script_file(name.c_str(), cmdline, &cmdline->script_options(),
-                   PARSING_LINKER_SCRIPT, Lex::LINKER_SCRIPT);
+  // FIXME: Implement ?
+  yyerror (closurev, _("GOLD does not currently support INCLUDE directives"));
 }
 
 // Functions for memory regions.
diff --git a/gold/script.h b/gold/script.h
index f41f438373..73079a49ac 100644
--- a/gold/script.h
+++ b/gold/script.h
@@ -90,28 +90,20 @@ class Expression
   // the section address.  If RESULT_ALIGNMENT is not NULL, this sets
   // *RESULT_ALIGNMENT to the alignment of the value of that alignment
   // is larger than *RESULT_ALIGNMENT; this will only be non-zero if
-  // this is an ALIGN expression.  If IS_SECTION_DOT_ASSIGMENT is true,
-  // we are evaluating an assignment to dot within an output section,
-  // and an absolute value should be interpreted as an offset within
-  // the section.
+  // this is an ALIGN expression.
   uint64_t
   eval_with_dot(const Symbol_table*, const Layout*, bool check_assertions,
 		uint64_t dot_value, Output_section* dot_section,
-		Output_section** result_section, uint64_t* result_alignment,
-		bool is_section_dot_assignment);
+		Output_section** result_section, uint64_t* result_alignment);
 
   // Return the value of an expression which may or may not be
   // permitted to refer to the dot symbol, depending on
-  // is_dot_available.  If IS_SECTION_DOT_ASSIGMENT is true,
-  // we are evaluating an assignment to dot within an output section,
-  // and an absolute value should be interpreted as an offset within
-  // the section.
+  // is_dot_available.
   uint64_t
   eval_maybe_dot(const Symbol_table*, const Layout*, bool check_assertions,
 		 bool is_dot_available, uint64_t dot_value,
 		 Output_section* dot_section,
-		 Output_section** result_section, uint64_t* result_alignment,
-		 bool is_section_dot_assignment);
+		 Output_section** result_section, uint64_t* result_alignment);
 
   // Print the expression to the FILE.  This is for debugging.
   virtual void
@@ -347,12 +339,12 @@ class Symbol_assignment
   finalize_with_dot(Symbol_table*, const Layout*, uint64_t dot_value,
 		    Output_section* dot_section);
 
-  // Set the symbol value, but only if the value is absolute or relative to
-  // DOT_SECTION.  This is used while processing a SECTIONS clause.
-  // We assume that dot is an absolute value here.  We do not check assertions.
+  // Set the symbol value, but only if the value is absolute.  This is
+  // used while processing a SECTIONS clause.  We assume that dot is
+  // an absolute value here.  We do not check assertions.
   void
   set_if_absolute(Symbol_table*, const Layout*, bool is_dot_available,
-		  uint64_t dot_value, Output_section* dot_section);
+		  uint64_t dot_value);
 
   const std::string&
   name() const
diff --git a/gold/sparc.cc b/gold/sparc.cc
index 39c7e7ccf6..5f67a4e611 100644
--- a/gold/sparc.cc
+++ b/gold/sparc.cc
@@ -1855,7 +1855,7 @@ Target_sparc<size, big_endian>::Scan::local(
           rela_dyn->add_local_relative(object, r_sym, elfcpp::R_SPARC_RELATIVE,
 				       output_section, data_shndx,
 				       reloc.get_r_offset(),
-				       reloc.get_r_addend(), false);
+				       reloc.get_r_addend());
         }
       break;
 
@@ -1946,7 +1946,7 @@ Target_sparc<size, big_endian>::Scan::local(
 		object->set_local_got_offset(r_sym, GOT_TYPE_STANDARD, off);
 		rela_dyn->add_local_relative(object, r_sym,
 					     elfcpp::R_SPARC_RELATIVE,
-					     got, off, 0, false);
+					     got, off, 0);
 	      }
 	  }
 	else
@@ -1998,14 +1998,14 @@ Target_sparc<size, big_endian>::Scan::local(
 		  object->error(_("local symbol %u has bad shndx %u"),
 				r_sym, shndx);
 		else
-		  got->add_local_pair_with_rel(object, r_sym, 
-					       lsym.get_st_shndx(),
-					       GOT_TYPE_TLS_PAIR,
-					       target->rela_dyn_section(layout),
-					       (size == 64
-						? elfcpp::R_SPARC_TLS_DTPMOD64
-						: elfcpp::R_SPARC_TLS_DTPMOD32),
-					       0);
+		  got->add_local_pair_with_rela(object, r_sym, 
+						lsym.get_st_shndx(),
+						GOT_TYPE_TLS_PAIR,
+						target->rela_dyn_section(layout),
+						(size == 64
+						 ? elfcpp::R_SPARC_TLS_DTPMOD64
+						 : elfcpp::R_SPARC_TLS_DTPMOD32),
+						 0);
 		if (r_type == elfcpp::R_SPARC_TLS_GD_CALL)
 		  generate_tls_call(symtab, layout, target);
 	      }
@@ -2339,8 +2339,8 @@ Target_sparc<size, big_endian>::Scan::global(
             if (gsym->is_from_dynobj()
                 || gsym->is_undefined()
                 || gsym->is_preemptible())
-              got->add_global_with_rel(gsym, GOT_TYPE_STANDARD, rela_dyn,
-				       elfcpp::R_SPARC_GLOB_DAT);
+              got->add_global_with_rela(gsym, GOT_TYPE_STANDARD, rela_dyn,
+                                        elfcpp::R_SPARC_GLOB_DAT);
             else if (!gsym->has_got_offset(GOT_TYPE_STANDARD))
               {
 		unsigned int off = got->add_constant(0);
@@ -2389,14 +2389,14 @@ Target_sparc<size, big_endian>::Scan::global(
                 // dtv-relative offset.
                 Output_data_got<size, big_endian>* got
                     = target->got_section(symtab, layout);
-                got->add_global_pair_with_rel(gsym, GOT_TYPE_TLS_PAIR,
-					      target->rela_dyn_section(layout),
-					      (size == 64
-					       ? elfcpp::R_SPARC_TLS_DTPMOD64
-					       : elfcpp::R_SPARC_TLS_DTPMOD32),
-					      (size == 64
-					       ? elfcpp::R_SPARC_TLS_DTPOFF64
-					       : elfcpp::R_SPARC_TLS_DTPOFF32));
+                got->add_global_pair_with_rela(gsym, GOT_TYPE_TLS_PAIR,
+                                               target->rela_dyn_section(layout),
+					       (size == 64 ?
+						elfcpp::R_SPARC_TLS_DTPMOD64 :
+						elfcpp::R_SPARC_TLS_DTPMOD32),
+					       (size == 64 ?
+						elfcpp::R_SPARC_TLS_DTPOFF64 :
+						elfcpp::R_SPARC_TLS_DTPOFF32));
 
 		// Emit R_SPARC_WPLT30 against "__tls_get_addr"
 		if (r_type == elfcpp::R_SPARC_TLS_GD_CALL)
@@ -2407,11 +2407,11 @@ Target_sparc<size, big_endian>::Scan::global(
                 // Create a GOT entry for the tp-relative offset.
                 Output_data_got<size, big_endian>* got
                     = target->got_section(symtab, layout);
-                got->add_global_with_rel(gsym, GOT_TYPE_TLS_OFFSET,
-					 target->rela_dyn_section(layout),
-					 (size == 64 ?
-					  elfcpp::R_SPARC_TLS_TPOFF64 :
-					  elfcpp::R_SPARC_TLS_TPOFF32));
+                got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+                                          target->rela_dyn_section(layout),
+					  (size == 64 ?
+					   elfcpp::R_SPARC_TLS_TPOFF64 :
+					   elfcpp::R_SPARC_TLS_TPOFF32));
 	      }
 	    else if (optimized_type != tls::TLSOPT_TO_LE)
 	      unsupported_reloc_global(object, r_type, gsym);
@@ -2462,11 +2462,11 @@ Target_sparc<size, big_endian>::Scan::global(
 		// Create a GOT entry for the tp-relative offset.
 		Output_data_got<size, big_endian>* got
 		  = target->got_section(symtab, layout);
-		got->add_global_with_rel(gsym, GOT_TYPE_TLS_OFFSET,
-					 target->rela_dyn_section(layout),
-					 (size == 64
-					  ? elfcpp::R_SPARC_TLS_TPOFF64
-					  : elfcpp::R_SPARC_TLS_TPOFF32));
+		got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+					  target->rela_dyn_section(layout),
+					  (size == 64 ?
+					   elfcpp::R_SPARC_TLS_TPOFF64 :
+					   elfcpp::R_SPARC_TLS_TPOFF32));
 	      }
 	    else if (optimized_type != tls::TLSOPT_TO_LE)
 	      unsupported_reloc_global(object, r_type, gsym);
diff --git a/gold/symtab.cc b/gold/symtab.cc
index f0ba1d560f..ff1b5caa36 100644
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -602,16 +602,20 @@ Symbol_table::gc_mark_undef_symbols(Layout* layout)
 }
 
 void
-Symbol_table::gc_mark_symbol(Symbol* sym)
+Symbol_table::gc_mark_symbol_for_shlib(Symbol* sym)
 {
-  // Add the object and section to the work list.
-  Relobj* obj = static_cast<Relobj*>(sym->object());
-  bool is_ordinary;
-  unsigned int shndx = sym->shndx(&is_ordinary);
-  if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+  if (!sym->is_from_dynobj() 
+      && sym->is_externally_visible())
     {
-      gold_assert(this->gc_!= NULL);
-      this->gc_->worklist().push(Section_id(obj, shndx));
+      //Add the object and section to the work list.
+      Relobj* obj = static_cast<Relobj*>(sym->object());
+      bool is_ordinary;
+      unsigned int shndx = sym->shndx(&is_ordinary);
+      if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+        {
+          gold_assert(this->gc_!= NULL);
+          this->gc_->worklist().push(Section_id(obj, shndx));
+        }
     }
 }
 
@@ -622,7 +626,16 @@ Symbol_table::gc_mark_dyn_syms(Symbol* sym)
 {
   if (sym->in_dyn() && sym->source() == Symbol::FROM_OBJECT
       && !sym->object()->is_dynamic())
-    this->gc_mark_symbol(sym);
+    {
+      Relobj* obj = static_cast<Relobj*>(sym->object()); 
+      bool is_ordinary;
+      unsigned int shndx = sym->shndx(&is_ordinary);
+      if (is_ordinary && shndx != elfcpp::SHN_UNDEF)
+        {
+          gold_assert(this->gc_ != NULL);
+          this->gc_->worklist().push(Section_id(obj, shndx));
+        }
+    }
 }
 
 // Make TO a symbol which forwards to FROM.
@@ -1130,14 +1143,6 @@ Symbol_table::add_from_relobj(
       bool is_default_version = false;
       bool is_forced_local = false;
 
-      // FIXME: For incremental links, we don't store version information,
-      // so we need to ignore version symbols for now.
-      if (parameters->incremental_update() && ver != NULL)
-	{
-	  namelen = ver - name;
-	  ver = NULL;
-	}
-
       if (ver != NULL)
         {
           // The symbol name is of the form foo@VERSION or foo@@VERSION
@@ -1238,16 +1243,11 @@ Symbol_table::add_from_relobj(
       if (is_forced_local)
 	this->force_local(res);
 
-      // Do not treat this symbol as garbage if this symbol will be
-      // exported to the dynamic symbol table.  This is true when
-      // building a shared library or using --export-dynamic and
-      // the symbol is externally visible.
-      if (parameters->options().gc_sections()
-	  && res->is_externally_visible()
-	  && !res->is_from_dynobj()
-          && (parameters->options().shared()
-	      || parameters->options().export_dynamic()))
-        this->gc_mark_symbol(res);
+      // If building a shared library using garbage collection, do not 
+      // treat externally visible symbols as garbage.
+      if (parameters->options().gc_sections() 
+          && parameters->options().shared())
+        this->gc_mark_symbol_for_shlib(res);
 
       if (is_defined_in_discarded_section)
 	res->set_is_defined_in_discarded_section();
@@ -1346,11 +1346,6 @@ Symbol_table::add_from_dynobj(
       return;
     }
 
-  // FIXME: For incremental links, we don't store version information,
-  // so we need to ignore version symbols for now.
-  if (parameters->incremental_update())
-    versym = NULL;
-
   if (versym != NULL && versym_size / 2 < count)
     {
       dynobj->error(_("too few symbol versions"));
@@ -2814,12 +2809,6 @@ Symbol_table::sized_write_globals(const Stringpool* sympool,
       typename elfcpp::Elf_types<size>::Elf_Addr sym_value = sym->value();
       typename elfcpp::Elf_types<size>::Elf_Addr dynsym_value = sym_value;
       elfcpp::STB binding = sym->binding();
-
-      // If --no-gnu-unique is set, change STB_GNU_UNIQUE to STB_GLOBAL.
-      if (binding == elfcpp::STB_GNU_UNIQUE
-	  && !parameters->options().gnu_unique())
-	binding = elfcpp::STB_GLOBAL;
-
       switch (sym->source())
 	{
 	case Symbol::FROM_OBJECT:
diff --git a/gold/symtab.h b/gold/symtab.h
index feed245810..b9b9e00811 100644
--- a/gold/symtab.h
+++ b/gold/symtab.h
@@ -993,12 +993,7 @@ class Symbol
   // index, not one of the special codes from SHN_LORESERVE to
   // SHN_HIRESERVE (bit 29).
   bool is_ordinary_shndx_ : 1;
-  // True if we've seen this symbol in a "real" ELF object (bit 30).
-  // If the symbol has been seen in a relocatable, non-IR, object file,
-  // it's known to be referenced from outside the IR.  A reference from
-  // a dynamic object doesn't count as a "real" ELF, and we'll simply
-  // mark the symbol as "visible" from outside the IR.  The compiler
-  // can use this distinction to guide its handling of COMDAT symbols.
+  // True if we've seen this symbol in a real ELF object (bit 30).
   bool in_real_elf_ : 1;
   // True if this symbol is defined in a section which was discarded
   // (bit 31).
@@ -1313,9 +1308,10 @@ class Symbol_table
   void
   gc_mark_undef_symbols(Layout*);
 
-  // This tells garbage collection that this symbol is referenced.
+  // During garbage collection, this ensures externally visible symbols
+  // are not treated as garbage while building shared objects.
   void
-  gc_mark_symbol(Symbol* sym);
+  gc_mark_symbol_for_shlib(Symbol* sym);
 
   // During garbage collection, this keeps sections that correspond to 
   // symbols seen in dynamic objects.
diff --git a/gold/target-reloc.h b/gold/target-reloc.h
index 6efcdf49bd..464a3fa896 100644
--- a/gold/target-reloc.h
+++ b/gold/target-reloc.h
@@ -423,17 +423,17 @@ apply_relocation(const Relocate_info<size, big_endian>* relinfo,
 		 section_size_type view_size)
 {
   // Construct the ELF relocation in a temporary buffer.
-  const int reloc_size = elfcpp::Elf_sizes<size>::rela_size;
+  const int reloc_size = elfcpp::Elf_sizes<64>::rela_size;
   unsigned char relbuf[reloc_size];
-  elfcpp::Rela<size, big_endian> rel(relbuf);
-  elfcpp::Rela_write<size, big_endian> orel(relbuf);
+  elfcpp::Rela<64, false> rel(relbuf);
+  elfcpp::Rela_write<64, false> orel(relbuf);
   orel.put_r_offset(r_offset);
-  orel.put_r_info(elfcpp::elf_r_info<size>(0, r_type));
+  orel.put_r_info(elfcpp::elf_r_info<64>(0, r_type));
   orel.put_r_addend(r_addend);
 
   // Setup a Symbol_value for the global symbol.
-  const Sized_symbol<size>* sym = static_cast<const Sized_symbol<size>*>(gsym);
-  Symbol_value<size> symval;
+  const Sized_symbol<64>* sym = static_cast<const Sized_symbol<64>*>(gsym);
+  Symbol_value<64> symval;
   gold_assert(sym->has_symtab_index() && sym->symtab_index() != -1U);
   symval.set_output_symtab_index(sym->symtab_index());
   symval.set_output_value(sym->value());
diff --git a/gold/target.h b/gold/target.h
index ff97abaeb9..a378120325 100644
--- a/gold/target.h
+++ b/gold/target.h
@@ -56,7 +56,8 @@ template<int size>
 class Sized_symbol;
 class Symbol_table;
 class Output_data;
-class Output_data_got_base;
+template<int size, bool big_endian>
+class Output_data_got;
 class Output_section;
 class Input_objects;
 class Task;
@@ -396,11 +397,6 @@ class Target
   set_osabi(elfcpp::ELFOSABI osabi)
   { this->osabi_ = osabi; }
 
-  // Define target-specific standard symbols.
-  void
-  define_standard_symbols(Symbol_table* symtab, Layout* layout)
-  { this->do_define_standard_symbols(symtab, layout); }
-
  protected:
   // This struct holds the constant information for a child class.  We
   // use a struct to avoid the overhead of virtual function calls for
@@ -634,11 +630,6 @@ class Target
   do_select_as_default_target()
   { }
 
-  // This may be overridden by the child class.
-  virtual void
-  do_define_standard_symbols(Symbol_table*, Layout*)
-  { }
-
  private:
   // The implementations of the four do_make_elf_object virtual functions are
   // almost identical except for their sizes and endianness.  We use a template.
@@ -854,7 +845,7 @@ class Sized_target : public Target
   // Create the GOT and PLT sections for an incremental update.
   // A target needs to implement this to support incremental linking.
 
-  virtual Output_data_got_base*
+  virtual Output_data_got<size, big_endian>*
   init_got_plt_for_update(Symbol_table*,
 			  Layout*,
 			  unsigned int /* got_count */,
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 6f74f71097..9b8605bbc4 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -94,9 +94,6 @@ object_unittest_SOURCES = object_unittest.cc
 check_PROGRAMS += binary_unittest
 binary_unittest_SOURCES = binary_unittest.cc
 
-check_PROGRAMS += leb128_unittest
-leb128_unittest_SOURCES = leb128_unittest.cc
-
 endif NATIVE_OR_CROSS_LINKER
 
 # ---------------------------------------------------------------------
@@ -864,7 +861,7 @@ initpri1_LDADD =
 check_PROGRAMS += initpri2
 initpri2_SOURCES = initpri2.c
 initpri2_DEPENDENCIES = gcctestdir/ld
-initpri2_LDFLAGS = -Bgcctestdir/ -Wl,--ctors-in-init-array
+initpri2_LDFLAGS = -Bgcctestdir/
 initpri2_LDADD =
 
 check_PROGRAMS += initpri3a
@@ -873,16 +870,11 @@ initpri3a_DEPENDENCIES = gcctestdir/ld
 initpri3a_LDFLAGS = -Bgcctestdir/
 initpri3a_LDADD =
 
-# This test fails on targets not using .ctors and .dtors sections (e.g. ARM
-# EABI). Given that gcc is moving towards using .init_array in all cases,
-# this test is commented out.  A better fix would be checking whether gcc
-# uses .ctors or .init_array sections in configure.
-
-# check_PROGRAMS += initpri3b
-# initpri3b_SOURCES = initpri3.c
-# initpri3b_DEPENDENCIES = gcctestdir/ld
-# initpri3b_LDFLAGS = -Bgcctestdir/ -Wl,--no-ctors-in-init-array
-# initpri3b_LDADD =
+check_PROGRAMS += initpri3b
+initpri3b_SOURCES = initpri3.c
+initpri3b_DEPENDENCIES = gcctestdir/ld
+initpri3b_LDFLAGS = -Bgcctestdir/ -Wl,--no-ctors-in-init-array
+initpri3b_LDADD =
 
 # Test --detect-odr-violations
 check_SCRIPTS += debug_msg.sh
@@ -1518,20 +1510,6 @@ unused.o: unused.c
 unused.c:
 	@cp /dev/null $@
 
-check_SCRIPTS += plugin_final_layout.sh
-check_DATA += plugin_final_layout.stdout
-plugin_final_layout.o: plugin_final_layout.cc
-	$(CXXCOMPILE) -O0 -c -ffunction-sections  -fdata-sections -g -o $@ $<
-plugin_final_layout: plugin_final_layout.o plugin_section_order.so gcctestdir/ld
-	$(CXXLINK) -Bgcctestdir/ -Wl,--plugin,"./plugin_section_order.so" plugin_final_layout.o
-plugin_final_layout.stdout: plugin_final_layout
-	$(TEST_NM) -n plugin_final_layout > plugin_final_layout.stdout
-
-plugin_section_order.so: plugin_section_order.o
-	$(LINK) -Bgcctestdir/ -shared plugin_section_order.o
-plugin_section_order.o: plugin_section_order.c
-	$(COMPILE) -O0 -c -fpic -o $@ $<
-
 endif PLUGINS
 
 check_PROGRAMS += exclude_libs_test
@@ -1967,31 +1945,6 @@ memory_test: memory_test.o gcctestdir/ld $(srcdir)/memory_test.t
 memory_test.stdout: memory_test
 	$(TEST_READELF) -lWS  $< > $@
 
-# Test that --gdb-index functions correctly.
-check_SCRIPTS += gdb_index_test_1.sh
-check_DATA += gdb_index_test_1.stdout
-MOSTLYCLEANFILES += gdb_index_test_1.stdout gdb_index_test_1
-gdb_index_test.o: gdb_index_test.cc
-	$(CXXCOMPILE) -O0 -g -c -o $@ $<
-gdb_index_test_1: gdb_index_test.o gcctestdir/ld
-	$(CXXLINK) -Bgcctestdir/ -Wl,--gdb-index $<
-gdb_index_test_1.stdout: gdb_index_test_1
-	$(TEST_READELF) --debug-dump=gdb_index $< > $@
-
-if HAVE_ZLIB
-
-check_SCRIPTS += gdb_index_test_2.sh
-check_DATA += gdb_index_test_2.stdout
-MOSTLYCLEANFILES += gdb_index_test_2.stdout gdb_index_test_2
-gdb_index_test_cdebug.o: gdb_index_test.cc
-	$(CXXCOMPILE) -Bgcctestdir/ -O0 -g -Wa,--compress-debug-sections -c -o $@ $<
-gdb_index_test_2: gdb_index_test_cdebug.o gcctestdir/ld
-	$(CXXLINK) -Bgcctestdir/ -Wl,--gdb-index $<
-gdb_index_test_2.stdout: gdb_index_test_2
-	$(TEST_READELF) --debug-dump=gdb_index $< > $@
-
-endif HAVE_ZLIB
-
 # End-to-end incremental linking tests.
 # Incremental linking is currently supported only on the x86_64 target.
 
@@ -2530,7 +2483,7 @@ check_SCRIPTS += arm_exidx_test.sh
 check_DATA += arm_exidx_test.stdout
 
 arm_exidx_test.stdout: arm_exidx_test.so
-	$(TEST_READELF) -Sr $< > $@
+	$(TEST_READELF) -S $< > $@
 
 arm_exidx_test.so: arm_exidx_test.o ../ld-new
 	../ld-new -shared -o $@ $<
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 844aa67226..67149fbb9e 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -54,18 +54,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 	$(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
 	$(am__EXEEXT_37) $(am__EXEEXT_38)
 @NATIVE_OR_CROSS_LINKER_TRUE@am__append_1 = object_unittest \
-@NATIVE_OR_CROSS_LINKER_TRUE@	binary_unittest leb128_unittest
-
-# This test fails on targets not using .ctors and .dtors sections (e.g. ARM
-# EABI). Given that gcc is moving towards using .init_array in all cases,
-# this test is commented out.  A better fix would be checking whether gcc
-# uses .ctors or .init_array sections in configure.
-
-# check_PROGRAMS += initpri3b
-# initpri3b_SOURCES = initpri3.c
-# initpri3b_DEPENDENCIES = gcctestdir/ld
-# initpri3b_LDFLAGS = -Bgcctestdir/ -Wl,--no-ctors-in-init-array
-# initpri3b_LDADD =
+@NATIVE_OR_CROSS_LINKER_TRUE@	binary_unittest
 
 # Test --detect-odr-violations
 
@@ -200,7 +189,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 # Test -o when emitting to a special file (such as something in /dev).
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_24 = many_sections_test \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	many_sections_r_test initpri1 \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri2 initpri3a \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri2 initpri3a initpri3b \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_o_specialfile
 @GCC_FALSE@many_sections_test_DEPENDENCIES =
 @NATIVE_LINKER_FALSE@many_sections_test_DEPENDENCIES =
@@ -215,6 +204,8 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @NATIVE_LINKER_FALSE@initpri2_DEPENDENCIES =
 @GCC_FALSE@initpri3a_DEPENDENCIES =
 @NATIVE_LINKER_FALSE@initpri3a_DEPENDENCIES =
+@GCC_FALSE@initpri3b_DEPENDENCIES =
+@NATIVE_LINKER_FALSE@initpri3b_DEPENDENCIES =
 
 # Check that --detect-odr-violations works with compressed debug sections.
 @GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@am__append_27 = debug_msg_cdebug.err
@@ -315,8 +306,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_3.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_4.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_6.sh \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_7.sh \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_final_layout.sh
+@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_7.sh
 
 # Test that symbols known in the IR file but not in the replacement file
 # produce an unresolved symbol error.
@@ -328,8 +318,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_6.err \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_7.err \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_7.syms \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_9.err \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_final_layout.stdout
+@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_9.err
 # Make a copy of two_file_test_1.o, which does not define the symbol _Z4t16av.
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@am__append_36 =  \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	plugin_test_1.err \
@@ -360,16 +349,13 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 # weak reference in a DSO.
 
 # Test that MEMORY region support works.
-
-# Test that --gdb-index functions correctly.
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_38 = exclude_libs_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	discard_locals_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	hidden_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	retain_symbols_file_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	no_version_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	strong_ref_weak_def.sh \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	dyn_weak_ref.sh memory_test.sh \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	gdb_index_test_1.sh
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	dyn_weak_ref.sh memory_test.sh
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_39 = exclude_libs_test.syms \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	discard_locals_test.syms \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	discard_locals_relocatable_test1.syms \
@@ -379,8 +365,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	no_version_test.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	strong_ref_weak_def.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	dyn_weak_ref.stdout \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	memory_test.stdout \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	gdb_index_test_1.stdout
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	memory_test.stdout
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_40 = exclude_libs_test.syms \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	libexclude_libs_test_1.a \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	libexclude_libs_test_2.a \
@@ -406,9 +391,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	dyn_weak_ref_2.so \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	dyn_weak_ref.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	memory_test.stdout memory_test \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	memory_test.o \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	gdb_index_test_1.stdout \
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	gdb_index_test_1
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	memory_test.o
 @GCC_TRUE@@MCMODEL_MEDIUM_TRUE@@NATIVE_LINKER_TRUE@am__append_41 = large
 @GCC_FALSE@large_DEPENDENCIES =
 @MCMODEL_MEDIUM_FALSE@large_DEPENDENCIES =
@@ -483,13 +466,10 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 
 # Test that --start-lib and --end-lib function correctly.
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_53 = start_lib_test
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@am__append_54 = gdb_index_test_2.sh
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@am__append_55 = gdb_index_test_2.stdout
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@am__append_56 = gdb_index_test_2.stdout gdb_index_test_2
 
 # Test the --incremental-unchanged flag with an archive library.
 # The second link should not update the library.
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_57 = incremental_test_2 \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_54 = incremental_test_2 \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_3 \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_4 \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_5 \
@@ -497,7 +477,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_copy_test \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_common_test_1 \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_comdat_test_1
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_58 = two_file_test_tmp_2.o \
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_55 = two_file_test_tmp_2.o \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	two_file_test_tmp_3.o \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_4.base \
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	two_file_test_tmp_4.o \
@@ -507,22 +487,22 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 # These tests work with native and cross linkers.
 
 # Test script section order.
-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_59 = script_test_10.sh
-@NATIVE_OR_CROSS_LINKER_TRUE@am__append_60 = script_test_10.stdout
+@NATIVE_OR_CROSS_LINKER_TRUE@am__append_56 = script_test_10.sh
+@NATIVE_OR_CROSS_LINKER_TRUE@am__append_57 = script_test_10.stdout
 
 # These tests work with cross linkers only.
-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_61 = split_i386.sh
-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_62 = split_i386_1.stdout split_i386_2.stdout \
+@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_58 = split_i386.sh
+@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_59 = split_i386_1.stdout split_i386_2.stdout \
 @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	split_i386_3.stdout split_i386_4.stdout split_i386_r.stdout
 
-@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_63 = split_i386_1 split_i386_2 split_i386_3 \
+@DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_60 = split_i386_1 split_i386_2 split_i386_3 \
 @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	split_i386_4 split_i386_r
 
-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_64 = split_x86_64.sh
-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_65 = split_x86_64_1.stdout split_x86_64_2.stdout \
+@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_61 = split_x86_64.sh
+@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_62 = split_x86_64_1.stdout split_x86_64_2.stdout \
 @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	split_x86_64_3.stdout split_x86_64_4.stdout split_x86_64_r.stdout
 
-@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_66 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \
+@DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_63 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \
 @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	split_x86_64_4 split_x86_64_r
 
 
@@ -537,7 +517,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 # Check Thumb to Thumb farcall veneers
 
 # Check Thumb to ARM farcall veneers
-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_67 = arm_abs_global.sh \
+@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_64 = arm_abs_global.sh \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_branch_in_range.sh \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_branch_out_of_range.sh \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_fix_v4bx.sh \
@@ -551,7 +531,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_farcall_arm_thumb.sh \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_farcall_thumb_thumb.sh \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_farcall_thumb_arm.sh
-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_68 = arm_abs_global.stdout \
+@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_65 = arm_abs_global.stdout \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_bl_in_range.stdout \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_bl_out_of_range.stdout \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	thumb_bl_in_range.stdout \
@@ -596,7 +576,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_farcall_thumb_thumb_6m.stdout \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_farcall_thumb_arm.stdout \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_farcall_thumb_arm_5t.stdout
-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_69 = arm_abs_global \
+@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_66 = arm_abs_global \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_bl_in_range \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	arm_bl_out_of_range \
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	thumb_bl_in_range \
@@ -664,8 +644,7 @@ am_libgoldtest_a_OBJECTS = test.$(OBJEXT) testmain.$(OBJEXT) \
 	testfile.$(OBJEXT)
 libgoldtest_a_OBJECTS = $(am_libgoldtest_a_OBJECTS)
 @NATIVE_OR_CROSS_LINKER_TRUE@am__EXEEXT_1 = object_unittest$(EXEEXT) \
-@NATIVE_OR_CROSS_LINKER_TRUE@	binary_unittest$(EXEEXT) \
-@NATIVE_OR_CROSS_LINKER_TRUE@	leb128_unittest$(EXEEXT)
+@NATIVE_OR_CROSS_LINKER_TRUE@	binary_unittest$(EXEEXT)
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_2 = icf_virtual_function_folding_test$(EXEEXT) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	basic_test$(EXEEXT) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	basic_pic_test$(EXEEXT)
@@ -733,6 +712,7 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest_a_OBJECTS)
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri1$(EXEEXT) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri2$(EXEEXT) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri3a$(EXEEXT) \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri3b$(EXEEXT) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_o_specialfile$(EXEEXT)
 @GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_21 = flagstest_compress_debug_sections$(EXEEXT) \
 @GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@	flagstest_o_specialfile_and_compress_debug_sections$(EXEEXT)
@@ -1220,6 +1200,11 @@ initpri2_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(initpri2_LDFLAGS) \
 initpri3a_OBJECTS = $(am_initpri3a_OBJECTS)
 initpri3a_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(initpri3a_LDFLAGS) \
 	$(LDFLAGS) -o $@
+@GCC_TRUE@@NATIVE_LINKER_TRUE@am_initpri3b_OBJECTS =  \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri3.$(OBJEXT)
+initpri3b_OBJECTS = $(am_initpri3b_OBJECTS)
+initpri3b_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(initpri3b_LDFLAGS) \
+	$(LDFLAGS) -o $@
 @GCC_TRUE@@NATIVE_LINKER_TRUE@am_justsyms_OBJECTS =  \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	justsyms_1.$(OBJEXT)
 justsyms_OBJECTS = $(am_justsyms_OBJECTS)
@@ -1234,13 +1219,6 @@ justsyms_exec_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 large_OBJECTS = $(am_large_OBJECTS)
 large_LINK = $(CCLD) $(large_CFLAGS) $(CFLAGS) $(large_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@NATIVE_OR_CROSS_LINKER_TRUE@am_leb128_unittest_OBJECTS =  \
-@NATIVE_OR_CROSS_LINKER_TRUE@	leb128_unittest.$(OBJEXT)
-leb128_unittest_OBJECTS = $(am_leb128_unittest_OBJECTS)
-leb128_unittest_LDADD = $(LDADD)
-leb128_unittest_DEPENDENCIES = libgoldtest.a ../libgold.a \
-	../../libiberty/libiberty.a $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 local_labels_test_SOURCES = local_labels_test.c
 local_labels_test_OBJECTS = local_labels_test.$(OBJEXT)
 local_labels_test_LDADD = $(LDADD)
@@ -1720,9 +1698,8 @@ SOURCES = $(libgoldtest_a_SOURCES) basic_pic_test.c basic_pie_test.c \
 	incremental_copy_test.c incremental_test_2.c \
 	incremental_test_3.c incremental_test_4.c incremental_test_5.c \
 	incremental_test_6.c $(initpri1_SOURCES) $(initpri2_SOURCES) \
-	$(initpri3a_SOURCES) $(justsyms_SOURCES) \
-	$(justsyms_exec_SOURCES) $(large_SOURCES) \
-	$(leb128_unittest_SOURCES) local_labels_test.c \
+	$(initpri3a_SOURCES) $(initpri3b_SOURCES) $(justsyms_SOURCES) \
+	$(justsyms_exec_SOURCES) $(large_SOURCES) local_labels_test.c \
 	many_sections_r_test.c $(many_sections_test_SOURCES) \
 	$(object_unittest_SOURCES) permission_test.c plugin_test_1.c \
 	plugin_test_2.c plugin_test_3.c plugin_test_4.c \
@@ -1867,8 +1844,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
-GOLD_LDADD = @GOLD_LDADD@
-GOLD_LDFLAGS = @GOLD_LDFLAGS@
 GREP = @GREP@
 INCINTL = @INCINTL@
 INSTALL = @INSTALL@
@@ -2006,19 +1981,18 @@ TEST_AS = $(top_builddir)/../gas/as-new
 MOSTLYCLEANFILES = *.so *.syms *.stdout $(am__append_4) \
 	$(am__append_17) $(am__append_26) $(am__append_28) \
 	$(am__append_30) $(am__append_36) $(am__append_40) \
-	$(am__append_56) $(am__append_58) $(am__append_63) \
-	$(am__append_66) $(am__append_69)
+	$(am__append_55) $(am__append_60) $(am__append_63) \
+	$(am__append_66)
 
 # We will add to these later, for each individual test.  Note
 # that we add each test under check_SCRIPTS or check_PROGRAMS;
 # the TESTS variable is automatically populated from these.
 check_SCRIPTS = $(am__append_2) $(am__append_34) $(am__append_38) \
-	$(am__append_54) $(am__append_59) $(am__append_61) \
-	$(am__append_64) $(am__append_67)
+	$(am__append_56) $(am__append_58) $(am__append_61) \
+	$(am__append_64)
 check_DATA = $(am__append_3) $(am__append_27) $(am__append_29) \
-	$(am__append_35) $(am__append_39) $(am__append_55) \
-	$(am__append_60) $(am__append_62) $(am__append_65) \
-	$(am__append_68)
+	$(am__append_35) $(am__append_39) $(am__append_57) \
+	$(am__append_59) $(am__append_62) $(am__append_65)
 BUILT_SOURCES = $(am__append_25)
 TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
 
@@ -2036,7 +2010,6 @@ LDADD = libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL) \
 
 @NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_SOURCES = object_unittest.cc
 @NATIVE_OR_CROSS_LINKER_TRUE@binary_unittest_SOURCES = binary_unittest.cc
-@NATIVE_OR_CROSS_LINKER_TRUE@leb128_unittest_SOURCES = leb128_unittest.cc
 @GCC_TRUE@@NATIVE_LINKER_TRUE@constructor_test_SOURCES = constructor_test.cc
 @GCC_TRUE@@NATIVE_LINKER_TRUE@constructor_test_DEPENDENCIES = gcctestdir/ld
 @GCC_TRUE@@NATIVE_LINKER_TRUE@constructor_test_LDFLAGS = -Bgcctestdir/
@@ -2300,12 +2273,16 @@ LDADD = libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL) \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri1_LDADD = 
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri2_SOURCES = initpri2.c
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri2_DEPENDENCIES = gcctestdir/ld
-@GCC_TRUE@@NATIVE_LINKER_TRUE@initpri2_LDFLAGS = -Bgcctestdir/ -Wl,--ctors-in-init-array
+@GCC_TRUE@@NATIVE_LINKER_TRUE@initpri2_LDFLAGS = -Bgcctestdir/
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri2_LDADD = 
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3a_SOURCES = initpri3.c
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3a_DEPENDENCIES = gcctestdir/ld
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3a_LDFLAGS = -Bgcctestdir/
 @GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3a_LDADD = 
+@GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3b_SOURCES = initpri3.c
+@GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3b_DEPENDENCIES = gcctestdir/ld
+@GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3b_LDFLAGS = -Bgcctestdir/ -Wl,--no-ctors-in-init-array
+@GCC_TRUE@@NATIVE_LINKER_TRUE@initpri3b_LDADD = 
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ver_test_SOURCES = ver_test_main.cc
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ver_test_DEPENDENCIES = gcctestdir/ld ver_test_1.so ver_test_2.so ver_test_4.so
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ver_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
@@ -2949,6 +2926,9 @@ initpri2$(EXEEXT): $(initpri2_OBJECTS) $(initpri2_DEPENDENCIES)
 initpri3a$(EXEEXT): $(initpri3a_OBJECTS) $(initpri3a_DEPENDENCIES) 
 	@rm -f initpri3a$(EXEEXT)
 	$(initpri3a_LINK) $(initpri3a_OBJECTS) $(initpri3a_LDADD) $(LIBS)
+initpri3b$(EXEEXT): $(initpri3b_OBJECTS) $(initpri3b_DEPENDENCIES) 
+	@rm -f initpri3b$(EXEEXT)
+	$(initpri3b_LINK) $(initpri3b_OBJECTS) $(initpri3b_LDADD) $(LIBS)
 justsyms$(EXEEXT): $(justsyms_OBJECTS) $(justsyms_DEPENDENCIES) 
 	@rm -f justsyms$(EXEEXT)
 	$(justsyms_LINK) $(justsyms_OBJECTS) $(justsyms_LDADD) $(LIBS)
@@ -2958,9 +2938,6 @@ justsyms_exec$(EXEEXT): $(justsyms_exec_OBJECTS) $(justsyms_exec_DEPENDENCIES)
 large$(EXEEXT): $(large_OBJECTS) $(large_DEPENDENCIES) 
 	@rm -f large$(EXEEXT)
 	$(large_LINK) $(large_OBJECTS) $(large_LDADD) $(LIBS)
-leb128_unittest$(EXEEXT): $(leb128_unittest_OBJECTS) $(leb128_unittest_DEPENDENCIES) 
-	@rm -f leb128_unittest$(EXEEXT)
-	$(CXXLINK) $(leb128_unittest_OBJECTS) $(leb128_unittest_LDADD) $(LIBS)
 @GCC_FALSE@local_labels_test$(EXEEXT): $(local_labels_test_OBJECTS) $(local_labels_test_DEPENDENCIES) 
 @GCC_FALSE@	@rm -f local_labels_test$(EXEEXT)
 @GCC_FALSE@	$(LINK) $(local_labels_test_OBJECTS) $(local_labels_test_LDADD) $(LIBS)
@@ -3341,7 +3318,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/justsyms_1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/justsyms_exec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/large-large.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/leb128_unittest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/local_labels_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/many_sections_r_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/many_sections_test.Po@am__quote@
@@ -3713,8 +3689,6 @@ plugin_test_6.sh.log: plugin_test_6.sh
 	@p='plugin_test_6.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 plugin_test_7.sh.log: plugin_test_7.sh
 	@p='plugin_test_7.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-plugin_final_layout.sh.log: plugin_final_layout.sh
-	@p='plugin_final_layout.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 exclude_libs_test.sh.log: exclude_libs_test.sh
 	@p='exclude_libs_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 discard_locals_test.sh.log: discard_locals_test.sh
@@ -3731,10 +3705,6 @@ dyn_weak_ref.sh.log: dyn_weak_ref.sh
 	@p='dyn_weak_ref.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 memory_test.sh.log: memory_test.sh
 	@p='memory_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-gdb_index_test_1.sh.log: gdb_index_test_1.sh
-	@p='gdb_index_test_1.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-gdb_index_test_2.sh.log: gdb_index_test_2.sh
-	@p='gdb_index_test_2.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 script_test_10.sh.log: script_test_10.sh
 	@p='script_test_10.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 split_i386.sh.log: split_i386.sh
@@ -3773,8 +3743,6 @@ object_unittest.log: object_unittest$(EXEEXT)
 	@p='object_unittest$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 binary_unittest.log: binary_unittest$(EXEEXT)
 	@p='binary_unittest$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-leb128_unittest.log: leb128_unittest$(EXEEXT)
-	@p='leb128_unittest$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 icf_virtual_function_folding_test.log: icf_virtual_function_folding_test$(EXEEXT)
 	@p='icf_virtual_function_folding_test$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 basic_test.log: basic_test$(EXEEXT)
@@ -3899,6 +3867,8 @@ initpri2.log: initpri2$(EXEEXT)
 	@p='initpri2$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 initpri3a.log: initpri3a$(EXEEXT)
 	@p='initpri3a$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+initpri3b.log: initpri3b$(EXEEXT)
+	@p='initpri3b$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 flagstest_o_specialfile.log: flagstest_o_specialfile$(EXEEXT)
 	@p='flagstest_o_specialfile$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 flagstest_compress_debug_sections.log: flagstest_compress_debug_sections$(EXEEXT)
@@ -4841,17 +4811,6 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(COMPILE) -c -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@unused.c:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	@cp /dev/null $@
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_final_layout.o: plugin_final_layout.cc
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(CXXCOMPILE) -O0 -c -ffunction-sections  -fdata-sections -g -o $@ $<
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_final_layout: plugin_final_layout.o plugin_section_order.so gcctestdir/ld
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(CXXLINK) -Bgcctestdir/ -Wl,--plugin,"./plugin_section_order.so" plugin_final_layout.o
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_final_layout.stdout: plugin_final_layout
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(TEST_NM) -n plugin_final_layout > plugin_final_layout.stdout
-
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_section_order.so: plugin_section_order.o
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(LINK) -Bgcctestdir/ -shared plugin_section_order.o
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@plugin_section_order.o: plugin_section_order.c
-@GCC_TRUE@@NATIVE_LINKER_TRUE@@PLUGINS_TRUE@	$(COMPILE) -O0 -c -fpic -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@exclude_libs_test.syms: exclude_libs_test
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -sW $< >$@ 2>/dev/null
 @GCC_TRUE@@NATIVE_LINKER_TRUE@libexclude_libs_test_1.a: exclude_libs_test_1.o
@@ -5056,18 +5015,6 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -T $(srcdir)/memory_test.t -o $@ memory_test.o
 @GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test.stdout: memory_test
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -lWS  $< > $@
-@GCC_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test.o: gdb_index_test.cc
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -O0 -g -c -o $@ $<
-@GCC_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test_1: gdb_index_test.o gcctestdir/ld
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXLINK) -Bgcctestdir/ -Wl,--gdb-index $<
-@GCC_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test_1.stdout: gdb_index_test_1
-@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) --debug-dump=gdb_index $< > $@
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test_cdebug.o: gdb_index_test.cc
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -Bgcctestdir/ -O0 -g -Wa,--compress-debug-sections -c -o $@ $<
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test_2: gdb_index_test_cdebug.o gcctestdir/ld
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@	$(CXXLINK) -Bgcctestdir/ -Wl,--gdb-index $<
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test_2.stdout: gdb_index_test_2
-@GCC_TRUE@@HAVE_ZLIB_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) --debug-dump=gdb_index $< > $@
 
 # End-to-end incremental linking tests.
 # Incremental linking is currently supported only on the x86_64 target.
@@ -5489,7 +5436,7 @@ uninstall-am:
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	$(TEST_AS) -o $@ $<
 
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@arm_exidx_test.stdout: arm_exidx_test.so
-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	$(TEST_READELF) -Sr $< > $@
+@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	$(TEST_READELF) -S $< > $@
 
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@arm_exidx_test.so: arm_exidx_test.o ../ld-new
 @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@	../ld-new -shared -o $@ $<
diff --git a/gold/testsuite/arm_exidx_test.s b/gold/testsuite/arm_exidx_test.s
index 8e550e4e7b..14dcc9414f 100644
--- a/gold/testsuite/arm_exidx_test.s
+++ b/gold/testsuite/arm_exidx_test.s
@@ -23,9 +23,3 @@ empty:
         .fnend
         .size   empty, .-empty
 
-# Check that no dynamic relocations for __exidx_start and __exidx_stop
-# generated.
-	.data
-	.align	12
-	.word	__exidx_start(got)
-	.word	__exidx_end(got)
diff --git a/gold/testsuite/arm_exidx_test.sh b/gold/testsuite/arm_exidx_test.sh
index e196f122df..f732a68dd7 100755
--- a/gold/testsuite/arm_exidx_test.sh
+++ b/gold/testsuite/arm_exidx_test.sh
@@ -29,23 +29,10 @@ check()
 {
     if ! grep -q "$2" "$1"
     then
-	echo "Did not find expected output in $1:"
+	echo "Did not find section header in $1:"
 	echo "   $2"
 	echo ""
-	echo "Actual output below:"
-	cat "$1"
-	exit 1
-    fi
-}
-
-check_not()
-{
-    if grep -q "$2" "$1"
-    then
-	echo "Found unexpected output in $1:"
-	echo "   $2"
-	echo ""
-	echo "Actual output below:"
+	echo "Actual headers below:"
 	cat "$1"
 	exit 1
     fi
@@ -54,7 +41,5 @@ check_not()
 # Check that SHF_LINK_ORDER is set.
 check arm_exidx_test.stdout ".* .ARM.exidx .* ARM_EXIDX .* AL .*"
 check arm_exidx_test.stdout ".* .ARM.extab .* PROGBITS .* A .*"
-check_not arm_exidx_test.stdout ".* .* R_ARM_GLOB_DAT .* __exidx_start"
-check_not arm_exidx_test.stdout ".* .* R_ARM_GLOB_DAT .* __exidx_end"
 
 exit 0
diff --git a/gold/testsuite/plugin_test_2.sh b/gold/testsuite/plugin_test_2.sh
index 293b1f0060..a47d22aaa6 100755
--- a/gold/testsuite/plugin_test_2.sh
+++ b/gold/testsuite/plugin_test_2.sh
@@ -45,7 +45,7 @@ check plugin_test_2.err "two_file_test_main.o: claim file hook called"
 check plugin_test_2.err "two_file_test_1.syms: claim file hook called"
 check plugin_test_2.err "two_file_test_1b.syms: claim file hook called"
 check plugin_test_2.err "two_file_shared_2.so: claim file hook called"
-check plugin_test_2.err "two_file_test_1.syms: _Z4f13iv: PREVAILING_DEF_IRONLY_EXP"
+check plugin_test_2.err "two_file_test_1.syms: _Z4f13iv: PREVAILING_DEF_REG"
 check plugin_test_2.err "two_file_test_1.syms: _Z2t2v: PREVAILING_DEF_REG"
 check plugin_test_2.err "two_file_test_1.syms: v2: RESOLVED_DYN"
 check plugin_test_2.err "two_file_test_1.syms: t17data: RESOLVED_DYN"
diff --git a/gold/testsuite/script_test_2.t b/gold/testsuite/script_test_2.t
index 6a0188f8bc..73d39df530 100644
--- a/gold/testsuite/script_test_2.t
+++ b/gold/testsuite/script_test_2.t
@@ -49,7 +49,7 @@ SECTIONS
     /* This should match the remaining sections.  */
     *(.gold_test)
 
-    . = 60;
+    . = . + 4;
     start_data = .;
     BYTE(1)
     SHORT(2)
diff --git a/gold/timer.cc b/gold/timer.cc
index 1423663281..d9b8874a59 100644
--- a/gold/timer.cc
+++ b/gold/timer.cc
@@ -49,15 +49,6 @@ Timer::start()
   this->get_time(&this->start_time_);
 }
 
-// Record the time used by pass N (0 <= N <= 2).
-void
-Timer::stamp(int n)
-{
-  gold_assert(n >= 0 && n <= 2);
-  TimeStats& thispass = this->pass_times_[n];
-  this->get_time(&thispass);
-}
-
 #if HAVE_SYSCONF && defined _SC_CLK_TCK
 # define TICKS_PER_SECOND sysconf (_SC_CLK_TCK) /* POSIX 1003.1-1996 */
 #else
@@ -115,17 +106,4 @@ Timer::get_elapsed_time()
   return delta;
 }
 
-// Return the stats for pass N (0 <= N <= 2).
-Timer::TimeStats
-Timer::get_pass_time(int n)
-{
-  gold_assert(n >= 0 && n <= 2);
-  TimeStats thispass = this->pass_times_[n];
-  TimeStats& lastpass = n > 0 ? this->pass_times_[n-1] : this->start_time_;
-  thispass.wall -= lastpass.wall;
-  thispass.user -= lastpass.user;
-  thispass.sys -= lastpass.sys;
-  return thispass;
-}
-
 }
diff --git a/gold/timer.h b/gold/timer.h
index 4f986ca11e..50b55e49dd 100644
--- a/gold/timer.h
+++ b/gold/timer.h
@@ -48,18 +48,10 @@ class Timer
   TimeStats
   get_elapsed_time();
 
-  // Return the stats for pass N (0 <= N <= 2).
-  TimeStats
-  get_pass_time(int n);
-
   // Start counting the time.
   void
   start();
 
-  // Record the time used by pass N (0 <= N <= 2).
-  void
-  stamp(int n);
-
  private:
   // This class cannot be copied.
   Timer(const Timer&);
@@ -71,9 +63,6 @@ class Timer
 
   // The time of the last call to start.
   TimeStats start_time_;
-
-  // Times for each pass.
-  TimeStats pass_times_[3];
 };
 
 }
diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index 3962e1ea36..e6b0021076 100644
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -1,7 +1,6 @@
 // x86_64.cc -- x86_64 target support for gold.
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
-// Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -50,11 +49,10 @@ using namespace gold;
 
 // A class to handle the PLT data.
 
-template<int size>
 class Output_data_plt_x86_64 : public Output_section_data
 {
  public:
-  typedef Output_data_reloc<elfcpp::SHT_RELA, true, size, false> Reloc_section;
+  typedef Output_data_reloc<elfcpp::SHT_RELA, true, 64, false> Reloc_section;
 
   Output_data_plt_x86_64(Layout* layout, Output_data_got<64, false>* got,
 			 Output_data_space* got_plt,
@@ -92,7 +90,7 @@ class Output_data_plt_x86_64 : public Output_section_data
   // Add an entry to the PLT for a local STT_GNU_IFUNC symbol.
   unsigned int
   add_local_ifunc_entry(Symbol_table* symtab, Layout*,
-			Sized_relobj_file<size, false>* relobj,
+			Sized_relobj_file<64, false>* relobj,
 			unsigned int local_sym_index);
 
   // Add the relocation for a PLT entry.
@@ -244,16 +242,15 @@ class Output_data_plt_x86_64 : public Output_section_data
 //   http://people.redhat.com/drepper/tls.pdf
 //   http://www.lsd.ic.unicamp.br/~oliva/writeups/TLS/RFC-TLSDESC-x86.txt
 
-template<int size>
-class Target_x86_64 : public Sized_target<size, false>
+class Target_x86_64 : public Sized_target<64, false>
 {
  public:
   // In the x86_64 ABI (p 68), it says "The AMD64 ABI architectures
   // uses only Elf64_Rela relocation entries with explicit addends."
-  typedef Output_data_reloc<elfcpp::SHT_RELA, true, size, false> Reloc_section;
+  typedef Output_data_reloc<elfcpp::SHT_RELA, true, 64, false> Reloc_section;
 
   Target_x86_64()
-    : Sized_target<size, false>(&x86_64_info),
+    : Sized_target<64, false>(&x86_64_info),
       got_(NULL), plt_(NULL), got_plt_(NULL), got_irelative_(NULL),
       got_tlsdesc_(NULL), global_offset_table_(NULL), rela_dyn_(NULL),
       rela_irelative_(NULL), copy_relocs_(elfcpp::R_X86_64_COPY),
@@ -269,7 +266,7 @@ class Target_x86_64 : public Sized_target<size, false>
   void
   gc_process_relocs(Symbol_table* symtab,
 	            Layout* layout,
-	            Sized_relobj_file<size, false>* object,
+	            Sized_relobj_file<64, false>* object,
 	            unsigned int data_shndx,
 	            unsigned int sh_type,
 	            const unsigned char* prelocs,
@@ -283,7 +280,7 @@ class Target_x86_64 : public Sized_target<size, false>
   void
   scan_relocs(Symbol_table* symtab,
 	      Layout* layout,
-	      Sized_relobj_file<size, false>* object,
+	      Sized_relobj_file<64, false>* object,
 	      unsigned int data_shndx,
 	      unsigned int sh_type,
 	      const unsigned char* prelocs,
@@ -304,14 +301,14 @@ class Target_x86_64 : public Sized_target<size, false>
 
   // Relocate a section.
   void
-  relocate_section(const Relocate_info<size, false>*,
+  relocate_section(const Relocate_info<64, false>*,
 		   unsigned int sh_type,
 		   const unsigned char* prelocs,
 		   size_t reloc_count,
 		   Output_section* output_section,
 		   bool needs_special_offset_handling,
 		   unsigned char* view,
-		   typename elfcpp::Elf_types<size>::Elf_Addr view_address,
+		   elfcpp::Elf_types<64>::Elf_Addr view_address,
 		   section_size_type view_size,
 		   const Reloc_symbol_changes*);
 
@@ -319,7 +316,7 @@ class Target_x86_64 : public Sized_target<size, false>
   void
   scan_relocatable_relocs(Symbol_table* symtab,
 			  Layout* layout,
-			  Sized_relobj_file<size, false>* object,
+			  Sized_relobj_file<64, false>* object,
 			  unsigned int data_shndx,
 			  unsigned int sh_type,
 			  const unsigned char* prelocs,
@@ -332,19 +329,18 @@ class Target_x86_64 : public Sized_target<size, false>
 
   // Relocate a section during a relocatable link.
   void
-  relocate_for_relocatable(
-      const Relocate_info<size, false>*,
-      unsigned int sh_type,
-      const unsigned char* prelocs,
-      size_t reloc_count,
-      Output_section* output_section,
-      off_t offset_in_output_section,
-      const Relocatable_relocs*,
-      unsigned char* view,
-      typename elfcpp::Elf_types<size>::Elf_Addr view_address,
-      section_size_type view_size,
-      unsigned char* reloc_view,
-      section_size_type reloc_view_size);
+  relocate_for_relocatable(const Relocate_info<64, false>*,
+			   unsigned int sh_type,
+			   const unsigned char* prelocs,
+			   size_t reloc_count,
+			   Output_section* output_section,
+			   off_t offset_in_output_section,
+			   const Relocatable_relocs*,
+			   unsigned char* view,
+			   elfcpp::Elf_types<64>::Elf_Addr view_address,
+			   section_size_type view_size,
+			   unsigned char* reloc_view,
+			   section_size_type reloc_view_size);
 
   // Return a string used to fill a code section with nops.
   std::string
@@ -429,7 +425,7 @@ class Target_x86_64 : public Sized_target<size, false>
   plt_entry_size() const;
 
   // Create the GOT section for an incremental update.
-  Output_data_got_base*
+  Output_data_got<64, false>*
   init_got_plt_for_update(Symbol_table* symtab,
 			  Layout* layout,
 			  unsigned int got_count,
@@ -439,7 +435,7 @@ class Target_x86_64 : public Sized_target<size, false>
   // necessary dynamic relocations.
   void
   reserve_local_got_entry(unsigned int got_index,
-		          Sized_relobj<size, false>* obj,
+		          Sized_relobj<64, false>* obj,
 			  unsigned int r_sym,
 			  unsigned int got_type);
 
@@ -460,18 +456,18 @@ class Target_x86_64 : public Sized_target<size, false>
 
   // Apply an incremental relocation.
   void
-  apply_relocation(const Relocate_info<size, false>* relinfo,
-		   typename elfcpp::Elf_types<size>::Elf_Addr r_offset,
+  apply_relocation(const Relocate_info<64, false>* relinfo,
+		   elfcpp::Elf_types<64>::Elf_Addr r_offset,
 		   unsigned int r_type,
-		   typename elfcpp::Elf_types<size>::Elf_Swxword r_addend,
+		   elfcpp::Elf_types<64>::Elf_Swxword r_addend,
 		   const Symbol* gsym,
 		   unsigned char* view,
-		   typename elfcpp::Elf_types<size>::Elf_Addr address,
+		   elfcpp::Elf_types<64>::Elf_Addr address,
 		   section_size_type view_size);
 
   // Add a new reloc argument, returning the index in the vector.
   size_t
-  add_tlsdesc_info(Sized_relobj_file<size, false>* object, unsigned int r_sym)
+  add_tlsdesc_info(Sized_relobj_file<64, false>* object, unsigned int r_sym)
   {
     this->tlsdesc_reloc_info_.push_back(Tlsdesc_info(object, r_sym));
     return this->tlsdesc_reloc_info_.size() - 1;
@@ -491,48 +487,47 @@ class Target_x86_64 : public Sized_target<size, false>
 
     inline void
     local(Symbol_table* symtab, Layout* layout, Target_x86_64* target,
-	  Sized_relobj_file<size, false>* object,
+	  Sized_relobj_file<64, false>* object,
 	  unsigned int data_shndx,
 	  Output_section* output_section,
-	  const elfcpp::Rela<size, false>& reloc, unsigned int r_type,
-	  const elfcpp::Sym<size, false>& lsym);
+	  const elfcpp::Rela<64, false>& reloc, unsigned int r_type,
+	  const elfcpp::Sym<64, false>& lsym);
 
     inline void
     global(Symbol_table* symtab, Layout* layout, Target_x86_64* target,
-	   Sized_relobj_file<size, false>* object,
+	   Sized_relobj_file<64, false>* object,
 	   unsigned int data_shndx,
 	   Output_section* output_section,
-	   const elfcpp::Rela<size, false>& reloc, unsigned int r_type,
+	   const elfcpp::Rela<64, false>& reloc, unsigned int r_type,
 	   Symbol* gsym);
 
     inline bool
     local_reloc_may_be_function_pointer(Symbol_table* symtab, Layout* layout,
 					Target_x86_64* target,
-			        	Sized_relobj_file<size, false>* object,
+			        	Sized_relobj_file<64, false>* object,
 		  			unsigned int data_shndx,
 		  			Output_section* output_section,
-		  			const elfcpp::Rela<size, false>& reloc,
+		  			const elfcpp::Rela<64, false>& reloc,
 					unsigned int r_type,
-				  	const elfcpp::Sym<size, false>& lsym);
+				  	const elfcpp::Sym<64, false>& lsym);
 
     inline bool
     global_reloc_may_be_function_pointer(Symbol_table* symtab, Layout* layout,
  					 Target_x86_64* target,
-         	   			 Sized_relobj_file<size, false>* object,
+         	   			 Sized_relobj_file<64, false>* object,
         	   			 unsigned int data_shndx,
 		   			 Output_section* output_section,
-		   			 const elfcpp::Rela<size, false>& reloc,
+		   			 const elfcpp::Rela<64, false>& reloc,
 					 unsigned int r_type,
 		  			 Symbol* gsym);
 
   private:
     static void
-    unsupported_reloc_local(Sized_relobj_file<size, false>*,
-			    unsigned int r_type);
+    unsupported_reloc_local(Sized_relobj_file<64, false>*, unsigned int r_type);
 
     static void
-    unsupported_reloc_global(Sized_relobj_file<size, false>*,
-			     unsigned int r_type, Symbol*);
+    unsupported_reloc_global(Sized_relobj_file<64, false>*, unsigned int r_type,
+			     Symbol*);
 
     void
     check_non_pic(Relobj*, unsigned int r_type, Symbol*);
@@ -541,7 +536,7 @@ class Target_x86_64 : public Sized_target<size, false>
     possible_function_pointer_reloc(unsigned int r_type);
 
     bool
-    reloc_needs_plt_for_ifunc(Sized_relobj_file<size, false>*,
+    reloc_needs_plt_for_ifunc(Sized_relobj_file<64, false>*,
 			      unsigned int r_type);
 
     // Whether we have issued an error about a non-PIC compilation.
@@ -568,77 +563,76 @@ class Target_x86_64 : public Sized_target<size, false>
     // Do a relocation.  Return false if the caller should not issue
     // any warnings about this relocation.
     inline bool
-    relocate(const Relocate_info<size, false>*, Target_x86_64*,
-	     Output_section*,
-	     size_t relnum, const elfcpp::Rela<size, false>&,
-	     unsigned int r_type, const Sized_symbol<size>*,
-	     const Symbol_value<size>*,
-	     unsigned char*, typename elfcpp::Elf_types<size>::Elf_Addr,
+    relocate(const Relocate_info<64, false>*, Target_x86_64*, Output_section*,
+	     size_t relnum, const elfcpp::Rela<64, false>&,
+	     unsigned int r_type, const Sized_symbol<64>*,
+	     const Symbol_value<64>*,
+	     unsigned char*, elfcpp::Elf_types<64>::Elf_Addr,
 	     section_size_type);
 
    private:
     // Do a TLS relocation.
     inline void
-    relocate_tls(const Relocate_info<size, false>*, Target_x86_64*,
-                 size_t relnum, const elfcpp::Rela<size, false>&,
-		 unsigned int r_type, const Sized_symbol<size>*,
-		 const Symbol_value<size>*,
-		 unsigned char*, typename elfcpp::Elf_types<size>::Elf_Addr,
+    relocate_tls(const Relocate_info<64, false>*, Target_x86_64*,
+                 size_t relnum, const elfcpp::Rela<64, false>&,
+		 unsigned int r_type, const Sized_symbol<64>*,
+		 const Symbol_value<64>*,
+		 unsigned char*, elfcpp::Elf_types<64>::Elf_Addr,
 		 section_size_type);
 
     // Do a TLS General-Dynamic to Initial-Exec transition.
     inline void
-    tls_gd_to_ie(const Relocate_info<size, false>*, size_t relnum,
+    tls_gd_to_ie(const Relocate_info<64, false>*, size_t relnum,
 		 Output_segment* tls_segment,
-		 const elfcpp::Rela<size, false>&, unsigned int r_type,
-		 typename elfcpp::Elf_types<size>::Elf_Addr value,
+		 const elfcpp::Rela<64, false>&, unsigned int r_type,
+		 elfcpp::Elf_types<64>::Elf_Addr value,
 		 unsigned char* view,
-		 typename elfcpp::Elf_types<size>::Elf_Addr,
+		 elfcpp::Elf_types<64>::Elf_Addr,
 		 section_size_type view_size);
 
     // Do a TLS General-Dynamic to Local-Exec transition.
     inline void
-    tls_gd_to_le(const Relocate_info<size, false>*, size_t relnum,
+    tls_gd_to_le(const Relocate_info<64, false>*, size_t relnum,
 		 Output_segment* tls_segment,
-		 const elfcpp::Rela<size, false>&, unsigned int r_type,
-		 typename elfcpp::Elf_types<size>::Elf_Addr value,
+		 const elfcpp::Rela<64, false>&, unsigned int r_type,
+		 elfcpp::Elf_types<64>::Elf_Addr value,
 		 unsigned char* view,
 		 section_size_type view_size);
 
     // Do a TLSDESC-style General-Dynamic to Initial-Exec transition.
     inline void
-    tls_desc_gd_to_ie(const Relocate_info<size, false>*, size_t relnum,
+    tls_desc_gd_to_ie(const Relocate_info<64, false>*, size_t relnum,
 		      Output_segment* tls_segment,
-		      const elfcpp::Rela<size, false>&, unsigned int r_type,
-		      typename elfcpp::Elf_types<size>::Elf_Addr value,
+		      const elfcpp::Rela<64, false>&, unsigned int r_type,
+		      elfcpp::Elf_types<64>::Elf_Addr value,
 		      unsigned char* view,
-		      typename elfcpp::Elf_types<size>::Elf_Addr,
+		      elfcpp::Elf_types<64>::Elf_Addr,
 		      section_size_type view_size);
 
     // Do a TLSDESC-style General-Dynamic to Local-Exec transition.
     inline void
-    tls_desc_gd_to_le(const Relocate_info<size, false>*, size_t relnum,
+    tls_desc_gd_to_le(const Relocate_info<64, false>*, size_t relnum,
 		      Output_segment* tls_segment,
-		      const elfcpp::Rela<size, false>&, unsigned int r_type,
-		      typename elfcpp::Elf_types<size>::Elf_Addr value,
+		      const elfcpp::Rela<64, false>&, unsigned int r_type,
+		      elfcpp::Elf_types<64>::Elf_Addr value,
 		      unsigned char* view,
 		      section_size_type view_size);
 
     // Do a TLS Local-Dynamic to Local-Exec transition.
     inline void
-    tls_ld_to_le(const Relocate_info<size, false>*, size_t relnum,
+    tls_ld_to_le(const Relocate_info<64, false>*, size_t relnum,
 		 Output_segment* tls_segment,
-		 const elfcpp::Rela<size, false>&, unsigned int r_type,
-		 typename elfcpp::Elf_types<size>::Elf_Addr value,
+		 const elfcpp::Rela<64, false>&, unsigned int r_type,
+		 elfcpp::Elf_types<64>::Elf_Addr value,
 		 unsigned char* view,
 		 section_size_type view_size);
 
     // Do a TLS Initial-Exec to Local-Exec transition.
     static inline void
-    tls_ie_to_le(const Relocate_info<size, false>*, size_t relnum,
+    tls_ie_to_le(const Relocate_info<64, false>*, size_t relnum,
 		 Output_segment* tls_segment,
-		 const elfcpp::Rela<size, false>&, unsigned int r_type,
-		 typename elfcpp::Elf_types<size>::Elf_Addr value,
+		 const elfcpp::Rela<64, false>&, unsigned int r_type,
+		 elfcpp::Elf_types<64>::Elf_Addr value,
 		 unsigned char* view,
 		 section_size_type view_size);
 
@@ -692,7 +686,7 @@ class Target_x86_64 : public Sized_target<size, false>
   // Create a PLT entry for a local STT_GNU_IFUNC symbol.
   void
   make_local_ifunc_plt_entry(Symbol_table*, Layout*,
-			     Sized_relobj_file<size, false>* relobj,
+			     Sized_relobj_file<64, false>* relobj,
 			     unsigned int local_sym_index);
 
   // Define the _TLS_MODULE_BASE_ symbol in the TLS segment.
@@ -706,10 +700,10 @@ class Target_x86_64 : public Sized_target<size, false>
   // Create a GOT entry for the TLS module index.
   unsigned int
   got_mod_index_entry(Symbol_table* symtab, Layout* layout,
-		      Sized_relobj_file<size, false>* object);
+		      Sized_relobj_file<64, false>* object);
 
   // Get the PLT section.
-  Output_data_plt_x86_64<size>*
+  Output_data_plt_x86_64*
   plt_section() const
   {
     gold_assert(this->plt_ != NULL);
@@ -731,12 +725,12 @@ class Target_x86_64 : public Sized_target<size, false>
   // Add a potential copy relocation.
   void
   copy_reloc(Symbol_table* symtab, Layout* layout,
-             Sized_relobj_file<size, false>* object,
+             Sized_relobj_file<64, false>* object,
 	     unsigned int shndx, Output_section* output_section,
-	     Symbol* sym, const elfcpp::Rela<size, false>& reloc)
+	     Symbol* sym, const elfcpp::Rela<64, false>& reloc)
   {
     this->copy_relocs_.copy_reloc(symtab, layout,
-				  symtab->get_sized_symbol<size>(sym),
+				  symtab->get_sized_symbol<64>(sym),
 				  object, shndx, output_section,
 				  reloc, this->rela_dyn_section(layout));
   }
@@ -762,12 +756,12 @@ class Target_x86_64 : public Sized_target<size, false>
   // R_X86_64_TLSDESC against a local symbol.
   struct Tlsdesc_info
   {
-    Tlsdesc_info(Sized_relobj_file<size, false>* a_object, unsigned int a_r_sym)
+    Tlsdesc_info(Sized_relobj_file<64, false>* a_object, unsigned int a_r_sym)
       : object(a_object), r_sym(a_r_sym)
     { }
 
     // The object in which the local symbol is defined.
-    Sized_relobj_file<size, false>* object;
+    Sized_relobj_file<64, false>* object;
     // The local symbol index in the object.
     unsigned int r_sym;
   };
@@ -775,7 +769,7 @@ class Target_x86_64 : public Sized_target<size, false>
   // The GOT section.
   Output_data_got<64, false>* got_;
   // The PLT section.
-  Output_data_plt_x86_64<size>* plt_;
+  Output_data_plt_x86_64* plt_;
   // The GOT PLT section.
   Output_data_space* got_plt_;
   // The GOT section for IRELATIVE relocations.
@@ -789,7 +783,7 @@ class Target_x86_64 : public Sized_target<size, false>
   // The section to use for IRELATIVE relocs.
   Reloc_section* rela_irelative_;
   // Relocs saved to avoid a COPY reloc.
-  Copy_relocs<elfcpp::SHT_RELA, size, false> copy_relocs_;
+  Copy_relocs<elfcpp::SHT_RELA, 64, false> copy_relocs_;
   // Space for variables copied with a COPY reloc.
   Output_data_space* dynbss_;
   // Offset of the GOT entry for the TLS module index.
@@ -802,8 +796,7 @@ class Target_x86_64 : public Sized_target<size, false>
   bool tls_base_symbol_defined_;
 };
 
-template<>
-const Target::Target_info Target_x86_64<64>::x86_64_info =
+const Target::Target_info Target_x86_64::x86_64_info =
 {
   64,			// size
   false,		// is_big_endian
@@ -826,36 +819,11 @@ const Target::Target_info Target_x86_64<64>::x86_64_info =
   NULL			// attributes_vendor
 };
 
-template<>
-const Target::Target_info Target_x86_64<32>::x86_64_info =
-{
-  32,			// size
-  false,		// is_big_endian
-  elfcpp::EM_X86_64,	// machine_code
-  false,		// has_make_symbol
-  false,		// has_resolve
-  true,			// has_code_fill
-  true,			// is_default_stack_executable
-  true,			// can_icf_inline_merge_sections
-  '\0',			// wrap_char
-  "/libx32/ldx32.so.1", // program interpreter
-  0x400000,		// default_text_segment_address
-  0x1000,		// abi_pagesize (overridable by -z max-page-size)
-  0x1000,		// common_pagesize (overridable by -z common-page-size)
-  elfcpp::SHN_UNDEF,	// small_common_shndx
-  elfcpp::SHN_X86_64_LCOMMON,	// large_common_shndx
-  0,			// small_common_section_flags
-  elfcpp::SHF_X86_64_LARGE,	// large_common_section_flags
-  NULL,			// attributes_section
-  NULL			// attributes_vendor
-};
-
 // This is called when a new output section is created.  This is where
 // we handle the SHF_X86_64_LARGE.
 
-template<int size>
 void
-Target_x86_64<size>::do_new_output_section(Output_section* os) const
+Target_x86_64::do_new_output_section(Output_section* os) const
 {
   if ((os->flags() & elfcpp::SHF_X86_64_LARGE) != 0)
     os->set_is_large_section();
@@ -863,9 +831,8 @@ Target_x86_64<size>::do_new_output_section(Output_section* os) const
 
 // Get the GOT section, creating it if necessary.
 
-template<int size>
 Output_data_got<64, false>*
-Target_x86_64<size>::got_section(Symbol_table* symtab, Layout* layout)
+Target_x86_64::got_section(Symbol_table* symtab, Layout* layout)
 {
   if (this->got_ == NULL)
     {
@@ -939,9 +906,8 @@ Target_x86_64<size>::got_section(Symbol_table* symtab, Layout* layout)
 
 // Get the dynamic reloc section, creating it if necessary.
 
-template<int size>
-typename Target_x86_64<size>::Reloc_section*
-Target_x86_64<size>::rela_dyn_section(Layout* layout)
+Target_x86_64::Reloc_section*
+Target_x86_64::rela_dyn_section(Layout* layout)
 {
   if (this->rela_dyn_ == NULL)
     {
@@ -960,9 +926,8 @@ Target_x86_64<size>::rela_dyn_section(Layout* layout)
 // that they can refer to global variables initialized by those
 // relocs.
 
-template<int size>
-typename Target_x86_64<size>::Reloc_section*
-Target_x86_64<size>::rela_irelative_section(Layout* layout)
+Target_x86_64::Reloc_section*
+Target_x86_64::rela_irelative_section(Layout* layout)
 {
   if (this->rela_irelative_ == NULL)
     {
@@ -980,9 +945,8 @@ Target_x86_64<size>::rela_irelative_section(Layout* layout)
 
 // Initialize the PLT section.
 
-template<int size>
 void
-Output_data_plt_x86_64<size>::init(Layout* layout)
+Output_data_plt_x86_64::init(Layout* layout)
 {
   this->rel_ = new Reloc_section(false);
   layout->add_output_section_data(".rela.plt", elfcpp::SHT_RELA,
@@ -995,19 +959,17 @@ Output_data_plt_x86_64<size>::init(Layout* layout)
 				 plt_eh_frame_fde, plt_eh_frame_fde_size);
 }
 
-template<int size>
 void
-Output_data_plt_x86_64<size>::do_adjust_output_section(Output_section* os)
+Output_data_plt_x86_64::do_adjust_output_section(Output_section* os)
 {
   os->set_entsize(plt_entry_size);
 }
 
 // Add an entry to the PLT.
 
-template<int size>
 void
-Output_data_plt_x86_64<size>::add_entry(Symbol_table* symtab, Layout* layout,
-					Symbol* gsym)
+Output_data_plt_x86_64::add_entry(Symbol_table* symtab, Layout* layout,
+				  Symbol* gsym)
 {
   gold_assert(!gsym->has_plt_offset());
 
@@ -1082,12 +1044,11 @@ Output_data_plt_x86_64<size>::add_entry(Symbol_table* symtab, Layout* layout,
 // Add an entry to the PLT for a local STT_GNU_IFUNC symbol.  Return
 // the PLT offset.
 
-template<int size>
 unsigned int
-Output_data_plt_x86_64<size>::add_local_ifunc_entry(
+Output_data_plt_x86_64::add_local_ifunc_entry(
     Symbol_table* symtab,
     Layout* layout,
-    Sized_relobj_file<size, false>* relobj,
+    Sized_relobj_file<64, false>* relobj,
     unsigned int local_sym_index)
 {
   unsigned int plt_offset = this->irelative_count_ * plt_entry_size;
@@ -1110,12 +1071,9 @@ Output_data_plt_x86_64<size>::add_local_ifunc_entry(
 
 // Add the relocation for a PLT entry.
 
-template<int size>
 void
-Output_data_plt_x86_64<size>::add_relocation(Symbol_table* symtab,
-					     Layout* layout,
-					     Symbol* gsym,
-					     unsigned int got_offset)
+Output_data_plt_x86_64::add_relocation(Symbol_table* symtab, Layout* layout,
+				       Symbol* gsym, unsigned int got_offset)
 {
   if (gsym->type() == elfcpp::STT_GNU_IFUNC
       && gsym->can_use_relative_reloc(false))
@@ -1135,9 +1093,8 @@ Output_data_plt_x86_64<size>::add_relocation(Symbol_table* symtab,
 // Return where the TLSDESC relocations should go, creating it if
 // necessary.  These follow the JUMP_SLOT relocations.
 
-template<int size>
-typename Output_data_plt_x86_64<size>::Reloc_section*
-Output_data_plt_x86_64<size>::rela_tlsdesc(Layout* layout)
+Output_data_plt_x86_64::Reloc_section*
+Output_data_plt_x86_64::rela_tlsdesc(Layout* layout)
 {
   if (this->tlsdesc_rel_ == NULL)
     {
@@ -1154,10 +1111,8 @@ Output_data_plt_x86_64<size>::rela_tlsdesc(Layout* layout)
 // Return where the IRELATIVE relocations should go in the PLT.  These
 // follow the JUMP_SLOT and the TLSDESC relocations.
 
-template<int size>
-typename Output_data_plt_x86_64<size>::Reloc_section*
-Output_data_plt_x86_64<size>::rela_irelative(Symbol_table* symtab,
-					     Layout* layout)
+Output_data_plt_x86_64::Reloc_section*
+Output_data_plt_x86_64::rela_irelative(Symbol_table* symtab, Layout* layout)
 {
   if (this->irelative_rel_ == NULL)
     {
@@ -1195,9 +1150,8 @@ Output_data_plt_x86_64<size>::rela_irelative(Symbol_table* symtab,
 
 // Return the PLT address to use for a global symbol.
 
-template<int size>
 uint64_t
-Output_data_plt_x86_64<size>::address_for_global(const Symbol* gsym)
+Output_data_plt_x86_64::address_for_global(const Symbol* gsym)
 {
   uint64_t offset = 0;
   if (gsym->type() == elfcpp::STT_GNU_IFUNC
@@ -1209,17 +1163,15 @@ Output_data_plt_x86_64<size>::address_for_global(const Symbol* gsym)
 // Return the PLT address to use for a local symbol.  These are always
 // IRELATIVE relocs.
 
-template<int size>
 uint64_t
-Output_data_plt_x86_64<size>::address_for_local(const Relobj*, unsigned int)
+Output_data_plt_x86_64::address_for_local(const Relobj*, unsigned int)
 {
   return this->address() + (this->count_ + 1) * plt_entry_size;
 }
 
 // Set the final size.
-template<int size>
 void
-Output_data_plt_x86_64<size>::set_final_data_size()
+Output_data_plt_x86_64::set_final_data_size()
 {
   unsigned int count = this->count_ + this->irelative_count_;
   if (this->has_tlsdesc_entry())
@@ -1229,9 +1181,7 @@ Output_data_plt_x86_64<size>::set_final_data_size()
 
 // The first entry in the PLT for an executable.
 
-template<int size>
-const unsigned char
-Output_data_plt_x86_64<size>::first_plt_entry[plt_entry_size] =
+const unsigned char Output_data_plt_x86_64::first_plt_entry[plt_entry_size] =
 {
   // From AMD64 ABI Draft 0.98, page 76
   0xff, 0x35,	// pushq contents of memory address
@@ -1243,9 +1193,7 @@ Output_data_plt_x86_64<size>::first_plt_entry[plt_entry_size] =
 
 // Subsequent entries in the PLT for an executable.
 
-template<int size>
-const unsigned char
-Output_data_plt_x86_64<size>::plt_entry[plt_entry_size] =
+const unsigned char Output_data_plt_x86_64::plt_entry[plt_entry_size] =
 {
   // From AMD64 ABI Draft 0.98, page 76
   0xff, 0x25,	// jmpq indirect
@@ -1258,9 +1206,7 @@ Output_data_plt_x86_64<size>::plt_entry[plt_entry_size] =
 
 // The reserved TLSDESC entry in the PLT for an executable.
 
-template<int size>
-const unsigned char
-Output_data_plt_x86_64<size>::tlsdesc_plt_entry[plt_entry_size] =
+const unsigned char Output_data_plt_x86_64::tlsdesc_plt_entry[plt_entry_size] =
 {
   // From Alexandre Oliva, "Thread-Local Storage Descriptors for IA32
   // and AMD64/EM64T", Version 0.9.4 (2005-10-10).
@@ -1274,9 +1220,8 @@ Output_data_plt_x86_64<size>::tlsdesc_plt_entry[plt_entry_size] =
 
 // The .eh_frame unwind information for the PLT.
 
-template<int size>
 const unsigned char 
-Output_data_plt_x86_64<size>::plt_eh_frame_cie[plt_eh_frame_cie_size] =
+Output_data_plt_x86_64::plt_eh_frame_cie[plt_eh_frame_cie_size] =
 {
   1,				// CIE version.
   'z',				// Augmentation: augmentation size included.
@@ -1294,9 +1239,8 @@ Output_data_plt_x86_64<size>::plt_eh_frame_cie[plt_eh_frame_cie_size] =
   elfcpp::DW_CFA_nop
 };
 
-template<int size>
 const unsigned char
-Output_data_plt_x86_64<size>::plt_eh_frame_fde[plt_eh_frame_fde_size] =
+Output_data_plt_x86_64::plt_eh_frame_fde[plt_eh_frame_fde_size] =
 {
   0, 0, 0, 0,				// Replaced with offset to .plt.
   0, 0, 0, 0,				// Replaced with size of .plt.
@@ -1325,9 +1269,8 @@ Output_data_plt_x86_64<size>::plt_eh_frame_fde[plt_eh_frame_fde_size] =
 // Write out the PLT.  This uses the hand-coded instructions above,
 // and adjusts them as needed.  This is specified by the AMD64 ABI.
 
-template<int size>
 void
-Output_data_plt_x86_64<size>::do_write(Output_file* of)
+Output_data_plt_x86_64::do_write(Output_file* of)
 {
   const off_t offset = this->offset();
   const section_size_type oview_size =
@@ -1347,14 +1290,13 @@ Output_data_plt_x86_64<size>::do_write(Output_file* of)
   unsigned char* pov = oview;
 
   // The base address of the .plt section.
-  typename elfcpp::Elf_types<size>::Elf_Addr plt_address = this->address();
+  elfcpp::Elf_types<64>::Elf_Addr plt_address = this->address();
   // The base address of the .got section.
-  typename elfcpp::Elf_types<size>::Elf_Addr got_base = this->got_->address();
+  elfcpp::Elf_types<64>::Elf_Addr got_base = this->got_->address();
   // The base address of the PLT portion of the .got section,
   // which is where the GOT pointer will point, and where the
   // three reserved GOT entries are located.
-  typename elfcpp::Elf_types<size>::Elf_Addr got_address
-    = this->got_plt_->address();
+  elfcpp::Elf_types<64>::Elf_Addr got_address = this->got_plt_->address();
 
   memcpy(pov, first_plt_entry, plt_entry_size);
   // We do a jmp relative to the PC at the end of this instruction.
@@ -1431,18 +1373,17 @@ Output_data_plt_x86_64<size>::do_write(Output_file* of)
 
 // Create the PLT section.
 
-template<int size>
 void
-Target_x86_64<size>::make_plt_section(Symbol_table* symtab, Layout* layout)
+Target_x86_64::make_plt_section(Symbol_table* symtab, Layout* layout)
 {
   if (this->plt_ == NULL)
     {
       // Create the GOT sections first.
       this->got_section(symtab, layout);
 
-      this->plt_ = new Output_data_plt_x86_64<size>(layout, this->got_,
-						    this->got_plt_,
-						    this->got_irelative_);
+      this->plt_ = new Output_data_plt_x86_64(layout, this->got_,
+					      this->got_plt_,
+					      this->got_irelative_);
       layout->add_output_section_data(".plt", elfcpp::SHT_PROGBITS,
 				      (elfcpp::SHF_ALLOC
 				       | elfcpp::SHF_EXECINSTR),
@@ -1456,19 +1397,17 @@ Target_x86_64<size>::make_plt_section(Symbol_table* symtab, Layout* layout)
 
 // Return the section for TLSDESC relocations.
 
-template<int size>
-typename Target_x86_64<size>::Reloc_section*
-Target_x86_64<size>::rela_tlsdesc_section(Layout* layout) const
+Target_x86_64::Reloc_section*
+Target_x86_64::rela_tlsdesc_section(Layout* layout) const
 {
   return this->plt_section()->rela_tlsdesc(layout);
 }
 
 // Create a PLT entry for a global symbol.
 
-template<int size>
 void
-Target_x86_64<size>::make_plt_entry(Symbol_table* symtab, Layout* layout,
-				    Symbol* gsym)
+Target_x86_64::make_plt_entry(Symbol_table* symtab, Layout* layout,
+                              Symbol* gsym)
 {
   if (gsym->has_plt_offset())
     return;
@@ -1481,12 +1420,10 @@ Target_x86_64<size>::make_plt_entry(Symbol_table* symtab, Layout* layout,
 
 // Make a PLT entry for a local STT_GNU_IFUNC symbol.
 
-template<int size>
 void
-Target_x86_64<size>::make_local_ifunc_plt_entry(
-    Symbol_table* symtab, Layout* layout,
-    Sized_relobj_file<size, false>* relobj,
-    unsigned int local_sym_index)
+Target_x86_64::make_local_ifunc_plt_entry(Symbol_table* symtab, Layout* layout,
+					  Sized_relobj_file<64, false>* relobj,
+					  unsigned int local_sym_index)
 {
   if (relobj->local_has_plt_offset(local_sym_index))
     return;
@@ -1500,9 +1437,8 @@ Target_x86_64<size>::make_local_ifunc_plt_entry(
 
 // Return the number of entries in the PLT.
 
-template<int size>
 unsigned int
-Target_x86_64<size>::plt_entry_count() const
+Target_x86_64::plt_entry_count() const
 {
   if (this->plt_ == NULL)
     return 0;
@@ -1511,27 +1447,24 @@ Target_x86_64<size>::plt_entry_count() const
 
 // Return the offset of the first non-reserved PLT entry.
 
-template<int size>
 unsigned int
-Target_x86_64<size>::first_plt_entry_offset() const
+Target_x86_64::first_plt_entry_offset() const
 {
-  return Output_data_plt_x86_64<size>::first_plt_entry_offset();
+  return Output_data_plt_x86_64::first_plt_entry_offset();
 }
 
 // Return the size of each PLT entry.
 
-template<int size>
 unsigned int
-Target_x86_64<size>::plt_entry_size() const
+Target_x86_64::plt_entry_size() const
 {
-  return Output_data_plt_x86_64<size>::get_plt_entry_size();
+  return Output_data_plt_x86_64::get_plt_entry_size();
 }
 
 // Create the GOT and PLT sections for an incremental update.
 
-template<int size>
-Output_data_got_base*
-Target_x86_64<size>::init_got_plt_for_update(Symbol_table* symtab,
+Output_data_got<64, false>*
+Target_x86_64::init_got_plt_for_update(Symbol_table* symtab,
 				       Layout* layout,
 				       unsigned int got_count,
 				       unsigned int plt_count)
@@ -1581,10 +1514,8 @@ Target_x86_64<size>::init_got_plt_for_update(Symbol_table* symtab,
 				  ORDER_NON_RELRO_FIRST, false);
 
   // Create the PLT section.
-  this->plt_ = new Output_data_plt_x86_64<size>(layout, this->got_,
-						this->got_plt_,
-						this->got_irelative_,
-						plt_count);
+  this->plt_ = new Output_data_plt_x86_64(layout, this->got_, this->got_plt_,
+					  this->got_irelative_, plt_count);
   layout->add_output_section_data(".plt", elfcpp::SHT_PROGBITS,
 				  elfcpp::SHF_ALLOC | elfcpp::SHF_EXECINSTR,
 				  this->plt_, ORDER_PLT, false);
@@ -1602,11 +1533,10 @@ Target_x86_64<size>::init_got_plt_for_update(Symbol_table* symtab,
 // Reserve a GOT entry for a local symbol, and regenerate any
 // necessary dynamic relocations.
 
-template<int size>
 void
-Target_x86_64<size>::reserve_local_got_entry(
+Target_x86_64::reserve_local_got_entry(
     unsigned int got_index,
-    Sized_relobj<size, false>* obj,
+    Sized_relobj<64, false>* obj,
     unsigned int r_sym,
     unsigned int got_type)
 {
@@ -1619,7 +1549,7 @@ Target_x86_64<size>::reserve_local_got_entry(
     case GOT_TYPE_STANDARD:
       if (parameters->options().output_is_position_independent())
 	rela_dyn->add_local_relative(obj, r_sym, elfcpp::R_X86_64_RELATIVE,
-				     this->got_, got_offset, 0, false);
+				     this->got_, got_offset, 0);
       break;
     case GOT_TYPE_TLS_OFFSET:
       rela_dyn->add_local(obj, r_sym, elfcpp::R_X86_64_TPOFF64,
@@ -1644,11 +1574,9 @@ Target_x86_64<size>::reserve_local_got_entry(
 // Reserve a GOT entry for a global symbol, and regenerate any
 // necessary dynamic relocations.
 
-template<int size>
 void
-Target_x86_64<size>::reserve_global_got_entry(unsigned int got_index,
-					      Symbol* gsym,
-					      unsigned int got_type)
+Target_x86_64::reserve_global_got_entry(unsigned int got_index, Symbol* gsym,
+					unsigned int got_type)
 {
   unsigned int got_offset = got_index * 8;
   Reloc_section* rela_dyn = this->rela_dyn_section(NULL);
@@ -1693,12 +1621,11 @@ Target_x86_64<size>::reserve_global_got_entry(unsigned int got_index,
 
 // Register an existing PLT entry for a global symbol.
 
-template<int size>
 void
-Target_x86_64<size>::register_global_plt_entry(Symbol_table* symtab,
-					       Layout* layout,
-					       unsigned int plt_index,
-					       Symbol* gsym)
+Target_x86_64::register_global_plt_entry(Symbol_table* symtab,
+					 Layout* layout,
+					 unsigned int plt_index,
+					 Symbol* gsym)
 {
   gold_assert(this->plt_ != NULL);
   gold_assert(!gsym->has_plt_offset());
@@ -1713,13 +1640,12 @@ Target_x86_64<size>::register_global_plt_entry(Symbol_table* symtab,
 
 // Force a COPY relocation for a given symbol.
 
-template<int size>
 void
-Target_x86_64<size>::emit_copy_reloc(
+Target_x86_64::emit_copy_reloc(
     Symbol_table* symtab, Symbol* sym, Output_section* os, off_t offset)
 {
   this->copy_relocs_.emit_copy_reloc(symtab,
-				     symtab->get_sized_symbol<size>(sym),
+				     symtab->get_sized_symbol<64>(sym),
 				     os,
 				     offset,
 				     this->rela_dyn_section(NULL));
@@ -1727,10 +1653,8 @@ Target_x86_64<size>::emit_copy_reloc(
 
 // Define the _TLS_MODULE_BASE_ symbol in the TLS segment.
 
-template<int size>
 void
-Target_x86_64<size>::define_tls_base_symbol(Symbol_table* symtab,
-					    Layout* layout)
+Target_x86_64::define_tls_base_symbol(Symbol_table* symtab, Layout* layout)
 {
   if (this->tls_base_symbol_defined_)
     return;
@@ -1755,9 +1679,8 @@ Target_x86_64<size>::define_tls_base_symbol(Symbol_table* symtab,
 
 // Create the reserved PLT and GOT entries for the TLS descriptor resolver.
 
-template<int size>
 void
-Target_x86_64<size>::reserve_tlsdesc_entries(Symbol_table* symtab,
+Target_x86_64::reserve_tlsdesc_entries(Symbol_table* symtab,
                                              Layout* layout)
 {
   if (this->plt_ == NULL)
@@ -1776,10 +1699,9 @@ Target_x86_64<size>::reserve_tlsdesc_entries(Symbol_table* symtab,
 
 // Create a GOT entry for the TLS module index.
 
-template<int size>
 unsigned int
-Target_x86_64<size>::got_mod_index_entry(Symbol_table* symtab, Layout* layout,
-					 Sized_relobj_file<size, false>* object)
+Target_x86_64::got_mod_index_entry(Symbol_table* symtab, Layout* layout,
+			           Sized_relobj_file<64, false>* object)
 {
   if (this->got_mod_index_offset_ == -1U)
     {
@@ -1799,9 +1721,8 @@ Target_x86_64<size>::got_mod_index_entry(Symbol_table* symtab, Layout* layout,
 // symbol.  IS_FINAL is true if the final address of this symbol is
 // known at link time.
 
-template<int size>
 tls::Tls_optimization
-Target_x86_64<size>::optimize_tls_reloc(bool is_final, int r_type)
+Target_x86_64::optimize_tls_reloc(bool is_final, int r_type)
 {
   // If we are generating a shared library, then we can't do anything
   // in the linker.
@@ -1853,9 +1774,8 @@ Target_x86_64<size>::optimize_tls_reloc(bool is_final, int r_type)
 
 // Get the Reference_flags for a particular relocation.
 
-template<int size>
 int
-Target_x86_64<size>::Scan::get_reference_flags(unsigned int r_type)
+Target_x86_64::Scan::get_reference_flags(unsigned int r_type)
 {
   switch (r_type)
     {
@@ -1921,10 +1841,9 @@ Target_x86_64<size>::Scan::get_reference_flags(unsigned int r_type)
 
 // Report an unsupported relocation against a local symbol.
 
-template<int size>
 void
-Target_x86_64<size>::Scan::unsupported_reloc_local(
-     Sized_relobj_file<size, false>* object,
+Target_x86_64::Scan::unsupported_reloc_local(
+     Sized_relobj_file<64, false>* object,
      unsigned int r_type)
 {
   gold_error(_("%s: unsupported reloc %u against local symbol"),
@@ -1941,10 +1860,9 @@ Target_x86_64<size>::Scan::unsupported_reloc_local(
 // it is the symbol the relocation is against; if it is NULL, the
 // relocation is against a local symbol.
 
-template<int size>
 void
-Target_x86_64<size>::Scan::check_non_pic(Relobj* object, unsigned int r_type,
-					 Symbol* gsym)
+Target_x86_64::Scan::check_non_pic(Relobj* object, unsigned int r_type,
+				   Symbol* gsym)
 {
   switch (r_type)
     {
@@ -1972,9 +1890,6 @@ Target_x86_64<size>::Scan::check_non_pic(Relobj* object, unsigned int r_type,
 	return;
       /* Fall through.  */
     case elfcpp::R_X86_64_32:
-      // R_X86_64_32 is OK for x32.
-      if (size == 32 && r_type == elfcpp::R_X86_64_32)
-	return;
       if (this->issued_non_pic_error_)
 	return;
       gold_assert(parameters->options().output_is_position_independent());
@@ -2012,10 +1927,9 @@ Target_x86_64<size>::Scan::check_non_pic(Relobj* object, unsigned int r_type,
 // Return whether we need to make a PLT entry for a relocation of the
 // given type against a STT_GNU_IFUNC symbol.
 
-template<int size>
 bool
-Target_x86_64<size>::Scan::reloc_needs_plt_for_ifunc(
-     Sized_relobj_file<size, false>* object,
+Target_x86_64::Scan::reloc_needs_plt_for_ifunc(
+     Sized_relobj_file<64, false>* object,
      unsigned int r_type)
 {
   int flags = Scan::get_reference_flags(r_type);
@@ -2027,23 +1941,22 @@ Target_x86_64<size>::Scan::reloc_needs_plt_for_ifunc(
 
 // Scan a relocation for a local symbol.
 
-template<int size>
 inline void
-Target_x86_64<size>::Scan::local(Symbol_table* symtab,
-				 Layout* layout,
-				 Target_x86_64<size>* target,
-				 Sized_relobj_file<size, false>* object,
-				 unsigned int data_shndx,
-				 Output_section* output_section,
-				 const elfcpp::Rela<size, false>& reloc,
-				 unsigned int r_type,
-				 const elfcpp::Sym<size, false>& lsym)
+Target_x86_64::Scan::local(Symbol_table* symtab,
+                           Layout* layout,
+                           Target_x86_64* target,
+                           Sized_relobj_file<64, false>* object,
+                           unsigned int data_shndx,
+                           Output_section* output_section,
+                           const elfcpp::Rela<64, false>& reloc,
+                           unsigned int r_type,
+                           const elfcpp::Sym<64, false>& lsym)
 {
   // A local STT_GNU_IFUNC symbol may require a PLT entry.
-  bool is_ifunc = lsym.get_st_type() == elfcpp::STT_GNU_IFUNC;
-  if (is_ifunc && this->reloc_needs_plt_for_ifunc(object, r_type))
+  if (lsym.get_st_type() == elfcpp::STT_GNU_IFUNC
+      && this->reloc_needs_plt_for_ifunc(object, r_type))
     {
-      unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+      unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
       target->make_local_ifunc_plt_entry(symtab, layout, object, r_sym);
     }
 
@@ -2063,13 +1976,13 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
       // relocate it easily.
       if (parameters->options().output_is_position_independent())
         {
-          unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+          unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
           Reloc_section* rela_dyn = target->rela_dyn_section(layout);
 	  rela_dyn->add_local_relative(object, r_sym,
 				       elfcpp::R_X86_64_RELATIVE,
 				       output_section, data_shndx,
 				       reloc.get_r_offset(),
-				       reloc.get_r_addend(), is_ifunc);
+				       reloc.get_r_addend());
         }
       break;
 
@@ -2083,23 +1996,10 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
       // because that is always a 64-bit relocation.
       if (parameters->options().output_is_position_independent())
         {
-	  // Use R_X86_64_RELATIVE relocation for R_X86_64_32 under x32.
-	  if (size == 32 && r_type == elfcpp::R_X86_64_32)
-	    {
-	      unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
-	      Reloc_section* rela_dyn = target->rela_dyn_section(layout);
-	      rela_dyn->add_local_relative(object, r_sym,
-					   elfcpp::R_X86_64_RELATIVE,
-					   output_section, data_shndx,
-					   reloc.get_r_offset(),
-					   reloc.get_r_addend(), is_ifunc);
-	      break;
-	    }
-
           this->check_non_pic(object, r_type, NULL);
 
           Reloc_section* rela_dyn = target->rela_dyn_section(layout);
-	  unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+	  unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
           if (lsym.get_st_type() != elfcpp::STT_SECTION)
 	    rela_dyn->add_local(object, r_sym, r_type, output_section,
 				data_shndx, reloc.get_r_offset(),
@@ -2152,13 +2052,13 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
       {
         // The symbol requires a GOT entry.
         Output_data_got<64, false>* got = target->got_section(symtab, layout);
-        unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+        unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
 
 	// For a STT_GNU_IFUNC symbol we want the PLT offset.  That
 	// lets function pointers compare correctly with shared
 	// libraries.  Otherwise we would need an IRELATIVE reloc.
 	bool is_new;
-	if (is_ifunc)
+	if (lsym.get_st_type() == elfcpp::STT_GNU_IFUNC)
 	  is_new = got->add_local_plt(object, r_sym, GOT_TYPE_STANDARD);
 	else
 	  is_new = got->add_local(object, r_sym, GOT_TYPE_STANDARD);
@@ -2176,7 +2076,7 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
 		      object->local_got_offset(r_sym, GOT_TYPE_STANDARD);
 		    rela_dyn->add_local_relative(object, r_sym,
 						 elfcpp::R_X86_64_RELATIVE,
-						 got, got_offset, 0, is_ifunc);
+						 got, got_offset, 0);
 		  }
                 else
                   {
@@ -2219,8 +2119,7 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
       {
 	bool output_is_shared = parameters->options().shared();
 	const tls::Tls_optimization optimized_type
-            = Target_x86_64<size>::optimize_tls_reloc(!output_is_shared,
-						      r_type);
+            = Target_x86_64::optimize_tls_reloc(!output_is_shared, r_type);
 	switch (r_type)
 	  {
           case elfcpp::R_X86_64_TLSGD:       // General-dynamic
@@ -2230,7 +2129,7 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
                 // dtv-relative offset.
                 Output_data_got<64, false>* got
                     = target->got_section(symtab, layout);
-                unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+                unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
 		unsigned int shndx = lsym.get_st_shndx();
 		bool is_ordinary;
 		shndx = object->adjust_sym_shndx(r_sym, shndx, &is_ordinary);
@@ -2238,11 +2137,11 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
 		  object->error(_("local symbol %u has bad shndx %u"),
 			      r_sym, shndx);
                 else
-		  got->add_local_pair_with_rel(object, r_sym,
-					       shndx,
-					       GOT_TYPE_TLS_PAIR,
-					       target->rela_dyn_section(layout),
-					       elfcpp::R_X86_64_DTPMOD64, 0);
+		  got->add_local_pair_with_rela(object, r_sym,
+						shndx,
+						GOT_TYPE_TLS_PAIR,
+						target->rela_dyn_section(layout),
+						elfcpp::R_X86_64_DTPMOD64, 0);
               }
             else if (optimized_type != tls::TLSOPT_TO_LE)
 	      unsupported_reloc_local(object, r_type);
@@ -2262,7 +2161,7 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
 	        // make sure the section has been created.
 		target->got_section(symtab, layout);
                 Output_data_got<64, false>* got = target->got_tlsdesc_section();
-                unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+                unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
 		if (!object->local_has_got_offset(r_sym, GOT_TYPE_TLS_DESC))
 		  {
 		    unsigned int got_offset = got->add_constant(0);
@@ -2307,10 +2206,10 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
 	        // Create a GOT entry for the tp-relative offset.
 	        Output_data_got<64, false>* got
 	            = target->got_section(symtab, layout);
-	        unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
-	        got->add_local_with_rel(object, r_sym, GOT_TYPE_TLS_OFFSET,
-					target->rela_dyn_section(layout),
-					elfcpp::R_X86_64_TPOFF64);
+	        unsigned int r_sym = elfcpp::elf_r_sym<64>(reloc.get_r_info());
+	        got->add_local_with_rela(object, r_sym, GOT_TYPE_TLS_OFFSET,
+	                                 target->rela_dyn_section(layout),
+	                                 elfcpp::R_X86_64_TPOFF64);
               }
             else if (optimized_type != tls::TLSOPT_TO_LE)
               unsupported_reloc_local(object, r_type);
@@ -2340,10 +2239,9 @@ Target_x86_64<size>::Scan::local(Symbol_table* symtab,
 
 // Report an unsupported relocation against a global symbol.
 
-template<int size>
 void
-Target_x86_64<size>::Scan::unsupported_reloc_global(
-    Sized_relobj_file<size, false>* object,
+Target_x86_64::Scan::unsupported_reloc_global(
+    Sized_relobj_file<64, false>* object,
     unsigned int r_type,
     Symbol* gsym)
 {
@@ -2352,9 +2250,8 @@ Target_x86_64<size>::Scan::unsupported_reloc_global(
 }
 
 // Returns true if this relocation type could be that of a function pointer.
-template<int size>
 inline bool
-Target_x86_64<size>::Scan::possible_function_pointer_reloc(unsigned int r_type)
+Target_x86_64::Scan::possible_function_pointer_reloc(unsigned int r_type)
 {
   switch (r_type)
     {
@@ -2379,18 +2276,17 @@ Target_x86_64<size>::Scan::possible_function_pointer_reloc(unsigned int r_type)
 // corresponds to a function pointer being taken.  In that case mark
 // the function whose pointer was taken as not foldable.
 
-template<int size>
 inline bool
-Target_x86_64<size>::Scan::local_reloc_may_be_function_pointer(
+Target_x86_64::Scan::local_reloc_may_be_function_pointer(
   Symbol_table* ,
   Layout* ,
-  Target_x86_64<size>* ,
-  Sized_relobj_file<size, false>* ,
+  Target_x86_64* ,
+  Sized_relobj_file<64, false>* ,
   unsigned int ,
   Output_section* ,
-  const elfcpp::Rela<size, false>& ,
+  const elfcpp::Rela<64, false>& ,
   unsigned int r_type,
-  const elfcpp::Sym<size, false>&)
+  const elfcpp::Sym<64, false>&)
 {
   // When building a shared library, do not fold any local symbols as it is
   // not possible to distinguish pointer taken versus a call by looking at
@@ -2403,16 +2299,15 @@ Target_x86_64<size>::Scan::local_reloc_may_be_function_pointer(
 // corresponds to a function pointer being taken.  In that case mark
 // the function whose pointer was taken as not foldable.
 
-template<int size>
 inline bool
-Target_x86_64<size>::Scan::global_reloc_may_be_function_pointer(
+Target_x86_64::Scan::global_reloc_may_be_function_pointer(
   Symbol_table*,
   Layout* ,
-  Target_x86_64<size>* ,
-  Sized_relobj_file<size, false>* ,
+  Target_x86_64* ,
+  Sized_relobj_file<64, false>* ,
   unsigned int ,
   Output_section* ,
-  const elfcpp::Rela<size, false>& ,
+  const elfcpp::Rela<64, false>& ,
   unsigned int r_type,
   Symbol* gsym)
 {
@@ -2427,15 +2322,14 @@ Target_x86_64<size>::Scan::global_reloc_may_be_function_pointer(
 
 // Scan a relocation for a global symbol.
 
-template<int size>
 inline void
-Target_x86_64<size>::Scan::global(Symbol_table* symtab,
+Target_x86_64::Scan::global(Symbol_table* symtab,
                             Layout* layout,
-                            Target_x86_64<size>* target,
-                            Sized_relobj_file<size, false>* object,
+                            Target_x86_64* target,
+                            Sized_relobj_file<64, false>* object,
                             unsigned int data_shndx,
                             Output_section* output_section,
-                            const elfcpp::Rela<size, false>& reloc,
+                            const elfcpp::Rela<64, false>& reloc,
                             unsigned int r_type,
                             Symbol* gsym)
 {
@@ -2476,8 +2370,7 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
                 target->copy_reloc(symtab, layout, object,
                                    data_shndx, output_section, gsym, reloc);
               }
-	    else if (((size == 64 && r_type == elfcpp::R_X86_64_64)
-		      || (size == 32 && r_type == elfcpp::R_X86_64_32))
+	    else if (r_type == elfcpp::R_X86_64_64
 		     && gsym->type() == elfcpp::STT_GNU_IFUNC
 		     && gsym->can_use_relative_reloc(false)
 		     && !gsym->is_from_dynobj()
@@ -2588,8 +2481,8 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
 		    && parameters->options().shared())
 		|| (gsym->type() == elfcpp::STT_GNU_IFUNC
 		    && parameters->options().output_is_position_independent()))
-              got->add_global_with_rel(gsym, GOT_TYPE_STANDARD, rela_dyn,
-				       elfcpp::R_X86_64_GLOB_DAT);
+              got->add_global_with_rela(gsym, GOT_TYPE_STANDARD, rela_dyn,
+                                        elfcpp::R_X86_64_GLOB_DAT);
             else
               {
 		// For a STT_GNU_IFUNC symbol we want to write the PLT
@@ -2677,7 +2570,7 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
       {
 	const bool is_final = gsym->final_value_is_known();
 	const tls::Tls_optimization optimized_type
-            = Target_x86_64<size>::optimize_tls_reloc(is_final, r_type);
+            = Target_x86_64::optimize_tls_reloc(is_final, r_type);
 	switch (r_type)
 	  {
           case elfcpp::R_X86_64_TLSGD:       // General-dynamic
@@ -2687,19 +2580,19 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
                 // dtv-relative offset.
                 Output_data_got<64, false>* got
                     = target->got_section(symtab, layout);
-                got->add_global_pair_with_rel(gsym, GOT_TYPE_TLS_PAIR,
-					      target->rela_dyn_section(layout),
-					      elfcpp::R_X86_64_DTPMOD64,
-					      elfcpp::R_X86_64_DTPOFF64);
+                got->add_global_pair_with_rela(gsym, GOT_TYPE_TLS_PAIR,
+                                               target->rela_dyn_section(layout),
+                                               elfcpp::R_X86_64_DTPMOD64,
+                                               elfcpp::R_X86_64_DTPOFF64);
 	      }
 	    else if (optimized_type == tls::TLSOPT_TO_IE)
 	      {
                 // Create a GOT entry for the tp-relative offset.
                 Output_data_got<64, false>* got
                     = target->got_section(symtab, layout);
-                got->add_global_with_rel(gsym, GOT_TYPE_TLS_OFFSET,
-					 target->rela_dyn_section(layout),
-					 elfcpp::R_X86_64_TPOFF64);
+                got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+                                          target->rela_dyn_section(layout),
+                                          elfcpp::R_X86_64_TPOFF64);
 	      }
 	    else if (optimized_type != tls::TLSOPT_TO_LE)
 	      unsupported_reloc_global(object, r_type, gsym);
@@ -2720,17 +2613,17 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
 		target->got_section(symtab, layout);
                 Output_data_got<64, false>* got = target->got_tlsdesc_section();
 		Reloc_section* rt = target->rela_tlsdesc_section(layout);
-                got->add_global_pair_with_rel(gsym, GOT_TYPE_TLS_DESC, rt,
-					      elfcpp::R_X86_64_TLSDESC, 0);
+                got->add_global_pair_with_rela(gsym, GOT_TYPE_TLS_DESC, rt,
+                                               elfcpp::R_X86_64_TLSDESC, 0);
 	      }
 	    else if (optimized_type == tls::TLSOPT_TO_IE)
 	      {
 	        // Create a GOT entry for the tp-relative offset.
                 Output_data_got<64, false>* got
                     = target->got_section(symtab, layout);
-                got->add_global_with_rel(gsym, GOT_TYPE_TLS_OFFSET,
-					 target->rela_dyn_section(layout),
-					 elfcpp::R_X86_64_TPOFF64);
+                got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+                                          target->rela_dyn_section(layout),
+                                          elfcpp::R_X86_64_TPOFF64);
 	      }
 	    else if (optimized_type != tls::TLSOPT_TO_LE)
 	      unsupported_reloc_global(object, r_type, gsym);
@@ -2760,9 +2653,9 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
 	        // Create a GOT entry for the tp-relative offset.
 	        Output_data_got<64, false>* got
 	            = target->got_section(symtab, layout);
-	        got->add_global_with_rel(gsym, GOT_TYPE_TLS_OFFSET,
-					 target->rela_dyn_section(layout),
-					 elfcpp::R_X86_64_TPOFF64);
+	        got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+	                                  target->rela_dyn_section(layout),
+	                                  elfcpp::R_X86_64_TPOFF64);
               }
             else if (optimized_type != tls::TLSOPT_TO_LE)
               unsupported_reloc_global(object, r_type, gsym);
@@ -2790,19 +2683,18 @@ Target_x86_64<size>::Scan::global(Symbol_table* symtab,
     }
 }
 
-template<int size>
 void
-Target_x86_64<size>::gc_process_relocs(Symbol_table* symtab,
-				       Layout* layout,
-				       Sized_relobj_file<size, false>* object,
-				       unsigned int data_shndx,
-				       unsigned int sh_type,
-				       const unsigned char* prelocs,
-				       size_t reloc_count,
-				       Output_section* output_section,
-				       bool needs_special_offset_handling,
-				       size_t local_symbol_count,
-				       const unsigned char* plocal_symbols)
+Target_x86_64::gc_process_relocs(Symbol_table* symtab,
+                                 Layout* layout,
+                                 Sized_relobj_file<64, false>* object,
+                                 unsigned int data_shndx,
+                                 unsigned int sh_type,
+                                 const unsigned char* prelocs,
+                                 size_t reloc_count,
+			         Output_section* output_section,
+			         bool needs_special_offset_handling,
+                                 size_t local_symbol_count,
+                                 const unsigned char* plocal_symbols)
 {
 
   if (sh_type == elfcpp::SHT_REL)
@@ -2810,9 +2702,9 @@ Target_x86_64<size>::gc_process_relocs(Symbol_table* symtab,
       return;
     }
 
-   gold::gc_process_relocs<size, false, Target_x86_64<size>, elfcpp::SHT_RELA,
-                           typename Target_x86_64<size>::Scan,
-			   typename Target_x86_64<size>::Relocatable_size_for_reloc>(
+   gold::gc_process_relocs<64, false, Target_x86_64, elfcpp::SHT_RELA,
+                           Target_x86_64::Scan,
+			   Target_x86_64::Relocatable_size_for_reloc>(
     symtab,
     layout,
     this,
@@ -2828,19 +2720,18 @@ Target_x86_64<size>::gc_process_relocs(Symbol_table* symtab,
 }
 // Scan relocations for a section.
 
-template<int size>
 void
-Target_x86_64<size>::scan_relocs(Symbol_table* symtab,
-				 Layout* layout,
-				 Sized_relobj_file<size, false>* object,
-				 unsigned int data_shndx,
-				 unsigned int sh_type,
-				 const unsigned char* prelocs,
-				 size_t reloc_count,
-				 Output_section* output_section,
-				 bool needs_special_offset_handling,
-				 size_t local_symbol_count,
-				 const unsigned char* plocal_symbols)
+Target_x86_64::scan_relocs(Symbol_table* symtab,
+                           Layout* layout,
+                           Sized_relobj_file<64, false>* object,
+                           unsigned int data_shndx,
+                           unsigned int sh_type,
+                           const unsigned char* prelocs,
+                           size_t reloc_count,
+			   Output_section* output_section,
+			   bool needs_special_offset_handling,
+                           size_t local_symbol_count,
+                           const unsigned char* plocal_symbols)
 {
   if (sh_type == elfcpp::SHT_REL)
     {
@@ -2849,8 +2740,8 @@ Target_x86_64<size>::scan_relocs(Symbol_table* symtab,
       return;
     }
 
-  gold::scan_relocs<size, false, Target_x86_64<size>, elfcpp::SHT_RELA,
-      typename Target_x86_64<size>::Scan>(
+  gold::scan_relocs<64, false, Target_x86_64, elfcpp::SHT_RELA,
+      Target_x86_64::Scan>(
     symtab,
     layout,
     this,
@@ -2866,9 +2757,8 @@ Target_x86_64<size>::scan_relocs(Symbol_table* symtab,
 
 // Finalize the sections.
 
-template<int size>
 void
-Target_x86_64<size>::do_finalize_sections(
+Target_x86_64::do_finalize_sections(
     Layout* layout,
     const Input_objects*,
     Symbol_table* symtab)
@@ -2908,7 +2798,7 @@ Target_x86_64<size>::do_finalize_sections(
   if (sym != NULL)
     {
       uint64_t data_size = this->got_plt_->current_data_size();
-      symtab->get_sized_symbol<size>(sym)->set_symsize(data_size);
+      symtab->get_sized_symbol<64>(sym)->set_symsize(data_size);
     }
 
   if (parameters->doing_static_link()
@@ -2955,20 +2845,18 @@ Target_x86_64<size>::do_finalize_sections(
 
 // Perform a relocation.
 
-template<int size>
 inline bool
-Target_x86_64<size>::Relocate::relocate(
-    const Relocate_info<size, false>* relinfo,
-    Target_x86_64<size>* target,
-    Output_section*,
-    size_t relnum,
-    const elfcpp::Rela<size, false>& rela,
-    unsigned int r_type,
-    const Sized_symbol<size>* gsym,
-    const Symbol_value<size>* psymval,
-    unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr address,
-    section_size_type view_size)
+Target_x86_64::Relocate::relocate(const Relocate_info<64, false>* relinfo,
+                                  Target_x86_64* target,
+				  Output_section*,
+                                  size_t relnum,
+                                  const elfcpp::Rela<64, false>& rela,
+                                  unsigned int r_type,
+                                  const Sized_symbol<64>* gsym,
+                                  const Symbol_value<64>* psymval,
+                                  unsigned char* view,
+                                  elfcpp::Elf_types<64>::Elf_Addr address,
+                                  section_size_type view_size)
 {
   if (this->skip_call_tls_get_addr_)
     {
@@ -2987,10 +2875,10 @@ Target_x86_64<size>::Relocate::relocate(
 	}
     }
 
-  const Sized_relobj_file<size, false>* object = relinfo->object;
+  const Sized_relobj_file<64, false>* object = relinfo->object;
 
   // Pick the value to use for symbols defined in the PLT.
-  Symbol_value<size> symval;
+  Symbol_value<64> symval;
   if (gsym != NULL
       && gsym->use_plt_offset(Scan::get_reference_flags(r_type)))
     {
@@ -3000,7 +2888,7 @@ Target_x86_64<size>::Relocate::relocate(
     }
   else if (gsym == NULL && psymval->is_ifunc_symbol())
     {
-      unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+      unsigned int r_sym = elfcpp::elf_r_sym<64>(rela.get_r_info());
       if (object->local_has_plt_offset(r_sym))
 	{
 	  symval.set_output_value(target->plt_address_for_local(object, r_sym)
@@ -3031,7 +2919,7 @@ Target_x86_64<size>::Relocate::relocate(
         }
       else
         {
-          unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+          unsigned int r_sym = elfcpp::elf_r_sym<64>(rela.get_r_info());
           gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
           got_offset = (object->local_got_offset(r_sym, GOT_TYPE_STANDARD)
                         - target->got_size());
@@ -3051,11 +2939,11 @@ Target_x86_64<size>::Relocate::relocate(
       break;
 
     case elfcpp::R_X86_64_64:
-      Relocate_functions<size, false>::rela64(view, object, psymval, addend);
+      Relocate_functions<64, false>::rela64(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC64:
-      Relocate_functions<size, false>::pcrela64(view, object, psymval, addend,
+      Relocate_functions<64, false>::pcrela64(view, object, psymval, addend,
                                               address);
       break;
 
@@ -3064,37 +2952,37 @@ Target_x86_64<size>::Relocate::relocate(
       //    uint64_t x = value + addend;
       //    x == static_cast<uint64_t>(static_cast<uint32_t>(x))
       // Likewise for other <=32-bit relocations (but see R_X86_64_32S).
-      Relocate_functions<size, false>::rela32(view, object, psymval, addend);
+      Relocate_functions<64, false>::rela32(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_32S:
       // FIXME: we need to verify that value + addend fits into 32 bits:
       //    int64_t x = value + addend;   // note this quantity is signed!
       //    x == static_cast<int64_t>(static_cast<int32_t>(x))
-      Relocate_functions<size, false>::rela32(view, object, psymval, addend);
+      Relocate_functions<64, false>::rela32(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC32:
-      Relocate_functions<size, false>::pcrela32(view, object, psymval, addend,
-						address);
+      Relocate_functions<64, false>::pcrela32(view, object, psymval, addend,
+                                              address);
       break;
 
     case elfcpp::R_X86_64_16:
-      Relocate_functions<size, false>::rela16(view, object, psymval, addend);
+      Relocate_functions<64, false>::rela16(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC16:
-      Relocate_functions<size, false>::pcrela16(view, object, psymval, addend,
-						address);
+      Relocate_functions<64, false>::pcrela16(view, object, psymval, addend,
+                                              address);
       break;
 
     case elfcpp::R_X86_64_8:
-      Relocate_functions<size, false>::rela8(view, object, psymval, addend);
+      Relocate_functions<64, false>::rela8(view, object, psymval, addend);
       break;
 
     case elfcpp::R_X86_64_PC8:
-      Relocate_functions<size, false>::pcrela8(view, object, psymval, addend,
-					       address);
+      Relocate_functions<64, false>::pcrela8(view, object, psymval, addend,
+                                             address);
       break;
 
     case elfcpp::R_X86_64_PLT32:
@@ -3107,8 +2995,8 @@ Target_x86_64<size>::Relocate::relocate(
       // Note: while this code looks the same as for R_X86_64_PC32, it
       // behaves differently because psymval was set to point to
       // the PLT entry, rather than the symbol, in Scan::global().
-      Relocate_functions<size, false>::pcrela32(view, object, psymval, addend,
-						address);
+      Relocate_functions<64, false>::pcrela32(view, object, psymval, addend,
+                                              address);
       break;
 
     case elfcpp::R_X86_64_PLTOFF64:
@@ -3116,23 +3004,23 @@ Target_x86_64<size>::Relocate::relocate(
         gold_assert(gsym);
         gold_assert(gsym->has_plt_offset()
                     || gsym->final_value_is_known());
-	typename elfcpp::Elf_types<size>::Elf_Addr got_address;
+	elfcpp::Elf_types<64>::Elf_Addr got_address;
 	got_address = target->got_section(NULL, NULL)->address();
-	Relocate_functions<size, false>::rela64(view, object, psymval,
-						addend - got_address);
+	Relocate_functions<64, false>::rela64(view, object, psymval,
+					      addend - got_address);
       }
 
     case elfcpp::R_X86_64_GOT32:
       gold_assert(have_got_offset);
-      Relocate_functions<size, false>::rela32(view, got_offset, addend);
+      Relocate_functions<64, false>::rela32(view, got_offset, addend);
       break;
 
     case elfcpp::R_X86_64_GOTPC32:
       {
         gold_assert(gsym);
-	typename elfcpp::Elf_types<size>::Elf_Addr value;
+	elfcpp::Elf_types<64>::Elf_Addr value;
 	value = target->got_plt_section()->address();
-	Relocate_functions<size, false>::pcrela32(view, value, addend, address);
+	Relocate_functions<64, false>::pcrela32(view, value, addend, address);
       }
       break;
 
@@ -3141,42 +3029,42 @@ Target_x86_64<size>::Relocate::relocate(
       // Since we always add a PLT entry, this is equivalent.
     case elfcpp::R_X86_64_GOTPLT64:
       gold_assert(have_got_offset);
-      Relocate_functions<size, false>::rela64(view, got_offset, addend);
+      Relocate_functions<64, false>::rela64(view, got_offset, addend);
       break;
 
     case elfcpp::R_X86_64_GOTPC64:
       {
         gold_assert(gsym);
-	typename elfcpp::Elf_types<size>::Elf_Addr value;
+	elfcpp::Elf_types<64>::Elf_Addr value;
 	value = target->got_plt_section()->address();
-	Relocate_functions<size, false>::pcrela64(view, value, addend, address);
+	Relocate_functions<64, false>::pcrela64(view, value, addend, address);
       }
       break;
 
     case elfcpp::R_X86_64_GOTOFF64:
       {
-	typename elfcpp::Elf_types<size>::Elf_Addr value;
+	elfcpp::Elf_types<64>::Elf_Addr value;
 	value = (psymval->value(object, 0)
 		 - target->got_plt_section()->address());
-	Relocate_functions<size, false>::rela64(view, value, addend);
+	Relocate_functions<64, false>::rela64(view, value, addend);
       }
       break;
 
     case elfcpp::R_X86_64_GOTPCREL:
       {
         gold_assert(have_got_offset);
-        typename elfcpp::Elf_types<size>::Elf_Addr value;
+        elfcpp::Elf_types<64>::Elf_Addr value;
         value = target->got_plt_section()->address() + got_offset;
-        Relocate_functions<size, false>::pcrela32(view, value, addend, address);
+        Relocate_functions<64, false>::pcrela32(view, value, addend, address);
       }
       break;
 
     case elfcpp::R_X86_64_GOTPCREL64:
       {
         gold_assert(have_got_offset);
-        typename elfcpp::Elf_types<size>::Elf_Addr value;
+        elfcpp::Elf_types<64>::Elf_Addr value;
         value = target->got_plt_section()->address() + got_offset;
-        Relocate_functions<size, false>::pcrela64(view, value, addend, address);
+        Relocate_functions<64, false>::pcrela64(view, value, addend, address);
       }
       break;
 
@@ -3221,34 +3109,32 @@ Target_x86_64<size>::Relocate::relocate(
 
 // Perform a TLS relocation.
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::relocate_tls(
-    const Relocate_info<size, false>* relinfo,
-    Target_x86_64<size>* target,
-    size_t relnum,
-    const elfcpp::Rela<size, false>& rela,
-    unsigned int r_type,
-    const Sized_symbol<size>* gsym,
-    const Symbol_value<size>* psymval,
-    unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr address,
-    section_size_type view_size)
+Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>* relinfo,
+                                      Target_x86_64* target,
+                                      size_t relnum,
+                                      const elfcpp::Rela<64, false>& rela,
+                                      unsigned int r_type,
+                                      const Sized_symbol<64>* gsym,
+                                      const Symbol_value<64>* psymval,
+                                      unsigned char* view,
+                                      elfcpp::Elf_types<64>::Elf_Addr address,
+                                      section_size_type view_size)
 {
   Output_segment* tls_segment = relinfo->layout->tls_segment();
 
-  const Sized_relobj_file<size, false>* object = relinfo->object;
+  const Sized_relobj_file<64, false>* object = relinfo->object;
   const elfcpp::Elf_Xword addend = rela.get_r_addend();
-  elfcpp::Shdr<size, false> data_shdr(relinfo->data_shdr);
+  elfcpp::Shdr<64, false> data_shdr(relinfo->data_shdr);
   bool is_executable = (data_shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0;
 
-  typename elfcpp::Elf_types<size>::Elf_Addr value = psymval->value(relinfo->object, 0);
+  elfcpp::Elf_types<64>::Elf_Addr value = psymval->value(relinfo->object, 0);
 
   const bool is_final = (gsym == NULL
 			 ? !parameters->options().shared()
 			 : gsym->final_value_is_known());
   tls::Tls_optimization optimized_type
-      = Target_x86_64<size>::optimize_tls_reloc(is_final, r_type);
+      = Target_x86_64::optimize_tls_reloc(is_final, r_type);
   switch (r_type)
     {
     case elfcpp::R_X86_64_TLSGD:            // Global-dynamic
@@ -3288,13 +3174,19 @@ Target_x86_64<size>::Relocate::relocate_tls(
             }
           else
             {
-              unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+              unsigned int r_sym = elfcpp::elf_r_sym<64>(rela.get_r_info());
               gold_assert(object->local_has_got_offset(r_sym, got_type));
               got_offset = (object->local_got_offset(r_sym, got_type)
                             - target->got_size());
             }
           if (optimized_type == tls::TLSOPT_TO_IE)
             {
+	      if (tls_segment == NULL)
+		{
+		  gold_assert(parameters->errors()->error_count() > 0
+			      || issue_undefined_symbol_error(gsym));
+		  return;
+		}
               value = target->got_plt_section()->address() + got_offset;
               this->tls_gd_to_ie(relinfo, relnum, tls_segment, rela, r_type,
                                  value, view, address, view_size);
@@ -3305,8 +3197,8 @@ Target_x86_64<size>::Relocate::relocate_tls(
               // Relocate the field with the offset of the pair of GOT
               // entries.
 	      value = target->got_plt_section()->address() + got_offset;
-              Relocate_functions<size, false>::pcrela32(view, value, addend,
-							address);
+              Relocate_functions<64, false>::pcrela32(view, value, addend,
+                                                      address);
               break;
             }
         }
@@ -3356,7 +3248,7 @@ Target_x86_64<size>::Relocate::relocate_tls(
             }
           else
             {
-              unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+              unsigned int r_sym = elfcpp::elf_r_sym<64>(rela.get_r_info());
               gold_assert(object->local_has_got_offset(r_sym, got_type));
               got_offset += (object->local_got_offset(r_sym, got_type)
 			     - target->got_size());
@@ -3382,8 +3274,8 @@ Target_x86_64<size>::Relocate::relocate_tls(
                   // Relocate the field with the offset of the pair of GOT
                   // entries.
 	          value = target->got_plt_section()->address() + got_offset;
-                  Relocate_functions<size, false>::pcrela32(view, value, addend,
-							    address);
+                  Relocate_functions<64, false>::pcrela32(view, value, addend,
+                                                          address);
                 }
               break;
             }
@@ -3418,8 +3310,8 @@ Target_x86_64<size>::Relocate::relocate_tls(
           got_offset = (target->got_mod_index_entry(NULL, NULL, NULL)
 			- target->got_size());
 	  value = target->got_plt_section()->address() + got_offset;
-          Relocate_functions<size, false>::pcrela32(view, value, addend,
-						    address);
+          Relocate_functions<64, false>::pcrela32(view, value, addend,
+                                                  address);
           break;
         }
       gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
@@ -3443,7 +3335,7 @@ Target_x86_64<size>::Relocate::relocate_tls(
 	    }
 	  value -= tls_segment->memsz();
 	}
-      Relocate_functions<size, false>::rela32(view, value, addend);
+      Relocate_functions<64, false>::rela32(view, value, addend);
       break;
 
     case elfcpp::R_X86_64_DTPOFF64:
@@ -3458,7 +3350,7 @@ Target_x86_64<size>::Relocate::relocate_tls(
 	    }
 	  value -= tls_segment->memsz();
 	}
-      Relocate_functions<size, false>::rela64(view, value, addend);
+      Relocate_functions<64, false>::rela64(view, value, addend);
       break;
 
     case elfcpp::R_X86_64_GOTTPOFF:         // Initial-exec
@@ -3470,10 +3362,9 @@ Target_x86_64<size>::Relocate::relocate_tls(
 			  || issue_undefined_symbol_error(gsym));
 	      return;
 	    }
-	  Target_x86_64<size>::Relocate::tls_ie_to_le(relinfo, relnum,
-						      tls_segment, rela,
-						      r_type, value, view,
-						      view_size);
+	  Target_x86_64::Relocate::tls_ie_to_le(relinfo, relnum, tls_segment,
+                                                rela, r_type, value, view,
+                                                view_size);
 	  break;
 	}
       else if (optimized_type == tls::TLSOPT_NONE)
@@ -3489,15 +3380,14 @@ Target_x86_64<size>::Relocate::relocate_tls(
             }
           else
             {
-              unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+              unsigned int r_sym = elfcpp::elf_r_sym<64>(rela.get_r_info());
               gold_assert(object->local_has_got_offset(r_sym,
                                                        GOT_TYPE_TLS_OFFSET));
               got_offset = (object->local_got_offset(r_sym, GOT_TYPE_TLS_OFFSET)
                             - target->got_size());
             }
 	  value = target->got_plt_section()->address() + got_offset;
-          Relocate_functions<size, false>::pcrela32(view, value, addend,
-						    address);
+          Relocate_functions<64, false>::pcrela32(view, value, addend, address);
           break;
         }
       gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
@@ -3513,7 +3403,7 @@ Target_x86_64<size>::Relocate::relocate_tls(
 	  return;
 	}
       value -= tls_segment->memsz();
-      Relocate_functions<size, false>::rela32(view, value, addend);
+      Relocate_functions<64, false>::rela32(view, value, addend);
       break;
     }
 }
@@ -3521,54 +3411,33 @@ Target_x86_64<size>::Relocate::relocate_tls(
 // Do a relocation in which we convert a TLS General-Dynamic to an
 // Initial-Exec.
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::tls_gd_to_ie(
-    const Relocate_info<size, false>* relinfo,
-    size_t relnum,
-    Output_segment*,
-    const elfcpp::Rela<size, false>& rela,
-    unsigned int,
-    typename elfcpp::Elf_types<size>::Elf_Addr value,
-    unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr address,
-    section_size_type view_size)
-{
-  // For SIZE == 64:
-  //	.byte 0x66; leaq foo@tlsgd(%rip),%rdi;
-  //	.word 0x6666; rex64; call __tls_get_addr
-  //	==> movq %fs:0,%rax; addq x@gottpoff(%rip),%rax
-  // For SIZE == 32:
-  //	leaq foo@tlsgd(%rip),%rdi;
-  //	.word 0x6666; rex64; call __tls_get_addr
-  //	==> movl %fs:0,%eax; addq x@gottpoff(%rip),%rax
-
+Target_x86_64::Relocate::tls_gd_to_ie(const Relocate_info<64, false>* relinfo,
+                                      size_t relnum,
+                                      Output_segment*,
+                                      const elfcpp::Rela<64, false>& rela,
+                                      unsigned int,
+                                      elfcpp::Elf_types<64>::Elf_Addr value,
+                                      unsigned char* view,
+                                      elfcpp::Elf_types<64>::Elf_Addr address,
+                                      section_size_type view_size)
+{
+  // .byte 0x66; leaq foo@tlsgd(%rip),%rdi;
+  // .word 0x6666; rex64; call __tls_get_addr
+  // ==> movq %fs:0,%rax; addq x@gottpoff(%rip),%rax
+
+  tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, -4);
   tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, 12);
+
+  tls::check_tls(relinfo, relnum, rela.get_r_offset(),
+                 (memcmp(view - 4, "\x66\x48\x8d\x3d", 4) == 0));
   tls::check_tls(relinfo, relnum, rela.get_r_offset(),
                  (memcmp(view + 4, "\x66\x66\x48\xe8", 4) == 0));
 
-  if (size == 64)
-    {
-      tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size,
-		       -4);
-      tls::check_tls(relinfo, relnum, rela.get_r_offset(),
-		     (memcmp(view - 4, "\x66\x48\x8d\x3d", 4) == 0));
-      memcpy(view - 4, "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0\0",
-	     16);
-    }
-  else
-    {
-      tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size,
-		       -3);
-      tls::check_tls(relinfo, relnum, rela.get_r_offset(),
-		     (memcmp(view - 3, "\x48\x8d\x3d", 3) == 0));
-      memcpy(view - 3, "\x64\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0\0",
-	     15);
-    }
+  memcpy(view - 4, "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0\0", 16);
 
   const elfcpp::Elf_Xword addend = rela.get_r_addend();
-  Relocate_functions<size, false>::pcrela32(view + 8, value, addend - 8,
-					    address);
+  Relocate_functions<64, false>::pcrela32(view + 8, value, addend - 8, address);
 
   // The next reloc should be a PLT32 reloc against __tls_get_addr.
   // We can skip it.
@@ -3578,53 +3447,32 @@ Target_x86_64<size>::Relocate::tls_gd_to_ie(
 // Do a relocation in which we convert a TLS General-Dynamic to a
 // Local-Exec.
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::tls_gd_to_le(
-    const Relocate_info<size, false>* relinfo,
-    size_t relnum,
-    Output_segment* tls_segment,
-    const elfcpp::Rela<size, false>& rela,
-    unsigned int,
-    typename elfcpp::Elf_types<size>::Elf_Addr value,
-    unsigned char* view,
-    section_size_type view_size)
-{
-  // For SIZE == 64:
-  //	.byte 0x66; leaq foo@tlsgd(%rip),%rdi;
-  //	.word 0x6666; rex64; call __tls_get_addr
-  //	==> movq %fs:0,%rax; leaq x@tpoff(%rax),%rax
-  // For SIZE == 32:
-  //	leaq foo@tlsgd(%rip),%rdi;
-  //	.word 0x6666; rex64; call __tls_get_addr
-  //	==> movl %fs:0,%eax; leaq x@tpoff(%rax),%rax
-
+Target_x86_64::Relocate::tls_gd_to_le(const Relocate_info<64, false>* relinfo,
+                                      size_t relnum,
+                                      Output_segment* tls_segment,
+                                      const elfcpp::Rela<64, false>& rela,
+                                      unsigned int,
+                                      elfcpp::Elf_types<64>::Elf_Addr value,
+                                      unsigned char* view,
+                                      section_size_type view_size)
+{
+  // .byte 0x66; leaq foo@tlsgd(%rip),%rdi;
+  // .word 0x6666; rex64; call __tls_get_addr
+  // ==> movq %fs:0,%rax; leaq x@tpoff(%rax),%rax
+
+  tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, -4);
   tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, 12);
-  tls::check_tls(relinfo, relnum, rela.get_r_offset(),
-		 (memcmp(view + 4, "\x66\x66\x48\xe8", 4) == 0));
 
-  if (size == 64)
-    {
-      tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size,
-		       -4);
-      tls::check_tls(relinfo, relnum, rela.get_r_offset(),
-		     (memcmp(view - 4, "\x66\x48\x8d\x3d", 4) == 0));
-      memcpy(view - 4, "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0\0",
-	     16);
-    }
-  else
-    {
-      tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size,
-		       -3);
-      tls::check_tls(relinfo, relnum, rela.get_r_offset(),
-		     (memcmp(view - 3, "\x48\x8d\x3d", 3) == 0));
+  tls::check_tls(relinfo, relnum, rela.get_r_offset(),
+                 (memcmp(view - 4, "\x66\x48\x8d\x3d", 4) == 0));
+  tls::check_tls(relinfo, relnum, rela.get_r_offset(),
+                 (memcmp(view + 4, "\x66\x66\x48\xe8", 4) == 0));
 
-      memcpy(view - 3, "\x64\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0\0",
-	     15);
-    }
+  memcpy(view - 4, "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0\0", 16);
 
   value -= tls_segment->memsz();
-  Relocate_functions<size, false>::rela32(view + 8, value, 0);
+  Relocate_functions<64, false>::rela32(view + 8, value, 0);
 
   // The next reloc should be a PLT32 reloc against __tls_get_addr.
   // We can skip it.
@@ -3633,17 +3481,16 @@ Target_x86_64<size>::Relocate::tls_gd_to_le(
 
 // Do a TLSDESC-style General-Dynamic to Initial-Exec transition.
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::tls_desc_gd_to_ie(
-    const Relocate_info<size, false>* relinfo,
+Target_x86_64::Relocate::tls_desc_gd_to_ie(
+    const Relocate_info<64, false>* relinfo,
     size_t relnum,
     Output_segment*,
-    const elfcpp::Rela<size, false>& rela,
+    const elfcpp::Rela<64, false>& rela,
     unsigned int r_type,
-    typename elfcpp::Elf_types<size>::Elf_Addr value,
+    elfcpp::Elf_types<64>::Elf_Addr value,
     unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr address,
+    elfcpp::Elf_types<64>::Elf_Addr address,
     section_size_type view_size)
 {
   if (r_type == elfcpp::R_X86_64_GOTPC32_TLSDESC)
@@ -3656,7 +3503,7 @@ Target_x86_64<size>::Relocate::tls_desc_gd_to_ie(
                      view[-3] == 0x48 && view[-2] == 0x8d && view[-1] == 0x05);
       view[-2] = 0x8b;
       const elfcpp::Elf_Xword addend = rela.get_r_addend();
-      Relocate_functions<size, false>::pcrela32(view, value, addend, address);
+      Relocate_functions<64, false>::pcrela32(view, value, addend, address);
     }
   else
     {
@@ -3673,15 +3520,14 @@ Target_x86_64<size>::Relocate::tls_desc_gd_to_ie(
 
 // Do a TLSDESC-style General-Dynamic to Local-Exec transition.
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::tls_desc_gd_to_le(
-    const Relocate_info<size, false>* relinfo,
+Target_x86_64::Relocate::tls_desc_gd_to_le(
+    const Relocate_info<64, false>* relinfo,
     size_t relnum,
     Output_segment* tls_segment,
-    const elfcpp::Rela<size, false>& rela,
+    const elfcpp::Rela<64, false>& rela,
     unsigned int r_type,
-    typename elfcpp::Elf_types<size>::Elf_Addr value,
+    elfcpp::Elf_types<64>::Elf_Addr value,
     unsigned char* view,
     section_size_type view_size)
 {
@@ -3696,7 +3542,7 @@ Target_x86_64<size>::Relocate::tls_desc_gd_to_le(
       view[-2] = 0xc7;
       view[-1] = 0xc0;
       value -= tls_segment->memsz();
-      Relocate_functions<size, false>::rela32(view, value, 0);
+      Relocate_functions<64, false>::rela32(view, value, 0);
     }
   else
     {
@@ -3711,17 +3557,15 @@ Target_x86_64<size>::Relocate::tls_desc_gd_to_le(
     }
 }
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::tls_ld_to_le(
-    const Relocate_info<size, false>* relinfo,
-    size_t relnum,
-    Output_segment*,
-    const elfcpp::Rela<size, false>& rela,
-    unsigned int,
-    typename elfcpp::Elf_types<size>::Elf_Addr,
-    unsigned char* view,
-    section_size_type view_size)
+Target_x86_64::Relocate::tls_ld_to_le(const Relocate_info<64, false>* relinfo,
+                                      size_t relnum,
+                                      Output_segment*,
+                                      const elfcpp::Rela<64, false>& rela,
+                                      unsigned int,
+                                      elfcpp::Elf_types<64>::Elf_Addr,
+                                      unsigned char* view,
+                                      section_size_type view_size)
 {
   // leaq foo@tlsld(%rip),%rdi; call __tls_get_addr@plt;
   // ... leq foo@dtpoff(%rax),%reg
@@ -3745,17 +3589,15 @@ Target_x86_64<size>::Relocate::tls_ld_to_le(
 // Do a relocation in which we convert a TLS Initial-Exec to a
 // Local-Exec.
 
-template<int size>
 inline void
-Target_x86_64<size>::Relocate::tls_ie_to_le(
-    const Relocate_info<size, false>* relinfo,
-    size_t relnum,
-    Output_segment* tls_segment,
-    const elfcpp::Rela<size, false>& rela,
-    unsigned int,
-    typename elfcpp::Elf_types<size>::Elf_Addr value,
-    unsigned char* view,
-    section_size_type view_size)
+Target_x86_64::Relocate::tls_ie_to_le(const Relocate_info<64, false>* relinfo,
+                                      size_t relnum,
+                                      Output_segment* tls_segment,
+                                      const elfcpp::Rela<64, false>& rela,
+                                      unsigned int,
+                                      elfcpp::Elf_types<64>::Elf_Addr value,
+                                      unsigned char* view,
+                                      section_size_type view_size)
 {
   // We need to examine the opcodes to figure out which instruction we
   // are looking at.
@@ -3797,29 +3639,28 @@ Target_x86_64<size>::Relocate::tls_ie_to_le(
     }
 
   value -= tls_segment->memsz();
-  Relocate_functions<size, false>::rela32(view, value, 0);
+  Relocate_functions<64, false>::rela32(view, value, 0);
 }
 
 // Relocate section data.
 
-template<int size>
 void
-Target_x86_64<size>::relocate_section(
-    const Relocate_info<size, false>* relinfo,
+Target_x86_64::relocate_section(
+    const Relocate_info<64, false>* relinfo,
     unsigned int sh_type,
     const unsigned char* prelocs,
     size_t reloc_count,
     Output_section* output_section,
     bool needs_special_offset_handling,
     unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr address,
+    elfcpp::Elf_types<64>::Elf_Addr address,
     section_size_type view_size,
     const Reloc_symbol_changes* reloc_symbol_changes)
 {
   gold_assert(sh_type == elfcpp::SHT_RELA);
 
-  gold::relocate_section<size, false, Target_x86_64<size>, elfcpp::SHT_RELA,
-			 typename Target_x86_64<size>::Relocate>(
+  gold::relocate_section<64, false, Target_x86_64, elfcpp::SHT_RELA,
+			 Target_x86_64::Relocate>(
     relinfo,
     this,
     prelocs,
@@ -3835,20 +3676,18 @@ Target_x86_64<size>::relocate_section(
 // Apply an incremental relocation.  Incremental relocations always refer
 // to global symbols.
 
-template<int size>
 void
-Target_x86_64<size>::apply_relocation(
-    const Relocate_info<size, false>* relinfo,
-    typename elfcpp::Elf_types<size>::Elf_Addr r_offset,
+Target_x86_64::apply_relocation(
+    const Relocate_info<64, false>* relinfo,
+    elfcpp::Elf_types<64>::Elf_Addr r_offset,
     unsigned int r_type,
-    typename elfcpp::Elf_types<size>::Elf_Swxword r_addend,
+    elfcpp::Elf_types<64>::Elf_Swxword r_addend,
     const Symbol* gsym,
     unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr address,
+    elfcpp::Elf_types<64>::Elf_Addr address,
     section_size_type view_size)
 {
-  gold::apply_relocation<size, false, Target_x86_64<size>,
-			 typename Target_x86_64<size>::Relocate>(
+  gold::apply_relocation<64, false, Target_x86_64, Target_x86_64::Relocate>(
     relinfo,
     this,
     r_offset,
@@ -3863,9 +3702,8 @@ Target_x86_64<size>::apply_relocation(
 // Return the size of a relocation while scanning during a relocatable
 // link.
 
-template<int size>
 unsigned int
-Target_x86_64<size>::Relocatable_size_for_reloc::get_size_for_reloc(
+Target_x86_64::Relocatable_size_for_reloc::get_size_for_reloc(
     unsigned int r_type,
     Relobj* object)
 {
@@ -3933,28 +3771,26 @@ Target_x86_64<size>::Relocatable_size_for_reloc::get_size_for_reloc(
 
 // Scan the relocs during a relocatable link.
 
-template<int size>
 void
-Target_x86_64<size>::scan_relocatable_relocs(
-    Symbol_table* symtab,
-    Layout* layout,
-    Sized_relobj_file<size, false>* object,
-    unsigned int data_shndx,
-    unsigned int sh_type,
-    const unsigned char* prelocs,
-    size_t reloc_count,
-    Output_section* output_section,
-    bool needs_special_offset_handling,
-    size_t local_symbol_count,
-    const unsigned char* plocal_symbols,
-    Relocatable_relocs* rr)
+Target_x86_64::scan_relocatable_relocs(Symbol_table* symtab,
+				       Layout* layout,
+				       Sized_relobj_file<64, false>* object,
+				       unsigned int data_shndx,
+				       unsigned int sh_type,
+				       const unsigned char* prelocs,
+				       size_t reloc_count,
+				       Output_section* output_section,
+				       bool needs_special_offset_handling,
+				       size_t local_symbol_count,
+				       const unsigned char* plocal_symbols,
+				       Relocatable_relocs* rr)
 {
   gold_assert(sh_type == elfcpp::SHT_RELA);
 
   typedef gold::Default_scan_relocatable_relocs<elfcpp::SHT_RELA,
     Relocatable_size_for_reloc> Scan_relocatable_relocs;
 
-  gold::scan_relocatable_relocs<size, false, elfcpp::SHT_RELA,
+  gold::scan_relocatable_relocs<64, false, elfcpp::SHT_RELA,
       Scan_relocatable_relocs>(
     symtab,
     layout,
@@ -3971,10 +3807,9 @@ Target_x86_64<size>::scan_relocatable_relocs(
 
 // Relocate a section during a relocatable link.
 
-template<int size>
 void
-Target_x86_64<size>::relocate_for_relocatable(
-    const Relocate_info<size, false>* relinfo,
+Target_x86_64::relocate_for_relocatable(
+    const Relocate_info<64, false>* relinfo,
     unsigned int sh_type,
     const unsigned char* prelocs,
     size_t reloc_count,
@@ -3982,14 +3817,14 @@ Target_x86_64<size>::relocate_for_relocatable(
     off_t offset_in_output_section,
     const Relocatable_relocs* rr,
     unsigned char* view,
-    typename elfcpp::Elf_types<size>::Elf_Addr view_address,
+    elfcpp::Elf_types<64>::Elf_Addr view_address,
     section_size_type view_size,
     unsigned char* reloc_view,
     section_size_type reloc_view_size)
 {
   gold_assert(sh_type == elfcpp::SHT_RELA);
 
-  gold::relocate_for_relocatable<size, false, elfcpp::SHT_RELA>(
+  gold::relocate_for_relocatable<64, false, elfcpp::SHT_RELA>(
     relinfo,
     prelocs,
     reloc_count,
@@ -4008,9 +3843,8 @@ Target_x86_64<size>::relocate_for_relocatable(
 // pointers across shared library boundaries, as described in the
 // processor specific ABI supplement.
 
-template<int size>
 uint64_t
-Target_x86_64<size>::do_dynsym_value(const Symbol* gsym) const
+Target_x86_64::do_dynsym_value(const Symbol* gsym) const
 {
   gold_assert(gsym->is_from_dynobj() && gsym->has_plt_offset());
   return this->plt_address_for_global(gsym) + gsym->plt_offset();
@@ -4019,9 +3853,8 @@ Target_x86_64<size>::do_dynsym_value(const Symbol* gsym) const
 // Return a string used to fill a code section with nops to take up
 // the specified length.
 
-template<int size>
 std::string
-Target_x86_64<size>::do_code_fill(section_size_type length) const
+Target_x86_64::do_code_fill(section_size_type length) const
 {
   if (length >= 16)
     {
@@ -4030,55 +3863,46 @@ Target_x86_64<size>::do_code_fill(section_size_type length) const
       jmp[0] = 0xe9;
       elfcpp::Swap_unaligned<32, false>::writeval(jmp + 1, length - 5);
       return (std::string(reinterpret_cast<char*>(&jmp[0]), 5)
-              + std::string(length - 5, static_cast<char>(0x90)));
+              + std::string(length - 5, '\0'));
     }
 
   // Nop sequences of various lengths.
-  const char nop1[1] = { '\x90' };                 // nop
-  const char nop2[2] = { '\x66', '\x90' };         // xchg %ax %ax
-  const char nop3[3] = { '\x0f', '\x1f', '\x00' }; // nop (%rax)
-  const char nop4[4] = { '\x0f', '\x1f', '\x40',   // nop 0(%rax)
-  			 '\x00'};
-  const char nop5[5] = { '\x0f', '\x1f', '\x44',   // nop 0(%rax,%rax,1)
-			 '\x00', '\x00' };
-  const char nop6[6] = { '\x66', '\x0f', '\x1f',   // nopw 0(%rax,%rax,1)
-  			 '\x44', '\x00', '\x00' };
-  const char nop7[7] = { '\x0f', '\x1f', '\x80',   // nopl 0L(%rax)
-  			 '\x00', '\x00', '\x00',
-			 '\x00' };
-  const char nop8[8] = { '\x0f', '\x1f', '\x84',   // nopl 0L(%rax,%rax,1)
-  			 '\x00', '\x00', '\x00',
-			 '\x00', '\x00' };
-  const char nop9[9] = { '\x66', '\x0f', '\x1f',   // nopw 0L(%rax,%rax,1)
-  			 '\x84', '\x00', '\x00',
-			 '\x00', '\x00', '\x00' };
-  const char nop10[10] = { '\x66', '\x2e', '\x0f', // nopw %cs:0L(%rax,%rax,1)
-  			   '\x1f', '\x84', '\x00',
-			   '\x00', '\x00', '\x00',
-			   '\x00' };
-  const char nop11[11] = { '\x66', '\x66', '\x2e', // data16
-  			   '\x0f', '\x1f', '\x84', // nopw %cs:0L(%rax,%rax,1)
-			   '\x00', '\x00', '\x00',
-			   '\x00', '\x00' };
-  const char nop12[12] = { '\x66', '\x66', '\x66', // data16; data16
-  			   '\x2e', '\x0f', '\x1f', // nopw %cs:0L(%rax,%rax,1)
-			   '\x84', '\x00', '\x00',
-			   '\x00', '\x00', '\x00' };
-  const char nop13[13] = { '\x66', '\x66', '\x66', // data16; data16; data16
-  			   '\x66', '\x2e', '\x0f', // nopw %cs:0L(%rax,%rax,1)
-			   '\x1f', '\x84', '\x00',
-			   '\x00', '\x00', '\x00',
-                           '\x00' };
-  const char nop14[14] = { '\x66', '\x66', '\x66', // data16; data16; data16
-  			   '\x66', '\x66', '\x2e', // data16
-			   '\x0f', '\x1f', '\x84', // nopw %cs:0L(%rax,%rax,1)
-			   '\x00', '\x00', '\x00',
-                           '\x00', '\x00' };
-  const char nop15[15] = { '\x66', '\x66', '\x66', // data16; data16; data16
-  			   '\x66', '\x66', '\x66', // data16; data16
-			   '\x2e', '\x0f', '\x1f', // nopw %cs:0L(%rax,%rax,1)
-			   '\x84', '\x00', '\x00',
-                           '\x00', '\x00', '\x00' };
+  const char nop1[1] = { 0x90 };                   // nop
+  const char nop2[2] = { 0x66, 0x90 };             // xchg %ax %ax
+  const char nop3[3] = { 0x0f, 0x1f, 0x00 };       // nop (%rax)
+  const char nop4[4] = { 0x0f, 0x1f, 0x40, 0x00};  // nop 0(%rax)
+  const char nop5[5] = { 0x0f, 0x1f, 0x44, 0x00,   // nop 0(%rax,%rax,1)
+                         0x00 };
+  const char nop6[6] = { 0x66, 0x0f, 0x1f, 0x44,   // nopw 0(%rax,%rax,1)
+                         0x00, 0x00 };
+  const char nop7[7] = { 0x0f, 0x1f, 0x80, 0x00,   // nopl 0L(%rax)
+                         0x00, 0x00, 0x00 };
+  const char nop8[8] = { 0x0f, 0x1f, 0x84, 0x00,   // nopl 0L(%rax,%rax,1)
+                         0x00, 0x00, 0x00, 0x00 };
+  const char nop9[9] = { 0x66, 0x0f, 0x1f, 0x84,   // nopw 0L(%rax,%rax,1)
+                         0x00, 0x00, 0x00, 0x00,
+                         0x00 };
+  const char nop10[10] = { 0x66, 0x2e, 0x0f, 0x1f, // nopw %cs:0L(%rax,%rax,1)
+                           0x84, 0x00, 0x00, 0x00,
+                           0x00, 0x00 };
+  const char nop11[11] = { 0x66, 0x66, 0x2e, 0x0f, // data16
+                           0x1f, 0x84, 0x00, 0x00, // nopw %cs:0L(%rax,%rax,1)
+                           0x00, 0x00, 0x00 };
+  const char nop12[12] = { 0x66, 0x66, 0x66, 0x2e, // data16; data16
+                           0x0f, 0x1f, 0x84, 0x00, // nopw %cs:0L(%rax,%rax,1)
+                           0x00, 0x00, 0x00, 0x00 };
+  const char nop13[13] = { 0x66, 0x66, 0x66, 0x66, // data16; data16; data16
+                           0x2e, 0x0f, 0x1f, 0x84, // nopw %cs:0L(%rax,%rax,1)
+                           0x00, 0x00, 0x00, 0x00,
+                           0x00 };
+  const char nop14[14] = { 0x66, 0x66, 0x66, 0x66, // data16; data16; data16
+                           0x66, 0x2e, 0x0f, 0x1f, // data16
+                           0x84, 0x00, 0x00, 0x00, // nopw %cs:0L(%rax,%rax,1)
+                           0x00, 0x00 };
+  const char nop15[15] = { 0x66, 0x66, 0x66, 0x66, // data16; data16; data16
+                           0x66, 0x66, 0x2e, 0x0f, // data16; data16
+                           0x1f, 0x84, 0x00, 0x00, // nopw %cs:0L(%rax,%rax,1)
+                           0x00, 0x00, 0x00 };
 
   const char* nops[16] = {
     NULL,
@@ -4094,16 +3918,15 @@ Target_x86_64<size>::do_code_fill(section_size_type length) const
 // symbol.  We want to set the addend is the offset of the local
 // symbol in the TLS segment.
 
-template<int size>
 uint64_t
-Target_x86_64<size>::do_reloc_addend(void* arg, unsigned int r_type,
-				     uint64_t) const
+Target_x86_64::do_reloc_addend(void* arg, unsigned int r_type,
+			       uint64_t) const
 {
   gold_assert(r_type == elfcpp::R_X86_64_TLSDESC);
   uintptr_t intarg = reinterpret_cast<uintptr_t>(arg);
   gold_assert(intarg < this->tlsdesc_reloc_info_.size());
   const Tlsdesc_info& ti(this->tlsdesc_reloc_info_[intarg]);
-  const Symbol_value<size>* psymval = ti.object->local_symbol(ti.r_sym);
+  const Symbol_value<64>* psymval = ti.object->local_symbol(ti.r_sym);
   gold_assert(psymval->is_tls_symbol());
   // The value of a TLS symbol is the offset in the TLS segment.
   return psymval->value(ti.object, 0);
@@ -4115,13 +3938,12 @@ Target_x86_64<size>::do_reloc_addend(void* arg, unsigned int r_type,
 // different sections, so instead of using a pc-relative value they
 // use an offset from the GOT.
 
-template<int size>
 uint64_t
-Target_x86_64<size>::do_ehframe_datarel_base() const
+Target_x86_64::do_ehframe_datarel_base() const
 {
   gold_assert(this->global_offset_table_ != NULL);
   Symbol* sym = this->global_offset_table_;
-  Sized_symbol<size>* ssym = static_cast<Sized_symbol<size>*>(sym);
+  Sized_symbol<64>* ssym = static_cast<Sized_symbol<64>*>(sym);
   return ssym->value();
 }
 
@@ -4130,15 +3952,14 @@ Target_x86_64<size>::do_ehframe_datarel_base() const
 // code.  We have to change the function so that it always ensures
 // that it has enough stack space to run some random function.
 
-template<int size>
 void
-Target_x86_64<size>::do_calls_non_split(Relobj* object, unsigned int shndx,
-					section_offset_type fnoffset,
-					section_size_type fnsize,
-					unsigned char* view,
-					section_size_type view_size,
-					std::string* from,
-					std::string* to) const
+Target_x86_64::do_calls_non_split(Relobj* object, unsigned int shndx,
+				  section_offset_type fnoffset,
+				  section_size_type fnsize,
+				  unsigned char* view,
+				  section_size_type view_size,
+				  std::string* from,
+				  std::string* to) const
 {
   // The function starts with a comparison of the stack pointer and a
   // field in the TCB.  This is followed by a jump.
@@ -4189,27 +4010,20 @@ Target_x86_64<size>::do_calls_non_split(Relobj* object, unsigned int shndx,
 
 // The selector for x86_64 object files.
 
-template<int size>
 class Target_selector_x86_64 : public Target_selector_freebsd
 {
 public:
   Target_selector_x86_64()
-    : Target_selector_freebsd(elfcpp::EM_X86_64, size, false,
-			      (size == 64 
-			       ? "elf64-x86-64" : "elf32-x86-64"),
-			      (size == 64 
-			       ? "elf64-x86-64-freebsd"
-			       : "elf32-x86-64-freebsd"),
-			      (size == 64 ? "elf_x86_64" : "elf32_x86_64"))
+    : Target_selector_freebsd(elfcpp::EM_X86_64, 64, false, "elf64-x86-64",
+			      "elf64-x86-64-freebsd", "elf_x86_64")
   { }
 
   Target*
   do_instantiate_target()
-  { return new Target_x86_64<size>(); }
+  { return new Target_x86_64(); }
 
 };
 
-Target_selector_x86_64<64> target_selector_x86_64;
-Target_selector_x86_64<32> target_selector_x32;
+Target_selector_x86_64 target_selector_x86_64;
 
 } // End anonymous namespace.
diff --git a/gold/yyscript.y b/gold/yyscript.y
index 51c755bac3..18f949600c 100644
--- a/gold/yyscript.y
+++ b/gold/yyscript.y
@@ -528,8 +528,6 @@ section_cmd:
 		 nothing, we accept it and ignore it.  */
 	    }
 	| SORT_BY_NAME '(' CONSTRUCTORS ')'
-	| INCLUDE string
-	    { script_include_directive(closure, $2.value, $2.length); }
 	| ';'
 	;
 
@@ -691,8 +689,6 @@ file_or_sections_cmd:
 	| assignment end
 	| ASSERT_K '(' parse_exp ',' string ')'
 	    { script_add_assertion(closure, $3, $5.value, $5.length); }
-	| INCLUDE string
-	    { script_include_directive(closure, $2.value, $2.length); }
 	;
 
 /* A list of MEMORY definitions.  */
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index ac9c35c6be..9ec97a8daf 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,15 +1,51 @@
-2012-03-06  Tristan Gingold  <gingold@adacore.com>
+2011-08-26  Nick Clifton  <nickc@redhat.com>
 
-	* corefile.c (core_create_function_syms): Do not call bsearch if
-	symbol_map_count is 0.
+	* po/es.po: Updated Spanish translation.
 
-2012-02-06  Nick Clifton  <nickc@redhat.com>
+2011-06-07  David Warme  <dwarme@groupw.com>
 
-	* po/sr.po: New Serbian translation.
-	* configure.in (ALL_LINGUAS): Add sr.
+	* corefile.c (core_sym_class): Allow for multiple iterations of
+	clone clones and subprograms.
+
+2011-04-28  Jonathan Nieder  <jrnieder@gmail.com>
+
+	* cg_print.c (print_header): Add no-c-format comment to prevent
+	confusion when translating "%time".
+
+2011-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* po/eo.po: Updated Esperanto translation.
+	* po/fr.po: Updated French translation.
+
+2011-03-30  Nick Clifton  <nickc@redhat.com>
+
+	* po/eo.po: New Esperanto translation.
+	* configure.in (ALL_LINGUAS): Add eo.
 	* configure: Regenerate.
 
-For older changes see ChangeLog-2011
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* basic_blocks.c (cmp_bb): Use filename_(n)cmp.
+	* cg_print.c (order_and_dump_functions_by_arcs): Likewise.
+	(cg_print_file_ordering): Likewise.
+	* corefile.c (read_function_mappings): Likewise.
+	(core_create_line_syms): Likewise.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-07  Alan Modra  <amodra@gmail.com>
+
+	PR gprof/12468
+	* corefile.c (core_create_function_syms): Set is_func for targets
+	that have no BSF_FUNCTION syms.
+
+2011-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/gprof/configure b/gprof/configure
index 6ffdbe30ce..fa68ffc8a3 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -11473,7 +11473,7 @@ fi
 done
 
 
-ALL_LINGUAS="fr tr sv es id da pt_BR de vi rw ga ms fi nl bg eo ja sr"
+ALL_LINGUAS="fr tr sv es id da pt_BR de vi rw ga ms fi nl bg eo"
 # If we haven't got the data from the intl directory,
 # assume NLS is disabled.
 USE_NLS=no
diff --git a/gprof/configure.in b/gprof/configure.in
index 631e3e4673..4e6f4f64a8 100644
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -27,7 +27,7 @@ LT_INIT
 
 AC_CHECK_FUNCS(setmode)
 
-ALL_LINGUAS="fr tr sv es id da pt_BR de vi rw ga ms fi nl bg eo ja sr"
+ALL_LINGUAS="fr tr sv es id da pt_BR de vi rw ga ms fi nl bg eo"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
diff --git a/gprof/corefile.c b/gprof/corefile.c
index 9f93ceeab3..e25d19bb06 100644
--- a/gprof/corefile.c
+++ b/gprof/corefile.c
@@ -582,7 +582,7 @@ core_create_function_syms (void)
   bfd_vma max_vma = 0;
   int cxxclass;
   long i;
-  struct function_map * found = NULL;
+  struct function_map * found;
   int core_has_func_syms = 0;
 
   switch (core_bfd->xvec->flavour)
@@ -609,14 +609,10 @@ core_create_function_syms (void)
       /* Don't create a symtab entry for a function that has
 	 a mapping to a file, unless it's the first function
 	 in the file.  */
-      if (symbol_map_count != 0)
-	{
-	  /* Note: some systems (SunOS 5.8) crash if bsearch base argument
-	     is NULL.  */
-	  found = (struct function_map *) bsearch
-	    (core_syms[i]->name, symbol_map, symbol_map_count,
-	     sizeof (struct function_map), search_mapped_symbol);
-	}
+      found = (struct function_map *) bsearch (core_syms[i]->name, symbol_map,
+                                               symbol_map_count,
+                                               sizeof (struct function_map),
+                                               search_mapped_symbol);
       if (found == NULL || found->is_first)
 	++symtab.len;
     }
@@ -647,14 +643,9 @@ core_create_function_syms (void)
 	  continue;
 	}
 
-      if (symbol_map_count != 0)
-	{
-	  /* Note: some systems (SunOS 5.8) crash if bsearch base argument
-	     is NULL.  */
-	  found = (struct function_map *) bsearch
-	    (core_syms[i]->name, symbol_map, symbol_map_count,
-	     sizeof (struct function_map), search_mapped_symbol);
-	}
+      found = (struct function_map *) bsearch (core_syms[i]->name, symbol_map,
+                                               symbol_map_count,
+		       sizeof (struct function_map), search_mapped_symbol);
       if (found && ! found->is_first)
 	continue;
 
diff --git a/gprof/hist.c b/gprof/hist.c
index 91b0000168..25364b215e 100644
--- a/gprof/hist.c
+++ b/gprof/hist.c
@@ -365,13 +365,13 @@ hist_assign_samples_1 (histogram *r)
   bfd_vma sym_low_pc, sym_high_pc;
   bfd_vma overlap, addr;
   unsigned int bin_count;
-  unsigned int i, j, k;
+  unsigned int i, j;
   double count_time, credit;
 
   bfd_vma lowpc = r->lowpc / sizeof (UNIT);
 
   /* Iterate over all sample bins.  */
-  for (i = 0, k = 1; i < r->num_bins; ++i)
+  for (i = 0, j = 1; i < r->num_bins; ++i)
     {
       bin_count = r->sample[i];
       if (! bin_count)
@@ -389,11 +389,8 @@ hist_assign_samples_1 (histogram *r)
 		    bin_count));
       total_time += count_time;
 
-      /* Credit all symbols that are covered by bin I.
-
-         PR gprof/13325: Make sure that K does not get decremented
-	 and J will never be less than 0.  */
-      for (j = k - 1; j < symtab.len; k = ++j)
+      /* Credit all symbols that are covered by bin I.  */
+      for (j = j - 1; j < symtab.len; ++j)
 	{
 	  sym_low_pc = symtab.base[j].hist.scaled_addr;
 	  sym_high_pc = symtab.base[j + 1].hist.scaled_addr;
diff --git a/gprof/po/bg.po b/gprof/po/bg.po
index 0de5b82b90..4a97f804df 100644
--- a/gprof/po/bg.po
+++ b/gprof/po/bg.po
@@ -1,17 +1,16 @@
 # Translation of binutils gprof to Bulgarian
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 #
-# Roumen Petrov <transl@roumenpetrov.info>, 2009, 2011.
+# Roumen Petrov <transl@roumenpetrov.info>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gprof 2.21.53\n"
+"Project-Id-Version: gprof 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2010-11-05 10:29+0100\n"
-"PO-Revision-Date: 2011-09-25 19:18+0300\n"
+"POT-Creation-Date: 2010-11-05 11:34+0100\n"
+"PO-Revision-Date: 2010-11-10 22:47+0200\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gprof/po/es.po b/gprof/po/es.po
index 57fa1d583b..45f2379a0b 100644
--- a/gprof/po/es.po
+++ b/gprof/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para gprof 2.21.53
+# Mensajes en español para gprof 2.20.90
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gprof 2.21.53\n"
+"Project-Id-Version: gprof 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2010-11-05 10:29+0100\n"
-"PO-Revision-Date: 2011-09-25 20:49-0500\n"
+"POT-Creation-Date: 2010-11-05 11:34+0100\n"
+"PO-Revision-Date: 2011-08-24 11:50-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
diff --git a/gprof/po/fi.po b/gprof/po/fi.po
index c334d7ee64..8078d5d741 100644
--- a/gprof/po/fi.po
+++ b/gprof/po/fi.po
@@ -1,18 +1,17 @@
-# Finnish messages for gprof.
-# Copyright © 2007, 2009, 2011 Free Software Foundation, Inc.
+# translation of gprof-2.19.90.po to Finnish
+# Copyright © 2007, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Jorma Karvonen <karvjorm@users.sf.net>, 2007.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009, 2011.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gprof 2.21.53\n"
+"Project-Id-Version: gprof 2.19.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2010-11-05 10:29+0100\n"
-"PO-Revision-Date: 2011-09-23 11:27+0200\n"
+"POT-Creation-Date: 2009-09-07 14:10+0200\n"
+"PO-Revision-Date: 2009-09-14 15:52+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +38,7 @@ msgid "[find_call] 0x%lx: bsr"
 msgstr "[etsi_kutsu] 0x%lx: bsr-käsky"
 
 #  ensimmäinen %s whoami, toinen %s filename
-#: basic_blocks.c:128 call_graph.c:89 hist.c:107
+#: basic_blocks.c:128 call_graph.c:89 hist.c:105
 #, c-format
 msgid "%s: %s: unexpected end of file\n"
 msgstr "%s: %s: tiedoston odottamaton loppu\n"
@@ -140,7 +139,7 @@ msgstr ""
 "\t\t\tKutsugraafi\n"
 "\n"
 
-#: cg_print.c:79 hist.c:468
+#: cg_print.c:79 hist.c:466
 #, c-format
 msgid ""
 "\n"
@@ -199,7 +198,7 @@ msgstr "itse"
 msgid "descendants"
 msgstr "jälkeläiset"
 
-#: cg_print.c:99 hist.c:494
+#: cg_print.c:99 hist.c:492
 msgid "name"
 msgstr "nimi"
 
@@ -244,9 +243,9 @@ msgstr "<jakso %d>"
 #: corefile.c:60
 #, c-format
 msgid "%s: unable to parse mapping file %s.\n"
-msgstr "%s: kuvaustiedostoa %s ei voi jäsentää.\n"
+msgstr "%s: mappaustiedostoa %s ei voi jäsentää.\n"
 
-#: corefile.c:84 corefile.c:504
+#: corefile.c:84 corefile.c:496
 #, c-format
 msgid "%s: could not open %s.\n"
 msgstr "%s: ei voitu avata tiedostoa %s.\n"
@@ -276,12 +275,12 @@ msgstr "%s: ei voi tehdä -c\n"
 msgid "%s: -c not supported on architecture %s\n"
 msgstr "%s: -c ei ole tuettu arkkitehtuurissa %s\n"
 
-#: corefile.c:513 corefile.c:598
+#: corefile.c:505 corefile.c:588
 #, c-format
 msgid "%s: file `%s' has no symbols\n"
 msgstr "%s: tiedostossa �%s� ei ole symboleja\n"
 
-#: corefile.c:859
+#: corefile.c:848
 #, c-format
 msgid "%s: somebody miscounted: ltab.len=%d instead of %ld\n"
 msgstr "%s: joku laski väärin: ltab.len=%d eikä %ld\n"
@@ -324,54 +323,54 @@ msgstr "%s: ei ole yhteensopiva ensimmäisen gmon-tiedoston kanssa\n"
 #: gmon_io.c:518
 #, c-format
 msgid "%s: file '%s' does not appear to be in gmon.out format\n"
-msgstr "%s: tiedosto ’%s’ ei vaikuta olevan �gmon.out�-muotoinen\n"
+msgstr "%s: tiedosto �%s� ei vaikuta olevan �gmon.out�-muotoinen\n"
 
 #: gmon_io.c:531
 #, c-format
 msgid "%s: unexpected EOF after reading %d/%d bins\n"
 msgstr "%s: odottamaton tiedoston loppumerkki �%d/%d bins�-lukemisen jälkeen\n"
 
-#: gmon_io.c:563
+#: gmon_io.c:565
 #, c-format
 msgid "time is in ticks, not seconds\n"
 msgstr "aika on ticks-yksikköinä, ei sekunteina\n"
 
-#: gmon_io.c:569 gmon_io.c:749
+#: gmon_io.c:571 gmon_io.c:748
 #, c-format
 msgid "%s: don't know how to deal with file format %d\n"
 msgstr "%s: ei tiedetä, kuinka tiedostomuotoa %d pitää käsitellä\n"
 
-#: gmon_io.c:579
+#: gmon_io.c:578
 #, c-format
 msgid "File `%s' (version %d) contains:\n"
 msgstr "Tiedosto �%s� (versio %d) sisältää:\n"
 
-#: gmon_io.c:582
+#: gmon_io.c:581
 #, c-format
 msgid "\t%d histogram record\n"
 msgstr "\t%d histogrammitietue\n"
 
-#: gmon_io.c:583
+#: gmon_io.c:582
 #, c-format
 msgid "\t%d histogram records\n"
 msgstr "\t%d histogrammitietueet\n"
 
-#: gmon_io.c:585
+#: gmon_io.c:584
 #, c-format
 msgid "\t%d call-graph record\n"
 msgstr "\t%d kutsugraafitietue\n"
 
-#: gmon_io.c:586
+#: gmon_io.c:585
 #, c-format
 msgid "\t%d call-graph records\n"
 msgstr "\t%d kutsugraafitietueet\n"
 
-#: gmon_io.c:588
+#: gmon_io.c:587
 #, c-format
 msgid "\t%d basic-block count record\n"
 msgstr "\t%d peruslohkolukumäärätietue\n"
 
-#: gmon_io.c:589
+#: gmon_io.c:588
 #, c-format
 msgid "\t%d basic-block count records\n"
 msgstr "\t%d peruslohkolukumäärätietueet\n"
@@ -402,17 +401,15 @@ msgstr ""
 "\t[--directory-path=hakemistot] [--display-unused-functions]\n"
 "\t[--file-format=nimi] [--file-info] [--help] [--line] [--min-count=n]\n"
 "\t[--no-static] [--print-path] [--separate-files]\n"
-"\t[--static-call-graph] [--sum] [--table-length=pituus] [--traditional]\n"
+"\t[--static-call-graph] [--sum] [--table-length=len] [--traditional]\n"
 "\t[--version] [--width=n] [--ignore-non-functions]\n"
-"\t[--demangle[=TYYLI]] [--no-demangle] [--external-symbol-table=nimi] [@TIEDOSTO]\n"
+"\t[--demangle[=TYYLI]] [--no-demangle] [--external-symbol-table=name] [@TIEDOSTO]\n"
 "\t[vedostiedosto] [profiilitiedosto...]\n"
 
 #: gprof.c:175
 #, c-format
 msgid "Report bugs to %s\n"
-msgstr ""
-"Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen %s\n"
-"Ilmoita käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
+msgstr "Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen %s\n"
 
 #: gprof.c:251
 #, c-format
@@ -465,7 +462,7 @@ msgstr "%s: �gmon.out�-tiedosto puuttuu histogrammista\n"
 msgid "%s: gmon.out file is missing call-graph data\n"
 msgstr "%s: �gmon.out�-tiedosto puuttuu kutsugraafidatasta\n"
 
-#: hist.c:135
+#: hist.c:133
 #, c-format
 msgid ""
 "%s: dimension unit changed between histogram records\n"
@@ -473,10 +470,10 @@ msgid ""
 "%s: to '%s'\n"
 msgstr ""
 "%s: mittasuhdeyksikkö muuttui histogrammitietueiden välillä\n"
-"%s: arvosta ’%s’\n"
-"%s: arvoon ’%s’\n"
+"%s: arvosta �%s�\n"
+"%s: arvoon �%s�\n"
 
-#: hist.c:145
+#: hist.c:143
 #, c-format
 msgid ""
 "%s: dimension abbreviation changed between histogram records\n"
@@ -484,30 +481,30 @@ msgid ""
 "%s: to '%c'\n"
 msgstr ""
 "%s: mittasuhdelyhenne muuttui histogrammitietueiden välillä\n"
-"%s: arvosta ’%c’\n"
-"%s: arvoon ’%c’\n"
+"%s: arvosta �%c�\n"
+"%s: arvoon �%c�\n"
 
-#: hist.c:159
+#: hist.c:157
 #, c-format
 msgid "%s: different scales in histogram records"
 msgstr "%s: histogrammitietueissa on erilaiset skaalat"
 
-#: hist.c:196
+#: hist.c:194
 #, c-format
 msgid "%s: overlapping histogram records\n"
 msgstr "%s: histogrammitietueet menevät päällekkäin\n"
 
-#: hist.c:230
+#: hist.c:228
 #, c-format
 msgid "%s: %s: unexpected EOF after reading %u of %u samples\n"
 msgstr "%s: %s: odottamaton tiedoston loppumerkki, kun oli luettu %u kaikkiaan %u näytteestä\n"
 
-#: hist.c:464
+#: hist.c:462
 #, c-format
 msgid "%c%c/call"
 msgstr "%c%c/kutsu"
 
-#: hist.c:472
+#: hist.c:470
 #, c-format
 msgid ""
 " for %.2f%% of %.2f %s\n"
@@ -516,7 +513,7 @@ msgstr ""
 " kohteelle %.2f%% / %.2f %s\n"
 "\n"
 
-#: hist.c:478
+#: hist.c:476
 #, c-format
 msgid ""
 "\n"
@@ -525,7 +522,7 @@ msgstr ""
 "\n"
 "Jokainen näyte lasketaan arvona %g %s.\n"
 
-#: hist.c:483
+#: hist.c:481
 #, c-format
 msgid ""
 " no time accumulated\n"
@@ -534,27 +531,27 @@ msgstr ""
 " ei kerääntynyttä aikaa\n"
 "\n"
 
-#: hist.c:490
+#: hist.c:488
 msgid "cumulative"
 msgstr "kumulatiivinen"
 
-#: hist.c:490
+#: hist.c:488
 msgid "self  "
 msgstr "itse  "
 
-#: hist.c:490
+#: hist.c:488
 msgid "total "
 msgstr "yhteensä "
 
-#: hist.c:493
+#: hist.c:491
 msgid "time"
 msgstr "aika"
 
-#: hist.c:493
+#: hist.c:491
 msgid "calls"
 msgstr "kutsut"
 
-#: hist.c:582
+#: hist.c:580
 #, c-format
 msgid ""
 "\n"
@@ -567,12 +564,12 @@ msgstr ""
 "\n"
 "litteä profiili:\n"
 
-#: hist.c:588
+#: hist.c:586
 #, c-format
 msgid "Flat profile:\n"
 msgstr "Litteä profiili:\n"
 
-#: hist.c:709
+#: hist.c:705
 #, c-format
 msgid "%s: found a symbol that covers several histogram records"
 msgstr "%s: löydetty symboli, joka kattaa useita histogrammitietueita"
diff --git a/gprof/po/gprof.pot b/gprof/po/gprof.pot
index 6beb36c89b..03b9c8b2d0 100644
--- a/gprof/po/gprof.pot
+++ b/gprof/po/gprof.pot
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-10-18 14:20+0100\n"
+"POT-Creation-Date: 2010-11-05 10:29+0100\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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,27 +35,27 @@ msgstr ""
 msgid "[find_call] 0x%lx: bsr"
 msgstr ""
 
-#: basic_blocks.c:129 call_graph.c:89 hist.c:107
+#: basic_blocks.c:128 call_graph.c:89 hist.c:107
 #, c-format
 msgid "%s: %s: unexpected end of file\n"
 msgstr ""
 
-#: basic_blocks.c:197
+#: basic_blocks.c:196
 #, c-format
 msgid "%s: warning: ignoring basic-block exec counts (use -l or --line)\n"
 msgstr ""
 
 #. FIXME: This only works if bfd_vma is unsigned long.
-#: basic_blocks.c:290 basic_blocks.c:300
+#: basic_blocks.c:289 basic_blocks.c:299
 #, c-format
 msgid "%s:%d: (%s:0x%lx) %lu executions\n"
 msgstr ""
 
-#: basic_blocks.c:291 basic_blocks.c:301
+#: basic_blocks.c:290 basic_blocks.c:300
 msgid "<unknown>"
 msgstr ""
 
-#: basic_blocks.c:544
+#: basic_blocks.c:543
 #, c-format
 msgid ""
 "\n"
@@ -67,7 +66,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: basic_blocks.c:568
+#: basic_blocks.c:567
 #, c-format
 msgid ""
 "\n"
@@ -75,29 +74,29 @@ msgid ""
 "\n"
 msgstr ""
 
-#: basic_blocks.c:569
+#: basic_blocks.c:568
 #, c-format
 msgid "%9ld   Executable lines in this file\n"
 msgstr ""
 
-#: basic_blocks.c:571
+#: basic_blocks.c:570
 #, c-format
 msgid "%9ld   Lines executed\n"
 msgstr ""
 
-#: basic_blocks.c:572
+#: basic_blocks.c:571
 #, c-format
 msgid "%9.2f   Percent of the file executed\n"
 msgstr ""
 
-#: basic_blocks.c:576
+#: basic_blocks.c:575
 #, c-format
 msgid ""
 "\n"
 "%9lu   Total number of line executions\n"
 msgstr ""
 
-#: basic_blocks.c:578
+#: basic_blocks.c:577
 #, c-format
 msgid "%9.2f   Average executions per line\n"
 msgstr ""
@@ -107,151 +106,151 @@ msgstr ""
 msgid "[cg_tally] arc from %s to %s traversed %lu times\n"
 msgstr ""
 
-#: cg_print.c:75
+#: cg_print.c:74
 #, c-format
 msgid ""
 "\t\t     Call graph (explanation follows)\n"
 "\n"
 msgstr ""
 
-#: cg_print.c:77
+#: cg_print.c:76
 #, c-format
 msgid ""
 "\t\t\tCall graph\n"
 "\n"
 msgstr ""
 
-#: cg_print.c:80 hist.c:468
+#: cg_print.c:79 hist.c:468
 #, c-format
 msgid ""
 "\n"
 "granularity: each sample hit covers %ld byte(s)"
 msgstr ""
 
-#: cg_print.c:84
+#: cg_print.c:83
 #, c-format
 msgid ""
 " for %.2f%% of %.2f seconds\n"
 "\n"
 msgstr ""
 
-#: cg_print.c:88
+#: cg_print.c:87
 #, c-format
 msgid ""
 " no time propagated\n"
 "\n"
 msgstr ""
 
-#: cg_print.c:97 cg_print.c:102 cg_print.c:105
+#: cg_print.c:96 cg_print.c:99 cg_print.c:101
 msgid "called"
 msgstr ""
 
-#: cg_print.c:97 cg_print.c:105
+#: cg_print.c:96 cg_print.c:101
 msgid "total"
 msgstr ""
 
-#: cg_print.c:97
+#: cg_print.c:96
 msgid "parents"
 msgstr ""
 
-#: cg_print.c:99 cg_print.c:103
+#: cg_print.c:98 cg_print.c:99
 msgid "index"
 msgstr ""
 
-#: cg_print.c:101
-#, no-c-format
+#: cg_print.c:98
+#, c-format
 msgid "%time"
 msgstr ""
 
-#: cg_print.c:102
+#: cg_print.c:98 cg_print.c:99
 msgid "self"
 msgstr ""
 
-#: cg_print.c:102
+#: cg_print.c:98
 msgid "descendants"
 msgstr ""
 
-#: cg_print.c:103 hist.c:494
+#: cg_print.c:99 hist.c:494
 msgid "name"
 msgstr ""
 
-#: cg_print.c:105
+#: cg_print.c:101
 msgid "children"
 msgstr ""
 
-#: cg_print.c:110
+#: cg_print.c:106
 #, c-format
 msgid "index %% time    self  children    called     name\n"
 msgstr ""
 
-#: cg_print.c:133
+#: cg_print.c:129
 #, c-format
 msgid " <cycle %d as a whole> [%d]\n"
 msgstr ""
 
-#: cg_print.c:359
+#: cg_print.c:355
 #, c-format
 msgid "%6.6s %5.5s %7.7s %11.11s %7.7s %7.7s     <spontaneous>\n"
 msgstr ""
 
-#: cg_print.c:360
+#: cg_print.c:356
 #, c-format
 msgid "%6.6s %5.5s %7.7s %7.7s %7.7s %7.7s     <spontaneous>\n"
 msgstr ""
 
-#: cg_print.c:594
+#: cg_print.c:590
 #, c-format
 msgid ""
 "Index by function name\n"
 "\n"
 msgstr ""
 
-#: cg_print.c:651 cg_print.c:660
+#: cg_print.c:647 cg_print.c:656
 #, c-format
 msgid "<cycle %d>"
 msgstr ""
 
-#: corefile.c:61
+#: corefile.c:60
 #, c-format
 msgid "%s: unable to parse mapping file %s.\n"
 msgstr ""
 
-#: corefile.c:85 corefile.c:514
+#: corefile.c:84 corefile.c:504
 #, c-format
 msgid "%s: could not open %s.\n"
 msgstr ""
 
-#: corefile.c:185
+#: corefile.c:183
 #, c-format
 msgid "%s: %s: not in executable format\n"
 msgstr ""
 
-#: corefile.c:196
+#: corefile.c:194
 #, c-format
 msgid "%s: can't find .text section in %s\n"
 msgstr ""
 
-#: corefile.c:271
+#: corefile.c:269
 #, c-format
 msgid "%s: ran out room for %lu bytes of text space\n"
 msgstr ""
 
-#: corefile.c:285
+#: corefile.c:283
 #, c-format
 msgid "%s: can't do -c\n"
 msgstr ""
 
-#: corefile.c:324
+#: corefile.c:322
 #, c-format
 msgid "%s: -c not supported on architecture %s\n"
 msgstr ""
 
-#: corefile.c:523 corefile.c:622
+#: corefile.c:513 corefile.c:598
 #, c-format
 msgid "%s: file `%s' has no symbols\n"
 msgstr ""
 
-#: corefile.c:884
+#: corefile.c:859
 #, c-format
 msgid "%s: somebody miscounted: ltab.len=%d instead of %ld\n"
 msgstr ""
diff --git a/include/ChangeLog b/include/ChangeLog
index c5b84b5799..af969774f6 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,86 +1,16 @@
-2012-03-15  Alan Modra  <amodra@gmail.com>
-
-	* dis-asm.h (disassemble_init_powerpc): Declare.
-
-2009-11-06  Jonas Maebe  <jonas.maebe@elis.ugent.be>
-
-	Add DWARF attribute value for the "Borland fastcall" calling
-	convention.
-	* elf/dwarf2.h: Add DW_CC_GNU_borland_fastcall_i386 constant.
-
-2012-01-31  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR ld/13616
-	* bfdlink.h (bfd_link_order): Update comments on data size.
-
-2012-01-26  Cary Coutant  <ccoutant@google.com>
-
-	* dwarf2.h (enum dwarf_form): Add Fission extensions.
-	(enum dwarf_attribute): Likewise.
-
-2012-01-06  Jason Merrill  <jason@redhat.com>
-
-	PR c++/6057
-	PR c++/48051
-	PR c++/50855
-	PR c++/51322
-	* demangle.h (enum demangle_component_type): Add
-	DEMANGLE_COMPONENT_INITIALIZER_LIST, DEMANGLE_COMPONENT_NULLARY.
-
-2011-12-14  Iain Sandoe  <iains@gcc.gnu.org>
-
-	* mach-o/loader.h (bfd_mach_o_section_type): define
-	BFD_MACH_O_S_ATTR_NONE to 0.
-
-2011-11-07  Richard Henderson  <rth@redhat.com>
-
-	Merged from transactional-memory.
-
-	* demangle.h (enum gnu_v3_ctor_kinds): Add gnu_v3_object_ctor_group.
-	(enum gnu_v3_dtor_kinds): Add gnu_v3_object_dtor_group.
-	(DEMANGLE_COMPONENT_TRANSACTION_CLONE): New.
-	(DEMANGLE_COMPONENT_NONTRANSACTION_CLONE): New.
-
-2011-11-01  DJ Delorie  <dj@redhat.com>
-
-	* dis-asm.h (print_insn_rl78): Declare.
-
-2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
-
-	* dis-asm.h (print_insn_epiphany): Declare.
-
-2011-10-21  Ulrich Drepper  <drepper@gmail.com>
-
-	* obstack.h [!GNUC] (obstack_free): Avoid cast to int.
-
-2011-10-21  Marc Glisse  <marc.glisse@inria.fr>
-
-	* ansidecl.h (ENUM_BITFIELD): Always use enum in C++
-
-2011-10-19  Alan Modra  <amodra@gmail.com>
+2011-10-25  Alan Modra  <amodra@gmail.com>
 
+	Apply mainline patches.
+	2011-10-19  Alan Modra  <amodra@gmail.com>
 	PR ld/13254
 	* bfdlink.h (struct bfd_link_info): Add error_textrel.
 
-2011-09-28  Doug Evans  <dje@google.com>
-
-	* timeval-utils.h: New file.
-
-	* libiberty.h (countargv): Declare.
-
-2011-09-26  Cary Coutant  <ccoutant@google.com>
-
+	2011-09-26  Cary Coutant  <ccoutant@google.com>
 	gcc PR lto/47247
 	* plugin-api.h (enum ld_plugin_symbol_resolution): Add
 	LDPR_PREVAILING_DEF_IRONLY_EXP.
 	(enum ld_plugin_tag): Add LDPT_GET_SYMBOLS_V2.
 
-2011-09-23  Cary Coutant  <ccoutant@google.com>
-
-	PR 40831
-	* demangle.h (enum demangle_component_type): Add
-	DEMANGLE_COMPONENT_CLONE.
-
 2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/12975
@@ -202,6 +132,12 @@
 
 	* bfdlink.h (struct bfd_link_hash_entry): Remove u.undef.weak field.
 
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf/tic6x.h (ELF_STRING_C6000_unwind,
+	ELF_STRING_C6000_unwind_info, ELF_STRING_C6000_unwind_once,
+	ELF_STRING_C6000_unwind_info_once): Define.
+
 2011-04-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* dwarf2.h (DW_OP_GNU_const_type, DW_OP_GNU_regval_type,
@@ -496,6 +432,11 @@
 	(disassemble_init_for_target): Ditto.
 	(init_disassemble_info): Ditto.
 
+2009-12-03  David Daney  <ddaney@caviumnetworks.com>
+	    Adam Nemet  <adambnemet@gmail.com>
+
+	* elf/mips.h (E_MIPS_MACH_OCTEON2): New machine flag.
+
 2009-11-18  Alan Modra  <amodra@bigpond.net.au>
 
 	* alloca-conf.h: Clarify comment.
@@ -504,7 +445,7 @@
 
 	Add DWARF attribute value for the "Borland fastcall" calling
 	convention.
-	* dwarf2.h: Add DW_CC_GNU_borland_fastcall_i386 constant.
+	* elf/dwarf2.h: Add DW_CC_GNU_borland_fastcall_i386 constant.
 
 2009-10-23  Kai Tietz  <kai.tietz@onevision.com>
 
diff --git a/include/ansidecl.h b/include/ansidecl.h
index 23d85bf0e1..c39ce2f5d7 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -416,12 +416,10 @@ So instead we use the macro below and test it against specific values.  */
 #define EXPORTED_CONST const
 #endif
 
-/* Be conservative and only use enum bitfields with C++ or GCC.
+/* Be conservative and only use enum bitfields with GCC.
    FIXME: provide a complete autoconf test for buggy enum bitfields.  */
 
-#ifdef __cplusplus
-#define ENUM_BITFIELD(TYPE) enum TYPE
-#elif (GCC_VERSION > 2000)
+#if (GCC_VERSION > 2000)
 #define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
 #else
 #define ENUM_BITFIELD(TYPE) unsigned int
diff --git a/include/bfdlink.h b/include/bfdlink.h
index c79d8f0553..be853295ad 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -674,8 +674,8 @@ struct bfd_link_order
 	} indirect;
       struct
 	{
-	  /* Size of contents, or zero when contents should be filled by 
-	     the architecture-dependent fill function.
+	  /* Size of contents, or zero when contents size == size
+	     within output section.
 	     A non-zero value allows filling of the output section
 	     with an arbitrary repeated pattern.  */
 	  unsigned int size;
diff --git a/include/demangle.h b/include/demangle.h
index 34b3ed3cde..53f6c54f52 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -172,8 +172,7 @@ ada_demangle (const char *mangled, int options);
 enum gnu_v3_ctor_kinds {
   gnu_v3_complete_object_ctor = 1,
   gnu_v3_base_object_ctor,
-  gnu_v3_complete_object_allocating_ctor,
-  gnu_v3_object_ctor_group
+  gnu_v3_complete_object_allocating_ctor
 };
 
 /* Return non-zero iff NAME is the mangled form of a constructor name
@@ -187,8 +186,7 @@ extern enum gnu_v3_ctor_kinds
 enum gnu_v3_dtor_kinds {
   gnu_v3_deleting_dtor = 1,
   gnu_v3_complete_object_dtor,
-  gnu_v3_base_object_dtor,
-  gnu_v3_object_dtor_group
+  gnu_v3_base_object_dtor
 };
 
 /* Return non-zero iff NAME is the mangled form of a destructor name
@@ -344,9 +342,6 @@ enum demangle_component_type
      template argument, and the right subtree is either NULL or
      another TEMPLATE_ARGLIST node.  */
   DEMANGLE_COMPONENT_TEMPLATE_ARGLIST,
-  /* An initializer list.  The left subtree is either an explicit type or
-     NULL, and the right subtree is a DEMANGLE_COMPONENT_ARGLIST.  */
-  DEMANGLE_COMPONENT_INITIALIZER_LIST,
   /* An operator.  This holds information about a standard
      operator.  */
   DEMANGLE_COMPONENT_OPERATOR,
@@ -356,8 +351,6 @@ enum demangle_component_type
   /* A typecast, represented as a unary operator.  The one subtree is
      the type to which the argument should be cast.  */
   DEMANGLE_COMPONENT_CAST,
-  /* A nullary expression.  The left subtree is the operator.  */
-  DEMANGLE_COMPONENT_NULLARY,
   /* A unary expression.  The left subtree is the operator, and the
      right subtree is the single argument.  */
   DEMANGLE_COMPONENT_UNARY,
@@ -408,17 +401,8 @@ enum demangle_component_type
   DEMANGLE_COMPONENT_DEFAULT_ARG,
   /* An unnamed type.  */
   DEMANGLE_COMPONENT_UNNAMED_TYPE,
-  /* A transactional clone.  This has one subtree, the encoding for
-     which it is providing alternative linkage.  */
-  DEMANGLE_COMPONENT_TRANSACTION_CLONE,
-  /* A non-transactional clone entry point.  In the i386/x86_64 abi,
-     the unmangled symbol of a tm_callable becomes a thunk and the
-     non-transactional function version is mangled thus.  */
-  DEMANGLE_COMPONENT_NONTRANSACTION_CLONE,
   /* A pack expansion.  */
-  DEMANGLE_COMPONENT_PACK_EXPANSION,
-  /* A cloned function.  */
-  DEMANGLE_COMPONENT_CLONE
+  DEMANGLE_COMPONENT_PACK_EXPANSION
 };
 
 /* Types which are only used internally.  */
diff --git a/include/dis-asm.h b/include/dis-asm.h
index c9cbfbb321..d654211c3a 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -1,7 +1,7 @@
 /* Interface between the opcode library and its callers.
 
    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010,
-   2011, 2012 Free Software Foundation, Inc.
+   2011  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -233,7 +233,6 @@ extern int print_insn_crx               (bfd_vma, disassemble_info *);
 extern int print_insn_d10v		(bfd_vma, disassemble_info *);
 extern int print_insn_d30v		(bfd_vma, disassemble_info *);
 extern int print_insn_dlx 		(bfd_vma, disassemble_info *);
-extern int print_insn_epiphany		(bfd_vma, disassemble_info *);
 extern int print_insn_fr30		(bfd_vma, disassemble_info *);
 extern int print_insn_frv		(bfd_vma, disassemble_info *);
 extern int print_insn_h8300		(bfd_vma, disassemble_info *);
@@ -299,7 +298,6 @@ extern int print_insn_z80		(bfd_vma, disassemble_info *);
 extern int print_insn_z8001		(bfd_vma, disassemble_info *);
 extern int print_insn_z8002		(bfd_vma, disassemble_info *);
 extern int print_insn_rx		(bfd_vma, disassemble_info *);
-extern int print_insn_rl78		(bfd_vma, disassemble_info *);
 
 extern disassembler_ftype arc_get_disassembler (void *);
 extern disassembler_ftype cris_get_disassembler (bfd *);
@@ -314,7 +312,6 @@ extern int  get_arm_regname_num_options (void);
 extern int  set_arm_regname_option (int);
 extern int  get_arm_regnames (int, const char **, const char **, const char *const **);
 extern bfd_boolean arm_symbol_is_valid (asymbol *, struct disassemble_info *);
-extern void disassemble_init_powerpc (struct disassemble_info *);
 
 /* Fetch the disassembler for a given BFD, if that support is available.  */
 extern disassembler_ftype disassembler (bfd *);
diff --git a/include/dwarf2.h b/include/dwarf2.h
index 8c0c9ed6da..37cb83f4b2 100644
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -188,11 +188,7 @@ enum dwarf_form
     DW_FORM_sec_offset = 0x17,
     DW_FORM_exprloc = 0x18,
     DW_FORM_flag_present = 0x19,
-    DW_FORM_ref_sig8 = 0x20,
-    /* Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
-    DW_FORM_GNU_ref_index = 0x1f00,
-    DW_FORM_GNU_addr_index = 0x1f01,
-    DW_FORM_GNU_str_index = 0x1f02
+    DW_FORM_ref_sig8 = 0x20
   };
 
 /* Attribute names and codes.  */
@@ -372,13 +368,6 @@ enum dwarf_attribute
     DW_AT_GNU_all_source_call_sites = 0x2118,
     /* Section offset into .debug_macro section.  */
     DW_AT_GNU_macros = 0x2119,
-    /* Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
-    DW_AT_GNU_dwo_name = 0x2130,
-    DW_AT_GNU_dwo_id = 0x2131,
-    DW_AT_GNU_ref_base = 0x2132,
-    DW_AT_GNU_addr_base = 0x2133,
-    DW_AT_GNU_pubnames = 0x2134,
-    DW_AT_GNU_pubtypes = 0x2135,
     /* VMS extensions.  */
     DW_AT_VMS_rtnbeg_pd_address = 0x2201,
     /* GNAT extensions.  */
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 2d8264ea33..3b2c88bea4 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,99 +1,9 @@
-2012-03-07  Nick Clifton  <nickc@redhat.com>
-
-	* mn10300.h (elf_mn10300_reloc_type): Add R_MN10300_TLS_GD,
-	R_MN10300_TLS_LD, R_MN10300_TLS_LDO, R_MN10300_TLS_GOTIE,
-	R_MN10300_TLS_IE, R_MN10300_TLS_LE, R_MN10300_TLS_DPTMOD,
-	R_MN10300_TLS_DTPOFF and R_MN10300_TLS_TPOFF.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* tilegx.h (R_TILEGX_IMM16_X0_HW1_GOT): Delete.
-	(R_TILEGX_IMM16_X1_HW1_GOT): Ditto.
-	(R_TILEGX_IMM16_X0_HW2_GOT): Ditto.
-	(R_TILEGX_IMM16_X1_HW2_GOT): Ditto.
-	(R_TILEGX_IMM16_X0_HW3_GOT): Ditto.
-	(R_TILEGX_IMM16_X1_HW3_GOT): Ditto.
-	(R_TILEGX_IMM16_X0_HW2_LAST_GOT): Ditto.
-	(R_TILEGX_IMM16_X1_HW2_LAST_GOT): Ditto.
-	(R_TILEGX_IMM16_X0_HW1_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X1_HW1_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X0_HW2_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X1_HW2_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X0_HW3_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X1_HW3_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD): Ditto.
-	(R_TILEGX_IMM16_X0_HW1_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X1_HW1_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X0_HW2_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X1_HW2_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X0_HW3_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X1_HW3_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE): Ditto.
-	(R_TILEGX_IMM16_X0_HW0_TLS_LE): New relocation.
-	(R_TILEGX_IMM16_X1_HW0_TLS_LE): Ditto.
-	(R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE): Ditto.
-	(R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE): Ditto.
-	(R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE): Ditto.
-	(R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE): Ditto.
-	(R_TILEGX_TLS_GD_CALL): Ditto.
-	(R_TILEGX_IMM8_X0_TLS_GD_ADD): Ditto.
-	(R_TILEGX_IMM8_X1_TLS_GD_ADD): Ditto.
-	(R_TILEGX_IMM8_Y0_TLS_GD_ADD): Ditto.
-	(R_TILEGX_IMM8_Y1_TLS_GD_ADD): Ditto.
-	(R_TILEGX_TLS_IE_LOAD): Ditto.
-	(R_TILEGX_IMM8_X0_TLS_ADD): Ditto.
-	(R_TILEGX_IMM8_X1_TLS_ADD): Ditto.
-	(R_TILEGX_IMM8_Y0_TLS_ADD): Ditto.
-	(R_TILEGX_IMM8_Y1_TLS_ADD): Ditto.
-	* tilepro.h (R_TILEPRO_TLS_GD_CALL): New relocation.
-	(R_TILEPRO_IMM8_X0_TLS_GD_ADD): Ditto.
-	(R_TILEPRO_IMM8_X1_TLS_GD_ADD): Ditto.
-	(R_TILEPRO_IMM8_Y0_TLS_GD_ADD): Ditto.
-	(R_TILEPRO_IMM8_Y1_TLS_GD_ADD): Ditto.
-	(R_TILEPRO_TLS_IE_LOAD): Ditto.
-	(R_TILEPRO_IMM16_X0_TLS_LE): Ditto.
-	(R_TILEPRO_IMM16_X1_TLS_LE): Ditto.
-	(R_TILEPRO_IMM16_X0_TLS_LE_LO): Ditto.
-	(R_TILEPRO_IMM16_X1_TLS_LE_LO): Ditto.
-	(R_TILEPRO_IMM16_X0_TLS_LE_HI): Ditto.
-	(R_TILEPRO_IMM16_X1_TLS_LE_HI): Ditto.
-	(R_TILEPRO_IMM16_X0_TLS_LE_HA): Ditto.
-	(R_TILEPRO_IMM16_X1_TLS_LE_HA): Ditto.
-
-2011-12-22  DJ Delorie  <dj@redhat.com>
-
-	* rl78.h (R_RL78_RH_RELAX, R_RL78_RH_SFR, R_RL78_RH_SADDR): New.
-	(RL78_RELAXA_BRA, RL78_RELAXA_ADDR16: New.
-
-2011-12-19  Chung-Lin Tang  <cltang@codesourcery.com>
-
-	* mips.h (elf_mips_reloc_type): Add R_MIPS16_TLS_* entries.
-
-2011-12-06  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* common.h (NT_S390_LAST_BREAK): Define.
-	(NT_S390_SYSTEM_CALL): Likewise.
-
-2011-11-01  DJ Delorie  <dj@redhat.com>
-
-	* common.h (EM_RL78, EM_78K0R): New.
-	* rl78.h: New.
-
-2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
-
-	* epiphany.h: New file.
-	* common.h (EM_ADAPTEVA_EPIPHANY): Define.
-
-2011-10-10  Alan Modra  <amodra@gmail.com>
+2011-10-25  Alan Modra  <amodra@gmail.com>
 
+	Apply mainline patches
+	2011-10-10  Alan Modra  <amodra@gmail.com>
 	* ppc64.h (R_PPC64_TOCSAVE): Add.
 
-2011-10-05  DJ Delorie  <dj@redhat.com>
-
-	* rx.h (E_FLAG_RX_PID): New.
-
 2011-09-21  David S. Miller  <davem@davemloft.net>
 
 	* sparc.h (Tag_GNU_Sparc_HWCAPS): New object attribute.
@@ -172,12 +82,6 @@
 
 	* arm.h (arm_st_branch_type): Add ST_BRANCH_UNKNOWN.
 
-2011-05-09  Paul Brook  <paul@codesourcery.com>
-
-	* tic6x.h (ELF_STRING_C6000_unwind,
-	ELF_STRING_C6000_unwind_info, ELF_STRING_C6000_unwind_once,
-	ELF_STRING_C6000_unwind_info_once): Define.
-
 2011-04-15  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* common.h (NT_STAPSDT): New define.
@@ -462,11 +366,6 @@
 	R_PPC_RELAX32PC_PLT): Delete.
 	(R_PPC_RELAX, R_PPC_RELAX_PLT, R_PPC_RELAX_PLTREL24): Define.
 
-2009-12-03  David Daney  <ddaney@caviumnetworks.com>
-	    Adam Nemet  <adambnemet@gmail.com>
-
-	* mips.h (E_MIPS_MACH_OCTEON2): New machine flag.
-
 2009-11-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* common.h (ELFOSABI_FENIXOS, EM_TI_C6000, EM_TI_C2000,
diff --git a/include/elf/common.h b/include/elf/common.h
index 5cddc0bef3..e46ae3370d 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -296,8 +296,6 @@
 #define EM_MICROBLAZE	189	/* Xilinx MicroBlaze 32-bit RISC soft processor core */
 #define EM_CUDA		190	/* NVIDIA CUDA architecture */
 #define EM_TILEGX	191	/* Tilera TILE-Gx multicore architecture family */
-#define EM_RL78		197	/* Renesas RL78 family.  */
-#define EM_78K0R	199	/* Renesas 78K0R.  */
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
    random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision
@@ -403,8 +401,6 @@
 
 #define EM_MICROBLAZE_OLD	0xbaab	/* Old MicroBlaze */
 
-#define EM_ADAPTEVA_EPIPHANY   0x1223  /* Adapteva's Epiphany architecture.  */
-
 /* See the above comment before you add a new EM_* value here.  */
 
 /* Values for e_version.  */
@@ -543,10 +539,6 @@
 					/*   note name must be "LINUX".  */
 #define NT_S390_PREFIX	0x305		/* S390 prefix register */
 					/*   note name must be "LINUX".  */
-#define NT_S390_LAST_BREAK      0x306   /* S390 breaking event address */
-					/*   note name must be "LINUX".  */
-#define NT_S390_SYSTEM_CALL     0x307   /* S390 system call restart data */
-					/*   note name must be "LINUX".  */
 #define NT_ARM_VFP	0x400		/* ARM VFP registers */
 					/*   note name must be "LINUX".  */
 
diff --git a/include/elf/mips.h b/include/elf/mips.h
index c2c5922dde..db5fa54148 100644
--- a/include/elf/mips.h
+++ b/include/elf/mips.h
@@ -98,14 +98,7 @@ START_RELOC_NUMBERS (elf_mips_reloc_type)
   RELOC_NUMBER (R_MIPS16_CALL16, 103)
   RELOC_NUMBER (R_MIPS16_HI16, 104)
   RELOC_NUMBER (R_MIPS16_LO16, 105)
-  RELOC_NUMBER (R_MIPS16_TLS_GD, 106)
-  RELOC_NUMBER (R_MIPS16_TLS_LDM, 107)
-  RELOC_NUMBER (R_MIPS16_TLS_DTPREL_HI16, 108)
-  RELOC_NUMBER (R_MIPS16_TLS_DTPREL_LO16, 109)
-  RELOC_NUMBER (R_MIPS16_TLS_GOTTPREL, 110)
-  RELOC_NUMBER (R_MIPS16_TLS_TPREL_HI16, 111)
-  RELOC_NUMBER (R_MIPS16_TLS_TPREL_LO16, 112)
-  FAKE_RELOC (R_MIPS16_max, 113)
+  FAKE_RELOC (R_MIPS16_max, 106)
   /* These relocations are specific to VxWorks.  */
   RELOC_NUMBER (R_MIPS_COPY, 126)
   RELOC_NUMBER (R_MIPS_JUMP_SLOT, 127)
diff --git a/include/elf/mn10300.h b/include/elf/mn10300.h
index 529b3897b4..444787b5f9 100644
--- a/include/elf/mn10300.h
+++ b/include/elf/mn10300.h
@@ -51,15 +51,6 @@ START_RELOC_NUMBERS (elf_mn10300_reloc_type)
   RELOC_NUMBER (R_MN10300_GLOB_DAT, 21)
   RELOC_NUMBER (R_MN10300_JMP_SLOT, 22)
   RELOC_NUMBER (R_MN10300_RELATIVE, 23)
-  RELOC_NUMBER (R_MN10300_TLS_GD, 24)
-  RELOC_NUMBER (R_MN10300_TLS_LD, 25)
-  RELOC_NUMBER (R_MN10300_TLS_LDO, 26)
-  RELOC_NUMBER (R_MN10300_TLS_GOTIE, 27)
-  RELOC_NUMBER (R_MN10300_TLS_IE, 28)
-  RELOC_NUMBER (R_MN10300_TLS_LE, 29)
-  RELOC_NUMBER (R_MN10300_TLS_DTPMOD, 30)
-  RELOC_NUMBER (R_MN10300_TLS_DTPOFF, 31)
-  RELOC_NUMBER (R_MN10300_TLS_TPOFF, 32)
   RELOC_NUMBER (R_MN10300_SYM_DIFF, 33)
   RELOC_NUMBER (R_MN10300_ALIGN, 34)
 END_RELOC_NUMBERS (R_MN10300_MAX)
diff --git a/include/elf/rx.h b/include/elf/rx.h
index baaa1aa9e3..e8794f3529 100644
--- a/include/elf/rx.h
+++ b/include/elf/rx.h
@@ -116,8 +116,7 @@ END_RELOC_NUMBERS (R_RX_max)
 
 /* Values for the e_flags field in the ELF header.  */
 #define E_FLAG_RX_64BIT_DOUBLES		(1 << 0)
-#define E_FLAG_RX_DSP			(1 << 1) /* Defined in the RX CPU Object file specification, but not explained. */
-#define E_FLAG_RX_PID			(1 << 2) /* Unofficial - DJ */
+#define E_FLAG_RX_DSP			(1 << 1) /* Defined in the RX CPU Object file specification, but not explained.  */
 
 /* These define the addend field of R_RX_RH_RELAX relocations.  */
 #define	RX_RELAXA_IMM6	0x00000010	/* Imm8/16/24/32 at bit offset 6.  */
diff --git a/include/elf/tilegx.h b/include/elf/tilegx.h
index 004ce28caa..d276f2e5fe 100644
--- a/include/elf/tilegx.h
+++ b/include/elf/tilegx.h
@@ -104,37 +104,48 @@ START_RELOC_NUMBERS (elf_tilegx_reloc_type)
 
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_GOT,          64)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_GOT,          65)
-  /* Relocs 66-71 are currently not defined.  */
-
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_GOT,          66)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_GOT,          67)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_GOT,          68)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_GOT,          69)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_GOT,          70)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_GOT,          71)
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_GOT,     72)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_GOT,     73)
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_GOT,     74)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_GOT,     75)
-  /* Relocs 76-77 are currently not defined.  */
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_GOT,     76)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_GOT,     77)
 
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_TLS_GD,       78)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_TLS_GD,       79)
-  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_TLS_LE,       80)
-  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_TLS_LE,       81)
-  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE,  82)
-  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE,  83)
-  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE,  84)
-  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE,  85)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_TLS_GD,       80)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_TLS_GD,       81)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_TLS_GD,       82)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_TLS_GD,       83)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_TLS_GD,       84)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_TLS_GD,       85)
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD,  86)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD,  87)
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD,  88)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD,  89)
-  /* Relocs 90-91 are currently not defined.  */
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD,  90)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD,  91)
 
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_TLS_IE,       92)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_TLS_IE,       93)
-  /* Relocs 94-99 are currently not defined.  */
-
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_TLS_IE,       94)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_TLS_IE,       95)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_TLS_IE,       96)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_TLS_IE,       97)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_TLS_IE,       98)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_TLS_IE,       99)
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE, 100)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE, 101)
   RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE, 102)
   RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE, 103)
-  /* Relocs 104-105 are currently not defined.  */
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE, 104)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE, 105)
 
   RELOC_NUMBER (R_TILEGX_TLS_DTPMOD64,             106)
   RELOC_NUMBER (R_TILEGX_TLS_DTPOFF64,             107)
@@ -143,17 +154,6 @@ START_RELOC_NUMBERS (elf_tilegx_reloc_type)
   RELOC_NUMBER (R_TILEGX_TLS_DTPOFF32,             110)
   RELOC_NUMBER (R_TILEGX_TLS_TPOFF32,              111)
 
-  RELOC_NUMBER (R_TILEGX_TLS_GD_CALL,              112)
-  RELOC_NUMBER (R_TILEGX_IMM8_X0_TLS_GD_ADD,       113)
-  RELOC_NUMBER (R_TILEGX_IMM8_X1_TLS_GD_ADD,       114)
-  RELOC_NUMBER (R_TILEGX_IMM8_Y0_TLS_GD_ADD,       115)
-  RELOC_NUMBER (R_TILEGX_IMM8_Y1_TLS_GD_ADD,       116)
-  RELOC_NUMBER (R_TILEGX_TLS_IE_LOAD,              117)
-  RELOC_NUMBER (R_TILEGX_IMM8_X0_TLS_ADD,          118)
-  RELOC_NUMBER (R_TILEGX_IMM8_X1_TLS_ADD,          119)
-  RELOC_NUMBER (R_TILEGX_IMM8_Y0_TLS_ADD,          120)
-  RELOC_NUMBER (R_TILEGX_IMM8_Y1_TLS_ADD,          121)
-
 /* These are GNU extensions to enable C++ vtable garbage collection.  */
   RELOC_NUMBER (R_TILEGX_GNU_VTINHERIT, 128)
   RELOC_NUMBER (R_TILEGX_GNU_VTENTRY, 129)
diff --git a/include/elf/tilepro.h b/include/elf/tilepro.h
index 0079a2fe4a..899697f605 100644
--- a/include/elf/tilepro.h
+++ b/include/elf/tilepro.h
@@ -96,14 +96,7 @@ START_RELOC_NUMBERS (elf_tilepro_reloc_type)
 
   RELOC_NUMBER (R_TILEPRO_DEST_IMM8_X1,       55)
 
-  /* Relocs 56-59 are currently not defined.  */
-
-  RELOC_NUMBER (R_TILEPRO_TLS_GD_CALL,        60)
-  RELOC_NUMBER (R_TILEPRO_IMM8_X0_TLS_GD_ADD, 61)
-  RELOC_NUMBER (R_TILEPRO_IMM8_X1_TLS_GD_ADD, 62)
-  RELOC_NUMBER (R_TILEPRO_IMM8_Y0_TLS_GD_ADD, 63)
-  RELOC_NUMBER (R_TILEPRO_IMM8_Y1_TLS_GD_ADD, 64)
-  RELOC_NUMBER (R_TILEPRO_TLS_IE_LOAD,        65)
+  /* Relocs 56-65 are currently not defined.  */
 
   RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_GD,    66)
   RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_GD,    67)
@@ -127,15 +120,6 @@ START_RELOC_NUMBERS (elf_tilepro_reloc_type)
   RELOC_NUMBER (R_TILEPRO_TLS_DTPOFF32,       83)
   RELOC_NUMBER (R_TILEPRO_TLS_TPOFF32,        84)
 
-  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_LE,    85)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_LE,    86)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_LE_LO, 87)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_LE_LO, 88)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_LE_HI, 89)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_LE_HI, 90)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_LE_HA, 91)
-  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_LE_HA, 92)
-
 /* These are GNU extensions to enable C++ vtable garbage collection.  */
   RELOC_NUMBER (R_TILEPRO_GNU_VTINHERIT, 128)
   RELOC_NUMBER (R_TILEPRO_GNU_VTENTRY, 129)
diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index a2ab59f0f6..dabaa5b19e 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,11 +1,3 @@
-2012-02-03  Kevin Buettner  <kevinb@redhat.com>
-
-	* sim-rl78.h: New file.
-
-2011-12-03  Mike Frysinger  <vapier@gentoo.org>
-
-	* callback.h (cb_get_string): New prototype.
-
 2011-04-14  Mike Frysinger  <vapier@gentoo.org>
 
 	* remote-sim.h (sim_complete_command): New prototype.
diff --git a/include/gdb/callback.h b/include/gdb/callback.h
index 9b6cf8539d..a1f79f94de 100644
--- a/include/gdb/callback.h
+++ b/include/gdb/callback.h
@@ -1,5 +1,5 @@
 /* Remote target system call callback support.
-   Copyright 1997, 2007-2012 Free Software Foundation, Inc.
+   Copyright 1997, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
    This file is part of GDB.
@@ -324,9 +324,6 @@ int cb_is_stdin (host_callback *, int);
 int cb_is_stdout (host_callback *, int);
 int cb_is_stderr (host_callback *, int);
 
-/* Read a string out of the target.  */
-int cb_get_string (host_callback *, CB_SYSCALL *, char *, int, unsigned long);
-
 /* Perform a system call.  */
 CB_RC cb_syscall (host_callback *, CB_SYSCALL *);
 
diff --git a/include/gdb/fileio.h b/include/gdb/fileio.h
index 06b2ecf601..fc44760141 100644
--- a/include/gdb/fileio.h
+++ b/include/gdb/fileio.h
@@ -1,6 +1,6 @@
 /* Hosted File I/O interface definitions, for GDB, the GNU Debugger.
 
-   Copyright 2003, 2007-2012 Free Software Foundation, Inc.
+   Copyright 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/include/gdb/remote-sim.h b/include/gdb/remote-sim.h
index cef0dd9307..14a86a8666 100644
--- a/include/gdb/remote-sim.h
+++ b/include/gdb/remote-sim.h
@@ -1,7 +1,7 @@
 /* This file defines the interface between the simulator and gdb.
 
-   Copyright 1993-1994, 1996-1998, 2000, 2002, 2007-2012 Free Software
-   Foundation, Inc.
+   Copyright 1993, 1994, 1996, 1997, 1998, 2000, 2002, 2007, 2008, 2009, 2010,
+   2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/signals.def b/include/gdb/signals.def
index c01895ae5d..7e08c9045a 100644
--- a/include/gdb/signals.def
+++ b/include/gdb/signals.def
@@ -1,5 +1,5 @@
 /* Target signal numbers for GDB and the GDB remote protocol.
-   Copyright 2010-2012 Free Software Foundation, Inc.
+   Copyright 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/signals.h b/include/gdb/signals.h
index 67902c6170..73643974c8 100644
--- a/include/gdb/signals.h
+++ b/include/gdb/signals.h
@@ -1,5 +1,7 @@
 /* Target signal numbers for GDB and the GDB remote protocol.
-   Copyright 1986, 1988-2002, 2007-2012 Free Software Foundation, Inc.
+   Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+   1998, 1999, 2000, 2001, 2002, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/sim-arm.h b/include/gdb/sim-arm.h
index 1210e947b9..3004d8c429 100644
--- a/include/gdb/sim-arm.h
+++ b/include/gdb/sim-arm.h
@@ -1,6 +1,7 @@
 /* This file defines the interface between the Arm simulator and GDB.
 
-   Copyright 2002-2003, 2007-2012 Free Software Foundation, Inc.
+   Copyright 2002, 2003, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
diff --git a/include/gdb/sim-bfin.h b/include/gdb/sim-bfin.h
index 52a3632eca..3a006b882e 100644
--- a/include/gdb/sim-bfin.h
+++ b/include/gdb/sim-bfin.h
@@ -1,6 +1,6 @@
 /* This file defines the interface between the Blackfin simulator and GDB.
 
-   Copyright (C) 2005-2012 Free Software Foundation, Inc.
+   Copyright (C) 2005-2011 Free Software Foundation, Inc.
    Contributed by Analog Devices.
 
    This file is part of GDB.
diff --git a/include/gdb/sim-cr16.h b/include/gdb/sim-cr16.h
index 86449bebe5..1e1c0dd0b4 100644
--- a/include/gdb/sim-cr16.h
+++ b/include/gdb/sim-cr16.h
@@ -1,6 +1,6 @@
 /* This file defines the interface between the cr16 simulator and gdb.
 
-   Copyright 2008-2012 Free Software Foundation, Inc.
+   Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/sim-d10v.h b/include/gdb/sim-d10v.h
index e40b1fe9e9..9f65191b0e 100644
--- a/include/gdb/sim-d10v.h
+++ b/include/gdb/sim-d10v.h
@@ -1,6 +1,7 @@
 /* This file defines the interface between the d10v simulator and gdb.
 
-   Copyright 1999, 2002, 2007-2012 Free Software Foundation, Inc.
+   Copyright 1999, 2002, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/sim-frv.h b/include/gdb/sim-frv.h
index c7ab2a58ff..fe206b2b05 100644
--- a/include/gdb/sim-frv.h
+++ b/include/gdb/sim-frv.h
@@ -1,6 +1,6 @@
 /* This file defines the interface between the FR-V simulator and GDB.
 
-   Copyright 2003, 2007-2012 Free Software Foundation, Inc.
+   Copyright 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
diff --git a/include/gdb/sim-h8300.h b/include/gdb/sim-h8300.h
index 2b578e8a92..bc1ab7b2e0 100644
--- a/include/gdb/sim-h8300.h
+++ b/include/gdb/sim-h8300.h
@@ -1,5 +1,6 @@
 /* This file defines the interface between the h8300 simulator and gdb.
-   Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/sim-lm32.h b/include/gdb/sim-lm32.h
index 72a26c32a3..ad94a9f35f 100644
--- a/include/gdb/sim-lm32.h
+++ b/include/gdb/sim-lm32.h
@@ -1,7 +1,7 @@
 /* This file defines the interface between the LM32 simulator and GDB.
    Contributed by Jon Beniston <jon@beniston.com>
 
-   Copyright (C) 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/sim-m32c.h b/include/gdb/sim-m32c.h
index 4d74312b8d..2d742f496c 100644
--- a/include/gdb/sim-m32c.h
+++ b/include/gdb/sim-m32c.h
@@ -1,5 +1,6 @@
 /* This file defines the interface between the m32c simulator and gdb.
-   Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/gdb/sim-ppc.h b/include/gdb/sim-ppc.h
index f4562dc917..3b61a5d947 100644
--- a/include/gdb/sim-ppc.h
+++ b/include/gdb/sim-ppc.h
@@ -1,6 +1,6 @@
 /* sim-ppc.h --- interface between PowerPC simulator and GDB.
 
-   Copyright 2004, 2007-2012 Free Software Foundation, Inc.
+   Copyright 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
diff --git a/include/gdb/sim-rx.h b/include/gdb/sim-rx.h
index 783dffe11b..ac3ffe96db 100644
--- a/include/gdb/sim-rx.h
+++ b/include/gdb/sim-rx.h
@@ -1,6 +1,6 @@
 /* sim-rx.h --- interface between RX simulator and GDB.
 
-   Copyright 2008-2012 Free Software Foundation, Inc.
+   Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
diff --git a/include/gdb/sim-sh.h b/include/gdb/sim-sh.h
index ce2bfa5a3e..6c08d2d231 100644
--- a/include/gdb/sim-sh.h
+++ b/include/gdb/sim-sh.h
@@ -1,6 +1,6 @@
 /* This file defines the interface between the sh simulator and gdb.
-   Copyright (C) 2000, 2002, 2004, 2007-2012 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2002, 2004, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/include/libiberty.h b/include/libiberty.h
index cacde800ea..32eb83a049 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -91,10 +91,6 @@ extern void expandargv PARAMS ((int *, char ***));
 
 extern int writeargv PARAMS ((char **, FILE *));
 
-/* Return the number of elements in argv.  */
-
-extern int countargv (char**);
-
 /* Return the last component of a path name.  Note that we can't use a
    prototype here because the parameter is declared inconsistently
    across different systems, sometimes as "char *" and sometimes as
diff --git a/include/mach-o/ChangeLog b/include/mach-o/ChangeLog
index 19eacd0c51..2276d01459 100644
--- a/include/mach-o/ChangeLog
+++ b/include/mach-o/ChangeLog
@@ -1,35 +1,3 @@
-2012-02-23  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* external.h: Add comments about relocations fields.  Add macros
-	for non-scattered relocations.  Move scattered relocation macros to
-	here.
-	* reloc.h: Remove macros related to external representation of reloc
-	fields.
-
-2012-01-12  Iain Sandoe  <idsandoe@googlemail.com>
-
-	* loader.h (BFD_MACH_O_INDIRECT_SYM_LOCAL): New.
-	(BFD_MACH_O_INDIRECT_SYM_ABS): New
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* external.h (mach_o_fvmlib_command_external): New structure.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* loader.h: Update copyright year.
-	(bfd_mach_o_cpu_subtype): Add ARM subtypes.
-
-2012-01-04  Tristan Gingold  <gingold@adacore.com>
-
-	* external.h: Update copyright year.
-	(mach_o_symtab_command_external): Add comments.
-	(mach_o_encryption_info_command_external): New structure.
-
-2011-12-16  Tristan Gingold  <gingold@adacore.com>
-
-	* codesign.h: New file.
-
 2011-08-08  Tristan Gingold  <gingold@adacore.com>
 
 	* loader.h (bfd_mach_o_load_command_type): Add
diff --git a/include/mach-o/external.h b/include/mach-o/external.h
index 41a2932500..ebb09a7761 100644
--- a/include/mach-o/external.h
+++ b/include/mach-o/external.h
@@ -1,5 +1,5 @@
 /* Mach-O support for BFD.
-   Copyright 2011, 2012
+   Copyright 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -116,51 +116,12 @@ struct mach_o_reloc_info_external
 };
 #define BFD_MACH_O_RELENT_SIZE 8
 
-/* Relocations are based on 'address' being a section offset and an assumption
-   that sections are never more than 2^24-1 bytes in size.  Relocation data
-   also carry information on type/size/PC-relative/extern and whether scattered
-   or not [stored in the MSB of the r_address].  */
-
-#define BFD_MACH_O_SR_SCATTERED		0x80000000
-
-/* For a non-scattered reloc, the relocation info is found in r_symbolnum.
-   Bytes 1 to 3 contain the symbol number (0xffffff, in a non-scattered PAIR).  
-   Byte 4 contains the relocation info - but with differing bit-positions
-   dependent on target endian-ness - as below.  */
-
-#define BFD_MACH_O_LE_PCREL		0x01
-#define BFD_MACH_O_LE_LENGTH_SHIFT	1
-#define BFD_MACH_O_LE_EXTERN		0x08
-#define BFD_MACH_O_LE_TYPE_SHIFT	4
-
-#define BFD_MACH_O_BE_PCREL		0x80
-#define BFD_MACH_O_BE_LENGTH_SHIFT	5
-#define BFD_MACH_O_BE_EXTERN		0x10
-#define BFD_MACH_O_BE_TYPE_SHIFT	0
-
-/* The field sizes are the same for both BE and LE.  */
-#define BFD_MACH_O_LENGTH_MASK		0x03
-#define BFD_MACH_O_TYPE_MASK		0x0f
-
-/* For a scattered reloc entry the info is contained in r_address.  There
-   is no need to discriminate on target endian-ness, since the design was
-   arranged to produce the same layout on both.  Scattered relocations are
-   only used for local items, therefore there is no 'extern' field.  */
-
-#define BFD_MACH_O_SR_PCREL		0x40000000
-#define BFD_MACH_O_GET_SR_LENGTH(s)	(((s) >> 28) & 0x3)
-#define BFD_MACH_O_GET_SR_TYPE(s)	(((s) >> 24) & 0x0f)
-#define BFD_MACH_O_GET_SR_ADDRESS(s)	((s) & 0x00ffffff)
-#define BFD_MACH_O_SET_SR_LENGTH(l)	(((l) & 0x3) << 28)
-#define BFD_MACH_O_SET_SR_TYPE(t)	(((t) & 0xf) << 24)
-#define BFD_MACH_O_SET_SR_ADDRESS(s)	((s) & 0x00ffffff)
-
 struct mach_o_symtab_command_external
 {
-  unsigned char symoff[4];	/* File offset of the symbol table.  */
-  unsigned char nsyms[4];	/* Number of symbols.  */
-  unsigned char stroff[4];	/* File offset of the string table.  */
-  unsigned char strsize[4];	/* String table size.  */
+  unsigned char symoff[4];
+  unsigned char nsyms[4];
+  unsigned char stroff[4];
+  unsigned char strsize[4];
 };
 
 struct mach_o_nlist_external
@@ -294,20 +255,6 @@ struct mach_o_version_min_command_external
   unsigned char reserved[4];
 };
 
-struct mach_o_encryption_info_command_external
-{
-  unsigned char cryptoff[4];	/* File offset of the encrypted area.  */
-  unsigned char cryptsize[4];	/* Size of the encrypted area.  */
-  unsigned char cryptid[4];	/* Encryption method.  */
-};
-
-struct mach_o_fvmlib_command_external
-{
-  unsigned char name[4];	/* Offset of the name.  */
-  unsigned char minor_version[4];
-  unsigned char header_addr[4];
-};
-
 struct mach_o_fat_header_external
 {
   unsigned char magic[4];
diff --git a/include/mach-o/loader.h b/include/mach-o/loader.h
index 1b9b15efe3..357f65e546 100644
--- a/include/mach-o/loader.h
+++ b/include/mach-o/loader.h
@@ -1,5 +1,5 @@
 /* Mach-O support for BFD.
-   Copyright 2011, 2012
+   Copyright 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -56,16 +56,7 @@ bfd_mach_o_cpu_type;
 
 typedef enum bfd_mach_o_cpu_subtype
 {
-  /* i386.  */
-  BFD_MACH_O_CPU_SUBTYPE_X86_ALL = 3,
-
-  /* arm.  */
-  BFD_MACH_O_CPU_SUBTYPE_ARM_ALL = 0,
-  BFD_MACH_O_CPU_SUBTYPE_ARM_V4T = 5,
-  BFD_MACH_O_CPU_SUBTYPE_ARM_V6 = 6,
-  BFD_MACH_O_CPU_SUBTYPE_ARM_V5TEJ = 7,
-  BFD_MACH_O_CPU_SUBTYPE_ARM_XSCALE = 8,
-  BFD_MACH_O_CPU_SUBTYPE_ARM_V7 = 9
+  BFD_MACH_O_CPU_SUBTYPE_X86_ALL = 3
 }
 bfd_mach_o_cpu_subtype;
 
@@ -255,9 +246,6 @@ bfd_mach_o_section_type;
 
 typedef enum bfd_mach_o_section_attribute
 {
-  /* Section has no specified attibutes.  */
-  BFD_MACH_O_S_ATTR_NONE              = 0,
-
   /* Section has local relocation entries.  */
   BFD_MACH_O_S_ATTR_LOC_RELOC         = 0x00000100,
 
@@ -320,9 +308,6 @@ bfd_mach_o_section_attribute;
 #define BFD_MACH_O_N_NO_DEAD_STRIP				0x20
 #define BFD_MACH_O_N_WEAK_REF					0x40
 #define BFD_MACH_O_N_WEAK_DEF					0x80
-
-#define BFD_MACH_O_INDIRECT_SYM_LOCAL			0x80000000
-#define BFD_MACH_O_INDIRECT_SYM_ABS			0x40000000
 
 /* Thread constants.  */
 
diff --git a/include/mach-o/reloc.h b/include/mach-o/reloc.h
index bab31efeb9..93ebb8b5fc 100644
--- a/include/mach-o/reloc.h
+++ b/include/mach-o/reloc.h
@@ -1,5 +1,5 @@
 /* Mach-O support for BFD.
-   Copyright 2011, 2012
+   Copyright 2011
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -22,6 +22,26 @@
 #ifndef _MACH_O_RELOC_H
 #define _MACH_O_RELOC_H
 
+/* Fields for a normal (non-scattered) entry.  */
+#define BFD_MACH_O_R_PCREL		0x01000000
+#define BFD_MACH_O_GET_R_LENGTH(s)	(((s) >> 25) & 0x3)
+#define BFD_MACH_O_R_EXTERN		0x08000000
+#define BFD_MACH_O_GET_R_TYPE(s)	(((s) >> 28) & 0x0f)
+#define BFD_MACH_O_GET_R_SYMBOLNUM(s)	((s) & 0x00ffffff)
+#define BFD_MACH_O_SET_R_LENGTH(l)	(((l) & 0x3) << 25)
+#define BFD_MACH_O_SET_R_TYPE(t)	(((t) & 0xf) << 28)
+#define BFD_MACH_O_SET_R_SYMBOLNUM(s)	((s) & 0x00ffffff)
+
+/* Fields for a scattered entry.  */
+#define BFD_MACH_O_SR_SCATTERED		0x80000000
+#define BFD_MACH_O_SR_PCREL		0x40000000
+#define BFD_MACH_O_GET_SR_LENGTH(s)	(((s) >> 28) & 0x3)
+#define BFD_MACH_O_GET_SR_TYPE(s)	(((s) >> 24) & 0x0f)
+#define BFD_MACH_O_GET_SR_ADDRESS(s)	((s) & 0x00ffffff)
+#define BFD_MACH_O_SET_SR_LENGTH(l)	(((l) & 0x3) << 28)
+#define BFD_MACH_O_SET_SR_TYPE(t)	(((t) & 0xf) << 24)
+#define BFD_MACH_O_SET_SR_ADDRESS(s)	((s) & 0x00ffffff)
+
 /* Generic relocation types (used by i386).  */
 #define BFD_MACH_O_GENERIC_RELOC_VANILLA 	0
 #define BFD_MACH_O_GENERIC_RELOC_PAIR	 	1
diff --git a/include/obstack.h b/include/obstack.h
index 23487ba4f4..4aec3a484e 100644
--- a/include/obstack.h
+++ b/include/obstack.h
@@ -532,9 +532,9 @@ __extension__								\
 # define obstack_free(h,obj)						\
 ( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
   (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
-   ? (((h)->next_free = (h)->object_base				\
-	    = (h)->temp + (char *) (h)->chunk), 0)			\
-   : ((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0)))
+   ? (int) ((h)->next_free = (h)->object_base				\
+	    = (h)->temp + (char *) (h)->chunk)				\
+   : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
 
 #endif /* not __GNUC__ or not __STDC__ */
 
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 07571e0b00..8f070a10d4 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,47 +1,3 @@
-2012-03-10  Edmar Wienskoski  <edmar@freescale.com>
-
-	* ppc.h: Add PPC_OPCODE_ALTIVEC2, PPC_OPCODE_E6500, PPC_OPCODE_TMR.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* crx.h (cst4_map): Update declaration.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* tilegx.h (tilegx_mnemonic): Add TILEGX_OPC_LD4S_TLS,
-	TILEGX_OPC_LD_TLS.
-	* tilepro.h (tilepro_mnemonic): Add TILEPRO_OPC_LW_TLS,
-	TILEPRO_OPC_LW_TLS_SN.
-
-2012-02-08  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* i386.h (XACQUIRE_PREFIX_OPCODE): New.
-	(XRELEASE_PREFIX_OPCODE): Likewise.
-
-2011-12-08  Andrew Pinski  <apinski@cavium.com>
-            Adam Nemet  <anemet@caviumnetworks.com>
-
-	* mips.h (INSN_CHIP_MASK): Update according to INSN_OCTEON2.
-	(INSN_OCTEON2): New macro.
-	(CPU_OCTEON2): New macro.
-	(OPCODE_IS_MEMBER): Add Octeon2.
-
-2011-11-29  Andrew Pinski  <apinski@cavium.com>
-
-	* mips.h (INSN_CHIP_MASK): Update according to INSN_OCTEONP.
-	(INSN_OCTEONP): New macro.
-	(CPU_OCTEONP): New macro.
-	(OPCODE_IS_MEMBER): Add Octeon+.
-	(M_SAA_AB, M_SAAD_AB, M_SAA_OB, M_SAAD_OB): New enum values.
-
-2011-11-01  DJ Delorie  <dj@redhat.com>
-
-	* rl78.h: New file.
-
-2011-10-24  Maciej W. Rozycki  <macro@codesourcery.com>
-
-	* mips.h: Fix a typo in description.
-
 2011-09-21  David S. Miller  <davem@davemloft.net>
 
 	* sparc.h (struct sparc_opcode): Expand 'flags' to unsigned int.
diff --git a/include/opcode/crx.h b/include/opcode/crx.h
index 6081ea3548..5c484bf26b 100644
--- a/include/opcode/crx.h
+++ b/include/opcode/crx.h
@@ -1,5 +1,5 @@
 /* crx.h -- Header file for CRX opcode and register tables.
-   Copyright 2004, 2010, 2012 Free Software Foundation, Inc.
+   Copyright 2004, 2010 Free Software Foundation, Inc.
    Contributed by Tomer Levi, NSC, Israel.
    Originally written for GAS 2.12 by Tomer Levi, NSC, Israel.
    Updates, BFDizing, GNUifying and ELF support by Tomer Levi.
@@ -384,7 +384,7 @@ extern const int crx_num_traps;
 #define NUMTRAPS crx_num_traps
 
 /* cst4 operand mapping.  */
-extern const int cst4_map[];
+extern const long cst4_map[];
 extern const int cst4_maps;
 
 /* Table of instructions with no operands.  */
diff --git a/include/opcode/i386.h b/include/opcode/i386.h
index ad6d3c6755..b635334e41 100644
--- a/include/opcode/i386.h
+++ b/include/opcode/i386.h
@@ -76,8 +76,6 @@
 #define SS_PREFIX_OPCODE 0x36
 #define REPNE_PREFIX_OPCODE 0xf2
 #define REPE_PREFIX_OPCODE  0xf3
-#define XACQUIRE_PREFIX_OPCODE 0xf2
-#define XRELEASE_PREFIX_OPCODE 0xf3
 
 #define TWO_BYTE_OPCODE_ESCAPE 0x0f
 #define NOP_OPCODE (char) 0x90
diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index fb9094c26f..e6703f81a4 100644
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -713,12 +713,10 @@ static const unsigned int mips_isa_table[] =
   { 0x0001, 0x0003, 0x0607, 0x1e0f, 0x3e1f, 0x0a23, 0x3e63, 0x3ebf, 0x3fff };
 
 /* Masks used for Chip specific instructions.  */
-#define INSN_CHIP_MASK		  0xc3ff0f20
+#define INSN_CHIP_MASK		  0xc3ff0c20
 
 /* Cavium Networks Octeon instructions.  */
 #define INSN_OCTEON		  0x00000800
-#define INSN_OCTEONP		  0x00000200
-#define INSN_OCTEON2		  0x00000100
 
 /* Masks used for MIPS-defined ASEs.  */
 #define INSN_ASE_MASK		  0x3c00f010
@@ -825,8 +823,6 @@ static const unsigned int mips_isa_table[] =
 #define CPU_LOONGSON_2F 3002
 #define CPU_LOONGSON_3A 3003
 #define CPU_OCTEON	6501
-#define CPU_OCTEONP	6601
-#define CPU_OCTEON2	6502
 #define CPU_XLR     	887682   	/* decimal 'XLR'   */
 
 /* Test for membership in an ISA including chip specific ISAs.  INSN
@@ -863,10 +859,6 @@ static const unsigned int mips_isa_table[] =
          && ((insn)->membership & INSN_LOONGSON_3A) != 0)               \
      || (cpu == CPU_OCTEON						\
 	 && ((insn)->membership & INSN_OCTEON) != 0)			\
-     || (cpu == CPU_OCTEONP						\
-	 && ((insn)->membership & INSN_OCTEONP) != 0)			\
-     || (cpu == CPU_OCTEON2						\
-	 && ((insn)->membership & INSN_OCTEON2) != 0)			\
      || (cpu == CPU_XLR && ((insn)->membership & INSN_XLR) != 0)        \
      || 0)	/* Please keep this term for easier source merging.  */
 
@@ -1073,10 +1065,6 @@ enum
   M_S_DOB,
   M_S_DAB,
   M_S_S,
-  M_SAA_AB,
-  M_SAA_OB,
-  M_SAAD_AB,
-  M_SAAD_OB,
   M_SC_AB,
   M_SC_OB,
   M_SCD_AB,
@@ -1628,7 +1616,7 @@ extern const int bfd_mips16_num_opcodes;
    "c" 10-bit higher breakpoint code (MICROMIPSOP_*_CODE)
    "d" 5-bit destination register specifier (MICROMIPSOP_*_RD)
    "h" 5-bit PREFX hint (MICROMIPSOP_*_PREFX)
-   "i" 16-bit unsigned immediate (MICROMIPSOP_*_IMMEDIATE)
+   "i" 16 bit unsigned immediate (MICROMIPSOP_*_IMMEDIATE)
    "j" 16-bit signed immediate (MICROMIPSOP_*_DELTA)
    "k" 5-bit cache opcode in target register position (MICROMIPSOP_*_CACHE)
    "n" register list for 32-bit LWM/SWM instruction (MICROMIPSOP_*_RT)
diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index e672502e36..a0119dc0a9 100644
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -1,6 +1,6 @@
 /* ppc.h -- Header file for PowerPC opcode table
    Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
    This file is part of GDB, GAS, and the GNU binutils.
@@ -174,15 +174,6 @@ extern const int powerpc_num_opcodes;
 /* Opcode which is supported by the e500 family */
 #define PPC_OPCODE_E500	       0x100000000ull
 
-/* Opcode is supported by Extended Altivec Vector Unit */
-#define PPC_OPCODE_ALTIVEC2    0x200000000ull
-
-/* Opcode is supported by Power E6500 */
-#define PPC_OPCODE_E6500       0x400000000ull
-
-/* Opcode is supported by Thread management APU */
-#define PPC_OPCODE_TMR         0x800000000ull
-
 /* A macro to extract the major opcode from an instruction.  */
 #define PPC_OP(i) (((i) >> 26) & 0x3f)
 
diff --git a/include/opcode/tilegx.h b/include/opcode/tilegx.h
index c11fc16615..95a9ca7d29 100644
--- a/include/opcode/tilegx.h
+++ b/include/opcode/tilegx.h
@@ -34,8 +34,6 @@ typedef enum
   TILEGX_OPC_BPT,
   TILEGX_OPC_INFO,
   TILEGX_OPC_INFOL,
-  TILEGX_OPC_LD4S_TLS,
-  TILEGX_OPC_LD_TLS,
   TILEGX_OPC_MOVE,
   TILEGX_OPC_MOVEI,
   TILEGX_OPC_MOVELI,
diff --git a/include/opcode/tilepro.h b/include/opcode/tilepro.h
index 767926bdaf..91e2a2bdb2 100644
--- a/include/opcode/tilepro.h
+++ b/include/opcode/tilepro.h
@@ -36,8 +36,6 @@ typedef enum
   TILEPRO_OPC_INFOL,
   TILEPRO_OPC_J,
   TILEPRO_OPC_JAL,
-  TILEPRO_OPC_LW_TLS,
-  TILEPRO_OPC_LW_TLS_SN,
   TILEPRO_OPC_MOVE,
   TILEPRO_OPC_MOVE_SN,
   TILEPRO_OPC_MOVEI,
diff --git a/include/vms/ChangeLog b/include/vms/ChangeLog
index bb2dfebe8f..788d8d80c5 100644
--- a/include/vms/ChangeLog
+++ b/include/vms/ChangeLog
@@ -1,7 +1,3 @@
-2012-03-08  Tristan Gingold  <gingold@adacore.com>
-
-	* lbr.h (struct vms_lhd): Add comments.
-
 2010-05-27  Tristan Gingold  <gingold@adacore.com>
 
 	* lbr.h: Improve comments.
diff --git a/include/vms/lbr.h b/include/vms/lbr.h
index fd3c256ad8..bdb436aa70 100644
--- a/include/vms/lbr.h
+++ b/include/vms/lbr.h
@@ -87,10 +87,7 @@ struct vms_lhd
   unsigned char nextvbn[4];
 
   /* Free pre-allocated index block.  */
-  /* Number of free blocks.  */
   unsigned char freidxblk[4];
-  /* VBN of a simply linked list of free blocks.  The list is terminated by a
-     nul VBN.  */
   unsigned char freeidx[4];
 
   /* Highest pre-allocated index block and in use.  */
diff --git a/ld/ChangeLog b/ld/ChangeLog
index cd32f62145..f5fa6ff530 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,277 +1,967 @@
-2012-03-27  Roland McGrath  <mcgrathr@google.com>
-
-	* configure.in: Set want64 on a 64-bit host regardless of
-	--enable-targets=all.
-	* configure: Regenerated.
-
-2012-03-26  Tristan Gingold  <gingold@adacore.com>
-
-	* lexsup.c (parse_args): Add a missing '\n'.
-
-2012-03-25  Alan Modra  <amodra@gmail.com>
-
-	* ldemul.c (before_allocation_default): Revert last change.
-	ldlang.c (lang_add_section): Likewise.
-	(strip_excluded_output_sections): Don't strip output sections with
-	user input sections when emitrelocations, unless all are SEC_EXCLUDE.
-
-2012-03-23  Alan Modra  <amodra@gmail.com>
-
-	* ldemul.c (before_allocation_default): When emitrelocations,
-	don't strip sections..
-	* ldlang.c (lang_add_section): ..and don't set up map_head, map_tail.
-
-2012-03-14  Kai Tietz  <ktietz@redhat.com>
-	    Pascal Obry  <pascal@obry.net>
-
-	* pe-dll.c (found_sym): New static variable.
-	(undef_count): Likewise.
-	(key_value): New structure.
-	(undef_sort_cmp): Compare routine for qsort/bsearch.
-	(pe_find_cdecl_alias_match): Add new argument.
-	(pe_undef_alias_cdecl_match): Removed.
-	(pe_undef_count): New helper routine.
-	(pe_create_undef_table): Likewise.
-	(pe_process_import_defs): Use pe_create_undef_table and
-	new pe_undef_alias_cdecl_match function.
-
-2012-03-14  Alan Modra  <amodra@gmail.com>
-
-	PR ld/13839
-	* ldexp.c (fold_name): Ignore undefined symbols when assigning to
-	dot in mark phase.
-	(exp_fold_tree_1): Evaluate assignment to dot expressions even when
-	discarding result, for side effects.  Fix typo in error message.
-
-2012-03-08  Tristan Gingold  <gingold@adacore.com>
-
-	* ldexp.c (exp_print_tree): Special case for SEGMENT_START.
-	(exp_print_token): Constify.
-
-2012-03-08  Alan Modra  <amodra@gmail.com>
-
-	PR ld/10340
-	* ldfile.c (is_sysrooted_pathname): Remove notsame param.
-	(ldfile_add_library_path): Don't set sysrooted flag.
-	(ldfile_open_file_search): Likewise, and don't copy them.
-	(try_open): Delete exten and code handling such.  Add sysrooted
-	param and return whether path is in sysroot.
-	(ldfile_find_command_file): Delete extend param.  Add sysrooted
-	param.  Rename local var.  Update try_open calls.
-	(ldfile_open_command_file_1): Pass sysrooted to lex_push_file.
-	* ldfile.h (search_dirs_type): Remove sysrooted field.
-	* ldlang.c (new_afile): Always set sysrooted from input_flags.
-	(load_symbols): Don't set input_flags.sysrooted.
-	* ldlang.h (struct lang_input_statement_flags): Revise sysrooted
-	comment.
-	* ldlex.h (lex_push_file): Update prototype.
-	* ldlex.l (sysrooted_stack): New array.
-	(EOF): Pop input_flags.sysrooted.
-	(lex_push_file): Add sysrooted param.  Save and set
-	input_flags.sysrooted.
-
-2012-03-06  Alan Modra  <amodra@gmail.com>
-
-	* ldlang.h (struct lang_input_statement_flags): New, extract from..
-	(lang_input_statement_type): ..here.  New field "flags".
-	(input_flags): Declare.
-	(missing_file): Delete.
-	* ldmain.h (whole_archive): Delete.
-	(add_DT_NEEDED_for_regular, add_DT_NEEDED_for_dynamic): Delete.
-	* ld.h (ld_config_type <dynamic_link>): Delete.
-	* ldmain.c (whole_archive): Delete.
-	(add_DT_NEEDED_for_regular, add_DT_NEEDED_for_dynamic): Delete.
-	* ldlang.c (missing_file, ldlang_sysrooted_script): Delete.
-	(input_flags): New variable.  Replace all uses of config.dynamic_link,
-	missing_file, ldlang_sysrooted_script, whole_archive,
-	add_DT_NEEDED_for_regular and add_DT_NEEDED_for_dynamic with fields
-	from here.
-	* ldfile.c: Likewise.
-	* ldgram.y: Likewise.
-	* ldmain.c: Likewise.
-	* ldwrite.c: Likewise.
-	* lexsup.c: Likewise.
+2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	Backport from mainline:
+	2011-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.tgt (x86_64-*-solaris2*): Use $targ_extra_emuls for
+	targ_extra_libpath.
+
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-20  Alan Modra  <amodra@gmail.com>
+	PR ld/13287
+	* plugin.c (plugin_should_reload): New function.
+	* plugin.h (plugin_should_reload): Declare.
+	* ldlang.c (open_input_bfds): Use above function.
+
+	2011-10-19  Alan Modra  <amodra@gmail.com>
+	PR ld/13254
+	* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Add
+	-z text, -z notext, -z textoff options for all targets having
+	shared lib support.
+
+	2011-10-15  Alan Modra  <amodra@gmail.com>
+	* emultempl/ppc64elf.em (gld${EMULATION_NAME}_finish): Remove toc check.
+
+	2011-10-10  Alan Modra  <amodra@gmail.com>
+	* ldmain.c (main): Move code twiddling various config and link_info
+	bits to..
+	* lexsup.c (parse_args): ..here.  Move plugin_load_plugins call
+	into main.
+	* plugin.c (set_tv_header): Test link_info.executable, not
+	link_info.shared.
+	(is_visible_from_outside): Likewise.  Delete redundant
+	is_ir_dummy_bfd check and "section" parameter.
+
+	2011-10-10  Alan Modra  <amodra@gmail.com>
+	* emultempl/ppc64elf.em (ppc_add_stub_section): Align to 32 bytes.
+
+	2011-10-06  Alan Modra  <amodra@gmail.com>
+	PR ld/13229
+	* plugin.c (tv_header_tags): Add LDPT_GET_SYMBOLS_V2.
+	(set_tv_header): Handle it.  Adjust LDPT_GET_SYMBOLS.  Return void.
+	(get_symbols): Add def_ironly_exp param.  Return that value for
+	syms exported from shared libs.
+	(get_symbols_v1, get_symbols_v2): New wrapper functions.
+	* testplug.c: Update for above changes.
+
+2011-10-13  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* pe-dll.c (generate_reloc): Don't emit a base reloc for an
+	underlying BFD reloc that will be discarded in eh_frame data.
+
+2011-09-22  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add marker for 2.22.
+
+2011-09-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13201
+	* ldlang.h (lang_input_statement_type): Add "reload" bitfield.
+	Clarify comments.
+	* ldlang.c (new_afile): Init new field.
+	(load_symbols): Don't call ldlang_add_file when reloading.
+	(open_input_bfds): Reload as-needed libs during plugin rescan.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12975
+	* ldlang.c (lang_elf_version_info): Removed.
+	(lang_register_vers_node): Replace lang_elf_version_info with
+	link_info.version_info.
+	(lang_add_vers_depend): Likewise.
+	* pe-dll.c (process_def_file_and_drectve): Likewise.
+	* emultempl/solaris2.em (elf_solaris2_before_allocation): Likewise.
+
+	* ldlang.h (lang_elf_version_info): Removed.
+
+	* plugin.c  (is_visible_from_outside): Check if symbol is hidden
+	by version script.
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_before_allocation):
+	Remove lang_elf_version_info.
+
+2011-09-15  Dmitry Gorbachev  <d.g.gorbachev@gmail.com>
+
+	PR ld/13183
+	* ldmain.c (add_archive_element): Support thin archive member
+	for LTO.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* NEWS: Mention that --no-copy-dt-needed-entries is now the
+	default.
+
+2011-08-22  Michael Matz  <matz@suse.de>
+
+	* ldmain.c (add_DT_NEEDED_for_dynamic): Default to FALSE.
+	* ld.texinfo (--copy-dt-needed-entries): Mention new default.
+
+2011-08-17  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12762
+	* ldlang.c (section_already_linked): Revert 2011-07-09 changes.
 	* plugin.c: Likewise.
-	* emultempl/aix.em: Likewise.
-	* emultempl/armelf.em: Likewise.
-	* emultempl/elf32.em: Likewise.
-	* emultempl/hppaelf.em: Likewise.
-	* emultempl/linux.em: Likewise.
-	* emultempl/pe.em: Likewise.
-	* emultempl/pep.em: Likewise.
-	* emultempl/ppc64elf.em: Likewise.
-	* emultempl/scoreelf.em: Likewise.
-	* emultempl/spuelf.em: Likewise.
-	* emultempl/sunos.em: Likewise.
-	* emultempl/vms.em: Likewise.
-	* ldlang.c (new_afile): Use memset to init zero fields.
-	(load_symbols): Simplify save and restore of flags around command
-	file processing.
-	* ldfile.c (is_sysrooted_pathname): Tidy.
-
-2012-03-05  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.tgt (mips64*el-*-freebsd*, mips64*-*-freebsd*)
-	(mips*el-*-freebsd*, mips*-*-freebsd*): Correct triplets by
-	replacing trailing "-*" with "*".
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* Makefile.am (ALL_EMULATION_SOURCES): Add eelf32tilegx_be.c.
-	(ALL_64_EMULATION_SOURCES): Add eelf64tilegx_be.c.
-	(eelf32tilegx_be.c): Add rule to build this file.
-	(eelf64tilegx_be.c): Ditto.
+	(asymbol_from_plugin_symbol): Create linkonce section for syms
+	with comdat_key.
+
+2011-08-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* emultempl/armelf.em (fix_arm1176): New variable.
+	(arm_elf_create_output_section_statements): Pass
+	fix_arm1176 option to bfd backend.
+	(OPTION_FIX_ARM1176): New define.
+	(OPTION_NO_FIX_ARM1176): Likewise.
+	(PARSE_AND_LIST_LONGOPTS): Add new command line options.
+	(PARSE_AND_LIST_OPTIONS): Likewise.
+	(PARSE_AND_LIST_ARGS_CASES): Likewise.
+	* ld.texinfo: Document new command line options.
+
+2011-08-09  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13066
+	* plugin.c (add_symbols): Revert 2011-08-05.
+
+2011-08-06  Kai Tietz  <ktietz@redhat.com>
+
+	* scripttempl/pep.sc: Add .debug_macro section.
+	* scripttempl/pe.sc: Likewise.
+
+2011-08-05  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12762
+	* plugin.c (add_symbols): Exclude comdat_key symbols from symbol
+	table if already seen.
+
+2011-08-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ldmain.c (main): Replace remove_output with ld_cleanup in
+	comments.
+
+2011-07-26  Alan Modra  <amodra@gmail.com>
+
+	* emulparams/elf32ppc.sh: Source plt_unwind.sh.
+	* emulparams/elf64ppc.sh: Likewise.
+	* emultempl/ppc32elf.em (OPTION_NO_TLS_OPT): Adjust.
+	(PARSE_AND_LIST_PROLOGUE, PARSE_AND_LIST_LONGOPTS,
+	PARSE_AND_LIST_OPTIONS, PARSE_AND_LIST_ARGS_CASES): Append to
+	existing values.
+	* emultempl/ppc64elf.em (OPTION_STUBGROUP_SIZE): Adjust.
+	(PARSE_AND_LIST_PROLOGUE, PARSE_AND_LIST_LONGOPTS,
+	PARSE_AND_LIST_OPTIONS, PARSE_AND_LIST_ARGS_CASES): Append to
+	existing values.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (ALL_64_EMULATIONS): Add eelf_k1om.o and
+	eelf_k1om_fbsd.o
+	(eelf_k1om.c): New.
+	(eelf_k1om_fbsd.c): Likewise.
+	* Makefile.in: Regenerated.
+
+	* configure.tgt (targ64_extra_emuls): Add elf_k1om if elf_x86_64
+	is supported.  Add elf_k1om_fbsd if elf_x86_64_fbsd is supported.
+	(targ_extra_emuls): Likewise.
+
+	* emulparams/elf_k1om.sh: New.
+	* emulparams/elf_k1om_fbsd.sh: Likewise.
+
+2011-07-16  Roland McGrath  <roland@hack.frob.com>
+
+	* ld.h (args_type): New field print_output_format.
+	* lexsup.c (enum option_values, ld_options, parse_args):
+	Handle --print-output-format.
+	* ldmain.c (main): Implement --print-output-format.
+	* ld.texinfo (Options): Document it.
+
+	* ldlang.c (lang_get_output_target): Don't return current_target
+	when it's NULL.
+
+2011-07-15  Alan Modra  <amodra@gmail.com>
+
+	* Makefile.am (e*.c): Sort.
 	* Makefile.in: Regenerate.
-	* configure.tgt (tilegx-*-*): Support big endian.
-	(tilegxbe-*-*): New.
-	* emulparams/elf32tilegx.sh (OUTPUT_FORMAT): Rename.
-	(BIG_OUTPUT_FORMAT): Define.
-	(LITTLE_OUTPUT_FORMAT): Define.
-	* emulparams/elf32tilegx_be.sh: New.
-	* emulparams/elf64tilegx.sh (OUTPUT_FORMAT): Rename.
-	(BIG_OUTPUT_FORMAT): Define.
-	(LITTLE_OUTPUT_FORMAT): Define.
-	* emulparams/elf64tilegx_be.sh: New.
-
-2012-02-24  Kai Tietz  <ktietz@redhat.com>
-
-	PR binutils/13710
-	* deffilep.y (keyword_as_name): Disable LIBRARY
-	keyword.
-
-2012-02-22  Alan Modra  <amodra@gmail.com>
-
-	PR ld/13683
-	* ldlang.c (lang_process): Rerun lang_do_assignments before
-	starting garbage collection.
-	* ldexp.c (fold_name): Generate a reloc for defined symbols
-	found without an associated output section during the mark phase.
-	(exp_fold_tree_1): Continue processing an expression, even if we
-	are unable to fold it, if we are in the first two evaluation
-	phases.
-	* ldexp.h (enum lang_phase_type): Add descriptions of the phases.
-
-2012-02-19  Kai Tietz  <ktietz@redhat.com>
-
-	* deffilep.y (cmp_import_elem): Sort first by module name.
-	* pe-dll.c (process_def_file_and_drectve): Free strings
-	from removed export-element.
-	(add_bfd_to_link): Optimize loop on import-elements and lower
-	allocated memory.
-	(pe_implied_import_dll): Pass NULL instead of 0 for pointer
-	argument.
-
-2012-02-18  Hans-Peter Nilsson  <hp@axis.com>
-
-	* ldmisc.c (vfinfo <%S>): Use same type and avoid cast for
-	temporary variable node used for NULL argument.
-
-2012-02-18  Alan Modra  <amodra@gmail.com>
-
-	PR ld/13343
-	* ld.h (parsing_defsym): Delete.
-	* ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename.
-	(fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill,
-	exp_get_abs_int): Add tree arg for %S in error messages.  Don't
-	fudge lineno.
-	(exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy
-	type.filename from sub-tree.
-	(exp_trinop): Likewise, and use "cond" rather than "lhs".
-	* ldexp.h (node_type): Add filename field to struct.
-	* ldfile.c (ldfile_input_filename): Delete.  Remove all refs.
-	* ldfile.h (ldfile_input_filename): Delete.
-	* ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for
-	%S in error messages.
-	* ldemul.c (syslib_default, hll_default): Likewise.
-	* ldlang.c (lang_memory_region_lookup, lang_memory_region_alias,
-	lang_get_regions, lang_new_phdr): Likewise.
-	(lang_size_sections_1): Pass addr_tree for %S.
-	* ldlex.h (lex_redirect): Update prototype.
-	(ldlex_filename): Declare.
-	* ldlex.l (<EOF>): Don't set ldfile_input_filename.
-	(lex_redirect): Add fake_filename and count params.  Push
-	fake_filename to file_name_stack and init lineno from count.
-	(ldlex_filename): New function.
-	(lex_warn_invalid): Use above.
-	* ldmain.c (main): Update lex_redirect call.
-	* ldmisc.c (vfinfo <%S>): Take file name and line number from
-	etree_type arg, or use current if arg is NULL.
-	* lexsup.c (parsing_defsym): Delete.
-	(parse_args <OPTION_DEFSYM>): Update lex_redirect call.
-
-2012-02-13  Kai Tietz  <ktietz@redhat.com>
-
-	* deffilep.y (find_export_in_list): Set is_indent for
-	first or last element, if identical.
-	(find_import_in_list): Likewise.
-
-2012-02-11  Kai Tietz  <ktietz@redhat.com>
-
-	* deffilep.y (%union): New type id_const.
-	(opt_name2): New rule.
-	(keyword_as_name): New rule.
-	(dot_name): Replaced by opt_name2 rule.
-	(opt_name): Adjust rule.
-	(opt_equal_name): Likewise.
-
-2012-02-11  Pascal Obry  <pascal@obry.net>
-
-	* pe-dll.c (auto_export): Use bsearch to speed up scan of exports
-	table.
-	(process_def_file_and_drectve): Maintain sorting of exports table
-	after stripping leading @ signs.
-
-2012-02-09  Alan Modra  <amodra@gmail.com>
-
-	* ldgram.y (input_section_spec_no_keep): Don't ignore sect_flags.
-
-2012-01-31  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR ld/13616
-	* emulparams/elf32_x86_64.sh: Remove NOP.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option,
+	gld${EMULATION_NAME}_list_options): Don't condition -z relro
+	and -z norelro on COMMONPAGESIZE being defined.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* emultempl/ppc64elf.em (plt_static_chain): New var.
+	(gld${EMULATION_NAME}_after_allocation): Pass to ppc64_elf_size_stubs.
+	(PARSE_AND_LIST_PROLOGUE, PARSE_AND_LIST_LONGOPTS,
+	PARSE_AND_LIST_OPTIONS, PARSE_AND_LIST_ARGS_CASES): Handle
+	--plt-static-chain and --no-plt-static-chain.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_add_options,
+	gld${EMULATION_NAME}_handle_option, gld${EMULATION_NAME}_list_options):
+	Provide --build-id, -z defs, -z muldefs, -z max-page-size,
+	-z common-page-size, -z execstack, -z noexecstack for all targets.
+	Add help for --exclude-libs.
+	(OPTION_LD_GENERATED_UNWIND_INFO,
+	OPTION_NO_LD_GENERATED_UNWIND_INFO): Move this..
+	(gld${EMULATION_NAME}_handle_option): ..and code handling
+	--ld-generated-unwind-info and --no-ld-generated-unwind-info..
+	* emulparams/plt_unwind.sh: ..to here.  New file.  Add help.
+	* emulparams/elf32_x86_64.sh: Include plt_unwind.sh.
 	* emulparams/elf_i386.sh: Likewise.
-	* emulparams/elf_i386_be.sh: Likewise.
+	* emulparams/elf_i386_chaos.sh: Likewise.
 	* emulparams/elf_i386_ldso.sh: Likewise.
-	* emulparams/elf_i386_vxworks.sh: Likewise.
-	* emulparams/elf_k1om.sh: Likewise.
 	* emulparams/elf_l1om.sh: Likewise.
 	* emulparams/elf_x86_64.sh: Likewise.
 
-	* ldlang.c (zero_fill): Initialized to 0.
+2011-07-11  Catherine Moore  <clm@codesourcery.com>
+
+	* ld.h (section_flag_list): Add field to struct wildcard_spec.
+	* ld.texinfo (INPUT_SECTION_FLAGS): Document.
+	* ldgram.y (flag_info_list, flag_info): Add to union.
+	(INPUT_SECTION_FLAGS): New token.
+	(wildcard_spec): Initialize section_flag_list to NULL for
+	each alternative.
+	(sect_flag_list, sect_flags): New rules.
+	(input_section_spec_no_keep): Add alternatives to recognize
+	sect_flags.
+	* ldlang.c (walk_wild_consider_section): Initialize
+	section_flag_info field of the section struct.
+	(lang_add_section): Check input section flags.
+	(lang_add_wild): Initialize section_flag_list field of
+	the statement struct.
+	* ldlang.h (lang_input_statement_struct): Add section_flag_list field.
+	(lang_wild_statement_struct): Likewise.
+	* ldlex.l (INPUT_SECTION_FLAGS): New token.
+	* mri.c (mri_draw_tree): Initialize section_flag_list to NULL.
+	* NEWS: Announce INPUT_SECTION_FLAGS enhancement.
+
+2011-07-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12942
+	* ldlang.c (section_already_linked): Pass "struct already_linked *"
+	to bfd_section_already_linked.
+	(lang_process): Set link_info.loading_lto_outputs before
+	loading LTO outputs.
+	* plugin.c: Include "libbfd.h".
+	(add_symbols): Call bfd_section_already_linked with comdat_key.
+
+2011-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.tgt: Revert x32 change.
+
+2011-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/12570
+	* emultempl/elf32.em (OPTION_LD_GENERATED_UNWIND_INFO,
+	OPTION_NO_LD_GENERATED_UNWIND_INFO): Define.
+	(gld${EMULATION_NAME}_handle_option): Handle
+	--ld-generated-unwind-info and --no-ld-generated-unwind-info.
+	* ld.texinfo (--ld-generated-unwind-info,
+	--no-ld-generated-unwind-info): Document.
+
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.tgt: Support x32.
+
+2011-06-15  Nick Clifton  <nickc@redhat.com>
+
+	* NEWS: Mention addition of TILEPRO and TIKE-Gx support.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* Makefile.am (ALL_EMULATION_SOURCES): Add eelf32tilegx.c and
+	eelf32tilepro.c.
+	(ALL_64_EMULATION_SOURCES): Add eelf64tilegx.c.
+	(eelf32tilegx.c): New target.
+	(eelf32tilepro.c): Likewise.
+	(eelf64tilegx.c): Likewise.
+	* Makefile.in: Regenerate.
+	* configure.tgt: Handle tilegx-*-* and tilepro-*-*.
+	* emulparams/elf32tilegx.sh: New file.
+	* emulparams/elf64tilegx.sh: New file.
+	* emulparams/elf32tilepro.sh: New file.
+
+2011-06-13  Alan Modra  <amodra@gmail.com>
+
+	* ldlang.c (sort_def_symbol, lang_one_common): Don't handle
+	warning symbols here.
+	* emultempl/pe.em (pr_sym): Remove redundant test.
+	* emultempl/pep.em (pr_sym): Likewise.
+
+2011-06-09  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12845
+	* emultempl/mipself.em (mips_add_stub_section): Do not add stubs
+	for sections that have been removed by garbage collection.
+
+2011-06-08  Alan Modra  <amodra@gmail.com>
+
+	* ldlang.c (lang_one_common): Handle warning symbols.
+
+2011-06-07  Nick Clifton  <nickc@redhat.com>
+
+	* configure.tgt: Accept any V850 architecture.
+
+2011-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.am (ALL_EMULATION_SOURCES): Add eelf32am33lin.c
+	Add rule to build eelf32am33lin.c
+	* Makefile.in: Regenerate.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* lexsup.c: Fix spelling mistake in comment.
+	* scripttempl/epocpe.sc: Likewise.
+	* scripttempl/i386beos.sc: Likewise.
+	* scripttempl/mcorepe.sc: Likewise.
+	* scripttempl/pe.sc: Likewise.
+	* scripttempl/pep.sc: Likewise.
+	* po/ld.pot: Regenerate.
+
+2011-05-27  Nick Clifton  <nickc@redhat.com>
+
+	* scripttempl/v850.sc (_heap_start): Provide.
+
+2011-05-23  Alan Modra  <amodra@gmail.com>
+
+	* ldmisc.c (vfinfo): Add %H.
+	* ldmain.c (reloc_overflow): Use %H rather than %C.
+	(reloc_dangerous, unattached_reloc): Likewise.
+
+2011-05-23  Alan Modra  <amodra@gmail.com>
+
+	PR 12763
+	* ldlang.c (lang_output_section_find_by_flags): Match orphan .sdata2
+	like sections to existing .sdata2, and similarly for orphan TLS
+	sections.
+	* emultempl/elf32.em (place_orphan): Exclude .tbss from orphan_bss.
 
-	* ldwrite.c (build_link_order): Set data size to linker odrder
-	size when they are the same.
+2011-05-17  Tomohiro Kashiwada  <kikairoya@gmail.com>
 
-	* scripttempl/elf.sc: Don't specify fill if NOP is undefined.
+	PR ld/12759
+	* emultempl/rxelf.em (ignore_lma): New variable.
+	(rx_elf_create_output_section_statements): Pass the setiing of
+	ignore_lma to bfd_elf32_rx_set_target_flags.
+	(OPTION_IGNORE_LMA): Define.
+	(OPTION_NO_IGNORE_LMA): Define.
+	(PARSE_AND_LIST_LONGOPTS): Add ignore lma.
+	(PARSE_AND_LIST_OPTIONS): Add ignore lma.
+	(PARSE_AND_LIST_ARGS_CASES): Add ignore lma.
+
+2011-05-17  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12760
+	* ldmain.c (notice): Add "flags" and "string" param.
+	* plugin.c (plugin_notice): Likewise.  Handle indirect, warning
+	and constructor syms.
+
+2010-05-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
-2012-01-17  Alan Modra  <amodra@gmail.com>
+	* ldlang.c (print_assignment): Use the symbol's section if we
+	use its value.
+	* ldexp.c (exp_fold_tree_1): Skip self-assignment.  Expand
+	comment on copying symbol type.
 
-	* ldver.c (ldversion): Update copyright message year.
+2011-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12760
+	* plugin.c (plugin_notice): Set u.undef.abfd for symbols made
+	undefweak.
+
+2011-05-16  Alan Modra  <amodra@gmail.com>
 
-2012-01-15  Alan Modra  <amodra@gmail.com>
+	* ldlang.c (lang_leave_output_section_statement): Don't copy
+	previous lma_region if given address.
 
-	PR ld/12758
-	* ldlang.c (lang_process): Don't reopen all files, just those
-	newly added by plugin.
+2011-05-13  Bernd Schmidt  <bernds@codesourcery.com>
 
-2012-01-11  Alan Modra  <amodra@gmail.com>
+	(eelf32_tic6x_linux_be.c, eelf32_tic6x_linux_le.c,
+	eelf32_tic6x_elf_be.c, eelf32_tic6x_elf_le.c): New rules.
+	* Makefile.am (ALL_EMULATIONS): Add these files.
+	(eelf32_tic6x_be.c, eelf32_tic6x_le.c): Depend on tic6xdsbt.em.
+	* Makefile.in: Regenerated.
+	* emultempl/tic6xdsbt.em (is_tic6x_target): Allow more tic6x target
+	vectors.
+	* emulparams/elf32_tic6x_elf_be.sh: New file.
+	* emulparams/elf32_tic6x_elf_le.sh: New file.
+	* emulparams/elf32_tic6x_linux_be.sh: New file.
+	* emulparams/elf32_tic6x_linux_le.sh: New file.
+	* configure.tgt (tic6x-*-elf, tic6x-*-uclinux): New.
+	(tic6x-*-*): Replaced by these.
 
-	* emultempl/ppc64elf.em (PARSE_AND_LIST_PROLOGUE,
-	PARSE_AND_LIST_LONGOPTS, PARSE_AND_LIST_OPTIONS,
-	PARSE_AND_LIST_ARGS_CASES): Handle --{no-,}plt-thread-safe and
-	--{no-,}plt-align.
-	(plt_thread_safe, plt_stub_align): New vars.
-	(gld${EMULATION_NAME}_after_allocation): Pass them to
-	ppc64_elf_size_stubs.  Align stub sections according to plt_stub_align.
-	* ld.texinfo: Document new command line options, and an old
-	undocumented option.
+2011-05-13  Jan Beulich  <jbeulich@novell.com>
 
-2012-01-09  Roland McGrath  <mcgrathr@google.com>
+	* configure.tgt: Add targets x86_64-*-pe and x86_64-*-pep.
 
-	* configure.in: Use AM_ZLIB.
-	* configure: Regenerated.
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* emultempl/tic6xdsbt.em (merge_exidx_entries): New.
+	(compare_output_sec_vma): New function.
+	(gld${EMULATION_NAME}_after_allocation): New function.
+	(OPTION_NO_MERGE_EXIDX_ENTRIES): Define.
+	(PARSE_AND_LIST_OPTIONS): Add --no-merge-exidx-entries.
+	(PARSE_AND_LIST_ARGS_CASES): Add OPTION_NO_MERGE_EXIDX_ENTRIES.
+	(LDEMUL_AFTER_ALLOCATION): Set.
+	* ld.texinfo: Document c6x --no-merge-exidx-entries.
+
+2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR ld/12365
+	* scripttempl/pe.sc (__rt_psrelocs_start): New symbol definition.
+	(__rt_psrelocs_end): Likewise.
+	(__rt_psrelocs_size): Likewise difference between the above.
+	(__RUNTIME_PSEUDO_RELOC_LIST_END__): Move outside .rdata section
+	immediately after end of pseudo-reloc data.
+	(___RUNTIME_PSEUDO_RELOC_LIST_END___): Likewise.
+	(__RUNTIME_PSEUDO_RELOC_LIST__): Move outside .rdata section and
+	calculate backward from list end.
+	(___RUNTIME_PSEUDO_RELOC_LIST___): Likewise.
+	* scripttempl/pep.sc: Likewise.
+
+2011-05-06  Tristan Gingold  <gingold@adacore.com>
+
+	* scripttempl/alphavms.sc (CODE): Add *$CODE*.
+
+2011-05-04  Tristan Gingold  <gingold@adacore.com>
+
+	* emultempl/generic.em (ld_${EMULATION_NAME}_emulation): Add
+	LDEMUL_ADD_OPTIONS and LDEMUL_HANDLE_OPTION.
+	* emultempl/vms.em (OPTION_IDENTIFICATION): New macro.
+	(gld${EMULATION_NAME}_add_options): New function.
+	(gld${EMULATION_NAME}_list_options): Ditto.
+	(gld${EMULATION_NAME}_handle_option): Ditto.
+	(LDEMUL_ADD_OPTIONS, LDEMUL_HANDLE_OPTION)
+	(LDEMUL_LIST_OPTIONS): Define.
+
+2011-05-04  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12726
+	* ldexp.h (lang_phase_type): Add lang_assigning_phase_enum.
+	* ldexp.c (exp_fold_tree_1): Correct assign to dot comment.  Don't
+	assign to dot when lang_assigning_phase_enum.
+	* ldlang.h (lang_do_assignments): Update prototype.
+	* ldlang.c (lang_do_assignments): Add phase parameter.  Update all
+	callers.
+	* pe-dll.c (pe_dll_fill_sections, pe_exe_fill_sections): Update
+	lang_do_assignments calls.
+
+2011-04-28  Daniel C. Klauer  <daniel.c.klauer@web.de>
+
+	PR ld/12614
+	* emultempl/pe.em (_after_open): Correctly check whether symbol is
+	in undef list.
+
+2011-04-26  Kai Tietz  <ktietz@redhat.com>
+
+	* scripttempl/pe.sc: Handle .eh_frame($|.)* sections.
+	* scripttempl/pep.sc: Likewise.
+
+2011-04-24  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	PR ld/12696
+	* ldmain.c (notice): Delete "name" param, add "h".
+	* plugin.c (plugin_notice): Likewise.  Set non_ir_ref.  Handle
+	redefinitions of IR symbols in real BFDs.
+	(plugin_multiple_definition, plugin_multiple_common): Delete.
+	(non_ironly_hash, init_non_ironly_hash): Delete.
+	(is_visible_from_outside): Traverse entry_symbol chain.
+	(get_symbols): Use non_ir_ref flag rather than hash lookup.
+
+2011-04-21  Tristan Gingold  <gingold@adacore.com>
+
+	* scripttempl/alphavms.sc: Add dwarf2 embedding marks.
+
+2011-04-20  Tristan Gingold  <gingold@adacore.com>
+
+	* emultempl/aix.em (_add_options): Ignore -bbigtoc switch.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	* ld.h (ld_config_type <hash_table_size>): Make it an unsigned long.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	* ldfile.c (ldfile_try_open_bfd): Move code creating and switching
+	to plugin IR BFD..
+	* ldmain.c (add_archive_element): ..and similar code here..
+	* plugin.c (plugin_maybe_claim): ..to here.  New function.
+	(plugin_call_claim_file): Make static.
+	(asymbol_from_plugin_symbol): Set ELF st_shndx for common syms.
+	(plugin_multiple_common): New function.
+	(plugin_call_all_symbols_read): Hook in plugin_multiple_common.
+	* plugin.h (plugin_call_claim_file): Don't declare.
+	(plugin_maybe_claim): Declare.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	* ldmain.c (multiple_definition): Take a bfd_link_hash_entry
+	pointer arg rather than "name", "obfd", "osec", "oval".  Add code
+	removed from linker.c.  Hack around xcofflink.c oddity in
+	passing NULL nbfd.
+	(multiple_common): Similarly.
+	* plugin.c (orig_allow_multiple_defs): Delete.
+	(plugin_call_all_symbols_read): Don't twiddle allow_multiple_definition.
+	(plugin_multiple_definition): Update.
+
+2011-04-18  Kai Tietz  <ktietz@redhat.com>
+
+	* deffilep.y (def_aligncomm): Avoid duplets.
+
+	* deffilep.y (def_pool_str): New type.
+	(pool_strs): Local static.
+	(def_pool_alloc): Local function.
+	(def_pool_strdup): Likewise.
+	(def_pool_free): Likewise.
+	(opt_name): Replace xmalloc/xstrdup by
+	def_pool_alloc/def_pool_strdup.
+	(dot_name): Likewise.
+	(anylang_id): Likewise.
+	(def_lex): Likewise.
+	(def_file_parse): Call def_pool_free on
+	exit and cleanup directives elements.
+	(def_file_add_directive): Call def_pool_free.
+
+2011-04-18  Paul Brook  <paul@codesourcery.com>
+
+	* emulparams/elf32_tic6x_le.sh: Define OTHER_READONLY_SECTIONS
+	for unwinding tables.
+
+2011-04-18  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	PR ld/12672
+	* ldfile.c (ldfile_try_open_bfd): Don't attempt any plugin action
+	when no_more_claiming.
+	* ldmain.c (add_archive_element): Likewise.
+	(multiple_definition): Remove plugin_multiple_definition call.
+	(notice): Remove plugin_notice call.
+	* ldlang.c (lang_list_insert_after, void lang_list_remove_tail): Move.
+	Delete prototype.
+	(plugin_insert): New static var.
+	(open_input_bfds): Only rescan libs after plugin insert point.
+	(lang_gc_sections): Omit plugin claimed files.
+	(lang_process): Set plugin_insert.  Only rescan when plugin adds
+	objects.
+	* plugin.h (no_more_claiming): Declare.
+	(plugin_notice, plugin_multiple_definition): Don't declare.
+	* plugin.c: Formatting.
+	(orig_notice_all, orig_allow_multiple_defs, orig_callbacks,
+	plugin_callbacks): New static vars.
+	(no_more_claiming): Make global.
+	(plugin_cached_allow_multiple_defs): Delete.
+	(plugin_get_ir_dummy_bfd): Set SEC_EXCLUDE on dummy .text section,
+	use newer bfd_make_section variant.  Make COMMON section too.
+	Error handling.  Correct setting of gp size.
+	(asymbol_from_plugin_symbol): Properly cast last arg of concat.
+	(message): Likewise for ACONCAT.
+	(asymbol_from_plugin_symbol): Use our COMMON section.
+	(get_symbols): When report_plugin_symbols, show visibility too.
+	(init_non_ironly_hash): Move.  Don't test non_ironly_hash.
+	(plugin_load_plugins): Save state of linker callbacks, set up to
+	call plugin_notice instead.  Call init_non_ironly_hash here.
+	(plugin_call_all_symbols_read): Set plugin_multiple_definition in
+	plugin callbacks.
+	(plugin_notice): Rewrite.
+	(plugin_multiple_definition): Make static, call original callback.
+
+2011-04-15  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12672
+	* ldlang.c (enum open_bfd_mode): New.
+	(open_input_bfds): Replace "force" param with "mode".  Reload
+	archives for rescan.  Update all callers.
+	(lang_process): Make another open_input_bfds pass for plugins.
+
+2011-04-13  Kai Tietz  <ktietz@redhat.com>
+
+	PR binutils/12658
+	* deffile.h (def_file_add_export): Add is_dup argument.
+	(def_file_add_import): Likewise.
+	* deffilep.y (are_names_equal): New helper.
+	(cmp_export_elem): New helper.
+	(find_export_in_list): Add search routine for exports.
+	(def_file_add_export): Check for duplicates.
+	(cmp_import_elem): New helper.
+	(find_import_in_list): Add search routine for imports.
+	(def_file_add_import): Check for duplicates.
+	(def_exports): Handle duplicates.
+	(def_imports): Likewise.
+	* pe-dll.c (process_def_file_and_drectve): Likewise.
+	(pe_implied_import_dll): Likewise.
+
+2011-04-11  Chris Quenelle  <chris.quenelle@oracle.com>
+
+	* scripttempl/elf.sc (.exception_ranges): Add new section.
+
+2011-04-08  Hector Oron  <hector.oron@gmail.com>
+
+	PR ld/12643
+	* configure.tgt: Add support for arm-*-gnueabihf targets.
+
+2011-04-07  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* Makefile.in: Regenerate. Remove stray eavrtiny10 rules.
+
+2011-04-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.tgt: Remove stray ;;.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.tgt (thumb-*-linux-* | thumb-*-uclinux*,
+	strongarm-*-coff, strongarm-*-elf, strongarm-*-kaos*,
+	thumb-*-coff, thumb-*-elf, thumb-epoc-pe, thumb-*-pe,
+	xscale-*-coff, xscale-*-elf): Remove targets.
+
+2011-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.tgt: Add elf_l1om to targ_extra_libpath for
+	x86_64-*-linux-*.
+
+	* emulparams/elf_l1om.sh: Remove duplicates.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* emulparams/elf32_tic6x_le.sh (BIG_OUTPUT_FORMAT, EXTRA_EM_FILE,
+	GENERATE_SHLIB_SCRIPT): New defines.
+	(TEXT_START_ADDR): Define differently depending on target.
+	(.got): Redefine to include "*(.dsbt)".
+	(SDATA_START_SYMBOLS): Remove, replace with
+	(OTHER_GOT_SYMBOLS): New.
+	(OTHER_BSS_SECTIONS): Define only for ELF targets.
+	* emultempl/tic6xdsbt.em: New file.
+	* gen-doc.texi: Set C6X.
+	* ld.texinfo: Likewise.
+	(Options specific to C6X uClinux targets): New section.
+
+2011-03-29  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12613
+	* ldlex.l (lex_warn_invalid): Don't assume char is unsigned.
+
+2011-03-26  John Marino  <binutils@marino.st>
+
+	* configure.host: Update *-*-dragonfly* host entry.
+	* configure.tgt: Update *-*-dragonfly* target entry.
+	* ldlex.l: Prevent redefinition of YY_NO_UNPUT.
+
+2011-03-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in: Check for windows.h, not Windows.h.
+	* configure: Regenerate.
+	* plugin.c: Include windows.h, not Windows.h.
+
+2011-03-25  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* Makefile.in: Regenerate.
+
+2011-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* lexsup.c (parse_args): Only set report_plugin_symbols if plugins
+	are enabled.  Mark level as possibly unused.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* Makefile.am (ALL_EMULATION_SOURCES): Add AVR XMEGA architectures.
+	(eavrxmega?.c): Likewise.
+	* configure.tgt (targ_extra_emuls): Likewise.
+	* emulparams/avrxmega1.sh: New file.
+	* emulparams/avrxmega2.sh: Likewise.
+	* emulparams/avrxmega3.sh: Likewise.
+	* emulparams/avrxmega4.sh: Likewise.
+	* emulparams/avrxmega5.sh: Likewise.
+	* emulparams/avrxmega6.sh: Likewise.
+	* emulparams/avrxmega7.sh: Likewise.
+	* emultempl/avrelf.em (avr_elf_${EMULATION_NAME}_before_allocation):
+	Add avrxmega6, avrxmega7 to list of architectures for no stubs.
+
+2011-03-21  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* scripttempl/avr.sc: Add fuse, lock, and signature memory regions.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* emultempl/armelf.em (gld${EMULATION_NAME}_finish): Check
+	eh->target_internal.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* emultempl/armelf.em (arm_elf_before_allocation): Check dynobj
+	instead of dynamic_sections_created.
+
+2011-03-10  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* plugin.c (get_symbols): Use wrapped lookup for undefined symbols.
+
+2011-03-10  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* ldlang.c (lang_check): Don't run checks on dummy IR BFDs.
+
+2011-03-10  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* ldlang.h (lang_input_statement_type): Add new 'claim_archive' flag,
+	wrapping both it and 'claim' flag in #ifdef ENABLE_PLUGINS.
+	* ldmain.c (add_archive_element): Set it if the member is claimed.
+	* ldlang.c (new_afile): Initialise claim_archive and claimed members.
+	(find_replacements_insert_point): New helper function.
+	(lang_process): After adding and opening replacement files passed
+	from plugin, splice them into correct place in statement list and
+	file chains to preserve critical link order.
+	(lang_list_insert_after): New helper function.
+	(lang_list_remove_tail): Likewise.
+
+2011-03-10  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* plugin.c (IRONLY_SUFFIX): Revise to nicely human-readable form.
+	(IRONLY_SUFFIX_LEN): Delete.
+	(plugin_get_ir_dummy_bfd): Don't append IRONLY_SUFFIX.
+	(is_ir_dummy_bfd): Don't look for suffix; check claimed flag of
+	enclosing lang input statement instead.
+
+2011-03-10  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Preserve
+	alignment of input sections when creating orphan output sections
+	during relocatable link.
+	* emultempl/pep.em (gld_${EMULATION_NAME}_place_orphan): Likewise.
+
+2011-03-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld.texinfo: Document --verbose[=NUMBER].
+
+	* lexsup.c (ld_options): Update --verbose.
+	(parse_args): Set report_plugin_symbols.
+
+	* plugin.c (report_plugin_symbols): New.
+	(get_symbols): Report plugin symbols if report_plugin_symbols
+	is TRUE.
+
+	* plugin.h (report_plugin_symbols): New.
+
+2011-03-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12529
+	* testplug.c: Don't include "filenames.h".
+	(onclaim_file): Don't use filename_cmp.
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* emultempl/beos.em (sort_by_file_name): Use filename_(n)cmp.
+	* emultempl/elf32.em (gld${EMULATION_NAME}_vercheck):
+	Likewise.
+	(gld${EMULATION_NAME}_stat_needed): Likewise.
+	(gld${EMULATION_NAME}_check_needed): Likewise.
+	* emultempl/pe.em (gld_${EMULATION_NAME}_after_open): Likewise.
+	(gld_${EMULATION_NAME}_unrecognized_file): Likewise.
+	* emultempl/pep.em (gld_${EMULATION_NAME}_after_open): Likewise.
+	(gld_${EMULATION_NAME}_unrecognized_file): Likewise.
+	* ldfile.c (ldfile_open_file): Likewise.
+	* ldlang.c (wild_sort): Likewise.
+	(lookup_name): Likewise.
+	(check_excluded_libs): Likewise.
+	* ldmisc.c (vfinfo): Likewise.
+	* pe-dll.c (libnamencmp): Likewise.
+	(auto_export): Likewise.
+	(pe_dll_generate_implib): Likewise.
+	* testplug.c (onclaim_file): Likewise.
+
+2011-02-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12507
+	* plugin.c (get_symbols): Don't check entry symbol here.
+	(init_non_ironly_hash): Add entry_symbol chain into
+	non_ironly_hash.
+
+2011-02-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12507
+	* plugin.c (get_symbols): Don't mark entry symbol IR only.
+
+2011-02-18  John David Anglin  <dave.anglin@nrc-cnnrc.gc.ca>
+
+	PR ld/12376
+	emulparams/hppalinux.sh (DATA_ADDR): Define.
+	(SHLIB_DATA_ADDR): Likewise.
+
+2011-02-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* emulparams/elf32_x86_64.sh (LIBPATH_SUFFIX): Changed to
+	x32 for x32.
+
+2011-02-15  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pe-dll.c (process_def_file_and_drectve): Don't strip
+	leading underscore from symbol by calling bfd_find_version_for_sym.
+
+2011-02-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* ldlang.c (lang_vers_match): Declare a new c_sym, assign it to
+	the bfd_demangle of sym, change users of sym to c_sym when not
+	already demangling, and free when done.  Change callers of
+	cplus_demangle to bfd_demangle.
+
+2011-02-14  Alan Modra  <amodra@gmail.com>
+
+	* plugin.c (plugin_get_ir_dummy_bfd): Set SEC_EXCLUDE on dummy
+	.text section, use newer bfd_make_section variant.  Error handling.
+	Correct setting of gp size.
+	(asymbol_from_plugin_symbol): Properly cast last arg of concat.
+	(message): Likewise for ACONCAT.
+	(get_symbols): Formatting.
+
+2011-02-14  Alan Modra  <amodra@gmail.com>
+
+	* ldmain.c (remove_output): Rename to..
+	(ld_cleanup): ..this. Call bfd_cache_close_all and plugin_call_cleanup.
+	(main): Adjust.
+	* plugin.c (plugin_call_cleanup): Make global.
+	(plugin_load_plugins): Don't register plugin_call_cleanup with xatexit.
+	* plugin.h (plugin_call_cleanup): Declare.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-10  Alan Modra  <amodra@gmail.com>
+
+	* scripttempl/armbpabi.sc: Revert 2010-11-02  H.J. Lu.
+	* scripttempl/avr.sc: Likewise.
+	* scripttempl/elf32cr16.sc: Likewise.
+	* scripttempl/elf32crx.sc: Likewise.
+	* scripttempl/elf32msp430.sc: Likewise.
+	* scripttempl/elf32msp430_3.sc: Likewise.
+	* scripttempl/elf32sh-symbian.sc: Likewise.
+	* scripttempl/elf64hppa.sc: Likewise.
+	* scripttempl/elf_chaos.sc: Likewise.
+	* scripttempl/elfd10v.sc: Likewise.
+	* scripttempl/elfd30v.sc: Likewise.
+	* scripttempl/elfi370.sc: Likewise.
+	* scripttempl/elfm68hc11.sc: Likewise.
+	* scripttempl/elfm68hc12.sc: Likewise.
+	* scripttempl/elfxtensa.sc: Likewise.
+	* scripttempl/ip2k.sc: Likewise.
+	* scripttempl/iq2000.sc: Likewise.
+	* scripttempl/mep.sc: Likewise.
+	* scripttempl/mmo.sc: Likewise.
+	* scripttempl/v850.sc: Likewise.
+	* scripttempl/xstormy16.sc: Likewise.
+	* scripttempl/elf.sc: Revert 2010-10-29  H.J. Lu.
+
+2011-01-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (CXX): Removed.
+
+	* configure.in: Add AC_PROG_CXX.
+
+	* Makefile.in: Regenerated.
+	* configure: Likewise.
+
+2011-01-22  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* plugin.c (plugin_get_ir_dummy_bfd): Copy across the bfd's
+	private data and GP size.
+
+2011-01-21  Alan Modra  <amodra@gmail.com>
+
+	* ldexp.c (fold_binary): Set result section for arithmetic and
+	logical operations to NULL when both operands are in same section.
+	* ld.texinfo (Expression Section): Describe this.
+
+2011-01-14  Alan Modra  <amodra@gmail.com>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
+	attempt to put non-alloc orphans before debug sections, just place
+	them after .comment.
+
+2011-01-14  J. Park  <grassman@gmail.com>
+
+	PR ld/12339
+	* ldlang.c (sort_def_symbol): Handle bfd_link_hash_warning symbols.
+
+2011-01-14  Alan Modra  <amodra@gmail.com>
+
+	* Makefile.am: Sort emulation rules.
+	(eelf32am33lin.c): Delete.
+	(ALL_EMULATION_SOURCES): Sort, add missing entries.
+	(ALL_64_EMULATION_SOURCES): Likewise.
+	* Makefile.in: Regenerate.
 
-For older changes see ChangeLog-2011
+2011-01-13  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12356
+	* ld.texinfo (Miscellaneous Commands): Describe LD_FEATURE.
+	(Expression Section): Update.
+	* ld.h (ld_config_type): Add sane_expr.
+	* ldgram.y (ifile_p1): Add LD_FEATURE.
+	* ldlex.l (LD_FEATYRE): New.
+	* ldemul.c (after_parse_default): Delete code handling ld_compatibility.
+	* ldexp.h (struct ldexp_control): Delete uses_defined.
+	* ldexp.c: Remove all uses of uses_defined.
+	(fold_name): Test config.sane_expr rather than ld_compatibility.
+	(exp_fold_tree_1): Likewise.  Adjust handling of assignments
+	during first phase.
+	* ldlang.h (ld_compatibility): Delete.
+	(lang_ld_feature): Declare.
+	* ldlang.c (ld_compatibility): Delete.
+	(open_input_bfds): Only handle assignments for --defsym.
+	(lang_ld_feature): New function.
+
+	PR ld/12356
+	* ldexp.h (exp_assop): Delete.
+	(exp_assign, exp_defsym): Declare.
+	* ldexp.c (exp_assop): Make static, handle all assignment variations.
+	(exp_assign, exp_defsym): New functions.
+	(exp_provide): Use exp_assop.
+	* ldgram.y (defsym_expr): Use exp_defsym.
+	* ldctor.c, * ldgram.y, * ldlang.c, * mri.c, * emultempl/beos.em,
+	* emultempl/pe.em, * emultempl/pep.em, * emultempl/spuelf.em,
+	* emultempl/xtensaelf.em: Update exp_assop -> exp_assign.
+
+2011-01-12  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12380
+	* ldexp.h (enum phase_enum): Comment.  Add exp_dataseg_done.
+	* ldexp.c (fold_unary <DATA_SEGMENT_END>): Rearrange code.  Test
+	for exp_dataseg_done rather than expld.phase == lang_final_phase_enum
+	to detect when we've finished sizing sections.
+	(fold_binary <DATA_SEGMENT_ALIGN>): Likewise.
+	(fold_binary <DATA_SEGMENT_RELRO_END>): Likewise.  Also test
+	that we are not inside an output section statement.
+	* ldlang.c (lang_size_sections): Set exp_dataseg_done on exit if
+	not exp_dataseg_relro_adjust or exp_dataseg_adjust.  Don't set
+	lang_final_phase_enum here.
+	(lang_process): Set lang_final_phase_enum here.
+
+2011-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ldlang.c (startup_file): Removed.
+	(lang_startup): Updated.
+
+2011-01-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12364
+	* plugin.c (get_symbols): Check if owner_sec->owner is NULL
+	before accessing its flags field.
+
+2011-01-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ldver.c (ldversion): Update copyright to 2011.
+
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 37f8d1fc9b..5ae86ba18e 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -211,7 +211,6 @@ ALL_EMULATION_SOURCES = \
 	eelf32ebmipvxworks.c \
 	eelf32elmip.c \
 	eelf32elmipvxworks.c \
-	eelf32epiphany.c \
 	eelf32fr30.c \
 	eelf32frv.c \
 	eelf32frvfd.c \
@@ -247,10 +246,8 @@ ALL_EMULATION_SOURCES = \
 	eelf32ppcsim.c \
 	eelf32ppcvxworks.c \
 	eelf32ppcwindiss.c \
-	eelf32rl78.c \
 	eelf32rx.c \
 	eelf32tilegx.c \
-	eelf32tilegx_be.c \
 	eelf32tilepro.c \
 	eelf32vax.c \
 	eelf32xc16x.c \
@@ -481,9 +478,7 @@ ALL_64_EMULATION_SOURCES = \
 	eelf64ltsmip_fbsd.c \
 	eelf64mmix.c \
 	eelf64ppc.c \
-	eelf64ppc_fbsd.c \
 	eelf64tilegx.c \
- 	eelf64tilegx_be.c \
 	eelf_l1om.c \
 	eelf_l1om_fbsd.c \
 	eelf_k1om.c \
@@ -995,9 +990,6 @@ eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
-eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
-  $(ELF_DEPS) ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
@@ -1144,9 +1136,6 @@ eelf32ppcvxworks.c: $(srcdir)/emulparams/elf32ppcvxworks.sh \
 eelf32ppcwindiss.c: $(srcdir)/emulparams/elf32ppcwindiss.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32ppcwindiss "$(tdir_elf32ppcwindiss)"
-eelf32rl78.c: $(srcdir)/emulparams/elf32rl78.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32rl78 "$(tdir_elf32rl78)"
 eelf32rx.c: $(srcdir)/emulparams/elf32rx.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32rx "$(tdir_elf32rx)"
@@ -1154,10 +1143,6 @@ eelf32tilegx.c: $(srcdir)/emulparams/elf32tilegx.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32tilegx "$(tdir_tilegx)"
-eelf32tilegx_be.c: $(srcdir)/emulparams/elf32tilegx_be.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
-  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilegx_be "$(tdir_tilegx_be)"
 eelf32tilepro.c: $(srcdir)/emulparams/elf32tilepro.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1987,18 +1972,10 @@ eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
-eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \
-  $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
-  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ppc_fbsd "$(tdir_elf64ppc_fbsd)"
 eelf64tilegx.c: $(srcdir)/emulparams/elf64tilegx.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64tilegx "$(tdir_tilegx)"
-eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
-  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64tilegx_be "$(tdir_tilegx_be)"
 eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_l1om "$(tdir_elf_l1om)"
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 1616f5843d..f062b92b53 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -517,7 +517,6 @@ ALL_EMULATION_SOURCES = \
 	eelf32ebmipvxworks.c \
 	eelf32elmip.c \
 	eelf32elmipvxworks.c \
-	eelf32epiphany.c \
 	eelf32fr30.c \
 	eelf32frv.c \
 	eelf32frvfd.c \
@@ -553,10 +552,8 @@ ALL_EMULATION_SOURCES = \
 	eelf32ppcsim.c \
 	eelf32ppcvxworks.c \
 	eelf32ppcwindiss.c \
-	eelf32rl78.c \
 	eelf32rx.c \
 	eelf32tilegx.c \
-	eelf32tilegx_be.c \
 	eelf32tilepro.c \
 	eelf32vax.c \
 	eelf32xc16x.c \
@@ -786,9 +783,7 @@ ALL_64_EMULATION_SOURCES = \
 	eelf64ltsmip_fbsd.c \
 	eelf64mmix.c \
 	eelf64ppc.c \
-	eelf64ppc_fbsd.c \
 	eelf64tilegx.c \
- 	eelf64tilegx_be.c \
 	eelf_l1om.c \
 	eelf_l1om_fbsd.c \
 	eelf_k1om.c \
@@ -1122,7 +1117,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ebmipvxworks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32elmip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32elmipvxworks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32epiphany.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32fr30.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32frv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32frvfd.Po@am__quote@
@@ -1158,10 +1152,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppcsim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppcvxworks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppcwindiss.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32rl78.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32rx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32tilegx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32tilegx_be.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32tilepro.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32vax.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16x.Po@am__quote@
@@ -1188,9 +1180,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ltsmip_fbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64mmix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ppc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ppc_fbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx_be.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_chaos.Po@am__quote@
@@ -2453,9 +2443,6 @@ eelf32elmipvxworks.c: $(srcdir)/emulparams/elf32elmipvxworks.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/generic.em $(srcdir)/emultempl/mipself.em \
   $(srcdir)/emultempl/vxworks.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32elmipvxworks "$(tdir_elf32elmipvxworks)"
-eelf32epiphany.c: $(srcdir)/emulparams/elf32epiphany.sh \
-  $(ELF_DEPS) ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32epiphany "$(tdir_epiphany)"
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
@@ -2602,9 +2589,6 @@ eelf32ppcvxworks.c: $(srcdir)/emulparams/elf32ppcvxworks.sh \
 eelf32ppcwindiss.c: $(srcdir)/emulparams/elf32ppcwindiss.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32ppcwindiss "$(tdir_elf32ppcwindiss)"
-eelf32rl78.c: $(srcdir)/emulparams/elf32rl78.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32rl78 "$(tdir_elf32rl78)"
 eelf32rx.c: $(srcdir)/emulparams/elf32rx.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32rx "$(tdir_elf32rx)"
@@ -2612,10 +2596,6 @@ eelf32tilegx.c: $(srcdir)/emulparams/elf32tilegx.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32tilegx "$(tdir_tilegx)"
-eelf32tilegx_be.c: $(srcdir)/emulparams/elf32tilegx_be.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
-  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf32tilegx_be "$(tdir_tilegx_be)"
 eelf32tilepro.c: $(srcdir)/emulparams/elf32tilepro.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -3445,18 +3425,10 @@ eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
-eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \
-  $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
-  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64ppc_fbsd "$(tdir_elf64ppc_fbsd)"
 eelf64tilegx.c: $(srcdir)/emulparams/elf64tilegx.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64tilegx "$(tdir_tilegx)"
-eelf64tilegx_be.c: $(srcdir)/emulparams/elf64tilegx_be.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \
-  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} elf64tilegx_be "$(tdir_tilegx_be)"
 eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_l1om "$(tdir_elf_l1om)"
diff --git a/ld/NEWS b/ld/NEWS
index 162f598b5e..62406b401c 100644
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -1,24 +1,18 @@
 -*- text -*-
 
-* Add option -f FILE on AIX (for response file).
-
-* Add support for the Renesas RL78 architecture.
-
-* Add support for the Adapteva EPIPHANY architecture.
-
 Changes in 2.22:
 
 * --copy-dt-needed-entries is no longer enabled by default.  Instead
   --no-copy-dt-needed-entries is the default.
 
 * INPUT_SECTION_FLAGS has been added to the linker script language
-  to allow selection of input sections by section header section flags.
+to allow selection of input sections by section header section flags.
 
-* Add support for the Tilera TILEPro and TILE-Gx architectures.
+* Add support for the Tilera TILEPRO and TILE-Gx architectures.
 
 * Added SORT_BY_INIT_PRIORITY to the linker script language to permit
-  sorting sections by numerical value of the GCC init_priority attribute
-  encoded in the section name.
+sorting sections by numerical value of the GCC init_priority attribute
+encoded in the section name.
 
 Changes in 2.21:
 
@@ -37,7 +31,7 @@ Changes in 2.21:
 * Extend .def file syntax by '== <ID>' for imports and exports. This allows
   to alias the import/export table name written in PE image.
 
-* Add --exclude-all-symbols option to PE based linkers.  This prevents all
+* Add --exlcude-all-symbols option to PE based linkers.  This prevents all
   symbols from automatically being exported.
 
 * Add support for the Renesas RX processor.
diff --git a/ld/configure b/ld/configure
index 4e6242731d..9e4cb57802 100755
--- a/ld/configure
+++ b/ld/configure
@@ -787,7 +787,6 @@ with_gnu_ld
 enable_libtool_lock
 enable_nls
 enable_initfini_array
-with_zlib
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1451,7 +1450,6 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-zlib             include zlib support (auto/yes/no) default=auto
 
 Some influential environment variables:
   CC          C compiler command
@@ -12140,7 +12138,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12143 "configure"
+#line 12141 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12246,7 +12244,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12249 "configure"
+#line 12247 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15499,7 +15497,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg it"
+ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg"
 # If we haven't got the data from the intl directory,
 # assume NLS is disabled.
 USE_NLS=no
@@ -16619,19 +16617,7 @@ _ACEOF
 
 # Link in zlib if we can.  This is needed only for the bootstrap tests
 # right now, since those tests use libbfd, which depends on zlib.
-
-  # See if the user specified whether he wants zlib support or not.
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then :
-  withval=$with_zlib;
-else
-  with_zlib=auto
-fi
-
-
-  if test "$with_zlib" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
 $as_echo_n "checking for library containing zlibVersion... " >&6; }
 if test "${ac_cv_search_zlibVersion+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -16698,11 +16684,6 @@ done
 
 fi
 
-    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
-      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
-    fi
-  fi
-
 
 # When converting linker scripts into strings for use in emulation
 # files, use astring.sed if the compiler supports ANSI string
@@ -16753,48 +16734,6 @@ all_libpath=
 
 rm -f tdirs
 
-# If the host is 64-bit, then we enable 64-bit targets by default.
-# This is consistent with what ../bfd/configure.in does.
-if test x${want64} = xfalse; then
-  # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-$as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_void_p" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (void *)
-See \`config.log' for more details." "$LINENO" 5; }; }
-   else
-     ac_cv_sizeof_void_p=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-$as_echo "$ac_cv_sizeof_void_p" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-_ACEOF
-
-
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
-    want64=true
-  fi
-fi
-
 for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
 do
   if test "$targ_alias" = "all"; then
@@ -16865,6 +16804,45 @@ TDIRS=tdirs
 
 
 if test x${all_targets} = xtrue; then
+  if test x${want64} = xfalse; then
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+
+    if test "x${ac_cv_sizeof_long}" = "x8"; then
+      want64=true
+    fi
+  fi
   if test x${want64} = xtrue; then
     EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
   else
diff --git a/ld/configure.in b/ld/configure.in
index a5df0fa294..bd5040ebcf 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -75,7 +75,7 @@ dnl "install_as_default" is set to false if gold is the default linker.
 dnl "installed_linker" is the installed BFD linker name.
 AC_ARG_ENABLE(gold,
 [[  --enable-gold[=ARG]     build gold [ARG={default,yes,no}]]],
-[case "${enableval}" in
+[case "${enableval}" in 
  default)
    install_as_default=no
    installed_linker=ld.bfd
@@ -140,7 +140,7 @@ AC_PROG_INSTALL
 
 LT_INIT
 
-ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg it"
+ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
@@ -210,14 +210,14 @@ if test $ld_cv_decl_getopt_unistd_h = yes; then
   AC_DEFINE([HAVE_DECL_GETOPT], 1,
 	    [Is the prototype for getopt in <unistd.h> in the expected format?])
 fi
-
+	
 BFD_BINARY_FOPEN
 
 AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ])
 
 # Link in zlib if we can.  This is needed only for the bootstrap tests
 # right now, since those tests use libbfd, which depends on zlib.
-AM_ZLIB
+AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
 
 # When converting linker scripts into strings for use in emulation
 # files, use astring.sed if the compiler supports ANSI string
@@ -252,15 +252,6 @@ dnl not permit literal newlines in an AC_SUBST variables.  So we use a
 dnl file.
 rm -f tdirs
 
-# If the host is 64-bit, then we enable 64-bit targets by default.
-# This is consistent with what ../bfd/configure.in does.
-if test x${want64} = xfalse; then
-  AC_CHECK_SIZEOF(void *)
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
-    want64=true
-  fi
-fi
-
 for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
 do
   if test "$targ_alias" = "all"; then
@@ -331,6 +322,12 @@ TDIRS=tdirs
 AC_SUBST_FILE(TDIRS)
 
 if test x${all_targets} = xtrue; then
+  if test x${want64} = xfalse; then
+    AC_CHECK_SIZEOF(long)
+    if test "x${ac_cv_sizeof_long}" = "x8"; then
+      want64=true
+    fi
+  fi
   if test x${want64} = xtrue; then
     EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
   else
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 8cd2915de4..197f27ac00 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -137,8 +137,6 @@ d30v-*-*)		targ_emul=d30velf; targ_extra_emuls="d30v_e d30v_o"
 			;;
 dlx-*-elf*)		targ_emul=elf32_dlx
 			;;
-epiphany-*-elf)		targ_emul=elf32epiphany
-			;;
 fido*-*-elf*)		targ_emul=m68kelf ;;
 fr30-*-*)		targ_emul=elf32fr30
 			;;
@@ -409,19 +407,19 @@ mips*el-*-linux-*)	targ_emul=elf32ltsmip
 mips*-*-linux-*)	targ_emul=elf32btsmip
 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
+mips64*el-*-freebsd-* | mips64*el-*-kfreebsd*-gnu)
 			targ_emul=elf32ltsmipn32_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmip_fbsd elf32btsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
+mips64*-*-freebsd-* | mips64*-*-kfreebsd*-gnu)
 			targ_emul=elf32btsmipn32_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmip_fbsd elf32ltsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips*el-*-freebsd* | mips*el-*-kfreebsd*-gnu)
+mips*el-*-freebsd-* | mips*el-*-kfreebsd*-gnu)
 			targ_emul=elf32ltsmip_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmipn32_fbsd elf32btsmip_fbsd elf32btsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips*-*-freebsd* | mips*-*-kfreebsd*-gnu)
+mips*-*-freebsd-* | mips*-*-kfreebsd*-gnu)
 			targ_emul=elf32btsmip_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmipn32_fbsd elf32ltsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
@@ -455,17 +453,10 @@ pjl*-*-*)	        targ_emul=pjlelf ; targ_extra_emuls="elf_i386" ;;
 pj*-*-*)	        targ_emul=pjelf
 			;;
 powerpc-*-freebsd* | powerpc-*-kfreebsd*-gnu)
-			targ_emul=elf32ppc_fbsd
-			targ_extra_emuls="elf32ppc elf32ppcsim"
+			targ_emul=elf32ppc_fbsd;
+			targ_extra_emuls="elf32ppc elf32ppcsim";
 			targ_extra_libpath=elf32ppc;
 			tdir_elf32ppcsim=`echo ${targ_alias} | sed -e 's/ppc/ppcsim/'` ;;
-powerpc64-*-freebsd*)
-			targ_emul=elf64ppc_fbsd
-			targ_extra_emuls="elf64ppc elf32ppc_fbsd elf32ppc"
-			targ_extra_libpath="elf32ppc_fbsd elf32ppc"
-			tdir_elf32ppc=`echo "${targ_alias}" | sed -e 's/64//'`
-			tdir_elf32ppc_fbsd=$tdir_elf32ppc
-			;;
 powerpc*-*-linux*)	case "${targ}" in
 			*64*)	targ_emul=elf64ppc
 				targ_extra_emuls="elf32ppclinux elf32ppc elf32ppcsim"
@@ -523,7 +514,6 @@ powerpc-*-lynxos*)	targ_emul=ppclynx ;;
 rs6000-*-aix[5-9]*)	targ_emul=aix5rs6 ;;
 rs6000-*-aix*)		targ_emul=aixrs6
 			;;
-rl78-*-*)		targ_emul=elf32rl78 ;;
 rx-*-*)			targ_emul=elf32rx ;;
 s390x-*-linux*)         targ_emul=elf64_s390
 			targ_extra_emuls=elf_s390
@@ -654,10 +644,7 @@ tic6x-*-uclinux)	targ_emul=elf32_tic6x_linux_le
 tic80-*-*)		targ_emul=tic80coff
 			;;
 tilegx-*-*)		targ_emul=elf64tilegx
-			targ_extra_emuls="elf64tilegx_be elf32tilegx elf32tilegx_be"
-			targ_extra_libpath=$targ_extra_emuls ;;
-tilegxbe-*-*)		targ_emul=elf64tilegx_be
-			targ_extra_emuls="elf64tilegx elf32tilegx elf32tilegx_be"
+			targ_extra_emuls="elf32tilegx"
 			targ_extra_libpath=$targ_extra_emuls ;;
 tilepro-*-*)		targ_emul=elf32tilepro ;;
 v850*-*-*)		targ_emul=v850
diff --git a/ld/deffilep.y b/ld/deffilep.y
index 3afb3ce3ce..58f3dd27b7 100644
--- a/ld/deffilep.y
+++ b/ld/deffilep.y
@@ -113,7 +113,6 @@ static const char *lex_parse_string_end = 0;
 
 %union {
   char *id;
-  const char *id_const;
   int number;
   char *digits;
 };
@@ -128,9 +127,8 @@ static const char *lex_parse_string_end = 0;
 %type  <digits> opt_digits
 %type  <number> opt_base opt_ordinal
 %type  <number> attr attr_list opt_number exp_opt_list exp_opt
-%type  <id> opt_name opt_name2 opt_equal_name anylang_id opt_id
+%type  <id> opt_name opt_equal_name dot_name anylang_id opt_id
 %type  <id> opt_equalequal_name
-%type  <id_const> keyword_as_name
 
 %%
 
@@ -166,7 +164,7 @@ expline:
 		/* The opt_comma is necessary to support both the usual
 		  DEF file syntax as well as .drectve syntax which
 		  mandates <expsym>,<expoptlist>.  */
-		opt_name2 opt_equal_name opt_ordinal opt_comma exp_opt_list opt_comma opt_equalequal_name
+		dot_name opt_equal_name opt_ordinal opt_comma exp_opt_list opt_comma opt_equalequal_name
 			{ def_exports ($1, $2, $3, $5, $7); }
 	;
 exp_opt_list:
@@ -236,65 +234,19 @@ attr:
 	|	SHARED	{ $$=8;}
 	;
 
-
-keyword_as_name: BASE { $$ = "BASE"; }
-	 | CODE { $$ = "CODE"; }
-	 | CONSTANTU { $$ = "CONSTANT"; }
-	 | CONSTANTL { $$ = "constant"; }
-	 | DATAU { $$ = "DATA"; }
-	 | DATAL { $$ = "data"; }
-	 | DESCRIPTION { $$ = "DESCRIPTION"; }
-	 | DIRECTIVE { $$ = "DIRECTIVE"; }
-	 | EXECUTE { $$ = "EXECUTE"; }
-	 | EXPORTS { $$ = "EXPORTS"; }
-	 | HEAPSIZE { $$ = "HEAPSIZE"; }
-	 | IMPORTS { $$ = "IMPORTS"; }
-/* Disable LIBRARY keyword as valid symbol-name.  This is necessary
-   for libtool, which places this command after EXPORTS command.
-   This behavior is illegal by specification, but sadly required by
-   by compatibility reasons.
-   See PR binutils/13710
-	 | LIBRARY { $$ = "LIBRARY"; } */
-	 | NAME { $$ = "NAME"; }
-	 | NONAMEU { $$ = "NONAME"; }
-	 | NONAMEL { $$ = "noname"; }
-	 | PRIVATEU { $$ = "PRIVATE"; }
-	 | PRIVATEL { $$ = "private"; }
-	 | READ { $$ = "READ"; }
-	 | SHARED  { $$ = "SHARED"; }
-	 | STACKSIZE_K { $$ = "STACKSIZE"; }
-	 | VERSIONK { $$ = "VERSION"; }
-	 | WRITE { $$ = "WRITE"; }
-	 ;
-
-opt_name2: ID { $$ = $1; }
-	| '.' keyword_as_name
+opt_name: ID		{ $$ = $1; }
+	| '.' ID
 	  {
-	    char *name = xmalloc (strlen ($2) + 2);
-	    sprintf (name, ".%s", $2);
-	    $$ = name;
-	  }
-	| '.' opt_name2
-	  { 
 	    char *name = def_pool_alloc (strlen ($2) + 2);
 	    sprintf (name, ".%s", $2);
 	    $$ = name;
 	  }
-	| keyword_as_name '.' opt_name2
-	  { 
-	    char *name = def_pool_alloc (strlen ($1) + 1 + strlen ($3) + 1);
-	    sprintf (name, "%s.%s", $1, $3);
-	    $$ = name;
-	  }
-	| ID '.' opt_name2
+	| ID '.' ID	
 	  { 
 	    char *name = def_pool_alloc (strlen ($1) + 1 + strlen ($3) + 1);
 	    sprintf (name, "%s.%s", $1, $3);
 	    $$ = name;
 	  }
-	;
-
-opt_name: opt_name2 { $$ = $1; }
 	|		{ $$ = ""; }
 	;
 
@@ -308,7 +260,7 @@ opt_ordinal:
 	;
 
 opt_equal_name:
-          '=' opt_name2	{ $$ = $2; }
+          '=' dot_name	{ $$ = $2; }
         | 		{ $$ =  0; }			 
 	;
 
@@ -316,6 +268,21 @@ opt_base: BASE	'=' NUMBER	{ $$ = $3;}
 	|	{ $$ = -1;}
 	;
 
+dot_name: ID		{ $$ = $1; }
+	| '.' ID
+	  {
+	    char *name = def_pool_alloc (strlen ($2) + 2);
+	    sprintf (name, ".%s", $2);
+	    $$ = name;
+	  }
+	| dot_name '.' ID	
+	  { 
+	    char *name = def_pool_alloc (strlen ($1) + 1 + strlen ($3) + 1);
+	    sprintf (name, "%s.%s", $1, $3);
+	    $$ = name;
+	  }
+	;
+
 anylang_id: ID		{ $$ = $1; }
 	| '.' ID
 	  {
@@ -627,21 +594,13 @@ find_export_in_list (def_file_export *b, int max,
   if (!max)
     return 0;
   if ((e = cmp_export_elem (b, ex_name, in_name, its_name, ord)) <= 0)
-    {
-      if (!e)
-        *is_ident = 1;
-      return 0;
-    }
+    return 0;
   if (max == 1)
     return 1;
   if ((e = cmp_export_elem (b + (max - 1), ex_name, in_name, its_name, ord)) > 0)
     return max;
   else if (!e || max == 2)
-    {
-      if (!e)
-	*is_ident = 1;
-      return max - 1;
-    }
+    return max - 1;
   l = 0; r = max - 1;
   while (l < r)
     {
@@ -746,15 +705,13 @@ cmp_import_elem (const def_file_import *e, const char *ex_name,
 {
   int r;
 
-  if ((r = are_names_equal (module, (e->module ? e->module->name : NULL))))
-    return r;
   if ((r = are_names_equal (ex_name, e->name)) != 0)
     return r;
   if ((r = are_names_equal (in_name, e->internal_name)) != 0)
     return r;
   if (ord != e->ordinal)
     return (ord < e->ordinal ? -1 : 1);
-  return 0;
+  return are_names_equal (module, (e->module ? e->module->name : NULL));
 }
 
 /* Search the position of the identical element, or returns the position
@@ -772,21 +729,13 @@ find_import_in_list (def_file_import *b, int max,
   if (!max)
     return 0;
   if ((e = cmp_import_elem (b, ex_name, in_name, module, ord)) <= 0)
-    {
-      if (!e)
-        *is_ident = 1;
-      return 0;
-    }
+    return 0;
   if (max == 1)
     return 1;
   if ((e = cmp_import_elem (b + (max - 1), ex_name, in_name, module, ord)) > 0)
     return max;
   else if (!e || max == 2)
-    {
-      if (!e)
-        *is_ident = 1;
-      return max - 1;
-    }
+    return max - 1;
   l = 0; r = max - 1;
   while (l < r)
     {
diff --git a/ld/emulparams/elf32_x86_64.sh b/ld/emulparams/elf32_x86_64.sh
index fb9400312b..d26a67fbe8 100644
--- a/ld/emulparams/elf32_x86_64.sh
+++ b/ld/emulparams/elf32_x86_64.sh
@@ -8,6 +8,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="i386:x64-32"
 MACHINE=
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
diff --git a/ld/emulparams/elf32bmip.sh b/ld/emulparams/elf32bmip.sh
index f0fcd2c4bf..44a0b8a16e 100644
--- a/ld/emulparams/elf32bmip.sh
+++ b/ld/emulparams/elf32bmip.sh
@@ -64,14 +64,14 @@ OTHER_BSS_SYMBOLS='_fbss = .;'
 OTHER_SECTIONS='
   .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
   .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-  .mdebug.abi32 0 : { KEEP(*(.mdebug.abi32)) }
-  .mdebug.abiN32 0 : { KEEP(*(.mdebug.abiN32)) }
-  .mdebug.abi64 0 : { KEEP(*(.mdebug.abi64)) }
-  .mdebug.abiO64 0 : { KEEP(*(.mdebug.abiO64)) }
-  .mdebug.eabi32 0 : { KEEP(*(.mdebug.eabi32)) }
-  .mdebug.eabi64 0 : { KEEP(*(.mdebug.eabi64)) }
-  .gcc_compiled_long32 0 : { KEEP(*(.gcc_compiled_long32)) }
-  .gcc_compiled_long64 0 : { KEEP(*(.gcc_compiled_long64)) }
+  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
+  .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) }
+  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
+  .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) }
+  .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) }
+  .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) }
+  .gcc_compiled_long32 : { KEEP(*(.gcc_compiled_long32)) }
+  .gcc_compiled_long64 : { KEEP(*(.gcc_compiled_long64)) }
 '
 ARCH=mips
 MACHINE=
diff --git a/ld/emulparams/elf32ppc_fbsd.sh b/ld/emulparams/elf32ppc_fbsd.sh
index 0025b61b59..2bac85c738 100644
--- a/ld/emulparams/elf32ppc_fbsd.sh
+++ b/ld/emulparams/elf32ppc_fbsd.sh
@@ -1,5 +1,2 @@
 . ${srcdir}/emulparams/elf32ppc.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
-
-OUTPUT_FORMAT="elf32-powerpc-freebsd"
-
diff --git a/ld/emulparams/elf32tilegx.sh b/ld/emulparams/elf32tilegx.sh
index 92121e7ef2..0b3226245b 100644
--- a/ld/emulparams/elf32tilegx.sh
+++ b/ld/emulparams/elf32tilegx.sh
@@ -1,7 +1,5 @@
 SCRIPT_NAME=elf
-OUTPUT_FORMAT="elf32-tilegx-le"
-BIG_OUTPUT_FORMAT="elf32-tilegx-be"
-LITTLE_OUTPUT_FORMAT="elf32-tilegx-le"
+OUTPUT_FORMAT="elf32-tilegx"
 TEXT_START_ADDR=0x10000
 NO_REL_RELOCS=yes
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
diff --git a/ld/emulparams/elf64tilegx.sh b/ld/emulparams/elf64tilegx.sh
index 6ac9fa83ae..a2c407efe4 100644
--- a/ld/emulparams/elf64tilegx.sh
+++ b/ld/emulparams/elf64tilegx.sh
@@ -1,7 +1,5 @@
 SCRIPT_NAME=elf
-OUTPUT_FORMAT="elf64-tilegx-le"
-BIG_OUTPUT_FORMAT="elf64-tilegx-be"
-LITTLE_OUTPUT_FORMAT="elf64-tilegx-le"
+OUTPUT_FORMAT="elf64-tilegx"
 TEXT_START_ADDR=0x10000
 NO_REL_RELOCS=yes
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh
index 2b2f910fd6..1d1e4b42c9 100644
--- a/ld/emulparams/elf_i386.sh
+++ b/ld/emulparams/elf_i386.sh
@@ -7,6 +7,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH=i386
 MACHINE=
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
diff --git a/ld/emulparams/elf_i386_be.sh b/ld/emulparams/elf_i386_be.sh
index 1e27faacd0..efe1a86bfa 100644
--- a/ld/emulparams/elf_i386_be.sh
+++ b/ld/emulparams/elf_i386_be.sh
@@ -5,6 +5,7 @@ TEXT_START_ADDR=0x80000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=i386
 MACHINE=
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 NO_SMALL_DATA=yes
diff --git a/ld/emulparams/elf_i386_ldso.sh b/ld/emulparams/elf_i386_ldso.sh
index e1a2cb7f5e..183731d718 100644
--- a/ld/emulparams/elf_i386_ldso.sh
+++ b/ld/emulparams/elf_i386_ldso.sh
@@ -6,6 +6,7 @@ TEXT_START_ADDR=0x08048000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=i386
 MACHINE=
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 ELF_INTERPRETER_NAME=\"/usr/lib/ld.so.1\"
diff --git a/ld/emulparams/elf_i386_vxworks.sh b/ld/emulparams/elf_i386_vxworks.sh
index 61839c8f48..693312845e 100644
--- a/ld/emulparams/elf_i386_vxworks.sh
+++ b/ld/emulparams/elf_i386_vxworks.sh
@@ -6,6 +6,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH=i386
 MACHINE=
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
diff --git a/ld/emulparams/elf_k1om.sh b/ld/emulparams/elf_k1om.sh
index d28ffc0761..ad4b955b0b 100644
--- a/ld/emulparams/elf_k1om.sh
+++ b/ld/emulparams/elf_k1om.sh
@@ -9,6 +9,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="k1om"
 MACHINE=
 COMPILE_IN=yes
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
diff --git a/ld/emulparams/elf_l1om.sh b/ld/emulparams/elf_l1om.sh
index 80152fea30..1d22d696ca 100644
--- a/ld/emulparams/elf_l1om.sh
+++ b/ld/emulparams/elf_l1om.sh
@@ -9,6 +9,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="l1om"
 MACHINE=
 COMPILE_IN=yes
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
index c38e8453ce..a921878364 100644
--- a/ld/emulparams/elf_x86_64.sh
+++ b/ld/emulparams/elf_x86_64.sh
@@ -8,6 +8,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="i386:x86-64"
 MACHINE=
+NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
index 3f6a097f4a..d374c0c300 100644
--- a/ld/emultempl/aix.em
+++ b/ld/emultempl/aix.em
@@ -10,7 +10,7 @@ fragment <<EOF
 
 /* AIX emulation code for ${EMULATION_NAME}
    Copyright 1991, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    AIX support by Ian Lance Taylor <ian@cygnus.com>
@@ -145,7 +145,7 @@ gld${EMULATION_NAME}_before_parse (void)
 {
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
 
-  input_flags.dynamic = TRUE;
+  config.dynamic_link = TRUE;
   config.has_shared = TRUE;
 
   /* The link_info.[init|fini]_functions are initialized in ld/lexsup.c.
@@ -259,7 +259,7 @@ gld${EMULATION_NAME}_add_options
     {NULL, no_argument, NULL, 0}
   };
 
-  /* Options supported by the AIX linker which we do not support:
+  /* Options supported by the AIX linker which we do not support: -f,
      -S, -v, -Z, -bbindcmds, -bbinder, -bbindopts, -bcalls, -bcaps,
      -bcror15, -bdebugopt, -bdbg, -bdelcsect, -bex?, -bfilelist, -bfl,
      -bgcbypass, -bglink, -binsert, -bi, -bloadmap, -bl, -bmap, -bnl,
@@ -303,76 +303,6 @@ gld${EMULATION_NAME}_parse_args (int argc, char **argv)
   return FALSE;
 }
 
-/* Helper for option '-f', which specify a list of input files.
-   Contrary to the native linker, we don't support shell patterns
-   (simply because glob isn't always available).  */
-
-static void
-read_file_list (const char *filename)
-{
-  FILE *f;
-  /* An upper bound on the number of characters in the file.  */
-  long pos;
-  /* File in memory.  */
-  char *buffer;
-  size_t len;
-  char *b;
-  char *e;
-
-  f = fopen (filename, FOPEN_RT);
-  if (f == NULL)
-    {
-      einfo ("%F%P: cannot open %s\n", filename);
-      return;
-    }
-  if (fseek (f, 0L, SEEK_END) == -1)
-    goto error;
-  pos = ftell (f);
-  if (pos == -1)
-    goto error;
-  if (fseek (f, 0L, SEEK_SET) == -1)
-    goto error;
-
-  buffer = (char *) xmalloc (pos + 1);
-  len = fread (buffer, sizeof (char), pos, f);
-  if (len != (size_t) pos && ferror (f))
-    goto error;
-  /* Add a NUL terminator.  */
-  buffer[len] = '\0';
-  fclose (f);
-
-  /* Parse files.  */
-  b = buffer;
-  while (1)
-    {
-      /* Skip empty lines.  */
-      while (*b == '\n' || *b == '\r')
-        b++;
-
-      /* Stop if end of buffer.  */
-      if (b == buffer + len)
-        break;
-
-      /* Eat any byte until end of line.  */
-      for (e = b; *e != '\0'; e++)
-        if (*e == '\n' || *e == '\r')
-          break;
-
-      /* Replace end of line by nul.  */
-      if (*e != '\0')
-        *e++ = '\0';
-      
-      if (b != e)
-        lang_add_input_file (b, lang_input_file_is_search_file_enum, NULL);
-      b = e;
-    }
-  return;
-
- error:
-  einfo ("%F%P: cannot read %s\n", optarg);
-  fclose (f);
-}
-
 static bfd_boolean
 gld${EMULATION_NAME}_handle_option (int optc)
 {
@@ -388,12 +318,6 @@ gld${EMULATION_NAME}_handle_option (int optc)
       /* Long option which just sets a flag.  */
       break;
 
-    case 'f':
-      /* This overrides --auxiliary.  This option specifies a file containing
-         a list of input files.  */
-      read_file_list (optarg);
-      break;
-
     case 'D':
       val = bfd_scan_vma (optarg, &end, 0);
       if (*end != '\0')
@@ -669,7 +593,7 @@ gld${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry)
       *flpp = n;
 
       ret = TRUE;
-      entry->flags.loaded = TRUE;
+      entry->loaded = TRUE;
     }
 
   fclose (e);
@@ -1505,7 +1429,7 @@ gld${EMULATION_NAME}_open_dynamic_archive (const char *arch,
 {
   char *path;
 
-  if (!entry->flags.maybe_archive)
+  if (!entry->maybe_archive)
     return FALSE;
 
   path = concat (search->name, "/lib", entry->filename, arch, ".a", NULL);
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 03ee98b05d..d29da59a61 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -1,6 +1,6 @@
 # This shell script emits a C file. -*- C -*-
 #   Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#   2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -50,7 +50,7 @@ gld${EMULATION_NAME}_before_parse (void)
 #ifndef TARGET_			/* I.e., if not generic.  */
   ldfile_set_output_arch ("`echo ${ARCH}`", bfd_arch_unknown);
 #endif /* not TARGET_ */
-  input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
+  config.dynamic_link = ${DYNAMIC_LINK-TRUE};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
 }
 
@@ -240,7 +240,7 @@ build_section_lists (lang_statement_union_type *statement)
     {
       asection *i = statement->input_section.section;
 
-      if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+      if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
 	  && (i->flags & SEC_EXCLUDE) == 0
 	  && i->output_section != NULL
 	  && i->output_section->owner == link_info.output_bfd)
@@ -571,18 +571,18 @@ PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("  --vfp11-denorm-fix          Specify how to fix VFP11 denorm erratum\n"));
   fprintf (file, _("  --no-enum-size-warning      Don'\''t warn about objects with incompatible\n"
 		   "                                enum sizes\n"));
-  fprintf (file, _("  --no-wchar-size-warning     Don'\''t warn about objects with incompatible\n"
+  fprintf (file, _("  --no-wchar-size-warning     Don'\''t warn about objects with incompatible"
 		   "                                wchar_t sizes\n"));
   fprintf (file, _("  --pic-veneer                Always generate PIC interworking veneers\n"));
   fprintf (file, _("\
-  --stub-group-size=N         Maximum size of a group of input sections that\n\
-                               can be handled by one stub section.  A negative\n\
-                               value locates all stubs after their branches\n\
-                               (with a group size of -N), while a positive\n\
-                               value allows two groups of input sections, one\n\
-                               before, and one after each stub section.\n\
-                               Values of +/-1 indicate the linker should\n\
-                               choose suitable defaults.\n"));
+   --stub-group-size=N   Maximum size of a group of input sections that can be\n\
+                           handled by one stub section.  A negative value\n\
+                           locates all stubs after their branches (with a\n\
+                           group size of -N), while a positive value allows\n\
+                           two groups of input sections, one before, and one\n\
+                           after each stub section.  Values of +/-1 indicate\n\
+                           the linker should choose suitable defaults.\n"
+ 		   ));
   fprintf (file, _("  --[no-]fix-cortex-a8        Disable/enable Cortex-A8 Thumb-2 branch erratum fix\n"));
   fprintf (file, _("  --no-merge-exidx-entries    Disable merging exidx entries\n"));
   fprintf (file, _("  --[no-]fix-arm1176          Disable/enable ARM1176 BLX immediate erratum fix\n"));
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 7d318646eb..78a708bb4f 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -13,7 +13,7 @@ fragment <<EOF
 
 /* ${ELFSIZE} bit ELF emulation code for ${EMULATION_NAME}
    Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    ELF support by Ian Lance Taylor <ian@cygnus.com>
@@ -102,7 +102,7 @@ static void
 gld${EMULATION_NAME}_before_parse (void)
 {
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
-  input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
+  config.dynamic_link = ${DYNAMIC_LINK-TRUE};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
 }
 
@@ -121,16 +121,16 @@ gld${EMULATION_NAME}_load_symbols (lang_input_statement_type *entry)
   /* Tell the ELF linker that we don't want the output file to have a
      DT_NEEDED entry for this file, unless it is used to resolve
      references in a regular object.  */
-  if (entry->flags.add_DT_NEEDED_for_regular)
+  if (entry->add_DT_NEEDED_for_regular)
     link_class = DYN_AS_NEEDED;
 
   /* Tell the ELF linker that we don't want the output file to have a
      DT_NEEDED entry for any dynamic library in DT_NEEDED tags from
      this file at all.  */
-  if (!entry->flags.add_DT_NEEDED_for_dynamic)
+  if (!entry->add_DT_NEEDED_for_dynamic)
     link_class |= DYN_NO_ADD_NEEDED;
 
-  if (entry->flags.just_syms
+  if (entry->just_syms_flag
       && (bfd_get_file_flags (entry->the_bfd) & DYNAMIC) != 0)
     einfo (_("%P%F: --just-symbols may not be used on DSO: %B\n"),
 	   entry->the_bfd);
@@ -862,7 +862,7 @@ gld${EMULATION_NAME}_check_needed (lang_input_statement_type *s)
       return;
     }
 
-  if (s->flags.search_dirs)
+  if (s->search_dirs_flag)
     {
       const char *f = strrchr (s->filename, '/');
       if (f != NULL
@@ -1560,7 +1560,7 @@ ${ELF_INTERPRETER_SET_DEFAULT}
 	char *msg;
 	bfd_boolean ret;
 
-	if (is->flags.just_syms)
+	if (is->just_syms_flag)
 	  continue;
 
 	s = bfd_get_section_by_name (is->the_bfd, ".gnu.warning");
@@ -1621,7 +1621,7 @@ gld${EMULATION_NAME}_open_dynamic_archive
   const char *filename;
   char *string;
 
-  if (! entry->flags.maybe_archive)
+  if (! entry->maybe_archive)
     return FALSE;
 
   filename = entry->filename;
@@ -1675,7 +1675,7 @@ gld${EMULATION_NAME}_open_dynamic_archive
   if (bfd_check_format (entry->the_bfd, bfd_object)
       && (entry->the_bfd->flags & DYNAMIC) != 0)
     {
-      ASSERT (entry->flags.maybe_archive && entry->flags.search_dirs);
+      ASSERT (entry->maybe_archive && entry->search_dirs_flag);
 
       /* Rather than duplicating the logic above.  Just use the
 	 filename we recorded earlier.  */
diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index ec816246ab..1137ba2cd6 100644
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -1,6 +1,6 @@
 # This shell script emits a C file. -*- C -*-
 #   Copyright 1991, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006, 2007, 2008, 2009, 2012 Free Software Foundation, Inc.
+#   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -229,7 +229,7 @@ build_section_lists (lang_statement_union_type *statement)
     {
       asection *i = statement->input_section.section;
 
-      if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+      if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
 	  && (i->flags & SEC_EXCLUDE) == 0
 	  && i->output_section != NULL
 	  && i->output_section->owner == link_info.output_bfd)
diff --git a/ld/emultempl/linux.em b/ld/emultempl/linux.em
index 61c7df4e8b..db628308c2 100644
--- a/ld/emultempl/linux.em
+++ b/ld/emultempl/linux.em
@@ -10,7 +10,7 @@ fragment <<EOF
 
 /* Linux a.out emulation code for ${EMULATION_NAME}
    Copyright 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007, 2008, 2012 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    Linux support by Eric Youngdale <ericy@cais.cais.com>
 
@@ -49,7 +49,7 @@ static void
 gld${EMULATION_NAME}_before_parse (void)
 {
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
-  input_flags.dynamic = TRUE;
+  config.dynamic_link = TRUE;
   config.has_shared = TRUE;
 }
 
@@ -62,7 +62,7 @@ gld${EMULATION_NAME}_open_dynamic_archive
 {
   char *string;
 
-  if (! entry->flags.maybe_archive)
+  if (! entry->maybe_archive)
     return FALSE;
 
   string = (char *) xmalloc (strlen (search->name)
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index fe188f7de6..5737fc0985 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -9,8 +9,7 @@ rm -f e${EMULATION_NAME}.c
 (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
 fragment <<EOF
 /* Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -165,7 +164,7 @@ gld_${EMULATION_NAME}_before_parse (void)
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
   output_filename = "${EXECUTABLE_NAME:-a.exe}";
 #ifdef DLL_SUPPORT
-  input_flags.dynamic = TRUE;
+  config.dynamic_link = TRUE;
   config.has_shared = 1;
 EOF
 
@@ -2094,7 +2093,7 @@ gld_${EMULATION_NAME}_open_dynamic_archive
   unsigned int i;
 
 
-  if (! entry->flags.maybe_archive)
+  if (! entry->maybe_archive)
     return FALSE;
 
   filename = entry->filename;
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index a24c30a909..e02ddcf5ea 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -8,7 +8,7 @@ fi
 rm -f e${EMULATION_NAME}.c
 (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
 fragment <<EOF
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Kai Tietz, OneVision Software GmbH&CoKg.
 
@@ -139,7 +139,7 @@ gld_${EMULATION_NAME}_before_parse (void)
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
   output_filename = "${EXECUTABLE_NAME:-a.exe}";
 #ifdef DLL_SUPPORT
-  input_flags.dynamic = TRUE;
+  config.dynamic_link = TRUE;
   config.has_shared = 1;
   link_info.pei386_auto_import = 1;
   link_info.pei386_runtime_pseudo_reloc = 2; /* Use by default version 2.  */
@@ -1830,7 +1830,7 @@ gld_${EMULATION_NAME}_open_dynamic_archive
   unsigned int i;
 
 
-  if (! entry->flags.maybe_archive)
+  if (! entry->maybe_archive)
     return FALSE;
 
   filename = entry->filename;
diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
index 668b468b69..92a468fb66 100644
--- a/ld/emultempl/ppc64elf.em
+++ b/ld/emultempl/ppc64elf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 # Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -62,13 +62,7 @@ static int no_multi_toc = 0;
 static int no_toc_sort = 0;
 
 /* Set if PLT call stubs should load r11.  */
-static int plt_static_chain = ${DEFAULT_PLT_STATIC_CHAIN-0};
-
-/* Set if PLT call stubs need to be thread safe on power7+.  */
-static int plt_thread_safe = -1;
-
-/* Set if individual PLT call stubs should be aligned.  */
-static int plt_stub_align = 0;
+static int plt_static_chain = 0;
 
 /* Whether to emit symbols for stubs.  */
 static int emit_stub_syms = -1;
@@ -100,7 +94,7 @@ ppc_create_output_section_statements (void)
 			     bfd_get_arch (link_info.output_bfd),
 			     bfd_get_mach (link_info.output_bfd)))
     {
-      einfo ("%F%P: can not create BFD: %E\n");
+      einfo ("%F%P: can not create BFD %E\n");
       return;
     }
 
@@ -255,7 +249,7 @@ ppc_before_allocation (void)
     {
       if (!no_opd_opt
 	  && !ppc64_elf_edit_opd (&link_info, non_overlapping_opd))
-	einfo ("%X%P: can not edit %s: %E\n", "opd");
+	einfo ("%X%P: can not edit %s %E\n", "opd");
 
       if (ppc64_elf_tls_setup (&link_info, no_tls_get_addr_opt, &no_multi_toc)
 	  && !no_tls_opt)
@@ -274,7 +268,7 @@ ppc_before_allocation (void)
 	  prelim_size_sections ();
 
 	  if (!ppc64_elf_edit_toc (&link_info))
-	    einfo ("%X%P: can not edit %s: %E\n", "toc");
+	    einfo ("%X%P: can not edit %s %E\n", "toc");
 	}
 
       if (!no_toc_sort)
@@ -385,8 +379,7 @@ ppc_add_stub_section (const char *stub_sec_name, asection *input_section)
   stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd,
 						 stub_sec_name, flags);
   if (stub_sec == NULL
-      || !bfd_set_section_alignment (stub_file->the_bfd, stub_sec,
-				     plt_stub_align > 5 ? plt_stub_align : 5))
+      || !bfd_set_section_alignment (stub_file->the_bfd, stub_sec, 5))
     goto err_ret;
 
   output_section = input_section->output_section;
@@ -435,7 +428,7 @@ build_toc_list (lang_statement_union_type *statement)
     {
       asection *i = statement->input_section.section;
 
-      if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+      if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
 	  && (i->flags & SEC_EXCLUDE) == 0
 	  && i->output_section == toc_section)
 	{
@@ -453,7 +446,7 @@ build_section_lists (lang_statement_union_type *statement)
     {
       asection *i = statement->input_section.section;
 
-      if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+      if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
 	  && (i->flags & SEC_EXCLUDE) == 0
 	  && i->output_section != NULL
 	  && i->output_section->owner == link_info.output_bfd)
@@ -511,9 +504,7 @@ gld${EMULATION_NAME}_after_allocation (void)
 	    einfo ("%P: .init/.fini fragments use differing TOC pointers\n");
 
 	  /* Call into the BFD backend to do the real work.  */
-	  if (!ppc64_elf_size_stubs (&link_info, group_size,
-				     plt_static_chain, plt_thread_safe,
-				     plt_stub_align))
+	  if (!ppc64_elf_size_stubs (&link_info, group_size, plt_static_chain))
 	    einfo ("%X%P: can not size stub section: %E\n");
 	}
     }
@@ -658,11 +649,7 @@ PARSE_AND_LIST_PROLOGUE=${PARSE_AND_LIST_PROLOGUE}'
 #define OPTION_STUBGROUP_SIZE		321
 #define OPTION_PLT_STATIC_CHAIN		(OPTION_STUBGROUP_SIZE + 1)
 #define OPTION_NO_PLT_STATIC_CHAIN	(OPTION_PLT_STATIC_CHAIN + 1)
-#define OPTION_PLT_THREAD_SAFE		(OPTION_NO_PLT_STATIC_CHAIN + 1)
-#define OPTION_NO_PLT_THREAD_SAFE	(OPTION_PLT_THREAD_SAFE + 1)
-#define OPTION_PLT_ALIGN		(OPTION_NO_PLT_THREAD_SAFE + 1)
-#define OPTION_NO_PLT_ALIGN		(OPTION_PLT_ALIGN + 1)
-#define OPTION_STUBSYMS			(OPTION_NO_PLT_ALIGN + 1)
+#define OPTION_STUBSYMS			(OPTION_NO_PLT_STATIC_CHAIN + 1)
 #define OPTION_NO_STUBSYMS		(OPTION_STUBSYMS + 1)
 #define OPTION_DOTSYMS			(OPTION_NO_STUBSYMS + 1)
 #define OPTION_NO_DOTSYMS		(OPTION_DOTSYMS + 1)
@@ -679,10 +666,6 @@ PARSE_AND_LIST_LONGOPTS=${PARSE_AND_LIST_LONGOPTS}'
   { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE },
   { "plt-static-chain", no_argument, NULL, OPTION_PLT_STATIC_CHAIN },
   { "no-plt-static-chain", no_argument, NULL, OPTION_NO_PLT_STATIC_CHAIN },
-  { "plt-thread-safe", no_argument, NULL, OPTION_PLT_THREAD_SAFE },
-  { "no-plt-thread-safe", no_argument, NULL, OPTION_NO_PLT_THREAD_SAFE },
-  { "plt-align", optional_argument, NULL, OPTION_PLT_ALIGN },
-  { "no-plt-align", no_argument, NULL, OPTION_NO_PLT_ALIGN },
   { "emit-stub-syms", no_argument, NULL, OPTION_STUBSYMS },
   { "no-emit-stub-syms", no_argument, NULL, OPTION_NO_STUBSYMS },
   { "dotsyms", no_argument, NULL, OPTION_DOTSYMS },
@@ -708,22 +691,10 @@ PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
                                 choose suitable defaults.\n"
 		   ));
   fprintf (file, _("\
-  --plt-static-chain          PLT call stubs should load r11.${DEFAULT_PLT_STATIC_CHAIN- (default)}\n"
-		   ));
-  fprintf (file, _("\
-  --no-plt-static-chain       PLT call stubs should not load r11.${DEFAULT_PLT_STATIC_CHAIN+ (default)}\n"
-		   ));
-  fprintf (file, _("\
-  --plt-thread-safe           PLT call stubs with load-load barrier.\n"
-		   ));
-  fprintf (file, _("\
-  --no-plt-thread-safe        PLT call stubs without barrier.\n"
-		   ));
-  fprintf (file, _("\
-  --plt-align [=<align>]      Align PLT call stubs to fit cache lines.\n"
+  --plt-static-chain          PLT call stubs should load r11.\n"
 		   ));
   fprintf (file, _("\
-  --no-plt-align              Dont'\''t align individual PLT call stubs.\n"
+  --no-plt-static-chain       PLT call stubs should not load r11. (default)\n"
 		   ));
   fprintf (file, _("\
   --emit-stub-syms            Label linker stubs with a symbol.\n"
@@ -782,31 +753,6 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
       plt_static_chain = 0;
       break;
 
-    case OPTION_PLT_THREAD_SAFE:
-      plt_thread_safe = 1;
-      break;
-
-    case OPTION_NO_PLT_THREAD_SAFE:
-      plt_thread_safe = 0;
-      break;
-
-    case OPTION_PLT_ALIGN:
-      if (optarg != NULL)
-	{
-	  char *end;
-	  unsigned long val = strtoul (optarg, &end, 0);
-	  if (*end || val > 8)
-	    einfo (_("%P%F: invalid --plt-align `%s'\''\n"), optarg);
-	  plt_stub_align = val;
-	}
-      else
-	plt_stub_align = 5;
-      break;
-
-    case OPTION_NO_PLT_ALIGN:
-      plt_stub_align = 0;
-      break;
-
     case OPTION_STUBSYMS:
       emit_stub_syms = 1;
       break;
diff --git a/ld/emultempl/scoreelf.em b/ld/emultempl/scoreelf.em
index 94aa5af17a..897147e9d7 100644
--- a/ld/emultempl/scoreelf.em
+++ b/ld/emultempl/scoreelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2006, 2007, 2008, 2009, 2012 Free Software Foundation, Inc.
+#   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Contributed by:
 #   Brain.lin (brain.lin@sunplusct.com)
 #   Mei Ligang (ligang@sunnorth.com.cn)
@@ -36,7 +36,7 @@ gld${EMULATION_NAME}_before_parse ()
 #ifndef TARGET_			/* I.e., if not generic.  */
   ldfile_set_output_arch ("`echo ${ARCH}`", bfd_arch_unknown);
 #endif /* not TARGET_ */
-  input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
+  config.dynamic_link = ${DYNAMIC_LINK-TRUE};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
 }
 
diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index d3e3c70476..92f2d163d3 100644
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#   Copyright 2006, 2007, 2008, 2009, 2010, 2011
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -384,13 +384,9 @@ spu_elf_open_overlay_script (void)
   return script;
 }
 
-#include <errno.h>
-
 static void
 spu_elf_relink (void)
 {
-  const char *pex_return;
-  int status;
   char **argv = xmalloc ((my_argc + 4) * sizeof (*argv));
 
   memcpy (argv, my_argv, my_argc * sizeof (*argv));
@@ -401,16 +397,9 @@ spu_elf_relink (void)
   argv[my_argc++] = "-T";
   argv[my_argc++] = auto_overlay_file;
   argv[my_argc] = 0;
-
-  pex_return = pex_one (PEX_SEARCH | PEX_LAST, (const char *) argv[0],
-			(char * const *) argv, (const char *) argv[0],
-			NULL, NULL, & status, & errno);
-  if (pex_return != NULL)
-    {
-      perror (pex_return);
-      _exit (127);
-    }
-  exit (status);
+  execvp (argv[0], (char *const *) argv);
+  perror (argv[0]);
+  _exit (127);
 }
 
 /* Final emulation specific call.  */
@@ -579,7 +568,7 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags)
 
   /* Ensure bfd sections are excluded from the output.  */
   bfd_section_list_clear (entry->the_bfd);
-  entry->flags.loaded = TRUE;
+  entry->loaded = TRUE;
   return TRUE;
 }
 
diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em
index d7cd3e8352..567b8e2450 100644
--- a/ld/emultempl/sunos.em
+++ b/ld/emultempl/sunos.em
@@ -10,8 +10,7 @@ fragment <<EOF
 
 /* SunOS emulation code for ${EMULATION_NAME}
    Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2012
-   Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    SunOS shared library support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -86,7 +85,7 @@ static void
 gld${EMULATION_NAME}_before_parse (void)
 {
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
-  input_flags.dynamic = TRUE;
+  config.dynamic_link = TRUE;
   config.has_shared = TRUE;
 }
 
@@ -157,9 +156,9 @@ gld${EMULATION_NAME}_find_so (lang_input_statement_type *inp)
   char *alc;
   struct stat st;
 
-  if (! inp->flags.search_dirs
-      || ! inp->flags.maybe_archive
-      || ! inp->flags.dynamic)
+  if (! inp->search_dirs_flag
+      || ! inp->maybe_archive
+      || ! inp->dynamic)
     return;
 
   ASSERT (CONST_STRNEQ (inp->local_sym_name, "-l"));
@@ -189,7 +188,7 @@ gld${EMULATION_NAME}_find_so (lang_input_statement_type *inp)
 
   /* Turn off the search_dirs_flag to prevent ldfile_open_file from
      searching for this file again.  */
-  inp->flags.search_dirs = FALSE;
+  inp->search_dirs_flag = FALSE;
 
   free (found);
 
@@ -892,7 +891,7 @@ gld${EMULATION_NAME}_count_need (lang_input_statement_type *inp)
     {
       ++need_entries;
       need_size += NEED_ENTRY_SIZE;
-      if (! inp->flags.maybe_archive)
+      if (! inp->maybe_archive)
 	need_size += strlen (inp->filename) + 1;
       else
 	{
@@ -920,7 +919,7 @@ gld${EMULATION_NAME}_set_need (lang_input_statement_type *inp)
 	 referential locality.  */
       bfd_put_32 (link_info.output_bfd, need_pnames - need_contents,
 		  need_pinfo);
-      if (! inp->flags.maybe_archive)
+      if (! inp->maybe_archive)
 	{
 	  bfd_put_32 (link_info.output_bfd, (bfd_vma) 0, need_pinfo + 4);
 	  bfd_put_16 (link_info.output_bfd, (bfd_vma) 0, need_pinfo + 8);
diff --git a/ld/emultempl/vms.em b/ld/emultempl/vms.em
index 164f2e1903..6107c56870 100644
--- a/ld/emultempl/vms.em
+++ b/ld/emultempl/vms.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2010, 2012
+#   Copyright 2010
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -29,7 +29,7 @@ static void
 gld${EMULATION_NAME}_before_parse (void)
 {
   ldfile_set_output_arch ("${ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
-  input_flags.dynamic = TRUE;
+  config.dynamic_link = TRUE;
   config.has_shared = FALSE; /* Not yet.  */
 }
 
@@ -54,7 +54,7 @@ gld${EMULATION_NAME}_open_dynamic_archive (const char *arch ATTRIBUTE_UNUSED,
 {
   char *string;
 
-  if (! entry->flags.maybe_archive)
+  if (! entry->maybe_archive)
     return FALSE;
 
   string = (char *) xmalloc (strlen (search->name)
diff --git a/ld/ld.h b/ld/ld.h
index f5e031be08..a18b265eb8 100644
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -1,6 +1,6 @@
 /* ld.h -- general linker header file
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -250,6 +250,9 @@ typedef struct {
   bfd_boolean magic_demand_paged;
   bfd_boolean make_executable;
 
+  /* If TRUE, doing a dynamic link.  */
+  bfd_boolean dynamic_link;
+
   /* If TRUE, -shared is supported.  */
   /* ??? A better way to do this is perhaps to define this in the
      ld_emulation_xfer_struct since this is really a target dependent
@@ -323,6 +326,9 @@ extern ld_config_type config;
 extern FILE * saved_script_handle;
 extern bfd_boolean force_make_executable;
 
+/* Non-zero if we are processing a --defsym from the command line.  */
+extern int parsing_defsym;
+
 extern int yyparse (void);
 extern void add_cref (const char *, bfd *, asection *, bfd_vma);
 extern bfd_boolean handle_asneeded_cref (bfd *, enum notice_asneeded_action);
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index 6c74ff5dc4..592e38cefb 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -1,7 +1,7 @@
 \input texinfo
 @setfilename ld.info
 @c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 @c Free Software Foundation, Inc.
 @syncodeindex ky cp
 @c man begin INCLUDE
@@ -6710,9 +6710,7 @@ optimization.
 @cindex PowerPC64 multi-TOC
 @kindex --no-multi-toc
 @item --no-multi-toc
-If given any toc option besides @code{-mcmodel=medium} or
-@code{-mcmodel=large}, PowerPC64 GCC generates code for a TOC model
-where TOC
+By default, PowerPC64 GCC generates code for a TOC model where TOC
 entries are accessed with a 16-bit offset from r2.  This limits the
 total TOC size to 64K.  PowerPC64 @command{ld} extends this limit by
 grouping code sections such that each group uses less than 64K for its
@@ -6721,52 +6719,6 @@ calls.  @command{ld} does not split apart input sections, so cannot
 help if a single input file has a @code{.toc} section that exceeds
 64K, most likely from linking multiple files with @command{ld -r}.
 Use this option to turn off this feature.
-
-@cindex PowerPC64 TOC sorting
-@kindex --no-toc-sort
-@item --no-toc-sort
-By default, @command{ld} sorts TOC sections so that those whose file
-happens to have a section called @code{.init} or @code{.fini} are
-placed first, followed by TOC sections referenced by code generated
-with PowerPC64 gcc's @code{-mcmodel=small}, and lastly TOC sections
-referenced only by code generated with PowerPC64 gcc's
-@code{-mcmodel=medium} or @code{-mcmodel=large} options.  Doing this
-results in better TOC grouping for multi-TOC.  Use this option to turn
-off this feature.
-
-@cindex PowerPC64 PLT stub alignment
-@kindex --plt-align
-@kindex --no-plt-align
-@item --plt-align
-@itemx --no-plt-align
-Use these options to control whether individual PLT call stubs are
-aligned to a 32-byte boundary, or to the specified power of two
-boundary when using @code{--plt-align=}.  By default PLT call stubs
-are packed tightly.
-
-@cindex PowerPC64 PLT call stub static chain
-@kindex --plt-static-chain
-@kindex --no-plt-static-chain
-@item --plt-static-chain
-@itemx --no-plt-static-chain
-Use these options to control whether PLT call stubs load the static
-chain pointer (r11).  @code{ld} defaults to not loading the static
-chain since there is never any need to do so on a PLT call.
-
-@cindex PowerPC64 PLT call stub thread safety
-@kindex --plt-thread-safe
-@kindex --no-plt-thread-safe
-@item --plt-thread-safe
-@itemx --no-thread-safe
-With power7's weakly ordered memory model, it is possible when using
-lazy binding for ld.so to update a plt entry in one thread and have
-another thread see the individual plt entry words update in the wrong
-order, despite ld.so carefully writing in the correct order and using
-memory write barriers.  To avoid this we need some sort of read
-barrier in the call stub, or use LD_BIND_NOW=1.  By default, @code{ld}
-looks for calls to commonly used functions that create threads, and if
-seen, adds the necessary barriers.  Use these options to change the
-default behaviour.
 @end table
 
 @ifclear GENERIC
diff --git a/ld/ldemul.c b/ld/ldemul.c
index 85baeab325..c6ba73003d 100644
--- a/ld/ldemul.c
+++ b/ld/ldemul.c
@@ -1,6 +1,6 @@
 /* ldemul.c -- clearing house for ld emulation states
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -262,13 +262,13 @@ set_output_arch_default (void)
 void
 syslib_default (char *ignore ATTRIBUTE_UNUSED)
 {
-  info_msg (_("%S SYSLIB ignored\n"), NULL);
+  info_msg (_("%S SYSLIB ignored\n"));
 }
 
 void
 hll_default (char *ignore ATTRIBUTE_UNUSED)
 {
-  info_msg (_("%S HLL ignored\n"), NULL);
+  info_msg (_("%S HLL ignored\n"));
 }
 
 ld_emulation_xfer_type *ld_emulations[] = { EMULATION_LIST };
diff --git a/ld/ldexp.c b/ld/ldexp.c
index 3bddc813e0..68617d8553 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -1,6 +1,6 @@
 /* This module handles expression trees.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
@@ -59,7 +59,7 @@ exp_print_token (token_code_type code, int infix_p)
   static const struct
   {
     token_code_type code;
-    const char * name;
+    char * name;
   }
   table[] =
   {
@@ -156,7 +156,6 @@ exp_intop (bfd_vma value)
 {
   etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value));
   new_e->type.node_code = INT;
-  new_e->type.filename = ldlex_filename ();
   new_e->type.lineno = lineno;
   new_e->value.value = value;
   new_e->value.str = NULL;
@@ -169,7 +168,6 @@ exp_bigintop (bfd_vma value, char *str)
 {
   etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value));
   new_e->type.node_code = INT;
-  new_e->type.filename = ldlex_filename ();
   new_e->type.lineno = lineno;
   new_e->value.value = value;
   new_e->value.str = str;
@@ -184,7 +182,6 @@ exp_relop (asection *section, bfd_vma value)
 {
   etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->rel));
   new_e->type.node_code = REL;
-  new_e->type.filename = ldlex_filename ();
   new_e->type.lineno = lineno;
   new_e->type.node_class = etree_rel;
   new_e->rel.section = section;
@@ -407,7 +404,7 @@ fold_binary (etree_type *tree)
 	    expld.result.value = ((bfd_signed_vma) lhs.value
 				  % (bfd_signed_vma) expld.result.value);
 	  else if (expld.phase != lang_mark_phase_enum)
-	    einfo (_("%F%S %% by zero\n"), tree->binary.rhs);
+	    einfo (_("%F%S %% by zero\n"));
 	  if (expld.result.section == lhs.section)
 	    expld.result.section = NULL;
 	  break;
@@ -417,7 +414,7 @@ fold_binary (etree_type *tree)
 	    expld.result.value = ((bfd_signed_vma) lhs.value
 				  / (bfd_signed_vma) expld.result.value);
 	  else if (expld.phase != lang_mark_phase_enum)
-	    einfo (_("%F%S / by zero\n"), tree->binary.rhs);
+	    einfo (_("%F%S / by zero\n"));
 	  if (expld.result.section == lhs.section)
 	    expld.result.section = NULL;
 	  break;
@@ -590,12 +587,10 @@ fold_name (etree_type *tree)
 	      output_section = h->u.def.section->output_section;
 	      if (output_section == NULL)
 		{
-		  if (expld.phase == lang_mark_phase_enum)
-		    new_rel (h->u.def.value, h->u.def.section);
-		  else
+		  if (expld.phase != lang_mark_phase_enum)
 		    einfo (_("%X%S: unresolvable symbol `%s'"
 			     " referenced in expression\n"),
-			   tree, tree->name.name);
+			   tree->name.name);
 		}
 	      else if (output_section == bfd_abs_section_ptr
 		       && (expld.section != bfd_abs_section_ptr
@@ -606,11 +601,9 @@ fold_name (etree_type *tree)
 			 output_section);
 	    }
 	  else if (expld.phase == lang_final_phase_enum
-		   || (expld.phase != lang_mark_phase_enum
-		       && expld.assigning_to_dot))
-	    einfo (_("%F%S: undefined symbol `%s'"
-		     " referenced in expression\n"),
-		   tree, tree->name.name);
+		   || expld.assigning_to_dot)
+	    einfo (_("%F%S: undefined symbol `%s' referenced in expression\n"),
+		   tree->name.name);
 	  else if (h->type == bfd_link_hash_new)
 	    {
 	      h->type = bfd_link_hash_undefined;
@@ -630,9 +623,8 @@ fold_name (etree_type *tree)
 	  if (os == NULL)
 	    {
 	      if (expld.phase == lang_final_phase_enum)
-		einfo (_("%F%S: undefined section `%s'"
-			 " referenced in expression\n"),
-		       tree, tree->name.name);
+		einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
+		       tree->name.name);
 	    }
 	  else if (os->processed_vma)
 	    new_rel (0, os->bfd_section);
@@ -648,9 +640,8 @@ fold_name (etree_type *tree)
 	  if (os == NULL)
 	    {
 	      if (expld.phase == lang_final_phase_enum)
-		einfo (_("%F%S: undefined section `%s'"
-			 " referenced in expression\n"),
-		       tree, tree->name.name);
+		einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
+		       tree->name.name);
 	    }
 	  else if (os->processed_lma)
 	    {
@@ -676,9 +667,8 @@ fold_name (etree_type *tree)
 	  if (os == NULL)
 	    {
 	      if (expld.phase == lang_final_phase_enum)
-		einfo (_("%F%S: undefined section `%s'"
-			 " referenced in expression\n"),
-		       tree, tree->name.name);
+		einfo (_("%F%S: undefined section `%s' referenced in expression\n"),
+		       tree->name.name);
 	      new_number (0);
 	    }
 	  else if (os->processed_vma)
@@ -705,8 +695,7 @@ fold_name (etree_type *tree)
           new_number (mem->length);
         else          
           einfo (_("%F%S: undefined MEMORY region `%s'"
-		   " referenced in expression\n"),
-		 tree, tree->name.name);
+		   " referenced in expression\n"), tree->name.name);
       }
       break;
 
@@ -720,8 +709,7 @@ fold_name (etree_type *tree)
 	    new_rel_from_abs (mem->origin);
 	  else          
 	    einfo (_("%F%S: undefined MEMORY region `%s'"
-		     " referenced in expression\n"),
-		   tree, tree->name.name);
+		     " referenced in expression\n"), tree->name.name);
 	}
       break;
 
@@ -732,7 +720,7 @@ fold_name (etree_type *tree)
 	new_number (config.commonpagesize);
       else
 	einfo (_("%F%S: unknown constant `%s' referenced in expression\n"),
-	       tree, tree->name.name);
+	       tree->name.name);
       break;
 
     default:
@@ -796,9 +784,15 @@ exp_fold_tree_1 (etree_type *tree)
       if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0)
 	{
 	  if (tree->type.node_class != etree_assign)
-	    einfo (_("%F%S can not PROVIDE assignment to"
-		     " location counter\n"), tree);
-	  if (expld.phase != lang_first_phase_enum)
+	    einfo (_("%F%S can not PROVIDE assignment to location counter\n"));
+	  /* After allocation, assignment to dot should not be done inside
+	     an output section since allocation adds a padding statement
+	     that effectively duplicates the assignment.  */
+	  if (expld.phase == lang_mark_phase_enum
+	      || expld.phase == lang_allocating_phase_enum
+	      || ((expld.phase == lang_assigning_phase_enum
+		   || expld.phase == lang_final_phase_enum)
+		  && expld.section == bfd_abs_section_ptr))
 	    {
 	      /* Notify the folder that this is an assignment to dot.  */
 	      expld.assigning_to_dot = TRUE;
@@ -808,19 +802,12 @@ exp_fold_tree_1 (etree_type *tree)
 	      if (!expld.result.valid_p)
 		{
 		  if (expld.phase != lang_mark_phase_enum)
-		    einfo (_("%F%S invalid assignment to"
-			     " location counter\n"), tree);
+		    einfo (_("%F%S invalid assignment to location counter\n"));
 		}
 	      else if (expld.dotp == NULL)
 		einfo (_("%F%S assignment to location counter"
-			 " invalid outside of SECTIONS\n"), tree);
-
-	      /* After allocation, assignment to dot should not be
-		 done inside an output section since allocation adds a
-		 padding statement that effectively duplicates the
-		 assignment.  */
-	      else if (expld.phase <= lang_allocating_phase_enum
-		       || expld.section == bfd_abs_section_ptr)
+			 " invalid outside of SECTION\n"));
+	      else
 		{
 		  bfd_vma nextdot;
 
@@ -832,8 +819,7 @@ exp_fold_tree_1 (etree_type *tree)
 		  if (nextdot < expld.dot
 		      && expld.section != bfd_abs_section_ptr)
 		    einfo (_("%F%S cannot move location counter backwards"
-			     " (from %V to %V)\n"),
-			   tree, expld.dot, nextdot);
+			     " (from %V to %V)\n"), expld.dot, nextdot);
 		  else
 		    {
 		      expld.dot = nextdot;
@@ -884,7 +870,7 @@ exp_fold_tree_1 (etree_type *tree)
 
 	  exp_fold_tree_1 (tree->assign.src);
 	  if (expld.result.valid_p
-	      || (expld.phase <= lang_mark_phase_enum
+	      || (expld.phase == lang_first_phase_enum
 		  && tree->type.node_class == etree_assign
 		  && tree->assign.hidden))
 	    {
@@ -969,7 +955,6 @@ exp_binop (int code, etree_type *lhs, etree_type *rhs)
   etree_type value, *new_e;
 
   value.type.node_code = code;
-  value.type.filename = lhs->type.filename;
   value.type.lineno = lhs->type.lineno;
   value.binary.lhs = lhs;
   value.binary.rhs = rhs;
@@ -989,8 +974,7 @@ exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs)
   etree_type value, *new_e;
 
   value.type.node_code = code;
-  value.type.filename = cond->type.filename;
-  value.type.lineno = cond->type.lineno;
+  value.type.lineno = lhs->type.lineno;
   value.trinary.lhs = lhs;
   value.trinary.cond = cond;
   value.trinary.rhs = rhs;
@@ -1010,7 +994,6 @@ exp_unop (int code, etree_type *child)
   etree_type value, *new_e;
 
   value.unary.type.node_code = code;
-  value.unary.type.filename = child->type.filename;
   value.unary.type.lineno = child->type.lineno;
   value.unary.child = child;
   value.unary.type.node_class = etree_unary;
@@ -1029,7 +1012,6 @@ exp_nameop (int code, const char *name)
   etree_type value, *new_e;
 
   value.name.type.node_code = code;
-  value.name.type.filename = ldlex_filename ();
   value.name.type.lineno = lineno;
   value.name.name = name;
   value.name.type.node_class = etree_name;
@@ -1054,7 +1036,6 @@ exp_assop (const char *dst,
 
   n = (etree_type *) stat_alloc (sizeof (n->assign));
   n->assign.type.node_code = '=';
-  n->assign.type.filename = src->type.filename;
   n->assign.type.lineno = src->type.lineno;
   n->assign.type.node_class = class;
   n->assign.src = src;
@@ -1092,7 +1073,6 @@ exp_assert (etree_type *exp, const char *message)
 
   n = (etree_type *) stat_alloc (sizeof (n->assert_s));
   n->assert_s.type.node_code = '!';
-  n->assert_s.type.filename = exp->type.filename;
   n->assert_s.type.lineno = exp->type.lineno;
   n->assert_s.type.node_class = etree_assert;
   n->assert_s.child = exp;
@@ -1145,17 +1125,6 @@ exp_print_tree (etree_type *tree)
 	case DATA_SEGMENT_ALIGN:
 	case DATA_SEGMENT_RELRO_END:
 	  function_like = TRUE;
-	  break;
-	case SEGMENT_START:
-	  /* Special handling because arguments are in reverse order and
-	     the segment name is quoted.  */
-	  exp_print_token (tree->type.node_code, FALSE);
-	  fputs (" (\"", config.map_file);
-	  exp_print_tree (tree->binary.rhs);
-	  fputs ("\", ", config.map_file);
-	  exp_print_tree (tree->binary.lhs);
-	  fputc (')', config.map_file);
-	  return;
 	}
       if (function_like)
 	{
@@ -1219,8 +1188,7 @@ exp_get_vma (etree_type *tree, bfd_vma def, char *name)
       if (expld.result.valid_p)
 	return expld.result.value;
       else if (name != NULL && expld.phase != lang_mark_phase_enum)
-	einfo (_("%F%S: nonconstant expression for %s\n"),
-	       tree, name);
+	einfo (_("%F%S: nonconstant expression for %s\n"), name);
     }
   return def;
 }
@@ -1245,8 +1213,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
   if (!expld.result.valid_p)
     {
       if (name != NULL && expld.phase != lang_mark_phase_enum)
-	einfo (_("%F%S: nonconstant expression for %s\n"),
-	       tree, name);
+	einfo (_("%F%S: nonconstant expression for %s\n"), name);
       return def;
     }
 
@@ -1305,8 +1272,8 @@ exp_get_abs_int (etree_type *tree, int def, char *name)
 	}
       else if (name != NULL && expld.phase != lang_mark_phase_enum)
 	{
-	  einfo (_("%F%S: nonconstant expression for %s\n"),
-		 tree, name);
+	  lineno = tree->type.lineno;
+	  einfo (_("%F%S: nonconstant expression for %s\n"), name);
 	}
     }
   return def;
diff --git a/ld/ldexp.h b/ld/ldexp.h
index 586dd13f62..4ea13c2c7b 100644
--- a/ld/ldexp.h
+++ b/ld/ldexp.h
@@ -1,6 +1,6 @@
 /* ldexp.h -
    Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007, 2011, 2012 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2007, 2011 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -46,7 +46,6 @@ enum node_tree_enum {
 typedef struct {
   int node_code;
   unsigned int lineno;
-  const char *filename;
   enum node_tree_enum node_class;
 } node_type;
 
@@ -94,19 +93,11 @@ typedef union etree_union {
   } assert_s;
 } etree_type;
 
-/* Expression evaluation control.  */
-typedef enum
-{
-  /* Parsing linker script.  Will only return "valid" for expressions
-     that evaluate to a constant.  */
+typedef enum {
   lang_first_phase_enum,
-  /* Prior to section sizing.  */
   lang_mark_phase_enum,
-  /* During section sizing.  */
   lang_allocating_phase_enum,
-  /* During assignment of symbol values when relaxation in progress.  */
   lang_assigning_phase_enum,
-  /* Final assignment of symbol values.  */
   lang_final_phase_enum
 } lang_phase_type;
 
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 41ace36f54..c4b89120ee 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -1,6 +1,6 @@
 /* Linker file opening and searching.
    Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012
+   2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -40,6 +40,7 @@
 #include "plugin.h"
 #endif /* ENABLE_PLUGINS */
 
+const char * ldfile_input_filename;
 bfd_boolean  ldfile_assumed_script = FALSE;
 const char * ldfile_output_machine_name = "";
 unsigned long ldfile_output_machine;
@@ -70,26 +71,29 @@ static search_arch_type **search_arch_tail_ptr = &search_arch_head;
    sub-directory of the sysroot directory.  */
 
 static bfd_boolean
-is_sysrooted_pathname (const char *name)
+is_sysrooted_pathname (const char *name, bfd_boolean notsame)
 {
-  char *realname;
+  char * realname = ld_canon_sysroot ? lrealpath (name) : NULL;
   int len;
   bfd_boolean result;
 
-  if (ld_canon_sysroot == NULL)
+  if (! realname)
     return FALSE;
 
-  realname = lrealpath (name);
   len = strlen (realname);
-  result = FALSE;
-  if (len > ld_canon_sysroot_len
-      && IS_DIR_SEPARATOR (realname[ld_canon_sysroot_len]))
-    {
-      realname[ld_canon_sysroot_len] = '\0';
-      result = FILENAME_CMP (ld_canon_sysroot, realname) == 0;
-    }
 
-  free (realname);
+  if (((! notsame && len == ld_canon_sysroot_len)
+       || (len >= ld_canon_sysroot_len
+	   && IS_DIR_SEPARATOR (realname[ld_canon_sysroot_len])
+	   && (realname[ld_canon_sysroot_len] = '\0') == '\0'))
+      && FILENAME_CMP (ld_canon_sysroot, realname) == 0)
+    result = TRUE;
+  else
+    result = FALSE;
+
+  if (realname)
+    free (realname);
+
   return result;
 }
 
@@ -113,9 +117,15 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
   /* If a directory is marked as honoring sysroot, prepend the sysroot path
      now.  */
   if (name[0] == '=')
-    new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+    {
+      new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+      new_dirs->sysrooted = TRUE;
+    }
   else
-    new_dirs->name = xstrdup (name);
+    {
+      new_dirs->name = xstrdup (name);
+      new_dirs->sysrooted = is_sysrooted_pathname (name, FALSE);
+    }
 }
 
 /* Try to open a BFD for a lang_input_statement.  */
@@ -155,7 +165,7 @@ ldfile_try_open_bfd (const char *attempt,
      checks out compatible, do not exit early returning TRUE, or
      the plugins will not get a chance to claim the file.  */
 
-  if (entry->flags.search_dirs || !entry->flags.dynamic)
+  if (entry->search_dirs_flag || !entry->dynamic)
     {
       bfd *check;
 
@@ -169,7 +179,7 @@ ldfile_try_open_bfd (const char *attempt,
 	  if (! bfd_check_format (check, bfd_object))
 	    {
 	      if (check == entry->the_bfd
-		  && entry->flags.search_dirs
+		  && entry->search_dirs_flag
 		  && bfd_get_error () == bfd_error_file_not_recognized
 		  && ! ldemul_unrecognized_file (entry))
 		{
@@ -265,7 +275,7 @@ ldfile_try_open_bfd (const char *attempt,
 	      goto success;
 	    }
 
-	  if (!entry->flags.dynamic && (entry->the_bfd->flags & DYNAMIC) != 0)
+	  if (!entry->dynamic && (entry->the_bfd->flags & DYNAMIC) != 0)
 	    {
 	      einfo (_("%F%P: attempted static link of dynamic object `%s'\n"),
 		     attempt);
@@ -274,7 +284,7 @@ ldfile_try_open_bfd (const char *attempt,
 	      return FALSE;
 	    }
 
-	  if (entry->flags.search_dirs
+	  if (entry->search_dirs_flag
 	      && !bfd_arch_get_compatible (check, link_info.output_bfd,
 					   command_line.accept_unknown_input_arch)
 	      /* XCOFF archives can have 32 and 64 bit objects.  */
@@ -339,9 +349,9 @@ ldfile_open_file_search (const char *arch,
 
   /* If this is not an archive, try to open it in the current
      directory first.  */
-  if (! entry->flags.maybe_archive)
+  if (! entry->maybe_archive)
     {
-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
+      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
 	{
 	  char *name = concat (ld_sysroot, entry->filename,
 			       (const char *) NULL);
@@ -353,7 +363,11 @@ ldfile_open_file_search (const char *arch,
 	  free (name);
 	}
       else if (ldfile_try_open_bfd (entry->filename, entry))
-	return TRUE;
+	{
+	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+	    && is_sysrooted_pathname (entry->filename, TRUE);
+	  return TRUE;
+	}
 
       if (IS_ABSOLUTE_PATH (entry->filename))
 	return FALSE;
@@ -363,13 +377,16 @@ ldfile_open_file_search (const char *arch,
     {
       char *string;
 
-      if (entry->flags.dynamic && ! link_info.relocatable)
+      if (entry->dynamic && ! link_info.relocatable)
 	{
 	  if (ldemul_open_dynamic_archive (arch, search, entry))
-	    return TRUE;
+	    {
+	      entry->sysrooted = search->sysrooted;
+	      return TRUE;
+	    }
 	}
 
-      if (entry->flags.maybe_archive)
+      if (entry->maybe_archive)
 	string = concat (search->name, slash, lib, entry->filename,
 			 arch, suffix, (const char *) NULL);
       else
@@ -379,6 +396,7 @@ ldfile_open_file_search (const char *arch,
       if (ldfile_try_open_bfd (string, entry))
 	{
 	  entry->filename = string;
+	  entry->sysrooted = search->sysrooted;
 	  return TRUE;
 	}
 
@@ -399,7 +417,7 @@ ldfile_open_file (lang_input_statement_type *entry)
   if (entry->the_bfd != NULL)
     return;
 
-  if (! entry->flags.search_dirs)
+  if (! entry->search_dirs_flag)
     {
       if (ldfile_try_open_bfd (entry->filename, entry))
 	return;
@@ -410,8 +428,8 @@ ldfile_open_file (lang_input_statement_type *entry)
       else
 	einfo (_("%P: cannot find %s: %E\n"), entry->local_sym_name);
 
-      entry->flags.missing_file = TRUE;
-      input_flags.missing_file = TRUE;
+      entry->missing_file = TRUE;
+      missing_file = TRUE;
     }
   else
     {
@@ -437,34 +455,31 @@ ldfile_open_file (lang_input_statement_type *entry)
       /* If we have found the file, we don't need to search directories
 	 again.  */
       if (found)
-	entry->flags.search_dirs = FALSE;
+	entry->search_dirs_flag = FALSE;
       else
 	{
-	  if (entry->flags.sysrooted
+	  if (entry->sysrooted
 	       && ld_sysroot
 	       && IS_ABSOLUTE_PATH (entry->local_sym_name))
 	    einfo (_("%P: cannot find %s inside %s\n"),
 		   entry->local_sym_name, ld_sysroot);
 	  else
 	    einfo (_("%P: cannot find %s\n"), entry->local_sym_name);
-	  entry->flags.missing_file = TRUE;
-	  input_flags.missing_file = TRUE;
+	  entry->missing_file = TRUE;
+	  missing_file = TRUE;
 	}
     }
 }
 
-/* Try to open NAME.  */
+/* Try to open NAME; if that fails, try NAME with EXTEN appended to it.  */
 
 static FILE *
-try_open (const char *name, bfd_boolean *sysrooted)
+try_open (const char *name, const char *exten)
 {
   FILE *result;
 
   result = fopen (name, "r");
 
-  if (result != NULL)
-    *sysrooted = is_sysrooted_pathname (name);
-
   if (trace_file_tries)
     {
       if (result == NULL)
@@ -473,6 +488,26 @@ try_open (const char *name, bfd_boolean *sysrooted)
 	info_msg (_("opened script file %s\n"), name);
     }
 
+  if (result != NULL)
+    return result;
+
+  if (*exten)
+    {
+      char *buff;
+
+      buff = concat (name, exten, (const char *) NULL);
+      result = fopen (buff, "r");
+
+      if (trace_file_tries)
+	{
+	  if (result == NULL)
+	    info_msg (_("cannot find script file %s\n"), buff);
+	  else
+	    info_msg (_("opened script file %s\n"), buff);
+	}
+      free (buff);
+    }
+
   return result;
 }
 
@@ -533,23 +568,22 @@ find_scripts_dir (void)
 
 /* If DEFAULT_ONLY is false, try to open NAME; if that fails, look for
    it in directories specified with -L, then in the default script
-   directory.  If DEFAULT_ONLY is true, the search is restricted to
-   the default script location.  */
+   directory, without and with EXTEND appended.  If DEFAULT_ONLY is
+   true, the search is restricted to the default script location.  */
 
 static FILE *
-ldfile_find_command_file (const char *name,
-			  bfd_boolean default_only,
-			  bfd_boolean *sysrooted)
+ldfile_find_command_file (const char *name, const char *extend,
+			  bfd_boolean default_only)
 {
   search_dirs_type *search;
   FILE *result = NULL;
-  char *path;
+  char *buffer;
   static search_dirs_type *script_search;
 
   if (!default_only)
     {
       /* First try raw name.  */
-      result = try_open (name, sysrooted);
+      result = try_open (name, "");
       if (result != NULL)
 	return result;
     }
@@ -575,9 +609,9 @@ ldfile_find_command_file (const char *name,
        search != NULL;
        search = search->next)
     {
-      path = concat (search->name, slash, name, (const char *) NULL);
-      result = try_open (path, sysrooted);
-      free (path);
+      buffer = concat (search->name, slash, name, (const char *) NULL);
+      result = try_open (buffer, extend);
+      free (buffer);
       if (result)
 	break;
     }
@@ -594,9 +628,7 @@ static void
 ldfile_open_command_file_1 (const char *name, bfd_boolean default_only)
 {
   FILE *ldlex_input_stack;
-  bfd_boolean sysrooted;
-
-  ldlex_input_stack = ldfile_find_command_file (name, default_only, &sysrooted);
+  ldlex_input_stack = ldfile_find_command_file (name, "", default_only);
 
   if (ldlex_input_stack == NULL)
     {
@@ -604,8 +636,9 @@ ldfile_open_command_file_1 (const char *name, bfd_boolean default_only)
       einfo (_("%P%F: cannot open linker script file %s: %E\n"), name);
     }
 
-  lex_push_file (ldlex_input_stack, name, sysrooted);
+  lex_push_file (ldlex_input_stack, name);
 
+  ldfile_input_filename = name;
   lineno = 1;
 
   saved_script_handle = ldlex_input_stack;
diff --git a/ld/ldfile.h b/ld/ldfile.h
index 945609250a..9b79397e84 100644
--- a/ld/ldfile.h
+++ b/ld/ldfile.h
@@ -1,6 +1,6 @@
 /* ldfile.h -
-   Copyright 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, 2004, 2005,
-   2007, 2012 Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -22,6 +22,7 @@
 #ifndef LDFILE_H
 #define LDFILE_H
 
+extern const char *ldfile_input_filename;
 extern bfd_boolean ldfile_assumed_script;
 extern unsigned long ldfile_output_machine;
 extern enum bfd_architecture ldfile_output_architecture;
@@ -37,6 +38,8 @@ typedef struct search_dirs {
   const char *name;
   /* TRUE if this is from the command line.  */
   bfd_boolean cmdline;
+  /* true if this is from within the sys-root.  */
+  bfd_boolean sysrooted;
 } search_dirs_type;
 
 extern search_dirs_type *search_head;
diff --git a/ld/ldgram.y b/ld/ldgram.y
index 923ac0f8f4..36ccb5b28b 100644
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -1,6 +1,6 @@
 /* A YACC grammar to parse a superset of the AT&T linker scripting language.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
@@ -386,20 +386,17 @@ input_list:
 		{ lang_add_input_file($2,lang_input_file_is_l_enum,
 				 (char *)NULL); }
 	|	AS_NEEDED '('
-		  { $<integer>$ = input_flags.add_DT_NEEDED_for_regular;
-		    input_flags.add_DT_NEEDED_for_regular = TRUE; }
+		  { $<integer>$ = add_DT_NEEDED_for_regular; add_DT_NEEDED_for_regular = TRUE; }
 		     input_list ')'
-		  { input_flags.add_DT_NEEDED_for_regular = $<integer>3; }
+		  { add_DT_NEEDED_for_regular = $<integer>3; }
 	|	input_list ',' AS_NEEDED '('
-		  { $<integer>$ = input_flags.add_DT_NEEDED_for_regular;
-		    input_flags.add_DT_NEEDED_for_regular = TRUE; }
+		  { $<integer>$ = add_DT_NEEDED_for_regular; add_DT_NEEDED_for_regular = TRUE; }
 		     input_list ')'
-		  { input_flags.add_DT_NEEDED_for_regular = $<integer>5; }
+		  { add_DT_NEEDED_for_regular = $<integer>5; }
 	|	input_list AS_NEEDED '('
-		  { $<integer>$ = input_flags.add_DT_NEEDED_for_regular;
-		    input_flags.add_DT_NEEDED_for_regular = TRUE; }
+		  { $<integer>$ = add_DT_NEEDED_for_regular; add_DT_NEEDED_for_regular = TRUE; }
 		     input_list ')'
-		  { input_flags.add_DT_NEEDED_for_regular = $<integer>4; }
+		  { add_DT_NEEDED_for_regular = $<integer>4; }
 	;
 
 sections:
@@ -632,7 +629,7 @@ input_section_spec_no_keep:
 			  tmp.exclude_name_list = NULL;
 			  tmp.sorted = none;
 			  tmp.section_flag_list = $1;
-			  lang_add_wild (&tmp, $3, ldgram_had_keep);
+			  lang_add_wild (NULL, $3, ldgram_had_keep);
 			}
 	|	wildcard_spec '(' file_NAME_list ')'
 			{
@@ -1222,7 +1219,7 @@ phdr_type:
 			    {
 			      einfo (_("\
 %X%P:%S: unknown phdr type `%s' (try integer literal)\n"),
-				     NULL, s);
+				     s);
 			      $$ = exp_intop (0);
 			    }
 			}
@@ -1245,8 +1242,7 @@ phdr_qualifiers:
 		  else if (strcmp ($1, "FLAGS") == 0 && $2 != NULL)
 		    $$.flags = $2;
 		  else
-		    einfo (_("%X%P:%S: PHDRS syntax error at `%s'\n"),
-			   NULL, $1);
+		    einfo (_("%X%P:%S: PHDRS syntax error at `%s'\n"), $1);
 		}
 	|	AT '(' exp ')' phdr_qualifiers
 		{
@@ -1452,9 +1448,9 @@ yyerror(arg)
 {
   if (ldfile_assumed_script)
     einfo (_("%P:%s: file format not recognized; treating as linker script\n"),
-	   ldlex_filename ());
+	   ldfile_input_filename);
   if (error_index > 0 && error_index < ERROR_NAME_MAX)
-    einfo ("%P%F:%S: %s in %s\n", NULL, arg, error_names[error_index - 1]);
+     einfo ("%P%F:%S: %s in %s\n", arg, error_names[error_index-1]);
   else
-    einfo ("%P%F:%S: %s\n", NULL, arg);
+     einfo ("%P%F:%S: %s\n", arg);
 }
diff --git a/ld/ldlang.c b/ld/ldlang.c
index b0c23cb449..2c56b56455 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1,6 +1,6 @@
 /* Linker command language support.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -69,6 +69,7 @@ static struct bfd_hash_table lang_definedness_table;
 static lang_statement_list_type *stat_save[10];
 static lang_statement_list_type **stat_save_ptr = &stat_save[0];
 static struct unique_sections *unique_section_list;
+static bfd_boolean ldlang_sysrooted_script = FALSE;
 
 /* Forward declarations.  */
 static void exp_init_os (etree_type *);
@@ -99,7 +100,6 @@ lang_statement_list_type file_chain = { NULL, NULL };
 lang_statement_list_type input_file_chain;
 struct bfd_sym_chain entry_symbol = { NULL, NULL };
 const char *entry_section = ".text";
-struct lang_input_statement_flags input_flags;
 bfd_boolean entry_from_cmdline;
 bfd_boolean undef_from_cmdline;
 bfd_boolean lang_has_input_file = FALSE;
@@ -108,6 +108,7 @@ bfd_boolean lang_float_flag = FALSE;
 bfd_boolean delete_output_file_on_failure = FALSE;
 struct lang_phdr *lang_phdr_list;
 struct lang_nocrossrefs *nocrossref_list;
+bfd_boolean missing_file = FALSE;
 
  /* Functions that traverse the linker script and might evaluate
     DEFINED() need to increment this.  */
@@ -730,7 +731,7 @@ walk_wild_section (lang_wild_statement_type *ptr,
 		   callback_t callback,
 		   void *data)
 {
-  if (file->flags.just_syms)
+  if (file->just_syms_flag)
     return;
 
   (*ptr->walk_wild_section_handler) (ptr, file, callback, data);
@@ -1045,8 +1046,6 @@ new_afile (const char *name,
 {
   lang_input_statement_type *p;
 
-  lang_has_input_file = TRUE;
-
   if (add_to_list)
     p = (lang_input_statement_type *) new_stat (lang_input_statement, stat_ptr);
   else
@@ -1057,14 +1056,9 @@ new_afile (const char *name,
       p->header.next = NULL;
     }
 
-  memset (&p->the_bfd, 0,
-	  sizeof (*p) - offsetof (lang_input_statement_type, the_bfd));
+  lang_has_input_file = TRUE;
   p->target = target;
-  p->flags.dynamic = input_flags.dynamic;
-  p->flags.add_DT_NEEDED_for_dynamic = input_flags.add_DT_NEEDED_for_dynamic;
-  p->flags.add_DT_NEEDED_for_regular = input_flags.add_DT_NEEDED_for_regular;
-  p->flags.whole_archive = input_flags.whole_archive;
-  p->flags.sysrooted = input_flags.sysrooted;
+  p->sysrooted = FALSE;
 
   if (file_type == lang_input_file_is_l_enum
       && name[0] == ':' && name[1] != '\0')
@@ -1077,40 +1071,70 @@ new_afile (const char *name,
     {
     case lang_input_file_is_symbols_only_enum:
       p->filename = name;
+      p->maybe_archive = FALSE;
+      p->real = TRUE;
       p->local_sym_name = name;
-      p->flags.real = TRUE;
-      p->flags.just_syms = TRUE;
+      p->just_syms_flag = TRUE;
+      p->search_dirs_flag = FALSE;
       break;
     case lang_input_file_is_fake_enum:
       p->filename = name;
+      p->maybe_archive = FALSE;
+      p->real = FALSE;
       p->local_sym_name = name;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = FALSE;
       break;
     case lang_input_file_is_l_enum:
+      p->maybe_archive = TRUE;
       p->filename = name;
+      p->real = TRUE;
       p->local_sym_name = concat ("-l", name, (const char *) NULL);
-      p->flags.maybe_archive = TRUE;
-      p->flags.real = TRUE;
-      p->flags.search_dirs = TRUE;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = TRUE;
       break;
     case lang_input_file_is_marker_enum:
       p->filename = name;
+      p->maybe_archive = FALSE;
+      p->real = FALSE;
       p->local_sym_name = name;
-      p->flags.search_dirs = TRUE;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = TRUE;
       break;
     case lang_input_file_is_search_file_enum:
+      p->sysrooted = ldlang_sysrooted_script;
       p->filename = name;
+      p->maybe_archive = FALSE;
+      p->real = TRUE;
       p->local_sym_name = name;
-      p->flags.real = TRUE;
-      p->flags.search_dirs = TRUE;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = TRUE;
       break;
     case lang_input_file_is_file_enum:
       p->filename = name;
+      p->maybe_archive = FALSE;
+      p->real = TRUE;
       p->local_sym_name = name;
-      p->flags.real = TRUE;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = FALSE;
       break;
     default:
       FAIL ();
     }
+  p->the_bfd = NULL;
+  p->next_real_file = NULL;
+  p->next = NULL;
+  p->dynamic = config.dynamic_link;
+  p->add_DT_NEEDED_for_dynamic = add_DT_NEEDED_for_dynamic;
+  p->add_DT_NEEDED_for_regular = add_DT_NEEDED_for_regular;
+  p->whole_archive = whole_archive;
+  p->loaded = FALSE;
+  p->missing_file = FALSE;
+#ifdef ENABLE_PLUGINS
+  p->claimed = FALSE;
+  p->claim_archive = FALSE;
+  p->reload = FALSE;
+#endif /* ENABLE_PLUGINS */
 
   lang_statement_append (&input_file_chain,
 			 (lang_statement_union_type *) p,
@@ -1288,13 +1312,12 @@ lang_memory_region_lookup (const char *const name, bfd_boolean create)
         {
           if (create)
             einfo (_("%P:%S: warning: redeclaration of memory region `%s'\n"),
-                   NULL, name);
+                   name);
           return r;
         }
 
   if (!create && strcmp (name, DEFAULT_MEMORY_REGION))
-    einfo (_("%P:%S: warning: memory region `%s' not declared\n"),
-	   NULL, name);
+    einfo (_("%P:%S: warning: memory region `%s' not declared\n"), name);
 
   new_region = (lang_memory_region_type *)
       stat_alloc (sizeof (lang_memory_region_type));
@@ -1328,7 +1351,7 @@ lang_memory_region_alias (const char * alias, const char * region_name)
      the default memory region.  */
   if (strcmp (region_name, DEFAULT_MEMORY_REGION) == 0
       || strcmp (alias, DEFAULT_MEMORY_REGION) == 0)
-    einfo (_("%F%P:%S: error: alias for default memory region\n"), NULL);
+    einfo (_("%F%P:%S: error: alias for default memory region\n"));
 
   /* Look for the target region and check if the alias is not already
      in use.  */
@@ -1341,14 +1364,15 @@ lang_memory_region_alias (const char * alias, const char * region_name)
         if (strcmp (n->name, alias) == 0)
           einfo (_("%F%P:%S: error: redefinition of memory region "
                    "alias `%s'\n"),
-                 NULL, alias);
+                 alias);
       }
 
   /* Check if the target region exists.  */
   if (region == NULL)
     einfo (_("%F%P:%S: error: memory region `%s' "
              "for alias `%s' does not exist\n"),
-           NULL, region_name, alias);
+           region_name,
+           alias);
 
   /* Add alias to region name list.  */
   n = (lang_memory_region_name *) stat_alloc (sizeof (lang_memory_region_name));
@@ -1988,7 +2012,7 @@ lang_map (void)
       asection *s;
 
       if ((file->the_bfd->flags & (BFD_LINKER_CREATED | DYNAMIC)) != 0
-	  || file->flags.just_syms)
+	  || file->just_syms_flag)
 	continue;
 
       for (s = file->the_bfd->sections; s != NULL; s = s->next)
@@ -2210,7 +2234,7 @@ section_already_linked (bfd *abfd, asection *sec, void *data)
 
   /* If we are only reading symbols from this object, then we want to
      discard all sections.  */
-  if (entry->flags.just_syms)
+  if (entry->just_syms_flag)
     {
       bfd_link_just_syms (abfd, sec, &link_info);
       return;
@@ -2595,7 +2619,7 @@ lookup_name (const char *name)
 
   /* If we have already added this file, or this file is not real
      don't add this file.  */
-  if (search->flags.loaded || !search->flags.real)
+  if (search->loaded || !search->real)
     return search;
 
   if (! load_symbols (search, NULL))
@@ -2673,20 +2697,23 @@ load_symbols (lang_input_statement_type *entry,
 {
   char **matching;
 
-  if (entry->flags.loaded)
+  if (entry->loaded)
     return TRUE;
 
   ldfile_open_file (entry);
 
   /* Do not process further if the file was missing.  */
-  if (entry->flags.missing_file)
+  if (entry->missing_file)
     return TRUE;
 
   if (! bfd_check_format (entry->the_bfd, bfd_archive)
       && ! bfd_check_format_matches (entry->the_bfd, bfd_object, &matching))
     {
       bfd_error_type err;
-      struct lang_input_statement_flags save_flags;
+      bfd_boolean save_ldlang_sysrooted_script;
+      bfd_boolean save_add_DT_NEEDED_for_regular;
+      bfd_boolean save_add_DT_NEEDED_for_dynamic;
+      bfd_boolean save_whole_archive;
 
       err = bfd_get_error ();
 
@@ -2712,27 +2739,30 @@ load_symbols (lang_input_statement_type *entry,
       entry->the_bfd = NULL;
 
       /* Try to interpret the file as a linker script.  */
-      save_flags = input_flags;
       ldfile_open_command_file (entry->filename);
 
       push_stat_ptr (place);
-      input_flags.add_DT_NEEDED_for_regular
-	= entry->flags.add_DT_NEEDED_for_regular;
-      input_flags.add_DT_NEEDED_for_dynamic
-	= entry->flags.add_DT_NEEDED_for_dynamic;
-      input_flags.whole_archive = entry->flags.whole_archive;
-      input_flags.dynamic = entry->flags.dynamic;
+      save_ldlang_sysrooted_script = ldlang_sysrooted_script;
+      ldlang_sysrooted_script = entry->sysrooted;
+      save_add_DT_NEEDED_for_regular = add_DT_NEEDED_for_regular;
+      add_DT_NEEDED_for_regular = entry->add_DT_NEEDED_for_regular;
+      save_add_DT_NEEDED_for_dynamic = add_DT_NEEDED_for_dynamic;
+      add_DT_NEEDED_for_dynamic = entry->add_DT_NEEDED_for_dynamic;
+      save_whole_archive = whole_archive;
+      whole_archive = entry->whole_archive;
 
       ldfile_assumed_script = TRUE;
       parser_input = input_script;
+      /* We want to use the same -Bdynamic/-Bstatic as the one for
+	 ENTRY.  */
+      config.dynamic_link = entry->dynamic;
       yyparse ();
       ldfile_assumed_script = FALSE;
 
-      /* missing_file is sticky.  sysrooted will already have been
-	 restored when seeing EOF in yyparse, but no harm to restore
-	 again.  */
-      save_flags.missing_file |= input_flags.missing_file;
-      input_flags = save_flags;
+      ldlang_sysrooted_script = save_ldlang_sysrooted_script;
+      add_DT_NEEDED_for_regular = save_add_DT_NEEDED_for_regular;
+      add_DT_NEEDED_for_dynamic = save_add_DT_NEEDED_for_dynamic;
+      whole_archive = save_whole_archive;
       pop_stat_ptr ();
 
       return TRUE;
@@ -2752,7 +2782,7 @@ load_symbols (lang_input_statement_type *entry,
 
     case bfd_object:
 #ifdef ENABLE_PLUGINS
-      if (!entry->flags.reload)
+      if (!entry->reload)
 #endif
 	ldlang_add_file (entry);
       if (trace_files || trace_file_tries)
@@ -2762,7 +2792,7 @@ load_symbols (lang_input_statement_type *entry,
     case bfd_archive:
       check_excluded_libs (entry->the_bfd);
 
-      if (entry->flags.whole_archive)
+      if (entry->whole_archive)
 	{
 	  bfd *member = NULL;
 	  bfd_boolean loaded = TRUE;
@@ -2797,18 +2827,18 @@ load_symbols (lang_input_statement_type *entry,
 		}
 	    }
 
-	  entry->flags.loaded = loaded;
+	  entry->loaded = loaded;
 	  return loaded;
 	}
       break;
     }
 
   if (bfd_link_add_symbols (entry->the_bfd, &link_info))
-    entry->flags.loaded = TRUE;
+    entry->loaded = TRUE;
   else
     einfo (_("%F%B: could not read symbols: %E\n"), entry->the_bfd);
 
-  return entry->flags.loaded;
+  return entry->loaded;
 }
 
 /* Handle a wild statement.  S->FILENAME or S->SECTION_LIST or both
@@ -2992,7 +3022,7 @@ get_first_input_target (void)
   LANG_FOR_EACH_INPUT_STATEMENT (s)
     {
       if (s->header.type == lang_input_statement_enum
-	  && s->flags.real)
+	  && s->real)
 	{
 	  ldfile_open_file (s);
 
@@ -3225,7 +3255,7 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
 	  current_target = s->target_statement.target;
 	  break;
 	case lang_input_statement_enum:
-	  if (s->input_statement.flags.real)
+	  if (s->input_statement.real)
 	    {
 	      lang_statement_union_type **os_tail;
 	      lang_statement_list_type add;
@@ -3241,22 +3271,22 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
 		  && ((mode & OPEN_BFD_RESCAN) == 0
 		      || plugin_insert == NULL)
 #endif
-		  && !s->input_statement.flags.whole_archive
-		  && s->input_statement.flags.loaded
+		  && !s->input_statement.whole_archive
+		  && s->input_statement.loaded
 		  && bfd_check_format (s->input_statement.the_bfd,
 				       bfd_archive))
-		s->input_statement.flags.loaded = FALSE;
+		s->input_statement.loaded = FALSE;
 #ifdef ENABLE_PLUGINS
 	      /* When rescanning, reload --as-needed shared libs.  */
 	      else if ((mode & OPEN_BFD_RESCAN) != 0
 		       && plugin_insert == NULL
-		       && s->input_statement.flags.loaded
-		       && s->input_statement.flags.add_DT_NEEDED_for_regular
+		       && s->input_statement.loaded
+		       && s->input_statement.add_DT_NEEDED_for_regular
 		       && ((s->input_statement.the_bfd->flags) & DYNAMIC) != 0
 		       && plugin_should_reload (s->input_statement.the_bfd))
 		{
-		  s->input_statement.flags.loaded = FALSE;
-		  s->input_statement.flags.reload = TRUE;
+		  s->input_statement.loaded = FALSE;
+		  s->input_statement.reload = TRUE;
 		}
 #endif
 
@@ -3307,7 +3337,7 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
     }
 
   /* Exit if any of the files were missing.  */
-  if (input_flags.missing_file)
+  if (missing_file)
     einfo ("%F");
 }
 
@@ -3886,9 +3916,8 @@ strip_excluded_output_sections (void)
 	  asection *s;
 
 	  for (s = output_section->map_head.s; s != NULL; s = s->map_head.s)
-	    if ((s->flags & SEC_EXCLUDE) == 0
-		&& ((s->flags & SEC_LINKER_CREATED) != 0
-		    || link_info.emitrelocations))
+	    if ((s->flags & SEC_LINKER_CREATED) != 0
+		&& (s->flags & SEC_EXCLUDE) == 0)
 	      {
 		exclude = FALSE;
 		break;
@@ -4567,11 +4596,11 @@ dprint_statement (lang_statement_union_type *s, int n)
 static void
 insert_pad (lang_statement_union_type **ptr,
 	    fill_type *fill,
-	    bfd_size_type alignment_needed,
+	    unsigned int alignment_needed,
 	    asection *output_section,
 	    bfd_vma dot)
 {
-  static fill_type zero_fill;
+  static fill_type zero_fill = { 1, { 0 } };
   lang_statement_union_type *pad = NULL;
 
   if (ptr != &statement_list.head)
@@ -4619,10 +4648,10 @@ size_input_section
   lang_input_section_type *is = &((*this_ptr)->input_section);
   asection *i = is->section;
 
-  if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+  if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
       && (i->flags & SEC_EXCLUDE) == 0)
     {
-      bfd_size_type alignment_needed;
+      unsigned int alignment_needed;
       asection *o;
 
       /* Align this section first to the input sections requirement,
@@ -4862,7 +4891,7 @@ lang_size_sections_1
 		else if (expld.phase != lang_mark_phase_enum)
 		  einfo (_("%F%S: non constant or forward reference"
 			   " address expression for section %s\n"),
-			 os->addr_tree, os->name);
+			 os->name);
 	      }
 
 	    if (os->bfd_section == NULL)
@@ -5790,7 +5819,7 @@ lang_check (void)
     {
 #ifdef ENABLE_PLUGINS
       /* Don't check format of files claimed by plugin.  */
-      if (file->input_statement.flags.claimed)
+      if (file->input_statement.claimed)
 	continue;
 #endif /* ENABLE_PLUGINS */
       input_bfd = file->input_statement.the_bfd;
@@ -5993,7 +6022,7 @@ lang_place_orphans (void)
 	      /* This section of the file is not attached, root
 		 around for a sensible place for it to go.  */
 
-	      if (file->flags.just_syms)
+	      if (file->just_syms_flag)
 		bfd_link_just_syms (file->the_bfd, s, &link_info);
 	      else if ((s->flags & SEC_EXCLUDE) != 0)
 		s->output_section = bfd_abs_section_ptr;
@@ -6305,7 +6334,7 @@ lang_gc_sections (void)
 	{
 	  asection *sec;
 #ifdef ENABLE_PLUGINS
-	  if (f->flags.claimed)
+	  if (f->claimed)
 	    continue;
 #endif
 	  for (sec = f->the_bfd->sections; sec != NULL; sec = sec->next)
@@ -6470,8 +6499,8 @@ find_replacements_insert_point (void)
        claim1 != NULL;
        claim1 = &claim1->next->input_statement)
     {
-      if (claim1->flags.claimed)
-	return claim1->flags.claim_archive ? lastobject : claim1;
+      if (claim1->claimed)
+	return claim1->claim_archive ? lastobject : claim1;
       /* Update lastobject if this is a real object file.  */
       if (claim1->the_bfd && (claim1->the_bfd->my_archive == NULL))
 	lastobject = claim1;
@@ -6561,7 +6590,7 @@ lang_process (void)
 	       plugin_error_plugin ());
       /* Open any newly added files, updating the file chains.  */
       link_info.loading_lto_outputs = TRUE;
-      open_input_bfds (*added.tail, OPEN_BFD_NORMAL);
+      open_input_bfds (added.head, OPEN_BFD_NORMAL);
       /* Restore the global list pointer now they have all been added.  */
       lang_list_remove_tail (stat_ptr, &added);
       /* And detach the fresh ends of the file lists.  */
@@ -6621,11 +6650,6 @@ lang_process (void)
      files.  */
   ldctor_build_sets ();
 
-  /* PR 13683: We must rerun the assignments prior to running garbage
-     collection in order to make sure that all symbol aliases are resolved.  */
-  lang_do_assignments (lang_mark_phase_enum);
-  expld.phase = lang_first_phase_enum;
-
   /* Remove unreferenced sections if asked to.  */
   lang_gc_sections ();
 
@@ -6882,7 +6906,7 @@ lang_startup (const char *name)
     }
   first_file->filename = name;
   first_file->local_sym_name = name;
-  first_file->flags.real = TRUE;
+  first_file->real = TRUE;
 }
 
 void
@@ -6924,8 +6948,7 @@ lang_get_regions (lang_memory_region_type **region,
     *region = lang_memory_region_lookup (memspec, FALSE);
 
   if (have_lma && lma_memspec != 0)
-    einfo (_("%X%P:%S: section has both a load address and a load region\n"),
-	   NULL);
+    einfo (_("%X%P:%S: section has both a load address and a load region\n"));
 }
 
 void
@@ -7112,8 +7135,7 @@ lang_new_phdr (const char *name,
 	&& (*pp)->type == 1
 	&& !((*pp)->filehdr || (*pp)->phdrs))
       {
-	einfo (_("%X%P:%S: PHDRS and FILEHDR are not supported"
-		 " when prior PT_LOAD headers lack them\n"), NULL);
+	einfo (_("%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack them\n"));
 	hdrs = FALSE;
       }
 
diff --git a/ld/ldlang.h b/ld/ldlang.h
index e36a0664c2..95f94128b3 100644
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -1,6 +1,6 @@
 /* ldlang.h - linker command language support
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -228,21 +228,44 @@ typedef struct
   bfd_vma output_offset;
 } lang_reloc_statement_type;
 
-struct lang_input_statement_flags
+typedef struct lang_input_statement_struct
 {
-  /* 1 means this file was specified in a -l option.  */
+  lang_statement_header_type header;
+  /* Name of this file.  */
+  const char *filename;
+  /* Name to use for the symbol giving address of text start.
+     Usually the same as filename, but for a file spec'd with
+     -l this is the -l switch itself rather than the filename.  */
+  const char *local_sym_name;
+
+  bfd *the_bfd;
+
+  struct flag_info *section_flag_list;
+
+  /* Point to the next file - whatever it is, wanders up and down
+     archives */
+  union lang_statement_union *next;
+
+  /* Point to the next file, but skips archive contents.  */
+  union lang_statement_union *next_real_file;
+
+  const char *target;
+
   unsigned int maybe_archive : 1;
 
   /* 1 means search a set of directories for this file.  */
-  unsigned int search_dirs : 1;
+  unsigned int search_dirs_flag : 1;
 
-  /* 1 means this was found when processing a script in the sysroot.  */
+  /* 1 means this was found in a search directory marked as sysrooted,
+     if search_dirs_flag is false, otherwise, that it should be
+     searched in ld_sysroot before any other location, as long as it
+     starts with a slash.  */
   unsigned int sysrooted : 1;
 
   /* 1 means this is base file of incremental load.
      Do not load this file's text or data.
      Also default text_start to after this file's bss.  */
-  unsigned int just_syms : 1;
+  unsigned int just_syms_flag : 1;
 
   /* Whether to search for this entry as a dynamic archive.  */
   unsigned int dynamic : 1;
@@ -277,32 +300,7 @@ struct lang_input_statement_flags
   /* Set if reloading an --as-needed lib.  */
   unsigned int reload : 1;
 #endif /* ENABLE_PLUGINS */
-};
 
-typedef struct lang_input_statement_struct
-{
-  lang_statement_header_type header;
-  /* Name of this file.  */
-  const char *filename;
-  /* Name to use for the symbol giving address of text start.
-     Usually the same as filename, but for a file spec'd with
-     -l this is the -l switch itself rather than the filename.  */
-  const char *local_sym_name;
-
-  bfd *the_bfd;
-
-  struct flag_info *section_flag_list;
-
-  /* Point to the next file - whatever it is, wanders up and down
-     archives */
-  union lang_statement_union *next;
-
-  /* Point to the next file, but skips archive contents.  */
-  union lang_statement_union *next_real_file;
-
-  const char *target;
-
-  struct lang_input_statement_flags flags;
 } lang_input_statement_type;
 
 typedef struct
@@ -360,7 +358,7 @@ typedef struct
 {
   lang_statement_header_type header;
   bfd_vma output_offset;
-  bfd_size_type size;
+  size_t size;
   asection *output_section;
   fill_type *fill;
 } lang_padding_statement_type;
@@ -418,6 +416,8 @@ struct lang_phdr
   etree_type *flags;
 };
 
+extern struct lang_phdr *lang_phdr_list;
+
 /* This structure is used to hold a list of sections which may not
    cross reference each other.  */
 
@@ -435,6 +435,8 @@ struct lang_nocrossrefs
   lang_nocrossref_type *list;
 };
 
+extern struct lang_nocrossrefs *nocrossref_list;
+
 /* This structure is used to hold a list of input section names which
    will not match an output section in the linker script.  */
 
@@ -465,12 +467,9 @@ struct orphan_save
   lang_output_section_statement_type **os_tail;
 };
 
-extern struct lang_phdr *lang_phdr_list;
-extern struct lang_nocrossrefs *nocrossref_list;
 extern const char *output_target;
 extern lang_output_section_statement_type *abs_output_section;
 extern lang_statement_list_type lang_output_section_statement;
-extern struct lang_input_statement_flags input_flags;
 extern bfd_boolean lang_has_input_file;
 extern etree_type *base;
 extern lang_statement_list_type *stat_ptr;
@@ -483,6 +482,7 @@ extern lang_statement_list_type file_chain;
 extern lang_statement_list_type input_file_chain;
 
 extern int lang_statement_iteration;
+extern bfd_boolean missing_file;
 
 extern void lang_init
   (void);
diff --git a/ld/ldlex.h b/ld/ldlex.h
index 739a9b0b9a..9663ce0d29 100644
--- a/ld/ldlex.h
+++ b/ld/ldlex.h
@@ -1,6 +1,6 @@
 /* ldlex.h -
-   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2000, 2003, 2005, 2006,
-   2007, 2012 Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2000, 2003, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -41,8 +41,8 @@ extern const char *lex_string;
 
 /* In ldlex.l.  */
 extern int yylex (void);
-extern void lex_push_file (FILE *, const char *, unsigned int);
-extern void lex_redirect (const char *, const char *, unsigned int);
+extern void lex_push_file (FILE *, const char *);
+extern void lex_redirect (const char *);
 extern void ldlex_script (void);
 extern void ldlex_mri_script (void);
 extern void ldlex_version_script (void);
@@ -52,7 +52,6 @@ extern void ldlex_expression (void);
 extern void ldlex_both (void);
 extern void ldlex_command (void);
 extern void ldlex_popstate (void);
-extern const char* ldlex_filename (void);
 
 /* In lexsup.c.  */
 extern int lex_input (void);
diff --git a/ld/ldlex.l b/ld/ldlex.l
index 7da611fd70..4e859b0332 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -3,7 +3,7 @@
 %{
 
 /* Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
@@ -68,7 +68,6 @@ const char *lex_string = NULL;
 static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
 static const char *file_name_stack[MAX_INCLUDE_DEPTH];
 static unsigned int lineno_stack[MAX_INCLUDE_DEPTH];
-static unsigned int sysrooted_stack[MAX_INCLUDE_DEPTH];
 static unsigned int include_stack_ptr = 0;
 static int vers_node_nesting = 0;
 
@@ -449,13 +448,18 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
 
 <<EOF>> {
   include_stack_ptr--;
+
   if (include_stack_ptr == 0)
+  {
     yyterminate ();
+  }
   else
+  {
     yy_switch_to_buffer (include_stack[include_stack_ptr]);
+  }
 
+  ldfile_input_filename = file_name_stack[include_stack_ptr - 1];
   lineno = lineno_stack[include_stack_ptr];
-  input_flags.sysrooted = sysrooted_stack[include_stack_ptr];
 
   return END;
 }
@@ -470,7 +474,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
    saving the current input info on the include stack.  */
 
 void
-lex_push_file (FILE *file, const char *name, unsigned int sysrooted)
+lex_push_file (FILE *file, const char *name)
 {
   if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
     {
@@ -478,12 +482,10 @@ lex_push_file (FILE *file, const char *name, unsigned int sysrooted)
     }
   file_name_stack[include_stack_ptr] = name;
   lineno_stack[include_stack_ptr] = lineno;
-  sysrooted_stack[include_stack_ptr] = input_flags.sysrooted;
   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
 
   include_stack_ptr++;
   lineno = 1;
-  input_flags.sysrooted = sysrooted;
   yyin = file;
   yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE));
 }
@@ -532,7 +534,7 @@ yy_create_string_buffer (const char *string, size_t size)
    on the include stack.  */
 
 void
-lex_redirect (const char *string, const char *fake_filename, unsigned int count)
+lex_redirect (const char *string)
 {
   YY_BUFFER_STATE tmp;
 
@@ -541,11 +543,11 @@ lex_redirect (const char *string, const char *fake_filename, unsigned int count)
     {
       einfo("%F: macros nested too deeply\n");
     }
-  file_name_stack[include_stack_ptr] = fake_filename;
+  file_name_stack[include_stack_ptr] = "redirect";
   lineno_stack[include_stack_ptr] = lineno;
   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
   include_stack_ptr++;
-  lineno = count;
+  lineno = 1;
   tmp = yy_create_string_buffer (string, strlen (string));
   yy_switch_to_buffer (tmp);
 }
@@ -610,15 +612,6 @@ ldlex_popstate (void)
 {
   yy_start = *(--state_stack_p);
 }
-
-/* Return the current file name, or the previous file if no file is
-   current.  */
-
-const char*
-ldlex_filename (void)
-{
-  return file_name_stack[include_stack_ptr - (include_stack_ptr != 0)];
-}
 
 
 /* Place up to MAX_SIZE characters in BUF and return
@@ -692,7 +685,7 @@ lex_warn_invalid (char *where, char *what)
   if (ldfile_assumed_script)
     {
       bfd_set_error (bfd_error_file_not_recognized);
-      einfo ("%F%s: file not recognized: %E\n", ldlex_filename ());
+      einfo ("%F%s: file not recognized: %E\n", ldfile_input_filename);
     }
 
   if (! ISPRINT (*what))
@@ -701,5 +694,5 @@ lex_warn_invalid (char *where, char *what)
       what = buf;
     }
 
-  einfo ("%P:%S: ignoring invalid character `%s'%s\n", NULL, what, where);
+  einfo ("%P:%S: ignoring invalid character `%s'%s\n", what, where);
 }
diff --git a/ld/ldmain.c b/ld/ldmain.c
index b2810a725d..7aacf0f51a 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -1,6 +1,6 @@
 /* Main program of GNU linker.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -95,6 +95,18 @@ bfd_boolean trace_file_tries;
    instead of complaining if no input files are given.  */
 bfd_boolean version_printed;
 
+/* Nonzero means link in every member of an archive.  */
+bfd_boolean whole_archive;
+
+/* True means only create DT_NEEDED entries for dynamic libraries
+   if they actually satisfy some reference in a regular object.  */
+bfd_boolean add_DT_NEEDED_for_regular;
+
+/* True means create DT_NEEDED entries for dynamic libraries that
+   are DT_NEEDED by dynamic libraries specifically mentioned on
+   the command line.  */
+bfd_boolean add_DT_NEEDED_for_dynamic;
+
 /* TRUE if we should demangle symbol names.  */
 bfd_boolean demangling;
 
@@ -315,7 +327,7 @@ main (int argc, char **argv)
       else
 	{
 	  lex_string = s;
-	  lex_redirect (s, _("built in linker script"), 1);
+	  lex_redirect (s);
 	}
       parser_input = input_script;
       yyparse ();
@@ -755,9 +767,9 @@ add_archive_element (struct bfd_link_info *info,
 	  file.filesize = arelt_size (abfd);
 	  file.fd = fd;
 	  plugin_maybe_claim (&file, input);
-	  if (input->flags.claimed)
+	  if (input->claimed)
 	    {
-	      input->flags.claim_archive = TRUE;
+	      input->claim_archive = TRUE;
 	      *subsbfd = input->the_bfd;
 	    }
 	}
diff --git a/ld/ldmain.h b/ld/ldmain.h
index 527d3f2e51..57ce8d7811 100644
--- a/ld/ldmain.h
+++ b/ld/ldmain.h
@@ -1,6 +1,6 @@
 /* ldmain.h -
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2002, 2003, 2004,
-   2005, 2007, 2008, 2009, 2012 Free Software Foundation, Inc.
+   2005, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -33,6 +33,9 @@ extern char *default_target;
 extern bfd_boolean trace_files;
 extern bfd_boolean trace_file_tries;
 extern bfd_boolean version_printed;
+extern bfd_boolean whole_archive;
+extern bfd_boolean add_DT_NEEDED_for_regular;
+extern bfd_boolean add_DT_NEEDED_for_dynamic;
 extern bfd_boolean demangling;
 extern int g_switch_value;
 extern const char *output_filename;
diff --git a/ld/ldmisc.c b/ld/ldmisc.c
index 5112c716a4..12cb726d9a 100644
--- a/ld/ldmisc.c
+++ b/ld/ldmisc.c
@@ -1,6 +1,6 @@
 /* ldmisc.c
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
@@ -51,7 +51,7 @@
  %I filename from a lang_input_statement_type
  %P print program name
  %R info about a relent
- %S print script file and linenumber from etree_type.
+ %S print script file and linenumber
  %T symbol name
  %V hex bfd_vma
  %W hex bfd_vma with 0x with no leading zeros taking up 8 spaces
@@ -240,19 +240,12 @@ vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning)
 
 	    case 'S':
 	      /* Print script file and linenumber.  */
-	      {
-		etree_type node;
-		etree_type *tp = va_arg (arg, etree_type *);
-
-		if (tp == NULL)
-		  {
-		    tp = &node;
-		    tp->type.filename = ldlex_filename ();
-		    tp->type.lineno = lineno;
-		  }
-		if (tp->type.filename != NULL)
-		  fprintf (fp, "%s:%u", tp->type.filename, tp->type.lineno);
-	      }
+	      if (parsing_defsym)
+		fprintf (fp, "--defsym %s", lex_string);
+	      else if (ldfile_input_filename != NULL)
+		fprintf (fp, "%s:%u", ldfile_input_filename, lineno);
+	      else
+		fprintf (fp, _("built in linker script:%u"), lineno);
 	      break;
 
 	    case 'R':
diff --git a/ld/ldver.c b/ld/ldver.c
index bb83b3ed88..78077d23c3 100644
--- a/ld/ldver.c
+++ b/ld/ldver.c
@@ -1,6 +1,6 @@
 /* ldver.c -- Print linker version.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002,
-   2003, 2005, 2007, 2008, 2009, 2010, 2011, 2012
+   2003, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -40,7 +40,7 @@ ldversion (int noisy)
 
   if (noisy & 2)
     {
-      printf (_("Copyright 2012 Free Software Foundation, Inc.\n"));
+      printf (_("Copyright 2011 Free Software Foundation, Inc.\n"));
       printf (_("\
 This program is free software; you may redistribute it under the terms of\n\
 the GNU General Public License version 3 or (at your option) a later version.\n\
diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index 911149e2e4..b7a1469c06 100644
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -183,7 +183,6 @@ build_link_order (lang_statement_union_type *statement)
 	  default:
 	    abort ();
 	  }
-	link_order->u.data.size = link_order->size;
       }
       break;
 
@@ -241,7 +240,7 @@ build_link_order (lang_statement_union_type *statement)
 	   attached */
 	asection *i = statement->input_section.section;
 
-	if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+	if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag
 	    && (i->flags & SEC_EXCLUDE) == 0)
 	  {
 	    asection *output_section = i->output_section;
diff --git a/ld/lexsup.c b/ld/lexsup.c
index ea34104d24..20e0271e78 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1,6 +1,6 @@
 /* Parse options for the GNU linker.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
@@ -62,6 +62,9 @@ static void set_section_start (char *, char *);
 static void set_segment_start (const char *, char *);
 static void help (void);
 
+/* Non-zero if we are processing a --defsym from the command line.  */
+int parsing_defsym = 0;
+
 /* Codes used for the long options with no short synonyms.  150 isn't
    special; it's just an arbitrary non-ASCII char value.  */
 enum option_values
@@ -726,7 +729,6 @@ parse_args (unsigned argc, char **argv)
     {
       int longind;
       int optc;
-      static unsigned int defsym_count;
 
       /* Using last_optind lets us avoid calling ldemul_parse_args
 	 multiple times on a single option, which would lead to
@@ -775,10 +777,10 @@ parse_args (unsigned argc, char **argv)
 	     ``use only shared libraries'' but, then, we don't
 	     currently support shared libraries on HP/UX anyhow.  */
 	  if (strcmp (optarg, "archive") == 0)
-	    input_flags.dynamic = FALSE;
+	    config.dynamic_link = FALSE;
 	  else if (strcmp (optarg, "shared") == 0
 		   || strcmp (optarg, "default") == 0)
-	    input_flags.dynamic = TRUE;
+	    config.dynamic_link = TRUE;
 	  else
 	    einfo (_("%P%F: unrecognized -a option `%s'\n"), optarg);
 	  break;
@@ -807,10 +809,10 @@ parse_args (unsigned argc, char **argv)
 	  yyparse ();
 	  break;
 	case OPTION_CALL_SHARED:
-	  input_flags.dynamic = TRUE;
+	  config.dynamic_link = TRUE;
 	  break;
 	case OPTION_NON_SHARED:
-	  input_flags.dynamic = FALSE;
+	  config.dynamic_link = FALSE;
 	  break;
 	case OPTION_CREF:
 	  command_line.cref = TRUE;
@@ -821,9 +823,11 @@ parse_args (unsigned argc, char **argv)
 	  break;
 	case OPTION_DEFSYM:
 	  lex_string = optarg;
-	  lex_redirect (optarg, "--defsym", ++defsym_count);
+	  lex_redirect (optarg);
 	  parser_input = input_defsym;
+	  parsing_defsym = 1;
 	  yyparse ();
+	  parsing_defsym = 0;
 	  lex_string = NULL;
 	  break;
 	case OPTION_DEMANGLE:
@@ -834,7 +838,7 @@ parse_args (unsigned argc, char **argv)
 
 	      style = cplus_demangle_name_to_style (optarg);
 	      if (style == unknown_demangling)
-		einfo (_("%F%P: unknown demangling style `%s'\n"),
+		einfo (_("%F%P: unknown demangling style `%s'"),
 		       optarg);
 
 	      cplus_demangle_set_style (style);
@@ -934,17 +938,17 @@ parse_args (unsigned argc, char **argv)
 	case 'N':
 	  config.text_read_only = FALSE;
 	  config.magic_demand_paged = FALSE;
-	  input_flags.dynamic = FALSE;
+	  config.dynamic_link = FALSE;
 	  break;
 	case OPTION_NO_OMAGIC:
 	  config.text_read_only = TRUE;
 	  config.magic_demand_paged = TRUE;
-	  /* NB/ Does not set input_flags.dynamic to TRUE.
+	  /* NB/ Does not set dynamic_link to TRUE.
 	     Use --call-shared or -Bdynamic for this.  */
 	  break;
 	case 'n':
 	  config.magic_demand_paged = FALSE;
-	  input_flags.dynamic = FALSE;
+	  config.dynamic_link = FALSE;
 	  break;
 	case OPTION_NO_DEFINE_COMMON:
 	  command_line.inhibit_common_definition = TRUE;
@@ -1040,7 +1044,7 @@ parse_args (unsigned argc, char **argv)
 	  config.only_cmd_line_lib_dirs = TRUE;
 	  break;
 	case OPTION_NO_WHOLE_ARCHIVE:
-	  input_flags.whole_archive = FALSE;
+	  whole_archive = FALSE;
 	  break;
 	case 'O':
 	  /* FIXME "-O<non-digits> <value>" used to set the address of
@@ -1092,7 +1096,7 @@ parse_args (unsigned argc, char **argv)
 	  config.build_constructors = FALSE;
 	  config.magic_demand_paged = FALSE;
 	  config.text_read_only = FALSE;
-	  input_flags.dynamic = FALSE;
+	  config.dynamic_link = FALSE;
 	  break;
 	case 'R':
 	  /* The GNU linker traditionally uses -R to mean to include
@@ -1313,7 +1317,7 @@ parse_args (unsigned argc, char **argv)
 	  config.build_constructors = TRUE;
 	  config.magic_demand_paged = FALSE;
 	  config.text_read_only = FALSE;
-	  input_flags.dynamic = FALSE;
+	  config.dynamic_link = FALSE;
 	  break;
 	case 'u':
 	  ldlang_add_undef (optarg, TRUE);
@@ -1437,19 +1441,19 @@ parse_args (unsigned argc, char **argv)
 	  link_info.warn_alternate_em = TRUE;
 	  break;
 	case OPTION_WHOLE_ARCHIVE:
-	  input_flags.whole_archive = TRUE;
+	  whole_archive = TRUE;
 	  break;
 	case OPTION_ADD_DT_NEEDED_FOR_DYNAMIC:
-	  input_flags.add_DT_NEEDED_for_dynamic = TRUE;
+	  add_DT_NEEDED_for_dynamic = TRUE;
 	  break;
 	case OPTION_NO_ADD_DT_NEEDED_FOR_DYNAMIC:
-	  input_flags.add_DT_NEEDED_for_dynamic = FALSE;
+	  add_DT_NEEDED_for_dynamic = FALSE;
 	  break;
 	case OPTION_ADD_DT_NEEDED_FOR_REGULAR:
-	  input_flags.add_DT_NEEDED_for_regular = TRUE;
+	  add_DT_NEEDED_for_regular = TRUE;
 	  break;
 	case OPTION_NO_ADD_DT_NEEDED_FOR_REGULAR:
-	  input_flags.add_DT_NEEDED_for_regular = FALSE;
+	  add_DT_NEEDED_for_regular = FALSE;
 	  break;
 	case OPTION_WRAP:
 	  add_wrap (optarg);
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 85bf2a7b35..ce0ab5d2ea 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -1,6 +1,6 @@
 /* Routines to help build PEI-format DLLs (Win32 etc)
    Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
    Written by DJ Delorie <dj@cygnus.com>
 
    This file is part of the GNU Binutils.
@@ -529,20 +529,16 @@ is_import (const char* n)
 static int
 auto_export (bfd *abfd, def_file *d, const char *n)
 {
-  def_file_export key;
+  int i;
   struct exclude_list_struct *ex;
   const autofilter_entry_type *afptr;
-  const char * libname = NULL;
-
+  const char * libname = 0;
   if (abfd && abfd->my_archive)
     libname = lbasename (abfd->my_archive->filename);
 
-  key.name = key.its_name = (char *) n;
-
-  /* Return false if n is in the d->exports table.  */
-  if (bsearch (&key, d->exports, d->num_exports,
-               sizeof (pe_def_file->exports[0]), pe_export_sort))
-    return 0;
+  for (i = 0; i < d->num_exports; i++)
+    if (strcmp (d->exports[i].name, n) == 0)
+      return 0;
 
   if (pe_dll_do_default_excludes)
     {
@@ -648,7 +644,6 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
   bfd *b;
   struct bfd_section *s;
   def_file_export *e = 0;
-  bfd_boolean resort_needed;
 
   if (!pe_def_file)
     pe_def_file = def_file_empty ();
@@ -755,7 +750,6 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 		    {
 		      int is_dup = 0;
 		      def_file_export *p;
-
 		      p = def_file_add_export (pe_def_file, sn, 0, -1,
 					       NULL, &is_dup);
 		      /* Fill data flag properly, from dlltool.c.  */
@@ -774,8 +768,6 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
   if (NE == 0)
     return;
 
-  resort_needed = FALSE;
-
   /* Canonicalize the export list.  */
   if (pe_dll_kill_ats)
     {
@@ -796,17 +788,10 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	        einfo (_("%XCannot export %s: invalid export name\n"),
 		       pe_def_file->exports[i].name);
 	      pe_def_file->exports[i].name = tmp;
-              resort_needed = TRUE;
 	    }
 	}
     }
 
-  /* Re-sort the exports table as we have possibly changed the order
-     by removing leading @.  */
-  if (resort_needed)
-    qsort (pe_def_file->exports, NE, sizeof (pe_def_file->exports[0]),
-           pe_export_sort);
-
   if (pe_dll_stdcall_aliases)
     {
       for (i = 0; i < NE; i++)
@@ -834,6 +819,18 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
   /* Convenience, but watch out for it changing.  */
   e = pe_def_file->exports;
 
+  exported_symbol_offsets = xmalloc (NE * sizeof (bfd_vma));
+  exported_symbol_sections = xmalloc (NE * sizeof (struct bfd_section *));
+
+  memset (exported_symbol_sections, 0, NE * sizeof (struct bfd_section *));
+  max_ordinal = 0;
+  min_ordinal = 65536;
+  count_exported = 0;
+  count_exported_byname = 0;
+  count_with_ordinals = 0;
+
+  qsort (pe_def_file->exports, NE, sizeof (pe_def_file->exports[0]),
+	 pe_export_sort);
   for (i = 0, j = 0; i < NE; i++)
     {
       if (i > 0 && strcmp (e[i].name, e[i - 1].name) == 0)
@@ -862,12 +859,6 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	  e[j - 1].flag_constant |= e[i].flag_constant;
 	  e[j - 1].flag_noname |= e[i].flag_noname;
 	  e[j - 1].flag_data |= e[i].flag_data;
-	  if (e[i].name)
-	    free (e[i].name);
-	  if (e[i].internal_name)
-	    free (e[i].internal_name);
-	  if (e[i].its_name)
-	    free (e[i].its_name);
 	}
       else
 	{
@@ -878,16 +869,6 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
     }
   pe_def_file->num_exports = j;	/* == NE */
 
-  exported_symbol_offsets = xmalloc (NE * sizeof (bfd_vma));
-  exported_symbol_sections = xmalloc (NE * sizeof (struct bfd_section *));
-
-  memset (exported_symbol_sections, 0, NE * sizeof (struct bfd_section *));
-  max_ordinal = 0;
-  min_ordinal = 65536;
-  count_exported = 0;
-  count_exported_byname = 0;
-  count_with_ordinals = 0;
-
   for (i = 0; i < NE; i++)
     {
       char *name;
@@ -2817,160 +2798,36 @@ pe_dll_generate_implib (def_file *def, const char *impfilename, struct bfd_link_
     }
 }
 
-static int undef_count = 0;
-
-struct key_value
-{
-  char *key;
-  const char *oname;
-};
-
-struct key_value *udef_table;
-
-static int undef_sort_cmp (const void *l1, const void *r1)
-{
-  const struct key_value *l = l1;
-  const struct key_value *r = r1;
-
-  return strcmp (l->key, r->key);
-}
-
-static struct bfd_link_hash_entry *
-pe_find_cdecl_alias_match (struct bfd_link_info *linfo, char *name)
-{
-  struct bfd_link_hash_entry *h = NULL;
-  struct key_value *kv;
-  struct key_value key;
-  char *at, *lname = (char *) alloca (strlen (name) + 3);
-  
-  strcpy (lname, name);
-
-  at = strchr (lname + (lname[0] == '@'), '@');
-  if (at)
-    at[1] = 0;
-
-  key.key = lname;
-  kv = bsearch (&key, udef_table, undef_count, sizeof (struct key_value),
-		undef_sort_cmp);
-
-  if (kv)
-    {
-      h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
-      if (h->type == bfd_link_hash_undefined)
-        return h;
-    }
-  if (lname[0] == '?')
-    return NULL;
-  if (at || lname[0] == '@')
-    {
-      if (lname[0] == '@')
-        {
-	  if (pe_details->underscored)
-	    lname[0] = '_';
-	  else
-	    strcpy (lname, lname + 1);
-	  key.key = lname;
-	  kv = bsearch (&key, udef_table, undef_count,
-			sizeof (struct key_value), undef_sort_cmp);
-	  if (kv)
-	    {
-	      h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
-	      if (h->type == bfd_link_hash_undefined)
-		return h;
-	    }
-	}
-      if (at)
-        *strchr (lname, '@') = 0;
-      key.key = lname;
-      kv = bsearch (&key, udef_table, undef_count,
-		    sizeof (struct key_value), undef_sort_cmp);
-      if (kv)
-	{
-	  h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
-	  if (h->type == bfd_link_hash_undefined)
-	    return h;
-	}
-      return NULL;
-    }
-
-  strcat (lname, "@");
-  key.key = lname;
-  kv = bsearch (&key, udef_table, undef_count,
-		sizeof (struct key_value), undef_sort_cmp);
-
-  if (kv)
-    {
-      h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
-      if (h->type == bfd_link_hash_undefined)
-	return h;
-    }
-
-  if (lname[0] == '_' && pe_details->underscored)
-    lname[0] = '@';
-  else
-    {
-      memmove (lname + 1, lname, strlen (lname) + 1);
-      lname[0] = '@';
-    }
-  key.key = lname;
-
-  kv = bsearch (&key, udef_table, undef_count,
-		sizeof (struct key_value), undef_sort_cmp);
-
-  if (kv)
-    {
-      h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
-      if (h->type == bfd_link_hash_undefined)
-        return h;
-    }
-  
-  return NULL;
-}
-
-static bfd_boolean
-pe_undef_count (struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED,
-                void *inf ATTRIBUTE_UNUSED)
-{
-  if (h->type == bfd_link_hash_undefined)
-    undef_count++;
-  return TRUE;
-}
+static struct bfd_link_hash_entry *found_sym;
 
 static bfd_boolean
-pe_undef_fill (struct bfd_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
+pe_undef_alias_cdecl_match (struct bfd_link_hash_entry *h, void *inf)
 {
-  if (h->type == bfd_link_hash_undefined)
-    {
-      char *at;
-
-      udef_table[undef_count].key = xstrdup (h->root.string);
-      at = strchr (udef_table[undef_count].key
-		   + (udef_table[undef_count].key[0] == '@'), '@');
-      if (at)
-        at[1] = 0;
-      udef_table[undef_count].oname = h->root.string;
-      undef_count++;
+  int sl;
+  char *string = inf;
+  const char *hs = h->root.string;
+
+  sl = strlen (string);
+  if (h->type == bfd_link_hash_undefined
+      && ((*hs == '@' && (!pe_details->underscored || *string == '_')
+	   && strncmp (hs + 1, string + (pe_details->underscored != 0),
+		       sl - (pe_details->underscored != 0)) == 0)
+	  || strncmp (hs, string, sl) == 0)
+      && h->root.string[sl] == '@')
+    {
+      found_sym = h;
+      return FALSE;
     }
   return TRUE;
 }
 
-static void
-pe_create_undef_table (void)
+static struct bfd_link_hash_entry *
+pe_find_cdecl_alias_match (char *name)
 {
-  undef_count = 0;
-
-  /* count undefined symbols */
-
-  bfd_link_hash_traverse (link_info.hash, pe_undef_count, "");
-
-  /* create and fill the corresponding table */
-  udef_table = xmalloc (undef_count * sizeof (struct key_value));
-
-  undef_count = 0;
-  bfd_link_hash_traverse (link_info.hash, pe_undef_fill, "");
-
-  /* sort items */
-  qsort (udef_table, undef_count, sizeof (struct key_value), undef_sort_cmp);
+  found_sym = 0;
+  bfd_link_hash_traverse (link_info.hash, pe_undef_alias_cdecl_match,
+			  (char *) name);
+  return found_sym;
 }
 
 static void
@@ -2991,112 +2848,99 @@ add_bfd_to_link (bfd *abfd, const char *name, struct bfd_link_info *linfo)
 void
 pe_process_import_defs (bfd *output_bfd, struct bfd_link_info *linfo)
 {
-  int i, j;
   def_file_module *module;
-  def_file_import *imp;
 
   pe_dll_id_target (bfd_get_target (output_bfd));
 
   if (!pe_def_file)
     return;
 
-  imp = pe_def_file->imports;
-
-  pe_create_undef_table ();
-
   for (module = pe_def_file->modules; module; module = module->next)
     {
-      int do_this_dll = 0;
-
-      for (i = 0; i < pe_def_file->num_imports && imp[i].module != module; i++)
-	;
-      if (i >= pe_def_file->num_imports)
-        continue;
+      int i, do_this_dll;
 
       dll_filename = module->name;
       dll_symname = xstrdup (module->name);
-      for (j = 0; dll_symname[j]; j++)
-	if (!ISALNUM (dll_symname[j]))
-	  dll_symname[j] = '_';
+      for (i = 0; dll_symname[i]; i++)
+	if (!ISALNUM (dll_symname[i]))
+	  dll_symname[i] = '_';
 
-      for (; i < pe_def_file->num_imports && imp[i].module == module; i++)
-	{
-	  def_file_export exp;
-	  struct bfd_link_hash_entry *blhe;
-	  int lead_at = (*imp[i].internal_name == '@');
-	  /* See if we need this import.  */
-	  size_t len = strlen (imp[i].internal_name);
-	  char *name = xmalloc (len + 2 + 6);
-	  bfd_boolean include_jmp_stub = FALSE;
-	  bfd_boolean is_cdecl = FALSE;
-	  bfd_boolean is_undef = FALSE;
-
-	  if (!lead_at && strchr (imp[i].internal_name, '@') == NULL)
-	      is_cdecl = TRUE;
-
-	  if (lead_at)
-	    sprintf (name, "%s", imp[i].internal_name);
-	  else
-	    sprintf (name, "%s%s",U (""), imp[i].internal_name);
-
-	  blhe = bfd_link_hash_lookup (linfo->hash, name,
-				       FALSE, FALSE, FALSE);
+      do_this_dll = 0;
 
-	  /* Include the jump stub for <sym> only if the <sym>
-	     is undefined.  */
-	  if (!blhe || (blhe && blhe->type != bfd_link_hash_undefined))
-	    {
-	      if (lead_at)
-		sprintf (name, "%s%s", "__imp_", imp[i].internal_name);
-	      else
-		sprintf (name, "%s%s%s", "__imp_", U (""),
-			 imp[i].internal_name);
-
-	      blhe = bfd_link_hash_lookup (linfo->hash, name,
-					   FALSE, FALSE, FALSE);
-	      if (blhe)
-	        is_undef = (blhe->type == bfd_link_hash_undefined);
-	    }
-	  else
-	    {
-	      include_jmp_stub = TRUE;
-	      is_undef = (blhe->type == bfd_link_hash_undefined);
-	    }
-
-	  if (is_cdecl && (!blhe || (blhe && blhe->type != bfd_link_hash_undefined)))
-	    {
-	      sprintf (name, "%s%s",U (""), imp[i].internal_name);
-	      blhe = pe_find_cdecl_alias_match (linfo, name);
+      for (i = 0; i < pe_def_file->num_imports; i++)
+	if (pe_def_file->imports[i].module == module)
+	  {
+	    def_file_export exp;
+	    struct bfd_link_hash_entry *blhe;
+	    int lead_at = (*pe_def_file->imports[i].internal_name == '@');
+	    /* See if we need this import.  */
+	    size_t len = strlen (pe_def_file->imports[i].internal_name);
+	    char *name = xmalloc (len + 2 + 6);
+	    bfd_boolean include_jmp_stub = FALSE;
+	    bfd_boolean is_cdecl = FALSE;
+	    if (!lead_at && strchr (pe_def_file->imports[i].internal_name, '@') == NULL)
+	        is_cdecl = TRUE;
+
+ 	    if (lead_at)
+	      sprintf (name, "%s",
+		       pe_def_file->imports[i].internal_name);
+	    else
+	      sprintf (name, "%s%s",U (""),
+		       pe_def_file->imports[i].internal_name);
+
+	    blhe = bfd_link_hash_lookup (linfo->hash, name,
+					 FALSE, FALSE, FALSE);
+
+	    /* Include the jump stub for <sym> only if the <sym>
+	       is undefined.  */
+	    if (!blhe || (blhe && blhe->type != bfd_link_hash_undefined))
+	      {
+		if (lead_at)
+		  sprintf (name, "%s%s", "__imp_",
+			   pe_def_file->imports[i].internal_name);
+		else
+		  sprintf (name, "%s%s%s", "__imp_", U (""),
+			   pe_def_file->imports[i].internal_name);
+
+		blhe = bfd_link_hash_lookup (linfo->hash, name,
+					     FALSE, FALSE, FALSE);
+	      }
+	    else
 	      include_jmp_stub = TRUE;
-	      if (blhe)
-	        is_undef = (blhe->type == bfd_link_hash_undefined);
-	    }
-
-	  free (name);
 
-	  if (is_undef)
-	    {
-	      bfd *one;
-	      /* We do.  */
-	      if (!do_this_dll)
-		{
-		  bfd *ar_head = make_head (output_bfd);
-		  add_bfd_to_link (ar_head, ar_head->filename, linfo);
-		  do_this_dll = 1;
-		}
-	      exp.internal_name = imp[i].internal_name;
-	      exp.name = imp[i].name;
-	      exp.its_name = imp[i].its_name;
-	      exp.ordinal = imp[i].ordinal;
-	      exp.hint = exp.ordinal >= 0 ? exp.ordinal : 0;
-	      exp.flag_private = 0;
-	      exp.flag_constant = 0;
-	      exp.flag_data = imp[i].data;
-	      exp.flag_noname = exp.name ? 0 : 1;
-	      one = make_one (&exp, output_bfd, (! exp.flag_data) && include_jmp_stub);
-	      add_bfd_to_link (one, one->filename, linfo);
-	    }
-	}
+	    if (is_cdecl && !blhe)
+	      {
+		sprintf (name, "%s%s",U (""),
+		         pe_def_file->imports[i].internal_name);
+		blhe = pe_find_cdecl_alias_match (name);
+		include_jmp_stub = TRUE;
+	      }
+
+	    free (name);
+
+	    if (blhe && blhe->type == bfd_link_hash_undefined)
+	      {
+		bfd *one;
+		/* We do.  */
+		if (!do_this_dll)
+		  {
+		    bfd *ar_head = make_head (output_bfd);
+		    add_bfd_to_link (ar_head, ar_head->filename, linfo);
+		    do_this_dll = 1;
+		  }
+		exp.internal_name = pe_def_file->imports[i].internal_name;
+		exp.name = pe_def_file->imports[i].name;
+		exp.its_name = pe_def_file->imports[i].its_name;
+		exp.ordinal = pe_def_file->imports[i].ordinal;
+		exp.hint = exp.ordinal >= 0 ? exp.ordinal : 0;
+		exp.flag_private = 0;
+		exp.flag_constant = 0;
+		exp.flag_data = pe_def_file->imports[i].data;
+		exp.flag_noname = exp.name ? 0 : 1;
+		one = make_one (&exp, output_bfd, (! exp.flag_data) && include_jmp_stub);
+		add_bfd_to_link (one, one->filename, linfo);
+	      }
+	  }
       if (do_this_dll)
 	{
 	  bfd *ar_tail = make_tail (output_bfd);
@@ -3105,13 +2949,6 @@ pe_process_import_defs (bfd *output_bfd, struct bfd_link_info *linfo)
 
       free (dll_symname);
     }
-
-  while (undef_count)
-    {
-      --undef_count;
-      free (udef_table[undef_count].key);
-    }
-  free (udef_table);
 }
 
 /* We were handed a *.DLL file.  Parse it and turn it into a set of
@@ -3328,7 +3165,7 @@ pe_implied_import_dll (const char *filename)
 	    || (func_rva >= bss_start && func_rva < bss_end);
 
 	  imp = def_file_add_import (pe_def_file, erva + name_rva,
-				     dllname, i, NULL, NULL, &is_dup);
+				     dllname, i, 0, NULL, &is_dup);
  	  /* Mark symbol type.  */
  	  if (!is_dup)
  	    imp->data = is_data;
diff --git a/ld/plugin.c b/ld/plugin.c
index 2515888878..91fe48b9f2 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -1,5 +1,5 @@
 /* Plugin control for the GNU linker.
-   Copyright 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -262,7 +262,7 @@ is_ir_dummy_bfd (const bfd *abfd)
      when processing DT_NEEDED dependencies.  */
   return (abfd
 	  && abfd->usrdata
-	  && ((lang_input_statement_type *)(abfd->usrdata))->flags.claimed);
+	  && ((lang_input_statement_type *)(abfd->usrdata))->claimed);
 }
 
 /* Helpers to convert between BFD and GOLD symbol formats.  */
@@ -873,7 +873,7 @@ plugin_maybe_claim (struct ld_plugin_input_file *file,
       if (entry->the_bfd->my_archive == NULL)
 	bfd_close (entry->the_bfd);
       entry->the_bfd = file->handle;
-      entry->flags.claimed = TRUE;
+      entry->claimed = TRUE;
       bfd_make_readable (entry->the_bfd);
     }
   else
@@ -881,7 +881,7 @@ plugin_maybe_claim (struct ld_plugin_input_file *file,
       /* If plugin didn't claim the file, we don't need the dummy bfd.
 	 Can't avoid speculatively creating it, alas.  */
       bfd_close_all_done (file->handle);
-      entry->flags.claimed = FALSE;
+      entry->claimed = FALSE;
     }
 }
 
diff --git a/ld/po/bg.po b/ld/po/bg.po
index 0dbba9ff8a..123d2a2cd7 100644
--- a/ld/po/bg.po
+++ b/ld/po/bg.po
@@ -1,20 +1,19 @@
 # Translation of binutils ld to Bulgarian
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010, 2011.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010.
 #
 # Abbreviations:
 #  BFD - Binary Format Description
 #  IR - Intermediate Representation
 msgid ""
 msgstr ""
-"Project-Id-Version: ld 2.21.53\n"
+"Project-Id-Version: ld 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-25 19:18+0300\n"
+"POT-Creation-Date: 2010-11-05 11:34+0100\n"
+"PO-Revision-Date: 2010-11-10 22:47+0200\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,170 +34,170 @@ msgstr "  --thumb-entry=<знак>         УÑ�тановÑ�ване на вхоÐ
 msgid "Errors encountered processing file %s"
 msgstr "Сблъ�кване � грешки при обработване на файл %s"
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1813
+#: emultempl/armcoff.em:190 emultempl/pe.em:1812
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr "%P: предупреждение: '--thumb-entry %s' прегазва '-e %s'\n"
 
-#: emultempl/armcoff.em:197 emultempl/pe.em:1818
+#: emultempl/armcoff.em:195 emultempl/pe.em:1817
 msgid "%P: warning: cannot find thumb start symbol %s\n"
 msgstr "%P: предупреждение: не е намерен, като начален, отбел�зани� знак %s\n"
 
-#: emultempl/pe.em:419
+#: emultempl/pe.em:418
 #, c-format
 msgid "  --base_file <basefile>             Generate a base file for relocatable DLLs\n"
 msgstr "  --base_file <базов_файл>           Създаване на базов файл за преме�тваеми DLLs\n"
 
-#: emultempl/pe.em:420
+#: emultempl/pe.em:419
 #, c-format
 msgid "  --dll                              Set image base to the default for DLLs\n"
 msgstr "  --dll                              У�танов�ва базови� адре� на подразбиращи� �е за DLLs\n"
 
-#: emultempl/pe.em:421
+#: emultempl/pe.em:420
 #, c-format
 msgid "  --file-alignment <size>            Set file alignment\n"
 msgstr "  --file-alignment <размер>            У�танов�ва подравн�ване за файла\n"
 
-#: emultempl/pe.em:422
+#: emultempl/pe.em:421
 #, c-format
 msgid "  --heap <size>                      Set initial size of the heap\n"
 msgstr "  --heap <размер>                    У�танов�ва начални� размер на динамичната памет\n"
 
-#: emultempl/pe.em:423
+#: emultempl/pe.em:422
 #, c-format
 msgid "  --image-base <address>             Set start address of the executable\n"
 msgstr "  --image-base <адре�>               У�танов�ва начален адре� на изпълними� файл\n"
 
-#: emultempl/pe.em:424
+#: emultempl/pe.em:423
 #, c-format
 msgid "  --major-image-version <number>     Set version number of the executable\n"
 msgstr "  --major-image-version <чи�ло>      У�танов�ва номер на вер�и� на изпълними� файл\n"
 
-#: emultempl/pe.em:425
+#: emultempl/pe.em:424
 #, c-format
 msgid "  --major-os-version <number>        Set minimum required OS version\n"
 msgstr "  --major-os-version <чи�ло>         У�танов�ва необходима минимална вер�и� на ОС\n"
 
-#: emultempl/pe.em:426
+#: emultempl/pe.em:425
 #, c-format
 msgid "  --major-subsystem-version <number> Set minimum required OS subsystem version\n"
 msgstr "  --major-subsystem-version <чи�ло>  У�танов�ва необходима минимална подвер�и� на ОС\n"
 
-#: emultempl/pe.em:427
+#: emultempl/pe.em:426
 #, c-format
 msgid "  --minor-image-version <number>     Set revision number of the executable\n"
 msgstr "  --minor-image-version <чи�ло>      У�танов�ва номер на изданието на изпълними� файл\n"
 
-#: emultempl/pe.em:428
+#: emultempl/pe.em:427
 #, c-format
 msgid "  --minor-os-version <number>        Set minimum required OS revision\n"
 msgstr "  --minor-os-version <чи�ло>         У�танов�ва необходимо минимално издание на ОС\n"
 
-#: emultempl/pe.em:429
+#: emultempl/pe.em:428
 #, c-format
 msgid "  --minor-subsystem-version <number> Set minimum required OS subsystem revision\n"
 msgstr "  --minor-subsystem-version <чи�ло>  У�танов�ва необходимо минимално подиздание на ОС\n"
 
-#: emultempl/pe.em:430
+#: emultempl/pe.em:429
 #, c-format
 msgid "  --section-alignment <size>         Set section alignment\n"
 msgstr "  --section-alignment <размер>       У�танов�ва подравн�ване на раздел\n"
 
-#: emultempl/pe.em:431
+#: emultempl/pe.em:430
 #, c-format
 msgid "  --stack <size>                     Set size of the initial stack\n"
 msgstr "  --stack <размер>                   У�танов�ва размера на първоначални� �тек\n"
 
-#: emultempl/pe.em:432
+#: emultempl/pe.em:431
 #, c-format
 msgid "  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"
 msgstr "  --subsystem <име>[:<вер�и�>]       У�танов�ва необходима под�и�тема [и вер�и�] на ОС\n"
 
-#: emultempl/pe.em:433
+#: emultempl/pe.em:432
 #, c-format
 msgid "  --support-old-code                 Support interworking with old code\n"
 msgstr "  --support-old-code                 Поддръжка на работо�по�обно�т � предишен код\n"
 
-#: emultempl/pe.em:434
+#: emultempl/pe.em:433
 #, c-format
 msgid "  --[no-]leading-underscore          Set explicit symbol underscore prefix mode\n"
 msgstr "  --[no-]leading-underscore          Изрично у�танов�ва режим � подчертавка като пред�тавка за име\n"
 
-#: emultempl/pe.em:435
+#: emultempl/pe.em:434
 #, c-format
 msgid "  --thumb-entry=<symbol>             Set the entry point to be Thumb <symbol>\n"
 msgstr "  --thumb-entry=<знак>             У�танов�ване на вход�ща точка да е отбел�зани� <знак>\n"
 
-#: emultempl/pe.em:437
+#: emultempl/pe.em:436
 #, c-format
 msgid "  --add-stdcall-alias                Export symbols with and without @nn\n"
 msgstr "  --add-stdcall-alias                Изна��не на имена � и без @nn\n"
 
-#: emultempl/pe.em:438
+#: emultempl/pe.em:437
 #, c-format
 msgid "  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"
 msgstr "  --disable-stdcall-fixup            Без �вързване на _име към _име@nn\n"
 
-#: emultempl/pe.em:439
+#: emultempl/pe.em:438
 #, c-format
 msgid "  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"
 msgstr "  --enable-stdcall-fixup             Свързва _име �ъ� _име@nn без предупреждени�\n"
 
-#: emultempl/pe.em:440
+#: emultempl/pe.em:439
 #, c-format
 msgid "  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"
 msgstr "  --exclude-symbols име,име,...    Изключва имена от автоматичното изна��не\n"
 
-#: emultempl/pe.em:441
+#: emultempl/pe.em:440
 #, c-format
 msgid "  --exclude-all-symbols              Exclude all symbols from automatic export\n"
 msgstr "  --exclude-all-symbols              Изключва в�ички имена от автоматичното изна��не\n"
 
-#: emultempl/pe.em:442
+#: emultempl/pe.em:441
 #, c-format
 msgid "  --exclude-libs lib,lib,...         Exclude libraries from automatic export\n"
 msgstr "  --exclude-libs библ.,библ.,...     Изключва библиотеки от автоматичното изна��не\n"
 
-#: emultempl/pe.em:443
+#: emultempl/pe.em:442
 #, c-format
 msgid "  --exclude-modules-for-implib mod,mod,...\n"
 msgstr "  --exclude-modules-for-implib модул,модул,...\n"
 
-#: emultempl/pe.em:444
+#: emultempl/pe.em:443
 #, c-format
 msgid "                                     Exclude objects, archive members from auto\n"
 msgstr "                                     Изключва обекти, библиотечни обекти от автоматично\n"
 
-#: emultempl/pe.em:445
+#: emultempl/pe.em:444
 #, c-format
 msgid "                                     export, place into import library instead.\n"
 msgstr "                                     изна��не, в зам�на по�тав�не в библиотека за вна��не.\n"
 
-#: emultempl/pe.em:446
+#: emultempl/pe.em:445
 #, c-format
 msgid "  --export-all-symbols               Automatically export all globals to DLL\n"
 msgstr "  --export-all-symbols               �втоматично изна��не на в�ички общи в DLL\n"
 
-#: emultempl/pe.em:447
+#: emultempl/pe.em:446
 #, c-format
 msgid "  --kill-at                          Remove @nn from exported symbols\n"
 msgstr "  --kill-at                          Премахва @nn от изне�ените имена\n"
 
-#: emultempl/pe.em:448
+#: emultempl/pe.em:447
 #, c-format
 msgid "  --out-implib <file>                Generate import library\n"
 msgstr "  --out-implib <файл>                Създава библиотека за вна��не\n"
 
-#: emultempl/pe.em:449
+#: emultempl/pe.em:448
 #, c-format
 msgid "  --output-def <file>                Generate a .DEF file for the built DLL\n"
 msgstr "  --output-def <файл>                Генерира DEF-файл за �ъздадената DLL\n"
 
-#: emultempl/pe.em:450
+#: emultempl/pe.em:449
 #, c-format
 msgid "  --warn-duplicate-exports           Warn about duplicate exports.\n"
 msgstr "  --warn-duplicate-exports           Предупреждени� за повторени ек�порти.\n"
 
-#: emultempl/pe.em:451
+#: emultempl/pe.em:450
 #, c-format
 msgid ""
 "  --compat-implib                    Create backward compatible import libs;\n"
@@ -207,7 +206,7 @@ msgstr ""
 "  --compat-implib                    Създава �ъвме�тими � преди библиотеки за вн���не;\n"
 "                                       �ъщо така �ъздава __imp_<ИМЕ>.\n"
 
-#: emultempl/pe.em:453
+#: emultempl/pe.em:452
 #, c-format
 msgid ""
 "  --enable-auto-image-base           Automatically choose image base for DLLs\n"
@@ -216,12 +215,12 @@ msgstr ""
 "  --enable-auto-image-base           �втоматично избира база на образа за DLLs,\n"
 "                                       о�вен ако потребител� не � зададе\n"
 
-#: emultempl/pe.em:455
+#: emultempl/pe.em:454
 #, c-format
 msgid "  --disable-auto-image-base          Do not auto-choose image base. (default)\n"
 msgstr "  --disable-auto-image-base          Да не �е избира автоматично база на образа. (по подразбиране)\n"
 
-#: emultempl/pe.em:456
+#: emultempl/pe.em:455
 #, c-format
 msgid ""
 "  --dll-search-prefix=<string>       When linking dynamically to a dll without\n"
@@ -233,21 +232,21 @@ msgstr ""
 "                                       предпочете <низ><базовоиме>.dll пред\n"
 "                                       lib<базовоиме>.dll \n"
 
-#: emultempl/pe.em:459
+#: emultempl/pe.em:458
 #, c-format
 msgid ""
-"  --enable-auto-import               Do sophisticated linking of _sym to\n"
+"  --enable-auto-import               Do sophistcated linking of _sym to\n"
 "                                       __imp_sym for DATA references\n"
 msgstr ""
 "  --enable-auto-import               \"Изтънчено\" �вързване на _sym �ъ�\n"
 "                                       __imp_sym при отпратки за данни\n"
 
-#: emultempl/pe.em:461
+#: emultempl/pe.em:460
 #, c-format
 msgid "  --disable-auto-import              Do not auto-import DATA items from DLLs\n"
 msgstr "  --disable-auto-import              Да не �е вна��т автоматично данни от DLL-ли\n"
 
-#: emultempl/pe.em:462
+#: emultempl/pe.em:461
 #, c-format
 msgid ""
 "  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n"
@@ -258,7 +257,7 @@ msgstr ""
 "                                       вна��ни� � добав�не на лъже-преме�твани�,\n"
 "                                       определ�ни по време на работа.\n"
 
-#: emultempl/pe.em:465
+#: emultempl/pe.em:464
 #, c-format
 msgid ""
 "  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations for\n"
@@ -267,7 +266,7 @@ msgstr ""
 "  --disable-runtime-pseudo-reloc     Без лъже-преме�твани�, по време на работа,\n"
 "                                       за автоматично вне�ени данни.\n"
 
-#: emultempl/pe.em:467
+#: emultempl/pe.em:466
 #, c-format
 msgid ""
 "  --enable-extra-pe-debug            Enable verbose debug output when building\n"
@@ -276,7 +275,7 @@ msgstr ""
 "  --enable-extra-pe-debug            Разрешава извеждане на подробна информаци� при �ъздаване\n"
 "                                       или �вързване на DLL-ли (�ъотв. �амовна��не)\n"
 
-#: emultempl/pe.em:470
+#: emultempl/pe.em:469
 #, c-format
 msgid ""
 "  --large-address-aware              Executable supports virtual addresses\n"
@@ -285,7 +284,7 @@ msgstr ""
 "  --large-address-aware              Програмата поддържа виртуални адре�и\n"
 "                                       по-гол�ми от 2 гигабайта\n"
 
-#: emultempl/pe.em:472
+#: emultempl/pe.em:471
 #, c-format
 msgid ""
 "  --enable-long-section-names        Use long COFF section names even in\n"
@@ -294,7 +293,7 @@ msgstr ""
 "  --enable-long-section-names        Използване на дълги имена за COFF\n"
 "                                       раздели, дори в изпълними файлове\n"
 
-#: emultempl/pe.em:474
+#: emultempl/pe.em:473
 #, c-format
 msgid ""
 "  --disable-long-section-names       Never use long COFF section names, even\n"
@@ -303,7 +302,7 @@ msgstr ""
 "  --disable-long-section-names       Да не �е използват дълги имена на COFF\n"
 "                                       раздели, дори в обектни файлове\n"
 
-#: emultempl/pe.em:476
+#: emultempl/pe.em:475
 #, c-format
 msgid ""
 "  --dynamicbase\t\t\t Image base address may be relocated using\n"
@@ -312,22 +311,22 @@ msgstr ""
 "  --dynamicbase\t\t\t Базови�т адре� на образа може да бъде преме�тен\n"
 "\t\t\t\t       като �е използва �лучаен адре�\n"
 
-#: emultempl/pe.em:478
+#: emultempl/pe.em:477
 #, c-format
 msgid "  --forceinteg\t\t Code integrity checks are enforced\n"
 msgstr "  --forceinteg\t\t �алагане на проверка за ц�ло�тно�т на кода\n"
 
-#: emultempl/pe.em:479
+#: emultempl/pe.em:478
 #, c-format
 msgid "  --nxcompat\t\t Image is compatible with data execution prevention\n"
 msgstr "  --nxcompat\t\t Образа е �ъвме�тим � предотврат�ване на изпълнение на данни\n"
 
-#: emultempl/pe.em:480
+#: emultempl/pe.em:479
 #, c-format
 msgid "  --no-isolation\t\t Image understands isolation but do not isolate the image\n"
 msgstr "  --no-isolation\t\t Образа поддържа изолиране, но да не �е изолира\n"
 
-#: emultempl/pe.em:481
+#: emultempl/pe.em:480
 #, c-format
 msgid ""
 "  --no-seh\t\t\t Image does not use SEH. No SE handler may\n"
@@ -336,73 +335,74 @@ msgstr ""
 "  --no-seh\t\t\t Образа не използва SEH. �е може да �е извиква\n"
 "\t\t\t\t       SE подръжка в този образ\n"
 
-#: emultempl/pe.em:483
+#: emultempl/pe.em:482
 #, c-format
 msgid "  --no-bind\t\t\t Do not bind this image\n"
 msgstr "  --no-bind\t\t\t Образ без таблица за �вързване\n"
 
-#: emultempl/pe.em:484
+#: emultempl/pe.em:483
 #, c-format
 msgid "  --wdmdriver\t\t Driver uses the WDM model\n"
 msgstr "  --wdmdriver\t\t Използване на WDM модел за driver\n"
 
-#: emultempl/pe.em:485
+#: emultempl/pe.em:484
 #, c-format
 msgid "  --tsaware                  Image is Terminal Server aware\n"
 msgstr "  --tsaware                  Образа поддържа \"Terminal Server\"\n"
 
-#: emultempl/pe.em:614
+#: emultempl/pe.em:613
 msgid "%P: warning: bad version number in -subsystem option\n"
 msgstr "%P: предупреждение: непревилен номер на вер�и� за командата -subsystem\n"
 
-#: emultempl/pe.em:639
+#: emultempl/pe.em:638
 msgid "%P%F: invalid subsystem type %s\n"
 msgstr "%P%F: неправилен тип на под�и�тема %s\n"
 
-#: emultempl/pe.em:660
+#: emultempl/pe.em:659
 msgid "%P%F: invalid hex number for PE parameter '%s'\n"
 msgstr "%P%F: непревилен ше�най�етично чи�ло за \"PE\" параметър '%s'\n"
 
-#: emultempl/pe.em:677
+#: emultempl/pe.em:676
 msgid "%P%F: strange hex info for PE parameter '%s'\n"
 msgstr "%P%F: неизве�тни ше�т. данни за PE параметър '%s'\n"
 
-#: emultempl/pe.em:692
-msgid "%F%P: cannot open base file %s\n"
-msgstr "%F%P: �е може да �е отвори о�новен файл %s\n"
+#: emultempl/pe.em:693
+#, c-format
+msgid "%s: Can't open base file %s\n"
+msgstr "%s: �е може да �е отвори базов файл %s\n"
 
-#: emultempl/pe.em:965
+#: emultempl/pe.em:969
 msgid "%P: warning, file alignment > section alignment.\n"
 msgstr "%P: предупреждение, подравн�ване за файл > подравн�ване за раздел.\n"
 
-#: emultempl/pe.em:978
+#: emultempl/pe.em:982
 msgid "%P: warning: --export-dynamic is not supported for PE targets, did you mean --export-all-symbols?\n"
 msgstr "%P: предупреждение: --export-dynamic не �е поддържа при PE резултат, може би --export-all-symbols?\n"
 
-#: emultempl/pe.em:1054 emultempl/pe.em:1081
+#: emultempl/pe.em:1058 emultempl/pe.em:1085
 #, c-format
 msgid "Warning: resolving %s by linking to %s\n"
 msgstr "Предупрежение: разрешаване на %s �ъ� �вързване към %s\n"
 
-#: emultempl/pe.em:1059 emultempl/pe.em:1086
+#: emultempl/pe.em:1063 emultempl/pe.em:1090
 msgid "Use --enable-stdcall-fixup to disable these warnings\n"
 msgstr "Да �е използва --enable-stdcall-fixup, за да �е забран�т тези предупреждени�\n"
 
-#: emultempl/pe.em:1060 emultempl/pe.em:1087
+#: emultempl/pe.em:1064 emultempl/pe.em:1091
 msgid "Use --disable-stdcall-fixup to disable these fixups\n"
 msgstr "Да �е използва --disable-stdcall-fixup, за да �е забран�т тези предупреждени�\n"
 
-#: emultempl/pe.em:1106
+#: emultempl/pe.em:1110
 #, c-format
 msgid "%C: Cannot get section contents - auto-import exception\n"
 msgstr "%C: �е можа да �е вземе �ъдържанието на раздел - изключение при автоматично вна��не\n"
 
-#: emultempl/pe.em:1146
+#: emultempl/pe.em:1150
 #, c-format
 msgid "Info: resolving %s by linking to %s (auto-import)\n"
 msgstr "Информаци�: разрешаване на %s �ъ� �вързване към %s (�амо-вна��не)\n"
 
-#: emultempl/pe.em:1153
+#: emultempl/pe.em:1157
 msgid ""
 "%P: warning: auto-importing has been activated without --enable-auto-import specified on the command line.\n"
 "This should work unless it involves constant data structures referencing symbols from auto-imported DLLs.\n"
@@ -410,28 +410,28 @@ msgstr ""
 "%P: предупр.: �амо-вна��не е активирано без да �е зададе --enable-auto-import на командни� ред.\n"
 "Това работи, о�вен ако не е �вързано � кон�тантни �труктури за данни, които указват към имена от �амо-вна��ни DLL-ли.\n"
 
-#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
-#: pe-dll.c:1352
+#: emultempl/pe.em:1164 emultempl/pe.em:1369 emultempl/pe.em:1575 ldcref.c:490
+#: ldcref.c:588 ldmain.c:1183 ldmisc.c:286 pe-dll.c:705 pe-dll.c:1253
+#: pe-dll.c:1348
 msgid "%B%F: could not read symbols: %E\n"
 msgstr "%B%F: не могат да �е прочетат имената: %E\n"
 
-#: emultempl/pe.em:1243
+#: emultempl/pe.em:1245
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
 msgstr "%F%P: не може да �е извърши \"PE\"-операции на изходен файл '%B', който не е \"PE\".\n"
 
-#: emultempl/pe.em:1617
+#: emultempl/pe.em:1616
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr "Открити �а грешки при обработката на файл %s\n"
 
-#: emultempl/pe.em:1640
+#: emultempl/pe.em:1639
 #, c-format
 msgid "Errors encountered processing file %s for interworking\n"
 msgstr "Открити �а грешки при обработката на файл %s за �ъвме�тна работа\n"
 
-#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
-#: ldmain.c:1160
+#: emultempl/pe.em:1701 ldexp.c:542 ldlang.c:3323 ldlang.c:3358 ldlang.c:6804
+#: ldlang.c:6835 ldmain.c:1128
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_link_hash_lookup не у�п�: %E\n"
 
@@ -476,7 +476,7 @@ msgstr "Без имена\n"
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr "%P: име '%T' лип�ва в главната хеш-таблица\n"
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
+#: ldcref.c:650 ldcref.c:657 ldmain.c:1217 ldmain.c:1224
 msgid "%B%F: could not read relocs: %E\n"
 msgstr "%B%F: не могат да �е прочетат \"преме�твани�та\": %E\n"
 
@@ -537,158 +537,162 @@ msgstr "Поддържани подражавани�: "
 msgid "  no emulation specific options.\n"
 msgstr "  без о�обени възможно�ти за подражаване.\n"
 
-#: ldexp.c:314
+#: ldexp.c:313
 msgid "%P: warning: address of `%s' isn't multiple of maximum page size\n"
 msgstr "%P: предупреждение: адре�а на '%s' не е кратен на мак�имални� размер на �траница\n"
 
-#: ldexp.c:407
+#: ldexp.c:351
 #, c-format
 msgid "%F%S %% by zero\n"
 msgstr "%F%S %% на нула\n"
 
-#: ldexp.c:417
+#: ldexp.c:359
 #, c-format
 msgid "%F%S / by zero\n"
 msgstr "%F%S / на нула\n"
 
-#: ldexp.c:591
+#: ldexp.c:552
 #, c-format
 msgid "%X%S: unresolvable symbol `%s' referenced in expression\n"
 msgstr "%X%S: неразгадано име '%s' е указано в израза\n"
 
-#: ldexp.c:605
+#: ldexp.c:564
 #, c-format
 msgid "%F%S: undefined symbol `%s' referenced in expression\n"
 msgstr "%F%S: неопределено име '%s' е указано в израза\n"
 
-#: ldexp.c:626 ldexp.c:643 ldexp.c:670
+#: ldexp.c:585 ldexp.c:602 ldexp.c:629
 #, c-format
 msgid "%F%S: undefined section `%s' referenced in expression\n"
 msgstr "%F%S: в израза е указан неопределен раздел '%s'\n"
 
-#: ldexp.c:697 ldexp.c:711
+#: ldexp.c:656 ldexp.c:670
 #, c-format
 msgid "%F%S: undefined MEMORY region `%s' referenced in expression\n"
 msgstr "%F%S: неопределен MEMORY регион '%s' е указан в израза\n"
 
-#: ldexp.c:722
+#: ldexp.c:681
 #, c-format
 msgid "%F%S: unknown constant `%s' referenced in expression\n"
 msgstr "%F%S: непозната кон�танта '%s' е указана в израза\n"
 
-#: ldexp.c:787
+#: ldexp.c:743
 #, c-format
 msgid "%F%S can not PROVIDE assignment to location counter\n"
 msgstr "%F%S не може да �е при�вои на бро�ч за ме�тоположение\n"
 
-#: ldexp.c:805
+#: ldexp.c:757
 #, c-format
 msgid "%F%S invalid assignment to location counter\n"
 msgstr "%F%S неправилно при�во�ване на бро�ч за ме�тоположение\n"
 
-#: ldexp.c:808
+#: ldexp.c:760
 #, c-format
 msgid "%F%S assignment to location counter invalid outside of SECTION\n"
 msgstr "%F%S неправилно при�во�ване на бро�ч за ме�тоположение извън Р�ЗДЕЛ\n"
 
-#: ldexp.c:821
+#: ldexp.c:773
 msgid "%F%S cannot move location counter backwards (from %V to %V)\n"
 msgstr "%F%S не може да �е върне обратно бро�ч на ме�тоположение (от %V към %V)\n"
 
-#: ldexp.c:882
+#: ldexp.c:812
 msgid "%P%F:%s: hash creation failed\n"
 msgstr "%P%F:%s: пропадна �ъздаването на хеш\n"
 
-#: ldexp.c:1191 ldexp.c:1216 ldexp.c:1276
+#: ldexp.c:1119 ldexp.c:1144 ldexp.c:1204
 #, c-format
 msgid "%F%S: nonconstant expression for %s\n"
 msgstr "%F%S: не е кон�тантен изразът за %s\n"
 
-#: ldfile.c:142
+#: ldfile.c:141
 #, c-format
 msgid "attempt to open %s failed\n"
 msgstr "опита да �е отвори %s не у�п�\n"
 
-#: ldfile.c:144
+#: ldfile.c:143
 #, c-format
 msgid "attempt to open %s succeeded\n"
 msgstr "опита да �е отвори %s у�п�\n"
 
-#: ldfile.c:150
+#: ldfile.c:149
 msgid "%F%P: invalid BFD target `%s'\n"
 msgstr "%F%P: неправилна BFD цел '%s'\n"
 
-#: ldfile.c:267 ldfile.c:296
+#: ldfile.c:266 ldfile.c:295
 msgid "%P: skipping incompatible %s when searching for %s\n"
 msgstr "%P: пропу�кане на не�ъвме�тим %s при тър�ене на %s\n"
 
-#: ldfile.c:280
+#: ldfile.c:279
 msgid "%F%P: attempted static link of dynamic object `%s'\n"
 msgstr "%F%P: опитано �татично �вързване на динамичен обект '%s'\n"
 
-#: ldfile.c:426
+#: ldfile.c:332 ldmain.c:832
+msgid "%P%F: %s: plugin reported error claiming file\n"
+msgstr "%P%F: %s: при�тавката рапортува грешка, при твърдени�та за файла\n"
+
+#: ldfile.c:447
 msgid "%P: cannot find %s (%s): %E\n"
 msgstr "%P: не �е намира %s в %s: %E\n"
 
-#: ldfile.c:429
+#: ldfile.c:450
 msgid "%P: cannot find %s: %E\n"
 msgstr "%P: не �е намира %s: %E\n"
 
-#: ldfile.c:464
+#: ldfile.c:485
 msgid "%P: cannot find %s inside %s\n"
 msgstr "%P: не �е намера %s в %s\n"
 
-#: ldfile.c:467
+#: ldfile.c:488
 msgid "%P: cannot find %s\n"
 msgstr "%P: не �е намира %s\n"
 
-#: ldfile.c:486 ldfile.c:504
+#: ldfile.c:507 ldfile.c:525
 #, c-format
 msgid "cannot find script file %s\n"
 msgstr "не �е намира \"�крипт\"-файл %s\n"
 
-#: ldfile.c:488 ldfile.c:506
+#: ldfile.c:509 ldfile.c:527
 #, c-format
 msgid "opened script file %s\n"
 msgstr "отворен \"�крипт\"-файл %s\n"
 
-#: ldfile.c:636
+#: ldfile.c:657
 msgid "%P%F: cannot open linker script file %s: %E\n"
 msgstr "%P%F: не може да �е отвори \"�крипт\"-файл при �вързване %s: %E\n"
 
-#: ldfile.c:701
+#: ldfile.c:722
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr "%P%F: не може да �е пред�тави машина '%s'\n"
 
-#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
+#: ldlang.c:1160 ldlang.c:1202 ldlang.c:3048
 msgid "%P%F: can not create hash table: %E\n"
 msgstr "%P%F: н може да �е �ъздаде хеш-таблицата: %E\n"
 
-#: ldlang.c:1310
+#: ldlang.c:1253
 msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
 msgstr "%P:%S: предупреждение: повторно определение за регион памет '%s'\n"
 
-#: ldlang.c:1316
+#: ldlang.c:1259
 msgid "%P:%S: warning: memory region `%s' not declared\n"
 msgstr "%P: %S: предупр.: региона за памет '%s' не е об�вен\n"
 
-#: ldlang.c:1350
+#: ldlang.c:1293
 msgid "%F%P:%S: error: alias for default memory region\n"
 msgstr "%F%P:%S: грешка: �иноним за регион памет по подразбиране\n"
 
-#: ldlang.c:1361
+#: ldlang.c:1304
 msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
 msgstr "%F%P:%S: грешка: повторен определение на �иноним за регион памет '%s'\n"
 
-#: ldlang.c:1368
+#: ldlang.c:1311
 msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
 msgstr "%F%P:%S: грешка: региона памет '%s' за �инонима '%s' не �ъще�твува\n"
 
-#: ldlang.c:1420 ldlang.c:1459
+#: ldlang.c:1363 ldlang.c:1402
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr "%P%F: пропадна �ъздаването на раздел '%s': %E\n"
 
-#: ldlang.c:2021
+#: ldlang.c:1958
 #, c-format
 msgid ""
 "\n"
@@ -699,7 +703,7 @@ msgstr ""
 "Отхвърлени входни раздели\n"
 "\n"
 
-#: ldlang.c:2029
+#: ldlang.c:1966
 msgid ""
 "\n"
 "Memory Configuration\n"
@@ -709,23 +713,23 @@ msgstr ""
 "Конфигураци� на паметта\n"
 "\n"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Name"
 msgstr "Име"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Origin"
 msgstr "Произход"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Length"
 msgstr "Дължина"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Attributes"
 msgstr "�трибути"
 
-#: ldlang.c:2071
+#: ldlang.c:2008
 #, c-format
 msgid ""
 "\n"
@@ -736,178 +740,178 @@ msgstr ""
 "Тек�т при �вързване и изображени� на паметта\n"
 "\n"
 
-#: ldlang.c:2140
+#: ldlang.c:2074
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr "%P%F: �еправилно използване на раздел '%s'\n"
 
-#: ldlang.c:2149
+#: ldlang.c:2083
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr "%P%F: в изходни� формат %s, не може да �е пред�тави раздел именуван %s\n"
 
-#: ldlang.c:2702
+#: ldlang.c:2636
 msgid "%B: file not recognized: %E\n"
 msgstr "%B: файлът не е разпознат: %E\n"
 
-#: ldlang.c:2703
+#: ldlang.c:2637
 msgid "%B: matching formats:"
 msgstr "%B: �ъвпадащи формати:"
 
-#: ldlang.c:2710
+#: ldlang.c:2644
 msgid "%F%B: file not recognized: %E\n"
 msgstr "%F%B: файлът не е разпознат: %E\n"
 
-#: ldlang.c:2781
+#: ldlang.c:2715
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr "%F%B: членът, на архива %B, не е обект\n"
 
-#: ldlang.c:2796 ldlang.c:2810
+#: ldlang.c:2730 ldlang.c:2744
 msgid "%F%B: could not read symbols: %E\n"
 msgstr "%F%B: не може да �е прочетат имената: %E\n"
 
-#: ldlang.c:3084
+#: ldlang.c:3018
 msgid "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr "%P: предупреждение: не може да �е открие резултат, който да отговар� на изи�квани�та за подредба(на байтовете)\n"
 
-#: ldlang.c:3098
+#: ldlang.c:3032
 msgid "%P%F: target %s not found\n"
 msgstr "%P%F: целта %s не е намерена\n"
 
-#: ldlang.c:3100
+#: ldlang.c:3034
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr "%P%F: не може да �е отвори вход�щ файл %s: %E\n"
 
-#: ldlang.c:3106
+#: ldlang.c:3040
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr "%P%F:%s: не може да �е �ъздаде обектен файл: %E\n"
 
-#: ldlang.c:3110
+#: ldlang.c:3044
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr "%P%F:%s: не може да �е зададе архитектура: %E\n"
 
-#: ldlang.c:3267
+#: ldlang.c:3185
 msgid "%P: warning: %s contains output sections; did you forget -T?\n"
 msgstr "%P: предупр.: %s �ъдържа изход�щ раздел; забравен -T?\n"
 
-#: ldlang.c:3308
+#: ldlang.c:3215
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr "%P%F: bfd_hash_lookup не у�п� да �ъздаде име %s\n"
 
-#: ldlang.c:3326
+#: ldlang.c:3233
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr "%P%F: bfd_hash_allocate не у�п� да �ъздаде име %s\n"
 
-#: ldlang.c:3722
+#: ldlang.c:3688
 msgid "%F%P: %s not found for insert\n"
 msgstr "%F%P: %s не е намерен(за добав�не)\n"
 
-#: ldlang.c:3937
+#: ldlang.c:3903
 msgid " load address 0x%V"
 msgstr " адре� на зареждане 0x%V"
 
-#: ldlang.c:4212
+#: ldlang.c:4179
 msgid "%W (size before relaxing)\n"
 msgstr "%W (размер преди намал�ване)\n"
 
-#: ldlang.c:4303
+#: ldlang.c:4270
 #, c-format
 msgid "Address of section %s set to "
 msgstr "�дре�ът на раздел %s е у�тановен на "
 
-#: ldlang.c:4456
+#: ldlang.c:4423
 #, c-format
 msgid "Fail with %d\n"
 msgstr "�е у�п� при %d\n"
 
-#: ldlang.c:4743
+#: ldlang.c:4710
 msgid "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
 msgstr "%X%P: раздел %s зареден в [%V,%V] припокрива раздел %s зареден в [%V,%V]\n"
 
-#: ldlang.c:4759
+#: ldlang.c:4726
 msgid "%X%P: region `%s' overflowed by %ld bytes\n"
 msgstr "%X%P: регионът '%s' е препълнен � %ld байта\n"
 
-#: ldlang.c:4782
+#: ldlang.c:4749
 msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
 msgstr "%X%P: адре�ът 0x%v от %B, раздел '%s', не е в регион '%s'\n"
 
-#: ldlang.c:4793
+#: ldlang.c:4760
 msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
 msgstr "%X%P: %B раздел '%s' не �е побира в регион '%s'\n"
 
-#: ldlang.c:4850
+#: ldlang.c:4816
 #, c-format
 msgid "%F%S: non constant or forward reference address expression for section %s\n"
 msgstr "%F%S: адре�ни� израз не е кон�тантен или отпратка за по нататък при раздел %s\n"
 
-#: ldlang.c:4875
+#: ldlang.c:4841
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr "%P%X: Вътрешна грешка при раздел от COFF �поделена библиотека %s\n"
 
-#: ldlang.c:4932
+#: ldlang.c:4900
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
 msgstr "%P%F: грешка: без зададени региони памет за заредим раздел '%s'\n"
 
-#: ldlang.c:4937
+#: ldlang.c:4905
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr "%P: предупреждение: без зададени региони памет за заредим раздел '%s'\n"
 
-#: ldlang.c:4959
+#: ldlang.c:4927
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr "%P: предупреждение: пром�на на началото на раздел %s � %lu байта\n"
 
-#: ldlang.c:5036
+#: ldlang.c:5004
 msgid "%P: warning: dot moved backwards before `%s'\n"
 msgstr "%P: предупреждение: точката е преме�тена назад преди '%s'\n"
 
-#: ldlang.c:5202
+#: ldlang.c:5170
 msgid "%P%F: can't relax section: %E\n"
 msgstr "%P%F: не може да �е намали раздел: %E\n"
 
-#: ldlang.c:5531
+#: ldlang.c:5497
 msgid "%F%P: invalid data statement\n"
 msgstr "%F%P: неправилен �егмент за данни\n"
 
-#: ldlang.c:5564
+#: ldlang.c:5530
 msgid "%F%P: invalid reloc statement\n"
 msgstr "%F%P: неправилен �егмент за преме�тване\n"
 
-#: ldlang.c:5683
+#: ldlang.c:5648
 msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
 msgstr "%P%F: gc-раздели изи�кват или вход или неопределено име\n"
 
-#: ldlang.c:5708
+#: ldlang.c:5673
 msgid "%P%F:%s: can't set start address\n"
 msgstr "%P%F:%s: не може да �е у�танови начален адре�\n"
 
-#: ldlang.c:5721 ldlang.c:5740
+#: ldlang.c:5686 ldlang.c:5705
 msgid "%P%F: can't set start address\n"
 msgstr "%P%F: не може да �е у�танови начален адре�\n"
 
-#: ldlang.c:5733
+#: ldlang.c:5698
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr "%P: предупреждение: не е намерено входно име %s; по подразбиране - %V\n"
 
-#: ldlang.c:5745
+#: ldlang.c:5710
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr "%P: предупреждение: не е намерен входно име %s; без начален адре�\n"
 
-#: ldlang.c:5800
+#: ldlang.c:5760
 msgid "%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"
 msgstr "%P%F: Свързване � преме�твани� от формат %s (%B) към формат %s (%B) не �е поддържа\n"
 
-#: ldlang.c:5810
+#: ldlang.c:5770
 msgid "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
 msgstr "%P%X: %s архитектурата на входен файл '%B' е не�ъвме�тима � %s изход\n"
 
-#: ldlang.c:5832
+#: ldlang.c:5792
 msgid "%P%X: failed to merge target specific data of file %B\n"
 msgstr "%P%X: пропадна �ливането, на �пецифични за резултата данни, от файл %B\n"
 
-#: ldlang.c:5903
+#: ldlang.c:5863
 msgid "%P%F: Could not define common symbol `%T': %E\n"
 msgstr "%P%F: �е може да �е определ�т общите имена '%T': %E\n"
 
-#: ldlang.c:5915
+#: ldlang.c:5875
 msgid ""
 "\n"
 "Allocating common symbols\n"
@@ -915,7 +919,7 @@ msgstr ""
 "\n"
 "Задел�не на общи имена\n"
 
-#: ldlang.c:5916
+#: ldlang.c:5876
 msgid ""
 "Common symbol       size              file\n"
 "\n"
@@ -923,70 +927,66 @@ msgstr ""
 "Общо име            размер            файл\n"
 "\n"
 
-#: ldlang.c:6062
+#: ldlang.c:6022
 msgid "%P%F: invalid syntax in flags\n"
 msgstr "%P%F: неправилен �интак�и� при флаговете\n"
 
-#: ldlang.c:6524
+#: ldlang.c:6415
 msgid "%P%F: Failed to create hash table\n"
 msgstr "%P%F: �е у�п� �ъздаването на хеш-таблица\n"
 
-#: ldlang.c:6547
+#: ldlang.c:6430
 msgid "%P%F: %s: plugin reported error after all symbols read\n"
 msgstr "%P%F: %s: при�тавката рапортува грешка, �лед прочитане на в�ички имена\n"
 
-#: ldlang.c:6860
+#: ldlang.c:6717
 msgid "%P%F: multiple STARTUP files\n"
 msgstr "%P%F: многократни STARTUP файлове\n"
 
-#: ldlang.c:6906
+#: ldlang.c:6765
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr "%X%P:%S: раздел едновременно � адре� и регион за зареждане\n"
 
-#: ldlang.c:7093
+#: ldlang.c:6950
 msgid "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack them\n"
 msgstr "%X%P:%S: не �е поддържат PHDRS и FILEHDR, ако лип�ват в предишни PT_LOAD заглави�\n"
 
-#: ldlang.c:7165
+#: ldlang.c:7022
 msgid "%F%P: no sections assigned to phdrs\n"
 msgstr "%F%P: към phdrs не �а при�воени раздели\n"
 
-#: ldlang.c:7203
+#: ldlang.c:7060
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr "%F%P: bfd_record_phdr не у�п�: %E\n"
 
-#: ldlang.c:7223
+#: ldlang.c:7080
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr "%X%P: раздел '%s' е при�воен към не�ъще�твуващ phdr `%s'\n"
 
-#: ldlang.c:7636
+#: ldlang.c:7481
 msgid "%X%P: unknown language `%s' in version information\n"
-msgstr "%X%P: непознат език '%s' при информаци� за вер�и�\n"
+msgstr "%X%P: непо�нат език '%s' при информаци� за вер�и�\n"
 
-#: ldlang.c:7781
+#: ldlang.c:7626
 msgid "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr "%X%P: безименна отметка за вер�и� не може да �е �ме�ва � други отметки за вер�ии\n"
 
-#: ldlang.c:7790
+#: ldlang.c:7635
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr "%X%P: повторена отметка за вер�и� '%s'\n"
 
-#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
+#: ldlang.c:7656 ldlang.c:7665 ldlang.c:7683 ldlang.c:7693
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr "%X%P: повторен израз '%s'при информаци� за вер�и�\n"
 
-#: ldlang.c:7888
+#: ldlang.c:7733
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr "%X%P: не може да �е намери зави�имо�т за вер�и� '%s'\n"
 
-#: ldlang.c:7911
+#: ldlang.c:7756
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr "%X%P: не може да �е прочете �ъдържанието на раздел .exports\n"
 
-#: ldlang.c:8035
-msgid "%X%P: unknown feature `%s'\n"
-msgstr "%X%P: непозната възможно�т '%s'\n"
-
 #: ldmain.c:239
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr "%X%P: цел по подразбиране на BFD, не можа да �е у�танови на '%s': %E\n"
@@ -1023,66 +1023,70 @@ msgstr "%P: режим %s\n"
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr "%P%F: не можа да �е отвори файл � изобраз�вани� %s: %E\n"
 
-#: ldmain.c:488
+#: ldmain.c:485
+msgid "%P: %s: error in plugin cleanup (ignored)\n"
+msgstr "%P: %s: грешка при почи�тване на при�тавка, пренебрегната\n"
+
+#: ldmain.c:494
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr "%P: грешка при �вързване, изтриване на изпълними� файл '%s'\n"
 
-#: ldmain.c:497
+#: ldmain.c:503
 msgid "%F%B: final close failed: %E\n"
 msgstr "%F%B: пропадна заключителното затвар�не: %E\n"
 
-#: ldmain.c:523
+#: ldmain.c:529
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr "%X%P: не можа да �е отвори източника на копието '%s'\n"
 
-#: ldmain.c:526
+#: ldmain.c:532
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr "%X%P: не можа да �е отвори целта на копието '%s'\n"
 
-#: ldmain.c:533
+#: ldmain.c:539
 msgid "%P: Error writing file `%s'\n"
 msgstr "%P: Грешка при запи� на файла '%s'\n"
 
-#: ldmain.c:538 pe-dll.c:1733
+#: ldmain.c:544 pe-dll.c:1729
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr "%P: Грешка при затвар�не на файла '%s'\n"
 
-#: ldmain.c:555
+#: ldmain.c:560
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr "%s: общо време за �вързване: %ld.%06ld\n"
 
-#: ldmain.c:558
+#: ldmain.c:563
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: размер на данни %ld\n"
 
-#: ldmain.c:642
+#: ldmain.c:646
 msgid "%P%F: missing argument to -m\n"
 msgstr "%P%F: лип�ва аргумент за -m\n"
 
-#: ldmain.c:690 ldmain.c:710 ldmain.c:742
+#: ldmain.c:694 ldmain.c:714 ldmain.c:746 plugin.c:772
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr "%P%F: bfd_hash_table_init не у�п�: %E\n"
 
-#: ldmain.c:694 ldmain.c:714
+#: ldmain.c:698 ldmain.c:718
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup не у�п�: %E\n"
 
-#: ldmain.c:728
+#: ldmain.c:732
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr "%X%P: грешка: повторен retain-symbols-file\n"
 
-#: ldmain.c:772
+#: ldmain.c:776
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup не у�п� при вмъкване: %E\n"
 
-#: ldmain.c:777
+#: ldmain.c:781
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr "%P: '-retain-symbols-file' отмен� '-s' и '-S'\n"
 
-#: ldmain.c:877
+#: ldmain.c:895
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
@@ -1091,162 +1095,163 @@ msgstr ""
 "Членове на архива включени заради файл(име)\n"
 "\n"
 
-#: ldmain.c:983
+#: ldmain.c:975
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr "%X%C: многократни определени� за '%T'\n"
 
-#: ldmain.c:986
+#: ldmain.c:978
 msgid "%D: first defined here\n"
 msgstr "%D: първото определение тук\n"
 
-#: ldmain.c:990
+#: ldmain.c:982
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr "%P: Забран�ва намал�ването: не работи � многократни определени�\n"
 
-#: ldmain.c:1044
+#: ldmain.c:1012
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr "%B: предупр.: определението за '%T' припокрива общ\n"
 
-#: ldmain.c:1047
+#: ldmain.c:1015
 msgid "%B: warning: common is here\n"
 msgstr "%B: предупр.: общи� е тук\n"
 
-#: ldmain.c:1054
+#: ldmain.c:1022
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr "%B: предупр.: общи� на '%T' е припокрит от определение\n"
 
-#: ldmain.c:1057
+#: ldmain.c:1025
 msgid "%B: warning: defined here\n"
 msgstr "%B: предупр.: определено тук\n"
 
-#: ldmain.c:1064
+#: ldmain.c:1032
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr "B: предупр.: общи� на '%T' е припокрит от по-гол�м общ\n"
 
-#: ldmain.c:1067
+#: ldmain.c:1035
 msgid "%B: warning: larger common is here\n"
 msgstr "%B: предупр.: по-големи�т общ е тук\n"
 
-#: ldmain.c:1071
+#: ldmain.c:1039
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr "%B: предупр.: общи� на '%T' припокрива по-малък общ\n"
 
-#: ldmain.c:1074
+#: ldmain.c:1042
 msgid "%B: warning: smaller common is here\n"
 msgstr "%B: предупр.: тук е по-малки�т общ\n"
 
-#: ldmain.c:1078
+#: ldmain.c:1046
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr "%B: предупр.: многократeн общ за '%T'\n"
 
-#: ldmain.c:1080
+#: ldmain.c:1048
 msgid "%B: warning: previous common is here\n"
 msgstr "%B: предупр.: тук е предишни�т общ\n"
 
-#: ldmain.c:1100 ldmain.c:1138
+#: ldmain.c:1068 ldmain.c:1106
 msgid "%P: warning: global constructor %s used\n"
 msgstr "%P: предупр.: използван общ кон�труктор %s\n"
 
-#: ldmain.c:1148
+#: ldmain.c:1116
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr "%P%F: BFD грешка: BFD_RELOC_CTOR неподдържан\n"
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
+#: ldmain.c:1170 ldmain.c:1172 ldmain.c:1174 ldmain.c:1192 ldmain.c:1237
 msgid "warning: "
 msgstr "предупр.: "
 
-#: ldmain.c:1305
+#: ldmain.c:1273
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr "%F%P: bfd_hash_table_init не у�п�: %E\n"
 
-#: ldmain.c:1312
+#: ldmain.c:1280
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr "%F%P: bfd_hash_lookup не у�п�: %E\n"
 
-#: ldmain.c:1333
+#: ldmain.c:1301
 msgid "%X%C: undefined reference to `%T'\n"
 msgstr "%X%C: неопределена отпратка към '%T'\n"
 
-#: ldmain.c:1336
+#: ldmain.c:1304
 msgid "%C: warning: undefined reference to `%T'\n"
 msgstr "%C: предупр.: неопределена отпратка към '%T'\n"
 
-#: ldmain.c:1342
+#: ldmain.c:1310
 msgid "%X%D: more undefined references to `%T' follow\n"
 msgstr "%X%D: �ледват още неопределени отпратки към '%T'\n"
 
-#: ldmain.c:1345
+#: ldmain.c:1313
 msgid "%D: warning: more undefined references to `%T' follow\n"
 msgstr "%D: предупр.: �ледват още неопределени отпратки към '%T'\n"
 
-#: ldmain.c:1356
+#: ldmain.c:1324
 msgid "%X%B: undefined reference to `%T'\n"
 msgstr "%X%B: неопределена отпратка към '%T'\n"
 
-#: ldmain.c:1359
+#: ldmain.c:1327
 msgid "%B: warning: undefined reference to `%T'\n"
 msgstr "%B: предупр.: неопределена отпратка към '%T'\n"
 
-#: ldmain.c:1365
+#: ldmain.c:1333
 msgid "%X%B: more undefined references to `%T' follow\n"
 msgstr "%X%B: още неопределени отпратки към '%T' �ледват\n"
 
-#: ldmain.c:1368
+#: ldmain.c:1336
 msgid "%B: warning: more undefined references to `%T' follow\n"
 msgstr "%B: предупр.: още неопределени отпратки към '%T' �ледват\n"
 
-#: ldmain.c:1407
+#: ldmain.c:1375
 msgid " additional relocation overflows omitted from the output\n"
 msgstr " допълнителен излишък за преме�твани� изпу�нат в резултата\n"
 
-#: ldmain.c:1420
+#: ldmain.c:1388
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
 msgstr " преме�тването отр�зано, за да �ъвпадне: %s �рещу неопределеното име '%T'"
 
-#: ldmain.c:1425
+#: ldmain.c:1393
 msgid " relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"
 msgstr " преме�тването отр�зано, за да �ъвпадне: %s �рещу име '%T' определено в раздел %A от %B"
 
-#: ldmain.c:1437
+#: ldmain.c:1405
 msgid " relocation truncated to fit: %s against `%T'"
 msgstr " преме�тването отр�зано, за да �ъвпадне:  %s �рещу '%T'"
 
-#: ldmain.c:1454
-msgid "%X%H: dangerous relocation: %s\n"
-msgstr "%X%H: опа�но преме�тване: %s\n"
+#: ldmain.c:1422
+#, c-format
+msgid "%X%C: dangerous relocation: %s\n"
+msgstr "%X%C: опа�но преме�тване: %s\n"
 
-#: ldmain.c:1469
-msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
-msgstr "%X%H: преме�тването указва към име '%T', което не е изход�що\n"
+#: ldmain.c:1437
+msgid "%X%C: reloc refers to symbol `%T' which is not being output\n"
+msgstr "%X%C: преме�тването указва към име '%T', което не е изход�що\n"
 
-#: ldmisc.c:151
+#: ldmisc.c:149
 #, c-format
 msgid "no symbol"
 msgstr "без имена"
 
-#: ldmisc.c:248
+#: ldmisc.c:246
 #, c-format
 msgid "built in linker script:%u"
 msgstr "вграден �крипт за �вързване:%u"
 
-#: ldmisc.c:329
+#: ldmisc.c:324
 msgid "%B: In function `%T':\n"
 msgstr "%B: Във функци� '%T':\n"
 
-#: ldmisc.c:464
+#: ldmisc.c:451
 msgid "%F%P: internal error %s %d\n"
 msgstr "%F%P: вътрешна грешка %s %d\n"
 
-#: ldmisc.c:513
+#: ldmisc.c:500
 msgid "%P: internal error: aborting at %s line %d in %s\n"
 msgstr "%P: вътрешна грешка: прекрат�ване в %s ред %d от %s\n"
 
-#: ldmisc.c:516
+#: ldmisc.c:503
 msgid "%P: internal error: aborting at %s line %d\n"
 msgstr "%P: вътрешна грешка: прекрат�ване в %s ред %d\n"
 
-#: ldmisc.c:518
+#: ldmisc.c:505
 msgid "%P%F: please report this bug\n"
 msgstr "%P%F: мол�, рапортувайте този проблем\n"
 
@@ -1258,8 +1263,8 @@ msgstr "Г�У ld %s\n"
 
 #: ldver.c:43
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "�втор�ко право: 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "�втор�ко право: 2010 Free Software Foundation, Inc.\n"
 
 #: ldver.c:44
 #, c-format
@@ -1298,7 +1303,7 @@ msgstr "%8x други\n"
 msgid "%F%P: final link failed: %E\n"
 msgstr "%F%P: пропадна заключителното �вързване: %E\n"
 
-#: lexsup.c:219 lexsup.c:373
+#: lexsup.c:219 lexsup.c:368
 msgid "KEYWORD"
 msgstr "КЛЮЧ"
 
@@ -1314,7 +1319,7 @@ msgstr "�РХИТЕКТУР�"
 msgid "Set architecture"
 msgstr "Задава архитектура"
 
-#: lexsup.c:224 lexsup.c:492
+#: lexsup.c:224 lexsup.c:487
 msgid "TARGET"
 msgstr "РЕЗУЛТ�Т"
 
@@ -1322,8 +1327,8 @@ msgstr "РЕЗУЛТ�Т"
 msgid "Specify target for following input files"
 msgstr "Задава вида на резултата за �ледващите входни файлове"
 
-#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
-#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
+#: lexsup.c:227 lexsup.c:278 lexsup.c:296 lexsup.c:309 lexsup.c:311
+#: lexsup.c:441 lexsup.c:501 lexsup.c:563 lexsup.c:576
 msgid "FILE"
 msgstr "Ф�ЙЛ"
 
@@ -1335,7 +1340,7 @@ msgstr "Използва Ñ�крипт за Ñ�вързване в MRI формаÑ
 msgid "Force common symbols to be defined"
 msgstr "Принудително определ�не на общи имена"
 
-#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
+#: lexsup.c:233 lexsup.c:545 lexsup.c:547 lexsup.c:549 lexsup.c:551
 msgid "ADDRESS"
 msgstr "�ДРЕС"
 
@@ -1467,124 +1472,120 @@ msgstr "�РГ"
 msgid "Send arg to last-loaded plugin"
 msgstr "Изпраща арг. към по�ледно заредената при�тавка"
 
-#: lexsup.c:287 lexsup.c:290
-msgid "Ignored for GCC LTO option compatibility"
-msgstr "Пренебрегнато за �ъвме�тимо�т � GCC LTO възможно�т"
-
-#: lexsup.c:294
+#: lexsup.c:288
 msgid "Ignored for SVR4 compatibility"
 msgstr "Пренебрегнат(�ъвме�тимо�т �ъ� SVR4)"
 
-#: lexsup.c:298
+#: lexsup.c:292
 msgid "Generate relocatable output"
 msgstr "Създаване на преме�тваем резултат"
 
-#: lexsup.c:302
+#: lexsup.c:296
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr "Само �вързване на имената (ако е директори�, като --rpath)"
 
-#: lexsup.c:305
+#: lexsup.c:299
 msgid "Strip all symbols"
 msgstr "Премахване на в�ички имена"
 
-#: lexsup.c:307
+#: lexsup.c:301
 msgid "Strip debugging symbols"
 msgstr "Премахване на имена за тра�иране"
 
-#: lexsup.c:309
+#: lexsup.c:303
 msgid "Strip symbols in discarded sections"
 msgstr "Премахване на имена в отхвърлени раздели"
 
-#: lexsup.c:311
+#: lexsup.c:305
 msgid "Do not strip symbols in discarded sections"
 msgstr "Без премахване на имена в отхвърлени раздели"
 
-#: lexsup.c:313
+#: lexsup.c:307
 msgid "Trace file opens"
 msgstr "Про�лед�ване на отвар�ните файлове"
 
-#: lexsup.c:315
+#: lexsup.c:309
 msgid "Read linker script"
 msgstr "Използва �крипт за �вързване"
 
-#: lexsup.c:317
+#: lexsup.c:311
 msgid "Read default linker script"
 msgstr "Използва �крипт за �вързване по подразбиране"
 
-#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
-#: lexsup.c:572 lexsup.c:611
+#: lexsup.c:315 lexsup.c:333 lexsup.c:418 lexsup.c:439 lexsup.c:538
+#: lexsup.c:566 lexsup.c:605
 msgid "SYMBOL"
 msgstr "ИМЕ"
 
-#: lexsup.c:321
+#: lexsup.c:315
 msgid "Start with undefined reference to SYMBOL"
 msgstr "�ачало � неопределена отпратка към ИМЕ"
 
-#: lexsup.c:324
+#: lexsup.c:318
 msgid "[=SECTION]"
 msgstr "=Р�ЗДЕЛ"
 
-#: lexsup.c:325
+#: lexsup.c:319
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr "Без �ливане на вход�щи [Р�ЗДЕЛ | о�ирот�л] раздели"
 
-#: lexsup.c:327
+#: lexsup.c:321
 msgid "Build global constructor/destructor tables"
 msgstr "Изграждане на общи кон�трутор/де�труктор таблици"
 
-#: lexsup.c:329
+#: lexsup.c:323
 msgid "Print version information"
 msgstr "Извеждане на информаци� за вер�и�"
 
-#: lexsup.c:331
+#: lexsup.c:325
 msgid "Print version and emulation information"
 msgstr "Извеждане на информаци� за вер�и� и подражаване"
 
-#: lexsup.c:333
+#: lexsup.c:327
 msgid "Discard all local symbols"
 msgstr "Отхвърл�не на в�ички ме�тни имена"
 
-#: lexsup.c:335
+#: lexsup.c:329
 msgid "Discard temporary local symbols (default)"
 msgstr "Отхвърл�не на временни ме�тни имена (по подразбиране)"
 
-#: lexsup.c:337
+#: lexsup.c:331
 msgid "Don't discard any local symbols"
 msgstr "Без отхвърл�не на ме�тни имена"
 
-#: lexsup.c:339
+#: lexsup.c:333
 msgid "Trace mentions of SYMBOL"
 msgstr "Про�лед�ване на по�очвани�та на ИМЕ"
 
-#: lexsup.c:341 lexsup.c:508 lexsup.c:510
+#: lexsup.c:335 lexsup.c:503 lexsup.c:505
 msgid "PATH"
 msgstr "ПЪТ"
 
-#: lexsup.c:341
+#: lexsup.c:335
 msgid "Default search path for Solaris compatibility"
 msgstr "Път за тър�ене по подразбиране за �ъвме�тимо�т �ъ� Солари�"
 
-#: lexsup.c:344
+#: lexsup.c:338
 msgid "Start a group"
 msgstr "�ачало на група"
 
-#: lexsup.c:346
+#: lexsup.c:340
 msgid "End a group"
 msgstr "Край на група"
 
-#: lexsup.c:350
+#: lexsup.c:344
 msgid "Accept input files whose architecture cannot be determined"
 msgstr "Приемане на вход�щи файлове, чи�то архитектура не може да �е определи"
 
-#: lexsup.c:354
+#: lexsup.c:348
 msgid "Reject input files whose architecture is unknown"
 msgstr "Игнориране на входни файлове � непозната архитектура"
 
-#: lexsup.c:366
+#: lexsup.c:361
 msgid "Only set DT_NEEDED for following dynamic libs if used"
 msgstr "У�танов�ва �е DT_NEEDED за �ледните динамични библ., �амо ако �е използва"
 
-#: lexsup.c:369
+#: lexsup.c:364
 msgid ""
 "Always set DT_NEEDED for dynamic libraries mentioned on\n"
 "                                the command line"
@@ -1592,171 +1593,171 @@ msgstr ""
 "Винаги �е у�танов�ва DT_NEEDED за динамичните библиотеки\n"
 "                                по�очени на командни� ред"
 
-#: lexsup.c:373
+#: lexsup.c:368
 msgid "Ignored for SunOS compatibility"
 msgstr "Пренебрегнат(�ъвме�тимо�т �ъ� SunOS)"
 
-#: lexsup.c:375
+#: lexsup.c:370
 msgid "Link against shared libraries"
 msgstr "Свързване �ъ� �поделени библиотеки"
 
-#: lexsup.c:381
+#: lexsup.c:376
 msgid "Do not link against shared libraries"
 msgstr "Без �вързване �ъ� �поделени библиотеки"
 
-#: lexsup.c:389
+#: lexsup.c:384
 msgid "Bind global references locally"
 msgstr "Привързване на общи препратки като ме�тни"
 
-#: lexsup.c:391
+#: lexsup.c:386
 msgid "Bind global function references locally"
 msgstr "Привързване на общи препратки за функции като ме�тни"
 
-#: lexsup.c:393
+#: lexsup.c:388
 msgid "Check section addresses for overlaps (default)"
 msgstr "Проверка за припокриване на адре�ите на раздели (по подразбиране)"
 
-#: lexsup.c:396
+#: lexsup.c:391
 msgid "Do not check section addresses for overlaps"
 msgstr "Без проверка за припокриване за адре�ите на раздели"
 
-#: lexsup.c:400
+#: lexsup.c:395
 msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr "Копиране на DT_NEEDED връзки �поменати в DSO-то, което �ледва"
 
-#: lexsup.c:404
+#: lexsup.c:399
 msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr "Да не �е копират DT_NEEDED връзки �поменати в DSO-то, което �ледва"
 
-#: lexsup.c:408
+#: lexsup.c:403
 msgid "Output cross reference table"
 msgstr "Извежда таблица � кръ�то�ани отпратки"
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "SYMBOL=EXPRESSION"
 msgstr "ИМЕ=ИЗР�З"
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "Define a symbol"
 msgstr "Задаване на име"
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "[=STYLE]"
 msgstr "[=��ЧИ�]"
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "Demangle symbol names [using STYLE]"
 msgstr "Декориране на имена [използвайки ��ЧИ�]"
 
-#: lexsup.c:415
+#: lexsup.c:410
 msgid "Generate embedded relocs"
 msgstr "Създаване на вградени преме�твани�"
 
-#: lexsup.c:417
+#: lexsup.c:412
 msgid "Treat warnings as errors"
 msgstr "Третиране на предупреждени� като грешки"
 
-#: lexsup.c:420
+#: lexsup.c:415
 msgid "Do not treat warnings as errors (default)"
 msgstr "Да не �е третиране предупреждени� като грешки (по подразбиране)"
 
-#: lexsup.c:423
+#: lexsup.c:418
 msgid "Call SYMBOL at unload-time"
 msgstr "Извикване на ИМЕ по време разтоварване"
 
-#: lexsup.c:425
+#: lexsup.c:420
 msgid "Force generation of file with .exe suffix"
 msgstr "Принудително �ъздаване на файл � на�тавка .exe "
 
-#: lexsup.c:427
+#: lexsup.c:422
 msgid "Remove unused sections (on some targets)"
 msgstr "Изтриване на неизползвани раздели (за н�кои резултати)"
 
-#: lexsup.c:430
+#: lexsup.c:425
 msgid "Don't remove unused sections (default)"
 msgstr "Без изтриване на неизползвани раздели (по подразбиране)"
 
-#: lexsup.c:433
+#: lexsup.c:428
 msgid "List removed unused sections on stderr"
 msgstr "Извеждане, на изхода за грешки, на изтритите неизползвани раздели"
 
-#: lexsup.c:436
+#: lexsup.c:431
 msgid "Do not list removed unused sections"
 msgstr "Без извеждане на изтритите неизползвани раздели"
 
-#: lexsup.c:439
+#: lexsup.c:434
 msgid "Set default hash table size close to <NUMBER>"
 msgstr "У�танов�ва размер по подразбиране на таблицат за хеш близък до <ЧИСЛО>"
 
-#: lexsup.c:442
+#: lexsup.c:437
 msgid "Print option help"
 msgstr "Извеждане на помощ за опците"
 
-#: lexsup.c:444
+#: lexsup.c:439
 msgid "Call SYMBOL at load-time"
 msgstr "Извикване на ИМЕ по време на зареждане"
 
-#: lexsup.c:446
+#: lexsup.c:441
 msgid "Write a map file"
 msgstr "Запи�ване на файл � изобраз�вани�"
 
-#: lexsup.c:448
+#: lexsup.c:443
 msgid "Do not define Common storage"
 msgstr "Без определ�не на адре� за общи имена"
 
-#: lexsup.c:450
+#: lexsup.c:445
 msgid "Do not demangle symbol names"
 msgstr "Без декораци� за имената"
 
-#: lexsup.c:452
+#: lexsup.c:447
 msgid "Use less memory and more disk I/O"
 msgstr "Използване на по-малко памет и повече ди�кови операции"
 
-#: lexsup.c:454
+#: lexsup.c:449
 msgid "Do not allow unresolved references in object files"
 msgstr "�епозвол�ва не�вързани отпратки при обектни файлове"
 
-#: lexsup.c:457
-msgid "Allow unresolved references in shared libraries"
+#: lexsup.c:452
+msgid "Allow unresolved references in shared libaries"
 msgstr "Позвол�ва не�вързани отпратки при �поделени библиотеки"
 
-#: lexsup.c:461
+#: lexsup.c:456
 msgid "Do not allow unresolved references in shared libs"
 msgstr "�епозвол�ва не�вързани отпратки при �поделени библиотеки"
 
-#: lexsup.c:465
+#: lexsup.c:460
 msgid "Allow multiple definitions"
 msgstr "Позвол�ва повтар�не на определени�"
 
-#: lexsup.c:467
+#: lexsup.c:462
 msgid "Disallow undefined version"
 msgstr "�епозвол�ва неопределена вер�и�"
 
-#: lexsup.c:469
+#: lexsup.c:464
 msgid "Create default symbol version"
 msgstr "Създаване на подразбираща �е вер�и� за име"
 
-#: lexsup.c:472
+#: lexsup.c:467
 msgid "Create default symbol version for imported symbols"
 msgstr "Създаване на подразбираща �е вер�и� за име при вне�ените имена"
 
-#: lexsup.c:475
+#: lexsup.c:470
 msgid "Don't warn about mismatched input files"
 msgstr "Без предупреждениe за не�ъответ�тващи вход�щи файлове"
 
-#: lexsup.c:478
+#: lexsup.c:473
 msgid "Don't warn on finding an incompatible library"
 msgstr "Без предупреждени� при откриване на не�ъвме�тими библиотеки"
 
-#: lexsup.c:481
+#: lexsup.c:476
 msgid "Turn off --whole-archive"
 msgstr "Изключване на --whole-archive"
 
-#: lexsup.c:483
+#: lexsup.c:478
 msgid "Create an output file even if errors occur"
 msgstr "Създаване на изходен файл, дори при грешки"
 
-#: lexsup.c:488
+#: lexsup.c:483
 msgid ""
 "Only use library directories specified on\n"
 "                                the command line"
@@ -1764,127 +1765,127 @@ msgstr ""
 "Използване �амо на директорите за библиотеки\n"
 "                                 зададени на командни� ред"
 
-#: lexsup.c:492
+#: lexsup.c:487
 msgid "Specify target of output file"
 msgstr "Задаване на целта за резултата"
 
-#: lexsup.c:495
+#: lexsup.c:490
 msgid "Ignored for Linux compatibility"
 msgstr "Пренебрегнат(�ъвме�тимо�т � линук�)"
 
-#: lexsup.c:498
+#: lexsup.c:493
 msgid "Reduce memory overheads, possibly taking much longer"
 msgstr "�амал�ване на използваната памет, възможно е �вързването да протече по-дълго"
 
-#: lexsup.c:501
+#: lexsup.c:496
 msgid "Reduce code size by using target specific optimizations"
 msgstr "�амал�ване на размера на кода � използване на оптимизаци� характерна за целта"
 
-#: lexsup.c:503
+#: lexsup.c:498
 msgid "Do not use relaxation techniques to reduce code size"
 msgstr "Да не �е използват намал�ващи похвати, за да �е ограничи размера на кода"
 
-#: lexsup.c:506
+#: lexsup.c:501
 msgid "Keep only symbols listed in FILE"
 msgstr "Запазване �амо на имената изброени във Ф�ЙЛ"
 
-#: lexsup.c:508
+#: lexsup.c:503
 msgid "Set runtime shared library search path"
 msgstr "Задава път за тър�ене на �поделена библиотека по време на изпълнение"
 
-#: lexsup.c:510
+#: lexsup.c:505
 msgid "Set link time shared library search path"
 msgstr "Задава път за тър�ене на �поделена библиотека по време на �вързване"
 
-#: lexsup.c:513
+#: lexsup.c:508
 msgid "Create a shared library"
 msgstr "Създаване на �поделена библиотека"
 
-#: lexsup.c:517
+#: lexsup.c:512
 msgid "Create a position independent executable"
 msgstr "Създаване на позиционно незави�им изпълним файл"
 
-#: lexsup.c:521
+#: lexsup.c:516
 msgid "[=ascending|descending]"
 msgstr "[=възход�щ|низход�щ]"
 
-#: lexsup.c:522
+#: lexsup.c:517
 msgid "Sort common symbols by alignment [in specified order]"
 msgstr "Подреждане на общите имена по подравн�ване [в зададени� ред]"
 
-#: lexsup.c:527
+#: lexsup.c:522
 msgid "name|alignment"
 msgstr "име|подравн�ване"
 
-#: lexsup.c:528
+#: lexsup.c:523
 msgid "Sort sections by name or maximum alignment"
 msgstr "Подреждане на раздели по име или мак�имално подравн�ваме"
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "COUNT"
 msgstr "БРОЙ"
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "How many tags to reserve in .dynamic section"
 msgstr "Колко отметки да �е задел�т за раздел .dynamic"
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "[=SIZE]"
 msgstr "[=Р�ЗМЕР]"
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "Split output sections every SIZE octets"
 msgstr "Раздел�не на резултатните раздели на в�еки Р�ЗМЕР о�морки"
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "[=COUNT]"
 msgstr "[=БРОЙ]"
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "Split output sections every COUNT relocs"
 msgstr "Раздел�не на резултатните раздели на в�еки БРОЙ преме�твани�"
 
-#: lexsup.c:539
+#: lexsup.c:534
 msgid "Print memory usage statistics"
 msgstr "Извеждане на �тати�тика за изполване на паметта"
 
-#: lexsup.c:541
+#: lexsup.c:536
 msgid "Display target specific options"
 msgstr "Извеждане на опции, �пецифични за целта"
 
-#: lexsup.c:543
+#: lexsup.c:538
 msgid "Do task level linking"
 msgstr "Свързване на ниво задача"
 
-#: lexsup.c:545
+#: lexsup.c:540
 msgid "Use same format as native linker"
 msgstr "Използване на �ъщи� формат като �тандартната програма за �вързване"
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "SECTION=ADDRESS"
 msgstr "Р�ЗДЕЛ=�ДРЕС"
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "Set address of named section"
 msgstr "Задаване на адре� на именуван раздел"
 
-#: lexsup.c:550
+#: lexsup.c:545
 msgid "Set address of .bss section"
 msgstr "Задаване на адре� на раздел .bss"
 
-#: lexsup.c:552
+#: lexsup.c:547
 msgid "Set address of .data section"
 msgstr "Задаване на адре� на раздел .data"
 
-#: lexsup.c:554
+#: lexsup.c:549
 msgid "Set address of .text section"
 msgstr "Задаване на адре� на раздел .text"
 
-#: lexsup.c:556
+#: lexsup.c:551
 msgid "Set address of text segment"
 msgstr "Задаване адре� на раздел .text"
 
-#: lexsup.c:559
+#: lexsup.c:554
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
 "                                ignore-all, report-all, ignore-in-object-files,\n"
@@ -1894,19 +1895,15 @@ msgstr ""
 "                                ignore-all, report-all, ignore-in-object-files,\n"
 "                                ignore-in-shared-libs"
 
-#: lexsup.c:564
-msgid "[=NUMBER]"
-msgstr "[=ЧИСЛО]"
-
-#: lexsup.c:565
+#: lexsup.c:559
 msgid "Output lots of information during link"
 msgstr "Извеждане, при �вързване, на допълнителна информаци�"
 
-#: lexsup.c:569
+#: lexsup.c:563
 msgid "Read version information script"
 msgstr "Използва �крипт � информаци� за вер�ии"
 
-#: lexsup.c:572
+#: lexsup.c:566
 msgid ""
 "Take export symbols list from .exports, using\n"
 "                                SYMBOL as the version."
@@ -1914,99 +1911,99 @@ msgstr ""
 "Използване на �пи�ък � имена за ек�порт от .exports, използвайки\n"
 "                                ИМЕ като вер�и�."
 
-#: lexsup.c:576
+#: lexsup.c:570
 msgid "Add data symbols to dynamic list"
 msgstr "Добав�не на имената на данните към динамичен �пи�ък"
 
-#: lexsup.c:578
+#: lexsup.c:572
 msgid "Use C++ operator new/delete dynamic list"
 msgstr "Използване на динамичен �пи�ък за C++ оператори new/delete"
 
-#: lexsup.c:580
+#: lexsup.c:574
 msgid "Use C++ typeinfo dynamic list"
 msgstr "Използване на динамичен �пи�ък за \"C++ информаци� за тип\""
 
-#: lexsup.c:582
+#: lexsup.c:576
 msgid "Read dynamic list"
 msgstr "Използва динамичен �пи�ък"
 
-#: lexsup.c:584
+#: lexsup.c:578
 msgid "Warn about duplicate common symbols"
 msgstr "Предупреждение при повторени общи имена"
 
-#: lexsup.c:586
+#: lexsup.c:580
 msgid "Warn if global constructors/destructors are seen"
 msgstr "Предупреждение, ако �е �рещнат общи кон�трутори/де�труктори"
 
-#: lexsup.c:589
+#: lexsup.c:583
 msgid "Warn if the multiple GP values are used"
 msgstr "Предупреждение за използване на н�колко GP �тойно�ти"
 
-#: lexsup.c:591
+#: lexsup.c:585
 msgid "Warn only once per undefined symbol"
 msgstr "Еднократно предупреждение за неопределено име"
 
-#: lexsup.c:593
+#: lexsup.c:587
 msgid "Warn if start of section changes due to alignment"
 msgstr "Предупреждение, ако началото на раздел �е промен� заради подравн�ване"
 
-#: lexsup.c:596
+#: lexsup.c:590
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr "Предупреждение, ако �поделен обект �ъдържа DT_TEXTREL"
 
-#: lexsup.c:599
+#: lexsup.c:593
 msgid "Warn if an object has alternate ELF machine code"
 msgstr "Предупреждение ако обекта е � друг ELF ELF код за машина"
 
-#: lexsup.c:603
+#: lexsup.c:597
 msgid "Report unresolved symbols as warnings"
 msgstr "Рапортуване като предупреждени�, на не�вързани имена"
 
-#: lexsup.c:606
+#: lexsup.c:600
 msgid "Report unresolved symbols as errors"
 msgstr "Рапортуване, като грешки, на не�вързани имена"
 
-#: lexsup.c:608
+#: lexsup.c:602
 msgid "Include all objects from following archives"
 msgstr "Включване на в�ички обекти от �ледните архиви"
 
-#: lexsup.c:611
+#: lexsup.c:605
 msgid "Use wrapper functions for SYMBOL"
 msgstr "Използване на 'обвиващи' функции за ИМЕ"
 
-#: lexsup.c:760
+#: lexsup.c:754
 msgid "%P: unrecognized option '%s'\n"
 msgstr "%P: неразпозната опци� '%s'\n"
 
-#: lexsup.c:764
+#: lexsup.c:758
 msgid "%P%F: use the --help option for usage information\n"
 msgstr "%P%F: за информаци� за употреба �е използва опци� --help \n"
 
-#: lexsup.c:782
+#: lexsup.c:776
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr "%P%F: неразпозната опци� -a '%s'\n"
 
-#: lexsup.c:795
+#: lexsup.c:789
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr "%P%F: неразпозната опци� -assert '%s'\n"
 
-#: lexsup.c:838
+#: lexsup.c:832
 msgid "%F%P: unknown demangling style `%s'"
 msgstr "%F%P: непознат начин за декориране на имена '%s'"
 
-#: lexsup.c:904 lexsup.c:1335
+#: lexsup.c:898
 msgid "%P%F: invalid number `%s'\n"
 msgstr "%P%F: неправилно чи�ло '%s'\n"
 
-#: lexsup.c:1002
+#: lexsup.c:996
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr "%P%F: грешна опци� --unresolved-symbols: %s\n"
 
-#: lexsup.c:1065 lexsup.c:1564
-msgid "%P%F: %s: error loading plugin\n"
-msgstr "%P%F: %s: грешка при зареждане на при�тавка\n"
+#: lexsup.c:1059
+msgid "%P%F: bad -plugin option\n"
+msgstr "%P%F: грешна опци� -plugin\n"
 
-#: lexsup.c:1070
+#: lexsup.c:1063
 msgid "%P%F: bad -plugin-opt option\n"
 msgstr "%P%F: грешна опци� -plugin-opt\n"
 
@@ -2018,100 +2015,104 @@ msgstr "%P%F: грешна опци� -plugin-opt\n"
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1087
+#: lexsup.c:1080
 msgid "%P%F: bad -rpath option\n"
 msgstr "%P%F: грешна опци� -rpath\n"
 
-#: lexsup.c:1201
+#: lexsup.c:1194
 msgid "%P%F: -shared not supported\n"
 msgstr "%P%F: -shared не �е поддържа\n"
 
-#: lexsup.c:1210
+#: lexsup.c:1203
 msgid "%P%F: -pie not supported\n"
 msgstr "%P%F: -pie не �е поддържа\n"
 
-#: lexsup.c:1218
+#: lexsup.c:1211
 msgid "descending"
 msgstr "низход�щ"
 
-#: lexsup.c:1220
+#: lexsup.c:1213
 msgid "ascending"
 msgstr "възход�щ"
 
-#: lexsup.c:1223
+#: lexsup.c:1216
 msgid "%P%F: invalid common section sorting option: %s\n"
 msgstr "%P%F: неправилна обща опци� за подреждане на : %s\n"
 
-#: lexsup.c:1227
+#: lexsup.c:1220
 msgid "name"
 msgstr "име"
 
-#: lexsup.c:1229
+#: lexsup.c:1222
 msgid "alignment"
 msgstr "подравн�ване"
 
-#: lexsup.c:1232
+#: lexsup.c:1225
 msgid "%P%F: invalid section sorting option: %s\n"
 msgstr "%P%F: неправилна опци� за подреждане на раздел: %s\n"
 
-#: lexsup.c:1266
+#: lexsup.c:1259
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr "%P%F: неправилен аргумент за опци�та \"--section-start\"\n"
 
-#: lexsup.c:1273
+#: lexsup.c:1266
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr "%P%F: лип�ват аргументи за опци�та \"--section-start\"\n"
 
-#: lexsup.c:1507
+#: lexsup.c:1490
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr "%P%F: групата  завърши преди да е започната (--help за употреба)\n"
 
-#: lexsup.c:1535
+#: lexsup.c:1518
 msgid "%P%X: --hash-size needs a numeric argument\n"
 msgstr "%P%X: --hash-size изи�ква чи�ло за аргумент\n"
 
-#: lexsup.c:1595 lexsup.c:1608
+#: lexsup.c:1547
+msgid "%P%F: %s: error loading plugin\n"
+msgstr "%P%F: %s: грешка при зареждане на при�тавка\n"
+
+#: lexsup.c:1578 lexsup.c:1591
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr "%P%F: неправилно ше�т. чи�ло '%s'\n"
 
-#: lexsup.c:1644
+#: lexsup.c:1627
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr "Употреба: %s [опции] файл...\n"
 
-#: lexsup.c:1646
+#: lexsup.c:1629
 #, c-format
 msgid "Options:\n"
 msgstr "Команди:\n"
 
-#: lexsup.c:1724
+#: lexsup.c:1707
 #, c-format
 msgid "  @FILE"
 msgstr "  @Ф�ЙЛ"
 
-#: lexsup.c:1727
+#: lexsup.c:1710
 #, c-format
 msgid "Read options from FILE\n"
 msgstr "Използва опции от Ф�ЙЛ\n"
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1732
+#: lexsup.c:1715
 #, c-format
 msgid "%s: supported targets:"
 msgstr "%s: поддържани цели:"
 
-#: lexsup.c:1740
+#: lexsup.c:1723
 #, c-format
 msgid "%s: supported emulations: "
 msgstr "%s: поддържани емулации: "
 
-#: lexsup.c:1745
+#: lexsup.c:1728
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr "%s: �пецифични опции при емулаци�:\n"
 
-#: lexsup.c:1750
+#: lexsup.c:1733
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Подавайте доклади за грешки на %s\n"
@@ -2120,120 +2121,111 @@ msgstr "Подавайте доклади за грешки на %s\n"
 msgid "%P%F: unknown format type %s\n"
 msgstr "%P%F: непознат формат %s\n"
 
-#: pe-dll.c:431
+#: pe-dll.c:430
 #, c-format
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr "%X�еподдържна PEI архитектура: %s\n"
 
-#: pe-dll.c:791
+#: pe-dll.c:788
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
 msgstr "%X�е може да �е изне�е %s: неправилно име за ек�порт\n"
 
-#: pe-dll.c:848
+#: pe-dll.c:844
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr "%XГрешка, повторен EXPORT � номера: %s (%d �/у %d)\n"
 
-#: pe-dll.c:855
+#: pe-dll.c:851
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr "Предупреждение, повторен EXPORT: %s\n"
 
-#: pe-dll.c:942
+#: pe-dll.c:938
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr "%X�е може да �е изне�е %s: името не е определено\n"
 
-#: pe-dll.c:948
+#: pe-dll.c:944
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr "%X�е може да �е изне�е %s: име �ъ� �грешен тип (%d �/у %d)\n"
 
-#: pe-dll.c:955
+#: pe-dll.c:951
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr "%X�е може да �е изне�е %s: името лип�ва\n"
 
-#: pe-dll.c:1069
+#: pe-dll.c:1065
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr "%XГрешка, номера е използван два пъти: %d (%s �/у %s)\n"
 
-#: pe-dll.c:1450
+#: pe-dll.c:1446
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr "%XГрешка: %d-битово преме�тване в dll\n"
 
-#: pe-dll.c:1578
+#: pe-dll.c:1574
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr "%s: �е може да �е отвори за извеждане def-файл %s\n"
 
-#: pe-dll.c:1729
+#: pe-dll.c:1725
 #, c-format
 msgid "; no contents available\n"
 msgstr "; лип�ва �ъдържание\n"
 
-#: pe-dll.c:2656
+#: pe-dll.c:2652
 msgid "%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"
 msgstr "%C: променливата '%T' не може да �е вне�е автоматично. Да �е прочете документаци�та на ld --enable-auto-import за повече информаци�.\n"
 
-#: pe-dll.c:2686
+#: pe-dll.c:2682
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr "%X�е може да �е отвори lib-файл: %s\n"
 
-#: pe-dll.c:2691
+#: pe-dll.c:2687
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr "Създаване на библиотека: %s\n"
 
-#: pe-dll.c:2720
+#: pe-dll.c:2716
 #, c-format
 msgid "%Xbfd_openr %s: %E\n"
 msgstr "%Xbfd_openr %s: %E\n"
 
-#: pe-dll.c:2732
+#: pe-dll.c:2728
 #, c-format
 msgid "%X%s(%s): can't find member in non-archive file"
 msgstr "%X%s(%s): не е намерена член в файл, който не е архив"
 
-#: pe-dll.c:2744
+#: pe-dll.c:2740
 #, c-format
 msgid "%X%s(%s): can't find member in archive"
 msgstr "%X%s(%s): не е намерен член в архива"
 
-#: pe-dll.c:3183
+#: pe-dll.c:3177
 #, c-format
 msgid "%XError: can't use long section names on this arch\n"
 msgstr "%XError: на тази архитектура не може да �е използват дълги имена за раздели\n"
 
-#: plugin.c:176 plugin.c:210
+#: plugin.c:178 plugin.c:212
 msgid "<no plugin>"
 msgstr "<без при�тавка>"
 
-#: plugin.c:249
-#, c-format
-msgid "could not create dummy IR bfd: %F%E\n"
-msgstr "не може да �е �ъздаде изми�лен IR bfd: %F%E\n"
-
-#: plugin.c:322
-msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
-msgstr "%P%F: %s: не е ELF име при ELF BFD!\n"
-
-#: plugin.c:326
-msgid "%P%F: unknown ELF symbol visibility: %d!\n"
-msgstr "%P%F: непозната видимо�т на ELF име: %d!\n"
+#: plugin.c:308
+msgid "%P%F: %s: non-ELF symbol in ELF BFD!"
+msgstr "%P%F: %s: не е ELF име за ELF BFD!"
 
-#: plugin.c:559
-msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
-msgstr "%P: %B: име '%s' определение: %d, видимо�т: %d, решение: %d\n"
+#: plugin.c:800
+msgid "%P%X: %s: hash table failure adding symbol %s"
+msgstr "%P%X: %s: грешка в хеш-таблицата при добав�не на име %s"
 
-#: plugin.c:825
-msgid "%P%F: %s: plugin reported error claiming file\n"
-msgstr "%P%F: %s: при�тавката рапортува грешка, при твърдени�та за файла\n"
+#: plugin.c:833
+msgid "%P%X: %s: can't find IR symbol '%s'"
+msgstr "%P%X: %s: не може да �е открие 'междинно' име '%s'"
 
-#: plugin.c:896
-msgid "%P: %s: error in plugin cleanup (ignored)\n"
-msgstr "%P: %s: грешка при почи�тване на при�тавка, пренебрегната\n"
+#: plugin.c:836
+msgid "%P%x: %s: bad IR symbol type %d"
+msgstr "%P%x: %s: неправилен тип за 'междинно' име %d"
diff --git a/ld/po/es.po b/ld/po/es.po
index 75fbb8e3c3..8e371d02a0 100644
--- a/ld/po/es.po
+++ b/ld/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para ld 2.21.53.
+# Mensajes en español para ld 2.20.90.
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ld 2.21.53\n"
+"Project-Id-Version: ld 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-23 19:14-0600\n"
+"POT-Creation-Date: 2010-11-05 11:34+0100\n"
+"PO-Revision-Date: 2011-08-24 11:51-0600\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -31,15 +31,15 @@ msgstr "  --thumb-entry=<sim>         Establece el punto de entrada para el sím
 msgid "Errors encountered processing file %s"
 msgstr "Se encontraron errores al procesar el fichero %s"
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1813
+#: emultempl/armcoff.em:190 emultempl/pe.em:1812
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr "%P: aviso: '--thumb-entry %s' se impone a '-e %s'\n"
 
-#: emultempl/armcoff.em:197 emultempl/pe.em:1818
+#: emultempl/armcoff.em:195 emultempl/pe.em:1817
 msgid "%P: warning: cannot find thumb start symbol %s\n"
 msgstr "%P: aviso: no se puede encontrar el símbolo de inicio thumb %s\n"
 
-#: emultempl/pe.em:419
+#: emultempl/pe.em:418
 #, c-format
 msgid "  --base_file <basefile>             Generate a base file for relocatable DLLs\n"
 msgstr "  --base_file <ficherobase>          Genera un fichero base para DLLs reubicables\n"
@@ -47,157 +47,157 @@ msgstr "  --base_file <ficherobase>          Genera un fichero base para DLLs re
 # DLL son las siglas en inglés de `Biblioteca de Enlace Dinámico'.
 # El problema es que las siglas en español (BED) no están muy extendidas.
 # Se dejó `DLL' sin traducir en todas las ocasiones. cfuga
-#: emultempl/pe.em:420
+#: emultempl/pe.em:419
 #, c-format
 msgid "  --dll                              Set image base to the default for DLLs\n"
 msgstr "  --dll                              Establece la imagen base por defecto para las DLLs\n"
 
-#: emultempl/pe.em:421
+#: emultempl/pe.em:420
 #, c-format
 msgid "  --file-alignment <size>            Set file alignment\n"
 msgstr "  --file-alignment <tamaño>          Establece el fichero de alineación\n"
 
-#: emultempl/pe.em:422
+#: emultempl/pe.em:421
 #, c-format
 msgid "  --heap <size>                      Set initial size of the heap\n"
 msgstr "  --heap <tamaño>                    Establece el tamaño inicial del montón\n"
 
-#: emultempl/pe.em:423
+#: emultempl/pe.em:422
 #, c-format
 msgid "  --image-base <address>             Set start address of the executable\n"
 msgstr "  --image-base <dirección>           Establece la dirección de inicio del ejecutable\n"
 
-#: emultempl/pe.em:424
+#: emultempl/pe.em:423
 #, c-format
 msgid "  --major-image-version <number>     Set version number of the executable\n"
 msgstr "  --major-image-version <número>     Establece el número de versión del ejecutable\n"
 
-#: emultempl/pe.em:425
+#: emultempl/pe.em:424
 #, c-format
 msgid "  --major-os-version <number>        Set minimum required OS version\n"
 msgstr "  --major-os-version <número>        Establece la versión mínima requerida del SO\n"
 
-#: emultempl/pe.em:426
+#: emultempl/pe.em:425
 #, c-format
 msgid "  --major-subsystem-version <number> Set minimum required OS subsystem version\n"
 msgstr "  --major-subsystem-version <número> Establece la versión mínima requerida del subsistema del SO\n"
 
-#: emultempl/pe.em:427
+#: emultempl/pe.em:426
 #, c-format
 msgid "  --minor-image-version <number>     Set revision number of the executable\n"
 msgstr "  --minor-image-version <número>     Establece el número de revisión del ejecutable\n"
 
-#: emultempl/pe.em:428
+#: emultempl/pe.em:427
 #, c-format
 msgid "  --minor-os-version <number>        Set minimum required OS revision\n"
 msgstr "  --minor-os-version <número>        Establece la revisión mínima requerida del SO\n"
 
-#: emultempl/pe.em:429
+#: emultempl/pe.em:428
 #, c-format
 msgid "  --minor-subsystem-version <number> Set minimum required OS subsystem revision\n"
 msgstr "  --minor-subsystem-version <número> Establece la revisión mínima requerida del subsistema del SO\n"
 
-#: emultempl/pe.em:430
+#: emultempl/pe.em:429
 #, c-format
 msgid "  --section-alignment <size>         Set section alignment\n"
 msgstr "  --section-alignment <tamaño>       Establece la alineación de la sección\n"
 
-#: emultempl/pe.em:431
+#: emultempl/pe.em:430
 #, c-format
 msgid "  --stack <size>                     Set size of the initial stack\n"
 msgstr "  --stack <size>                     Establece el tamaño de la pila inicial\n"
 
-#: emultempl/pe.em:432
+#: emultempl/pe.em:431
 #, c-format
 msgid "  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"
 msgstr "  --subsystem <nombre>[:<versión>]   Establece el subsistema [y versión] requeridos del SO\n"
 
-#: emultempl/pe.em:433
+#: emultempl/pe.em:432
 #, c-format
 msgid "  --support-old-code                 Support interworking with old code\n"
 msgstr "  --support-old-code                 Admite interoperar con código antiguo\n"
 
-#: emultempl/pe.em:434
+#: emultempl/pe.em:433
 #, c-format
 msgid "  --[no-]leading-underscore          Set explicit symbol underscore prefix mode\n"
 msgstr "  --[no-]leading-underscore          Establece el modo explícito de prefijo de símbolo con subrayado\n"
 
-#: emultempl/pe.em:435
+#: emultempl/pe.em:434
 #, c-format
 msgid "  --thumb-entry=<symbol>             Set the entry point to be Thumb <symbol>\n"
 msgstr "  --thumb-entry=<símbolo>            Establece el punto de entrada para el símbolo Thumb <símbolo>\n"
 
-#: emultempl/pe.em:437
+#: emultempl/pe.em:436
 #, c-format
 msgid "  --add-stdcall-alias                Export symbols with and without @nn\n"
 msgstr "  --add-stdcall-alias                Exporta símbolos con y sin @nn\n"
 
-#: emultempl/pe.em:438
+#: emultempl/pe.em:437
 #, c-format
 msgid "  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"
 msgstr "  --disable-stdcall-fixup            No enlaza _sym con _sym@nn\n"
 
-#: emultempl/pe.em:439
+#: emultempl/pe.em:438
 #, c-format
 msgid "  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"
 msgstr "  --enable-stdcall-fixup             Enlaza _sym con _sym@nn sin avisos\n"
 
-#: emultempl/pe.em:440
+#: emultempl/pe.em:439
 #, c-format
 msgid "  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"
 msgstr "  --exclude-symbols sim,sim,...      Excluye símbolos de la exportación automática\n"
 
-#: emultempl/pe.em:441
+#: emultempl/pe.em:440
 #, c-format
 msgid "  --exclude-all-symbols              Exclude all symbols from automatic export\n"
 msgstr "  --exclude-all-symbols              Excluye todos los símbolos de la exportación automática\n"
 
-#: emultempl/pe.em:442
+#: emultempl/pe.em:441
 #, c-format
 msgid "  --exclude-libs lib,lib,...         Exclude libraries from automatic export\n"
 msgstr "  --exclude-libs bib,bib,...         Excluye bibliotecas de la exportación automática\n"
 
-#: emultempl/pe.em:443
+#: emultempl/pe.em:442
 #, c-format
 msgid "  --exclude-modules-for-implib mod,mod,...\n"
 msgstr "  --exclude-modules-for-implib mod,mod,...\n"
 
-#: emultempl/pe.em:444
+#: emultempl/pe.em:443
 #, c-format
 msgid "                                     Exclude objects, archive members from auto\n"
 msgstr "                                     Excluye objetos, miembros de archivo de la exportación\n"
 
-#: emultempl/pe.em:445
+#: emultempl/pe.em:444
 #, c-format
 msgid "                                     export, place into import library instead.\n"
 msgstr "                                     automática, los coloca en la biblioteca de importación.\n"
 
-#: emultempl/pe.em:446
+#: emultempl/pe.em:445
 #, c-format
 msgid "  --export-all-symbols               Automatically export all globals to DLL\n"
 msgstr "  --export-all-symbols               Exporta automáticamente todos los globales a la DLL\n"
 
-#: emultempl/pe.em:447
+#: emultempl/pe.em:446
 #, c-format
 msgid "  --kill-at                          Remove @nn from exported symbols\n"
 msgstr "  --kill-at                          Elimina @nn de los símbolos exportados\n"
 
-#: emultempl/pe.em:448
+#: emultempl/pe.em:447
 #, c-format
 msgid "  --out-implib <file>                Generate import library\n"
 msgstr "  --out-implib <fichero>             Genera una biblioteca de importación\n"
 
-#: emultempl/pe.em:449
+#: emultempl/pe.em:448
 #, c-format
 msgid "  --output-def <file>                Generate a .DEF file for the built DLL\n"
 msgstr "  --output-def <fichero>             Genera un fichero .DEF para la DLL construida\n"
 
-#: emultempl/pe.em:450
+#: emultempl/pe.em:449
 #, c-format
 msgid "  --warn-duplicate-exports           Warn about duplicate exports.\n"
 msgstr "  --warn-duplicate-exports           Avisa sobre exportaciones duplicadas.\n"
 
-#: emultempl/pe.em:451
+#: emultempl/pe.em:450
 #, c-format
 msgid ""
 "  --compat-implib                    Create backward compatible import libs;\n"
@@ -206,7 +206,7 @@ msgstr ""
 "  --compat-implib                    Crea bibliotecas de importación compatibles hacia atrás;\n"
 "                                       crea además __imp_<S�MBOLO>.\n"
 
-#: emultempl/pe.em:453
+#: emultempl/pe.em:452
 #, c-format
 msgid ""
 "  --enable-auto-image-base           Automatically choose image base for DLLs\n"
@@ -215,12 +215,12 @@ msgstr ""
 "  --enable-auto-image-base           Escoge automáticamente la imagen base para las DLLs\n"
 "                                       a menos que el usuario especifique una\n"
 
-#: emultempl/pe.em:455
+#: emultempl/pe.em:454
 #, c-format
 msgid "  --disable-auto-image-base          Do not auto-choose image base. (default)\n"
 msgstr "  --disable-auto-image-base          No escoge automáticamente una imagen base. (por defecto)\n"
 
-#: emultempl/pe.em:456
+#: emultempl/pe.em:455
 #, c-format
 msgid ""
 "  --dll-search-prefix=<string>       When linking dynamically to a dll without\n"
@@ -231,21 +231,21 @@ msgstr ""
 "                                       biblioteca de importación, usa <cadena><nombrebase>.dll \n"
 "                                       en lugar de lib<nombrebase>.dll \n"
 
-#: emultempl/pe.em:459
+#: emultempl/pe.em:458
 #, c-format
 msgid ""
-"  --enable-auto-import               Do sophisticated linking of _sym to\n"
+"  --enable-auto-import               Do sophistcated linking of _sym to\n"
 "                                       __imp_sym for DATA references\n"
 msgstr ""
 "  --enable-auto-import               Hace enlazado sofisticado de _sym a\n"
 "                                       __imp_sym para las referencias DATA\n"
 
-#: emultempl/pe.em:461
+#: emultempl/pe.em:460
 #, c-format
 msgid "  --disable-auto-import              Do not auto-import DATA items from DLLs\n"
 msgstr "  --disable-auto-import              No importa automáticamente elementos DATA de las DLLs\n"
 
-#: emultempl/pe.em:462
+#: emultempl/pe.em:461
 #, c-format
 msgid ""
 "  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n"
@@ -256,7 +256,7 @@ msgstr ""
 "                                       agregando pseudo-reubicaciones resueltas\n"
 "                                       al momento de ejecución.\n"
 
-#: emultempl/pe.em:465
+#: emultempl/pe.em:464
 #, c-format
 msgid ""
 "  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations for\n"
@@ -265,7 +265,7 @@ msgstr ""
 "  --disable-runtime-pseudo-reloc     No agrega pseudo-reubicaciones al momento\n"
 "                                       de ejecución para DATOS autoimportados.\n"
 
-#: emultempl/pe.em:467
+#: emultempl/pe.em:466
 #, c-format
 msgid ""
 "  --enable-extra-pe-debug            Enable verbose debug output when building\n"
@@ -274,7 +274,7 @@ msgstr ""
 "  --enable-extra-pe-debug            Activa la salida de depuración detallada al construir\n"
 "                                       o enlazar a DLLs (en part. con auto-importación)\n"
 
-#: emultempl/pe.em:470
+#: emultempl/pe.em:469
 #, c-format
 msgid ""
 "  --large-address-aware              Executable supports virtual addresses\n"
@@ -283,7 +283,7 @@ msgstr ""
 "  --large-address-aware              El ejecutable admite direcciones\n"
 "                                       virtuales mayores a 2 gigabytes\n"
 
-#: emultempl/pe.em:472
+#: emultempl/pe.em:471
 #, c-format
 msgid ""
 "  --enable-long-section-names        Use long COFF section names even in\n"
@@ -292,7 +292,7 @@ msgstr ""
 "  --enable-long-section-names        Usa nombres de sección COFF largos aún\n"
 "                                      en ficheros de imágenes ejecutables\n"
 
-#: emultempl/pe.em:474
+#: emultempl/pe.em:473
 #, c-format
 msgid ""
 "  --disable-long-section-names       Never use long COFF section names, even\n"
@@ -301,7 +301,7 @@ msgstr ""
 "  --disable-long-section-names       Nunca usa nombres de sección COFF largos,\n"
 "                                       aún en ficheros objeto\n"
 
-#: emultempl/pe.em:476
+#: emultempl/pe.em:475
 #, c-format
 msgid ""
 "  --dynamicbase\t\t\t Image base address may be relocated using\n"
@@ -311,22 +311,22 @@ msgstr ""
 "\t\t\t\t       reubicar usando la disposición aleatoria\n"
 "\t\t\t\t       del espacio de direcciones (en inglés: ASLR)\n"
 
-#: emultempl/pe.em:478
+#: emultempl/pe.em:477
 #, c-format
 msgid "  --forceinteg\t\t Code integrity checks are enforced\n"
 msgstr "  --forceinteg\t\t Activa la revisión de integridad de código\n"
 
-#: emultempl/pe.em:479
+#: emultempl/pe.em:478
 #, c-format
 msgid "  --nxcompat\t\t Image is compatible with data execution prevention\n"
 msgstr "  --nxcompat\t\t La imagen es compatible con la prevención de ejecución de datos\n"
 
-#: emultempl/pe.em:480
+#: emultempl/pe.em:479
 #, c-format
 msgid "  --no-isolation\t\t Image understands isolation but do not isolate the image\n"
 msgstr "  --no-isolation\t\t La imagen entiende aislamiento, pero no aísla la imagen\n"
 
-#: emultempl/pe.em:481
+#: emultempl/pe.em:480
 #, c-format
 msgid ""
 "  --no-seh\t\t\t Image does not use SEH. No SE handler may\n"
@@ -335,73 +335,74 @@ msgstr ""
 "  --no-seh\t\t\t La imagen no usa SEH. No se puede llamar\n"
 "\t\t\t\t       un manejador SE en esta imagen\n"
 
-#: emultempl/pe.em:483
+#: emultempl/pe.em:482
 #, c-format
 msgid "  --no-bind\t\t\t Do not bind this image\n"
 msgstr "  --no-bind\t\t\t No enlaza esta imagen\n"
 
-#: emultempl/pe.em:484
+#: emultempl/pe.em:483
 #, c-format
 msgid "  --wdmdriver\t\t Driver uses the WDM model\n"
 msgstr "  --wdmdriver\t\t El controlador usa el modelo WDB\n"
 
-#: emultempl/pe.em:485
+#: emultempl/pe.em:484
 #, c-format
 msgid "  --tsaware                  Image is Terminal Server aware\n"
 msgstr "  --tsaware                  La imagen funciona con Terminal Server\n"
 
-#: emultempl/pe.em:614
+#: emultempl/pe.em:613
 msgid "%P: warning: bad version number in -subsystem option\n"
 msgstr "%P: aviso: número de versión erróneo en la opción -subsystem\n"
 
-#: emultempl/pe.em:639
+#: emultempl/pe.em:638
 msgid "%P%F: invalid subsystem type %s\n"
 msgstr "%P%F: tipo de subsistema %s inválido\n"
 
-#: emultempl/pe.em:660
+#: emultempl/pe.em:659
 msgid "%P%F: invalid hex number for PE parameter '%s'\n"
 msgstr "%P%F: número hexadecimal inválido para el parámetro PE '%s'\n"
 
-#: emultempl/pe.em:677
+#: emultempl/pe.em:676
 msgid "%P%F: strange hex info for PE parameter '%s'\n"
 msgstr "%P%F: información hexadecimal extraña para el parámetro PE '%s'\n"
 
-#: emultempl/pe.em:692
-msgid "%F%P: cannot open base file %s\n"
-msgstr "%F%P: no se puede abrir el fichero base %s\n"
+#: emultempl/pe.em:693
+#, c-format
+msgid "%s: Can't open base file %s\n"
+msgstr "%s: No se puede abrir el fichero base %s\n"
 
-#: emultempl/pe.em:965
+#: emultempl/pe.em:969
 msgid "%P: warning, file alignment > section alignment.\n"
 msgstr "%P: aviso, alineación del fichero > alineación de la sección.\n"
 
-#: emultempl/pe.em:978
+#: emultempl/pe.em:982
 msgid "%P: warning: --export-dynamic is not supported for PE targets, did you mean --export-all-symbols?\n"
 msgstr "%P: aviso: --export-dynamic no se admite para objetivos PE, ¿quiso decir --export-all-symbols?\n"
 
-#: emultempl/pe.em:1054 emultempl/pe.em:1081
+#: emultempl/pe.em:1058 emultempl/pe.em:1085
 #, c-format
 msgid "Warning: resolving %s by linking to %s\n"
 msgstr "Aviso: se resuelve %s al enlazar con %s\n"
 
-#: emultempl/pe.em:1059 emultempl/pe.em:1086
+#: emultempl/pe.em:1063 emultempl/pe.em:1090
 msgid "Use --enable-stdcall-fixup to disable these warnings\n"
 msgstr "Use --enable-stdcall-fixup para desactivar estos avisos\n"
 
-#: emultempl/pe.em:1060 emultempl/pe.em:1087
+#: emultempl/pe.em:1064 emultempl/pe.em:1091
 msgid "Use --disable-stdcall-fixup to disable these fixups\n"
 msgstr "Use --disable-stdcall-fixup para desactivar estas composturas\n"
 
-#: emultempl/pe.em:1106
+#: emultempl/pe.em:1110
 #, c-format
 msgid "%C: Cannot get section contents - auto-import exception\n"
 msgstr "%C: No se puede obtener el contenido de la sección - excepción de auto-importación\n"
 
-#: emultempl/pe.em:1146
+#: emultempl/pe.em:1150
 #, c-format
 msgid "Info: resolving %s by linking to %s (auto-import)\n"
 msgstr "Información: se resuelve %s al enlazar con %s (auto-importación)\n"
 
-#: emultempl/pe.em:1153
+#: emultempl/pe.em:1157
 msgid ""
 "%P: warning: auto-importing has been activated without --enable-auto-import specified on the command line.\n"
 "This should work unless it involves constant data structures referencing symbols from auto-imported DLLs.\n"
@@ -409,28 +410,28 @@ msgstr ""
 "%P: aviso: la importación automática se activó sin especificar --enable-auto-import en la línea de órdenes.\n"
 "Esto debe funcionar a menos que involucre estructuras de datos constantes que referencíen símbolos de DLLs auto-importadas.\n"
 
-#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
-#: pe-dll.c:1352
+#: emultempl/pe.em:1164 emultempl/pe.em:1369 emultempl/pe.em:1575 ldcref.c:490
+#: ldcref.c:588 ldmain.c:1183 ldmisc.c:286 pe-dll.c:705 pe-dll.c:1253
+#: pe-dll.c:1348
 msgid "%B%F: could not read symbols: %E\n"
 msgstr "%B%F: no se pueden leer símbolos: %E\n"
 
-#: emultempl/pe.em:1243
+#: emultempl/pe.em:1245
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
 msgstr "%F%P: no se pueden realizar operaciones PE en el fichero de salida '%B' que no es PE.\n"
 
-#: emultempl/pe.em:1617
+#: emultempl/pe.em:1616
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr "Se encontraron errores al procesar el fichero %s\n"
 
-#: emultempl/pe.em:1640
+#: emultempl/pe.em:1639
 #, c-format
 msgid "Errors encountered processing file %s for interworking\n"
 msgstr "Se encontraron errores al procesar el fichero %s para interoperabilidad\n"
 
-#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
-#: ldmain.c:1160
+#: emultempl/pe.em:1701 ldexp.c:542 ldlang.c:3323 ldlang.c:3358 ldlang.c:6804
+#: ldlang.c:6835 ldmain.c:1128
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr "%P%F: falló bfd_link_hash_lookup: %E\n"
 
@@ -475,7 +476,7 @@ msgstr "No hay símbolos\n"
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr "%P: falta el símbolo `%T' de la tabla principal de dispersión\n"
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
+#: ldcref.c:650 ldcref.c:657 ldmain.c:1217 ldmain.c:1224
 msgid "%B%F: could not read relocs: %E\n"
 msgstr "%B%F: no se pueden leer las reubicaciones: %E\n"
 
@@ -536,158 +537,162 @@ msgstr "Emulaciones admitidas: "
 msgid "  no emulation specific options.\n"
 msgstr "  no hay opciones específicas de emulación.\n"
 
-#: ldexp.c:314
+#: ldexp.c:313
 msgid "%P: warning: address of `%s' isn't multiple of maximum page size\n"
 msgstr "%P: aviso: la dirección de `%s' no es un múltiplo del tamaño máximo de página\n"
 
-#: ldexp.c:407
+#: ldexp.c:351
 #, c-format
 msgid "%F%S %% by zero\n"
 msgstr "%F%S %% por cero\n"
 
-#: ldexp.c:417
+#: ldexp.c:359
 #, c-format
 msgid "%F%S / by zero\n"
 msgstr "%F%S / por cero\n"
 
-#: ldexp.c:591
+#: ldexp.c:552
 #, c-format
 msgid "%X%S: unresolvable symbol `%s' referenced in expression\n"
 msgstr "%X%S: se referencía el símbolo sin resolución `%s' en la expresión\n"
 
-#: ldexp.c:605
+#: ldexp.c:564
 #, c-format
 msgid "%F%S: undefined symbol `%s' referenced in expression\n"
 msgstr "%F%S: se referencía el símbolo sin definir `%s' en la expresión\n"
 
-#: ldexp.c:626 ldexp.c:643 ldexp.c:670
+#: ldexp.c:585 ldexp.c:602 ldexp.c:629
 #, c-format
 msgid "%F%S: undefined section `%s' referenced in expression\n"
 msgstr "%F%S: se referencía la sección sin definir `%s' en la expresión\n"
 
-#: ldexp.c:697 ldexp.c:711
+#: ldexp.c:656 ldexp.c:670
 #, c-format
 msgid "%F%S: undefined MEMORY region `%s' referenced in expression\n"
 msgstr "%F%S: se referencía la región MEMORY sin definir `%s' en la expresión\n"
 
-#: ldexp.c:722
+#: ldexp.c:681
 #, c-format
 msgid "%F%S: unknown constant `%s' referenced in expression\n"
 msgstr "%F%S: se referencía la constante sin definir `%s' en la expresión\n"
 
-#: ldexp.c:787
+#: ldexp.c:743
 #, c-format
 msgid "%F%S can not PROVIDE assignment to location counter\n"
 msgstr "%F%S no se puede hacer una asignación PROVIDE al contador de ubicación\n"
 
-#: ldexp.c:805
+#: ldexp.c:757
 #, c-format
 msgid "%F%S invalid assignment to location counter\n"
 msgstr "%F%S asignación inválida al contador de ubicación\n"
 
-#: ldexp.c:808
+#: ldexp.c:760
 #, c-format
 msgid "%F%S assignment to location counter invalid outside of SECTION\n"
 msgstr "%F%S asignación al contador de ubicación inválida fuera de SECTION\n"
 
-#: ldexp.c:821
+#: ldexp.c:773
 msgid "%F%S cannot move location counter backwards (from %V to %V)\n"
 msgstr "%F%S no se puede mover el contador de ubicación hacia atrás (de %V a %V)\n"
 
-#: ldexp.c:882
+#: ldexp.c:812
 msgid "%P%F:%s: hash creation failed\n"
 msgstr "%P%F:%s: falló la creación de la dispersión\n"
 
-#: ldexp.c:1191 ldexp.c:1216 ldexp.c:1276
+#: ldexp.c:1119 ldexp.c:1144 ldexp.c:1204
 #, c-format
 msgid "%F%S: nonconstant expression for %s\n"
 msgstr "%F%S: la expresión no es constante para %s\n"
 
-#: ldfile.c:142
+#: ldfile.c:141
 #, c-format
 msgid "attempt to open %s failed\n"
 msgstr "falló el intento de abrir %s\n"
 
-#: ldfile.c:144
+#: ldfile.c:143
 #, c-format
 msgid "attempt to open %s succeeded\n"
 msgstr "tuvo éxito el intento de abrir %s\n"
 
-#: ldfile.c:150
+#: ldfile.c:149
 msgid "%F%P: invalid BFD target `%s'\n"
 msgstr "%F%P: objetivo BFD inválido `%s'\n"
 
-#: ldfile.c:267 ldfile.c:296
+#: ldfile.c:266 ldfile.c:295
 msgid "%P: skipping incompatible %s when searching for %s\n"
 msgstr "%P: se salta el %s incompatible mientras se busca %s\n"
 
-#: ldfile.c:280
+#: ldfile.c:279
 msgid "%F%P: attempted static link of dynamic object `%s'\n"
 msgstr "%F%P: se intentó el enlazado estático del objeto dinámico `%s'\n"
 
-#: ldfile.c:426
+#: ldfile.c:332 ldmain.c:832
+msgid "%P%F: %s: plugin reported error claiming file\n"
+msgstr "%P%F: %s: el plugin reportó error al reclamar el fichero\n"
+
+#: ldfile.c:447
 msgid "%P: cannot find %s (%s): %E\n"
 msgstr "%P: no se puede encontrar %s (%s): %E\n"
 
-#: ldfile.c:429
+#: ldfile.c:450
 msgid "%P: cannot find %s: %E\n"
 msgstr "%P: no se puede encontrar %s: %E\n"
 
-#: ldfile.c:464
+#: ldfile.c:485
 msgid "%P: cannot find %s inside %s\n"
 msgstr "%P: no se puede encontrar %s dentro de %s\n"
 
-#: ldfile.c:467
+#: ldfile.c:488
 msgid "%P: cannot find %s\n"
 msgstr "%P: no se puede encontrar %s\n"
 
-#: ldfile.c:486 ldfile.c:504
+#: ldfile.c:507 ldfile.c:525
 #, c-format
 msgid "cannot find script file %s\n"
 msgstr "no se puede encontrar el fichero de guión %s\n"
 
-#: ldfile.c:488 ldfile.c:506
+#: ldfile.c:509 ldfile.c:527
 #, c-format
 msgid "opened script file %s\n"
 msgstr "fichero de guión %s abierto\n"
 
-#: ldfile.c:636
+#: ldfile.c:657
 msgid "%P%F: cannot open linker script file %s: %E\n"
 msgstr "%P%F: no se puede abrir el fichero de guión del enlazador %s: %E\n"
 
-#: ldfile.c:701
+#: ldfile.c:722
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr "%P%F: no se puede representar la máquina `%s'\n"
 
-#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
+#: ldlang.c:1160 ldlang.c:1202 ldlang.c:3048
 msgid "%P%F: can not create hash table: %E\n"
 msgstr "%P%F: no se puede crear la tabla de dispersión: %E\n"
 
-#: ldlang.c:1310
+#: ldlang.c:1253
 msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
 msgstr "%P:%S: aviso: redeclaración de la región de memoria `%s'\n"
 
-#: ldlang.c:1316
+#: ldlang.c:1259
 msgid "%P:%S: warning: memory region `%s' not declared\n"
 msgstr "%P:%S: aviso: no se declaró la región de memoria `%s'\n"
 
-#: ldlang.c:1350
+#: ldlang.c:1293
 msgid "%F%P:%S: error: alias for default memory region\n"
 msgstr "%F%P:%S: aviso: alias para la región de memoria por defecto\n"
 
-#: ldlang.c:1361
+#: ldlang.c:1304
 msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
 msgstr "%F%P:%S: aviso: redefinición del alias de la región de memoria '%s'\n"
 
-#: ldlang.c:1368
+#: ldlang.c:1311
 msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
 msgstr "%F%P:%S: aviso: no existe la región de memoria `%s' para el alias `%s'\n"
 
-#: ldlang.c:1420 ldlang.c:1459
+#: ldlang.c:1363 ldlang.c:1402
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr "%P%F: falló la creación de la sección `%s': %E\n"
 
-#: ldlang.c:2021
+#: ldlang.c:1958
 #, c-format
 msgid ""
 "\n"
@@ -698,7 +703,7 @@ msgstr ""
 "Secciones de salida descartadas\n"
 "\n"
 
-#: ldlang.c:2029
+#: ldlang.c:1966
 msgid ""
 "\n"
 "Memory Configuration\n"
@@ -708,23 +713,23 @@ msgstr ""
 "Configuración de la Memoria\n"
 "\n"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Name"
 msgstr "Nombre"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Origin"
 msgstr "Origen"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Length"
 msgstr "Longitud"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ldlang.c:2071
+#: ldlang.c:2008
 #, c-format
 msgid ""
 "\n"
@@ -735,178 +740,178 @@ msgstr ""
 "Guión del enlazador y mapa de memoria\n"
 "\n"
 
-#: ldlang.c:2140
+#: ldlang.c:2074
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr "%P%F: Uso ilegal de la sección `%s'\n"
 
-#: ldlang.c:2149
+#: ldlang.c:2083
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr "%P%F: el formato de salida %s no puede representar la sección llamada %s\n"
 
-#: ldlang.c:2702
+#: ldlang.c:2636
 msgid "%B: file not recognized: %E\n"
 msgstr "%B: no se reconoce el fichero: %E\n"
 
-#: ldlang.c:2703
+#: ldlang.c:2637
 msgid "%B: matching formats:"
 msgstr "%B: formatos coincidentes:"
 
-#: ldlang.c:2710
+#: ldlang.c:2644
 msgid "%F%B: file not recognized: %E\n"
 msgstr "%F%B: no se reconoce el fichero: %E\n"
 
-#: ldlang.c:2781
+#: ldlang.c:2715
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr "%F%B: el miembro %B en el archivo no es un objeto\n"
 
-#: ldlang.c:2796 ldlang.c:2810
+#: ldlang.c:2730 ldlang.c:2744
 msgid "%F%B: could not read symbols: %E\n"
 msgstr "%F%B: no se puede leer símbolos: %E\n"
 
-#: ldlang.c:3084
+#: ldlang.c:3018
 msgid "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr "%P: aviso: no se puede encontrar ningún objetivo que coincida con los requerimientos de `endianez'\n"
 
-#: ldlang.c:3098
+#: ldlang.c:3032
 msgid "%P%F: target %s not found\n"
 msgstr "%P%F: no se encontró el objetivo %s\n"
 
-#: ldlang.c:3100
+#: ldlang.c:3034
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr "%P%F: no se puede abrir el fichero de salida %s: %E\n"
 
-#: ldlang.c:3106
+#: ldlang.c:3040
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr "%P%F:%s: no se puede hacer el fichero objeto: %E\n"
 
-#: ldlang.c:3110
+#: ldlang.c:3044
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr "%P%F:%s: no se puede establecer la arquitectura: %E\n"
 
-#: ldlang.c:3267
+#: ldlang.c:3185
 msgid "%P: warning: %s contains output sections; did you forget -T?\n"
 msgstr "%P: aviso: %s contiene secciones de salida. ¿Olvidó -T?\n"
 
-#: ldlang.c:3308
+#: ldlang.c:3215
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr "%P%F: falló bfd_hash_lookup al crear el símbolo %s\n"
 
-#: ldlang.c:3326
+#: ldlang.c:3233
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr "%P%F: falló bfd_hash_allocate al crear el símbolo %s\n"
 
-#: ldlang.c:3722
+#: ldlang.c:3688
 msgid "%F%P: %s not found for insert\n"
 msgstr "%F%P: no se puede encontrar %s para insert\n"
 
-#: ldlang.c:3937
+#: ldlang.c:3903
 msgid " load address 0x%V"
 msgstr " dirección de carga 0x%V"
 
-#: ldlang.c:4212
+#: ldlang.c:4179
 msgid "%W (size before relaxing)\n"
 msgstr "%W (tamaño antes de la relajación)\n"
 
-#: ldlang.c:4303
+#: ldlang.c:4270
 #, c-format
 msgid "Address of section %s set to "
 msgstr "La dirección de la sección %s se estableció a "
 
-#: ldlang.c:4456
+#: ldlang.c:4423
 #, c-format
 msgid "Fail with %d\n"
 msgstr "Falló con %d\n"
 
-#: ldlang.c:4743
+#: ldlang.c:4710
 msgid "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
 msgstr "%X%P: la sección %s cargada en [%V,%V] sobreescribe la sección %s cargada en [%V,%V]\n"
 
-#: ldlang.c:4759
+#: ldlang.c:4726
 msgid "%X%P: region `%s' overflowed by %ld bytes\n"
 msgstr "%X%P: la región `%s' se desborda por %ld bytes\n"
 
-#: ldlang.c:4782
+#: ldlang.c:4749
 msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
 msgstr "%X%P: la dirección 0x%v de la sección %B %s no está dentro de la región `%s'\n"
 
-#: ldlang.c:4793
+#: ldlang.c:4760
 msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
 msgstr "%X%P: la sección %B `%s' no cabe en la región `%s'\n"
 
-#: ldlang.c:4850
+#: ldlang.c:4816
 #, c-format
 msgid "%F%S: non constant or forward reference address expression for section %s\n"
 msgstr "%F%S: expresión de dirección de referencia hacia adelante o no constante para la sección %s\n"
 
-#: ldlang.c:4875
+#: ldlang.c:4841
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr "%P%X: Error interno en la sección de biblioteca compartida COFF %s\n"
 
-#: ldlang.c:4932
+#: ldlang.c:4900
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
 msgstr "%P%F: aviso: no se especificó una región de memoria para la sección cargable `%s'\n"
 
-#: ldlang.c:4937
+#: ldlang.c:4905
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr "%P: aviso: no se especificó una región de memoria para la sección cargable `%s'\n"
 
-#: ldlang.c:4959
+#: ldlang.c:4927
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr "%P: aviso: se cambia el inicio de la sección %s por %lu bytes\n"
 
-#: ldlang.c:5036
+#: ldlang.c:5004
 msgid "%P: warning: dot moved backwards before `%s'\n"
 msgstr "%P: aviso: el punto se movió hacia atrás antes de `%s'\n"
 
-#: ldlang.c:5202
+#: ldlang.c:5170
 msgid "%P%F: can't relax section: %E\n"
 msgstr "%P%F: no se puede relajar la sección: %E\n"
 
-#: ldlang.c:5531
+#: ldlang.c:5497
 msgid "%F%P: invalid data statement\n"
 msgstr "%F%P: declaración de datos inválida\n"
 
-#: ldlang.c:5564
+#: ldlang.c:5530
 msgid "%F%P: invalid reloc statement\n"
 msgstr "%F%P: declaración de reubicación inválida\n"
 
-#: ldlang.c:5683
+#: ldlang.c:5648
 msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
 msgstr "%P%F: las secciones-gc requieren de una entrada o un símbolo indefinido\n"
 
-#: ldlang.c:5708
+#: ldlang.c:5673
 msgid "%P%F:%s: can't set start address\n"
 msgstr "%P%F:%s: no se puede establecer la dirección de inicio\n"
 
-#: ldlang.c:5721 ldlang.c:5740
+#: ldlang.c:5686 ldlang.c:5705
 msgid "%P%F: can't set start address\n"
 msgstr "%P%F: no se puede establecer la dirección de inicio\n"
 
-#: ldlang.c:5733
+#: ldlang.c:5698
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr "%P: aviso: no se puede encontrar el símbolo de entrada %s; se usa por defecto %V\n"
 
-#: ldlang.c:5745
+#: ldlang.c:5710
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr "%P: aviso: no se puede encontrar el símbolo de entrada %s; no se establece la dirección de inicio\n"
 
-#: ldlang.c:5800
+#: ldlang.c:5760
 msgid "%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"
 msgstr "%P%F: No se admite el enlazado reubicable con reubicaciones del formato %s (%B) al formato %s (%B)\n"
 
-#: ldlang.c:5810
+#: ldlang.c:5770
 msgid "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
 msgstr "%P%X: la arquitectura %s del fichero de entrada `%B' es incompatible con la salida %s\n"
 
-#: ldlang.c:5832
+#: ldlang.c:5792
 msgid "%P%X: failed to merge target specific data of file %B\n"
 msgstr "%P%X: falló la mezcla de datos específicos de objetivo del fichero %B\n"
 
-#: ldlang.c:5903
+#: ldlang.c:5863
 msgid "%P%F: Could not define common symbol `%T': %E\n"
 msgstr "%P%F: No se puede definir el símbolo común `%T': %E\n"
 
-#: ldlang.c:5915
+#: ldlang.c:5875
 msgid ""
 "\n"
 "Allocating common symbols\n"
@@ -914,7 +919,7 @@ msgstr ""
 "\n"
 "Se asignan símbolos comunes\n"
 
-#: ldlang.c:5916
+#: ldlang.c:5876
 msgid ""
 "Common symbol       size              file\n"
 "\n"
@@ -922,70 +927,66 @@ msgstr ""
 "Símbolo común       tamaño            fichero\n"
 "\n"
 
-#: ldlang.c:6062
+#: ldlang.c:6022
 msgid "%P%F: invalid syntax in flags\n"
 msgstr "%P%F: sintaxis inválida en los interruptores\n"
 
-#: ldlang.c:6524
+#: ldlang.c:6415
 msgid "%P%F: Failed to create hash table\n"
 msgstr "%P%F: Falló al crear la tabla de dispersión\n"
 
-#: ldlang.c:6547
+#: ldlang.c:6430
 msgid "%P%F: %s: plugin reported error after all symbols read\n"
 msgstr "%P%F: %s: el plugin reportó error después de leer todos los símbolos\n"
 
-#: ldlang.c:6860
+#: ldlang.c:6717
 msgid "%P%F: multiple STARTUP files\n"
 msgstr "%P%F: ficheros STARTUP múltiples\n"
 
-#: ldlang.c:6906
+#: ldlang.c:6765
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr "%X%P:%S: la sección tiene tanto una dirección de carga como una región de carga\n"
 
-#: ldlang.c:7093
+#: ldlang.c:6950
 msgid "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack them\n"
 msgstr "%X%P:%S: no se admiten PHDRS y FILEHDR cuando los encabezados PT_LOAD previso no los tienen\n"
 
-#: ldlang.c:7165
+#: ldlang.c:7022
 msgid "%F%P: no sections assigned to phdrs\n"
 msgstr "%F%P: no se asignaron secciones a phdrs\n"
 
-#: ldlang.c:7203
+#: ldlang.c:7060
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr "%F%P: falló bfd_record_phdr: %E\n"
 
-#: ldlang.c:7223
+#: ldlang.c:7080
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr "%X%P: se asignó la sección `%s' al phdr que no existe `%s'\n"
 
-#: ldlang.c:7636
+#: ldlang.c:7481
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr "%X%P: lenguaje `%s' desconocido en la información de la versión\n"
 
-#: ldlang.c:7781
+#: ldlang.c:7626
 msgid "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr "%X%P: la marca de versión anónima no se puede combinar con otras marcas de versión\n"
 
-#: ldlang.c:7790
+#: ldlang.c:7635
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr "%X%P: marca de versión `%s' duplicada\n"
 
-#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
+#: ldlang.c:7656 ldlang.c:7665 ldlang.c:7683 ldlang.c:7693
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr "%X%P: expresión `%s' duplicada en la información de la versión\n"
 
-#: ldlang.c:7888
+#: ldlang.c:7733
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr "%X%P: no se puede encontrar la dependencia de versión `%s'\n"
 
-#: ldlang.c:7911
+#: ldlang.c:7756
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr "%X%P: no se pueden leer los contenidos de la sección .exports\n"
 
-#: ldlang.c:8035
-msgid "%X%P: unknown feature `%s'\n"
-msgstr "%X%P: opción `%s' desconocida\n"
-
 #: ldmain.c:239
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr "%X%P: no se puede establecer el objetivo BFD por defecto a `%s': %E\n"
@@ -1022,66 +1023,70 @@ msgstr "%P: modo %s\n"
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr "%P%F: no se puede encontrar el fichero de mapeo %s: %E\n"
 
-#: ldmain.c:488
+#: ldmain.c:485
+msgid "%P: %s: error in plugin cleanup (ignored)\n"
+msgstr "%P %s: error en la limpieza de plugin (se descarta)\n"
+
+#: ldmain.c:494
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr "%P: se encontraron errores de enlace, se borra el ejecutable `%s'\n"
 
-#: ldmain.c:497
+#: ldmain.c:503
 msgid "%F%B: final close failed: %E\n"
 msgstr "%F%B: falló el cerrado final: %E\n"
 
-#: ldmain.c:523
+#: ldmain.c:529
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr "%X%P: no se puede abrir para la fuente de la copia `%s'\n"
 
-#: ldmain.c:526
+#: ldmain.c:532
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr "%X%P: no se puede abrir para el destino de la copia `%s'\n"
 
-#: ldmain.c:533
+#: ldmain.c:539
 msgid "%P: Error writing file `%s'\n"
 msgstr "%P: Error al escribir el fichero `%s'\n"
 
-#: ldmain.c:538 pe-dll.c:1733
+#: ldmain.c:544 pe-dll.c:1729
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr "%P: Error al cerrar el fichero `%s'\n"
 
-#: ldmain.c:555
+#: ldmain.c:560
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr "%s: tiempo total de enlazado: %ld.%06ld\n"
 
-#: ldmain.c:558
+#: ldmain.c:563
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: tamaño de los datos %ld\n"
 
-#: ldmain.c:642
+#: ldmain.c:646
 msgid "%P%F: missing argument to -m\n"
 msgstr "%P%F: falta el argumento para -m\n"
 
-#: ldmain.c:690 ldmain.c:710 ldmain.c:742
+#: ldmain.c:694 ldmain.c:714 ldmain.c:746 plugin.c:772
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr "%P%F: falló bfd_hash_table_init: %E\n"
 
-#: ldmain.c:694 ldmain.c:714
+#: ldmain.c:698 ldmain.c:718
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr "%P%F: falló bfd_hash_lookup: %E\n"
 
-#: ldmain.c:728
+#: ldmain.c:732
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr "%X%P: error: fichero de símbolos a retener duplicado\n"
 
-#: ldmain.c:772
+#: ldmain.c:776
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr "%P%F: falló bfd_hash_lookup para la inserción: %E\n"
 
-#: ldmain.c:777
+#: ldmain.c:781
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr "%P `-retain-symbols-file' se impone a `-s' y `-S'\n"
 
-#: ldmain.c:877
+#: ldmain.c:895
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
@@ -1090,164 +1095,165 @@ msgstr ""
 "Se incluyó el miembro del archivo debido al fichero (símbolo)\n"
 "\n"
 
-#: ldmain.c:983
+#: ldmain.c:975
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr "%X%C: definiciones múltiples de `%T'\n"
 
-#: ldmain.c:986
+#: ldmain.c:978
 msgid "%D: first defined here\n"
 msgstr "%D: primero se definió aquí\n"
 
-#: ldmain.c:990
+#: ldmain.c:982
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr "%P: Se desactiva la relajación: no funcionará con definiciones múltiples\n"
 
 # FIXME: Revisar en el código fuente si `common' se refiere a una orden o
 # se puede sustituir por `común'. cfuga
-#: ldmain.c:1044
+#: ldmain.c:1012
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr "%B: aviso: la definición de `%T' se impone a common\n"
 
-#: ldmain.c:1047
+#: ldmain.c:1015
 msgid "%B: warning: common is here\n"
 msgstr "%B: aviso: common está aquí\n"
 
-#: ldmain.c:1054
+#: ldmain.c:1022
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr "%B: aviso: el common de `%T' se sobrepasa por definición\n"
 
-#: ldmain.c:1057
+#: ldmain.c:1025
 msgid "%B: warning: defined here\n"
 msgstr "%B: aviso: se definió aquí\n"
 
-#: ldmain.c:1064
+#: ldmain.c:1032
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr "%B: aviso: el common de `%T' se sobrepasa con un common más grande\n"
 
-#: ldmain.c:1067
+#: ldmain.c:1035
 msgid "%B: warning: larger common is here\n"
 msgstr "%B: aviso: el common más grande está aquí\n"
 
-#: ldmain.c:1071
+#: ldmain.c:1039
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr "%B: aviso: el common de `%T' se sobrepasa con un common más pequeño\n"
 
-#: ldmain.c:1074
+#: ldmain.c:1042
 msgid "%B: warning: smaller common is here\n"
 msgstr "%B: aviso: el common más pequeño está aquí\n"
 
-#: ldmain.c:1078
+#: ldmain.c:1046
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr "%B: aviso: common múltiple de `%T'\n"
 
-#: ldmain.c:1080
+#: ldmain.c:1048
 msgid "%B: warning: previous common is here\n"
 msgstr "%B: aviso: el common previo está aquí\n"
 
-#: ldmain.c:1100 ldmain.c:1138
+#: ldmain.c:1068 ldmain.c:1106
 msgid "%P: warning: global constructor %s used\n"
 msgstr "%P: aviso: se usó el constructor global %s\n"
 
-#: ldmain.c:1148
+#: ldmain.c:1116
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr "%P%F: error del frente trasero de BFD: no se admite BFD_RELOC_CTOR\n"
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
+#: ldmain.c:1170 ldmain.c:1172 ldmain.c:1174 ldmain.c:1192 ldmain.c:1237
 msgid "warning: "
 msgstr "aviso: "
 
-#: ldmain.c:1305
+#: ldmain.c:1273
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr "%F%P: falló bfd_hash_table_init: %E\n"
 
-#: ldmain.c:1312
+#: ldmain.c:1280
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr "%F%P: falló bfd_hash_lookup: %E\n"
 
-#: ldmain.c:1333
+#: ldmain.c:1301
 msgid "%X%C: undefined reference to `%T'\n"
 msgstr "%X%C: referencia a `%T' sin definir\n"
 
-#: ldmain.c:1336
+#: ldmain.c:1304
 msgid "%C: warning: undefined reference to `%T'\n"
 msgstr "%C: aviso: referencia a `%T' sin definir\n"
 
-#: ldmain.c:1342
+#: ldmain.c:1310
 msgid "%X%D: more undefined references to `%T' follow\n"
 msgstr "%X%D: más referencias a `%T' sin definir a continuación\n"
 
-#: ldmain.c:1345
+#: ldmain.c:1313
 msgid "%D: warning: more undefined references to `%T' follow\n"
 msgstr "%D: aviso: más referencias a `%T' sin definir a continuación\n"
 
-#: ldmain.c:1356
+#: ldmain.c:1324
 msgid "%X%B: undefined reference to `%T'\n"
 msgstr "%X%B: referencia a `%T' sin definir\n"
 
-#: ldmain.c:1359
+#: ldmain.c:1327
 msgid "%B: warning: undefined reference to `%T'\n"
 msgstr "%B: aviso: referencia a `%T' sin definir\n"
 
-#: ldmain.c:1365
+#: ldmain.c:1333
 msgid "%X%B: more undefined references to `%T' follow\n"
 msgstr "%X%B: más referencias a `%T' sin definir a continuación\n"
 
-#: ldmain.c:1368
+#: ldmain.c:1336
 msgid "%B: warning: more undefined references to `%T' follow\n"
 msgstr "%B: aviso: más referencias a `%T' sin definir a continuación\n"
 
-#: ldmain.c:1407
+#: ldmain.c:1375
 msgid " additional relocation overflows omitted from the output\n"
 msgstr " se omitieron desbordamientos de reubicación adicionales de la salida\n"
 
-#: ldmain.c:1420
+#: ldmain.c:1388
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
 msgstr " reubicación truncada para ajustar: %s contra el símbolo `%T' sin definir"
 
-#: ldmain.c:1425
+#: ldmain.c:1393
 msgid " relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"
 msgstr " reubicación truncada para ajustar: %s contra el símbolo `%T' definido en la sección %A en %B"
 
-#: ldmain.c:1437
+#: ldmain.c:1405
 msgid " relocation truncated to fit: %s against `%T'"
 msgstr " reubicación truncada para ajustar: %s contra `%T'"
 
-#: ldmain.c:1454
-msgid "%X%H: dangerous relocation: %s\n"
-msgstr "%X%H: reubicación peligrosa: %s\n"
+#: ldmain.c:1422
+#, c-format
+msgid "%X%C: dangerous relocation: %s\n"
+msgstr "%X%C: reubicación peligrosa: %s\n"
 
-#: ldmain.c:1469
-msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
-msgstr "%X%H: la reubicación se refiere al símbolo `%T' el cual no se muestra\n"
+#: ldmain.c:1437
+msgid "%X%C: reloc refers to symbol `%T' which is not being output\n"
+msgstr "%X%C: la reubicación se refiere al símbolo `%T' el cual no se muestra\n"
 
-#: ldmisc.c:151
+#: ldmisc.c:149
 #, c-format
 msgid "no symbol"
 msgstr "no hay símbolo"
 
-#: ldmisc.c:248
+#: ldmisc.c:246
 #, c-format
 msgid "built in linker script:%u"
 msgstr "guión interno del enlazador:%u"
 
-#: ldmisc.c:329
+#: ldmisc.c:324
 msgid "%B: In function `%T':\n"
 msgstr "%B: En la función `%T':\n"
 
-#: ldmisc.c:464
+#: ldmisc.c:451
 msgid "%F%P: internal error %s %d\n"
 msgstr "%F%P: error interno %s %d\n"
 
-#: ldmisc.c:513
+#: ldmisc.c:500
 msgid "%P: internal error: aborting at %s line %d in %s\n"
 msgstr "%P: error interno: se aborta en %s línea %d en %s\n"
 
-#: ldmisc.c:516
+#: ldmisc.c:503
 msgid "%P: internal error: aborting at %s line %d\n"
 msgstr "%P: error interno: se aborta en %s línea %d\n"
 
-#: ldmisc.c:518
+#: ldmisc.c:505
 msgid "%P%F: please report this bug\n"
 msgstr "%P%F: por favor reporte este bicho\n"
 
@@ -1259,8 +1265,8 @@ msgstr "GNU ld %s\n"
 
 #: ldver.c:43
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: ldver.c:44
 #, c-format
@@ -1300,7 +1306,7 @@ msgstr "%8x algo más\n"
 msgid "%F%P: final link failed: %E\n"
 msgstr "%F%P: falló el enlace final: %E\n"
 
-#: lexsup.c:219 lexsup.c:373
+#: lexsup.c:219 lexsup.c:368
 msgid "KEYWORD"
 msgstr "PALABRA CLAVE"
 
@@ -1316,7 +1322,7 @@ msgstr "ARQ"
 msgid "Set architecture"
 msgstr "Establece la arquitectura"
 
-#: lexsup.c:224 lexsup.c:492
+#: lexsup.c:224 lexsup.c:487
 msgid "TARGET"
 msgstr "OBJETIVO"
 
@@ -1324,8 +1330,8 @@ msgstr "OBJETIVO"
 msgid "Specify target for following input files"
 msgstr "Especifica el objetivo para los siguientes ficheros de entrada"
 
-#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
-#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
+#: lexsup.c:227 lexsup.c:278 lexsup.c:296 lexsup.c:309 lexsup.c:311
+#: lexsup.c:441 lexsup.c:501 lexsup.c:563 lexsup.c:576
 msgid "FILE"
 msgstr "FICHERO"
 
@@ -1337,7 +1343,7 @@ msgstr "Lee el guión del enlazador de formato MRI"
 msgid "Force common symbols to be defined"
 msgstr "Fuerza que se definan los símbolos comunes"
 
-#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
+#: lexsup.c:233 lexsup.c:545 lexsup.c:547 lexsup.c:549 lexsup.c:551
 msgid "ADDRESS"
 msgstr "DIRECCIÓN"
 
@@ -1469,124 +1475,120 @@ msgstr "ARG"
 msgid "Send arg to last-loaded plugin"
 msgstr "Envía el argumento al último plugin cargado"
 
-#: lexsup.c:287 lexsup.c:290
-msgid "Ignored for GCC LTO option compatibility"
-msgstr "Se descarta por compatibilidad con LTO de GCC"
-
-#: lexsup.c:294
+#: lexsup.c:288
 msgid "Ignored for SVR4 compatibility"
 msgstr "Se descarta por compatibilidad con SVR4"
 
-#: lexsup.c:298
+#: lexsup.c:292
 msgid "Generate relocatable output"
 msgstr "Genera salida reubicable"
 
-#: lexsup.c:302
+#: lexsup.c:296
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr "Sólo enlaza símbolos (si es un directorio, es igual que --rpath)"
 
-#: lexsup.c:305
+#: lexsup.c:299
 msgid "Strip all symbols"
 msgstr "Descarta todos los símbolos"
 
-#: lexsup.c:307
+#: lexsup.c:301
 msgid "Strip debugging symbols"
 msgstr "Descarta los símbolos de depuración"
 
-#: lexsup.c:309
+#: lexsup.c:303
 msgid "Strip symbols in discarded sections"
 msgstr "Descarta símbolos en las secciones descartadas"
 
-#: lexsup.c:311
+#: lexsup.c:305
 msgid "Do not strip symbols in discarded sections"
 msgstr "No descarta símbolos en las secciones descartadas"
 
-#: lexsup.c:313
+#: lexsup.c:307
 msgid "Trace file opens"
 msgstr "Rastrea la apertura de ficheros"
 
-#: lexsup.c:315
+#: lexsup.c:309
 msgid "Read linker script"
 msgstr "Lee el guión del enlazador"
 
-#: lexsup.c:317
+#: lexsup.c:311
 msgid "Read default linker script"
 msgstr "Lee el guión del enlazador por defecto"
 
-#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
-#: lexsup.c:572 lexsup.c:611
+#: lexsup.c:315 lexsup.c:333 lexsup.c:418 lexsup.c:439 lexsup.c:538
+#: lexsup.c:566 lexsup.c:605
 msgid "SYMBOL"
 msgstr "S�MBOLO"
 
-#: lexsup.c:321
+#: lexsup.c:315
 msgid "Start with undefined reference to SYMBOL"
 msgstr "Inicia con una referencia sin definir hacia el S�MBOLO"
 
-#: lexsup.c:324
+#: lexsup.c:318
 msgid "[=SECTION]"
 msgstr "[=SECCIÓN]"
 
-#: lexsup.c:325
+#: lexsup.c:319
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr "No mezcla secciones de entrada [SECCIÓN | huérfanas]"
 
-#: lexsup.c:327
+#: lexsup.c:321
 msgid "Build global constructor/destructor tables"
 msgstr "Construye tablas globales de constructores/destructores"
 
-#: lexsup.c:329
+#: lexsup.c:323
 msgid "Print version information"
 msgstr "Muestra la información de la versión"
 
-#: lexsup.c:331
+#: lexsup.c:325
 msgid "Print version and emulation information"
 msgstr "Muestra la información de la versión y de la emulación"
 
-#: lexsup.c:333
+#: lexsup.c:327
 msgid "Discard all local symbols"
 msgstr "Descarta todos los símbolos locales"
 
-#: lexsup.c:335
+#: lexsup.c:329
 msgid "Discard temporary local symbols (default)"
 msgstr "Descarta los símbolos locales temporales (por defecto)"
 
-#: lexsup.c:337
+#: lexsup.c:331
 msgid "Don't discard any local symbols"
 msgstr "No descarta ningún símbolo local"
 
-#: lexsup.c:339
+#: lexsup.c:333
 msgid "Trace mentions of SYMBOL"
 msgstr "Rastrea las menciones del S�MBOLO"
 
-#: lexsup.c:341 lexsup.c:508 lexsup.c:510
+#: lexsup.c:335 lexsup.c:503 lexsup.c:505
 msgid "PATH"
 msgstr "RUTA"
 
-#: lexsup.c:341
+#: lexsup.c:335
 msgid "Default search path for Solaris compatibility"
 msgstr "Ruta de búsqueda por defecto para compatibilidad con Solaris"
 
-#: lexsup.c:344
+#: lexsup.c:338
 msgid "Start a group"
 msgstr "Inicia un grupo"
 
-#: lexsup.c:346
+#: lexsup.c:340
 msgid "End a group"
 msgstr "Termina un grupo"
 
-#: lexsup.c:350
+#: lexsup.c:344
 msgid "Accept input files whose architecture cannot be determined"
 msgstr "Acepta ficheros de entrada cuya arquitectura no se pueda determinar"
 
-#: lexsup.c:354
+#: lexsup.c:348
 msgid "Reject input files whose architecture is unknown"
 msgstr "Rechaza ficheros de entrada cuya arquitectura es desconocida"
 
-#: lexsup.c:366
+#: lexsup.c:361
 msgid "Only set DT_NEEDED for following dynamic libs if used"
 msgstr "Sólo establece DT_NEEDED para las siguientes bibliotecas dinámicas si se usan"
 
-#: lexsup.c:369
+#: lexsup.c:364
 msgid ""
 "Always set DT_NEEDED for dynamic libraries mentioned on\n"
 "                                the command line"
@@ -1594,172 +1596,172 @@ msgstr ""
 "Siempre establece DT_NEEDED para las bibliotecas dinámicas\n"
 "                                mencionadas en la línea de órdenes"
 
-#: lexsup.c:373
+#: lexsup.c:368
 msgid "Ignored for SunOS compatibility"
 msgstr "Se descarta por compatibilidad con SunOS"
 
-#: lexsup.c:375
+#: lexsup.c:370
 msgid "Link against shared libraries"
 msgstr "Enlaza contra bibliotecas compartidas"
 
-#: lexsup.c:381
+#: lexsup.c:376
 msgid "Do not link against shared libraries"
 msgstr "No enlaza contra bibliotecas compartidas"
 
-#: lexsup.c:389
+#: lexsup.c:384
 msgid "Bind global references locally"
 msgstr "Asocia localmente las referencias globlales"
 
-#: lexsup.c:391
+#: lexsup.c:386
 msgid "Bind global function references locally"
 msgstr "Asocia localmente las referencias a función globales"
 
-#: lexsup.c:393
+#: lexsup.c:388
 msgid "Check section addresses for overlaps (default)"
 msgstr "Revisa las direcciones de las secciones por traslapes (por defecto)"
 
-#: lexsup.c:396
+#: lexsup.c:391
 msgid "Do not check section addresses for overlaps"
 msgstr "No revisa las direcciones de las secciones por traslapes"
 
-#: lexsup.c:400
+#: lexsup.c:395
 msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr "Copia los enlaces DT_NEEDED mencionados dentro de los DSOs a continuación"
 
-#: lexsup.c:404
+#: lexsup.c:399
 msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr "No copia los enlaces DT_NEEDED mencionados dentro de los DSOs a continuación"
 
-#: lexsup.c:408
+#: lexsup.c:403
 msgid "Output cross reference table"
 msgstr "Muestra la tabla de referencias cruzadas"
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "SYMBOL=EXPRESSION"
 msgstr "S�MBOLO=EXPRESIÓN"
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "Define a symbol"
 msgstr "Define un símbolo"
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "[=STYLE]"
 msgstr "[=ESTILO]"
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "Demangle symbol names [using STYLE]"
 msgstr "Desenreda los nombres de los símbolos [utilizando el ESTILO]"
 
 # No me convence mucho la traducción de `embedded' por imbuído. cfuga
-#: lexsup.c:415
+#: lexsup.c:410
 msgid "Generate embedded relocs"
 msgstr "Genera reubicaciones imbuídas"
 
-#: lexsup.c:417
+#: lexsup.c:412
 msgid "Treat warnings as errors"
 msgstr "Trata los avisos como errores"
 
-#: lexsup.c:420
+#: lexsup.c:415
 msgid "Do not treat warnings as errors (default)"
 msgstr "No trata los avisos como errores (por defecto)"
 
-#: lexsup.c:423
+#: lexsup.c:418
 msgid "Call SYMBOL at unload-time"
 msgstr "Llama al S�MBOLO al momento de descargar"
 
-#: lexsup.c:425
+#: lexsup.c:420
 msgid "Force generation of file with .exe suffix"
 msgstr "Fuerza la generación del fichero con sufijo .exe"
 
-#: lexsup.c:427
+#: lexsup.c:422
 msgid "Remove unused sections (on some targets)"
 msgstr "Elimina las secciones sin uso (en algunos objetivos)"
 
-#: lexsup.c:430
+#: lexsup.c:425
 msgid "Don't remove unused sections (default)"
 msgstr "No elimina las secciones sin uso (por defecto)"
 
-#: lexsup.c:433
+#: lexsup.c:428
 msgid "List removed unused sections on stderr"
 msgstr "Muestra las secciones sin uso eliminadas en la salida de error estándar"
 
-#: lexsup.c:436
+#: lexsup.c:431
 msgid "Do not list removed unused sections"
 msgstr "No muestra las secciones sin uso eliminadas"
 
-#: lexsup.c:439
+#: lexsup.c:434
 msgid "Set default hash table size close to <NUMBER>"
 msgstr "Establece el tamaño de de la tabla de dispersión cercano al <NÚMERO>"
 
-#: lexsup.c:442
+#: lexsup.c:437
 msgid "Print option help"
 msgstr "Muestra la ayuda de opciones"
 
-#: lexsup.c:444
+#: lexsup.c:439
 msgid "Call SYMBOL at load-time"
 msgstr "Llama al S�MBOLO al momento de cargar"
 
-#: lexsup.c:446
+#: lexsup.c:441
 msgid "Write a map file"
 msgstr "Escribe un fichero mapa"
 
-#: lexsup.c:448
+#: lexsup.c:443
 msgid "Do not define Common storage"
 msgstr "No define almacenamiento Common"
 
-#: lexsup.c:450
+#: lexsup.c:445
 msgid "Do not demangle symbol names"
 msgstr "No desenreda los nombres de los símbolos"
 
-#: lexsup.c:452
+#: lexsup.c:447
 msgid "Use less memory and more disk I/O"
 msgstr "Usa menos memoria y más E/S de disco"
 
-#: lexsup.c:454
+#: lexsup.c:449
 msgid "Do not allow unresolved references in object files"
 msgstr "No permite referencias sin resolver en ficheros objeto"
 
-#: lexsup.c:457
-msgid "Allow unresolved references in shared libraries"
+#: lexsup.c:452
+msgid "Allow unresolved references in shared libaries"
 msgstr "Permite referencias sin resolver en bibliotecas compartidas"
 
-#: lexsup.c:461
+#: lexsup.c:456
 msgid "Do not allow unresolved references in shared libs"
 msgstr "No permite referencias sin resolver en bibliotecas compartidas"
 
-#: lexsup.c:465
+#: lexsup.c:460
 msgid "Allow multiple definitions"
 msgstr "Permite definiciones múltiples"
 
-#: lexsup.c:467
+#: lexsup.c:462
 msgid "Disallow undefined version"
 msgstr "No permite versiones sin definir"
 
-#: lexsup.c:469
+#: lexsup.c:464
 msgid "Create default symbol version"
 msgstr "Crea la versión de símbolo por defecto"
 
-#: lexsup.c:472
+#: lexsup.c:467
 msgid "Create default symbol version for imported symbols"
 msgstr "Crea la versión de símbolo por defecto para símbolos importados"
 
-#: lexsup.c:475
+#: lexsup.c:470
 msgid "Don't warn about mismatched input files"
 msgstr "No avisa sobre ficheros de entrada sin coincidencia"
 
-#: lexsup.c:478
+#: lexsup.c:473
 msgid "Don't warn on finding an incompatible library"
 msgstr "No avisa al encontrar una biblioteca incompatible"
 
-#: lexsup.c:481
+#: lexsup.c:476
 msgid "Turn off --whole-archive"
 msgstr "Apaga --whole-archive"
 
-#: lexsup.c:483
+#: lexsup.c:478
 msgid "Create an output file even if errors occur"
 msgstr "Crea un fichero de salida aún si ocurren errores"
 
-#: lexsup.c:488
+#: lexsup.c:483
 msgid ""
 "Only use library directories specified on\n"
 "                                the command line"
@@ -1767,127 +1769,127 @@ msgstr ""
 "Utiliza solamente los directorios de bibliotecas\n"
 "                                especificados en la línea de órdenes"
 
-#: lexsup.c:492
+#: lexsup.c:487
 msgid "Specify target of output file"
 msgstr "Especifica el objetivo del fichero de salida"
 
-#: lexsup.c:495
+#: lexsup.c:490
 msgid "Ignored for Linux compatibility"
 msgstr "Se descarta por compatibilidad con Linux"
 
-#: lexsup.c:498
+#: lexsup.c:493
 msgid "Reduce memory overheads, possibly taking much longer"
 msgstr "Reduce las saturaciones de memoria, tal vez tomando más tiempo"
 
-#: lexsup.c:501
+#: lexsup.c:496
 msgid "Reduce code size by using target specific optimizations"
 msgstr "Reduce el tamaño del código usando optimizaciones específicas del objetivo"
 
-#: lexsup.c:503
+#: lexsup.c:498
 msgid "Do not use relaxation techniques to reduce code size"
 msgstr "No utiliza técnicas de relajación para reducir el tamaño del código"
 
-#: lexsup.c:506
+#: lexsup.c:501
 msgid "Keep only symbols listed in FILE"
 msgstr "Conserva solamente los símbolos enlistados en el FICHERO"
 
-#: lexsup.c:508
+#: lexsup.c:503
 msgid "Set runtime shared library search path"
 msgstr "Establece la ruta de búsqueda de bibliotecas compartidas en tiempo de ejecución"
 
-#: lexsup.c:510
+#: lexsup.c:505
 msgid "Set link time shared library search path"
 msgstr "Establece la ruta de búsqueda de bibliotecas compartidas en tiempo de enlace"
 
-#: lexsup.c:513
+#: lexsup.c:508
 msgid "Create a shared library"
 msgstr "Crea una biblioteca compartida"
 
-#: lexsup.c:517
+#: lexsup.c:512
 msgid "Create a position independent executable"
 msgstr "Crea un ejecutable independiente de posición"
 
-#: lexsup.c:521
+#: lexsup.c:516
 msgid "[=ascending|descending]"
 msgstr "[=ascending|descending]"
 
-#: lexsup.c:522
+#: lexsup.c:517
 msgid "Sort common symbols by alignment [in specified order]"
 msgstr "Ordena los símbolos comunes por alineación [en orden específico]"
 
-#: lexsup.c:527
+#: lexsup.c:522
 msgid "name|alignment"
 msgstr "nombre|alineación"
 
-#: lexsup.c:528
+#: lexsup.c:523
 msgid "Sort sections by name or maximum alignment"
 msgstr "Ordena secciones por nombre o alineación máxima"
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "COUNT"
 msgstr "CUENTA"
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "How many tags to reserve in .dynamic section"
 msgstr "Cúantas marcas reserva en la sección .dynamic"
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "[=SIZE]"
 msgstr "[=TAMAÑO]"
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "Split output sections every SIZE octets"
 msgstr "Divide las secciones de salida cada TAMAÑO octetos"
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "[=COUNT]"
 msgstr "[=CUENTA]"
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "Split output sections every COUNT relocs"
 msgstr "Divide las secciones de salida cada CUENTA reubicaciones"
 
-#: lexsup.c:539
+#: lexsup.c:534
 msgid "Print memory usage statistics"
 msgstr "Muestra las estadísticas de uso de memoria"
 
-#: lexsup.c:541
+#: lexsup.c:536
 msgid "Display target specific options"
 msgstr "Muestra las opciones específicas del objetivo"
 
-#: lexsup.c:543
+#: lexsup.c:538
 msgid "Do task level linking"
 msgstr "Enlaza a nivel de tarea"
 
-#: lexsup.c:545
+#: lexsup.c:540
 msgid "Use same format as native linker"
 msgstr "Usa el mismo formato que el enlazador nativo"
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "SECTION=ADDRESS"
 msgstr "SECCIÓN=DIRECCIÓN"
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "Set address of named section"
 msgstr "Establece la dirección de la sección nombrada"
 
-#: lexsup.c:550
+#: lexsup.c:545
 msgid "Set address of .bss section"
 msgstr "Establece la dirección de la sección .bss"
 
-#: lexsup.c:552
+#: lexsup.c:547
 msgid "Set address of .data section"
 msgstr "Establece la dirección de la sección .data"
 
-#: lexsup.c:554
+#: lexsup.c:549
 msgid "Set address of .text section"
 msgstr "Establece la dirección de la sección .text"
 
-#: lexsup.c:556
+#: lexsup.c:551
 msgid "Set address of text segment"
 msgstr "Establece la dirección del segmento de texto"
 
-#: lexsup.c:559
+#: lexsup.c:554
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
 "                                ignore-all, report-all, ignore-in-object-files,\n"
@@ -1897,19 +1899,15 @@ msgstr ""
 "                                ignore-all, report-all, ignore-in-object-files,\n"
 "                                ignore-in-shared-libs"
 
-#: lexsup.c:564
-msgid "[=NUMBER]"
-msgstr "[=NÚMERO]"
-
-#: lexsup.c:565
+#: lexsup.c:559
 msgid "Output lots of information during link"
 msgstr "Muestra mucha información durante el enlace"
 
-#: lexsup.c:569
+#: lexsup.c:563
 msgid "Read version information script"
 msgstr "Lee la información de la versión del guión"
 
-#: lexsup.c:572
+#: lexsup.c:566
 msgid ""
 "Take export symbols list from .exports, using\n"
 "                                SYMBOL as the version."
@@ -1917,99 +1915,99 @@ msgstr ""
 "Toma la lista de exportación de símbolos de .exports, usando\n"
 "                                el S�MBOLO como la versión."
 
-#: lexsup.c:576
+#: lexsup.c:570
 msgid "Add data symbols to dynamic list"
 msgstr "Agrega símbolos de datos a la lista dinámica"
 
-#: lexsup.c:578
+#: lexsup.c:572
 msgid "Use C++ operator new/delete dynamic list"
 msgstr "Usa la lista dinámica de los operadores de C++ new/delete"
 
-#: lexsup.c:580
+#: lexsup.c:574
 msgid "Use C++ typeinfo dynamic list"
 msgstr "Usa la lista dinámica de tipo de dato de C++"
 
-#: lexsup.c:582
+#: lexsup.c:576
 msgid "Read dynamic list"
 msgstr "Lee la lista dinámica"
 
-#: lexsup.c:584
+#: lexsup.c:578
 msgid "Warn about duplicate common symbols"
 msgstr "Avisa sobre símbolos comunes duplicados"
 
-#: lexsup.c:586
+#: lexsup.c:580
 msgid "Warn if global constructors/destructors are seen"
 msgstr "Avisa si se ven constructores/destructores globales"
 
-#: lexsup.c:589
+#: lexsup.c:583
 msgid "Warn if the multiple GP values are used"
 msgstr "Avisa si se usan valores múltiples de GP"
 
-#: lexsup.c:591
+#: lexsup.c:585
 msgid "Warn only once per undefined symbol"
 msgstr "Avisa sólo una vez por cada símbolo sin definir"
 
-#: lexsup.c:593
+#: lexsup.c:587
 msgid "Warn if start of section changes due to alignment"
 msgstr "Avisa si el inicio de la sección cambia debido a la alineación"
 
-#: lexsup.c:596
+#: lexsup.c:590
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr "Avisa si el objeto compartido tiene DT_TEXTREL"
 
-#: lexsup.c:599
+#: lexsup.c:593
 msgid "Warn if an object has alternate ELF machine code"
 msgstr "Avisa si el objeto tiene código máquina ELF alternativo"
 
-#: lexsup.c:603
+#: lexsup.c:597
 msgid "Report unresolved symbols as warnings"
 msgstr "Reporta símbolos sin resolver como avisos"
 
-#: lexsup.c:606
+#: lexsup.c:600
 msgid "Report unresolved symbols as errors"
 msgstr "Reporta símbolos sin resolver como errores"
 
-#: lexsup.c:608
+#: lexsup.c:602
 msgid "Include all objects from following archives"
 msgstr "Incluye todos los objetos de los siguientes ficheros"
 
-#: lexsup.c:611
+#: lexsup.c:605
 msgid "Use wrapper functions for SYMBOL"
 msgstr "Usa funciones de envoltura para el S�MBOLO"
 
-#: lexsup.c:760
+#: lexsup.c:754
 msgid "%P: unrecognized option '%s'\n"
 msgstr "%P: no se reconoce la opción `%s'\n"
 
-#: lexsup.c:764
+#: lexsup.c:758
 msgid "%P%F: use the --help option for usage information\n"
 msgstr "%P%F: use la opción --help para información de modo de empleo\n"
 
-#: lexsup.c:782
+#: lexsup.c:776
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr "%P%F: no se reconoce la opción -a `%s'\n"
 
-#: lexsup.c:795
+#: lexsup.c:789
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr "%P%F: no se reconoce la opción -assert `%s'\n"
 
-#: lexsup.c:838
+#: lexsup.c:832
 msgid "%F%P: unknown demangling style `%s'"
 msgstr "%F%P: estilo de desenredo `%s' desconocido"
 
-#: lexsup.c:904 lexsup.c:1335
+#: lexsup.c:898
 msgid "%P%F: invalid number `%s'\n"
 msgstr "%P%F: número `%s' inválido\n"
 
-#: lexsup.c:1002
+#: lexsup.c:996
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr "%P%F: opción --unresolved-symbols errónea: %s\n"
 
-#: lexsup.c:1065 lexsup.c:1564
-msgid "%P%F: %s: error loading plugin\n"
-msgstr "%P%F: %s: error al cargar el plugin\n"
+#: lexsup.c:1059
+msgid "%P%F: bad -plugin option\n"
+msgstr "%P%F: opción -plugin errónea\n"
 
-#: lexsup.c:1070
+#: lexsup.c:1063
 msgid "%P%F: bad -plugin-opt option\n"
 msgstr "%P%F: opción -plugin-opt errónea\n"
 
@@ -2021,100 +2019,104 @@ msgstr "%P%F: opción -plugin-opt errónea\n"
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1087
+#: lexsup.c:1080
 msgid "%P%F: bad -rpath option\n"
 msgstr "%P%F: opción -rpath errónea\n"
 
-#: lexsup.c:1201
+#: lexsup.c:1194
 msgid "%P%F: -shared not supported\n"
 msgstr "%P%F: no se admite -shared\n"
 
-#: lexsup.c:1210
+#: lexsup.c:1203
 msgid "%P%F: -pie not supported\n"
 msgstr "%P%F: no se admite -pie\n"
 
-#: lexsup.c:1218
+#: lexsup.c:1211
 msgid "descending"
 msgstr "descendente"
 
-#: lexsup.c:1220
+#: lexsup.c:1213
 msgid "ascending"
 msgstr "ascendente"
 
-#: lexsup.c:1223
+#: lexsup.c:1216
 msgid "%P%F: invalid common section sorting option: %s\n"
 msgstr "%P%F: opción de ordenado de sección común inválida: %s\n"
 
-#: lexsup.c:1227
+#: lexsup.c:1220
 msgid "name"
 msgstr "nombre"
 
-#: lexsup.c:1229
+#: lexsup.c:1222
 msgid "alignment"
 msgstr "alineación"
 
-#: lexsup.c:1232
+#: lexsup.c:1225
 msgid "%P%F: invalid section sorting option: %s\n"
 msgstr "%P%F: opción de ordenado de sección inválida: %s\n"
 
-#: lexsup.c:1266
+#: lexsup.c:1259
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr "%P%F: argumento inválido para la opción \"--section-start\"\n"
 
-#: lexsup.c:1273
+#: lexsup.c:1266
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr "%P%F: falta(n) argumento(s) para la opción \"--section-start\"\n"
 
-#: lexsup.c:1507
+#: lexsup.c:1490
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr "%P%F: el grupo terminó antes de empezar (--help para modo de empleo)\n"
 
-#: lexsup.c:1535
+#: lexsup.c:1518
 msgid "%P%X: --hash-size needs a numeric argument\n"
 msgstr "%P%X: --hash-size necesita un argumento numérico\n"
 
-#: lexsup.c:1595 lexsup.c:1608
+#: lexsup.c:1547
+msgid "%P%F: %s: error loading plugin\n"
+msgstr "%P%F: %s: error al cargar el plugin\n"
+
+#: lexsup.c:1578 lexsup.c:1591
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr "%P%F: número hexadecimal `%s' inválido\n"
 
-#: lexsup.c:1644
+#: lexsup.c:1627
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr "Modo de empleo: %s [opciones] fichero...\n"
 
-#: lexsup.c:1646
+#: lexsup.c:1629
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: lexsup.c:1724
+#: lexsup.c:1707
 #, c-format
 msgid "  @FILE"
 msgstr "  @FICHERO"
 
-#: lexsup.c:1727
+#: lexsup.c:1710
 #, c-format
 msgid "Read options from FILE\n"
 msgstr "Lee opciones del FICHERO\n"
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1732
+#: lexsup.c:1715
 #, c-format
 msgid "%s: supported targets:"
 msgstr "%s: objetivos admitidos:"
 
-#: lexsup.c:1740
+#: lexsup.c:1723
 #, c-format
 msgid "%s: supported emulations: "
 msgstr "%s: emulaciones admitidas: "
 
-#: lexsup.c:1745
+#: lexsup.c:1728
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr "%s: opciones específicas de emulación:\n"
 
-#: lexsup.c:1750
+#: lexsup.c:1733
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Reporte bichos a %s\n"
@@ -2123,135 +2125,114 @@ msgstr "Reporte bichos a %s\n"
 msgid "%P%F: unknown format type %s\n"
 msgstr "%P%F: tipo de formato %s desconocido\n"
 
-#: pe-dll.c:431
+#: pe-dll.c:430
 #, c-format
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr "%XNo se admite la arquitectura PEI: %s\n"
 
-#: pe-dll.c:791
+#: pe-dll.c:788
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
 msgstr "%XNo se puede exportar %s: nombre de exportación inválido\n"
 
-#: pe-dll.c:848
+#: pe-dll.c:844
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr "%XError, EXPORT duplicado con ordinales: %s (%d vs %d)\n"
 
-#: pe-dll.c:855
+#: pe-dll.c:851
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr "Aviso, EXPORT duplicado: %s\n"
 
-#: pe-dll.c:942
+#: pe-dll.c:938
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr "%XNo se puede exportar %s: símbolo sin definir\n"
 
-#: pe-dll.c:948
+#: pe-dll.c:944
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr "%XNo se puede exportar %s: tipo erróneo del símbolo (%d vs %d)\n"
 
-#: pe-dll.c:955
+#: pe-dll.c:951
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr "%XNo se puede exportar %s: no se encuentra el símbolo\n"
 
-#: pe-dll.c:1069
+#: pe-dll.c:1065
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr "%XError, ordinal utilizado dos veces: %d (%s vs %s)\n"
 
-#: pe-dll.c:1450
+#: pe-dll.c:1446
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr "%XError: reubicación de %d-bit en la dll\n"
 
-#: pe-dll.c:1578
+#: pe-dll.c:1574
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr "%s: No se puede abrir el fichero por defecto de salida %s\n"
 
-#: pe-dll.c:1729
+#: pe-dll.c:1725
 #, c-format
 msgid "; no contents available\n"
 msgstr "; no hay contenido disponible\n"
 
-#: pe-dll.c:2656
+#: pe-dll.c:2652
 msgid "%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"
 msgstr "%C: no se puede auto-importar la variable '%T'. Por favor lea la documentación para --enable-auto-import de ld para más detalles.\n"
 
-#: pe-dll.c:2686
+#: pe-dll.c:2682
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr "%XNo se puede abrir el fichero .lib: %s\n"
 
-#: pe-dll.c:2691
+#: pe-dll.c:2687
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr "Se crea el fichero de biblioteca: %s\n"
 
-#: pe-dll.c:2720
+#: pe-dll.c:2716
 #, c-format
 msgid "%Xbfd_openr %s: %E\n"
 msgstr "%Xbfd_openr %s: %E\n"
 
-#: pe-dll.c:2732
+#: pe-dll.c:2728
 #, c-format
 msgid "%X%s(%s): can't find member in non-archive file"
 msgstr "%X%s(%s): no se puede encontrar el miembro en un fichero que no es archivo"
 
-#: pe-dll.c:2744
+#: pe-dll.c:2740
 #, c-format
 msgid "%X%s(%s): can't find member in archive"
 msgstr "%X%s(%s): no se puede encontrar el miembro en el archivo"
 
-#: pe-dll.c:3183
+#: pe-dll.c:3177
 #, c-format
 msgid "%XError: can't use long section names on this arch\n"
 msgstr "%XError: no se pueden usar nombres de sección largos en esta arquitectura\n"
 
-#: plugin.c:176 plugin.c:210
+#: plugin.c:178 plugin.c:212
 msgid "<no plugin>"
 msgstr "<sin plugin>"
 
-#: plugin.c:249
-#, c-format
-msgid "could not create dummy IR bfd: %F%E\n"
-msgstr "no se puede crear el bdf IR dummy: %F%E\n"
-
-#: plugin.c:322
-msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
-msgstr "%P%F: %s: ¡Símbolo que no es ELF en el BFD ELF!\n"
-
-#: plugin.c:326
-msgid "%P%F: unknown ELF symbol visibility: %d!\n"
-msgstr "%P%F: visibilidad de símbolo ELF desconocida: ¡%d!\n"
-
-#: plugin.c:559
-msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
-msgstr "%P %B: símbolo `%s' definición: %d, visibilidad: %d, resolución: %d\n"
-
-#: plugin.c:825
-msgid "%P%F: %s: plugin reported error claiming file\n"
-msgstr "%P%F: %s: el plugin reportó error al reclamar el fichero\n"
-
-#: plugin.c:896
-msgid "%P: %s: error in plugin cleanup (ignored)\n"
-msgstr "%P %s: error en la limpieza de plugin (se descarta)\n"
-
-#~ msgid "%P%F: bad -plugin option\n"
-#~ msgstr "%P%F: opción -plugin errónea\n"
+#: plugin.c:308
+msgid "%P%F: %s: non-ELF symbol in ELF BFD!"
+msgstr "%P%F: %s: ¡Símbolo que no es ELF en el BFD ELF!"
 
-#~ msgid "%P%X: %s: hash table failure adding symbol %s"
-#~ msgstr "%P%X: %s: falló la tabla de dispersión al agregar el símbolo %s"
+#: plugin.c:800
+msgid "%P%X: %s: hash table failure adding symbol %s"
+msgstr "%P%X: %s: falló la tabla de dispersión al agregar el símbolo %s"
 
-#~ msgid "%P%X: %s: can't find IR symbol '%s'"
-#~ msgstr "%P%X: %s: no se puede encontrar el símbolo IR '%s'"
+#: plugin.c:833
+msgid "%P%X: %s: can't find IR symbol '%s'"
+msgstr "%P%X: %s: no se puede encontrar el símbolo IR '%s'"
 
-#~ msgid "%P%x: %s: bad IR symbol type %d"
-#~ msgstr "%P%x: %s: tipo de símbolo IR %d erróneo"
+#: plugin.c:836
+msgid "%P%x: %s: bad IR symbol type %d"
+msgstr "%P%x: %s: tipo de símbolo IR %d erróneo"
 
 #~ msgid "%F%P: %s (%s): No such file: %E\n"
 #~ msgstr "%F%P: %s (%s): No hay tal fichero: %E\n"
@@ -2321,6 +2302,9 @@ msgstr "%P %s: error en la limpieza de plugin (se descarta)\n"
 #~ msgid "%F%P: cannot open %s: %E\n"
 #~ msgstr "%F%P: no se puede abrir %s: %E\n"
 
+#~ msgid "%P%F: unknown architecture: %s\n"
+#~ msgstr "%P%F: arquitectura desconocida: %s\n"
+
 #~ msgid "%P%F: target architecture respecified\n"
 #~ msgstr "%P%F: arquitectura destino reespecificada\n"
 
diff --git a/ld/po/fi.po b/ld/po/fi.po
index f7fd268d67..6c28a38036 100644
--- a/ld/po/fi.po
+++ b/ld/po/fi.po
@@ -1,18 +1,17 @@
 # Finnish messages for ld
-# Copyright © 2009, 2011 Free Software Foundation, Inc.
+# Copyright © 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Jorma Karvonen <karvjorm@users.sf.net>, 2007-2009.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ld 2.21.53\n"
+"Project-Id-Version: ld 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-23 12:37+0200\n"
+"POT-Creation-Date: 2010-11-05 11:34+0100\n"
+"PO-Revision-Date: 2010-11-10 19:55+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,172 +35,172 @@ msgstr "  --thumb-entry=<sym>         Aseta tulokohta Thumb-symboliksi <sym>\n"
 msgid "Errors encountered processing file %s"
 msgstr "Löydettiin virheitä käsiteltäessä tiedostoa %s"
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1813
+#: emultempl/armcoff.em:190 emultempl/pe.em:1812
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
-msgstr "%P: varoitus: ’--thumb-entry %s’ korvaa argumentin ’-e %s’\n"
+msgstr "%P: varoitus: �--thumb-entry %s� korvaa argumentin �-e %s�\n"
 
-#: emultempl/armcoff.em:197 emultempl/pe.em:1818
+#: emultempl/armcoff.em:195 emultempl/pe.em:1817
 msgid "%P: warning: cannot find thumb start symbol %s\n"
 msgstr "%P: varoitus: thumb-aloitussymbolia �%s� ei löydy\n"
 
-#: emultempl/pe.em:419
+#: emultempl/pe.em:418
 #, c-format
 msgid "  --base_file <basefile>             Generate a base file for relocatable DLLs\n"
-msgstr "  --base_file <kantatiedosto>        Tuota uudelleensijoitettavien DLL:ien kantatiedosto\n"
+msgstr "  --base_file <kantatiedosto>        Luo uudelleensijoitettavien DLL:ien kantatiedosto\n"
 
-#: emultempl/pe.em:420
+#: emultempl/pe.em:419
 #, c-format
 msgid "  --dll                              Set image base to the default for DLLs\n"
 msgstr "  --dll                              Aseta vedoskanta DLL:ien oletukseksi\n"
 
-#: emultempl/pe.em:421
+#: emultempl/pe.em:420
 #, c-format
 msgid "  --file-alignment <size>            Set file alignment\n"
 msgstr "  --file-alignment <koko>            Aseta tiedostotasaus\n"
 
-#: emultempl/pe.em:422
+#: emultempl/pe.em:421
 #, c-format
 msgid "  --heap <size>                      Set initial size of the heap\n"
 msgstr "  --heap <koko>                      Aseta keon aloituskoko\n"
 
-#: emultempl/pe.em:423
+#: emultempl/pe.em:422
 #, c-format
 msgid "  --image-base <address>             Set start address of the executable\n"
 msgstr "  --image-base <osoite>              Aseta suoritettavien tiedostojen aloitusosoite\n"
 
-#: emultempl/pe.em:424
+#: emultempl/pe.em:423
 #, c-format
 msgid "  --major-image-version <number>     Set version number of the executable\n"
 msgstr "  --major-image-version <numero>     Aseta suoritettavien tiedostojen versionumero\n"
 
-#: emultempl/pe.em:425
+#: emultempl/pe.em:424
 #, c-format
 msgid "  --major-os-version <number>        Set minimum required OS version\n"
 msgstr "  --major-os-version <numero>        Aseta pienin vaadittu käyttöjärjestelmäversio\n"
 
-#: emultempl/pe.em:426
+#: emultempl/pe.em:425
 #, c-format
 msgid "  --major-subsystem-version <number> Set minimum required OS subsystem version\n"
 msgstr "  --major-subsystem-version <numero> Aseta pienin vaadittu käyttöjärjestelmän alijärjestelmän versio\n"
 
-#: emultempl/pe.em:427
+#: emultempl/pe.em:426
 #, c-format
 msgid "  --minor-image-version <number>     Set revision number of the executable\n"
 msgstr "  --minor-image-version <numero>     Asettaa suoritettavan tiedoston revisionumeron\n"
 
-#: emultempl/pe.em:428
+#: emultempl/pe.em:427
 #, c-format
 msgid "  --minor-os-version <number>        Set minimum required OS revision\n"
 msgstr "  --minor-os-version <numero>        Aseta pienin vaadittu käyttöjärjestelmän revisionumero\n"
 
-#: emultempl/pe.em:429
+#: emultempl/pe.em:428
 #, c-format
 msgid "  --minor-subsystem-version <number> Set minimum required OS subsystem revision\n"
 msgstr "  --minor-subsystem-version <numero> Aseta pienin vaadittu käyttöjärjestelmän alijärjestelmän revisionumero\n"
 
-#: emultempl/pe.em:430
+#: emultempl/pe.em:429
 #, c-format
 msgid "  --section-alignment <size>         Set section alignment\n"
 msgstr "  --section-alignment <koko>         Aseta lohkotasaus\n"
 
-#: emultempl/pe.em:431
+#: emultempl/pe.em:430
 #, c-format
 msgid "  --stack <size>                     Set size of the initial stack\n"
 msgstr "  --stack <koko>                     Aseta pinon aloituskoko\n"
 
-#: emultempl/pe.em:432
+#: emultempl/pe.em:431
 #, c-format
 msgid "  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"
 msgstr "  --subsystem <nimi>[:<versio>]      Aseta vaadittu käyttöjärjestelmän alijärjestelmä [& versio]\n"
 
-#: emultempl/pe.em:433
+#: emultempl/pe.em:432
 #, c-format
 msgid "  --support-old-code                 Support interworking with old code\n"
 msgstr "  --support-old-code                 Tue yhteistoimivuutta vanhan koodin kanssa\n"
 
-#: emultempl/pe.em:434
+#: emultempl/pe.em:433
 #, c-format
 msgid "  --[no-]leading-underscore          Set explicit symbol underscore prefix mode\n"
 msgstr "  --[no-]leading-underscore          Aseta eksplisiittinen symbolin alaviivaetuliitetila\n"
 
-#: emultempl/pe.em:435
+#: emultempl/pe.em:434
 #, c-format
 msgid "  --thumb-entry=<symbol>             Set the entry point to be Thumb <symbol>\n"
 msgstr "  --thumb-entry=<symboli>            Aseta  tulokohdaksi �Thumb <symboli>�\n"
 
-#: emultempl/pe.em:437
+#: emultempl/pe.em:436
 #, c-format
 msgid "  --add-stdcall-alias                Export symbols with and without @nn\n"
 msgstr "  --add-stdcall-alias                Vie symbolit ilman @nn:ää ja sen kanssa\n"
 
-#: emultempl/pe.em:438
+#: emultempl/pe.em:437
 #, c-format
 msgid "  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"
 msgstr "  --disable-stdcall-fixup            Älä linkitä symbolia _sym symboliin _sym@nn\n"
 
-#: emultempl/pe.em:439
+#: emultempl/pe.em:438
 #, c-format
 msgid "  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"
 msgstr "  --enable-stdcall-fixup             Linkitä symboli _sym symboliin _sym@nn ilman varoituksia\n"
 
-#: emultempl/pe.em:440
+#: emultempl/pe.em:439
 #, c-format
 msgid "  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"
 msgstr "  --exclude-symbols sym,sym,...      Jätä symbolit pois automaattisesta viennistä\n"
 
-#: emultempl/pe.em:441
+#: emultempl/pe.em:440
 #, c-format
 msgid "  --exclude-all-symbols              Exclude all symbols from automatic export\n"
 msgstr "  --exclude-all-symbols              Jätä kaikki symbolit pois automaattisesta viennistä\n"
 
-#: emultempl/pe.em:442
+#: emultempl/pe.em:441
 #, c-format
 msgid "  --exclude-libs lib,lib,...         Exclude libraries from automatic export\n"
 msgstr "  --exclude-libs lib,lib,...         Jätä kirjastot pois automaattisesta viennistä\n"
 
-#: emultempl/pe.em:443
+#: emultempl/pe.em:442
 #, c-format
 msgid "  --exclude-modules-for-implib mod,mod,...\n"
 msgstr "  --exclude-modules-for-implib moduli,moduli,...\n"
 
 #  Tämä teksti jatkuu seuraavassa merkkijonossa
-#: emultempl/pe.em:444
+#: emultempl/pe.em:443
 #, c-format
 msgid "                                     Exclude objects, archive members from auto\n"
 msgstr "                                     Jätä pois objektit, arkistojäsenet automaattisesta\n"
 
 #  Tämä teksti on jatkoa edelliselle merkkijonolle
-#: emultempl/pe.em:445
+#: emultempl/pe.em:444
 #, c-format
 msgid "                                     export, place into import library instead.\n"
 msgstr "                                     viennistä, sijoita ne sen sijaan tuontikirjastoon.\n"
 
-#: emultempl/pe.em:446
+#: emultempl/pe.em:445
 #, c-format
 msgid "  --export-all-symbols               Automatically export all globals to DLL\n"
 msgstr "  --export-all-symbols               Vie kaikki yleismuuttujat automaattisesti DLL:ään\n"
 
-#: emultempl/pe.em:447
+#: emultempl/pe.em:446
 #, c-format
 msgid "  --kill-at                          Remove @nn from exported symbols\n"
 msgstr "  --kill-at                          Poista @nn viedyistä symboleista\n"
 
-#: emultempl/pe.em:448
+#: emultempl/pe.em:447
 #, c-format
 msgid "  --out-implib <file>                Generate import library\n"
-msgstr "  --out-implib <tiedosto>            Tuota tuontikirjasto\n"
+msgstr "  --out-implib <tiedosto>            Luo tuontikirjasto\n"
 
-#: emultempl/pe.em:449
+#: emultempl/pe.em:448
 #, c-format
 msgid "  --output-def <file>                Generate a .DEF file for the built DLL\n"
-msgstr "  --output-def <tiedosto>            Tuota .DEF-tiedosto DLL:n rakentamiseen\n"
+msgstr "  --output-def <tiedosto>            Luo .DEF-tiedosto DLL:n rakentamiseen\n"
 
-#: emultempl/pe.em:450
+#: emultempl/pe.em:449
 #, c-format
 msgid "  --warn-duplicate-exports           Warn about duplicate exports.\n"
 msgstr "  --warn-duplicate-exports           Varoita kaksoiskappalevienneistä.\n"
 
-#: emultempl/pe.em:451
+#: emultempl/pe.em:450
 #, c-format
 msgid ""
 "  --compat-implib                    Create backward compatible import libs;\n"
@@ -210,7 +209,7 @@ msgstr ""
 "  --compat-implib                    Luo taaksepäin yhteensopivat tuontikirjastot;\n"
 "                                       luo myös __imp_<SYMBOLI>.\n"
 
-#: emultempl/pe.em:453
+#: emultempl/pe.em:452
 #, c-format
 msgid ""
 "  --enable-auto-image-base           Automatically choose image base for DLLs\n"
@@ -219,12 +218,12 @@ msgstr ""
 "  --enable-auto-image-base           Valitse automaattisesti vedoskanta DLL:ille\n"
 "                                       jollei käyttäjä määrittele sellaista\n"
 
-#: emultempl/pe.em:455
+#: emultempl/pe.em:454
 #, c-format
 msgid "  --disable-auto-image-base          Do not auto-choose image base. (default)\n"
 msgstr "  --disable-auto-image-base          Älä valitse automaattisesti vedoskantaa. (oletus)\n"
 
-#: emultempl/pe.em:456
+#: emultempl/pe.em:455
 #, c-format
 msgid ""
 "  --dll-search-prefix=<string>       When linking dynamically to a dll without\n"
@@ -235,21 +234,21 @@ msgstr ""
 "                                       tuontikirjastoa, käytä �<merkkijono><kantanimi>.dll�\n"
 "                                       mieluimmin kuin �lib<kantanimi>.dll� \n"
 
-#: emultempl/pe.em:459
+#: emultempl/pe.em:458
 #, c-format
 msgid ""
-"  --enable-auto-import               Do sophisticated linking of _sym to\n"
+"  --enable-auto-import               Do sophistcated linking of _sym to\n"
 "                                       __imp_sym for DATA references\n"
 msgstr ""
 "  --enable-auto-import               Linkitä symboli _sym edistyksellisesti\n"
-"                                       DATA-viitteille symboliin __imp_sym\n"
+"                                       symboliin __imp_sym DATA-viitteille\n"
 
-#: emultempl/pe.em:461
+#: emultempl/pe.em:460
 #, c-format
 msgid "  --disable-auto-import              Do not auto-import DATA items from DLLs\n"
 msgstr "  --disable-auto-import              Älä tuo DATA-alkioita DLL:stä automaattisesti\n"
 
-#: emultempl/pe.em:462
+#: emultempl/pe.em:461
 #, c-format
 msgid ""
 "  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n"
@@ -257,28 +256,28 @@ msgid ""
 "                                       runtime.\n"
 msgstr ""
 "  --enable-runtime-pseudo-reloc      Kierrä automaattisen tuonnin rajoitukset\n"
-"                                       lisäämällä ajoaikaisesti ratkaistavia vale-\n"
+"                                       lisäämällä ajoaikaisesti ratkaistavia pseudo-\n"
 "                                       uudelleensijoitusalkioita.\n"
 
-#: emultempl/pe.em:465
+#: emultempl/pe.em:464
 #, c-format
 msgid ""
 "  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations for\n"
 "                                       auto-imported DATA.\n"
 msgstr ""
-"  --disable-runtime-pseudo-reloc     Älä lisää ajoaikaisia vale-uudelleensijoitusalkioita\n"
+"  --disable-runtime-pseudo-reloc     Älä lisää ajoaikaisia pseudo-uudelleensijoitusalkioita\n"
 "                                       automaattisesti tuotuun DATA:an.\n"
 
-#: emultempl/pe.em:467
+#: emultempl/pe.em:466
 #, c-format
 msgid ""
 "  --enable-extra-pe-debug            Enable verbose debug output when building\n"
 "                                       or linking to DLLs (esp. auto-import)\n"
 msgstr ""
-"  --enable-extra-pe-debug            Salli lavea vianjäljitystulostus kun muodostetaan\n"
+"  --enable-extra-pe-debug            Salli lavea debug-tulostus kun muodostetaan\n"
 "                                       tai linkitetään DLL:ään (erityisesti automaattisessa tuonnissa)\n"
 
-#: emultempl/pe.em:470
+#: emultempl/pe.em:469
 #, c-format
 msgid ""
 "  --large-address-aware              Executable supports virtual addresses\n"
@@ -287,7 +286,7 @@ msgstr ""
 "  --large-address-aware              Suoritettava tiedosto tukee virtuaaliosoitteita,\n"
 "                                       jotka ovat suurempia kuin 2 gigatavua\n"
 
-#: emultempl/pe.em:472
+#: emultempl/pe.em:471
 #, c-format
 msgid ""
 "  --enable-long-section-names        Use long COFF section names even in\n"
@@ -296,7 +295,7 @@ msgstr ""
 "  --enable-long-section-names        Käytä pitkiä COFF-lohkonimiä myös suoritettavissa\n"
 "                                       vedostiedostoissa\n"
 
-#: emultempl/pe.em:474
+#: emultempl/pe.em:473
 #, c-format
 msgid ""
 "  --disable-long-section-names       Never use long COFF section names, even\n"
@@ -305,7 +304,7 @@ msgstr ""
 "  --disable-long-section-names       Älä koskaan käytä pitkiä COFF-lohkonimiä, ei edes\n"
 "                                       objektitiedostoissa\n"
 
-#: emultempl/pe.em:476
+#: emultempl/pe.em:475
 #, c-format
 msgid ""
 "  --dynamicbase\t\t\t Image base address may be relocated using\n"
@@ -314,23 +313,23 @@ msgstr ""
 "  --dynamicbase\t\t\t Vedoksen perusosoite voidaan sijoittaa uudelleen\n"
 "\t\t\t\t       käyttäen osoitetilan asettelun satunnaislukuhajautusta (ASLR)\n"
 
-#: emultempl/pe.em:478
+#: emultempl/pe.em:477
 #, c-format
 msgid "  --forceinteg\t\t Code integrity checks are enforced\n"
 msgstr "  --forceinteg\t\t Koodin eheystarkistukset ovat valvottuja\n"
 
-#: emultempl/pe.em:479
+#: emultempl/pe.em:478
 #, c-format
 msgid "  --nxcompat\t\t Image is compatible with data execution prevention\n"
 msgstr "  --nxcompat\t\t Vedos on yhteneväinen datasuorituseston kanssa\n"
 
-#: emultempl/pe.em:480
+#: emultempl/pe.em:479
 #, c-format
 msgid "  --no-isolation\t\t Image understands isolation but do not isolate the image\n"
 msgstr "  --no-isolation\t\t Vedos ymmärtää eristyksen, mutta ei eristä vedosta\n"
 
 #  SEH on lyhenne sanoista "SE Handler"
-#: emultempl/pe.em:481
+#: emultempl/pe.em:480
 #, c-format
 msgid ""
 "  --no-seh\t\t\t Image does not use SEH. No SE handler may\n"
@@ -339,74 +338,75 @@ msgstr ""
 "  --no-seh\t\t\t Vedos ei käytä SE-käsittelijää. SE-käsittelijää ei\n"
 "\t\t\t\t       saa kutsua tässä vedoksessa\n"
 
-#: emultempl/pe.em:483
+#: emultempl/pe.em:482
 #, c-format
 msgid "  --no-bind\t\t\t Do not bind this image\n"
 msgstr "  --no-bind\t\t\t Älä sido tätä vedosta\n"
 
-#: emultempl/pe.em:484
+#: emultempl/pe.em:483
 #, c-format
 msgid "  --wdmdriver\t\t Driver uses the WDM model\n"
 msgstr "  --wdmdriver\t\t Ajuri käyttää WDM-mallia\n"
 
-#: emultempl/pe.em:485
+#: emultempl/pe.em:484
 #, c-format
 msgid "  --tsaware                  Image is Terminal Server aware\n"
 msgstr "  --tsaware                  Vedos on tietoinen pääteikkunapalvelimesta\n"
 
-#: emultempl/pe.em:614
+#: emultempl/pe.em:613
 msgid "%P: warning: bad version number in -subsystem option\n"
 msgstr "%P: varoitus: virheellinen versionumero �-subsystem�-valitsimessa\n"
 
-#: emultempl/pe.em:639
+#: emultempl/pe.em:638
 msgid "%P%F: invalid subsystem type %s\n"
 msgstr "%P%F: Virheellinen alijärjestelmätyyppi %s\n"
 
-#: emultempl/pe.em:660
+#: emultempl/pe.em:659
 msgid "%P%F: invalid hex number for PE parameter '%s'\n"
-msgstr "%P%F: virheellinen heksadesimaalinumero PE-parametrille ’%s’\n"
+msgstr "%P%F: virheellinen heksadesimaalinumero PE-parametrille �%s�\n"
 
-#: emultempl/pe.em:677
+#: emultempl/pe.em:676
 msgid "%P%F: strange hex info for PE parameter '%s'\n"
-msgstr "%P%F: outo heksadesimaalinumerotieto PE-parameterílle ’%s’\n"
+msgstr "%P%F: outo heksadesimaalinumerotieto PE-parameterílle �%s�\n"
 
-#: emultempl/pe.em:692
-msgid "%F%P: cannot open base file %s\n"
-msgstr "%F%P: Ei voi avata kantatiedostoa %s\n"
+#: emultempl/pe.em:693
+#, c-format
+msgid "%s: Can't open base file %s\n"
+msgstr "%s: Ei voi avata kantatiedostoa %s\n"
 
-#: emultempl/pe.em:965
+#: emultempl/pe.em:969
 msgid "%P: warning, file alignment > section alignment.\n"
 msgstr "%P: varoitus, tiedostotasaus > lohkotasaus.\n"
 
-#: emultempl/pe.em:978
+#: emultempl/pe.em:982
 msgid "%P: warning: --export-dynamic is not supported for PE targets, did you mean --export-all-symbols?\n"
 msgstr "%P: varoitus: --export-dynamic ei tueta PE-kohteille, tarkoititko --export-all-symbols?\n"
 
-#: emultempl/pe.em:1054 emultempl/pe.em:1081
+#: emultempl/pe.em:1058 emultempl/pe.em:1085
 #, c-format
 msgid "Warning: resolving %s by linking to %s\n"
 msgstr "Varoitus: ratkaistaan %s linkittämällä kohteeseen %s\n"
 
 #  enable -> disable ???
-#: emultempl/pe.em:1059 emultempl/pe.em:1086
+#: emultempl/pe.em:1063 emultempl/pe.em:1090
 msgid "Use --enable-stdcall-fixup to disable these warnings\n"
 msgstr "Käytä --enable-stdcall-fixup poistamaan nämä varoitukset käytöstä\n"
 
-#: emultempl/pe.em:1060 emultempl/pe.em:1087
+#: emultempl/pe.em:1064 emultempl/pe.em:1091
 msgid "Use --disable-stdcall-fixup to disable these fixups\n"
 msgstr "Käytä --disable-stdcall-fixup poistamaan nämä korjaukset käytöstä\n"
 
-#: emultempl/pe.em:1106
+#: emultempl/pe.em:1110
 #, c-format
 msgid "%C: Cannot get section contents - auto-import exception\n"
 msgstr "%C: Lohkosisältöä ei saada - automaattituonnin poikkeus\n"
 
-#: emultempl/pe.em:1146
+#: emultempl/pe.em:1150
 #, c-format
 msgid "Info: resolving %s by linking to %s (auto-import)\n"
 msgstr "Tieto: ratkaistaan %s linkittämällä kohteeseen %s (automaattituonti)\n"
 
-#: emultempl/pe.em:1153
+#: emultempl/pe.em:1157
 msgid ""
 "%P: warning: auto-importing has been activated without --enable-auto-import specified on the command line.\n"
 "This should work unless it involves constant data structures referencing symbols from auto-imported DLLs.\n"
@@ -414,28 +414,28 @@ msgstr ""
 "%P: varoitus: automaattinen tuonti on aktivoitu määrittelemättä �--enable-auto-import�-argumenttia komentorivillä.\n"
 "Tämän pitäisi toimia ellei se sisällä vakiodatarakenteita, jotka viittaavat automaattisesti tuotujen DLL:ien symboleihin.\n"
 
-#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
-#: pe-dll.c:1352
+#: emultempl/pe.em:1164 emultempl/pe.em:1369 emultempl/pe.em:1575 ldcref.c:490
+#: ldcref.c:588 ldmain.c:1183 ldmisc.c:286 pe-dll.c:705 pe-dll.c:1253
+#: pe-dll.c:1348
 msgid "%B%F: could not read symbols: %E\n"
 msgstr "%B%F: ei voinut lukea symboleja: %E\n"
 
-#: emultempl/pe.em:1243
+#: emultempl/pe.em:1245
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
-msgstr "%F%P: ei voi suorittaa PE-toimintoja ei-PE-tulostetiedostossa ’%B’.\n"
+msgstr "%F%P: ei voi suorittaa PE-toimintoja ei-PE-tulostetiedostossa �%B�.\n"
 
-#: emultempl/pe.em:1617
+#: emultempl/pe.em:1616
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr "Tiedostoa %s käsitellessä syntyi virheitä\n"
 
-#: emultempl/pe.em:1640
+#: emultempl/pe.em:1639
 #, c-format
 msgid "Errors encountered processing file %s for interworking\n"
 msgstr "Virheitä syntyi käsiteltäessä tiedostoa %s yhteistoimivuutta varten\n"
 
-#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
-#: ldmain.c:1160
+#: emultempl/pe.em:1701 ldexp.c:542 ldlang.c:3323 ldlang.c:3358 ldlang.c:6804
+#: ldlang.c:6835 ldmain.c:1128
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_link_hash_lookup epäonnistui: %E\n"
 
@@ -480,7 +480,7 @@ msgstr "Ei symboleja\n"
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr "%P: puuttuu symboli �%T� pää-hash-taulusta\n"
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
+#: ldcref.c:650 ldcref.c:657 ldmain.c:1217 ldmain.c:1224
 msgid "%B%F: could not read relocs: %E\n"
 msgstr "%B%F: ei voitu lukea reloc-alkioita: %E\n"
 
@@ -534,166 +534,170 @@ msgstr "%P: tunnistamaton emulointitila: %s\n"
 
 #: ldemul.c:292
 msgid "Supported emulations: "
-msgstr "Tuetut emuloinnit: "
+msgstr "Tuetut emuloinnit:"
 
 #: ldemul.c:334
 #, c-format
 msgid "  no emulation specific options.\n"
 msgstr "  ei emulointikohtaisia valitsimia.\n"
 
-#: ldexp.c:314
+#: ldexp.c:313
 msgid "%P: warning: address of `%s' isn't multiple of maximum page size\n"
 msgstr "%P: varoitus: �%s�:n osoite ei ole enimmäissivukoon monikerta\n"
 
-#: ldexp.c:407
+#: ldexp.c:351
 #, c-format
 msgid "%F%S %% by zero\n"
 msgstr "%F%S %% nollalla\n"
 
-#: ldexp.c:417
+#: ldexp.c:359
 #, c-format
 msgid "%F%S / by zero\n"
 msgstr "%F%S / nollalla\n"
 
-#: ldexp.c:591
+#: ldexp.c:552
 #, c-format
 msgid "%X%S: unresolvable symbol `%s' referenced in expression\n"
 msgstr "%X%S: lausekkeessa viitattu ratkaisemattomaan symboliin �%s�\n"
 
-#: ldexp.c:605
+#: ldexp.c:564
 #, c-format
 msgid "%F%S: undefined symbol `%s' referenced in expression\n"
 msgstr "%F%S: lausekkeessa viitattu ratkaisemattomaan symboliin �%s�\n"
 
-#: ldexp.c:626 ldexp.c:643 ldexp.c:670
+#: ldexp.c:585 ldexp.c:602 ldexp.c:629
 #, c-format
 msgid "%F%S: undefined section `%s' referenced in expression\n"
 msgstr "%F%S: lausekkeessa viitattu määrittelemättömään lohkoon �%s�\n"
 
-#: ldexp.c:697 ldexp.c:711
+#: ldexp.c:656 ldexp.c:670
 #, c-format
 msgid "%F%S: undefined MEMORY region `%s' referenced in expression\n"
 msgstr "%F%S: lausekkeessa viitattu määrittelemättömään MEMORY-alueeseen �%s�\n"
 
-#: ldexp.c:722
+#: ldexp.c:681
 #, c-format
 msgid "%F%S: unknown constant `%s' referenced in expression\n"
 msgstr "%F%S: lausekkeessa viitattu tuntemattomaan vakioon �%s�\n"
 
-#: ldexp.c:787
+#: ldexp.c:743
 #, c-format
 msgid "%F%S can not PROVIDE assignment to location counter\n"
 msgstr "%F%S ei voi ANTAA sijoitusta sijoituslaskuriin\n"
 
-#: ldexp.c:805
+#: ldexp.c:757
 #, c-format
 msgid "%F%S invalid assignment to location counter\n"
 msgstr "%F%S virheellinen sijoitus sijoituslaskuriin\n"
 
-#: ldexp.c:808
+#: ldexp.c:760
 #, c-format
 msgid "%F%S assignment to location counter invalid outside of SECTION\n"
 msgstr "%F%S sijoitus sijoituslaskuriin virheellinen SECTION-lohkon ulkopuolella\n"
 
-#: ldexp.c:821
+#: ldexp.c:773
 msgid "%F%S cannot move location counter backwards (from %V to %V)\n"
 msgstr "%F%S ei voi siirtää sijoituslaskuria taaksepäin (arvosta %V arvoon %V)\n"
 
-#: ldexp.c:882
+#: ldexp.c:812
 msgid "%P%F:%s: hash creation failed\n"
 msgstr "%P%F:%s: hash-luonti ei onnistunut\n"
 
-#: ldexp.c:1191 ldexp.c:1216 ldexp.c:1276
+#: ldexp.c:1119 ldexp.c:1144 ldexp.c:1204
 #, c-format
 msgid "%F%S: nonconstant expression for %s\n"
 msgstr "%F%S: ei-vakio lauseke kohteelle %s\n"
 
-#: ldfile.c:142
+#: ldfile.c:141
 #, c-format
 msgid "attempt to open %s failed\n"
 msgstr "yritys avata %s ei onnistunut\n"
 
-#: ldfile.c:144
+#: ldfile.c:143
 #, c-format
 msgid "attempt to open %s succeeded\n"
 msgstr "yritettiin avata %s menestyksellisesti\n"
 
 #  Binary File Descriptor
-#: ldfile.c:150
+#: ldfile.c:149
 msgid "%F%P: invalid BFD target `%s'\n"
 msgstr "%F%P: virheellinen BFD-kohde �%s�\n"
 
-#: ldfile.c:267 ldfile.c:296
+#: ldfile.c:266 ldfile.c:295
 msgid "%P: skipping incompatible %s when searching for %s\n"
 msgstr "%P: hypättiin ei-yhteensopivan kohteen %s yli kun haettiin kohdetta %s\n"
 
-#: ldfile.c:280
+#: ldfile.c:279
 msgid "%F%P: attempted static link of dynamic object `%s'\n"
 msgstr "%F%P: yritettiin dynaamisen objektin �%s� staattista linkkiä\n"
 
-#: ldfile.c:426
+#: ldfile.c:332 ldmain.c:832
+msgid "%P%F: %s: plugin reported error claiming file\n"
+msgstr "%P%F: %s: lisäosa ilmoitettu virhevaatimustiedostoon\n"
+
+#: ldfile.c:447
 msgid "%P: cannot find %s (%s): %E\n"
 msgstr "%P: ei voi löytää kohdetta %s (%s): %E\n"
 
-#: ldfile.c:429
+#: ldfile.c:450
 msgid "%P: cannot find %s: %E\n"
 msgstr "%P: ei voi löytää kohdetta %s: %E\n"
 
-#: ldfile.c:464
+#: ldfile.c:485
 msgid "%P: cannot find %s inside %s\n"
 msgstr "%P: kohdetta %s ei löydy kohteen %s sisältä\n"
 
-#: ldfile.c:467
+#: ldfile.c:488
 msgid "%P: cannot find %s\n"
 msgstr "%P: ei löydy kohdetta %s\n"
 
-#: ldfile.c:486 ldfile.c:504
+#: ldfile.c:507 ldfile.c:525
 #, c-format
 msgid "cannot find script file %s\n"
 msgstr "ei löydy skriptitiedostoa %s\n"
 
-#: ldfile.c:488 ldfile.c:506
+#: ldfile.c:509 ldfile.c:527
 #, c-format
 msgid "opened script file %s\n"
 msgstr "avattiin skriptitiedosto %s\n"
 
-#: ldfile.c:636
+#: ldfile.c:657
 msgid "%P%F: cannot open linker script file %s: %E\n"
 msgstr "%P%F: ei voi avata linkkerin skriptitiedostoa %s: %E\n"
 
-#: ldfile.c:701
+#: ldfile.c:722
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr "%P%F: ei voi edustaa konetta �%s�\n"
 
-#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
+#: ldlang.c:1160 ldlang.c:1202 ldlang.c:3048
 msgid "%P%F: can not create hash table: %E\n"
 msgstr "%P%F: ei voida luoda hash-taulua: %E\n"
 
-#: ldlang.c:1310
+#: ldlang.c:1253
 msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
 msgstr "%P:%S: varoitus: uudelleenesitelty muistialue �%s�\n"
 
-#: ldlang.c:1316
+#: ldlang.c:1259
 msgid "%P:%S: warning: memory region `%s' not declared\n"
 msgstr "%P:%S: varoitus: muistialuetta �%s� ei ole esitelty\n"
 
-#: ldlang.c:1350
+#: ldlang.c:1293
 msgid "%F%P:%S: error: alias for default memory region\n"
 msgstr "%F%P:%S: virhe: alias oletusmuistialueelle\n"
 
-#: ldlang.c:1361
+#: ldlang.c:1304
 msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
 msgstr "%F%P:%S: virhe: uudelleenmäärittely muistialuealiakselle �%s�\n"
 
-#: ldlang.c:1368
+#: ldlang.c:1311
 msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
 msgstr "%F%P:%S: virhe: muistialuetta �%s� aliakselle �%s� ei ole olemassa\n"
 
-#: ldlang.c:1420 ldlang.c:1459
+#: ldlang.c:1363 ldlang.c:1402
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr "%P%F: ei onnistuttu luomaan lohkoa �%s�: %E\n"
 
-#: ldlang.c:2021
+#: ldlang.c:1958
 #, c-format
 msgid ""
 "\n"
@@ -704,7 +708,7 @@ msgstr ""
 "Hylätyt syötelohkot\n"
 "\n"
 
-#: ldlang.c:2029
+#: ldlang.c:1966
 msgid ""
 "\n"
 "Memory Configuration\n"
@@ -714,23 +718,23 @@ msgstr ""
 "Muistiasetukset\n"
 "\n"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Name"
 msgstr "Nimi"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Origin"
 msgstr "Alkupiste"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Length"
 msgstr "Pituus"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Attributes"
 msgstr "Attribuutit"
 
-#: ldlang.c:2071
+#: ldlang.c:2008
 #, c-format
 msgid ""
 "\n"
@@ -741,181 +745,181 @@ msgstr ""
 "Linkitysskripti ja muistikartta\n"
 "\n"
 
-#: ldlang.c:2140
+#: ldlang.c:2074
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr "%P%F: �%s�-lohkon virheellinen käyttö\n"
 
-#: ldlang.c:2149
+#: ldlang.c:2083
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr "%P%F: tulostemuoto %s ei voi edustaa lohkoa, jonka nimi on %s\n"
 
-#: ldlang.c:2702
+#: ldlang.c:2636
 msgid "%B: file not recognized: %E\n"
 msgstr "%B: tiedostoa ei ole tunnistettu: %E\n"
 
-#: ldlang.c:2703
+#: ldlang.c:2637
 msgid "%B: matching formats:"
 msgstr "%B: täsmäävät muodot:"
 
-#: ldlang.c:2710
+#: ldlang.c:2644
 msgid "%F%B: file not recognized: %E\n"
 msgstr "%F%B: tiedostoa ei ole tunnistettu: %E\n"
 
-#: ldlang.c:2781
+#: ldlang.c:2715
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr "%F%B: arkiston jäsen %B ei ole objekti\n"
 
-#: ldlang.c:2796 ldlang.c:2810
+#: ldlang.c:2730 ldlang.c:2744
 msgid "%F%B: could not read symbols: %E\n"
 msgstr "%F%B: ei voitu lukea symboleja: %E\n"
 
-#: ldlang.c:3084
+#: ldlang.c:3018
 msgid "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr "%P: varoitus: ei löytynyt yhtään kohdetta, joka olisi täsmännyt tavujärjestysvaatimuksen kanssa\n"
 
 #  Binary File Descriptor -kohde
-#: ldlang.c:3098
+#: ldlang.c:3032
 msgid "%P%F: target %s not found\n"
 msgstr "%P%F: bfd-kohdetta %s ei löytynyt\n"
 
-#: ldlang.c:3100
+#: ldlang.c:3034
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr "%P%F: ei voi avata tulostetiedostoa %s: %E\n"
 
-#: ldlang.c:3106
+#: ldlang.c:3040
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr "%P%F:%s: ei voi tehdä objektitiedostoa: %E\n"
 
-#: ldlang.c:3110
+#: ldlang.c:3044
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr "%P%F:%s: ei voi asettaa arkkitehtuuria: %E\n"
 
-#: ldlang.c:3267
+#: ldlang.c:3185
 msgid "%P: warning: %s contains output sections; did you forget -T?\n"
 msgstr "%P: varoitus: %s sisältää tulostelohkoja; unohditko valitsimen -T?\n"
 
-#: ldlang.c:3308
+#: ldlang.c:3215
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr "%P%F: bfd_hash_lookup ei onnistunut luomaan symbolia %s\n"
 
-#: ldlang.c:3326
+#: ldlang.c:3233
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr "%P%F: bfd_hash_allocate ei onnistunut luomaan symbolia %s\n"
 
-#: ldlang.c:3722
+#: ldlang.c:3688
 msgid "%F%P: %s not found for insert\n"
 msgstr "%F%P: kohdetta %s ei löydy sijoitusta varten\n"
 
-#: ldlang.c:3937
+#: ldlang.c:3903
 msgid " load address 0x%V"
 msgstr " latausosoite 0x%V"
 
 #  Kun käskykohdemuuttuja on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska  haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
-#: ldlang.c:4212
+#: ldlang.c:4179
 msgid "%W (size before relaxing)\n"
 msgstr "%W (koko ennen avartamista)\n"
 
-#: ldlang.c:4303
+#: ldlang.c:4270
 #, c-format
 msgid "Address of section %s set to "
 msgstr "Lohkon %s osoitteeksi asetetaan "
 
-#: ldlang.c:4456
+#: ldlang.c:4423
 #, c-format
 msgid "Fail with %d\n"
 msgstr "Ei onnistuttu kohteella %d\n"
 
-#: ldlang.c:4743
+#: ldlang.c:4710
 msgid "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
 msgstr "%X%P: lohko %s, joka on ladattu osoitteesta [%V,%V] menee päällekkäin lohkon %s, joka on ladattu osoitteesta [%V,%V]\n"
 
-#: ldlang.c:4759
+#: ldlang.c:4726
 msgid "%X%P: region `%s' overflowed by %ld bytes\n"
 msgstr "%X%P: alueen �%s� ylitys on %ld tavua\n"
 
-#: ldlang.c:4782
+#: ldlang.c:4749
 msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
 msgstr "%X%P: osoite 0x%v kohteen %B lohkossa �%s� ei ole alueen �%s� sisällä\n"
 
-#: ldlang.c:4793
+#: ldlang.c:4760
 msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
 msgstr "%X%P: kohteen %B lohko �%s� ei mahdu alueen �%s� sisälle\n"
 
-#: ldlang.c:4850
+#: ldlang.c:4816
 #, c-format
 msgid "%F%S: non constant or forward reference address expression for section %s\n"
 msgstr "%F%S: ei-vakio tai edelleenviiteosoitelauseke lohkolle %s\n"
 
-#: ldlang.c:4875
+#: ldlang.c:4841
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr "%P%X: Sisäinen virhe COFF-tiedoston jaetussa kirjastolohkossa %s\n"
 
-#: ldlang.c:4932
+#: ldlang.c:4900
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
 msgstr "%P%F: virhe: ladattavalle lohkolle �%s� ei ole määritelty muistialuetta\n"
 
-#: ldlang.c:4937
+#: ldlang.c:4905
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr "%P: varoitus: ladattavalle lohkolle �%s� ei ole määritelty muistialuetta\n"
 
-#: ldlang.c:4959
+#: ldlang.c:4927
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr "%P: varoitus: vaihdetaan lohkon %s alkua %lu tavulla\n"
 
-#: ldlang.c:5036
+#: ldlang.c:5004
 msgid "%P: warning: dot moved backwards before `%s'\n"
 msgstr "%P: varoitus: pistettä siirretty taaksepäin ennen kohdetta �%s�\n"
 
 #  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
-#: ldlang.c:5202
+#: ldlang.c:5170
 msgid "%P%F: can't relax section: %E\n"
 msgstr "%P%F: ei voi avartaa lohkoa: %E\n"
 
-#: ldlang.c:5531
+#: ldlang.c:5497
 msgid "%F%P: invalid data statement\n"
 msgstr "%F%P: virheellinen data-lause\n"
 
-#: ldlang.c:5564
+#: ldlang.c:5530
 msgid "%F%P: invalid reloc statement\n"
 msgstr "%F%P: virheellinen reloc-lause\n"
 
-#: ldlang.c:5683
+#: ldlang.c:5648
 msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
 msgstr "%P%F: gc-lohkot vaativat joko alkion tai määrittelemättömän symbolin\n"
 
-#: ldlang.c:5708
+#: ldlang.c:5673
 msgid "%P%F:%s: can't set start address\n"
 msgstr "%P%F:%s: ei voi asettaa aloitusosoitetta\n"
 
-#: ldlang.c:5721 ldlang.c:5740
+#: ldlang.c:5686 ldlang.c:5705
 msgid "%P%F: can't set start address\n"
 msgstr "%P%F: ei voi asettaa aloitusosoitetta\n"
 
-#: ldlang.c:5733
+#: ldlang.c:5698
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr "%P: varoitus: tulosymbolia %s ei löydy, asetaan oletukseksi %V\n"
 
-#: ldlang.c:5745
+#: ldlang.c:5710
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr "%P: varoitus: tulosymbolia %s ei löydy, ei aseta aloitusosoitetta\n"
 
-#: ldlang.c:5800
+#: ldlang.c:5760
 msgid "%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"
 msgstr "%P%F: Uudelleensijoituslinkitystä uudelleensijoituksilla muodosta %s (%B) muotoon %s (%B) ei tueta\n"
 
-#: ldlang.c:5810
+#: ldlang.c:5770
 msgid "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
 msgstr "%P%X: %s syötetiedoston �%B� arkkitehtuuri ei täsmää tulosteen %s kanssa\n"
 
-#: ldlang.c:5832
+#: ldlang.c:5792
 msgid "%P%X: failed to merge target specific data of file %B\n"
 msgstr "%P%X: ei onnistuttu yhdistää kohdekohtaista tiedostodataa %B\n"
 
-#: ldlang.c:5903
+#: ldlang.c:5863
 msgid "%P%F: Could not define common symbol `%T': %E\n"
 msgstr "%B%F: Ei voitu määritellä yhteissymbolia �%T�: %E\n"
 
-#: ldlang.c:5915
+#: ldlang.c:5875
 msgid ""
 "\n"
 "Allocating common symbols\n"
@@ -923,7 +927,7 @@ msgstr ""
 "\n"
 "Varataan muistia yhteissymboleille\n"
 
-#: ldlang.c:5916
+#: ldlang.c:5876
 msgid ""
 "Common symbol       size              file\n"
 "\n"
@@ -931,70 +935,66 @@ msgstr ""
 "Yhteissymboli       koko              tiedosto\n"
 "\n"
 
-#: ldlang.c:6062
+#: ldlang.c:6022
 msgid "%P%F: invalid syntax in flags\n"
 msgstr "%P%F: virheellinen syntaksi lipussa\n"
 
-#: ldlang.c:6524
+#: ldlang.c:6415
 msgid "%P%F: Failed to create hash table\n"
 msgstr "%P%F: ei onnistuttu luomaan hash-taulua\n"
 
-#: ldlang.c:6547
+#: ldlang.c:6430
 msgid "%P%F: %s: plugin reported error after all symbols read\n"
 msgstr "%P%F: %s: lisäosa ilmoitti virheestä kaikkien symbolien lukemisen jälkeen\n"
 
-#: ldlang.c:6860
+#: ldlang.c:6717
 msgid "%P%F: multiple STARTUP files\n"
 msgstr "%P%F: useita STARTUP-tiedostoja\n"
 
-#: ldlang.c:6906
+#: ldlang.c:6765
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr "%X%P:%S: lohkossa on sekä latausosoite että latausalue\n"
 
-#: ldlang.c:7093
+#: ldlang.c:6950
 msgid "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack them\n"
 msgstr "%X%P:%S: PHDRS ja FILEHDR eivät ole tuettuja, kun edeltävät PT_LOAD-otsakkeet puuttuvat niistä\n"
 
-#: ldlang.c:7165
+#: ldlang.c:7022
 msgid "%F%P: no sections assigned to phdrs\n"
 msgstr "%F%P: kohteeseen �phdrs� ei ole liitetty lohkoja\n"
 
-#: ldlang.c:7203
+#: ldlang.c:7060
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr "%F%P: bfd_record_phdr ei onnistunut: %E\n"
 
-#: ldlang.c:7223
+#: ldlang.c:7080
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr "%X%P: lohko �%s� liitetty phdr-kohteeseen �%s�, joka ei ole olemassa\n"
 
-#: ldlang.c:7636
+#: ldlang.c:7481
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr "%X%P: tuntematon kieli �%s� versiotiedoissa\n"
 
-#: ldlang.c:7781
+#: ldlang.c:7626
 msgid "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr "%X%P: nimetöntä versiotunnistetta ei voi yhdistää muihin versiotunnisteisiin\n"
 
-#: ldlang.c:7790
+#: ldlang.c:7635
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr "%X%P: kaksoiskappaleversiotunniste �%s�\n"
 
-#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
+#: ldlang.c:7656 ldlang.c:7665 ldlang.c:7683 ldlang.c:7693
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr "%X%P: kaksoiskappalelauseke �%s� versiotiedoissa\n"
 
-#: ldlang.c:7888
+#: ldlang.c:7733
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr "%X%P: ei voi löytää versioriippuvuutta �%s�\n"
 
-#: ldlang.c:7911
+#: ldlang.c:7756
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr "%X%P: ei voi lukea .exports-lohkon sisältöä\n"
 
-#: ldlang.c:8035
-msgid "%X%P: unknown feature `%s'\n"
-msgstr "%P%F: tuntematon toiminto �%s�\n"
-
 #  Binary File Descriptor
 #: ldmain.c:239
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
@@ -1032,66 +1032,70 @@ msgstr "%P: tila %s\n"
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr "%P%F: ei voi avata map-tiedostoa %s: %E\n"
 
-#: ldmain.c:488
+#: ldmain.c:485
+msgid "%P: %s: error in plugin cleanup (ignored)\n"
+msgstr "%P: %s: virhe lisäosan puhdistuksessa (ohitettu)\n"
+
+#: ldmain.c:494
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr "%P: linkitysvirheitä löytyi, poistetaan suoritettava tiedosto �%s�\n"
 
-#: ldmain.c:497
+#: ldmain.c:503
 msgid "%F%B: final close failed: %E\n"
 msgstr "%F%B: loppusulkeminen ei onnistunut: %E\n"
 
-#: ldmain.c:523
+#: ldmain.c:529
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr "%X%P: ei voitu avata kopion �%s� lähdekoodia\n"
 
-#: ldmain.c:526
+#: ldmain.c:532
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr "%X%P: ei voitu avata kopion �%s� kohdetta\n"
 
-#: ldmain.c:533
+#: ldmain.c:539
 msgid "%P: Error writing file `%s'\n"
 msgstr "%P: Virhe kirjoitettaessa tiedostoa �%s�\n"
 
-#: ldmain.c:538 pe-dll.c:1733
+#: ldmain.c:544 pe-dll.c:1729
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr "%P: Virhe suljettaessa tiedostoa �%s�\n"
 
-#: ldmain.c:555
+#: ldmain.c:560
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr "%s: kokonaisaika linkityksessä: %ld.%06ld\n"
 
-#: ldmain.c:558
+#: ldmain.c:563
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: data-koko %ld\n"
 
-#: ldmain.c:642
+#: ldmain.c:646
 msgid "%P%F: missing argument to -m\n"
 msgstr "%P%F: puuttuva argumentti kohteelle -m\n"
 
-#: ldmain.c:690 ldmain.c:710 ldmain.c:742
+#: ldmain.c:694 ldmain.c:714 ldmain.c:746 plugin.c:772
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr "%P%F: bfd_hash_table_init ei onnistunut: %E\n"
 
-#: ldmain.c:694 ldmain.c:714
+#: ldmain.c:698 ldmain.c:718
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup ei onnistunut: %E\n"
 
-#: ldmain.c:728
+#: ldmain.c:732
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr "%X%P: virhe: retain-symbols-file-kaksoiskappale\n"
 
-#: ldmain.c:772
+#: ldmain.c:776
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup-lisäys ei onnistunut: %E\n"
 
-#: ldmain.c:777
+#: ldmain.c:781
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr "%P: �-retain-symbols-file� korvaa argumentit �-s� ja �-S�\n"
 
-#: ldmain.c:877
+#: ldmain.c:895
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
@@ -1100,164 +1104,165 @@ msgstr ""
 "Arkistojäsen sisällytetty tiedoston vuoksi (symboli)\n"
 "\n"
 
-#: ldmain.c:983
+#: ldmain.c:975
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr "%X%C: useita �%T�-määrittelyjä\n"
 
-#: ldmain.c:986
+#: ldmain.c:978
 msgid "%D: first defined here\n"
 msgstr "%D: ensimmäinen määritelty täällä\n"
 
 #  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
-#: ldmain.c:990
+#: ldmain.c:982
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr "%P: Otetaan avartaminen pois käytöstä: se ei toimi kun määrittelyjä on useita\n"
 
-#: ldmain.c:1044
+#: ldmain.c:1012
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr "%B: varoitus: �%T�-määrittely korvaa yhteisen\n"
 
-#: ldmain.c:1047
+#: ldmain.c:1015
 msgid "%B: warning: common is here\n"
 msgstr "%B: varoitus: yhteinen on täällä\n"
 
-#: ldmain.c:1054
+#: ldmain.c:1022
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr "%B: varoitus: �%T�-yhteinen korvattu määrittelyllä\n"
 
-#: ldmain.c:1057
+#: ldmain.c:1025
 msgid "%B: warning: defined here\n"
 msgstr "%B: varoitus: määritelty täällä\n"
 
-#: ldmain.c:1064
+#: ldmain.c:1032
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr "%B: varoitus: �%T�-yhteinen korvattu laajemmalla yhteisellä\n"
 
-#: ldmain.c:1067
+#: ldmain.c:1035
 msgid "%B: warning: larger common is here\n"
 msgstr "%B: varoitus: laajempi yhteinen on täällä\n"
 
-#: ldmain.c:1071
+#: ldmain.c:1039
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr "%B: varoitus: �%T�-yhteinen korvaa pienemmän yhteisen\n"
 
-#: ldmain.c:1074
+#: ldmain.c:1042
 msgid "%B: warning: smaller common is here\n"
 msgstr "%B: varoitus: pienempi yhteinen on täällä\n"
 
-#: ldmain.c:1078
+#: ldmain.c:1046
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr "%B: varoitus: useita �%T�-yhteisiä\n"
 
-#: ldmain.c:1080
+#: ldmain.c:1048
 msgid "%B: warning: previous common is here\n"
 msgstr "%B: varoitus: edellinen yhteinen on täällä\n"
 
-#: ldmain.c:1100 ldmain.c:1138
+#: ldmain.c:1068 ldmain.c:1106
 msgid "%P: warning: global constructor %s used\n"
 msgstr "%P: varoitus: yleiskonstruktoria %s käytetty\n"
 
 #  Binary File Descriptor
-#: ldmain.c:1148
+#: ldmain.c:1116
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr "%P%F: BFD-taustavirhe: kohdetta BFD_RELOC_CTOR ei ole tuettu\n"
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
+#: ldmain.c:1170 ldmain.c:1172 ldmain.c:1174 ldmain.c:1192 ldmain.c:1237
 msgid "warning: "
 msgstr "varoitus: "
 
-#: ldmain.c:1305
+#: ldmain.c:1273
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr "%F%P: bfd_hash_table_init ei onnistunut: %E\n"
 
-#: ldmain.c:1312
+#: ldmain.c:1280
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr "%F%P: bfd_hash_lookup ei onnistunut: %E\n"
 
-#: ldmain.c:1333
+#: ldmain.c:1301
 msgid "%X%C: undefined reference to `%T'\n"
 msgstr "%X%C: määrittelemätön viite kohteeseen �%T�\n"
 
-#: ldmain.c:1336
+#: ldmain.c:1304
 msgid "%C: warning: undefined reference to `%T'\n"
 msgstr "%C: varoitus: määrittelemätön viite kohteeseen �%T�\n"
 
-#: ldmain.c:1342
+#: ldmain.c:1310
 msgid "%X%D: more undefined references to `%T' follow\n"
 msgstr "%X%D: lisää määrittelemättömiä viitteitä kohteeseen �%T� seuraa\n"
 
-#: ldmain.c:1345
+#: ldmain.c:1313
 msgid "%D: warning: more undefined references to `%T' follow\n"
 msgstr "%D: varoitus: lisää määrittelemättömiä viitteitä kohteeseen �%T� seuraa\n"
 
-#: ldmain.c:1356
+#: ldmain.c:1324
 msgid "%X%B: undefined reference to `%T'\n"
 msgstr "%X%B: määrittelemätön viite kohteeseen �%T�\n"
 
-#: ldmain.c:1359
+#: ldmain.c:1327
 msgid "%B: warning: undefined reference to `%T'\n"
 msgstr "%B: varoitus: määrittelemätön viite kohteeseen �%T�\n"
 
-#: ldmain.c:1365
+#: ldmain.c:1333
 msgid "%X%B: more undefined references to `%T' follow\n"
 msgstr "%X%B: lisää määrittelemättömiä viitteitä kohteeseen �%T� seuraa\n"
 
-#: ldmain.c:1368
+#: ldmain.c:1336
 msgid "%B: warning: more undefined references to `%T' follow\n"
 msgstr "%B: varoitus: lisää määrittelemättömiä viitteitä kohteeseen �%T� seuraa\n"
 
-#: ldmain.c:1407
+#: ldmain.c:1375
 msgid " additional relocation overflows omitted from the output\n"
 msgstr " lisäuudelleensijoituskorvauksia ei lisätä tulosteeseen\n"
 
-#: ldmain.c:1420
+#: ldmain.c:1388
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
 msgstr " uudelleensijoituksia typistetty sopimaan: %s vastaan määrittelemätön symboli �%T�"
 
-#: ldmain.c:1425
+#: ldmain.c:1393
 msgid " relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"
 msgstr " uudelleensijoituksia typistetty sopimaan: %s vastaan symboli �%T� määritelty %A-lohkossa %B:ssä"
 
-#: ldmain.c:1437
+#: ldmain.c:1405
 msgid " relocation truncated to fit: %s against `%T'"
 msgstr " uudelleensijoituksia typistetty sopimaan: %s vastaan �%T�"
 
-#: ldmain.c:1454
-msgid "%X%H: dangerous relocation: %s\n"
-msgstr "%X%H: vaarallinen uudelleensijoitus: %s\n"
+#: ldmain.c:1422
+#, c-format
+msgid "%X%C: dangerous relocation: %s\n"
+msgstr "%X%C: vaarallinen uudelleensijoitus: %s\n"
 
-#: ldmain.c:1469
-msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
-msgstr "%X%H: reloc viitaa symboliin �%T�, jota ei tulosteta\n"
+#: ldmain.c:1437
+msgid "%X%C: reloc refers to symbol `%T' which is not being output\n"
+msgstr "%X%C: reloc viitaa symboliin �%T�, jota ei tulosteta\n"
 
-#: ldmisc.c:151
+#: ldmisc.c:149
 #, c-format
 msgid "no symbol"
 msgstr "ei symbolia"
 
-#: ldmisc.c:248
+#: ldmisc.c:246
 #, c-format
 msgid "built in linker script:%u"
 msgstr "sisäänrakennettu linkitysskripti:%u"
 
-#: ldmisc.c:329
+#: ldmisc.c:324
 msgid "%B: In function `%T':\n"
 msgstr "%B: Funktiossa �%T�:\n"
 
-#: ldmisc.c:464
+#: ldmisc.c:451
 msgid "%F%P: internal error %s %d\n"
 msgstr "%F%P: sisäinen virhe %s %d\n"
 
-#: ldmisc.c:513
+#: ldmisc.c:500
 msgid "%P: internal error: aborting at %s line %d in %s\n"
 msgstr "%P: sisäinen virhe: hylätään %s rivillä %d kohteessa %s\n"
 
-#: ldmisc.c:516
+#: ldmisc.c:503
 msgid "%P: internal error: aborting at %s line %d\n"
 msgstr "%P: sisäinen virhe: hylätään %s rivillä %d\n"
 
-#: ldmisc.c:518
+#: ldmisc.c:505
 msgid "%P%F: please report this bug\n"
 msgstr "%P%F: ilmoita tästä virheestä\n"
 
@@ -1269,8 +1274,8 @@ msgstr "GNU ld-versio %s\n"
 
 #: ldver.c:43
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2010 Free Software Foundation, Inc.\n"
 
 #: ldver.c:44
 #, c-format
@@ -1309,7 +1314,7 @@ msgstr "%8x jotain muuta\n"
 msgid "%F%P: final link failed: %E\n"
 msgstr "%F%P: loppulinkitys ei onnistunut: %E\n"
 
-#: lexsup.c:219 lexsup.c:373
+#: lexsup.c:219 lexsup.c:368
 msgid "KEYWORD"
 msgstr "AVAINSANA"
 
@@ -1325,7 +1330,7 @@ msgstr "ARKISTO"
 msgid "Set architecture"
 msgstr "Aseta arkkitehtuuri"
 
-#: lexsup.c:224 lexsup.c:492
+#: lexsup.c:224 lexsup.c:487
 msgid "TARGET"
 msgstr "KOHDE"
 
@@ -1333,8 +1338,8 @@ msgstr "KOHDE"
 msgid "Specify target for following input files"
 msgstr "Määrittele kohde seuraaville syötetiedostoille"
 
-#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
-#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
+#: lexsup.c:227 lexsup.c:278 lexsup.c:296 lexsup.c:309 lexsup.c:311
+#: lexsup.c:441 lexsup.c:501 lexsup.c:563 lexsup.c:576
 msgid "FILE"
 msgstr "TIEDOSTO"
 
@@ -1346,7 +1351,7 @@ msgstr "Lue MRI-muotoinen linkitysskripti"
 msgid "Force common symbols to be defined"
 msgstr "Pakota yhteissymbolit määriteltäviksi"
 
-#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
+#: lexsup.c:233 lexsup.c:545 lexsup.c:547 lexsup.c:549 lexsup.c:551
 msgid "ADDRESS"
 msgstr "OSOITE"
 
@@ -1478,124 +1483,120 @@ msgstr "ARGUMENTTI"
 msgid "Send arg to last-loaded plugin"
 msgstr "Lähetä argumentti viimeksiladattuun lisäosaan"
 
-#: lexsup.c:287 lexsup.c:290
-msgid "Ignored for GCC LTO option compatibility"
-msgstr "Ei oteta huomioon GCC LTO -valitsinyhteensopivuutta"
-
-#: lexsup.c:294
+#: lexsup.c:288
 msgid "Ignored for SVR4 compatibility"
 msgstr "Ei oteta huomioon SVR4-yhteensopivuutta"
 
-#: lexsup.c:298
+#: lexsup.c:292
 msgid "Generate relocatable output"
-msgstr "Tuota uudelleensijoitettava tuloste"
+msgstr "Luo uudelleensijoitettava tuloste"
 
-#: lexsup.c:302
+#: lexsup.c:296
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr "Linkitä vain symbolit (jos hakemisto, sama kuin --rpath)"
 
-#: lexsup.c:305
+#: lexsup.c:299
 msgid "Strip all symbols"
 msgstr "Riisu kaikki symbolit"
 
-#: lexsup.c:307
+#: lexsup.c:301
 msgid "Strip debugging symbols"
 msgstr "Riisu vianjäljityssymbolit"
 
-#: lexsup.c:309
+#: lexsup.c:303
 msgid "Strip symbols in discarded sections"
 msgstr "Riisu symbolit hylätyissä lohkoissa"
 
-#: lexsup.c:311
+#: lexsup.c:305
 msgid "Do not strip symbols in discarded sections"
 msgstr "Älä riisu symboleja hylätyistä lohkoista"
 
-#: lexsup.c:313
+#: lexsup.c:307
 msgid "Trace file opens"
 msgstr "Jäljitä tiedoston avaukset"
 
-#: lexsup.c:315
+#: lexsup.c:309
 msgid "Read linker script"
 msgstr "Lue linkitysskripti"
 
-#: lexsup.c:317
+#: lexsup.c:311
 msgid "Read default linker script"
 msgstr "Lue oletus linkitysskripti"
 
-#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
-#: lexsup.c:572 lexsup.c:611
+#: lexsup.c:315 lexsup.c:333 lexsup.c:418 lexsup.c:439 lexsup.c:538
+#: lexsup.c:566 lexsup.c:605
 msgid "SYMBOL"
 msgstr "SYMBOLI"
 
-#: lexsup.c:321
+#: lexsup.c:315
 msgid "Start with undefined reference to SYMBOL"
 msgstr "Aloita määrittelemättömällä viitteellä kohteeseen SYMBOLI"
 
-#: lexsup.c:324
+#: lexsup.c:318
 msgid "[=SECTION]"
 msgstr "[=LOHKO]"
 
-#: lexsup.c:325
+#: lexsup.c:319
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr "Älä yhdistä syöte[LOHKO | orpo]lohkoja"
 
-#: lexsup.c:327
+#: lexsup.c:321
 msgid "Build global constructor/destructor tables"
 msgstr "Muodosta yleiset konstruktori/destruktoritaulut"
 
-#: lexsup.c:329
+#: lexsup.c:323
 msgid "Print version information"
 msgstr "Tulosta versiotiedot"
 
-#: lexsup.c:331
+#: lexsup.c:325
 msgid "Print version and emulation information"
 msgstr "Tulosta versio- ja emulointitiedot"
 
-#: lexsup.c:333
+#: lexsup.c:327
 msgid "Discard all local symbols"
 msgstr "Hylkää kaikki paikalliset symbolit"
 
-#: lexsup.c:335
+#: lexsup.c:329
 msgid "Discard temporary local symbols (default)"
 msgstr "Hylkää tilapäiset paikalliset symbolit (oletus)"
 
-#: lexsup.c:337
+#: lexsup.c:331
 msgid "Don't discard any local symbols"
 msgstr "Älä hylkää mitään paikallisia symboleja"
 
-#: lexsup.c:339
+#: lexsup.c:333
 msgid "Trace mentions of SYMBOL"
 msgstr "Jäljitä SYMBOLIn maininnat"
 
-#: lexsup.c:341 lexsup.c:508 lexsup.c:510
+#: lexsup.c:335 lexsup.c:503 lexsup.c:505
 msgid "PATH"
 msgstr "POLKU"
 
-#: lexsup.c:341
+#: lexsup.c:335
 msgid "Default search path for Solaris compatibility"
 msgstr "Oletushakupolku Solaris-yhteensopivuutta varten"
 
-#: lexsup.c:344
+#: lexsup.c:338
 msgid "Start a group"
 msgstr "Käynnistä ryhmä"
 
-#: lexsup.c:346
+#: lexsup.c:340
 msgid "End a group"
 msgstr "Lopeta ryhmä"
 
-#: lexsup.c:350
+#: lexsup.c:344
 msgid "Accept input files whose architecture cannot be determined"
 msgstr "Hyväksy syötetiedostot, joiden arkkitehtuuria ei voida määritellä"
 
-#: lexsup.c:354
+#: lexsup.c:348
 msgid "Reject input files whose architecture is unknown"
 msgstr "Hylkää syötetiedostot, joiden arkkitehtuuri on tuntematon"
 
-#: lexsup.c:366
+#: lexsup.c:361
 msgid "Only set DT_NEEDED for following dynamic libs if used"
 msgstr "Aseta DT_NEEDED vain seuraavissa dynaamisissa kirjastoissa, jos niitä käytetään"
 
-#: lexsup.c:369
+#: lexsup.c:364
 msgid ""
 "Always set DT_NEEDED for dynamic libraries mentioned on\n"
 "                                the command line"
@@ -1603,171 +1604,171 @@ msgstr ""
 "Aseta aina DT_NEEDED dynaamisille kirjastoille, jotka on\n"
 "                                määritelty komentorivillä"
 
-#: lexsup.c:373
+#: lexsup.c:368
 msgid "Ignored for SunOS compatibility"
 msgstr "Ei oteta huomioon SunOS-yhteensopivuutta"
 
-#: lexsup.c:375
+#: lexsup.c:370
 msgid "Link against shared libraries"
 msgstr "Linkitä käyttäen jaettuja kirjastoja"
 
-#: lexsup.c:381
+#: lexsup.c:376
 msgid "Do not link against shared libraries"
 msgstr "Älä linkitä käyttäen jaettuja kirjastoja"
 
-#: lexsup.c:389
+#: lexsup.c:384
 msgid "Bind global references locally"
 msgstr "Sido yleisviitteet paikallisesti"
 
-#: lexsup.c:391
+#: lexsup.c:386
 msgid "Bind global function references locally"
 msgstr "Sido yleisfunktioviitteet paikallisesti"
 
-#: lexsup.c:393
+#: lexsup.c:388
 msgid "Check section addresses for overlaps (default)"
 msgstr "Tarkista lohko-osoitteet päällekkäisyyksien varalta (oletus)"
 
-#: lexsup.c:396
+#: lexsup.c:391
 msgid "Do not check section addresses for overlaps"
 msgstr "Älä tarkista lohko-osoitteita päällekkäisyyksien varalta"
 
-#: lexsup.c:400
+#: lexsup.c:395
 msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr "Kopioi DT_NEEDED-linkit, jotka on mainittu seuraavien DSO-kohteiden sisällä"
 
-#: lexsup.c:404
+#: lexsup.c:399
 msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr "Älä kopioi DT_NEEDED-linkkejä, jotka on mainittu seuraavien DSO-kohteiden sisällä"
 
-#: lexsup.c:408
+#: lexsup.c:403
 msgid "Output cross reference table"
 msgstr "Tulosteristiviitetaulu"
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "SYMBOL=EXPRESSION"
 msgstr "SYMBOLI=LAUSEKE"
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "Define a symbol"
 msgstr "Määrittele symboli"
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "[=STYLE]"
 msgstr "[=TYYLI]"
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "Demangle symbol names [using STYLE]"
 msgstr "Eheytä symbolinnimet [käyttäen TYYLIä]"
 
-#: lexsup.c:415
+#: lexsup.c:410
 msgid "Generate embedded relocs"
-msgstr "Tuota upotettuja relocs-lohkoja"
+msgstr "luo upotettuja relocs-lohkoja"
 
-#: lexsup.c:417
+#: lexsup.c:412
 msgid "Treat warnings as errors"
 msgstr "Kohtele varoituksia virheinä"
 
-#: lexsup.c:420
+#: lexsup.c:415
 msgid "Do not treat warnings as errors (default)"
 msgstr "Älä kohtele varoituksia virheinä (oletus)"
 
-#: lexsup.c:423
+#: lexsup.c:418
 msgid "Call SYMBOL at unload-time"
 msgstr "Kutsu SYMBOLIa vapautushetkellä"
 
-#: lexsup.c:425
+#: lexsup.c:420
 msgid "Force generation of file with .exe suffix"
 msgstr "Pakota .exe-suffiksitiedoston luominen"
 
-#: lexsup.c:427
+#: lexsup.c:422
 msgid "Remove unused sections (on some targets)"
 msgstr "Poista käyttämättömät lohkot (joissakin kohteissa)"
 
-#: lexsup.c:430
+#: lexsup.c:425
 msgid "Don't remove unused sections (default)"
 msgstr "Älä poista käyttämättömiä lohkoja (oletus)"
 
-#: lexsup.c:433
+#: lexsup.c:428
 msgid "List removed unused sections on stderr"
 msgstr "Luettele poistetut käyttämättömät lohkot vakiovirheessä"
 
-#: lexsup.c:436
+#: lexsup.c:431
 msgid "Do not list removed unused sections"
 msgstr "Älä luettele poistettuja käyttämättömiä lohkoja"
 
-#: lexsup.c:439
+#: lexsup.c:434
 msgid "Set default hash table size close to <NUMBER>"
 msgstr "Aseta oletus-hash-taulukoko lähelle <NUMERO>"
 
-#: lexsup.c:442
+#: lexsup.c:437
 msgid "Print option help"
 msgstr "Tulosta valitsinopaste"
 
-#: lexsup.c:444
+#: lexsup.c:439
 msgid "Call SYMBOL at load-time"
 msgstr "Kutsu SYMBOLIa lataushetkellä"
 
-#: lexsup.c:446
+#: lexsup.c:441
 msgid "Write a map file"
 msgstr "Kirjoita map-tiedosto"
 
-#: lexsup.c:448
+#: lexsup.c:443
 msgid "Do not define Common storage"
 msgstr "Älä määrittele Yhteinen-varastoa"
 
-#: lexsup.c:450
+#: lexsup.c:445
 msgid "Do not demangle symbol names"
 msgstr "Älä eheytä symbolinimiä"
 
-#: lexsup.c:452
+#: lexsup.c:447
 msgid "Use less memory and more disk I/O"
 msgstr "Käytä vähemmän muistia ja enemmän levyn I/O-toimintoja"
 
-#: lexsup.c:454
+#: lexsup.c:449
 msgid "Do not allow unresolved references in object files"
 msgstr "Älä salli ratkaisemattomia viitteitä objektitiedostoissa"
 
-#: lexsup.c:457
-msgid "Allow unresolved references in shared libraries"
+#: lexsup.c:452
+msgid "Allow unresolved references in shared libaries"
 msgstr "Salli ratkaisemattomia viitteitä jaetuissa kirjastoissa"
 
-#: lexsup.c:461
+#: lexsup.c:456
 msgid "Do not allow unresolved references in shared libs"
 msgstr "Älä salli ratkaisemattomia viitteitä jaetuissa kirjastoissa"
 
-#: lexsup.c:465
+#: lexsup.c:460
 msgid "Allow multiple definitions"
 msgstr "Salli useita määrittelyjä"
 
-#: lexsup.c:467
+#: lexsup.c:462
 msgid "Disallow undefined version"
 msgstr "Älä salli määrittelemätöntä versiota"
 
-#: lexsup.c:469
+#: lexsup.c:464
 msgid "Create default symbol version"
 msgstr "Luo oletussymboliversio"
 
-#: lexsup.c:472
+#: lexsup.c:467
 msgid "Create default symbol version for imported symbols"
 msgstr "Luo oletussymboliversio tuontisymboleille"
 
-#: lexsup.c:475
+#: lexsup.c:470
 msgid "Don't warn about mismatched input files"
 msgstr "Älä varoita täsmäämättömistä syötetiedostoista"
 
-#: lexsup.c:478
+#: lexsup.c:473
 msgid "Don't warn on finding an incompatible library"
 msgstr "Älä varoita yhteensopimattoman kirjaston löytymisestä"
 
-#: lexsup.c:481
+#: lexsup.c:476
 msgid "Turn off --whole-archive"
 msgstr "Käännä pois --whole-archive"
 
-#: lexsup.c:483
+#: lexsup.c:478
 msgid "Create an output file even if errors occur"
 msgstr "Luo tulostetiedosto myös silloin kun syntyy virheitä"
 
-#: lexsup.c:488
+#: lexsup.c:483
 msgid ""
 "Only use library directories specified on\n"
 "                                the command line"
@@ -1775,128 +1776,128 @@ msgstr ""
 "Käytä vain kirjastohakemistoja, jotka on määritelty\n"
 "                                komentorivillä"
 
-#: lexsup.c:492
+#: lexsup.c:487
 msgid "Specify target of output file"
 msgstr "Määrittele tulostetiedoston kohde"
 
-#: lexsup.c:495
+#: lexsup.c:490
 msgid "Ignored for Linux compatibility"
 msgstr "Ei oteta huomioon Linux-yhteensopivuutta"
 
-#: lexsup.c:498
+#: lexsup.c:493
 msgid "Reduce memory overheads, possibly taking much longer"
 msgstr "Pienennä muistiyleisrasite, mahdollisesti ottamalla paljon pitemmän"
 
-#: lexsup.c:501
+#: lexsup.c:496
 msgid "Reduce code size by using target specific optimizations"
 msgstr "Pienennä koodikokoa käyttämällä kohdekohtaisia optimointeja"
 
 #  Kun käskyoperandi on sen lukualueen ulkopuolella, joka sallitaan kullekin käskykentälle, assembler voi muuntaa koodin käyttämään toiminnallisesti samanlaista käskyä tai käskysekvenssiä. Tämä prosessi tunnetaan nimellä relaxation. Tätä tehdään tyypillisesti haarautumiskäskyissä, koska haarautumiskohteen etäisyyttä ei tunneta ennen linkitystä. Tavallaan tällä tavalla kumotaan lukualueen rajoitteet (constraints). Siksi olen suomentanut sen termillä avartaminen.
-#: lexsup.c:503
+#: lexsup.c:498
 msgid "Do not use relaxation techniques to reduce code size"
 msgstr "Älä käytä avartamistekniikoita koodikoon pienentämiseksi"
 
-#: lexsup.c:506
+#: lexsup.c:501
 msgid "Keep only symbols listed in FILE"
 msgstr "Pidä vain symbolit, jotka on lueteltu TIEDOSTOssa"
 
-#: lexsup.c:508
+#: lexsup.c:503
 msgid "Set runtime shared library search path"
 msgstr "Aseta ajoaikaisen jaetun kirjaston hakupolku"
 
-#: lexsup.c:510
+#: lexsup.c:505
 msgid "Set link time shared library search path"
 msgstr "Aseta linkkausaikaisen jaetun kirjaston hakupolku"
 
-#: lexsup.c:513
+#: lexsup.c:508
 msgid "Create a shared library"
 msgstr "Luo jaettu kirjasto"
 
-#: lexsup.c:517
+#: lexsup.c:512
 msgid "Create a position independent executable"
 msgstr "Luo paikkariippumaton suoritettava tiedosto"
 
-#: lexsup.c:521
+#: lexsup.c:516
 msgid "[=ascending|descending]"
 msgstr "[=nouseva|laskeva]"
 
-#: lexsup.c:522
+#: lexsup.c:517
 msgid "Sort common symbols by alignment [in specified order]"
 msgstr "Lajittele yhteissymbolit [määritellyn järjestyksen] mukaan"
 
-#: lexsup.c:527
+#: lexsup.c:522
 msgid "name|alignment"
 msgstr "nimi|tasaus"
 
-#: lexsup.c:528
+#: lexsup.c:523
 msgid "Sort sections by name or maximum alignment"
 msgstr "Lajittele lohkot nimen tai maksimitasauksen mukaan"
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "COUNT"
 msgstr "LUKUMÄÄRÄ"
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "How many tags to reserve in .dynamic section"
 msgstr "Kuinka monta tunnistetta �.dynamic�-lohkon varaamiseen"
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "[=SIZE]"
 msgstr "[=KOKO]"
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "Split output sections every SIZE octets"
 msgstr "Halkaise tulostelohkot kaikkiin KOKO-oktetteihin"
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "[=COUNT]"
 msgstr "[=LUKUMÄÄRÄ]"
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "Split output sections every COUNT relocs"
 msgstr "Halkaise tulostelohkot kaikkiin COUNT-reloc-alkioihin"
 
-#: lexsup.c:539
+#: lexsup.c:534
 msgid "Print memory usage statistics"
 msgstr "Tulosta muistikäyttötilastot"
 
-#: lexsup.c:541
+#: lexsup.c:536
 msgid "Display target specific options"
 msgstr "Näytä kohdekohtaiset valitsimet"
 
-#: lexsup.c:543
+#: lexsup.c:538
 msgid "Do task level linking"
 msgstr "Tee tehtävätason linkitystä"
 
-#: lexsup.c:545
+#: lexsup.c:540
 msgid "Use same format as native linker"
 msgstr "Käytä samaa muotoa kuin kotoperäinen linkkeri"
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "SECTION=ADDRESS"
 msgstr "LOHKO=OSOITE"
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "Set address of named section"
 msgstr "Aseta nimetyn lohkon osoite"
 
-#: lexsup.c:550
+#: lexsup.c:545
 msgid "Set address of .bss section"
 msgstr "Aseta �.bss�-lohkon osoite"
 
-#: lexsup.c:552
+#: lexsup.c:547
 msgid "Set address of .data section"
 msgstr "Aseta �.data�-lohkon osoite"
 
-#: lexsup.c:554
+#: lexsup.c:549
 msgid "Set address of .text section"
 msgstr "Aseta �.text�-lohkon osoite"
 
-#: lexsup.c:556
+#: lexsup.c:551
 msgid "Set address of text segment"
 msgstr "Aseta text-lohkon osoite"
 
-#: lexsup.c:559
+#: lexsup.c:554
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
 "                                ignore-all, report-all, ignore-in-object-files,\n"
@@ -1906,19 +1907,15 @@ msgstr ""
 "                                ei-oteta-huomioon-kaikissa, raportoi-kaikki, ei-oteta-huomioon-objektitiedostoista,\n"
 "                                ei-oteta-huomioon-jaetuissa-kirjastoissa"
 
-#: lexsup.c:564
-msgid "[=NUMBER]"
-msgstr "[=NUMERO]"
-
-#: lexsup.c:565
+#: lexsup.c:559
 msgid "Output lots of information during link"
 msgstr "Tulosta paljon tietoja linkityksen aikana"
 
-#: lexsup.c:569
+#: lexsup.c:563
 msgid "Read version information script"
 msgstr "Lue versiotietoskripti"
 
-#: lexsup.c:572
+#: lexsup.c:566
 msgid ""
 "Take export symbols list from .exports, using\n"
 "                                SYMBOL as the version."
@@ -1926,99 +1923,99 @@ msgstr ""
 "Ota vientisymbolit �.exports�-luettelosta, käytä\n"
 "                                SYMBOLIa versiona."
 
-#: lexsup.c:576
+#: lexsup.c:570
 msgid "Add data symbols to dynamic list"
 msgstr "Lisää datasymboleja dynaamiseen luetteloon"
 
-#: lexsup.c:578
+#: lexsup.c:572
 msgid "Use C++ operator new/delete dynamic list"
 msgstr "Käytä C++-operaattoria �new/delete� dynaamiseen luetteloon"
 
-#: lexsup.c:580
+#: lexsup.c:574
 msgid "Use C++ typeinfo dynamic list"
 msgstr "Käytä C++ typeinfo-luokkaa dynaamiseen luetteloon"
 
-#: lexsup.c:582
+#: lexsup.c:576
 msgid "Read dynamic list"
 msgstr "Lue dynaamista luetteloa"
 
-#: lexsup.c:584
+#: lexsup.c:578
 msgid "Warn about duplicate common symbols"
 msgstr "Varoita yhteissymbolien kaksoiskappaleista"
 
-#: lexsup.c:586
+#: lexsup.c:580
 msgid "Warn if global constructors/destructors are seen"
 msgstr "Varoita, jos nähdään yleisiä konstruktoreja/destruktoreja"
 
-#: lexsup.c:589
+#: lexsup.c:583
 msgid "Warn if the multiple GP values are used"
 msgstr "Varoita, jos käytetään useita GP-arvoja"
 
-#: lexsup.c:591
+#: lexsup.c:585
 msgid "Warn only once per undefined symbol"
 msgstr "Varoita vain kerran määrittämättömästä symbolista"
 
-#: lexsup.c:593
+#: lexsup.c:587
 msgid "Warn if start of section changes due to alignment"
 msgstr "Varoita, jos lohkon alku muuttuu tasauksen vuoksi"
 
-#: lexsup.c:596
+#: lexsup.c:590
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr "Varoita, jos jaetuilla objekteilla on DT_TEXTREL"
 
-#: lexsup.c:599
+#: lexsup.c:593
 msgid "Warn if an object has alternate ELF machine code"
 msgstr "Varoita, jos objektissa on vaihtoehtoisen ELF-koneen koodia"
 
-#: lexsup.c:603
+#: lexsup.c:597
 msgid "Report unresolved symbols as warnings"
 msgstr "Raportoi ratkaisemattomat symbolit varoituksina"
 
-#: lexsup.c:606
+#: lexsup.c:600
 msgid "Report unresolved symbols as errors"
 msgstr "Raportoi ratkaisemattomat symbolit virheinä"
 
-#: lexsup.c:608
+#: lexsup.c:602
 msgid "Include all objects from following archives"
 msgstr "Sisällytä kaikki objektit seuraavista arkistoista"
 
-#: lexsup.c:611
+#: lexsup.c:605
 msgid "Use wrapper functions for SYMBOL"
 msgstr "Käytä wrapper-toimintoja SYMBOLille"
 
-#: lexsup.c:760
+#: lexsup.c:754
 msgid "%P: unrecognized option '%s'\n"
-msgstr "%P: tunnistamaton valitsin ’%s’\n"
+msgstr "%P: tunnistamaton valitsin �%s�\n"
 
-#: lexsup.c:764
+#: lexsup.c:758
 msgid "%P%F: use the --help option for usage information\n"
 msgstr "%P%F: käytä �--help�-valitsinta käyttötietojen saamiseksi\n"
 
-#: lexsup.c:782
+#: lexsup.c:776
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr "%P%F: tunnistamaton �-a�-valitsin �%s�\n"
 
-#: lexsup.c:795
+#: lexsup.c:789
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr "%P%F: tunnistamaton �-assert�-valitsin �%s�\n"
 
-#: lexsup.c:838
+#: lexsup.c:832
 msgid "%F%P: unknown demangling style `%s'"
 msgstr "%F%P: tuntematon eheytystyyli �%s�"
 
-#: lexsup.c:904 lexsup.c:1335
+#: lexsup.c:898
 msgid "%P%F: invalid number `%s'\n"
 msgstr "%P%F: virheellinen numero �%s�\n"
 
-#: lexsup.c:1002
+#: lexsup.c:996
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr "%P%F: virheellinen �--unresolved-symbols�-valitsin: %s\n"
 
-#: lexsup.c:1065 lexsup.c:1564
-msgid "%P%F: %s: error loading plugin\n"
-msgstr "%P%F: %s: virhe ladattaessa lisäosaa\n"
+#: lexsup.c:1059
+msgid "%P%F: bad -plugin option\n"
+msgstr "%P%F: virheellinen �-plugin�-valitsin\n"
 
-#: lexsup.c:1070
+#: lexsup.c:1063
 msgid "%P%F: bad -plugin-opt option\n"
 msgstr "%P%F: virheellinen �-plugin-opt�-valitsin\n"
 
@@ -2030,100 +2027,104 @@ msgstr "%P%F: virheellinen �-plugin-opt�-valitsin\n"
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1087
+#: lexsup.c:1080
 msgid "%P%F: bad -rpath option\n"
 msgstr "%P%F: virheellinen �-rpath�-valitsin\n"
 
-#: lexsup.c:1201
+#: lexsup.c:1194
 msgid "%P%F: -shared not supported\n"
 msgstr "%P%F: �-shared� ei ole tuettu\n"
 
-#: lexsup.c:1210
+#: lexsup.c:1203
 msgid "%P%F: -pie not supported\n"
 msgstr "%P%F: �-pie� ei ole tuettu\n"
 
-#: lexsup.c:1218
+#: lexsup.c:1211
 msgid "descending"
 msgstr "laskeva"
 
-#: lexsup.c:1220
+#: lexsup.c:1213
 msgid "ascending"
 msgstr "nouseva"
 
-#: lexsup.c:1223
+#: lexsup.c:1216
 msgid "%P%F: invalid common section sorting option: %s\n"
 msgstr "%P%F: virheellinen yhteisen lohkon lajitteluvalitsin: %s\n"
 
-#: lexsup.c:1227
+#: lexsup.c:1220
 msgid "name"
 msgstr "nimi"
 
-#: lexsup.c:1229
+#: lexsup.c:1222
 msgid "alignment"
 msgstr "tasaus"
 
-#: lexsup.c:1232
+#: lexsup.c:1225
 msgid "%P%F: invalid section sorting option: %s\n"
 msgstr "%P%F: virheellinen lohkolajitteluvalitsin: %s\n"
 
-#: lexsup.c:1266
+#: lexsup.c:1259
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr "%P%F: virheellinen argumentti valitsimelle �--section-start�\n"
 
-#: lexsup.c:1273
+#: lexsup.c:1266
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr "%P%F: argumentteja puuttuu valitsimelle �--section-start�\n"
 
-#: lexsup.c:1507
+#: lexsup.c:1490
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr "%P%F: ryhmä loppui ennen alkamista (--help opasteeksi)\n"
 
-#: lexsup.c:1535
+#: lexsup.c:1518
 msgid "%P%X: --hash-size needs a numeric argument\n"
 msgstr "%P%X: �--hash-size� tarvitsee numeerisen argumentin\n"
 
-#: lexsup.c:1595 lexsup.c:1608
+#: lexsup.c:1547
+msgid "%P%F: %s: error loading plugin\n"
+msgstr "%P%F: %s: virhe ladattaessa lisäosaa\n"
+
+#: lexsup.c:1578 lexsup.c:1591
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr "%P%F: virheellinen heksadesimaalinumero �%s�\n"
 
-#: lexsup.c:1644
+#: lexsup.c:1627
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr "Käyttö: %s [valitsimet] tiedosto...\n"
 
-#: lexsup.c:1646
+#: lexsup.c:1629
 #, c-format
 msgid "Options:\n"
 msgstr "Valitsimet:\n"
 
-#: lexsup.c:1724
+#: lexsup.c:1707
 #, c-format
 msgid "  @FILE"
 msgstr "  @TIEDOSTO"
 
-#: lexsup.c:1727
+#: lexsup.c:1710
 #, c-format
 msgid "Read options from FILE\n"
 msgstr "Lue valitsimet tiedostosta TIEDOSTO\n"
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1732
+#: lexsup.c:1715
 #, c-format
 msgid "%s: supported targets:"
 msgstr "%s: tuetut kohteet:"
 
-#: lexsup.c:1740
+#: lexsup.c:1723
 #, c-format
 msgid "%s: supported emulations: "
 msgstr "%s: tuetut emuloinnit: "
 
-#: lexsup.c:1745
+#: lexsup.c:1728
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr "%s: emulointikohtaiset valitsimet:\n"
 
-#: lexsup.c:1750
+#: lexsup.c:1733
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
@@ -2134,135 +2135,114 @@ msgstr ""
 msgid "%P%F: unknown format type %s\n"
 msgstr "%P%F: tuntematon muototyyppi %s\n"
 
-#: pe-dll.c:431
+#: pe-dll.c:430
 #, c-format
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr "%XEi-tuettu PEI-arkkitehtuuri: %s\n"
 
-#: pe-dll.c:791
+#: pe-dll.c:788
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
 msgstr "%XEi voi viedä %s: virheellinen vientinimi\n"
 
-#: pe-dll.c:848
+#: pe-dll.c:844
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr "%XVirhe, EXPORT-kaksoiskappale järjestysnumeroilla: %s (%d vs %d)\n"
 
-#: pe-dll.c:855
+#: pe-dll.c:851
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr "Varoitus, EXPORT-kaksoiskappale: %s\n"
 
-#: pe-dll.c:942
+#: pe-dll.c:938
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr "%XEi voi viedä symbolia %s: symbolia ei ole määritelty\n"
 
-#: pe-dll.c:948
+#: pe-dll.c:944
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr "%XEi voi viedä symbolia %s: symboli on väärän tyyppinen (%d vs %d)\n"
 
-#: pe-dll.c:955
+#: pe-dll.c:951
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr "%XEi voi viedä symbolia %s: symbolia ei löydy\n"
 
-#: pe-dll.c:1069
+#: pe-dll.c:1065
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr "%XVirhe, järjestyslukua käytetty kahdesti: %d (%s vs %s)\n"
 
-#: pe-dll.c:1450
+#: pe-dll.c:1446
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr "%XVirhe: %d-bittinen reloc dll:ssä\n"
 
-#: pe-dll.c:1578
+#: pe-dll.c:1574
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr "%s: Ei voi avata def-tulostetiedostoa %s\n"
 
-#: pe-dll.c:1729
+#: pe-dll.c:1725
 #, c-format
 msgid "; no contents available\n"
 msgstr "; sisältö ei ole saatavilla\n"
 
-#: pe-dll.c:2656
+#: pe-dll.c:2652
 msgid "%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"
 msgstr "%C: muuttujaa �%T� ei voi tuoda automaattisesti. Lue yksityiskohtaiset dokumentit ld-ohjelman --enable-auto-import-valitsimesta.\n"
 
-#: pe-dll.c:2686
+#: pe-dll.c:2682
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr "%XEi voi avata .lib-tiedostoa: %s\n"
 
-#: pe-dll.c:2691
+#: pe-dll.c:2687
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr "Luodaan kirjastotiedosto: %s\n"
 
-#: pe-dll.c:2720
+#: pe-dll.c:2716
 #, c-format
 msgid "%Xbfd_openr %s: %E\n"
 msgstr "%Xbfd_openr %s: %E\n"
 
-#: pe-dll.c:2732
+#: pe-dll.c:2728
 #, c-format
 msgid "%X%s(%s): can't find member in non-archive file"
 msgstr "%X%s(%s): ei voi löytää jäsentä ei-arkistotiedostossa"
 
-#: pe-dll.c:2744
+#: pe-dll.c:2740
 #, c-format
 msgid "%X%s(%s): can't find member in archive"
 msgstr "%X%s(%s): ei voi löytää jäsentä arkistossa"
 
-#: pe-dll.c:3183
+#: pe-dll.c:3177
 #, c-format
 msgid "%XError: can't use long section names on this arch\n"
 msgstr "%XError: ei voi käyttää pitkiä lohkonimiä tähän arkistoon\n"
 
-#: plugin.c:176 plugin.c:210
+#: plugin.c:178 plugin.c:212
 msgid "<no plugin>"
 msgstr "<ei lisäosa>"
 
-#: plugin.c:249
-#, c-format
-msgid "could not create dummy IR bfd: %F%E\n"
-msgstr "ei voitu luoda valesymbolia IR bfd: %F%E\n"
-
-#: plugin.c:322
-msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
-msgstr "%P%F: %s: ei-ELF-symboli kohteessa ELF BFD!\n"
-
-#: plugin.c:326
-msgid "%P%F: unknown ELF symbol visibility: %d!\n"
-msgstr "%P%F: tuntematon ELF-symbolinäkyvyys: %d!\n"
-
-#: plugin.c:559
-msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
-msgstr "%P: %B: symbolin �%s� määrittely: %d, näkyvyys: %d, ratkaisu: %d\n"
-
-#: plugin.c:825
-msgid "%P%F: %s: plugin reported error claiming file\n"
-msgstr "%P%F: %s: lisäosa ilmoitettu virhevaatimustiedostoon\n"
-
-#: plugin.c:896
-msgid "%P: %s: error in plugin cleanup (ignored)\n"
-msgstr "%P: %s: virhe lisäosan puhdistuksessa (ohitettu)\n"
-
-#~ msgid "%P%F: bad -plugin option\n"
-#~ msgstr "%P%F: virheellinen �-plugin�-valitsin\n"
+#: plugin.c:308
+msgid "%P%F: %s: non-ELF symbol in ELF BFD!"
+msgstr "%P%F: %s: ei-ELF-symboli kohteessa ELF BFD!"
 
-#~ msgid "%P%X: %s: hash table failure adding symbol %s"
-#~ msgstr "%P%X: %s: hash-tauluhäiriö lisättäesä symbolia %s"
+#: plugin.c:800
+msgid "%P%X: %s: hash table failure adding symbol %s"
+msgstr "%P%X: %s: hash-tauluhäiriö lisättäesä symbolia %s"
 
-#~ msgid "%P%X: %s: can't find IR symbol '%s'"
-#~ msgstr "%P%X: %s: ei löydy IR-symbolia ’%s’"
+#: plugin.c:833
+msgid "%P%X: %s: can't find IR symbol '%s'"
+msgstr "%P%X: %s: ei löydy IR-symbolia ’%s’"
 
-#~ msgid "%P%x: %s: bad IR symbol type %d"
-#~ msgstr "%P%x: %s: väärä IR-symbolityyppi %d"
+#: plugin.c:836
+msgid "%P%x: %s: bad IR symbol type %d"
+msgstr "%P%x: %s: väärä IR-symbolityyppi %d"
 
 #~ msgid "%F%P: %s (%s): No such file: %E\n"
 #~ msgstr "%F%P: %s (%s): Ei löydy tiedostoa: %E\n"
diff --git a/ld/po/fr.po b/ld/po/fr.po
index cdc8dac12f..7c9c46a297 100644
--- a/ld/po/fr.po
+++ b/ld/po/fr.po
@@ -1,202 +1,174 @@
 # Messages français pour ld.
 # Copyright © 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the binutils package.
-# Michel Robitaille <robitail@IRO.UMontreal.CA>, 1996-2011
-# Grégoire Scano <gregoire.scano@malloc.fr>, 2011
+# Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ld 2.21.53\n"
-"Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-22 21:50-0600\n"
-"Last-Translator: Grégoire Scano <gregoire.scano@malloc.fr>\n"
+"Project-Id-Version: ld 2.17.90\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-27 16:44+0930\n"
+"PO-Revision-Date: 2008-03-29 20:33+0000\n"
+"Last-Translator: François-Xavier Coudert <fxcoudert@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: emultempl/armcoff.em:73
+#: emultempl/armcoff.em:72
 #, c-format
-msgid "  --support-old-code          Support interworking with old code\n"
-msgstr "  --support-old-code          Supporter l'interfonctionnement avec du vieux code\n"
+msgid "  --support-old-code   Support interworking with old code\n"
+msgstr "  --support-old-code   supporter les veilles versions de code\n"
 
-#: emultempl/armcoff.em:74
+#: emultempl/armcoff.em:73
 #, c-format
-msgid "  --thumb-entry=<sym>         Set the entry point to be Thumb symbol <sym>\n"
-msgstr "  --thumb-entry=<sym>         Initialiser le point d'entrée au symbole Thumb <sym>\n"
+msgid "  --thumb-entry=<sym>  Set the entry point to be Thumb symbol <sym>\n"
+msgstr "  --thumb-entry=<sym>  initialiser le point d'entrée de Thumb symbol à <sym>\n"
 
-#: emultempl/armcoff.em:122
+#: emultempl/armcoff.em:121
 #, c-format
 msgid "Errors encountered processing file %s"
 msgstr "Erreur rencontrées lors du traitement du fichier %s"
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1813
+#: emultempl/armcoff.em:189 emultempl/pe.em:1528
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr "%P: AVERTISSEMENT: « --thumb-entry %s » écrase « -e %s »\n"
 
-#: emultempl/armcoff.em:197 emultempl/pe.em:1818
-msgid "%P: warning: cannot find thumb start symbol %s\n"
-msgstr "%P: Avertissement: ne peut repérer le symbole thumb de départ %s\n"
+#: emultempl/armcoff.em:194 emultempl/pe.em:1533
+msgid "%P: warning: connot find thumb start symbol %s\n"
+msgstr "%P: AVERTISSEMENT: ne peut repérer le symbole thumb de départ %s\n"
 
-#: emultempl/pe.em:419
+#: emultempl/pe.em:311
 #, c-format
 msgid "  --base_file <basefile>             Generate a base file for relocatable DLLs\n"
 msgstr "  --base_file <fichier_de_base>      générer une fichier de base les les DLL relocalisables\n"
 
-#: emultempl/pe.em:420
+#: emultempl/pe.em:312
 #, c-format
 msgid "  --dll                              Set image base to the default for DLLs\n"
 msgstr "  --dll                              initialise l'image de base au DLL par défaut\n"
 
-#: emultempl/pe.em:421
+#: emultempl/pe.em:313
 #, c-format
 msgid "  --file-alignment <size>            Set file alignment\n"
 msgstr "  --file-alignment <taille>          initialiser l'alignement du fichier\n"
 
-#: emultempl/pe.em:422
+#: emultempl/pe.em:314
 #, c-format
 msgid "  --heap <size>                      Set initial size of the heap\n"
 msgstr "  --heap <taille>                    initialiser la taille initiale du monceau\n"
 
-#: emultempl/pe.em:423
+#: emultempl/pe.em:315
 #, c-format
 msgid "  --image-base <address>             Set start address of the executable\n"
 msgstr "  --image-base <adresse>             initialiser l'adresse de début de l'exécutable\n"
 
-#: emultempl/pe.em:424
+#: emultempl/pe.em:316
 #, c-format
 msgid "  --major-image-version <number>     Set version number of the executable\n"
 msgstr "  --major-image-version <nombre>     initialiser le numéro de version de l'exécutable\n"
 
-#: emultempl/pe.em:425
+#: emultempl/pe.em:317
 #, c-format
 msgid "  --major-os-version <number>        Set minimum required OS version\n"
 msgstr "  --major-os-version <nombre>        initialiser le numéro minimum de version du système d'exploitation\n"
 
-#: emultempl/pe.em:426
+#: emultempl/pe.em:318
 #, c-format
 msgid "  --major-subsystem-version <number> Set minimum required OS subsystem version\n"
 msgstr "  --major-subsystem-version <nombre> initialiser le numéro minimum de version du sous-système\n"
 
-#: emultempl/pe.em:427
+#: emultempl/pe.em:319
 #, c-format
 msgid "  --minor-image-version <number>     Set revision number of the executable\n"
 msgstr "  --minor-image-version <nombre>     initialiser le numéro de révision de l'exécutable\n"
 
-#: emultempl/pe.em:428
+#: emultempl/pe.em:320
 #, c-format
 msgid "  --minor-os-version <number>        Set minimum required OS revision\n"
 msgstr "  --minor-os-version <nombre>        initialiser le numéro minimum de version du système d'exploitation\n"
 
-#: emultempl/pe.em:429
+#: emultempl/pe.em:321
 #, c-format
 msgid "  --minor-subsystem-version <number> Set minimum required OS subsystem revision\n"
 msgstr "  --minor-subsystem-version <nombre> initialiser le numéro minimum de version du sous-système\n"
 
-#: emultempl/pe.em:430
+#: emultempl/pe.em:322
 #, c-format
 msgid "  --section-alignment <size>         Set section alignment\n"
 msgstr "  --section-alignment <taille>       initialiser l'alignement de section\n"
 
-#: emultempl/pe.em:431
+#: emultempl/pe.em:323
 #, c-format
 msgid "  --stack <size>                     Set size of the initial stack\n"
 msgstr "  --stack <taille>                   initialiser la taille initiale de la pile\n"
 
-#: emultempl/pe.em:432
+#: emultempl/pe.em:324
 #, c-format
 msgid "  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"
 msgstr "  --subsystem <nom>[:<version>]      initialiser le sous-système de l'OS requis [&version]\n"
 
-#: emultempl/pe.em:433
+#: emultempl/pe.em:325
 #, c-format
 msgid "  --support-old-code                 Support interworking with old code\n"
 msgstr "  --support-old-code                 supporter l'inter-réseautage avec le vieux code\n"
 
-#: emultempl/pe.em:434
-#, c-format
-msgid "  --[no-]leading-underscore          Set explicit symbol underscore prefix mode\n"
-msgstr "  --[no-]leading-underscore          Activer le mode préfixe utilisant le souligné comme symbole explicite\n"
-
-#: emultempl/pe.em:435
+#: emultempl/pe.em:326
 #, c-format
 msgid "  --thumb-entry=<symbol>             Set the entry point to be Thumb <symbol>\n"
 msgstr "  --thumb-entry=<symbole>            initialiser le point d'entrée de Thumb <symbole>\n"
 
-#: emultempl/pe.em:437
+#: emultempl/pe.em:328
 #, c-format
 msgid "  --add-stdcall-alias                Export symbols with and without @nn\n"
 msgstr "  --add-stdcall-alias                exporter les symboles avec et sans @nn\n"
 
-#: emultempl/pe.em:438
+#: emultempl/pe.em:329
 #, c-format
 msgid "  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"
 msgstr "  --disable-stdcall-fixup            ne lier _sym à _sym@nn\n"
 
-#: emultempl/pe.em:439
+#: emultempl/pe.em:330
 #, c-format
 msgid "  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"
 msgstr "  --enable-stdcall-fixup             lier _sym à _sym@nn sans avertissement\n"
 
-#: emultempl/pe.em:440
+#: emultempl/pe.em:331
 #, c-format
 msgid "  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"
 msgstr "  --exclude-symbols sym,sym,...      exclure les symboles de l'exportation automatique\n"
 
-#: emultempl/pe.em:441
-#, c-format
-msgid "  --exclude-all-symbols              Exclude all symbols from automatic export\n"
-msgstr "  --exclude-all-symbols              Exclure tous les symboles de l'exportation automatique\n"
-
-#: emultempl/pe.em:442
+#: emultempl/pe.em:332
 #, c-format
 msgid "  --exclude-libs lib,lib,...         Exclude libraries from automatic export\n"
 msgstr "  --exclude-libs bibli,...           exclure les bibliothèques lors l'exportation automatique\n"
 
-#: emultempl/pe.em:443
-#, c-format
-msgid "  --exclude-modules-for-implib mod,mod,...\n"
-msgstr "  --exclude-modules-for-implib mod,mod,...\n"
-
-#: emultempl/pe.em:444
-#, c-format
-msgid "                                     Exclude objects, archive members from auto\n"
-msgstr "                                     Exclure les objets, archiver les membres depuis auto\n"
-
-#: emultempl/pe.em:445
-#, c-format
-msgid "                                     export, place into import library instead.\n"
-msgstr "                                     exporter, insère dans la bibliothèque importée.\n"
-
-#: emultempl/pe.em:446
+#: emultempl/pe.em:333
 #, c-format
 msgid "  --export-all-symbols               Automatically export all globals to DLL\n"
 msgstr "  --export-all-symbols               exporter automatiquement tous les globaux au DLL\n"
 
-#: emultempl/pe.em:447
+#: emultempl/pe.em:334
 #, c-format
 msgid "  --kill-at                          Remove @nn from exported symbols\n"
 msgstr "  --kill-at                          enlever les @nn des symboles exportés\n"
 
-#: emultempl/pe.em:448
+#: emultempl/pe.em:335
 #, c-format
 msgid "  --out-implib <file>                Generate import library\n"
 msgstr "  --out-implib <fichier>             générer la bibliothèque d'importation\n"
 
-#: emultempl/pe.em:449
+#: emultempl/pe.em:336
 #, c-format
 msgid "  --output-def <file>                Generate a .DEF file for the built DLL\n"
 msgstr "  --output-def <fichier>             générer le fichier .DEF pour le DLL construit\n"
 
-#: emultempl/pe.em:450
+#: emultempl/pe.em:337
 #, c-format
 msgid "  --warn-duplicate-exports           Warn about duplicate exports.\n"
 msgstr "  --warn-duplicate-exports           avertir lors de l'exportation avec duplication\n"
 
-#: emultempl/pe.em:451
+#: emultempl/pe.em:338
 #, c-format
 msgid ""
 "  --compat-implib                    Create backward compatible import libs;\n"
@@ -206,7 +178,7 @@ msgstr ""
 "                                       compatibilité arrière; \n"
 "                                       créer __imp_<SYMBOL> aussi\n"
 
-#: emultempl/pe.em:453
+#: emultempl/pe.em:340
 #, c-format
 msgid ""
 "  --enable-auto-image-base           Automatically choose image base for DLLs\n"
@@ -215,12 +187,12 @@ msgstr ""
 "  --enable-auto-image-base           automatiquement choisir l'image de base pour les DLL\n"
 "                                       à moins que l'usager en ait spécifié une\n"
 
-#: emultempl/pe.em:455
+#: emultempl/pe.em:342
 #, c-format
 msgid "  --disable-auto-image-base          Do not auto-choose image base. (default)\n"
 msgstr "  --disable-auto-image-base          ne pas choisir automatiquement l'image de base (par défaut)\n"
 
-#: emultempl/pe.em:456
+#: emultempl/pe.em:343
 #, c-format
 msgid ""
 "  --dll-search-prefix=<string>       When linking dynamically to a dll without\n"
@@ -231,21 +203,21 @@ msgstr ""
 "                                       importlib, utiliser <chaîne><basename>.dll \n"
 "                                       de préférence à lib<basename>.dll \n"
 
-#: emultempl/pe.em:459
+#: emultempl/pe.em:346
 #, c-format
 msgid ""
-"  --enable-auto-import               Do sophisticated linking of _sym to\n"
+"  --enable-auto-import               Do sophistcated linking of _sym to\n"
 "                                       __imp_sym for DATA references\n"
 msgstr ""
-"  --enable-auto-import               Faire de l'édition sophitiquée de liens de _sym vers \n"
+"  --enable-auto-import               faire de l'édition sophitiquée de liens de _sym vers \n"
 "                                       __imp_sym pour les références DATA\n"
 
-#: emultempl/pe.em:461
+#: emultempl/pe.em:348
 #, c-format
 msgid "  --disable-auto-import              Do not auto-import DATA items from DLLs\n"
 msgstr "  --disable-auto-image-base          ne pas choisir des items DATA auto-importés à partir des DLLs\n"
 
-#: emultempl/pe.em:462
+#: emultempl/pe.em:349
 #, c-format
 msgid ""
 "  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n"
@@ -256,7 +228,7 @@ msgstr ""
 "                                       ajoutant des pseudo-relocalisations résolues\n"
 "                                       lors de l'exécution\n"
 
-#: emultempl/pe.em:465
+#: emultempl/pe.em:352
 #, c-format
 msgid ""
 "  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations for\n"
@@ -265,7 +237,7 @@ msgstr ""
 "  --enable-auto-import               ne pas ajouter de pseudo-relocalisations lors\n"
 "                                       lors de l'exécution pour les données auto-importées\n"
 
-#: emultempl/pe.em:467
+#: emultempl/pe.em:354
 #, c-format
 msgid ""
 "  --enable-extra-pe-debug            Enable verbose debug output when building\n"
@@ -275,7 +247,7 @@ msgstr ""
 "                                       de mise au point lors de la construction ou du lien\n"
 "                                       vers un DLLs (spécialement en auto-import)\n"
 
-#: emultempl/pe.em:470
+#: emultempl/pe.em:357
 #, c-format
 msgid ""
 "  --large-address-aware              Executable supports virtual addresses\n"
@@ -284,167 +256,86 @@ msgstr ""
 "  --large-address-aware              supporter des adresses virtuelles pour les exécutables\n"
 "                                       plus grande que 2 gigaoctets\n"
 
-#: emultempl/pe.em:472
-#, c-format
-msgid ""
-"  --enable-long-section-names        Use long COFF section names even in\n"
-"                                       executable image files\n"
-msgstr ""
-"  --enable-long-section-names        Utiliser de longs noms de section COFF même dans\n"
-"                                       des fichiers images exécutables\n"
-
-#: emultempl/pe.em:474
-#, c-format
-msgid ""
-"  --disable-long-section-names       Never use long COFF section names, even\n"
-"                                       in object files\n"
-msgstr ""
-"  --disable-long-section-names       Ne jamais utiliser de longs noms de section COFF, même\n"
-"                                       dans les fichiers objet\n"
-
-#: emultempl/pe.em:476
-#, c-format
-msgid ""
-"  --dynamicbase\t\t\t Image base address may be relocated using\n"
-"\t\t\t\t       address space layout randomization (ASLR)\n"
-msgstr ""
-"  --dynamicbase\t\t\t L'image de l'adresse de base devrait être translatée en utilsant\n"
-"\t\t\t\t       la gestion aléatoire de l'espace mémoire(ASLR)\n"
-
-#: emultempl/pe.em:478
-#, c-format
-msgid "  --forceinteg\t\t Code integrity checks are enforced\n"
-msgstr "  --forceinteg\t\t Les vérifications de l'intégrité du code sont imposées\n"
-
-#: emultempl/pe.em:479
-#, c-format
-msgid "  --nxcompat\t\t Image is compatible with data execution prevention\n"
-msgstr "  --nxcompat\t\t L'image est compatible avec la vérification de données d'exécution\n"
-
-#: emultempl/pe.em:480
-#, c-format
-msgid "  --no-isolation\t\t Image understands isolation but do not isolate the image\n"
-msgstr "  --no-isolation\t\t L'image autorise l'isolation mais n'isole pas l'image\n"
-
-#: emultempl/pe.em:481
-#, c-format
-msgid ""
-"  --no-seh\t\t\t Image does not use SEH. No SE handler may\n"
-"\t\t\t\t       be called in this image\n"
-msgstr ""
-"  --no-seh\t\t\t L'image n'utilise pas SEH. Aucun gestionnaire de SE ne doit\n"
-"\t\t\t\t       être appelé dans cette image\n"
-
-#: emultempl/pe.em:483
-#, c-format
-msgid "  --no-bind\t\t\t Do not bind this image\n"
-msgstr "  --no-bind\t\t\t Ne pas lier cette image\n"
-
-#: emultempl/pe.em:484
-#, c-format
-msgid "  --wdmdriver\t\t Driver uses the WDM model\n"
-msgstr "  --wdmdriver\t\t Le pilote utilise le modèle WDM\n"
-
-#: emultempl/pe.em:485
-#, c-format
-msgid "  --tsaware                  Image is Terminal Server aware\n"
-msgstr "  --tsaware                  L'image est avisée du Server Terminal\n"
-
-#: emultempl/pe.em:614
+#: emultempl/pe.em:424
 msgid "%P: warning: bad version number in -subsystem option\n"
 msgstr "%P: AVERTISSEMENT: mauvais numéro de version dans l'option -subsystem\n"
 
-#: emultempl/pe.em:639
+#: emultempl/pe.em:455
 msgid "%P%F: invalid subsystem type %s\n"
 msgstr "%P%F: type de sous-système invalide %s\n"
 
-#: emultempl/pe.em:660
+#: emultempl/pe.em:494
 msgid "%P%F: invalid hex number for PE parameter '%s'\n"
 msgstr "%P%F: nombre hexadécimal invalide pour un paramètre PE « %s »\n"
 
-#: emultempl/pe.em:677
+#: emultempl/pe.em:511
 msgid "%P%F: strange hex info for PE parameter '%s'\n"
 msgstr "%P%F: info étrange en hexadécimal pour un paramètre PE « %s »\n"
 
-#: emultempl/pe.em:692
-msgid "%F%P: cannot open base file %s\n"
-msgstr "%F%P: ne peut ouvrir le fichier de base %s\n"
+#: emultempl/pe.em:528
+#, c-format
+msgid "%s: Can't open base file %s\n"
+msgstr "%s: ne peut ouvrir le fichier de base %s\n"
 
-#: emultempl/pe.em:965
+#: emultempl/pe.em:744
 msgid "%P: warning, file alignment > section alignment.\n"
 msgstr "%P: AVERTISSEMENT, alignement de fichier > alignement de section\n"
 
-#: emultempl/pe.em:978
-msgid "%P: warning: --export-dynamic is not supported for PE targets, did you mean --export-all-symbols?\n"
-msgstr "%P: Avertissement: --export-dynamic n'est pas supporté pour les cibles PE, vouliez-vous dire --export-all-symbols?\n"
-
-#: emultempl/pe.em:1054 emultempl/pe.em:1081
+#: emultempl/pe.em:831 emultempl/pe.em:858
 #, c-format
 msgid "Warning: resolving %s by linking to %s\n"
 msgstr "AVERTISSEMENT: résolution de %s par un lien vers %s\n"
 
-#: emultempl/pe.em:1059 emultempl/pe.em:1086
+#: emultempl/pe.em:836 emultempl/pe.em:863
 msgid "Use --enable-stdcall-fixup to disable these warnings\n"
 msgstr "Utiliser --enable-stdcall-fixup pour inhiber les avertissements\n"
 
-#: emultempl/pe.em:1060 emultempl/pe.em:1087
+#: emultempl/pe.em:837 emultempl/pe.em:864
 msgid "Use --disable-stdcall-fixup to disable these fixups\n"
 msgstr "Utiliser --disable-stdcall-fixup pour inhiber les correctifs\n"
 
-#: emultempl/pe.em:1106
+#: emultempl/pe.em:883
 #, c-format
 msgid "%C: Cannot get section contents - auto-import exception\n"
 msgstr "%C: ne peut obtenir le contenu de section - exception auto-import\n"
 
-#: emultempl/pe.em:1146
+#: emultempl/pe.em:920
 #, c-format
 msgid "Info: resolving %s by linking to %s (auto-import)\n"
 msgstr "Info: résolution de %s par un lien vers %s (auto-importé)\n"
 
-#: emultempl/pe.em:1153
-msgid ""
-"%P: warning: auto-importing has been activated without --enable-auto-import specified on the command line.\n"
-"This should work unless it involves constant data structures referencing symbols from auto-imported DLLs.\n"
-msgstr "%P: Avertissement: auto-importing a été activé sans que --enable-auto-import n'ait été spécifié dans la ligne de commande.\n"
-
-#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
-#: pe-dll.c:1352
-msgid "%B%F: could not read symbols: %E\n"
-msgstr "%B%F: ne peut lire les symboles: %E\n"
-
-#: emultempl/pe.em:1243
+#: emultempl/pe.em:992
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
 msgstr "%F%P: ne peut effectuer des opérations PE sur le fichier de sortie « %B » qui n'est pas PE.\n"
 
-#: emultempl/pe.em:1617
+#: emultempl/pe.em:1334
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr "Erreurs rencontrées lors du traitement du fichier %s\n"
 
-#: emultempl/pe.em:1640
+#: emultempl/pe.em:1357
 #, c-format
-msgid "Errors encountered processing file %s for interworking\n"
-msgstr "Erreurs rencontrées lors du traitement du fichier %s pour l'interfonctionnement\n"
+msgid "Errors encountered processing file %s for interworking"
+msgstr "Erreurs rencontrées lors du traitement du fichier %s pour l'inter-réseautage"
 
-#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
-#: ldmain.c:1160
+#: emultempl/pe.em:1418 ldexp.c:530 ldlang.c:3082 ldlang.c:6087 ldlang.c:6118
+#: ldmain.c:1167
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_link_hash_lookup en échec: %E\n"
 
-#: ldcref.c:168
+#: ldcref.c:166
 msgid "%X%P: bfd_hash_table_init of cref table failed: %E\n"
 msgstr "%X%P: bfd_hash_table_init de la tacle cref en échec: %E\n"
 
-#: ldcref.c:174
+#: ldcref.c:172
 msgid "%X%P: cref_hash_lookup failed: %E\n"
 msgstr "%X%P: cref_hash_lookup en échec: %E\n"
 
-#: ldcref.c:184
+#: ldcref.c:182
 msgid "%X%P: cref alloc failed: %E\n"
 msgstr "%X%P: cref alloc en échec: %E\n"
 
-#: ldcref.c:366
+#: ldcref.c:362
 #, c-format
 msgid ""
 "\n"
@@ -455,25 +346,33 @@ msgstr ""
 "Table de référence croisé\n"
 "\n"
 
-#: ldcref.c:367
+#: ldcref.c:363
 msgid "Symbol"
 msgstr "Symbole"
 
-#: ldcref.c:375
+#: ldcref.c:371
 #, c-format
 msgid "File\n"
 msgstr "Fichier\n"
 
-#: ldcref.c:379
+#: ldcref.c:375
 #, c-format
 msgid "No symbols\n"
 msgstr "Aucun symbol\n"
 
-#: ldcref.c:532
+#: ldcref.c:496 ldcref.c:618
+msgid "%B%F: could not read symbols; %E\n"
+msgstr "%B%F: ne peut lire les symboles; %E\n"
+
+#: ldcref.c:500 ldcref.c:622 ldmain.c:1232 ldmain.c:1236
+msgid "%B%F: could not read symbols: %E\n"
+msgstr "%B%F: ne peut lire les symboles: %E\n"
+
+#: ldcref.c:551
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr "%P: symbole « %T » manquant dans la table de hachage principale\n"
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
+#: ldcref.c:693 ldcref.c:700 ldmain.c:1279 ldmain.c:1286
 msgid "%B%F: could not read relocs: %E\n"
 msgstr "%B%F: ne peut lire les relocalisations: %E\n"
 
@@ -481,15 +380,15 @@ msgstr "%B%F: ne peut lire les relocalisations: %E\n"
 #. in OUTSECNAME.  This reloc is from a section which is
 #. mapped into a section from which references to OUTSECNAME
 #. are prohibited.  We must report an error.
-#: ldcref.c:684
+#: ldcref.c:727
 msgid "%X%C: prohibited cross reference from %s to `%T' in %s\n"
 msgstr "%X%C: référence croisée prohibé de %s vers « %T » dans %s\n"
 
-#: ldctor.c:85
+#: ldctor.c:84
 msgid "%P%X: Different relocs used in set %s\n"
 msgstr "%P%X: différentes relocalisations utilisées dans l'ensemble %s\n"
 
-#: ldctor.c:103
+#: ldctor.c:102
 msgid "%P%X: Different object file formats composing set %s\n"
 msgstr "%P%X: différents format de fichiers objet composant l'ensemble %s\n"
 
@@ -511,181 +410,170 @@ msgstr ""
 "Ensemble            Symbole\n"
 "\n"
 
-#: ldemul.c:265
+#: ldemul.c:235
 #, c-format
 msgid "%S SYSLIB ignored\n"
 msgstr "%S SYSLIB ignoré\n"
 
-#: ldemul.c:271
+#: ldemul.c:241
 #, c-format
 msgid "%S HLL ignored\n"
 msgstr "%S HLL ignoré\n"
 
-#: ldemul.c:291
+#: ldemul.c:261
 msgid "%P: unrecognised emulation mode: %s\n"
 msgstr "%P: mode d'émulation non reconnu: %s\n"
 
-#: ldemul.c:292
+#: ldemul.c:262
 msgid "Supported emulations: "
 msgstr "Émulations supportées: "
 
-#: ldemul.c:334
+#: ldemul.c:304
 #, c-format
 msgid "  no emulation specific options.\n"
 msgstr "  aucune option spécifique d'émulation.\n"
 
-#: ldexp.c:314
-msgid "%P: warning: address of `%s' isn't multiple of maximum page size\n"
-msgstr "%P: Avertissement: l'adresse de «%s» n'est pas un multiple de la taille maximale des pages\n"
-
-#: ldexp.c:407
+#: ldexp.c:344
 #, c-format
 msgid "%F%S %% by zero\n"
 msgstr "%F%S %% par zéro\n"
 
-#: ldexp.c:417
+#: ldexp.c:352
 #, c-format
 msgid "%F%S / by zero\n"
 msgstr "%F%S / by zéro\n"
 
-#: ldexp.c:591
+#: ldexp.c:544
 #, c-format
 msgid "%X%S: unresolvable symbol `%s' referenced in expression\n"
 msgstr "%X%S: symbole non résolu « %s » référencé dans l'expression\n"
 
-#: ldexp.c:605
+#: ldexp.c:555
 #, c-format
 msgid "%F%S: undefined symbol `%s' referenced in expression\n"
 msgstr "%F%S: symbole non résolu « %s » référencé dans l'expression\n"
 
-#: ldexp.c:626 ldexp.c:643 ldexp.c:670
+#: ldexp.c:576 ldexp.c:593 ldexp.c:619
 #, c-format
 msgid "%F%S: undefined section `%s' referenced in expression\n"
 msgstr "%F%S: section non définie « %s » référencée dans l'expression\n"
 
-#: ldexp.c:697 ldexp.c:711
+#: ldexp.c:645 ldexp.c:658
 #, c-format
 msgid "%F%S: undefined MEMORY region `%s' referenced in expression\n"
 msgstr "%F%S: région MÉMOIRE indéfinie « %s » référencé dans l'expression\n"
 
-#: ldexp.c:722
+#: ldexp.c:669
 #, c-format
 msgid "%F%S: unknown constant `%s' referenced in expression\n"
 msgstr "%F%S: constante inconnue « %s » référencée dans l'expression\n"
 
-#: ldexp.c:787
+#: ldexp.c:730
 #, c-format
 msgid "%F%S can not PROVIDE assignment to location counter\n"
 msgstr "%F%S ne peut FOURNIR une assignation au compteur de localisation\n"
 
-#: ldexp.c:805
+#: ldexp.c:744
 #, c-format
 msgid "%F%S invalid assignment to location counter\n"
 msgstr "%F%S affection invalide au compteur de localisation\n"
 
-#: ldexp.c:808
+#: ldexp.c:747
 #, c-format
 msgid "%F%S assignment to location counter invalid outside of SECTION\n"
 msgstr "%F%S affection au compteur de localisation invalide en dehors de la SECTION\n"
 
-#: ldexp.c:821
+#: ldexp.c:756
 msgid "%F%S cannot move location counter backwards (from %V to %V)\n"
 msgstr "%F%S ne peut déplacer le compteur de localisation par en arrière (de %V vers %V)\n"
 
-#: ldexp.c:882
+#: ldexp.c:795
 msgid "%P%F:%s: hash creation failed\n"
 msgstr "%P%F:%s: création de la table de hachage en échec\n"
 
-#: ldexp.c:1191 ldexp.c:1216 ldexp.c:1276
+#: ldexp.c:1054 ldexp.c:1079
+#, c-format
+msgid "%F%S nonconstant expression for %s\n"
+msgstr "%F%S expression d'une non constante: %s\n"
+
+#: ldexp.c:1138
 #, c-format
 msgid "%F%S: nonconstant expression for %s\n"
 msgstr "%F%S expression non constante pour %s\n"
 
-#: ldfile.c:142
+#: ldfile.c:139
 #, c-format
 msgid "attempt to open %s failed\n"
 msgstr "échec de la tentative d'ouverture de %s\n"
 
-#: ldfile.c:144
+#: ldfile.c:141
 #, c-format
 msgid "attempt to open %s succeeded\n"
 msgstr "succès de la tentative d'ouverture de %s\n"
 
-#: ldfile.c:150
+#: ldfile.c:147
 msgid "%F%P: invalid BFD target `%s'\n"
 msgstr "%F%P: cible BFD invalide « %s »\n"
 
-#: ldfile.c:267 ldfile.c:296
+#: ldfile.c:256 ldfile.c:285
 msgid "%P: skipping incompatible %s when searching for %s\n"
 msgstr "%P: escamotage incompatible %s lors de la recherche de %s\n"
 
-#: ldfile.c:280
+#: ldfile.c:269
 msgid "%F%P: attempted static link of dynamic object `%s'\n"
 msgstr "%F%P: tentative de liaison statique de l'objet dynamique `%s'\n"
 
-#: ldfile.c:426
-msgid "%P: cannot find %s (%s): %E\n"
-msgstr "%P: ne peut pas trouver %s (%s): %E\n"
+#: ldfile.c:388
+msgid "%F%P: %s (%s): No such file: %E\n"
+msgstr "%F%P: %s (%s): pas de fichier tel: %E\n"
 
-#: ldfile.c:429
-msgid "%P: cannot find %s: %E\n"
-msgstr "%P: ne peut pas trouver %s: %E\n"
+#: ldfile.c:391
+msgid "%F%P: %s: No such file: %E\n"
+msgstr "%F%P: %s: pas de fichier tel: %E\n"
 
-#: ldfile.c:464
-msgid "%P: cannot find %s inside %s\n"
-msgstr "%P: ne peut trouver %s à l'intérieur de %s\n"
+#: ldfile.c:421
+msgid "%F%P: cannot find %s inside %s\n"
+msgstr "%F%P: ne peut trouver %s à l'intérieur de %s\n"
 
-#: ldfile.c:467
-msgid "%P: cannot find %s\n"
-msgstr "%P: ne peut trouver %s\n"
+#: ldfile.c:424
+msgid "%F%P: cannot find %s\n"
+msgstr "%F%P: ne peut trouver %s\n"
 
-#: ldfile.c:486 ldfile.c:504
+#: ldfile.c:441 ldfile.c:457
 #, c-format
 msgid "cannot find script file %s\n"
 msgstr "ne peut repérer le fichier de scripts %s\n"
 
-#: ldfile.c:488 ldfile.c:506
+#: ldfile.c:443 ldfile.c:459
 #, c-format
 msgid "opened script file %s\n"
 msgstr "fichier de scripts ouvert %s\n"
 
-#: ldfile.c:636
+#: ldfile.c:503
 msgid "%P%F: cannot open linker script file %s: %E\n"
 msgstr "%P%F: ne peut ouvrir le fichier de scripts de l'éditeur de liens %s: %E\n"
 
-#: ldfile.c:701
+#: ldfile.c:550
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr "%P%F: ne peut représenter la machine « %s »\n"
 
-#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
+#: ldlang.c:1069 ldlang.c:1111 ldlang.c:2831
 msgid "%P%F: can not create hash table: %E\n"
 msgstr "%P%F: ne peut créer une table de hachage: %E\n"
 
-#: ldlang.c:1310
-msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
-msgstr "%P:%S: Avertissement: redéclaration de la région mémoire « %s »\n"
-
-#: ldlang.c:1316
-msgid "%P:%S: warning: memory region `%s' not declared\n"
-msgstr "%P:%S: Avertissement: région mémoire %s non déclarée\n"
-
-#: ldlang.c:1350
-msgid "%F%P:%S: error: alias for default memory region\n"
-msgstr "%F%P:%S: Erreur: alias pour la région mémoire par défault\n"
+#: ldlang.c:1154
+msgid "%P:%S: warning: redeclaration of memory region '%s'\n"
+msgstr "%P:%S: AVERTISSEMENT: redéclaration de la région mémoire « %s »\n"
 
-#: ldlang.c:1361
-msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
-msgstr "%F%P:%S: Erreur: redéfinition de l'alias de la région mémoire « %s »\n"
+#: ldlang.c:1160
+msgid "%P:%S: warning: memory region %s not declared\n"
+msgstr "%P:%S: AVERTISSEMENT: région mémoire %s non déclarée\n"
 
-#: ldlang.c:1368
-msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
-msgstr "%F%P:%S: Erreur: la région mémoire «%s» de nom «%s» n'existe pas\n"
-
-#: ldlang.c:1420 ldlang.c:1459
+#: ldlang.c:1240 ldlang.c:1270
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr "%P%F: ne peut créer la section « %s »: %E\n"
 
-#: ldlang.c:2021
+#: ldlang.c:1754
 #, c-format
 msgid ""
 "\n"
@@ -696,7 +584,7 @@ msgstr ""
 "Sections d'entrée éliminées\n"
 "\n"
 
-#: ldlang.c:2029
+#: ldlang.c:1762
 msgid ""
 "\n"
 "Memory Configuration\n"
@@ -706,23 +594,23 @@ msgstr ""
 "Configuration mémoire\n"
 "\n"
 
-#: ldlang.c:2031
+#: ldlang.c:1764
 msgid "Name"
 msgstr "Nom"
 
-#: ldlang.c:2031
+#: ldlang.c:1764
 msgid "Origin"
 msgstr "Origine"
 
-#: ldlang.c:2031
+#: ldlang.c:1764
 msgid "Length"
 msgstr "Longueur"
 
-#: ldlang.c:2031
+#: ldlang.c:1764
 msgid "Attributes"
 msgstr "Attributs"
 
-#: ldlang.c:2071
+#: ldlang.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -733,180 +621,160 @@ msgstr ""
 "Script de l'éditeurs de liens and table de projection mémoire\n"
 "\n"
 
-#: ldlang.c:2140
+#: ldlang.c:1871
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr "%P%F: utilisation illégale de la section « %s »\n"
 
-#: ldlang.c:2149
+#: ldlang.c:1879
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr "%P%F: format de sortie %s ne peut représenter la section %s\n"
 
-#: ldlang.c:2702
+#: ldlang.c:2429
 msgid "%B: file not recognized: %E\n"
 msgstr "%B: fichier non reconnue: %E\n"
 
-#: ldlang.c:2703
+#: ldlang.c:2430
 msgid "%B: matching formats:"
 msgstr "%B: formats concordants:"
 
-#: ldlang.c:2710
+#: ldlang.c:2437
 msgid "%F%B: file not recognized: %E\n"
 msgstr "%F%B: fichier non reconnu: %E\n"
 
-#: ldlang.c:2781
+#: ldlang.c:2507
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr "%F%B: membre %B dans l'archive n'est pas un objet\n"
 
-#: ldlang.c:2796 ldlang.c:2810
+#: ldlang.c:2518 ldlang.c:2532
 msgid "%F%B: could not read symbols: %E\n"
 msgstr "%F%B: ne peut lire les symboles: %E\n"
 
-#: ldlang.c:3084
+#: ldlang.c:2801
 msgid "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr ""
 "%P: AVERTISSEMENT: ne peut repérer les cibles qui concordent avec\n"
 "les types de système à octets de poids faible ou fort requis\n"
 
-#: ldlang.c:3098
+#: ldlang.c:2815
 msgid "%P%F: target %s not found\n"
 msgstr "%P%F: cible %s non trouvée\n"
 
-#: ldlang.c:3100
+#: ldlang.c:2817
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr "%P%F: ne peut ouvrir le fichier de sortie %s: %E\n"
 
-#: ldlang.c:3106
+#: ldlang.c:2823
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr "%P%F:%s: ne peut créer le fichier objet: %E\n"
 
-#: ldlang.c:3110
+#: ldlang.c:2827
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr "%P%F:%s: ne peut initialiser l'architecture: %E\n"
 
-#: ldlang.c:3267
-msgid "%P: warning: %s contains output sections; did you forget -T?\n"
-msgstr "%P: Avertissement: %s contient des sections de sortie; avez-vous oublié -T?\n"
-
-#: ldlang.c:3308
+#: ldlang.c:2975
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr "%P%F: bfd_hash_lookup en échec lors de la création du symbole %s\n"
 
-#: ldlang.c:3326
+#: ldlang.c:2993
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr "%P%F: bfd_hash_allocate en échec lors de la création dusymbole %s\n"
 
-#: ldlang.c:3722
-msgid "%F%P: %s not found for insert\n"
-msgstr "%F%P: %s pas trouvé pour insertion\n"
-
-#: ldlang.c:3937
+#: ldlang.c:3426
 msgid " load address 0x%V"
 msgstr " address de chargement 0x%V"
 
-#: ldlang.c:4212
+#: ldlang.c:3661
 msgid "%W (size before relaxing)\n"
 msgstr "%W (taille avant relaxe)\n"
 
-#: ldlang.c:4303
+#: ldlang.c:3747
 #, c-format
 msgid "Address of section %s set to "
 msgstr "Adresse de la section %s initialisé à "
 
-#: ldlang.c:4456
+#: ldlang.c:3900
 #, c-format
 msgid "Fail with %d\n"
 msgstr "Échec avec %d\n"
 
-#: ldlang.c:4743
-msgid "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
-msgstr "%X%P: la section %s chargée à [%V -> %V] chevauche la section %s chargée à [%V -> %V]\n"
-
-#: ldlang.c:4759
-msgid "%X%P: region `%s' overflowed by %ld bytes\n"
-msgstr "%X%P: la région «%s» est débordée de %ld octets\n"
+#: ldlang.c:4172
+msgid "%X%P: section %s [%V -> %V] overlaps section %s [%V -> %V]\n"
+msgstr "%X%P: section %s [%V -> %V] chevauche la section %s [%V -> %V]\n"
 
-#: ldlang.c:4782
-msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
-msgstr "%X%P: l'adresse 0x%v de %B de la section «%s» n'est pas dans la région «%s»\n"
+#: ldlang.c:4197
+msgid "%X%P: address 0x%v of %B section %s is not within region %s\n"
+msgstr "%X%P: l'adresse 0x%v de %B de la section %s n'est pas dans la région %s\n"
 
-#: ldlang.c:4793
-msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
-msgstr "%X%P: %B la section «%s» ne va pas s'adapter à la région «%s»\n"
+#: ldlang.c:4206
+msgid "%X%P: region %s is full (%B section %s)\n"
+msgstr "%X%P: région %s est pleine (%B section %s)\n"
 
-#: ldlang.c:4850
+#: ldlang.c:4247
 #, c-format
 msgid "%F%S: non constant or forward reference address expression for section %s\n"
 msgstr "%F%S: référence d'adresse avant d'expression ou non constante pour la section %s\n"
 
-#: ldlang.c:4875
+#: ldlang.c:4272
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr "%P%X: erreur interne dans la section de bibliothèque partagée COFF %s\n"
 
-#: ldlang.c:4932
+#: ldlang.c:4331
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
-msgstr "%P%F: error: aucune région mémoire spécifiée pour la section chargeable « %s »\n"
+msgstr "%P%F: ERREUR: aucune région mémoire spécifiée pour la section chargeable « %s »\n"
 
-#: ldlang.c:4937
+#: ldlang.c:4336
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr "%P: AVERTISSEMENT: aucune région mémoire spécifiée pour la section chargeable « %s »\n"
 
-#: ldlang.c:4959
+#: ldlang.c:4358
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr "%P: AVERTISSEMENT: modification du début de section %s de %lu octets\n"
 
-#: ldlang.c:5036
+#: ldlang.c:4437
 msgid "%P: warning: dot moved backwards before `%s'\n"
 msgstr "%P: AVERTISSEMENT: point (.) déplacé avant « %s »\n"
 
-#: ldlang.c:5202
+#: ldlang.c:4609
 msgid "%P%F: can't relax section: %E\n"
 msgstr "%P%F: ne peut relâcher la section: %E\n"
 
-#: ldlang.c:5531
+#: ldlang.c:4898
 msgid "%F%P: invalid data statement\n"
 msgstr "%F%P: déclaration invalide de données\n"
 
-#: ldlang.c:5564
+#: ldlang.c:4931
 msgid "%F%P: invalid reloc statement\n"
 msgstr "%F%P: déclaration invalide de relocalisation\n"
 
-#: ldlang.c:5683
-msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
-msgstr "%P%F: gc-sections requière soit une entrée, soit un symbole non définit\n"
-
-#: ldlang.c:5708
+#: ldlang.c:5063
 msgid "%P%F:%s: can't set start address\n"
 msgstr "%P%F:%s: ne peut initialiser l'adresse de départ\n"
 
-#: ldlang.c:5721 ldlang.c:5740
+#: ldlang.c:5076 ldlang.c:5095
 msgid "%P%F: can't set start address\n"
 msgstr "%P%F: ne peut initialiser l'adresse de départ\n"
 
-#: ldlang.c:5733
+#: ldlang.c:5088
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr "%P: AVERTISSEMENT: ne peut trouver le symbole d'entrée %s; utilise par défaut %V\n"
 
-#: ldlang.c:5745
+#: ldlang.c:5100
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr "%P: AVERTISSEMENT: ne peut trouver le symbole d'entrée %s; pas d'initialisation de l'adresse de départ\n"
 
-#: ldlang.c:5800
+#: ldlang.c:5149
 msgid "%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"
 msgstr "%P%F: liaison relocalisable avec relocalisation à partir du format %s (%B) au format %s (%B) n'est pas supportée\n"
 
-#: ldlang.c:5810
+#: ldlang.c:5159
 msgid "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
 msgstr "%P%X: architecture %s du fichier d'entrée « %B » est incompatible avec la sortie %s\n"
 
-#: ldlang.c:5832
+#: ldlang.c:5181
 msgid "%P%X: failed to merge target specific data of file %B\n"
 msgstr "%E%X: échec de fusion des données spécifiques cibles du fichier %B\n"
 
-#: ldlang.c:5903
-msgid "%P%F: Could not define common symbol `%T': %E\n"
-msgstr "%P%F: Impossible de définir le symbole commun «%T» : %E\n"
-
-#: ldlang.c:5915
+#: ldlang.c:5265
 msgid ""
 "\n"
 "Allocating common symbols\n"
@@ -914,7 +782,7 @@ msgstr ""
 "\n"
 "Allocation des symboles communs\n"
 
-#: ldlang.c:5916
+#: ldlang.c:5266
 msgid ""
 "Common symbol       size              file\n"
 "\n"
@@ -922,166 +790,154 @@ msgstr ""
 "Symbole commun      taille            fichier\n"
 "\n"
 
-#: ldlang.c:6062
+#: ldlang.c:5401
 msgid "%P%F: invalid syntax in flags\n"
 msgstr "%P%F: syntaxe invalide dans les fanions\n"
 
-#: ldlang.c:6524
+#: ldlang.c:5714
 msgid "%P%F: Failed to create hash table\n"
 msgstr "%P%F: échec de création de la table de hachage\n"
 
-#: ldlang.c:6547
-msgid "%P%F: %s: plugin reported error after all symbols read\n"
-msgstr "%P%F: %s: le greffon a reporté une erreur après avoir lu tous les symboles\n"
-
-#: ldlang.c:6860
+#: ldlang.c:6009
 msgid "%P%F: multiple STARTUP files\n"
 msgstr "%P%F: fichiers DÉPART multiples\n"
 
-#: ldlang.c:6906
+#: ldlang.c:6057
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr "%X%P:%S: section a à la fois une adresse de chargement et une région de chargement\n"
 
-#: ldlang.c:7093
-msgid "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack them\n"
-msgstr "%X%P:%S: PHDRS et FILEHDR ne sont pas supportés lorsque des entêtes prioritaires PT_LOAD ne les ont pas\n"
-
-#: ldlang.c:7165
-msgid "%F%P: no sections assigned to phdrs\n"
-msgstr "%F%P: aucune section n'est assignée à phdrs\n"
-
-#: ldlang.c:7203
+#: ldlang.c:6314
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr "%F%P: bfd_record_phdr en échec: %E\n"
 
-#: ldlang.c:7223
+#: ldlang.c:6334
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr "%X%P: section « %s » affectée à phdr inexistent « %s »\n"
 
-#: ldlang.c:7636
+#: ldlang.c:6725
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr "%X%P: langage inconnue « %s » dans l'information de la version\n"
 
-#: ldlang.c:7781
+#: ldlang.c:6867
 msgid "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr "%X%P: étiquette de version anonyme ne peut être combinée avec d'autres étiquettes de version\n"
 
-#: ldlang.c:7790
+#: ldlang.c:6876
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr "%X%P: duplication de l'étiquette de version « %s »\n"
 
-#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
+#: ldlang.c:6896 ldlang.c:6905 ldlang.c:6922 ldlang.c:6932
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr "%X%P: duplication de l'expression « %s » dans l'information de version\n"
 
-#: ldlang.c:7888
+#: ldlang.c:6972
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr "%X%P: incapable de repérer les dépendences de version « %s »\n"
 
-#: ldlang.c:7911
+#: ldlang.c:6994
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr "%X%P: incapable de lire le contenu de la section .exports\n"
 
-#: ldlang.c:8035
-msgid "%X%P: unknown feature `%s'\n"
-msgstr "%P%F: caractéristique inconnue «%s»\n"
-
-#: ldmain.c:239
+#: ldmain.c:234
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr "%X%P: ne peut initialiser la cible par défaut BFD à « %s »: %E\n"
 
-#: ldmain.c:307
+#: ldmain.c:298
+msgid "%P%F: --relax and -r may not be used together\n"
+msgstr "%P%F: --relax et -r ne peuvent être utilisés ensemble\n"
+
+#: ldmain.c:300
 msgid "%P%F: -r and -shared may not be used together\n"
 msgstr "%P%F: -r et -shared ne peuvent être utilisés ensemble\n"
 
-#: ldmain.c:350
+#: ldmain.c:343
 msgid "%P%F: -F may not be used without -shared\n"
 msgstr "%P%F: -F ne peut être utilisé sans -shared\n"
 
-#: ldmain.c:352
+#: ldmain.c:345
 msgid "%P%F: -f may not be used without -shared\n"
 msgstr "%P%F: -f ne peut être utilisé sans -shared\n"
 
-#: ldmain.c:400
+#: ldmain.c:397
 msgid "using external linker script:"
 msgstr "utilisation du script externe d'édition de liens:"
 
-#: ldmain.c:402
+#: ldmain.c:399
 msgid "using internal linker script:"
 msgstr "utilisation du script interne d'édition de liens:"
 
-#: ldmain.c:436
+#: ldmain.c:433
 msgid "%P%F: no input files\n"
 msgstr "%P%F: aucun fichier d'entrée\n"
 
-#: ldmain.c:440
+#: ldmain.c:437
 msgid "%P: mode %s\n"
 msgstr "%P: mode %s\n"
 
-#: ldmain.c:456
+#: ldmain.c:453
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr "%P%F: ne peut ouvrir le fichier de la table de projection %s: %E\n"
 
-#: ldmain.c:488
+#: ldmain.c:485
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr "%P: erreurs de lien trouvés, destruction de l'exécutable « %s »\n"
 
-#: ldmain.c:497
+#: ldmain.c:494
 msgid "%F%B: final close failed: %E\n"
 msgstr "%F%B: fermeture finale en échec: %E\n"
 
-#: ldmain.c:523
+#: ldmain.c:520
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr "%X%P: incapable d'ouvrir la copie source de « %s »\n"
 
-#: ldmain.c:526
+#: ldmain.c:523
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr "%X%P: incpapable d'ouvrir la copie destination de « %s »\n"
 
-#: ldmain.c:533
+#: ldmain.c:530
 msgid "%P: Error writing file `%s'\n"
 msgstr "%P: erreur lors de l'écriture du fichier « %s »\n"
 
-#: ldmain.c:538 pe-dll.c:1733
+#: ldmain.c:535 pe-dll.c:1572
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr "%P: erreur lors de la fermeture du fichier « %s »\n"
 
-#: ldmain.c:555
+#: ldmain.c:551
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr "%s: temps total d'édition de liens: %ld.%06ld\n"
 
-#: ldmain.c:558
+#: ldmain.c:554
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: tailles des données %ld\n"
 
-#: ldmain.c:642
+#: ldmain.c:637
 msgid "%P%F: missing argument to -m\n"
 msgstr "%P%F: argument manquant pour -m\n"
 
-#: ldmain.c:690 ldmain.c:710 ldmain.c:742
+#: ldmain.c:784 ldmain.c:803 ldmain.c:834
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr "%P%F: bfd_hash_table_init en échec: %E\n"
 
-#: ldmain.c:694 ldmain.c:714
+#: ldmain.c:788 ldmain.c:807
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup en échec: %E\n"
 
-#: ldmain.c:728
+#: ldmain.c:821
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr "%X%P: erreur: duplication dans retain-symbols-file\n"
 
-#: ldmain.c:772
+#: ldmain.c:864
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup en échec lors d'une insertion: %E\n"
 
-#: ldmain.c:777
+#: ldmain.c:869
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr "%P: « -retain-symbols-file » écrase les options « -s » et « -S »\n"
 
-#: ldmain.c:877
+#: ldmain.c:944
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
@@ -1090,925 +946,877 @@ msgstr ""
 "Membre de l'archive est inclu en raison du fichier (symbole)\n"
 "\n"
 
-#: ldmain.c:983
+#: ldmain.c:1014
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr "%X%C: définitions multiples de « %T »\n"
 
-#: ldmain.c:986
+#: ldmain.c:1017
 msgid "%D: first defined here\n"
 msgstr "%D: défini pour la première fois ici\n"
 
-#: ldmain.c:990
+#: ldmain.c:1021
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr "%P: désactivation de la relâche: il ne pourra pas travailler avec des définitions multiples\n"
 
-#: ldmain.c:1044
+#: ldmain.c:1051
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr "%B: AVERTISSEMENT: définition de « %T » écrase le commun\n"
 
-#: ldmain.c:1047
+#: ldmain.c:1054
 msgid "%B: warning: common is here\n"
 msgstr "%B: AVERTISSEMENT: le commun est ici\n"
 
-#: ldmain.c:1054
+#: ldmain.c:1061
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr "%B: AVERTISSEMENT: le commun de « %T » écrasé par définition\n"
 
-#: ldmain.c:1057
+#: ldmain.c:1064
 msgid "%B: warning: defined here\n"
 msgstr "%B: AVERTISSEMENT: défini ici\n"
 
-#: ldmain.c:1064
+#: ldmain.c:1071
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr "%B: AVERTISSEMENT: le commun de « %T » écrasé par un commun de plus grande taille\n"
 
-#: ldmain.c:1067
+#: ldmain.c:1074
 msgid "%B: warning: larger common is here\n"
 msgstr "%B: AVERTISSEMENT: le commun de plus grande taille est ici\n"
 
-#: ldmain.c:1071
+#: ldmain.c:1078
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr "%B: AVERTISSEMENT: le commun de « %T » écrasé par un commun de plus petite taille\n"
 
-#: ldmain.c:1074
+#: ldmain.c:1081
 msgid "%B: warning: smaller common is here\n"
 msgstr "%B: AVERTISSEMENT: le commun de plus petite taille est ici\n"
 
-#: ldmain.c:1078
+#: ldmain.c:1085
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr "%B: AVERTISSEMENT: communs multiples de « %T »\n"
 
-#: ldmain.c:1080
+#: ldmain.c:1087
 msgid "%B: warning: previous common is here\n"
 msgstr "%B: AVERTISSEMENT: commun précédent est ici\n"
 
-#: ldmain.c:1100 ldmain.c:1138
+#: ldmain.c:1107 ldmain.c:1145
 msgid "%P: warning: global constructor %s used\n"
 msgstr "%P: AVERTISSEMENT: constructeur global %s est utilisé\n"
 
-#: ldmain.c:1148
+#: ldmain.c:1155
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr "%P%F: BFD erreur de terminaison arrière (backend): BFD_RELOC_CTOR non supporté\n"
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
+#: ldmain.c:1209 ldmain.c:1211 ldmain.c:1213 ldmain.c:1251 ldmain.c:1299
 msgid "warning: "
 msgstr "AVERTISSEMENT: "
 
-#: ldmain.c:1305
+#: ldmain.c:1334
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr "%F%P: bfd_hash_table_init en échec: %E\n"
 
-#: ldmain.c:1312
+#: ldmain.c:1341
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr "%F%P: bfd_hash_lookup en échec: %E\n"
 
-#: ldmain.c:1333
+#: ldmain.c:1362
 msgid "%X%C: undefined reference to `%T'\n"
 msgstr "%X%C: référence indéfinie vers « %T »\n"
 
-#: ldmain.c:1336
+#: ldmain.c:1365
 msgid "%C: warning: undefined reference to `%T'\n"
 msgstr "%C: AVERTISSEMENT: référence indéfinie vers « %T »\n"
 
-#: ldmain.c:1342
+#: ldmain.c:1371
 msgid "%X%D: more undefined references to `%T' follow\n"
 msgstr "%X%D: encore plus de références indéfinies suivent vers « %T »\n"
 
-#: ldmain.c:1345
+#: ldmain.c:1374
 msgid "%D: warning: more undefined references to `%T' follow\n"
 msgstr "%D: AVERTISSEMENT: encore plus de références indéfinies suivent vers « %T »\n"
 
-#: ldmain.c:1356
+#: ldmain.c:1385
 msgid "%X%B: undefined reference to `%T'\n"
 msgstr "%X%B: référence indéfinie vers « %T »\n"
 
-#: ldmain.c:1359
+#: ldmain.c:1388
 msgid "%B: warning: undefined reference to `%T'\n"
 msgstr "%B: AVERTISSMENT: référence indéfinie vers « %T »\n"
 
-#: ldmain.c:1365
+#: ldmain.c:1394
 msgid "%X%B: more undefined references to `%T' follow\n"
 msgstr "%X%B: encore plus de références indéfinies suivent vers « %T »\n"
 
-#: ldmain.c:1368
+#: ldmain.c:1397
 msgid "%B: warning: more undefined references to `%T' follow\n"
 msgstr "%B: AVERTISSEMENT: encore plus de références indéfinies suivent vers « %T »\n"
 
-#: ldmain.c:1407
+#: ldmain.c:1436
 msgid " additional relocation overflows omitted from the output\n"
 msgstr " débordement de relocalisation additionnelle omise à partir de la sortie\n"
 
-#: ldmain.c:1420
+#: ldmain.c:1449
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
 msgstr " relocalisation tronquée pour concorder avec la taille: %s vers le symbole indéfini %T"
 
-#: ldmain.c:1425
+#: ldmain.c:1454
 msgid " relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"
 msgstr " relocalisation tronquée pour concorder: %s vers le symbole %T défini sans la section %A dans %B"
 
-#: ldmain.c:1437
+#: ldmain.c:1466
 msgid " relocation truncated to fit: %s against `%T'"
 msgstr " relocalisation tronquée pour concorder: %s avec %T"
 
-#: ldmain.c:1454
-msgid "%X%H: dangerous relocation: %s\n"
-msgstr "%X%H: relocalisation dangereuse: %s\n"
+#: ldmain.c:1483
+#, c-format
+msgid "%X%C: dangerous relocation: %s\n"
+msgstr "%X%C: relocalisation dangereuse: %s\n"
 
-#: ldmain.c:1469
-msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
-msgstr "%X%H: la relocalisation réfère au symbole «%T» qui n'est pas écrit\n"
+#: ldmain.c:1498
+msgid "%X%C: reloc refers to symbol `%T' which is not being output\n"
+msgstr "%X%C: relocalisation réfère au symbole « %T » qui n'est pas écrit\n"
 
-#: ldmisc.c:151
+#: ldmisc.c:148
 #, c-format
 msgid "no symbol"
 msgstr "aucun symbole"
 
-#: ldmisc.c:248
+#: ldmisc.c:245
 #, c-format
 msgid "built in linker script:%u"
 msgstr "construit dans le script d'édition de liens:%u"
 
-#: ldmisc.c:329
+#: ldmisc.c:301 ldmisc.c:305
+msgid "%B%F: could not read symbols\n"
+msgstr "%B%F: ne peut lire les symboles\n"
+
+#: ldmisc.c:347
 msgid "%B: In function `%T':\n"
 msgstr "%B: dans la fonction « %T »:\n"
 
-#: ldmisc.c:464
+#: ldmisc.c:472
 msgid "%F%P: internal error %s %d\n"
 msgstr "%F%P: erreur interne %s %d\n"
 
-#: ldmisc.c:513
+#: ldmisc.c:521
 msgid "%P: internal error: aborting at %s line %d in %s\n"
 msgstr "%P: erreur interne: arrêt immédiat %s, ligne %d dans %s\n"
 
-#: ldmisc.c:516
+#: ldmisc.c:524
 msgid "%P: internal error: aborting at %s line %d\n"
 msgstr "%P: erreur interne: arrêt immédiat à %s ligne %d\n"
 
-#: ldmisc.c:518
+#: ldmisc.c:526
 msgid "%P%F: please report this bug\n"
 msgstr "%P%F: rapporter cette anomalie\n"
 
 #. Output for noisy == 2 is intended to follow the GNU standards.
-#: ldver.c:39
+#: ldver.c:37
 #, c-format
 msgid "GNU ld %s\n"
 msgstr "GNU ld %s\n"
 
-#: ldver.c:43
+#: ldver.c:41
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2007 Free Software Foundation, Inc.\n"
+msgstr "Copyright 2007 Free Software Foundation, Inc.\n"
 
-#: ldver.c:44
+#: ldver.c:42
 #, c-format
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
-"the GNU General Public License version 3 or (at your option) a later version.\n"
-"This program has absolutely no warranty.\n"
+"the GNU General Public License.  This program has absolutely no warranty.\n"
 msgstr ""
-"Ce logiciel est libre; si vous le redistribuez, vous devez le faire selon les termes\n"
-"de la licence GNU General Public License version 3 ou postérieure selon votre besoin.\n"
-"Ce logiciel n'est couvert par aucune GARANTIE.\n"
+"Ce logiciel est libre; voir les sources pour les conditions de\n"
+"reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
+"COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: ldver.c:54
+#: ldver.c:51
 #, c-format
 msgid "  Supported emulations:\n"
 msgstr "  Émulations supportées:\n"
 
-#: ldwrite.c:62 ldwrite.c:207
+#: ldwrite.c:55 ldwrite.c:191
 msgid "%P%F: bfd_new_link_order failed\n"
 msgstr "%P%F: bfd_new_link_order en échec\n"
 
-#: ldwrite.c:365
+#: ldwrite.c:344
 msgid "%F%P: cannot create split section name for %s\n"
 msgstr "%F%P: ne peut créer un nom de section scindé pour %s\n"
 
-#: ldwrite.c:377
+#: ldwrite.c:356
 msgid "%F%P: clone section failed: %E\n"
 msgstr "%F%P: section clone en échec: %E\n"
 
-#: ldwrite.c:418
+#: ldwrite.c:394
 #, c-format
 msgid "%8x something else\n"
 msgstr "%8x quelque chose d'autre\n"
 
-#: ldwrite.c:588
+#: ldwrite.c:564
 msgid "%F%P: final link failed: %E\n"
 msgstr "%F%P: édition de lien finale en échec: %E\n"
 
-#: lexsup.c:219 lexsup.c:373
+#: lexsup.c:205 lexsup.c:341
 msgid "KEYWORD"
 msgstr "MOT CLÉ"
 
-#: lexsup.c:219
+#: lexsup.c:205
 msgid "Shared library control for HP/UX compatibility"
 msgstr "Bibliothèque partagée de contrôle pour compatibilité HP/UX"
 
-#: lexsup.c:222
+#: lexsup.c:208
 msgid "ARCH"
 msgstr "ARCH"
 
-#: lexsup.c:222
+#: lexsup.c:208
 msgid "Set architecture"
 msgstr "Initilisé l'architecture"
 
-#: lexsup.c:224 lexsup.c:492
+#: lexsup.c:210 lexsup.c:447
 msgid "TARGET"
 msgstr "CIBLE"
 
-#: lexsup.c:224
+#: lexsup.c:210
 msgid "Specify target for following input files"
 msgstr "Spécifier la cible pour les règles suivantes pour les fichiers d'entrée"
 
-#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
-#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
+#: lexsup.c:213 lexsup.c:262 lexsup.c:274 lexsup.c:287 lexsup.c:289
+#: lexsup.c:402 lexsup.c:459 lexsup.c:516 lexsup.c:528
 msgid "FILE"
 msgstr "FICHIER"
 
-#: lexsup.c:227
+#: lexsup.c:213
 msgid "Read MRI format linker script"
 msgstr "Lecture du format MRI du script de l'éditeur de liens"
 
-#: lexsup.c:229
+#: lexsup.c:215
 msgid "Force common symbols to be defined"
 msgstr "Forcer les symboles communs à être définis"
 
-#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
+#: lexsup.c:219 lexsup.c:501 lexsup.c:503 lexsup.c:505
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
-#: lexsup.c:233
+#: lexsup.c:219
 msgid "Set start address"
 msgstr "Initialiser l'adresse de début"
 
-#: lexsup.c:235
+#: lexsup.c:221
 msgid "Export all dynamic symbols"
 msgstr "Exportation de tous les symboles dynamiques"
 
-#: lexsup.c:237
-msgid "Undo the effect of --export-dynamic"
-msgstr "Annuler l'effet de --export-dynamic"
-
-#: lexsup.c:239
+#: lexsup.c:223
 msgid "Link big-endian objects"
 msgstr "Lier les objets pour les systèmes à octet de poids fort (big endian)"
 
-#: lexsup.c:241
+#: lexsup.c:225
 msgid "Link little-endian objects"
 msgstr "Lier les objets pour les systèmes à octets de poids faible (little endian)"
 
-#: lexsup.c:243 lexsup.c:246
+#: lexsup.c:227 lexsup.c:230
 msgid "SHLIB"
 msgstr "SHLIB"
 
-#: lexsup.c:243
+#: lexsup.c:227
 msgid "Auxiliary filter for shared object symbol table"
 msgstr "Filtre auxiliaire de la table de symboles de l'objet partagé"
 
-#: lexsup.c:246
+#: lexsup.c:230
 msgid "Filter for shared object symbol table"
 msgstr "Filtre de la table de symboles de l'objet partagé"
 
-#: lexsup.c:249
+#: lexsup.c:233
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: lexsup.c:251
+#: lexsup.c:235
 msgid "SIZE"
 msgstr "TAILLE"
 
-#: lexsup.c:251
+#: lexsup.c:235
 msgid "Small data size (if no size, same as --shared)"
 msgstr "Petite taille des données (si aucune taille spécifié, identique à --shared)"
 
-#: lexsup.c:254
+#: lexsup.c:238
 msgid "FILENAME"
 msgstr "NOM DE FICHIER"
 
-#: lexsup.c:254
+#: lexsup.c:238
 msgid "Set internal name of shared library"
 msgstr "Initialisé le nom interne de la bibliothèque partagée"
 
-#: lexsup.c:256
+#: lexsup.c:240
 msgid "PROGRAM"
 msgstr "PROGRAMME"
 
-#: lexsup.c:256
+#: lexsup.c:240
 msgid "Set PROGRAM as the dynamic linker to use"
 msgstr "Utiliser le PROGRAM comme éditeur de liens dynamique"
 
-#: lexsup.c:259
+#: lexsup.c:243
 msgid "LIBNAME"
 msgstr "LIBNAME"
 
-#: lexsup.c:259
+#: lexsup.c:243
 msgid "Search for library LIBNAME"
 msgstr "Recherche de la bibliothèque LIBNAME"
 
-#: lexsup.c:261
+#: lexsup.c:245
 msgid "DIRECTORY"
 msgstr "RÉPERTOIRE"
 
-#: lexsup.c:261
+#: lexsup.c:245
 msgid "Add DIRECTORY to library search path"
 msgstr "Ajout du RÉPERTOIRE au chemin de recherche des bibliothèques"
 
-#: lexsup.c:264
+#: lexsup.c:248
 msgid "Override the default sysroot location"
 msgstr "Localisation de sysroot par défaut est écrasée"
 
-#: lexsup.c:266
+#: lexsup.c:250
 msgid "EMULATION"
 msgstr "ÉMULATION"
 
-#: lexsup.c:266
+#: lexsup.c:250
 msgid "Set emulation"
 msgstr "Initialisation de l'émuilation"
 
-#: lexsup.c:268
+#: lexsup.c:252
 msgid "Print map file on standard output"
 msgstr "Afficher le fichier de projection sur la sortie standard"
 
-#: lexsup.c:270
+#: lexsup.c:254
 msgid "Do not page align data"
 msgstr "Ne pas paginer l'alignement des données"
 
-#: lexsup.c:272
+#: lexsup.c:256
 msgid "Do not page align data, do not make text readonly"
 msgstr "Ne pas paginer l'alignement des donnnées, ne pas faire de texte en lecture seulement"
 
-#: lexsup.c:275
+#: lexsup.c:259
 msgid "Page align data, make text readonly"
 msgstr "Données d'alignement de page, texte en mis en mode lecture seulement"
 
-#: lexsup.c:278
+#: lexsup.c:262
 msgid "Set output file name"
 msgstr "Initialisé le nom du fichier de sortie"
 
-#: lexsup.c:280
+#: lexsup.c:264
 msgid "Optimize output file"
 msgstr "Optimisé le fichier de sortie"
 
-#: lexsup.c:283
-msgid "PLUGIN"
-msgstr "GREFFON"
-
-#: lexsup.c:283
-msgid "Load named plugin"
-msgstr "Charger le greffon nommé"
-
-#: lexsup.c:285
-msgid "ARG"
-msgstr "ARGUMENT"
-
-#: lexsup.c:285
-msgid "Send arg to last-loaded plugin"
-msgstr "Envoyer l'argument au dernier greffon chargé"
-
-#: lexsup.c:287 lexsup.c:290
-msgid "Ignored for GCC LTO option compatibility"
-msgstr "Ignoré pour la compatibilité avec l'option LTO de GCC"
-
-#: lexsup.c:294
+#: lexsup.c:266
 msgid "Ignored for SVR4 compatibility"
 msgstr "Ignoré pour la compatibilité avec SVR4"
 
-#: lexsup.c:298
+#: lexsup.c:270
 msgid "Generate relocatable output"
 msgstr "Générer une sortie relocalisable"
 
-#: lexsup.c:302
+#: lexsup.c:274
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr "Juste lier les symboles (si répertoire, identique à --rpath)"
 
-#: lexsup.c:305
+#: lexsup.c:277
 msgid "Strip all symbols"
 msgstr "Élaguer tous les symboles"
 
-#: lexsup.c:307
+#: lexsup.c:279
 msgid "Strip debugging symbols"
 msgstr "Élaguer tous les symboles de débug"
 
-#: lexsup.c:309
+#: lexsup.c:281
 msgid "Strip symbols in discarded sections"
 msgstr "Éliminer les symboles des sections éliminées"
 
-#: lexsup.c:311
+#: lexsup.c:283
 msgid "Do not strip symbols in discarded sections"
 msgstr "Ne pas éliminer les symboles des sections éliminées"
 
-#: lexsup.c:313
+#: lexsup.c:285
 msgid "Trace file opens"
 msgstr "Ouverture des fichiers de trace"
 
-#: lexsup.c:315
+#: lexsup.c:287
 msgid "Read linker script"
 msgstr "Lecture du script de l'éditeur de lien"
 
-#: lexsup.c:317
+#: lexsup.c:289
 msgid "Read default linker script"
 msgstr "Lecture du script par défaut de l'éditeur de lien"
 
-#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
-#: lexsup.c:572 lexsup.c:611
+#: lexsup.c:293 lexsup.c:311 lexsup.c:379 lexsup.c:400 lexsup.c:494
+#: lexsup.c:519 lexsup.c:554
 msgid "SYMBOL"
 msgstr "SYMBOLE"
 
-#: lexsup.c:321
+#: lexsup.c:293
 msgid "Start with undefined reference to SYMBOL"
 msgstr "Débuter avec une référence indéfinie au SYMBOLE"
 
-#: lexsup.c:324
+#: lexsup.c:296
 msgid "[=SECTION]"
 msgstr "[=SECTION]"
 
-#: lexsup.c:325
+#: lexsup.c:297
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr "Ne pas fusionner les sections d'entrée [SECTION | orpheline]"
 
-#: lexsup.c:327
+#: lexsup.c:299
 msgid "Build global constructor/destructor tables"
 msgstr "Bâtir les tables de constructeurs/destructeurs globaux"
 
-#: lexsup.c:329
+#: lexsup.c:301
 msgid "Print version information"
 msgstr "Afficher les informations de version"
 
-#: lexsup.c:331
+#: lexsup.c:303
 msgid "Print version and emulation information"
 msgstr "Afficher les information de version et d'émulation"
 
-#: lexsup.c:333
+#: lexsup.c:305
 msgid "Discard all local symbols"
 msgstr "Ignorer tous les symboles locaux"
 
-#: lexsup.c:335
+#: lexsup.c:307
 msgid "Discard temporary local symbols (default)"
 msgstr "Ignorer tous les symboles locaux temporaires (par défaut)"
 
-#: lexsup.c:337
+#: lexsup.c:309
 msgid "Don't discard any local symbols"
 msgstr "Ne pas ignorer tous les symboles locaux"
 
-#: lexsup.c:339
+#: lexsup.c:311
 msgid "Trace mentions of SYMBOL"
 msgstr "Tracer les mentions de SYMBOLE"
 
-#: lexsup.c:341 lexsup.c:508 lexsup.c:510
+#: lexsup.c:313 lexsup.c:461 lexsup.c:463
 msgid "PATH"
 msgstr "CHEMIN"
 
-#: lexsup.c:341
+#: lexsup.c:313
 msgid "Default search path for Solaris compatibility"
 msgstr "Chemin par défaut de recherche pour la compatibilité Solaris"
 
-#: lexsup.c:344
+#: lexsup.c:316
 msgid "Start a group"
 msgstr "Débuter un groupe"
 
-#: lexsup.c:346
+#: lexsup.c:318
 msgid "End a group"
 msgstr "Terminer un groupe"
 
-#: lexsup.c:350
+#: lexsup.c:322
 msgid "Accept input files whose architecture cannot be determined"
 msgstr "Accepter les fichiers à l'entrée dont l'architecture ne peut être déterminée"
 
-#: lexsup.c:354
+#: lexsup.c:326
 msgid "Reject input files whose architecture is unknown"
 msgstr "Rejeter les fichiers à l'entrée dont l'architecture est inconnue"
 
-#: lexsup.c:366
-msgid "Only set DT_NEEDED for following dynamic libs if used"
-msgstr "Initialiser seulement DT_NEEDED pour les bibliothèques dynamiques suivantes si utilisées"
+#: lexsup.c:329
+msgid ""
+"Set DT_NEEDED tags for DT_NEEDED entries in\n"
+"\t\t\t\tfollowing dynamic libs"
+msgstr ""
+"Initialiser les  étiquettes DT_NEEDED pour les entrées DT_NEEDED dans\n"
+"\t\t\t\tsuivant les bibliothèques dynamiques"
 
-#: lexsup.c:369
+#: lexsup.c:332
 msgid ""
-"Always set DT_NEEDED for dynamic libraries mentioned on\n"
-"                                the command line"
+"Do not set DT_NEEDED tags for DT_NEEDED entries\n"
+"\t\t\t\tin following dynamic libs"
 msgstr ""
-"Toujours définir DT_NEEDED pour les bibliothèqes dynamiques mentionnées en\n"
-"                                ligne de commande"
+"Ne pas initialiser les étiquettes DT_NEEDED pour les entrées DT_NEEDED\n"
+"\t\t\t\tsuivant les bibliothèques dynamiques"
+
+#: lexsup.c:335
+msgid "Only set DT_NEEDED for following dynamic libs if used"
+msgstr "Initialiser seulement DT_NEEDED pour les bibliothèques dynamiques suivantes si utilisées"
+
+#: lexsup.c:338
+msgid "Always set DT_NEEDED for following dynamic libs"
+msgstr "Toujours initialiser DT_NEEDED pour les bibliothèques dynamiques suivantes"
 
-#: lexsup.c:373
+#: lexsup.c:341
 msgid "Ignored for SunOS compatibility"
 msgstr "Ignoré pour la compatibilité avec SunOS"
 
-#: lexsup.c:375
+#: lexsup.c:343
 msgid "Link against shared libraries"
 msgstr "Établir des liens vis à vis des bibliothèques partagées"
 
-#: lexsup.c:381
+#: lexsup.c:349
 msgid "Do not link against shared libraries"
 msgstr "Ne pas établir de liens vis à vis des bibliothèques partagées"
 
-#: lexsup.c:389
+#: lexsup.c:357
 msgid "Bind global references locally"
 msgstr "Lier les référence locales globales"
 
-#: lexsup.c:391
+#: lexsup.c:359
 msgid "Bind global function references locally"
 msgstr "Lier localement les référence globales à des fonctions"
 
-#: lexsup.c:393
+#: lexsup.c:361
 msgid "Check section addresses for overlaps (default)"
 msgstr "Vérifier les adresses de section pour le chevauchement (par défaut)"
 
-#: lexsup.c:396
+#: lexsup.c:364
 msgid "Do not check section addresses for overlaps"
 msgstr "Ne pas vérifier les adresses des sections pour le chevauchement"
 
-#: lexsup.c:400
-msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
-msgstr "Copier les liens DT_NEEDED mentionnés dans les DSO qui suivent"
-
-#: lexsup.c:404
-msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
-msgstr "Ne pas copier les liens DT_NEEDED mentionnés dans les DSO qui suivent"
-
-#: lexsup.c:408
+#: lexsup.c:367
 msgid "Output cross reference table"
 msgstr "Produire la table des références croisées"
 
-#: lexsup.c:410
+#: lexsup.c:369
 msgid "SYMBOL=EXPRESSION"
 msgstr "SYMBOLE=EXPRESSION"
 
-#: lexsup.c:410
+#: lexsup.c:369
 msgid "Define a symbol"
 msgstr "Définir un symbole"
 
-#: lexsup.c:412
+#: lexsup.c:371
 msgid "[=STYLE]"
 msgstr "[=STYLE]"
 
-#: lexsup.c:412
+#: lexsup.c:371
 msgid "Demangle symbol names [using STYLE]"
 msgstr "Recouvrir les noms des symboles encodés par mutilisation [utilisant le STYLE]"
 
-#: lexsup.c:415
+#: lexsup.c:374
 msgid "Generate embedded relocs"
 msgstr "Générer des relocalisations imbriqués"
 
-#: lexsup.c:417
+#: lexsup.c:376
 msgid "Treat warnings as errors"
 msgstr "Traiter les avertissements comme des erreurs"
 
-#: lexsup.c:420
-msgid "Do not treat warnings as errors (default)"
-msgstr "Ne pas traiter les avertissements comme des erreurs (défaut)"
-
-#: lexsup.c:423
+#: lexsup.c:379
 msgid "Call SYMBOL at unload-time"
 msgstr "Appeler le SYMBOLE au moment du déchargement"
 
-#: lexsup.c:425
+#: lexsup.c:381
 msgid "Force generation of file with .exe suffix"
 msgstr "Force la génération de fichier avec le suffixe .exe"
 
-#: lexsup.c:427
+#: lexsup.c:383
 msgid "Remove unused sections (on some targets)"
 msgstr "Enlever les sections inutilisées (sur quelques cibles)"
 
-#: lexsup.c:430
+#: lexsup.c:386
 msgid "Don't remove unused sections (default)"
 msgstr "Ne pas enlever les sections inutilisées (par défaut)"
 
-#: lexsup.c:433
+#: lexsup.c:389
 msgid "List removed unused sections on stderr"
 msgstr "Afficher sur stderr la liste des sections inutilisées et supprimées"
 
-#: lexsup.c:436
+#: lexsup.c:392
 msgid "Do not list removed unused sections"
 msgstr "Ne pas afficher la liste des sections inutilisées supprimées"
 
-#: lexsup.c:439
+#: lexsup.c:395
 msgid "Set default hash table size close to <NUMBER>"
 msgstr "Initialiser la table de hachage par défaut près de <NUMÉRO>"
 
-#: lexsup.c:442
+#: lexsup.c:398
 msgid "Print option help"
 msgstr "Afficher l'aide-mémoire"
 
-#: lexsup.c:444
+#: lexsup.c:400
 msgid "Call SYMBOL at load-time"
 msgstr "Appeler le SYMBOLE au moment du chargement"
 
-#: lexsup.c:446
+#: lexsup.c:402
 msgid "Write a map file"
 msgstr "Écrire un fichier de projection"
 
-#: lexsup.c:448
+#: lexsup.c:404
 msgid "Do not define Common storage"
 msgstr "Ne pas définir le stockage commun"
 
-#: lexsup.c:450
+#: lexsup.c:406
 msgid "Do not demangle symbol names"
 msgstr "Ne pas recouvrir les noms des symboles encodés par mutilisation"
 
-#: lexsup.c:452
+#: lexsup.c:408
 msgid "Use less memory and more disk I/O"
 msgstr "Utiliser moins de mémoire et plus d'espace disque"
 
-#: lexsup.c:454
+#: lexsup.c:410
 msgid "Do not allow unresolved references in object files"
 msgstr "Ne pas permettre les références indéfinis dans les objets partagés"
 
-#: lexsup.c:457
-msgid "Allow unresolved references in shared libraries"
+#: lexsup.c:413
+msgid "Allow unresolved references in shared libaries"
 msgstr "Permettre les références non résolues dans les bibliothèques partagées"
 
-#: lexsup.c:461
+#: lexsup.c:417
 msgid "Do not allow unresolved references in shared libs"
 msgstr "Ne pas permettre les références non résolues dans les bibliothèques partagés"
 
-#: lexsup.c:465
+#: lexsup.c:421
 msgid "Allow multiple definitions"
 msgstr "Autoriser des définitions multiples"
 
-#: lexsup.c:467
+#: lexsup.c:423
 msgid "Disallow undefined version"
 msgstr "Ne pas permettre de version indéfinie"
 
-#: lexsup.c:469
+#: lexsup.c:425
 msgid "Create default symbol version"
 msgstr "Créer la version de symbole par défaut"
 
-#: lexsup.c:472
+#: lexsup.c:428
 msgid "Create default symbol version for imported symbols"
 msgstr "Créer la version de symbole par défaut pour les symboles importés"
 
-#: lexsup.c:475
+#: lexsup.c:431
 msgid "Don't warn about mismatched input files"
 msgstr "Ne pas avertir à propos des non-concordances dans les fichiers d'entrée"
 
-#: lexsup.c:478
+#: lexsup.c:434
 msgid "Don't warn on finding an incompatible library"
 msgstr "Ne pas avertir lorsqu'une bibliothèque incompatible est trouvée"
 
-#: lexsup.c:481
+#: lexsup.c:437
 msgid "Turn off --whole-archive"
 msgstr "Désactiver --whole-archive"
 
-#: lexsup.c:483
+#: lexsup.c:439
 msgid "Create an output file even if errors occur"
 msgstr "Créer un fichier de sortie même si des erreurs surviennent"
 
-#: lexsup.c:488
+#: lexsup.c:444
 msgid ""
 "Only use library directories specified on\n"
-"                                the command line"
+"\t\t\t\tthe command line"
 msgstr ""
-"Utiliser seulement les répertoires de bibliothèques spécifiés sur\n"
-"                                la ligne de commande"
+"Utiliser seuelement les répertoires de bibliothèques spécifiés sur\n"
+"la ligne de commande"
 
-#: lexsup.c:492
+#: lexsup.c:447
 msgid "Specify target of output file"
 msgstr "Spécifier un fichier cible de sortie"
 
-#: lexsup.c:495
+#: lexsup.c:450
 msgid "Ignored for Linux compatibility"
 msgstr "Ignoré pour la compatibilité avec Linux"
 
-#: lexsup.c:498
+#: lexsup.c:453
 msgid "Reduce memory overheads, possibly taking much longer"
 msgstr "Réduire la surcharge en mémoire, en prenant possiblement plus de temps"
 
-#: lexsup.c:501
-msgid "Reduce code size by using target specific optimizations"
-msgstr "Réduire la taille du code en utilisant des optimisations spécifiques à la cible"
-
-#: lexsup.c:503
-msgid "Do not use relaxation techniques to reduce code size"
-msgstr "Ne pas utiliser de technique de relaxation pour réduire la taille du code"
+#: lexsup.c:456
+msgid "Relax branches on certain targets"
+msgstr "Relâcher les branches de certaines cibles"
 
-#: lexsup.c:506
+#: lexsup.c:459
 msgid "Keep only symbols listed in FILE"
 msgstr "Conserver uniquement les symboles listés dans le FICHIER"
 
-#: lexsup.c:508
+#: lexsup.c:461
 msgid "Set runtime shared library search path"
 msgstr "Initialisé le chemin de recherche des bibliothèques partagées pour l'exécution"
 
-#: lexsup.c:510
+#: lexsup.c:463
 msgid "Set link time shared library search path"
 msgstr "Initialisé le chemin de recherche des bibliothèques partagées pour l'édition de liens"
 
-#: lexsup.c:513
+#: lexsup.c:466
 msgid "Create a shared library"
 msgstr "Créer une bibliothèque partagée"
 
-#: lexsup.c:517
+#: lexsup.c:470
 msgid "Create a position independent executable"
 msgstr "Créer un exécutable à position indépendante"
 
-#: lexsup.c:521
-msgid "[=ascending|descending]"
-msgstr "[=croissant|décroissant]"
-
-#: lexsup.c:522
-msgid "Sort common symbols by alignment [in specified order]"
-msgstr "Trier les symboles communs par taille [dans l'ordre spécifié]"
+#: lexsup.c:474
+msgid "Sort common symbols by size"
+msgstr "Trier les symboles communs par taille"
 
-#: lexsup.c:527
+#: lexsup.c:478
 msgid "name|alignment"
 msgstr "nom|alignement"
 
-#: lexsup.c:528
+#: lexsup.c:479
 msgid "Sort sections by name or maximum alignment"
 msgstr "Tries les sections par le nom ou l'alignement maximal"
 
-#: lexsup.c:530
+#: lexsup.c:481
 msgid "COUNT"
 msgstr "DÉCOMPTE"
 
-#: lexsup.c:530
+#: lexsup.c:481
 msgid "How many tags to reserve in .dynamic section"
 msgstr "Combien d'étiquettes réservées dans la section .dynamic"
 
-#: lexsup.c:533
+#: lexsup.c:484
 msgid "[=SIZE]"
 msgstr "[=TAILLE]"
 
-#: lexsup.c:533
+#: lexsup.c:484
 msgid "Split output sections every SIZE octets"
 msgstr "Découper à la sortie les sections à chaque NOMBRE d'octets"
 
-#: lexsup.c:536
+#: lexsup.c:487
 msgid "[=COUNT]"
 msgstr "[=DÉCOMPTE]"
 
-#: lexsup.c:536
+#: lexsup.c:487
 msgid "Split output sections every COUNT relocs"
 msgstr "Découper à la sortie les sections à chaque NOMBRE de relocalisations"
 
-#: lexsup.c:539
+#: lexsup.c:490
 msgid "Print memory usage statistics"
 msgstr "Afficher les statistiques de l'utilisation de la mémoire"
 
-#: lexsup.c:541
+#: lexsup.c:492
 msgid "Display target specific options"
 msgstr "Afficher les options spécifiques cibles"
 
-#: lexsup.c:543
+#: lexsup.c:494
 msgid "Do task level linking"
 msgstr "Composer des liens au niveau de l'exécution de la tache"
 
-#: lexsup.c:545
+#: lexsup.c:496
 msgid "Use same format as native linker"
 msgstr "Utiliser le même format que l'éditeur de lien natif"
 
-#: lexsup.c:547
+#: lexsup.c:498
 msgid "SECTION=ADDRESS"
 msgstr "SECTION=ADRESSE"
 
-#: lexsup.c:547
+#: lexsup.c:498
 msgid "Set address of named section"
 msgstr "Initialisé l'adresse de la section nommé"
 
-#: lexsup.c:550
+#: lexsup.c:501
 msgid "Set address of .bss section"
 msgstr "Initialisé l'adresse de la section .bss"
 
-#: lexsup.c:552
+#: lexsup.c:503
 msgid "Set address of .data section"
 msgstr "Initialisé l'adresse de la section .data"
 
-#: lexsup.c:554
+#: lexsup.c:505
 msgid "Set address of .text section"
 msgstr "Initialisé l'adresse de la section .text"
 
-#: lexsup.c:556
-msgid "Set address of text segment"
-msgstr "Initialise l'adresse des segments de texte"
-
-#: lexsup.c:559
+#: lexsup.c:508
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
-"                                ignore-all, report-all, ignore-in-object-files,\n"
-"                                ignore-in-shared-libs"
+"\t\t\t\tignore-all, report-all, ignore-in-object-files,\n"
+"\t\t\t\tignore-in-shared-libs"
 msgstr ""
 "Comment traiter les symboles non résolus.  <méthode> est:\n"
-"                                ignore-all, report-all, ignore-in-object-files,\n"
-"                                ignore-in-shared-libs"
+"\t\t\t\tignore-all, report-all, ignore-in-object-files,\n"
+"\t\t\t\tignore-in-shared-libs"
 
-#: lexsup.c:564
-msgid "[=NUMBER]"
-msgstr "[=NUMERO]"
-
-#: lexsup.c:565
+#: lexsup.c:512
 msgid "Output lots of information during link"
 msgstr "Afficher des tas d'information durant l'édition de lien"
 
-#: lexsup.c:569
+#: lexsup.c:516
 msgid "Read version information script"
 msgstr "Lire le script des informations de version"
 
-#: lexsup.c:572
+#: lexsup.c:519
 msgid ""
 "Take export symbols list from .exports, using\n"
-"                                SYMBOL as the version."
+"\t\t\t\tSYMBOL as the version."
 msgstr ""
 "Prendre la liste des symboles exportés de .exports, en utilisant\n"
-"                                SYMBOLE comme version."
+"\t\t\t\tSYMBOLE comme version."
 
-#: lexsup.c:576
+#: lexsup.c:522
 msgid "Add data symbols to dynamic list"
 msgstr "Ajouter les symboles de données à la liste dynamique"
 
-#: lexsup.c:578
+#: lexsup.c:524
 msgid "Use C++ operator new/delete dynamic list"
 msgstr "Utiliser la liste dynamique d'opérateur C++ new/delete"
 
-#: lexsup.c:580
+#: lexsup.c:526
 msgid "Use C++ typeinfo dynamic list"
 msgstr "Utiliser la liste dynamique C++ typeinfo"
 
-#: lexsup.c:582
+#: lexsup.c:528
 msgid "Read dynamic list"
 msgstr "Lire la liste dynamique"
 
-#: lexsup.c:584
+#: lexsup.c:530
 msgid "Warn about duplicate common symbols"
 msgstr "AVERTIR au sujet des symboles communs dupliqués"
 
-#: lexsup.c:586
+#: lexsup.c:532
 msgid "Warn if global constructors/destructors are seen"
 msgstr "AVERTIR si des constructeurs/destructeurs globaux sont détectés"
 
-#: lexsup.c:589
+#: lexsup.c:535
 msgid "Warn if the multiple GP values are used"
 msgstr "AVERTIR si des valeurs GP multiples sont utilisées"
 
-#: lexsup.c:591
+#: lexsup.c:537
 msgid "Warn only once per undefined symbol"
 msgstr "AVERTIR seulement une fois pour chaque symbole indéfini"
 
-#: lexsup.c:593
+#: lexsup.c:539
 msgid "Warn if start of section changes due to alignment"
 msgstr "AVERTIR si le début de la section est modifié en raison de l'alignement"
 
-#: lexsup.c:596
+#: lexsup.c:542
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr "Avertir si l'objet partagé a DT_TEXTREL"
 
-#: lexsup.c:599
-msgid "Warn if an object has alternate ELF machine code"
-msgstr "Avertir si un objet a un un code machine ELF alternatif"
-
-#: lexsup.c:603
+#: lexsup.c:546
 msgid "Report unresolved symbols as warnings"
 msgstr "Rapporter les symboles non résolus par avertissement"
 
-#: lexsup.c:606
+#: lexsup.c:549
 msgid "Report unresolved symbols as errors"
 msgstr "Rapporter des symboles non résolus comme des errreurs"
 
-#: lexsup.c:608
+#: lexsup.c:551
 msgid "Include all objects from following archives"
 msgstr "Inclure tous les objets des archives suivantes"
 
-#: lexsup.c:611
+#: lexsup.c:554
 msgid "Use wrapper functions for SYMBOL"
 msgstr "Utiliser les fonctions d'emballage pour SYMBOLE"
 
-#: lexsup.c:760
+#: lexsup.c:701
 msgid "%P: unrecognized option '%s'\n"
 msgstr "%P: option « %s » non reocnnue\n"
 
-#: lexsup.c:764
+#: lexsup.c:705
 msgid "%P%F: use the --help option for usage information\n"
 msgstr "%P%F: utiliser --help pour afficher l'aide-mémoire\n"
 
-#: lexsup.c:782
+#: lexsup.c:723
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr "%P%F: -a option non reocnnue « %s »\n"
 
-#: lexsup.c:795
+#: lexsup.c:736
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr "%P%F: -assert option non reconnue « %s »\n"
 
-#: lexsup.c:838
+#: lexsup.c:779
 msgid "%F%P: unknown demangling style `%s'"
 msgstr "%F%P: style inconnu de recouvrement du transcodage par mutilisation « %s »"
 
-#: lexsup.c:904 lexsup.c:1335
+#: lexsup.c:841
 msgid "%P%F: invalid number `%s'\n"
 msgstr "%P%F: nombre invalide « %s »\n"
 
-#: lexsup.c:1002
+#: lexsup.c:939
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr "%P%F: option erronée de --unresolved-symbols: %s\n"
 
-#: lexsup.c:1065 lexsup.c:1564
-msgid "%P%F: %s: error loading plugin\n"
-msgstr "%P%F: %s: Erreur lors du chargement du greffon\n"
-
-#: lexsup.c:1070
-msgid "%P%F: bad -plugin-opt option\n"
-msgstr "%P%F: mauvaise option -plugin-opt\n"
-
 #. This can happen if the user put "-rpath,a" on the command
 #. line.  (Or something similar.  The comma is important).
 #. Getopt becomes confused and thinks that this is a -r option
@@ -2017,273 +1825,169 @@ msgstr "%P%F: mauvaise option -plugin-opt\n"
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1087
+#: lexsup.c:1013
 msgid "%P%F: bad -rpath option\n"
 msgstr "%P%F: option -rpath non reconnue\n"
 
-#: lexsup.c:1201
+#: lexsup.c:1124
 msgid "%P%F: -shared not supported\n"
 msgstr "%P%F: -shared non supporté\n"
 
-#: lexsup.c:1210
+#: lexsup.c:1133
 msgid "%P%F: -pie not supported\n"
 msgstr "%P%F: -pie n'est pas supportée\n"
 
-#: lexsup.c:1218
-msgid "descending"
-msgstr "décroissant"
-
-#: lexsup.c:1220
-msgid "ascending"
-msgstr "croissant"
-
-#: lexsup.c:1223
-msgid "%P%F: invalid common section sorting option: %s\n"
-msgstr "%P%F: option de trie de section invalide: %s\n"
-
-#: lexsup.c:1227
+#: lexsup.c:1143
 msgid "name"
 msgstr "nom"
 
-#: lexsup.c:1229
+#: lexsup.c:1145
 msgid "alignment"
 msgstr "alignement"
 
-#: lexsup.c:1232
+#: lexsup.c:1148
 msgid "%P%F: invalid section sorting option: %s\n"
 msgstr "%P%F:option de trie de section invalide: %s\n"
 
-#: lexsup.c:1266
+#: lexsup.c:1180
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr "%P%F: argument invalide pour l'option \"--section-start\"\n"
 
-#: lexsup.c:1273
+#: lexsup.c:1187
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr "%P%F: argument(s) manquant(s) pour l'option \"--section-start\"\n"
 
-#: lexsup.c:1507
+#: lexsup.c:1398
+msgid "%P%F: may not nest groups (--help for usage)\n"
+msgstr "%P%F: ne peut imbriquer les groupes (--help pour l'usage)\n"
+
+#: lexsup.c:1405
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr "%P%F: fin du groupe avant son début (--help pour l'usage)\n"
 
-#: lexsup.c:1535
+#: lexsup.c:1433
 msgid "%P%X: --hash-size needs a numeric argument\n"
 msgstr "%P%X: --hash-size a beoin d'un argument numérique\n"
 
-#: lexsup.c:1595 lexsup.c:1608
+#: lexsup.c:1484 lexsup.c:1497
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr "%P%F: nombre hexadécimal invalide « %s »\n"
 
-#: lexsup.c:1644
+#: lexsup.c:1533
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr "Usage: %s [options] fichier...\n"
 
-#: lexsup.c:1646
+#: lexsup.c:1535
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: lexsup.c:1724
+#: lexsup.c:1613
 #, c-format
 msgid "  @FILE"
 msgstr "  @FICHIER"
 
-#: lexsup.c:1727
+#: lexsup.c:1616
 #, c-format
 msgid "Read options from FILE\n"
 msgstr "Lire les options à partir du FICHIER\n"
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1732
+#: lexsup.c:1621
 #, c-format
 msgid "%s: supported targets:"
 msgstr "%s: cibles supportées:"
 
-#: lexsup.c:1740
+#: lexsup.c:1629
 #, c-format
 msgid "%s: supported emulations: "
 msgstr "%s: émulations supportées: "
 
-#: lexsup.c:1745
+#: lexsup.c:1634
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr "%s: options spécifiques d'émulation:\n"
 
-#: lexsup.c:1750
+#: lexsup.c:1639
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr "Rapporter toutes anomalies à %s\n"
 
-#: mri.c:292
+#: mri.c:291
 msgid "%P%F: unknown format type %s\n"
 msgstr "%P%F: type de format inconnu %s\n"
 
-#: pe-dll.c:431
+#: pe-dll.c:367
 #, c-format
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr "%XArchitecture PEI non supportée: %s\n"
 
-#: pe-dll.c:791
+#: pe-dll.c:673
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
 msgstr "%XNe peut exporter %s: nom d'export invalide\n"
 
-#: pe-dll.c:848
+#: pe-dll.c:729
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr "%XErreur, duplicattion EXPORT avec nombre ordinal: %s (%d vs %d)\n"
 
-#: pe-dll.c:855
+#: pe-dll.c:736
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr "AVERTISSEMENT, duplication EXPORT: %s\n"
 
-#: pe-dll.c:942
+#: pe-dll.c:823
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr "%XNe peut exporter %s: symbole indéfini\n"
 
-#: pe-dll.c:948
+#: pe-dll.c:829
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr "%XNe peut exporter %s: mauvais type de symbole (%d vs %d)\n"
 
-#: pe-dll.c:955
+#: pe-dll.c:836
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr "%XNe peut exporter %s: symbole non repéré\n"
 
-#: pe-dll.c:1069
+#: pe-dll.c:949
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr "%XErreur, ordinal utilisé 2 fois: %d (%s vs %s)\n"
 
-#: pe-dll.c:1450
+#: pe-dll.c:1297
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr "%XErreur: %d-bit relocalisation dans dll\n"
 
-#: pe-dll.c:1578
+#: pe-dll.c:1425
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr "%s: ne peut ouvrir le fichier def %s\n"
 
-#: pe-dll.c:1729
+#: pe-dll.c:1568
 #, c-format
 msgid "; no contents available\n"
 msgstr "; aucun contenu disponible\n"
 
-#: pe-dll.c:2656
+#: pe-dll.c:2364
 msgid "%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"
 msgstr "%C: variable « %T » ne peut être auto-importée. SVP lire la documentation de ld --enable-auto-import pour plus de détails.\n"
 
-#: pe-dll.c:2686
+#: pe-dll.c:2394
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr "%XNe peut ouvrir le fichier .lib: %s\n"
 
-#: pe-dll.c:2691
+#: pe-dll.c:2399
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr "Création du fichier de bibliothèque: %s\n"
 
-#: pe-dll.c:2720
-#, c-format
-msgid "%Xbfd_openr %s: %E\n"
-msgstr "%Xbfd_openr %s: %E\n"
-
-#: pe-dll.c:2732
-#, c-format
-msgid "%X%s(%s): can't find member in non-archive file"
-msgstr "%X%s(%s): impossible de trouver le membre dans le fichier qui n'est pas une archive"
-
-#: pe-dll.c:2744
-#, c-format
-msgid "%X%s(%s): can't find member in archive"
-msgstr "%X%s(%s): impossible de trouver le membre dans l'archive"
-
-#: pe-dll.c:3183
-#, c-format
-msgid "%XError: can't use long section names on this arch\n"
-msgstr "%XError: Impossible d'utiliser de longs noms de section pour cette architecture\n"
-
-#: plugin.c:176 plugin.c:210
-msgid "<no plugin>"
-msgstr "<no plugin>"
-
-#: plugin.c:249
-#, c-format
-msgid "could not create dummy IR bfd: %F%E\n"
-msgstr "impossible de créer l'IR bfd factice: %F%E\n"
-
-#: plugin.c:322
-msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
-msgstr "%P%F: %s: symbole non conforme au format ELF dans ELF BFD !\n"
-
-#: plugin.c:326
-msgid "%P%F: unknown ELF symbol visibility: %d!\n"
-msgstr "%P%F: symbole de visibilité ELF inconnu: %d !\n"
-
-#: plugin.c:559
-msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
-msgstr "%P: %B: définition du symbole «%s»: %d, visibilité: %d, résolution: %d\n"
-
-#: plugin.c:825
-msgid "%P%F: %s: plugin reported error claiming file\n"
-msgstr "%P%F: %s: le greffon à signalé une erreur lors de la recherche d'un fichier\n"
-
-#: plugin.c:896
-msgid "%P: %s: error in plugin cleanup (ignored)\n"
-msgstr "%P: %s: Erreur lors du nettoyage du greffon (ignoré)\n"
-
-#~ msgid "  --support-old-code   Support interworking with old code\n"
-#~ msgstr "  --support-old-code   supporter les veilles versions de code\n"
-
-#~ msgid "%B%F: could not read symbols; %E\n"
-#~ msgstr "%B%F: ne peut lire les symboles; %E\n"
-
-#~ msgid "%F%S nonconstant expression for %s\n"
-#~ msgstr "%F%S expression d'une non constante: %s\n"
-
-#~ msgid "%F%P: %s (%s): No such file: %E\n"
-#~ msgstr "%F%P: %s (%s): pas de fichier tel: %E\n"
-
-#~ msgid "%F%P: %s: No such file: %E\n"
-#~ msgstr "%F%P: %s: pas de fichier tel: %E\n"
-
-#~ msgid "%X%P: region %s is full (%B section %s)\n"
-#~ msgstr "%X%P: région %s est pleine (%B section %s)\n"
-
-#~ msgid "%P%F: --relax and -r may not be used together\n"
-#~ msgstr "%P%F: --relax et -r ne peuvent être utilisés ensemble\n"
-
-#~ msgid "%B%F: could not read symbols\n"
-#~ msgstr "%B%F: ne peut lire les symboles\n"
-
-#~ msgid ""
-#~ "Set DT_NEEDED tags for DT_NEEDED entries in\n"
-#~ "\t\t\t\tfollowing dynamic libs"
-#~ msgstr ""
-#~ "Initialiser les  étiquettes DT_NEEDED pour les entrées DT_NEEDED dans\n"
-#~ "\t\t\t\tsuivant les bibliothèques dynamiques"
-
-#~ msgid ""
-#~ "Do not set DT_NEEDED tags for DT_NEEDED entries\n"
-#~ "\t\t\t\tin following dynamic libs"
-#~ msgstr ""
-#~ "Ne pas initialiser les étiquettes DT_NEEDED pour les entrées DT_NEEDED\n"
-#~ "\t\t\t\tsuivant les bibliothèques dynamiques"
-
-#~ msgid "Always set DT_NEEDED for following dynamic libs"
-#~ msgstr "Toujours initialiser DT_NEEDED pour les bibliothèques dynamiques suivantes"
-
-#~ msgid "Relax branches on certain targets"
-#~ msgstr "Relâcher les branches de certaines cibles"
-
-#~ msgid "%P%F: may not nest groups (--help for usage)\n"
-#~ msgstr "%P%F: ne peut imbriquer les groupes (--help pour l'usage)\n"
-
 #~ msgid "%F%S non constant expression for %s\n"
 #~ msgstr "%F%S expression de non constante: %s\n"
 
@@ -2308,6 +2012,9 @@ msgstr "%P: %s: Erreur lors du nettoyage du greffon (ignoré)\n"
 #~ msgid "%F%P: cannot open %s: %E\n"
 #~ msgstr "%F%P: ne peut ouvrir %s: %E\n"
 
+#~ msgid "%P%F: unknown architecture: %s\n"
+#~ msgstr "%P%F: architecture inconnue: %s\n"
+
 #~ msgid "%P%F: target architecture respecified\n"
 #~ msgstr "%P%F: architecture cible re-spécifiée\n"
 
@@ -2345,12 +2052,18 @@ msgstr "%P: %s: Erreur lors du nettoyage du greffon (ignoré)\n"
 #~ msgid "                                       create __imp_<SYMBOL> as well.\n"
 #~ msgstr "                                       créer  __imp_<SYMBOL> aussi.\n"
 
+#~ msgid "                                       unless user specifies one\n"
+#~ msgstr "                                       à moins que l'usager en spécifie une\n"
+
 #~ msgid "  --dll-search-prefix=<string>       When linking dynamically to a dll witout an\n"
 #~ msgstr "  --dll-search-prefix=<chaîne>       lors du lien dynamique à un DLL sans un\n"
 
 #~ msgid "                                       importlib, use <string><basename>.dll \n"
 #~ msgstr "                                       bibliothèque d'importation, utilier <chaîne><nom_de_base>.dll \n"
 
+#~ msgid "                                       in preference to lib<basename>.dll \n"
+#~ msgstr "                                       à la place de lib<nom_de_base>.dll \n"
+
 #~ msgid "Archive member included"
 #~ msgstr "Membre d'archive inclus"
 
diff --git a/ld/po/ja.po b/ld/po/ja.po
index 0ddf6f2bb8..34910e58db 100644
--- a/ld/po/ja.po
+++ b/ld/po/ja.po
@@ -1,26 +1,21 @@
 # Japanese messages for GNU ld
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
-# Yasuaki Taniguchi <yasuakit@gmail.com>, 2010, 2011.
+# Yasuaki Taniguchi <yasuakit@gmail.com>, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ld 2.21.53\n"
+"Project-Id-Version: ld 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-10-20 05:01+0900\n"
+"POT-Creation-Date: 2010-11-05 11:34+0100\n"
+"PO-Revision-Date: 2010-11-25 19:58+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-# ld 内�利用�れる書�文字列����� ld/ldmisc.c を�照������。
-# 独自�書�文字列を解釈���る部分���置パラメータ (%1$s ��) �利用������注�������。
-#
-#   - 2010/12/27 binutils-2.20.90 �書�文字列��置パラメータ�動作�����を確� (谷�)
 #: emultempl/armcoff.em:73
 #, c-format
 msgid "  --support-old-code          Support interworking with old code\n"
@@ -36,171 +31,171 @@ msgstr "  --thumb-entry=<sym>         エントリãƒ�イントを Thumb シンãƒ
 msgid "Errors encountered processing file %s"
 msgstr "ファイル %s を処�中�エラー�������"
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1813
+#: emultempl/armcoff.em:190 emultempl/pe.em:1812
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr "%P: 警告: '--thumb-entry %s' � '-e %s' を上書����\n"
 
 # thumb �����る�公��� Thumb ���先頭を大文字������
-#: emultempl/armcoff.em:197 emultempl/pe.em:1818
+#: emultempl/armcoff.em:195 emultempl/pe.em:1817
 msgid "%P: warning: cannot find thumb start symbol %s\n"
 msgstr "%P: 警告: Thumb 開始シンボル %s �見��り��ん\n"
 
-#: emultempl/pe.em:419
+#: emultempl/pe.em:418
 #, c-format
 msgid "  --base_file <basefile>             Generate a base file for relocatable DLLs\n"
 msgstr "  --base_file <basefile>             ��置�能 DLL �ベースファイルを生��る\n"
 
-#: emultempl/pe.em:420
+#: emultempl/pe.em:419
 #, c-format
 msgid "  --dll                              Set image base to the default for DLLs\n"
 msgstr "  --dll                              イメージ�ベースを DLL �デフォルト�設定�る\n"
 
-#: emultempl/pe.em:421
+#: emultempl/pe.em:420
 #, c-format
 msgid "  --file-alignment <size>            Set file alignment\n"
 msgstr "  --file-alignment <size>            ファイル整列を設定�る\n"
 
-#: emultempl/pe.em:422
+#: emultempl/pe.em:421
 #, c-format
 msgid "  --heap <size>                      Set initial size of the heap\n"
 msgstr "  --heap <size>                      ヒープ��期サイズを設定�る\n"
 
-#: emultempl/pe.em:423
+#: emultempl/pe.em:422
 #, c-format
 msgid "  --image-base <address>             Set start address of the executable\n"
 msgstr "  --image-base <address>             実行ファイル�開始アドレスを設定�る\n"
 
-#: emultempl/pe.em:424
+#: emultempl/pe.em:423
 #, c-format
 msgid "  --major-image-version <number>     Set version number of the executable\n"
 msgstr "  --major-image-version <number>     実行ファイル��ージョン番�を設定�る\n"
 
-#: emultempl/pe.em:425
+#: emultempl/pe.em:424
 #, c-format
 msgid "  --major-os-version <number>        Set minimum required OS version\n"
 msgstr "  --major-os-version <number>        最���求�れる OS �ージョンを設定�る\n"
 
-#: emultempl/pe.em:426
+#: emultempl/pe.em:425
 #, c-format
 msgid "  --major-subsystem-version <number> Set minimum required OS subsystem version\n"
 msgstr "  --major-subsystem-version <number> 最���求�れる OS サブシステム�ージョンを設定�る\n"
 
-#: emultempl/pe.em:427
+#: emultempl/pe.em:426
 #, c-format
 msgid "  --minor-image-version <number>     Set revision number of the executable\n"
 msgstr "  --minor-image-version <number>     実行ファイル�リビジョン番�を設定�る\n"
 
-#: emultempl/pe.em:428
+#: emultempl/pe.em:427
 #, c-format
 msgid "  --minor-os-version <number>        Set minimum required OS revision\n"
 msgstr "  --minor-os-version <number>        最���求�れる OS リビジョンを設定�る\n"
 
-#: emultempl/pe.em:429
+#: emultempl/pe.em:428
 #, c-format
 msgid "  --minor-subsystem-version <number> Set minimum required OS subsystem revision\n"
 msgstr "  --minor-subsystem-version <number> 最���求�れる OS �サブシステムリビジョンを設定�る\n"
 
-#: emultempl/pe.em:430
+#: emultempl/pe.em:429
 #, c-format
 msgid "  --section-alignment <size>         Set section alignment\n"
 msgstr "  --section-alignment <size>         セクション整列を設定�る\n"
 
-#: emultempl/pe.em:431
+#: emultempl/pe.em:430
 #, c-format
 msgid "  --stack <size>                     Set size of the initial stack\n"
 msgstr "  --stack <size>                     インラインスタック�大��を設定�る\n"
 
-#: emultempl/pe.em:432
+#: emultempl/pe.em:431
 #, c-format
 msgid "  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"
 msgstr "  --subsystem <name>[:<version>]     �求�れる OS �サブシステム [�よ��ージョン] を設定�る\n"
 
-#: emultempl/pe.em:433
+#: emultempl/pe.em:432
 #, c-format
 msgid "  --support-old-code                 Support interworking with old code\n"
 msgstr "  --support-old-code                 ��コード�相互利用をサ�ート�る\n"
 
-#: emultempl/pe.em:434
+#: emultempl/pe.em:433
 #, c-format
 msgid "  --[no-]leading-underscore          Set explicit symbol underscore prefix mode\n"
 msgstr "  --[no-]leading-underscore          シンボル�下線 (_) 接頭辞モードを明示的�設定�る\n"
 
-#: emultempl/pe.em:435
+#: emultempl/pe.em:434
 #, c-format
 msgid "  --thumb-entry=<symbol>             Set the entry point to be Thumb <symbol>\n"
 msgstr "  --thumb-entry=<symbol>             エントリ�イントを Thumb � <symbol> �設定�る\n"
 
-#: emultempl/pe.em:437
+#: emultempl/pe.em:436
 #, c-format
 msgid "  --add-stdcall-alias                Export symbols with and without @nn\n"
 msgstr "  --add-stdcall-alias                シンボルを @nn 付�� @nn 無���エクス�ート�る\n"
 
-#: emultempl/pe.em:438
+#: emultempl/pe.em:437
 #, c-format
 msgid "  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"
 msgstr "  --disable-stdcall-fixup            _sym �ら _sym@nn ��リンクを行���\n"
 
-#: emultempl/pe.em:439
+#: emultempl/pe.em:438
 #, c-format
 msgid "  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"
 msgstr "  --enable-stdcall-fixup             _sym を _sym@nn �警告���リンク�る\n"
 
-#: emultempl/pe.em:440
+#: emultempl/pe.em:439
 #, c-format
 msgid "  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"
 msgstr "  --exclude-symbols sym,sym,...      シンボルを自動エクス�ート�ら除外�る\n"
 
-#: emultempl/pe.em:441
+#: emultempl/pe.em:440
 #, c-format
 msgid "  --exclude-all-symbols              Exclude all symbols from automatic export\n"
 msgstr "  --exclude-all-symbols              全��シンボルを自動エクス�ート�ら除外�る\n"
 
-#: emultempl/pe.em:442
+#: emultempl/pe.em:441
 #, c-format
 msgid "  --exclude-libs lib,lib,...         Exclude libraries from automatic export\n"
 msgstr "  --exclude-libs lib,lib,...         ライブラリを自動エクス�ート�ら除外�る\n"
 
-#: emultempl/pe.em:443
+#: emultempl/pe.em:442
 #, c-format
 msgid "  --exclude-modules-for-implib mod,mod,...\n"
 msgstr "  --exclude-modules-for-implib mod,mod,...\n"
 
-#: emultempl/pe.em:444
+#: emultempl/pe.em:443
 #, c-format
 msgid "                                     Exclude objects, archive members from auto\n"
-msgstr "                                     オブジェクト�よ�書庫�メン�を自動エクス�ート\n"
+msgstr ""
 
-#: emultempl/pe.em:445
+#: emultempl/pe.em:444
 #, c-format
 msgid "                                     export, place into import library instead.\n"
-msgstr "                                     �ら除外��代�り�イン�ートライブラリを�置�る\n"
+msgstr ""
 
-#: emultempl/pe.em:446
+#: emultempl/pe.em:445
 #, c-format
 msgid "  --export-all-symbols               Automatically export all globals to DLL\n"
 msgstr "  --export-all-symbols               全��グロー�ルシンボルを DLL �対��自動的�エクス�ート�る\n"
 
-#: emultempl/pe.em:447
+#: emultempl/pe.em:446
 #, c-format
 msgid "  --kill-at                          Remove @nn from exported symbols\n"
 msgstr "  --kill-at                          エクス�ート�れ�シンボル�ら @nn を削除�る\n"
 
-#: emultempl/pe.em:448
+#: emultempl/pe.em:447
 #, c-format
 msgid "  --out-implib <file>                Generate import library\n"
 msgstr "  --out-implib <file>                イン�ートライブラリを生��る\n"
 
-#: emultempl/pe.em:449
+#: emultempl/pe.em:448
 #, c-format
 msgid "  --output-def <file>                Generate a .DEF file for the built DLL\n"
 msgstr "  --output-def <file>                構築�� DLL �ら .DEF ファイルを生��る\n"
 
-#: emultempl/pe.em:450
+#: emultempl/pe.em:449
 #, c-format
 msgid "  --warn-duplicate-exports           Warn about duplicate exports.\n"
 msgstr "  --warn-duplicate-exports           �複��エクス�ート�関��警告�る\n"
 
-#: emultempl/pe.em:451
+#: emultempl/pe.em:450
 #, c-format
 msgid ""
 "  --compat-implib                    Create backward compatible import libs;\n"
@@ -209,7 +204,7 @@ msgstr ""
 "  --compat-implib                    後方互�性����イン�ートライブラリを作���\n"
 "                                       __imp_<SYMBOL> も作��る\n"
 
-#: emultempl/pe.em:453
+#: emultempl/pe.em:452
 #, c-format
 msgid ""
 "  --enable-auto-image-base           Automatically choose image base for DLLs\n"
@@ -218,12 +213,12 @@ msgstr ""
 "  --enable-auto-image-base           利用者�指定����り DLL �イメージベースを\n"
 "                                       自動的��択�る\n"
 
-#: emultempl/pe.em:455
+#: emultempl/pe.em:454
 #, c-format
 msgid "  --disable-auto-image-base          Do not auto-choose image base. (default)\n"
 msgstr "  --disable-auto-image-base          イメージベースを自動�択��� (デフォルト)\n"
 
-#: emultempl/pe.em:456
+#: emultempl/pe.em:455
 #, c-format
 msgid ""
 "  --dll-search-prefix=<string>       When linking dynamically to a dll without\n"
@@ -234,19 +229,19 @@ msgstr ""
 "                                       lib<basename>.dll �代�り� <string><basename>.dll\n"
 "                                       を使用�る\n"
 
-#: emultempl/pe.em:459
+#: emultempl/pe.em:458
 #, c-format
 msgid ""
-"  --enable-auto-import               Do sophisticated linking of _sym to\n"
+"  --enable-auto-import               Do sophistcated linking of _sym to\n"
 "                                       __imp_sym for DATA references\n"
 msgstr "  --enable-auto-import               DATA �照時� _sym を __imp_sym �リンク�る\n"
 
-#: emultempl/pe.em:461
+#: emultempl/pe.em:460
 #, c-format
 msgid "  --disable-auto-import              Do not auto-import DATA items from DLLs\n"
 msgstr "  --disable-auto-import              DLL �ら DATA 項目を自動イン�ート���\n"
 
-#: emultempl/pe.em:462
+#: emultempl/pe.em:461
 #, c-format
 msgid ""
 "  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n"
@@ -256,7 +251,7 @@ msgstr ""
 "  --enable-runtime-pseudo-reloc      実行時�疑似��置�よる��解決を行����\n"
 "                                       自動イン�ート�制�を回�を�る\n"
 
-#: emultempl/pe.em:465
+#: emultempl/pe.em:464
 #, c-format
 msgid ""
 "  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations for\n"
@@ -265,7 +260,7 @@ msgstr ""
 "  --disable-runtime-pseudo-reloc     DATA �自動イン�ート�対�る実行時疑似��置\n"
 "                                       を行���\n"
 
-#: emultempl/pe.em:467
+#: emultempl/pe.em:466
 #, c-format
 msgid ""
 "  --enable-extra-pe-debug            Enable verbose debug output when building\n"
@@ -274,7 +269,7 @@ msgstr ""
 "  --enable-extra-pe-debug            DLL �ビルド���リンク時�冗長�デ�ッグ出力\n"
 "                                       を行� (特�自動イン�ート)\n"
 
-#: emultempl/pe.em:470
+#: emultempl/pe.em:469
 #, c-format
 msgid ""
 "  --large-address-aware              Executable supports virtual addresses\n"
@@ -283,7 +278,7 @@ msgstr ""
 "  --large-address-aware              実行ファイル� 2GB 以上�仮想アドレスを\n"
 "                                       サ�ート�るよ���る\n"
 
-#: emultempl/pe.em:472
+#: emultempl/pe.em:471
 #, c-format
 msgid ""
 "  --enable-long-section-names        Use long COFF section names even in\n"
@@ -292,7 +287,7 @@ msgstr ""
 "  --enable-long-section-names        実行�能�イメージファイル�中�も長� COFF\n"
 "                                       セクション�を使用�る\n"
 
-#: emultempl/pe.em:474
+#: emultempl/pe.em:473
 #, c-format
 msgid ""
 "  --disable-long-section-names       Never use long COFF section names, even\n"
@@ -301,106 +296,103 @@ msgstr ""
 "  --disable-long-section-names       オブジェクトファイル内�も長� COFF セクション\n"
 "                                       �を使用���\n"
 
-#: emultempl/pe.em:476
+#: emultempl/pe.em:475
 #, c-format
 msgid ""
 "  --dynamicbase\t\t\t Image base address may be relocated using\n"
 "\t\t\t\t       address space layout randomization (ASLR)\n"
 msgstr ""
-"  --dynamicbase\t\t\t アドレス空間�置ランダム化 (ASLR) を使用��\n"
-"\t\t\t\t       イメージ�ベースアドレス���置��るよ���る\n"
 
-#: emultempl/pe.em:478
+#: emultempl/pe.em:477
 #, c-format
 msgid "  --forceinteg\t\t Code integrity checks are enforced\n"
 msgstr "  --forceinteg\t\t コード�完全性�ェックを強制�る\n"
 
-#: emultempl/pe.em:479
+#: emultempl/pe.em:478
 #, c-format
 msgid "  --nxcompat\t\t Image is compatible with data execution prevention\n"
 msgstr "  --nxcompat\t\t イメージをデータ実行防止�互�性を��よ���る\n"
 
-#: emultempl/pe.em:480
+#: emultempl/pe.em:479
 #, c-format
 msgid "  --no-isolation\t\t Image understands isolation but do not isolate the image\n"
 msgstr ""
 
-#: emultempl/pe.em:481
+#: emultempl/pe.em:480
 #, c-format
 msgid ""
 "  --no-seh\t\t\t Image does not use SEH. No SE handler may\n"
 "\t\t\t\t       be called in this image\n"
 msgstr ""
-"  --no-seh\t\t\t イメージ� SEH を使用���。��イメージ\n"
-"\t\t\t\t       �ら� SE �ンドラ�呼�出�れ��\n"
 
-#: emultempl/pe.em:483
+#: emultempl/pe.em:482
 #, c-format
 msgid "  --no-bind\t\t\t Do not bind this image\n"
 msgstr ""
 
-#: emultempl/pe.em:484
+#: emultempl/pe.em:483
 #, c-format
 msgid "  --wdmdriver\t\t Driver uses the WDM model\n"
 msgstr "  --wdmdriver\t\t WDM モデルを使用�るドライ���る\n"
 
-#: emultempl/pe.em:485
+#: emultempl/pe.em:484
 #, c-format
 msgid "  --tsaware                  Image is Terminal Server aware\n"
 msgstr "  --tsaware                  ターミナルサー��使用��るイメージ��る\n"
 
-#: emultempl/pe.em:614
+#: emultempl/pe.em:613
 msgid "%P: warning: bad version number in -subsystem option\n"
 msgstr "%P: 警告: -subsystem オプション��ージョン番��誤り��り��\n"
 
-#: emultempl/pe.em:639
+#: emultempl/pe.em:638
 msgid "%P%F: invalid subsystem type %s\n"
 msgstr "%P%F: 無効��システム型 %s ��\n"
 
-#: emultempl/pe.em:660
+#: emultempl/pe.em:659
 msgid "%P%F: invalid hex number for PE parameter '%s'\n"
 msgstr "%P%F: PE パラメータ '%s' �対�る無効��六進数��\n"
 
-#: emultempl/pe.em:677
+#: emultempl/pe.em:676
 msgid "%P%F: strange hex info for PE parameter '%s'\n"
 msgstr "%P%F: PE パラメータ '%s' �対�������六進情報��り��\n"
 
-#: emultempl/pe.em:692
-msgid "%F%P: cannot open base file %s\n"
-msgstr "%F%P: ベースファイル %s を開���ん\n"
+#: emultempl/pe.em:693
+#, c-format
+msgid "%s: Can't open base file %s\n"
+msgstr "%s: ベースファイル %s を開���ん\n"
 
-#: emultempl/pe.em:965
+#: emultempl/pe.em:969
 msgid "%P: warning, file alignment > section alignment.\n"
 msgstr "%P: 警告: ファイル引数 > セクション引数 �������\n"
 
-#: emultempl/pe.em:978
+#: emultempl/pe.em:982
 msgid "%P: warning: --export-dynamic is not supported for PE targets, did you mean --export-all-symbols?\n"
 msgstr "%P: 警告: PE ターゲット�対�� --export-dynamic �サ�ート�れ����ん。--export-all-symbols を行�����������?\n"
 
-#: emultempl/pe.em:1054 emultempl/pe.em:1081
+#: emultempl/pe.em:1058 emultempl/pe.em:1085
 #, c-format
 msgid "Warning: resolving %s by linking to %s\n"
-msgstr "警告:  %s を %s �リンク�る���よ��解決�����\n"
+msgstr "警告: %2$s �リンク�る���よ�� %1$s を解決�����\n"
 
-#: emultempl/pe.em:1059 emultempl/pe.em:1086
+#: emultempl/pe.em:1063 emultempl/pe.em:1090
 msgid "Use --enable-stdcall-fixup to disable these warnings\n"
 msgstr "�れら�警告を無効��る���� --enable-stdcall-fixup を使用������\n"
 
-#: emultempl/pe.em:1060 emultempl/pe.em:1087
+#: emultempl/pe.em:1064 emultempl/pe.em:1091
 msgid "Use --disable-stdcall-fixup to disable these fixups\n"
 msgstr "�れら�修正を無効��る���� --disable-stdcall-fixup を使用������\n"
 
-#: emultempl/pe.em:1106
+#: emultempl/pe.em:1110
 #, c-format
 msgid "%C: Cannot get section contents - auto-import exception\n"
 msgstr "%C: セクション�中身を�得����ん - 自動イン�ート例外��\n"
 
-#: emultempl/pe.em:1146
+#: emultempl/pe.em:1150
 #, c-format
 msgid "Info: resolving %s by linking to %s (auto-import)\n"
-msgstr "情報: %s (自動イン�ート) を %s �リンク�る���よ�� 解決�����\n"
+msgstr "情報: %2$s �リンク�る���よ�� %1$s を解決����� (自動イン�ート)\n"
 
-#: emultempl/pe.em:1153
+#: emultempl/pe.em:1157
 msgid ""
 "%P: warning: auto-importing has been activated without --enable-auto-import specified on the command line.\n"
 "This should work unless it involves constant data structures referencing symbols from auto-imported DLLs.\n"
@@ -408,28 +400,28 @@ msgstr ""
 "%P: 警告: --enable-auto-import �コマンドライン指定無��自動イン�ート�有効��り���。\n"
 "自動イン�ート�れ� DLL �シンボルを�照�る定数データ構造���れ���り�れ�動作���。\n"
 
-#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
-#: pe-dll.c:1352
+#: emultempl/pe.em:1164 emultempl/pe.em:1369 emultempl/pe.em:1575 ldcref.c:490
+#: ldcref.c:588 ldmain.c:1183 ldmisc.c:286 pe-dll.c:705 pe-dll.c:1253
+#: pe-dll.c:1348
 msgid "%B%F: could not read symbols: %E\n"
 msgstr "%B%F: シンボルを読�込む�������ん���: %E\n"
 
-#: emultempl/pe.em:1243
+#: emultempl/pe.em:1245
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
 msgstr "%F%P: PE ����出力ファイル '%B' �対�� PE �作�行���ん。\n"
 
-#: emultempl/pe.em:1617
+#: emultempl/pe.em:1616
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr "ファイル %s を処�中�エラー�発生����\n"
 
-#: emultempl/pe.em:1640
+#: emultempl/pe.em:1639
 #, c-format
 msgid "Errors encountered processing file %s for interworking\n"
 msgstr "相互利用����ファイル %s を処�中�エラー�発生����\n"
 
-#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
-#: ldmain.c:1160
+#: emultempl/pe.em:1701 ldexp.c:542 ldlang.c:3323 ldlang.c:3358 ldlang.c:6804
+#: ldlang.c:6835 ldmain.c:1128
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_link_hash_lookup �失敗����: %E\n"
 
@@ -474,7 +466,7 @@ msgstr "シンボル無�\n"
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr "%P: 主�ッシュ表�シンボル `%T' ��り��ん\n"
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
+#: ldcref.c:650 ldcref.c:657 ldmain.c:1217 ldmain.c:1224
 msgid "%B%F: could not read relocs: %E\n"
 msgstr "%B%F: ��置を読�込���ん���: %E\n"
 
@@ -484,23 +476,23 @@ msgstr "%B%F: ��置を読�込���ん���: %E\n"
 #. are prohibited.  We must report an error.
 #: ldcref.c:684
 msgid "%X%C: prohibited cross reference from %s to `%T' in %s\n"
-msgstr "%X%C: %s �ら `%T' ��相互�照 (%s 内) ��止�れ����\n"
+msgstr "%1$X%2$C: %5$s 内� %3$s �ら `%4$T' ��相互�照��止�れ����\n"
 
 #: ldctor.c:85
 msgid "%P%X: Different relocs used in set %s\n"
-msgstr "%P%X: 集� %s 内�異�る��置�使用�れ����\n"
+msgstr ""
 
 #: ldctor.c:103
 msgid "%P%X: Different object file formats composing set %s\n"
-msgstr "%P%X: 集� %s を構��る異���オブジェクトファイル形���\n"
+msgstr ""
 
 #: ldctor.c:281 ldctor.c:295
 msgid "%P%X: %s does not support reloc %s for set %s\n"
-msgstr "%P%X: %s ���置 %s を集� %s 用��サ�ート���ん\n"
+msgstr ""
 
 #: ldctor.c:316
 msgid "%P%X: Unsupported size %d for set %s\n"
-msgstr "%P%X: サ�ート�れ��サイズ %d (集� %s 用) ��\n"
+msgstr ""
 
 #: ldctor.c:337
 msgid ""
@@ -508,9 +500,6 @@ msgid ""
 "Set                 Symbol\n"
 "\n"
 msgstr ""
-"\n"
-"集�                シンボル\n"
-"\n"
 
 #: ldemul.c:265
 #, c-format
@@ -535,158 +524,162 @@ msgstr "サ�ート�れ��るエミュレーションモード: "
 msgid "  no emulation specific options.\n"
 msgstr "  エミュレーション固有���オプション。\n"
 
-#: ldexp.c:314
+#: ldexp.c:313
 msgid "%P: warning: address of `%s' isn't multiple of maximum page size\n"
 msgstr "%P: 警告: `%s' �アドレス�最大ページサイズ��数���り��ん\n"
 
-#: ldexp.c:407
+#: ldexp.c:351
 #, c-format
 msgid "%F%S %% by zero\n"
 msgstr "%F%S 0 �よる剰余演算\n"
 
-#: ldexp.c:417
+#: ldexp.c:359
 #, c-format
 msgid "%F%S / by zero\n"
 msgstr "%F%S 0 �よる除算\n"
 
-#: ldexp.c:591
+#: ldexp.c:552
 #, c-format
 msgid "%X%S: unresolvable symbol `%s' referenced in expression\n"
 msgstr "%X%S: ���照�れ�解決����シンボル `%s' \n"
 
-#: ldexp.c:605
+#: ldexp.c:564
 #, c-format
 msgid "%F%S: undefined symbol `%s' referenced in expression\n"
 msgstr "%F%S: ���照�れ�定義�れ����シンボル `%s'\n"
 
-#: ldexp.c:626 ldexp.c:643 ldexp.c:670
+#: ldexp.c:585 ldexp.c:602 ldexp.c:629
 #, c-format
 msgid "%F%S: undefined section `%s' referenced in expression\n"
 msgstr "%F%S: ���照�れ�未定義セクション `%s'\n"
 
-#: ldexp.c:697 ldexp.c:711
+#: ldexp.c:656 ldexp.c:670
 #, c-format
 msgid "%F%S: undefined MEMORY region `%s' referenced in expression\n"
-msgstr "%F%S: ���照�れ�未定義 MEMORY 領域 `%s'\n"
+msgstr ""
 
-#: ldexp.c:722
+#: ldexp.c:681
 #, c-format
 msgid "%F%S: unknown constant `%s' referenced in expression\n"
-msgstr "%F%S: ���照�れ��明�定数 `%s'\n"
+msgstr ""
 
-#: ldexp.c:787
+#: ldexp.c:743
 #, c-format
 msgid "%F%S can not PROVIDE assignment to location counter\n"
-msgstr "%F%S �置カウンタ��代入を�供�る�������ん\n"
+msgstr ""
 
-#: ldexp.c:805
+#: ldexp.c:757
 #, c-format
 msgid "%F%S invalid assignment to location counter\n"
-msgstr "%F%S �置カウンタ�対�る無効�代入��\n"
+msgstr ""
 
-#: ldexp.c:808
+#: ldexp.c:760
 #, c-format
 msgid "%F%S assignment to location counter invalid outside of SECTION\n"
-msgstr "%F%S assignment to location counter invalid outside of SECTION\n"
+msgstr ""
 
-#: ldexp.c:821
+#: ldexp.c:773
 msgid "%F%S cannot move location counter backwards (from %V to %V)\n"
-msgstr "%F%S �置カウンタを減ら��������ん (%V �ら %V)\n"
+msgstr ""
 
-#: ldexp.c:882
+#: ldexp.c:812
 msgid "%P%F:%s: hash creation failed\n"
 msgstr "%P%F:%s: �ッシュ作��失敗����\n"
 
-#: ldexp.c:1191 ldexp.c:1216 ldexp.c:1276
+#: ldexp.c:1119 ldexp.c:1144 ldexp.c:1204
 #, c-format
 msgid "%F%S: nonconstant expression for %s\n"
-msgstr "%F%S: %s �対�る�定数���\n"
+msgstr ""
 
-#: ldfile.c:142
+#: ldfile.c:141
 #, c-format
 msgid "attempt to open %s failed\n"
 msgstr "%s を開���失敗����\n"
 
-#: ldfile.c:144
+#: ldfile.c:143
 #, c-format
 msgid "attempt to open %s succeeded\n"
 msgstr "%s を開����功����\n"
 
-#: ldfile.c:150
+#: ldfile.c:149
 msgid "%F%P: invalid BFD target `%s'\n"
 msgstr "%F%P: 無効� BFD ターゲット `%s' ��\n"
 
-#: ldfile.c:267 ldfile.c:296
+#: ldfile.c:266 ldfile.c:295
 msgid "%P: skipping incompatible %s when searching for %s\n"
-msgstr "%P: 互�性���を %s スキップ���� (%s を探索���る時)\n"
+msgstr "%1$P: %3$s を探索���る���互�性��� %2$s をスキップ����\n"
 
-#: ldfile.c:280
+#: ldfile.c:279
 msgid "%F%P: attempted static link of dynamic object `%s'\n"
 msgstr "%F%P: 動的オブジェクト `%s' �対�る�的リンク�試�られ���\n"
 
-#: ldfile.c:426
+#: ldfile.c:332 ldmain.c:832
+msgid "%P%F: %s: plugin reported error claiming file\n"
+msgstr "%P%F: %s: プラグイン�ファイルを�求時�エラーを報告����\n"
+
+#: ldfile.c:447
 msgid "%P: cannot find %s (%s): %E\n"
 msgstr "%P: %s (%s) �見��り��ん: %E\n"
 
-#: ldfile.c:429
+#: ldfile.c:450
 msgid "%P: cannot find %s: %E\n"
 msgstr "%P: %s �見��り��ん: %E\n"
 
-#: ldfile.c:464
+#: ldfile.c:485
 msgid "%P: cannot find %s inside %s\n"
-msgstr "%P: %s � %s 内�見��り��ん\n"
+msgstr "%1$P: %3$s 内� %2$s �見��り��ん\n"
 
-#: ldfile.c:467
+#: ldfile.c:488
 msgid "%P: cannot find %s\n"
 msgstr "%P: %s �見��り��ん\n"
 
-#: ldfile.c:486 ldfile.c:504
+#: ldfile.c:507 ldfile.c:525
 #, c-format
 msgid "cannot find script file %s\n"
 msgstr "スクリプトファイル %s �見��り��ん\n"
 
-#: ldfile.c:488 ldfile.c:506
+#: ldfile.c:509 ldfile.c:527
 #, c-format
 msgid "opened script file %s\n"
 msgstr "スクリプトファイル %s �開�れ���\n"
 
-#: ldfile.c:636
+#: ldfile.c:657
 msgid "%P%F: cannot open linker script file %s: %E\n"
 msgstr "%P%F: リンカスクリプトファイル %s を開���ん: %E\n"
 
-#: ldfile.c:701
+#: ldfile.c:722
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr "%P%F: マシン `%s' を表��������ん\n"
 
-#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
+#: ldlang.c:1160 ldlang.c:1202 ldlang.c:3048
 msgid "%P%F: can not create hash table: %E\n"
 msgstr "%P%F: �ッシュテーブルを作�����ん: %E\n"
 
-#: ldlang.c:1310
+#: ldlang.c:1253
 msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
 msgstr "%P:%S: 警告: メモリ領域 `%s' ��宣言�れ����\n"
 
-#: ldlang.c:1316
+#: ldlang.c:1259
 msgid "%P:%S: warning: memory region `%s' not declared\n"
 msgstr "%P:%S: メモリ領域 `%s' �宣言�れ����ん\n"
 
-#: ldlang.c:1350
+#: ldlang.c:1293
 msgid "%F%P:%S: error: alias for default memory region\n"
 msgstr "%F%P:%S: エラー: デフォルトメモリ区画�別���\n"
 
-#: ldlang.c:1361
+#: ldlang.c:1304
 msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
 msgstr "%F%P:%S: エラー: メモリ区画�別� `%s' ��定義��\n"
 
-#: ldlang.c:1368
+#: ldlang.c:1311
 msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
-msgstr "%F%P:%S: エラー: メモリ区画 `%s' (別� `%s' 用) �存在���ん\n"
+msgstr "%1$F%2$P:%3$S: エラー: 別� `%5$s' ����メモリ区画 `%4$s' �存在���ん\n"
 
-#: ldlang.c:1420 ldlang.c:1459
+#: ldlang.c:1363 ldlang.c:1402
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr "%P%F: セクション `%s' �作��失敗����: %E\n"
 
-#: ldlang.c:2021
+#: ldlang.c:1958
 #, c-format
 msgid ""
 "\n"
@@ -697,7 +690,7 @@ msgstr ""
 "破棄�れ�入力セクション\n"
 "\n"
 
-#: ldlang.c:2029
+#: ldlang.c:1966
 msgid ""
 "\n"
 "Memory Configuration\n"
@@ -707,23 +700,23 @@ msgstr ""
 "メモリ設定\n"
 "\n"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Name"
 msgstr "��"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Origin"
-msgstr "原点"
+msgstr ""
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Length"
 msgstr "長�"
 
-#: ldlang.c:2031
+#: ldlang.c:1968
 msgid "Attributes"
 msgstr "属性"
 
-#: ldlang.c:2071
+#: ldlang.c:2008
 #, c-format
 msgid ""
 "\n"
@@ -734,178 +727,178 @@ msgstr ""
 "リンカスクリプト�よ�メモリマップ\n"
 "\n"
 
-#: ldlang.c:2140
+#: ldlang.c:2074
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr "%P%F: `%s' セクション��正�利用��\n"
 
-#: ldlang.c:2149
+#: ldlang.c:2083
 msgid "%P%F: output format %s cannot represent section called %s\n"
-msgstr "%P%F: 出力形� %s � %s �ら呼�出�れるセクションを表��る�������ん\n"
+msgstr ""
 
-#: ldlang.c:2702
+#: ldlang.c:2636
 msgid "%B: file not recognized: %E\n"
 msgstr "%B: ファイル��識����ん���: %E\n"
 
-#: ldlang.c:2703
+#: ldlang.c:2637
 msgid "%B: matching formats:"
 msgstr "%B: 一致��形�:"
 
-#: ldlang.c:2710
+#: ldlang.c:2644
 msgid "%F%B: file not recognized: %E\n"
 msgstr "%F%B: ファイル��識����ん���: %E\n"
 
-#: ldlang.c:2781
+#: ldlang.c:2715
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr "%F%B: 書庫内�メン� %B �オブジェクト���り��ん\n"
 
-#: ldlang.c:2796 ldlang.c:2810
+#: ldlang.c:2730 ldlang.c:2744
 msgid "%F%B: could not read symbols: %E\n"
 msgstr "%F%B: シンボルを読�込���ん���: %E\n"
 
-#: ldlang.c:3084
+#: ldlang.c:3018
 msgid "%P: warning: could not find any targets that match endianness requirement\n"
-msgstr "%P: 警告: �求�れ�エンディアン�一致�るターゲット�見��り��ん���\n"
+msgstr ""
 
-#: ldlang.c:3098
+#: ldlang.c:3032
 msgid "%P%F: target %s not found\n"
 msgstr "%P%F: ターゲット %s �見��り��ん���\n"
 
-#: ldlang.c:3100
+#: ldlang.c:3034
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr "%P%F: 出力ファイル %s �開���ん: %E\n"
 
-#: ldlang.c:3106
+#: ldlang.c:3040
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr "%P%F:%s: オブジェクトファイルを作�����ん: %E\n"
 
-#: ldlang.c:3110
+#: ldlang.c:3044
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr "%P%F:%s: アーキテク�ャを設定����ん: %E\n"
 
-#: ldlang.c:3267
+#: ldlang.c:3185
 msgid "%P: warning: %s contains output sections; did you forget -T?\n"
 msgstr "%P: 警告: %s ��出力セクション���れ��。-T オプションを忘れ����ん�?\n"
 
-#: ldlang.c:3308
+#: ldlang.c:3215
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr "%P%F: シンボル %s 作�時� bfd_hash_lookup �失敗����\n"
 
-#: ldlang.c:3326
+#: ldlang.c:3233
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr "%P%F: シンボル %s 作�時� bfd_hash_allocate �失敗����\n"
 
-#: ldlang.c:3722
+#: ldlang.c:3688
 msgid "%F%P: %s not found for insert\n"
-msgstr "%F%P: 挿入�る %s �見��り��ん���\n"
+msgstr ""
 
-#: ldlang.c:3937
+#: ldlang.c:3903
 msgid " load address 0x%V"
-msgstr " ロードアドレス 0x%V"
+msgstr ""
 
-#: ldlang.c:4212
+#: ldlang.c:4179
 msgid "%W (size before relaxing)\n"
-msgstr "%W (緩和��サイズ)\n"
+msgstr ""
 
-#: ldlang.c:4303
+#: ldlang.c:4270
 #, c-format
 msgid "Address of section %s set to "
-msgstr "セクション %s �アドレス�次�設定�れ���: "
+msgstr ""
 
-#: ldlang.c:4456
+#: ldlang.c:4423
 #, c-format
 msgid "Fail with %d\n"
 msgstr "コード %d �失敗����\n"
 
-#: ldlang.c:4743
+#: ldlang.c:4710
 msgid "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
-msgstr "%X%P: セクション %s (ロード�れ��置 [%V,%V]) �セクション %s (ロード�れ��置 [%V,%V]) �範囲��������\n"
+msgstr ""
 
-#: ldlang.c:4759
+#: ldlang.c:4726
 msgid "%X%P: region `%s' overflowed by %ld bytes\n"
 msgstr "%X%P: 領域 `%s' � %ld �イト溢れ���\n"
 
-#: ldlang.c:4782
+#: ldlang.c:4749
 msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
-msgstr "%X%P: アドレス 0x%v  (%B セクション `%s') �領域� `%s' �範囲内��り��ん\n"
+msgstr ""
 
-#: ldlang.c:4793
+#: ldlang.c:4760
 msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
-msgstr "%X%P: %B セクション `%s' �領域 `%s' 内�入り��ん\n"
+msgstr ""
 
-#: ldlang.c:4850
+#: ldlang.c:4816
 #, c-format
 msgid "%F%S: non constant or forward reference address expression for section %s\n"
-msgstr "%F%S: セクション %s �対�る�定数����方�照アドレス���\n"
+msgstr ""
 
-#: ldlang.c:4875
+#: ldlang.c:4841
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr "%P%X: COFF 共有ライブラリ�セクション %s �内部エラー�発生����\n"
 
-#: ldlang.c:4932
+#: ldlang.c:4900
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
 msgstr "%P%F: エラー: ロード�能セクション `%s' ����メモリ区画�指定�れ����ん\n"
 
-#: ldlang.c:4937
+#: ldlang.c:4905
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr "%P: 警告: ロード�能セクション `%s' ����メモリ区画�指定�れ����ん\n"
 
-#: ldlang.c:4959
+#: ldlang.c:4927
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr "%P: 警告: セクション %s �開始を %lu �イト分変更�����\n"
 
-#: ldlang.c:5036
+#: ldlang.c:5004
 msgid "%P: warning: dot moved backwards before `%s'\n"
-msgstr "%P: 警告: `%s' より後方�移動���ん\n"
+msgstr ""
 
-#: ldlang.c:5202
+#: ldlang.c:5170
 msgid "%P%F: can't relax section: %E\n"
-msgstr "%P%F: セクションを緩和����ん: %E\n"
+msgstr ""
 
-#: ldlang.c:5531
+#: ldlang.c:5497
 msgid "%F%P: invalid data statement\n"
-msgstr "%F%P: 無効�データ文��\n"
+msgstr ""
 
-#: ldlang.c:5564
+#: ldlang.c:5530
 msgid "%F%P: invalid reloc statement\n"
-msgstr "%F%P: 無効���置文��\n"
+msgstr ""
 
-#: ldlang.c:5683
+#: ldlang.c:5648
 msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
-msgstr "%P%F: gc セクション�エントリシンボル���未定義シンボルを�求���\n"
+msgstr ""
 
-#: ldlang.c:5708
+#: ldlang.c:5673
 msgid "%P%F:%s: can't set start address\n"
 msgstr "%P%F:%s: 開始アドレスを設定����ん\n"
 
-#: ldlang.c:5721 ldlang.c:5740
+#: ldlang.c:5686 ldlang.c:5705
 msgid "%P%F: can't set start address\n"
 msgstr "%P%F: 開始アドレスを設定����ん\n"
 
-#: ldlang.c:5733
+#: ldlang.c:5698
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr "%P: 警告: エントリシンボル %s �見��り��ん。デフォルト��� %V を使用���\n"
 
-#: ldlang.c:5745
+#: ldlang.c:5710
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr "%P: 警告: エントリシンボル %s �見��り��ん。開始アドレスを設定���ん\n"
 
-#: ldlang.c:5800
+#: ldlang.c:5760
 msgid "%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"
-msgstr "%P%F: 形� %s (%B) �ら形� %s (%B) ����置を伴���置�能リンク�サ�ート�れ����ん\n"
+msgstr ""
 
-#: ldlang.c:5810
+#: ldlang.c:5770
 msgid "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
-msgstr "%P%X: %s アーキテク�ャ (入力ファイル`%B') � %s 出力�互�性��り��ん\n"
+msgstr "%1$P%2$X: `%4$B' � %3$s アーキテク�ャ� %5$s 出力�互�性��り��ん\n"
 
-#: ldlang.c:5832
+#: ldlang.c:5792
 msgid "%P%X: failed to merge target specific data of file %B\n"
-msgstr "%P%X: ファイル %B �ターゲット特有データ�併��失敗����\n"
+msgstr ""
 
-#: ldlang.c:5903
+#: ldlang.c:5863
 msgid "%P%F: Could not define common symbol `%T': %E\n"
 msgstr "%P%F: 共通シンボル `%T' を定義����ん���: %E\n"
 
-#: ldlang.c:5915
+#: ldlang.c:5875
 msgid ""
 "\n"
 "Allocating common symbols\n"
@@ -913,7 +906,7 @@ msgstr ""
 "\n"
 "割り当���る共通シンボル\n"
 
-#: ldlang.c:5916
+#: ldlang.c:5876
 msgid ""
 "Common symbol       size              file\n"
 "\n"
@@ -921,70 +914,66 @@ msgstr ""
 "共通シンボル        サイズ            ファイル\n"
 "\n"
 
-#: ldlang.c:6062
+#: ldlang.c:6022
 msgid "%P%F: invalid syntax in flags\n"
 msgstr "%P%F: フラグ内�無効�構文��\n"
 
-#: ldlang.c:6524
+#: ldlang.c:6415
 msgid "%P%F: Failed to create hash table\n"
 msgstr "%P%F: �ッシュ表�作��失敗����\n"
 
-#: ldlang.c:6547
+#: ldlang.c:6430
 msgid "%P%F: %s: plugin reported error after all symbols read\n"
 msgstr "%P%F: %s: 全��シンボル読�込�後�プラグイン�エラーを報告����\n"
 
-#: ldlang.c:6860
+#: ldlang.c:6717
 msgid "%P%F: multiple STARTUP files\n"
 msgstr "%P%F: 複数� STARTUP ファイル��り��\n"
 
-#: ldlang.c:6906
+#: ldlang.c:6765
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr "%X%P:%S: セクション�ロードアドレス�よ�ロード区画�両方�存在���\n"
 
-#: ldlang.c:7093
+#: ldlang.c:6950
 msgid "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack them\n"
-msgstr "%X%P:%S: PHDRS �よ� FILEHDR ����る PT_LOAD ヘッダ�存在���場��サ�ート�れ��ん\n"
+msgstr ""
 
-#: ldlang.c:7165
+#: ldlang.c:7022
 msgid "%F%P: no sections assigned to phdrs\n"
-msgstr "%F%P: phdrs �セクション�代入�れ��ん���\n"
+msgstr ""
 
-#: ldlang.c:7203
+#: ldlang.c:7060
 msgid "%F%P: bfd_record_phdr failed: %E\n"
-msgstr "%F%P: bfd_record_phdr �失敗����: %E\n"
+msgstr ""
 
-#: ldlang.c:7223
+#: ldlang.c:7080
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
-msgstr "%X%P: セクション `%s' �存在��� phdr `%s' �代入�れ���\n"
+msgstr ""
 
-#: ldlang.c:7636
+#: ldlang.c:7481
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr "%X%P: �ージョン情報内��明�言語 `%s' ��り��\n"
 
-#: ldlang.c:7781
+#: ldlang.c:7626
 msgid "%X%P: anonymous version tag cannot be combined with other version tags\n"
-msgstr "%X%P: anonymous �ージョンタグ�他��ージョンタブ����る�������ん\n"
+msgstr ""
 
-#: ldlang.c:7790
+#: ldlang.c:7635
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr "%X%P: �ージョンタグ `%s' ��複�����\n"
 
-#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
+#: ldlang.c:7656 ldlang.c:7665 ldlang.c:7683 ldlang.c:7693
 msgid "%X%P: duplicate expression `%s' in version information\n"
-msgstr "%X%P: �ージョン情報内��複��� `%s' ��り��\n"
+msgstr ""
 
-#: ldlang.c:7888
+#: ldlang.c:7733
 msgid "%X%P: unable to find version dependency `%s'\n"
-msgstr "%X%P: �ージョン�存関係 `%s' �見��り��ん\n"
+msgstr ""
 
-#: ldlang.c:7911
+#: ldlang.c:7756
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr "%X%P: .exports セクション�中身を読�込���ん\n"
 
-#: ldlang.c:8035
-msgid "%X%P: unknown feature `%s'\n"
-msgstr "%X%P: �明�機能 `%s' ��\n"
-
 #: ldmain.c:239
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr "%X%P: BFD デフォルトターゲットを `%s' �設定����ん: %E\n"
@@ -1021,228 +1010,233 @@ msgstr "%P: モード %s\n"
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr "%P%F: マップファイル %s を開���ん: %E\n"
 
-#: ldmain.c:488
+#: ldmain.c:485
+msgid "%P: %s: error in plugin cleanup (ignored)\n"
+msgstr ""
+
+#: ldmain.c:494
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr "%P: リンクエラー�発生����。実行ファイル `%s' を削除�����\n"
 
-#: ldmain.c:497
+#: ldmain.c:503
 msgid "%F%B: final close failed: %E\n"
 msgstr "%F%B: 最後�クローズ�失敗����: %E\n"
 
-#: ldmain.c:523
+#: ldmain.c:529
 msgid "%X%P: unable to open for source of copy `%s'\n"
-msgstr "%X%P: 複製元 `%s' を開��������ん\n"
+msgstr ""
 
-#: ldmain.c:526
+#: ldmain.c:532
 msgid "%X%P: unable to open for destination of copy `%s'\n"
-msgstr "%X%P: 複製先 `%s' を開��������ん\n"
+msgstr ""
 
-#: ldmain.c:533
+#: ldmain.c:539
 msgid "%P: Error writing file `%s'\n"
 msgstr "%P: ファイル `%s' を書�込�中�エラー�発生����\n"
 
-#: ldmain.c:538 pe-dll.c:1733
+#: ldmain.c:544 pe-dll.c:1729
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr "%P: ファイル `%s' を閉���る途中�エラー�発生����\n"
 
-#: ldmain.c:555
+#: ldmain.c:560
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr "%s: リンク������時間: %ld.%06ld\n"
 
-#: ldmain.c:558
+#: ldmain.c:563
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr "%s: データサイズ %ld\n"
 
-#: ldmain.c:642
+#: ldmain.c:646
 msgid "%P%F: missing argument to -m\n"
 msgstr "%P%F: -m �対�る引数��り��ん\n"
 
-#: ldmain.c:690 ldmain.c:710 ldmain.c:742
+#: ldmain.c:694 ldmain.c:714 ldmain.c:746 plugin.c:772
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr "%P%F: bfd_hash_table_init �失敗����: %E\n"
 
-#: ldmain.c:694 ldmain.c:714
+#: ldmain.c:698 ldmain.c:718
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr "%P%F: bfd_hash_lookup �失敗����: %E\n"
 
-#: ldmain.c:728
+#: ldmain.c:732
 msgid "%X%P: error: duplicate retain-symbols-file\n"
-msgstr "%X%P: エラー: retain-symbols-file ��複�����\n"
+msgstr ""
 
-#: ldmain.c:772
+#: ldmain.c:776
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
-msgstr "%P%F: 挿入用� bfd_hash_lookup �失敗����: %E\n"
+msgstr ""
 
-#: ldmain.c:777
+#: ldmain.c:781
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr "%P: `-retain-symbols-file' � `-s' �よ� `-S' を上書����\n"
 
-#: ldmain.c:877
+#: ldmain.c:895
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
 "\n"
-msgstr "ファイル (シンボル) ��る��書庫�メン���り込�れ���\n"
+msgstr ""
 
-#: ldmain.c:983
+#: ldmain.c:975
 msgid "%X%C: multiple definition of `%T'\n"
-msgstr "%X%C: `%T' ��複��定義�れ����\n"
+msgstr "%X%C: `%T' �複数定義�れ����\n"
 
-#: ldmain.c:986
+#: ldmain.c:978
 msgid "%D: first defined here\n"
 msgstr "%D: ���最��定義�れ����\n"
 
-#: ldmain.c:990
+#: ldmain.c:982
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
-msgstr "%P: 緩和を無効������: �複定義�併��使用����ん\n"
+msgstr ""
 
-#: ldmain.c:1044
+#: ldmain.c:1012
 msgid "%B: warning: definition of `%T' overriding common\n"
-msgstr "%B: 警告: `%T' �定義�共通シンボルを上書������\n"
+msgstr ""
 
-#: ldmain.c:1047
+#: ldmain.c:1015
 msgid "%B: warning: common is here\n"
-msgstr "%B: 警告: 共通シンボル�����\n"
+msgstr ""
 
-#: ldmain.c:1054
+#: ldmain.c:1022
 msgid "%B: warning: common of `%T' overridden by definition\n"
-msgstr "%B: 警告: `%T' �共通シンボル�他�定義�より上書��れ���\n"
+msgstr ""
 
-#: ldmain.c:1057
+#: ldmain.c:1025
 msgid "%B: warning: defined here\n"
-msgstr "%B: 警告: ���定義�れ����\n"
+msgstr ""
 
-#: ldmain.c:1064
+#: ldmain.c:1032
 msgid "%B: warning: common of `%T' overridden by larger common\n"
-msgstr "%B: 警告: `%T' �共通シンボル�より大��共通シンボル�より上書��れ���\n"
+msgstr ""
 
-#: ldmain.c:1067
+#: ldmain.c:1035
 msgid "%B: warning: larger common is here\n"
-msgstr "%B: 警告: より大��共通シンボル�����\n"
+msgstr ""
 
-#: ldmain.c:1071
+#: ldmain.c:1039
 msgid "%B: warning: common of `%T' overriding smaller common\n"
-msgstr "%B: 警告: `%T' 共通シンボル�より���共通シンボル�上書��れ���\n"
+msgstr ""
 
-#: ldmain.c:1074
+#: ldmain.c:1042
 msgid "%B: warning: smaller common is here\n"
-msgstr "%B: 警告: より���共通シンボル�����\n"
+msgstr ""
 
-#: ldmain.c:1078
+#: ldmain.c:1046
 msgid "%B: warning: multiple common of `%T'\n"
-msgstr "%B: 警告: 共通シンボル `%T' ��複�����\n"
+msgstr ""
 
-#: ldmain.c:1080
+#: ldmain.c:1048
 msgid "%B: warning: previous common is here\n"
-msgstr "%B: 警告: ��共通シンボル�����\n"
+msgstr ""
 
-#: ldmain.c:1100 ldmain.c:1138
+#: ldmain.c:1068 ldmain.c:1106
 msgid "%P: warning: global constructor %s used\n"
-msgstr "%P: 警告: 大域コンストラクタ %s �使用�れ����\n"
+msgstr ""
 
-#: ldmain.c:1148
+#: ldmain.c:1116
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
-msgstr "%P%F: BFD �ックエンドエラー: BFD_RELOC_CTOR �サ�ート�れ����ん\n"
+msgstr ""
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
+#: ldmain.c:1170 ldmain.c:1172 ldmain.c:1174 ldmain.c:1192 ldmain.c:1237
 msgid "warning: "
-msgstr "警告: "
+msgstr ""
 
-#: ldmain.c:1305
+#: ldmain.c:1273
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
-msgstr "%F%P: bfd_hash_table_init �失敗����: %E\n"
+msgstr ""
 
-#: ldmain.c:1312
+#: ldmain.c:1280
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
-msgstr "%F%P: bfd_hash_lookup �失敗����: %E\n"
+msgstr ""
 
-#: ldmain.c:1333
+#: ldmain.c:1301
 msgid "%X%C: undefined reference to `%T'\n"
-msgstr "%X%C: `%T' �対�る定義�れ�����照��\n"
+msgstr ""
 
-#: ldmain.c:1336
+#: ldmain.c:1304
 msgid "%C: warning: undefined reference to `%T'\n"
-msgstr "%C: 警告: `%T' �対�る定義�れ�����照��\n"
+msgstr ""
 
-#: ldmain.c:1342
+#: ldmain.c:1310
 msgid "%X%D: more undefined references to `%T' follow\n"
-msgstr "%X%D: `%T' �対�る定義�れ�����照��ら�続�����\n"
+msgstr ""
 
-#: ldmain.c:1345
+#: ldmain.c:1313
 msgid "%D: warning: more undefined references to `%T' follow\n"
-msgstr "%D: 警告: `%T' �対�る定義�れ�����照��ら�続�����\n"
+msgstr ""
 
-#: ldmain.c:1356
+#: ldmain.c:1324
 msgid "%X%B: undefined reference to `%T'\n"
-msgstr "%X%B: `%T' �対�る定義�れ�����照��\n"
+msgstr ""
 
-#: ldmain.c:1359
+#: ldmain.c:1327
 msgid "%B: warning: undefined reference to `%T'\n"
-msgstr "%B: 警告: `%T' �対�る定義�れ�����照��\n"
+msgstr ""
 
-#: ldmain.c:1365
+#: ldmain.c:1333
 msgid "%X%B: more undefined references to `%T' follow\n"
-msgstr "%X%B: `%T' �対�る定義�れ�����照��ら�続�����\n"
+msgstr ""
 
-#: ldmain.c:1368
+#: ldmain.c:1336
 msgid "%B: warning: more undefined references to `%T' follow\n"
-msgstr "%B: 警告: `%T' �対�る定義�れ�����照��ら�続�����\n"
+msgstr ""
 
-#: ldmain.c:1407
+#: ldmain.c:1375
 msgid " additional relocation overflows omitted from the output\n"
-msgstr " 追加���置オー�ーフロー�出力�ら除�れ��\n"
+msgstr ""
 
-#: ldmain.c:1420
+#: ldmain.c:1388
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
-msgstr " ��置�オー�ーフロー���よ��切り詰�られ���: %s (未定義シンボル `%T' �対��)"
+msgstr ""
 
-#: ldmain.c:1425
+#: ldmain.c:1393
 msgid " relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"
-msgstr "��置�オー�ーフロー���よ��切り詰�られ���: %s (シンボル `%T' �対��� %A セクション� %B 内)"
+msgstr ""
 
-#: ldmain.c:1437
+#: ldmain.c:1405
 msgid " relocation truncated to fit: %s against `%T'"
-msgstr " ��置�オー�ーフロー���よ��切り詰�られ���: %s (`%T' �対��)"
+msgstr ""
 
-#: ldmain.c:1454
-msgid "%X%H: dangerous relocation: %s\n"
-msgstr "%X%H: �険���置��: %s\n"
+#: ldmain.c:1422
+#, c-format
+msgid "%X%C: dangerous relocation: %s\n"
+msgstr "%X%C: �険���置��: %s\n"
 
-#: ldmain.c:1469
-msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
-msgstr "%X%H: 出力�れ��シンボル `%T' �対�る�照��る��置��\n"
+#: ldmain.c:1437
+msgid "%X%C: reloc refers to symbol `%T' which is not being output\n"
+msgstr ""
 
-#: ldmisc.c:151
+#: ldmisc.c:149
 #, c-format
 msgid "no symbol"
 msgstr "シンボル��り��ん"
 
-#: ldmisc.c:248
+#: ldmisc.c:246
 #, c-format
 msgid "built in linker script:%u"
-msgstr "組�込�リンカスクリプト:%u"
+msgstr ""
 
-#: ldmisc.c:329
+#: ldmisc.c:324
 msgid "%B: In function `%T':\n"
 msgstr "%B: 関数 `%T' 内:\n"
 
-#: ldmisc.c:464
+#: ldmisc.c:451
 msgid "%F%P: internal error %s %d\n"
 msgstr "%F%P: 内部エラー %s %d\n"
 
-#: ldmisc.c:513
+#: ldmisc.c:500
 msgid "%P: internal error: aborting at %s line %d in %s\n"
-msgstr "%P: 内部エラー: �置 %s (行 %d� %s 内) �中止�����\n"
+msgstr ""
 
-#: ldmisc.c:516
+#: ldmisc.c:503
 msgid "%P: internal error: aborting at %s line %d\n"
-msgstr "%P: 内部エラー:  �置 %s (行 %d) �中止�����\n"
+msgstr ""
 
-#: ldmisc.c:518
+#: ldmisc.c:505
 msgid "%P%F: please report this bug\n"
 msgstr "%P%F: ���グを報告������\n"
 
@@ -1250,12 +1244,12 @@ msgstr "%P%F: ���グを報告������\n"
 #: ldver.c:39
 #, c-format
 msgid "GNU ld %s\n"
-msgstr "GNU ld %s\n"
+msgstr ""
 
 #: ldver.c:43
 #, c-format
-msgid "Copyright 2011 Free Software Foundation, Inc.\n"
-msgstr "Copyright 2011 Free Software Foundation, Inc.\n"
+msgid "Copyright 2010 Free Software Foundation, Inc.\n"
+msgstr ""
 
 #: ldver.c:44
 #, c-format
@@ -1264,745 +1258,728 @@ msgid ""
 "the GNU General Public License version 3 or (at your option) a later version.\n"
 "This program has absolutely no warranty.\n"
 msgstr ""
-"This program is free software; you may redistribute it under the terms of\n"
-"the GNU General Public License version 3 or (at your option) a later version.\n"
-"This program has absolutely no warranty.\n"
 
 #: ldver.c:54
 #, c-format
 msgid "  Supported emulations:\n"
-msgstr "  サ�ート�れ��るエミュレーション:\n"
+msgstr ""
 
 #: ldwrite.c:62 ldwrite.c:207
 msgid "%P%F: bfd_new_link_order failed\n"
-msgstr "%P%F: bfd_new_link_order �失敗����\n"
+msgstr ""
 
 #: ldwrite.c:365
 msgid "%F%P: cannot create split section name for %s\n"
-msgstr "%F%P: %s 用�分割セクション�を作�����ん\n"
+msgstr ""
 
 #: ldwrite.c:377
 msgid "%F%P: clone section failed: %E\n"
-msgstr "%F%P: セクション�クローン�失敗����: %E\n"
+msgstr ""
 
 #: ldwrite.c:418
 #, c-format
 msgid "%8x something else\n"
-msgstr "%8x ��他\n"
+msgstr ""
 
 #: ldwrite.c:588
 msgid "%F%P: final link failed: %E\n"
-msgstr "%F%P: 最終リンク�失敗����: %E\n"
+msgstr ""
 
-#: lexsup.c:219 lexsup.c:373
+#: lexsup.c:219 lexsup.c:368
 msgid "KEYWORD"
-msgstr "KEYWORD"
+msgstr ""
 
 #: lexsup.c:219
 msgid "Shared library control for HP/UX compatibility"
-msgstr "HP/UX 互�性����共有ライブラリ制御"
+msgstr ""
 
 #: lexsup.c:222
 msgid "ARCH"
-msgstr "ARCH"
+msgstr ""
 
 #: lexsup.c:222
 msgid "Set architecture"
-msgstr "アーキテク�ャを設定�る"
+msgstr ""
 
-#: lexsup.c:224 lexsup.c:492
+#: lexsup.c:224 lexsup.c:487
 msgid "TARGET"
-msgstr "TARGET"
+msgstr ""
 
 #: lexsup.c:224
 msgid "Specify target for following input files"
-msgstr "以��入力ファイル�ターゲットを指定�る"
+msgstr ""
 
-#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
-#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
+#: lexsup.c:227 lexsup.c:278 lexsup.c:296 lexsup.c:309 lexsup.c:311
+#: lexsup.c:441 lexsup.c:501 lexsup.c:563 lexsup.c:576
 msgid "FILE"
-msgstr "FILE"
+msgstr ""
 
 #: lexsup.c:227
 msgid "Read MRI format linker script"
-msgstr "MRI 形��リンカスクリプトを読�込む"
+msgstr ""
 
 #: lexsup.c:229
 msgid "Force common symbols to be defined"
-msgstr "共通シンボル�定義を強制�る"
+msgstr ""
 
-#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
+#: lexsup.c:233 lexsup.c:545 lexsup.c:547 lexsup.c:549 lexsup.c:551
 msgid "ADDRESS"
-msgstr "ADDRESS"
+msgstr ""
 
 #: lexsup.c:233
 msgid "Set start address"
-msgstr "開始アドレスを設定�る"
+msgstr ""
 
 #: lexsup.c:235
 msgid "Export all dynamic symbols"
-msgstr "全��動的シンボルをエクス�ート�る"
+msgstr ""
 
 #: lexsup.c:237
 msgid "Undo the effect of --export-dynamic"
-msgstr "--export-dynamic �効果を�りや�る"
+msgstr ""
 
 #: lexsup.c:239
 msgid "Link big-endian objects"
-msgstr "ビッグエンディアンオブジェクト�リンク�る"
+msgstr ""
 
 #: lexsup.c:241
 msgid "Link little-endian objects"
-msgstr "リトルエンディアンオブジェクト�リンク�る"
+msgstr ""
 
 #: lexsup.c:243 lexsup.c:246
 msgid "SHLIB"
-msgstr "SHLIB"
+msgstr ""
 
 #: lexsup.c:243
 msgid "Auxiliary filter for shared object symbol table"
-msgstr "共有オブジェクトシンボル表用�補助フィルタ"
+msgstr ""
 
 #: lexsup.c:246
 msgid "Filter for shared object symbol table"
-msgstr "共有オブジェクトシンボル表用�フィルタ"
+msgstr ""
 
 #: lexsup.c:249
 msgid "Ignored"
-msgstr "無視�れる"
+msgstr ""
 
 #: lexsup.c:251
 msgid "SIZE"
-msgstr "SIZE"
+msgstr ""
 
 #: lexsup.c:251
 msgid "Small data size (if no size, same as --shared)"
-msgstr "データサイズを����る (SIZE �無�場�� --shared ��様)"
+msgstr ""
 
 #: lexsup.c:254
 msgid "FILENAME"
-msgstr "FILENAME"
+msgstr ""
 
 #: lexsup.c:254
 msgid "Set internal name of shared library"
-msgstr "共有ライブラリ�内部�を設定�る"
+msgstr ""
 
 #: lexsup.c:256
 msgid "PROGRAM"
-msgstr "PROGRAM"
+msgstr ""
 
 #: lexsup.c:256
 msgid "Set PROGRAM as the dynamic linker to use"
-msgstr "使用�る動的リンカを PROGRAM �設定�る"
+msgstr ""
 
 #: lexsup.c:259
 msgid "LIBNAME"
-msgstr "LIBNAME"
+msgstr ""
 
 #: lexsup.c:259
 msgid "Search for library LIBNAME"
-msgstr "ライブラリ LIBNAME を探索�る"
+msgstr ""
 
 #: lexsup.c:261
 msgid "DIRECTORY"
-msgstr "DIRECTORY"
+msgstr ""
 
 #: lexsup.c:261
 msgid "Add DIRECTORY to library search path"
-msgstr "ライブラリ探査パス� DIRECTORY を加�る"
+msgstr ""
 
 #: lexsup.c:264
 msgid "Override the default sysroot location"
-msgstr "デフォルト� sysroot �置を上書��る"
+msgstr ""
 
 #: lexsup.c:266
 msgid "EMULATION"
-msgstr "EMULATION"
+msgstr ""
 
 #: lexsup.c:266
 msgid "Set emulation"
-msgstr "エミュレーションを設定�る"
+msgstr ""
 
 #: lexsup.c:268
 msgid "Print map file on standard output"
-msgstr "標準出力�マップファイルを表示�る"
+msgstr ""
 
 #: lexsup.c:270
 msgid "Do not page align data"
-msgstr "データをページ整列���"
+msgstr ""
 
 #: lexsup.c:272
 msgid "Do not page align data, do not make text readonly"
-msgstr "データをページ整列���テキストを読��り専用����"
+msgstr ""
 
 #: lexsup.c:275
 msgid "Page align data, make text readonly"
-msgstr "データをページ整列��テキストを読��り専用��る"
+msgstr ""
 
 #: lexsup.c:278
 msgid "Set output file name"
-msgstr "出力ファイル�を設定�る"
+msgstr ""
 
 #: lexsup.c:280
 msgid "Optimize output file"
-msgstr "出力ファイルを最�化�る"
+msgstr ""
 
 #: lexsup.c:283
 msgid "PLUGIN"
-msgstr "PLUGIN"
+msgstr ""
 
 #: lexsup.c:283
 msgid "Load named plugin"
-msgstr "PLUGIN ������プラグインをロード�る"
+msgstr ""
 
 #: lexsup.c:285
 msgid "ARG"
-msgstr "ARG"
+msgstr ""
 
 #: lexsup.c:285
 msgid "Send arg to last-loaded plugin"
-msgstr "最後�ロード��プラグイン�引数 ARG を渡�"
-
-#: lexsup.c:287 lexsup.c:290
-msgid "Ignored for GCC LTO option compatibility"
-msgstr "GCC LTO オプション互�性を無視�る"
+msgstr ""
 
-#: lexsup.c:294
+#: lexsup.c:288
 msgid "Ignored for SVR4 compatibility"
-msgstr "SVR4 互�性���無視�る"
+msgstr ""
 
-#: lexsup.c:298
+#: lexsup.c:292
 msgid "Generate relocatable output"
-msgstr "��置�能出力を生��る"
+msgstr ""
 
-#: lexsup.c:302
+#: lexsup.c:296
 msgid "Just link symbols (if directory, same as --rpath)"
-msgstr "シンボル�リンク��行� (ディレクトリ�場�� --rpath ��様)"
+msgstr ""
 
-#: lexsup.c:305
+#: lexsup.c:299
 msgid "Strip all symbols"
-msgstr "全��シンボルを�り除�"
+msgstr ""
 
-#: lexsup.c:307
+#: lexsup.c:301
 msgid "Strip debugging symbols"
-msgstr "デ�ッグシンボルを�り除�"
+msgstr ""
 
-#: lexsup.c:309
+#: lexsup.c:303
 msgid "Strip symbols in discarded sections"
-msgstr "破棄�れ�セクション�シンボルを�り除�"
+msgstr ""
 
-#: lexsup.c:311
+#: lexsup.c:305
 msgid "Do not strip symbols in discarded sections"
-msgstr "破棄�れ�セクション�シンボルを�り除���"
+msgstr ""
 
-#: lexsup.c:313
+#: lexsup.c:307
 msgid "Trace file opens"
-msgstr "トレースファイルを開�"
+msgstr ""
 
-#: lexsup.c:315
+#: lexsup.c:309
 msgid "Read linker script"
-msgstr "リンカスクリプトを読�込む"
+msgstr ""
 
-#: lexsup.c:317
+#: lexsup.c:311
 msgid "Read default linker script"
-msgstr "デフォルト�リンカスクリプトを読�込む"
+msgstr ""
 
-#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
-#: lexsup.c:572 lexsup.c:611
+#: lexsup.c:315 lexsup.c:333 lexsup.c:418 lexsup.c:439 lexsup.c:538
+#: lexsup.c:566 lexsup.c:605
 msgid "SYMBOL"
-msgstr "SYMBOL"
+msgstr ""
 
-#: lexsup.c:321
+#: lexsup.c:315
 msgid "Start with undefined reference to SYMBOL"
-msgstr "SYMBOL ��未定義�照�ら開始�る"
+msgstr ""
 
-#: lexsup.c:324
+#: lexsup.c:318
 msgid "[=SECTION]"
-msgstr "[=SECTION]"
+msgstr ""
 
-#: lexsup.c:325
+#: lexsup.c:319
 msgid "Don't merge input [SECTION | orphan] sections"
-msgstr "入力� [SECTION | orphan] セクションを併����"
+msgstr ""
 
-#: lexsup.c:327
+#: lexsup.c:321
 msgid "Build global constructor/destructor tables"
-msgstr "大域コンストラクタ/デストラクタ表を構築�る"
+msgstr ""
 
-#: lexsup.c:329
+#: lexsup.c:323
 msgid "Print version information"
-msgstr "�ージョン情報を表示�る"
+msgstr ""
 
-#: lexsup.c:331
+#: lexsup.c:325
 msgid "Print version and emulation information"
-msgstr "�ージョン�エミュレーション情報を表示�る"
+msgstr ""
 
-#: lexsup.c:333
+#: lexsup.c:327
 msgid "Discard all local symbols"
-msgstr "����局所シンボルを破棄�る"
+msgstr ""
 
-#: lexsup.c:335
+#: lexsup.c:329
 msgid "Discard temporary local symbols (default)"
-msgstr "一時的�局所シンボルを破棄�る (デフォルト)"
+msgstr ""
 
-#: lexsup.c:337
+#: lexsup.c:331
 msgid "Don't discard any local symbols"
-msgstr "局所シンボルを全�破棄���"
+msgstr ""
 
-#: lexsup.c:339
+#: lexsup.c:333
 msgid "Trace mentions of SYMBOL"
-msgstr "SYMBOL �使用を追跡�る"
+msgstr ""
 
-#: lexsup.c:341 lexsup.c:508 lexsup.c:510
+#: lexsup.c:335 lexsup.c:503 lexsup.c:505
 msgid "PATH"
-msgstr "PATH"
+msgstr ""
 
-#: lexsup.c:341
+#: lexsup.c:335
 msgid "Default search path for Solaris compatibility"
-msgstr "Solaris 互�性����デフォルト探索パス"
+msgstr ""
 
-#: lexsup.c:344
+#: lexsup.c:338
 msgid "Start a group"
-msgstr "グループ開始"
+msgstr ""
 
-#: lexsup.c:346
+#: lexsup.c:340
 msgid "End a group"
-msgstr "グループ終了"
+msgstr ""
 
-#: lexsup.c:350
+#: lexsup.c:344
 msgid "Accept input files whose architecture cannot be determined"
-msgstr "アーキテク�ャ�決定����ファイルを��付�る"
+msgstr ""
 
-#: lexsup.c:354
+#: lexsup.c:348
 msgid "Reject input files whose architecture is unknown"
-msgstr "アーキテク�ャ��明�入力ファイルを拒��る"
+msgstr ""
 
-#: lexsup.c:366
+#: lexsup.c:361
 msgid "Only set DT_NEEDED for following dynamic libs if used"
-msgstr "�れ以��動的ライブラリ�使用�れ�場��� DT_NEEDED を設定�る"
+msgstr ""
 
-#: lexsup.c:369
+#: lexsup.c:364
 msgid ""
 "Always set DT_NEEDED for dynamic libraries mentioned on\n"
 "                                the command line"
 msgstr ""
-"コマンドライン�指定�れ�動的ライブラリ�対�常� DT_NEEDED \n"
-"                                を設定�る"
 
-#: lexsup.c:373
+#: lexsup.c:368
 msgid "Ignored for SunOS compatibility"
-msgstr "SunOS 互�性���無視�る"
+msgstr ""
 
-#: lexsup.c:375
+#: lexsup.c:370
 msgid "Link against shared libraries"
-msgstr "共有ライブラリ�対��リンク�る"
+msgstr ""
 
-#: lexsup.c:381
+#: lexsup.c:376
 msgid "Do not link against shared libraries"
-msgstr "共有ライブラリ�対��リンク���"
+msgstr ""
 
-#: lexsup.c:389
+#: lexsup.c:384
 msgid "Bind global references locally"
-msgstr "大域�照を局所的��インド�る"
+msgstr ""
 
-#: lexsup.c:391
+#: lexsup.c:386
 msgid "Bind global function references locally"
-msgstr "大域関数�照を局所的��インド�る"
+msgstr ""
 
-#: lexsup.c:393
+#: lexsup.c:388
 msgid "Check section addresses for overlaps (default)"
-msgstr "セクションアドレス���り��を確��る (デフォルト)"
+msgstr ""
 
-#: lexsup.c:396
+#: lexsup.c:391
 msgid "Do not check section addresses for overlaps"
-msgstr "セクションアドレス���り��を確����"
+msgstr ""
 
-#: lexsup.c:400
+#: lexsup.c:395
 msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr ""
 
-#: lexsup.c:404
+#: lexsup.c:399
 msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr ""
 
-#: lexsup.c:408
+#: lexsup.c:403
 msgid "Output cross reference table"
-msgstr "相互�照表を出力�る"
+msgstr ""
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "SYMBOL=EXPRESSION"
-msgstr "SYMBOL=EXPRESSION"
+msgstr ""
 
-#: lexsup.c:410
+#: lexsup.c:405
 msgid "Define a symbol"
-msgstr "シンボルを定義�る"
+msgstr ""
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "[=STYLE]"
-msgstr "[=STYLE]"
+msgstr ""
 
-#: lexsup.c:412
+#: lexsup.c:407
 msgid "Demangle symbol names [using STYLE]"
-msgstr "シンボル����復元 (demangle) を行� [STYLE を使用]"
+msgstr ""
 
-#: lexsup.c:415
+#: lexsup.c:410
 msgid "Generate embedded relocs"
-msgstr "組�込���置を生��る"
+msgstr ""
 
-#: lexsup.c:417
+#: lexsup.c:412
 msgid "Treat warnings as errors"
-msgstr "警告をエラー���扱�"
+msgstr ""
 
-#: lexsup.c:420
+#: lexsup.c:415
 msgid "Do not treat warnings as errors (default)"
-msgstr "警告をエラー���扱��� (デフォルト)"
+msgstr ""
 
-#: lexsup.c:423
+#: lexsup.c:418
 msgid "Call SYMBOL at unload-time"
-msgstr "アンロード時� SYMBOL を呼�出�"
+msgstr ""
 
-#: lexsup.c:425
+#: lexsup.c:420
 msgid "Force generation of file with .exe suffix"
-msgstr "接尾辞 .exe を付��ファイル生�を強制�る"
+msgstr ""
 
-#: lexsup.c:427
+#: lexsup.c:422
 msgid "Remove unused sections (on some targets)"
-msgstr "使用�れ����セクションを削除�る (�����ターゲット上)"
+msgstr ""
 
-#: lexsup.c:430
+#: lexsup.c:425
 msgid "Don't remove unused sections (default)"
-msgstr "使用�れ����セクションを削除��� (デフォルト)"
+msgstr ""
 
-#: lexsup.c:433
+#: lexsup.c:428
 msgid "List removed unused sections on stderr"
-msgstr "削除�れ�使用�れ����セクションを標準エラー出力�一覧表示�る"
+msgstr ""
 
-#: lexsup.c:436
+#: lexsup.c:431
 msgid "Do not list removed unused sections"
-msgstr "削除�れ�使用�れ����セクションを一覧表示���"
+msgstr ""
 
-#: lexsup.c:439
+#: lexsup.c:434
 msgid "Set default hash table size close to <NUMBER>"
-msgstr "デフォルト��ッシュ表サイズを <NUMBER> �ら��設定�る"
+msgstr ""
 
-#: lexsup.c:442
+#: lexsup.c:437
 msgid "Print option help"
-msgstr "オプション�ヘルプを表示�る"
+msgstr ""
 
-#: lexsup.c:444
+#: lexsup.c:439
 msgid "Call SYMBOL at load-time"
-msgstr "ロード時� SYMBOL を呼�出�"
+msgstr ""
 
-#: lexsup.c:446
+#: lexsup.c:441
 msgid "Write a map file"
-msgstr "マップファイルを書�込む"
+msgstr ""
 
-#: lexsup.c:448
+#: lexsup.c:443
 msgid "Do not define Common storage"
-msgstr "共通記憶域を定義���"
+msgstr ""
 
-#: lexsup.c:450
+#: lexsup.c:445
 msgid "Do not demangle symbol names"
-msgstr "シンボル����復元 (demangle) を行���"
+msgstr ""
 
-#: lexsup.c:452
+#: lexsup.c:447
 msgid "Use less memory and more disk I/O"
-msgstr "メモリ使用�を減ら��ディスク I/O を増や�"
+msgstr ""
 
-#: lexsup.c:454
+#: lexsup.c:449
 msgid "Do not allow unresolved references in object files"
-msgstr "オブジェクトファイル内�解決�����照を許����"
+msgstr ""
 
-#: lexsup.c:457
-msgid "Allow unresolved references in shared libraries"
-msgstr "共有ライブラリ内�解決�����照を許��る"
+#: lexsup.c:452
+msgid "Allow unresolved references in shared libaries"
+msgstr ""
 
-#: lexsup.c:461
+#: lexsup.c:456
 msgid "Do not allow unresolved references in shared libs"
-msgstr "共有ライブラリ内�解決�����照を許����"
+msgstr ""
 
-#: lexsup.c:465
+#: lexsup.c:460
 msgid "Allow multiple definitions"
-msgstr "�複��定義を許��る"
+msgstr ""
 
-#: lexsup.c:467
+#: lexsup.c:462
 msgid "Disallow undefined version"
-msgstr "未定義�ージョンを許����"
+msgstr ""
 
-#: lexsup.c:469
+#: lexsup.c:464
 msgid "Create default symbol version"
-msgstr "デフォルト�シンボル�ージョンを作��る"
+msgstr ""
 
-#: lexsup.c:472
+#: lexsup.c:467
 msgid "Create default symbol version for imported symbols"
-msgstr "イン�ート��シンボル�対�るデフォルト�シンボル�ージョンを作��る"
+msgstr ""
 
-#: lexsup.c:475
+#: lexsup.c:470
 msgid "Don't warn about mismatched input files"
-msgstr "�����入力ファイル��る場��も警告���"
+msgstr ""
 
-#: lexsup.c:478
+#: lexsup.c:473
 msgid "Don't warn on finding an incompatible library"
-msgstr "互�性���ライブラリ�見����場��も警告���"
+msgstr ""
 
-#: lexsup.c:481
+#: lexsup.c:476
 msgid "Turn off --whole-archive"
-msgstr "--whole-archive を無効��る"
+msgstr ""
 
-#: lexsup.c:483
+#: lexsup.c:478
 msgid "Create an output file even if errors occur"
-msgstr "エラー�発生��場��も出力ファイルを作��る"
+msgstr ""
 
-#: lexsup.c:488
+#: lexsup.c:483
 msgid ""
 "Only use library directories specified on\n"
 "                                the command line"
 msgstr ""
-"コマンドライン�指定�れ�ライブラリディレクトリ\n"
-"                                ��使用�る"
 
-#: lexsup.c:492
+#: lexsup.c:487
 msgid "Specify target of output file"
-msgstr "出力ファイル�ターゲットを指定�る"
+msgstr ""
 
-#: lexsup.c:495
+#: lexsup.c:490
 msgid "Ignored for Linux compatibility"
-msgstr "Linux 互�性���無視�る"
+msgstr ""
 
-#: lexsup.c:498
+#: lexsup.c:493
 msgid "Reduce memory overheads, possibly taking much longer"
-msgstr "メモリ�オー�ーヘッドを減ら�。実行時間�長��る�能性��る"
+msgstr ""
 
-#: lexsup.c:501
+#: lexsup.c:496
 msgid "Reduce code size by using target specific optimizations"
-msgstr "ターゲット固有�最�化を使用��コードサイズを減ら�"
+msgstr ""
 
-#: lexsup.c:503
+#: lexsup.c:498
 msgid "Do not use relaxation techniques to reduce code size"
-msgstr "コードサイズを減ら����緩和技術を使用���"
+msgstr ""
 
-#: lexsup.c:506
+#: lexsup.c:501
 msgid "Keep only symbols listed in FILE"
-msgstr "FILE 内���れ��るシンボル�����る"
+msgstr ""
 
-#: lexsup.c:508
+#: lexsup.c:503
 msgid "Set runtime shared library search path"
-msgstr "実行時共有ライブラリ探索パスを設定�る"
+msgstr ""
 
-#: lexsup.c:510
+#: lexsup.c:505
 msgid "Set link time shared library search path"
-msgstr "リンク時共有ライブラリ探索パスを設定�る"
+msgstr ""
 
-#: lexsup.c:513
+#: lexsup.c:508
 msgid "Create a shared library"
-msgstr "共有ライブラリを作��る"
+msgstr ""
 
-#: lexsup.c:517
+#: lexsup.c:512
 msgid "Create a position independent executable"
-msgstr "�置��存実行ファイルを作��る"
+msgstr ""
 
-#: lexsup.c:521
+#: lexsup.c:516
 msgid "[=ascending|descending]"
-msgstr "[=ascending|descending]"
+msgstr ""
 
-#: lexsup.c:522
+#: lexsup.c:517
 msgid "Sort common symbols by alignment [in specified order]"
-msgstr "共通シンボルを整列�大��順�ソート�る [指定�る順�]"
+msgstr ""
 
-#: lexsup.c:527
+#: lexsup.c:522
 msgid "name|alignment"
-msgstr "name|alignment"
+msgstr ""
 
-#: lexsup.c:528
+#: lexsup.c:523
 msgid "Sort sections by name or maximum alignment"
-msgstr "セクションを�����整列�大��順�ソート�る"
+msgstr ""
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "COUNT"
-msgstr "COUNT"
+msgstr ""
 
-#: lexsup.c:530
+#: lexsup.c:525
 msgid "How many tags to reserve in .dynamic section"
-msgstr ".dynamic セクション内�予約�るタグ�数"
+msgstr ""
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "[=SIZE]"
-msgstr "[=SIZE]"
+msgstr ""
 
-#: lexsup.c:533
+#: lexsup.c:528
 msgid "Split output sections every SIZE octets"
-msgstr "SIZE オクテット���出力セクションを分割�る"
+msgstr ""
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "[=COUNT]"
-msgstr "[=COUNT]"
+msgstr ""
 
-#: lexsup.c:536
+#: lexsup.c:531
 msgid "Split output sections every COUNT relocs"
-msgstr "��置数 COUNT ���出力セクションを分割�る"
+msgstr ""
 
-#: lexsup.c:539
+#: lexsup.c:534
 msgid "Print memory usage statistics"
-msgstr "メモリ使用�統計を表示�る"
+msgstr ""
 
-#: lexsup.c:541
+#: lexsup.c:536
 msgid "Display target specific options"
-msgstr "ターゲット固有�オプションを表示�る"
+msgstr ""
 
-#: lexsup.c:543
+#: lexsup.c:538
 msgid "Do task level linking"
-msgstr "タスクレベルリンクを行�"
+msgstr ""
 
-#: lexsup.c:545
+#: lexsup.c:540
 msgid "Use same format as native linker"
-msgstr "�イティブリンカ���形�を使用�る"
+msgstr ""
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "SECTION=ADDRESS"
-msgstr "SECTION=ADDRESS"
+msgstr ""
 
-#: lexsup.c:547
+#: lexsup.c:542
 msgid "Set address of named section"
 msgstr "named セクション�アドレスを設定�る"
 
-#: lexsup.c:550
+#: lexsup.c:545
 msgid "Set address of .bss section"
 msgstr ".bss セクション�アドレスを設定�る"
 
-#: lexsup.c:552
+#: lexsup.c:547
 msgid "Set address of .data section"
 msgstr ".data セクション�アドレスを設定�る"
 
-#: lexsup.c:554
+#: lexsup.c:549
 msgid "Set address of .text section"
 msgstr ".text セクション�アドレスを設定�る"
 
-#: lexsup.c:556
+#: lexsup.c:551
 msgid "Set address of text segment"
 msgstr "text セグメント�アドレスを設定�る"
 
-#: lexsup.c:559
+#: lexsup.c:554
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
 "                                ignore-all, report-all, ignore-in-object-files,\n"
 "                                ignore-in-shared-libs"
 msgstr ""
-"解決�れ����シンボルを��よ��扱��を指定�る。 <method> �次�通り:\n"
+"解決�れ����シンボルを��よ��扱��を指定�る。 <method> �以下�通り:\n"
 "                                ignore-all, report-all, ignore-in-object-files,\n"
 "                                ignore-in-shared-libs"
 
-#: lexsup.c:564
-msgid "[=NUMBER]"
-msgstr "[=NUMBER]"
-
-#: lexsup.c:565
+#: lexsup.c:559
 msgid "Output lots of information during link"
 msgstr "リンク中�多数�情報を表示�る"
 
-#: lexsup.c:569
+#: lexsup.c:563
 msgid "Read version information script"
 msgstr "�ージョン情報スクリプトを読�込む"
 
-#: lexsup.c:572
+#: lexsup.c:566
 msgid ""
 "Take export symbols list from .exports, using\n"
 "                                SYMBOL as the version."
 msgstr ""
-"SYMBOL を�ージョン���使用��エクス�ート�るシンボルリストを\n"
-"                                 .exports �ら�り出�"
 
-#: lexsup.c:576
+#: lexsup.c:570
 msgid "Add data symbols to dynamic list"
-msgstr "データシンボルを動的リスト�加�る"
+msgstr ""
 
-#: lexsup.c:578
+#: lexsup.c:572
 msgid "Use C++ operator new/delete dynamic list"
-msgstr "C++ 演算� new/delete 動的リストを使用�る"
+msgstr ""
 
-#: lexsup.c:580
+#: lexsup.c:574
 msgid "Use C++ typeinfo dynamic list"
-msgstr "C++ typeinfo 動的リストを使用�る"
+msgstr ""
 
-#: lexsup.c:582
+#: lexsup.c:576
 msgid "Read dynamic list"
 msgstr "動的リストを読�込む"
 
-#: lexsup.c:584
+#: lexsup.c:578
 msgid "Warn about duplicate common symbols"
-msgstr "�複共通シンボル�関��警告�る"
+msgstr ""
 
-#: lexsup.c:586
+#: lexsup.c:580
 msgid "Warn if global constructors/destructors are seen"
 msgstr "大域コンストラクタ/デストラクタ�見�������警告�る"
 
-#: lexsup.c:589
+#: lexsup.c:583
 msgid "Warn if the multiple GP values are used"
 msgstr "複数� GP 値�使用�れ��る���警告�る"
 
-#: lexsup.c:591
+#: lexsup.c:585
 msgid "Warn only once per undefined symbol"
 msgstr "定義�れ����シンボル��る���一回��警告�る"
 
-#: lexsup.c:593
+#: lexsup.c:587
 msgid "Warn if start of section changes due to alignment"
 msgstr "整列�よりセクション�開始�変更�れ����警告�る"
 
-#: lexsup.c:596
+#: lexsup.c:590
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr "共有オブジェクト� DT_TEXTREL ���れる���警告�る"
 
-#: lexsup.c:599
+#: lexsup.c:593
 msgid "Warn if an object has alternate ELF machine code"
-msgstr "オブジェクト�代替 ELF マシンコードを�����警告�る"
+msgstr ""
 
-#: lexsup.c:603
+#: lexsup.c:597
 msgid "Report unresolved symbols as warnings"
 msgstr "解決����シンボルを警告���報告�る"
 
-#: lexsup.c:606
+#: lexsup.c:600
 msgid "Report unresolved symbols as errors"
 msgstr "解決����シンボルをエラー���報告�る"
 
-#: lexsup.c:608
+#: lexsup.c:602
 msgid "Include all objects from following archives"
 msgstr "�れ以��書庫�ら�全��オブジェクトを��る"
 
-#: lexsup.c:611
+#: lexsup.c:605
 msgid "Use wrapper functions for SYMBOL"
-msgstr "SYMBOL �対��ラッパー関数を使用�る"
+msgstr ""
 
-#: lexsup.c:760
+#: lexsup.c:754
 msgid "%P: unrecognized option '%s'\n"
 msgstr "%P: �識����オプション '%s' ��\n"
 
-#: lexsup.c:764
+#: lexsup.c:758
 msgid "%P%F: use the --help option for usage information\n"
 msgstr "%P%F: 使用法�関�る情報����� --help オプションを使用������\n"
 
-#: lexsup.c:782
+#: lexsup.c:776
 msgid "%P%F: unrecognized -a option `%s'\n"
-msgstr "%P%F: �識出��� -a �オプション `%s' ��\n"
+msgstr ""
 
-#: lexsup.c:795
+#: lexsup.c:789
 msgid "%P%F: unrecognized -assert option `%s'\n"
-msgstr "%P%F: �識出��� -assert �オプション `%s' ��\n"
+msgstr ""
 
-#: lexsup.c:838
+#: lexsup.c:832
 msgid "%F%P: unknown demangling style `%s'"
 msgstr "%F%P: �明���復元 (demangle) 形� `%s' ��"
 
-#: lexsup.c:904 lexsup.c:1335
+#: lexsup.c:898
 msgid "%P%F: invalid number `%s'\n"
 msgstr "%P%F: 無効�数値 `%s' ��\n"
 
-#: lexsup.c:1002
+#: lexsup.c:996
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr "%P%F: 誤�� --unresolved-symbols オプション��: %s\n"
 
-#: lexsup.c:1065 lexsup.c:1564
-msgid "%P%F: %s: error loading plugin\n"
-msgstr "%P%F: %s: プラグイン�読�込�中�エラー�発生����\n"
+#: lexsup.c:1059
+msgid "%P%F: bad -plugin option\n"
+msgstr "%P%F: 誤�� -plugin オプション��\n"
 
-#: lexsup.c:1070
+#: lexsup.c:1063
 msgid "%P%F: bad -plugin-opt option\n"
 msgstr "%P%F: 誤�� -plugin-opt オプション��\n"
 
@@ -2014,100 +1991,104 @@ msgstr "%P%F: 誤�� -plugin-opt オプション��\n"
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1087
+#: lexsup.c:1080
 msgid "%P%F: bad -rpath option\n"
 msgstr "%P%F: 誤�� -rpath オプション��\n"
 
-#: lexsup.c:1201
+#: lexsup.c:1194
 msgid "%P%F: -shared not supported\n"
 msgstr "%P%F: -shared �サ�ート�れ����ん\n"
 
-#: lexsup.c:1210
+#: lexsup.c:1203
 msgid "%P%F: -pie not supported\n"
 msgstr "%P%F: -pie �サ�ート�れ����ん\n"
 
-#: lexsup.c:1218
+#: lexsup.c:1211
 msgid "descending"
 msgstr "descending"
 
-#: lexsup.c:1220
+#: lexsup.c:1213
 msgid "ascending"
 msgstr "ascending"
 
-#: lexsup.c:1223
+#: lexsup.c:1216
 msgid "%P%F: invalid common section sorting option: %s\n"
-msgstr "%P%F: 無効�共通セクションソートオプション��: %s\n"
+msgstr ""
 
-#: lexsup.c:1227
+#: lexsup.c:1220
 msgid "name"
-msgstr "��"
+msgstr ""
 
-#: lexsup.c:1229
+#: lexsup.c:1222
 msgid "alignment"
-msgstr "整列"
+msgstr ""
 
-#: lexsup.c:1232
+#: lexsup.c:1225
 msgid "%P%F: invalid section sorting option: %s\n"
-msgstr "%P%F: 無効�セクションソートオプション��: %s\n"
+msgstr ""
 
-#: lexsup.c:1266
+#: lexsup.c:1259
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
-msgstr "%P%F: オプション \"--section-start\" �対�る無効�引数��\n"
+msgstr ""
 
-#: lexsup.c:1273
+#: lexsup.c:1266
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
-msgstr "%P%F: オプション \"--section-start\" �引数��り��ん\n"
+msgstr ""
 
-#: lexsup.c:1507
+#: lexsup.c:1490
 msgid "%P%F: group ended before it began (--help for usage)\n"
-msgstr "%P%F: グループ�開始��終了���� (使用法� --help を�照)\n"
+msgstr ""
 
-#: lexsup.c:1535
+#: lexsup.c:1518
 msgid "%P%X: --hash-size needs a numeric argument\n"
-msgstr "%P%X: --hash-size �数値を引数����り��\n"
+msgstr ""
 
-#: lexsup.c:1595 lexsup.c:1608
+#: lexsup.c:1547
+msgid "%P%F: %s: error loading plugin\n"
+msgstr "%P%F: %s: プラグイン�読�込�中�エラー�発生����\n"
+
+#: lexsup.c:1578 lexsup.c:1591
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr "%P%F: 無効��六進数 `%s' ��\n"
 
-#: lexsup.c:1644
+#: lexsup.c:1627
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr "使用法: %s [options] file...\n"
 
-#: lexsup.c:1646
+#: lexsup.c:1629
 #, c-format
 msgid "Options:\n"
 msgstr "オプション:\n"
 
-#: lexsup.c:1724
+#: lexsup.c:1707
 #, c-format
 msgid "  @FILE"
-msgstr "  @FILE"
+msgstr ""
 
-#: lexsup.c:1727
+#: lexsup.c:1710
 #, c-format
 msgid "Read options from FILE\n"
 msgstr "オプションを FILE �ら読�込む\n"
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1732
+#: lexsup.c:1715
 #, c-format
 msgid "%s: supported targets:"
 msgstr "%s: supported targets:"
 
-#: lexsup.c:1740
+#: lexsup.c:1723
 #, c-format
 msgid "%s: supported emulations: "
 msgstr "%s: supported emulations: "
 
-#: lexsup.c:1745
+#: lexsup.c:1728
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr "%s: emulation specific options:\n"
 
-#: lexsup.c:1750
+#: lexsup.c:1733
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
@@ -2116,134 +2097,113 @@ msgstr ""
 
 #: mri.c:292
 msgid "%P%F: unknown format type %s\n"
-msgstr "%P%F: タイプ %s ��明�形���\n"
+msgstr ""
 
-#: pe-dll.c:431
+#: pe-dll.c:430
 #, c-format
 msgid "%XUnsupported PEI architecture: %s\n"
-msgstr "%Xサ�ート�れ���� PEI アーキテク�ャ��: %s\n"
+msgstr ""
 
-#: pe-dll.c:791
+#: pe-dll.c:788
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
-msgstr "%X%sをエクス�ート����ん: 無効�エクス�ート���\n"
+msgstr ""
 
-#: pe-dll.c:848
+#: pe-dll.c:844
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
-msgstr "%Xエラー��複���数付� EXPORT: %s (%d � %d)\n"
+msgstr ""
 
-#: pe-dll.c:855
+#: pe-dll.c:851
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
-msgstr "警告��複�� EXPORT: %s\n"
+msgstr ""
 
-#: pe-dll.c:942
+#: pe-dll.c:938
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
-msgstr "%X%s をエクス�ート����ん: シンボル�定義�れ����ん\n"
+msgstr ""
 
-#: pe-dll.c:948
+#: pe-dll.c:944
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
-msgstr "%X%s をエクス�ート����ん: 誤��型�シンボル�� (%d � %d)\n"
+msgstr ""
 
-#: pe-dll.c:955
+#: pe-dll.c:951
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
-msgstr "%X%s をエクス�ート����ん: シンボル�見��り��ん\n"
+msgstr ""
 
-#: pe-dll.c:1069
+#: pe-dll.c:1065
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
-msgstr "%Xエラー��数�2回使用�れ���: %d (%s � %s)\n"
+msgstr ""
 
-#: pe-dll.c:1450
+#: pe-dll.c:1446
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
-msgstr "%Xエラー: dll 内� %d-bit ��置��り��\n"
+msgstr ""
 
-#: pe-dll.c:1578
+#: pe-dll.c:1574
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr "%s: 出力定義ファイル %s を開��������ん\n"
 
-#: pe-dll.c:1729
+#: pe-dll.c:1725
 #, c-format
 msgid "; no contents available\n"
-msgstr "。中身�利用����ん\n"
+msgstr ""
 
-#: pe-dll.c:2656
+#: pe-dll.c:2652
 msgid "%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"
-msgstr "%C: 変数 '%T' を自動イン�ート����ん。--enable-auto-import �詳細����� ld �文書を�照������。\n"
+msgstr ""
 
-#: pe-dll.c:2686
+#: pe-dll.c:2682
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr "%X .lib ファイルを開��������ん: %s\n"
 
-#: pe-dll.c:2691
+#: pe-dll.c:2687
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr "ライブラリファイルを作������: %s\n"
 
-#: pe-dll.c:2720
+#: pe-dll.c:2716
 #, c-format
 msgid "%Xbfd_openr %s: %E\n"
-msgstr "%Xbfd_openr %s: %E\n"
+msgstr ""
 
-#: pe-dll.c:2732
+#: pe-dll.c:2728
 #, c-format
 msgid "%X%s(%s): can't find member in non-archive file"
-msgstr "%X%s(%s): 書庫����ファイル内�メン��見��り��ん"
+msgstr ""
 
-#: pe-dll.c:2744
+#: pe-dll.c:2740
 #, c-format
 msgid "%X%s(%s): can't find member in archive"
 msgstr "%X%s(%s): 書庫内�メン��見��り��ん"
 
-#: pe-dll.c:3183
+#: pe-dll.c:3177
 #, c-format
 msgid "%XError: can't use long section names on this arch\n"
 msgstr "%Xエラー: ��アーキテク�ャ��長�セクション�を使用����ん\n"
 
-#: plugin.c:176 plugin.c:210
+#: plugin.c:178 plugin.c:212
 msgid "<no plugin>"
-msgstr "<プラグイン無�>"
-
-#: plugin.c:249
-#, c-format
-msgid "could not create dummy IR bfd: %F%E\n"
-msgstr "ダミー IR bfd を作�����ん���: %F%E\n"
-
-#: plugin.c:322
-msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
-msgstr "%P%F: %s: ELF BFD 内�� ELF シンボル��り��!\n"
-
-#: plugin.c:326
-msgid "%P%F: unknown ELF symbol visibility: %d!\n"
-msgstr "%P%F: �明� ELF シンボル�視性��!: %d\n"
-
-#: plugin.c:559
-msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
-msgstr "%P: %B: シンボル `%s' 定義: %d, �視性: %d, 解決: %d\n"
-
-#: plugin.c:825
-msgid "%P%F: %s: plugin reported error claiming file\n"
-msgstr "%P%F: %s: プラグイン�ファイルを�求時�エラーを報告����\n"
-
-#: plugin.c:896
-msgid "%P: %s: error in plugin cleanup (ignored)\n"
-msgstr "%P: %s: プラグイン�クリーンアップ中�エラー�発生���� (無視�れ���)\n"
+msgstr ""
 
-#~ msgid "%P%F: bad -plugin option\n"
-#~ msgstr "%P%F: 誤�� -plugin オプション��\n"
+#: plugin.c:308
+msgid "%P%F: %s: non-ELF symbol in ELF BFD!"
+msgstr "%P%F: %s: ELF BFD 内�� ELF シンボル��り��!"
 
-#~ msgid "%P%X: %s: hash table failure adding symbol %s"
-#~ msgstr "%P%X: %s: シンボル %s を追加中��ッシュ表作��失敗����"
+#: plugin.c:800
+msgid "%P%X: %s: hash table failure adding symbol %s"
+msgstr ""
 
-#~ msgid "%P%X: %s: can't find IR symbol '%s'"
-#~ msgstr "%P%X: %s: IR シンボル '%s' �見��り��ん"
+#: plugin.c:833
+msgid "%P%X: %s: can't find IR symbol '%s'"
+msgstr ""
 
-#~ msgid "%P%x: %s: bad IR symbol type %d"
-#~ msgstr "%P%x: %s: 誤�� IR シンボルタイプ %d ��"
+#: plugin.c:836
+msgid "%P%x: %s: bad IR symbol type %d"
+msgstr ""
diff --git a/ld/po/ld.pot b/ld/po/ld.pot
index 790cfdd8ab..ef25380380 100644
--- a/ld/po/ld.pot
+++ b/ld/po/ld.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-10-25 11:20+0100\n"
+"POT-Creation-Date: 2011-06-02 14:30+0100\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"
@@ -33,11 +33,11 @@ msgstr ""
 msgid "Errors encountered processing file %s"
 msgstr ""
 
-#: emultempl/armcoff.em:192 emultempl/pe.em:1812
+#: emultempl/armcoff.em:192 emultempl/pe.em:1813
 msgid "%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"
 msgstr ""
 
-#: emultempl/armcoff.em:197 emultempl/pe.em:1817
+#: emultempl/armcoff.em:197 emultempl/pe.em:1818
 msgid "%P: warning: cannot find thumb start symbol %s\n"
 msgstr ""
 
@@ -428,28 +428,28 @@ msgid ""
 "symbols from auto-imported DLLs.\n"
 msgstr ""
 
-#: emultempl/pe.em:1160 emultempl/pe.em:1366 emultempl/pe.em:1573 ldcref.c:490
-#: ldcref.c:588 ldmain.c:1158 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1254
-#: pe-dll.c:1349
+#: emultempl/pe.em:1160 emultempl/pe.em:1367 emultempl/pe.em:1574 ldcref.c:490
+#: ldcref.c:588 ldmain.c:1215 ldmisc.c:290 pe-dll.c:706 pe-dll.c:1257
+#: pe-dll.c:1352
 msgid "%B%F: could not read symbols: %E\n"
 msgstr ""
 
-#: emultempl/pe.em:1242
+#: emultempl/pe.em:1243
 msgid "%F%P: cannot perform PE operations on non PE output file '%B'.\n"
 msgstr ""
 
-#: emultempl/pe.em:1616
+#: emultempl/pe.em:1617
 #, c-format
 msgid "Errors encountered processing file %s\n"
 msgstr ""
 
-#: emultempl/pe.em:1639
+#: emultempl/pe.em:1640
 #, c-format
 msgid "Errors encountered processing file %s for interworking\n"
 msgstr ""
 
-#: emultempl/pe.em:1701 ldexp.c:581 ldlang.c:3458 ldlang.c:6992 ldlang.c:7023
-#: ldmain.c:1103
+#: emultempl/pe.em:1702 ldexp.c:581 ldlang.c:3416 ldlang.c:6947 ldlang.c:6978
+#: ldmain.c:1160
 msgid "%P%F: bfd_link_hash_lookup failed: %E\n"
 msgstr ""
 
@@ -491,7 +491,7 @@ msgstr ""
 msgid "%P: symbol `%T' missing from main hash table\n"
 msgstr ""
 
-#: ldcref.c:650 ldcref.c:657 ldmain.c:1192 ldmain.c:1199
+#: ldcref.c:650 ldcref.c:657 ldmain.c:1249 ldmain.c:1256
 msgid "%B%F: could not read relocs: %E\n"
 msgstr ""
 
@@ -672,35 +672,35 @@ msgstr ""
 msgid "%P%F: cannot represent machine `%s'\n"
 msgstr ""
 
-#: ldlang.c:1221 ldlang.c:1263 ldlang.c:3143
+#: ldlang.c:1217 ldlang.c:1259 ldlang.c:3114
 msgid "%P%F: can not create hash table: %E\n"
 msgstr ""
 
-#: ldlang.c:1314
+#: ldlang.c:1310
 msgid "%P:%S: warning: redeclaration of memory region `%s'\n"
 msgstr ""
 
-#: ldlang.c:1320
+#: ldlang.c:1316
 msgid "%P:%S: warning: memory region `%s' not declared\n"
 msgstr ""
 
-#: ldlang.c:1354
+#: ldlang.c:1350
 msgid "%F%P:%S: error: alias for default memory region\n"
 msgstr ""
 
-#: ldlang.c:1365
+#: ldlang.c:1361
 msgid "%F%P:%S: error: redefinition of memory region alias `%s'\n"
 msgstr ""
 
-#: ldlang.c:1372
+#: ldlang.c:1368
 msgid "%F%P:%S: error: memory region `%s' for alias `%s' does not exist\n"
 msgstr ""
 
-#: ldlang.c:1424 ldlang.c:1463
+#: ldlang.c:1420 ldlang.c:1459
 msgid "%P%F: failed creating section `%s': %E\n"
 msgstr ""
 
-#: ldlang.c:2025
+#: ldlang.c:2021
 #, c-format
 msgid ""
 "\n"
@@ -708,30 +708,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ldlang.c:2033
+#: ldlang.c:2029
 msgid ""
 "\n"
 "Memory Configuration\n"
 "\n"
 msgstr ""
 
-#: ldlang.c:2035
+#: ldlang.c:2031
 msgid "Name"
 msgstr ""
 
-#: ldlang.c:2035
+#: ldlang.c:2031
 msgid "Origin"
 msgstr ""
 
-#: ldlang.c:2035
+#: ldlang.c:2031
 msgid "Length"
 msgstr ""
 
-#: ldlang.c:2035
+#: ldlang.c:2031
 msgid "Attributes"
 msgstr ""
 
-#: ldlang.c:2075
+#: ldlang.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -739,259 +739,259 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ldlang.c:2141
+#: ldlang.c:2140
 msgid "%P%F: Illegal use of `%s' section\n"
 msgstr ""
 
-#: ldlang.c:2150
+#: ldlang.c:2149
 msgid "%P%F: output format %s cannot represent section called %s\n"
 msgstr ""
 
-#: ldlang.c:2728
+#: ldlang.c:2702
 msgid "%B: file not recognized: %E\n"
 msgstr ""
 
-#: ldlang.c:2729
+#: ldlang.c:2703
 msgid "%B: matching formats:"
 msgstr ""
 
-#: ldlang.c:2736
+#: ldlang.c:2710
 msgid "%F%B: file not recognized: %E\n"
 msgstr ""
 
-#: ldlang.c:2810
+#: ldlang.c:2781
 msgid "%F%B: member %B in archive is not an object\n"
 msgstr ""
 
-#: ldlang.c:2825 ldlang.c:2839
+#: ldlang.c:2796 ldlang.c:2810
 msgid "%F%B: could not read symbols: %E\n"
 msgstr ""
 
-#: ldlang.c:3113
+#: ldlang.c:3084
 msgid ""
 "%P: warning: could not find any targets that match endianness requirement\n"
 msgstr ""
 
-#: ldlang.c:3127
+#: ldlang.c:3098
 msgid "%P%F: target %s not found\n"
 msgstr ""
 
-#: ldlang.c:3129
+#: ldlang.c:3100
 msgid "%P%F: cannot open output file %s: %E\n"
 msgstr ""
 
-#: ldlang.c:3135
+#: ldlang.c:3106
 msgid "%P%F:%s: can not make object file: %E\n"
 msgstr ""
 
-#: ldlang.c:3139
+#: ldlang.c:3110
 msgid "%P%F:%s: can not set architecture: %E\n"
 msgstr ""
 
-#: ldlang.c:3309
+#: ldlang.c:3267
 msgid "%P: warning: %s contains output sections; did you forget -T?\n"
 msgstr ""
 
-#: ldlang.c:3350
+#: ldlang.c:3308
 msgid "%P%F: bfd_hash_lookup failed creating symbol %s\n"
 msgstr ""
 
-#: ldlang.c:3368
+#: ldlang.c:3326
 msgid "%P%F: bfd_hash_allocate failed creating symbol %s\n"
 msgstr ""
 
-#: ldlang.c:3764
+#: ldlang.c:3722
 msgid "%F%P: %s not found for insert\n"
 msgstr ""
 
-#: ldlang.c:3979
+#: ldlang.c:3937
 msgid " load address 0x%V"
 msgstr ""
 
-#: ldlang.c:4254
+#: ldlang.c:4212
 msgid "%W (size before relaxing)\n"
 msgstr ""
 
-#: ldlang.c:4345
+#: ldlang.c:4303
 #, c-format
 msgid "Address of section %s set to "
 msgstr ""
 
-#: ldlang.c:4498
+#: ldlang.c:4456
 #, c-format
 msgid "Fail with %d\n"
 msgstr ""
 
-#: ldlang.c:4785
+#: ldlang.c:4743
 msgid ""
 "%X%P: section %s loaded at [%V,%V] overlaps section %s loaded at [%V,%V]\n"
 msgstr ""
 
-#: ldlang.c:4801
+#: ldlang.c:4759
 msgid "%X%P: region `%s' overflowed by %ld bytes\n"
 msgstr ""
 
-#: ldlang.c:4824
+#: ldlang.c:4782
 msgid "%X%P: address 0x%v of %B section `%s' is not within region `%s'\n"
 msgstr ""
 
-#: ldlang.c:4835
+#: ldlang.c:4793
 msgid "%X%P: %B section `%s' will not fit in region `%s'\n"
 msgstr ""
 
-#: ldlang.c:4892
+#: ldlang.c:4850
 #, c-format
 msgid ""
 "%F%S: non constant or forward reference address expression for section %s\n"
 msgstr ""
 
-#: ldlang.c:4917
+#: ldlang.c:4875
 msgid "%P%X: Internal error on COFF shared library section %s\n"
 msgstr ""
 
-#: ldlang.c:4974
+#: ldlang.c:4932
 msgid "%P%F: error: no memory region specified for loadable section `%s'\n"
 msgstr ""
 
-#: ldlang.c:4979
+#: ldlang.c:4937
 msgid "%P: warning: no memory region specified for loadable section `%s'\n"
 msgstr ""
 
-#: ldlang.c:5001
+#: ldlang.c:4959
 msgid "%P: warning: changing start of section %s by %lu bytes\n"
 msgstr ""
 
-#: ldlang.c:5078
+#: ldlang.c:5036
 msgid "%P: warning: dot moved backwards before `%s'\n"
 msgstr ""
 
-#: ldlang.c:5244
+#: ldlang.c:5202
 msgid "%P%F: can't relax section: %E\n"
 msgstr ""
 
-#: ldlang.c:5573
+#: ldlang.c:5531
 msgid "%F%P: invalid data statement\n"
 msgstr ""
 
-#: ldlang.c:5606
+#: ldlang.c:5564
 msgid "%F%P: invalid reloc statement\n"
 msgstr ""
 
-#: ldlang.c:5725
+#: ldlang.c:5683
 msgid "%P%F: gc-sections requires either an entry or an undefined symbol\n"
 msgstr ""
 
-#: ldlang.c:5750
+#: ldlang.c:5708
 msgid "%P%F:%s: can't set start address\n"
 msgstr ""
 
-#: ldlang.c:5763 ldlang.c:5782
+#: ldlang.c:5721 ldlang.c:5740
 msgid "%P%F: can't set start address\n"
 msgstr ""
 
-#: ldlang.c:5775
+#: ldlang.c:5733
 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n"
 msgstr ""
 
-#: ldlang.c:5787
+#: ldlang.c:5745
 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n"
 msgstr ""
 
-#: ldlang.c:5842
+#: ldlang.c:5800
 msgid ""
 "%P%F: Relocatable linking with relocations from format %s (%B) to format %s "
 "(%B) is not supported\n"
 msgstr ""
 
-#: ldlang.c:5852
+#: ldlang.c:5810
 msgid ""
 "%P%X: %s architecture of input file `%B' is incompatible with %s output\n"
 msgstr ""
 
-#: ldlang.c:5874
+#: ldlang.c:5832
 msgid "%P%X: failed to merge target specific data of file %B\n"
 msgstr ""
 
-#: ldlang.c:5945
+#: ldlang.c:5903
 msgid "%P%F: Could not define common symbol `%T': %E\n"
 msgstr ""
 
-#: ldlang.c:5957
+#: ldlang.c:5915
 msgid ""
 "\n"
 "Allocating common symbols\n"
 msgstr ""
 
-#: ldlang.c:5958
+#: ldlang.c:5916
 msgid ""
 "Common symbol       size              file\n"
 "\n"
 msgstr ""
 
-#: ldlang.c:6104
+#: ldlang.c:6062
 msgid "%P%F: invalid syntax in flags\n"
 msgstr ""
 
-#: ldlang.c:6566
+#: ldlang.c:6524
 msgid "%P%F: Failed to create hash table\n"
 msgstr ""
 
-#: ldlang.c:6589
+#: ldlang.c:6547
 msgid "%P%F: %s: plugin reported error after all symbols read\n"
 msgstr ""
 
-#: ldlang.c:6905
+#: ldlang.c:6860
 msgid "%P%F: multiple STARTUP files\n"
 msgstr ""
 
-#: ldlang.c:6951
+#: ldlang.c:6906
 msgid "%X%P:%S: section has both a load address and a load region\n"
 msgstr ""
 
-#: ldlang.c:7138
+#: ldlang.c:7093
 msgid ""
 "%X%P:%S: PHDRS and FILEHDR are not supported when prior PT_LOAD headers lack "
 "them\n"
 msgstr ""
 
-#: ldlang.c:7210
+#: ldlang.c:7165
 msgid "%F%P: no sections assigned to phdrs\n"
 msgstr ""
 
-#: ldlang.c:7248
+#: ldlang.c:7203
 msgid "%F%P: bfd_record_phdr failed: %E\n"
 msgstr ""
 
-#: ldlang.c:7268
+#: ldlang.c:7223
 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n"
 msgstr ""
 
-#: ldlang.c:7677
+#: ldlang.c:7636
 msgid "%X%P: unknown language `%s' in version information\n"
 msgstr ""
 
-#: ldlang.c:7822
+#: ldlang.c:7781
 msgid ""
 "%X%P: anonymous version tag cannot be combined with other version tags\n"
 msgstr ""
 
-#: ldlang.c:7831
+#: ldlang.c:7790
 msgid "%X%P: duplicate version tag `%s'\n"
 msgstr ""
 
-#: ldlang.c:7852 ldlang.c:7861 ldlang.c:7879 ldlang.c:7889
+#: ldlang.c:7811 ldlang.c:7820 ldlang.c:7838 ldlang.c:7848
 msgid "%X%P: duplicate expression `%s' in version information\n"
 msgstr ""
 
-#: ldlang.c:7929
+#: ldlang.c:7888
 msgid "%X%P: unable to find version dependency `%s'\n"
 msgstr ""
 
-#: ldlang.c:7952
+#: ldlang.c:7911
 msgid "%X%P: unable to read .exports section contents\n"
 msgstr ""
 
-#: ldlang.c:8076
+#: ldlang.c:8035
 msgid "%X%P: unknown feature `%s'\n"
 msgstr ""
 
@@ -999,224 +999,232 @@ msgstr ""
 msgid "%X%P: can't set BFD default target to `%s': %E\n"
 msgstr ""
 
-#: ldmain.c:303 lexsup.c:1071
-msgid "%P%F: %s: error loading plugin\n"
+#: ldmain.c:307
+msgid "%P%F: -r and -shared may not be used together\n"
+msgstr ""
+
+#: ldmain.c:350
+msgid "%P%F: -F may not be used without -shared\n"
 msgstr ""
 
-#: ldmain.c:340
+#: ldmain.c:352
+msgid "%P%F: -f may not be used without -shared\n"
+msgstr ""
+
+#: ldmain.c:400
 msgid "using external linker script:"
 msgstr ""
 
-#: ldmain.c:342
+#: ldmain.c:402
 msgid "using internal linker script:"
 msgstr ""
 
-#: ldmain.c:379
+#: ldmain.c:436
 msgid "%P%F: no input files\n"
 msgstr ""
 
-#: ldmain.c:383
+#: ldmain.c:440
 msgid "%P: mode %s\n"
 msgstr ""
 
-#: ldmain.c:399
+#: ldmain.c:456
 msgid "%P%F: cannot open map file %s: %E\n"
 msgstr ""
 
-#: ldmain.c:431
+#: ldmain.c:488
 msgid "%P: link errors found, deleting executable `%s'\n"
 msgstr ""
 
-#: ldmain.c:440
+#: ldmain.c:497
 msgid "%F%B: final close failed: %E\n"
 msgstr ""
 
-#: ldmain.c:466
+#: ldmain.c:523
 msgid "%X%P: unable to open for source of copy `%s'\n"
 msgstr ""
 
-#: ldmain.c:469
+#: ldmain.c:526
 msgid "%X%P: unable to open for destination of copy `%s'\n"
 msgstr ""
 
-#: ldmain.c:476
+#: ldmain.c:533
 msgid "%P: Error writing file `%s'\n"
 msgstr ""
 
-#: ldmain.c:481 pe-dll.c:1739
+#: ldmain.c:538 pe-dll.c:1733
 #, c-format
 msgid "%P: Error closing file `%s'\n"
 msgstr ""
 
-#: ldmain.c:498
+#: ldmain.c:555
 #, c-format
 msgid "%s: total time in link: %ld.%06ld\n"
 msgstr ""
 
-#: ldmain.c:501
+#: ldmain.c:558
 #, c-format
 msgid "%s: data size %ld\n"
 msgstr ""
 
-#: ldmain.c:585
+#: ldmain.c:642
 msgid "%P%F: missing argument to -m\n"
 msgstr ""
 
-#: ldmain.c:633 ldmain.c:653 ldmain.c:685
+#: ldmain.c:690 ldmain.c:710 ldmain.c:742
 msgid "%P%F: bfd_hash_table_init failed: %E\n"
 msgstr ""
 
-#: ldmain.c:637 ldmain.c:657
+#: ldmain.c:694 ldmain.c:714
 msgid "%P%F: bfd_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldmain.c:671
+#: ldmain.c:728
 msgid "%X%P: error: duplicate retain-symbols-file\n"
 msgstr ""
 
-#: ldmain.c:715
+#: ldmain.c:772
 msgid "%P%F: bfd_hash_lookup for insertion failed: %E\n"
 msgstr ""
 
-#: ldmain.c:720
+#: ldmain.c:777
 msgid "%P: `-retain-symbols-file' overrides `-s' and `-S'\n"
 msgstr ""
 
-#: ldmain.c:820
+#: ldmain.c:877
 #, c-format
 msgid ""
 "Archive member included because of file (symbol)\n"
 "\n"
 msgstr ""
 
-#: ldmain.c:926
+#: ldmain.c:983
 msgid "%X%C: multiple definition of `%T'\n"
 msgstr ""
 
-#: ldmain.c:929
+#: ldmain.c:986
 msgid "%D: first defined here\n"
 msgstr ""
 
-#: ldmain.c:933
+#: ldmain.c:990
 msgid "%P: Disabling relaxation: it will not work with multiple definitions\n"
 msgstr ""
 
-#: ldmain.c:987
+#: ldmain.c:1044
 msgid "%B: warning: definition of `%T' overriding common\n"
 msgstr ""
 
-#: ldmain.c:990
+#: ldmain.c:1047
 msgid "%B: warning: common is here\n"
 msgstr ""
 
-#: ldmain.c:997
+#: ldmain.c:1054
 msgid "%B: warning: common of `%T' overridden by definition\n"
 msgstr ""
 
-#: ldmain.c:1000
+#: ldmain.c:1057
 msgid "%B: warning: defined here\n"
 msgstr ""
 
-#: ldmain.c:1007
+#: ldmain.c:1064
 msgid "%B: warning: common of `%T' overridden by larger common\n"
 msgstr ""
 
-#: ldmain.c:1010
+#: ldmain.c:1067
 msgid "%B: warning: larger common is here\n"
 msgstr ""
 
-#: ldmain.c:1014
+#: ldmain.c:1071
 msgid "%B: warning: common of `%T' overriding smaller common\n"
 msgstr ""
 
-#: ldmain.c:1017
+#: ldmain.c:1074
 msgid "%B: warning: smaller common is here\n"
 msgstr ""
 
-#: ldmain.c:1021
+#: ldmain.c:1078
 msgid "%B: warning: multiple common of `%T'\n"
 msgstr ""
 
-#: ldmain.c:1023
+#: ldmain.c:1080
 msgid "%B: warning: previous common is here\n"
 msgstr ""
 
-#: ldmain.c:1043 ldmain.c:1081
+#: ldmain.c:1100 ldmain.c:1138
 msgid "%P: warning: global constructor %s used\n"
 msgstr ""
 
-#: ldmain.c:1091
+#: ldmain.c:1148
 msgid "%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"
 msgstr ""
 
 #. We found a reloc for the symbol we are looking for.
-#: ldmain.c:1145 ldmain.c:1147 ldmain.c:1149 ldmain.c:1167 ldmain.c:1212
+#: ldmain.c:1202 ldmain.c:1204 ldmain.c:1206 ldmain.c:1224 ldmain.c:1269
 msgid "warning: "
 msgstr ""
 
-#: ldmain.c:1248
+#: ldmain.c:1305
 msgid "%F%P: bfd_hash_table_init failed: %E\n"
 msgstr ""
 
-#: ldmain.c:1255
+#: ldmain.c:1312
 msgid "%F%P: bfd_hash_lookup failed: %E\n"
 msgstr ""
 
-#: ldmain.c:1276
+#: ldmain.c:1333
 msgid "%X%C: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1279
+#: ldmain.c:1336
 msgid "%C: warning: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1285
+#: ldmain.c:1342
 msgid "%X%D: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1288
+#: ldmain.c:1345
 msgid "%D: warning: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1299
+#: ldmain.c:1356
 msgid "%X%B: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1302
+#: ldmain.c:1359
 msgid "%B: warning: undefined reference to `%T'\n"
 msgstr ""
 
-#: ldmain.c:1308
+#: ldmain.c:1365
 msgid "%X%B: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1311
+#: ldmain.c:1368
 msgid "%B: warning: more undefined references to `%T' follow\n"
 msgstr ""
 
-#: ldmain.c:1350
+#: ldmain.c:1407
 msgid " additional relocation overflows omitted from the output\n"
 msgstr ""
 
-#: ldmain.c:1363
+#: ldmain.c:1420
 msgid " relocation truncated to fit: %s against undefined symbol `%T'"
 msgstr ""
 
-#: ldmain.c:1368
+#: ldmain.c:1425
 msgid ""
 " relocation truncated to fit: %s against symbol `%T' defined in %A section "
 "in %B"
 msgstr ""
 
-#: ldmain.c:1380
+#: ldmain.c:1437
 msgid " relocation truncated to fit: %s against `%T'"
 msgstr ""
 
-#: ldmain.c:1397
+#: ldmain.c:1454
 msgid "%X%H: dangerous relocation: %s\n"
 msgstr ""
 
-#: ldmain.c:1412
+#: ldmain.c:1469
 msgid "%X%H: reloc refers to symbol `%T' which is not being output\n"
 msgstr ""
 
@@ -1296,593 +1304,589 @@ msgstr ""
 msgid "%F%P: final link failed: %E\n"
 msgstr ""
 
-#: lexsup.c:220 lexsup.c:374
+#: lexsup.c:219 lexsup.c:373
 msgid "KEYWORD"
 msgstr ""
 
-#: lexsup.c:220
+#: lexsup.c:219
 msgid "Shared library control for HP/UX compatibility"
 msgstr ""
 
-#: lexsup.c:223
+#: lexsup.c:222
 msgid "ARCH"
 msgstr ""
 
-#: lexsup.c:223
+#: lexsup.c:222
 msgid "Set architecture"
 msgstr ""
 
-#: lexsup.c:225 lexsup.c:493
+#: lexsup.c:224 lexsup.c:492
 msgid "TARGET"
 msgstr ""
 
-#: lexsup.c:225
+#: lexsup.c:224
 msgid "Specify target for following input files"
 msgstr ""
 
-#: lexsup.c:228 lexsup.c:279 lexsup.c:303 lexsup.c:316 lexsup.c:318
-#: lexsup.c:447 lexsup.c:509 lexsup.c:572 lexsup.c:585
+#: lexsup.c:227 lexsup.c:278 lexsup.c:302 lexsup.c:315 lexsup.c:317
+#: lexsup.c:446 lexsup.c:506 lexsup.c:569 lexsup.c:582
 msgid "FILE"
 msgstr ""
 
-#: lexsup.c:228
+#: lexsup.c:227
 msgid "Read MRI format linker script"
 msgstr ""
 
-#: lexsup.c:230
+#: lexsup.c:229
 msgid "Force common symbols to be defined"
 msgstr ""
 
-#: lexsup.c:234 lexsup.c:553 lexsup.c:555 lexsup.c:557 lexsup.c:559
+#: lexsup.c:233 lexsup.c:550 lexsup.c:552 lexsup.c:554 lexsup.c:556
 msgid "ADDRESS"
 msgstr ""
 
-#: lexsup.c:234
+#: lexsup.c:233
 msgid "Set start address"
 msgstr ""
 
-#: lexsup.c:236
+#: lexsup.c:235
 msgid "Export all dynamic symbols"
 msgstr ""
 
-#: lexsup.c:238
+#: lexsup.c:237
 msgid "Undo the effect of --export-dynamic"
 msgstr ""
 
-#: lexsup.c:240
+#: lexsup.c:239
 msgid "Link big-endian objects"
 msgstr ""
 
-#: lexsup.c:242
+#: lexsup.c:241
 msgid "Link little-endian objects"
 msgstr ""
 
-#: lexsup.c:244 lexsup.c:247
+#: lexsup.c:243 lexsup.c:246
 msgid "SHLIB"
 msgstr ""
 
-#: lexsup.c:244
+#: lexsup.c:243
 msgid "Auxiliary filter for shared object symbol table"
 msgstr ""
 
-#: lexsup.c:247
+#: lexsup.c:246
 msgid "Filter for shared object symbol table"
 msgstr ""
 
-#: lexsup.c:250
+#: lexsup.c:249
 msgid "Ignored"
 msgstr ""
 
-#: lexsup.c:252
+#: lexsup.c:251
 msgid "SIZE"
 msgstr ""
 
-#: lexsup.c:252
+#: lexsup.c:251
 msgid "Small data size (if no size, same as --shared)"
 msgstr ""
 
-#: lexsup.c:255
+#: lexsup.c:254
 msgid "FILENAME"
 msgstr ""
 
-#: lexsup.c:255
+#: lexsup.c:254
 msgid "Set internal name of shared library"
 msgstr ""
 
-#: lexsup.c:257
+#: lexsup.c:256
 msgid "PROGRAM"
 msgstr ""
 
-#: lexsup.c:257
+#: lexsup.c:256
 msgid "Set PROGRAM as the dynamic linker to use"
 msgstr ""
 
-#: lexsup.c:260
+#: lexsup.c:259
 msgid "LIBNAME"
 msgstr ""
 
-#: lexsup.c:260
+#: lexsup.c:259
 msgid "Search for library LIBNAME"
 msgstr ""
 
-#: lexsup.c:262
+#: lexsup.c:261
 msgid "DIRECTORY"
 msgstr ""
 
-#: lexsup.c:262
+#: lexsup.c:261
 msgid "Add DIRECTORY to library search path"
 msgstr ""
 
-#: lexsup.c:265
+#: lexsup.c:264
 msgid "Override the default sysroot location"
 msgstr ""
 
-#: lexsup.c:267
+#: lexsup.c:266
 msgid "EMULATION"
 msgstr ""
 
-#: lexsup.c:267
+#: lexsup.c:266
 msgid "Set emulation"
 msgstr ""
 
-#: lexsup.c:269
+#: lexsup.c:268
 msgid "Print map file on standard output"
 msgstr ""
 
-#: lexsup.c:271
+#: lexsup.c:270
 msgid "Do not page align data"
 msgstr ""
 
-#: lexsup.c:273
+#: lexsup.c:272
 msgid "Do not page align data, do not make text readonly"
 msgstr ""
 
-#: lexsup.c:276
+#: lexsup.c:275
 msgid "Page align data, make text readonly"
 msgstr ""
 
-#: lexsup.c:279
+#: lexsup.c:278
 msgid "Set output file name"
 msgstr ""
 
-#: lexsup.c:281
+#: lexsup.c:280
 msgid "Optimize output file"
 msgstr ""
 
-#: lexsup.c:284
+#: lexsup.c:283
 msgid "PLUGIN"
 msgstr ""
 
-#: lexsup.c:284
+#: lexsup.c:283
 msgid "Load named plugin"
 msgstr ""
 
-#: lexsup.c:286
+#: lexsup.c:285
 msgid "ARG"
 msgstr ""
 
-#: lexsup.c:286
+#: lexsup.c:285
 msgid "Send arg to last-loaded plugin"
 msgstr ""
 
-#: lexsup.c:288 lexsup.c:291
+#: lexsup.c:287 lexsup.c:290
 msgid "Ignored for GCC LTO option compatibility"
 msgstr ""
 
-#: lexsup.c:295
+#: lexsup.c:294
 msgid "Ignored for SVR4 compatibility"
 msgstr ""
 
-#: lexsup.c:299
+#: lexsup.c:298
 msgid "Generate relocatable output"
 msgstr ""
 
-#: lexsup.c:303
+#: lexsup.c:302
 msgid "Just link symbols (if directory, same as --rpath)"
 msgstr ""
 
-#: lexsup.c:306
+#: lexsup.c:305
 msgid "Strip all symbols"
 msgstr ""
 
-#: lexsup.c:308
+#: lexsup.c:307
 msgid "Strip debugging symbols"
 msgstr ""
 
-#: lexsup.c:310
+#: lexsup.c:309
 msgid "Strip symbols in discarded sections"
 msgstr ""
 
-#: lexsup.c:312
+#: lexsup.c:311
 msgid "Do not strip symbols in discarded sections"
 msgstr ""
 
-#: lexsup.c:314
+#: lexsup.c:313
 msgid "Trace file opens"
 msgstr ""
 
-#: lexsup.c:316
+#: lexsup.c:315
 msgid "Read linker script"
 msgstr ""
 
-#: lexsup.c:318
+#: lexsup.c:317
 msgid "Read default linker script"
 msgstr ""
 
-#: lexsup.c:322 lexsup.c:340 lexsup.c:424 lexsup.c:445 lexsup.c:546
-#: lexsup.c:575 lexsup.c:614
+#: lexsup.c:321 lexsup.c:339 lexsup.c:423 lexsup.c:444 lexsup.c:543
+#: lexsup.c:572 lexsup.c:611
 msgid "SYMBOL"
 msgstr ""
 
-#: lexsup.c:322
+#: lexsup.c:321
 msgid "Start with undefined reference to SYMBOL"
 msgstr ""
 
-#: lexsup.c:325
+#: lexsup.c:324
 msgid "[=SECTION]"
 msgstr ""
 
-#: lexsup.c:326
+#: lexsup.c:325
 msgid "Don't merge input [SECTION | orphan] sections"
 msgstr ""
 
-#: lexsup.c:328
+#: lexsup.c:327
 msgid "Build global constructor/destructor tables"
 msgstr ""
 
-#: lexsup.c:330
+#: lexsup.c:329
 msgid "Print version information"
 msgstr ""
 
-#: lexsup.c:332
+#: lexsup.c:331
 msgid "Print version and emulation information"
 msgstr ""
 
-#: lexsup.c:334
+#: lexsup.c:333
 msgid "Discard all local symbols"
 msgstr ""
 
-#: lexsup.c:336
+#: lexsup.c:335
 msgid "Discard temporary local symbols (default)"
 msgstr ""
 
-#: lexsup.c:338
+#: lexsup.c:337
 msgid "Don't discard any local symbols"
 msgstr ""
 
-#: lexsup.c:340
+#: lexsup.c:339
 msgid "Trace mentions of SYMBOL"
 msgstr ""
 
-#: lexsup.c:342 lexsup.c:511 lexsup.c:513
+#: lexsup.c:341 lexsup.c:508 lexsup.c:510
 msgid "PATH"
 msgstr ""
 
-#: lexsup.c:342
+#: lexsup.c:341
 msgid "Default search path for Solaris compatibility"
 msgstr ""
 
-#: lexsup.c:345
+#: lexsup.c:344
 msgid "Start a group"
 msgstr ""
 
-#: lexsup.c:347
+#: lexsup.c:346
 msgid "End a group"
 msgstr ""
 
-#: lexsup.c:351
+#: lexsup.c:350
 msgid "Accept input files whose architecture cannot be determined"
 msgstr ""
 
-#: lexsup.c:355
+#: lexsup.c:354
 msgid "Reject input files whose architecture is unknown"
 msgstr ""
 
-#: lexsup.c:367
+#: lexsup.c:366
 msgid "Only set DT_NEEDED for following dynamic libs if used"
 msgstr ""
 
-#: lexsup.c:370
+#: lexsup.c:369
 msgid ""
 "Always set DT_NEEDED for dynamic libraries mentioned on\n"
 "                                the command line"
 msgstr ""
 
-#: lexsup.c:374
+#: lexsup.c:373
 msgid "Ignored for SunOS compatibility"
 msgstr ""
 
-#: lexsup.c:376
+#: lexsup.c:375
 msgid "Link against shared libraries"
 msgstr ""
 
-#: lexsup.c:382
+#: lexsup.c:381
 msgid "Do not link against shared libraries"
 msgstr ""
 
-#: lexsup.c:390
+#: lexsup.c:389
 msgid "Bind global references locally"
 msgstr ""
 
-#: lexsup.c:392
+#: lexsup.c:391
 msgid "Bind global function references locally"
 msgstr ""
 
-#: lexsup.c:394
+#: lexsup.c:393
 msgid "Check section addresses for overlaps (default)"
 msgstr ""
 
-#: lexsup.c:397
+#: lexsup.c:396
 msgid "Do not check section addresses for overlaps"
 msgstr ""
 
-#: lexsup.c:401
+#: lexsup.c:400
 msgid "Copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr ""
 
-#: lexsup.c:405
+#: lexsup.c:404
 msgid "Do not copy DT_NEEDED links mentioned inside DSOs that follow"
 msgstr ""
 
-#: lexsup.c:409
+#: lexsup.c:408
 msgid "Output cross reference table"
 msgstr ""
 
-#: lexsup.c:411
+#: lexsup.c:410
 msgid "SYMBOL=EXPRESSION"
 msgstr ""
 
-#: lexsup.c:411
+#: lexsup.c:410
 msgid "Define a symbol"
 msgstr ""
 
-#: lexsup.c:413
+#: lexsup.c:412
 msgid "[=STYLE]"
 msgstr ""
 
-#: lexsup.c:413
+#: lexsup.c:412
 msgid "Demangle symbol names [using STYLE]"
 msgstr ""
 
-#: lexsup.c:416
+#: lexsup.c:415
 msgid "Generate embedded relocs"
 msgstr ""
 
-#: lexsup.c:418
+#: lexsup.c:417
 msgid "Treat warnings as errors"
 msgstr ""
 
-#: lexsup.c:421
+#: lexsup.c:420
 msgid "Do not treat warnings as errors (default)"
 msgstr ""
 
-#: lexsup.c:424
+#: lexsup.c:423
 msgid "Call SYMBOL at unload-time"
 msgstr ""
 
-#: lexsup.c:426
+#: lexsup.c:425
 msgid "Force generation of file with .exe suffix"
 msgstr ""
 
-#: lexsup.c:428
+#: lexsup.c:427
 msgid "Remove unused sections (on some targets)"
 msgstr ""
 
-#: lexsup.c:431
+#: lexsup.c:430
 msgid "Don't remove unused sections (default)"
 msgstr ""
 
-#: lexsup.c:434
+#: lexsup.c:433
 msgid "List removed unused sections on stderr"
 msgstr ""
 
-#: lexsup.c:437
+#: lexsup.c:436
 msgid "Do not list removed unused sections"
 msgstr ""
 
-#: lexsup.c:440
+#: lexsup.c:439
 msgid "Set default hash table size close to <NUMBER>"
 msgstr ""
 
-#: lexsup.c:443
+#: lexsup.c:442
 msgid "Print option help"
 msgstr ""
 
-#: lexsup.c:445
+#: lexsup.c:444
 msgid "Call SYMBOL at load-time"
 msgstr ""
 
-#: lexsup.c:447
+#: lexsup.c:446
 msgid "Write a map file"
 msgstr ""
 
-#: lexsup.c:449
+#: lexsup.c:448
 msgid "Do not define Common storage"
 msgstr ""
 
-#: lexsup.c:451
+#: lexsup.c:450
 msgid "Do not demangle symbol names"
 msgstr ""
 
-#: lexsup.c:453
+#: lexsup.c:452
 msgid "Use less memory and more disk I/O"
 msgstr ""
 
-#: lexsup.c:455
+#: lexsup.c:454
 msgid "Do not allow unresolved references in object files"
 msgstr ""
 
-#: lexsup.c:458
+#: lexsup.c:457
 msgid "Allow unresolved references in shared libraries"
 msgstr ""
 
-#: lexsup.c:462
+#: lexsup.c:461
 msgid "Do not allow unresolved references in shared libs"
 msgstr ""
 
-#: lexsup.c:466
+#: lexsup.c:465
 msgid "Allow multiple definitions"
 msgstr ""
 
-#: lexsup.c:468
+#: lexsup.c:467
 msgid "Disallow undefined version"
 msgstr ""
 
-#: lexsup.c:470
+#: lexsup.c:469
 msgid "Create default symbol version"
 msgstr ""
 
-#: lexsup.c:473
+#: lexsup.c:472
 msgid "Create default symbol version for imported symbols"
 msgstr ""
 
-#: lexsup.c:476
+#: lexsup.c:475
 msgid "Don't warn about mismatched input files"
 msgstr ""
 
-#: lexsup.c:479
+#: lexsup.c:478
 msgid "Don't warn on finding an incompatible library"
 msgstr ""
 
-#: lexsup.c:482
+#: lexsup.c:481
 msgid "Turn off --whole-archive"
 msgstr ""
 
-#: lexsup.c:484
+#: lexsup.c:483
 msgid "Create an output file even if errors occur"
 msgstr ""
 
-#: lexsup.c:489
+#: lexsup.c:488
 msgid ""
 "Only use library directories specified on\n"
 "                                the command line"
 msgstr ""
 
-#: lexsup.c:493
+#: lexsup.c:492
 msgid "Specify target of output file"
 msgstr ""
 
-#: lexsup.c:496
-msgid "Print default output format"
-msgstr ""
-
-#: lexsup.c:498
+#: lexsup.c:495
 msgid "Ignored for Linux compatibility"
 msgstr ""
 
-#: lexsup.c:501
+#: lexsup.c:498
 msgid "Reduce memory overheads, possibly taking much longer"
 msgstr ""
 
-#: lexsup.c:504
+#: lexsup.c:501
 msgid "Reduce code size by using target specific optimizations"
 msgstr ""
 
-#: lexsup.c:506
+#: lexsup.c:503
 msgid "Do not use relaxation techniques to reduce code size"
 msgstr ""
 
-#: lexsup.c:509
+#: lexsup.c:506
 msgid "Keep only symbols listed in FILE"
 msgstr ""
 
-#: lexsup.c:511
+#: lexsup.c:508
 msgid "Set runtime shared library search path"
 msgstr ""
 
-#: lexsup.c:513
+#: lexsup.c:510
 msgid "Set link time shared library search path"
 msgstr ""
 
-#: lexsup.c:516
+#: lexsup.c:513
 msgid "Create a shared library"
 msgstr ""
 
-#: lexsup.c:520
+#: lexsup.c:517
 msgid "Create a position independent executable"
 msgstr ""
 
-#: lexsup.c:524
+#: lexsup.c:521
 msgid "[=ascending|descending]"
 msgstr ""
 
-#: lexsup.c:525
+#: lexsup.c:522
 msgid "Sort common symbols by alignment [in specified order]"
 msgstr ""
 
-#: lexsup.c:530
+#: lexsup.c:527
 msgid "name|alignment"
 msgstr ""
 
-#: lexsup.c:531
+#: lexsup.c:528
 msgid "Sort sections by name or maximum alignment"
 msgstr ""
 
-#: lexsup.c:533
+#: lexsup.c:530
 msgid "COUNT"
 msgstr ""
 
-#: lexsup.c:533
+#: lexsup.c:530
 msgid "How many tags to reserve in .dynamic section"
 msgstr ""
 
-#: lexsup.c:536
+#: lexsup.c:533
 msgid "[=SIZE]"
 msgstr ""
 
-#: lexsup.c:536
+#: lexsup.c:533
 msgid "Split output sections every SIZE octets"
 msgstr ""
 
-#: lexsup.c:539
+#: lexsup.c:536
 msgid "[=COUNT]"
 msgstr ""
 
-#: lexsup.c:539
+#: lexsup.c:536
 msgid "Split output sections every COUNT relocs"
 msgstr ""
 
-#: lexsup.c:542
+#: lexsup.c:539
 msgid "Print memory usage statistics"
 msgstr ""
 
-#: lexsup.c:544
+#: lexsup.c:541
 msgid "Display target specific options"
 msgstr ""
 
-#: lexsup.c:546
+#: lexsup.c:543
 msgid "Do task level linking"
 msgstr ""
 
-#: lexsup.c:548
+#: lexsup.c:545
 msgid "Use same format as native linker"
 msgstr ""
 
-#: lexsup.c:550
+#: lexsup.c:547
 msgid "SECTION=ADDRESS"
 msgstr ""
 
-#: lexsup.c:550
+#: lexsup.c:547
 msgid "Set address of named section"
 msgstr ""
 
-#: lexsup.c:553
+#: lexsup.c:550
 msgid "Set address of .bss section"
 msgstr ""
 
-#: lexsup.c:555
+#: lexsup.c:552
 msgid "Set address of .data section"
 msgstr ""
 
-#: lexsup.c:557
+#: lexsup.c:554
 msgid "Set address of .text section"
 msgstr ""
 
-#: lexsup.c:559
+#: lexsup.c:556
 msgid "Set address of text segment"
 msgstr ""
 
-#: lexsup.c:562
+#: lexsup.c:559
 msgid ""
 "How to handle unresolved symbols.  <method> is:\n"
 "                                ignore-all, report-all, ignore-in-object-"
@@ -1890,113 +1894,117 @@ msgid ""
 "                                ignore-in-shared-libs"
 msgstr ""
 
-#: lexsup.c:567
+#: lexsup.c:564
 msgid "[=NUMBER]"
 msgstr ""
 
-#: lexsup.c:568
+#: lexsup.c:565
 msgid "Output lots of information during link"
 msgstr ""
 
-#: lexsup.c:572
+#: lexsup.c:569
 msgid "Read version information script"
 msgstr ""
 
-#: lexsup.c:575
+#: lexsup.c:572
 msgid ""
 "Take export symbols list from .exports, using\n"
 "                                SYMBOL as the version."
 msgstr ""
 
-#: lexsup.c:579
+#: lexsup.c:576
 msgid "Add data symbols to dynamic list"
 msgstr ""
 
-#: lexsup.c:581
+#: lexsup.c:578
 msgid "Use C++ operator new/delete dynamic list"
 msgstr ""
 
-#: lexsup.c:583
+#: lexsup.c:580
 msgid "Use C++ typeinfo dynamic list"
 msgstr ""
 
-#: lexsup.c:585
+#: lexsup.c:582
 msgid "Read dynamic list"
 msgstr ""
 
-#: lexsup.c:587
+#: lexsup.c:584
 msgid "Warn about duplicate common symbols"
 msgstr ""
 
-#: lexsup.c:589
+#: lexsup.c:586
 msgid "Warn if global constructors/destructors are seen"
 msgstr ""
 
-#: lexsup.c:592
+#: lexsup.c:589
 msgid "Warn if the multiple GP values are used"
 msgstr ""
 
-#: lexsup.c:594
+#: lexsup.c:591
 msgid "Warn only once per undefined symbol"
 msgstr ""
 
-#: lexsup.c:596
+#: lexsup.c:593
 msgid "Warn if start of section changes due to alignment"
 msgstr ""
 
-#: lexsup.c:599
+#: lexsup.c:596
 msgid "Warn if shared object has DT_TEXTREL"
 msgstr ""
 
-#: lexsup.c:602
+#: lexsup.c:599
 msgid "Warn if an object has alternate ELF machine code"
 msgstr ""
 
-#: lexsup.c:606
+#: lexsup.c:603
 msgid "Report unresolved symbols as warnings"
 msgstr ""
 
-#: lexsup.c:609
+#: lexsup.c:606
 msgid "Report unresolved symbols as errors"
 msgstr ""
 
-#: lexsup.c:611
+#: lexsup.c:608
 msgid "Include all objects from following archives"
 msgstr ""
 
-#: lexsup.c:614
+#: lexsup.c:611
 msgid "Use wrapper functions for SYMBOL"
 msgstr ""
 
-#: lexsup.c:763
+#: lexsup.c:760
 msgid "%P: unrecognized option '%s'\n"
 msgstr ""
 
-#: lexsup.c:767
+#: lexsup.c:764
 msgid "%P%F: use the --help option for usage information\n"
 msgstr ""
 
-#: lexsup.c:785
+#: lexsup.c:782
 msgid "%P%F: unrecognized -a option `%s'\n"
 msgstr ""
 
-#: lexsup.c:798
+#: lexsup.c:795
 msgid "%P%F: unrecognized -assert option `%s'\n"
 msgstr ""
 
-#: lexsup.c:841
+#: lexsup.c:838
 msgid "%F%P: unknown demangling style `%s'"
 msgstr ""
 
-#: lexsup.c:907 lexsup.c:1341
+#: lexsup.c:904 lexsup.c:1335
 msgid "%P%F: invalid number `%s'\n"
 msgstr ""
 
-#: lexsup.c:1005
+#: lexsup.c:1002
 msgid "%P%F: bad --unresolved-symbols option: %s\n"
 msgstr ""
 
-#: lexsup.c:1076
+#: lexsup.c:1065 lexsup.c:1564
+msgid "%P%F: %s: error loading plugin\n"
+msgstr ""
+
+#: lexsup.c:1070
 msgid "%P%F: bad -plugin-opt option\n"
 msgstr ""
 
@@ -2008,117 +2016,105 @@ msgstr ""
 #. an error message here.  We cannot just make this a warning,
 #. increment optind, and continue because getopt is too confused
 #. and will seg-fault the next time around.
-#: lexsup.c:1093
+#: lexsup.c:1087
 msgid "%P%F: bad -rpath option\n"
 msgstr ""
 
-#: lexsup.c:1207
+#: lexsup.c:1201
 msgid "%P%F: -shared not supported\n"
 msgstr ""
 
-#: lexsup.c:1216
+#: lexsup.c:1210
 msgid "%P%F: -pie not supported\n"
 msgstr ""
 
-#: lexsup.c:1224
+#: lexsup.c:1218
 msgid "descending"
 msgstr ""
 
-#: lexsup.c:1226
+#: lexsup.c:1220
 msgid "ascending"
 msgstr ""
 
-#: lexsup.c:1229
+#: lexsup.c:1223
 msgid "%P%F: invalid common section sorting option: %s\n"
 msgstr ""
 
-#: lexsup.c:1233
+#: lexsup.c:1227
 msgid "name"
 msgstr ""
 
-#: lexsup.c:1235
+#: lexsup.c:1229
 msgid "alignment"
 msgstr ""
 
-#: lexsup.c:1238
+#: lexsup.c:1232
 msgid "%P%F: invalid section sorting option: %s\n"
 msgstr ""
 
-#: lexsup.c:1272
+#: lexsup.c:1266
 msgid "%P%F: invalid argument to option \"--section-start\"\n"
 msgstr ""
 
-#: lexsup.c:1279
+#: lexsup.c:1273
 msgid "%P%F: missing argument(s) to option \"--section-start\"\n"
 msgstr ""
 
-#: lexsup.c:1513
+#: lexsup.c:1507
 msgid "%P%F: group ended before it began (--help for usage)\n"
 msgstr ""
 
-#: lexsup.c:1541
+#: lexsup.c:1535
 msgid "%P%X: --hash-size needs a numeric argument\n"
 msgstr ""
 
-#: lexsup.c:1572
-msgid "%P%F: -r and -shared may not be used together\n"
-msgstr ""
-
-#: lexsup.c:1615
-msgid "%P%F: -F may not be used without -shared\n"
-msgstr ""
-
-#: lexsup.c:1617
-msgid "%P%F: -f may not be used without -shared\n"
-msgstr ""
-
-#: lexsup.c:1661 lexsup.c:1674
+#: lexsup.c:1595 lexsup.c:1608
 msgid "%P%F: invalid hex number `%s'\n"
 msgstr ""
 
-#: lexsup.c:1710
+#: lexsup.c:1644
 #, c-format
 msgid "Usage: %s [options] file...\n"
 msgstr ""
 
-#: lexsup.c:1712
+#: lexsup.c:1646
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: lexsup.c:1790
+#: lexsup.c:1724
 #, c-format
 msgid "  @FILE"
 msgstr ""
 
-#: lexsup.c:1793
+#: lexsup.c:1727
 #, c-format
 msgid "Read options from FILE\n"
 msgstr ""
 
 #. Note: Various tools (such as libtool) depend upon the
 #. format of the listings below - do not change them.
-#: lexsup.c:1798
+#: lexsup.c:1732
 #, c-format
 msgid "%s: supported targets:"
 msgstr ""
 
-#: lexsup.c:1806
+#: lexsup.c:1740
 #, c-format
 msgid "%s: supported emulations: "
 msgstr ""
 
-#: lexsup.c:1811
+#: lexsup.c:1745
 #, c-format
 msgid "%s: emulation specific options:\n"
 msgstr ""
 
-#: lexsup.c:1816
+#: lexsup.c:1750
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 
-#: mri.c:294
+#: mri.c:292
 msgid "%P%F: unknown format type %s\n"
 msgstr ""
 
@@ -2127,117 +2123,117 @@ msgstr ""
 msgid "%XUnsupported PEI architecture: %s\n"
 msgstr ""
 
-#: pe-dll.c:788
+#: pe-dll.c:791
 #, c-format
 msgid "%XCannot export %s: invalid export name\n"
 msgstr ""
 
-#: pe-dll.c:845
+#: pe-dll.c:848
 #, c-format
 msgid "%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"
 msgstr ""
 
-#: pe-dll.c:852
+#: pe-dll.c:855
 #, c-format
 msgid "Warning, duplicate EXPORT: %s\n"
 msgstr ""
 
-#: pe-dll.c:939
+#: pe-dll.c:942
 #, c-format
 msgid "%XCannot export %s: symbol not defined\n"
 msgstr ""
 
-#: pe-dll.c:945
+#: pe-dll.c:948
 #, c-format
 msgid "%XCannot export %s: symbol wrong type (%d vs %d)\n"
 msgstr ""
 
-#: pe-dll.c:952
+#: pe-dll.c:955
 #, c-format
 msgid "%XCannot export %s: symbol not found\n"
 msgstr ""
 
-#: pe-dll.c:1066
+#: pe-dll.c:1069
 #, c-format
 msgid "%XError, ordinal used twice: %d (%s vs %s)\n"
 msgstr ""
 
-#: pe-dll.c:1456
+#: pe-dll.c:1450
 #, c-format
 msgid "%XError: %d-bit reloc in dll\n"
 msgstr ""
 
-#: pe-dll.c:1584
+#: pe-dll.c:1578
 #, c-format
 msgid "%s: Can't open output def file %s\n"
 msgstr ""
 
-#: pe-dll.c:1735
+#: pe-dll.c:1729
 #, c-format
 msgid "; no contents available\n"
 msgstr ""
 
-#: pe-dll.c:2662
+#: pe-dll.c:2656
 msgid ""
 "%C: variable '%T' can't be auto-imported. Please read the documentation for "
 "ld's --enable-auto-import for details.\n"
 msgstr ""
 
-#: pe-dll.c:2692
+#: pe-dll.c:2686
 #, c-format
 msgid "%XCan't open .lib file: %s\n"
 msgstr ""
 
-#: pe-dll.c:2697
+#: pe-dll.c:2691
 #, c-format
 msgid "Creating library file: %s\n"
 msgstr ""
 
-#: pe-dll.c:2726
+#: pe-dll.c:2720
 #, c-format
 msgid "%Xbfd_openr %s: %E\n"
 msgstr ""
 
-#: pe-dll.c:2738
+#: pe-dll.c:2732
 #, c-format
 msgid "%X%s(%s): can't find member in non-archive file"
 msgstr ""
 
-#: pe-dll.c:2750
+#: pe-dll.c:2744
 #, c-format
 msgid "%X%s(%s): can't find member in archive"
 msgstr ""
 
-#: pe-dll.c:3189
+#: pe-dll.c:3183
 #, c-format
 msgid "%XError: can't use long section names on this arch\n"
 msgstr ""
 
-#: plugin.c:177 plugin.c:211
+#: plugin.c:176 plugin.c:210
 msgid "<no plugin>"
 msgstr ""
 
-#: plugin.c:250
+#: plugin.c:249
 #, c-format
 msgid "could not create dummy IR bfd: %F%E\n"
 msgstr ""
 
-#: plugin.c:343
+#: plugin.c:322
 msgid "%P%F: %s: non-ELF symbol in ELF BFD!\n"
 msgstr ""
 
-#: plugin.c:347
+#: plugin.c:326
 msgid "%P%F: unknown ELF symbol visibility: %d!\n"
 msgstr ""
 
-#: plugin.c:586
+#: plugin.c:559
 msgid "%P: %B: symbol `%s' definition: %d, visibility: %d, resolution: %d\n"
 msgstr ""
 
-#: plugin.c:863
+#: plugin.c:825
 msgid "%P%F: %s: plugin reported error claiming file\n"
 msgstr ""
 
-#: plugin.c:934
+#: plugin.c:896
 msgid "%P: %s: error in plugin cleanup (ignored)\n"
 msgstr ""
diff --git a/ld/scripttempl/aix.sc b/ld/scripttempl/aix.sc
index adc5de6bae..d592dbe59f 100644
--- a/ld/scripttempl/aix.sc
+++ b/ld/scripttempl/aix.sc
@@ -11,7 +11,7 @@ SECTIONS
 {
   .pad 0 : { *(.pad) }
 
-  . = ALIGN (0x10000000 + SIZEOF_HEADERS, 32);
+  . = 0x10000000;
   .text ${RELOCATING-0} : {
     ${RELOCATING+PROVIDE (_text = .);}
     *(.text)
@@ -24,8 +24,7 @@ SECTIONS
     *(.tb)
     ${RELOCATING+PROVIDE (_etext = .);}
   }
-
-  . = ALIGN (ALIGN (0x10000000) + (. & 0xfff), 32);
+  . = ALIGN (0x10000000);
   .data . : {
     ${RELOCATING+PROVIDE (_data = .);}
     *(.data)
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 7994b5f11e..149eec7ab3 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -1,6 +1,6 @@
 #
 # Unusual variables checked by this code:
-#	NOP - four byte opcode for no-op (defaults to none)
+#	NOP - four byte opcode for no-op (defaults to 0)
 #	NO_SMALL_DATA - no .sbss/.sbss2/.sdata/.sdata2 sections if not
 #		empty.
 #	SMALL_DATA_CTOR - .ctors contains small data.
@@ -91,12 +91,6 @@
 #
 #  Each of these can also have corresponding .rel.* and .rela.* sections.
 
-if test -n "$NOP"; then
-  FILL="=$NOP"
-else
-  FILL=
-fi
-
 test -z "$RODATA_NAME" && RODATA_NAME=rodata
 test -z "$SDATA_NAME" && SDATA_NAME=sdata
 test -z "$SBSS_NAME" && SBSS_NAME=sbss
@@ -444,7 +438,7 @@ cat <<EOF
     ${RELOCATING+${INIT_START}}
     KEEP (*(.init))
     ${RELOCATING+${INIT_END}}
-  } ${FILL}
+  } =${NOP-0}
 
   ${TEXT_PLT+${PLT}}
   ${TINY_READONLY_SECTION}
@@ -459,13 +453,13 @@ cat <<EOF
     /* .gnu.warning sections are handled specially by elf32.em.  */
     *(.gnu.warning)
     ${RELOCATING+${OTHER_TEXT_SECTIONS}}
-  } ${FILL}
+  } =${NOP-0}
   .fini         ${RELOCATING-0} :
   {
     ${RELOCATING+${FINI_START}}
     KEEP (*(.fini))
     ${RELOCATING+${FINI_END}}
-  } ${FILL}
+  } =${NOP-0}
   ${RELOCATING+PROVIDE (__${ETEXT_NAME} = .);}
   ${RELOCATING+PROVIDE (_${ETEXT_NAME} = .);}
   ${RELOCATING+PROVIDE (${ETEXT_NAME} = .);}
diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
index 3a27952fe1..3cb77ab4e0 100644
--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
@@ -73,7 +73,6 @@ SECTIONS
     *(.text)
     ${R_TEXT}
     ${RELOCATING+ *(.text.*)}
-    ${RELOCATING+ *(.gnu.linkonce.t.*)}
     *(.glue_7t)
     *(.glue_7)
     ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; 
@@ -239,7 +238,7 @@ SECTIONS
   /* DWARF 2.  */
   .debug_info ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_info${RELOCATING+ .gnu.linkonce.wi.*})
+    *(.debug_info) *(.gnu.linkonce.wi.*)
   }
 
   .debug_abbrev ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
@@ -307,7 +306,7 @@ SECTIONS
   /* DWARF 4.  */
   .debug_types ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_types${RELOCATING+ .gnu.linkonce.wt.*})
+    *(.debug_types) *(.gnu.linkonce.wt.*)
   }
 }
 EOF
diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc
index b2113fe227..60515ef9f1 100644
--- a/ld/scripttempl/pep.sc
+++ b/ld/scripttempl/pep.sc
@@ -73,7 +73,6 @@ SECTIONS
     *(.text)
     ${R_TEXT}
     ${RELOCATING+ *(.text.*)}
-    ${RELOCATING+ *(.gnu.linkonce.t.*)}
     *(.glue_7t)
     *(.glue_7)
     ${CONSTRUCTING+. = ALIGN(8);}
@@ -245,7 +244,7 @@ SECTIONS
   /* DWARF 2.  */
   .debug_info ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_info${RELOCATING+ .gnu.linkonce.wi.*})
+    *(.debug_info) *(.gnu.linkonce.wi.*)
   }
 
   .debug_abbrev ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
@@ -313,7 +312,7 @@ SECTIONS
   /* DWARF 4.  */
   .debug_types ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_types${RELOCATING+ .gnu.linkonce.wt.*})
+    *(.debug_types) *(.gnu.linkonce.wt.*)
   }
 }
 EOF
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index dc8643beec..233d962352 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,237 +1,1145 @@
-2012-03-25  Alan Modra  <amodra@gmail.com>
+2011-11-10  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
-	* ld-powerpc/vxworks-relax.rd: Remove check on reloc section
-	file offset and reloc symbol indices.
+	Apply mainline patches.
+	2011-11-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+	* ld-arm/jump-reloc-veneers.s: Update for changes to assembler output.
 
-2012-03-21  Hans-Peter Nilsson  <hp@axis.com>
+2011-11-08  Alan Modra  <amodra@gmail.com>
 
-	PR ld/13813
-	* ld-mips-elf/comm-data.exp (mips_comm_data_test): For N32 and N64
-	tests, also specify assembler option -march=mips3.
+	* ld-powerpc/powerpc.exp: Expect ld warnings for tocopt test.
+	* ld-powerpc/tocopt.out: New file.
 
-2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+2011-10-25  Alan Modra  <amodra@gmail.com>
 
-	PR ld/13880
-	* ld-i386/i386.exp: Run protected4 and protected5.
-	* ld-x86-64/x86-64.exp: Likewise.
+	Apply mainline patches
+	2011-10-10  Alan Modra  <amodra@gmail.com>
+	* ld-powerpc/relbrlt.d: Update for stub alignment change.
+	* ld-powerpc/tlsexe.g: Likewise.
+	* ld-powerpc/tlsexe.r: Likewise.
+	* ld-powerpc/tlsexetoc.g: Likewise.
+	* ld-powerpc/tlsexetoc.r: Likewise.
+	* ld-powerpc/tlsso.g: Likewise.
+	* ld-powerpc/tlsso.r: Likewise.
+
+	2011-10-08  H.J. Lu  <hongjiu.lu@intel.com>
+	PR ld/13250
+	* ld-elf/shared.exp (build_tests): Add tests for PR ld/13250.
+	(run_tests): Likewise.
+	* ld-elf/pr13250-1.c: New.
+	* ld-elf/pr13250-2.c: Likewise.
+	* ld-elf/pr13250-3.c: Likewise.
+
+	2011-10-06  Alan Modra  <amodra@gmail.com>
+	* ld-plugin/plugin-1.d, * ld-plugin/plugin-2.d, * ld-plugin/plugin-3.d,
+	* ld-plugin/plugin-4.d, * ld-plugin/plugin-5.d, * ld-plugin/plugin-6.d,
+	* ld-plugin/plugin-7.d, * ld-plugin/plugin-8.d, * ld-plugin/plugin-9.d,
+	* ld-plugin/plugin-10.d, * ld-plugin/plugin-11.d: Update.
+
+	2011-09-30  Alan Modra  <amodra@gmail.com>
+	* ld-powerpc/tocopt.d: Update.
+	* ld-powerpc/tocopt5.d, * ld-powerpc/tocopt5.s: New test.
+	* ld-powerpc/powerpc.exp: Run new test.
+
+2011-10-18  David S. Miller  <davem@davemloft.net>
+
+	* ld-sparc/tlssunbin32.dd: Update for TLS call relaxation fix
+	for PR 13301.
+	* ld-sparc/tlssunbin64.dd: Likewise.
+	* ld-sparc/tlssunpic32.dd: Likewise.
+	* ld-sparc/tlssunpic64.dd: Likewise.
+
+2011-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13177
+	* ld-elf/pr13177.d: Removed.
+	* ld-elf/pr13177.s: Likewise.
+
+2011-10-14  Hans-Peter Nilsson  <hp@axis.com>
+
+	* ld-cris/pic-gc-72.d: Adjust for dropping unused undefined
+	dynamic symbol "dsofn".
+
+2011-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13195
+	* ld-elf/elf.exp: Add a C link testcase for PR ld/13195.
+
+	* ld-elf/pr13195.c: New.
+	* ld-elf/pr13195.d: Likewise.
+	* ld-elf/pr13195.s: Likewise.
+	* ld-elf/pr13195.t: Likewise.
+
+2011-09-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/pr12975.d: Only run for *-*-linux* and *-*-gnu*
+	targets.
+	* ld-elf/pr13177.d: Likewise.
 
-	* ld-i386/protected4.d: New.
-	* ld-i386/protected4.s: Likewise.
-	* ld-i386/protected5.d: Likewise.
-	* ld-i386/protected5.s: Likewise.
-	* ld-x86-64/protected4.d: Likewise.
-	* ld-x86-64/protected4.s: Likewise.
-	* ld-x86-64/protected5.d: Likewise.
-	* ld-x86-64/protected5.s: Likewise.
-
-2012-03-19  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* ld-m68k/m68k.exp ("TLS indirect symbol use"): Pass
-	--copy-dt-needed-entries.
-
-2012-03-16  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
-
-	* ld-arm/arm-elf.exp: Add new testcases.
-	* ld-arm/attr-merge-2.attr: Update ouput.
-	* ld-arm/attr-merge-2a.s: Remove Tag_DIV_use test.
-	* ld-arm/attr-merge-2b.s: Likewise.
-	* ld-arm/attr-merge-3.attr: Updated expected output.
-	* ld-arm/attr-merge-4.attr: Likewise.
-	* ld-arm/attr-merge-5.attr: Likewise.
-	* ld-arm/attr-merge-6.attr: Likewise.
-	* ld-arm/attr-merge-7.attr: Likewise.
-	* ld-arm/attr-merge-arch-1.attr: Likewise.
-	* ld-arm/attr-merge-arch-2.attr: Likewise.
-	* ld-arm/attr-merge-unknown-2.d: Likewise.
-	* ld-arm/attr-merge-unknown-2r.d: Likewise.
-	* ld-arm/attr-merge-unknown-3.d: Likewise.
-	* ld-arm/attr-merge-vfp-1.d: Likewise.
-	* ld-arm/attr-merge-vfp-1r.d: Likewise.
-	* ld-arm/attr-merge-vfp-2.d: Likewise.
-	* ld-arm/attr-merge-vfp-2r.d: Likewise.
-	* ld-arm/attr-merge-vfp-3.d: Likewise.
-	* ld-arm/attr-merge-vfp-3r.d: Likewise.
-	* ld-arm/attr-merge-vfp-4.d: Likewise.
-	* ld-arm/attr-merge-vfp-4r.d: Likewise.
-	* ld-arm/attr-merge-vfp-5.d: Likewise.
-	* ld-arm/attr-merge-vfp-5r.d: Likewise.
-	* ld-arm/attr-merge-vfp-6.d: Likewise.
-	* ld-arm/attr-merge-vfp-6r.d: Likewise.
-	* ld-arm/attr-merge-wchar-00-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-00.d: Likewise.
-	* ld-arm/attr-merge-wchar-02-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-02.d: Likewise.
-	* ld-arm/attr-merge-wchar-04-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-04.d: Likewise.
-	* ld-arm/attr-merge-wchar-20-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-20.d: Likewise.
-	* ld-arm/attr-merge-wchar-22-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-22.d: Likewise.
-	* ld-arm/attr-merge-wchar-24-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-40-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-40.d: Likewise.
-	* ld-arm/attr-merge-wchar-42-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-44-nowarn.d: Likewise.
-	* ld-arm/attr-merge-wchar-44.d: Likewise.
-	* ld-arm/attr-merge.attr: Likewise.
-	* ld-arm/attr-merge-div-0.s: New testcase.
-	* ld-arm/attr-merge-div-00.d: Likewise.
-	* ld-arm/attr-merge-div-01-m3.d: Likewise.
-	* ld-arm/attr-merge-div-01.d: Likewise.
-	* ld-arm/attr-merge-div-02.d: Likewise.
-	* ld-arm/attr-merge-div-1.s: Likewise.
-	* ld-arm/attr-merge-div-10-m3.d: Likewise.
-	* ld-arm/attr-merge-div-10.d: Likewise.
-	* ld-arm/attr-merge-div-11.d: Likewise.
-	* ld-arm/attr-merge-div-12.d: Likewise.
-	* ld-arm/attr-merge-div-120.d: Likewise.
-	* ld-arm/attr-merge-div-2.s: Likewise.
-	* ld-arm/attr-merge-div-20.d: Likewise.
-	* ld-arm/attr-merge-div-21.d: Likewise.
-	* ld-arm/attr-merge-div-22.d: Likewise.
-
-2012-03-16  Alan Modra  <amodra@gmail.com>
-
-	* ld-gc/pr13683.d: Accept powerpc64 function descriptor syms.
-
-2012-03-15  Alan Modra  <amodra@gmail.com>
-
-	* config/default.exp: Update copyright date.
-	* ld-elf/shared.exp: Pass --no-as-needed to various tests linking
-	shared libs.
-	* ld-elfvers/vers.exp: Likewise.
-
-2012-03-14  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR ld/13839
-	* ld-elf/pr13839.d: New.
-	* ld-elf/pr13839.s: Likewise.
-	* ld-elf/pr13839.t: Likewise.
-
-2012-03-09  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR ld/13817
-	* ld-i386/pr13302.d: Updated.
+	* ld-elf/pr13177.s: Avoid relocations in text sections.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13177
+	* ld-elf/pr13177.d: New.
+	* ld-elf/pr13177.s: Likewise.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12975
+	* ld-elf/pr12975.d: New.
+	* ld-elf/pr12975.s: Likewise.
+	* ld-elf/pr12975.t: Likewise.
+
+2011-09-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13178
+	* ld-ifunc/ifunc-13-i386.d: Updated.
+	* ld-ifunc/ifunc-13-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-3a-x86.d: Likewise.
+	* ld-x86-64/pr13082-5a.d: Likewise.
+
+	* ld-ifunc/ifunc-15-i386.d: New.
+	* ld-ifunc/ifunc-15-i386.s: Likewise.
+	* ld-ifunc/ifunc-15-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-15-x86-64.s: Likewise.
+
+2011-09-01  Christophe Lyon  <christophe.lyon@st.com>
+
+	* ld-arm/arm-elf.exp: Add new rodata-merge-map test.
+	* ld-arm/rodata-merge-map.ld: New file.
+	* ld-arm/rodata-merge-map.sym: Likewise.
+	* ld-arm/rodata-merge-map1.s Likewise.
+	* ld-arm/rodata-merge-map2.s: Likewise.
+	* ld-arm/rodata-merge-map3.s: Likewise.
+
+2011-08-22  Alan Modra  <amodra@gmail.com>
+
+	* ld-powerpc/tocopt4a.s, * ld-powerpc/tocopt4b.s,
+	* ld-powerpc/tocopt4.d: New test.
+	* ld-powerpc/powerpc.exp: Run it.
+
+2011-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13082
+	* ld-x86-64/pr13082-1.s: New.
+	* ld-x86-64/pr13082-1a.d: Likewise.
+	* ld-x86-64/pr13082-1b.d: Likewise.
+	* ld-x86-64/pr13082-2.s: Likewise.
+	* ld-x86-64/pr13082-2a.d: Likewise.
+	* ld-x86-64/pr13082-2b.d: Likewise.
+	* ld-x86-64/pr13082-3.s: Likewise.
+	* ld-x86-64/pr13082-3a.d: Likewise.
+	* ld-x86-64/pr13082-3b.d: Likewise.
+	* ld-x86-64/pr13082-4.s: Likewise.
+	* ld-x86-64/pr13082-4a.d: Likewise.
+	* ld-x86-64/pr13082-4b.d: Likewise.
+	* ld-x86-64/pr13082-5.s: Likewise.
+	* ld-x86-64/pr13082-5a.d: Likewise.
 	* ld-x86-64/pr13082-5b.d: Likewise.
+	* ld-x86-64/pr13082-6.s: Likewise.
 	* ld-x86-64/pr13082-6a.d: Likewise.
 	* ld-x86-64/pr13082-6b.d: Likewise.
 
-2012-03-06  Alan Modra  <amodra@gmail.com>
+	* ld-x86-64/x86-64.exp: Run pr13082-[1-6][ab].
 
-	PR ld/13683
-	* ld-gc/pr13683.d: Allow non-zero top address digit.
+2011-08-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
-2012-03-05  Hans-Peter Nilsson  <hp@axis.com>
+	* ld-arm/arm-elf.exp (armelftests): Update for new command-line
+	options.
+	(armeabitests): Update for new command-line options, and add
+	new test cases.
+	* ld-arm/fix-arm1176.s: Add test case.
+	* ld-arm/fix-arm1176-off.d: Likewise.
+	* ld-arm/fix-arm1176-on.d: Likewise.
 
-	PR ld/13803
-	* ld-arm/fix-arm1176-off.d, ld-arm/fix-arm1176-on.d: Regexpify
-	address of func_to_branch_to.
+2011-08-05  Alan Modra  <amodra@gmail.com>
 
-2012-03-01  Hans-Peter Nilsson  <hp@axis.com>
+	* ld-powerpc/tlsexe.r: Update for stripped .branch_lt.
+	* ld-powerpc/tlsexetoc.r: Likewise.
+	* ld-powerpc/tlsso.r: Likewise.
+	* ld-powerpc/tlstocso.r: Likewise.
 
-	PR ld/13789
-	* ld-elf/zerosize1.d: Allow xyzzy to be either OBJECT or NOTYPE.
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
-2012-02-25  Walter Lee  <walt@tilera.com>
+	PR ld/13048
+	* ld-x86-64/ilp32-6.d: New.
+	* ld-x86-64/ilp32-6.s: Likewise.
+	* ld-x86-64/ilp32-7.d: Likewise.
+	* ld-x86-64/ilp32-7.s: Likewise.
+	* ld-x86-64/ilp32-8.d: Likewise.
+	* ld-x86-64/ilp32-8.s: Likewise.
+	* ld-x86-64/ilp32-9.d: Likewise.
+	* ld-x86-64/ilp32-9.s: Likewise.
 
-	* ld-tilegx/reloc-be.d: New.
-	* ld-tilegx/reloc-le.d: New.
-	* ld-tilegx/reloc.d: Delete.
-	* ld-tilegx/tilegx.exp: Test big and little endian.
+	* ld-x86-64/x86-64.exp: Run ilp32-6, ilp32-7, ilp32-8 and ilp32-9.
 
-2012-02-22  Nick Clifton  <nickc@redhat.com>
+2011-07-27  Roland McGrath  <mcgrathr@google.com>
 
-	PR ld/13683
-	* ld-gc/pr13683.c: New test source file.
-	* ld-gc/pr13683.d: New test control and output file.
-	* ld-gc/gc.exp: Run the pr13683 test.
+	* ld-i386/vxworks1-lib.rd: Swap order of sections expected in output.
 
-	* ld-cris/tls-gc-68: Update expected symbol table dump.
-	* ld-cris/tls-gc-69: Likewise.
-	* ld-cris/tls-gc-70: Likewise.
-	* ld-cris/tls-gc-71: Likewise.
-	* ld-cris/tls-gc-75: Likewise.
-	* ld-cris/tls-gc-76.d: Likewise.
-	* ld-cris/tls-gc-79.d: Likewise.
+2011-07-26  Alan Modra  <amodra@gmail.com>
 
-2012-02-20  Thomas Schwinge <thomas@schwinge.name>
+	* ld-powerpc/powerpc.exp: Use --no-ld-generated-unwind-info
+	with some tests.
+	* ld-powerpc/relbrlt.d: Likewise.
 
-	* ld-elf/comm-data.exp: Run for *-*-gnu*.
+2011-07-25  Hans-Peter Nilsson  <hp@bitrange.com>
 
-2012-02-14  Alan Modra  <amodra@gmail.com>
+	PR ld/12815
+	* ld-mmix/pr12815-1.d, ld-mmix/pr12815-1.s, ld-mmix/pr12815-1.ld,
+	ld-mmix/pr12815-2.d, ld-mmix/pr12815-2.s: New tests.
 
-	* ld-elf/linkoncerdiff.d: Don't run for hppa64-hpux.
-	* ld-elf/pr11304a.s: Always have whitespace before directives.
-	* ld-elf/pr11304b.s: Likewise.
-	* ld-selective/selective.exp: Test m68hc1* variant of m6811, m6812.
-	* lib/ld-lib.exp: Likewise, and vice versa.
+2011-07-24  Catherine Moore  <clm@codesourcery.com>
+	    Chao-ying Fu  <fu@mips.com>
+	    Maciej W. Rozycki  <macro@codesourcery.com>
 
-2012-02-13  Richard Henderson  <rth@redhat.com>
+	* lib/ld-lib.exp (run_dump_test): Support distinct assembler
+	flags for the same source named multiple times.
+	* ld-mips-elf/jalx-1.s: New test source.
+	* ld-mips-elf/jalx-1.d: New test output.
+	* ld-mips-elf/jalx-1.ld: New test linker script.
+	* ld-mips-elf/jalx-2-main.s: New test source.
+	* ld-mips-elf/jalx-2-ex.s: Likewise.
+	* ld-mips-elf/jalx-2-printf.s: Likewise.
+	* ld-mips-elf/jalx-2.dd: New test output.
+	* ld-mips-elf/jalx-2.ld: New test linker script.
+	* ld-mips-elf/mips16-and-micromips.d: New test.
+	* ld-mips-elf/mips-elf.exp: Run the new tests
 
-	PR ld/13621
-	* ld-elf/warn2.d: Expect ABS section for Foo.
-	* ld-elf/zerosize1.d, ld-elf/zerosize1.s: New test.
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
 
-2012-02-13  Alan Modra  <amodra@gmail.com>
+	* ld-x86-64/abs-k1om.d: New.
+	* ld-x86-64/protected2-k1om.d: Likewise.
+	* ld-x86-64/protected3-k1om.d: Likewise.
 
-	* ld-m68hc11/m68hc11.exp: Run for m68hc11-*-* and m68hc12-*-*.
-	* ld-m68hc11/adj-brset.d: Remove redundant #target line.  Add
-	-m m68hc11elf to ld invocation.
-	* ld-m68hc11/adj-jump.d: Likewise.
-	* ld-m68hc11/bug-1403.d: Likewise.
-	* ld-m68hc11/bug-1417.d: Likewise.
-	* ld-m68hc11/bug-3331.d: Likewise.
-	* ld-m68hc11/relax-direct.d: Likewise.
-	* ld-m68hc11/relax-group.d: Likewise.
-	* ld-m68hc11/far-hc11.d: Remove redundant #target line.  Adjust for
-	changed addresses.
-	* ld-m68hc11/far-hc12.d: Remove redundant #target line.
-	* ld-m68hc11/link-hcs12.d: Likewise, and adjust for header changes.
+	* ld-x86-64/x86-64.exp: Run abs-k1om, protected2-k1om and
+	protected3-k1om.
 
-2012-02-09  H.J. Lu  <hongjiu.lu@intel.com>
+2011-07-14  H.J. Lu  <hongjiu.lu@intel.com>
 
-	PR ld/13675
-	* ld-i386/tlsnopic.dd: Update no-op padding.
-	* ld-i386/tlspic.dd: Likewise.
+	* ld-elf/binutils.exp (binutils_test): Also check ignored
+	"-z relro".
 
-2012-01-31  H.J. Lu  <hongjiu.lu@intel.com>
+2011-07-14  Alan Modra  <amodra@gmail.com>
 
-	PR ld/13616
-	* ld-i386/tlsbindesc.dd: Update no-op padding.
-	* ld-i386/tlsnopic.dd: Likewise.
-	* ld-i386/tlspic.dd: Likewise.
+	* ld-scripts/section-flags.exp: Pass --local-store 0:0 for
+	spu.  Rewrite using foreach.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* ld-powerpc/tlsexe.d, * ld-powerpc/tlsexe.g. *ld-powerpc/tlsexe.r,
+	* ld-powerpc/tlsexetoc.d, * ld-powerpc/tlsexetoc.g,
+	* ld-powerpc/tlsexetoc.r, * ld-powerpc/tlsso.d,
+	* ld-powerpc/tlstocso.d: Update for plt stub change.
+
+2011-07-11 Catherine Moore  <clm@cm00re.com>
+
+	* ld-scripts/section-flags-1.s: New.
+	* ld-scripts/section-flags-1.t: New.
+	* ld-scripts/section-flags-2.s: New.
+	* ld-scripts/section-flags-2.t: New.
+	* ld-scripts/section-flags.exp: New.
+
+2011-07-11  Alan Modra  <amodra@gmail.com>
+
+	* ld-powerpc/tocopt2.s, * ld-powerpc/tocopt2.out,
+	* ld-powerpc/tocopt2.d: New test.
+	* ld-powerpc/tocopt3.s, * ld-powerpc/tocopt3.d: New test.
+	* ld-powerpc/powerpc.exp (ppc64elftests) Run them.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* ld-ifunc/ifunc.exp: Update for changed output.
+	* ld-unique/unique.exp: Likewise.
+
+2011-06-27  Nick Clifton  <nickc@redhat.com>
+
+	* ld-elf/elf.exp: Exlcude all v850 targets from note-3 test.
+
+2011-06-27  Alan Modra  <amodra@gmail.com>
+
+	* ld-elf/elf.exp: Exclude more targets from note-3 test.
+
+2011-06-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12921
+	* ld-i386/i386.exp: Run pr12921.
+	* ld-x86-64/x86-64.exp: Likewise.
+
+	* ld-i386/pr12921.d: New.
+	* ld-i386/pr12921.s: Likewise.
+	* ld-x86-64/pr12921.d: Likewise.
+	* ld-x86-64/pr12921.s: Likewise.
+
+2011-06-22  Thomas Schwinge  <thomas@schwinge.name>
+
+	* ld-elf/elf.exp: Execute array_tests_pie tests on *-*-gnu*, too.
+
+2011-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-ifunc/ifunc-1-local-x86.d: Adjusted.
+	* ld-ifunc/ifunc-1-x86.d: Likewise.
+	* ld-ifunc/ifunc-3a-x86.d: Likewise.
+
+2011-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/eh1.d: Revert x32 change.
+	* ld-elf/eh2.d: Likewise.
+	* ld-elf/eh3.d: Likewise.
+	* ld-elf/eh4.d: Likewise.
+
+2011-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/12570
+	* ld-x86-64/x86-64.exp: Link some testcases with
+	--no-ld-generated-unwind-info.
+	* ld-x86-64/tlsbin.rd: Add --no-ld-generated-unwind-info to ld
+	comment.
+	* ld-x86-64/tlsdesc.dd: Likewise.
+	* ld-x86-64/tlspic.dd: Likewise.
+	* ld-x86-64/tlsdesc.sd: Likewise.
+	* ld-x86-64/tlspic.rd: Likewise.
+	* ld-x86-64/tlsbindesc.rd: Likewise.
+	* ld-x86-64/tlsbindesc.sd: Likewise.
+	* ld-x86-64/tlsbin.td: Likewise.
+	* ld-x86-64/tlsdesc.pd: Likewise.
+	* ld-x86-64/tlsdesc.td: Likewise.
+	* ld-x86-64/tlsbindesc.dd: Likewise.
 	* ld-x86-64/tlsbin.dd: Likewise.
+	* ld-x86-64/tlsgdesc.rd: Likewise.
+	* ld-x86-64/tlspic.sd: Likewise.
+	* ld-x86-64/tlsbindesc.td: Likewise.
+	* ld-x86-64/tlspic.td: Likewise.
+	* ld-x86-64/tlsbin.sd: Likewise.
+	* ld-x86-64/ilp32-4.d: Likewise.
+	* ld-x86-64/tlsgdesc.dd: Add --no-ld-generated-unwind-info to ld
+	comment.  Adjust.
+	* ld-x86-64/tlsdesc.rd: Likewise.
+	* ld-x86-64/tlsgd6.dd: Adjust.
+	* ld-x86-64/tlsgd5.dd: Likewise.
+	* ld-i386/i386.exp: Link some testcases with
+	--no-ld-generated-unwind-info.
+	* ld-i386/tlsbin.rd: Add --no-ld-generated-unwind-info to ld
+	comment..
+	* ld-i386/tlsdesc.dd: Likewise.
+	* ld-i386/tlspic.dd: Likewise.
+	* ld-i386/tlsdesc.sd: Likewise.
+	* ld-i386/tlsgdesc.dd: Likewise.
+	* ld-i386/tlsnopic.sd: Likewise.
+	* ld-i386/tlspic.rd: Likewise.
+	* ld-i386/tlsdesc.rd: Likewise.
+	* ld-i386/tlsbindesc.rd: Likewise.
+	* ld-i386/tlsbindesc.sd: Likewise.
+	* ld-i386/tlsbin.td: Likewise.
+	* ld-i386/tlsdesc.td: Likewise.
+	* ld-i386/tlsnopic.dd: Likewise.
+	* ld-i386/tlsbindesc.dd: Likewise.
+	* ld-i386/tlsbin.dd: Likewise.
+	* ld-i386/tlsgdesc.rd: Likewise.
+	* ld-i386/tlspic.sd: Likewise.
+	* ld-i386/tlsnopic.rd: Likewise.
+	* ld-i386/tlsbindesc.td: Likewise.
+	* ld-i386/tlspic.td: Likewise.
+	* ld-i386/tlsbin.sd: Likewise.
+
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/eh1.d: Skip x32.
+	* ld-elf/eh2.d: Likewise.
+	* ld-elf/eh3.d: Likewise.
+	* ld-elf/eh4.d: Likewise.
+
+	* ld-elfvsb/elfvsb.exp: Only xfail 64bit x86_64-*-linux*.
+	* ld-shared/shared.exp: Likewise.
+
+	* ld-ifunc/ifunc-1-local-x86.d: Support x32.
+	* ld-ifunc/ifunc-1-x86.d: Likewise.
+	* ld-ifunc/ifunc-3a-x86.d: Likewise.
+	* ld-x86-64/pcrel16.d: Likewise.
+
+	* ld-x86-64/x86-64.exp (x86_64tests): Add missing -melf_x86_64.
+
+2011-06-16  Alan Modra  <amodra@gmail.com>
+
+	* ld-elfvers/vers2.ver: Don't assume any particular index for
+	version reference.
+	* ld-elfvers/vers3.ver: Likewise.
+	* ld-elfvers/vers19.ver: Likewise.
+	* ld-elfvers/vers22.ver: Likewise.
+	* ld-elfvers/vers27d4.ver: Likewise.
+	* ld-elfvers/vers28c.ver: Likewise.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* ld-elf/elf.exp: Don't attempt to build symbol3.a for hppa64-hpux.
+	* ld-elf/warn3.d: Correct target selection and comment.
+
+	* ld-elf/pr12851.d: Correct target selection and comment.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* ld-elf/eh5.d: Don't run on tile*.
+	* ld-srec/srec.exp: xfail on tile*.
+	* ld-tilegx/external.s: New file.
+	* ld-tilegx/reloc.d: New file.
+	* ld-tilegx/reloc.s: New file.
+	* ld-tilegx/tilegx.exp: New file.
+	* ld-tilepro/external.s: New file.
+	* ld-tilepro/reloc.d: New file.
+	* ld-tilepro/reloc.s: New file.
+	* ld-tilepro/tilepro.exp: New file.
+
+2011-06-10  Nick Clifton  <nickc@redhat.com>
+
+	* ld-elf/elf.exp: Add test for linking a shared library with a
+	broken linker script that marks dynamic sections as being notes.
+	* ld-elf/note-3.s: New test source file.
+	* ld-elf/note-3.t: New test linker script.
+	* ld-elf/note-3.l: Expected output from the linker.
+	* lib/ld-lib.exp (run_ld_link_tests): Improve description.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/x86-64.exp: Build x32 DSO from x86-64 object file
+	only for native.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/simple.c: New.
+	* ld-x86-64/x86-64-x32.rd: Likewise.
+
+	* ld-x86-64/x86-64.exp: Check building x32 DSO from x86-64
+	object file.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12851
+	* ld-elf/pr12851.d: New.
+	* ld-elf/pr12851.s: Likewise.
+
+2011-06-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/elf.exp: Build symbol3.a and symbol3w.a.
+
+	* ld-elf/symbol3.s: New.
+	* ld-elf/symbol3w.s: Likewise.
+	* ld-elf/warn3.d: Likewise.
+
+2011-06-02  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Adjust tests for zero offset formatting.
+	* ld-arm/cortex-a8-fix-bcc-plt.d: Adjust.
+	* ld-arm/farcall-arm-arm-pic-veneer.d: Adjust.
+	* ld-arm/farcall-arm-thumb.d: Adjust.
+	* ld-arm/farcall-group-size2.d: Adjust.
+	* ld-arm/farcall-group.d: Adjust.
+	* ld-arm/farcall-mix.d: Adjust.
+	* ld-arm/farcall-mix2.d: Adjust.
+	* ld-arm/farcall-mixed-lib-v4t.d: Adjust.
+	* ld-arm/farcall-mixed-lib.d: Adjust.
+	* ld-arm/farcall-thumb-arm-blx-pic-veneer.d: Adjust.
+	* ld-arm/farcall-thumb-arm-pic-veneer.d: Adjust.
+	* ld-arm/farcall-thumb-thumb.d: Adjust.
+	* ld-arm/ifunc-10.dd: Adjust.
+	* ld-arm/ifunc-3.dd: Adjust.
+	* ld-arm/ifunc-4.dd: Adjust.
+	* ld-arm/ifunc-5.dd: Adjust.
+	* ld-arm/ifunc-6.dd: Adjust.
+	* ld-arm/ifunc-7.dd: Adjust.
+	* ld-arm/ifunc-8.dd: Adjust.
+	* ld-arm/jump-reloc-veneers-long.d: Adjust.
+	* ld-arm/tls-longplt-lib.d: Adjust.
+	* ld-arm/tls-thumb1.d: Adjust.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* ld-arm/cortex-a8-far.d: Adjust expected output.
+	* ld-arm/arm-call1.s: Give function symbol correct type.
+	* ld-arm/arm-call2.s: Ditto.
+	* ld-arm/farcall-group4.s: Ditto.
+	* ld-arm/arm-elf.exp (cortex-a8-far): Define far symbols with correct
+	type via assembly file.
+	* ld-arm/cortex-a8-far-3.s: New file.
+	* ld-arm/abs-call-1.s: Add Thumb tests
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+	Nathan Sidwell  <nathan@codesourcery.com>
+
+	* ld-arm/abs-call-1.d: New.
+	* ld-arm/abs-call-1.s: New.
+	* ld-arm/arm-elf.exp: Add it.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* ld-arm/tls-longplt.d: Update expected output.
+	* ld-arm/tls-thumb1.d: Ditto.
+
+2011-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12809
+	* ld-x86-64/tlsbin.s: Add a test for LE with large model.
+
+	* ld-x86-64/tlsbin.dd: Updated.
+	* ld-x86-64/tlsbin.rd: Likewise.
+	* ld-x86-64/tlsbin.sd: Likewise.
+	* ld-x86-64/tlsbin.td: Likewise.
 	* ld-x86-64/tlsbindesc.dd: Likewise.
-	* ld-x86-64/tlspic.dd: Likewise.
+	* ld-x86-64/tlsbindesc.rd: Likewise.
+	* ld-x86-64/tlsbindesc.sd: Likewise.
+	* ld-x86-64/tlsbindesc.td: Likewise.
+
+2011-05-24  Hans-Peter Nilsson  <hp@axis.com>
+
+	* ld-cris/tls-e-tpoffcomm1.d: Adjust for second PR12763 change,
+	setting TLS file offset.
+
+2011-05-23  Nick Clifton  <nickc@redhat.com>
+
+	* ld-elf/shared.exp: Revert previous delta.  Do not build
+	libraries in a non-native environment.
+
+2011-05-23  Alan Modra  <amodra@gmail.com>
+
+	PR 12763
+	* ld-elf/binutils.exp: Don't run tdata3 for hppa64.
+
+2011-05-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	* ld-cris/tls-e-tpoffcomm1.d: Adjust for PR12763 change removing
+	empty program header.
+
+2011-05-21  Alan Modra  <amodra@gmail.com>
+
+	PR 12763
+	* ld-elf/tdata3.s: New test.
+	* ld-elf/tbss3.s: New test.
+	* ld-elf/binutils.exp: Consolidate tbss and tdata tests.
+
+2011-05-20  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* ld-tic6x/pcr-reloc.d: New test.
+	* ld-tic6x/pcr-reloc.s: New test.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12761
+	* lib/ld-lib.exp (run_cc_link_tests): Add an optional 8th
+	parameter - an expected warning message from the linker.
+	* ld-elf/shared.exp (build_tests): Expect a warning message when
+	building the libbarw.so library.
+
+	* ld-elf/shared.exp: Run library building tests even when not
+	building a native toolchain.
+
+2011-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-scripts/phdrs.exp: Replace --private with
+	--private-headers for objdump.
+	* ld-scripts/phdrs2.exp: Likewise.
+
+2011-05-15  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* lib/ld-lib.exp (run_ld_link_tests): Simplify pass/fail logic.
+	Fail if the link command fails and if no test rules are defined.
+	* ld-mips-elf/reloc-6a.s, ld-mips-elf/reloc-6b.s: New tests.
+	* ld-mips-elf/mips-elf.exp: Run them.
+
+2011-05-13  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* ld-tic6x/dsbt.ld (OUTPUT_FORMAT): Add.
+	* ld-tic6x/tic6x.exp: Add OSABI tests.
 
-2012-01-17  Alan Modra  <amodra@gmail.com>
+2011-05-13  Alan Modra  <amodra@gmail.com>
 
-	* config/default.exp: Provide tmpdir/ld/collect-ld.
+	* ld-elf/flags1.d: Don't xfail tic6x.
+	* ld-scripts/weak.exp: Correct comments.  Don't xfail sh-pe.  Remove
+	redundant xfail.
+	* ld-selective/sel-dump.exp: Don't xfail alpha.
+	* ld-selective/selective.exp: Run for alpha.
+	* ld-undefined/weak-undef.exp: Don't xfail hppa64.
 
-2012-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+2011-05-12  Bernd Schmidt  <bernds@codesourcery.com>
 
-	PR ld/13581
-	* ld-x86-64/ilp32-4.s: New.
-	* ld-x86-64/ilp32-10.d: Likewise.
-	* ld-x86-64/ilp32-10.s: Likewise.
+	* config/default.exp (ld_assemble): Pass flags parameter to
+	default_ld_assemble.
+	(ld_assemble_flags): New function.
+	* ld-elf/frame.exp: Pass -mpic and -mpid flags to the assembler on
+	tic6x.
+	* ld-elf/exclude.exp: Likewise.
+	* lib/ld-lib.exp (default_ld_assemble): Take extra argument in_flags
+	and pass it to the assembler.
 
-	* ld-x86-64/ilp32-4.d: Adjusted.
+2011-05-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* ld-mips-elf/mips-elf.exp: Add missing $has_newabi tests.
+
+2011-05-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/elf.exp (array_tests): Remove "pr12730".
+	(array_tests_pie): Remove "PIE pr12730".
+	(array_tests_static): Remove "static pr12730".
+
+	* ld-elf/pr12730.cc: Removed.
+	* ld-elf/pr12730.out: Likewise.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* ld-tic6x/discard-unwind.ld: New.
+	* ld-tic6x/unwind.ld: New.
+	* ld-tic6x/unwind-1.d: New test.
+	* ld-tic6x/unwind-1.s: New test.
+	* ld-tic6x/unwind-2.d: New test.
+	* ld-tic6x/unwind-2.s: New test.
+	* ld-tic6x/unwind-3.d: New test.
+	* ld-tic6x/unwind-3.s: New test.
+	* ld-tic6x/unwind-4.d: New test.
+	* ld-tic6x/unwind-4.s: New test.
+	* ld-tic6x/unwind-5.d: New test.
+	* ld-tic6x/unwind-5.s: New test.
+	* ld-tic6x/unwind-6.d: New test.
+
+2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR ld/12365
+	* ld-plugin/plugin-7.d: Allow underscore in error message.
+	* ld-plugin/plugin-8.d: Likewise.
+
+2011-05-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12730
+	* ld-elf/elf.exp (array_tests): Add "pr12730".
+	(array_tests_pie): New.
+	(array_tests_static): Add -static for "static init array mixed".
+	Add "static pr12730".  Run array_tests_pie for Linux.
+
+	* ld-elf/init-mixed.c (ctor1007): Renamed to ...
+	(ctor1007a): This.
+	(ctor1007b): New.
+	(ctors1007): Remove ctor1007.  Add ctor1007b and ctor1007a.
+	(dtor1007): Renamed to ...
+	(dtor1007a): This.
+	(dtor1007b): New.
+	(dtors1007): Remove dtor1007.  Add dtor1007b and dtor1007a.
+	(ctor65535): Renamed to ...
+	(ctor65535a): This.
+	(ctor65535b): New.
+	(ctors65535): Remove ctor65535.  Add ctor65535b and ctor65535a.
+	(dtor65535): Renamed to ...
+	(dtor65535a): This.
+	(dtor65535b): New.
+	(dtors65535): Remove dtor65535.  Add dtor65535b and dtor65535a.
+
+	* ld-elf/pr12730.cc: New.
+	* ld-elf/pr12730.out: Likewise.
+
+2011-05-06  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* ld-arm/cortex-a8-fix-b-plt.s, ld-arm/cortex-a8-fix-b-plt.d,
+	ld-arm/cortex-a8-fix-bcc-plt.s, ld-arm/cortex-a8-fix-bcc-plt.d,
+	ld-arm/cortex-a8-fix-bl-plt.s, ld-arm/cortex-a8-fix-bl-plt.d,
+	ld-arm/cortex-a8-fix-blx-plt.s, ld-arm/cortex-a8-fix-blx-plt.d,
+	ld-arm/cortex-a8-fix-plt.ld: New tests.
+	* ld-arm/arm-elf.exp: Run them.
+
+2011-05-05  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* ld-tic6x/shared-nopic.d: New test.
+	* ld-tic6x/shared-nopid.d: New test.
+	* ld-tic6x/attr-pid-21.d: Don't expect a warning; check readelf
+	output instead.
+	* ld-tic6x/attr-pid-12.d: Likewise.
+	* ld-tic6x/attr-pic-01.d: Likewise.
+	* ld-tic6x/attr-pic-10.d: Likewise.
+	* ld-tic6x/attr-pid-01.d: Likewise.
+	* ld-tic6x/attr-pid-10.d: Likewise.
+	* ld-tic6x/attr-pid-02.d: Likewise.
+	* ld-tic6x/attr-pid-20.d: Likewise.
+	* ld-tic6x/got-reloc-inrange.d: Pass -mpic and -mpid options to gas.
+
+2011-05-03  Paul Brook  <paul@codesourcery.com>
+
+	* ld-tic6x/ehtype-reloc-1-rel.d: New test.
+	* ld-tic6x/ehtype-reloc-1.d: New test.
+	* ld-tic6x/ehtype-reloc-1.s: New test.
+
+2011-05-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12718
+	* ld-i386/i386.exp: Run pr12718.
+	* ld-x86-64/x86-64.exp: Likewise.
+
+	* ld-i386/pr12718.d: New.
+	* ld-i386/pr12718.s: Likewise.
+	* ld-x86-64/pr12718.d: Likewise.
+	* ld-x86-64/pr12718.s: Likewise.
+
+2011-04-26  Kai Tietz  <ktietz@redhat.com>
+
+	* ld-pe/pe.exp: Add cfi/cfi32 tests.
+	* ld-pe/cfi.d: New.
+	* ld-pe/cfi32.d: New.
+	* ld-pe/cfia.s: New.
+	* ld-pe/cfib.s: New.
+
+2011-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12694
+	* ld-ifunc/ifunc-14-i386.d: New.
+	* ld-ifunc/ifunc-14-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-14a.s: Likewise.
+	* ld-ifunc/ifunc-14b.s: Likewise.
+
+2011-04-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-plugin/plugin-ignore.d: Removed.
+
+2011-04-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-plugin/plugin-7.d: Update expected LTO linker errors for
+	GCC 4.6.
+	* ld-plugin/plugin-8.d: Likewise.
+
+2011-04-18  Alan Modra  <amodra@gmail.com>
+
+	* ld-plugin/plugin-7.d: Adjust for plugin changes.
+	* ld-plugin/plugin-8.d: Likewise.
+	* ld-plugin/plugin.exp: Pass --verbose=2 for visibility test, and
+	compare ld output to..
+	* ld-plugin/plugin-12.d: New.
+
+2011-04-15  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* ld-m68k/tls-gd-ie-1.d: Stabilize test.
+	* ld-m68k/tls-gd-3.[sd]: New test.
+
+2011-04-12  Richard Henderson  <rth@redhat.com>
+
+	* ld-alpha/emptygot.s, ld-alpha/emptygot.nm: New test.
+	* ld-alpha/alpha.exp: Run it.
+
+2011-04-11  Mark Wielaard  <mjw@redhat.com>
+
+	PR 10549
+	* ld-unique: New directory.
+	* ld-unique/unique.exp: New file: Run the UNIQUE tests.
+	* ld-unique/unique.s: New test file.
+	* ld-unique/unique_empty.s: Likewise.
+	* ld-unique/unique_shared.s: Likewise.
+
+2011-04-11  Alan Modra  <amodra@gmail.com>
+
+	* ld-elf/eh-frame-hdr.d: xfail avr.
+
+2011-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12654
+	* ld-i386/i386.exp: Run tlspie2.
+
+	* ld-i386/tlspie2.d: New.
+	* ld-i386/tlspie2.s: Likewise.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* ld-selective/selective.exp (xscale-*-*): Don't handle.
+	* ld-srec/srec.exp (strongarm*-*-*, xscale*-*-*, thumb-*-*): Don't
+	handle.
+	(*arm*-*-*): Change to arm*-*-*.
+	(strongarm*-*-coff, xscale*-*-coff, thumb-*-coff*, thumb-*-pe*,
+	thumb-*-elf*, strongarm*-*-*, thumb-*-*): Remove xfails.
+	* ld-undefined/undefined.exp (thumb*-*-pe*, thumb*-*-pe*): Remove
+	commented-out xfails.
+	(thumb-elf): Remove reference in comment.
+	* lib/ld-lib.exp (strongarm*-*-*, xscale*-*-*, thumb-*-*): Don't
+	handle.
+
+2011-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12627
+	* ld-i386/i386.exp: Run pr12627.
+
+	* ld-i386/pr12627.d: New.
+	* ld-i386/pr12627.s: Likewise.
+	* ld-i386/pr12627.t: Likewise.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* ld-scripts/crossref.exp: Add CFLAGS for tic6x*-*-*.
+	* ld-elf/sec-to-seg.exp: Remove tic6x from list of targets defining
+	pagesize to 1.
+	* ld-tic6x/tic6x.exp: Add support for DSBT shared library/executable
+	linking tests.
+	* ld-tic6x/dsbt.ld: New linker script.
+	* ld-tic6x/dsbt-be.ld: New linker script.
+	* ld-tic6x/dsbt-overflow.ld: New linker script.
+	* ld-tic6x/dsbt-inrange.ld: New linker script.
+	* ld-tic6x/shlib-1.s: New test.
+	* ld-tic6x/shlib-2.s: New test.
+	* ld-tic6x/shlib-app-1r.s: New test.
+	* ld-tic6x/shlib-app-1.s: New test.
+	* ld-tic6x/shlib-1.sd: New test.
+	* ld-tic6x/shlib-1.dd: New test.
+	* ld-tic6x/shlib-app-1.rd: New test.
+	* ld-tic6x/shlib-app-1rb.rd: New test.
+	* ld-tic6x/shlib-app-1.sd: New test.
+	* ld-tic6x/static-app-1rb.od: New test.
+	* ld-tic6x/shlib-app-1.dd: New test.
+	* ld-tic6x/shlib-app-1rb.sd: New test.
+	* ld-tic6x/static-app-1b.od: New test.
+	* ld-tic6x/static-app-1r.od: New test.
+	* ld-tic6x/shlib-1rb.rd: New test.
+	* ld-tic6x/shlib-app-1rb.dd: New test.
+	* ld-tic6x/shlib-1rb.sd: New test.
+	* ld-tic6x/shlib-1rb.dd: New test.
+	* ld-tic6x/shlib-app-1b.od: New test.
+	* ld-tic6x/tic6x.exp: New test.
+	* ld-tic6x/static-app-1rb.rd: New test.
+	* ld-tic6x/shlib-app-1r.od: New test.
+	* ld-tic6x/static-app-1.od: New test.
+	* ld-tic6x/static-app-1b.rd: New test.
+	* ld-tic6x/static-app-1r.rd: New test.
+	* ld-tic6x/static-app-1rb.sd: New test.
+	* ld-tic6x/static-app-1b.sd: New test.
+	* ld-tic6x/static-app-1rb.dd: New test.
+	* ld-tic6x/static-app-1r.sd: New test.
+	* ld-tic6x/static-app-1b.dd: New test.
+	* ld-tic6x/shlib-1b.rd: New test.
+	* ld-tic6x/static-app-1r.dd: New test.
+	* ld-tic6x/shlib-app-1b.rd: New test.
+	* ld-tic6x/shlib-1r.rd: New test.
+	* ld-tic6x/shlib-app-1r.rd: New test.
+	* ld-tic6x/shlib-1b.sd: New test.
+	* ld-tic6x/static-app-1.rd: New test.
+	* ld-tic6x/shlib-app-1b.sd: New test.
+	* ld-tic6x/shlib-1r.sd: New test.
+	* ld-tic6x/shlib-1b.dd: New test.
+	* ld-tic6x/shlib-app-1r.sd: New test.
+	* ld-tic6x/shlib-app-1b.dd: New test.
+	* ld-tic6x/shlib-1r.dd: New test.
+	* ld-tic6x/static-app-1.sd: New test.
+	* ld-tic6x/shlib-app-1r.dd: New test.
+	* ld-tic6x/static-app-1.dd: New test.
+	* ld-tic6x/shlib-noindex.rd: New test.
+	* ld-tic6x/shlib-noindex.dd: New test.
+	* ld-tic6x/shlib-noindex.sd: New test.
+	* ld-tic6x/got-reloc-local-1.s: New test.
+	* ld-tic6x/got-reloc-local-2.s: New test.
+	* ld-tic6x/got-reloc-local-r.d: New test.
+	* ld-tic6x/got-reloc-global.s: New test.
+	* ld-tic6x/got-reloc-global-addend-1.d: New test.
+	* ld-tic6x/got-reloc-global-addend-1.s: New test.
+	* ld-tic6x/got-reloc-global-addend-2.d: New test.
+	* ld-tic6x/got-reloc-inrange.d: New test.
+	* ld-tic6x/got-reloc-overflow.d: New test.
+	* ld-tic6x/got-reloc-global-addend-2.s: New test.
+	* ld-tic6x/dsbt-index-error.d: New test.
+	* ld-tic6x/dsbt-index.d: New test.
+	* ld-tic6x/dsbt-index.s: New test.
+	* ld-tic6x/shlib-app-1.od: New test.
+	* ld-tic6x/shlib-app-1rb.od: New test.
+	* ld-tic6x/shlib-1.rd: New test.
+	* ld-tic6x/weak.d: New test.
+	* ld-tic6x/weak-be.d: New test.
+	* ld-tic6x/weak.s: New test.
+	* ld-tic6x/weak-data.d: New test.
+	* ld-tic6x/common.d: New test.
+	* ld-tic6x/common.ld: New test.
+	* ld-tic6x/common.s: New test.
+
+2011-03-30  Richard Henderson  <rth@redhat.com>
+
+	* ld-elf/elf.exp: Force 32-bit start address for alpha.
+	* ld-elf/group8a.d: Don't disable for alpha.
+	* ld-elf/group8b.d: Likewise.
+	* ld-gc/start.s: Use .dc.a instead of .long.
+
+2011-03-24  Alan Modra  <amodra@gmail.com>
+
+	* ld-powerpc/tlsmark.s: Delete non-optimizable section.
+	* ld-powerpc/tlsmark32.s: Likewise.
+	* ld-powerpc/tlsmark.d: Adjust to suit.
+	* ld-powerpc/tlsmark32.d: Likewise.
+	* ld-powerpc/tlsopt1.d, * ld-powerpc/tlsopt1.s: New.
+	* ld-powerpc/tlsopt2.d, * ld-powerpc/tlsopt2.s: New.
+	* ld-powerpc/tlsopt3.d, * ld-powerpc/tlsopt3.s: New.
+	* ld-powerpc/tlsopt4.d, * ld-powerpc/tlsopt4.s: New.
+	* ld-powerpc/tlsopt1_32.d, * ld-powerpc/tlsopt1_32.s: New.
+	* ld-powerpc/tlsopt2_32.d, * ld-powerpc/tlsopt2_32.s: New.
+	* ld-powerpc/tlsopt3_32.d, * ld-powerpc/tlsopt3_32.s: New.
+	* ld-powerpc/tlsopt4_32.d, * ld-powerpc/tlsopt4_32.s: New.
+	* ld-powerpc/powerpc.exp: Run new tests.
+
+2011-03-15  Mike Frysinger  <vapier@gentoo.org>
+
+	* ld-elfvers/vers.exp (vers19): Add -Wl,-rpath-link,. to linker flags.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* ld-arm/ifunc-1.s, ld-arm/ifunc-1.dd, ld-arm/ifunc-1.gd,
+	ld-arm/ifunc-1.rd, ld-arm/ifunc-2.s, ld-arm/ifunc-2.dd,
+	ld-arm/ifunc-2.gd, ld-arm/ifunc-2.rd, ld-arm/ifunc-3.s,
+	ld-arm/ifunc-3.dd, ld-arm/ifunc-3.gd, ld-arm/ifunc-3.rd,
+	ld-arm/ifunc-4.s, ld-arm/ifunc-4.dd, ld-arm/ifunc-4.gd,
+	ld-arm/ifunc-4.rd, ld-arm/ifunc-5.s, ld-arm/ifunc-5.dd,
+	ld-arm/ifunc-5.gd, ld-arm/ifunc-5.rd, ld-arm/ifunc-6.s,
+	ld-arm/ifunc-6.dd, ld-arm/ifunc-6.gd, ld-arm/ifunc-6.rd,
+	ld-arm/ifunc-7.s, ld-arm/ifunc-7.dd, ld-arm/ifunc-7.gd,
+	ld-arm/ifunc-7.rd, ld-arm/ifunc-8.s, ld-arm/ifunc-8.dd,
+	ld-arm/ifunc-8.gd, ld-arm/ifunc-8.rd, ld-arm/ifunc-9.s,
+	ld-arm/ifunc-9.dd, ld-arm/ifunc-9.gd, ld-arm/ifunc-9.rd,
+	ld-arm/ifunc-10.s, ld-arm/ifunc-10.dd, ld-arm/ifunc-10.gd,
+	ld-arm/ifunc-10.rd, ld-arm/ifunc-11.s, ld-arm/ifunc-11.dd,
+	ld-arm/ifunc-11.gd, ld-arm/ifunc-11.rd, ld-arm/ifunc-12.s,
+	ld-arm/ifunc-12.dd, ld-arm/ifunc-12.gd, ld-arm/ifunc-12.rd,
+	ld-arm/ifunc-13.s, ld-arm/ifunc-13.dd, ld-arm/ifunc-13.gd,
+	ld-arm/ifunc-13.rd, ld-arm/ifunc-14.s, ld-arm/ifunc-14.dd,
+	ld-arm/ifunc-14.gd, ld-arm/ifunc-14.rd, ld-arm/ifunc-15.s,
+	ld-arm/ifunc-15.dd, ld-arm/ifunc-15.gd, ld-arm/ifunc-15.rd,
+	ld-arm/ifunc-16.s, ld-arm/ifunc-16.dd, ld-arm/ifunc-16.gd,
+	ld-arm/ifunc-16.rd, ld-arm/ifunc-dynamic.ld,
+	ld-arm/ifunc-static.ld: New tests.
+	* ld-arm/farcall-group.d, ld-arm/farcall-group-size2.d,
+	ld-arm/farcall-mixed-lib-v4t.d, ld-arm/farcall-mixed-lib.d: Update
+	for new stub hashes.
+	* ld-arm/arm-elf.exp: Run them.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* ld-arm/arm-lib-plt-2a.s, ld-arm/arm-lib-plt-2b.s,
+	ld-arm/arm-lib-plt-2.dd, ld-arm/arm-lib-plt-2.rd: New tests.
+	* ld-arm/arm-elf.exp: Run them.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* ld-arm/exec-got-1a.s, ld-arm/exec-got-1b.s, ld-arm/exec-got-1.d,
+	ld-arm/unresolved-1.s, ld-arm/unresolved-1.d,
+	ld-arm/unresolved-1-dyn.d: New tests.
+	* ld-arm/arm-elf.exp: Run them.
+
+2011-03-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/tlsgd4.dd: New.
+	* ld-x86-64/tlsgd4.s: Likewise.
+	* ld-x86-64/tlsgd5.dd: Likewise.
+	* ld-x86-64/tlsgd5a.s: Likewise.
+	* ld-x86-64/tlsgd5b.s: Likewise.
+	* ld-x86-64/tlsgd6.dd: Likewise.
+	* ld-x86-64/tlsgd6a.s: Likewise.
+	* ld-x86-64/tlsgd6b.s: Likewise.
+	* ld-x86-64/tlsld2.dd: Likewise.
+	* ld-x86-64/tlsld2.s: Likewise.
+
+	* ld-x86-64/x86-64.exp (x86_64tests): Add tlsgd4, libtlsgd5.so,
+	tlsgd5, libtlsgd6.so, tlsgd6 and tlsld2.
+
+2011-03-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/tlsie4.dd: New.
+	* ld-x86-64/tlsie4.s: Likewise.
+
+	* ld-x86-64/x86-64.exp (x86_64tests): Add tlsie4.
+
+2011-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12516
+	* ld-elf/dynamic1.d: New.
+	* ld-elf/dynamic1.ld: Likewise.
+	* ld-elf/dynamic1.s: Likewise.
+
+2011-02-25  Alan Modra  <amodra@gmail.com>
+
+	* ld-mn10300/i135409-3.s: Correct .size label reference.
+	* ld-sh/sh64/stolib.s: Likewise.
+
+2011-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/new.cc: Don't include <exception_defines.h>.
+
+2011-02-10  Alan Modra  <amodra@gmail.com>
+
+	* ld-scripts/defined.exp: Don't run defined5 for AOUT.
+	* ld-scripts/defined5.s: Use .text for "defined" section.
+	* ld-scripts/defined5.t: Adjust.
+
+	* ld-gc/start.d: Exclude frv-*-linux*.
+	* ld-misc/defsym1.d: Likewise.
+
+2011-02-09  Alan Modra  <amodra@gmail.com>
+
+	* ld-elfvsb/elfvsb.exp: Don't run any non-PIC tests on powerpc*-linux.
+	* ld-gc/gc.exp: Ensure powerpc64 test continues to fail.
+	* ld-srec/srec.exp: Don't edit toc on powerpc64.
+
+2011-01-23  Alan Modra  <amodra@gmail.com>
+
+	* ld-scripts/sane1.d, * ld-scripts/sane1.t: New test.
+	* ld-scripts/expr.exp: Run it.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/ilp32-4.d: Updated.
+
+2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* ld-arm/arm-rel32.s, ld-arm/arm-rel32.d: New testcase.
+	* ld-arm/arm-elf.exp: Run it.
+
+2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* ld-arm/gc-thumb-lib.s, ld-arm/gc-thumb.s,
+	ld-arm/gc-thumb.d: New test.
+	* ld-arm/arm-elf.exp: Run it.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/ia32-2.d: Replace --n32 with --x32.
+	* ld-x86-64/ilp32-1.d: Likewise.
+	* ld-x86-64/ilp32-2.d: Likewise.
+	* ld-x86-64/ilp32-3.d: Likewise.
+	* ld-x86-64/ilp32-4.d: Likewise.
 	* ld-x86-64/ilp32-5.d: Likewise.
+	* ld-x86-64/lp64-3.d: Likewise.
+	* ld-x86-64/x86-64.exp: Likewise.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/ilp32-5.d: New.
 	* ld-x86-64/ilp32-5.s: Likewise.
 
-	* ld-x86-64/x86-64.exp: Run ilp32-10.
+	* ld-x86-64/x86-64.exp: Run ilp32-5.
+
+2011-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/ilp32-4.d: New.
+
+	* ld-x86-64/x86-64.exp: Run ilp32-4.
+
+2011-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12356
+	* ld-scripts/defined.exp: Run defined5.
+
+	* ld-scripts/defined5.d: New.
+	* ld-scripts/defined5.s: Likewise.
+	* ld-scripts/defined5.t: Likewise.
+
+2011-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-scripts/defined4.d: Xfail rs6000-*-aix*.  Skip mips*-*-*
+	and mmix-*-*.
+
+	* ld-scripts/expr2.d: Xfail rs6000-*-aix* and arm-*-*aout.
+
+2011-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-scripts/assert.exp: Run assert2.
+
+	* ld-scripts/assert2.d: New.
+	* ld-scripts/assert2.t: Likewise.
+
+2011-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+	    Glauber de Oliveira Costa  <glommer@gmail.com>
+
+	* ld-arm/arm-elf.exp: Added tests for new TLS handling
+	relocations.
+	* ld-arm/tls-descrelax-be32.d: New.
+	* ld-arm/tls-descrelax-be32.s: New.
+	* ld-arm/tls-descrelax-be8.d: New.
+	* ld-arm/tls-descrelax-be8.s: New.
+	* ld-arm/tls-descrelax-v7.d: New.
+	* ld-arm/tls-descrelax-v7.s: New.
+	* ld-arm/tls-descrelax.d: New.
+	* ld-arm/tls-descrelax.s: New.
+	* ld-arm/tls-descseq.d: New.
+	* ld-arm/tls-descseq.r: New.
+	* ld-arm/tls-descseq.s: New.
+	* ld-arm/tls-gdesc-got.d: New.
+	* ld-arm/tls-gdesc-got.s: New.
+	* ld-arm/tls-gdesc-nlazy.g: New.
+	* ld-arm/tls-gdesc-nlazy.s: New.
+	* ld-arm/tls-gdesc.d: New.
+	* ld-arm/tls-gdesc.r: New.
+	* ld-arm/tls-gdesc.s: New.
+	* ld-arm/tls-gdierelax.d: New.
+	* ld-arm/tls-gdierelax.s: New.
+	* ld-arm/tls-gdierelax2.d: New.
+	* ld-arm/tls-gdierelax2.s: New.
+	* ld-arm/tls-gdlerelax.d: New.
+	* ld-arm/tls-gdlerelax.s: New.
+	* ld-arm/tls-lib-loc.d: New.
+	* ld-arm/tls-lib-loc.r: New.
+	* ld-arm/tls-lib-loc.s: New.
+	* ld-arm/tls-longplt-lib.d: New.
+	* ld-arm/tls-longplt-lib.s: New.
+	* ld-arm/tls-longplt.d: New.
+	* ld-arm/tls-longplt.s: New.
+	* ld-arm/tls-mixed.r: New.
+	* ld-arm/tls-mixed.s: New.
+	* ld-arm/tls-thumb1.d: New.
+	* ld-arm/tls-thumb1.s: New.
+	* ld-arm/arm-elf.exp: New.
+
+2011-01-08  Nick Clifton  <nickc@redhat.com>
+
+	* ld-misc/defsym1.d: Add a -e linker command line option.
+	* ld-misc/dummy.s: Remove text.
+
+2011-01-08  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12358
+	PR ld/12359
+	* ld-elf/textaddr2.d: Fix regexp to work with hppa64 targets.
+	* ld-elf/textaddr6.d: Fix regexp to work with hppa64 targets.
+
+2011-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12366
+	PR ld/12371
+	* ld-ifunc/ifunc-10-i386.s: Add more tests.
+	* ld-ifunc/ifunc-10-x86-64.s: Likewise.
+	* ld-ifunc/ifunc-11-i386.s: Likewise.
+	* ld-ifunc/ifunc-11-x86-64.s: Likewise.
+
+	* ld-ifunc/ifunc-12-i386.d: New.
+	* ld-ifunc/ifunc-12-i386.s: Likewise.
+	* ld-ifunc/ifunc-12-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-12-x86-64.s: Likewise.
+	* ld-ifunc/ifunc-13-i386.d: Likewise.
+	* ld-ifunc/ifunc-13-x86-64.d: Likewise.
+	* ld-ifunc/ifunc-13a-i386.s: Likewise.
+	* ld-ifunc/ifunc-13a-x86-64.s: Likewise.
+	* ld-ifunc/ifunc-13b-i386.s: Likewise.
+	* ld-ifunc/ifunc-13b-x86-64.s: Likewise.
+
+2011-01-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-x86-64/dummy.s: New.
+	* ld-x86-64/foo.s: Likewise.
+	* ld-x86-64/ia32-1.d: Likewise.
+	* ld-x86-64/ia32-2.d: Likewise.
+	* ld-x86-64/ia32-3.d: Likewise.
+	* ld-x86-64/ilp32-1.d: Likewise.
+	* ld-x86-64/ilp32-2.d: Likewise.
+	* ld-x86-64/ilp32-3.d: Likewise.
+	* ld-x86-64/lp64-1.d: Likewise.
+	* ld-x86-64/lp64-2.d: Likewise.
+	* ld-x86-64/lp64-3.d: Likewise.
+	* ld-x86-64/start.s: Likewise.
+
+	* ld-x86-64/x86-64.exp: Run ilp32-1, ilp32-2, ilp32-3, ia32-1,
+	ia32-2, ia32-3, lp64-1, lp64-2 and lp64-3.
 
-2012-01-05  Nick Clifton  <nickc@redhat.com>
+2011-01-02  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* ld-x86-64/x86-64.exp: Add test of linking mixed 32-bit and
-	64-bit objects when the 32-bit object (loaded first) contains 32+
-	local symbols, all referenced by relocs and the 64-bit object
-	contains a reloc that uses a symbol in the 32-bit object.
-	* 32bit.s: New source file.
-	* 64bit.s: New source file.
-	* incompatible.l: New expected linker output file.
+	PR ld/12001
+	* ld-misc/defsym.exp: New.
+	* ld-misc/defsym1.d: Likewise.
+	* ld-misc/dummy.s: Likewise.
+	* ld-misc/foo.s: Likewise.
+	* ld-misc/start.s: Likewise.
 
-For older changes see ChangeLog-2011
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp
index bba48d7416..26a7a0c353 100644
--- a/ld/testsuite/config/default.exp
+++ b/ld/testsuite/config/default.exp
@@ -1,6 +1,6 @@
 # Basic expect script for LD Regression Tests
 #   Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2001, 2003, 2005, 2007, 2009
-#   2011, 2012 Free Software Foundation, Inc.
+#   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -67,7 +67,6 @@ set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
 if {![file isdirectory tmpdir/ld]} then {
     catch "exec mkdir tmpdir/ld" status
     catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
-    catch "exec ln -s ld tmpdir/ld/collect-ld" status
 }
 set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
 
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 789c7425f2..c7a0b2c33e 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -690,18 +690,6 @@ set armeabitests {
 }
 
 run_ld_link_tests $armeabitests
-run_dump_test "attr-merge-div-00"
-run_dump_test "attr-merge-div-01"
-run_dump_test "attr-merge-div-10"
-run_dump_test "attr-merge-div-01-m3"
-run_dump_test "attr-merge-div-10-m3"
-run_dump_test "attr-merge-div-11"
-run_dump_test "attr-merge-div-12"
-run_dump_test "attr-merge-div-120"
-run_dump_test "attr-merge-div-21"
-run_dump_test "attr-merge-div-22"
-run_dump_test "attr-merge-div-02"
-run_dump_test "attr-merge-div-20"
 run_dump_test "attr-merge-wchar-00"
 run_dump_test "attr-merge-wchar-02"
 run_dump_test "attr-merge-wchar-04"
diff --git a/ld/testsuite/ld-arm/attr-merge-2.attr b/ld/testsuite/ld-arm/attr-merge-2.attr
index 578333b263..e34111b9d7 100644
--- a/ld/testsuite/ld-arm/attr-merge-2.attr
+++ b/ld/testsuite/ld-arm/attr-merge-2.attr
@@ -12,3 +12,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Allowed in v7-A with integer division extension
diff --git a/ld/testsuite/ld-arm/attr-merge-2a.s b/ld/testsuite/ld-arm/attr-merge-2a.s
index 03031634b0..9d9ae18485 100644
--- a/ld/testsuite/ld-arm/attr-merge-2a.s
+++ b/ld/testsuite/ld-arm/attr-merge-2a.s
@@ -7,4 +7,5 @@
 	.eabi_attribute 25, 1
 	.eabi_attribute 26, 1
 	.eabi_attribute 30, 6
+	.eabi_attribute Tag_DIV_use, 1
 	.file	"attr-merge-2a.s"
diff --git a/ld/testsuite/ld-arm/attr-merge-2b.s b/ld/testsuite/ld-arm/attr-merge-2b.s
index 047890a04d..6aa8da9024 100644
--- a/ld/testsuite/ld-arm/attr-merge-2b.s
+++ b/ld/testsuite/ld-arm/attr-merge-2b.s
@@ -8,4 +8,5 @@
 	.eabi_attribute 26, 1
 	.eabi_attribute 30, 6
 	.eabi_attribute 18, 4
+	.eabi_attribute Tag_DIV_use, 2
 	.file	"attr-merge-2b.s"
diff --git a/ld/testsuite/ld-arm/attr-merge-3.attr b/ld/testsuite/ld-arm/attr-merge-3.attr
index 8d7d1c3370..b0f8ef97c6 100644
--- a/ld/testsuite/ld-arm/attr-merge-3.attr
+++ b/ld/testsuite/ld-arm/attr-merge-3.attr
@@ -27,6 +27,5 @@ File Attributes
   Tag_CPU_unaligned_access: v6
   Tag_FP_HP_extension: Allowed
   Tag_MPextension_use: Allowed
-  Tag_DIV_use: Not allowed
   Tag_T2EE_use: Allowed
   Tag_Virtualization_use: TrustZone
diff --git a/ld/testsuite/ld-arm/attr-merge-4.attr b/ld/testsuite/ld-arm/attr-merge-4.attr
index 75fd063117..c8fc7ecffe 100644
--- a/ld/testsuite/ld-arm/attr-merge-4.attr
+++ b/ld/testsuite/ld-arm/attr-merge-4.attr
@@ -5,4 +5,5 @@ File Attributes
   Tag_CPU_arch_profile: Microcontroller
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
   Tag_also_compatible_with: v6-M
diff --git a/ld/testsuite/ld-arm/attr-merge-5.attr b/ld/testsuite/ld-arm/attr-merge-5.attr
index 9d3e97100b..f016708d9f 100644
--- a/ld/testsuite/ld-arm/attr-merge-5.attr
+++ b/ld/testsuite/ld-arm/attr-merge-5.attr
@@ -3,3 +3,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_compatibility: flag = 1, vendor = gnu
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-6.attr b/ld/testsuite/ld-arm/attr-merge-6.attr
index 0af32f7751..9e2324ff2f 100644
--- a/ld/testsuite/ld-arm/attr-merge-6.attr
+++ b/ld/testsuite/ld-arm/attr-merge-6.attr
@@ -6,4 +6,5 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
   Tag_MPextension_use: Allowed
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/ld/testsuite/ld-arm/attr-merge-7.attr b/ld/testsuite/ld-arm/attr-merge-7.attr
index 0af32f7751..9e2324ff2f 100644
--- a/ld/testsuite/ld-arm/attr-merge-7.attr
+++ b/ld/testsuite/ld-arm/attr-merge-7.attr
@@ -6,4 +6,5 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
   Tag_MPextension_use: Allowed
+  Tag_DIV_use: Not allowed
   Tag_Virtualization_use: TrustZone
diff --git a/ld/testsuite/ld-arm/attr-merge-arch-1.attr b/ld/testsuite/ld-arm/attr-merge-arch-1.attr
index f69f1e76c2..b39634fe23 100644
--- a/ld/testsuite/ld-arm/attr-merge-arch-1.attr
+++ b/ld/testsuite/ld-arm/attr-merge-arch-1.attr
@@ -4,3 +4,4 @@ File Attributes
   Tag_CPU_arch: v7
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-arch-2.attr b/ld/testsuite/ld-arm/attr-merge-arch-2.attr
index 55f69659c9..ab8916ba70 100644
--- a/ld/testsuite/ld-arm/attr-merge-arch-2.attr
+++ b/ld/testsuite/ld-arm/attr-merge-arch-2.attr
@@ -5,3 +5,4 @@ File Attributes
   Tag_CPU_arch: v6K
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-2.d b/ld/testsuite/ld-arm/attr-merge-unknown-2.d
index bf44f43c71..5755803a80 100644
--- a/ld/testsuite/ld-arm/attr-merge-unknown-2.d
+++ b/ld/testsuite/ld-arm/attr-merge-unknown-2.d
@@ -11,3 +11,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-2r.d b/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
index 6d523fb06b..d950b3ec24 100644
--- a/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
+++ b/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
@@ -11,3 +11,4 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-3.d b/ld/testsuite/ld-arm/attr-merge-unknown-3.d
index b02ba6d6d2..c210a06d01 100644
--- a/ld/testsuite/ld-arm/attr-merge-unknown-3.d
+++ b/ld/testsuite/ld-arm/attr-merge-unknown-3.d
@@ -11,4 +11,5 @@ Attribute Section: aeabi
 File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
   Tag_unknown_82: 1 \(0x1\)
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-1.d b/ld/testsuite/ld-arm/attr-merge-vfp-1.d
index 8625735176..99fc8e47fa 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-1.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-1.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3-D16
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-1r.d b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
index d7a15d7bb6..42bfe99513 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3-D16
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-2.d b/ld/testsuite/ld-arm/attr-merge-vfp-2.d
index 6444bd00a3..3161e1196d 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-2.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-2.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-2r.d b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
index 1d36983304..9c6367f49e 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
@@ -11,3 +11,4 @@ File Attributes
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-3.d b/ld/testsuite/ld-arm/attr-merge-vfp-3.d
index ee89384a28..9853879acd 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-3.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-3.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4-D16
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-3r.d b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
index d06bd2732c..24df972992 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4-D16
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-4.d b/ld/testsuite/ld-arm/attr-merge-vfp-4.d
index c18d672d19..469fc9ba3f 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-4.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-4.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-4r.d b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
index 327e0c384f..c84e50800c 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-5.d b/ld/testsuite/ld-arm/attr-merge-vfp-5.d
index cd55a86b74..dc0c6ee816 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-5.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-5.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-5r.d b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
index 505c31b36c..5e1d23af29 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv4
   Tag_FP_HP_extension: Allowed
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-6.d b/ld/testsuite/ld-arm/attr-merge-vfp-6.d
index 54d063fac2..ca89181439 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-6.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-6.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
   Tag_ABI_HardFP_use: SP and DP
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-6r.d b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
index f32d4fcb58..f533632253 100644
--- a/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
+++ b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
@@ -12,3 +12,4 @@ File Attributes
   Tag_THUMB_ISA_use: Thumb-1
   Tag_FP_arch: VFPv3
   Tag_ABI_HardFP_use: SP and DP
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
index 8a01f2d210..88e5d2519e 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
@@ -19,3 +19,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-00.d b/ld/testsuite/ld-arm/attr-merge-wchar-00.d
index 4242822c8d..73df821fbb 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-00.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-00.d
@@ -19,3 +19,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
index f3935169d3..f55bf52a22 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-02.d b/ld/testsuite/ld-arm/attr-merge-wchar-02.d
index f662120c56..500b6a9fac 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-02.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-02.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
index 16cc469683..c1d4efd086 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-04.d b/ld/testsuite/ld-arm/attr-merge-wchar-04.d
index 41413b9d6b..cd119803e2 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-04.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-04.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
index c0b12488a5..b60e458e7c 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-20.d b/ld/testsuite/ld-arm/attr-merge-wchar-20.d
index b81fb15885..96738b1d19 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-20.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-20.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
index e9a1e944e4..22539de497 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-22.d b/ld/testsuite/ld-arm/attr-merge-wchar-22.d
index bf756606de..c0e67dcaf8 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-22.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-22.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
index 0c9b33e574..e7f2566388 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
index 54f0c54a44..efeafccd84 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-40.d b/ld/testsuite/ld-arm/attr-merge-wchar-40.d
index 46be48c223..39cb58a502 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-40.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-40.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
index cc72d3e4da..b989f35451 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
index 35eb756e1c..988dd6ebd7 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-44.d b/ld/testsuite/ld-arm/attr-merge-wchar-44.d
index c0fba85666..acda7e7bac 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-44.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-44.d
@@ -20,3 +20,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/attr-merge.attr b/ld/testsuite/ld-arm/attr-merge.attr
index 578333b263..f07930e2b6 100644
--- a/ld/testsuite/ld-arm/attr-merge.attr
+++ b/ld/testsuite/ld-arm/attr-merge.attr
@@ -12,3 +12,4 @@ File Attributes
   Tag_ABI_align_preserved: 8-byte, except leaf SP
   Tag_ABI_enum_size: small
   Tag_ABI_optimization_goals: Aggressive Debug
+  Tag_DIV_use: Not allowed
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
index 4f1078d644..59efecb5b4 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
@@ -12,8 +12,8 @@ Disassembly of section \.plt:
     8010:	00000ffc 	\.word	0x00000ffc
     8014:	4778      	bx	pc
     8016:	46c0      	nop			; \(mov r8, r8\)
-    8018:	e28fc600 	add	ip, pc, #0, 12
-    801c:	e28cca00 	add	ip, ip, #0, 20
+    8018:	e28fc600 	add	ip, pc, #0
+    801c:	e28cca00 	add	ip, ip, #0
     8020:	e5bcfff8 	ldr	pc, \[ip, #4088\]!	; 0xff8
 
 Disassembly of section \.text:
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
index 1e0cab2d33..78620082f5 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
@@ -12,7 +12,7 @@ Disassembly of section \.plt:
     8010:	00001004 	\.word	0x00001004
     8014:	4778      	bx	pc
     8016:	46c0      	nop			; \(mov r8, r8\)
-    8018:	e28fc600 	add	ip, pc, #0, 12
+    8018:	e28fc600 	add	ip, pc, #0
     801c:	e28cca01 	add	ip, ip, #4096	; 0x1000
     8020:	e5bcf000 	ldr	pc, \[ip, #0\]!
 
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
index ebb480f0f6..17cb9ac76f 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
@@ -10,8 +10,8 @@ Disassembly of section \.plt:
     8008:	e08fe00e 	add	lr, pc, lr
     800c:	e5bef008 	ldr	pc, \[lr, #8\]!
     8010:	00000ffc 	\.word	0x00000ffc
-    8014:	e28fc600 	add	ip, pc, #0, 12
-    8018:	e28cca00 	add	ip, ip, #0, 20
+    8014:	e28fc600 	add	ip, pc, #0
+    8018:	e28cca00 	add	ip, ip, #0
     801c:	e5bcfffc 	ldr	pc, \[ip, #4092\]!	; 0xffc
 
 Disassembly of section \.text:
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
index f8a9c24295..e885a17a2b 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
@@ -10,8 +10,8 @@ Disassembly of section \.plt:
     8e08:	e08fe00e 	add	lr, pc, lr
     8e0c:	e5bef008 	ldr	pc, \[lr, #8\]!
     8e10:	0000827c 	\.word	0x0000827c
-    8e14:	e28fc600 	add	ip, pc, #0, 12
-    8e18:	e28cca08 	add	ip, ip, #8, 20	; 0x8000
+    8e14:	e28fc600 	add	ip, pc, #0
+    8e18:	e28cca08 	add	ip, ip, #32768	; 0x8000
     8e1c:	e5bcf27c 	ldr	pc, \[ip, #636\]!	; 0x27c
 
 Disassembly of section \.text:
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
index ebb480f0f6..17cb9ac76f 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
@@ -10,8 +10,8 @@ Disassembly of section \.plt:
     8008:	e08fe00e 	add	lr, pc, lr
     800c:	e5bef008 	ldr	pc, \[lr, #8\]!
     8010:	00000ffc 	\.word	0x00000ffc
-    8014:	e28fc600 	add	ip, pc, #0, 12
-    8018:	e28cca00 	add	ip, ip, #0, 20
+    8014:	e28fc600 	add	ip, pc, #0
+    8018:	e28cca00 	add	ip, ip, #0
     801c:	e5bcfffc 	ldr	pc, \[ip, #4092\]!	; 0xffc
 
 Disassembly of section \.text:
diff --git a/ld/testsuite/ld-arm/fix-arm1176-off.d b/ld/testsuite/ld-arm/fix-arm1176-off.d
index c19feed921..3b45a3b472 100644
--- a/ld/testsuite/ld-arm/fix-arm1176-off.d
+++ b/ld/testsuite/ld-arm/fix-arm1176-off.d
@@ -9,7 +9,7 @@ Disassembly of section .foo:
 
 [0-9a-f]+ <__func_to_branch_to_veneer>:
  [0-9a-f]+:	e51ff004 	ldr	pc, \[pc, #-4\]	; 200101c <__func_to_branch_to_veneer\+0x4>
- [0-9a-f]+:	........ 	.word	0x........
+ [0-9a-f]+:	00008000 	.word	0x00008000
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-arm/fix-arm1176-on.d b/ld/testsuite/ld-arm/fix-arm1176-on.d
index 2df197d4af..c4e787039e 100644
--- a/ld/testsuite/ld-arm/fix-arm1176-on.d
+++ b/ld/testsuite/ld-arm/fix-arm1176-on.d
@@ -11,7 +11,7 @@ Disassembly of section .foo:
  [0-9a-f]+:	4778      	bx	pc
  [0-9a-f]+:	46c0      	nop			; \(mov r8, r8\)
  [0-9a-f]+:	e51ff004 	ldr	pc, \[pc, #-4\]	; 2001020 <__func_to_branch_to_veneer\+0x8>
- [0-9a-f]+:	........ 	.word	0x........
+ [0-9a-f]+:	00008000 	.word	0x00008000
  [0-9a-f]+:	00000000 	.word	0x00000000
 
 Disassembly of section .text:
diff --git a/ld/testsuite/ld-arm/ifunc-1.dd b/ld/testsuite/ld-arm/ifunc-1.dd
index 14b14829c3..de6d813ade 100644
--- a/ld/testsuite/ld-arm/ifunc-1.dd
+++ b/ld/testsuite/ld-arm/ifunc-1.dd
@@ -8,17 +8,17 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    9000:	e28fc600 	add	ip, pc, #0, 12
-    9004:	e28cca08 	add	ip, ip, #8, 20	; 0x8000
+    9000:	e28fc600 	add	ip, pc, #0
+    9004:	e28cca08 	add	ip, ip, #32768	; 0x8000
     9008:	e5bcf004 	ldr	pc, \[ip, #4\]!
 
 0000900c <f3>:
-    900c:	e28fc600 	add	ip, pc, #0, 12
+    900c:	e28fc600 	add	ip, pc, #0
     9010:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9014:	e5bcfffc 	ldr	pc, \[ip, #4092\]!	; 0xffc
 
 00009018 <f2>:
-    9018:	e28fc600 	add	ip, pc, #0, 12
+    9018:	e28fc600 	add	ip, pc, #0
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcfff4 	ldr	pc, \[ip, #4084\]!	; 0xff4
 
diff --git a/ld/testsuite/ld-arm/ifunc-10.dd b/ld/testsuite/ld-arm/ifunc-10.dd
index 105b09b9c6..f9bfd09bcd 100644
--- a/ld/testsuite/ld-arm/ifunc-10.dd
+++ b/ld/testsuite/ld-arm/ifunc-10.dd
@@ -21,13 +21,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ atf2's .plt entry
 #------------------------------------------------------------------------------
-    9018:	e28fc600 	add	ip, pc, #0, 12
+    9018:	e28fc600 	add	ip, pc, #0
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcffec 	ldr	pc, \[ip, #4076\]!	; 0xfec
 #------------------------------------------------------------------------------
 #------ aaf4's .plt entry
 #------------------------------------------------------------------------------
-    9024:	e28fc600 	add	ip, pc, #0, 12
+    9024:	e28fc600 	add	ip, pc, #0
     9028:	e28cca07 	add	ip, ip, #28672	; 0x7000
     902c:	e5bcffe4 	ldr	pc, \[ip, #4068\]!	; 0xfe4
 #------------------------------------------------------------------------------
@@ -38,7 +38,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ ttf2's .plt entry
 #------------------------------------------------------------------------------
-    9034:	e28fc600 	add	ip, pc, #0, 12
+    9034:	e28fc600 	add	ip, pc, #0
     9038:	e28cca07 	add	ip, ip, #28672	; 0x7000
     903c:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 #------------------------------------------------------------------------------
@@ -49,19 +49,19 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ tbf2's .plt entry
 #------------------------------------------------------------------------------
-    9044:	e28fc600 	add	ip, pc, #0, 12
+    9044:	e28fc600 	add	ip, pc, #0
     9048:	e28cca07 	add	ip, ip, #28672	; 0x7000
     904c:	e5bcffcc 	ldr	pc, \[ip, #4044\]!	; 0xfcc
 #------------------------------------------------------------------------------
 #------ taf2's .plt entry
 #------------------------------------------------------------------------------
-    9050:	e28fc600 	add	ip, pc, #0, 12
+    9050:	e28fc600 	add	ip, pc, #0
     9054:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9058:	e5bcffc4 	ldr	pc, \[ip, #4036\]!	; 0xfc4
 #------------------------------------------------------------------------------
 #------ aaf2's .plt entry
 #------------------------------------------------------------------------------
-    905c:	e28fc600 	add	ip, pc, #0, 12
+    905c:	e28fc600 	add	ip, pc, #0
     9060:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9064:	e5bcffbc 	ldr	pc, \[ip, #4028\]!	; 0xfbc
 #------------------------------------------------------------------------------
@@ -72,7 +72,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ abf4's .plt entry
 #------------------------------------------------------------------------------
-    906c:	e28fc600 	add	ip, pc, #0, 12
+    906c:	e28fc600 	add	ip, pc, #0
     9070:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9074:	e5bcffb0 	ldr	pc, \[ip, #4016\]!	; 0xfb0
 #------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ tbf4's .plt entry
 #------------------------------------------------------------------------------
-    907c:	e28fc600 	add	ip, pc, #0, 12
+    907c:	e28fc600 	add	ip, pc, #0
     9080:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9084:	e5bcffa4 	ldr	pc, \[ip, #4004\]!	; 0xfa4
 #------------------------------------------------------------------------------
@@ -94,7 +94,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ ttf4's .plt entry
 #------------------------------------------------------------------------------
-    908c:	e28fc600 	add	ip, pc, #0, 12
+    908c:	e28fc600 	add	ip, pc, #0
     9090:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9094:	e5bcff98 	ldr	pc, \[ip, #3992\]!	; 0xf98
 #------------------------------------------------------------------------------
@@ -105,13 +105,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ atf4's .plt entry
 #------------------------------------------------------------------------------
-    909c:	e28fc600 	add	ip, pc, #0, 12
+    909c:	e28fc600 	add	ip, pc, #0
     90a0:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90a4:	e5bcff8c 	ldr	pc, \[ip, #3980\]!	; 0xf8c
 #------------------------------------------------------------------------------
 #------ taf4's .plt entry
 #------------------------------------------------------------------------------
-    90a8:	e28fc600 	add	ip, pc, #0, 12
+    90a8:	e28fc600 	add	ip, pc, #0
     90ac:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90b0:	e5bcff84 	ldr	pc, \[ip, #3972\]!	; 0xf84
 #------------------------------------------------------------------------------
@@ -122,7 +122,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ abf2's .plt entry
 #------------------------------------------------------------------------------
-    90b8:	e28fc600 	add	ip, pc, #0, 12
+    90b8:	e28fc600 	add	ip, pc, #0
     90bc:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90c0:	e5bcff78 	ldr	pc, \[ip, #3960\]!	; 0xf78
 
@@ -132,7 +132,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ aaf1's .iplt entry
 #------------------------------------------------------------------------------
-    90c4:	e28fc600 	add	ip, pc, #0, 12
+    90c4:	e28fc600 	add	ip, pc, #0
     90c8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90cc:	e5bcff70 	ldr	pc, \[ip, #3952\]!	; 0xf70
 #------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf1's .iplt entry
 #------------------------------------------------------------------------------
-    90d4:	e28fc600 	add	ip, pc, #0, 12
+    90d4:	e28fc600 	add	ip, pc, #0
     90d8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90dc:	e5bcff64 	ldr	pc, \[ip, #3940\]!	; 0xf64
 #------------------------------------------------------------------------------
@@ -154,13 +154,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf1's .iplt entry
 #------------------------------------------------------------------------------
-    90e4:	e28fc600 	add	ip, pc, #0, 12
+    90e4:	e28fc600 	add	ip, pc, #0
     90e8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90ec:	e5bcff58 	ldr	pc, \[ip, #3928\]!	; 0xf58
 #------------------------------------------------------------------------------
 #------ taf1's .iplt entry
 #------------------------------------------------------------------------------
-    90f0:	e28fc600 	add	ip, pc, #0, 12
+    90f0:	e28fc600 	add	ip, pc, #0
     90f4:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90f8:	e5bcff50 	ldr	pc, \[ip, #3920\]!	; 0xf50
 #------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf1's .iplt entry
 #------------------------------------------------------------------------------
-    9100:	e28fc600 	add	ip, pc, #0, 12
+    9100:	e28fc600 	add	ip, pc, #0
     9104:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9108:	e5bcff44 	ldr	pc, \[ip, #3908\]!	; 0xf44
 #------------------------------------------------------------------------------
@@ -182,7 +182,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf1's .iplt entry
 #------------------------------------------------------------------------------
-    9110:	e28fc600 	add	ip, pc, #0, 12
+    9110:	e28fc600 	add	ip, pc, #0
     9114:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9118:	e5bcff38 	ldr	pc, \[ip, #3896\]!	; 0xf38
 #------------------------------------------------------------------------------
@@ -192,7 +192,7 @@ Disassembly of section \.iplt:
     911e:	46c0      	nop			; \(mov r8, r8\)
 
 00009120 <atf3>:
-    9120:	e28fc600 	add	ip, pc, #0, 12
+    9120:	e28fc600 	add	ip, pc, #0
     9124:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9128:	e5bcff2c 	ldr	pc, \[ip, #3884\]!	; 0xf2c
 #------------------------------------------------------------------------------
@@ -202,7 +202,7 @@ Disassembly of section \.iplt:
     912e:	46c0      	nop			; \(mov r8, r8\)
 
 00009130 <abf3>:
-    9130:	e28fc600 	add	ip, pc, #0, 12
+    9130:	e28fc600 	add	ip, pc, #0
     9134:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9138:	e5bcff20 	ldr	pc, \[ip, #3872\]!	; 0xf20
 #------------------------------------------------------------------------------
@@ -212,7 +212,7 @@ Disassembly of section \.iplt:
     913e:	46c0      	nop			; \(mov r8, r8\)
 
 00009140 <ttf3>:
-    9140:	e28fc600 	add	ip, pc, #0, 12
+    9140:	e28fc600 	add	ip, pc, #0
     9144:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9148:	e5bcff14 	ldr	pc, \[ip, #3860\]!	; 0xf14
 #------------------------------------------------------------------------------
@@ -222,17 +222,17 @@ Disassembly of section \.iplt:
     914e:	46c0      	nop			; \(mov r8, r8\)
 
 00009150 <tbf3>:
-    9150:	e28fc600 	add	ip, pc, #0, 12
+    9150:	e28fc600 	add	ip, pc, #0
     9154:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9158:	e5bcff08 	ldr	pc, \[ip, #3848\]!	; 0xf08
 
 0000915c <taf3>:
-    915c:	e28fc600 	add	ip, pc, #0, 12
+    915c:	e28fc600 	add	ip, pc, #0
     9160:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9164:	e5bcff00 	ldr	pc, \[ip, #3840\]!	; 0xf00
 
 00009168 <aaf3>:
-    9168:	e28fc600 	add	ip, pc, #0, 12
+    9168:	e28fc600 	add	ip, pc, #0
     916c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9170:	e5bcfef8 	ldr	pc, \[ip, #3832\]!	; 0xef8
 
diff --git a/ld/testsuite/ld-arm/ifunc-14.dd b/ld/testsuite/ld-arm/ifunc-14.dd
index 861f687733..8df338a545 100644
--- a/ld/testsuite/ld-arm/ifunc-14.dd
+++ b/ld/testsuite/ld-arm/ifunc-14.dd
@@ -16,13 +16,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ f2t's .plt entry
 #------------------------------------------------------------------------------
-    9014:	e28fc600 	add	ip, pc, #0, 12
+    9014:	e28fc600 	add	ip, pc, #0
     9018:	e28cca07 	add	ip, ip, #28672	; 0x7000
     901c:	e5bcfff0 	ldr	pc, \[ip, #4080\]!	; 0xff0
 #------------------------------------------------------------------------------
 #------ f2's .plt entry
 #------------------------------------------------------------------------------
-    9020:	e28fc600 	add	ip, pc, #0, 12
+    9020:	e28fc600 	add	ip, pc, #0
     9024:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9028:	e5bcffe8 	ldr	pc, \[ip, #4072\]!	; 0xfe8
 
@@ -32,23 +32,23 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 #------------------------------------------------------------------------------
 #------ f1t's .iplt entry
 #------------------------------------------------------------------------------
-    9038:	e28fc600 	add	ip, pc, #0, 12
+    9038:	e28fc600 	add	ip, pc, #0
     903c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9040:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 
 00009044 <f3>:
-    9044:	e28fc600 	add	ip, pc, #0, 12
+    9044:	e28fc600 	add	ip, pc, #0
     9048:	e28cca07 	add	ip, ip, #28672	; 0x7000
     904c:	e5bcffd0 	ldr	pc, \[ip, #4048\]!	; 0xfd0
 
 00009050 <f3t>:
-    9050:	e28fc600 	add	ip, pc, #0, 12
+    9050:	e28fc600 	add	ip, pc, #0
     9054:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9058:	e5bcffc8 	ldr	pc, \[ip, #4040\]!	; 0xfc8
 
diff --git a/ld/testsuite/ld-arm/ifunc-15.dd b/ld/testsuite/ld-arm/ifunc-15.dd
index d7648410cc..886d35512d 100644
--- a/ld/testsuite/ld-arm/ifunc-15.dd
+++ b/ld/testsuite/ld-arm/ifunc-15.dd
@@ -16,13 +16,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ f2t's .plt entry
 #------------------------------------------------------------------------------
-    9014:	e28fc600 	add	ip, pc, #0, 12
+    9014:	e28fc600 	add	ip, pc, #0
     9018:	e28cca07 	add	ip, ip, #28672	; 0x7000
     901c:	e5bcfff0 	ldr	pc, \[ip, #4080\]!	; 0xff0
 #------------------------------------------------------------------------------
 #------ f2's .plt entry
 #------------------------------------------------------------------------------
-    9020:	e28fc600 	add	ip, pc, #0, 12
+    9020:	e28fc600 	add	ip, pc, #0
     9024:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9028:	e5bcffe8 	ldr	pc, \[ip, #4072\]!	; 0xfe8
 
@@ -32,23 +32,23 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 #------------------------------------------------------------------------------
 #------ f1t's .iplt entry
 #------------------------------------------------------------------------------
-    9038:	e28fc600 	add	ip, pc, #0, 12
+    9038:	e28fc600 	add	ip, pc, #0
     903c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9040:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 
 00009044 <f3>:
-    9044:	e28fc600 	add	ip, pc, #0, 12
+    9044:	e28fc600 	add	ip, pc, #0
     9048:	e28cca07 	add	ip, ip, #28672	; 0x7000
     904c:	e5bcffd0 	ldr	pc, \[ip, #4048\]!	; 0xfd0
 
 00009050 <f3t>:
-    9050:	e28fc600 	add	ip, pc, #0, 12
+    9050:	e28fc600 	add	ip, pc, #0
     9054:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9058:	e5bcffc8 	ldr	pc, \[ip, #4040\]!	; 0xfc8
 
diff --git a/ld/testsuite/ld-arm/ifunc-16.dd b/ld/testsuite/ld-arm/ifunc-16.dd
index 16c2a9739c..d3b39bd7a8 100644
--- a/ld/testsuite/ld-arm/ifunc-16.dd
+++ b/ld/testsuite/ld-arm/ifunc-16.dd
@@ -8,33 +8,33 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    9000:	e28fc600 	add	ip, pc, #0, 12
-    9004:	e28cca08 	add	ip, ip, #8, 20	; 0x8000
+    9000:	e28fc600 	add	ip, pc, #0
+    9004:	e28cca08 	add	ip, ip, #32768	; 0x8000
     9008:	e5bcf004 	ldr	pc, \[ip, #4\]!
 #------------------------------------------------------------------------------
 #------ f1t's .iplt entry
 #------------------------------------------------------------------------------
-    900c:	e28fc600 	add	ip, pc, #0, 12
+    900c:	e28fc600 	add	ip, pc, #0
     9010:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9014:	e5bcfffc 	ldr	pc, \[ip, #4092\]!	; 0xffc
 
 00009018 <f2t>:
-    9018:	e28fc600 	add	ip, pc, #0, 12
+    9018:	e28fc600 	add	ip, pc, #0
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcfff4 	ldr	pc, \[ip, #4084\]!	; 0xff4
 
 00009024 <f3>:
-    9024:	e28fc600 	add	ip, pc, #0, 12
+    9024:	e28fc600 	add	ip, pc, #0
     9028:	e28cca07 	add	ip, ip, #28672	; 0x7000
     902c:	e5bcffec 	ldr	pc, \[ip, #4076\]!	; 0xfec
 
 00009030 <f2>:
-    9030:	e28fc600 	add	ip, pc, #0, 12
+    9030:	e28fc600 	add	ip, pc, #0
     9034:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9038:	e5bcffe4 	ldr	pc, \[ip, #4068\]!	; 0xfe4
 
 0000903c <f3t>:
-    903c:	e28fc600 	add	ip, pc, #0, 12
+    903c:	e28fc600 	add	ip, pc, #0
     9040:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9044:	e5bcffdc 	ldr	pc, \[ip, #4060\]!	; 0xfdc
 
diff --git a/ld/testsuite/ld-arm/ifunc-2.dd b/ld/testsuite/ld-arm/ifunc-2.dd
index f6d57faef9..994069ceee 100644
--- a/ld/testsuite/ld-arm/ifunc-2.dd
+++ b/ld/testsuite/ld-arm/ifunc-2.dd
@@ -8,13 +8,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    9000:	e28fc600 	add	ip, pc, #0, 12
-    9004:	e28cca08 	add	ip, ip, #8, 20	; 0x8000
+    9000:	e28fc600 	add	ip, pc, #0
+    9004:	e28cca08 	add	ip, ip, #32768	; 0x8000
     9008:	e5bcf004 	ldr	pc, \[ip, #4\]!
 #------------------------------------------------------------------------------
 #------ f2's .iplt entry
 #------------------------------------------------------------------------------
-    900c:	e28fc600 	add	ip, pc, #0, 12
+    900c:	e28fc600 	add	ip, pc, #0
     9010:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9014:	e5bcfffc 	ldr	pc, \[ip, #4092\]!	; 0xffc
 #------------------------------------------------------------------------------
@@ -25,7 +25,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f3's .iplt entry
 #------------------------------------------------------------------------------
-    901c:	e28fc600 	add	ip, pc, #0, 12
+    901c:	e28fc600 	add	ip, pc, #0
     9020:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9024:	e5bcfff0 	ldr	pc, \[ip, #4080\]!	; 0xff0
 #------------------------------------------------------------------------------
@@ -36,7 +36,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f4's .iplt entry
 #------------------------------------------------------------------------------
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe4 	ldr	pc, \[ip, #4068\]!	; 0xfe4
 #------------------------------------------------------------------------------
@@ -46,12 +46,12 @@ Disassembly of section \.iplt:
     903a:	46c0      	nop			; \(mov r8, r8\)
 
 0000903c <f7>:
-    903c:	e28fc600 	add	ip, pc, #0, 12
+    903c:	e28fc600 	add	ip, pc, #0
     9040:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9044:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 
 00009048 <f5>:
-    9048:	e28fc600 	add	ip, pc, #0, 12
+    9048:	e28fc600 	add	ip, pc, #0
     904c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9050:	e5bcffd0 	ldr	pc, \[ip, #4048\]!	; 0xfd0
 #------------------------------------------------------------------------------
@@ -61,12 +61,12 @@ Disassembly of section \.iplt:
     9056:	46c0      	nop			; \(mov r8, r8\)
 
 00009058 <f8>:
-    9058:	e28fc600 	add	ip, pc, #0, 12
+    9058:	e28fc600 	add	ip, pc, #0
     905c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9060:	e5bcffc4 	ldr	pc, \[ip, #4036\]!	; 0xfc4
 
 00009064 <f6>:
-    9064:	e28fc600 	add	ip, pc, #0, 12
+    9064:	e28fc600 	add	ip, pc, #0
     9068:	e28cca07 	add	ip, ip, #28672	; 0x7000
     906c:	e5bcffbc 	ldr	pc, \[ip, #4028\]!	; 0xfbc
 
diff --git a/ld/testsuite/ld-arm/ifunc-3.dd b/ld/testsuite/ld-arm/ifunc-3.dd
index a1fb37a8e9..824d516ecc 100644
--- a/ld/testsuite/ld-arm/ifunc-3.dd
+++ b/ld/testsuite/ld-arm/ifunc-3.dd
@@ -16,7 +16,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ f2's .plt entry
 #------------------------------------------------------------------------------
-    9014:	e28fc600 	add	ip, pc, #0, 12
+    9014:	e28fc600 	add	ip, pc, #0
     9018:	e28cca07 	add	ip, ip, #28672	; 0x7000
     901c:	e5bcfff0 	ldr	pc, \[ip, #4080\]!	; 0xff0
 
@@ -26,19 +26,19 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    9020:	e28fc600 	add	ip, pc, #0, 12
+    9020:	e28fc600 	add	ip, pc, #0
     9024:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9028:	e5bcffe8 	ldr	pc, \[ip, #4072\]!	; 0xfe8
 #------------------------------------------------------------------------------
 #------ f3's .iplt entry
 #------------------------------------------------------------------------------
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 #------------------------------------------------------------------------------
 #------ f4's .iplt entry
 #------------------------------------------------------------------------------
-    9038:	e28fc600 	add	ip, pc, #0, 12
+    9038:	e28fc600 	add	ip, pc, #0
     903c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9040:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 
diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd
index f5a4d9190b..afac39780a 100644
--- a/ld/testsuite/ld-arm/ifunc-4.dd
+++ b/ld/testsuite/ld-arm/ifunc-4.dd
@@ -21,7 +21,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ atf2's .plt entry
 #------------------------------------------------------------------------------
-    9018:	e28fc600 	add	ip, pc, #0, 12
+    9018:	e28fc600 	add	ip, pc, #0
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcffec 	ldr	pc, \[ip, #4076\]!	; 0xfec
 #------------------------------------------------------------------------------
@@ -32,7 +32,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ ttf2's .plt entry
 #------------------------------------------------------------------------------
-    9028:	e28fc600 	add	ip, pc, #0, 12
+    9028:	e28fc600 	add	ip, pc, #0
     902c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9030:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 #------------------------------------------------------------------------------
@@ -43,19 +43,19 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ tbf2's .plt entry
 #------------------------------------------------------------------------------
-    9038:	e28fc600 	add	ip, pc, #0, 12
+    9038:	e28fc600 	add	ip, pc, #0
     903c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9040:	e5bcffd4 	ldr	pc, \[ip, #4052\]!	; 0xfd4
 #------------------------------------------------------------------------------
 #------ taf2's .plt entry
 #------------------------------------------------------------------------------
-    9044:	e28fc600 	add	ip, pc, #0, 12
+    9044:	e28fc600 	add	ip, pc, #0
     9048:	e28cca07 	add	ip, ip, #28672	; 0x7000
     904c:	e5bcffcc 	ldr	pc, \[ip, #4044\]!	; 0xfcc
 #------------------------------------------------------------------------------
 #------ aaf2's .plt entry
 #------------------------------------------------------------------------------
-    9050:	e28fc600 	add	ip, pc, #0, 12
+    9050:	e28fc600 	add	ip, pc, #0
     9054:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9058:	e5bcffc4 	ldr	pc, \[ip, #4036\]!	; 0xfc4
 #------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ abf2's .plt entry
 #------------------------------------------------------------------------------
-    9060:	e28fc600 	add	ip, pc, #0, 12
+    9060:	e28fc600 	add	ip, pc, #0
     9064:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9068:	e5bcffb8 	ldr	pc, \[ip, #4024\]!	; 0xfb8
 
@@ -76,7 +76,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ aaf1's .iplt entry
 #------------------------------------------------------------------------------
-    906c:	e28fc600 	add	ip, pc, #0, 12
+    906c:	e28fc600 	add	ip, pc, #0
     9070:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9074:	e5bcffb0 	ldr	pc, \[ip, #4016\]!	; 0xfb0
 #------------------------------------------------------------------------------
@@ -87,7 +87,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf1's .iplt entry
 #------------------------------------------------------------------------------
-    907c:	e28fc600 	add	ip, pc, #0, 12
+    907c:	e28fc600 	add	ip, pc, #0
     9080:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9084:	e5bcffa4 	ldr	pc, \[ip, #4004\]!	; 0xfa4
 #------------------------------------------------------------------------------
@@ -98,13 +98,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf1's .iplt entry
 #------------------------------------------------------------------------------
-    908c:	e28fc600 	add	ip, pc, #0, 12
+    908c:	e28fc600 	add	ip, pc, #0
     9090:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9094:	e5bcff98 	ldr	pc, \[ip, #3992\]!	; 0xf98
 #------------------------------------------------------------------------------
 #------ taf1's .iplt entry
 #------------------------------------------------------------------------------
-    9098:	e28fc600 	add	ip, pc, #0, 12
+    9098:	e28fc600 	add	ip, pc, #0
     909c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90a0:	e5bcff90 	ldr	pc, \[ip, #3984\]!	; 0xf90
 #------------------------------------------------------------------------------
@@ -115,7 +115,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf1's .iplt entry
 #------------------------------------------------------------------------------
-    90a8:	e28fc600 	add	ip, pc, #0, 12
+    90a8:	e28fc600 	add	ip, pc, #0
     90ac:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90b0:	e5bcff84 	ldr	pc, \[ip, #3972\]!	; 0xf84
 #------------------------------------------------------------------------------
@@ -126,13 +126,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf1's .iplt entry
 #------------------------------------------------------------------------------
-    90b8:	e28fc600 	add	ip, pc, #0, 12
+    90b8:	e28fc600 	add	ip, pc, #0
     90bc:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90c0:	e5bcff78 	ldr	pc, \[ip, #3960\]!	; 0xf78
 #------------------------------------------------------------------------------
 #------ aaf4's .iplt entry
 #------------------------------------------------------------------------------
-    90c4:	e28fc600 	add	ip, pc, #0, 12
+    90c4:	e28fc600 	add	ip, pc, #0
     90c8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90cc:	e5bcff70 	ldr	pc, \[ip, #3952\]!	; 0xf70
 #------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf3's .iplt entry
 #------------------------------------------------------------------------------
-    90d4:	e28fc600 	add	ip, pc, #0, 12
+    90d4:	e28fc600 	add	ip, pc, #0
     90d8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90dc:	e5bcff64 	ldr	pc, \[ip, #3940\]!	; 0xf64
 #------------------------------------------------------------------------------
@@ -154,7 +154,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf3's .iplt entry
 #------------------------------------------------------------------------------
-    90e4:	e28fc600 	add	ip, pc, #0, 12
+    90e4:	e28fc600 	add	ip, pc, #0
     90e8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90ec:	e5bcff58 	ldr	pc, \[ip, #3928\]!	; 0xf58
 #------------------------------------------------------------------------------
@@ -165,7 +165,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf3's .iplt entry
 #------------------------------------------------------------------------------
-    90f4:	e28fc600 	add	ip, pc, #0, 12
+    90f4:	e28fc600 	add	ip, pc, #0
     90f8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90fc:	e5bcff4c 	ldr	pc, \[ip, #3916\]!	; 0xf4c
 #------------------------------------------------------------------------------
@@ -176,13 +176,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf3's .iplt entry
 #------------------------------------------------------------------------------
-    9104:	e28fc600 	add	ip, pc, #0, 12
+    9104:	e28fc600 	add	ip, pc, #0
     9108:	e28cca07 	add	ip, ip, #28672	; 0x7000
     910c:	e5bcff40 	ldr	pc, \[ip, #3904\]!	; 0xf40
 #------------------------------------------------------------------------------
 #------ taf3's .iplt entry
 #------------------------------------------------------------------------------
-    9110:	e28fc600 	add	ip, pc, #0, 12
+    9110:	e28fc600 	add	ip, pc, #0
     9114:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9118:	e5bcff38 	ldr	pc, \[ip, #3896\]!	; 0xf38
 #------------------------------------------------------------------------------
@@ -193,7 +193,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf4's .iplt entry
 #------------------------------------------------------------------------------
-    9120:	e28fc600 	add	ip, pc, #0, 12
+    9120:	e28fc600 	add	ip, pc, #0
     9124:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9128:	e5bcff2c 	ldr	pc, \[ip, #3884\]!	; 0xf2c
 #------------------------------------------------------------------------------
@@ -204,7 +204,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf4's .iplt entry
 #------------------------------------------------------------------------------
-    9130:	e28fc600 	add	ip, pc, #0, 12
+    9130:	e28fc600 	add	ip, pc, #0
     9134:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9138:	e5bcff20 	ldr	pc, \[ip, #3872\]!	; 0xf20
 #------------------------------------------------------------------------------
@@ -215,13 +215,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf4's .iplt entry
 #------------------------------------------------------------------------------
-    9140:	e28fc600 	add	ip, pc, #0, 12
+    9140:	e28fc600 	add	ip, pc, #0
     9144:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9148:	e5bcff14 	ldr	pc, \[ip, #3860\]!	; 0xf14
 #------------------------------------------------------------------------------
 #------ aaf3's .iplt entry
 #------------------------------------------------------------------------------
-    914c:	e28fc600 	add	ip, pc, #0, 12
+    914c:	e28fc600 	add	ip, pc, #0
     9150:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9154:	e5bcff0c 	ldr	pc, \[ip, #3852\]!	; 0xf0c
 #------------------------------------------------------------------------------
@@ -232,13 +232,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf4's .iplt entry
 #------------------------------------------------------------------------------
-    915c:	e28fc600 	add	ip, pc, #0, 12
+    915c:	e28fc600 	add	ip, pc, #0
     9160:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9164:	e5bcff00 	ldr	pc, \[ip, #3840\]!	; 0xf00
 #------------------------------------------------------------------------------
 #------ taf4's .iplt entry
 #------------------------------------------------------------------------------
-    9168:	e28fc600 	add	ip, pc, #0, 12
+    9168:	e28fc600 	add	ip, pc, #0
     916c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9170:	e5bcfef8 	ldr	pc, \[ip, #3832\]!	; 0xef8
 
diff --git a/ld/testsuite/ld-arm/ifunc-5.dd b/ld/testsuite/ld-arm/ifunc-5.dd
index b0bf5979a8..0fe8255c98 100644
--- a/ld/testsuite/ld-arm/ifunc-5.dd
+++ b/ld/testsuite/ld-arm/ifunc-5.dd
@@ -8,19 +8,19 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    9000:	e28fc600 	add	ip, pc, #0, 12
-    9004:	e28cca08 	add	ip, ip, #8, 20	; 0x8000
+    9000:	e28fc600 	add	ip, pc, #0
+    9004:	e28cca08 	add	ip, ip, #32768	; 0x8000
     9008:	e5bcf004 	ldr	pc, \[ip, #4\]!
 #------------------------------------------------------------------------------
 #------ f3's .iplt entry
 #------------------------------------------------------------------------------
-    900c:	e28fc600 	add	ip, pc, #0, 12
+    900c:	e28fc600 	add	ip, pc, #0
     9010:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9014:	e5bcfffc 	ldr	pc, \[ip, #4092\]!	; 0xffc
 #------------------------------------------------------------------------------
 #------ f2's .iplt entry
 #------------------------------------------------------------------------------
-    9018:	e28fc600 	add	ip, pc, #0, 12
+    9018:	e28fc600 	add	ip, pc, #0
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcfff4 	ldr	pc, \[ip, #4084\]!	; 0xff4
 
diff --git a/ld/testsuite/ld-arm/ifunc-6.dd b/ld/testsuite/ld-arm/ifunc-6.dd
index 3c9cbd5351..c78c8d4d56 100644
--- a/ld/testsuite/ld-arm/ifunc-6.dd
+++ b/ld/testsuite/ld-arm/ifunc-6.dd
@@ -13,13 +13,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f3's .iplt entry
 #------------------------------------------------------------------------------
-    9004:	e28fc600 	add	ip, pc, #0, 12
-    9008:	e28cca08 	add	ip, ip, #8, 20	; 0x8000
+    9004:	e28fc600 	add	ip, pc, #0
+    9008:	e28cca08 	add	ip, ip, #32768	; 0x8000
     900c:	e5bcf000 	ldr	pc, \[ip, #0\]!
 #------------------------------------------------------------------------------
 #------ f2's .iplt entry
 #------------------------------------------------------------------------------
-    9010:	e28fc600 	add	ip, pc, #0, 12
+    9010:	e28fc600 	add	ip, pc, #0
     9014:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9018:	e5bcfff8 	ldr	pc, \[ip, #4088\]!	; 0xff8
 #------------------------------------------------------------------------------
@@ -30,13 +30,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f4's .iplt entry
 #------------------------------------------------------------------------------
-    9020:	e28fc600 	add	ip, pc, #0, 12
+    9020:	e28fc600 	add	ip, pc, #0
     9024:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9028:	e5bcffec 	ldr	pc, \[ip, #4076\]!	; 0xfec
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe4 	ldr	pc, \[ip, #4068\]!	; 0xfe4
 
diff --git a/ld/testsuite/ld-arm/ifunc-7.dd b/ld/testsuite/ld-arm/ifunc-7.dd
index e9a9681464..5db88fb133 100644
--- a/ld/testsuite/ld-arm/ifunc-7.dd
+++ b/ld/testsuite/ld-arm/ifunc-7.dd
@@ -16,13 +16,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ f2's .plt entry
 #------------------------------------------------------------------------------
-    9014:	e28fc600 	add	ip, pc, #0, 12
+    9014:	e28fc600 	add	ip, pc, #0
     9018:	e28cca07 	add	ip, ip, #28672	; 0x7000
     901c:	e5bcfff0 	ldr	pc, \[ip, #4080\]!	; 0xff0
 #------------------------------------------------------------------------------
 #------ f4's .plt entry
 #------------------------------------------------------------------------------
-    9020:	e28fc600 	add	ip, pc, #0, 12
+    9020:	e28fc600 	add	ip, pc, #0
     9024:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9028:	e5bcffe8 	ldr	pc, \[ip, #4072\]!	; 0xfe8
 
@@ -32,13 +32,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 #------------------------------------------------------------------------------
 #------ f3's .iplt entry
 #------------------------------------------------------------------------------
-    9038:	e28fc600 	add	ip, pc, #0, 12
+    9038:	e28fc600 	add	ip, pc, #0
     903c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9040:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 
diff --git a/ld/testsuite/ld-arm/ifunc-8.dd b/ld/testsuite/ld-arm/ifunc-8.dd
index 5b255e2e5f..f14ab34f69 100644
--- a/ld/testsuite/ld-arm/ifunc-8.dd
+++ b/ld/testsuite/ld-arm/ifunc-8.dd
@@ -21,13 +21,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ atf2's .plt entry
 #------------------------------------------------------------------------------
-    9018:	e28fc600 	add	ip, pc, #0, 12
+    9018:	e28fc600 	add	ip, pc, #0
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcffec 	ldr	pc, \[ip, #4076\]!	; 0xfec
 #------------------------------------------------------------------------------
 #------ aaf4's .plt entry
 #------------------------------------------------------------------------------
-    9024:	e28fc600 	add	ip, pc, #0, 12
+    9024:	e28fc600 	add	ip, pc, #0
     9028:	e28cca07 	add	ip, ip, #28672	; 0x7000
     902c:	e5bcffe4 	ldr	pc, \[ip, #4068\]!	; 0xfe4
 #------------------------------------------------------------------------------
@@ -38,7 +38,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ ttf2's .plt entry
 #------------------------------------------------------------------------------
-    9034:	e28fc600 	add	ip, pc, #0, 12
+    9034:	e28fc600 	add	ip, pc, #0
     9038:	e28cca07 	add	ip, ip, #28672	; 0x7000
     903c:	e5bcffd8 	ldr	pc, \[ip, #4056\]!	; 0xfd8
 #------------------------------------------------------------------------------
@@ -49,19 +49,19 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ tbf2's .plt entry
 #------------------------------------------------------------------------------
-    9044:	e28fc600 	add	ip, pc, #0, 12
+    9044:	e28fc600 	add	ip, pc, #0
     9048:	e28cca07 	add	ip, ip, #28672	; 0x7000
     904c:	e5bcffcc 	ldr	pc, \[ip, #4044\]!	; 0xfcc
 #------------------------------------------------------------------------------
 #------ taf2's .plt entry
 #------------------------------------------------------------------------------
-    9050:	e28fc600 	add	ip, pc, #0, 12
+    9050:	e28fc600 	add	ip, pc, #0
     9054:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9058:	e5bcffc4 	ldr	pc, \[ip, #4036\]!	; 0xfc4
 #------------------------------------------------------------------------------
 #------ aaf2's .plt entry
 #------------------------------------------------------------------------------
-    905c:	e28fc600 	add	ip, pc, #0, 12
+    905c:	e28fc600 	add	ip, pc, #0
     9060:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9064:	e5bcffbc 	ldr	pc, \[ip, #4028\]!	; 0xfbc
 #------------------------------------------------------------------------------
@@ -72,7 +72,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ abf4's .plt entry
 #------------------------------------------------------------------------------
-    906c:	e28fc600 	add	ip, pc, #0, 12
+    906c:	e28fc600 	add	ip, pc, #0
     9070:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9074:	e5bcffb0 	ldr	pc, \[ip, #4016\]!	; 0xfb0
 #------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ tbf4's .plt entry
 #------------------------------------------------------------------------------
-    907c:	e28fc600 	add	ip, pc, #0, 12
+    907c:	e28fc600 	add	ip, pc, #0
     9080:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9084:	e5bcffa4 	ldr	pc, \[ip, #4004\]!	; 0xfa4
 #------------------------------------------------------------------------------
@@ -94,7 +94,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ ttf4's .plt entry
 #------------------------------------------------------------------------------
-    908c:	e28fc600 	add	ip, pc, #0, 12
+    908c:	e28fc600 	add	ip, pc, #0
     9090:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9094:	e5bcff98 	ldr	pc, \[ip, #3992\]!	; 0xf98
 #------------------------------------------------------------------------------
@@ -105,13 +105,13 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ atf4's .plt entry
 #------------------------------------------------------------------------------
-    909c:	e28fc600 	add	ip, pc, #0, 12
+    909c:	e28fc600 	add	ip, pc, #0
     90a0:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90a4:	e5bcff8c 	ldr	pc, \[ip, #3980\]!	; 0xf8c
 #------------------------------------------------------------------------------
 #------ taf4's .plt entry
 #------------------------------------------------------------------------------
-    90a8:	e28fc600 	add	ip, pc, #0, 12
+    90a8:	e28fc600 	add	ip, pc, #0
     90ac:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90b0:	e5bcff84 	ldr	pc, \[ip, #3972\]!	; 0xf84
 #------------------------------------------------------------------------------
@@ -122,7 +122,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ abf2's .plt entry
 #------------------------------------------------------------------------------
-    90b8:	e28fc600 	add	ip, pc, #0, 12
+    90b8:	e28fc600 	add	ip, pc, #0
     90bc:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90c0:	e5bcff78 	ldr	pc, \[ip, #3960\]!	; 0xf78
 
@@ -132,7 +132,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ aaf1's .iplt entry
 #------------------------------------------------------------------------------
-    90c4:	e28fc600 	add	ip, pc, #0, 12
+    90c4:	e28fc600 	add	ip, pc, #0
     90c8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90cc:	e5bcff70 	ldr	pc, \[ip, #3952\]!	; 0xf70
 #------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf1's .iplt entry
 #------------------------------------------------------------------------------
-    90d4:	e28fc600 	add	ip, pc, #0, 12
+    90d4:	e28fc600 	add	ip, pc, #0
     90d8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90dc:	e5bcff64 	ldr	pc, \[ip, #3940\]!	; 0xf64
 #------------------------------------------------------------------------------
@@ -154,13 +154,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf1's .iplt entry
 #------------------------------------------------------------------------------
-    90e4:	e28fc600 	add	ip, pc, #0, 12
+    90e4:	e28fc600 	add	ip, pc, #0
     90e8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90ec:	e5bcff58 	ldr	pc, \[ip, #3928\]!	; 0xf58
 #------------------------------------------------------------------------------
 #------ taf1's .iplt entry
 #------------------------------------------------------------------------------
-    90f0:	e28fc600 	add	ip, pc, #0, 12
+    90f0:	e28fc600 	add	ip, pc, #0
     90f4:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90f8:	e5bcff50 	ldr	pc, \[ip, #3920\]!	; 0xf50
 #------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf1's .iplt entry
 #------------------------------------------------------------------------------
-    9100:	e28fc600 	add	ip, pc, #0, 12
+    9100:	e28fc600 	add	ip, pc, #0
     9104:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9108:	e5bcff44 	ldr	pc, \[ip, #3908\]!	; 0xf44
 #------------------------------------------------------------------------------
@@ -182,7 +182,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf1's .iplt entry
 #------------------------------------------------------------------------------
-    9110:	e28fc600 	add	ip, pc, #0, 12
+    9110:	e28fc600 	add	ip, pc, #0
     9114:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9118:	e5bcff38 	ldr	pc, \[ip, #3896\]!	; 0xf38
 #------------------------------------------------------------------------------
@@ -193,7 +193,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf3's .iplt entry
 #------------------------------------------------------------------------------
-    9120:	e28fc600 	add	ip, pc, #0, 12
+    9120:	e28fc600 	add	ip, pc, #0
     9124:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9128:	e5bcff2c 	ldr	pc, \[ip, #3884\]!	; 0xf2c
 #------------------------------------------------------------------------------
@@ -204,7 +204,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf3's .iplt entry
 #------------------------------------------------------------------------------
-    9130:	e28fc600 	add	ip, pc, #0, 12
+    9130:	e28fc600 	add	ip, pc, #0
     9134:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9138:	e5bcff20 	ldr	pc, \[ip, #3872\]!	; 0xf20
 #------------------------------------------------------------------------------
@@ -215,7 +215,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf3's .iplt entry
 #------------------------------------------------------------------------------
-    9140:	e28fc600 	add	ip, pc, #0, 12
+    9140:	e28fc600 	add	ip, pc, #0
     9144:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9148:	e5bcff14 	ldr	pc, \[ip, #3860\]!	; 0xf14
 #------------------------------------------------------------------------------
@@ -226,19 +226,19 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf3's .iplt entry
 #------------------------------------------------------------------------------
-    9150:	e28fc600 	add	ip, pc, #0, 12
+    9150:	e28fc600 	add	ip, pc, #0
     9154:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9158:	e5bcff08 	ldr	pc, \[ip, #3848\]!	; 0xf08
 #------------------------------------------------------------------------------
 #------ taf3's .iplt entry
 #------------------------------------------------------------------------------
-    915c:	e28fc600 	add	ip, pc, #0, 12
+    915c:	e28fc600 	add	ip, pc, #0
     9160:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9164:	e5bcff00 	ldr	pc, \[ip, #3840\]!	; 0xf00
 #------------------------------------------------------------------------------
 #------ aaf3's .iplt entry
 #------------------------------------------------------------------------------
-    9168:	e28fc600 	add	ip, pc, #0, 12
+    9168:	e28fc600 	add	ip, pc, #0
     916c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9170:	e5bcfef8 	ldr	pc, \[ip, #3832\]!	; 0xef8
 
diff --git a/ld/testsuite/ld-arm/ifunc-9.dd b/ld/testsuite/ld-arm/ifunc-9.dd
index 36139d9c4b..be8f3d04f4 100644
--- a/ld/testsuite/ld-arm/ifunc-9.dd
+++ b/ld/testsuite/ld-arm/ifunc-9.dd
@@ -16,7 +16,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ f2's .plt entry
 #------------------------------------------------------------------------------
-    9014:	e28fc600 	add	ip, pc, #0, 12
+    9014:	e28fc600 	add	ip, pc, #0
     9018:	e28cca07 	add	ip, ip, #28672	; 0x7000
     901c:	e5bcfff0 	ldr	pc, \[ip, #4080\]!	; 0xff0
 
@@ -26,12 +26,12 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ f1's .iplt entry
 #------------------------------------------------------------------------------
-    9020:	e28fc600 	add	ip, pc, #0, 12
+    9020:	e28fc600 	add	ip, pc, #0
     9024:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9028:	e5bcffe8 	ldr	pc, \[ip, #4072\]!	; 0xfe8
 
 0000902c <f3>:
-    902c:	e28fc600 	add	ip, pc, #0, 12
+    902c:	e28fc600 	add	ip, pc, #0
     9030:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9034:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 
diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp
index 1893873e61..d0563deb89 100644
--- a/ld/testsuite/ld-bootstrap/bootstrap.exp
+++ b/ld/testsuite/ld-bootstrap/bootstrap.exp
@@ -155,7 +155,7 @@ foreach flags {"" "strip" "--static" "--traditional-format"
 	    # On ia64, tmpdir/ld2 != tmpdir/ld3 is normal since they are
 	    # generated by different linkers, tmpdir/ld1 and tmpdir/ld2.
 	    # So we rebuild tmpdir/ld2 with tmpdir/ld3.
-	    if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY $extralibs"] {
+	    if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY"] {
 		fail $testname
 		continue
 	    }
@@ -165,7 +165,7 @@ foreach flags {"" "strip" "--static" "--traditional-format"
 	    # On Linux/mips, tmpdir/ld2 != tmpdir/ld3 is normal since
 	    # they are generated by different linkers, tmpdir/ld1 and
 	    # tmpdir/ld2. So we rebuild tmpdir/ld2 with tmpdir/ld3.
-	    if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY $extralibs"] {
+	    if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY"] {
 		fail $testname
 		continue
 	    }
diff --git a/ld/testsuite/ld-cris/tls-gc-68.d b/ld/testsuite/ld-cris/tls-gc-68.d
index 4b639913cb..60fcc3be10 100644
--- a/ld/testsuite/ld-cris/tls-gc-68.d
+++ b/ld/testsuite/ld-cris/tls-gc-68.d
@@ -21,11 +21,11 @@ private flags = 0:
 SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82078 l    d  .got	0+ .got
-0+82084 l       \*ABS\*	0+ __bss_start
-0+82084 l       \*ABS\*	0+ _edata
 0+82078 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
-0+820a0 l       \*ABS\*	0+ _end
 0+80074 g       .text	0+ _start
+0+82084 g       \*ABS\*	0+ __bss_start
+0+82084 g       \*ABS\*	0+ _edata
+0+820a0 g       \*ABS\*	0+ _end
 
 Contents of section .text:
  80074 41b20+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gc-69.d b/ld/testsuite/ld-cris/tls-gc-69.d
index f14deec520..e547ba4aa0 100644
--- a/ld/testsuite/ld-cris/tls-gc-69.d
+++ b/ld/testsuite/ld-cris/tls-gc-69.d
@@ -22,11 +22,11 @@ private flags = 0:
 SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82078 l    d  .got	0+ .got
-0+82084 l       \*ABS\*	0+ __bss_start
-0+82084 l       \*ABS\*	0+ _edata
 0+82078 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
-0+820a0 l       \*ABS\*	0+ _end
 0+80074 g       .text	0+ _start
+0+82084 g       \*ABS\*	0+ __bss_start
+0+82084 g       \*ABS\*	0+ _edata
+0+820a0 g       \*ABS\*	0+ _end
 
 Contents of section .text:
  80074 41b20+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gc-70.d b/ld/testsuite/ld-cris/tls-gc-70.d
index dbeb9d0707..d8d5324f5c 100644
--- a/ld/testsuite/ld-cris/tls-gc-70.d
+++ b/ld/testsuite/ld-cris/tls-gc-70.d
@@ -22,11 +22,11 @@ private flags = 0:
 SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82078 l    d  .got	0+ .got
-0+82084 l       \*ABS\*	0+ __bss_start
-0+82084 l       \*ABS\*	0+ _edata
 0+82078 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
-0+820a0 l       \*ABS\*	0+ _end
 0+80074 g       .text	0+ _start
+0+82084 g       \*ABS\*	0+ __bss_start
+0+82084 g       \*ABS\*	0+ _edata
+0+820a0 g       \*ABS\*	0+ _end
 
 Contents of section .text:
  80074 41b20+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gc-71.d b/ld/testsuite/ld-cris/tls-gc-71.d
index 29745de735..3ee73fc3af 100644
--- a/ld/testsuite/ld-cris/tls-gc-71.d
+++ b/ld/testsuite/ld-cris/tls-gc-71.d
@@ -17,11 +17,11 @@
 DYNAMIC SYMBOL TABLE:
 0+18e l    d  .text	0+ .text
 0+2194 l    d  .tdata	0+ .tdata
-0+2280 l    D  \*ABS\*	0+ __bss_start
-0+2280 l    D  \*ABS\*	0+ _edata
-0+2280 l    D  \*ABS\*	0+ _end
 0+18e g    DF .text	0+2 _init
+0+2280 g    D  \*ABS\*	0+ __bss_start
 0+ g    D  .tdata	0+80 tls128
+0+2280 g    D  \*ABS\*	0+ _edata
+0+2280 g    D  \*ABS\*	0+ _end
 
 DYNAMIC RELOCATION RECORDS \(none\)
 #...
diff --git a/ld/testsuite/ld-cris/tls-gc-75.d b/ld/testsuite/ld-cris/tls-gc-75.d
index b1c77bfc67..2f4257e161 100644
--- a/ld/testsuite/ld-cris/tls-gc-75.d
+++ b/ld/testsuite/ld-cris/tls-gc-75.d
@@ -24,11 +24,11 @@ private flags = 0:
 SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82078 l    d  .got	0+ .got
-0+82084 l       \*ABS\*	0+ __bss_start
-0+82084 l       \*ABS\*	0+ _edata
 0+82078 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
-0+820a0 l       \*ABS\*	0+ _end
 0+80074 g       .text	0+ _start
+0+82084 g       \*ABS\*	0+ __bss_start
+0+82084 g       \*ABS\*	0+ _edata
+0+820a0 g       \*ABS\*	0+ _end
 
 Contents of section .text:
  80074 41b20+                             .*
diff --git a/ld/testsuite/ld-cris/tls-gc-76.d b/ld/testsuite/ld-cris/tls-gc-76.d
index 52387275e2..f3c78df681 100644
--- a/ld/testsuite/ld-cris/tls-gc-76.d
+++ b/ld/testsuite/ld-cris/tls-gc-76.d
@@ -23,11 +23,11 @@ SYMBOL TABLE:
 0+82080 l    d  .got	0+ .got
 0+82090 l    d  .data	0+ .data
 0+82090 l     O .data	0+4 gc76var
-0+82094 l       \*ABS\*	0+ __bss_start
-0+82094 l       \*ABS\*	0+ _edata
 0+82080 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
-0+820a0 l       \*ABS\*	0+ _end
 0+80074 g       .text	0+ _start
+0+82094 g       \*ABS\*	0+ __bss_start
+0+82094 g       \*ABS\*	0+ _edata
+0+820a0 g       \*ABS\*	0+ _end
 0+80078 g     F .text	0+6 gc76fn
 
 Contents of section .text:
diff --git a/ld/testsuite/ld-cris/tls-gc-79.d b/ld/testsuite/ld-cris/tls-gc-79.d
index eb3646d652..210f4789ef 100644
--- a/ld/testsuite/ld-cris/tls-gc-79.d
+++ b/ld/testsuite/ld-cris/tls-gc-79.d
@@ -22,11 +22,11 @@ private flags = 0:
 SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82078 l    d  .got	0+ .got
-0+82084 l       \*ABS\*	0+ __bss_start
-0+82084 l       \*ABS\*	0+ _edata
 0+82078 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
-0+820a0 l       \*ABS\*	0+ _end
 0+80074 g       .text	0+ _start
+0+82084 g       \*ABS\*	0+ __bss_start
+0+82084 g       \*ABS\*	0+ _edata
+0+820a0 g       \*ABS\*	0+ _end
 
 Contents of section .text:
  80074 41b20+                             .*
diff --git a/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
index 0dc4f7c19a..2a9223e6a6 100644
--- a/ld/testsuite/ld-cris/tls-js1.d
+++ b/ld/testsuite/ld-cris/tls-js1.d
@@ -28,5 +28,5 @@ Relocation section '\.rela\.plt' at offset 0x224 contains 2 entries:
 0000235c  0000030b R_CRIS_JUMP_SLOT  00000296   dsofn4 \+ 0
 00002360  00000c0b R_CRIS_JUMP_SLOT  000002ae   dsofn \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 #pass
diff --git a/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
index ea86a461b4..f628097120 100644
--- a/ld/testsuite/ld-cris/tls-local-63.d
+++ b/ld/testsuite/ld-cris/tls-local-63.d
@@ -12,7 +12,7 @@ Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 00002210  0000001c R_CRIS_32_TPREL[ ]+00+
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains 7 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index 7630fdcd2e..f813858b05 100644
--- a/ld/testsuite/ld-cris/tls-local-64.d
+++ b/ld/testsuite/ld-cris/tls-local-64.d
@@ -14,7 +14,7 @@ Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 00002290  0000001c R_CRIS_32_TPREL[ ]+0+80
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains 7 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
diff --git a/ld/testsuite/ld-cris/tls-und-38.d b/ld/testsuite/ld-cris/tls-und-38.d
index 7830672dc1..314dac5595 100644
--- a/ld/testsuite/ld-cris/tls-und-38.d
+++ b/ld/testsuite/ld-cris/tls-und-38.d
@@ -13,7 +13,7 @@ Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
 000021ec +00000217 R_CRIS_DTP +00000000 +x \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains . entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/ld/testsuite/ld-cris/tls-und-42.d b/ld/testsuite/ld-cris/tls-und-42.d
index db45264347..a996506749 100644
--- a/ld/testsuite/ld-cris/tls-und-42.d
+++ b/ld/testsuite/ld-cris/tls-und-42.d
@@ -13,7 +13,7 @@ Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
 000021f4 +0000021c R_CRIS_32_TPREL +0+ +x \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains . entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/ld/testsuite/ld-cris/tls-und-46.d b/ld/testsuite/ld-cris/tls-und-46.d
index 92755d4adf..65421a0e76 100644
--- a/ld/testsuite/ld-cris/tls-und-46.d
+++ b/ld/testsuite/ld-cris/tls-und-46.d
@@ -13,7 +13,7 @@ Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
 000021e8 +00000217 R_CRIS_DTP +00000000 +x \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains . entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/ld/testsuite/ld-cris/tls-und-50.d b/ld/testsuite/ld-cris/tls-und-50.d
index 6814aac23e..71f3d9079a 100644
--- a/ld/testsuite/ld-cris/tls-und-50.d
+++ b/ld/testsuite/ld-cris/tls-und-50.d
@@ -13,7 +13,7 @@ Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
 000021ec +0000021c R_CRIS_32_TPREL +0+ +x \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains . entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/ld/testsuite/ld-cris/weakref3.d b/ld/testsuite/ld-cris/weakref3.d
index d07f514d61..2d3b285193 100644
--- a/ld/testsuite/ld-cris/weakref3.d
+++ b/ld/testsuite/ld-cris/weakref3.d
@@ -22,7 +22,7 @@ Relocation section '.rela.plt' at offset 0x... contains 1 entries:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
 00082320 +0000030b R_CRIS_JUMP_SLOT +00080238 +expfn2 \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains . entries:
 #...
diff --git a/ld/testsuite/ld-cris/weakref4.d b/ld/testsuite/ld-cris/weakref4.d
index 95fb5ec9a8..b0345765d3 100644
--- a/ld/testsuite/ld-cris/weakref4.d
+++ b/ld/testsuite/ld-cris/weakref4.d
@@ -19,7 +19,7 @@ Relocation section '.rela.dyn' at offset 0x... contains 1 entries:
 #...
 000822a8 +00000109 R_CRIS_COPY +000822a8 +__expobj2 \+ 0
 
-The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
+There are no unwind sections in this file.
 
 Symbol table '.dynsym' contains . entries:
 #...
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 42b554138b..866c86682e 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -58,7 +58,40 @@ if { ![istarget hppa64*-hpux*] } {
 # should not seg-fault whilst creating the binary.
 #
 # Only run the test on targets thats support creating shared libraries.
-if { [check_shared_lib_support] } then {
+if {    ! [istarget arc-*-*]
+     && ! [istarget avr-*-*]
+     && ! [istarget cr16-*-*]
+     && ! [istarget cris*-*-*]
+     && ! [istarget crx-*-*]
+     && ! [istarget d10v-*-*]
+     && ! [istarget d30v-*-*]
+     && ! [istarget dlx-*-*]
+     && ! [istarget fr30-*-*]
+     && ! [istarget frv-*-*]
+     && ! [istarget h8300-*-*]
+     && ! [istarget i860-*-*]
+     && ! [istarget i960-*-*]
+     && ! [istarget ip2k-*-*]
+     && ! [istarget iq2000-*-*]
+     && ! [istarget lm32-*-*]
+     && ! [istarget m32c-*-*]
+     && ! [istarget m32r-*-*]
+     && ! [istarget mcore*-*-*]
+     && ! [istarget mep-*-*]
+     && ! [istarget microblaze-*-*]
+     && ! [istarget mn10200-*-*]
+     && ! [istarget moxie-*-*]
+     && ! [istarget ms1-*-*]
+     && ! [istarget msp430-*-*]
+     && ! [istarget openrisc-*-*]
+     && ! [istarget or32-*-*]
+     && ! [istarget pj-*-*]
+     && ! [istarget rx-*-*]
+     && ! [istarget spu-*-*]
+     && ! [istarget v850*-*-*]
+     && ! [istarget xstormy16-*-*]
+     && ! [istarget *-*-irix*]
+     && ! [istarget *-*-rtems] } {
   run_ld_link_tests {
       {"Build shared library for next test"
        "-shared" "" "note-3.s" {} "note-3.so" }
@@ -105,11 +138,9 @@ if ![isnative] {
     return
 }
 
-if [check_gc_sections_available] {
-    run_cc_link_tests {
-	{"PR ld/13195" "-Wl,--gc-sections" ""
-	 {pr13195.c} {} "pr13195"}
-    }
+run_cc_link_tests {
+    {"PR ld/13195" "-Wl,--gc-sections" ""
+     {pr13195.c} {} "pr13195"}
 }
 
 set array_tests {
diff --git a/ld/testsuite/ld-elf/linkoncerdiff.d b/ld/testsuite/ld-elf/linkoncerdiff.d
index 06d08c16eb..8eec3d2ca2 100644
--- a/ld/testsuite/ld-elf/linkoncerdiff.d
+++ b/ld/testsuite/ld-elf/linkoncerdiff.d
@@ -2,6 +2,5 @@
 #source: linkoncerdiff2.s
 #ld: -r
 #readelf: -r
-#notarget: hppa64*-*-hpux*
 There are no relocations in this file.
 #pass
diff --git a/ld/testsuite/ld-elf/pr11304a.s b/ld/testsuite/ld-elf/pr11304a.s
index 75fcd37b43..22fbbee8a8 100644
--- a/ld/testsuite/ld-elf/pr11304a.s
+++ b/ld/testsuite/ld-elf/pr11304a.s
@@ -1,4 +1,4 @@
- .section .zzz,"ax",%progbits
- .long 0
- .text
- .long 0
+.section .zzz,"ax",%progbits
+.long 0
+.text
+.long 0
diff --git a/ld/testsuite/ld-elf/pr11304b.s b/ld/testsuite/ld-elf/pr11304b.s
index 75fcd37b43..22fbbee8a8 100644
--- a/ld/testsuite/ld-elf/pr11304b.s
+++ b/ld/testsuite/ld-elf/pr11304b.s
@@ -1,4 +1,4 @@
- .section .zzz,"ax",%progbits
- .long 0
- .text
- .long 0
+.section .zzz,"ax",%progbits
+.long 0
+.text
+.long 0
diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index f39bf0f0c4..9cd0221ccb 100644
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -1,6 +1,5 @@
 # Expect script for various ELF tests.
-#   Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
-#   Free Software Foundation, Inc.
+#   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -162,7 +161,7 @@ set build_tests {
    "-shared" "-fPIC"
    {pr13250-1.c} {} "libpr13250-1.so"}
   {"Build pr13250-2.so with libpr13250-1.so"
-   "-shared -Wl,--no-as-needed tmpdir/libpr13250-1.so" "-fPIC"
+   "-shared tmpdir/libpr13250-1.so" "-fPIC"
    {pr13250-2.c} {} "libpr13250-2.so"}
   {"Build libpr13250-3.o"
    "-r -nostdlib" ""
@@ -326,14 +325,14 @@ set build_cxx_tests {
 
 set run_cxx_tests {
     {"Run with libdl3a.so"
-     "-Wl,--no-as-needed tmpdir/libdl3a.so" ""
+     "tmpdir/libdl3a.so" ""
      {dl3main.cc} "dl3a" "dl3a.out" "" "c++"}
 # "-shared -Bsymbolic" only works with gcc 4.5.0 and newer.
 #    {"Run with libdl3b.so"
 #     "tmpdir/libdl3b.so" ""
 #     {dl3main.cc} "dl3b" "dl3b.out" "" "c++"}
     {"Run with libdl3c.so"
-     "-Wl,--no-as-needed tmpdir/libdl3c.so" ""
+     "tmpdir/libdl3c.so" ""
      {dl3main.cc} "dl3c" "dl3a.out" "" "c++"}
     {"Run with libnew1a.so"
      "tmpdir/libnew1a.so" ""
diff --git a/ld/testsuite/ld-elf/warn2.d b/ld/testsuite/ld-elf/warn2.d
index a9c05f9541..95b7ef4999 100644
--- a/ld/testsuite/ld-elf/warn2.d
+++ b/ld/testsuite/ld-elf/warn2.d
@@ -13,5 +13,5 @@
 # construct and that the symbol still appears as expected.
 
 #...
- +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +ABS Foo
+ +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-9] Foo
 #pass
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index c770c6fce9..d1c2228dc9 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -1,6 +1,6 @@
 # Expect script for ld-version tests
 #   Copyright 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-#   2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+#   2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -72,9 +72,7 @@ set SOBJDUMP_FLAGS --syms
 set shared "--shared --no-undefined-version"
 set script --version-script
 
-# Old version of GCC for MIPS default to enabling -fpic
-# and get confused if it is used on the command line.
-if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
+if [istarget mips*-*-*] {
     set picflag ""
 } else {
     # Unfortunately, the gcc argument is -fpic and the cc argument is
@@ -770,9 +768,8 @@ proc build_exec { test source execname flags solibname verexp versymexp symexp }
     pass $test
 }
 
-if { [istarget x86_64-*-linux*] \
-     || ( [istarget mips*-*-linux*] && [at_least_gcc_version 4 3] ) } {
-    # x86_64 and newer MIPS toolchains do not like non-pic shared libraries
+if [istarget x86_64-*-linux*] {
+    # x86_64 doesn't like non-pic shared libraries
     set pic "yes"
 } else {
     set pic "no"
@@ -884,7 +881,7 @@ test_strip_vers_lib "vers14" vers1.so vers14 vers1.ver vers1.dsym
 # try and override something from the library, and we shouldn't get
 # any errors.
 #
-build_exec "vers15" vers15.c vers15 "-Wl,--no-as-needed" vers1.so vers15.ver vers15.dsym vers15.sym
+build_exec "vers15" vers15.c vers15 "" vers1.so vers15.ver vers15.dsym vers15.sym
 
 #
 # Test that when we override a versioned symbol from the library this
diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index 58bc8f2dca..3c6478398c 100644
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -249,8 +249,7 @@ proc visibility_run {visibility} {
 	set VSBCFLAG ""
     }}}}}}}}}
 
-    if { [istarget powerpc*-*-linux*] \
-	 || ( [istarget mips*-*-linux*] && [at_least_gcc_version 4 3] )} {
+    if { [istarget powerpc*-*-linux*] } {
 	# Testing non-PIC libraries is a waste of effort on any target.
 	# If you don't pass -fpic or -fPIC to gcc, gcc will assume quite
 	# reasonably that you are not compiling for a shared library.
@@ -454,9 +453,7 @@ proc visibility_run {visibility} {
     }}
 }
 
-# Old version of GCC for MIPS default to enabling -fpic
-# and get confused if it is used on the command line.
-if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
+if [istarget mips*-*-*] {
     set picflag ""
 } else {
     # Unfortunately, the gcc argument is -fpic and the cc argument is
diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index 1b60b89943..0cc1299351 100644
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -370,9 +370,7 @@ proc build_exec { test execname objs flags dat dynsymexp symexp} {
     pass $test
 }
 
-# Old version of GCC for MIPS default to enabling -fpic
-# and get confused if it is used on the command line.
-if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
+if [istarget mips*-*-*] {
     set picflag ""
 } else {
     # Unfortunately, the gcc argument is -fpic and the cc argument is
diff --git a/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp
index d8d34fa6e8..b7d6dffd90 100644
--- a/ld/testsuite/ld-gc/gc.exp
+++ b/ld/testsuite/ld-gc/gc.exp
@@ -97,20 +97,6 @@ test_gc "Check --gc-section/-r/-u" "gcrel" $ld "-r --gc-sections -u used_func"
 run_dump_test "noent"
 run_dump_test "abi-note"
 run_dump_test "start"
-
-if { [is_elf_format] && [check_shared_lib_support] } then {
-    set gasopt ""
-    if { [istarget tic6x-*] } then {
-	set gasopt "-mpic -mpid=near"
-    }
-    if {![ld_assemble_flags $as $gasopt $srcdir/$subdir/libpersonality.s tmpdir/libpersonality.o]
-	|| ![ld_simple_link $ld tmpdir/libpersonality.so "-shared tmpdir/libpersonality.o"] } then {
-	fail libpersonality
-    } else {
-	run_dump_test "personality"
-    }
-}
-
 if { [is_remote host] || [which $CC] != 0 } {
     if { [istarget "*-*-linux*"]
 	 || [istarget "*-*-gnu*"] } {
@@ -120,8 +106,3 @@ if { [is_remote host] || [which $CC] != 0 } {
 	run_dump_test "pr11218"
     }
 }
-
-if { [is_remote host] || [which $CC] != 0 } {
-	ld_compile "$CC $CFLAGS $cflags" $srcdir/$subdir/pr13683.c tmpdir/pr13683.o
-	run_dump_test "pr13683"
-}
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index ff9db9829e..68b71fbcba 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -194,8 +194,6 @@ run_dump_test "hidden3"
 run_dump_test "protected1"
 run_dump_test "protected2"
 run_dump_test "protected3"
-run_dump_test "protected4"
-run_dump_test "protected5"
 run_dump_test "tlspie1"
 run_dump_test "tlspie2"
 run_dump_test "nogot1"
@@ -212,4 +210,3 @@ if { !([istarget "i?86-*-linux*"]
 
 run_dump_test "compressed1"
 run_dump_test "pr12627"
-run_dump_test "pr13302"
diff --git a/ld/testsuite/ld-i386/tlsbindesc.dd b/ld/testsuite/ld-i386/tlsbindesc.dd
index 79a26d1667..db547644f2 100644
--- a/ld/testsuite/ld-i386/tlsbindesc.dd
+++ b/ld/testsuite/ld-i386/tlsbindesc.dd
@@ -223,7 +223,8 @@ Disassembly of section .text:
  [0-9a-f]+:	8b 5d fc[ 	]+mov    -0x4\(%ebp\),%ebx
  [0-9a-f]+:	c9[ 	]+leave *
  [0-9a-f]+:	c3[ 	]+ret *
- [0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
+ [0-9a-f]+:	90[ 	]+nop *
+ [0-9a-f]+:	90[ 	]+nop *
 
 [0-9a-f]+ <_start>:
  [0-9a-f]+:	55[ 	]+push   %ebp
diff --git a/ld/testsuite/ld-i386/tlsnopic.dd b/ld/testsuite/ld-i386/tlsnopic.dd
index 027d2882ca..995cdaa1b9 100644
--- a/ld/testsuite/ld-i386/tlsnopic.dd
+++ b/ld/testsuite/ld-i386/tlsnopic.dd
@@ -156,5 +156,6 @@ Disassembly of section .text:
     10ec:	8b 5d fc[ 	]+mov    -0x4\(%ebp\),%ebx
     10ef:	c9[ 	]+leave *
     10f0:	c3[ 	]+ret *
-    10f1:	66 90[ 	]+xchg   %ax,%ax
-    10f3:	90[ 	]+nop
+    10f1:	90[ 	]+nop *
+    10f2:	90[ 	]+nop *
+    10f3:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-i386/tlspic.dd b/ld/testsuite/ld-i386/tlspic.dd
index ace06e6e8f..b0c046d9ef 100644
--- a/ld/testsuite/ld-i386/tlspic.dd
+++ b/ld/testsuite/ld-i386/tlspic.dd
@@ -406,5 +406,6 @@ Disassembly of section .text:
  [0-9a-f]+:	8b 5d fc[ 	]+mov    -0x4\(%ebp\),%ebx
  [0-9a-f]+:	c9[ 	]+leave *
  [0-9a-f]+:	c3[ 	]+ret *
- [0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
- [0-9a-f]+:	90[ 	]+nop
+ [0-9a-f]+:	90[ 	]+nop *
+ [0-9a-f]+:	90[ 	]+nop *
+ [0-9a-f]+:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-m68hc11/adj-brset.d b/ld/testsuite/ld-m68hc11/adj-brset.d
index a6306cf67a..f1788f7fec 100644
--- a/ld/testsuite/ld-m68hc11/adj-brset.d
+++ b/ld/testsuite/ld-m68hc11/adj-brset.d
@@ -1,7 +1,8 @@
 #source: adj-brset.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32\-m68hc11
 
diff --git a/ld/testsuite/ld-m68hc11/adj-jump.d b/ld/testsuite/ld-m68hc11/adj-jump.d
index da181bdbab..be87524717 100644
--- a/ld/testsuite/ld-m68hc11/adj-jump.d
+++ b/ld/testsuite/ld-m68hc11/adj-jump.d
@@ -1,7 +1,8 @@
 #source: adj-jump.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32\-m68hc11
 
diff --git a/ld/testsuite/ld-m68hc11/bug-1403.d b/ld/testsuite/ld-m68hc11/bug-1403.d
index dfd69b083e..c643cd1678 100644
--- a/ld/testsuite/ld-m68hc11/bug-1403.d
+++ b/ld/testsuite/ld-m68hc11/bug-1403.d
@@ -1,7 +1,8 @@
 #source: bug-1403.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32-m68hc11
 
diff --git a/ld/testsuite/ld-m68hc11/bug-1417.d b/ld/testsuite/ld-m68hc11/bug-1417.d
index 1947506f42..84b3ad45d8 100644
--- a/ld/testsuite/ld-m68hc11/bug-1417.d
+++ b/ld/testsuite/ld-m68hc11/bug-1417.d
@@ -1,7 +1,8 @@
 #source: bug-1417.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32-m68hc11
 
diff --git a/ld/testsuite/ld-m68hc11/bug-3331.d b/ld/testsuite/ld-m68hc11/bug-3331.d
index cee93ab656..91050bf7e1 100644
--- a/ld/testsuite/ld-m68hc11/bug-3331.d
+++ b/ld/testsuite/ld-m68hc11/bug-3331.d
@@ -1,7 +1,8 @@
 #source: bug-3331.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32-m68hc11
 
diff --git a/ld/testsuite/ld-m68hc11/far-hc11.d b/ld/testsuite/ld-m68hc11/far-hc11.d
index d563356ae1..e38051114f 100644
--- a/ld/testsuite/ld-m68hc11/far-hc11.d
+++ b/ld/testsuite/ld-m68hc11/far-hc11.d
@@ -2,30 +2,31 @@
 #as: -m68hc11
 #ld: -m m68hc11elf
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*:     file format elf32-m68hc11
 
 Disassembly of section .text:
 0+8000 <tramp._far_foo> pshb
 0+8001 <tramp._far_foo\+0x1> ldab	\#0
-0+8003 <tramp._far_foo\+0x3> ldy	\#0+8072 <_far_foo>
+0+8003 <tramp._far_foo\+0x3> ldy	\#0+6c <_far_foo>
 0+8007 <tramp._far_foo\+0x7> jmp	0+8056 <__far_trampoline>
 0+800a <tramp._far_bar> pshb
 0+800b <tramp._far_bar\+0x1> ldab	\#0
-0+800d <tramp._far_bar\+0x3> ldy	\#0+806a .*
+0+800d <tramp._far_bar\+0x3> ldy	\#0+64 <stack>
 0+8011 <tramp._far_bar\+0x7> jmp	0+8056 <__far_trampoline>
 0+8014 <_start> lds	\#0+64 <stack>
-0+8017 <_start\+0x3> ldx	\#0+abcd .*
+0+8017 <_start\+0x3> ldx	\#0+abcd <__data_image\+0x2b63>
 0+801a <_start\+0x6> pshx
-0+801b <_start\+0x7> ldd	\#0+1234 .*
-0+801e <_start\+0xa> ldx	\#0+5678 .*
+0+801b <_start\+0x7> ldd	\#0+1234 <__data_section_start\+0x134>
+0+801e <_start\+0xa> ldx	\#0+5678 <__data_section_start\+0x4578>
 0+8021 <_start\+0xd> jsr	0+800a <tramp._far_bar>
-0+8024 <_start\+0x10> cpx	\#0+1234 .*
+0+8024 <_start\+0x10> cpx	\#0+1234 <__data_section_start\+0x134>
 0+8027 <_start\+0x13> bne	0+804e <fail>
-0+8029 <_start\+0x15> cpd	\#0+5678 .*
+0+8029 <_start\+0x15> cpd	\#0+5678 <__data_section_start\+0x4578>
 0+802d <_start\+0x19> bne	0+804e <fail>
 0+802f <_start\+0x1b> pulx
-0+8030 <_start\+0x1c> cpx	\#0+abcd .*
+0+8030 <_start\+0x1c> cpx	\#0+abcd <__data_image\+0x2b63>
 0+8033 <_start\+0x1f> bne	0+804e <fail>
 0+8035 <_start\+0x21> ldd	\#0+8000 <tramp._far_foo>
 0+8038 <_start\+0x24> xgdx
@@ -34,7 +35,7 @@ Disassembly of section .text:
 0+803e <_start\+0x2a> xgdy
 0+8040 <_start\+0x2c> jsr	0,y
 0+8043 <_start\+0x2f> ldaa	\#0
-0+8045 <_start\+0x31> ldy	\#0+8079 <_far_no_tramp>
+0+8045 <_start\+0x31> ldy	\#0+73 <_far_no_tramp>
 0+8049 <_start\+0x35> bsr	0+8066 <__call_a16>
 0+804b <_start\+0x37> clra
 0+804c <_start\+0x38> clrb
@@ -58,15 +59,15 @@ Disassembly of section .text:
 0+8066 <__call_a16> psha
 0+8067 <__call_a16\+0x1> jmp	0,y
 Disassembly of section .bank1:
-0+806a <_far_bar> jsr	0+8071 <local_bank1>
-0+806d <_far_bar\+0x3> xgdx
-0+806e <_far_bar\+0x4> jmp	0+8054 <__return>
-0+8071 <local_bank1> rts
+0+64 <_far_bar> jsr	0+6b <local_bank1>
+0+67 <_far_bar\+0x3> xgdx
+0+68 <_far_bar\+0x4> jmp	0+8054 <__return>
+0+6b <local_bank1> rts
 Disassembly of section .bank2:
-0+8072 <_far_foo> jsr	0+8078 <local_bank2>
-0+8075 <_far_foo\+0x3> jmp	0+8054 <__return>
-0+8078 <local_bank2> rts
+0+6c <_far_foo> jsr	0+72 <local_bank2>
+0+6f <_far_foo\+0x3> jmp	0+8054 <__return>
+0+72 <local_bank2> rts
 Disassembly of section .bank3:
-0+8079 <_far_no_tramp> jsr	0+807f <local_bank3>
-0+807c <_far_no_tramp\+0x3> jmp	0+8054 <__return>
-0+807f <local_bank3> rts
+0+73 <_far_no_tramp> jsr	0+79 <local_bank3>
+0+76 <_far_no_tramp\+0x3> jmp	0+8054 <__return>
+0+79 <local_bank3> rts
diff --git a/ld/testsuite/ld-m68hc11/far-hc12.d b/ld/testsuite/ld-m68hc11/far-hc12.d
index 09b3fec171..304ae870ed 100644
--- a/ld/testsuite/ld-m68hc11/far-hc12.d
+++ b/ld/testsuite/ld-m68hc11/far-hc12.d
@@ -2,6 +2,7 @@
 #as: -m68hc12
 #ld: -m m68hc12elf --script $srcdir/$subdir/far-hc12.ld
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*:     file format elf32\-m68hc12
 
diff --git a/ld/testsuite/ld-m68hc11/link-hcs12.d b/ld/testsuite/ld-m68hc11/link-hcs12.d
index d90fcf6cda..f243da2460 100644
--- a/ld/testsuite/ld-m68hc11/link-hcs12.d
+++ b/ld/testsuite/ld-m68hc11/link-hcs12.d
@@ -3,12 +3,17 @@
 #as: -mshort
 #ld: -m m68hc12elf
 #objdump: -p -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*:     file format elf32\-m68hc12
 
 Program Header:
+    LOAD off    0x0+ vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*12
+         filesz 0x0+100 memsz 0x0+100 flags rw-
     LOAD off    0x0+1000 vaddr 0x0+8000 paddr 0x0+8000 align 2\*\*12
          filesz 0x0+6 memsz 0x0+6 flags r-x
+    LOAD off    0x0+1100 vaddr 0x0+1100 paddr 0x0+8006 align 2\*\*12
+         filesz 0x0+ memsz 0x0+ flags rw-
 private flags = 22:\[abi=16\-bit int, 64\-bit double, cpu=HCS12\] \[memory=flat\]
 
 Disassembly of section .text:
diff --git a/ld/testsuite/ld-m68hc11/m68hc11.exp b/ld/testsuite/ld-m68hc11/m68hc11.exp
index d673bc023d..103b792504 100644
--- a/ld/testsuite/ld-m68hc11/m68hc11.exp
+++ b/ld/testsuite/ld-m68hc11/m68hc11.exp
@@ -1,5 +1,5 @@
 # Expect script for run_dump_test based ld-m68hc11 tests.
-#   Copyright 2002, 2005, 2007, 2012 Free Software Foundation, Inc.
+#   Copyright 2002, 2005, 2007 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -22,8 +22,7 @@
 
 # Test 68HC11 relaxing.  This tests the assembler as well as the linker.
 
-if { ![istarget m6811-*-*] && ![istarget m6812-*-*]
-     && ![istarget m68hc11-*-*] && ![istarget m68hc12-*-*] } {
+if { ![istarget m6811-*-*] && ![istarget m6812-*-*] } {
     return
 }
 
diff --git a/ld/testsuite/ld-m68hc11/relax-direct.d b/ld/testsuite/ld-m68hc11/relax-direct.d
index 3de3d9a8d6..9bd0822a9d 100644
--- a/ld/testsuite/ld-m68hc11/relax-direct.d
+++ b/ld/testsuite/ld-m68hc11/relax-direct.d
@@ -1,7 +1,8 @@
 #source: relax-direct.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32-m68hc11
 
diff --git a/ld/testsuite/ld-m68hc11/relax-group.d b/ld/testsuite/ld-m68hc11/relax-group.d
index 25ac588e57..baf294b489 100644
--- a/ld/testsuite/ld-m68hc11/relax-group.d
+++ b/ld/testsuite/ld-m68hc11/relax-group.d
@@ -1,7 +1,8 @@
 #source: relax-group.s
 #as: -m68hc11
-#ld: -m m68hc11elf --relax
+#ld: --relax
 #objdump: -d --prefix-addresses -r
+#target: m6811-*-* m6812-*-*
 
 .*: +file format elf32-m68hc11
 
diff --git a/ld/testsuite/ld-m68k/m68k.exp b/ld/testsuite/ld-m68k/m68k.exp
index 843d9196c4..198a5e2078 100644
--- a/ld/testsuite/ld-m68k/m68k.exp
+++ b/ld/testsuite/ld-m68k/m68k.exp
@@ -1,5 +1,5 @@
 # Expect script for run_dump_test based ld-m68k tests.
-#   Copyright 2006, 2007, 2008, 2009, 2012 Free Software Foundation, Inc.
+#   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -85,7 +85,7 @@ if { [istarget m68k-*-linux*] } then {
 	    {{nm -ngD tls-gd-1.d2} {readelf -d tls-gd-1.d3}}
 	    "tls-gd-1.so"}
 	{"TLS indirect symbol use"
-	    "--copy-dt-needed-entries tmpdir/tls-gd-1.so -rpath-link ./" "" {tls-main-1.s}
+	    "tmpdir/tls-gd-1.so -rpath-link ./" "" {tls-main-1.s}
 	    {{readelf -d tls-main-1.d}}
 	    "tls-main-1"}}
 
diff --git a/ld/testsuite/ld-mips-elf/multi-got-1.d b/ld/testsuite/ld-mips-elf/multi-got-1.d
index 810a263a8c..15f04b2a02 100644
--- a/ld/testsuite/ld-mips-elf/multi-got-1.d
+++ b/ld/testsuite/ld-mips-elf/multi-got-1.d
@@ -18,7 +18,7 @@ Dynamic section at offset .* contains 17 entries:
  0x00000013 \(RELENT\)                     8 \(bytes\)
  0x70000001 \(MIPS_RLD_VERSION\)           1
  0x70000005 \(MIPS_FLAGS\)                 NOTPOT
- 0x70000006 \(MIPS_BASE_ADDRESS\)          0x0
+ 0x70000006 \(MIPS_BASE_ADDRESS\)          0
  0x7000000a \(MIPS_LOCAL_GOTNO\)           2
  0x70000011 \(MIPS_SYMTABNO\)              [0-9]+
  0x70000012 \(MIPS_UNREFEXTNO\)            [0-9]+
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
index 47c05bf09a..7efa5d15d0 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
@@ -19,7 +19,7 @@ Disassembly of section \.plt:
 .*:	ddd91000 	ld	t9,4096\(t2\)
 .*:	25ce1000 	addiu	t2,t2,4096
 .*:	030ec023 	subu	t8,t8,t2
-.*:	03e0782d 	move	t3,ra
+.*:	03e07821 	move	t3,ra
 .*:	0018c0c2 	srl	t8,t8,0x3
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
diff --git a/ld/testsuite/ld-mips-elf/textrel-1.d b/ld/testsuite/ld-mips-elf/textrel-1.d
index b0615b5712..16bd727f28 100644
--- a/ld/testsuite/ld-mips-elf/textrel-1.d
+++ b/ld/testsuite/ld-mips-elf/textrel-1.d
@@ -17,7 +17,7 @@ Dynamic section at offset .* contains 17 entries:
  0x00000013 \(RELENT\)                     8 \(bytes\)
  0x70000001 \(MIPS_RLD_VERSION\)           1
  0x70000005 \(MIPS_FLAGS\)                 NOTPOT
- 0x70000006 \(MIPS_BASE_ADDRESS\)          0x0
+ 0x70000006 \(MIPS_BASE_ADDRESS\)          0
  0x7000000a \(MIPS_LOCAL_GOTNO\)           [0-9]*
  0x70000011 \(MIPS_SYMTABNO\)              [0-9]*
  0x70000012 \(MIPS_UNREFEXTNO\)            [0-9]*
diff --git a/ld/testsuite/ld-mips-elf/tls-multi-got-1.r b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
index 14a12d629c..a51abf10f4 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
@@ -12,7 +12,7 @@ Dynamic section at offset .* contains 18 entries:
  0x00000013 \(RELENT\)                     8 \(bytes\)
  0x70000001 \(MIPS_RLD_VERSION\)           1
  0x70000005 \(MIPS_FLAGS\)                 NOTPOT
- 0x70000006 \(MIPS_BASE_ADDRESS\)          0x0
+ 0x70000006 \(MIPS_BASE_ADDRESS\)          0
  0x7000000a \(MIPS_LOCAL_GOTNO\)           2
  0x70000011 \(MIPS_SYMTABNO\)              20013
  0x70000012 \(MIPS_UNREFEXTNO\)            10
diff --git a/ld/testsuite/ld-powerpc/vxworks-relax.rd b/ld/testsuite/ld-powerpc/vxworks-relax.rd
index 572c74ddf4..e28094c0c1 100644
--- a/ld/testsuite/ld-powerpc/vxworks-relax.rd
+++ b/ld/testsuite/ld-powerpc/vxworks-relax.rd
@@ -1,9 +1,9 @@
 
-Relocation section '.rela.text' at offset .* contains 6 entries:
+Relocation section '.rela.text' at offset 0x4010150 contains 6 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-00080012  .* R_PPC_ADDR16_HA   00080000   .text \+ 4000020
-00080016  .* R_PPC_ADDR16_LO   00080000   .text \+ 4000020
-00080006  .* R_PPC_ADDR16_HA   00080000   .text \+ 4000020
-0008000a  .* R_PPC_ADDR16_LO   00080000   .text \+ 4000020
-0408002a  .* R_PPC_ADDR16_HA   00080000   _start \+ 0
-0408002e  .* R_PPC_ADDR16_LO   00080000   _start \+ 0
+00080012  00000106 R_PPC_ADDR16_HA   00080000   .text \+ 4000020
+00080016  00000104 R_PPC_ADDR16_LO   00080000   .text \+ 4000020
+00080006  00000106 R_PPC_ADDR16_HA   00080000   .text \+ 4000020
+0008000a  00000104 R_PPC_ADDR16_LO   00080000   .text \+ 4000020
+0408002a  00000306 R_PPC_ADDR16_HA   00080000   _start \+ 0
+0408002e  00000304 R_PPC_ADDR16_LO   00080000   _start \+ 0
diff --git a/ld/testsuite/ld-scripts/phdrs.exp b/ld/testsuite/ld-scripts/phdrs.exp
index b7f3682afd..c4e56995d7 100644
--- a/ld/testsuite/ld-scripts/phdrs.exp
+++ b/ld/testsuite/ld-scripts/phdrs.exp
@@ -60,14 +60,6 @@ if ![ld_simple_link $ld tmpdir/phdrs $ldopt] {
     set exec_output [prune_warnings $exec_output]
     verbose -log $exec_output
 
-    # The RX port sets the p_paddr of loadable segments to 0 in order
-    # to be compatible with Renesas tools.  When an RX executable is
-    # loaded into a BFD based tool the code tries to reconstruct the
-    # correct vaddr and paddr values.  This is not always possible
-    # however and this test is one example of where the reconstruction
-    # fails.
-    setup_xfail rx-*-*
-    
     if [regexp $phdrs_regexp $exec_output] {
 	pass $testname
     } else {
diff --git a/ld/testsuite/ld-selective/sel-dump.exp b/ld/testsuite/ld-selective/sel-dump.exp
index d9ac24b68d..c78bd6ea03 100644
--- a/ld/testsuite/ld-selective/sel-dump.exp
+++ b/ld/testsuite/ld-selective/sel-dump.exp
@@ -20,7 +20,7 @@
 
 # Test for ELF here, so we don't have to qualify on ELF specifically
 # in every .d-file.
-if { ![is_elf_format] || ![check_gc_sections_available] } {
+if ![is_elf_format] {
     return
 }
 
@@ -28,5 +28,8 @@ set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 for { set i 0 } { $i < [llength $test_list] } { incr i } {
     # We need to strip the ".d", but can leave the dirname.
     verbose [file rootname [lindex $test_list $i]]
+    setup_xfail "am33*-*" "arc*-*" "d30v*-*" "dlx*-*"
+    setup_xfail "hppa*64-*-*" "i370*-*" "i860*-*" "i960*-*" "ia64*-*"
+    setup_xfail "m88*-*" "mn10200-*" "mep-*" "or32-*" "pj-*"
     run_dump_test [file rootname [lindex $test_list $i]]
 }
diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
index 23c23dd825..d4d30ecc9e 100644
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -23,7 +23,19 @@
 # Make sure that constructors are handled correctly.
 
 # Only ELF based ports support selective linking
-if { ![is_elf_format] || ![check_gc_sections_available] } {
+if ![is_elf_format] {
+    return
+}
+
+# These targets do not support selective linking
+if {[istarget "am33*-*-*"] ||
+    [istarget "arc-*-*"] || [istarget "d30v-*-*"] ||
+    [istarget "dlx-*-*"] || [istarget "hppa*64*-*-*"] ||
+    [istarget "i370-*-*"] || [istarget "i860-*-*"] ||
+    [istarget "i960-*-*"] || [istarget "ia64-*-*"] ||
+    [istarget "m88*-*-*"] || [istarget "mn10200-*-*"] ||
+    [istarget "mep-*-*"] || [istarget "or32-*-*"] ||
+    [istarget "pj*-*-*"]} {
     return
 }
 
@@ -89,6 +101,8 @@ foreach testitem $seltests {
     foreach xfail_target $xfails {
 	setup_xfail $xfail_target
     }
+    setup_xfail "arc*-*" "d30v*-*" "dlx*-*" "i370*-*" "i860*-*"
+    setup_xfail "i960*-*" "mn10200-*" "or32-*" "pj-*"
 
     # It's either C or C++ at the moment.
     if { $testtype == "C++" } {
@@ -141,7 +155,7 @@ foreach testitem $seltests {
     }
 
     # m6811/m6812 code has references to soft registers.
-    if {[istarget m6811-*-*] || [istarget m6812-*-*] || [istarget m68hc1*-*-*]} {
+    if {[istarget m6811-*-*] || [istarget m6812-*-*]} {
 	set objfile "$objfile --defsym _.frame=0 --defsym _.d1=0"
 	set objfile "$objfile --defsym _.d2=0"
     }
diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
index c31ac7da28..1d25d51c92 100644
--- a/ld/testsuite/ld-shared/shared.exp
+++ b/ld/testsuite/ld-shared/shared.exp
@@ -181,9 +181,7 @@ proc shared_test { progname testname main sh1 sh2 dat args } {
     pass "$testname"
 }
 
-# Old version of GCC for MIPS default to enabling -fpic
-# and get confused if it is used on the command line.
-if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
+if [istarget mips*-*-*] {
     set picflag ""
 } else {
     # Unfortunately, the gcc argument is -fpic and the cc argument is
diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index 5e741e09cc..25dfb067f6 100644
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -270,12 +270,6 @@ proc run_srec_test { test objs } {
 	set flags "$flags --no-toc-optimize"
     }
 
-    # Epiphany needs some help too
-    if [istarget epiphany*-*-*] {
-	set flags "$flags --defsym _start=00000060"
-	setup_xfail "epiphany*-*-*"
-    }
-
     if { ![ld_simple_link $ld tmpdir/sr1 "$flags $objs"] \
 	 || ![ld_simple_link $ld tmpdir/sr2.sr "$flags --oformat srec $objs"] } {
 	fail $test
diff --git a/ld/testsuite/ld-tilegx/reloc.d b/ld/testsuite/ld-tilegx/reloc.d
new file mode 100644
index 0000000000..c9acdac37d
--- /dev/null
+++ b/ld/testsuite/ld-tilegx/reloc.d
@@ -0,0 +1,70 @@
+
+.*:     file format elf64-tilegx.*
+
+Contents of section .text:
+ 100b0 .*
+ 100c0 .*
+ 100d0 .*
+ 100e0 .*
+ 100f0 .*
+ 10100 .*
+ 10110 .*
+ 10120 .*
+ 10130 .*
+ 10140 .*
+ 10150 .*
+ 10160 .*
+ 10170 .*
+ 10180 .*
+ 10190 .*
+ 101a0 .*
+ 101b0 .*
+ 101c0 .*
+Contents of section .data:
+ 201e0 b8010100 c0010100 7a82644b 11773200  .*
+ 201f0 00002e00 2c7a8234 12785634 127856bc  .*
+ 20200 9a341278 56bc9af0 de000000 00000000  .*
+ 20210 00000000 00000000 00000000 00000000  .*
+
+Disassembly of section .text:
+
+00000000000100b0 <_start>:
+   100b0:	[0-9a-f]* 	{ add r2, zero, zero }
+   100b8:	[0-9a-f]* 	{ j 101b8 <external1> }
+   100c0:	[0-9a-f]* 	{ add r3, r2, r2 }
+   100c8:	[0-9a-f]* 	{ beqzt zero, 101c0 <external2> }
+   100d0:	[0-9a-f]* 	{ movei r2, 17 ; movei r3, 119 }
+   100d8:	[0-9a-f]* 	{ movei r2, 17 ; movei r3, 119 ; ld zero, zero }
+   100e0:	[0-9a-f]* 	{ mtspr 17, zero }
+   100e8:	[0-9a-f]* 	{ mfspr zero, 17 }
+   100f0:	[0-9a-f]* 	{ moveli r2, -32134 ; moveli r3, 19300 }
+   100f8:	[0-9a-f]* 	{ moveli r2, 4660 ; moveli r3, -30293 }
+   10100:	[0-9a-f]* 	{ shl16insli r2, r2, 22136 ; shl16insli r3, r3, -12816 }
+   10108:	[0-9a-f]* 	{ moveli r2, 4660 ; moveli r3, 30292 }
+   10110:	[0-9a-f]* 	{ shl16insli r2, r2, 22136 ; shl16insli r3, r3, 12816 }
+   10118:	[0-9a-f]* 	{ shl16insli r2, r2, -25924 ; shl16insli r3, r3, -292 }
+   10120:	[0-9a-f]* 	{ moveli r2, 4660 ; moveli r3, -292 }
+   10128:	[0-9a-f]* 	{ shl16insli r2, r2, 22136 ; shl16insli r3, r3, -17768 }
+   10130:	[0-9a-f]* 	{ shl16insli r2, r2, -25924 ; shl16insli r3, r3, 30292 }
+   10138:	[0-9a-f]* 	{ shl16insli r2, r2, -8464 ; shl16insli r3, r3, 12816 }
+   10140:	[0-9a-f]* 	{ ld_add r0, r0, 17 }
+   10148:	[0-9a-f]* 	{ st_add r0, r0, 17 }
+   10150:	[0-9a-f]* 	{ mm r2, r3, 19, 31 }
+   10158:	[0-9a-f]* 	{ shli r2, r3, 19 ; shli r4, r5, 31 }
+   10160:	[0-9a-f]* 	{ shli r2, r3, 19 ; shli r4, r5, 31 ; ld zero, zero }
+   10168:	[0-9a-f]* 	{ moveli r0, 80 ; moveli r1, 80 }
+   10170:	[0-9a-f]* 	{ moveli r0, 1 ; moveli r1, 1 }
+   10178:	[0-9a-f]* 	{ moveli r0, 168 ; moveli r1, 168 }
+   10180:	[0-9a-f]* 	{ moveli r0, 4096 ; moveli r1, 4096 }
+   10188:	[0-9a-f]* 	{ moveli r0, 1 ; moveli r1, 1 }
+   10190:	[0-9a-f]* 	{ moveli r0, 144 ; moveli r1, 144 }
+   10198:	[0-9a-f]* 	{ moveli r0, 4096 ; moveli r1, 4096 }
+   101a0:	[0-9a-f]* 	{ moveli r0, 0 ; moveli r1, 0 }
+   101a8:	[0-9a-f]* 	{ moveli r0, 1 ; moveli r1, 1 }
+   101b0:	[0-9a-f]* 	{ moveli r0, 112 ; moveli r1, 112 }
+
+00000000000101b8 <external1>:
+   101b8:	[0-9a-f]* 	{ j 101b8 <external1> }
+
+00000000000101c0 <external2>:
+   101c0:	[0-9a-f]* 	{ j 101b8 <external1> }
diff --git a/ld/testsuite/ld-tilegx/tilegx.exp b/ld/testsuite/ld-tilegx/tilegx.exp
index fbc80a2b1c..856b41ecb9 100644
--- a/ld/testsuite/ld-tilegx/tilegx.exp
+++ b/ld/testsuite/ld-tilegx/tilegx.exp
@@ -24,21 +24,14 @@ if {!([istarget "tilegx-*-*"]) } {
 
 # Set up a list as described in ld-lib.exp
 
-set tilegx_tests {
-    {   "tilegx little-endian relocation resolution linker test"
-        "-EL"
-        "-EL"
+set tilepro_tests {
+    {   "tilegx relocation resolution linker test"
+        ""
+        ""
         { "reloc.s" "external.s" }
-        { {objdump -ds reloc-le.d} }
-        "reloc"
-    }
-    {   "tilegx big-endian relocation resolution linker test"
-        "-EB"
-        "-EB"
-        { "reloc.s" "external.s" }
-        { {objdump -ds reloc-be.d} }
+        { {objdump -ds reloc.d} }
         "reloc"
     }
 }
 
-run_ld_link_tests $tilegx_tests
+run_ld_link_tests $tilepro_tests
diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d
index 92d8a67e7b..84dc7b250e 100644
--- a/ld/testsuite/ld-x86-64/ilp32-4.d
+++ b/ld/testsuite/ld-x86-64/ilp32-4.d
@@ -1,30 +1,36 @@
+#source: start.s
 #as: --x32
 #ld: -m elf32_x86_64 -shared --no-ld-generated-unwind-info
 #readelf: -d -S --wide
 
-There are 9 section headers, starting at offset 0x1d8:
+There are 10 section headers, starting at offset 0x22c:
 
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
-  \[ 1\] .hash             HASH            00000094 000094 00002c 04   A  2   0  4
-  \[ 2\] .dynsym           DYNSYM          000000c0 0000c0 000060 10   A  3   2  4
-  \[ 3\] .dynstr           STRTAB          00000120 000120 000019 00   A  0   0  1
-  \[ 4\] .text             PROGBITS        0000013c 00013c 000001 00  AX  0   0  4
-  \[ 5\] .dynamic          DYNAMIC         00200140 000140 000058 08  WA  3   0  4
-  \[ 6\] .shstrtab         STRTAB          00000000 000198 000040 00      0   0  1
-  \[ 7\] .symtab           SYMTAB          00000000 000340 0000c0 10      8   8  4
-  \[ 8\] .strtab           STRTAB          00000000 000400 00003f 00      0   0  1
+  \[ 1\] .hash             HASH            00000094 000094 000030 04   A  2   0  4
+  \[ 2\] .dynsym           DYNSYM          000000c4 0000c4 000070 10   A  3   2  4
+  \[ 3\] .dynstr           STRTAB          00000134 000134 00001d 00   A  0   0  1
+  \[ 4\] .rela.dyn         RELA            00000154 000154 00000c 0c   A  2   0  4
+  \[ 5\] .text             PROGBITS        00000160 000160 000005 00  AX  0   0  4
+  \[ 6\] .dynamic          DYNAMIC         00200168 000168 000078 08  WA  3   0  4
+  \[ 7\] .shstrtab         STRTAB          00000000 0001e0 00004a 00      0   0  1
+  \[ 8\] .symtab           SYMTAB          00000000 0003bc 0000e0 10      9   9  4
+  \[ 9\] .strtab           STRTAB          00000000 00049c 000043 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
   O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
 
-Dynamic section at offset 0x140 contains 6 entries:
+Dynamic section at offset 0x168 contains 10 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x94
- 0x00000005 \(STRTAB\)                     0x120
- 0x00000006 \(SYMTAB\)                     0xc0
- 0x0000000a \(STRSZ\)                      25 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x134
+ 0x00000006 \(SYMTAB\)                     0xc4
+ 0x0000000a \(STRSZ\)                      29 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
+ 0x00000007 \(RELA\)                       0x154
+ 0x00000008 \(RELASZ\)                     12 \(bytes\)
+ 0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x00000016 \(TEXTREL\)                    0x0
  0x00000000 \(NULL\)                       0x0
diff --git a/ld/testsuite/ld-x86-64/ilp32-5.d b/ld/testsuite/ld-x86-64/ilp32-5.d
index 4870c2b518..e4673e52b2 100644
--- a/ld/testsuite/ld-x86-64/ilp32-5.d
+++ b/ld/testsuite/ld-x86-64/ilp32-5.d
@@ -4,5 +4,5 @@
 
 #...
 [0-9a-f]+ +[0-9a-f]+ +R_X86_64_RELATIVE +[0-9a-f]+
-[0-9a-f]+ +[0-9a-f]+ +R_X86_64_GLOB_DAT +[0-9a-f]+ +foo \+ 0
+[0-9a-f]+ +[0-9a-f]+ +R_X86_64_PC32 +[0-9a-f]+ +foo - 4
 [0-9a-f]+ +[0-9a-f]+ +R_X86_64_32 +[0-9a-f]+ +foo \+ 0
diff --git a/ld/testsuite/ld-x86-64/ilp32-5.s b/ld/testsuite/ld-x86-64/ilp32-5.s
index ef0c60e3a0..0d97807395 100644
--- a/ld/testsuite/ld-x86-64/ilp32-5.s
+++ b/ld/testsuite/ld-x86-64/ilp32-5.s
@@ -1,6 +1,6 @@
 	.globl bar
 bar:
-	mov foo@GOTPCREL(%rip), %rax
+	mov foo(%rip), %rax
 
 	.data
 xxx:
diff --git a/ld/testsuite/ld-x86-64/tlsbin.dd b/ld/testsuite/ld-x86-64/tlsbin.dd
index e0287530ca..5bb59791e2 100644
--- a/ld/testsuite/ld-x86-64/tlsbin.dd
+++ b/ld/testsuite/ld-x86-64/tlsbin.dd
@@ -174,7 +174,9 @@ Disassembly of section .text:
   401136:	90[ 	]+nop *
   401137:	c9[ 	]+leaveq *
   401138:	c3[ 	]+retq *
-  401139:	0f 1f 00[ 	]+nopl   \(%rax\)
+  401139:	90[ 	]+nop *
+  40113a:	90[ 	]+nop *
+  40113b:	90[ 	]+nop *
 
 0+40113c <_start>:
   40113c:	55[ 	]+push   %rbp
diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.dd b/ld/testsuite/ld-x86-64/tlsbindesc.dd
index 03f0169abf..b1cfacba83 100644
--- a/ld/testsuite/ld-x86-64/tlsbindesc.dd
+++ b/ld/testsuite/ld-x86-64/tlsbindesc.dd
@@ -165,7 +165,9 @@ Disassembly of section .text:
   [0-9a-f]+:	90[ 	]+nop *
   [0-9a-f]+:	c9[ 	]+leaveq *
   [0-9a-f]+:	c3[ 	]+retq *
-  [0-9a-f]+:	0f 1f 00[ 	]+nopl   \(%rax\)
+  [0-9a-f]+:	90[ 	]+nop *
+  [0-9a-f]+:	90[ 	]+nop *
+  [0-9a-f]+:	90[ 	]+nop *
 
 [0-9a-f]+ <_start>:
   [0-9a-f]+:	55[ 	]+push   %rbp
diff --git a/ld/testsuite/ld-x86-64/tlspic.dd b/ld/testsuite/ld-x86-64/tlspic.dd
index 0c474a9211..6f55456d82 100644
--- a/ld/testsuite/ld-x86-64/tlspic.dd
+++ b/ld/testsuite/ld-x86-64/tlspic.dd
@@ -226,4 +226,5 @@ Disassembly of section .text:
  +11a7:	90[ 	]+nop *
  +11a8:	c9[ 	]+leaveq *
  +11a9:	c3[ 	]+retq *
- +11aa:	66 90[ 	]+xchg   %ax,%ax
+ +11aa:	90[ 	]+nop *
+ +11ab:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index c258251853..77b081ba46 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -111,10 +111,6 @@ set x86_64tests {
     {"TLS X32 LD->LE transition" "-melf32_x86_64"
      "--x32" {tlsld2.s}
      {{objdump -dwr tlsld2.dd}} "tlsld2"}
- 
-     {"build 32-bit object with 33 locals" "-e 0" "--32" {32bit.s} {{ ld incompatible.l }} "dummy" }
-     {"build 64-bit object" "-e 0 --defsym foo=1" "--64" {64bit.s} {} "dummy" }
-     {"link mixed objects"  "-e 0 tmpdir/32bit.o tmpdir/64bit.o" "" {} { { ld incompatible.l } } "mixed"}
 }
 
 run_ld_link_tests $x86_64tests
@@ -158,8 +154,6 @@ run_dump_test "protected2"
 run_dump_test "protected2-l1om"
 run_dump_test "protected3"
 run_dump_test "protected3-l1om"
-run_dump_test "protected4"
-run_dump_test "protected5"
 run_dump_test "tlsle1"
 run_dump_test "tlspie1"
 run_dump_test "unique1"
@@ -213,7 +207,6 @@ run_dump_test "ilp32-6"
 run_dump_test "ilp32-7"
 run_dump_test "ilp32-8"
 run_dump_test "ilp32-9"
-run_dump_test "ilp32-10"
 run_dump_test "ia32-1"
 run_dump_test "ia32-2"
 run_dump_test "ia32-3"
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 8b51123db5..3e77a5a422 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -27,31 +27,6 @@ proc load_common_lib { name } {
 
 load_common_lib binutils-common.exp
 
-# Returns 1 if the gcc for the target is at least version MAJOR.MINOR
-# Returns 0 otherwise.
-#
-proc at_least_gcc_version { major minor } {
-    
-    if {![info exists CC]} {
-	set CC [find_gcc]
-    }
-    if { $CC == "" } {
-      return 0
-    }
-    set state [remote_exec host $CC --version]
-    set tmp "[lindex $state 1]\n"
-    # Look for (eg) 4.6.1 in the version output.
-    regexp " .* (\[1-9\])\\.(\[0-9\])\\.\[0-9\]* .*" "$tmp" fred maj min
-    verbose "gcc version: $tmp"
-    verbose "major gcc version is $maj, want at least $major"
-    if { $maj == $major } then {
-	verbose "minor gcc version is $min, want at least $minor"
-	return [expr  $min >= $minor ]
-    } else {
-	return [expr $maj > $major ]
-    }
-}
-
 # Extract and print the version number of ld.
 #
 proc default_ld_version { ld } {
@@ -415,7 +390,7 @@ proc ld_simple_link_defsyms {} {
     }
 
     # m6811/m6812 code has references to soft registers.
-    if {[istarget m6811-*-*] || [istarget m6812-*-*] || [istarget m68hc1*-*-*]} {
+    if {[istarget m6811-*-*] || [istarget m6812-*-*]} {
 	append flags " --defsym _.frame=0 --defsym _.d1=0 --defsym _.d2=0"
 	append flags " --defsym _.d3=0 --defsym _.d4=0"
 	append flags " --defsym _.tmp=0 --defsym _.xy=0 --defsym _.z=0"
@@ -989,12 +964,11 @@ proc run_ld_link_tests { ldtests } {
 
 	# Assemble each file in the test.
 	foreach src_file $src_files {
-	    set fileroot "[file rootname [file tail $src_file]]"
-	    set objfile "tmpdir/$fileroot.o"
+	    set objfile "tmpdir/[file rootname $src_file].o"
 	    lappend objfiles $objfile
 
 	    if { [file extension $src_file] == ".c" } {
-		set as_file "tmpdir/$fileroot.s"
+		set as_file "tmpdir/[file rootname $src_file].s"
 		if ![ld_compile "$CC -S $CFLAGS $cflags" $srcdir/$subdir/$src_file $as_file] {
 		    set is_unresolved 1
 		    break
@@ -1188,8 +1162,7 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } {
 
 	# Assemble each file in the test.
 	foreach src_file $src_files {
-	    set fileroot "[file rootname [file tail $src_file]]"
-	    set objfile "tmpdir/$fileroot.o"
+	    set objfile "tmpdir/[file rootname $src_file].o"
 	    lappend objfiles $objfile
 
 	    # We ignore warnings since some compilers may generate
@@ -1311,8 +1284,7 @@ proc run_cc_link_tests { ldtests } {
 
 	# Compile each file in the test.
 	foreach src_file $src_files {
-	    set fileroot "[file rootname [file tail $src_file]]"
-	    set objfile "tmpdir/$fileroot.o"
+	    set objfile "tmpdir/[file rootname $src_file].o"
 	    lappend objfiles $objfile
 
 	    # We ignore warnings since some compilers may generate
@@ -1446,7 +1418,7 @@ proc check_gc_sections_available { } {
 	     || [istarget or32-*-*]
 	     || [istarget pj*-*-*]
 	     || [istarget alpha-*-*]
-	     || [istarget hppa*64-*-*]
+	     || [istarget hppa64-*-*]
 	     || [istarget i370-*-*]
 	     || [istarget i860-*-*]
 	     || [istarget ia64-*-*]
@@ -1467,8 +1439,6 @@ proc check_gc_sections_available { } {
 	}
 
 	# Check if the ld used by gcc supports --gc-sections.
-	# FIXME: this test is useless since ld --help always says
-	# --gc-sections is available
 	set ld_output [remote_exec host $ld "--help"]
 	if { [ string first "--gc-sections" $ld_output ] >= 0 } {
 	    set gc_sections_available_saved 1
@@ -1479,53 +1449,6 @@ proc check_gc_sections_available { } {
     return $gc_sections_available_saved
 }
 
-# Returns true if -shared is supported on the target
-# Only used and accurate for ELF targets at the moment
-
-proc check_shared_lib_support { } {
-    if {![istarget arc-*-*]
-	 && ![istarget avr-*-*]
-	 && ![istarget cr16-*-*]
-	 && ![istarget cris*-*-*]
-	 && ![istarget crx-*-*]
-	 && ![istarget d10v-*-*]
-	 && ![istarget d30v-*-*]
-	 && ![istarget dlx-*-*]
-	 && ![istarget epiphany-*-*]
-	 && ![istarget fr30-*-*]
-	 && ![istarget frv-*-*]
-	 && ![istarget h8300-*-*]
-	 && ![istarget i860-*-*]
-	 && ![istarget i960-*-*]
-	 && ![istarget ip2k-*-*]
-	 && ![istarget iq2000-*-*]
-	 && ![istarget lm32-*-*]
-	 && ![istarget m32c-*-*]
-	 && ![istarget m32r-*-*]
-	 && ![istarget m6811-*-*]
-	 && ![istarget m6812-*-*]
-	 && ![istarget m68hc1*-*-*]
-	 && ![istarget mcore*-*-*]
-	 && ![istarget mep-*-*]
-	 && ![istarget microblaze-*-*]
-	 && ![istarget mn10200-*-*]
-	 && ![istarget moxie-*-*]
-	 && ![istarget msp430-*-*]
-	 && ![istarget mt-*-*]
-	 && ![istarget openrisc-*-*]
-	 && ![istarget or32-*-*]
-	 && ![istarget pj-*-*]
-	 && ![istarget rx-*-*]
-	 && ![istarget spu-*-*]
-	 && ![istarget v850*-*-*]
-	 && ![istarget xstormy16-*-*]
-	 && ![istarget *-*-irix*]
-	 && ![istarget *-*-rtems] } {
-	return 1
-    }
-    return 0
-}
-
 # Returns true if the target ld supports the plugin API.
 proc check_plugin_api_available { } {
     global plugin_api_available_saved
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 97bdfed4cc..844b1ee474 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,146 +1,3 @@
-2012-03-07  Jason Merrill  <jason@redhat.com>
-
-	* cp-demangle.c (cplus_demangle_operators): Add li.
-	(d_unqualified_name): Handle it specially.
-
-2012-01-26  Jakub Jelinek  <jakub@redhat.com>
-
-	* make-relative-prefix.c (make_relative_prefix_1): Avoid warning
-	about using preprocessor directives inside of macro arguments.
-
-2012-01-22  Douglas B Rupp  <rupp@gnat.com>
-
-	* configure: Regenerate.
-
-2012-01-10  Jason Merrill  <jason@redhat.com>
-
-	* cp-demangle.c (d_print_comp) [DEMANGLE_COMPONENT_OPERATOR]:
-	Omit a trailing space in the operator name.
-
-2012-01-06  Jason Merrill  <jason@redhat.com>
-
-	PR c++/6057
-	PR c++/48051
-	PR c++/50855
-	PR c++/51322
-	* cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_NULLARY and
-	DEMANGLE_COMPONENT_INITIALIZER_LIST.
-	(d_make_comp): Likewise.  Allow null right arg for
-	DEMANGLE_COMPONENT_TRINARY_ARG2.
-	(cplus_demangle_operators): Adjust new/delete; add .*, :: and throw.
-	(d_template_args, d_template_arg): Handle 'J' for argument packs.
-	(d_exprlist): Add terminator parm.
-	(d_expression, d_print_comp): Handle initializer lists, nullary
-	expressions, prefix/suffix operators, and new.
-	(d_print_subexpr): Avoid parens around DEMANGLE_COMPONENT_QUAL_NAME
-	and DEMANGLE_COMPONENT_INITIALIZER_LIST.
-	* testsuite/demangle-expected: Add tests.
-
-	* cp-demangle.c (cplus_demangle_type): decltype, pack expansion
-	and vector are substitutable.
-	(cplus_demangle_operators): Sort.
-
-2012-01-04  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
-
-	* configure: Regenerate.
-
-2012-01-02  Jakub Jelinek  <jakub@redhat.com>
-
-	* make-relative-prefix.c (make_relative_prefix_1): Avoid
-	stack overflow if PATH contains just a single entry and
-	HOST_EXECUTABLE_SUFFIX needs to be used.
-
-	PR driver/48306
-	* make-relative-prefix.c: Include sys/stat.h.
-	(make_relative_prefix_1): If access succeeds, check also stat
-	if nstore is a regular file.
-
-2011-12-20  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* configure: Regenerate.
-
-2011-12-20  Tristan Gingold  <gingold@adacore.com>
-
-	* aclocal.m4: Assume strncmp works in cross case.
-	* configure: Regenerate
-
-2011-12-19  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* configure: Regenerate.
-
-2011-11-07  Richard Henderson  <rth@redhat.com>
-
-	Merged from transactional-memory.
-
-	* cp-demangle.c (cplus_demangle_fill_ctor): Accept
-	gnu_v3_object_ctor_group.
-	(cplus_demangle_fill_dtor): Accept gnu_v3_object_dtor_group.
-	(d_ctor_dtor_name): Recognize gnu_v3_object_ctor_group
-	and gnu_v3_object_dtor_group.
-	(d_dump): Handle DEMANGLE_COMPONENT_TRANSACTION_CLONE
-	and DEMANGLE_COMPONENT_NONTRANSACTION_CLONE.
-	(d_make_comp, d_print_comp): Likewise.
-	(d_special_name): Generate them.
-
-2011-11-04  Jason Merrill  <jason@redhat.com>
-
-	PR c++/48370
-	* cp-demangle.c (d_special_name, d_print_comp): Handle a
-	discriminator number on DEMANGLE_COMPONENT_REFTEMP.
-
-2011-11-02  Doug Evans  <dje@google.com>
-
-	* Makefile.in (CFILES): Add timeval-utils.c.
-	(REQUIRED_OFILES): Add timeval-utils.$(objext).
-	(INSTALLED_HEADERS): Add timeval-utils.h.
-	(timeval-utils.$(objext)): Add rule.
-
-2011-10-28  Ian Lance Taylor  <iant@google.com>
-
-	* setproctitle.c (setproctitle): Use "GNU/Linux" in comment.
-
-2011-10-26  Iain Sandoe  <iains@gcc.gnu.org>
-
-	PR target/48108
-	* simple-object-mach-o.c  (GNU_WRAPPER_SECTS, GNU_WRAPPER_INDEX,
-	GNU_WRAPPER_NAMES): New macros.
-	(simple_object_mach_o_segment): Handle wrapper scheme.
-	(simple_object_mach_o_write_section_header): Allow the segment name
-	to be supplied.
-	(simple_object_mach_o_write_segment): Handle wrapper scheme.  Ensure
-	that the top-level segment name in the load command is empty.
-	(simple_object_mach_o_write_to_file): Determine the number of
-	sections during segment output, use that in writing the header.
-
-2011-10-10  Ian Lance Taylor  <iant@google.com>
-
-	PR c++/48665
-	* cp-demangle.c (d_cv_qualifiers): If qualifiers are applied to a
-	function type, change them to apply to the "this" parameter.
-	* testsuite/demangle-expected: Add test case.
-
-2011-09-28  Doug Evans  <dje@google.com>
-
-	* timeval-utils.c: New file.
-
-	* argv.c (countargv): New function.
-
-2011-09-23  Cary Coutant  <ccoutant@google.com>
-
-	PR 40831
-	* cp-demangle.c (d_make_comp): Add new component type.
-	(cplus_demangle_mangled_name): Check for clone suffixes.
-	(d_parmlist): Don't error out if we see '.'.
-	(d_clone_suffix): New function.
-	(d_print_comp): Print info for clone suffixes.
-	* testsuite/demangle-expected: Add new testcases.
-
-2011-09-23  Ian Lance Taylor  <iant@google.com>
-	    Pierre Vittet  <piervit@pvittet.com>
-
-	* md5.c (md5_process_bytes): Correct handling of unaligned
-	buffer.
-
 2011-08-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* aclocal.m4: Include ../config/picflag.m4.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 5280bc1585..bcd03fd016 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -152,7 +152,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c				\
 	 strcasecmp.c strchr.c strdup.c strerror.c strncasecmp.c	\
 	 strncmp.c strrchr.c strsignal.c strstr.c strtod.c strtol.c	\
 	 strtoul.c strndup.c strverscmp.c				\
-	timeval-utils.c tmpnam.c					\
+	tmpnam.c							\
 	unlink-if-ordinary.c						\
 	vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c	\
 	waitpid.c							\
@@ -184,8 +184,8 @@ REQUIRED_OFILES =							\
 	./simple-object-elf.$(objext) ./simple-object-mach-o.$(objext)	\
 	./sort.$(objext) ./spaces.$(objext)				\
 	./splay-tree.$(objext) ./stack-limit.$(objext)			\
-	./strerror.$(objext) ./strsignal.$(objext)			\
-	./timeval-utils.$(objext) ./unlink-if-ordinary.$(objext)	\
+	./strerror.$(objext)						\
+	./strsignal.$(objext) ./unlink-if-ordinary.$(objext)		\
 	./xatexit.$(objext) ./xexit.$(objext) ./xmalloc.$(objext)	\
 	./xmemdup.$(objext) ./xstrdup.$(objext) ./xstrerror.$(objext)	\
 	./xstrndup.$(objext)
@@ -235,8 +235,7 @@ INSTALLED_HEADERS =                                                     \
 	$(INCDIR)/partition.h                                           \
 	$(INCDIR)/safe-ctype.h                                          \
 	$(INCDIR)/sort.h                                                \
-	$(INCDIR)/splay-tree.h \
-	$(INCDIR)/timeval-utils.h
+	$(INCDIR)/splay-tree.h
 
 $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
 	-rm -f $(TARGETLIB) pic/$(TARGETLIB)
@@ -1142,13 +1141,6 @@ $(CONFIGURED_OFILES): stamp-picdir
 	else true; fi
 	$(COMPILE.c) $(srcdir)/strverscmp.c $(OUTPUT_OPTION)
 
-./timeval-utils.$(objext): $(srcdir)/timeval-utils.c config.h \
-	$(INCDIR)/timeval-utils.h
-	if [ x"$(PICFLAG)" != x ]; then \
-	  $(COMPILE.c) $(PICFLAG) $(srcdir)/timeval-utils.c -o pic/$@; \
-	else true; fi
-	$(COMPILE.c) $(srcdir)/timeval-utils.c $(OUTPUT_OPTION)
-
 ./tmpnam.$(objext): $(srcdir)/tmpnam.c
 	if [ x"$(PICFLAG)" != x ]; then \
 	  $(COMPILE.c) $(PICFLAG) $(srcdir)/tmpnam.c -o pic/$@; \
diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index bf8a907100..a528604d70 100644
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -72,7 +72,7 @@ main ()
   exit (0);
 }
 ], ac_cv_func_strncmp_works=yes, ac_cv_func_strncmp_works=no,
-  ac_cv_func_strncmp_works=yes)
+  ac_cv_func_strncmp_works=no)
 rm -f core core.* *.core])
 if test $ac_cv_func_strncmp_works = no ; then
   AC_LIBOBJ([strncmp])
diff --git a/libiberty/argv.c b/libiberty/argv.c
index ca53f91493..8476c8fda9 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -492,29 +492,6 @@ expandargv (int *argcp, char ***argvp)
     }
 }
 
-/*
-
-@deftypefn Extension int countargv (char **@var{argv})
-
-Return the number of elements in @var{argv}.
-Returns zero if @var{argv} is NULL.
-
-@end deftypefn
-
-*/
-
-int
-countargv (char **argv)
-{
-  int argc;
-
-  if (argv == NULL)
-    return 0;
-  for (argc = 0; argv[argc] != NULL; argc++)
-    continue;
-  return argc;
-}
-
 #ifdef MAIN
 
 /* Simple little test driver. */
diff --git a/libiberty/configure b/libiberty/configure
index 6e98352f35..c798937dee 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -3920,14 +3920,8 @@ ac_c_preproc_warn_flag=yes
 
 ac_libiberty_warn_cflags=
 save_CFLAGS="$CFLAGS"
-for real_option in -W -Wall -Wwrite-strings -Wc++-compat \
+for option in -W -Wall -Wwrite-strings -Wc++-compat \
 			  -Wstrict-prototypes; do
-  # Do the check with the no- prefix removed since gcc silently
-  # accepts any -Wno-* option on purpose
-  case $real_option in
-    -Wno-*) option=-W`expr x$real_option : 'x-Wno-\(.*\)'` ;;
-    *) option=$real_option ;;
-  esac
   as_acx_Woption=`$as_echo "acx_cv_prog_cc_warning_$option" | $as_tr_sh`
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5
@@ -3959,13 +3953,11 @@ eval ac_res=\$$as_acx_Woption
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   if test `eval 'as_val=${'$as_acx_Woption'};$as_echo "$as_val"'` = yes; then :
-  ac_libiberty_warn_cflags="$ac_libiberty_warn_cflags${ac_libiberty_warn_cflags:+ }$real_option"
+  ac_libiberty_warn_cflags="$ac_libiberty_warn_cflags${ac_libiberty_warn_cflags:+ }$option"
 fi
   done
 CFLAGS="$save_CFLAGS"
 
-# Do the check with the no- prefix removed from the warning options
-# since gcc silently accepts any -Wno-* option on purpose
 if test "$GCC" = yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -pedantic " >&5
 $as_echo_n "checking whether $CC supports -pedantic ... " >&6; }
@@ -4867,7 +4859,7 @@ case "${host}" in
 	;;
     i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
 	;;
-    i[34567]86-*-interix[3-9]*)
+    i[34567]86-*-interix3*)
 	# Interix 3.x gcc -fpic/-fPIC options generate broken code.
 	# Instead, we relocate shared libraries at runtime.
 	;;
@@ -4899,6 +4891,9 @@ case "${host}" in
     m68k-*-*)
 	PICFLAG=-fpic
 	;;
+    s390*-*-*)
+	PICFLAG=-fpic
+	;;
     # FIXME: Override -fPIC default in libgcc only?
     sh-*-linux* | sh[2346lbe]*-*-linux*)
 	PICFLAG=-fpic
@@ -6821,7 +6816,7 @@ if test "${ac_cv_func_strncmp_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  ac_cv_func_strncmp_works=yes
+  ac_cv_func_strncmp_works=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 2b3d1820c6..d67a9e74e6 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -417,9 +417,6 @@ static struct demangle_component *d_lambda (struct d_info *);
 
 static struct demangle_component *d_unnamed_type (struct d_info *);
 
-static struct demangle_component *
-d_clone_suffix (struct d_info *, struct demangle_component *);
-
 static int
 d_add_substitution (struct d_info *, struct demangle_component *);
 
@@ -585,12 +582,6 @@ d_dump (struct demangle_component *dc, int indent)
     case DEMANGLE_COMPONENT_HIDDEN_ALIAS:
       printf ("hidden alias\n");
       break;
-    case DEMANGLE_COMPONENT_TRANSACTION_CLONE:
-      printf ("transaction clone\n");
-      break;
-    case DEMANGLE_COMPONENT_NONTRANSACTION_CLONE:
-      printf ("non-transaction clone\n");
-      break;
     case DEMANGLE_COMPONENT_RESTRICT:
       printf ("restrict\n");
       break;
@@ -648,15 +639,9 @@ d_dump (struct demangle_component *dc, int indent)
     case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
       printf ("template argument list\n");
       break;
-    case DEMANGLE_COMPONENT_INITIALIZER_LIST:
-      printf ("initializer list\n");
-      break;
     case DEMANGLE_COMPONENT_CAST:
       printf ("cast\n");
       break;
-    case DEMANGLE_COMPONENT_NULLARY:
-      printf ("nullary operator\n");
-      break;
     case DEMANGLE_COMPONENT_UNARY:
       printf ("unary operator\n");
       break;
@@ -744,7 +729,7 @@ cplus_demangle_fill_ctor (struct demangle_component *p,
   if (p == NULL
       || name == NULL
       || (int) kind < gnu_v3_complete_object_ctor
-      || (int) kind > gnu_v3_object_ctor_group)
+      || (int) kind > gnu_v3_complete_object_allocating_ctor)
     return 0;
   p->type = DEMANGLE_COMPONENT_CTOR;
   p->u.s_ctor.kind = kind;
@@ -763,7 +748,7 @@ cplus_demangle_fill_dtor (struct demangle_component *p,
   if (p == NULL
       || name == NULL
       || (int) kind < gnu_v3_deleting_dtor
-      || (int) kind > gnu_v3_object_dtor_group)
+      || (int) kind > gnu_v3_base_object_dtor)
     return 0;
   p->type = DEMANGLE_COMPONENT_DTOR;
   p->u.s_dtor.kind = kind;
@@ -812,11 +797,11 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
     case DEMANGLE_COMPONENT_BINARY_ARGS:
     case DEMANGLE_COMPONENT_TRINARY:
     case DEMANGLE_COMPONENT_TRINARY_ARG1:
+    case DEMANGLE_COMPONENT_TRINARY_ARG2:
     case DEMANGLE_COMPONENT_LITERAL:
     case DEMANGLE_COMPONENT_LITERAL_NEG:
     case DEMANGLE_COMPONENT_COMPOUND_NAME:
     case DEMANGLE_COMPONENT_VECTOR_TYPE:
-    case DEMANGLE_COMPONENT_CLONE:
       if (left == NULL || right == NULL)
 	return NULL;
       break;
@@ -834,8 +819,6 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
     case DEMANGLE_COMPONENT_GUARD:
     case DEMANGLE_COMPONENT_REFTEMP:
     case DEMANGLE_COMPONENT_HIDDEN_ALIAS:
-    case DEMANGLE_COMPONENT_TRANSACTION_CLONE:
-    case DEMANGLE_COMPONENT_NONTRANSACTION_CLONE:
     case DEMANGLE_COMPONENT_POINTER:
     case DEMANGLE_COMPONENT_REFERENCE:
     case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
@@ -848,8 +831,6 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
     case DEMANGLE_COMPONENT_PACK_EXPANSION:
     case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS:
     case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS:
-    case DEMANGLE_COMPONENT_NULLARY:
-    case DEMANGLE_COMPONENT_TRINARY_ARG2:
       if (left == NULL)
 	return NULL;
       break;
@@ -857,7 +838,6 @@ d_make_comp (struct d_info *di, enum demangle_component_type type,
       /* This needs a right parameter, but the left parameter can be
 	 empty.  */
     case DEMANGLE_COMPONENT_ARRAY_TYPE:
-    case DEMANGLE_COMPONENT_INITIALIZER_LIST:
       if (right == NULL)
 	return NULL;
       break;
@@ -1054,7 +1034,7 @@ d_make_sub (struct d_info *di, const char *name, int len)
   return p;
 }
 
-/* <mangled-name> ::= _Z <encoding> [<clone-suffix>]*
+/* <mangled-name> ::= _Z <encoding>
 
    TOP_LEVEL is non-zero when called at the top level.  */
 
@@ -1062,8 +1042,6 @@ CP_STATIC_IF_GLIBCPP_V3
 struct demangle_component *
 cplus_demangle_mangled_name (struct d_info *di, int top_level)
 {
-  struct demangle_component *p;
-
   if (! d_check_char (di, '_')
       /* Allow missing _ if not at toplevel to work around a
 	 bug in G++ abi-version=2 mangling; see the comment in
@@ -1072,18 +1050,7 @@ cplus_demangle_mangled_name (struct d_info *di, int top_level)
     return NULL;
   if (! d_check_char (di, 'Z'))
     return NULL;
-  p = d_encoding (di, top_level);
-
-  /* If at top level and parsing parameters, check for a clone
-     suffix.  */
-  if (top_level && (di->options & DMGL_PARAMS) != 0)
-    while (d_peek_char (di) == '.'
-	   && (IS_LOWER (d_peek_next_char (di))
-	       || d_peek_next_char (di) == '_'
-	       || IS_DIGIT (d_peek_next_char (di))))
-      p = d_clone_suffix (di, p);
-
-  return p;
+  return d_encoding (di, top_level);
 }
 
 /* Return whether a function should have a return type.  The argument
@@ -1419,12 +1386,7 @@ d_unqualified_name (struct d_info *di)
 
       ret = d_operator_name (di);
       if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR)
-	{
-	  di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
-	  if (!strcmp (ret->u.s_operator.op->code, "li"))
-	    ret = d_make_comp (di, DEMANGLE_COMPONENT_UNARY, ret,
-			       d_source_name (di));
-	}
+	di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
       return ret;
     }
   else if (peek == 'C' || peek == 'D')
@@ -1567,8 +1529,7 @@ d_identifier (struct d_info *di, int len)
 /* operator_name ::= many different two character encodings.
                  ::= cv <type>
                  ::= v <digit> <source-name>
-
-   This list is sorted for binary search.  */
+*/
 
 #define NL(s) s, (sizeof s) - 1
 
@@ -1580,28 +1541,23 @@ const struct demangle_operator_info cplus_demangle_operators[] =
   { "aa", NL ("&&"),        2 },
   { "ad", NL ("&"),         1 },
   { "an", NL ("&"),         2 },
-  { "at", NL ("alignof "),   1 },
-  { "az", NL ("alignof "),   1 },
   { "cl", NL ("()"),        2 },
   { "cm", NL (","),         2 },
   { "co", NL ("~"),         1 },
   { "dV", NL ("/="),        2 },
-  { "da", NL ("delete[] "), 1 },
+  { "da", NL ("delete[]"),  1 },
   { "de", NL ("*"),         1 },
-  { "dl", NL ("delete "),   1 },
-  { "ds", NL (".*"),        2 },
+  { "dl", NL ("delete"),    1 },
   { "dt", NL ("."),         2 },
   { "dv", NL ("/"),         2 },
   { "eO", NL ("^="),        2 },
   { "eo", NL ("^"),         2 },
   { "eq", NL ("=="),        2 },
   { "ge", NL (">="),        2 },
-  { "gs", NL ("::"),	    1 },
   { "gt", NL (">"),         2 },
   { "ix", NL ("[]"),        2 },
   { "lS", NL ("<<="),       2 },
   { "le", NL ("<="),        2 },
-  { "li", NL ("operator\"\" "), 1 },
   { "ls", NL ("<<"),        2 },
   { "lt", NL ("<"),         2 },
   { "mI", NL ("-="),        2 },
@@ -1609,11 +1565,11 @@ const struct demangle_operator_info cplus_demangle_operators[] =
   { "mi", NL ("-"),         2 },
   { "ml", NL ("*"),         2 },
   { "mm", NL ("--"),        1 },
-  { "na", NL ("new[]"),     3 },
+  { "na", NL ("new[]"),     1 },
   { "ne", NL ("!="),        2 },
   { "ng", NL ("-"),         1 },
   { "nt", NL ("!"),         1 },
-  { "nw", NL ("new"),       3 },
+  { "nw", NL ("new"),       1 },
   { "oR", NL ("|="),        2 },
   { "oo", NL ("||"),        2 },
   { "or", NL ("|"),         2 },
@@ -1630,8 +1586,8 @@ const struct demangle_operator_info cplus_demangle_operators[] =
   { "rs", NL (">>"),        2 },
   { "st", NL ("sizeof "),   1 },
   { "sz", NL ("sizeof "),   1 },
-  { "tr", NL ("throw"),     0 },
-  { "tw", NL ("throw "),    1 },
+  { "at", NL ("alignof "),   1 },
+  { "az", NL ("alignof "),   1 },
   { NULL, NULL, 0,          0 }
 };
 
@@ -1789,8 +1745,6 @@ d_java_resource (struct d_info *di)
                   ::= GR <name>
 		  ::= GA <encoding>
 		  ::= Gr <resource name>
-		  ::= GTt <encoding>
-		  ::= GTn <encoding>
 */
 
 static struct demangle_component *
@@ -1875,33 +1829,13 @@ d_special_name (struct d_info *di)
 	  return d_make_comp (di, DEMANGLE_COMPONENT_GUARD, d_name (di), NULL);
 
 	case 'R':
-	  {
-	    struct demangle_component *name = d_name (di);
-	    return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, name,
-				d_number_component (di));
-	  }
+	  return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, d_name (di),
+			      NULL);
 
 	case 'A':
 	  return d_make_comp (di, DEMANGLE_COMPONENT_HIDDEN_ALIAS,
 			      d_encoding (di, 0), NULL);
 
-	case 'T':
-	  switch (d_next_char (di))
-	    {
-	    case 'n':
-	      return d_make_comp (di, DEMANGLE_COMPONENT_NONTRANSACTION_CLONE,
-				  d_encoding (di, 0), NULL);
-	    default:
-	      /* ??? The proposal is that other letters (such as 'h') stand
-		 for different variants of transaction cloning, such as
-		 compiling directly for hardware transaction support.  But
-		 they still should all be transactional clones of some sort
-		 so go ahead and call them that.  */
-	    case 't':
-	      return d_make_comp (di, DEMANGLE_COMPONENT_TRANSACTION_CLONE,
-				  d_encoding (di, 0), NULL);
-	    }
-
 	case 'r':
 	  return d_java_resource (di);
 
@@ -1985,9 +1919,6 @@ d_ctor_dtor_name (struct d_info *di)
 	  case '3':
 	    kind = gnu_v3_complete_object_allocating_ctor;
 	    break;
-	  case '5':
-	    kind = gnu_v3_object_ctor_group;
-	    break;
 	  default:
 	    return NULL;
 	  }
@@ -2010,9 +1941,6 @@ d_ctor_dtor_name (struct d_info *di)
 	  case '2':
 	    kind = gnu_v3_base_object_dtor;
 	    break;
-	  case '5':
-	    kind = gnu_v3_object_dtor_group;
-	    break;
 	  default:
 	    return NULL;
 	  }
@@ -2261,14 +2189,12 @@ cplus_demangle_type (struct d_info *di)
 			     d_expression (di), NULL);
 	  if (ret && d_next_char (di) != 'E')
 	    ret = NULL;
-	  can_subst = 1;
 	  break;
 	  
 	case 'p':
 	  /* Pack expansion.  */
 	  ret = d_make_comp (di, DEMANGLE_COMPONENT_PACK_EXPANSION,
 			     cplus_demangle_type (di), NULL);
-	  can_subst = 1;
 	  break;
 	  
 	case 'f':
@@ -2319,7 +2245,6 @@ cplus_demangle_type (struct d_info *di)
 
 	case 'v':
 	  ret = d_vector_type (di);
-	  can_subst = 1;
 	  break;
 
         case 'n':
@@ -2352,10 +2277,8 @@ static struct demangle_component **
 d_cv_qualifiers (struct d_info *di,
                  struct demangle_component **pret, int member_fn)
 {
-  struct demangle_component **pstart;
   char peek;
 
-  pstart = pret;
   peek = d_peek_char (di);
   while (peek == 'r' || peek == 'V' || peek == 'K')
     {
@@ -2392,28 +2315,6 @@ d_cv_qualifiers (struct d_info *di,
       peek = d_peek_char (di);
     }
 
-  if (!member_fn && peek == 'F')
-    {
-      while (pstart != pret)
-	{
-	  switch ((*pstart)->type)
-	    {
-	    case DEMANGLE_COMPONENT_RESTRICT:
-	      (*pstart)->type = DEMANGLE_COMPONENT_RESTRICT_THIS;
-	      break;
-	    case DEMANGLE_COMPONENT_VOLATILE:
-	      (*pstart)->type = DEMANGLE_COMPONENT_VOLATILE_THIS;
-	      break;
-	    case DEMANGLE_COMPONENT_CONST:
-	      (*pstart)->type = DEMANGLE_COMPONENT_CONST_THIS;
-	      break;
-	    default:
-	      break;
-	    }
-	  pstart = &d_left (*pstart);
-	}
-    }
-
   return pret;
 }
 
@@ -2453,7 +2354,7 @@ d_parmlist (struct d_info *di)
       struct demangle_component *type;
 
       char peek = d_peek_char (di);
-      if (peek == '\0' || peek == 'E' || peek == '.')
+      if (peek == '\0' || peek == 'E')
 	break;
       type = cplus_demangle_type (di);
       if (type == NULL)
@@ -2697,10 +2598,8 @@ d_template_args (struct d_info *di)
      constructor or destructor.  */
   hold_last_name = di->last_name;
 
-  if (d_peek_char (di) != 'I'
-      && d_peek_char (di) != 'J')
+  if (! d_check_char (di, 'I'))
     return NULL;
-  d_advance (di, 1);
 
   if (d_peek_char (di) == 'E')
     {
@@ -2759,7 +2658,6 @@ d_template_arg (struct d_info *di)
       return d_expr_primary (di);
 
     case 'I':
-    case 'J':
       /* An argument pack.  */
       return d_template_args (di);
 
@@ -2768,16 +2666,15 @@ d_template_arg (struct d_info *di)
     }
 }
 
-/* Parse a sequence of expressions until we hit the terminator
-   character.  */
+/* Subroutine of <expression> ::= cl <expression>+ E */
 
 static struct demangle_component *
-d_exprlist (struct d_info *di, char terminator)
+d_exprlist (struct d_info *di)
 {
   struct demangle_component *list = NULL;
   struct demangle_component **p = &list;
 
-  if (d_peek_char (di) == terminator)
+  if (d_peek_char (di) == 'E')
     {
       d_advance (di, 1);
       return d_make_comp (di, DEMANGLE_COMPONENT_ARGLIST, NULL, NULL);
@@ -2794,7 +2691,7 @@ d_exprlist (struct d_info *di, char terminator)
 	return NULL;
       p = &d_right (*p);
 
-      if (d_peek_char (di) == terminator)
+      if (d_peek_char (di) == 'E')
 	{
 	  d_advance (di, 1);
 	  break;
@@ -2885,21 +2782,9 @@ d_expression (struct d_info *di)
       else
 	return name;
     }
-  else if ((peek == 'i' || peek == 't')
-	   && d_peek_next_char (di) == 'l')
-    {
-      /* Brace-enclosed initializer list, untyped or typed.  */
-      struct demangle_component *type = NULL;
-      if (peek == 't')
-	type = cplus_demangle_type (di);
-      d_advance (di, 2);
-      return d_make_comp (di, DEMANGLE_COMPONENT_INITIALIZER_LIST,
-			  type, d_exprlist (di, 'E'));
-    }
   else
     {
       struct demangle_component *op;
-      const char *code = NULL;
       int args;
 
       op = d_operator_name (di);
@@ -2907,13 +2792,12 @@ d_expression (struct d_info *di)
 	return NULL;
 
       if (op->type == DEMANGLE_COMPONENT_OPERATOR)
-	{
-	  code = op->u.s_operator.op->code;
-	  di->expansion += op->u.s_operator.op->len - 2;
-	  if (strcmp (code, "st") == 0)
-	    return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
-				cplus_demangle_type (di));
-	}
+	di->expansion += op->u.s_operator.op->len - 2;
+
+      if (op->type == DEMANGLE_COMPONENT_OPERATOR
+	  && strcmp (op->u.s_operator.op->code, "st") == 0)
+	return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+			    cplus_demangle_type (di));
 
       switch (op->type)
 	{
@@ -2932,43 +2816,26 @@ d_expression (struct d_info *di)
 
       switch (args)
 	{
-	case 0:
-	  return d_make_comp (di, DEMANGLE_COMPONENT_NULLARY, op, NULL);
-
 	case 1:
 	  {
 	    struct demangle_component *operand;
-	    int suffix = 0;
-
-	    if (code && (code[0] == 'p' || code[0] == 'm')
-		&& code[1] == code[0])
-	      /* pp_ and mm_ are the prefix variants.  */
-	      suffix = !d_check_char (di, '_');
-
 	    if (op->type == DEMANGLE_COMPONENT_CAST
 		&& d_check_char (di, '_'))
-	      operand = d_exprlist (di, 'E');
+	      operand = d_exprlist (di);
 	    else
 	      operand = d_expression (di);
-
-	    if (suffix)
-	      /* Indicate the suffix variant for d_print_comp.  */
-	      return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
-				  d_make_comp (di,
-					       DEMANGLE_COMPONENT_BINARY_ARGS,
-					       operand, operand));
-	    else
-	      return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
-				  operand);
+	    return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+				operand);
 	  }
 	case 2:
 	  {
 	    struct demangle_component *left;
 	    struct demangle_component *right;
+	    const char *code = op->u.s_operator.op->code;
 
 	    left = d_expression (di);
 	    if (!strcmp (code, "cl"))
-	      right = d_exprlist (di, 'E');
+	      right = d_exprlist (di);
 	    else if (!strcmp (code, "dt") || !strcmp (code, "pt"))
 	      {
 		right = d_unqualified_name (di);
@@ -2988,50 +2855,17 @@ d_expression (struct d_info *di)
 	  {
 	    struct demangle_component *first;
 	    struct demangle_component *second;
-	    struct demangle_component *third;
 
-	    if (!strcmp (code, "qu"))
-	      {
-		/* ?: expression.  */
-		first = d_expression (di);
-		second = d_expression (di);
-		third = d_expression (di);
-	      }
-	    else if (code[0] == 'n')
-	      {
-		/* new-expression.  */
-		if (code[1] != 'w' && code[1] != 'a')
-		  return NULL;
-		first = d_exprlist (di, '_');
-		second = cplus_demangle_type (di);
-		if (d_peek_char (di) == 'E')
-		  {
-		    d_advance (di, 1);
-		    third = NULL;
-		  }
-		else if (d_peek_char (di) == 'p'
-			 && d_peek_next_char (di) == 'i')
-		  {
-		    /* Parenthesized initializer.  */
-		    d_advance (di, 2);
-		    third = d_exprlist (di, 'E');
-		  }
-		else if (d_peek_char (di) == 'i'
-			 && d_peek_next_char (di) == 'l')
-		  /* initializer-list.  */
-		  third = d_expression (di);
-		else
-		  return NULL;
-	      }
-	    else
-	      return NULL;
+	    first = d_expression (di);
+	    second = d_expression (di);
 	    return d_make_comp (di, DEMANGLE_COMPONENT_TRINARY, op,
 				d_make_comp (di,
 					     DEMANGLE_COMPONENT_TRINARY_ARG1,
 					     first,
 					     d_make_comp (di,
 							  DEMANGLE_COMPONENT_TRINARY_ARG2,
-							  second, third)));
+							  second,
+							  d_expression (di))));
 	  }
 	default:
 	  return NULL;
@@ -3248,33 +3082,6 @@ d_unnamed_type (struct d_info *di)
   return ret;
 }
 
-/* <clone-suffix> ::= [ . <clone-type-identifier> ] [ . <nonnegative number> ]*
-*/
-
-static struct demangle_component *
-d_clone_suffix (struct d_info *di, struct demangle_component *encoding)
-{
-  const char *suffix = d_str (di);
-  const char *pend = suffix;
-  struct demangle_component *n;
-
-  if (*pend == '.' && (IS_LOWER (pend[1]) || pend[1] == '_'))
-    {
-      pend += 2;
-      while (IS_LOWER (*pend) || *pend == '_')
-	++pend;
-    }
-  while (*pend == '.' && IS_DIGIT (pend[1]))
-    {
-      pend += 2;
-      while (IS_DIGIT (*pend))
-	++pend;
-    }
-  d_advance (di, pend - suffix);
-  n = d_make_name (di, suffix, pend - suffix);
-  return d_make_comp (di, DEMANGLE_COMPONENT_CLONE, encoding, n);
-}
-
 /* Add a new substitution.  */
 
 static int
@@ -3751,8 +3558,6 @@ d_print_subexpr (struct d_print_info *dpi, int options,
 {
   int simple = 0;
   if (dc->type == DEMANGLE_COMPONENT_NAME
-      || dc->type == DEMANGLE_COMPONENT_QUAL_NAME
-      || dc->type == DEMANGLE_COMPONENT_INITIALIZER_LIST
       || dc->type == DEMANGLE_COMPONENT_FUNCTION_PARAM)
     simple = 1;
   if (!simple)
@@ -4048,9 +3853,7 @@ d_print_comp (struct d_print_info *dpi, int options,
       return;
 
     case DEMANGLE_COMPONENT_REFTEMP:
-      d_append_string (dpi, "reference temporary #");
-      d_print_comp (dpi, options, d_right (dc));
-      d_append_string (dpi, " for ");
+      d_append_string (dpi, "reference temporary for ");
       d_print_comp (dpi, options, d_left (dc));
       return;
 
@@ -4059,16 +3862,6 @@ d_print_comp (struct d_print_info *dpi, int options,
       d_print_comp (dpi, options, d_left (dc));
       return;
 
-    case DEMANGLE_COMPONENT_TRANSACTION_CLONE:
-      d_append_string (dpi, "transaction clone for ");
-      d_print_comp (dpi, options, d_left (dc));
-      return;
-
-    case DEMANGLE_COMPONENT_NONTRANSACTION_CLONE:
-      d_append_string (dpi, "non-transaction clone for ");
-      d_print_comp (dpi, options, d_left (dc));
-      return;
-
     case DEMANGLE_COMPONENT_SUB_STD:
       d_append_buffer (dpi, dc->u.s_string.string, dc->u.s_string.len);
       return;
@@ -4348,32 +4141,16 @@ d_print_comp (struct d_print_info *dpi, int options,
 	}
       return;
 
-    case DEMANGLE_COMPONENT_INITIALIZER_LIST:
-      {
-	struct demangle_component *type = d_left (dc);
-	struct demangle_component *list = d_right (dc);
-
-	if (type)
-	  d_print_comp (dpi, options, type);
-	d_append_char (dpi, '{');
-	d_print_comp (dpi, options, list);
-	d_append_char (dpi, '}');
-      }
-      return;
-
     case DEMANGLE_COMPONENT_OPERATOR:
       {
-	const struct demangle_operator_info *op = dc->u.s_operator.op;
-	int len = op->len;
+	char c;
 
 	d_append_string (dpi, "operator");
-	/* Add a space before new/delete.  */
-	if (IS_LOWER (op->name[0]))
+	c = dc->u.s_operator.op->name[0];
+	if (IS_LOWER (c))
 	  d_append_char (dpi, ' ');
-	/* Omit a trailing space.  */
-	if (op->name[len-1] == ' ')
-	  --len;
-	d_append_buffer (dpi, op->name, len);
+	d_append_buffer (dpi, dc->u.s_operator.op->name,
+			 dc->u.s_operator.op->len);
 	return;
       }
 
@@ -4387,59 +4164,55 @@ d_print_comp (struct d_print_info *dpi, int options,
       d_print_cast (dpi, options, dc);
       return;
 
-    case DEMANGLE_COMPONENT_NULLARY:
-      d_print_expr_op (dpi, options, d_left (dc));
-      return;
-
     case DEMANGLE_COMPONENT_UNARY:
-      {
-	struct demangle_component *op = d_left (dc);
-	struct demangle_component *operand = d_right (dc);
-	const char *code = NULL;
+      if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
+	  && d_left (dc)->u.s_operator.op->len == 1
+	  && d_left (dc)->u.s_operator.op->name[0] == '&'
+	  && d_right (dc)->type == DEMANGLE_COMPONENT_TYPED_NAME
+	  && d_left (d_right (dc))->type == DEMANGLE_COMPONENT_QUAL_NAME
+	  && d_right (d_right (dc))->type == DEMANGLE_COMPONENT_FUNCTION_TYPE)
+	{
+	  /* Address of a function (therefore in an expression context) must
+	     have its argument list suppressed.
+
+	     unary operator ... dc
+	       operator & ... d_left (dc)
+	       typed name ... d_right (dc)
+		 qualified name ... d_left (d_right (dc))
+		   <names>
+		 function type ... d_right (d_right (dc))
+		   argument list
+		     <arguments>  */
+
+	  d_print_expr_op (dpi, options, d_left (dc));
+	  d_print_comp (dpi, options, d_left (d_right (dc)));
+	  return;
+	}
+      else if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
+	       && d_left (dc)->u.s_operator.op->len == 1
+	       && d_left (dc)->u.s_operator.op->name[0] == '&'
+	       && d_right (dc)->type == DEMANGLE_COMPONENT_QUAL_NAME)
+	{
+	  /* Keep also already processed variant without the argument list.
 
-	if (op->type == DEMANGLE_COMPONENT_OPERATOR)
-	  {
-	    code = op->u.s_operator.op->code;
-	    if (!strcmp (code, "ad"))
-	      {
-		/* Don't print the argument list for the address of a
-		   function.  */
-		if (operand->type == DEMANGLE_COMPONENT_TYPED_NAME
-		    && d_left (operand)->type == DEMANGLE_COMPONENT_QUAL_NAME
-		    && d_right (operand)->type == DEMANGLE_COMPONENT_FUNCTION_TYPE)
-		  operand = d_left (operand);
-	      }
-	    if (operand->type == DEMANGLE_COMPONENT_BINARY_ARGS)
-	      {
-		/* This indicates a suffix operator.  */
-		operand = d_left (operand);
-		d_print_subexpr (dpi, options, operand);
-		d_print_expr_op (dpi, options, op);
-		return;
-	      }
-	  }
+	     unary operator ... dc
+	       operator & ... d_left (dc)
+	       qualified name ... d_right (dc)
+		 <names>  */
 
-	if (op->type != DEMANGLE_COMPONENT_CAST)
-	  d_print_expr_op (dpi, options, op);
-	else
-	  {
-	    d_append_char (dpi, '(');
-	    d_print_cast (dpi, options, op);
-	    d_append_char (dpi, ')');
-	  }
-	if (code && !strcmp (code, "gs"))
-	  /* Avoid parens after '::'.  */
-	  d_print_comp (dpi, options, operand);
-	else if (code && !strcmp (code, "st"))
-	  /* Always print parens for sizeof (type).  */
-	  {
-	    d_append_char (dpi, '(');
-	    d_print_comp (dpi, options, operand);
-	    d_append_char (dpi, ')');
-	  }
-	else
-	  d_print_subexpr (dpi, options, operand);
-      }
+	  d_print_expr_op (dpi, options, d_left (dc));
+	  d_print_comp (dpi, options, d_right (dc));
+	  return;
+	}
+      else if (d_left (dc)->type != DEMANGLE_COMPONENT_CAST)
+	d_print_expr_op (dpi, options, d_left (dc));
+      else
+	{
+	  d_append_char (dpi, '(');
+	  d_print_cast (dpi, options, d_left (dc));
+	  d_append_char (dpi, ')');
+	}
+      d_print_subexpr (dpi, options, d_right (dc));
       return;
 
     case DEMANGLE_COMPONENT_BINARY:
@@ -4504,33 +4277,11 @@ d_print_comp (struct d_print_info *dpi, int options,
 	  d_print_error (dpi);
 	  return;
 	}
-      {
-	struct demangle_component *op = d_left (dc);
-	struct demangle_component *first = d_left (d_right (dc));
-	struct demangle_component *second = d_left (d_right (d_right (dc)));
-	struct demangle_component *third = d_right (d_right (d_right (dc)));
-
-	if (!strcmp (op->u.s_operator.op->code, "qu"))
-	  {
-	    d_print_subexpr (dpi, options, first);
-	    d_print_expr_op (dpi, options, op);
-	    d_print_subexpr (dpi, options, second);
-	    d_append_string (dpi, " : ");
-	    d_print_subexpr (dpi, options, third);
-	  }
-	else
-	  {
-	    d_append_string (dpi, "new ");
-	    if (d_left (first) != NULL)
-	      {
-		d_print_subexpr (dpi, options, first);
-		d_append_char (dpi, ' ');
-	      }
-	    d_print_comp (dpi, options, second);
-	    if (third)
-	      d_print_subexpr (dpi, options, third);
-	  }
-      }
+      d_print_subexpr (dpi, options, d_left (d_right (dc)));
+      d_print_expr_op (dpi, options, d_left (dc));
+      d_print_subexpr (dpi, options, d_left (d_right (d_right (dc))));
+      d_append_string (dpi, " : ");
+      d_print_subexpr (dpi, options, d_right (d_right (d_right (dc))));
       return;
 
     case DEMANGLE_COMPONENT_TRINARY_ARG1:
@@ -4712,13 +4463,6 @@ d_print_comp (struct d_print_info *dpi, int options,
       d_append_char (dpi, '}');
       return;
 
-    case DEMANGLE_COMPONENT_CLONE:
-      d_print_comp (dpi, options, d_left (dc));
-      d_append_string (dpi, " [clone ");
-      d_print_comp (dpi, options, d_right (dc));
-      d_append_char (dpi, ']');
-      return;
-
     default:
       d_print_error (dpi);
       return;
diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
index fe639d18bd..4553a7109d 100644
--- a/libiberty/make-relative-prefix.c
+++ b/libiberty/make-relative-prefix.c
@@ -1,6 +1,6 @@
 /* Relative (relocatable) prefix support.
    Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2006, 2012 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is part of libiberty.
 
@@ -58,9 +58,6 @@ relative prefix can be found, return @code{NULL}.
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #include <string.h>
 
@@ -248,15 +245,10 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
 	{
 	  char *startp, *endp, *nstore;
 	  size_t prefixlen = strlen (temp) + 1;
-	  size_t len;
 	  if (prefixlen < 2)
 	    prefixlen = 2;
 
-	  len = prefixlen + strlen (progname) + 1;
-#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
-	  len += strlen (HOST_EXECUTABLE_SUFFIX);
-#endif
-	  nstore = (char *) alloca (len);
+	  nstore = (char *) alloca (prefixlen + strlen (progname) + 1);
 
 	  startp = endp = temp;
 	  while (1)
@@ -271,7 +263,7 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
 		    }
 		  else
 		    {
-		      memcpy (nstore, startp, endp - startp);
+		      strncpy (nstore, startp, endp - startp);
 		      if (! IS_DIR_SEPARATOR (endp[-1]))
 			{
 			  nstore[endp - startp] = DIR_SEPARATOR;
@@ -287,14 +279,8 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
 #endif
 		      )
 		    {
-#if defined (HAVE_SYS_STAT_H) && defined (S_ISREG)
-		      struct stat st;
-		      if (stat (nstore, &st) >= 0 && S_ISREG (st.st_mode))
-#endif
-			{
-			  progname = nstore;
-			  break;
-			}
+		      progname = nstore;
+		      break;
 		    }
 
 		  if (*endp == 0)
diff --git a/libiberty/md5.c b/libiberty/md5.c
index 0db8fc8936..11920e1b55 100644
--- a/libiberty/md5.c
+++ b/libiberty/md5.c
@@ -1,6 +1,6 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
    NOTE: This source is derived from an old version taken from the GNU C
    Library (glibc).
@@ -245,11 +245,9 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
           }
       else
 #endif
-	{
-	  md5_process_block (buffer, len & ~63, ctx);
-	  buffer = (const void *) ((const char *) buffer + (len & ~63));
-	  len &= 63;
-	}
+      md5_process_block (buffer, len & ~63, ctx);
+      buffer = (const void *) ((const char *) buffer + (len & ~63));
+      len &= 63;
     }
 
   /* Move remaining bytes in internal buffer.  */
diff --git a/libiberty/setproctitle.c b/libiberty/setproctitle.c
index 6a2fe8ce3a..3b3f377b67 100644
--- a/libiberty/setproctitle.c
+++ b/libiberty/setproctitle.c
@@ -41,8 +41,8 @@ void
 setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
 {
 #ifdef PR_SET_NAME
-  /* On GNU/Linux this sets the top visible "comm", but not
-     necessarily the name visible in ps. */
+  /* On Linux this sets the top visible "comm", but not necessarily
+     the name visible in ps. */
   prctl (PR_SET_NAME, name);
 #endif
 }
diff --git a/libiberty/simple-object-mach-o.c b/libiberty/simple-object-mach-o.c
index af5e4f9ca8..bbbbd09de5 100644
--- a/libiberty/simple-object-mach-o.c
+++ b/libiberty/simple-object-mach-o.c
@@ -1,5 +1,5 @@
 /* simple-object-mach-o.c -- routines to manipulate Mach-O object files.
-   Copyright 2010, 2011 Free Software Foundation, Inc.
+   Copyright 2010 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Google.
 
 This program is free software; you can redistribute it and/or modify it
@@ -174,15 +174,6 @@ struct mach_o_section_64
 
 #define GNU_SECTION_NAMES "__section_names"
 
-/* A GNU-specific extension to wrap multiple sections using three
-   mach-o sections within a given segment.  The section '__wrapper_sects'
-   is subdivided according to the index '__wrapper_index' and each sub
-   sect is named according to the names supplied in '__wrapper_names'.  */
-
-#define GNU_WRAPPER_SECTS "__wrapper_sects"
-#define GNU_WRAPPER_INDEX "__wrapper_index"
-#define GNU_WRAPPER_NAMES "__wrapper_names"
-
 /* Private data for an simple_object_read.  */
 
 struct simple_object_mach_o_read
@@ -223,18 +214,7 @@ struct simple_object_mach_o_attributes
   unsigned int reserved;
 };
 
-/* See if we have a Mach-O MH_OBJECT file:
-
-   A standard MH_OBJECT (from as) will have three load commands:
-   0 - LC_SEGMENT/LC_SEGMENT64
-   1 - LC_SYMTAB
-   2 - LC_DYSYMTAB
-
-   The LC_SEGMENT/LC_SEGMENT64 will introduce a single anonymous segment
-   containing all the sections.
-
-   Files written by simple-object will have only the segment command
-   (no symbol tables).  */
+/* See if we have a Mach-O file.  */
 
 static void *
 simple_object_mach_o_match (
@@ -376,29 +356,8 @@ simple_object_mach_o_section_info (int is_big_endian, int is_32,
     }
 }
 
-/* Handle a segment in a Mach-O Object file.
-
-   This will callback to the function pfn for each "section found" the meaning
-   of which depends on gnu extensions to mach-o:
-
-   If we find mach-o sections (with the segment name as specified) which also
-   contain: a 'sects' wrapper, an index, and a  name table, we expand this into
-   as many sections as are specified in the index.  In this case, there will
-   be a callback for each of these.
-
-   We will also allow an extension that permits long names (more than 16
-   characters) to be used with mach-o.  In this case, the section name has
-   a specific format embedding an index into a name table, and the file must
-   contain such name table.
-
-   Return 1 if we should continue, 0 if the caller should return.  */
-
-#define SOMO_SECTS_PRESENT 0x01
-#define SOMO_INDEX_PRESENT 0x02
-#define SOMO_NAMES_PRESENT 0x04
-#define SOMO_LONGN_PRESENT 0x08
-#define SOMO_WRAPPING (SOMO_SECTS_PRESENT | SOMO_INDEX_PRESENT \
-		       | SOMO_NAMES_PRESENT)
+/* Handle a segment in a Mach-O file.  Return 1 if we should continue,
+   0 if the caller should return.  */
 
 static int
 simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
@@ -419,20 +378,9 @@ simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
   unsigned int nsects;
   unsigned char *secdata;
   unsigned int i;
-  unsigned int gnu_sections_found;
   unsigned int strtab_index;
-  unsigned int index_index;
-  unsigned int nametab_index;
-  unsigned int sections_index;
   char *strtab;
-  char *nametab;
-  unsigned char *index;
   size_t strtab_size;
-  size_t nametab_size;
-  size_t index_size;
-  unsigned int n_wrapped_sects;
-  size_t wrapper_sect_size;
-  off_t wrapper_sect_offset;
 
   fetch_32 = (omr->is_big_endian
 	      ? simple_object_fetch_big_32
@@ -461,8 +409,6 @@ simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
 					nsects));
     }
 
-  /* Fetch the section headers from the segment command.  */
-
   secdata = XNEWVEC (unsigned char, nsects * sechdrsize);
   if (!simple_object_internal_read (sobj->descriptor, offset + seghdrsize,
 				    secdata, nsects * sechdrsize, errmsg, err))
@@ -471,13 +417,9 @@ simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
       return 0;
     }
 
-  /* Scan for special sections that signal GNU extensions to the format.  */
+  /* Scan for a __section_names section.  This is in effect a GNU
+     extension that permits section names longer than 16 chars.  */
 
-  gnu_sections_found = 0;
-  index_index = nsects;
-  sections_index = nsects;
-  strtab_index = nsects;
-  nametab_index = nsects;
   for (i = 0; i < nsects; ++i)
     {
       size_t nameoff;
@@ -485,104 +427,19 @@ simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
       nameoff = i * sechdrsize + segname_offset;
       if (strcmp ((char *) secdata + nameoff, omr->segment_name) != 0)
 	continue;
-
       nameoff = i * sechdrsize + sectname_offset;
-      if (strcmp ((char *) secdata + nameoff, GNU_WRAPPER_NAMES) == 0)
-	{
-	  nametab_index = i;
-	  gnu_sections_found |= SOMO_NAMES_PRESENT;
-	}
-      else if (strcmp ((char *) secdata + nameoff, GNU_WRAPPER_INDEX) == 0)
-	{
-	  index_index = i;
-	  gnu_sections_found |= SOMO_INDEX_PRESENT;
-	}
-      else if (strcmp ((char *) secdata + nameoff, GNU_WRAPPER_SECTS) == 0)
-	{
-	  sections_index = i;
-	  gnu_sections_found |= SOMO_SECTS_PRESENT;
-	}
-      else if (strcmp ((char *) secdata + nameoff, GNU_SECTION_NAMES) == 0)
-	{
-	  strtab_index = i;
-	  gnu_sections_found |= SOMO_LONGN_PRESENT;
-	}
+      if (strcmp ((char *) secdata + nameoff, GNU_SECTION_NAMES) == 0)
+	break;
     }
 
-  /* If any of the special wrapper section components is present, then
-     they all should be.  */
-
-  if ((gnu_sections_found & SOMO_WRAPPING) != 0)
+  strtab_index = i;
+  if (strtab_index >= nsects)
     {
-      off_t nametab_offset;
-      off_t index_offset;
-
-      if ((gnu_sections_found & SOMO_WRAPPING) != SOMO_WRAPPING)
-	{
-	  *errmsg = "GNU Mach-o section wrapper: required section missing";
-	  *err = 0; /* No useful errno.  */
-	  XDELETEVEC (secdata);
-	  return 0;
-	}
-
-      /* Fetch the name table.  */
-
-      simple_object_mach_o_section_info (omr->is_big_endian, is_32,
-					 secdata + nametab_index * sechdrsize,
-					 &nametab_offset, &nametab_size);
-      nametab = XNEWVEC (char, nametab_size);
-      if (!simple_object_internal_read (sobj->descriptor,
-					sobj->offset + nametab_offset,
-					(unsigned char *) nametab, nametab_size,
-					errmsg, err))
-	{
-	  XDELETEVEC (nametab);
-	  XDELETEVEC (secdata);
-	  return 0;
-	}
-
-      /* Fetch the index.  */
-
-      simple_object_mach_o_section_info (omr->is_big_endian, is_32,
-					 secdata + index_index * sechdrsize,
-					 &index_offset, &index_size);
-      index = XNEWVEC (unsigned char, index_size);
-      if (!simple_object_internal_read (sobj->descriptor,
-					sobj->offset + index_offset,
-					index, index_size,
-					errmsg, err))
-	{
-	  XDELETEVEC (index);
-	  XDELETEVEC (nametab);
-	  XDELETEVEC (secdata);
-	  return 0;
-	}
-
-      /* The index contains 4 unsigned ints per sub-section:
-	 sub-section offset/length, sub-section name/length.
-	 We fix this for both 32 and 64 bit mach-o for now, since
-	 other fields limit the maximum size of an object to 4G.  */
-      n_wrapped_sects = index_size / 16;
-
-      /* Get the parameters for the wrapper too.  */
-      simple_object_mach_o_section_info (omr->is_big_endian, is_32,
-					 secdata + sections_index * sechdrsize,
-					 &wrapper_sect_offset,
-					 &wrapper_sect_size);
+      strtab = NULL;
+      strtab_size = 0;
     }
   else
     {
-      index = NULL;
-      index_size = 0;
-      nametab = NULL;
-      nametab_size = 0;
-      n_wrapped_sects = 0;
-    }
-
-  /* If we have a long names section, fetch it.  */
-
-  if ((gnu_sections_found & SOMO_LONGN_PRESENT) != 0)
-    {
       off_t strtab_offset;
 
       simple_object_mach_o_section_info (omr->is_big_endian, is_32,
@@ -595,118 +452,50 @@ simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
 					errmsg, err))
 	{
 	  XDELETEVEC (strtab);
-	  XDELETEVEC (index);
-	  XDELETEVEC (nametab);
 	  XDELETEVEC (secdata);
 	  return 0;
 	}
     }
-  else
-    {
-      strtab = NULL;
-      strtab_size = 0;
-      strtab_index = nsects;
-    }
 
   /* Process the sections.  */
 
   for (i = 0; i < nsects; ++i)
     {
       const unsigned char *sechdr;
-      char namebuf[MACH_O_NAME_LEN * 2 + 2];
+      char namebuf[MACH_O_NAME_LEN + 1];
       char *name;
       off_t secoffset;
       size_t secsize;
-      int l;
 
-      sechdr = secdata + i * sechdrsize;
-
-      /* We've already processed the long section names.  */
-
-      if ((gnu_sections_found & SOMO_LONGN_PRESENT) != 0
-	  && i == strtab_index)
+      if (i == strtab_index)
 	continue;
 
-      /* We only act on the segment named.  */
+      sechdr = secdata + i * sechdrsize;
 
       if (strcmp ((char *) sechdr + segname_offset, omr->segment_name) != 0)
 	continue;
 
-      /* Process sections associated with the wrapper.  */
+      memcpy (namebuf, sechdr + sectname_offset, MACH_O_NAME_LEN);
+      namebuf[MACH_O_NAME_LEN] = '\0';
 
-      if ((gnu_sections_found & SOMO_WRAPPING) != 0)
+      name = &namebuf[0];
+      if (strtab != NULL && name[0] == '_' && name[1] == '_')
 	{
-	  if (i == nametab_index || i == index_index)
-	    continue;
+	  unsigned long stringoffset;
 
-	  if (i == sections_index)
+	  if (sscanf (name + 2, "%08lX", &stringoffset) == 1)
 	    {
-	      unsigned int j;
-	      for (j = 0; j < n_wrapped_sects; ++j)
+	      if (stringoffset >= strtab_size)
 		{
-		  unsigned int subsect_offset, subsect_length, name_offset;
-		  subsect_offset = (*fetch_32) (index + 16 * j);
-		  subsect_length = (*fetch_32) (index + 16 * j + 4);
-		  name_offset = (*fetch_32) (index + 16 * j + 8);
-		  /* We don't need the name_length yet.  */
-
-		  secoffset = wrapper_sect_offset + subsect_offset;
-		  secsize = subsect_length;
-		  name = nametab + name_offset;
-
-		  if (!(*pfn) (data, name, secoffset, secsize))
-		    {
-		      *errmsg = NULL;
-		      *err = 0;
-		      XDELETEVEC (index);
-		      XDELETEVEC (nametab);
-		      XDELETEVEC (strtab);
-		      XDELETEVEC (secdata);
-		      return 0;
-		    }
+		  *errmsg = "section name offset out of range";
+		  *err = 0;
+		  XDELETEVEC (strtab);
+		  XDELETEVEC (secdata);
+		  return 0;
 		}
-	      continue;
-	    }
-	}
-
-      if ((gnu_sections_found & SOMO_LONGN_PRESENT) != 0)
-	{
-	  memcpy (namebuf, sechdr + sectname_offset, MACH_O_NAME_LEN);
-	  namebuf[MACH_O_NAME_LEN] = '\0';
-
-	  name = &namebuf[0];
-	  if (strtab != NULL && name[0] == '_' && name[1] == '_')
-	    {
-	      unsigned long stringoffset;
 
-	      if (sscanf (name + 2, "%08lX", &stringoffset) == 1)
-		{
-		  if (stringoffset >= strtab_size)
-		    {
-		      *errmsg = "section name offset out of range";
-		      *err = 0;
-		      XDELETEVEC (index);
-		      XDELETEVEC (nametab);
-		      XDELETEVEC (strtab);
-		      XDELETEVEC (secdata);
-		      return 0;
-		    }
-
-		  name = strtab + stringoffset;
-		}
-	  }
-	}
-      else
-	{
-	   /* Otherwise, make a name like __segment,__section as per the
-	      convention in mach-o asm.  */
-	  name = &namebuf[0];
-	  memset (namebuf, 0, MACH_O_NAME_LEN * 2 + 2);
-	  memcpy (namebuf, (char *) sechdr + segname_offset, MACH_O_NAME_LEN);
-	  l = strlen (namebuf);
-	  namebuf[l] = ',';
-	  memcpy (namebuf + l + 1, (char *) sechdr + sectname_offset,
-		  MACH_O_NAME_LEN);
+	      name = strtab + stringoffset;
+	    }
 	}
 
       simple_object_mach_o_section_info (omr->is_big_endian, is_32, sechdr,
@@ -716,16 +505,12 @@ simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
 	{
 	  *errmsg = NULL;
 	  *err = 0;
-	  XDELETEVEC (index);
-	  XDELETEVEC (nametab);
 	  XDELETEVEC (strtab);
 	  XDELETEVEC (secdata);
 	  return 0;
 	}
     }
 
-  XDELETEVEC (index);
-  XDELETEVEC (nametab);
   XDELETEVEC (strtab);
   XDELETEVEC (secdata);
 
@@ -939,9 +724,9 @@ static int
 simple_object_mach_o_write_section_header (simple_object_write *sobj,
 					   int descriptor,
 					   size_t sechdr_offset,
-					   const char *name, const char *segn,
-					   size_t secaddr, size_t secsize,
-					   size_t offset, unsigned int align,
+					   const char *name, size_t secaddr,
+					   size_t secsize, size_t offset,
+					   unsigned int align,
 					   const char **errmsg, int *err)
 {
   struct simple_object_mach_o_attributes *attrs =
@@ -963,7 +748,7 @@ simple_object_mach_o_write_section_header (simple_object_write *sobj,
       strncpy ((char *) hdr + offsetof (struct mach_o_section_32, sectname),
 	       name, MACH_O_NAME_LEN);
       strncpy ((char *) hdr + offsetof (struct mach_o_section_32, segname),
-	       segn, MACH_O_NAME_LEN);
+	       sobj->segment_name, MACH_O_NAME_LEN);
       set_32 (hdr + offsetof (struct mach_o_section_32, addr), secaddr);
       set_32 (hdr + offsetof (struct mach_o_section_32, size), secsize);
       set_32 (hdr + offsetof (struct mach_o_section_32, offset), offset);
@@ -988,7 +773,7 @@ simple_object_mach_o_write_section_header (simple_object_write *sobj,
       strncpy ((char *) hdr + offsetof (struct mach_o_section_64, sectname),
 	       name, MACH_O_NAME_LEN);
       strncpy ((char *) hdr + offsetof (struct mach_o_section_64, segname),
-	       segn, MACH_O_NAME_LEN);
+	       sobj->segment_name, MACH_O_NAME_LEN);
       set_64 (hdr + offsetof (struct mach_o_section_64, addr), secaddr);
       set_64 (hdr + offsetof (struct mach_o_section_64, size), secsize);
       set_32 (hdr + offsetof (struct mach_o_section_64, offset), offset);
@@ -1008,25 +793,11 @@ simple_object_mach_o_write_section_header (simple_object_write *sobj,
 				       sechdrsize, errmsg, err);
 }
 
-/* Write out the single (anonymous) segment containing the sections of a Mach-O
-   Object file.
-
-   As a GNU extension to mach-o, when the caller specifies a segment name in
-   sobj->segment_name, all the sections passed will be output under a single
-   mach-o section header.  The caller's sections are indexed within this
-   'wrapper' section by a table stored in a second mach-o section.  Finally,
-   arbitrary length section names are permitted by the extension and these are
-   stored in a table in a third mach-o section.
-
-   Note that this is only likely to make any sense for the __GNU_LTO segment
-   at present.
-
-   If the wrapper extension is not in force, we assume that the section name
-   is in the form __SEGMENT_NAME,__section_name as per Mach-O asm.  */
+/* Write out the single segment and the sections of a Mach-O file.  */
 
 static int
 simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
-				    size_t *nsects, const char **errmsg,
+				    size_t nsects, const char **errmsg,
 				    int *err)
 {
   struct simple_object_mach_o_attributes *attrs =
@@ -1043,10 +814,6 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
   simple_object_write_section *section;
   unsigned char hdrbuf[sizeof (struct mach_o_segment_command_64)];
   unsigned char *hdr;
-  size_t nsects_in;
-  unsigned int *index;
-  char *snames;
-  unsigned int sect;
 
   set_32 = (attrs->is_big_endian
 	    ? simple_object_set_big_32
@@ -1067,62 +834,19 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
       sechdrsize = sizeof (struct mach_o_section_64);
     }
 
-  name_offset = 0;
-  *nsects = nsects_in = 0;
-
-  /* Count the number of sections we start with.  */
-
-  for (section = sobj->sections; section != NULL; section = section->next)
-    nsects_in++;
-
-  if (sobj->segment_name != NULL)
-    {
-      /* We will only write 3 sections: wrapped data, index and names.  */
-
-      *nsects = 3;
-
-      /* The index has four entries per wrapped section:
-	   Section Offset, length,  Name offset, length.
-	 Where the offsets are based at the start of the wrapper and name
-	 sections respectively.
-	 The values are stored as 32 bit int for both 32 and 64 bit mach-o
-	 since the size of a mach-o MH_OBJECT cannot exceed 4G owing to
-	 other constraints.  */
-
-      index = XNEWVEC (unsigned int, nsects_in * 4);
-
-      /* We now need to figure out the size of the names section.  This just
-	 stores the names as null-terminated c strings, packed without any
-	 alignment padding.  */
-
-      for (section = sobj->sections, sect = 0; section != NULL;
-	   section = section->next, sect++)
-	{
-	  index[sect*4+2] = name_offset;
-	  index[sect*4+3] = strlen (section->name) + 1;
-	  name_offset += strlen (section->name) + 1;
-	}
-      snames = XNEWVEC (char, name_offset);
-    }
-  else
-    {
-      *nsects = nsects_in;
-      index = NULL;
-      snames = NULL;
-    }
-
   sechdr_offset = hdrsize + seghdrsize;
-  cmdsize = seghdrsize + *nsects * sechdrsize;
+  cmdsize = seghdrsize + nsects * sechdrsize;
   offset = hdrsize + cmdsize;
+  name_offset = 0;
   secaddr = 0;
 
-  for (section = sobj->sections, sect = 0;
-       section != NULL; section = section->next, sect++)
+  for (section = sobj->sections; section != NULL; section = section->next)
     {
       size_t mask;
       size_t new_offset;
       size_t secsize;
       struct simple_object_write_section_buffer *buffer;
+      char namebuf[MACH_O_NAME_LEN + 1];
 
       mask = (1U << section->align) - 1;
       new_offset = offset + mask;
@@ -1153,126 +877,39 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
 	  secsize += buffer->size;
 	}
 
-      if (sobj->segment_name != NULL)
-	{
-	  index[sect*4+0] = (unsigned int) offset;
-	  index[sect*4+1] = secsize;
-	  /* Stash the section name in our table.  */
-	  memcpy (snames + index[sect * 4 + 2], section->name,
-		  index[sect * 4 + 3]);
-	}
-      else
-	{
-	  char namebuf[MACH_O_NAME_LEN + 1];
-	  char segnbuf[MACH_O_NAME_LEN + 1];
-	  char *comma;
-
-	  /* Try to extract segment,section from the input name.  */
-
-	  memset (namebuf, 0, sizeof namebuf);
-	  memset (segnbuf, 0, sizeof segnbuf);
-	  comma = strchr (section->name, ',');
-	  if (comma != NULL)
-	    {
-	      int len = comma - section->name;
-	      len = len > MACH_O_NAME_LEN ? MACH_O_NAME_LEN : len;
-	      strncpy (namebuf, section->name, len);
-	      strncpy (segnbuf, comma + 1, MACH_O_NAME_LEN);
-	    }
-	  else /* just try to copy the name, leave segment blank.  */
-	    strncpy (namebuf, section->name, MACH_O_NAME_LEN);
-
-	  if (!simple_object_mach_o_write_section_header (sobj, descriptor,
-							  sechdr_offset,
-							  namebuf, segnbuf,
-							  secaddr, secsize,
-							  offset,
-							  section->align,
-							  errmsg, err))
-	    return 0;
-	  sechdr_offset += sechdrsize;
-	}
-
-      offset += secsize;
-      secaddr += secsize;
-    }
-
-  if (sobj->segment_name != NULL)
-    {
-      size_t secsize;
-      unsigned int i;
-
-      /* Write the section header for the wrapper.  */
-      /* Account for any initial aligment - which becomes the alignment for this
-	 created section.  */
-
-      secsize = (offset - index[0]);
+      snprintf (namebuf, sizeof namebuf, "__%08X", name_offset);
       if (!simple_object_mach_o_write_section_header (sobj, descriptor,
-						      sechdr_offset,
-						      GNU_WRAPPER_SECTS,
-						      sobj->segment_name,
-						      0 /*secaddr*/,
-						      secsize, index[0],
-						      sobj->sections->align,
+						      sechdr_offset, namebuf,
+						      secaddr, secsize, offset,
+						      section->align,
 						      errmsg, err))
 	return 0;
 
-      /* Subtract the wrapper section start from the begining of each sub
-	 section.  */
-
-      for (i = 1; i < nsects_in; ++i)
-	index[4 * i] -= index[0];
-      index[0] = 0;
-
       sechdr_offset += sechdrsize;
+      offset += secsize;
+      name_offset += strlen (section->name) + 1;
+      secaddr += secsize;
+    }
 
-      /* Write out the section names.
-	 ... the header ...
-	 name_offset contains the length of the section.  It is not aligned.  */
-
-      if (!simple_object_mach_o_write_section_header (sobj, descriptor,
-						      sechdr_offset,
-						      GNU_WRAPPER_NAMES,
-						      sobj->segment_name,
-						      0 /*secaddr*/,
-						      name_offset,
-						      offset,
-						      0, errmsg, err))
-	return 0;
-
-      /* ... and the content.. */
-      if (!simple_object_internal_write (descriptor, offset,
-					 (const unsigned char *) snames,
-					 name_offset, errmsg, err))
-	return 0;
-
-      sechdr_offset += sechdrsize;
-      secaddr += name_offset;
-      offset += name_offset;
+  /* Write out the section names.  */
 
-      /* Now do the index, we'll align this to 4 bytes although the read code
-	 will handle unaligned.  */
+  if (!simple_object_mach_o_write_section_header (sobj, descriptor,
+						  sechdr_offset,
+						  GNU_SECTION_NAMES, secaddr,
+						  name_offset, offset, 0,
+						  errmsg, err))
+    return 0;
 
-      offset += 3;
-      offset &= ~0x03;
-      if (!simple_object_mach_o_write_section_header (sobj, descriptor,
-						      sechdr_offset,
-						      GNU_WRAPPER_INDEX,
-						      sobj->segment_name,
-						      0 /*secaddr*/,
-						      nsects_in * 16,
-						      offset,
-						      2, errmsg, err))
-	return 0;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t namelen;
 
-      /* ... and the content.. */
+      namelen = strlen (section->name) + 1;
       if (!simple_object_internal_write (descriptor, offset,
-					 (const unsigned char *) index,
-					 nsects_in*16, errmsg, err))
+					 (const unsigned char *) section->name,
+					 namelen, errmsg, err))
 	return 0;
-
-      XDELETEVEC (index);
-      XDELETEVEC (snames);
+      offset += namelen;
     }
 
   /* Write out the segment header.  */
@@ -1286,8 +923,9 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
 	      MACH_O_LC_SEGMENT);
       set_32 (hdr + offsetof (struct mach_o_segment_command_32, cmdsize),
 	      cmdsize);
-     /* MH_OBJECTS have a single, anonymous, segment - so the segment name
-	 is left empty.  */
+      strncpy (((char *) hdr
+		+ offsetof (struct mach_o_segment_command_32, segname)),
+	       sobj->segment_name, MACH_O_NAME_LEN);
       /* vmaddr left as zero.  */
       /* vmsize left as zero.  */
       set_32 (hdr + offsetof (struct mach_o_segment_command_32, fileoff),
@@ -1297,7 +935,7 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
       /* maxprot left as zero.  */
       /* initprot left as zero.  */
       set_32 (hdr + offsetof (struct mach_o_segment_command_32, nsects),
-	      *nsects);
+	      nsects);
       /* flags left as zero.  */
     }
   else
@@ -1313,8 +951,9 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
 	      MACH_O_LC_SEGMENT);
       set_32 (hdr + offsetof (struct mach_o_segment_command_64, cmdsize),
 	      cmdsize);
-      /* MH_OBJECTS have a single, anonymous, segment - so the segment name
-	 is left empty.  */
+      strncpy (((char *) hdr
+		+ offsetof (struct mach_o_segment_command_64, segname)),
+	       sobj->segment_name, MACH_O_NAME_LEN);
       /* vmaddr left as zero.  */
       /* vmsize left as zero.  */
       set_64 (hdr + offsetof (struct mach_o_segment_command_64, fileoff),
@@ -1324,7 +963,7 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
       /* maxprot left as zero.  */
       /* initprot left as zero.  */
       set_32 (hdr + offsetof (struct mach_o_segment_command_64, nsects),
-	      *nsects);
+	      nsects);
       /* flags left as zero.  */
 #endif
     }
@@ -1339,17 +978,23 @@ static const char *
 simple_object_mach_o_write_to_file (simple_object_write *sobj, int descriptor,
 				    int *err)
 {
-  size_t nsects = 0;
+  size_t nsects;
+  simple_object_write_section *section;
   const char *errmsg;
 
-  if (!simple_object_mach_o_write_segment (sobj, descriptor, &nsects,
-					   &errmsg, err))
-    return errmsg;
+  /* Start at 1 for symbol_names section.  */
+  nsects = 1;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    ++nsects;
 
   if (!simple_object_mach_o_write_header (sobj, descriptor, nsects,
 					  &errmsg, err))
     return errmsg;
 
+  if (!simple_object_mach_o_write_segment (sobj, descriptor, nsects,
+					   &errmsg, err))
+    return errmsg;
+
   return NULL;
 }
 
diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 036c481351..3737cfd7bd 100644
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -3935,7 +3935,7 @@ _Z1tIlEDTplcvT_Li5EclL_Z1qsELi6EEEv
 decltype (((long)(5))+(q(6))) t<long>()
 # test for expansion of function parameter pack
 --format=gnu-v3
-_Z1gIJidEEDTclL_Z1fEspplfp_Li1EEEDpT_
+_Z1gIIidEEDTclL_Z1fEspplfp_Li1EEEDpT_
 decltype (f(({parm#1}+(1))...)) g<int, double>(int, double)
 # lambda tests
 --format=gnu-v3
@@ -4018,63 +4018,6 @@ K<1, &S::m>::f()
 --format=gnu-v3
 _ZSt10_ConstructI10CellBorderIS0_EEvPT_DpOT0_
 _ZSt10_ConstructI10CellBorderIS0_EEvPT_DpOT0_
-# A pack expansion is substitutable.
---format=gnu-v3
-_Z1fIJiEiEv1AIJDpT_EET0_S4_
-void f<int, int>(A<int>, int, int)
-# So is decltype.
---format=gnu-v3
-_Z1fIiiEDTcvT__EET0_S2_
-decltype ((int)()) f<int, int>(int, int)
-# And vector.
---format=gnu-v3
-_Z1fDv4_iS_
-f(int __vector(4), int __vector(4))
---format=gnu-v3
-_Z2f1Ii1AEDTdsfp_fp0_ET0_MS2_T_
-decltype ({parm#1}.*{parm#2}) f1<int, A>(A, int A::*)
---format=gnu-v3
-_Z2f2IiEDTquL_Z1bEfp_trET_
-decltype (b?{parm#1} : (throw)) f2<int>(int)
---format=gnu-v3
-_Z6check1IiEvP6helperIXsznw_T_EEE
-void check1<int>(helper<sizeof (new int)>*)
---format=gnu-v3
-_Z6check2IiEvP6helperIXszgsnw_T_piEEE
-void check2<int>(helper<sizeof (::new int())>*)
---format=gnu-v3
-_Z6check3IiEvP6helperIXsznwadL_Z1iE_T_piLi1EEEE
-void check3<int>(helper<sizeof (new (&i) int(1))>*)
---format=gnu-v3
-_Z6check4IiEvP6helperIXszna_A1_T_EEE
-void check4<int>(helper<sizeof (new int [1])>*)
---format=gnu-v3
-_Z6check5IiEvP6helperIXszna_A1_T_piEEE
-void check5<int>(helper<sizeof (new int [1]())>*)
---format=gnu-v3
-_Z1fIiEDTcmgsdlfp_psfp_EPT_
-decltype ((::delete {parm#1}),(+{parm#1})) f<int>(int*)
---format=gnu-v3
-_Z1fIiEDTcmdafp_psfp_EPT_
-decltype ((delete[] {parm#1}),(+{parm#1})) f<int>(int*)
---format=gnu-v3
-_ZN1AdlEPv
-A::operator delete(void*)
---format=gnu-v3
-_Z2f1IiEDTppfp_ET_
-decltype ({parm#1}++) f1<int>(int)
---format=gnu-v3
-_Z2f1IiEDTpp_fp_ET_
-decltype (++{parm#1}) f1<int>(int)
---format=gnu-v3
-_Z2f1IiEDTcl1gfp_ilEEET_
-decltype (g({parm#1}, {})) f1<int>(int)
---format=gnu-v3
-_Z2f1IiEDTnw_T_ilEES0_
-decltype (new int{}) f1<int>(int)
---format=gnu-v3
-_Zli2_wPKc
-operator"" _w(char const*)
 #
 # Ada (GNAT) tests.
 #
@@ -4208,55 +4151,3 @@ DFA
 --format=auto
 _ZN3Psi7VariantIIcPKcEE5visitIIRZN11VariantTest9TestVisit11test_methodEvEUlS2_E0_RZNS6_11test_methodEvEUlcE1_RZNS6_11test_methodEvEUlNS_4NoneEE_EEENS_13VariantDetail19SelectVisitorResultIIDpT_EE4typeEDpOSG_
 Psi::VariantDetail::SelectVisitorResult<VariantTest::TestVisit::test_method()::{lambda(char const*)#2}&, VariantTest::TestVisit::test_method()::{lambda(char)#3}&, VariantTest::TestVisit::test_method()::{lambda(Psi::None)#1}&>::type Psi::Variant<char, char const*>::visit<VariantTest::TestVisit::test_method()::{lambda(char const*)#2}&, VariantTest::TestVisit::test_method()::{lambda(char)#3}&, VariantTest::TestVisit::test_method()::{lambda(Psi::None)#1}&>((VariantTest::TestVisit::test_method()::{lambda(Psi::None)#1}&)...)
-#
-# Clone suffix tests
-#
---format=gnu-v3 --no-params
-_Z3fo5n.clone.1
-fo5(__int128) [clone .clone.1]
-fo5
-#
---format=gnu-v3 --no-params
-_Z3fo5n.constprop.2
-fo5(__int128) [clone .constprop.2]
-fo5
-#
---format=gnu-v3 --no-params
-_Z3fo5n.isra.3
-fo5(__int128) [clone .isra.3]
-fo5
-#
---format=gnu-v3 --no-params
-_Z3fo5n.part.4
-fo5(__int128) [clone .part.4]
-fo5
-#
---format=gnu-v3 --no-params
-_Z12to_be_clonediPv.clone.0
-to_be_cloned(int, void*) [clone .clone.0]
-to_be_cloned
-#
---format=gnu-v3 --no-params
-_Z3fooi.1988
-foo(int) [clone .1988]
-foo
-#
---format=gnu-v3 --no-params
-_Z3fooi.part.9.165493.constprop.775.31805
-foo(int) [clone .part.9.165493] [clone .constprop.775.31805]
-foo
-#
---format=gnu-v3 --no-params
-_Z2f1IiEvT_S0_S0_._omp_fn.2
-void f1<int>(int, int, int) [clone ._omp_fn.2]
-f1<int>
-#
---format=gnu-v3 --no-params
-_Z3fooi._omp_cpyfn.6
-foo(int) [clone ._omp_cpyfn.6]
-foo
-#
---format=gnu-v3 --no-params
-_Z1fIKFvvES0_Evv
-void f<void () const, void ()>()
-f<void () const, void ()>
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a7264990c2..a4450301b1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,163 +1,678 @@
-2012-03-23  Maxim Kuvyrkov  <maxim@codesourcery.com>
-
-	* mips-dis.c (mips_arch_choices): Add entry for Broadcom XLP.
-
-2012-03-16  Alan Modra  <amodra@gmail.com>
-
-	* ppc-dis.c (PPC_OPC_SEGS, PPC_OP_TO_SEG): Delete.
-	(powerpc_opcd_indices): Bump array size.
-	(disassemble_init_powerpc): Set powerpc_opcd_indices entries
-	corresponding to unused opcodes to following entry.
-	(lookup_powerpc): New function, extracted and optimised from..
-	(print_insn_powerpc): ..here.
-
-2012-03-15  Alan Modra  <amodra@gmail.com>
-	    James Lemke  <jwlemke@codesourcery.com>
-
-	* disassemble.c (disassemble_init_for_target): Handle ppc init.
-	* ppc-dis.c (private): New var.
-	(powerpc_init_dialect): Don't return calloc failure, instead use
-	private.
-	(PPC_OPCD_SEGS, PPC_OP_TO_SEG): Define.
-	(powerpc_opcd_indices): New array.
-	(disassemble_init_powerpc): New function.
-	(print_insn_big_powerpc): Don't init dialect here.
-	(print_insn_little_powerpc): Likewise.
-	(print_insn_powerpc): Start search using powerpc_opcd_indices.
-
-2012-03-10  Edmar Wienskoski  <edmar@freescale.com>
-
-	* ppc-dis.c (ppc_opts): Add entries for "e5500" and "e6500".
-	* ppc-opc.c (insert_ls, TMR, ESYNC, XSYNCLE_MASK): New.
-	(PPCVEC2, PPCTMR, E6500): New short names.
-	(powerpc_opcodes): Add vabsdub, vabsduh, vabsduw, dni, mvidsplt,
-	mviwsplt, icblq., mftmr, mttmr, dcblq., miso, lvexbx, lvexhx,
-	lvexwx, stvexbx, stvexhx, stvexwx, lvepx, lvepxl, stvepx, stvepxl,
-	lvtrx, lvtrxl, lvtlx, lvtlxl, stvfrx, stvfrxl, stvflx, stvflxl,
-	lvswx, lvswxl, stvswx, stvswxl, lvsm mnemonics. Accept LS, ESYNC
-	optional operands on sync instruction for E6500 target.
-
-2012-03-08  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
-
-	* s390-opc.txt: Set instruction type of pku to SS_L2RDRD.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* mt-dis.c: Regenerate.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* v850-opc.c (extract_v8): Rearrange to make it obvious this
-	is the inverse of corresponding insert function.
-	(extract_d22, extract_u9, extract_r4): Likewise.
-	(extract_d9): Correct sign extension.
-	(extract_d16_15): Don't assume "long" is 32 bits, and don't
-	rely on implementation defined behaviour for shift right of
-	signed types.
-	(extract_d16_16, extract_d17_16, extract_i9): Likewise.
-	(extract_d23): Likewise, and correct mask.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* crx-dis.c (print_arg): Mask constant to 32 bits.
-	* crx-opc.c (cst4_map): Use int array.
-
-2012-02-27  Alan Modra  <amodra@gmail.com>
-
-	* arc-dis.c (BITS): Don't use shifts to mask off bits.
-	(FIELDD): Sign extend with xor,sub.
-
-2012-02-25  Walter Lee  <walt@tilera.com>
-
-	* tilegx-opc.c: Handle TILEGX_OPC_LD4S_TLS and TILEGX_OPC_LD_TLS.
-	* tilepro-opc.c: Handle TILEPRO_OPC_LW_TLS and
-	TILEPRO_OPC_LW_TLS_SN.
-
-2012-02-21  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* i386-opc.h (HLEPrefixNone): New.
-	(HLEPrefixLock): Likewise.
-	(HLEPrefixAny): Likewise.
-	(HLEPrefixRelease): Likewise.
-
-2012-02-08  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* i386-dis.c (HLE_Fixup1): New.
-	(HLE_Fixup2): Likewise.
-	(HLE_Fixup3): Likewise.
-	(Ebh1): Likewise.
-	(Evh1): Likewise.
-	(Ebh2): Likewise.
-	(Evh2): Likewise.
-	(Ebh3): Likewise.
-	(Evh3): Likewise.
-	(MOD_C6_REG_7): Likewise.
-	(MOD_C7_REG_7): Likewise.
-	(RM_C6_REG_7): Likewise.
-	(RM_C7_REG_7): Likewise.
-	(XACQUIRE_PREFIX): Likewise.
-	(XRELEASE_PREFIX): Likewise.
-	(dis386): Use Ebh1/Evh1 on add, adc, and, btc, btr, bts,
-	cmpxchg, dec, inc, neg, not, or, sbb, sub, xor and xadd. Use
-	Ebh2/Evh2 on xchg.  Use Ebh3/Evh3 on mov.
-	(reg_table): Use Ebh1/Evh1 on add, adc, and, dec, inc, neg,
-	not, or, sbb, sub and xor.  Use Ebh3/Evh3 on mov.  Use
-	MOD_C6_REG_7 and MOD_C7_REG_7.
-	(mod_table): Add MOD_C6_REG_7 and MOD_C7_REG_7.
-	(rm_table): Add RM_C6_REG_7 and RM_C7_REG_7.  Add xend and
-	xtest.
-	(prefix_name): Handle XACQUIRE_PREFIX and XRELEASE_PREFIX.
-	(CMPXCHG8B_Fixup): Handle HLE prefix on cmpxchg8b.
-
-	* i386-gen.c (cpu_flag_init): Add CPU_HLE_FLAGS and
-	CPU_RTM_FLAGS.
-	(cpu_flags): Add CpuHLE and CpuRTM.
-	(opcode_modifiers): Add HLEPrefixOk.
-
-	* i386-opc.h (CpuHLE): New.
-	(CpuRTM): Likewise.
-	(HLEPrefixOk): Likewise.
-	(i386_cpu_flags): Add cpuhle and cpurtm.
-	(i386_opcode_modifier): Add hleprefixok.
-
-	* i386-opc.tbl: Add HLEPrefixOk=3 to mov.  Add HLEPrefixOk to
-	add, adc, and, btc, btr, bts, cmpxchg, dec, inc, neg, not, or,
-	sbb, sub, xor and xadd.  Add HLEPrefixOk=2 to xchg with memory
-	operand.  Add xacquire, xrelease, xabort, xbegin, xend and
-	xtest.
+2011-10-27  Peter Bergner  <bergner@vnet.ibm.com>
+
+	* ppc-opc.c (powerpc_opcodes) <drrndq, drrndq., dtstexq, dctqpq,
+	dctqpq., dctfixq, dctfixq., dxexq, dxexq., dtstsfq, dcffixq, dcffixq.,
+	diexq, diexq.>: Use FRT, FRA, FRB and FRBp repsectively on DFP quad
+	instructions.
+
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-09-28  Jan Beulich  <jbeulich@suse.com>
+	* ppc-opc.c (insert_nbi, insert_rbx, FRAp, FRBp, FRSp, FRTp, NBI, RAX,
+	RBX): New.
+	(insert_bo, insert_boe): Reject bcctr with bit 2 in bo unset.
+	(powerpc_opcodes): Use RAX for second and RBXC for third operand of
+	lswx. Use NBI for third operand of lswi. Use FRTp for first operand of
+	lfdp and lfdpx. Use FRSp for first operand of stfdp and stfdpx, and
+	mark them as invalid on POWER7. Use FRTp, FRAp, and FRBp repsectively
+	on DFP quad instructions.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* sparc-opc.c (sparc_opcodes): Annotate table with HWCAP flag
+	bits.  Fix "fchksm16" mnemonic.
+
+2011-09-08  Mark Fortescue <mark@mtfhpc.demon.co.uk>
+
+	The changes below bring 'mov' and 'ticc' instructions into line
+	with the V8 SPARC Architecture Manual.
+	* sparc-opc.c (sparc_opcodes): Add entry for 'ticc imm + regrs1'.
+	* sparc-opc.c (sparc_opcodes): Add alias entries for
+	'mov regrs2,%asrX'; 'mov regrs2,%y'; 'mov regrs2,%prs';
+	'mov regrs2,%wim' and 'mov regrs2,%tbr'.
+	* sparc-opc.c (sparc_opcodes): Move/Change entries for
+	'mov imm,%asrX'; 'mov imm,%y'; 'mov imm,%prs'; 'mov imm,%wim'
+	and 'mov imm,%tbr'.
+	* sparc-opc.c (sparc_opcodes): Add wr alias entries to match above
+	mov aliases.
+
+	* sparc-opc.c (sparc_opcodes): Add entry for 'save simm13,regrs1,regrd'
+	This has been reported as being accepted by the Sun assmebler.
+
+2011-09-08  David S. Miller  <davem@davemloft.net>
+
+	* sparc-opc.c (pdistn): Destination is integer not float register.
+
+2011-09-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+	PR gas/13145
+	* m68k-opc.c: Use "y" in moveml pattern for mcfisa_a.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-22  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.am (CPUDIR): Redfine to point to top level cpu
+	directory.
+	(stamp-frv): Use CPUDIR.
+	(stamp-iq2000): Likewise.
+	(stamp-lm32): Likewise.
+	(stamp-m32c): Likewise.
+	(stamp-mt): Likewise.
+	(stamp-xc16x): Likewise.
+	* Makefile.in: Regenerate.
+
+2011-08-09  Chao-ying Fu  <fu@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* mips-dis.c (mips_arch_choices): Enable MCU for "mips32r2"
+	and "mips64r2".
+	(print_insn_args, print_insn_micromips): Handle MCU.
+	* micromips-opc.c (MC): New macro.
+	(micromips_opcodes): Add "aclr", "aset" and "iret".
+	* mips-opc.c (MC): New macro.
+	(mips_builtin_opcodes): Add "aclr", "aset" and "iret".
+
+2011-08-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* micromips-opc.c (MOD_mb, MOD_mc, MOD_md): Remove macros.
+	(MOD_me, MOD_mf, MOD_mg, MOD_mhi, MOD_mj, MOD_ml): Likewise.
+	(MOD_mm, MOD_mn, MOD_mp, MOD_mq, MOD_sp): Likewise.
+	(WR_mb, RD_mc, RD_md, WR_md, RD_me, RD_mf, WR_mf): New macros.
+	(RD_mg, WR_mhi, RD_mj, WR_mj, RD_ml, RD_mmn): Likewise.
+	(RD_mp, WR_mp, RD_mq, RD_sp, WR_sp): Likewise.
+	(WR_s): Update macro.
+	(micromips_opcodes): Update register use flags of: "addiu",
+	"addiupc", "addiur1sp", "addiur2", "addius5", "addiusp", "addu",
+	"and", "andi", "beq", "beqz", "bne", "bnez", "di", "ei", "j",
+	"jalr", "jalrs", "jr", "jraddiusp", "jrc", "lbu", "lhu", "li",
+	"lui", "lw", "lwm", "mfhi", "mflo", "move", "movep", "not",
+	"nor", "or", "ori", "sb", "sh", "sll", "srl", "subu", "sw",
+	"swm" and "xor" instructions.
+
+2011-08-05  David S. Miller  <davem@davemloft.net>
+
+	* sparc-dis.c (v9a_ast_reg_names): Add "cps".
+	(X_RS3): New macro.
+	(print_insn_sparc): Handle '4', '5', and '(' format codes.
+	Accept %asr numbers below 28.
+	* sparc-opc.c (sparc_opcodes): Add entries for HPC and VIS3
+	instructions.
+
+2011-08-02  Quentin Neill  <quentin.neill@amd.com>
+
+	* i386-dis.c (xop_table): Remove spurious bextr insn.
+
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13048
+	* i386-dis.c (print_insn): Optimize info->mach check.
+
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/13046
+	* i386-opc.tbl: Add Disp32S to 64bit call.
+	* i386-tbl.h: Regenerated.
+
+2011-07-24  Chao-ying Fu  <fu@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* micromips-opc.c: New file.
+	* mips-dis.c (micromips_to_32_reg_b_map): New array.
+	(micromips_to_32_reg_c_map, micromips_to_32_reg_d_map): Likewise.
+	(micromips_to_32_reg_e_map, micromips_to_32_reg_f_map): Likewise.
+	(micromips_to_32_reg_g_map, micromips_to_32_reg_l_map): Likewise.
+	(micromips_to_32_reg_q_map): Likewise.
+	(micromips_imm_b_map, micromips_imm_c_map): Likewise.
+	(micromips_ase): New variable.
+	(is_micromips): New function.
+	(set_default_mips_dis_options): Handle microMIPS ASE.
+	(print_insn_micromips): New function.
+	(is_compressed_mode_p): Likewise.
+	(_print_insn_mips): Handle microMIPS instructions.
+	* Makefile.am (CFILES): Add micromips-opc.c.
+	* configure.in (bfd_mips_arch): Add micromips-opc.lo.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+	* mips-dis.c (micromips_to_32_reg_h_map): New variable.
+	(micromips_to_32_reg_i_map): Likewise.
+	(micromips_to_32_reg_m_map): Likewise.
+	(micromips_to_32_reg_n_map): New macro.
+
+2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* mips-opc.c (NODS): New macro.
+	(TRAP): Adjust for the rename of INSN_TRAP to INSN_NO_DELAY_SLOT.
+	(DSP_VOLA): Likewise.
+	(mips_builtin_opcodes): Add NODS annotation to "deret" and
+	"eret". Replace INSN_SYNC with NODS throughout.  Use NODS in
+	place of TRAP for "wait", "waiti" and "yield".
+	* mips16-opc.c (NODS): New macro.
+	(TRAP): Adjust for the rename of INSN_TRAP to INSN_NO_DELAY_SLOT.
+	(mips16_opcodes):  Use NODS in place of TRAP for "jalrc", "jrc",
+	"restore" and "save".
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: Handle bfd_k1om_arch.
+	* configure: Regenerated.
+
+	* disassemble.c (disassembler): Handle bfd_k1om_arch.
+
+	* i386-dis.c (print_insn): Handle bfd_mach_k1om and
+	bfd_mach_k1om_intel_syntax.
+
+	* i386-gen.c (cpu_flag_init): Set CPU_UNKNOWN_FLAGS to
+	~(CpuL1OM|CpuK1OM).  Add CPU_K1OM_FLAGS.
+	(cpu_flags): Add CpuK1OM.
+
+	* i386-opc.h (CpuK1OM): New.
+	(i386_cpu_flags): Add cpuk1om.
+
 	* i386-init.h: Regenerated.
 	* i386-tbl.h: Likewise.
 
-2012-01-24  DJ Delorie  <dj@redhat.com>
+2011-07-12  Nick Clifton  <nickc@redhat.com>
+
+	* arm-dis.c (print_insn_arm): Revert previous, undocumented,
+	accidental change.
+
+2011-07-01  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12329
+	* avr-dis.c (avr_operand): Fix disassembly of ELPM, LPM and SPM
+	insns using post-increment addressing.
+
+2011-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (vex_len_table): Update rorxS.
+
+2011-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	AVX Programming Reference (June, 2011)
+	* i386-dis.c (vex_len_table): Correct rorxS.
+
+	* i386-opc.tbl: Correct rorx.
+	* i386-tbl.h: Regenerated.
+
+2011-06-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* tilegx-opc.c (find_opcode): Replace "index" with "i".
+	* tilepro-opc.c (find_opcode): Likewise.
+
+2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* mips16-opc.c (jalrc, jrc): Move earlier in file.
+
+2011-06-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (prefix_table): Re-indent PREFIX_VEX_0F388C and
+	PREFIX_VEX_0F388E.
+
+2011-06-17  Andreas Schwab  <schwab@redhat.com>
+
+	* Makefile.am (MAINTAINERCLEANFILES): Move s390-opc.tab ...
+	(MOSTLYCLEANFILES): ... here.
+	* Makefile.in: Regenerate.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* Makefile.in: Regenerate.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* Makefile.am (TARGET_LIBOPCODES_CFILES): Add tilegx-dis.c,
+	tilegx-opc.c, tilepro-dis.c, and tilepro-opc.c.
+	* Makefile.in: Regenerate.
+	* configure.in: Handle bfd_tilegx_arch and bfd_tilepro_arch.
+	* configure: Regenerate.
+	* disassemble.c (disassembler): Add ARCH_tilegx and ARCH_tilepro.
+	* po/POTFILES.in: Regenerate.
+	* tilegx-dis.c: New file.
+	* tilegx-opc.c: New file.
+	* tilepro-dis.c: New file.
+	* tilepro-opc.c: New file.
+
+2011-06-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	AVX Programming Reference (June, 2011)
+	* i386-dis.c (XMGatherQ): New.
+	* i386-dis.c (EXxmm_mb): New.
+	(EXxmm_mb): Likewise.
+	(EXxmm_mw): Likewise.
+	(EXxmm_md): Likewise.
+	(EXxmm_mq): Likewise.
+	(EXxmmdw): Likewise.
+	(EXxmmqd): Likewise.
+	(VexGatherQ): Likewise.
+	(MVexVSIBDWpX): Likewise.
+	(MVexVSIBQWpX): Likewise.
+	(xmm_mb_mode): Likewise.
+	(xmm_mw_mode): Likewise.
+	(xmm_md_mode): Likewise.
+	(xmm_mq_mode): Likewise.
+	(xmmdw_mode): Likewise.
+	(xmmqd_mode): Likewise.
+	(ymmxmm_mode): Likewise.
+	(vex_vsib_d_w_dq_mode): Likewise.
+	(vex_vsib_q_w_dq_mode): Likewise.
+	(MOD_VEX_0F385A_PREFIX_2): Likewise.
+	(MOD_VEX_0F388C_PREFIX_2): Likewise.
+	(MOD_VEX_0F388E_PREFIX_2): Likewise.
+	(PREFIX_0F3882): Likewise.
+	(PREFIX_VEX_0F3816): Likewise.
+	(PREFIX_VEX_0F3836): Likewise.
+	(PREFIX_VEX_0F3845): Likewise.
+	(PREFIX_VEX_0F3846): Likewise.
+	(PREFIX_VEX_0F3847): Likewise.
+	(PREFIX_VEX_0F3858): Likewise.
+	(PREFIX_VEX_0F3859): Likewise.
+	(PREFIX_VEX_0F385A): Likewise.
+	(PREFIX_VEX_0F3878): Likewise.
+	(PREFIX_VEX_0F3879): Likewise.
+	(PREFIX_VEX_0F388C): Likewise.
+	(PREFIX_VEX_0F388E): Likewise.
+	(PREFIX_VEX_0F3890..PREFIX_VEX_0F3893): Likewise.
+	(PREFIX_VEX_0F38F5): Likewise.
+	(PREFIX_VEX_0F38F6): Likewise.
+	(PREFIX_VEX_0F3A00): Likewise.
+	(PREFIX_VEX_0F3A01): Likewise.
+	(PREFIX_VEX_0F3A02): Likewise.
+	(PREFIX_VEX_0F3A38): Likewise.
+	(PREFIX_VEX_0F3A39): Likewise.
+	(PREFIX_VEX_0F3A46): Likewise.
+	(PREFIX_VEX_0F3AF0): Likewise.
+	(VEX_LEN_0F3816_P_2): Likewise.
+	(VEX_LEN_0F3819_P_2): Likewise.
+	(VEX_LEN_0F3836_P_2): Likewise.
+	(VEX_LEN_0F385A_P_2_M_0): Likewise.
+	(VEX_LEN_0F38F5_P_0): Likewise.
+	(VEX_LEN_0F38F5_P_1): Likewise.
+	(VEX_LEN_0F38F5_P_3): Likewise.
+	(VEX_LEN_0F38F6_P_3): Likewise.
+	(VEX_LEN_0F38F7_P_1): Likewise.
+	(VEX_LEN_0F38F7_P_2): Likewise.
+	(VEX_LEN_0F38F7_P_3): Likewise.
+	(VEX_LEN_0F3A00_P_2): Likewise.
+	(VEX_LEN_0F3A01_P_2): Likewise.
+	(VEX_LEN_0F3A38_P_2): Likewise.
+	(VEX_LEN_0F3A39_P_2): Likewise.
+	(VEX_LEN_0F3A46_P_2): Likewise.
+	(VEX_LEN_0F3AF0_P_3): Likewise.
+	(VEX_W_0F3816_P_2): Likewise.
+	(VEX_W_0F3818_P_2): Likewise.
+	(VEX_W_0F3819_P_2): Likewise.
+	(VEX_W_0F3836_P_2): Likewise.
+	(VEX_W_0F3846_P_2): Likewise.
+	(VEX_W_0F3858_P_2): Likewise.
+	(VEX_W_0F3859_P_2): Likewise.
+	(VEX_W_0F385A_P_2_M_0): Likewise.
+	(VEX_W_0F3878_P_2): Likewise.
+	(VEX_W_0F3879_P_2): Likewise.
+	(VEX_W_0F3A00_P_2): Likewise.
+	(VEX_W_0F3A01_P_2): Likewise.
+	(VEX_W_0F3A02_P_2): Likewise.
+	(VEX_W_0F3A38_P_2): Likewise.
+	(VEX_W_0F3A39_P_2): Likewise.
+	(VEX_W_0F3A46_P_2): Likewise.
+	(MOD_VEX_0F3818_PREFIX_2): Removed.
+	(MOD_VEX_0F3819_PREFIX_2): Likewise.
+	(VEX_LEN_0F60_P_2..VEX_LEN_0F6D_P_2): Likewise.
+	(VEX_LEN_0F70_P_1..VEX_LEN_0F76_P_2): Likewise.
+	(VEX_LEN_0FD1_P_2..VEX_LEN_0FD5_P_2): Likewise.
+	(VEX_LEN_0FD7_P_2_M_1..VEX_LEN_0F3819_P_2_M_0): Likewise.
+	(VEX_LEN_0F381C_P_2..VEX_LEN_0F3840_P_2): Likewise.
+	(VEX_LEN_0F3A0E_P_2): Likewise.
+	(VEX_LEN_0F3A0F_P_2): Likewise.
+	(VEX_LEN_0F3A42_P_2): Likewise.
+	(VEX_LEN_0F3A4C_P_2): Likewise.
+	(VEX_W_0F3818_P_2_M_0): Likewise.
+	(VEX_W_0F3819_P_2_M_0): Likewise.
+	(prefix_table): Updated.
+	(three_byte_table): Likewise.
+	(vex_table): Likewise.
+	(vex_len_table): Likewise.
+	(vex_w_table): Likewise.
+	(mod_table): Likewise.
+	(putop): Handle "LW".
+	(intel_operand_size): Handle xmm_mb_mode, xmm_mw_mode,
+	xmm_md_mode, xmm_mq_mode, xmmdw_mode, xmmqd_mode, ymmxmm_mode,
+	vex_vsib_d_w_dq_mode, vex_vsib_q_w_dq_mode.
+	(OP_EX): Likewise.
+	(OP_E_memory): Handle vex_vsib_d_w_dq_mode and
+	vex_vsib_q_w_dq_mode.
+	(OP_XMM): Handle vex_vsib_q_w_dq_mode.
+	(OP_VEX): Likewise.
+
+	* i386-gen.c (cpu_flag_init): Add CpuAVX2 to CPU_ANY_SSE_FLAGS
+	and CPU_ANY_AVX_FLAGS.  Add CPU_BMI2_FLAGS, CPU_LZCNT_FLAGS,
+	CPU_INVPCID_FLAGS and CPU_AVX2_FLAGS.
+	(cpu_flags): Add CpuAVX2, CpuBMI2, CpuLZCNT and CpuINVPCID.
+	(opcode_modifiers): Add VecSIB.
+
+	* i386-opc.h (CpuAVX2): New.
+	(CpuBMI2): Likewise.
+	(CpuLZCNT): Likewise.
+	(CpuINVPCID): Likewise.
+	(VecSIB128): Likewise.
+	(VecSIB256): Likewise.
+	(VecSIB): Likewise.
+	(i386_cpu_flags): Add cpuavx2, cpubmi2, cpulzcnt and cpuinvpcid.
+	(i386_opcode_modifier): Add vecsib.
+
+	* i386-opc.tbl: Add invpcid, AVX2 and BMI2 instructions.
+	* i386-init.h: Regenerated.
+	* i386-tbl.h: Likewise.
+
+2011-06-03  Quentin Neill  <quentin.neill@amd.com>
+
+	* i386-gen.c (cpu_flag_init): Add CpuF16C to CPU_BDVER2_FLAGS.
+	* i386-init.h: Regenerated.
+
+2011-06-03  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12752
+	* arm-dis.c (print_insn_coprocessor): Use bfd_vma type for
+	computing address offsets.
+	(print_arm_address): Likewise.
+	(print_insn_arm): Likewise.
+	(print_insn_thumb16): Likewise.
+	(print_insn_thumb32): Likewise.
+
+2011-06-02  Jie Zhang <jie@codesourcery.com>
+	    Nathan Sidwell <nathan@codesourcery.com>
+	    Maciej Rozycki <macro@codesourcery.com>
+
+	* arm-dis.c (print_insn_coprocessor): Explicitly print #-0
+	as address offset.
+	(print_arm_address): Likewise. Elide positive #0 appropriately.
+	(print_insn_arm): Likewise.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/12752
+	* arm-dis.c (print_insn_thumb32): Do not sign extend  addresses
+	passed to print_address_func.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* arm-dis.c: Fix spelling mistakes.
+	* op/opcodes.pot: Regenerate.
+
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* s390-opc.c: Replace S390_OPERAND_REG_EVEN with
+	S390_OPERAND_REG_PAIR.  Fix INSTR_RRF_0UFEF instruction type.
+	* s390-opc.txt: Fix cxr instruction type.
+
+2011-05-24  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* s390-opc.c: Add new instruction types marking register pair
+	operands.
+	* s390-opc.txt: Match instructions having register pair operands
+	to the new instruction types.
+
+2011-05-19  Nick Clifton  <nickc@redhat.com>
+
+	* v850-opc.c (cmpf.[sd]): Reverse the order of the reg1 and reg2
+	operands.
+
+2011-05-10  Quentin Neill  <quentin.neill@amd.com>
+
+	* i386-gen.c (cpu_flag_init): Add new CPU_BDVER2_FLAGS.
+	* i386-init.h: Regenerated.
+
+2011-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-04-26  Anton Blanchard  <anton@samba.org>
+
+	* ppc-opc.c: (powerpc_opcodes): Enable icswx for POWER7.
+
+2011-04-21  DJ Delorie  <dj@redhat.com>
+
+	* rx-decode.opc (rx_decode_opcode): Set the syntax for multi-byte NOPs.
+	* rx-decode.c: Regenerate.
+
+2011-04-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-init.h: Regenerated.
+
+2011-04-19  Quentin Neill  <quentin.neill@amd.com>
+
+	* i386-gen.c (cpu_flag_init): Remove 3dnow and 3dnowa bits
+	from bdver1 flags.
+
+2011-04-13  Nick Clifton  <nickc@redhat.com>
+
+	* v850-dis.c (disassemble): Always print a closing square brace if
+	an opening square brace was printed.
+
+2011-04-12  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12534
+	* arm-dis.c (thumb32_opcodes): Add %L suffix to LDRD and STRD insn
+	patterns.
+	(print_insn_thumb32): Handle %L.
+
+2011-04-11  Julian Brown  <julian@codesourcery.com>
+
+	* arm-dis.c (psr_name): Fix typo for BASEPRI_MAX.
+	(print_insn_thumb32): Add APSR bitmask support.
+
+2011-04-07  Paul Carroll<pcarroll@codesourcery.com>
+
+	* arm-dis.c (print_insn): init vars moved into private_data structure.
+
+2011-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (decode_dsp32mac_0): Move MM zeroing down to MAC0 logic.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* avr-dis.c (avr_operand): Add opcode_str parameter. Check for
+	post-increment to support LPM Z+ instruction. Add support for 'E'
+	constraint for DES instruction.
+	(print_insn_avr): Adjust calls to avr_operand. Rename variable.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* arm-dis.c (get_sym_code_type): Treat STT_GNU_IFUNCs as code.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* arm-dis.c (get_sym_code_type): Don't check for STT_ARM_TFUNC.
+	Use branch types instead.
+	(print_insn): Likewise.
+
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	* rl78-decode.opc (rl78_decode_opcode): Add NOT1.
-	* rl78-decode.c: Regenerate.
+	* mips-opc.c (mips_builtin_opcodes): Correct register use
+	annotation of "alnv.ps".
 
-2012-01-17  James Murray  <jsm@jsm-net.demon.co.uk>
+2011-02-28  Maciej W. Rozycki  <macro@codesourcery.com>
 
-	PR binutils/10173
-	* cr16-dis.c (print_arg): Test symtab_size not num_symbols.
+	* mips-opc.c (mips_builtin_opcodes): Add "pref" macro.
 
-2012-01-17  Andreas Schwab  <schwab@linux-m68k.org>
+2011-02-22  Mike Frysinger  <vapier@gentoo.org>
 
-	* m68k-opc.c (m68k_opcodes): Fix entries for pmove with BADx/BACx
-	register and move them after pmove with PSR/PCSR register.
+	* bfin-dis.c (OUTS): Remove p NULL check and txt NUL check.
 
-2012-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+2011-02-22  Mike Frysinger  <vapier@gentoo.org>
 
-	* i386-dis.c (mod_table): Add vmfunc.
+	* bfin-dis.c (print_insn_bfin): Change outf->fprintf_func to OUTS.
 
-	* i386-gen.c (cpu_flag_init): Add CPU_VMFUNC_FLAGS.
-	(cpu_flags): CpuVMFUNC.
+2011-02-19  Mike Frysinger  <vapier@gentoo.org>
 
-	* i386-opc.h (CpuVMFUNC): New.
-	(i386_cpu_flags): Add cpuvmfunc.
+	* bfin-dis.c (saved_state): Mark static.  Change a[01]x to ax[] and
+	a[01]w to aw[].  Delete ac0, ac0_copy, ac1, an, aq, av0, av0s, av1,
+	av1s, az, cc, v, v_copy, vs, rnd_mod, v_internal, pc, ticks, insts,
+	exception, end_of_registers, msize, memory, bfd_mach.
+	(CCREG, PCREG, A0XREG, A0WREG, A1XREG, A1WREG, LC0REG, LT0REG,
+	LB0REG, LC1REG, LT1REG, LB1REG): Delete
+	(AXREG, AWREG, LCREG, LTREG, LBREG): Define.
+	(get_allreg): Change to new defines.  Fallback to abort().
 
-	* i386-opc.tbl: Add vmfunc.
+2011-02-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c: Add whitespace/parenthesis where needed.
+
+2011-02-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (decode_LoopSetup_0): Return when reg is greater
+	than 7.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (decode_dsp32alu_0): Fix typo with A1 reg.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (decode_dsp32mult_0): Add 1 to dst for mac1.  Output
+	dregs only when P is set, and dregs_lo otherwise.
+
+2011-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (decode_dsp32alu_0): Delete BYTEOP2M code.
+
+2011-02-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (decode_pseudoDEBUG_0): Add space after PRNT.
+
+2011-02-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (machine_registers): Delete REG_GP.
+	(reg_names): Delete "GP".
+	(decode_allregs): Change REG_GP to REG_LASTREG.
+
+2011-02-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (M_S2RND, M_T, M_W32, M_FU, M_TFU, M_IS, M_ISS2,
+	M_IH, M_IU): Delete.
+
+2011-02-11  Mike Frysinger  <vapier@gentoo.org>
+
+	* bfin-dis.c (reg_names): Add const.
+	(decode_dregs_lo, decode_dregs_hi, decode_dregs, decode_dregs_byte,
+	decode_pregs, decode_iregs, decode_mregs, decode_dpregs, decode_gregs,
+	decode_regs, decode_regs_lo, decode_regs_hi, decode_statbits,
+	decode_counters, decode_allregs): Likewise.
+
+2011-02-09  Michael Snyder  <msnyder@vmware.com>
+
+	* i386-dis.c (OP_J): Parenthesize expression to prevent
+	truncated addresses.
+	(print_insn): Fix indentation off-by-one.
+
+2011-02-01  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-01-21  Dave Murphy  <davem@devkitpro.org>
+
+	* ppc-opc.c (NON32, NO371): Remove PPC_OPCODE_PPCPS.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (sIbT): New.
+	(b_T_mode): Likewise.
+	(dis386): Replace sIb with sIbT on "pushT".
+	(x86_64_table): Replace sIb with Ib on "aam" and "aad".
+	(OP_sI): Handle b_T_mode.  Properly sign-extend byte.
+
+2011-01-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* i386-init.h: Regenerated.
+	* i386-tbl.h: Regenerated
+
+2011-01-17  Quentin Neill  <quentin.neill@amd.com>
+
+	* i386-dis.c (REG_XOP_TBM_01): New.
+	(REG_XOP_TBM_02): New.
+	(reg_table): Add REG_XOP_TBM_01 and REG_XOP_TBM_02 tables.
+	(xop_table): Redirect to REG_XOP_TBM_01 and REG_XOP_TBM_02
+	entries, and add bextr instruction.
+
+	* i386-gen.c (cpu_flag_init): Add CPU_TBM_FLAGS, CpuTBM.
+	(cpu_flags): Add CpuTBM.
+
+	* i386-opc.h (CpuTBM) New.
+	(i386_cpu_flags): Add bit cputbm.
+
+	* i386-opc.tbl: Add bextr, blcfill, blci, blcic, blcmsk,
+	blcs, blsfill, blsic, t1mskc, and tzmsk.
+
+2011-01-12  DJ Delorie  <dj@redhat.com>
+
+	* rx-dis.c (print_insn_rx): Support RX_Operand_TwoReg.
+
+2011-01-11  Mingjie Xing  <mingjie.xing@gmail.com>
+
+	* mips-dis.c (print_insn_args): Adjust the value to print the real
+	offset for "+c" argument.
+
+2011-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-01-05  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* arm-dis.c (thumb32_opcodes): BLX must have bit zero clear.
+
+2011-01-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (REG_VEX_38F3): New.
+	(PREFIX_0FBC): Likewise.
+	(PREFIX_VEX_38F2): Likewise.
+	(PREFIX_VEX_38F3_REG_1): Likewise.
+	(PREFIX_VEX_38F3_REG_2): Likewise.
+	(PREFIX_VEX_38F3_REG_3): Likewise.
+	(PREFIX_VEX_38F7): Likewise.
+	(VEX_LEN_38F2_P_0): Likewise.
+	(VEX_LEN_38F3_R_1_P_0): Likewise.
+	(VEX_LEN_38F3_R_2_P_0): Likewise.
+	(VEX_LEN_38F3_R_3_P_0): Likewise.
+	(VEX_LEN_38F7_P_0): Likewise.
+	(dis386_twobyte): Use PREFIX_0FBC.
+	(reg_table): Add REG_VEX_38F3.
+	(prefix_table): Add PREFIX_0FBC, PREFIX_VEX_38F2,
+	PREFIX_VEX_38F3_REG_1, PREFIX_VEX_38F3_REG_2,
+	PREFIX_VEX_38F3_REG_3 and PREFIX_VEX_38F7.
+	(vex_table): Use PREFIX_VEX_38F2, REG_VEX_38F3 and
+	PREFIX_VEX_38F7.
+	(vex_len_table): Add VEX_LEN_38F2_P_0, VEX_LEN_38F3_R_1_P_0,
+	VEX_LEN_38F3_R_2_P_0, VEX_LEN_38F3_R_3_P_0 and
+	VEX_LEN_38F7_P_0.
+
+	* i386-gen.c (cpu_flag_init): Add CPU_BMI_FLAGS.
+	(cpu_flags): Add CpuBMI.
+
+	* i386-opc.h (CpuBMI): New.
+	(i386_cpu_flags): Add cpubmi.
+
+	* i386-opc.tbl: Add andn, bextr, blsi, blsmsk, blsr and tzcnt.
 	* i386-init.h: Regenerated.
 	* i386-tbl.h: Likewise.
 
-For older changes see ChangeLog-2011
+2011-01-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (VexGdq): New.
+	(OP_VEX): Handle dq_mode.
+
+2011-01-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-gen.c (process_copyright): Update copyright to 2011.
+
+For older changes see ChangeLog-2010
 
 Local Variables:
 mode: change-log
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index b377c4d17c..ec7fa3e64c 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -41,7 +41,6 @@ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@
 
 # Header files.
 HFILES = \
-	epiphany-desc.h epiphany-opc.h \
 	fr30-desc.h fr30-opc.h \
 	frv-desc.h frv-opc.h \
 	h8500-opc.h \
@@ -96,11 +95,6 @@ TARGET_LIBOPCODES_CFILES = \
 	d30v-dis.c \
 	d30v-opc.c \
 	dlx-dis.c \
-	epiphany-asm.c \
-	epiphany-desc.c \
-	epiphany-dis.c \
-	epiphany-ibld.c \
-	epiphany-opc.c \
 	fr30-asm.c \
 	fr30-desc.c \
 	fr30-dis.c \
@@ -193,8 +187,6 @@ TARGET_LIBOPCODES_CFILES = \
 	pj-opc.c \
 	ppc-dis.c \
 	ppc-opc.c \
-	rl78-decode.c \
-	rl78-dis.c \
 	rx-decode.c \
 	rx-dis.c \
 	s390-dis.c \
@@ -319,7 +311,7 @@ po/POTFILES.in: @MAINT@ Makefile
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 CLEANFILES = \
-	stamp-epiphany stamp-fr30 stamp-frv stamp-ip2k stamp-iq2000 stamp-lm32 \
+	stamp-fr30 stamp-frv stamp-ip2k stamp-iq2000 stamp-lm32 \
 	stamp-m32c stamp-m32r stamp-mep stamp-mt \
 	stamp-openrisc stamp-xc16x stamp-xstormy16 \
 	libopcodes.a stamp-lib
@@ -337,10 +329,9 @@ CGENDEPS = \
 	$(CGENDIR)/opc-opinst.scm \
 	cgen-asm.in cgen-dis.in cgen-ibld.in
 
-CGEN_CPUS = epiphany fr30 frv ip2k iq2000 lm32 m32c m32r mep mt openrisc xc16x xstormy16
+CGEN_CPUS = fr30 frv ip2k iq2000 lm32 m32c m32r mep mt openrisc xc16x xstormy16
 
 if CGEN_MAINT
-EPIPHANY_DEPS = stamp-epiphany
 FR30_DEPS = stamp-fr30
 FRV_DEPS = stamp-frv
 IP2K_DEPS = stamp-ip2k
@@ -354,7 +345,6 @@ OPENRISC_DEPS = stamp-openrisc
 XC16X_DEPS = stamp-xc16x
 XSTORMY16_DEPS = stamp-xstormy16
 else
-EPIPHANY_DEPS =
 FR30_DEPS =
 FRV_DEPS =
 IP2K_DEPS =
@@ -386,16 +376,6 @@ run-cgen-all:
 
 # For now, require developers to configure with --enable-cgen-maint.
 
-$(srcdir)/epiphany-desc.h $(srcdir)/epiphany-desc.c $(srcdir)/epiphany-opc.h \
-		$(srcdir)/epiphany-opc.c $(srcdir)/epiphany-ibld.c \
-		$(srcdir)/epiphany-opinst.c $(srcdir)/epiphany-asm.c \
-		$(srcdir)/epiphany-dis.c: $(EPIPHANY_DEPS)
-	@true
-
-stamp-epiphany: $(CGENDEPS) $(CPUDIR)/epiphany.cpu $(CPUDIR)/epiphany.opc
-	$(MAKE) run-cgen arch=epiphany prefix=epiphany options= \
-		archfile=$(CPUDIR)/epiphany.cpu opcfile=$(CPUDIR)/epiphany.opc extrafiles=
-
 $(srcdir)/fr30-desc.h $(srcdir)/fr30-desc.c $(srcdir)/fr30-opc.h $(srcdir)/fr30-opc.c $(srcdir)/fr30-ibld.c $(srcdir)/fr30-asm.c $(srcdir)/fr30-dis.c: $(FR30_DEPS)
 	@true
 stamp-fr30: $(CGENDEPS) $(CPUDIR)/fr30.cpu $(CPUDIR)/fr30.opc
@@ -484,7 +464,6 @@ MOSTLYCLEANFILES = i386-gen$(EXEEXT_FOR_BUILD) ia64-gen$(EXEEXT_FOR_BUILD) \
 
 MAINTAINERCLEANFILES = $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h \
 	$(srcdir)/ia64-asmtab.c $(srcdir)/z8k-opc.h \
-	$(srcdir)/rl78-decode.c \
 	$(srcdir)/rx-decode.c
 
 i386-gen$(EXEEXT_FOR_BUILD): i386-gen.o $(BUILD_LIB_DEPS)
@@ -523,9 +502,6 @@ $(srcdir)/ia64-asmtab.c: @MAINT@ $(ia64_asmtab_deps)
 
 ia64-opc.lo: $(srcdir)/ia64-asmtab.c
 
-$(srcdir)/rl78-decode.c: @MAINT@ $(srcdir)/rl78-decode.opc opc2c$(EXEEXT_FOR_BUILD)
-	./opc2c$(EXEEXT_FOR_BUILD) $(srcdir)/rl78-decode.opc > $(srcdir)/rl78-decode.c
-
 $(srcdir)/rx-decode.c: @MAINT@ $(srcdir)/rx-decode.opc opc2c$(EXEEXT_FOR_BUILD)
 	./opc2c$(EXEEXT_FOR_BUILD) $(srcdir)/rx-decode.opc > $(srcdir)/rx-decode.c
 
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 8ae4b841c9..7d260a7602 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -310,7 +310,6 @@ BFD_H = ../bfd/bfd.h
 
 # Header files.
 HFILES = \
-	epiphany-desc.h epiphany-opc.h \
 	fr30-desc.h fr30-opc.h \
 	frv-desc.h frv-opc.h \
 	h8500-opc.h \
@@ -366,11 +365,6 @@ TARGET_LIBOPCODES_CFILES = \
 	d30v-dis.c \
 	d30v-opc.c \
 	dlx-dis.c \
-	epiphany-asm.c \
-	epiphany-desc.c \
-	epiphany-dis.c \
-	epiphany-ibld.c \
-	epiphany-opc.c \
 	fr30-asm.c \
 	fr30-desc.c \
 	fr30-dis.c \
@@ -463,8 +457,6 @@ TARGET_LIBOPCODES_CFILES = \
 	pj-opc.c \
 	ppc-dis.c \
 	ppc-opc.c \
-	rl78-decode.c \
-	rl78-dis.c \
 	rx-decode.c \
 	rx-dis.c \
 	s390-dis.c \
@@ -558,7 +550,7 @@ noinst_LIBRARIES = libopcodes.a
 libopcodes_a_SOURCES = 
 POTFILES = $(HFILES) $(CFILES)
 CLEANFILES = \
-	stamp-epiphany stamp-fr30 stamp-frv stamp-ip2k stamp-iq2000 stamp-lm32 \
+	stamp-fr30 stamp-frv stamp-ip2k stamp-iq2000 stamp-lm32 \
 	stamp-m32c stamp-m32r stamp-mep stamp-mt \
 	stamp-openrisc stamp-xc16x stamp-xstormy16 \
 	libopcodes.a stamp-lib
@@ -574,9 +566,7 @@ CGENDEPS = \
 	$(CGENDIR)/opc-opinst.scm \
 	cgen-asm.in cgen-dis.in cgen-ibld.in
 
-CGEN_CPUS = epiphany fr30 frv ip2k iq2000 lm32 m32c m32r mep mt openrisc xc16x xstormy16
-@CGEN_MAINT_FALSE@EPIPHANY_DEPS = 
-@CGEN_MAINT_TRUE@EPIPHANY_DEPS = stamp-epiphany
+CGEN_CPUS = fr30 frv ip2k iq2000 lm32 m32c m32r mep mt openrisc xc16x xstormy16
 @CGEN_MAINT_FALSE@FR30_DEPS = 
 @CGEN_MAINT_TRUE@FR30_DEPS = stamp-fr30
 @CGEN_MAINT_FALSE@FRV_DEPS = 
@@ -607,7 +597,6 @@ MOSTLYCLEANFILES = i386-gen$(EXEEXT_FOR_BUILD) ia64-gen$(EXEEXT_FOR_BUILD) \
 
 MAINTAINERCLEANFILES = $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h \
 	$(srcdir)/ia64-asmtab.c $(srcdir)/z8k-opc.h \
-	$(srcdir)/rl78-decode.c \
 	$(srcdir)/rx-decode.c
 
 
@@ -752,11 +741,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dis-init.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disassemble.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlx-dis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-asm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-desc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-dis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-ibld.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-opc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fr30-asm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fr30-desc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fr30-dis.Plo@am__quote@
@@ -849,8 +833,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj-opc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc-dis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc-opc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl78-decode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl78-dis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rx-decode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rx-dis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s390-dis.Plo@am__quote@
@@ -1247,16 +1229,6 @@ run-cgen-all:
 
 # For now, require developers to configure with --enable-cgen-maint.
 
-$(srcdir)/epiphany-desc.h $(srcdir)/epiphany-desc.c $(srcdir)/epiphany-opc.h \
-		$(srcdir)/epiphany-opc.c $(srcdir)/epiphany-ibld.c \
-		$(srcdir)/epiphany-opinst.c $(srcdir)/epiphany-asm.c \
-		$(srcdir)/epiphany-dis.c: $(EPIPHANY_DEPS)
-	@true
-
-stamp-epiphany: $(CGENDEPS) $(CPUDIR)/epiphany.cpu $(CPUDIR)/epiphany.opc
-	$(MAKE) run-cgen arch=epiphany prefix=epiphany options= \
-		archfile=$(CPUDIR)/epiphany.cpu opcfile=$(CPUDIR)/epiphany.opc extrafiles=
-
 $(srcdir)/fr30-desc.h $(srcdir)/fr30-desc.c $(srcdir)/fr30-opc.h $(srcdir)/fr30-opc.c $(srcdir)/fr30-ibld.c $(srcdir)/fr30-asm.c $(srcdir)/fr30-dis.c: $(FR30_DEPS)
 	@true
 stamp-fr30: $(CGENDEPS) $(CPUDIR)/fr30.cpu $(CPUDIR)/fr30.opc
@@ -1370,9 +1342,6 @@ $(srcdir)/ia64-asmtab.c: @MAINT@ $(ia64_asmtab_deps)
 
 ia64-opc.lo: $(srcdir)/ia64-asmtab.c
 
-$(srcdir)/rl78-decode.c: @MAINT@ $(srcdir)/rl78-decode.opc opc2c$(EXEEXT_FOR_BUILD)
-	./opc2c$(EXEEXT_FOR_BUILD) $(srcdir)/rl78-decode.opc > $(srcdir)/rl78-decode.c
-
 $(srcdir)/rx-decode.c: @MAINT@ $(srcdir)/rx-decode.opc opc2c$(EXEEXT_FOR_BUILD)
 	./opc2c$(EXEEXT_FOR_BUILD) $(srcdir)/rx-decode.opc > $(srcdir)/rx-decode.c
 
diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c
index ac7379d7b7..b4cc241615 100644
--- a/opcodes/arc-dis.c
+++ b/opcodes/arc-dis.c
@@ -1,6 +1,6 @@
 /* Instruction printing code for the ARC.
-   Copyright 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2005, 2007, 2009,
-   2010, 2012 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2005, 2007, 2009, 2010
+   Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
    This file is part of libopcodes.
@@ -60,14 +60,15 @@ typedef enum
 } a4_decoding_class;
 
 #define BIT(word,n)	((word) & (1 << n))
-#define BITS(word,s,e)  (((word) >> s) & ((1 << (e + 1 - s)) - 1))
+#define BITS(word,s,e)  (((word) << (31 - e)) >> (s + (31 - e)))
 #define OPCODE(word)	(BITS ((word), 27, 31))
 #define FIELDA(word)	(BITS ((word), 21, 26))
 #define FIELDB(word)	(BITS ((word), 15, 20))
 #define FIELDC(word)	(BITS ((word),  9, 14))
 
-/* FIELD D is signed.  */
-#define FIELDD(word)	((BITS ((word), 0, 8) ^ 0x100) - 0x100)
+/* FIELD D is signed in all of its uses, so we make sure argument is
+   treated as signed for bit shifting purposes:  */
+#define FIELDD(word)	(BITS (((signed int)word), 0, 8))
 
 #define PUT_NEXT_WORD_IN(a)						\
   do									\
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 03062ad4d9..fafa7f6853 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -3140,23 +3140,13 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info, long given)
 		    case 'o':
 		      if ((given & 0x02000000) != 0)
 			{
-			  unsigned int rotate = (given & 0xf00) >> 7;
-			  unsigned int immed = (given & 0xff);
-			  unsigned int a, i;
-
-			  a = (((immed << (32 - rotate))
-				| (immed >> rotate)) & 0xffffffff);
-			  /* If there is another encoding with smaller rotate,
-			     the rotate should be specified directly.  */
-			  for (i = 0; i < 32; i += 2)
-			    if ((a << i | a >> (32 - i)) <= 0xff)
-			      break;
+			  int rotate = (given & 0xf00) >> 7;
+			  int immed = (given & 0xff);
 
-			  if (i != rotate)
-			    func (stream, "#%d, %d", immed, rotate);
-			  else
-			    func (stream, "#%d", a);
-			  value_in_comment = a;
+			  immed = (((immed << (32 - rotate))
+				    | (immed >> rotate)) & 0xffffffff);
+			  func (stream, "#%d", immed);
+			  value_in_comment = immed;
 			}
 		      else
 			arm_decode_shift (given, func, stream, TRUE);
diff --git a/opcodes/cgen-asm.c b/opcodes/cgen-asm.c
index 901a578f54..f5fde40829 100644
--- a/opcodes/cgen-asm.c
+++ b/opcodes/cgen-asm.c
@@ -1,6 +1,6 @@
 /* CGEN generic assembler support code.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007,
-   2011  Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
 
    This file is part of libopcodes.
 
@@ -268,23 +268,7 @@ cgen_parse_signed_integer (CGEN_CPU_DESC cd,
      &result, &value);
   /* FIXME: Examine `result'.  */
   if (!errmsg)
-    {
-      /* Handle the case where a hex value is parsed on a 64-bit host.
-	 A value like 0xffffe000 is clearly intended to be a negative
-	 16-bit value, but on a 64-bit host it will be parsed by gas
-	 as 0x00000000ffffe000.
-
-	 The shifts below are designed not to produce compile time
-	 warnings on a 32-bit host.  */
-      if (sizeof (value) > 4
-	  && result == CGEN_PARSE_OPERAND_RESULT_NUMBER
-	  && value > 0
-	  && (value & 0x80000000)
-	  && ((value >> 31) == 1))
-	value |= -1 << 31;
-
-      *valuep = value;
-    }
+    *valuep = value;
   return errmsg;
 }
 
diff --git a/opcodes/configure b/opcodes/configure
index cc690608e6..746070e550 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -11652,7 +11652,7 @@ fi
 
 # host-specific stuff:
 
-ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN it"
+ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN"
 # If we haven't got the data from the intl directory,
 # assume NLS is disabled.
 USE_NLS=no
@@ -12429,7 +12429,6 @@ if test x${all_targets} = xfalse ; then
 	bfd_i960_arch)		ta="$ta i960-dis.lo" ;;
 	bfd_ia64_arch)		ta="$ta ia64-dis.lo ia64-opc.lo" ;;
 	bfd_ip2k_arch)		ta="$ta ip2k-asm.lo ip2k-desc.lo ip2k-dis.lo ip2k-ibld.lo ip2k-opc.lo" using_cgen=yes ;;
-	bfd_epiphany_arch)		ta="$ta epiphany-asm.lo epiphany-desc.lo epiphany-dis.lo epiphany-ibld.lo epiphany-opc.lo" using_cgen=yes ;;
         bfd_iq2000_arch)        ta="$ta iq2000-asm.lo iq2000-desc.lo iq2000-dis.lo iq2000-ibld.lo iq2000-opc.lo" using_cgen=yes ;;
 	bfd_lm32_arch)          ta="$ta lm32-asm.lo lm32-desc.lo lm32-dis.lo lm32-ibld.lo lm32-opc.lo lm32-opinst.lo" using_cgen=yes ;;
 	bfd_m32c_arch)		ta="$ta m32c-asm.lo m32c-desc.lo m32c-dis.lo m32c-ibld.lo m32c-opc.lo" using_cgen=yes ;;
@@ -12457,7 +12456,6 @@ if test x${all_targets} = xfalse ; then
 	bfd_pyramid_arch)	;;
 	bfd_romp_arch)		;;
 	bfd_rs6000_arch)	ta="$ta ppc-dis.lo ppc-opc.lo" ;;
-	bfd_rl78_arch)		ta="$ta rl78-dis.lo rl78-decode.lo";;
 	bfd_rx_arch)		ta="$ta rx-dis.lo rx-decode.lo";;
 	bfd_s390_arch)		ta="$ta s390-dis.lo s390-opc.lo" ;;
 	bfd_score_arch)         ta="$ta score-dis.lo score7-dis.lo" ;;
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 6da3ef1acd..3776be37fc 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -55,7 +55,7 @@ AC_EXEEXT
 
 # host-specific stuff:
 
-ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN it"
+ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
@@ -243,7 +243,6 @@ if test x${all_targets} = xfalse ; then
 	bfd_i960_arch)		ta="$ta i960-dis.lo" ;;
 	bfd_ia64_arch)		ta="$ta ia64-dis.lo ia64-opc.lo" ;;
 	bfd_ip2k_arch)		ta="$ta ip2k-asm.lo ip2k-desc.lo ip2k-dis.lo ip2k-ibld.lo ip2k-opc.lo" using_cgen=yes ;;
-	bfd_epiphany_arch)		ta="$ta epiphany-asm.lo epiphany-desc.lo epiphany-dis.lo epiphany-ibld.lo epiphany-opc.lo" using_cgen=yes ;;
         bfd_iq2000_arch)        ta="$ta iq2000-asm.lo iq2000-desc.lo iq2000-dis.lo iq2000-ibld.lo iq2000-opc.lo" using_cgen=yes ;;
 	bfd_lm32_arch)          ta="$ta lm32-asm.lo lm32-desc.lo lm32-dis.lo lm32-ibld.lo lm32-opc.lo lm32-opinst.lo" using_cgen=yes ;;
 	bfd_m32c_arch)		ta="$ta m32c-asm.lo m32c-desc.lo m32c-dis.lo m32c-ibld.lo m32c-opc.lo" using_cgen=yes ;;
@@ -271,7 +270,6 @@ if test x${all_targets} = xfalse ; then
 	bfd_pyramid_arch)	;;
 	bfd_romp_arch)		;;
 	bfd_rs6000_arch)	ta="$ta ppc-dis.lo ppc-opc.lo" ;;
-	bfd_rl78_arch)		ta="$ta rl78-dis.lo rl78-decode.lo";;
 	bfd_rx_arch)		ta="$ta rx-dis.lo rx-decode.lo";;
 	bfd_s390_arch)		ta="$ta s390-dis.lo s390-opc.lo" ;;
 	bfd_score_arch)         ta="$ta score-dis.lo score7-dis.lo" ;;
diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index 1fc8c2b7a6..0aaf61c327 100644
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler code for CR16.
-   Copyright 2007, 2008, 2009, 2012  Free Software Foundation, Inc.
+   Copyright 2007, 2008, 2009  Free Software Foundation, Inc.
    Contributed by M R Swami Reddy (MR.Swami.Reddy@nsc.com).
 
    This file is part of GAS, GDB and the GNU binutils.
@@ -679,7 +679,7 @@ print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
 	(sign_flag) ? func (stream, "%s", "*-"): func (stream, "%s","*+");
 
       /* PR 10173: Avoid printing the 0x prefix twice.  */
-      if (info->symtab_size > 0)
+      if (info->num_symbols > 0)
 	func (stream, "%s", "0x");
       number = ((relative ? memaddr : 0) +
 		(sign_flag ? ((- a->constant) & 0xffffffe) : a->constant));
diff --git a/opcodes/crx-dis.c b/opcodes/crx-dis.c
index 35168bc97d..f909897444 100644
--- a/opcodes/crx-dis.c
+++ b/opcodes/crx-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler code for CRX.
-   Copyright 2004, 2005, 2006, 2007, 2012 Free Software Foundation, Inc.
+   Copyright 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    Contributed by Tomer Levi, NSC, Israel.
    Written by Tomer Levi.
 
@@ -548,7 +548,7 @@ print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
 		    func (stream, "%s", string);
 		  }
 		else
-		  func (stream, "$0x%lx", a->constant & 0xffffffff);
+		  func (stream, "$0x%lx", a->constant);
 	    }
 	  else
             {
@@ -557,12 +557,12 @@ print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
             }
         }
       else
-	func (stream, "$0x%lx", a->constant & 0xffffffff);
+	func (stream, "$0x%lx", a->constant);
       break;
 
     case arg_idxr:
-      func (stream, "0x%lx(%s,%s,%d)", a->constant & 0xffffffff,
-	    getregname (a->r), getregname (a->i_r), powerof2 (a->scale));
+      func (stream, "0x%lx(%s,%s,%d)", a->constant, getregname (a->r),
+	    getregname (a->i_r), powerof2 (a->scale));
       break;
 
     case arg_rbase:
@@ -570,7 +570,7 @@ print_arg (argument *a, bfd_vma memaddr, struct disassemble_info *info)
       break;
 
     case arg_cr:
-      func (stream, "0x%lx(%s)", a->constant & 0xffffffff, getregname (a->r));
+      func (stream, "0x%lx(%s)", a->constant, getregname (a->r));
 
       if (IS_INSN_TYPE (LD_STOR_INS_INC))
 	func (stream, "+");
diff --git a/opcodes/crx-opc.c b/opcodes/crx-opc.c
index 65e2e86cf7..b046c913e3 100644
--- a/opcodes/crx-opc.c
+++ b/opcodes/crx-opc.c
@@ -1,5 +1,5 @@
 /* crx-opc.c -- Table of opcodes for the CRX processor.
-   Copyright 2004, 2005, 2007, 2012 Free Software Foundation, Inc.
+   Copyright 2004, 2005, 2007 Free Software Foundation, Inc.
    Contributed by Tomer Levi NSC, Israel.
    Originally written for GAS 2.12 by Tomer Levi.
 
@@ -701,7 +701,7 @@ The value in entry <N> is mapped to the value <N>
 Example (for N=5):
 
     cst4_map[5]=-4  -->>	5		*/
-const int cst4_map[] =
+const long cst4_map[] =
 {
   0, 1, 2, 3, 4, -4, -1, 7, 8, 16, 32, 20, 12, 48
 };
diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index 43e1d53eb4..2919271620 100644
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -1,7 +1,6 @@
 /* Select disassembly routine for specified architecture.
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -35,7 +34,6 @@
 #define ARCH_d10v
 #define ARCH_d30v
 #define ARCH_dlx
-#define ARCH_epiphany
 #define ARCH_fr30
 #define ARCH_frv
 #define ARCH_h8300
@@ -72,7 +70,6 @@
 #define ARCH_pj
 #define ARCH_powerpc
 #define ARCH_rs6000
-#define ARCH_rl78
 #define ARCH_rx
 #define ARCH_s390
 #define ARCH_score
@@ -227,11 +224,6 @@ disassembler (abfd)
       disassemble = print_insn_ip2k;
       break;
 #endif
-#ifdef ARCH_epiphany
-    case bfd_arch_epiphany:
-      disassemble = print_insn_epiphany;
-      break;
-#endif
 #ifdef ARCH_fr30
     case bfd_arch_fr30:
       disassemble = print_insn_fr30;
@@ -357,11 +349,6 @@ disassembler (abfd)
 	disassemble = print_insn_rs6000;
       break;
 #endif
-#ifdef ARCH_rl78
-    case bfd_arch_rl78:
-      disassemble = print_insn_rl78;
-      break;
-#endif
 #ifdef ARCH_rx
     case bfd_arch_rx:
       disassemble = print_insn_rx;
@@ -567,16 +554,6 @@ disassemble_init_for_target (struct disassemble_info * info)
 	}
       break;
 #endif
-#ifdef ARCH_powerpc
-    case bfd_arch_powerpc:
-#endif
-#ifdef ARCH_rs6000
-    case bfd_arch_rs6000:
-#endif
-#if defined (ARCH_powerpc) || defined (ARCH_rs6000)
-      disassemble_init_powerpc (info);
-      break;
-#endif
     default:
       break;
     }
diff --git a/opcodes/frv-asm.c b/opcodes/frv-asm.c
index 3da8261621..dffa059ec2 100644
--- a/opcodes/frv-asm.c
+++ b/opcodes/frv-asm.c
@@ -465,11 +465,11 @@ parse_uhi16 (CGEN_CPU_DESC cd,
 	  if (errmsg == NULL
 	      && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
 	    {
- 	      /* If value is wider than 32 bits then be
- 		 careful about how we extract bits 16-31.  */
- 	      if (sizeof (value) > 4)
- 		value &= (((bfd_vma)1 << 16) << 16) - 1;
-
+	      /* If bfd_vma is wider than 32 bits, but we have a sign-
+		 or zero-extension, truncate it.  */
+	      if (value >= - ((bfd_vma)1 << 31)
+		  || value <= ((bfd_vma)1 << 31) - (bfd_vma)1)
+		value &= (((bfd_vma)1 << 16) << 16) - 1;
 	      value >>= 16;
 	    }
 	  *valuep = value;
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 4a014410fa..85b63ea445 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -108,9 +108,6 @@ static void OP_3DNowSuffix (int, int);
 static void CMP_Fixup (int, int);
 static void BadOp (void);
 static void REP_Fixup (int, int);
-static void HLE_Fixup1 (int, int);
-static void HLE_Fixup2 (int, int);
-static void HLE_Fixup3 (int, int);
 static void CMPXCHG8B_Fixup (int, int);
 static void XMM_Fixup (int, int);
 static void CRC32_Fixup (int, int);
@@ -415,14 +412,6 @@ fetch_data (struct disassemble_info *info, bfd_byte *addr)
 #define ALr { REP_Fixup, al_reg }
 #define eAXr { REP_Fixup, eAX_reg }
 
-/* Used handle HLE prefix for lockable instructions.  */
-#define Ebh1 { HLE_Fixup1, b_mode }
-#define Evh1 { HLE_Fixup1, v_mode }
-#define Ebh2 { HLE_Fixup2, b_mode }
-#define Evh2 { HLE_Fixup2, v_mode }
-#define Ebh3 { HLE_Fixup3, b_mode }
-#define Evh3 { HLE_Fixup3, v_mode }
-
 #define cond_jump_flag { NULL, cond_jump_mode }
 #define loop_jcxz_flag { NULL, loop_jcxz_mode }
 
@@ -653,8 +642,6 @@ enum
 enum
 {
   MOD_8D = 0,
-  MOD_C6_REG_7,
-  MOD_C7_REG_7,
   MOD_0F01_REG_0,
   MOD_0F01_REG_1,
   MOD_0F01_REG_2,
@@ -743,9 +730,7 @@ enum
 
 enum
 {
-  RM_C6_REG_7 = 0,
-  RM_C7_REG_7,
-  RM_0F01_REG_0,
+  RM_0F01_REG_0 = 0,
   RM_0F01_REG_1,
   RM_0F01_REG_2,
   RM_0F01_REG_3,
@@ -1661,8 +1646,8 @@ struct dis386 {
 
 static const struct dis386 dis386[] = {
   /* 00 */
-  { "addB",		{ Ebh1, Gb } },
-  { "addS",		{ Evh1, Gv } },
+  { "addB",		{ Eb, Gb } },
+  { "addS",		{ Ev, Gv } },
   { "addB",		{ Gb, EbS } },
   { "addS",		{ Gv, EvS } },
   { "addB",		{ AL, Ib } },
@@ -1670,8 +1655,8 @@ static const struct dis386 dis386[] = {
   { X86_64_TABLE (X86_64_06) },
   { X86_64_TABLE (X86_64_07) },
   /* 08 */
-  { "orB",		{ Ebh1, Gb } },
-  { "orS",		{ Evh1, Gv } },
+  { "orB",		{ Eb, Gb } },
+  { "orS",		{ Ev, Gv } },
   { "orB",		{ Gb, EbS } },
   { "orS",		{ Gv, EvS } },
   { "orB",		{ AL, Ib } },
@@ -1679,8 +1664,8 @@ static const struct dis386 dis386[] = {
   { X86_64_TABLE (X86_64_0D) },
   { Bad_Opcode },	/* 0x0f extended opcode escape */
   /* 10 */
-  { "adcB",		{ Ebh1, Gb } },
-  { "adcS",		{ Evh1, Gv } },
+  { "adcB",		{ Eb, Gb } },
+  { "adcS",		{ Ev, Gv } },
   { "adcB",		{ Gb, EbS } },
   { "adcS",		{ Gv, EvS } },
   { "adcB",		{ AL, Ib } },
@@ -1688,8 +1673,8 @@ static const struct dis386 dis386[] = {
   { X86_64_TABLE (X86_64_16) },
   { X86_64_TABLE (X86_64_17) },
   /* 18 */
-  { "sbbB",		{ Ebh1, Gb } },
-  { "sbbS",		{ Evh1, Gv } },
+  { "sbbB",		{ Eb, Gb } },
+  { "sbbS",		{ Ev, Gv } },
   { "sbbB",		{ Gb, EbS } },
   { "sbbS",		{ Gv, EvS } },
   { "sbbB",		{ AL, Ib } },
@@ -1697,8 +1682,8 @@ static const struct dis386 dis386[] = {
   { X86_64_TABLE (X86_64_1E) },
   { X86_64_TABLE (X86_64_1F) },
   /* 20 */
-  { "andB",		{ Ebh1, Gb } },
-  { "andS",		{ Evh1, Gv } },
+  { "andB",		{ Eb, Gb } },
+  { "andS",		{ Ev, Gv } },
   { "andB",		{ Gb, EbS } },
   { "andS",		{ Gv, EvS } },
   { "andB",		{ AL, Ib } },
@@ -1706,8 +1691,8 @@ static const struct dis386 dis386[] = {
   { Bad_Opcode },	/* SEG ES prefix */
   { X86_64_TABLE (X86_64_27) },
   /* 28 */
-  { "subB",		{ Ebh1, Gb } },
-  { "subS",		{ Evh1, Gv } },
+  { "subB",		{ Eb, Gb } },
+  { "subS",		{ Ev, Gv } },
   { "subB",		{ Gb, EbS } },
   { "subS",		{ Gv, EvS } },
   { "subB",		{ AL, Ib } },
@@ -1715,8 +1700,8 @@ static const struct dis386 dis386[] = {
   { Bad_Opcode },	/* SEG CS prefix */
   { X86_64_TABLE (X86_64_2F) },
   /* 30 */
-  { "xorB",		{ Ebh1, Gb } },
-  { "xorS",		{ Evh1, Gv } },
+  { "xorB",		{ Eb, Gb } },
+  { "xorS",		{ Ev, Gv } },
   { "xorB",		{ Gb, EbS } },
   { "xorS",		{ Gv, EvS } },
   { "xorB",		{ AL, Ib } },
@@ -1811,11 +1796,11 @@ static const struct dis386 dis386[] = {
   { REG_TABLE (REG_82) },
   { "testB",		{ Eb, Gb } },
   { "testS",		{ Ev, Gv } },
-  { "xchgB",		{ Ebh2, Gb } },
-  { "xchgS",		{ Evh2, Gv } },
+  { "xchgB",		{ Eb, Gb } },
+  { "xchgS",		{ Ev, Gv } },
   /* 88 */
-  { "movB",		{ Ebh3, Gb } },
-  { "movS",		{ Evh3, Gv } },
+  { "movB",		{ Eb, Gb } },
+  { "movS",		{ Ev, Gv } },
   { "movB",		{ Gb, EbS } },
   { "movS",		{ Gv, EvS } },
   { "movD",		{ Sv, Sw } },
@@ -2144,16 +2129,16 @@ static const struct dis386 dis386_twobyte[] = {
   { "pushT",		{ gs } },
   { "popT",		{ gs } },
   { "rsm",		{ XX } },
-  { "btsS",		{ Evh1, Gv } },
+  { "btsS",		{ Ev, Gv } },
   { "shrdS",		{ Ev, Gv, Ib } },
   { "shrdS",		{ Ev, Gv, CL } },
   { REG_TABLE (REG_0FAE) },
   { "imulS",		{ Gv, Ev } },
   /* b0 */
-  { "cmpxchgB",		{ Ebh1, Gb } },
-  { "cmpxchgS",		{ Evh1, Gv } },
+  { "cmpxchgB",		{ Eb, Gb } },
+  { "cmpxchgS",		{ Ev, Gv } },
   { MOD_TABLE (MOD_0FB2) },
-  { "btrS",		{ Evh1, Gv } },
+  { "btrS",		{ Ev, Gv } },
   { MOD_TABLE (MOD_0FB4) },
   { MOD_TABLE (MOD_0FB5) },
   { "movz{bR|x}",	{ Gv, Eb } },
@@ -2162,14 +2147,14 @@ static const struct dis386 dis386_twobyte[] = {
   { PREFIX_TABLE (PREFIX_0FB8) },
   { "ud1",		{ XX } },
   { REG_TABLE (REG_0FBA) },
-  { "btcS",		{ Evh1, Gv } },
+  { "btcS",		{ Ev, Gv } },
   { PREFIX_TABLE (PREFIX_0FBC) },
   { PREFIX_TABLE (PREFIX_0FBD) },
   { "movs{bR|x}",	{ Gv, Eb } },
   { "movs{wR|x}",	{ Gv, Ew } }, /* yes, there really is movsww ! */
   /* c0 */
-  { "xaddB",		{ Ebh1, Gb } },
-  { "xaddS",		{ Evh1, Gv } },
+  { "xaddB",		{ Eb, Gb } },
+  { "xaddS",		{ Ev, Gv } },
   { PREFIX_TABLE (PREFIX_0FC2) },
   { PREFIX_TABLE (PREFIX_0FC3) },
   { "pinsrw",		{ MX, Edqw, Ib } },
@@ -2451,35 +2436,35 @@ static const char *att_names_ymm[] = {
 static const struct dis386 reg_table[][8] = {
   /* REG_80 */
   {
-    { "addA",	{ Ebh1, Ib } },
-    { "orA",	{ Ebh1, Ib } },
-    { "adcA",	{ Ebh1, Ib } },
-    { "sbbA",	{ Ebh1, Ib } },
-    { "andA",	{ Ebh1, Ib } },
-    { "subA",	{ Ebh1, Ib } },
-    { "xorA",	{ Ebh1, Ib } },
+    { "addA",	{ Eb, Ib } },
+    { "orA",	{ Eb, Ib } },
+    { "adcA",	{ Eb, Ib } },
+    { "sbbA",	{ Eb, Ib } },
+    { "andA",	{ Eb, Ib } },
+    { "subA",	{ Eb, Ib } },
+    { "xorA",	{ Eb, Ib } },
     { "cmpA",	{ Eb, Ib } },
   },
   /* REG_81 */
   {
-    { "addQ",	{ Evh1, Iv } },
-    { "orQ",	{ Evh1, Iv } },
-    { "adcQ",	{ Evh1, Iv } },
-    { "sbbQ",	{ Evh1, Iv } },
-    { "andQ",	{ Evh1, Iv } },
-    { "subQ",	{ Evh1, Iv } },
-    { "xorQ",	{ Evh1, Iv } },
+    { "addQ",	{ Ev, Iv } },
+    { "orQ",	{ Ev, Iv } },
+    { "adcQ",	{ Ev, Iv } },
+    { "sbbQ",	{ Ev, Iv } },
+    { "andQ",	{ Ev, Iv } },
+    { "subQ",	{ Ev, Iv } },
+    { "xorQ",	{ Ev, Iv } },
     { "cmpQ",	{ Ev, Iv } },
   },
   /* REG_82 */
   {
-    { "addQ",	{ Evh1, sIb } },
-    { "orQ",	{ Evh1, sIb } },
-    { "adcQ",	{ Evh1, sIb } },
-    { "sbbQ",	{ Evh1, sIb } },
-    { "andQ",	{ Evh1, sIb } },
-    { "subQ",	{ Evh1, sIb } },
-    { "xorQ",	{ Evh1, sIb } },
+    { "addQ",	{ Ev, sIb } },
+    { "orQ",	{ Ev, sIb } },
+    { "adcQ",	{ Ev, sIb } },
+    { "sbbQ",	{ Ev, sIb } },
+    { "andQ",	{ Ev, sIb } },
+    { "subQ",	{ Ev, sIb } },
+    { "xorQ",	{ Ev, sIb } },
     { "cmpQ",	{ Ev, sIb } },
   },
   /* REG_8F */
@@ -2515,25 +2500,11 @@ static const struct dis386 reg_table[][8] = {
   },
   /* REG_C6 */
   {
-    { "movA",	{ Ebh3, Ib } },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { MOD_TABLE (MOD_C6_REG_7) },
+    { "movA",	{ Eb, Ib } },
   },
   /* REG_C7 */
   {
-    { "movQ",	{ Evh3, Iv } },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { MOD_TABLE (MOD_C7_REG_7) },
+    { "movQ",	{ Ev, Iv } },
   },
   /* REG_D0 */
   {
@@ -2583,8 +2554,8 @@ static const struct dis386 reg_table[][8] = {
   {
     { "testA",	{ Eb, Ib } },
     { Bad_Opcode },
-    { "notA",	{ Ebh1 } },
-    { "negA",	{ Ebh1 } },
+    { "notA",	{ Eb } },
+    { "negA",	{ Eb } },
     { "mulA",	{ Eb } },	/* Don't print the implicit %al register,  */
     { "imulA",	{ Eb } },	/* to distinguish these opcodes from other */
     { "divA",	{ Eb } },	/* mul/imul opcodes.  Do the same for div  */
@@ -2594,8 +2565,8 @@ static const struct dis386 reg_table[][8] = {
   {
     { "testQ",	{ Ev, Iv } },
     { Bad_Opcode },
-    { "notQ",	{ Evh1 } },
-    { "negQ",	{ Evh1 } },
+    { "notQ",	{ Ev } },
+    { "negQ",	{ Ev } },
     { "mulQ",	{ Ev } },	/* Don't print the implicit register.  */
     { "imulQ",	{ Ev } },
     { "divQ",	{ Ev } },
@@ -2603,13 +2574,13 @@ static const struct dis386 reg_table[][8] = {
   },
   /* REG_FE */
   {
-    { "incA",	{ Ebh1 } },
-    { "decA",	{ Ebh1 } },
+    { "incA",	{ Eb } },
+    { "decA",	{ Eb } },
   },
   /* REG_FF */
   {
-    { "incQ",	{ Evh1 } },
-    { "decQ",	{ Evh1 } },
+    { "incQ",	{ Ev } },
+    { "decQ",	{ Ev } },
     { "call{T|}", { indirEv } },
     { "Jcall{T|}", { indirEp } },
     { "jmp{T|}", { indirEv } },
@@ -2715,9 +2686,9 @@ static const struct dis386 reg_table[][8] = {
     { Bad_Opcode },
     { Bad_Opcode },
     { "btQ",	{ Ev, Ib } },
-    { "btsQ",	{ Evh1, Ib } },
-    { "btrQ",	{ Evh1, Ib } },
-    { "btcQ",	{ Evh1, Ib } },
+    { "btsQ",	{ Ev, Ib } },
+    { "btrQ",	{ Ev, Ib } },
+    { "btcQ",	{ Ev, Ib } },
   },
   /* REG_0FC7 */
   {
@@ -10095,16 +10066,6 @@ static const struct dis386 mod_table[][2] = {
     { "leaS",		{ Gv, M } },
   },
   {
-    /* MOD_C6_REG_7 */
-    { Bad_Opcode },
-    { RM_TABLE (RM_C6_REG_7) },
-  },
-  {
-    /* MOD_C7_REG_7 */
-    { Bad_Opcode },
-    { RM_TABLE (RM_C7_REG_7) },
-  },
-  {
     /* MOD_0F01_REG_0 */
     { X86_64_TABLE (X86_64_0F01_REG_0) },
     { RM_TABLE (RM_0F01_REG_0) },
@@ -10493,14 +10454,6 @@ static const struct dis386 mod_table[][2] = {
 
 static const struct dis386 rm_table[][8] = {
   {
-    /* RM_C6_REG_7 */
-    { "xabort",		{ Skip_MODRM, Ib } },
-  },
-  {
-    /* RM_C7_REG_7 */
-    { "xbeginT",	{ Skip_MODRM, Jv } },
-  },
-  {
     /* RM_0F01_REG_0 */
     { Bad_Opcode },
     { "vmcall",		{ Skip_MODRM } },
@@ -10517,12 +10470,6 @@ static const struct dis386 rm_table[][8] = {
     /* RM_0F01_REG_2 */
     { "xgetbv",		{ Skip_MODRM } },
     { "xsetbv",		{ Skip_MODRM } },
-    { Bad_Opcode },
-    { Bad_Opcode },
-    { "vmfunc",		{ Skip_MODRM } },
-    { "xend",		{ Skip_MODRM } },
-    { "xtest",		{ Skip_MODRM } },
-    { Bad_Opcode },
   },
   {
     /* RM_0F01_REG_3 */
@@ -10563,8 +10510,6 @@ static const struct dis386 rm_table[][8] = {
 #define DATA16_PREFIX	(0x66 | 0x100)
 #define DATA32_PREFIX	(0x66 | 0x200)
 #define REP_PREFIX	(0xf3 | 0x100)
-#define XACQUIRE_PREFIX	(0xf2 | 0x200)
-#define XRELEASE_PREFIX	(0xf3 | 0x400)
 
 static int
 ckprefix (void)
@@ -10795,10 +10740,6 @@ prefix_name (int pref, int sizeflag)
       return "data32";
     case REP_PREFIX:
       return "rep";
-    case XACQUIRE_PREFIX:
-      return "xacquire";
-    case XRELEASE_PREFIX:
-      return "xrelease";
     default:
       return NULL;
     }
@@ -11390,7 +11331,7 @@ print_insn (bfd_vma pc, disassemble_info *info)
     {
       /* Too many prefixes or unused REX prefixes.  */
       for (i = 0;
-	   i < (int) ARRAY_SIZE (all_prefixes) && all_prefixes[i];
+	   all_prefixes[i] && i < (int) ARRAY_SIZE (all_prefixes);
 	   i++)
 	(*info->fprintf_func) (info->stream, "%s",
 			       prefix_name (all_prefixes[i], sizeflag));
@@ -14417,57 +14358,6 @@ REP_Fixup (int bytemode, int sizeflag)
     }
 }
 
-/* Similar to OP_E.  But the 0xf2/0xf3 prefixes should be displayed as
-   "xacquire"/"xrelease" for memory operand if there is a LOCK prefix.
- */
-
-static void
-HLE_Fixup1 (int bytemode, int sizeflag)
-{
-  if (modrm.mod != 3
-      && (prefixes & PREFIX_LOCK) != 0)
-    {
-      if (prefixes & PREFIX_REPZ)
-	all_prefixes[last_repz_prefix] = XRELEASE_PREFIX;
-      if (prefixes & PREFIX_REPNZ)
-	all_prefixes[last_repnz_prefix] = XACQUIRE_PREFIX;
-    }
-
-  OP_E (bytemode, sizeflag);
-}
-
-/* Similar to OP_E.  But the 0xf2/0xf3 prefixes should be displayed as
-   "xacquire"/"xrelease" for memory operand.  No check for LOCK prefix.
- */
-
-static void
-HLE_Fixup2 (int bytemode, int sizeflag)
-{
-  if (modrm.mod != 3)
-    {
-      if (prefixes & PREFIX_REPZ)
-	all_prefixes[last_repz_prefix] = XRELEASE_PREFIX;
-      if (prefixes & PREFIX_REPNZ)
-	all_prefixes[last_repnz_prefix] = XACQUIRE_PREFIX;
-    }
-
-  OP_E (bytemode, sizeflag);
-}
-
-/* Similar to OP_E.  But the 0xf3 prefixes should be displayed as
-   "xrelease" for memory operand.  No check for LOCK prefix.   */
-
-static void
-HLE_Fixup3 (int bytemode, int sizeflag)
-{
-  if (modrm.mod != 3
-      && last_repz_prefix > last_repnz_prefix
-      && (prefixes & PREFIX_REPZ) != 0)
-    all_prefixes[last_repz_prefix] = XRELEASE_PREFIX;
-
-  OP_E (bytemode, sizeflag);
-}
-
 static void
 CMPXCHG8B_Fixup (int bytemode, int sizeflag)
 {
@@ -14479,14 +14369,6 @@ CMPXCHG8B_Fixup (int bytemode, int sizeflag)
       mnemonicendp = stpcpy (p, "16b");
       bytemode = o_mode;
     }
-  else if ((prefixes & PREFIX_LOCK) != 0)
-    {
-      if (prefixes & PREFIX_REPZ)
-	all_prefixes[last_repz_prefix] = XRELEASE_PREFIX;
-      if (prefixes & PREFIX_REPNZ)
-	all_prefixes[last_repnz_prefix] = XACQUIRE_PREFIX;
-    }
-
   OP_M (bytemode, sizeflag);
 }
 
diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index 21f600f034..4dd75a203d 100644
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -162,14 +162,8 @@ static initializer cpu_flag_init[] =
     "CpuBMI2" },
   { "CPU_LZCNT_FLAGS",
     "CpuLZCNT" },
-  { "CPU_HLE_FLAGS",
-    "CpuHLE" },
-  { "CPU_RTM_FLAGS",
-    "CpuRTM" },
   { "CPU_INVPCID_FLAGS",
     "CpuINVPCID" },
-  { "CPU_VMFUNC_FLAGS",
-    "CpuVMFUNC" },
   { "CPU_3DNOW_FLAGS",
     "CpuMMX|Cpu3dnow" },
   { "CPU_3DNOWA_FLAGS",
@@ -355,10 +349,7 @@ static bitfield cpu_flags[] =
   BITFIELD (CpuF16C),
   BITFIELD (CpuBMI2),
   BITFIELD (CpuLZCNT),
-  BITFIELD (CpuHLE),
-  BITFIELD (CpuRTM),
   BITFIELD (CpuINVPCID),
-  BITFIELD (CpuVMFUNC),
   BITFIELD (Cpu64),
   BITFIELD (CpuNo64),
 #ifdef CpuUnused
@@ -398,7 +389,6 @@ static bitfield opcode_modifiers[] =
   BITFIELD (RegKludge),
   BITFIELD (FirstXmm0),
   BITFIELD (Implicit1stXmm0),
-  BITFIELD (HLEPrefixOk),
   BITFIELD (ToDword),
   BITFIELD (ToQword),
   BITFIELD (AddrPrefixOp0),
diff --git a/opcodes/i386-init.h b/opcodes/i386-init.h
index db62af735c..69f0e948ac 100644
--- a/opcodes/i386-init.h
+++ b/opcodes/i386-init.h
@@ -22,377 +22,362 @@
 #define CPU_UNKNOWN_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  \
       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,  \
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 } }
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 } }
 
 #define CPU_GENERIC32_FLAGS \
   { { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_GENERIC64_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_NONE_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_I186_FLAGS \
   { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_I286_FLAGS \
   { { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_I386_FLAGS \
   { { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_I486_FLAGS \
   { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_I586_FLAGS \
   { { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_I686_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_PENTIUMPRO_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_P2_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_P3_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_P4_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_NOCONA_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_CORE_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_CORE2_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_COREI7_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_K6_FLAGS \
   { { 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_K6_2_FLAGS \
   { { 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_ATHLON_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_K8_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_AMDFAM10_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,  \
       0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_BDVER1_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,  \
-      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_BDVER2_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,  \
-      1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }
+      1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 } }
 
 #define CPU_8087_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_287_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_387_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_ANY87_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_CLFLUSH_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_NOP_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SYSCALL_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_MMX_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSE_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSE2_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSE3_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSSE3_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSE4_1_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSE4_2_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_ANY_SSE_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_VMX_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SMX_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_XSAVE_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_XSAVEOPT_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_AES_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_PCLMUL_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_FMA_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_FMA4_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_XOP_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_LWP_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_BMI_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_TBM_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_MOVBE_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_RDTSCP_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_EPT_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_FSGSBASE_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_RDRND_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_F16C_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_BMI2_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_LZCNT_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } }
-
-#define CPU_HLE_FLAGS \
-  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } }
-
-#define CPU_RTM_FLAGS \
-  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 } }
 
 #define CPU_INVPCID_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 } }
-
-#define CPU_VMFUNC_FLAGS \
-  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 } }
 
 #define CPU_3DNOW_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_3DNOWA_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_PADLOCK_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SVME_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_SSE4A_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_ABM_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_AVX_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_AVX2_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_ANY_AVX_FLAGS \
   { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
       0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  \
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
 
 #define CPU_L1OM_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  \
       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  \
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 } }
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 } }
 
 #define CPU_K1OM_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  \
       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  \
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 } }
+      1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 } }
 
 
 #define OPERAND_TYPE_NONE \
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index f130a96ce8..8d5dade9ab 100644
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -134,14 +134,8 @@ enum
   CpuBMI2,
   /* LZCNT support required */
   CpuLZCNT,
-  /* HLE support required */
-  CpuHLE,
-  /* RTM support required */
-  CpuRTM,
   /* INVPCID Instructions required */
   CpuINVPCID,
-  /* VMFUNC Instruction required */
-  CpuVMFUNC,
   /* 64bit support available, used by -march= in assembler.  */
   CpuLM,
   /* 64bit support required  */
@@ -218,10 +212,7 @@ typedef union i386_cpu_flags
       unsigned int cpuf16c:1;
       unsigned int cpubmi2:1;
       unsigned int cpulzcnt:1;
-      unsigned int cpuhle:1;
-      unsigned int cpurtm:1;
       unsigned int cpuinvpcid:1;
-      unsigned int cpuvmfunc:1;
       unsigned int cpulm:1;
       unsigned int cpu64:1;
       unsigned int cpuno64:1;
@@ -299,16 +290,6 @@ enum
   FirstXmm0,
   /* An implicit xmm0 as the first operand */
   Implicit1stXmm0,
-  /* The HLE prefix is OK:
-     1. With a LOCK prefix.
-     2. With or without a LOCK prefix.
-     3. With a RELEASE (0xf3) prefix.
-   */
-#define HLEPrefixNone		0
-#define HLEPrefixLock		1
-#define HLEPrefixAny		2
-#define HLEPrefixRelease	3
-  HLEPrefixOk,
   /* Convert to DWORD */
   ToDword,
   /* Convert to QWORD */
@@ -442,7 +423,6 @@ typedef struct i386_opcode_modifier
   unsigned int regkludge:1;
   unsigned int firstxmm0:1;
   unsigned int implicit1stxmm0:1;
-  unsigned int hleprefixok:2;
   unsigned int todword:1;
   unsigned int toqword:1;
   unsigned int addrprefixop0:1;
diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index 8a43b511fa..eb7dae9948 100644
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -24,11 +24,11 @@
 // larger than 32bit as Disp64.
 mov, 2, 0xa0, None, 1, Cpu64, D|W|CheckRegSize|No_sSuf|No_ldSuf, { Disp64|Unspecified|Byte|Word|Dword|Qword, Acc|Byte|Word|Dword|Qword }
 mov, 2, 0xa0, None, 1, CpuNo64, D|W|CheckRegSize|No_sSuf|No_qSuf|No_ldSuf, { Disp16|Disp32|Unspecified|Byte|Word|Dword, Acc|Byte|Word|Dword }
-mov, 2, 0x88, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|HLEPrefixOk=3, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+mov, 2, 0x88, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 // In the 64bit mode the short form mov immediate is redefined to have
 // 64bit value.
 mov, 2, 0xb0, None, 1, 0, W|CheckRegSize|ShortForm|No_sSuf|No_qSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32 }
-mov, 2, 0xc6, 0x0, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|HLEPrefixOk=3, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+mov, 2, 0xc6, 0x0, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 mov, 2, 0xb0, None, 1, Cpu64, W|ShortForm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_ldSuf, { Imm64, Reg64 }
 // The segment register moves accept WordReg so that a segment register
 // can be copied to a 32 bit register, and vice versa, without using a
@@ -128,8 +128,8 @@ popa, 0, 0x61, None, 1, Cpu186|CpuNo64, DefaultSize|No_bSuf|No_sSuf|No_qSuf|No_l
 // In the 64bit code, xchg rax, rax is reused for new nop instruction.
 xchg, 2, 0x90, None, 1, 0, ShortForm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf, { Reg16|Reg32|Reg64, Acc|Word|Dword|Qword }
 xchg, 2, 0x90, None, 1, 0, ShortForm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf, { Acc|Word|Dword|Qword, Reg16|Reg32|Reg64 }
-xchg, 2, 0x86, None, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk=2, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-xchg, 2, 0x86, None, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk=2, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg8|Reg16|Reg32|Reg64 }
+xchg, 2, 0x86, None, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+xchg, 2, 0x86, None, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg8|Reg16|Reg32|Reg64 }
 
 // In/out from ports.
 in, 2, 0xe4, None, 1, 0, W|CheckRegSize|No_sSuf|No_qSuf|No_ldSuf, { Imm8, Acc|Byte|Word|Dword }
@@ -168,26 +168,26 @@ std, 0, 0xfd, None, 1, 0, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0
 sti, 0, 0xfb, None, 1, 0, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
 
 // Arithmetic.
-add, 2, 0x0, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-add, 2, 0x83, 0x0, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+add, 2, 0x0, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+add, 2, 0x83, 0x0, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 add, 2, 0x4, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-add, 2, 0x80, 0x0, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+add, 2, 0x80, 0x0, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 inc, 1, 0x40, None, 1, CpuNo64, ShortForm|No_bSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg16|Reg32 }
-inc, 1, 0xfe, 0x0, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+inc, 1, 0xfe, 0x0, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-sub, 2, 0x28, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-sub, 2, 0x83, 0x5, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+sub, 2, 0x28, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+sub, 2, 0x83, 0x5, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 sub, 2, 0x2c, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-sub, 2, 0x80, 0x5, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+sub, 2, 0x80, 0x5, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 dec, 1, 0x48, None, 1, CpuNo64, ShortForm|No_bSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg16|Reg32 }
-dec, 1, 0xfe, 0x1, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+dec, 1, 0xfe, 0x1, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-sbb, 2, 0x18, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-sbb, 2, 0x83, 0x3, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+sbb, 2, 0x18, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+sbb, 2, 0x83, 0x3, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 sbb, 2, 0x1c, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-sbb, 2, 0x80, 0x3, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+sbb, 2, 0x80, 0x3, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 cmp, 2, 0x38, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 cmp, 2, 0x83, 0x7, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
@@ -199,31 +199,31 @@ test, 2, 0x84, None, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf, { Byte|Word|Dw
 test, 2, 0xa8, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
 test, 2, 0xf6, 0x0, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-and, 2, 0x20, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-and, 2, 0x83, 0x4, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+and, 2, 0x20, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+and, 2, 0x83, 0x4, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 and, 2, 0x24, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-and, 2, 0x80, 0x4, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+and, 2, 0x80, 0x4, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-or, 2, 0x8, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-or, 2, 0x83, 0x1, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+or, 2, 0x8, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+or, 2, 0x83, 0x1, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 or, 2, 0xc, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-or, 2, 0x80, 0x1, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+or, 2, 0x80, 0x1, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-xor, 2, 0x30, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-xor, 2, 0x83, 0x6, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+xor, 2, 0x30, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+xor, 2, 0x83, 0x6, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 xor, 2, 0x34, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-xor, 2, 0x80, 0x6, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+xor, 2, 0x80, 0x6, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 // clr with 1 operand is really xor with 2 operands.
 clr, 1, 0x30, None, 1, 0, W|Modrm|No_sSuf|No_ldSuf|RegKludge, { Reg8|Reg16|Reg32|Reg64 }
 
-adc, 2, 0x10, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-adc, 2, 0x83, 0x2, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+adc, 2, 0x10, None, 1, 0, D|W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+adc, 2, 0x83, 0x2, 1, 0, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8S, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 adc, 2, 0x14, None, 1, 0, W|CheckRegSize|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
-adc, 2, 0x80, 0x2, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+adc, 2, 0x80, 0x2, 1, 0, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-neg, 1, 0xf6, 0x3, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-not, 1, 0xf6, 0x2, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+neg, 1, 0xf6, 0x3, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+not, 1, 0xf6, 0x2, 1, 0, W|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 aaa, 0, 0x37, None, 1, CpuNo64, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
 aas, 0, 0x3f, None, 1, CpuNo64, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
@@ -479,12 +479,12 @@ bsf, 2, 0xfbc, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf, { R
 bsr, 2, 0xfbd, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf, { Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg16|Reg32|Reg64 }
 bt, 2, 0xfa3, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 bt, 2, 0xfba, 0x4, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-btc, 2, 0xfbb, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-btc, 2, 0xfba, 0x7, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-btr, 2, 0xfb3, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-btr, 2, 0xfba, 0x6, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-bts, 2, 0xfab, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-bts, 2, 0xfba, 0x5, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+btc, 2, 0xfbb, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+btc, 2, 0xfba, 0x7, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+btr, 2, 0xfb3, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+btr, 2, 0xfba, 0x6, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+bts, 2, 0xfab, None, 2, Cpu386, Modrm|CheckRegSize|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Reg16|Reg32|Reg64, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+bts, 2, 0xfba, 0x5, 2, Cpu386, Modrm|No_bSuf|No_sSuf|No_ldSuf|IsLockable, { Imm8, Reg16|Reg32|Reg64|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 // Interrupts & op. sys insns.
 // See gas/config/tc-i386.c for conversion of 'int $3' into the special
@@ -829,8 +829,8 @@ rex.wrxb, 0, 0x4f, None, 1, Cpu64, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ld
 // 486 extensions.
 
 bswap, 1, 0xfc8, None, 2, Cpu486, ShortForm|No_bSuf|No_wSuf|No_sSuf|No_ldSuf, { Reg32|Reg64 }
-xadd, 2, 0xfc0, None, 2, Cpu486, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
-cmpxchg, 2, 0xfb0, None, 2, Cpu486, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+xadd, 2, 0xfc0, None, 2, Cpu486, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+cmpxchg, 2, 0xfb0, None, 2, Cpu486, W|CheckRegSize|Modrm|No_sSuf|No_ldSuf|IsLockable, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 invd, 0, 0xf08, None, 2, Cpu486, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
 wbinvd, 0, 0xf09, None, 2, Cpu486, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
 invlpg, 1, 0xf01, 0x7, 2, Cpu486, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
@@ -842,7 +842,7 @@ cpuid, 0, 0xfa2, None, 2, Cpu486, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldS
 wrmsr, 0, 0xf30, None, 2, Cpu586, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
 rdtsc, 0, 0xf31, None, 2, Cpu586, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
 rdmsr, 0, 0xf32, None, 2, Cpu586, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
-cmpxchg8b, 1, 0xfc7, 0x1, 2, Cpu586, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_ldSuf|IsLockable|HLEPrefixOk, { Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
+cmpxchg8b, 1, 0xfc7, 0x1, 2, Cpu586, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_ldSuf|IsLockable, { Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
 // Pentium II/Pentium Pro extensions.
 sysenter, 0, 0xf34, None, 2, Cpu686, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
@@ -956,8 +956,8 @@ movd, 2, 0xf7e, None, 2, CpuMMX|Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|
 // 64bit displacement value.  We put the 64bit displacement first and
 // we only mark constants larger than 32bit as Disp64.
 movq, 2, 0xa0, None, 1, Cpu64, D|W|CheckRegSize|Size64|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Disp64|Unspecified|Qword, Acc|Qword }
-movq, 2, 0x88, None, 1, Cpu64, D|W|Modrm|Size64|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|HLEPrefixOk=3, { Reg64, Reg64|Unspecified|Qword|BaseIndex|Disp8|Disp32|Disp32S }
-movq, 2, 0xc6, 0x0, 1, Cpu64, W|Modrm|Size64|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|HLEPrefixOk=3, { Imm32S, Reg64|Qword|Unspecified|BaseIndex|Disp8|Disp32|Disp32S }
+movq, 2, 0x88, None, 1, Cpu64, D|W|Modrm|Size64|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg64, Reg64|Unspecified|Qword|BaseIndex|Disp8|Disp32|Disp32S }
+movq, 2, 0xc6, 0x0, 1, Cpu64, W|Modrm|Size64|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Imm32S, Reg64|Qword|Unspecified|BaseIndex|Disp8|Disp32|Disp32S }
 movq, 2, 0xb0, None, 1, Cpu64, W|ShortForm|Size64|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Imm64, Reg64 }
 movq, 2, 0xf37e, None, 1, CpuAVX, S|Modrm|Vex=3|VexOpcode=0|VexW=1|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|NoRex64|SSE2AVX, { Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|RegXMM, RegXMM }
 movq, 2, 0x66d6, None, 1, CpuAVX, Modrm|Vex=3|VexOpcode=0|VexW=1|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|NoRex64|SSE2AVX, { RegXMM, Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|RegXMM }
@@ -1561,10 +1561,6 @@ vmwrite, 2, 0xf79, None, 2, CpuVMX|Cpu64, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|
 vmxoff, 0, 0xf01, 0xc4, 2, CpuVMX, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImmExt, { 0 }
 vmxon, 1, 0xf30fc7, 0x6, 2, CpuVMX, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|NoRex64, { Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
 
-// VMFUNC instruction
-
-vmfunc, 0, 0xf01, 0xd4, 2, CpuVMFUNC, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImmExt, { 0 }
-
 // SMX instructions.
 
 getsec, 0, 0xf37, None, 2, CpuSMX, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
@@ -2691,17 +2687,6 @@ vfnmsub213ss, 3, 0x66af, None, 1, CpuFMA, Modrm|Vex=3|VexOpcode=1|VexVVVV=1|VexW
 vfnmsub231sd, 3, 0x66bf, None, 1, CpuFMA, Modrm|Vex=3|VexOpcode=1|VexVVVV=1|VexW=2|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|RegXMM, RegXMM, RegXMM }
 vfnmsub231ss, 3, 0x66bf, None, 1, CpuFMA, Modrm|Vex=3|VexOpcode=1|VexVVVV=1|VexW=1|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Dword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|RegXMM, RegXMM, RegXMM }
 
-// HLE prefixes
-
-xacquire, 0, 0xf2, None, 1, CpuHLE, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|IsPrefix, { 0 }
-xrelease, 0, 0xf3, None, 1, CpuHLE, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|IsPrefix, { 0 }
-
-// RTM instructions
-xabort, 1, 0xc6f8, None, 2, CpuRTM, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Imm8 }
-xbegin, 1, 0xc7f8, None, 2, CpuRTM,  JumpDword|DefaultSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|NoRex64, { Disp16|Disp32 }
-xend, 0, 0xf01d5, None, 3, CpuRTM, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
-xtest, 0, 0xf01d6, None, 3, CpuHLE|CpuRTM, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 }
-
 // BMI2 instructions.
 bzhi, 3, 0xf5, None, 1, CpuBMI2, Modrm|CheckRegSize|Vex=3|VexOpcode=1|VexVVVV=1|No_bSuf|No_wSuf|No_sSuf|No_ldSuf, { Reg32|Reg64, Reg32|Reg64|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32|Reg64 }
 mulx, 3, 0xf2f6, None, 1, CpuBMI2, Modrm|CheckRegSize|Vex=3|VexOpcode=1|VexVVVV=1|No_bSuf|No_wSuf|No_sSuf|No_ldSuf, { Reg32|Reg64|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32|Reg64, Reg32|Reg64 }
diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h
index e31bc62499..795f71df20 100644
--- a/opcodes/i386-tbl.h
+++ b/opcodes/i386-tbl.h
@@ -26,10 +26,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xa0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -39,10 +39,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xa0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -52,10 +52,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x88, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -65,10 +65,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xb0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -78,10 +78,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xc6, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -91,10 +91,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xb0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -104,10 +104,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -117,10 +117,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -130,10 +130,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8c, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -143,10 +143,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8c, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -156,10 +156,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -169,10 +169,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -182,10 +182,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8e, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -195,10 +195,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0x8e, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -208,10 +208,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xf20, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -221,10 +221,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xf20, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -234,10 +234,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xf21, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -247,10 +247,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xf21, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -260,10 +260,10 @@ const insn_template i386_optab[] =
   { "mov", 2, 0xf24, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -273,10 +273,10 @@ const insn_template i386_optab[] =
   { "movabs", 2, 0xa0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -286,10 +286,10 @@ const insn_template i386_optab[] =
   { "movabs", 2, 0xb0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -299,10 +299,10 @@ const insn_template i386_optab[] =
   { "movbe", 2, 0x0f38f0, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -312,10 +312,10 @@ const insn_template i386_optab[] =
   { "movbe", 2, 0x0f38f1, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -325,10 +325,10 @@ const insn_template i386_optab[] =
   { "movsbl", 2, 0xfbe, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -338,10 +338,10 @@ const insn_template i386_optab[] =
   { "movsbw", 2, 0xfbe, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -351,10 +351,10 @@ const insn_template i386_optab[] =
   { "movswl", 2, 0xfbf, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -364,10 +364,10 @@ const insn_template i386_optab[] =
   { "movsbq", 2, 0xfbe, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -377,10 +377,10 @@ const insn_template i386_optab[] =
   { "movswq", 2, 0xfbf, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -390,10 +390,10 @@ const insn_template i386_optab[] =
   { "movslq", 2, 0x63, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -403,10 +403,10 @@ const insn_template i386_optab[] =
   { "movsx", 2, 0xfbe, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -416,10 +416,10 @@ const insn_template i386_optab[] =
   { "movsx", 2, 0xfbf, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -429,10 +429,10 @@ const insn_template i386_optab[] =
   { "movsx", 2, 0x63, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -442,10 +442,10 @@ const insn_template i386_optab[] =
   { "movsx", 2, 0xfbe, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -455,10 +455,10 @@ const insn_template i386_optab[] =
   { "movsx", 2, 0xfbf, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -468,10 +468,10 @@ const insn_template i386_optab[] =
   { "movsx", 2, 0x63, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -481,10 +481,10 @@ const insn_template i386_optab[] =
   { "movsxd", 2, 0x63, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -494,10 +494,10 @@ const insn_template i386_optab[] =
   { "movzb", 2, 0xfb6, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -507,10 +507,10 @@ const insn_template i386_optab[] =
   { "movzbl", 2, 0xfb6, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -520,10 +520,10 @@ const insn_template i386_optab[] =
   { "movzbw", 2, 0xfb6, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -533,10 +533,10 @@ const insn_template i386_optab[] =
   { "movzwl", 2, 0xfb7, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -546,10 +546,10 @@ const insn_template i386_optab[] =
   { "movzbq", 2, 0xfb6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -559,10 +559,10 @@ const insn_template i386_optab[] =
   { "movzwq", 2, 0xfb7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -572,10 +572,10 @@ const insn_template i386_optab[] =
   { "movzx", 2, 0xfb6, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -585,10 +585,10 @@ const insn_template i386_optab[] =
   { "movzx", 2, 0xfb7, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -598,10 +598,10 @@ const insn_template i386_optab[] =
   { "movzx", 2, 0xfb6, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -611,10 +611,10 @@ const insn_template i386_optab[] =
   { "movzx", 2, 0xfb7, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -624,210 +624,210 @@ const insn_template i386_optab[] =
   { "push", 1, 0x50, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0xff, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "push", 1, 0x6a, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0x68, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0x6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0xfa0, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0x50, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0xff, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "push", 1, 0x6a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0x68, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "push", 1, 0xfa0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pusha", 0, 0x60, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pop", 1, 0x58, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pop", 1, 0x8f, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "pop", 1, 0x7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pop", 1, 0xfa1, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pop", 1, 0x58, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pop", 1, 0x8f, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "pop", 1, 0xfa1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "popa", 0, 0x61, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xchg", 2, 0x90, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -837,10 +837,10 @@ const insn_template i386_optab[] =
   { "xchg", 2, 0x90, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -850,10 +850,10 @@ const insn_template i386_optab[] =
   { "xchg", 2, 0x86, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -863,10 +863,10 @@ const insn_template i386_optab[] =
   { "xchg", 2, 0x86, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -876,10 +876,10 @@ const insn_template i386_optab[] =
   { "in", 2, 0xe4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -889,10 +889,10 @@ const insn_template i386_optab[] =
   { "in", 2, 0xec, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -902,30 +902,30 @@ const insn_template i386_optab[] =
   { "in", 1, 0xe4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "in", 1, 0xec, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "out", 2, 0xe6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -935,10 +935,10 @@ const insn_template i386_optab[] =
   { "out", 2, 0xee, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -948,30 +948,30 @@ const insn_template i386_optab[] =
   { "out", 1, 0xe6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "out", 1, 0xee, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lea", 2, 0x8d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 1, 0, 0 } },
@@ -981,10 +981,10 @@ const insn_template i386_optab[] =
   { "lds", 2, 0xc5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -994,10 +994,10 @@ const insn_template i386_optab[] =
   { "les", 2, 0xc4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -1007,10 +1007,10 @@ const insn_template i386_optab[] =
   { "lfs", 2, 0xfb4, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -1020,10 +1020,10 @@ const insn_template i386_optab[] =
   { "lgs", 2, 0xfb5, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -1033,10 +1033,10 @@ const insn_template i386_optab[] =
   { "lss", 2, 0xfb2, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -1046,150 +1046,150 @@ const insn_template i386_optab[] =
   { "clc", 0, 0xf8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cld", 0, 0xfc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cli", 0, 0xfa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "clts", 0, 0xf06, None, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cmc", 0, 0xf5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lahf", 0, 0x9f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "sahf", 0, 0x9e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pushf", 0, 0x9c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pushf", 0, 0x9c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "popf", 0, 0x9d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "popf", 0, 0x9d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "stc", 0, 0xf9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "std", 0, 0xfd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "sti", 0, 0xfb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "add", 2, 0x0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1199,10 +1199,10 @@ const insn_template i386_optab[] =
   { "add", 2, 0x83, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1212,10 +1212,10 @@ const insn_template i386_optab[] =
   { "add", 2, 0x4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1225,10 +1225,10 @@ const insn_template i386_optab[] =
   { "add", 2, 0x80, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1238,30 +1238,30 @@ const insn_template i386_optab[] =
   { "inc", 1, 0x40, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "inc", 1, 0xfe, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sub", 2, 0x28, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1271,10 +1271,10 @@ const insn_template i386_optab[] =
   { "sub", 2, 0x83, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1284,10 +1284,10 @@ const insn_template i386_optab[] =
   { "sub", 2, 0x2c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1297,10 +1297,10 @@ const insn_template i386_optab[] =
   { "sub", 2, 0x80, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1310,30 +1310,30 @@ const insn_template i386_optab[] =
   { "dec", 1, 0x48, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "dec", 1, 0xfe, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sbb", 2, 0x18, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1343,10 +1343,10 @@ const insn_template i386_optab[] =
   { "sbb", 2, 0x83, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1356,10 +1356,10 @@ const insn_template i386_optab[] =
   { "sbb", 2, 0x1c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1369,10 +1369,10 @@ const insn_template i386_optab[] =
   { "sbb", 2, 0x80, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1382,10 +1382,10 @@ const insn_template i386_optab[] =
   { "cmp", 2, 0x38, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1395,10 +1395,10 @@ const insn_template i386_optab[] =
   { "cmp", 2, 0x83, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1408,10 +1408,10 @@ const insn_template i386_optab[] =
   { "cmp", 2, 0x3c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1421,10 +1421,10 @@ const insn_template i386_optab[] =
   { "cmp", 2, 0x80, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1434,10 +1434,10 @@ const insn_template i386_optab[] =
   { "test", 2, 0x84, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1447,10 +1447,10 @@ const insn_template i386_optab[] =
   { "test", 2, 0x84, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -1460,10 +1460,10 @@ const insn_template i386_optab[] =
   { "test", 2, 0xa8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1473,10 +1473,10 @@ const insn_template i386_optab[] =
   { "test", 2, 0xf6, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1486,10 +1486,10 @@ const insn_template i386_optab[] =
   { "and", 2, 0x20, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1499,10 +1499,10 @@ const insn_template i386_optab[] =
   { "and", 2, 0x83, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1512,10 +1512,10 @@ const insn_template i386_optab[] =
   { "and", 2, 0x24, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1525,10 +1525,10 @@ const insn_template i386_optab[] =
   { "and", 2, 0x80, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1538,10 +1538,10 @@ const insn_template i386_optab[] =
   { "or", 2, 0x8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1551,10 +1551,10 @@ const insn_template i386_optab[] =
   { "or", 2, 0x83, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1564,10 +1564,10 @@ const insn_template i386_optab[] =
   { "or", 2, 0xc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1577,10 +1577,10 @@ const insn_template i386_optab[] =
   { "or", 2, 0x80, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1590,10 +1590,10 @@ const insn_template i386_optab[] =
   { "xor", 2, 0x30, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1603,10 +1603,10 @@ const insn_template i386_optab[] =
   { "xor", 2, 0x83, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1616,10 +1616,10 @@ const insn_template i386_optab[] =
   { "xor", 2, 0x34, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1629,10 +1629,10 @@ const insn_template i386_optab[] =
   { "xor", 2, 0x80, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1642,20 +1642,20 @@ const insn_template i386_optab[] =
   { "clr", 1, 0x30, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "adc", 2, 0x10, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1665,10 +1665,10 @@ const insn_template i386_optab[] =
   { "adc", 2, 0x83, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1678,10 +1678,10 @@ const insn_template i386_optab[] =
   { "adc", 2, 0x14, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1691,10 +1691,10 @@ const insn_template i386_optab[] =
   { "adc", 2, 0x80, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1704,250 +1704,250 @@ const insn_template i386_optab[] =
   { "neg", 1, 0xf6, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "not", 1, 0xf6, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "aaa", 0, 0x37, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "aas", 0, 0x3f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "daa", 0, 0x27, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "das", 0, 0x2f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "aad", 0, 0xd50a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "aad", 1, 0xd5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "aam", 0, 0xd40a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "aam", 1, 0xd4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cbw", 0, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cdqe", 0, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cwde", 0, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cwd", 0, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cdq", 0, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cqo", 0, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cbtw", 0, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cltq", 0, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cwtl", 0, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cwtd", 0, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cltd", 0, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cqto", 0, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "mul", 1, 0xf6, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "imul", 1, 0xf6, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "imul", 2, 0xfaf, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -1957,10 +1957,10 @@ const insn_template i386_optab[] =
   { "imul", 3, 0x6b, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1973,10 +1973,10 @@ const insn_template i386_optab[] =
   { "imul", 3, 0x69, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -1989,10 +1989,10 @@ const insn_template i386_optab[] =
   { "imul", 2, 0x6b, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2002,10 +2002,10 @@ const insn_template i386_optab[] =
   { "imul", 2, 0x69, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2015,20 +2015,20 @@ const insn_template i386_optab[] =
   { "div", 1, 0xf6, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "div", 2, 0xf6, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -2038,20 +2038,20 @@ const insn_template i386_optab[] =
   { "idiv", 1, 0xf6, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "idiv", 2, 0xf6, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -2061,10 +2061,10 @@ const insn_template i386_optab[] =
   { "rol", 2, 0xd0, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2074,10 +2074,10 @@ const insn_template i386_optab[] =
   { "rol", 2, 0xc0, 0x0, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2087,10 +2087,10 @@ const insn_template i386_optab[] =
   { "rol", 2, 0xd2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2100,20 +2100,20 @@ const insn_template i386_optab[] =
   { "rol", 1, 0xd0, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "ror", 2, 0xd0, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2123,10 +2123,10 @@ const insn_template i386_optab[] =
   { "ror", 2, 0xc0, 0x1, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2136,10 +2136,10 @@ const insn_template i386_optab[] =
   { "ror", 2, 0xd2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2149,20 +2149,20 @@ const insn_template i386_optab[] =
   { "ror", 1, 0xd0, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "rcl", 2, 0xd0, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2172,10 +2172,10 @@ const insn_template i386_optab[] =
   { "rcl", 2, 0xc0, 0x2, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2185,10 +2185,10 @@ const insn_template i386_optab[] =
   { "rcl", 2, 0xd2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2198,20 +2198,20 @@ const insn_template i386_optab[] =
   { "rcl", 1, 0xd0, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "rcr", 2, 0xd0, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2221,10 +2221,10 @@ const insn_template i386_optab[] =
   { "rcr", 2, 0xc0, 0x3, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2234,10 +2234,10 @@ const insn_template i386_optab[] =
   { "rcr", 2, 0xd2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2247,20 +2247,20 @@ const insn_template i386_optab[] =
   { "rcr", 1, 0xd0, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sal", 2, 0xd0, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2270,10 +2270,10 @@ const insn_template i386_optab[] =
   { "sal", 2, 0xc0, 0x4, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2283,10 +2283,10 @@ const insn_template i386_optab[] =
   { "sal", 2, 0xd2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2296,20 +2296,20 @@ const insn_template i386_optab[] =
   { "sal", 1, 0xd0, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "shl", 2, 0xd0, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2319,10 +2319,10 @@ const insn_template i386_optab[] =
   { "shl", 2, 0xc0, 0x4, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2332,10 +2332,10 @@ const insn_template i386_optab[] =
   { "shl", 2, 0xd2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2345,20 +2345,20 @@ const insn_template i386_optab[] =
   { "shl", 1, 0xd0, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "shr", 2, 0xd0, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2368,10 +2368,10 @@ const insn_template i386_optab[] =
   { "shr", 2, 0xc0, 0x5, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2381,10 +2381,10 @@ const insn_template i386_optab[] =
   { "shr", 2, 0xd2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2394,20 +2394,20 @@ const insn_template i386_optab[] =
   { "shr", 1, 0xd0, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sar", 2, 0xd0, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2417,10 +2417,10 @@ const insn_template i386_optab[] =
   { "sar", 2, 0xc0, 0x7, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2430,10 +2430,10 @@ const insn_template i386_optab[] =
   { "sar", 2, 0xd2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2443,20 +2443,20 @@ const insn_template i386_optab[] =
   { "sar", 1, 0xd0, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "shld", 3, 0xfa4, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2469,10 +2469,10 @@ const insn_template i386_optab[] =
   { "shld", 3, 0xfa5, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2485,10 +2485,10 @@ const insn_template i386_optab[] =
   { "shld", 2, 0xfa5, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2498,10 +2498,10 @@ const insn_template i386_optab[] =
   { "shrd", 3, 0xfac, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2514,10 +2514,10 @@ const insn_template i386_optab[] =
   { "shrd", 3, 0xfad, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2530,10 +2530,10 @@ const insn_template i386_optab[] =
   { "shrd", 2, 0xfad, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2543,50 +2543,50 @@ const insn_template i386_optab[] =
   { "call", 1, 0xe8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "call", 1, 0xe8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "call", 1, 0xff, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "call", 1, 0xff, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "call", 2, 0x9a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2596,20 +2596,20 @@ const insn_template i386_optab[] =
   { "call", 1, 0xff, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lcall", 2, 0x9a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2619,50 +2619,50 @@ const insn_template i386_optab[] =
   { "lcall", 1, 0xff, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "jmp", 1, 0xeb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jmp", 1, 0xff, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "jmp", 1, 0xff, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "jmp", 2, 0xea, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2672,20 +2672,20 @@ const insn_template i386_optab[] =
   { "jmp", 1, 0xff, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "ljmp", 2, 0xea, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2695,100 +2695,100 @@ const insn_template i386_optab[] =
   { "ljmp", 1, 0xff, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "ret", 0, 0xc3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ret", 1, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ret", 0, 0xc3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ret", 1, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lret", 0, 0xcb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lret", 1, 0xca, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "retf", 0, 0xcb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "retf", 1, 0xca, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "enter", 2, 0xc8, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2798,10 +2798,10 @@ const insn_template i386_optab[] =
   { "enter", 2, 0xc8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -2811,780 +2811,780 @@ const insn_template i386_optab[] =
   { "leave", 0, 0xc9, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "leave", 0, 0xc9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jo", 1, 0x70, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jno", 1, 0x71, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jb", 1, 0x72, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jc", 1, 0x72, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnae", 1, 0x72, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnb", 1, 0x73, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnc", 1, 0x73, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jae", 1, 0x73, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "je", 1, 0x74, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jz", 1, 0x74, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jne", 1, 0x75, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnz", 1, 0x75, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jbe", 1, 0x76, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jna", 1, 0x76, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnbe", 1, 0x77, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ja", 1, 0x77, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "js", 1, 0x78, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jns", 1, 0x79, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jp", 1, 0x7a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jpe", 1, 0x7a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnp", 1, 0x7b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jpo", 1, 0x7b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jl", 1, 0x7c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnge", 1, 0x7c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnl", 1, 0x7d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jge", 1, 0x7d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jle", 1, 0x7e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jng", 1, 0x7e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jnle", 1, 0x7f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jg", 1, 0x7f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jcxz", 1, 0xe3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jecxz", 1, 0xe3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jecxz", 1, 0x67e3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "jrcxz", 1, 0xe3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loop", 1, 0xe2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loop", 1, 0xe2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loopz", 1, 0xe1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loopz", 1, 0xe1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loope", 1, 0xe1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loope", 1, 0xe1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loopnz", 1, 0xe0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loopnz", 1, 0xe0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loopne", 1, 0xe0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "loopne", 1, 0xe0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "seto", 1, 0xf90, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setno", 1, 0xf91, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setb", 1, 0xf92, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setc", 1, 0xf92, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnae", 1, 0xf92, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnb", 1, 0xf93, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnc", 1, 0xf93, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setae", 1, 0xf93, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sete", 1, 0xf94, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setz", 1, 0xf94, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setne", 1, 0xf95, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnz", 1, 0xf95, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setbe", 1, 0xf96, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setna", 1, 0xf96, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnbe", 1, 0xf97, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "seta", 1, 0xf97, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sets", 1, 0xf98, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setns", 1, 0xf99, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setp", 1, 0xf9a, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setpe", 1, 0xf9a, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnp", 1, 0xf9b, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setpo", 1, 0xf9b, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setl", 1, 0xf9c, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnge", 1, 0xf9c, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnl", 1, 0xf9d, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setge", 1, 0xf9d, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setle", 1, 0xf9e, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setng", 1, 0xf9e, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setnle", 1, 0xf9f, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "setg", 1, 0xf9f, 0x0, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "cmps", 0, 0xa6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cmps", 2, 0xa6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3594,20 +3594,20 @@ const insn_template i386_optab[] =
   { "scmp", 0, 0xa6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "scmp", 2, 0xa6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3617,20 +3617,20 @@ const insn_template i386_optab[] =
   { "ins", 0, 0x6c, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ins", 2, 0x6c, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -3640,20 +3640,20 @@ const insn_template i386_optab[] =
   { "outs", 0, 0x6e, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "outs", 2, 0x6e, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3663,30 +3663,30 @@ const insn_template i386_optab[] =
   { "lods", 0, 0xac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lods", 1, 0xac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lods", 2, 0xac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3696,30 +3696,30 @@ const insn_template i386_optab[] =
   { "slod", 0, 0xac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "slod", 1, 0xac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "slod", 2, 0xac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3729,20 +3729,20 @@ const insn_template i386_optab[] =
   { "movs", 0, 0xa4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "movs", 2, 0xa4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3752,20 +3752,20 @@ const insn_template i386_optab[] =
   { "smov", 0, 0xa4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "smov", 2, 0xa4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3775,30 +3775,30 @@ const insn_template i386_optab[] =
   { "scas", 0, 0xae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "scas", 1, 0xae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "scas", 2, 0xae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3808,30 +3808,30 @@ const insn_template i386_optab[] =
   { "ssca", 0, 0xae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ssca", 1, 0xae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "ssca", 2, 0xae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3841,30 +3841,30 @@ const insn_template i386_optab[] =
   { "stos", 0, 0xaa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "stos", 1, 0xaa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "stos", 2, 0xaa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -3874,30 +3874,30 @@ const insn_template i386_optab[] =
   { "ssto", 0, 0xaa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ssto", 1, 0xaa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "ssto", 2, 0xaa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
       0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -3907,30 +3907,30 @@ const insn_template i386_optab[] =
   { "xlat", 0, 0xd7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xlat", 1, 0xd7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "bsf", 2, 0xfbc, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3940,10 +3940,10 @@ const insn_template i386_optab[] =
   { "bsr", 2, 0xfbd, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -3953,10 +3953,10 @@ const insn_template i386_optab[] =
   { "bt", 2, 0xfa3, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -3966,10 +3966,10 @@ const insn_template i386_optab[] =
   { "bt", 2, 0xfba, 0x4, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -3979,10 +3979,10 @@ const insn_template i386_optab[] =
   { "btc", 2, 0xfbb, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -3992,10 +3992,10 @@ const insn_template i386_optab[] =
   { "btc", 2, 0xfba, 0x7, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4005,10 +4005,10 @@ const insn_template i386_optab[] =
   { "btr", 2, 0xfb3, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4018,10 +4018,10 @@ const insn_template i386_optab[] =
   { "btr", 2, 0xfba, 0x6, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4031,10 +4031,10 @@ const insn_template i386_optab[] =
   { "bts", 2, 0xfab, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4044,10 +4044,10 @@ const insn_template i386_optab[] =
   { "bts", 2, 0xfba, 0x5, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4057,60 +4057,60 @@ const insn_template i386_optab[] =
   { "int", 1, 0xcd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "int3", 0, 0xcc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "into", 0, 0xce, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "iret", 0, 0xcf, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rsm", 0, 0xfaa, None, 2,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "bound", 2, 0x62, None, 1,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4120,40 +4120,40 @@ const insn_template i386_optab[] =
   { "hlt", 0, 0xf4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "nop", 1, 0xf1f, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "nop", 0, 0x90, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "arpl", 2, 0x63, None, 1,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4163,10 +4163,10 @@ const insn_template i386_optab[] =
   { "lar", 2, 0xf02, None, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -4176,70 +4176,70 @@ const insn_template i386_optab[] =
   { "lgdt", 1, 0xf01, 0x2, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lgdt", 1, 0xf01, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lidt", 1, 0xf01, 0x3, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lidt", 1, 0xf01, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lldt", 1, 0xf00, 0x2, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lmsw", 1, 0xf01, 0x6, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lsl", 2, 0xf03, None, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -4249,630 +4249,630 @@ const insn_template i386_optab[] =
   { "ltr", 1, 0xf00, 0x3, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sgdt", 1, 0xf01, 0x0, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sgdt", 1, 0xf01, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sidt", 1, 0xf01, 0x1, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sidt", 1, 0xf01, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sldt", 1, 0xf00, 0x0, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "sldt", 1, 0xf00, 0x0, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "smsw", 1, 0xf01, 0x4, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "smsw", 1, 0xf01, 0x4, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "str", 1, 0xf00, 0x1, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "str", 1, 0xf00, 0x1, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "verr", 1, 0xf00, 0x4, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "verw", 1, 0xf00, 0x5, 2,
     { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fld", 1, 0xd9c0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fld", 1, 0xd9, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fld", 1, 0xd9c0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fld", 1, 0xdb, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fild", 1, 0xdf, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fild", 1, 0xdf, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fildll", 1, 0xdf, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fldt", 1, 0xdb, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fbld", 1, 0xdf, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fst", 1, 0xddd0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fst", 1, 0xd9, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fst", 1, 0xddd0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fist", 1, 0xdf, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fstp", 1, 0xddd8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fstp", 1, 0xd9, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fstp", 1, 0xddd8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fstp", 1, 0xdb, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fistp", 1, 0xdf, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fistp", 1, 0xdf, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fistpll", 1, 0xdf, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fstpt", 1, 0xdb, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fbstp", 1, 0xdf, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fxch", 1, 0xd9c8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fxch", 0, 0xd9c9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcom", 1, 0xd8d0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcom", 0, 0xd8d1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcom", 1, 0xd8, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fcom", 1, 0xd8d0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ficom", 1, 0xde, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fcomp", 1, 0xd8d8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcomp", 0, 0xd8d9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcomp", 1, 0xd8, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fcomp", 1, 0xd8d8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ficomp", 1, 0xde, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fcompp", 0, 0xded9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucom", 1, 0xdde0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucom", 0, 0xdde1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucomp", 1, 0xdde8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucomp", 0, 0xdde9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucompp", 0, 0xdae9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ftst", 0, 0xd9e4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fxam", 0, 0xd9e5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fld1", 0, 0xd9e8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldl2t", 0, 0xd9e9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldl2e", 0, 0xd9ea, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldpi", 0, 0xd9eb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldlg2", 0, 0xd9ec, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldln2", 0, 0xd9ed, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldz", 0, 0xd9ee, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fadd", 2, 0xd8c0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4882,50 +4882,50 @@ const insn_template i386_optab[] =
   { "fadd", 1, 0xd8c0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fadd", 0, 0xdec1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fadd", 1, 0xd8, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fiadd", 1, 0xde, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "faddp", 2, 0xdec0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4935,30 +4935,30 @@ const insn_template i386_optab[] =
   { "faddp", 1, 0xdec0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "faddp", 0, 0xdec1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "faddp", 2, 0xdec0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4968,20 +4968,20 @@ const insn_template i386_optab[] =
   { "fsub", 1, 0xd8e0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsub", 2, 0xd8e0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -4991,30 +4991,30 @@ const insn_template i386_optab[] =
   { "fsub", 0, 0xdee1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsub", 0, 0xdee9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsub", 2, 0xd8e0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5024,30 +5024,30 @@ const insn_template i386_optab[] =
   { "fsub", 1, 0xd8, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fisub", 1, 0xde, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fsubp", 2, 0xdee0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5057,30 +5057,30 @@ const insn_template i386_optab[] =
   { "fsubp", 1, 0xdee0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubp", 0, 0xdee1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubp", 2, 0xdee0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5090,10 +5090,10 @@ const insn_template i386_optab[] =
   { "fsubp", 2, 0xdee9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5103,10 +5103,10 @@ const insn_template i386_optab[] =
   { "fsubp", 2, 0xdee8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5116,40 +5116,40 @@ const insn_template i386_optab[] =
   { "fsubp", 1, 0xdee8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubp", 0, 0xdee9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubr", 1, 0xd8e8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubr", 2, 0xd8e8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5159,30 +5159,30 @@ const insn_template i386_optab[] =
   { "fsubr", 0, 0xdee9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubr", 0, 0xdee1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubr", 2, 0xd8e8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5192,30 +5192,30 @@ const insn_template i386_optab[] =
   { "fsubr", 1, 0xd8, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fisubr", 1, 0xde, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fsubrp", 2, 0xdee8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5225,30 +5225,30 @@ const insn_template i386_optab[] =
   { "fsubrp", 1, 0xdee8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubrp", 0, 0xdee9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubrp", 2, 0xdee8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5258,10 +5258,10 @@ const insn_template i386_optab[] =
   { "fsubrp", 2, 0xdee0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5271,10 +5271,10 @@ const insn_template i386_optab[] =
   { "fsubrp", 2, 0xdee0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5284,30 +5284,30 @@ const insn_template i386_optab[] =
   { "fsubrp", 1, 0xdee0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsubrp", 0, 0xdee1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fmul", 2, 0xd8c8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5317,50 +5317,50 @@ const insn_template i386_optab[] =
   { "fmul", 1, 0xd8c8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fmul", 0, 0xdec9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fmul", 1, 0xd8, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fimul", 1, 0xde, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fmulp", 2, 0xdec8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5370,30 +5370,30 @@ const insn_template i386_optab[] =
   { "fmulp", 1, 0xdec8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fmulp", 0, 0xdec9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fmulp", 2, 0xdec8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5403,20 +5403,20 @@ const insn_template i386_optab[] =
   { "fdiv", 1, 0xd8f0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdiv", 2, 0xd8f0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5426,30 +5426,30 @@ const insn_template i386_optab[] =
   { "fdiv", 0, 0xdef1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdiv", 0, 0xdef9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdiv", 2, 0xd8f0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5459,30 +5459,30 @@ const insn_template i386_optab[] =
   { "fdiv", 1, 0xd8, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fidiv", 1, 0xde, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fdivp", 2, 0xdef0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5492,30 +5492,30 @@ const insn_template i386_optab[] =
   { "fdivp", 1, 0xdef0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivp", 0, 0xdef1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivp", 2, 0xdef0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5525,10 +5525,10 @@ const insn_template i386_optab[] =
   { "fdivp", 2, 0xdef8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5538,10 +5538,10 @@ const insn_template i386_optab[] =
   { "fdivp", 2, 0xdef8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5551,40 +5551,40 @@ const insn_template i386_optab[] =
   { "fdivp", 1, 0xdef8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivp", 0, 0xdef9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivr", 1, 0xd8f8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivr", 2, 0xd8f8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5594,30 +5594,30 @@ const insn_template i386_optab[] =
   { "fdivr", 0, 0xdef9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivr", 0, 0xdef1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivr", 2, 0xd8f8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5627,30 +5627,30 @@ const insn_template i386_optab[] =
   { "fdivr", 1, 0xd8, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fidivr", 1, 0xde, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fdivrp", 2, 0xdef8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5660,30 +5660,30 @@ const insn_template i386_optab[] =
   { "fdivrp", 1, 0xdef8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivrp", 0, 0xdef9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivrp", 2, 0xdef8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5693,10 +5693,10 @@ const insn_template i386_optab[] =
   { "fdivrp", 2, 0xdef0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5706,10 +5706,10 @@ const insn_template i386_optab[] =
   { "fdivrp", 2, 0xdef0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -5719,1060 +5719,1060 @@ const insn_template i386_optab[] =
   { "fdivrp", 1, 0xdef0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdivrp", 0, 0xdef1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "f2xm1", 0, 0xd9f0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fyl2x", 0, 0xd9f1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fptan", 0, 0xd9f2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fpatan", 0, 0xd9f3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fxtract", 0, 0xd9f4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fprem1", 0, 0xd9f5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdecstp", 0, 0xd9f6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fincstp", 0, 0xd9f7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fprem", 0, 0xd9f8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fyl2xp1", 0, 0xd9f9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsqrt", 0, 0xd9fa, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsincos", 0, 0xd9fb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "frndint", 0, 0xd9fc, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fscale", 0, 0xd9fd, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsin", 0, 0xd9fe, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcos", 0, 0xd9ff, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fchs", 0, 0xd9e0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fabs", 0, 0xd9e1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fninit", 0, 0xdbe3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "finit", 0, 0xdbe3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fldcw", 1, 0xd9, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fnstcw", 1, 0xd9, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fstcw", 1, 0xd9, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fnstsw", 1, 0xdfe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fnstsw", 1, 0xdd, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fnstsw", 0, 0xdfe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fstsw", 1, 0xdfe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fstsw", 1, 0xdd, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fstsw", 0, 0xdfe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fnclex", 0, 0xdbe2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fclex", 0, 0xdbe2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fnstenv", 1, 0xd9, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fstenv", 1, 0xd9, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fldenv", 1, 0xd9, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fnsave", 1, 0xdd, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fsave", 1, 0xdd, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "frstor", 1, 0xdd, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fneni", 0, 0xdbe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "feni", 0, 0xdbe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fndisi", 0, 0xdbe1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fdisi", 0, 0xdbe1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fnsetpm", 0, 0xdbe4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fsetpm", 0, 0xdbe4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "frstpm", 0, 0xdbe5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ffree", 1, 0xddc0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ffreep", 1, 0xdfc0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fnop", 0, 0xd9d0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fwait", 0, 0x9b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "addr16", 0, 0x67, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "addr32", 0, 0x67, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "aword", 0, 0x67, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "adword", 0, 0x67, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "data16", 0, 0x66, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "data32", 0, 0x66, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "word", 0, 0x66, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "dword", 0, 0x66, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lock", 0, 0xf0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "wait", 0, 0x9b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cs", 0, 0x2e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ds", 0, 0x3e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "es", 0, 0x26, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fs", 0, 0x64, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "gs", 0, 0x65, None, 1,
     { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ss", 0, 0x36, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rep", 0, 0xf3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "repe", 0, 0xf3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "repz", 0, 0xf3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "repne", 0, 0xf2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "repnz", 0, 0xf2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ht", 0, 0x3e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "hnt", 0, 0x2e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex", 0, 0x40, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexz", 0, 0x41, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexy", 0, 0x42, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexyz", 0, 0x43, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexx", 0, 0x44, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexxz", 0, 0x45, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexxy", 0, 0x46, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rexxyz", 0, 0x47, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64", 0, 0x48, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64z", 0, 0x49, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64y", 0, 0x4a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64yz", 0, 0x4b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64x", 0, 0x4c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64xz", 0, 0x4d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64xy", 0, 0x4e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex64xyz", 0, 0x4f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.b", 0, 0x41, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.x", 0, 0x42, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.xb", 0, 0x43, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.r", 0, 0x44, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.rb", 0, 0x45, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.rx", 0, 0x46, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.rxb", 0, 0x47, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.w", 0, 0x48, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wb", 0, 0x49, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wx", 0, 0x4a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wxb", 0, 0x4b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wr", 0, 0x4c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wrb", 0, 0x4d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wrx", 0, 0x4e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rex.wrxb", 0, 0x4f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "bswap", 1, 0xfc8, None, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xadd", 2, 0xfc0, None, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -6782,10 +6782,10 @@ const insn_template i386_optab[] =
   { "cmpxchg", 2, 0xfb0, None, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -6795,200 +6795,200 @@ const insn_template i386_optab[] =
   { "invd", 0, 0xf08, None, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "wbinvd", 0, 0xf09, None, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "invlpg", 1, 0xf01, 0x7, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "cpuid", 0, 0xfa2, None, 2,
     { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "wrmsr", 0, 0xf30, None, 2,
     { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rdtsc", 0, 0xf31, None, 2,
     { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rdmsr", 0, 0xf32, None, 2,
     { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cmpxchg8b", 1, 0xfc7, 0x1, 2,
     { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "sysenter", 0, 0xf34, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "sysexit", 0, 0xf35, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fxsave", 1, 0xfae, 0x0, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fxsave64", 1, 0xfae, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fxrstor", 1, 0xfae, 0x1, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fxrstor64", 1, 0xfae, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "rdpmc", 0, 0xf33, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ud2", 0, 0xf0b, None, 2,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ud2a", 0, 0xf0b, None, 2,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ud1", 0, 0xfb9, None, 2,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "ud2b", 0, 0xfb9, None, 2,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cmovo", 2, 0xf40, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -6998,10 +6998,10 @@ const insn_template i386_optab[] =
   { "cmovno", 2, 0xf41, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7011,10 +7011,10 @@ const insn_template i386_optab[] =
   { "cmovb", 2, 0xf42, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7024,10 +7024,10 @@ const insn_template i386_optab[] =
   { "cmovc", 2, 0xf42, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7037,10 +7037,10 @@ const insn_template i386_optab[] =
   { "cmovnae", 2, 0xf42, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7050,10 +7050,10 @@ const insn_template i386_optab[] =
   { "cmovae", 2, 0xf43, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7063,10 +7063,10 @@ const insn_template i386_optab[] =
   { "cmovnc", 2, 0xf43, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7076,10 +7076,10 @@ const insn_template i386_optab[] =
   { "cmovnb", 2, 0xf43, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7089,10 +7089,10 @@ const insn_template i386_optab[] =
   { "cmove", 2, 0xf44, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7102,10 +7102,10 @@ const insn_template i386_optab[] =
   { "cmovz", 2, 0xf44, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7115,10 +7115,10 @@ const insn_template i386_optab[] =
   { "cmovne", 2, 0xf45, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7128,10 +7128,10 @@ const insn_template i386_optab[] =
   { "cmovnz", 2, 0xf45, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7141,10 +7141,10 @@ const insn_template i386_optab[] =
   { "cmovbe", 2, 0xf46, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7154,10 +7154,10 @@ const insn_template i386_optab[] =
   { "cmovna", 2, 0xf46, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7167,10 +7167,10 @@ const insn_template i386_optab[] =
   { "cmova", 2, 0xf47, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7180,10 +7180,10 @@ const insn_template i386_optab[] =
   { "cmovnbe", 2, 0xf47, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7193,10 +7193,10 @@ const insn_template i386_optab[] =
   { "cmovs", 2, 0xf48, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7206,10 +7206,10 @@ const insn_template i386_optab[] =
   { "cmovns", 2, 0xf49, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7219,10 +7219,10 @@ const insn_template i386_optab[] =
   { "cmovp", 2, 0xf4a, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7232,10 +7232,10 @@ const insn_template i386_optab[] =
   { "cmovnp", 2, 0xf4b, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7245,10 +7245,10 @@ const insn_template i386_optab[] =
   { "cmovl", 2, 0xf4c, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7258,10 +7258,10 @@ const insn_template i386_optab[] =
   { "cmovnge", 2, 0xf4c, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7271,10 +7271,10 @@ const insn_template i386_optab[] =
   { "cmovge", 2, 0xf4d, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7284,10 +7284,10 @@ const insn_template i386_optab[] =
   { "cmovnl", 2, 0xf4d, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7297,10 +7297,10 @@ const insn_template i386_optab[] =
   { "cmovle", 2, 0xf4e, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7310,10 +7310,10 @@ const insn_template i386_optab[] =
   { "cmovng", 2, 0xf4e, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7323,10 +7323,10 @@ const insn_template i386_optab[] =
   { "cmovg", 2, 0xf4f, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7336,10 +7336,10 @@ const insn_template i386_optab[] =
   { "cmovnle", 2, 0xf4f, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7349,10 +7349,10 @@ const insn_template i386_optab[] =
   { "cmovpe", 2, 0xf4a, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7362,10 +7362,10 @@ const insn_template i386_optab[] =
   { "cmovpo", 2, 0xf4b, None, 2,
     { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7375,10 +7375,10 @@ const insn_template i386_optab[] =
   { "fcmovb", 2, 0xdac0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7388,10 +7388,10 @@ const insn_template i386_optab[] =
   { "fcmovnae", 2, 0xdac0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7401,10 +7401,10 @@ const insn_template i386_optab[] =
   { "fcmove", 2, 0xdac8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7414,10 +7414,10 @@ const insn_template i386_optab[] =
   { "fcmovbe", 2, 0xdad0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7427,10 +7427,10 @@ const insn_template i386_optab[] =
   { "fcmovna", 2, 0xdad0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7440,10 +7440,10 @@ const insn_template i386_optab[] =
   { "fcmovu", 2, 0xdad8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7453,10 +7453,10 @@ const insn_template i386_optab[] =
   { "fcmovae", 2, 0xdbc0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7466,10 +7466,10 @@ const insn_template i386_optab[] =
   { "fcmovnb", 2, 0xdbc0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7479,10 +7479,10 @@ const insn_template i386_optab[] =
   { "fcmovne", 2, 0xdbc8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7492,10 +7492,10 @@ const insn_template i386_optab[] =
   { "fcmova", 2, 0xdbd0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7505,10 +7505,10 @@ const insn_template i386_optab[] =
   { "fcmovnbe", 2, 0xdbd0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7518,10 +7518,10 @@ const insn_template i386_optab[] =
   { "fcmovnu", 2, 0xdbd8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7531,10 +7531,10 @@ const insn_template i386_optab[] =
   { "fcomi", 2, 0xdbf0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7544,30 +7544,30 @@ const insn_template i386_optab[] =
   { "fcomi", 0, 0xdbf1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcomi", 1, 0xdbf0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucomi", 2, 0xdbe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7577,30 +7577,30 @@ const insn_template i386_optab[] =
   { "fucomi", 0, 0xdbe9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucomi", 1, 0xdbe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcomip", 2, 0xdff0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7610,30 +7610,30 @@ const insn_template i386_optab[] =
   { "fcomip", 0, 0xdff1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcomip", 1, 0xdff0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcompi", 2, 0xdff0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7643,30 +7643,30 @@ const insn_template i386_optab[] =
   { "fcompi", 0, 0xdff1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fcompi", 1, 0xdff0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucomip", 2, 0xdfe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7676,30 +7676,30 @@ const insn_template i386_optab[] =
   { "fucomip", 0, 0xdfe9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucomip", 1, 0xdfe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucompi", 2, 0xdfe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7709,30 +7709,30 @@ const insn_template i386_optab[] =
   { "fucompi", 0, 0xdfe9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "fucompi", 1, 0xdfe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "movnti", 2, 0xfc3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7742,60 +7742,60 @@ const insn_template i386_optab[] =
   { "clflush", 1, 0xfae, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "lfence", 0, 0xfae, 0xe8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "mfence", 0, 0xfae, 0xf0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pause", 0, 0xf390, None, 2,
     { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "emms", 0, 0xf77, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "movd", 2, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7805,10 +7805,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7818,10 +7818,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7831,10 +7831,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7844,10 +7844,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x660f6e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7857,10 +7857,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x660f6e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7870,10 +7870,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x660f7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7883,10 +7883,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0x660f7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7896,10 +7896,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0xf6e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7909,10 +7909,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0xf6e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7922,10 +7922,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0xf7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7935,10 +7935,10 @@ const insn_template i386_optab[] =
   { "movd", 2, 0xf7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7948,10 +7948,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xa0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -7961,10 +7961,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x88, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7974,10 +7974,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xc6, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -7987,10 +7987,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xb0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8000,10 +8000,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf37e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8013,10 +8013,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x66d6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8026,10 +8026,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8039,10 +8039,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8052,10 +8052,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf30f7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8065,10 +8065,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x660fd6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8078,10 +8078,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x660f6e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8091,10 +8091,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x660f7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8104,10 +8104,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf6f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8117,10 +8117,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf7f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8130,10 +8130,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf6e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8143,10 +8143,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf7e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8156,10 +8156,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x8c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8169,10 +8169,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0x8e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8182,10 +8182,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf20, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8195,10 +8195,10 @@ const insn_template i386_optab[] =
   { "movq", 2, 0xf21, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -8208,10 +8208,10 @@ const insn_template i386_optab[] =
   { "packssdw", 2, 0x666b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8221,10 +8221,10 @@ const insn_template i386_optab[] =
   { "packssdw", 2, 0x660f6b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8234,10 +8234,10 @@ const insn_template i386_optab[] =
   { "packssdw", 2, 0xf6b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8247,10 +8247,10 @@ const insn_template i386_optab[] =
   { "packsswb", 2, 0x6663, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8260,10 +8260,10 @@ const insn_template i386_optab[] =
   { "packsswb", 2, 0x660f63, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8273,10 +8273,10 @@ const insn_template i386_optab[] =
   { "packsswb", 2, 0xf63, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8286,10 +8286,10 @@ const insn_template i386_optab[] =
   { "packuswb", 2, 0x6667, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8299,10 +8299,10 @@ const insn_template i386_optab[] =
   { "packuswb", 2, 0x660f67, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8312,10 +8312,10 @@ const insn_template i386_optab[] =
   { "packuswb", 2, 0xf67, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8325,10 +8325,10 @@ const insn_template i386_optab[] =
   { "paddb", 2, 0x66fc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8338,10 +8338,10 @@ const insn_template i386_optab[] =
   { "paddb", 2, 0x660ffc, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8351,10 +8351,10 @@ const insn_template i386_optab[] =
   { "paddb", 2, 0xffc, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8364,10 +8364,10 @@ const insn_template i386_optab[] =
   { "paddw", 2, 0x66fd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8377,10 +8377,10 @@ const insn_template i386_optab[] =
   { "paddw", 2, 0x660ffd, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8390,10 +8390,10 @@ const insn_template i386_optab[] =
   { "paddw", 2, 0xffd, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8403,10 +8403,10 @@ const insn_template i386_optab[] =
   { "paddd", 2, 0x66fe, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8416,10 +8416,10 @@ const insn_template i386_optab[] =
   { "paddd", 2, 0x660ffe, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8429,10 +8429,10 @@ const insn_template i386_optab[] =
   { "paddd", 2, 0xffe, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8442,10 +8442,10 @@ const insn_template i386_optab[] =
   { "paddq", 2, 0x66d4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8455,10 +8455,10 @@ const insn_template i386_optab[] =
   { "paddq", 2, 0x660fd4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8468,10 +8468,10 @@ const insn_template i386_optab[] =
   { "paddq", 2, 0xfd4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8481,10 +8481,10 @@ const insn_template i386_optab[] =
   { "paddsb", 2, 0x66ec, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8494,10 +8494,10 @@ const insn_template i386_optab[] =
   { "paddsb", 2, 0x660fec, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8507,10 +8507,10 @@ const insn_template i386_optab[] =
   { "paddsb", 2, 0xfec, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8520,10 +8520,10 @@ const insn_template i386_optab[] =
   { "paddsw", 2, 0x66ed, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8533,10 +8533,10 @@ const insn_template i386_optab[] =
   { "paddsw", 2, 0x660fed, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8546,10 +8546,10 @@ const insn_template i386_optab[] =
   { "paddsw", 2, 0xfed, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8559,10 +8559,10 @@ const insn_template i386_optab[] =
   { "paddusb", 2, 0x66dc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8572,10 +8572,10 @@ const insn_template i386_optab[] =
   { "paddusb", 2, 0x660fdc, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8585,10 +8585,10 @@ const insn_template i386_optab[] =
   { "paddusb", 2, 0xfdc, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8598,10 +8598,10 @@ const insn_template i386_optab[] =
   { "paddusw", 2, 0x66dd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8611,10 +8611,10 @@ const insn_template i386_optab[] =
   { "paddusw", 2, 0x660fdd, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8624,10 +8624,10 @@ const insn_template i386_optab[] =
   { "paddusw", 2, 0xfdd, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8637,10 +8637,10 @@ const insn_template i386_optab[] =
   { "pand", 2, 0x66db, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8650,10 +8650,10 @@ const insn_template i386_optab[] =
   { "pand", 2, 0x660fdb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8663,10 +8663,10 @@ const insn_template i386_optab[] =
   { "pand", 2, 0xfdb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8676,10 +8676,10 @@ const insn_template i386_optab[] =
   { "pandn", 2, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8689,10 +8689,10 @@ const insn_template i386_optab[] =
   { "pandn", 2, 0x660fdf, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8702,10 +8702,10 @@ const insn_template i386_optab[] =
   { "pandn", 2, 0xfdf, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8715,10 +8715,10 @@ const insn_template i386_optab[] =
   { "pcmpeqb", 2, 0x6674, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8728,10 +8728,10 @@ const insn_template i386_optab[] =
   { "pcmpeqb", 2, 0x660f74, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8741,10 +8741,10 @@ const insn_template i386_optab[] =
   { "pcmpeqb", 2, 0xf74, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8754,10 +8754,10 @@ const insn_template i386_optab[] =
   { "pcmpeqw", 2, 0x6675, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8767,10 +8767,10 @@ const insn_template i386_optab[] =
   { "pcmpeqw", 2, 0x660f75, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8780,10 +8780,10 @@ const insn_template i386_optab[] =
   { "pcmpeqw", 2, 0xf75, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8793,10 +8793,10 @@ const insn_template i386_optab[] =
   { "pcmpeqd", 2, 0x6676, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8806,10 +8806,10 @@ const insn_template i386_optab[] =
   { "pcmpeqd", 2, 0x660f76, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8819,10 +8819,10 @@ const insn_template i386_optab[] =
   { "pcmpeqd", 2, 0xf76, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8832,10 +8832,10 @@ const insn_template i386_optab[] =
   { "pcmpgtb", 2, 0x6664, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8845,10 +8845,10 @@ const insn_template i386_optab[] =
   { "pcmpgtb", 2, 0x660f64, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8858,10 +8858,10 @@ const insn_template i386_optab[] =
   { "pcmpgtb", 2, 0xf64, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8871,10 +8871,10 @@ const insn_template i386_optab[] =
   { "pcmpgtw", 2, 0x6665, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8884,10 +8884,10 @@ const insn_template i386_optab[] =
   { "pcmpgtw", 2, 0x660f65, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8897,10 +8897,10 @@ const insn_template i386_optab[] =
   { "pcmpgtw", 2, 0xf65, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8910,10 +8910,10 @@ const insn_template i386_optab[] =
   { "pcmpgtd", 2, 0x6666, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8923,10 +8923,10 @@ const insn_template i386_optab[] =
   { "pcmpgtd", 2, 0x660f66, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8936,10 +8936,10 @@ const insn_template i386_optab[] =
   { "pcmpgtd", 2, 0xf66, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8949,10 +8949,10 @@ const insn_template i386_optab[] =
   { "pmaddwd", 2, 0x66f5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8962,10 +8962,10 @@ const insn_template i386_optab[] =
   { "pmaddwd", 2, 0x660ff5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -8975,10 +8975,10 @@ const insn_template i386_optab[] =
   { "pmaddwd", 2, 0xff5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -8988,10 +8988,10 @@ const insn_template i386_optab[] =
   { "pmulhw", 2, 0x66e5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9001,10 +9001,10 @@ const insn_template i386_optab[] =
   { "pmulhw", 2, 0x660fe5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9014,10 +9014,10 @@ const insn_template i386_optab[] =
   { "pmulhw", 2, 0xfe5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9027,10 +9027,10 @@ const insn_template i386_optab[] =
   { "pmullw", 2, 0x66d5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9040,10 +9040,10 @@ const insn_template i386_optab[] =
   { "pmullw", 2, 0x660fd5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9053,10 +9053,10 @@ const insn_template i386_optab[] =
   { "pmullw", 2, 0xfd5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9066,10 +9066,10 @@ const insn_template i386_optab[] =
   { "por", 2, 0x66eb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9079,10 +9079,10 @@ const insn_template i386_optab[] =
   { "por", 2, 0x660feb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9092,10 +9092,10 @@ const insn_template i386_optab[] =
   { "por", 2, 0xfeb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9105,10 +9105,10 @@ const insn_template i386_optab[] =
   { "psllw", 2, 0x6671, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9118,10 +9118,10 @@ const insn_template i386_optab[] =
   { "psllw", 2, 0x66f1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9131,10 +9131,10 @@ const insn_template i386_optab[] =
   { "psllw", 2, 0x660f71, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9144,10 +9144,10 @@ const insn_template i386_optab[] =
   { "psllw", 2, 0x660ff1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9157,10 +9157,10 @@ const insn_template i386_optab[] =
   { "psllw", 2, 0xf71, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9170,10 +9170,10 @@ const insn_template i386_optab[] =
   { "psllw", 2, 0xff1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9183,10 +9183,10 @@ const insn_template i386_optab[] =
   { "pslld", 2, 0x6672, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9196,10 +9196,10 @@ const insn_template i386_optab[] =
   { "pslld", 2, 0x66f2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9209,10 +9209,10 @@ const insn_template i386_optab[] =
   { "pslld", 2, 0x660f72, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9222,10 +9222,10 @@ const insn_template i386_optab[] =
   { "pslld", 2, 0x660ff2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9235,10 +9235,10 @@ const insn_template i386_optab[] =
   { "pslld", 2, 0xf72, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9248,10 +9248,10 @@ const insn_template i386_optab[] =
   { "pslld", 2, 0xff2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9261,10 +9261,10 @@ const insn_template i386_optab[] =
   { "psllq", 2, 0x6673, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9274,10 +9274,10 @@ const insn_template i386_optab[] =
   { "psllq", 2, 0x66f3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9287,10 +9287,10 @@ const insn_template i386_optab[] =
   { "psllq", 2, 0x660f73, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9300,10 +9300,10 @@ const insn_template i386_optab[] =
   { "psllq", 2, 0x660ff3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9313,10 +9313,10 @@ const insn_template i386_optab[] =
   { "psllq", 2, 0xf73, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9326,10 +9326,10 @@ const insn_template i386_optab[] =
   { "psllq", 2, 0xff3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9339,10 +9339,10 @@ const insn_template i386_optab[] =
   { "psraw", 2, 0x6671, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9352,10 +9352,10 @@ const insn_template i386_optab[] =
   { "psraw", 2, 0x66e1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9365,10 +9365,10 @@ const insn_template i386_optab[] =
   { "psraw", 2, 0x660f71, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9378,10 +9378,10 @@ const insn_template i386_optab[] =
   { "psraw", 2, 0x660fe1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9391,10 +9391,10 @@ const insn_template i386_optab[] =
   { "psraw", 2, 0xf71, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9404,10 +9404,10 @@ const insn_template i386_optab[] =
   { "psraw", 2, 0xfe1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9417,10 +9417,10 @@ const insn_template i386_optab[] =
   { "psrad", 2, 0x6672, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9430,10 +9430,10 @@ const insn_template i386_optab[] =
   { "psrad", 2, 0x66e2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9443,10 +9443,10 @@ const insn_template i386_optab[] =
   { "psrad", 2, 0x660f72, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9456,10 +9456,10 @@ const insn_template i386_optab[] =
   { "psrad", 2, 0x660fe2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9469,10 +9469,10 @@ const insn_template i386_optab[] =
   { "psrad", 2, 0xf72, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9482,10 +9482,10 @@ const insn_template i386_optab[] =
   { "psrad", 2, 0xfe2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9495,10 +9495,10 @@ const insn_template i386_optab[] =
   { "psrlw", 2, 0x6671, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9508,10 +9508,10 @@ const insn_template i386_optab[] =
   { "psrlw", 2, 0x66d1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9521,10 +9521,10 @@ const insn_template i386_optab[] =
   { "psrlw", 2, 0x660f71, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9534,10 +9534,10 @@ const insn_template i386_optab[] =
   { "psrlw", 2, 0x660fd1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9547,10 +9547,10 @@ const insn_template i386_optab[] =
   { "psrlw", 2, 0xf71, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9560,10 +9560,10 @@ const insn_template i386_optab[] =
   { "psrlw", 2, 0xfd1, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9573,10 +9573,10 @@ const insn_template i386_optab[] =
   { "psrld", 2, 0x6672, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9586,10 +9586,10 @@ const insn_template i386_optab[] =
   { "psrld", 2, 0x66d2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9599,10 +9599,10 @@ const insn_template i386_optab[] =
   { "psrld", 2, 0x660f72, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9612,10 +9612,10 @@ const insn_template i386_optab[] =
   { "psrld", 2, 0x660fd2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9625,10 +9625,10 @@ const insn_template i386_optab[] =
   { "psrld", 2, 0xf72, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9638,10 +9638,10 @@ const insn_template i386_optab[] =
   { "psrld", 2, 0xfd2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9651,10 +9651,10 @@ const insn_template i386_optab[] =
   { "psrlq", 2, 0x6673, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9664,10 +9664,10 @@ const insn_template i386_optab[] =
   { "psrlq", 2, 0x66d3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9677,10 +9677,10 @@ const insn_template i386_optab[] =
   { "psrlq", 2, 0x660f73, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9690,10 +9690,10 @@ const insn_template i386_optab[] =
   { "psrlq", 2, 0x660fd3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9703,10 +9703,10 @@ const insn_template i386_optab[] =
   { "psrlq", 2, 0xf73, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -9716,10 +9716,10 @@ const insn_template i386_optab[] =
   { "psrlq", 2, 0xfd3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9729,10 +9729,10 @@ const insn_template i386_optab[] =
   { "psubb", 2, 0x66f8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9742,10 +9742,10 @@ const insn_template i386_optab[] =
   { "psubb", 2, 0x660ff8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9755,10 +9755,10 @@ const insn_template i386_optab[] =
   { "psubb", 2, 0xff8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9768,10 +9768,10 @@ const insn_template i386_optab[] =
   { "psubw", 2, 0x66f9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9781,10 +9781,10 @@ const insn_template i386_optab[] =
   { "psubw", 2, 0x660ff9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9794,10 +9794,10 @@ const insn_template i386_optab[] =
   { "psubw", 2, 0xff9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9807,10 +9807,10 @@ const insn_template i386_optab[] =
   { "psubd", 2, 0x66fa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9820,10 +9820,10 @@ const insn_template i386_optab[] =
   { "psubd", 2, 0x660ffa, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9833,10 +9833,10 @@ const insn_template i386_optab[] =
   { "psubd", 2, 0xffa, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9846,10 +9846,10 @@ const insn_template i386_optab[] =
   { "psubq", 2, 0x66fb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9859,10 +9859,10 @@ const insn_template i386_optab[] =
   { "psubq", 2, 0x660ffb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9872,10 +9872,10 @@ const insn_template i386_optab[] =
   { "psubq", 2, 0xffb, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9885,10 +9885,10 @@ const insn_template i386_optab[] =
   { "psubsb", 2, 0x66e8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9898,10 +9898,10 @@ const insn_template i386_optab[] =
   { "psubsb", 2, 0x660fe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9911,10 +9911,10 @@ const insn_template i386_optab[] =
   { "psubsb", 2, 0xfe8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9924,10 +9924,10 @@ const insn_template i386_optab[] =
   { "psubsw", 2, 0x66e9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9937,10 +9937,10 @@ const insn_template i386_optab[] =
   { "psubsw", 2, 0x660fe9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9950,10 +9950,10 @@ const insn_template i386_optab[] =
   { "psubsw", 2, 0xfe9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -9963,10 +9963,10 @@ const insn_template i386_optab[] =
   { "psubusb", 2, 0x66d8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9976,10 +9976,10 @@ const insn_template i386_optab[] =
   { "psubusb", 2, 0x660fd8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -9989,10 +9989,10 @@ const insn_template i386_optab[] =
   { "psubusb", 2, 0xfd8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10002,10 +10002,10 @@ const insn_template i386_optab[] =
   { "psubusw", 2, 0x66d9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10015,10 +10015,10 @@ const insn_template i386_optab[] =
   { "psubusw", 2, 0x660fd9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10028,10 +10028,10 @@ const insn_template i386_optab[] =
   { "psubusw", 2, 0xfd9, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10041,10 +10041,10 @@ const insn_template i386_optab[] =
   { "punpckhbw", 2, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10054,10 +10054,10 @@ const insn_template i386_optab[] =
   { "punpckhbw", 2, 0x660f68, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10067,10 +10067,10 @@ const insn_template i386_optab[] =
   { "punpckhbw", 2, 0xf68, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10080,10 +10080,10 @@ const insn_template i386_optab[] =
   { "punpckhwd", 2, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10093,10 +10093,10 @@ const insn_template i386_optab[] =
   { "punpckhwd", 2, 0x660f69, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10106,10 +10106,10 @@ const insn_template i386_optab[] =
   { "punpckhwd", 2, 0xf69, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10119,10 +10119,10 @@ const insn_template i386_optab[] =
   { "punpckhdq", 2, 0x666a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10132,10 +10132,10 @@ const insn_template i386_optab[] =
   { "punpckhdq", 2, 0x660f6a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10145,10 +10145,10 @@ const insn_template i386_optab[] =
   { "punpckhdq", 2, 0xf6a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10158,10 +10158,10 @@ const insn_template i386_optab[] =
   { "punpcklbw", 2, 0x6660, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10171,10 +10171,10 @@ const insn_template i386_optab[] =
   { "punpcklbw", 2, 0x660f60, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10184,10 +10184,10 @@ const insn_template i386_optab[] =
   { "punpcklbw", 2, 0xf60, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10197,10 +10197,10 @@ const insn_template i386_optab[] =
   { "punpcklwd", 2, 0x6661, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10210,10 +10210,10 @@ const insn_template i386_optab[] =
   { "punpcklwd", 2, 0x660f61, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10223,10 +10223,10 @@ const insn_template i386_optab[] =
   { "punpcklwd", 2, 0xf61, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10236,10 +10236,10 @@ const insn_template i386_optab[] =
   { "punpckldq", 2, 0x6662, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10249,10 +10249,10 @@ const insn_template i386_optab[] =
   { "punpckldq", 2, 0x660f62, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10262,10 +10262,10 @@ const insn_template i386_optab[] =
   { "punpckldq", 2, 0xf62, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10275,10 +10275,10 @@ const insn_template i386_optab[] =
   { "pxor", 2, 0x66ef, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10288,10 +10288,10 @@ const insn_template i386_optab[] =
   { "pxor", 2, 0x660fef, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10301,10 +10301,10 @@ const insn_template i386_optab[] =
   { "pxor", 2, 0xfef, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10314,10 +10314,10 @@ const insn_template i386_optab[] =
   { "addps", 2, 0x58, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10327,10 +10327,10 @@ const insn_template i386_optab[] =
   { "addps", 2, 0xf58, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10340,10 +10340,10 @@ const insn_template i386_optab[] =
   { "addss", 2, 0xf358, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10353,10 +10353,10 @@ const insn_template i386_optab[] =
   { "addss", 2, 0xf30f58, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10366,10 +10366,10 @@ const insn_template i386_optab[] =
   { "andnps", 2, 0x55, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10379,10 +10379,10 @@ const insn_template i386_optab[] =
   { "andnps", 2, 0xf55, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10392,10 +10392,10 @@ const insn_template i386_optab[] =
   { "andps", 2, 0x54, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10405,10 +10405,10 @@ const insn_template i386_optab[] =
   { "andps", 2, 0xf54, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10418,10 +10418,10 @@ const insn_template i386_optab[] =
   { "cmpeqps", 2, 0xc2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10431,10 +10431,10 @@ const insn_template i386_optab[] =
   { "cmpeqps", 2, 0xfc2, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10444,10 +10444,10 @@ const insn_template i386_optab[] =
   { "cmpeqss", 2, 0xf3c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10457,10 +10457,10 @@ const insn_template i386_optab[] =
   { "cmpeqss", 2, 0xf30fc2, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10470,10 +10470,10 @@ const insn_template i386_optab[] =
   { "cmpleps", 2, 0xc2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10483,10 +10483,10 @@ const insn_template i386_optab[] =
   { "cmpleps", 2, 0xfc2, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10496,10 +10496,10 @@ const insn_template i386_optab[] =
   { "cmpless", 2, 0xf3c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10509,10 +10509,10 @@ const insn_template i386_optab[] =
   { "cmpless", 2, 0xf30fc2, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10522,10 +10522,10 @@ const insn_template i386_optab[] =
   { "cmpltps", 2, 0xc2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10535,10 +10535,10 @@ const insn_template i386_optab[] =
   { "cmpltps", 2, 0xfc2, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10548,10 +10548,10 @@ const insn_template i386_optab[] =
   { "cmpltss", 2, 0xf3c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10561,10 +10561,10 @@ const insn_template i386_optab[] =
   { "cmpltss", 2, 0xf30fc2, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10574,10 +10574,10 @@ const insn_template i386_optab[] =
   { "cmpneqps", 2, 0xc2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10587,10 +10587,10 @@ const insn_template i386_optab[] =
   { "cmpneqps", 2, 0xfc2, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10600,10 +10600,10 @@ const insn_template i386_optab[] =
   { "cmpneqss", 2, 0xf3c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10613,10 +10613,10 @@ const insn_template i386_optab[] =
   { "cmpneqss", 2, 0xf30fc2, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10626,10 +10626,10 @@ const insn_template i386_optab[] =
   { "cmpnleps", 2, 0xc2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10639,10 +10639,10 @@ const insn_template i386_optab[] =
   { "cmpnleps", 2, 0xfc2, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10652,10 +10652,10 @@ const insn_template i386_optab[] =
   { "cmpnless", 2, 0xf3c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10665,10 +10665,10 @@ const insn_template i386_optab[] =
   { "cmpnless", 2, 0xf30fc2, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10678,10 +10678,10 @@ const insn_template i386_optab[] =
   { "cmpnltps", 2, 0xc2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10691,10 +10691,10 @@ const insn_template i386_optab[] =
   { "cmpnltps", 2, 0xfc2, 0x5, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10704,10 +10704,10 @@ const insn_template i386_optab[] =
   { "cmpnltss", 2, 0xf3c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10717,10 +10717,10 @@ const insn_template i386_optab[] =
   { "cmpnltss", 2, 0xf30fc2, 0x5, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10730,10 +10730,10 @@ const insn_template i386_optab[] =
   { "cmpordps", 2, 0xc2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10743,10 +10743,10 @@ const insn_template i386_optab[] =
   { "cmpordps", 2, 0xfc2, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10756,10 +10756,10 @@ const insn_template i386_optab[] =
   { "cmpordss", 2, 0xf3c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10769,10 +10769,10 @@ const insn_template i386_optab[] =
   { "cmpordss", 2, 0xf30fc2, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10782,10 +10782,10 @@ const insn_template i386_optab[] =
   { "cmpunordps", 2, 0xc2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10795,10 +10795,10 @@ const insn_template i386_optab[] =
   { "cmpunordps", 2, 0xfc2, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -10808,10 +10808,10 @@ const insn_template i386_optab[] =
   { "cmpunordss", 2, 0xf3c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10821,10 +10821,10 @@ const insn_template i386_optab[] =
   { "cmpunordss", 2, 0xf30fc2, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10834,10 +10834,10 @@ const insn_template i386_optab[] =
   { "cmpps", 3, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -10850,10 +10850,10 @@ const insn_template i386_optab[] =
   { "cmpps", 3, 0xfc2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -10866,10 +10866,10 @@ const insn_template i386_optab[] =
   { "cmpss", 3, 0xf3c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -10882,10 +10882,10 @@ const insn_template i386_optab[] =
   { "cmpss", 3, 0xf30fc2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -10898,10 +10898,10 @@ const insn_template i386_optab[] =
   { "comiss", 2, 0x2f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10911,10 +10911,10 @@ const insn_template i386_optab[] =
   { "comiss", 2, 0xf2f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10924,10 +10924,10 @@ const insn_template i386_optab[] =
   { "cvtpi2ps", 2, 0xf2a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10937,10 +10937,10 @@ const insn_template i386_optab[] =
   { "cvtps2pi", 2, 0xf2d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10950,10 +10950,10 @@ const insn_template i386_optab[] =
   { "cvtsi2ss", 2, 0xf32a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10963,10 +10963,10 @@ const insn_template i386_optab[] =
   { "cvtsi2ss", 2, 0xf32a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10976,10 +10976,10 @@ const insn_template i386_optab[] =
   { "cvtsi2ss", 2, 0xf30f2a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -10989,10 +10989,10 @@ const insn_template i386_optab[] =
   { "cvtsi2ss", 2, 0xf30f2a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11002,10 +11002,10 @@ const insn_template i386_optab[] =
   { "cvtss2si", 2, 0xf32d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11015,10 +11015,10 @@ const insn_template i386_optab[] =
   { "cvtss2si", 2, 0xf30f2d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11028,10 +11028,10 @@ const insn_template i386_optab[] =
   { "cvttps2pi", 2, 0xf2c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11041,10 +11041,10 @@ const insn_template i386_optab[] =
   { "cvttss2si", 2, 0xf32c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11054,10 +11054,10 @@ const insn_template i386_optab[] =
   { "cvttss2si", 2, 0xf30f2c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11067,10 +11067,10 @@ const insn_template i386_optab[] =
   { "divps", 2, 0x5e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11080,10 +11080,10 @@ const insn_template i386_optab[] =
   { "divps", 2, 0xf5e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11093,10 +11093,10 @@ const insn_template i386_optab[] =
   { "divss", 2, 0xf35e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11106,10 +11106,10 @@ const insn_template i386_optab[] =
   { "divss", 2, 0xf30f5e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11119,30 +11119,30 @@ const insn_template i386_optab[] =
   { "ldmxcsr", 1, 0xae, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "ldmxcsr", 1, 0xfae, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "maskmovq", 2, 0xff7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11152,10 +11152,10 @@ const insn_template i386_optab[] =
   { "maxps", 2, 0x5f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11165,10 +11165,10 @@ const insn_template i386_optab[] =
   { "maxps", 2, 0xf5f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11178,10 +11178,10 @@ const insn_template i386_optab[] =
   { "maxss", 2, 0xf35f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11191,10 +11191,10 @@ const insn_template i386_optab[] =
   { "maxss", 2, 0xf30f5f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11204,10 +11204,10 @@ const insn_template i386_optab[] =
   { "minps", 2, 0x5d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11217,10 +11217,10 @@ const insn_template i386_optab[] =
   { "minps", 2, 0xf5d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11230,10 +11230,10 @@ const insn_template i386_optab[] =
   { "minss", 2, 0xf35d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11243,10 +11243,10 @@ const insn_template i386_optab[] =
   { "minss", 2, 0xf30f5d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11256,10 +11256,10 @@ const insn_template i386_optab[] =
   { "movaps", 2, 0x28, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11269,10 +11269,10 @@ const insn_template i386_optab[] =
   { "movaps", 2, 0x29, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11282,10 +11282,10 @@ const insn_template i386_optab[] =
   { "movaps", 2, 0xf28, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11295,10 +11295,10 @@ const insn_template i386_optab[] =
   { "movaps", 2, 0xf29, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11308,10 +11308,10 @@ const insn_template i386_optab[] =
   { "movhlps", 2, 0x12, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11321,10 +11321,10 @@ const insn_template i386_optab[] =
   { "movhlps", 2, 0xf12, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11334,10 +11334,10 @@ const insn_template i386_optab[] =
   { "movhps", 2, 0x16, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11347,10 +11347,10 @@ const insn_template i386_optab[] =
   { "movhps", 2, 0x17, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11360,10 +11360,10 @@ const insn_template i386_optab[] =
   { "movhps", 2, 0xf16, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11373,10 +11373,10 @@ const insn_template i386_optab[] =
   { "movhps", 2, 0xf17, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11386,10 +11386,10 @@ const insn_template i386_optab[] =
   { "movlhps", 2, 0x16, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11399,10 +11399,10 @@ const insn_template i386_optab[] =
   { "movlhps", 2, 0xf16, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11412,10 +11412,10 @@ const insn_template i386_optab[] =
   { "movlps", 2, 0x12, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11425,10 +11425,10 @@ const insn_template i386_optab[] =
   { "movlps", 2, 0x13, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11438,10 +11438,10 @@ const insn_template i386_optab[] =
   { "movlps", 2, 0xf12, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11451,10 +11451,10 @@ const insn_template i386_optab[] =
   { "movlps", 2, 0xf13, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11464,10 +11464,10 @@ const insn_template i386_optab[] =
   { "movmskps", 2, 0x50, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11477,10 +11477,10 @@ const insn_template i386_optab[] =
   { "movmskps", 2, 0xf50, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11490,10 +11490,10 @@ const insn_template i386_optab[] =
   { "movntps", 2, 0x2b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11503,10 +11503,10 @@ const insn_template i386_optab[] =
   { "movntps", 2, 0xf2b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11516,10 +11516,10 @@ const insn_template i386_optab[] =
   { "movntq", 2, 0xfe7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11529,10 +11529,10 @@ const insn_template i386_optab[] =
   { "movntdq", 2, 0x66e7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11542,10 +11542,10 @@ const insn_template i386_optab[] =
   { "movntdq", 2, 0x660fe7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11555,10 +11555,10 @@ const insn_template i386_optab[] =
   { "movss", 2, 0xf311, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11568,10 +11568,10 @@ const insn_template i386_optab[] =
   { "movss", 2, 0xf310, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11581,10 +11581,10 @@ const insn_template i386_optab[] =
   { "movss", 2, 0xf310, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11594,10 +11594,10 @@ const insn_template i386_optab[] =
   { "movss", 2, 0xf311, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11607,10 +11607,10 @@ const insn_template i386_optab[] =
   { "movss", 2, 0xf30f10, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11620,10 +11620,10 @@ const insn_template i386_optab[] =
   { "movss", 2, 0xf30f11, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11633,10 +11633,10 @@ const insn_template i386_optab[] =
   { "movups", 2, 0x10, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11646,10 +11646,10 @@ const insn_template i386_optab[] =
   { "movups", 2, 0x11, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11659,10 +11659,10 @@ const insn_template i386_optab[] =
   { "movups", 2, 0xf10, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11672,10 +11672,10 @@ const insn_template i386_optab[] =
   { "movups", 2, 0xf11, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11685,10 +11685,10 @@ const insn_template i386_optab[] =
   { "mulps", 2, 0x59, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11698,10 +11698,10 @@ const insn_template i386_optab[] =
   { "mulps", 2, 0xf59, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11711,10 +11711,10 @@ const insn_template i386_optab[] =
   { "mulss", 2, 0xf359, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11724,10 +11724,10 @@ const insn_template i386_optab[] =
   { "mulss", 2, 0xf30f59, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11737,10 +11737,10 @@ const insn_template i386_optab[] =
   { "orps", 2, 0x56, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11750,10 +11750,10 @@ const insn_template i386_optab[] =
   { "orps", 2, 0xf56, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11763,10 +11763,10 @@ const insn_template i386_optab[] =
   { "pavgb", 2, 0xfe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11776,10 +11776,10 @@ const insn_template i386_optab[] =
   { "pavgb", 2, 0x66e0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11789,10 +11789,10 @@ const insn_template i386_optab[] =
   { "pavgb", 2, 0x660fe0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11802,10 +11802,10 @@ const insn_template i386_optab[] =
   { "pavgw", 2, 0xfe3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -11815,10 +11815,10 @@ const insn_template i386_optab[] =
   { "pavgw", 2, 0x66e3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11828,10 +11828,10 @@ const insn_template i386_optab[] =
   { "pavgw", 2, 0x660fe3, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11841,10 +11841,10 @@ const insn_template i386_optab[] =
   { "pextrw", 3, 0x66c5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11857,10 +11857,10 @@ const insn_template i386_optab[] =
   { "pextrw", 3, 0x6615, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11873,10 +11873,10 @@ const insn_template i386_optab[] =
   { "pextrw", 3, 0x660fc5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11889,10 +11889,10 @@ const insn_template i386_optab[] =
   { "pextrw", 3, 0x660f3a15, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11905,10 +11905,10 @@ const insn_template i386_optab[] =
   { "pextrw", 3, 0xfc5, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11921,10 +11921,10 @@ const insn_template i386_optab[] =
   { "pinsrw", 3, 0x66c4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11937,10 +11937,10 @@ const insn_template i386_optab[] =
   { "pinsrw", 3, 0x660fc4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11953,10 +11953,10 @@ const insn_template i386_optab[] =
   { "pinsrw", 3, 0xfc4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -11969,10 +11969,10 @@ const insn_template i386_optab[] =
   { "pmaxsw", 2, 0x66ee, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11982,10 +11982,10 @@ const insn_template i386_optab[] =
   { "pmaxsw", 2, 0x660fee, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -11995,10 +11995,10 @@ const insn_template i386_optab[] =
   { "pmaxsw", 2, 0xfee, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12008,10 +12008,10 @@ const insn_template i386_optab[] =
   { "pmaxub", 2, 0x66de, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12021,10 +12021,10 @@ const insn_template i386_optab[] =
   { "pmaxub", 2, 0x660fde, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12034,10 +12034,10 @@ const insn_template i386_optab[] =
   { "pmaxub", 2, 0xfde, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12047,10 +12047,10 @@ const insn_template i386_optab[] =
   { "pminsw", 2, 0x66ea, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12060,10 +12060,10 @@ const insn_template i386_optab[] =
   { "pminsw", 2, 0x660fea, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12073,10 +12073,10 @@ const insn_template i386_optab[] =
   { "pminsw", 2, 0xfea, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12086,10 +12086,10 @@ const insn_template i386_optab[] =
   { "pminub", 2, 0x66da, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12099,10 +12099,10 @@ const insn_template i386_optab[] =
   { "pminub", 2, 0x660fda, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12112,10 +12112,10 @@ const insn_template i386_optab[] =
   { "pminub", 2, 0xfda, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12125,10 +12125,10 @@ const insn_template i386_optab[] =
   { "pmovmskb", 2, 0x66d7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -12138,10 +12138,10 @@ const insn_template i386_optab[] =
   { "pmovmskb", 2, 0x660fd7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -12151,10 +12151,10 @@ const insn_template i386_optab[] =
   { "pmovmskb", 2, 0xfd7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -12164,10 +12164,10 @@ const insn_template i386_optab[] =
   { "pmulhuw", 2, 0x66e4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12177,10 +12177,10 @@ const insn_template i386_optab[] =
   { "pmulhuw", 2, 0x660fe4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12190,10 +12190,10 @@ const insn_template i386_optab[] =
   { "pmulhuw", 2, 0xfe4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12203,50 +12203,50 @@ const insn_template i386_optab[] =
   { "prefetchnta", 1, 0xf18, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "prefetcht0", 1, 0xf18, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "prefetcht1", 1, 0xf18, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "prefetcht2", 1, 0xf18, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "psadbw", 2, 0xff6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12256,10 +12256,10 @@ const insn_template i386_optab[] =
   { "psadbw", 2, 0x66f6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12269,10 +12269,10 @@ const insn_template i386_optab[] =
   { "psadbw", 2, 0x660ff6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12282,10 +12282,10 @@ const insn_template i386_optab[] =
   { "pshufw", 3, 0xf70, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -12298,10 +12298,10 @@ const insn_template i386_optab[] =
   { "rcpps", 2, 0x53, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12311,10 +12311,10 @@ const insn_template i386_optab[] =
   { "rcpps", 2, 0xf53, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12324,10 +12324,10 @@ const insn_template i386_optab[] =
   { "rcpss", 2, 0xf353, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12337,10 +12337,10 @@ const insn_template i386_optab[] =
   { "rcpss", 2, 0xf30f53, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12350,10 +12350,10 @@ const insn_template i386_optab[] =
   { "rsqrtps", 2, 0x52, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12363,10 +12363,10 @@ const insn_template i386_optab[] =
   { "rsqrtps", 2, 0xf52, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12376,10 +12376,10 @@ const insn_template i386_optab[] =
   { "rsqrtss", 2, 0xf352, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12389,10 +12389,10 @@ const insn_template i386_optab[] =
   { "rsqrtss", 2, 0xf30f52, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12402,20 +12402,20 @@ const insn_template i386_optab[] =
   { "sfence", 0, 0xfae, 0xf8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "shufps", 3, 0xc6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -12428,10 +12428,10 @@ const insn_template i386_optab[] =
   { "shufps", 3, 0xfc6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -12444,10 +12444,10 @@ const insn_template i386_optab[] =
   { "sqrtps", 2, 0x51, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12457,10 +12457,10 @@ const insn_template i386_optab[] =
   { "sqrtps", 2, 0xf51, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12470,10 +12470,10 @@ const insn_template i386_optab[] =
   { "sqrtss", 2, 0xf351, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12483,10 +12483,10 @@ const insn_template i386_optab[] =
   { "sqrtss", 2, 0xf30f51, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12496,30 +12496,30 @@ const insn_template i386_optab[] =
   { "stmxcsr", 1, 0xae, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "stmxcsr", 1, 0xfae, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "subps", 2, 0x5c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12529,10 +12529,10 @@ const insn_template i386_optab[] =
   { "subps", 2, 0xf5c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12542,10 +12542,10 @@ const insn_template i386_optab[] =
   { "subss", 2, 0xf35c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12555,10 +12555,10 @@ const insn_template i386_optab[] =
   { "subss", 2, 0xf30f5c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12568,10 +12568,10 @@ const insn_template i386_optab[] =
   { "ucomiss", 2, 0x2e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12581,10 +12581,10 @@ const insn_template i386_optab[] =
   { "ucomiss", 2, 0xf2e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12594,10 +12594,10 @@ const insn_template i386_optab[] =
   { "unpckhps", 2, 0x15, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12607,10 +12607,10 @@ const insn_template i386_optab[] =
   { "unpckhps", 2, 0xf15, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12620,10 +12620,10 @@ const insn_template i386_optab[] =
   { "unpcklps", 2, 0x14, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12633,10 +12633,10 @@ const insn_template i386_optab[] =
   { "unpcklps", 2, 0xf14, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12646,10 +12646,10 @@ const insn_template i386_optab[] =
   { "xorps", 2, 0x57, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12659,10 +12659,10 @@ const insn_template i386_optab[] =
   { "xorps", 2, 0xf57, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12672,10 +12672,10 @@ const insn_template i386_optab[] =
   { "addpd", 2, 0x6658, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12685,10 +12685,10 @@ const insn_template i386_optab[] =
   { "addpd", 2, 0x660f58, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12698,10 +12698,10 @@ const insn_template i386_optab[] =
   { "addsd", 2, 0xf258, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12711,10 +12711,10 @@ const insn_template i386_optab[] =
   { "addsd", 2, 0xf20f58, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12724,10 +12724,10 @@ const insn_template i386_optab[] =
   { "andnpd", 2, 0x6655, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12737,10 +12737,10 @@ const insn_template i386_optab[] =
   { "andnpd", 2, 0x660f55, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12750,10 +12750,10 @@ const insn_template i386_optab[] =
   { "andpd", 2, 0x6654, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12763,10 +12763,10 @@ const insn_template i386_optab[] =
   { "andpd", 2, 0x660f54, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12776,10 +12776,10 @@ const insn_template i386_optab[] =
   { "cmpeqpd", 2, 0x66c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12789,10 +12789,10 @@ const insn_template i386_optab[] =
   { "cmpeqpd", 2, 0x660fc2, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12802,10 +12802,10 @@ const insn_template i386_optab[] =
   { "cmpeqsd", 2, 0xf2c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12815,10 +12815,10 @@ const insn_template i386_optab[] =
   { "cmpeqsd", 2, 0xf20fc2, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12828,10 +12828,10 @@ const insn_template i386_optab[] =
   { "cmplepd", 2, 0x66c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12841,10 +12841,10 @@ const insn_template i386_optab[] =
   { "cmplepd", 2, 0x660fc2, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12854,10 +12854,10 @@ const insn_template i386_optab[] =
   { "cmplesd", 2, 0xf2c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12867,10 +12867,10 @@ const insn_template i386_optab[] =
   { "cmplesd", 2, 0xf20fc2, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12880,10 +12880,10 @@ const insn_template i386_optab[] =
   { "cmpltpd", 2, 0x66c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12893,10 +12893,10 @@ const insn_template i386_optab[] =
   { "cmpltpd", 2, 0x660fc2, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12906,10 +12906,10 @@ const insn_template i386_optab[] =
   { "cmpltsd", 2, 0xf2c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12919,10 +12919,10 @@ const insn_template i386_optab[] =
   { "cmpltsd", 2, 0xf20fc2, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12932,10 +12932,10 @@ const insn_template i386_optab[] =
   { "cmpneqpd", 2, 0x66c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12945,10 +12945,10 @@ const insn_template i386_optab[] =
   { "cmpneqpd", 2, 0x660fc2, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12958,10 +12958,10 @@ const insn_template i386_optab[] =
   { "cmpneqsd", 2, 0xf2c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12971,10 +12971,10 @@ const insn_template i386_optab[] =
   { "cmpneqsd", 2, 0xf20fc2, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -12984,10 +12984,10 @@ const insn_template i386_optab[] =
   { "cmpnlepd", 2, 0x66c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -12997,10 +12997,10 @@ const insn_template i386_optab[] =
   { "cmpnlepd", 2, 0x660fc2, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13010,10 +13010,10 @@ const insn_template i386_optab[] =
   { "cmpnlesd", 2, 0xf2c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13023,10 +13023,10 @@ const insn_template i386_optab[] =
   { "cmpnlesd", 2, 0xf20fc2, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13036,10 +13036,10 @@ const insn_template i386_optab[] =
   { "cmpnltpd", 2, 0x66c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13049,10 +13049,10 @@ const insn_template i386_optab[] =
   { "cmpnltpd", 2, 0x660fc2, 0x5, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13062,10 +13062,10 @@ const insn_template i386_optab[] =
   { "cmpnltsd", 2, 0xf2c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13075,10 +13075,10 @@ const insn_template i386_optab[] =
   { "cmpnltsd", 2, 0xf20fc2, 0x5, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13088,10 +13088,10 @@ const insn_template i386_optab[] =
   { "cmpordpd", 2, 0x66c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13101,10 +13101,10 @@ const insn_template i386_optab[] =
   { "cmpordpd", 2, 0x660fc2, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13114,10 +13114,10 @@ const insn_template i386_optab[] =
   { "cmpordsd", 2, 0xf2c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13127,10 +13127,10 @@ const insn_template i386_optab[] =
   { "cmpordsd", 2, 0xf20fc2, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13140,10 +13140,10 @@ const insn_template i386_optab[] =
   { "cmpunordpd", 2, 0x66c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13153,10 +13153,10 @@ const insn_template i386_optab[] =
   { "cmpunordpd", 2, 0x660fc2, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13166,10 +13166,10 @@ const insn_template i386_optab[] =
   { "cmpunordsd", 2, 0xf2c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13179,10 +13179,10 @@ const insn_template i386_optab[] =
   { "cmpunordsd", 2, 0xf20fc2, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13192,10 +13192,10 @@ const insn_template i386_optab[] =
   { "cmppd", 3, 0x66c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13208,10 +13208,10 @@ const insn_template i386_optab[] =
   { "cmppd", 3, 0x660fc2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13224,20 +13224,20 @@ const insn_template i386_optab[] =
   { "cmpsd", 0, 0xa7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "cmpsd", 2, 0xa7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13247,10 +13247,10 @@ const insn_template i386_optab[] =
   { "cmpsd", 3, 0xf2c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13263,10 +13263,10 @@ const insn_template i386_optab[] =
   { "cmpsd", 3, 0xf20fc2, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13279,10 +13279,10 @@ const insn_template i386_optab[] =
   { "comisd", 2, 0x662f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13292,10 +13292,10 @@ const insn_template i386_optab[] =
   { "comisd", 2, 0x660f2f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13305,10 +13305,10 @@ const insn_template i386_optab[] =
   { "cvtpi2pd", 2, 0x660f2a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13318,10 +13318,10 @@ const insn_template i386_optab[] =
   { "cvtsi2sd", 2, 0xf22a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13331,10 +13331,10 @@ const insn_template i386_optab[] =
   { "cvtsi2sd", 2, 0xf22a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13344,10 +13344,10 @@ const insn_template i386_optab[] =
   { "cvtsi2sd", 2, 0xf20f2a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13357,10 +13357,10 @@ const insn_template i386_optab[] =
   { "cvtsi2sd", 2, 0xf20f2a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13370,10 +13370,10 @@ const insn_template i386_optab[] =
   { "divpd", 2, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13383,10 +13383,10 @@ const insn_template i386_optab[] =
   { "divpd", 2, 0x660f5e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13396,10 +13396,10 @@ const insn_template i386_optab[] =
   { "divsd", 2, 0xf25e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13409,10 +13409,10 @@ const insn_template i386_optab[] =
   { "divsd", 2, 0xf20f5e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13422,10 +13422,10 @@ const insn_template i386_optab[] =
   { "maxpd", 2, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13435,10 +13435,10 @@ const insn_template i386_optab[] =
   { "maxpd", 2, 0x660f5f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13448,10 +13448,10 @@ const insn_template i386_optab[] =
   { "maxsd", 2, 0xf25f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13461,10 +13461,10 @@ const insn_template i386_optab[] =
   { "maxsd", 2, 0xf20f5f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13474,10 +13474,10 @@ const insn_template i386_optab[] =
   { "minpd", 2, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13487,10 +13487,10 @@ const insn_template i386_optab[] =
   { "minpd", 2, 0x660f5d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13500,10 +13500,10 @@ const insn_template i386_optab[] =
   { "minsd", 2, 0xf25d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13513,10 +13513,10 @@ const insn_template i386_optab[] =
   { "minsd", 2, 0xf20f5d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13526,10 +13526,10 @@ const insn_template i386_optab[] =
   { "movapd", 2, 0x6628, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13539,10 +13539,10 @@ const insn_template i386_optab[] =
   { "movapd", 2, 0x6629, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13552,10 +13552,10 @@ const insn_template i386_optab[] =
   { "movapd", 2, 0x660f28, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13565,10 +13565,10 @@ const insn_template i386_optab[] =
   { "movapd", 2, 0x660f29, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13578,10 +13578,10 @@ const insn_template i386_optab[] =
   { "movhpd", 2, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13591,10 +13591,10 @@ const insn_template i386_optab[] =
   { "movhpd", 2, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13604,10 +13604,10 @@ const insn_template i386_optab[] =
   { "movhpd", 2, 0x660f16, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13617,10 +13617,10 @@ const insn_template i386_optab[] =
   { "movhpd", 2, 0x660f17, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13630,10 +13630,10 @@ const insn_template i386_optab[] =
   { "movlpd", 2, 0x6612, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13643,10 +13643,10 @@ const insn_template i386_optab[] =
   { "movlpd", 2, 0x6613, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13656,10 +13656,10 @@ const insn_template i386_optab[] =
   { "movlpd", 2, 0x660f12, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13669,10 +13669,10 @@ const insn_template i386_optab[] =
   { "movlpd", 2, 0x660f13, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13682,10 +13682,10 @@ const insn_template i386_optab[] =
   { "movmskpd", 2, 0x6650, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13695,10 +13695,10 @@ const insn_template i386_optab[] =
   { "movmskpd", 2, 0x660f50, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13708,10 +13708,10 @@ const insn_template i386_optab[] =
   { "movntpd", 2, 0x662b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13721,10 +13721,10 @@ const insn_template i386_optab[] =
   { "movntpd", 2, 0x660f2b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13734,20 +13734,20 @@ const insn_template i386_optab[] =
   { "movsd", 0, 0xa5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "movsd", 2, 0xa5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13757,10 +13757,10 @@ const insn_template i386_optab[] =
   { "movsd", 2, 0xf211, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13770,10 +13770,10 @@ const insn_template i386_optab[] =
   { "movsd", 2, 0xf210, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13783,10 +13783,10 @@ const insn_template i386_optab[] =
   { "movsd", 2, 0xf210, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13796,10 +13796,10 @@ const insn_template i386_optab[] =
   { "movsd", 2, 0xf211, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13809,10 +13809,10 @@ const insn_template i386_optab[] =
   { "movsd", 2, 0xf20f10, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13822,10 +13822,10 @@ const insn_template i386_optab[] =
   { "movsd", 2, 0xf20f11, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13835,10 +13835,10 @@ const insn_template i386_optab[] =
   { "movupd", 2, 0x6610, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13848,10 +13848,10 @@ const insn_template i386_optab[] =
   { "movupd", 2, 0x6611, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13861,10 +13861,10 @@ const insn_template i386_optab[] =
   { "movupd", 2, 0x660f10, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13874,10 +13874,10 @@ const insn_template i386_optab[] =
   { "movupd", 2, 0x660f11, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13887,10 +13887,10 @@ const insn_template i386_optab[] =
   { "mulpd", 2, 0x6659, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13900,10 +13900,10 @@ const insn_template i386_optab[] =
   { "mulpd", 2, 0x660f59, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13913,10 +13913,10 @@ const insn_template i386_optab[] =
   { "mulsd", 2, 0xf259, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13926,10 +13926,10 @@ const insn_template i386_optab[] =
   { "mulsd", 2, 0xf20f59, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -13939,10 +13939,10 @@ const insn_template i386_optab[] =
   { "orpd", 2, 0x6656, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13952,10 +13952,10 @@ const insn_template i386_optab[] =
   { "orpd", 2, 0x660f56, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -13965,10 +13965,10 @@ const insn_template i386_optab[] =
   { "shufpd", 3, 0x66c6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13981,10 +13981,10 @@ const insn_template i386_optab[] =
   { "shufpd", 3, 0x660fc6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -13997,10 +13997,10 @@ const insn_template i386_optab[] =
   { "sqrtpd", 2, 0x6651, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14010,10 +14010,10 @@ const insn_template i386_optab[] =
   { "sqrtpd", 2, 0x660f51, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14023,10 +14023,10 @@ const insn_template i386_optab[] =
   { "sqrtsd", 2, 0xf251, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14036,10 +14036,10 @@ const insn_template i386_optab[] =
   { "sqrtsd", 2, 0xf20f51, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14049,10 +14049,10 @@ const insn_template i386_optab[] =
   { "subpd", 2, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14062,10 +14062,10 @@ const insn_template i386_optab[] =
   { "subpd", 2, 0x660f5c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14075,10 +14075,10 @@ const insn_template i386_optab[] =
   { "subsd", 2, 0xf25c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14088,10 +14088,10 @@ const insn_template i386_optab[] =
   { "subsd", 2, 0xf20f5c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14101,10 +14101,10 @@ const insn_template i386_optab[] =
   { "ucomisd", 2, 0x662e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14114,10 +14114,10 @@ const insn_template i386_optab[] =
   { "ucomisd", 2, 0x660f2e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14127,10 +14127,10 @@ const insn_template i386_optab[] =
   { "unpckhpd", 2, 0x6615, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14140,10 +14140,10 @@ const insn_template i386_optab[] =
   { "unpckhpd", 2, 0x660f15, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14153,10 +14153,10 @@ const insn_template i386_optab[] =
   { "unpcklpd", 2, 0x6614, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14166,10 +14166,10 @@ const insn_template i386_optab[] =
   { "unpcklpd", 2, 0x660f14, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14179,10 +14179,10 @@ const insn_template i386_optab[] =
   { "xorpd", 2, 0x6657, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14192,10 +14192,10 @@ const insn_template i386_optab[] =
   { "xorpd", 2, 0x660f57, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14205,10 +14205,10 @@ const insn_template i386_optab[] =
   { "cvtdq2pd", 2, 0xf3e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14218,10 +14218,10 @@ const insn_template i386_optab[] =
   { "cvtdq2pd", 2, 0xf30fe6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14231,10 +14231,10 @@ const insn_template i386_optab[] =
   { "cvtpd2dq", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14244,10 +14244,10 @@ const insn_template i386_optab[] =
   { "cvtpd2dq", 2, 0xf20fe6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14257,10 +14257,10 @@ const insn_template i386_optab[] =
   { "cvtdq2ps", 2, 0x5b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14270,10 +14270,10 @@ const insn_template i386_optab[] =
   { "cvtdq2ps", 2, 0xf5b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14283,10 +14283,10 @@ const insn_template i386_optab[] =
   { "cvtpd2pi", 2, 0x660f2d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14296,10 +14296,10 @@ const insn_template i386_optab[] =
   { "cvtpd2ps", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14309,10 +14309,10 @@ const insn_template i386_optab[] =
   { "cvtpd2ps", 2, 0x660f5a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14322,10 +14322,10 @@ const insn_template i386_optab[] =
   { "cvtps2pd", 2, 0x5a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14335,10 +14335,10 @@ const insn_template i386_optab[] =
   { "cvtps2pd", 2, 0xf5a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14348,10 +14348,10 @@ const insn_template i386_optab[] =
   { "cvtps2dq", 2, 0x665b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14361,10 +14361,10 @@ const insn_template i386_optab[] =
   { "cvtps2dq", 2, 0x660f5b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14374,10 +14374,10 @@ const insn_template i386_optab[] =
   { "cvtsd2si", 2, 0xf22d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14387,10 +14387,10 @@ const insn_template i386_optab[] =
   { "cvtsd2si", 2, 0xf20f2d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14400,10 +14400,10 @@ const insn_template i386_optab[] =
   { "cvtsd2ss", 2, 0xf25a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14413,10 +14413,10 @@ const insn_template i386_optab[] =
   { "cvtsd2ss", 2, 0xf20f5a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14426,10 +14426,10 @@ const insn_template i386_optab[] =
   { "cvtss2sd", 2, 0xf35a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14439,10 +14439,10 @@ const insn_template i386_optab[] =
   { "cvtss2sd", 2, 0xf30f5a, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14452,10 +14452,10 @@ const insn_template i386_optab[] =
   { "cvttpd2pi", 2, 0x660f2c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14465,10 +14465,10 @@ const insn_template i386_optab[] =
   { "cvttsd2si", 2, 0xf22c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14478,10 +14478,10 @@ const insn_template i386_optab[] =
   { "cvttsd2si", 2, 0xf20f2c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14491,10 +14491,10 @@ const insn_template i386_optab[] =
   { "cvttpd2dq", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14504,10 +14504,10 @@ const insn_template i386_optab[] =
   { "cvttpd2dq", 2, 0x660fe6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14517,10 +14517,10 @@ const insn_template i386_optab[] =
   { "cvttps2dq", 2, 0xf35b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14530,10 +14530,10 @@ const insn_template i386_optab[] =
   { "cvttps2dq", 2, 0xf30f5b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14543,10 +14543,10 @@ const insn_template i386_optab[] =
   { "maskmovdqu", 2, 0x66f7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14556,10 +14556,10 @@ const insn_template i386_optab[] =
   { "maskmovdqu", 2, 0x660ff7, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14569,10 +14569,10 @@ const insn_template i386_optab[] =
   { "movdqa", 2, 0x666f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14582,10 +14582,10 @@ const insn_template i386_optab[] =
   { "movdqa", 2, 0x667f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14595,10 +14595,10 @@ const insn_template i386_optab[] =
   { "movdqa", 2, 0x660f6f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14608,10 +14608,10 @@ const insn_template i386_optab[] =
   { "movdqa", 2, 0x660f7f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14621,10 +14621,10 @@ const insn_template i386_optab[] =
   { "movdqu", 2, 0xf36f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14634,10 +14634,10 @@ const insn_template i386_optab[] =
   { "movdqu", 2, 0xf37f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14647,10 +14647,10 @@ const insn_template i386_optab[] =
   { "movdqu", 2, 0xf30f6f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14660,10 +14660,10 @@ const insn_template i386_optab[] =
   { "movdqu", 2, 0xf30f7f, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14673,10 +14673,10 @@ const insn_template i386_optab[] =
   { "movdq2q", 2, 0xf20fd6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14686,10 +14686,10 @@ const insn_template i386_optab[] =
   { "movq2dq", 2, 0xf30fd6, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14699,10 +14699,10 @@ const insn_template i386_optab[] =
   { "pmuludq", 2, 0x66f4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14712,10 +14712,10 @@ const insn_template i386_optab[] =
   { "pmuludq", 2, 0x660ff4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14725,10 +14725,10 @@ const insn_template i386_optab[] =
   { "pmuludq", 2, 0xff4, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -14738,10 +14738,10 @@ const insn_template i386_optab[] =
   { "pshufd", 3, 0x6670, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14754,10 +14754,10 @@ const insn_template i386_optab[] =
   { "pshufd", 3, 0x660f70, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14770,10 +14770,10 @@ const insn_template i386_optab[] =
   { "pshufhw", 3, 0xf370, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14786,10 +14786,10 @@ const insn_template i386_optab[] =
   { "pshufhw", 3, 0xf30f70, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14802,10 +14802,10 @@ const insn_template i386_optab[] =
   { "pshuflw", 3, 0xf270, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14818,10 +14818,10 @@ const insn_template i386_optab[] =
   { "pshuflw", 3, 0xf20f70, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14834,10 +14834,10 @@ const insn_template i386_optab[] =
   { "pslldq", 2, 0x6673, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14847,10 +14847,10 @@ const insn_template i386_optab[] =
   { "pslldq", 2, 0x660f73, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14860,10 +14860,10 @@ const insn_template i386_optab[] =
   { "psrldq", 2, 0x6673, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14873,10 +14873,10 @@ const insn_template i386_optab[] =
   { "psrldq", 2, 0x660f73, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -14886,10 +14886,10 @@ const insn_template i386_optab[] =
   { "punpckhqdq", 2, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14899,10 +14899,10 @@ const insn_template i386_optab[] =
   { "punpckhqdq", 2, 0x660f6d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14912,10 +14912,10 @@ const insn_template i386_optab[] =
   { "punpcklqdq", 2, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14925,10 +14925,10 @@ const insn_template i386_optab[] =
   { "punpcklqdq", 2, 0x660f6c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14938,10 +14938,10 @@ const insn_template i386_optab[] =
   { "addsubpd", 2, 0x66d0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14951,10 +14951,10 @@ const insn_template i386_optab[] =
   { "addsubpd", 2, 0x660fd0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14964,10 +14964,10 @@ const insn_template i386_optab[] =
   { "addsubps", 2, 0xf2d0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14977,10 +14977,10 @@ const insn_template i386_optab[] =
   { "addsubps", 2, 0xf20fd0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -14990,50 +14990,50 @@ const insn_template i386_optab[] =
   { "cmpxchg16b", 1, 0xfc7, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } } } },
   { "fisttp", 1, 0xdf, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fisttp", 1, 0xdd, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "fisttpll", 1, 0xdd, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "haddpd", 2, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15043,10 +15043,10 @@ const insn_template i386_optab[] =
   { "haddpd", 2, 0x660f7c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15056,10 +15056,10 @@ const insn_template i386_optab[] =
   { "haddps", 2, 0xf27c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15069,10 +15069,10 @@ const insn_template i386_optab[] =
   { "haddps", 2, 0xf20f7c, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15082,10 +15082,10 @@ const insn_template i386_optab[] =
   { "hsubpd", 2, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15095,10 +15095,10 @@ const insn_template i386_optab[] =
   { "hsubpd", 2, 0x660f7d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15108,10 +15108,10 @@ const insn_template i386_optab[] =
   { "hsubps", 2, 0xf27d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15121,10 +15121,10 @@ const insn_template i386_optab[] =
   { "hsubps", 2, 0xf20f7d, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15134,10 +15134,10 @@ const insn_template i386_optab[] =
   { "lddqu", 2, 0xf2f0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15147,10 +15147,10 @@ const insn_template i386_optab[] =
   { "lddqu", 2, 0xf20ff0, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15160,20 +15160,20 @@ const insn_template i386_optab[] =
   { "monitor", 0, 0xf01, 0xc8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "monitor", 3, 0xf01, 0xc8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -15186,10 +15186,10 @@ const insn_template i386_optab[] =
   { "monitor", 3, 0xf01, 0xc8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -15202,10 +15202,10 @@ const insn_template i386_optab[] =
   { "movddup", 2, 0xf212, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15215,10 +15215,10 @@ const insn_template i386_optab[] =
   { "movddup", 2, 0xf20f12, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15228,10 +15228,10 @@ const insn_template i386_optab[] =
   { "movshdup", 2, 0xf316, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15241,10 +15241,10 @@ const insn_template i386_optab[] =
   { "movshdup", 2, 0xf30f16, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15254,10 +15254,10 @@ const insn_template i386_optab[] =
   { "movsldup", 2, 0xf312, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15267,10 +15267,10 @@ const insn_template i386_optab[] =
   { "movsldup", 2, 0xf30f12, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15280,20 +15280,20 @@ const insn_template i386_optab[] =
   { "mwait", 0, 0xf01, 0xc9, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "mwait", 2, 0xf01, 0xc9, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -15303,10 +15303,10 @@ const insn_template i386_optab[] =
   { "mwait", 2, 0xf01, 0xc9, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -15316,70 +15316,70 @@ const insn_template i386_optab[] =
   { "vmcall", 0, 0xf01, 0xc1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmclear", 1, 0x660fc7, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "vmlaunch", 0, 0xf01, 0xc2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmresume", 0, 0xf01, 0xc3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmptrld", 1, 0xfc7, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "vmptrst", 1, 0xfc7, 0x7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "vmread", 2, 0xf78, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -15389,10 +15389,10 @@ const insn_template i386_optab[] =
   { "vmread", 2, 0xf78, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -15402,10 +15402,10 @@ const insn_template i386_optab[] =
   { "vmwrite", 2, 0xf79, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15415,10 +15415,10 @@ const insn_template i386_optab[] =
   { "vmwrite", 2, 0xf79, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15428,50 +15428,40 @@ const insn_template i386_optab[] =
   { "vmxoff", 0, 0xf01, 0xc4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmxon", 1, 0xf30fc7, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
-  { "vmfunc", 0, 0xf01, 0xd4, 2,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
   { "getsec", 0, 0xf37, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "invept", 2, 0x660f3880, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15481,10 +15471,10 @@ const insn_template i386_optab[] =
   { "invept", 2, 0x660f3880, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15494,10 +15484,10 @@ const insn_template i386_optab[] =
   { "invvpid", 2, 0x660f3881, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15507,10 +15497,10 @@ const insn_template i386_optab[] =
   { "invvpid", 2, 0x660f3881, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15520,10 +15510,10 @@ const insn_template i386_optab[] =
   { "invpcid", 2, 0x660f3882, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15533,10 +15523,10 @@ const insn_template i386_optab[] =
   { "invpcid", 2, 0x660f3882, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15546,10 +15536,10 @@ const insn_template i386_optab[] =
   { "phaddw", 2, 0x6601, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15559,10 +15549,10 @@ const insn_template i386_optab[] =
   { "phaddw", 2, 0x660f3801, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15572,10 +15562,10 @@ const insn_template i386_optab[] =
   { "phaddw", 2, 0xf3801, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15585,10 +15575,10 @@ const insn_template i386_optab[] =
   { "phaddd", 2, 0x6602, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15598,10 +15588,10 @@ const insn_template i386_optab[] =
   { "phaddd", 2, 0x660f3802, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15611,10 +15601,10 @@ const insn_template i386_optab[] =
   { "phaddd", 2, 0xf3802, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15624,10 +15614,10 @@ const insn_template i386_optab[] =
   { "phaddsw", 2, 0x6603, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15637,10 +15627,10 @@ const insn_template i386_optab[] =
   { "phaddsw", 2, 0x660f3803, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15650,10 +15640,10 @@ const insn_template i386_optab[] =
   { "phaddsw", 2, 0xf3803, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15663,10 +15653,10 @@ const insn_template i386_optab[] =
   { "phsubw", 2, 0x6605, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15676,10 +15666,10 @@ const insn_template i386_optab[] =
   { "phsubw", 2, 0x660f3805, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15689,10 +15679,10 @@ const insn_template i386_optab[] =
   { "phsubw", 2, 0xf3805, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15702,10 +15692,10 @@ const insn_template i386_optab[] =
   { "phsubd", 2, 0x6606, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15715,10 +15705,10 @@ const insn_template i386_optab[] =
   { "phsubd", 2, 0x660f3806, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15728,10 +15718,10 @@ const insn_template i386_optab[] =
   { "phsubd", 2, 0xf3806, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15741,10 +15731,10 @@ const insn_template i386_optab[] =
   { "phsubsw", 2, 0x6607, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15754,10 +15744,10 @@ const insn_template i386_optab[] =
   { "phsubsw", 2, 0x660f3807, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15767,10 +15757,10 @@ const insn_template i386_optab[] =
   { "phsubsw", 2, 0xf3807, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15780,10 +15770,10 @@ const insn_template i386_optab[] =
   { "pmaddubsw", 2, 0x6604, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15793,10 +15783,10 @@ const insn_template i386_optab[] =
   { "pmaddubsw", 2, 0x660f3804, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15806,10 +15796,10 @@ const insn_template i386_optab[] =
   { "pmaddubsw", 2, 0xf3804, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15819,10 +15809,10 @@ const insn_template i386_optab[] =
   { "pmulhrsw", 2, 0x660b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15832,10 +15822,10 @@ const insn_template i386_optab[] =
   { "pmulhrsw", 2, 0x660f380b, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15845,10 +15835,10 @@ const insn_template i386_optab[] =
   { "pmulhrsw", 2, 0xf380b, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15858,10 +15848,10 @@ const insn_template i386_optab[] =
   { "pshufb", 2, 0x6600, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15871,10 +15861,10 @@ const insn_template i386_optab[] =
   { "pshufb", 2, 0x660f3800, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15884,10 +15874,10 @@ const insn_template i386_optab[] =
   { "pshufb", 2, 0xf3800, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15897,10 +15887,10 @@ const insn_template i386_optab[] =
   { "psignb", 2, 0x6608, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15910,10 +15900,10 @@ const insn_template i386_optab[] =
   { "psignb", 2, 0x660f3808, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15923,10 +15913,10 @@ const insn_template i386_optab[] =
   { "psignb", 2, 0xf3808, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15936,10 +15926,10 @@ const insn_template i386_optab[] =
   { "psignw", 2, 0x6609, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15949,10 +15939,10 @@ const insn_template i386_optab[] =
   { "psignw", 2, 0x660f3809, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15962,10 +15952,10 @@ const insn_template i386_optab[] =
   { "psignw", 2, 0xf3809, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -15975,10 +15965,10 @@ const insn_template i386_optab[] =
   { "psignd", 2, 0x660a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -15988,10 +15978,10 @@ const insn_template i386_optab[] =
   { "psignd", 2, 0x660f380a, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16001,10 +15991,10 @@ const insn_template i386_optab[] =
   { "psignd", 2, 0xf380a, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -16014,10 +16004,10 @@ const insn_template i386_optab[] =
   { "palignr", 3, 0x660f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16030,10 +16020,10 @@ const insn_template i386_optab[] =
   { "palignr", 3, 0x660f3a0f, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16046,10 +16036,10 @@ const insn_template i386_optab[] =
   { "palignr", 3, 0xf3a0f, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16062,10 +16052,10 @@ const insn_template i386_optab[] =
   { "pabsb", 2, 0x661c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16075,10 +16065,10 @@ const insn_template i386_optab[] =
   { "pabsb", 2, 0x660f381c, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16088,10 +16078,10 @@ const insn_template i386_optab[] =
   { "pabsb", 2, 0xf381c, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -16101,10 +16091,10 @@ const insn_template i386_optab[] =
   { "pabsw", 2, 0x661d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16114,10 +16104,10 @@ const insn_template i386_optab[] =
   { "pabsw", 2, 0x660f381d, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16127,10 +16117,10 @@ const insn_template i386_optab[] =
   { "pabsw", 2, 0xf381d, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -16140,10 +16130,10 @@ const insn_template i386_optab[] =
   { "pabsd", 2, 0x661e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16153,10 +16143,10 @@ const insn_template i386_optab[] =
   { "pabsd", 2, 0x660f381e, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16166,10 +16156,10 @@ const insn_template i386_optab[] =
   { "pabsd", 2, 0xf381e, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -16179,10 +16169,10 @@ const insn_template i386_optab[] =
   { "blendpd", 3, 0x660d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16195,10 +16185,10 @@ const insn_template i386_optab[] =
   { "blendpd", 3, 0x660f3a0d, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16211,10 +16201,10 @@ const insn_template i386_optab[] =
   { "blendps", 3, 0x660c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16227,10 +16217,10 @@ const insn_template i386_optab[] =
   { "blendps", 3, 0x660f3a0c, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16243,10 +16233,10 @@ const insn_template i386_optab[] =
   { "blendvpd", 3, 0x664b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16259,10 +16249,10 @@ const insn_template i386_optab[] =
   { "blendvpd", 2, 0x664b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16272,10 +16262,10 @@ const insn_template i386_optab[] =
   { "blendvpd", 3, 0x660f3815, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16288,10 +16278,10 @@ const insn_template i386_optab[] =
   { "blendvpd", 2, 0x660f3815, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16301,10 +16291,10 @@ const insn_template i386_optab[] =
   { "blendvps", 3, 0x664a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16317,10 +16307,10 @@ const insn_template i386_optab[] =
   { "blendvps", 2, 0x664a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16330,10 +16320,10 @@ const insn_template i386_optab[] =
   { "blendvps", 3, 0x660f3814, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16346,10 +16336,10 @@ const insn_template i386_optab[] =
   { "blendvps", 2, 0x660f3814, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16359,10 +16349,10 @@ const insn_template i386_optab[] =
   { "dppd", 3, 0x6641, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16375,10 +16365,10 @@ const insn_template i386_optab[] =
   { "dppd", 3, 0x660f3a41, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16391,10 +16381,10 @@ const insn_template i386_optab[] =
   { "dpps", 3, 0x6640, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16407,10 +16397,10 @@ const insn_template i386_optab[] =
   { "dpps", 3, 0x660f3a40, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16423,10 +16413,10 @@ const insn_template i386_optab[] =
   { "extractps", 3, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16439,10 +16429,10 @@ const insn_template i386_optab[] =
   { "extractps", 3, 0x660f3a17, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16455,10 +16445,10 @@ const insn_template i386_optab[] =
   { "insertps", 3, 0x6621, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16471,10 +16461,10 @@ const insn_template i386_optab[] =
   { "insertps", 3, 0x660f3a21, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16487,10 +16477,10 @@ const insn_template i386_optab[] =
   { "movntdqa", 2, 0x662a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16500,10 +16490,10 @@ const insn_template i386_optab[] =
   { "movntdqa", 2, 0x660f382a, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16513,10 +16503,10 @@ const insn_template i386_optab[] =
   { "mpsadbw", 3, 0x6642, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16529,10 +16519,10 @@ const insn_template i386_optab[] =
   { "mpsadbw", 3, 0x660f3a42, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16545,10 +16535,10 @@ const insn_template i386_optab[] =
   { "packusdw", 2, 0x662b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16558,10 +16548,10 @@ const insn_template i386_optab[] =
   { "packusdw", 2, 0x660f382b, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16571,10 +16561,10 @@ const insn_template i386_optab[] =
   { "pblendvb", 3, 0x664c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16587,10 +16577,10 @@ const insn_template i386_optab[] =
   { "pblendvb", 2, 0x664c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16600,10 +16590,10 @@ const insn_template i386_optab[] =
   { "pblendvb", 3, 0x660f3810, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16616,10 +16606,10 @@ const insn_template i386_optab[] =
   { "pblendvb", 2, 0x660f3810, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16629,10 +16619,10 @@ const insn_template i386_optab[] =
   { "pblendw", 3, 0x660e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16645,10 +16635,10 @@ const insn_template i386_optab[] =
   { "pblendw", 3, 0x660f3a0e, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16661,10 +16651,10 @@ const insn_template i386_optab[] =
   { "pcmpeqq", 2, 0x6629, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16674,10 +16664,10 @@ const insn_template i386_optab[] =
   { "pcmpeqq", 2, 0x660f3829, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16687,10 +16677,10 @@ const insn_template i386_optab[] =
   { "pextrb", 3, 0x6614, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16703,10 +16693,10 @@ const insn_template i386_optab[] =
   { "pextrb", 3, 0x660f3a14, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16719,10 +16709,10 @@ const insn_template i386_optab[] =
   { "pextrd", 3, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16735,10 +16725,10 @@ const insn_template i386_optab[] =
   { "pextrd", 3, 0x660f3a16, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16751,10 +16741,10 @@ const insn_template i386_optab[] =
   { "pextrq", 3, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16767,10 +16757,10 @@ const insn_template i386_optab[] =
   { "pextrq", 3, 0x660f3a16, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16783,10 +16773,10 @@ const insn_template i386_optab[] =
   { "phminposuw", 2, 0x6641, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16796,10 +16786,10 @@ const insn_template i386_optab[] =
   { "phminposuw", 2, 0x660f3841, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16809,10 +16799,10 @@ const insn_template i386_optab[] =
   { "pinsrb", 3, 0x6620, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16825,10 +16815,10 @@ const insn_template i386_optab[] =
   { "pinsrb", 3, 0x660f3a20, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16841,10 +16831,10 @@ const insn_template i386_optab[] =
   { "pinsrd", 3, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16857,10 +16847,10 @@ const insn_template i386_optab[] =
   { "pinsrd", 3, 0x660f3a22, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16873,10 +16863,10 @@ const insn_template i386_optab[] =
   { "pinsrq", 3, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16889,10 +16879,10 @@ const insn_template i386_optab[] =
   { "pinsrq", 3, 0x660f3a22, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -16905,10 +16895,10 @@ const insn_template i386_optab[] =
   { "pmaxsb", 2, 0x663c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16918,10 +16908,10 @@ const insn_template i386_optab[] =
   { "pmaxsb", 2, 0x660f383c, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16931,10 +16921,10 @@ const insn_template i386_optab[] =
   { "pmaxsd", 2, 0x663d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16944,10 +16934,10 @@ const insn_template i386_optab[] =
   { "pmaxsd", 2, 0x660f383d, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16957,10 +16947,10 @@ const insn_template i386_optab[] =
   { "pmaxud", 2, 0x663f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16970,10 +16960,10 @@ const insn_template i386_optab[] =
   { "pmaxud", 2, 0x660f383f, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16983,10 +16973,10 @@ const insn_template i386_optab[] =
   { "pmaxuw", 2, 0x663e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -16996,10 +16986,10 @@ const insn_template i386_optab[] =
   { "pmaxuw", 2, 0x660f383e, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17009,10 +16999,10 @@ const insn_template i386_optab[] =
   { "pminsb", 2, 0x6638, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17022,10 +17012,10 @@ const insn_template i386_optab[] =
   { "pminsb", 2, 0x660f3838, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17035,10 +17025,10 @@ const insn_template i386_optab[] =
   { "pminsd", 2, 0x6639, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17048,10 +17038,10 @@ const insn_template i386_optab[] =
   { "pminsd", 2, 0x660f3839, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17061,10 +17051,10 @@ const insn_template i386_optab[] =
   { "pminud", 2, 0x663b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17074,10 +17064,10 @@ const insn_template i386_optab[] =
   { "pminud", 2, 0x660f383b, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17087,10 +17077,10 @@ const insn_template i386_optab[] =
   { "pminuw", 2, 0x663a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17100,10 +17090,10 @@ const insn_template i386_optab[] =
   { "pminuw", 2, 0x660f383a, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17113,10 +17103,10 @@ const insn_template i386_optab[] =
   { "pmovsxbw", 2, 0x6620, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17126,10 +17116,10 @@ const insn_template i386_optab[] =
   { "pmovsxbw", 2, 0x660f3820, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17139,10 +17129,10 @@ const insn_template i386_optab[] =
   { "pmovsxbd", 2, 0x6621, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17152,10 +17142,10 @@ const insn_template i386_optab[] =
   { "pmovsxbd", 2, 0x660f3821, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17165,10 +17155,10 @@ const insn_template i386_optab[] =
   { "pmovsxbq", 2, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17178,10 +17168,10 @@ const insn_template i386_optab[] =
   { "pmovsxbq", 2, 0x660f3822, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17191,10 +17181,10 @@ const insn_template i386_optab[] =
   { "pmovsxwd", 2, 0x6623, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17204,10 +17194,10 @@ const insn_template i386_optab[] =
   { "pmovsxwd", 2, 0x660f3823, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17217,10 +17207,10 @@ const insn_template i386_optab[] =
   { "pmovsxwq", 2, 0x6624, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17230,10 +17220,10 @@ const insn_template i386_optab[] =
   { "pmovsxwq", 2, 0x660f3824, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17243,10 +17233,10 @@ const insn_template i386_optab[] =
   { "pmovsxdq", 2, 0x6625, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17256,10 +17246,10 @@ const insn_template i386_optab[] =
   { "pmovsxdq", 2, 0x660f3825, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17269,10 +17259,10 @@ const insn_template i386_optab[] =
   { "pmovzxbw", 2, 0x6630, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17282,10 +17272,10 @@ const insn_template i386_optab[] =
   { "pmovzxbw", 2, 0x660f3830, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17295,10 +17285,10 @@ const insn_template i386_optab[] =
   { "pmovzxbd", 2, 0x6631, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17308,10 +17298,10 @@ const insn_template i386_optab[] =
   { "pmovzxbd", 2, 0x660f3831, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17321,10 +17311,10 @@ const insn_template i386_optab[] =
   { "pmovzxbq", 2, 0x6632, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17334,10 +17324,10 @@ const insn_template i386_optab[] =
   { "pmovzxbq", 2, 0x660f3832, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17347,10 +17337,10 @@ const insn_template i386_optab[] =
   { "pmovzxwd", 2, 0x6633, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17360,10 +17350,10 @@ const insn_template i386_optab[] =
   { "pmovzxwd", 2, 0x660f3833, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17373,10 +17363,10 @@ const insn_template i386_optab[] =
   { "pmovzxwq", 2, 0x6634, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17386,10 +17376,10 @@ const insn_template i386_optab[] =
   { "pmovzxwq", 2, 0x660f3834, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17399,10 +17389,10 @@ const insn_template i386_optab[] =
   { "pmovzxdq", 2, 0x6635, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17412,10 +17402,10 @@ const insn_template i386_optab[] =
   { "pmovzxdq", 2, 0x660f3835, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17425,10 +17415,10 @@ const insn_template i386_optab[] =
   { "pmuldq", 2, 0x6628, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17438,10 +17428,10 @@ const insn_template i386_optab[] =
   { "pmuldq", 2, 0x660f3828, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17451,10 +17441,10 @@ const insn_template i386_optab[] =
   { "pmulld", 2, 0x6640, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17464,10 +17454,10 @@ const insn_template i386_optab[] =
   { "pmulld", 2, 0x660f3840, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17477,10 +17467,10 @@ const insn_template i386_optab[] =
   { "ptest", 2, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17490,10 +17480,10 @@ const insn_template i386_optab[] =
   { "ptest", 2, 0x660f3817, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17503,10 +17493,10 @@ const insn_template i386_optab[] =
   { "roundpd", 3, 0x6609, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17519,10 +17509,10 @@ const insn_template i386_optab[] =
   { "roundpd", 3, 0x660f3a09, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17535,10 +17525,10 @@ const insn_template i386_optab[] =
   { "roundps", 3, 0x6608, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17551,10 +17541,10 @@ const insn_template i386_optab[] =
   { "roundps", 3, 0x660f3a08, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17567,10 +17557,10 @@ const insn_template i386_optab[] =
   { "roundsd", 3, 0x660b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17583,10 +17573,10 @@ const insn_template i386_optab[] =
   { "roundsd", 3, 0x660f3a0b, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17599,10 +17589,10 @@ const insn_template i386_optab[] =
   { "roundss", 3, 0x660a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17615,10 +17605,10 @@ const insn_template i386_optab[] =
   { "roundss", 3, 0x660f3a0a, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17631,10 +17621,10 @@ const insn_template i386_optab[] =
   { "pcmpgtq", 2, 0x6637, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17644,10 +17634,10 @@ const insn_template i386_optab[] =
   { "pcmpgtq", 2, 0x660f3837, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17657,10 +17647,10 @@ const insn_template i386_optab[] =
   { "pcmpestri", 3, 0x6661, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17673,10 +17663,10 @@ const insn_template i386_optab[] =
   { "pcmpestri", 3, 0x660f3a61, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17689,10 +17679,10 @@ const insn_template i386_optab[] =
   { "pcmpestrm", 3, 0x6660, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17705,10 +17695,10 @@ const insn_template i386_optab[] =
   { "pcmpestrm", 3, 0x660f3a60, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17721,10 +17711,10 @@ const insn_template i386_optab[] =
   { "pcmpistri", 3, 0x6663, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17737,10 +17727,10 @@ const insn_template i386_optab[] =
   { "pcmpistri", 3, 0x660f3a63, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17753,10 +17743,10 @@ const insn_template i386_optab[] =
   { "pcmpistrm", 3, 0x6662, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17769,10 +17759,10 @@ const insn_template i386_optab[] =
   { "pcmpistrm", 3, 0x660f3a62, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -17785,10 +17775,10 @@ const insn_template i386_optab[] =
   { "crc32", 2, 0xf20f38f1, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
       0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17798,10 +17788,10 @@ const insn_template i386_optab[] =
   { "crc32", 2, 0xf20f38f1, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17811,10 +17801,10 @@ const insn_template i386_optab[] =
   { "crc32", 2, 0xf20f38f0, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17824,10 +17814,10 @@ const insn_template i386_optab[] =
   { "crc32", 2, 0xf20f38f0, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -17837,90 +17827,90 @@ const insn_template i386_optab[] =
   { "xsave", 1, 0xfae, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "xsave64", 1, 0xfae, 0x4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "xrstor", 1, 0xfae, 0x5, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "xrstor64", 1, 0xfae, 0x5, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "xgetbv", 0, 0xf01, 0xd0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xsetbv", 0, 0xf01, 0xd1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xsaveopt", 1, 0xfae, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "xsaveopt64", 1, 0xfae, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "aesdec", 2, 0x66de, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17930,10 +17920,10 @@ const insn_template i386_optab[] =
   { "aesdec", 2, 0x660f38de, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17943,10 +17933,10 @@ const insn_template i386_optab[] =
   { "aesdeclast", 2, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17956,10 +17946,10 @@ const insn_template i386_optab[] =
   { "aesdeclast", 2, 0x660f38df, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17969,10 +17959,10 @@ const insn_template i386_optab[] =
   { "aesenc", 2, 0x66dc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17982,10 +17972,10 @@ const insn_template i386_optab[] =
   { "aesenc", 2, 0x660f38dc, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -17995,10 +17985,10 @@ const insn_template i386_optab[] =
   { "aesenclast", 2, 0x66dd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18008,10 +17998,10 @@ const insn_template i386_optab[] =
   { "aesenclast", 2, 0x660f38dd, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18021,10 +18011,10 @@ const insn_template i386_optab[] =
   { "aesimc", 2, 0x66db, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18034,10 +18024,10 @@ const insn_template i386_optab[] =
   { "aesimc", 2, 0x660f38db, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18047,10 +18037,10 @@ const insn_template i386_optab[] =
   { "aeskeygenassist", 3, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18063,10 +18053,10 @@ const insn_template i386_optab[] =
   { "aeskeygenassist", 3, 0x660f3adf, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18079,10 +18069,10 @@ const insn_template i386_optab[] =
   { "pclmulqdq", 3, 0x6644, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18095,10 +18085,10 @@ const insn_template i386_optab[] =
   { "pclmulqdq", 3, 0x660f3a44, None, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18111,10 +18101,10 @@ const insn_template i386_optab[] =
   { "pclmullqlqdq", 2, 0x6644, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18124,10 +18114,10 @@ const insn_template i386_optab[] =
   { "pclmullqlqdq", 2, 0x660f3a44, 0x0, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18137,10 +18127,10 @@ const insn_template i386_optab[] =
   { "pclmulhqlqdq", 2, 0x6644, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18150,10 +18140,10 @@ const insn_template i386_optab[] =
   { "pclmulhqlqdq", 2, 0x660f3a44, 0x1, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18163,10 +18153,10 @@ const insn_template i386_optab[] =
   { "pclmullqhqdq", 2, 0x6644, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18176,10 +18166,10 @@ const insn_template i386_optab[] =
   { "pclmullqhqdq", 2, 0x660f3a44, 0x10, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18189,10 +18179,10 @@ const insn_template i386_optab[] =
   { "pclmulhqhqdq", 2, 0x6644, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18202,10 +18192,10 @@ const insn_template i386_optab[] =
   { "pclmulhqhqdq", 2, 0x660f3a44, 0x11, 3,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18215,10 +18205,10 @@ const insn_template i386_optab[] =
   { "vaddpd", 3, 0x6658, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18231,10 +18221,10 @@ const insn_template i386_optab[] =
   { "vaddpd", 3, 0x6658, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18247,10 +18237,10 @@ const insn_template i386_optab[] =
   { "vaddps", 3, 0x58, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18263,10 +18253,10 @@ const insn_template i386_optab[] =
   { "vaddps", 3, 0x58, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18279,10 +18269,10 @@ const insn_template i386_optab[] =
   { "vaddsd", 3, 0xf258, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18295,10 +18285,10 @@ const insn_template i386_optab[] =
   { "vaddss", 3, 0xf358, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18311,10 +18301,10 @@ const insn_template i386_optab[] =
   { "vaddsubpd", 3, 0x66d0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18327,10 +18317,10 @@ const insn_template i386_optab[] =
   { "vaddsubpd", 3, 0x66d0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18343,10 +18333,10 @@ const insn_template i386_optab[] =
   { "vaddsubps", 3, 0xf2d0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18359,10 +18349,10 @@ const insn_template i386_optab[] =
   { "vaddsubps", 3, 0xf2d0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18375,10 +18365,10 @@ const insn_template i386_optab[] =
   { "vandnpd", 3, 0x6655, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18391,10 +18381,10 @@ const insn_template i386_optab[] =
   { "vandnpd", 3, 0x6655, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18407,10 +18397,10 @@ const insn_template i386_optab[] =
   { "vandnps", 3, 0x55, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18423,10 +18413,10 @@ const insn_template i386_optab[] =
   { "vandnps", 3, 0x55, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18439,10 +18429,10 @@ const insn_template i386_optab[] =
   { "vandpd", 3, 0x6654, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18455,10 +18445,10 @@ const insn_template i386_optab[] =
   { "vandpd", 3, 0x6654, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18471,10 +18461,10 @@ const insn_template i386_optab[] =
   { "vandps", 3, 0x54, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18487,10 +18477,10 @@ const insn_template i386_optab[] =
   { "vandps", 3, 0x54, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18503,10 +18493,10 @@ const insn_template i386_optab[] =
   { "vblendpd", 4, 0x660d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18522,10 +18512,10 @@ const insn_template i386_optab[] =
   { "vblendpd", 4, 0x660d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18541,10 +18531,10 @@ const insn_template i386_optab[] =
   { "vblendps", 4, 0x660c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18560,10 +18550,10 @@ const insn_template i386_optab[] =
   { "vblendps", 4, 0x660c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18579,10 +18569,10 @@ const insn_template i386_optab[] =
   { "vblendvpd", 4, 0x664b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18598,10 +18588,10 @@ const insn_template i386_optab[] =
   { "vblendvpd", 4, 0x664b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18617,10 +18607,10 @@ const insn_template i386_optab[] =
   { "vblendvps", 4, 0x664a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18636,10 +18626,10 @@ const insn_template i386_optab[] =
   { "vblendvps", 4, 0x664a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18655,10 +18645,10 @@ const insn_template i386_optab[] =
   { "vbroadcastf128", 2, 0x661a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18668,10 +18658,10 @@ const insn_template i386_optab[] =
   { "vbroadcastsd", 2, 0x6619, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18681,10 +18671,10 @@ const insn_template i386_optab[] =
   { "vbroadcastsd", 2, 0x6619, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18694,10 +18684,10 @@ const insn_template i386_optab[] =
   { "vbroadcastss", 2, 0x6618, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18707,10 +18697,10 @@ const insn_template i386_optab[] =
   { "vbroadcastss", 2, 0x6618, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18720,10 +18710,10 @@ const insn_template i386_optab[] =
   { "vbroadcastss", 2, 0x6618, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18733,10 +18723,10 @@ const insn_template i386_optab[] =
   { "vbroadcastss", 2, 0x6618, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -18746,10 +18736,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_ospd", 3, 0x66c2, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18762,10 +18752,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_ospd", 3, 0x66c2, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18778,10 +18768,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_osps", 3, 0xc2, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18794,10 +18784,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_osps", 3, 0xc2, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18810,10 +18800,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_ossd", 3, 0xf2c2, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18826,10 +18816,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_osss", 3, 0xf3c2, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18842,10 +18832,10 @@ const insn_template i386_optab[] =
   { "vcmpeqpd", 3, 0x66c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18858,10 +18848,10 @@ const insn_template i386_optab[] =
   { "vcmpeqpd", 3, 0x66c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18874,10 +18864,10 @@ const insn_template i386_optab[] =
   { "vcmpeqps", 3, 0xc2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18890,10 +18880,10 @@ const insn_template i386_optab[] =
   { "vcmpeqps", 3, 0xc2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18906,10 +18896,10 @@ const insn_template i386_optab[] =
   { "vcmpeqsd", 3, 0xf2c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18922,10 +18912,10 @@ const insn_template i386_optab[] =
   { "vcmpeqss", 3, 0xf3c2, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -18938,10 +18928,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uqpd", 3, 0x66c2, 0x8, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18954,10 +18944,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uqpd", 3, 0x66c2, 0x8, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -18970,10 +18960,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uqps", 3, 0xc2, 0x8, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -18986,10 +18976,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uqps", 3, 0xc2, 0x8, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19002,10 +18992,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uqsd", 3, 0xf2c2, 0x8, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19018,10 +19008,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uqss", 3, 0xf3c2, 0x8, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19034,10 +19024,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uspd", 3, 0x66c2, 0x18, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19050,10 +19040,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_uspd", 3, 0x66c2, 0x18, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19066,10 +19056,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_usps", 3, 0xc2, 0x18, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19082,10 +19072,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_usps", 3, 0xc2, 0x18, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19098,10 +19088,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_ussd", 3, 0xf2c2, 0x18, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19114,10 +19104,10 @@ const insn_template i386_optab[] =
   { "vcmpeq_usss", 3, 0xf3c2, 0x18, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19130,10 +19120,10 @@ const insn_template i386_optab[] =
   { "vcmpfalse_ospd", 3, 0x66c2, 0x1b, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19146,10 +19136,10 @@ const insn_template i386_optab[] =
   { "vcmpfalse_ospd", 3, 0x66c2, 0x1b, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19162,10 +19152,10 @@ const insn_template i386_optab[] =
   { "vcmpfalse_osps", 3, 0xc2, 0x1b, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19178,10 +19168,10 @@ const insn_template i386_optab[] =
   { "vcmpfalse_osps", 3, 0xc2, 0x1b, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19194,10 +19184,10 @@ const insn_template i386_optab[] =
   { "vcmpfalse_ossd", 3, 0xf2c2, 0x1b, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19210,10 +19200,10 @@ const insn_template i386_optab[] =
   { "vcmpfalse_osss", 3, 0xf3c2, 0x1b, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19226,10 +19216,10 @@ const insn_template i386_optab[] =
   { "vcmpfalsepd", 3, 0x66c2, 0xb, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19242,10 +19232,10 @@ const insn_template i386_optab[] =
   { "vcmpfalsepd", 3, 0x66c2, 0xb, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19258,10 +19248,10 @@ const insn_template i386_optab[] =
   { "vcmpfalseps", 3, 0xc2, 0xb, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19274,10 +19264,10 @@ const insn_template i386_optab[] =
   { "vcmpfalseps", 3, 0xc2, 0xb, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19290,10 +19280,10 @@ const insn_template i386_optab[] =
   { "vcmpfalsesd", 3, 0xf2c2, 0xb, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19306,10 +19296,10 @@ const insn_template i386_optab[] =
   { "vcmpfalsess", 3, 0xf3c2, 0xb, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19322,10 +19312,10 @@ const insn_template i386_optab[] =
   { "vcmpge_oqpd", 3, 0x66c2, 0x1d, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19338,10 +19328,10 @@ const insn_template i386_optab[] =
   { "vcmpge_oqpd", 3, 0x66c2, 0x1d, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19354,10 +19344,10 @@ const insn_template i386_optab[] =
   { "vcmpge_oqps", 3, 0xc2, 0x1d, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19370,10 +19360,10 @@ const insn_template i386_optab[] =
   { "vcmpge_oqps", 3, 0xc2, 0x1d, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19386,10 +19376,10 @@ const insn_template i386_optab[] =
   { "vcmpge_oqsd", 3, 0xf2c2, 0x1d, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19402,10 +19392,10 @@ const insn_template i386_optab[] =
   { "vcmpge_oqss", 3, 0xf3c2, 0x1d, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19418,10 +19408,10 @@ const insn_template i386_optab[] =
   { "vcmpgepd", 3, 0x66c2, 0xd, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19434,10 +19424,10 @@ const insn_template i386_optab[] =
   { "vcmpgepd", 3, 0x66c2, 0xd, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19450,10 +19440,10 @@ const insn_template i386_optab[] =
   { "vcmpgeps", 3, 0xc2, 0xd, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19466,10 +19456,10 @@ const insn_template i386_optab[] =
   { "vcmpgeps", 3, 0xc2, 0xd, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19482,10 +19472,10 @@ const insn_template i386_optab[] =
   { "vcmpgesd", 3, 0xf2c2, 0xd, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19498,10 +19488,10 @@ const insn_template i386_optab[] =
   { "vcmpgess", 3, 0xf3c2, 0xd, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19514,10 +19504,10 @@ const insn_template i386_optab[] =
   { "vcmpgt_oqpd", 3, 0x66c2, 0x1e, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19530,10 +19520,10 @@ const insn_template i386_optab[] =
   { "vcmpgt_oqpd", 3, 0x66c2, 0x1e, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19546,10 +19536,10 @@ const insn_template i386_optab[] =
   { "vcmpgt_oqps", 3, 0xc2, 0x1e, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19562,10 +19552,10 @@ const insn_template i386_optab[] =
   { "vcmpgt_oqps", 3, 0xc2, 0x1e, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19578,10 +19568,10 @@ const insn_template i386_optab[] =
   { "vcmpgt_oqsd", 3, 0xf2c2, 0x1e, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19594,10 +19584,10 @@ const insn_template i386_optab[] =
   { "vcmpgt_oqss", 3, 0xf3c2, 0x1e, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19610,10 +19600,10 @@ const insn_template i386_optab[] =
   { "vcmpgtpd", 3, 0x66c2, 0xe, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19626,10 +19616,10 @@ const insn_template i386_optab[] =
   { "vcmpgtpd", 3, 0x66c2, 0xe, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19642,10 +19632,10 @@ const insn_template i386_optab[] =
   { "vcmpgtps", 3, 0xc2, 0xe, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19658,10 +19648,10 @@ const insn_template i386_optab[] =
   { "vcmpgtps", 3, 0xc2, 0xe, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19674,10 +19664,10 @@ const insn_template i386_optab[] =
   { "vcmpgtsd", 3, 0xf2c2, 0xe, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19690,10 +19680,10 @@ const insn_template i386_optab[] =
   { "vcmpgtss", 3, 0xf3c2, 0xe, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19706,10 +19696,10 @@ const insn_template i386_optab[] =
   { "vcmple_oqpd", 3, 0x66c2, 0x12, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19722,10 +19712,10 @@ const insn_template i386_optab[] =
   { "vcmple_oqpd", 3, 0x66c2, 0x12, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19738,10 +19728,10 @@ const insn_template i386_optab[] =
   { "vcmple_oqps", 3, 0xc2, 0x12, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19754,10 +19744,10 @@ const insn_template i386_optab[] =
   { "vcmple_oqps", 3, 0xc2, 0x12, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19770,10 +19760,10 @@ const insn_template i386_optab[] =
   { "vcmple_oqsd", 3, 0xf2c2, 0x12, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19786,10 +19776,10 @@ const insn_template i386_optab[] =
   { "vcmple_oqss", 3, 0xf3c2, 0x12, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19802,10 +19792,10 @@ const insn_template i386_optab[] =
   { "vcmplepd", 3, 0x66c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19818,10 +19808,10 @@ const insn_template i386_optab[] =
   { "vcmplepd", 3, 0x66c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19834,10 +19824,10 @@ const insn_template i386_optab[] =
   { "vcmpleps", 3, 0xc2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19850,10 +19840,10 @@ const insn_template i386_optab[] =
   { "vcmpleps", 3, 0xc2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19866,10 +19856,10 @@ const insn_template i386_optab[] =
   { "vcmplesd", 3, 0xf2c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19882,10 +19872,10 @@ const insn_template i386_optab[] =
   { "vcmpless", 3, 0xf3c2, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19898,10 +19888,10 @@ const insn_template i386_optab[] =
   { "vcmplt_oqpd", 3, 0x66c2, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19914,10 +19904,10 @@ const insn_template i386_optab[] =
   { "vcmplt_oqpd", 3, 0x66c2, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19930,10 +19920,10 @@ const insn_template i386_optab[] =
   { "vcmplt_oqps", 3, 0xc2, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -19946,10 +19936,10 @@ const insn_template i386_optab[] =
   { "vcmplt_oqps", 3, 0xc2, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -19962,10 +19952,10 @@ const insn_template i386_optab[] =
   { "vcmplt_oqsd", 3, 0xf2c2, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19978,10 +19968,10 @@ const insn_template i386_optab[] =
   { "vcmplt_oqss", 3, 0xf3c2, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -19994,10 +19984,10 @@ const insn_template i386_optab[] =
   { "vcmpltpd", 3, 0x66c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20010,10 +20000,10 @@ const insn_template i386_optab[] =
   { "vcmpltpd", 3, 0x66c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20026,10 +20016,10 @@ const insn_template i386_optab[] =
   { "vcmpltps", 3, 0xc2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20042,10 +20032,10 @@ const insn_template i386_optab[] =
   { "vcmpltps", 3, 0xc2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20058,10 +20048,10 @@ const insn_template i386_optab[] =
   { "vcmpltsd", 3, 0xf2c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20074,10 +20064,10 @@ const insn_template i386_optab[] =
   { "vcmpltss", 3, 0xf3c2, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20090,10 +20080,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_oqpd", 3, 0x66c2, 0xc, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20106,10 +20096,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_oqpd", 3, 0x66c2, 0xc, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20122,10 +20112,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_oqps", 3, 0xc2, 0xc, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20138,10 +20128,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_oqps", 3, 0xc2, 0xc, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20154,10 +20144,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_oqsd", 3, 0xf2c2, 0xc, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20170,10 +20160,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_oqss", 3, 0xf3c2, 0xc, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20186,10 +20176,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_ospd", 3, 0x66c2, 0x1c, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20202,10 +20192,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_ospd", 3, 0x66c2, 0x1c, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20218,10 +20208,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_osps", 3, 0xc2, 0x1c, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20234,10 +20224,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_osps", 3, 0xc2, 0x1c, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20250,10 +20240,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_ossd", 3, 0xf2c2, 0x1c, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20266,10 +20256,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_osss", 3, 0xf3c2, 0x1c, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20282,10 +20272,10 @@ const insn_template i386_optab[] =
   { "vcmpneqpd", 3, 0x66c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20298,10 +20288,10 @@ const insn_template i386_optab[] =
   { "vcmpneqpd", 3, 0x66c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20314,10 +20304,10 @@ const insn_template i386_optab[] =
   { "vcmpneqps", 3, 0xc2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20330,10 +20320,10 @@ const insn_template i386_optab[] =
   { "vcmpneqps", 3, 0xc2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20346,10 +20336,10 @@ const insn_template i386_optab[] =
   { "vcmpneqsd", 3, 0xf2c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20362,10 +20352,10 @@ const insn_template i386_optab[] =
   { "vcmpneqss", 3, 0xf3c2, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20378,10 +20368,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_uspd", 3, 0x66c2, 0x14, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20394,10 +20384,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_uspd", 3, 0x66c2, 0x14, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20410,10 +20400,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_usps", 3, 0xc2, 0x14, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20426,10 +20416,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_usps", 3, 0xc2, 0x14, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20442,10 +20432,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_ussd", 3, 0xf2c2, 0x14, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20458,10 +20448,10 @@ const insn_template i386_optab[] =
   { "vcmpneq_usss", 3, 0xf3c2, 0x14, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20474,10 +20464,10 @@ const insn_template i386_optab[] =
   { "vcmpngepd", 3, 0x66c2, 0x9, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20490,10 +20480,10 @@ const insn_template i386_optab[] =
   { "vcmpngepd", 3, 0x66c2, 0x9, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20506,10 +20496,10 @@ const insn_template i386_optab[] =
   { "vcmpngeps", 3, 0xc2, 0x9, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20522,10 +20512,10 @@ const insn_template i386_optab[] =
   { "vcmpngeps", 3, 0xc2, 0x9, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20538,10 +20528,10 @@ const insn_template i386_optab[] =
   { "vcmpngesd", 3, 0xf2c2, 0x9, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20554,10 +20544,10 @@ const insn_template i386_optab[] =
   { "vcmpngess", 3, 0xf3c2, 0x9, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20570,10 +20560,10 @@ const insn_template i386_optab[] =
   { "vcmpnge_uqpd", 3, 0x66c2, 0x19, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20586,10 +20576,10 @@ const insn_template i386_optab[] =
   { "vcmpnge_uqpd", 3, 0x66c2, 0x19, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20602,10 +20592,10 @@ const insn_template i386_optab[] =
   { "vcmpnge_uqps", 3, 0xc2, 0x19, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20618,10 +20608,10 @@ const insn_template i386_optab[] =
   { "vcmpnge_uqps", 3, 0xc2, 0x19, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20634,10 +20624,10 @@ const insn_template i386_optab[] =
   { "vcmpnge_uqsd", 3, 0xf2c2, 0x19, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20650,10 +20640,10 @@ const insn_template i386_optab[] =
   { "vcmpnge_uqss", 3, 0xf3c2, 0x19, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20666,10 +20656,10 @@ const insn_template i386_optab[] =
   { "vcmpngtpd", 3, 0x66c2, 0xa, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20682,10 +20672,10 @@ const insn_template i386_optab[] =
   { "vcmpngtpd", 3, 0x66c2, 0xa, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20698,10 +20688,10 @@ const insn_template i386_optab[] =
   { "vcmpngtps", 3, 0xc2, 0xa, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20714,10 +20704,10 @@ const insn_template i386_optab[] =
   { "vcmpngtps", 3, 0xc2, 0xa, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20730,10 +20720,10 @@ const insn_template i386_optab[] =
   { "vcmpngtsd", 3, 0xf2c2, 0xa, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20746,10 +20736,10 @@ const insn_template i386_optab[] =
   { "vcmpngtss", 3, 0xf3c2, 0xa, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20762,10 +20752,10 @@ const insn_template i386_optab[] =
   { "vcmpngt_uqpd", 3, 0x66c2, 0x1a, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20778,10 +20768,10 @@ const insn_template i386_optab[] =
   { "vcmpngt_uqpd", 3, 0x66c2, 0x1a, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20794,10 +20784,10 @@ const insn_template i386_optab[] =
   { "vcmpngt_uqps", 3, 0xc2, 0x1a, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20810,10 +20800,10 @@ const insn_template i386_optab[] =
   { "vcmpngt_uqps", 3, 0xc2, 0x1a, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20826,10 +20816,10 @@ const insn_template i386_optab[] =
   { "vcmpngt_uqsd", 3, 0xf2c2, 0x1a, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20842,10 +20832,10 @@ const insn_template i386_optab[] =
   { "vcmpngt_uqss", 3, 0xf3c2, 0x1a, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20858,10 +20848,10 @@ const insn_template i386_optab[] =
   { "vcmpnlepd", 3, 0x66c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20874,10 +20864,10 @@ const insn_template i386_optab[] =
   { "vcmpnlepd", 3, 0x66c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20890,10 +20880,10 @@ const insn_template i386_optab[] =
   { "vcmpnleps", 3, 0xc2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20906,10 +20896,10 @@ const insn_template i386_optab[] =
   { "vcmpnleps", 3, 0xc2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20922,10 +20912,10 @@ const insn_template i386_optab[] =
   { "vcmpnlesd", 3, 0xf2c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20938,10 +20928,10 @@ const insn_template i386_optab[] =
   { "vcmpnless", 3, 0xf3c2, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -20954,10 +20944,10 @@ const insn_template i386_optab[] =
   { "vcmpnle_uqpd", 3, 0x66c2, 0x16, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -20970,10 +20960,10 @@ const insn_template i386_optab[] =
   { "vcmpnle_uqpd", 3, 0x66c2, 0x16, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -20986,10 +20976,10 @@ const insn_template i386_optab[] =
   { "vcmpnle_uqps", 3, 0xc2, 0x16, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21002,10 +20992,10 @@ const insn_template i386_optab[] =
   { "vcmpnle_uqps", 3, 0xc2, 0x16, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21018,10 +21008,10 @@ const insn_template i386_optab[] =
   { "vcmpnle_uqsd", 3, 0xf2c2, 0x16, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21034,10 +21024,10 @@ const insn_template i386_optab[] =
   { "vcmpnle_uqss", 3, 0xf3c2, 0x16, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21050,10 +21040,10 @@ const insn_template i386_optab[] =
   { "vcmpnltpd", 3, 0x66c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21066,10 +21056,10 @@ const insn_template i386_optab[] =
   { "vcmpnltpd", 3, 0x66c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21082,10 +21072,10 @@ const insn_template i386_optab[] =
   { "vcmpnltps", 3, 0xc2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21098,10 +21088,10 @@ const insn_template i386_optab[] =
   { "vcmpnltps", 3, 0xc2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21114,10 +21104,10 @@ const insn_template i386_optab[] =
   { "vcmpnltsd", 3, 0xf2c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21130,10 +21120,10 @@ const insn_template i386_optab[] =
   { "vcmpnltss", 3, 0xf3c2, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21146,10 +21136,10 @@ const insn_template i386_optab[] =
   { "vcmpnlt_uqpd", 3, 0x66c2, 0x15, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21162,10 +21152,10 @@ const insn_template i386_optab[] =
   { "vcmpnlt_uqpd", 3, 0x66c2, 0x15, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21178,10 +21168,10 @@ const insn_template i386_optab[] =
   { "vcmpnlt_uqps", 3, 0xc2, 0x15, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21194,10 +21184,10 @@ const insn_template i386_optab[] =
   { "vcmpnlt_uqps", 3, 0xc2, 0x15, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21210,10 +21200,10 @@ const insn_template i386_optab[] =
   { "vcmpnlt_uqsd", 3, 0xf2c2, 0x15, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21226,10 +21216,10 @@ const insn_template i386_optab[] =
   { "vcmpnlt_uqss", 3, 0xf3c2, 0x15, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21242,10 +21232,10 @@ const insn_template i386_optab[] =
   { "vcmpordpd", 3, 0x66c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21258,10 +21248,10 @@ const insn_template i386_optab[] =
   { "vcmpordpd", 3, 0x66c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21274,10 +21264,10 @@ const insn_template i386_optab[] =
   { "vcmpordps", 3, 0xc2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21290,10 +21280,10 @@ const insn_template i386_optab[] =
   { "vcmpordps", 3, 0xc2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21306,10 +21296,10 @@ const insn_template i386_optab[] =
   { "vcmpordsd", 3, 0xf2c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21322,10 +21312,10 @@ const insn_template i386_optab[] =
   { "vcmpord_spd", 3, 0x66c2, 0x17, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21338,10 +21328,10 @@ const insn_template i386_optab[] =
   { "vcmpord_spd", 3, 0x66c2, 0x17, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21354,10 +21344,10 @@ const insn_template i386_optab[] =
   { "vcmpord_sps", 3, 0xc2, 0x17, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21370,10 +21360,10 @@ const insn_template i386_optab[] =
   { "vcmpord_sps", 3, 0xc2, 0x17, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21386,10 +21376,10 @@ const insn_template i386_optab[] =
   { "vcmpordss", 3, 0xf3c2, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21402,10 +21392,10 @@ const insn_template i386_optab[] =
   { "vcmpord_ssd", 3, 0xf2c2, 0x17, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21418,10 +21408,10 @@ const insn_template i386_optab[] =
   { "vcmpord_sss", 3, 0xf3c2, 0x17, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21434,10 +21424,10 @@ const insn_template i386_optab[] =
   { "vcmppd", 4, 0x66c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -21453,10 +21443,10 @@ const insn_template i386_optab[] =
   { "vcmppd", 4, 0x66c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -21472,10 +21462,10 @@ const insn_template i386_optab[] =
   { "vcmpps", 4, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -21491,10 +21481,10 @@ const insn_template i386_optab[] =
   { "vcmpps", 4, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -21510,10 +21500,10 @@ const insn_template i386_optab[] =
   { "vcmpsd", 4, 0xf2c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -21529,10 +21519,10 @@ const insn_template i386_optab[] =
   { "vcmpss", 4, 0xf3c2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -21548,10 +21538,10 @@ const insn_template i386_optab[] =
   { "vcmptruepd", 3, 0x66c2, 0xf, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21564,10 +21554,10 @@ const insn_template i386_optab[] =
   { "vcmptruepd", 3, 0x66c2, 0xf, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21580,10 +21570,10 @@ const insn_template i386_optab[] =
   { "vcmptrueps", 3, 0xc2, 0xf, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21596,10 +21586,10 @@ const insn_template i386_optab[] =
   { "vcmptrueps", 3, 0xc2, 0xf, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21612,10 +21602,10 @@ const insn_template i386_optab[] =
   { "vcmptruesd", 3, 0xf2c2, 0xf, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21628,10 +21618,10 @@ const insn_template i386_optab[] =
   { "vcmptruess", 3, 0xf3c2, 0xf, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21644,10 +21634,10 @@ const insn_template i386_optab[] =
   { "vcmptrue_uspd", 3, 0x66c2, 0x1f, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21660,10 +21650,10 @@ const insn_template i386_optab[] =
   { "vcmptrue_uspd", 3, 0x66c2, 0x1f, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21676,10 +21666,10 @@ const insn_template i386_optab[] =
   { "vcmptrue_usps", 3, 0xc2, 0x1f, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21692,10 +21682,10 @@ const insn_template i386_optab[] =
   { "vcmptrue_usps", 3, 0xc2, 0x1f, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21708,10 +21698,10 @@ const insn_template i386_optab[] =
   { "vcmptrue_ussd", 3, 0xf2c2, 0x1f, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21724,10 +21714,10 @@ const insn_template i386_optab[] =
   { "vcmptrue_usss", 3, 0xf3c2, 0x1f, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21740,10 +21730,10 @@ const insn_template i386_optab[] =
   { "vcmpunordpd", 3, 0x66c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21756,10 +21746,10 @@ const insn_template i386_optab[] =
   { "vcmpunordpd", 3, 0x66c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21772,10 +21762,10 @@ const insn_template i386_optab[] =
   { "vcmpunordps", 3, 0xc2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21788,10 +21778,10 @@ const insn_template i386_optab[] =
   { "vcmpunordps", 3, 0xc2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21804,10 +21794,10 @@ const insn_template i386_optab[] =
   { "vcmpunordsd", 3, 0xf2c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21820,10 +21810,10 @@ const insn_template i386_optab[] =
   { "vcmpunord_spd", 3, 0x66c2, 0x13, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21836,10 +21826,10 @@ const insn_template i386_optab[] =
   { "vcmpunord_spd", 3, 0x66c2, 0x13, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21852,10 +21842,10 @@ const insn_template i386_optab[] =
   { "vcmpunord_sps", 3, 0xc2, 0x13, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21868,10 +21858,10 @@ const insn_template i386_optab[] =
   { "vcmpunord_sps", 3, 0xc2, 0x13, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -21884,10 +21874,10 @@ const insn_template i386_optab[] =
   { "vcmpunordss", 3, 0xf3c2, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21900,10 +21890,10 @@ const insn_template i386_optab[] =
   { "vcmpunord_ssd", 3, 0xf2c2, 0x13, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21916,10 +21906,10 @@ const insn_template i386_optab[] =
   { "vcmpunord_sss", 3, 0xf3c2, 0x13, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21932,10 +21922,10 @@ const insn_template i386_optab[] =
   { "vcomisd", 2, 0x662f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21945,10 +21935,10 @@ const insn_template i386_optab[] =
   { "vcomiss", 2, 0x2f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21958,10 +21948,10 @@ const insn_template i386_optab[] =
   { "vcvtdq2pd", 2, 0xf3e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -21971,10 +21961,10 @@ const insn_template i386_optab[] =
   { "vcvtdq2pd", 2, 0xf3e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21984,10 +21974,10 @@ const insn_template i386_optab[] =
   { "vcvtdq2ps", 2, 0x5b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -21997,10 +21987,10 @@ const insn_template i386_optab[] =
   { "vcvtdq2ps", 2, 0x5b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22010,10 +22000,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2dq", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22023,10 +22013,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2dq", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 0, 0, 0, 0 } },
@@ -22036,10 +22026,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2dq", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22049,10 +22039,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2dq", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 0, 0, 0, 0 } },
@@ -22062,10 +22052,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2dqx", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22075,10 +22065,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2dqy", 2, 0xf2e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22088,10 +22078,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2ps", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22101,10 +22091,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2ps", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 0, 0, 0, 0 } },
@@ -22114,10 +22104,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2ps", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22127,10 +22117,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2ps", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 0, 0, 0, 0 } },
@@ -22140,10 +22130,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2psx", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22153,10 +22143,10 @@ const insn_template i386_optab[] =
   { "vcvtpd2psy", 2, 0x665a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22166,10 +22156,10 @@ const insn_template i386_optab[] =
   { "vcvtps2dq", 2, 0x665b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22179,10 +22169,10 @@ const insn_template i386_optab[] =
   { "vcvtps2dq", 2, 0x665b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22192,10 +22182,10 @@ const insn_template i386_optab[] =
   { "vcvtps2pd", 2, 0x5a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22205,10 +22195,10 @@ const insn_template i386_optab[] =
   { "vcvtps2pd", 2, 0x5a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22218,10 +22208,10 @@ const insn_template i386_optab[] =
   { "vcvtsd2si", 2, 0xf22d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22231,10 +22221,10 @@ const insn_template i386_optab[] =
   { "vcvtsd2ss", 3, 0xf25a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22247,10 +22237,10 @@ const insn_template i386_optab[] =
   { "vcvtsi2sd", 3, 0xf22a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22263,10 +22253,10 @@ const insn_template i386_optab[] =
   { "vcvtsi2sd", 3, 0xf22a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22279,10 +22269,10 @@ const insn_template i386_optab[] =
   { "vcvtsi2ss", 3, 0xf32a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22295,10 +22285,10 @@ const insn_template i386_optab[] =
   { "vcvtsi2ss", 3, 0xf32a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22311,10 +22301,10 @@ const insn_template i386_optab[] =
   { "vcvtss2sd", 3, 0xf35a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22327,10 +22317,10 @@ const insn_template i386_optab[] =
   { "vcvtss2si", 2, 0xf32d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22340,10 +22330,10 @@ const insn_template i386_optab[] =
   { "vcvttpd2dq", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22353,10 +22343,10 @@ const insn_template i386_optab[] =
   { "vcvttpd2dq", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 0, 0, 0, 0 } },
@@ -22366,10 +22356,10 @@ const insn_template i386_optab[] =
   { "vcvttpd2dq", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22379,10 +22369,10 @@ const insn_template i386_optab[] =
   { "vcvttpd2dq", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 0, 0, 0, 0 } },
@@ -22392,10 +22382,10 @@ const insn_template i386_optab[] =
   { "vcvttpd2dqx", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22405,10 +22395,10 @@ const insn_template i386_optab[] =
   { "vcvttpd2dqy", 2, 0x66e6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22418,10 +22408,10 @@ const insn_template i386_optab[] =
   { "vcvttps2dq", 2, 0xf35b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22431,10 +22421,10 @@ const insn_template i386_optab[] =
   { "vcvttps2dq", 2, 0xf35b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22444,10 +22434,10 @@ const insn_template i386_optab[] =
   { "vcvttsd2si", 2, 0xf22c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22457,10 +22447,10 @@ const insn_template i386_optab[] =
   { "vcvttss2si", 2, 0xf32c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22470,10 +22460,10 @@ const insn_template i386_optab[] =
   { "vdivpd", 3, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22486,10 +22476,10 @@ const insn_template i386_optab[] =
   { "vdivpd", 3, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22502,10 +22492,10 @@ const insn_template i386_optab[] =
   { "vdivps", 3, 0x5e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22518,10 +22508,10 @@ const insn_template i386_optab[] =
   { "vdivps", 3, 0x5e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22534,10 +22524,10 @@ const insn_template i386_optab[] =
   { "vdivsd", 3, 0xf25e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22550,10 +22540,10 @@ const insn_template i386_optab[] =
   { "vdivss", 3, 0xf35e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -22566,10 +22556,10 @@ const insn_template i386_optab[] =
   { "vdppd", 4, 0x6641, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22585,10 +22575,10 @@ const insn_template i386_optab[] =
   { "vdpps", 4, 0x6640, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22604,10 +22594,10 @@ const insn_template i386_optab[] =
   { "vdpps", 4, 0x6640, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22623,10 +22613,10 @@ const insn_template i386_optab[] =
   { "vextractf128", 3, 0x6619, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22639,10 +22629,10 @@ const insn_template i386_optab[] =
   { "vextractps", 3, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22655,10 +22645,10 @@ const insn_template i386_optab[] =
   { "vhaddpd", 3, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22671,10 +22661,10 @@ const insn_template i386_optab[] =
   { "vhaddpd", 3, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22687,10 +22677,10 @@ const insn_template i386_optab[] =
   { "vhaddps", 3, 0xf27c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22703,10 +22693,10 @@ const insn_template i386_optab[] =
   { "vhaddps", 3, 0xf27c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22719,10 +22709,10 @@ const insn_template i386_optab[] =
   { "vhsubpd", 3, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22735,10 +22725,10 @@ const insn_template i386_optab[] =
   { "vhsubpd", 3, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22751,10 +22741,10 @@ const insn_template i386_optab[] =
   { "vhsubps", 3, 0xf27d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22767,10 +22757,10 @@ const insn_template i386_optab[] =
   { "vhsubps", 3, 0xf27d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22783,10 +22773,10 @@ const insn_template i386_optab[] =
   { "vinsertf128", 4, 0x6618, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22802,10 +22792,10 @@ const insn_template i386_optab[] =
   { "vinsertps", 4, 0x6621, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22821,10 +22811,10 @@ const insn_template i386_optab[] =
   { "vlddqu", 2, 0xf2f0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22834,10 +22824,10 @@ const insn_template i386_optab[] =
   { "vlddqu", 2, 0xf2f0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22847,20 +22837,20 @@ const insn_template i386_optab[] =
   { "vldmxcsr", 1, 0xae, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "vmaskmovdqu", 2, 0x66f7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22870,10 +22860,10 @@ const insn_template i386_optab[] =
   { "vmaskmovpd", 3, 0x662f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22886,10 +22876,10 @@ const insn_template i386_optab[] =
   { "vmaskmovpd", 3, 0x662f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22902,10 +22892,10 @@ const insn_template i386_optab[] =
   { "vmaskmovpd", 3, 0x662d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22918,10 +22908,10 @@ const insn_template i386_optab[] =
   { "vmaskmovpd", 3, 0x662d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22934,10 +22924,10 @@ const insn_template i386_optab[] =
   { "vmaskmovps", 3, 0x662e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22950,10 +22940,10 @@ const insn_template i386_optab[] =
   { "vmaskmovps", 3, 0x662e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -22966,10 +22956,10 @@ const insn_template i386_optab[] =
   { "vmaskmovps", 3, 0x662c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -22982,10 +22972,10 @@ const insn_template i386_optab[] =
   { "vmaskmovps", 3, 0x662c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -22998,10 +22988,10 @@ const insn_template i386_optab[] =
   { "vmaxpd", 3, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23014,10 +23004,10 @@ const insn_template i386_optab[] =
   { "vmaxpd", 3, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23030,10 +23020,10 @@ const insn_template i386_optab[] =
   { "vmaxps", 3, 0x5f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23046,10 +23036,10 @@ const insn_template i386_optab[] =
   { "vmaxps", 3, 0x5f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23062,10 +23052,10 @@ const insn_template i386_optab[] =
   { "vmaxsd", 3, 0xf25f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23078,10 +23068,10 @@ const insn_template i386_optab[] =
   { "vmaxss", 3, 0xf35f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23094,10 +23084,10 @@ const insn_template i386_optab[] =
   { "vminpd", 3, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23110,10 +23100,10 @@ const insn_template i386_optab[] =
   { "vminpd", 3, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23126,10 +23116,10 @@ const insn_template i386_optab[] =
   { "vminps", 3, 0x5d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23142,10 +23132,10 @@ const insn_template i386_optab[] =
   { "vminps", 3, 0x5d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23158,10 +23148,10 @@ const insn_template i386_optab[] =
   { "vminsd", 3, 0xf25d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23174,10 +23164,10 @@ const insn_template i386_optab[] =
   { "vminss", 3, 0xf35d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23190,10 +23180,10 @@ const insn_template i386_optab[] =
   { "vmovapd", 2, 0x6628, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23203,10 +23193,10 @@ const insn_template i386_optab[] =
   { "vmovapd", 2, 0x6629, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23216,10 +23206,10 @@ const insn_template i386_optab[] =
   { "vmovapd", 2, 0x6628, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23229,10 +23219,10 @@ const insn_template i386_optab[] =
   { "vmovapd", 2, 0x6629, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23242,10 +23232,10 @@ const insn_template i386_optab[] =
   { "vmovaps", 2, 0x28, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23255,10 +23245,10 @@ const insn_template i386_optab[] =
   { "vmovaps", 2, 0x29, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23268,10 +23258,10 @@ const insn_template i386_optab[] =
   { "vmovaps", 2, 0x28, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23281,10 +23271,10 @@ const insn_template i386_optab[] =
   { "vmovaps", 2, 0x29, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23294,10 +23284,10 @@ const insn_template i386_optab[] =
   { "vmovd", 2, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23307,10 +23297,10 @@ const insn_template i386_optab[] =
   { "vmovd", 2, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23320,10 +23310,10 @@ const insn_template i386_optab[] =
   { "vmovd", 2, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23333,10 +23323,10 @@ const insn_template i386_optab[] =
   { "vmovd", 2, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23346,10 +23336,10 @@ const insn_template i386_optab[] =
   { "vmovddup", 2, 0xf212, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23359,10 +23349,10 @@ const insn_template i386_optab[] =
   { "vmovddup", 2, 0xf212, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23372,10 +23362,10 @@ const insn_template i386_optab[] =
   { "vmovdqa", 2, 0x666f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23385,10 +23375,10 @@ const insn_template i386_optab[] =
   { "vmovdqa", 2, 0x667f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23398,10 +23388,10 @@ const insn_template i386_optab[] =
   { "vmovdqa", 2, 0x666f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23411,10 +23401,10 @@ const insn_template i386_optab[] =
   { "vmovdqa", 2, 0x667f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23424,10 +23414,10 @@ const insn_template i386_optab[] =
   { "vmovdqu", 2, 0xf36f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23437,10 +23427,10 @@ const insn_template i386_optab[] =
   { "vmovdqu", 2, 0xf37f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23450,10 +23440,10 @@ const insn_template i386_optab[] =
   { "vmovdqu", 2, 0xf36f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23463,10 +23453,10 @@ const insn_template i386_optab[] =
   { "vmovdqu", 2, 0xf37f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23476,10 +23466,10 @@ const insn_template i386_optab[] =
   { "vmovhlps", 3, 0x12, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23492,10 +23482,10 @@ const insn_template i386_optab[] =
   { "vmovhpd", 3, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23508,10 +23498,10 @@ const insn_template i386_optab[] =
   { "vmovhpd", 2, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23521,10 +23511,10 @@ const insn_template i386_optab[] =
   { "vmovhps", 3, 0x16, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23537,10 +23527,10 @@ const insn_template i386_optab[] =
   { "vmovhps", 2, 0x17, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23550,10 +23540,10 @@ const insn_template i386_optab[] =
   { "vmovlhps", 3, 0x16, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23566,10 +23556,10 @@ const insn_template i386_optab[] =
   { "vmovlpd", 3, 0x6612, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23582,10 +23572,10 @@ const insn_template i386_optab[] =
   { "vmovlpd", 2, 0x6613, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23595,10 +23585,10 @@ const insn_template i386_optab[] =
   { "vmovlps", 3, 0x12, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23611,10 +23601,10 @@ const insn_template i386_optab[] =
   { "vmovlps", 2, 0x13, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23624,10 +23614,10 @@ const insn_template i386_optab[] =
   { "vmovmskpd", 2, 0x6650, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23637,10 +23627,10 @@ const insn_template i386_optab[] =
   { "vmovmskpd", 2, 0x6650, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23650,10 +23640,10 @@ const insn_template i386_optab[] =
   { "vmovmskps", 2, 0x50, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23663,10 +23653,10 @@ const insn_template i386_optab[] =
   { "vmovmskps", 2, 0x50, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23676,10 +23666,10 @@ const insn_template i386_optab[] =
   { "vmovntdq", 2, 0x66e7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23689,10 +23679,10 @@ const insn_template i386_optab[] =
   { "vmovntdq", 2, 0x66e7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23702,10 +23692,10 @@ const insn_template i386_optab[] =
   { "vmovntdqa", 2, 0x662a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23715,10 +23705,10 @@ const insn_template i386_optab[] =
   { "vmovntdqa", 2, 0x662a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23728,10 +23718,10 @@ const insn_template i386_optab[] =
   { "vmovntpd", 2, 0x662b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23741,10 +23731,10 @@ const insn_template i386_optab[] =
   { "vmovntpd", 2, 0x662b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23754,10 +23744,10 @@ const insn_template i386_optab[] =
   { "vmovntps", 2, 0x2b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23767,10 +23757,10 @@ const insn_template i386_optab[] =
   { "vmovntps", 2, 0x2b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23780,10 +23770,10 @@ const insn_template i386_optab[] =
   { "vmovq", 2, 0xf37e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23793,10 +23783,10 @@ const insn_template i386_optab[] =
   { "vmovq", 2, 0x66d6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23806,10 +23796,10 @@ const insn_template i386_optab[] =
   { "vmovq", 2, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23819,10 +23809,10 @@ const insn_template i386_optab[] =
   { "vmovq", 2, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23832,10 +23822,10 @@ const insn_template i386_optab[] =
   { "vmovsd", 2, 0xf211, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23845,10 +23835,10 @@ const insn_template i386_optab[] =
   { "vmovsd", 2, 0xf210, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23858,10 +23848,10 @@ const insn_template i386_optab[] =
   { "vmovsd", 3, 0xf210, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23874,10 +23864,10 @@ const insn_template i386_optab[] =
   { "vmovsd", 3, 0xf211, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23890,10 +23880,10 @@ const insn_template i386_optab[] =
   { "vmovshdup", 2, 0xf316, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23903,10 +23893,10 @@ const insn_template i386_optab[] =
   { "vmovshdup", 2, 0xf316, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23916,10 +23906,10 @@ const insn_template i386_optab[] =
   { "vmovsldup", 2, 0xf312, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -23929,10 +23919,10 @@ const insn_template i386_optab[] =
   { "vmovsldup", 2, 0xf312, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -23942,10 +23932,10 @@ const insn_template i386_optab[] =
   { "vmovss", 2, 0xf311, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23955,10 +23945,10 @@ const insn_template i386_optab[] =
   { "vmovss", 2, 0xf310, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -23968,10 +23958,10 @@ const insn_template i386_optab[] =
   { "vmovss", 3, 0xf310, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -23984,10 +23974,10 @@ const insn_template i386_optab[] =
   { "vmovss", 3, 0xf311, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24000,10 +23990,10 @@ const insn_template i386_optab[] =
   { "vmovupd", 2, 0x6610, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24013,10 +24003,10 @@ const insn_template i386_optab[] =
   { "vmovupd", 2, 0x6611, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24026,10 +24016,10 @@ const insn_template i386_optab[] =
   { "vmovupd", 2, 0x6610, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24039,10 +24029,10 @@ const insn_template i386_optab[] =
   { "vmovupd", 2, 0x6611, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24052,10 +24042,10 @@ const insn_template i386_optab[] =
   { "vmovups", 2, 0x10, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24065,10 +24055,10 @@ const insn_template i386_optab[] =
   { "vmovups", 2, 0x11, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24078,10 +24068,10 @@ const insn_template i386_optab[] =
   { "vmovups", 2, 0x10, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24091,10 +24081,10 @@ const insn_template i386_optab[] =
   { "vmovups", 2, 0x11, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24104,10 +24094,10 @@ const insn_template i386_optab[] =
   { "vmpsadbw", 4, 0x6642, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24123,10 +24113,10 @@ const insn_template i386_optab[] =
   { "vmpsadbw", 4, 0x6642, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24142,10 +24132,10 @@ const insn_template i386_optab[] =
   { "vmulpd", 3, 0x6659, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24158,10 +24148,10 @@ const insn_template i386_optab[] =
   { "vmulpd", 3, 0x6659, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24174,10 +24164,10 @@ const insn_template i386_optab[] =
   { "vmulps", 3, 0x59, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24190,10 +24180,10 @@ const insn_template i386_optab[] =
   { "vmulps", 3, 0x59, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24206,10 +24196,10 @@ const insn_template i386_optab[] =
   { "vmulsd", 3, 0xf259, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -24222,10 +24212,10 @@ const insn_template i386_optab[] =
   { "vmulss", 3, 0xf359, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -24238,10 +24228,10 @@ const insn_template i386_optab[] =
   { "vorpd", 3, 0x6656, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24254,10 +24244,10 @@ const insn_template i386_optab[] =
   { "vorpd", 3, 0x6656, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24270,10 +24260,10 @@ const insn_template i386_optab[] =
   { "vorps", 3, 0x56, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24286,10 +24276,10 @@ const insn_template i386_optab[] =
   { "vorps", 3, 0x56, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24302,10 +24292,10 @@ const insn_template i386_optab[] =
   { "vpabsb", 2, 0x661c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24315,10 +24305,10 @@ const insn_template i386_optab[] =
   { "vpabsb", 2, 0x661c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24328,10 +24318,10 @@ const insn_template i386_optab[] =
   { "vpabsd", 2, 0x661e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24341,10 +24331,10 @@ const insn_template i386_optab[] =
   { "vpabsd", 2, 0x661e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24354,10 +24344,10 @@ const insn_template i386_optab[] =
   { "vpabsw", 2, 0x661d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24367,10 +24357,10 @@ const insn_template i386_optab[] =
   { "vpabsw", 2, 0x661d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24380,10 +24370,10 @@ const insn_template i386_optab[] =
   { "vpackssdw", 3, 0x666b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24396,10 +24386,10 @@ const insn_template i386_optab[] =
   { "vpackssdw", 3, 0x666b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24412,10 +24402,10 @@ const insn_template i386_optab[] =
   { "vpacksswb", 3, 0x6663, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24428,10 +24418,10 @@ const insn_template i386_optab[] =
   { "vpacksswb", 3, 0x6663, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24444,10 +24434,10 @@ const insn_template i386_optab[] =
   { "vpackusdw", 3, 0x662b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24460,10 +24450,10 @@ const insn_template i386_optab[] =
   { "vpackusdw", 3, 0x662b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24476,10 +24466,10 @@ const insn_template i386_optab[] =
   { "vpackuswb", 3, 0x6667, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24492,10 +24482,10 @@ const insn_template i386_optab[] =
   { "vpackuswb", 3, 0x6667, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24508,10 +24498,10 @@ const insn_template i386_optab[] =
   { "vpaddsb", 3, 0x66ec, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24524,10 +24514,10 @@ const insn_template i386_optab[] =
   { "vpaddsb", 3, 0x66ec, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24540,10 +24530,10 @@ const insn_template i386_optab[] =
   { "vpaddsw", 3, 0x66ed, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24556,10 +24546,10 @@ const insn_template i386_optab[] =
   { "vpaddsw", 3, 0x66ed, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24572,10 +24562,10 @@ const insn_template i386_optab[] =
   { "vpaddb", 3, 0x66fc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24588,10 +24578,10 @@ const insn_template i386_optab[] =
   { "vpaddb", 3, 0x66fc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24604,10 +24594,10 @@ const insn_template i386_optab[] =
   { "vpaddd", 3, 0x66fe, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24620,10 +24610,10 @@ const insn_template i386_optab[] =
   { "vpaddd", 3, 0x66fe, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24636,10 +24626,10 @@ const insn_template i386_optab[] =
   { "vpaddq", 3, 0x66d4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24652,10 +24642,10 @@ const insn_template i386_optab[] =
   { "vpaddq", 3, 0x66d4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24668,10 +24658,10 @@ const insn_template i386_optab[] =
   { "vpaddw", 3, 0x66fd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24684,10 +24674,10 @@ const insn_template i386_optab[] =
   { "vpaddw", 3, 0x66fd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24700,10 +24690,10 @@ const insn_template i386_optab[] =
   { "vpaddusb", 3, 0x66dc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24716,10 +24706,10 @@ const insn_template i386_optab[] =
   { "vpaddusb", 3, 0x66dc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24732,10 +24722,10 @@ const insn_template i386_optab[] =
   { "vpaddusw", 3, 0x66dd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24748,10 +24738,10 @@ const insn_template i386_optab[] =
   { "vpaddusw", 3, 0x66dd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24764,10 +24754,10 @@ const insn_template i386_optab[] =
   { "vpalignr", 4, 0x660f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24783,10 +24773,10 @@ const insn_template i386_optab[] =
   { "vpalignr", 4, 0x660f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24802,10 +24792,10 @@ const insn_template i386_optab[] =
   { "vpand", 3, 0x66db, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24818,10 +24808,10 @@ const insn_template i386_optab[] =
   { "vpand", 3, 0x66db, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24834,10 +24824,10 @@ const insn_template i386_optab[] =
   { "vpandn", 3, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24850,10 +24840,10 @@ const insn_template i386_optab[] =
   { "vpandn", 3, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24866,10 +24856,10 @@ const insn_template i386_optab[] =
   { "vpavgb", 3, 0x66e0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24882,10 +24872,10 @@ const insn_template i386_optab[] =
   { "vpavgb", 3, 0x66e0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24898,10 +24888,10 @@ const insn_template i386_optab[] =
   { "vpavgw", 3, 0x66e3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -24914,10 +24904,10 @@ const insn_template i386_optab[] =
   { "vpavgw", 3, 0x66e3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -24930,10 +24920,10 @@ const insn_template i386_optab[] =
   { "vpblendvb", 4, 0x664c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24949,10 +24939,10 @@ const insn_template i386_optab[] =
   { "vpblendvb", 4, 0x664c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24968,10 +24958,10 @@ const insn_template i386_optab[] =
   { "vpblendw", 4, 0x660e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -24987,10 +24977,10 @@ const insn_template i386_optab[] =
   { "vpblendw", 4, 0x660e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25006,10 +24996,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqb", 3, 0x6674, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25022,10 +25012,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqb", 3, 0x6674, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25038,10 +25028,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqd", 3, 0x6676, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25054,10 +25044,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqd", 3, 0x6676, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25070,10 +25060,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqq", 3, 0x6629, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25086,10 +25076,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqq", 3, 0x6629, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25102,10 +25092,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqw", 3, 0x6675, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25118,10 +25108,10 @@ const insn_template i386_optab[] =
   { "vpcmpeqw", 3, 0x6675, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25134,10 +25124,10 @@ const insn_template i386_optab[] =
   { "vpcmpestri", 3, 0x6661, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25150,10 +25140,10 @@ const insn_template i386_optab[] =
   { "vpcmpestrm", 3, 0x6660, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25166,10 +25156,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtb", 3, 0x6664, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25182,10 +25172,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtb", 3, 0x6664, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25198,10 +25188,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtd", 3, 0x6666, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25214,10 +25204,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtd", 3, 0x6666, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25230,10 +25220,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtq", 3, 0x6637, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25246,10 +25236,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtq", 3, 0x6637, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25262,10 +25252,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtw", 3, 0x6665, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25278,10 +25268,10 @@ const insn_template i386_optab[] =
   { "vpcmpgtw", 3, 0x6665, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25294,10 +25284,10 @@ const insn_template i386_optab[] =
   { "vpcmpistri", 3, 0x6663, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25310,10 +25300,10 @@ const insn_template i386_optab[] =
   { "vpcmpistrm", 3, 0x6662, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25326,10 +25316,10 @@ const insn_template i386_optab[] =
   { "vperm2f128", 4, 0x6606, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25345,10 +25335,10 @@ const insn_template i386_optab[] =
   { "vpermilpd", 3, 0x660d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25361,10 +25351,10 @@ const insn_template i386_optab[] =
   { "vpermilpd", 3, 0x660d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25377,10 +25367,10 @@ const insn_template i386_optab[] =
   { "vpermilpd", 3, 0x6605, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25393,10 +25383,10 @@ const insn_template i386_optab[] =
   { "vpermilpd", 3, 0x6605, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25409,10 +25399,10 @@ const insn_template i386_optab[] =
   { "vpermilps", 3, 0x660c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25425,10 +25415,10 @@ const insn_template i386_optab[] =
   { "vpermilps", 3, 0x660c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25441,10 +25431,10 @@ const insn_template i386_optab[] =
   { "vpermilps", 3, 0x6604, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25457,10 +25447,10 @@ const insn_template i386_optab[] =
   { "vpermilps", 3, 0x6604, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25473,10 +25463,10 @@ const insn_template i386_optab[] =
   { "vpextrb", 3, 0x6614, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25489,10 +25479,10 @@ const insn_template i386_optab[] =
   { "vpextrd", 3, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25505,10 +25495,10 @@ const insn_template i386_optab[] =
   { "vpextrq", 3, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25521,10 +25511,10 @@ const insn_template i386_optab[] =
   { "vpextrw", 3, 0x66c5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25537,10 +25527,10 @@ const insn_template i386_optab[] =
   { "vpextrw", 3, 0x6615, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25553,10 +25543,10 @@ const insn_template i386_optab[] =
   { "vphaddd", 3, 0x6602, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25569,10 +25559,10 @@ const insn_template i386_optab[] =
   { "vphaddd", 3, 0x6602, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25585,10 +25575,10 @@ const insn_template i386_optab[] =
   { "vphaddsw", 3, 0x6603, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25601,10 +25591,10 @@ const insn_template i386_optab[] =
   { "vphaddsw", 3, 0x6603, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25617,10 +25607,10 @@ const insn_template i386_optab[] =
   { "vphaddw", 3, 0x6601, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25633,10 +25623,10 @@ const insn_template i386_optab[] =
   { "vphaddw", 3, 0x6601, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25649,10 +25639,10 @@ const insn_template i386_optab[] =
   { "vphminposuw", 2, 0x6641, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25662,10 +25652,10 @@ const insn_template i386_optab[] =
   { "vphsubd", 3, 0x6606, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25678,10 +25668,10 @@ const insn_template i386_optab[] =
   { "vphsubd", 3, 0x6606, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25694,10 +25684,10 @@ const insn_template i386_optab[] =
   { "vphsubsw", 3, 0x6607, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25710,10 +25700,10 @@ const insn_template i386_optab[] =
   { "vphsubsw", 3, 0x6607, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25726,10 +25716,10 @@ const insn_template i386_optab[] =
   { "vphsubw", 3, 0x6605, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25742,10 +25732,10 @@ const insn_template i386_optab[] =
   { "vphsubw", 3, 0x6605, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25758,10 +25748,10 @@ const insn_template i386_optab[] =
   { "vpinsrb", 4, 0x6620, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25777,10 +25767,10 @@ const insn_template i386_optab[] =
   { "vpinsrd", 4, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25796,10 +25786,10 @@ const insn_template i386_optab[] =
   { "vpinsrq", 4, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25815,10 +25805,10 @@ const insn_template i386_optab[] =
   { "vpinsrw", 4, 0x66c4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -25834,10 +25824,10 @@ const insn_template i386_optab[] =
   { "vpmaddubsw", 3, 0x6604, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25850,10 +25840,10 @@ const insn_template i386_optab[] =
   { "vpmaddubsw", 3, 0x6604, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25866,10 +25856,10 @@ const insn_template i386_optab[] =
   { "vpmaddwd", 3, 0x66f5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25882,10 +25872,10 @@ const insn_template i386_optab[] =
   { "vpmaddwd", 3, 0x66f5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25898,10 +25888,10 @@ const insn_template i386_optab[] =
   { "vpmaxsb", 3, 0x663c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25914,10 +25904,10 @@ const insn_template i386_optab[] =
   { "vpmaxsb", 3, 0x663c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25930,10 +25920,10 @@ const insn_template i386_optab[] =
   { "vpmaxsd", 3, 0x663d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25946,10 +25936,10 @@ const insn_template i386_optab[] =
   { "vpmaxsd", 3, 0x663d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25962,10 +25952,10 @@ const insn_template i386_optab[] =
   { "vpmaxsw", 3, 0x66ee, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -25978,10 +25968,10 @@ const insn_template i386_optab[] =
   { "vpmaxsw", 3, 0x66ee, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -25994,10 +25984,10 @@ const insn_template i386_optab[] =
   { "vpmaxub", 3, 0x66de, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26010,10 +26000,10 @@ const insn_template i386_optab[] =
   { "vpmaxub", 3, 0x66de, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26026,10 +26016,10 @@ const insn_template i386_optab[] =
   { "vpmaxud", 3, 0x663f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26042,10 +26032,10 @@ const insn_template i386_optab[] =
   { "vpmaxud", 3, 0x663f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26058,10 +26048,10 @@ const insn_template i386_optab[] =
   { "vpmaxuw", 3, 0x663e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26074,10 +26064,10 @@ const insn_template i386_optab[] =
   { "vpmaxuw", 3, 0x663e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26090,10 +26080,10 @@ const insn_template i386_optab[] =
   { "vpminsb", 3, 0x6638, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26106,10 +26096,10 @@ const insn_template i386_optab[] =
   { "vpminsb", 3, 0x6638, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26122,10 +26112,10 @@ const insn_template i386_optab[] =
   { "vpminsd", 3, 0x6639, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26138,10 +26128,10 @@ const insn_template i386_optab[] =
   { "vpminsd", 3, 0x6639, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26154,10 +26144,10 @@ const insn_template i386_optab[] =
   { "vpminsw", 3, 0x66ea, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26170,10 +26160,10 @@ const insn_template i386_optab[] =
   { "vpminsw", 3, 0x66ea, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26186,10 +26176,10 @@ const insn_template i386_optab[] =
   { "vpminub", 3, 0x66da, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26202,10 +26192,10 @@ const insn_template i386_optab[] =
   { "vpminub", 3, 0x66da, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26218,10 +26208,10 @@ const insn_template i386_optab[] =
   { "vpminud", 3, 0x663b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26234,10 +26224,10 @@ const insn_template i386_optab[] =
   { "vpminud", 3, 0x663b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26250,10 +26240,10 @@ const insn_template i386_optab[] =
   { "vpminuw", 3, 0x663a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26266,10 +26256,10 @@ const insn_template i386_optab[] =
   { "vpminuw", 3, 0x663a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26282,10 +26272,10 @@ const insn_template i386_optab[] =
   { "vpmovmskb", 2, 0x66d7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -26295,10 +26285,10 @@ const insn_template i386_optab[] =
   { "vpmovmskb", 2, 0x66d7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -26308,10 +26298,10 @@ const insn_template i386_optab[] =
   { "vpmovsxbd", 2, 0x6621, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26321,10 +26311,10 @@ const insn_template i386_optab[] =
   { "vpmovsxbd", 2, 0x6621, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26334,10 +26324,10 @@ const insn_template i386_optab[] =
   { "vpmovsxbq", 2, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26347,10 +26337,10 @@ const insn_template i386_optab[] =
   { "vpmovsxbq", 2, 0x6622, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26360,10 +26350,10 @@ const insn_template i386_optab[] =
   { "vpmovsxbw", 2, 0x6620, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26373,10 +26363,10 @@ const insn_template i386_optab[] =
   { "vpmovsxbw", 2, 0x6620, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26386,10 +26376,10 @@ const insn_template i386_optab[] =
   { "vpmovsxdq", 2, 0x6625, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26399,10 +26389,10 @@ const insn_template i386_optab[] =
   { "vpmovsxdq", 2, 0x6625, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26412,10 +26402,10 @@ const insn_template i386_optab[] =
   { "vpmovsxwd", 2, 0x6623, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26425,10 +26415,10 @@ const insn_template i386_optab[] =
   { "vpmovsxwd", 2, 0x6623, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26438,10 +26428,10 @@ const insn_template i386_optab[] =
   { "vpmovsxwq", 2, 0x6624, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26451,10 +26441,10 @@ const insn_template i386_optab[] =
   { "vpmovsxwq", 2, 0x6624, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26464,10 +26454,10 @@ const insn_template i386_optab[] =
   { "vpmovzxbd", 2, 0x6631, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26477,10 +26467,10 @@ const insn_template i386_optab[] =
   { "vpmovzxbd", 2, 0x6631, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26490,10 +26480,10 @@ const insn_template i386_optab[] =
   { "vpmovzxbq", 2, 0x6632, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26503,10 +26493,10 @@ const insn_template i386_optab[] =
   { "vpmovzxbq", 2, 0x6632, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26516,10 +26506,10 @@ const insn_template i386_optab[] =
   { "vpmovzxbw", 2, 0x6630, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26529,10 +26519,10 @@ const insn_template i386_optab[] =
   { "vpmovzxbw", 2, 0x6630, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26542,10 +26532,10 @@ const insn_template i386_optab[] =
   { "vpmovzxdq", 2, 0x6635, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26555,10 +26545,10 @@ const insn_template i386_optab[] =
   { "vpmovzxdq", 2, 0x6635, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26568,10 +26558,10 @@ const insn_template i386_optab[] =
   { "vpmovzxwd", 2, 0x6633, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26581,10 +26571,10 @@ const insn_template i386_optab[] =
   { "vpmovzxwd", 2, 0x6633, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26594,10 +26584,10 @@ const insn_template i386_optab[] =
   { "vpmovzxwq", 2, 0x6634, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26607,10 +26597,10 @@ const insn_template i386_optab[] =
   { "vpmovzxwq", 2, 0x6634, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -26620,10 +26610,10 @@ const insn_template i386_optab[] =
   { "vpmuldq", 3, 0x6628, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26636,10 +26626,10 @@ const insn_template i386_optab[] =
   { "vpmuldq", 3, 0x6628, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26652,10 +26642,10 @@ const insn_template i386_optab[] =
   { "vpmulhrsw", 3, 0x660b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26668,10 +26658,10 @@ const insn_template i386_optab[] =
   { "vpmulhrsw", 3, 0x660b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26684,10 +26674,10 @@ const insn_template i386_optab[] =
   { "vpmulhuw", 3, 0x66e4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26700,10 +26690,10 @@ const insn_template i386_optab[] =
   { "vpmulhuw", 3, 0x66e4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26716,10 +26706,10 @@ const insn_template i386_optab[] =
   { "vpmulhw", 3, 0x66e5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26732,10 +26722,10 @@ const insn_template i386_optab[] =
   { "vpmulhw", 3, 0x66e5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26748,10 +26738,10 @@ const insn_template i386_optab[] =
   { "vpmulld", 3, 0x6640, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26764,10 +26754,10 @@ const insn_template i386_optab[] =
   { "vpmulld", 3, 0x6640, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26780,10 +26770,10 @@ const insn_template i386_optab[] =
   { "vpmullw", 3, 0x66d5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26796,10 +26786,10 @@ const insn_template i386_optab[] =
   { "vpmullw", 3, 0x66d5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26812,10 +26802,10 @@ const insn_template i386_optab[] =
   { "vpmuludq", 3, 0x66f4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26828,10 +26818,10 @@ const insn_template i386_optab[] =
   { "vpmuludq", 3, 0x66f4, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26844,10 +26834,10 @@ const insn_template i386_optab[] =
   { "vpor", 3, 0x66eb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26860,10 +26850,10 @@ const insn_template i386_optab[] =
   { "vpor", 3, 0x66eb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26876,10 +26866,10 @@ const insn_template i386_optab[] =
   { "vpsadbw", 3, 0x66f6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26892,10 +26882,10 @@ const insn_template i386_optab[] =
   { "vpsadbw", 3, 0x66f6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26908,10 +26898,10 @@ const insn_template i386_optab[] =
   { "vpshufb", 3, 0x6600, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -26924,10 +26914,10 @@ const insn_template i386_optab[] =
   { "vpshufb", 3, 0x6600, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -26940,10 +26930,10 @@ const insn_template i386_optab[] =
   { "vpshufd", 3, 0x6670, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -26956,10 +26946,10 @@ const insn_template i386_optab[] =
   { "vpshufd", 3, 0x6670, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -26972,10 +26962,10 @@ const insn_template i386_optab[] =
   { "vpshufhw", 3, 0xf370, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -26988,10 +26978,10 @@ const insn_template i386_optab[] =
   { "vpshufhw", 3, 0xf370, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27004,10 +26994,10 @@ const insn_template i386_optab[] =
   { "vpshuflw", 3, 0xf270, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27020,10 +27010,10 @@ const insn_template i386_optab[] =
   { "vpshuflw", 3, 0xf270, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27036,10 +27026,10 @@ const insn_template i386_optab[] =
   { "vpsignb", 3, 0x6608, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27052,10 +27042,10 @@ const insn_template i386_optab[] =
   { "vpsignb", 3, 0x6608, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27068,10 +27058,10 @@ const insn_template i386_optab[] =
   { "vpsignd", 3, 0x660a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27084,10 +27074,10 @@ const insn_template i386_optab[] =
   { "vpsignd", 3, 0x660a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27100,10 +27090,10 @@ const insn_template i386_optab[] =
   { "vpsignw", 3, 0x6609, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27116,10 +27106,10 @@ const insn_template i386_optab[] =
   { "vpsignw", 3, 0x6609, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27132,10 +27122,10 @@ const insn_template i386_optab[] =
   { "vpslld", 3, 0x6672, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27148,10 +27138,10 @@ const insn_template i386_optab[] =
   { "vpslld", 3, 0x66f2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27164,10 +27154,10 @@ const insn_template i386_optab[] =
   { "vpslld", 3, 0x6672, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27180,10 +27170,10 @@ const insn_template i386_optab[] =
   { "vpslld", 3, 0x66f2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27196,10 +27186,10 @@ const insn_template i386_optab[] =
   { "vpslldq", 3, 0x6673, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27212,10 +27202,10 @@ const insn_template i386_optab[] =
   { "vpslldq", 3, 0x6673, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27228,10 +27218,10 @@ const insn_template i386_optab[] =
   { "vpsllq", 3, 0x6673, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27244,10 +27234,10 @@ const insn_template i386_optab[] =
   { "vpsllq", 3, 0x66f3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27260,10 +27250,10 @@ const insn_template i386_optab[] =
   { "vpsllq", 3, 0x6673, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27276,10 +27266,10 @@ const insn_template i386_optab[] =
   { "vpsllq", 3, 0x66f3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27292,10 +27282,10 @@ const insn_template i386_optab[] =
   { "vpsllw", 3, 0x6671, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27308,10 +27298,10 @@ const insn_template i386_optab[] =
   { "vpsllw", 3, 0x66f1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27324,10 +27314,10 @@ const insn_template i386_optab[] =
   { "vpsllw", 3, 0x6671, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27340,10 +27330,10 @@ const insn_template i386_optab[] =
   { "vpsllw", 3, 0x66f1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27356,10 +27346,10 @@ const insn_template i386_optab[] =
   { "vpsrad", 3, 0x6672, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27372,10 +27362,10 @@ const insn_template i386_optab[] =
   { "vpsrad", 3, 0x66e2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27388,10 +27378,10 @@ const insn_template i386_optab[] =
   { "vpsrad", 3, 0x6672, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27404,10 +27394,10 @@ const insn_template i386_optab[] =
   { "vpsrad", 3, 0x66e2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27420,10 +27410,10 @@ const insn_template i386_optab[] =
   { "vpsraw", 3, 0x6671, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27436,10 +27426,10 @@ const insn_template i386_optab[] =
   { "vpsraw", 3, 0x66e1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27452,10 +27442,10 @@ const insn_template i386_optab[] =
   { "vpsraw", 3, 0x6671, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27468,10 +27458,10 @@ const insn_template i386_optab[] =
   { "vpsraw", 3, 0x66e1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27484,10 +27474,10 @@ const insn_template i386_optab[] =
   { "vpsrld", 3, 0x6672, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27500,10 +27490,10 @@ const insn_template i386_optab[] =
   { "vpsrld", 3, 0x66d2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27516,10 +27506,10 @@ const insn_template i386_optab[] =
   { "vpsrld", 3, 0x6672, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27532,10 +27522,10 @@ const insn_template i386_optab[] =
   { "vpsrld", 3, 0x66d2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27548,10 +27538,10 @@ const insn_template i386_optab[] =
   { "vpsrldq", 3, 0x6673, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27564,10 +27554,10 @@ const insn_template i386_optab[] =
   { "vpsrldq", 3, 0x6673, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27580,10 +27570,10 @@ const insn_template i386_optab[] =
   { "vpsrlq", 3, 0x6673, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27596,10 +27586,10 @@ const insn_template i386_optab[] =
   { "vpsrlq", 3, 0x66d3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27612,10 +27602,10 @@ const insn_template i386_optab[] =
   { "vpsrlq", 3, 0x6673, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27628,10 +27618,10 @@ const insn_template i386_optab[] =
   { "vpsrlq", 3, 0x66d3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27644,10 +27634,10 @@ const insn_template i386_optab[] =
   { "vpsrlw", 3, 0x6671, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27660,10 +27650,10 @@ const insn_template i386_optab[] =
   { "vpsrlw", 3, 0x66d1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27676,10 +27666,10 @@ const insn_template i386_optab[] =
   { "vpsrlw", 3, 0x6671, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -27692,10 +27682,10 @@ const insn_template i386_optab[] =
   { "vpsrlw", 3, 0x66d1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27708,10 +27698,10 @@ const insn_template i386_optab[] =
   { "vpsubb", 3, 0x66f8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27724,10 +27714,10 @@ const insn_template i386_optab[] =
   { "vpsubb", 3, 0x66f8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27740,10 +27730,10 @@ const insn_template i386_optab[] =
   { "vpsubd", 3, 0x66fa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27756,10 +27746,10 @@ const insn_template i386_optab[] =
   { "vpsubd", 3, 0x66fa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27772,10 +27762,10 @@ const insn_template i386_optab[] =
   { "vpsubq", 3, 0x66fb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27788,10 +27778,10 @@ const insn_template i386_optab[] =
   { "vpsubq", 3, 0x66fb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27804,10 +27794,10 @@ const insn_template i386_optab[] =
   { "vpsubsb", 3, 0x66e8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27820,10 +27810,10 @@ const insn_template i386_optab[] =
   { "vpsubsb", 3, 0x66e8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27836,10 +27826,10 @@ const insn_template i386_optab[] =
   { "vpsubsw", 3, 0x66e9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27852,10 +27842,10 @@ const insn_template i386_optab[] =
   { "vpsubsw", 3, 0x66e9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27868,10 +27858,10 @@ const insn_template i386_optab[] =
   { "vpsubusb", 3, 0x66d8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27884,10 +27874,10 @@ const insn_template i386_optab[] =
   { "vpsubusb", 3, 0x66d8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27900,10 +27890,10 @@ const insn_template i386_optab[] =
   { "vpsubusw", 3, 0x66d9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27916,10 +27906,10 @@ const insn_template i386_optab[] =
   { "vpsubusw", 3, 0x66d9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27932,10 +27922,10 @@ const insn_template i386_optab[] =
   { "vpsubw", 3, 0x66f9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27948,10 +27938,10 @@ const insn_template i386_optab[] =
   { "vpsubw", 3, 0x66f9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27964,10 +27954,10 @@ const insn_template i386_optab[] =
   { "vptest", 2, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -27977,10 +27967,10 @@ const insn_template i386_optab[] =
   { "vptest", 2, 0x6617, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -27990,10 +27980,10 @@ const insn_template i386_optab[] =
   { "vpunpckhbw", 3, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28006,10 +27996,10 @@ const insn_template i386_optab[] =
   { "vpunpckhbw", 3, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28022,10 +28012,10 @@ const insn_template i386_optab[] =
   { "vpunpckhdq", 3, 0x666a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28038,10 +28028,10 @@ const insn_template i386_optab[] =
   { "vpunpckhdq", 3, 0x666a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28054,10 +28044,10 @@ const insn_template i386_optab[] =
   { "vpunpckhqdq", 3, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28070,10 +28060,10 @@ const insn_template i386_optab[] =
   { "vpunpckhqdq", 3, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28086,10 +28076,10 @@ const insn_template i386_optab[] =
   { "vpunpckhwd", 3, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28102,10 +28092,10 @@ const insn_template i386_optab[] =
   { "vpunpckhwd", 3, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28118,10 +28108,10 @@ const insn_template i386_optab[] =
   { "vpunpcklbw", 3, 0x6660, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28134,10 +28124,10 @@ const insn_template i386_optab[] =
   { "vpunpcklbw", 3, 0x6660, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28150,10 +28140,10 @@ const insn_template i386_optab[] =
   { "vpunpckldq", 3, 0x6662, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28166,10 +28156,10 @@ const insn_template i386_optab[] =
   { "vpunpckldq", 3, 0x6662, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28182,10 +28172,10 @@ const insn_template i386_optab[] =
   { "vpunpcklqdq", 3, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28198,10 +28188,10 @@ const insn_template i386_optab[] =
   { "vpunpcklqdq", 3, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28214,10 +28204,10 @@ const insn_template i386_optab[] =
   { "vpunpcklwd", 3, 0x6661, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28230,10 +28220,10 @@ const insn_template i386_optab[] =
   { "vpunpcklwd", 3, 0x6661, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28246,10 +28236,10 @@ const insn_template i386_optab[] =
   { "vpxor", 3, 0x66ef, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28262,10 +28252,10 @@ const insn_template i386_optab[] =
   { "vpxor", 3, 0x66ef, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28278,10 +28268,10 @@ const insn_template i386_optab[] =
   { "vrcpps", 2, 0x53, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28291,10 +28281,10 @@ const insn_template i386_optab[] =
   { "vrcpps", 2, 0x53, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28304,10 +28294,10 @@ const insn_template i386_optab[] =
   { "vrcpss", 3, 0xf353, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28320,10 +28310,10 @@ const insn_template i386_optab[] =
   { "vroundpd", 3, 0x6609, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28336,10 +28326,10 @@ const insn_template i386_optab[] =
   { "vroundpd", 3, 0x6609, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28352,10 +28342,10 @@ const insn_template i386_optab[] =
   { "vroundps", 3, 0x6608, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28368,10 +28358,10 @@ const insn_template i386_optab[] =
   { "vroundps", 3, 0x6608, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28384,10 +28374,10 @@ const insn_template i386_optab[] =
   { "vroundsd", 4, 0x660b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 3, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28403,10 +28393,10 @@ const insn_template i386_optab[] =
   { "vroundss", 4, 0x660a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28422,10 +28412,10 @@ const insn_template i386_optab[] =
   { "vrsqrtps", 2, 0x52, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28435,10 +28425,10 @@ const insn_template i386_optab[] =
   { "vrsqrtps", 2, 0x52, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28448,10 +28438,10 @@ const insn_template i386_optab[] =
   { "vrsqrtss", 3, 0xf352, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28464,10 +28454,10 @@ const insn_template i386_optab[] =
   { "vshufpd", 4, 0x66c6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28483,10 +28473,10 @@ const insn_template i386_optab[] =
   { "vshufpd", 4, 0x66c6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28502,10 +28492,10 @@ const insn_template i386_optab[] =
   { "vshufps", 4, 0xc6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28521,10 +28511,10 @@ const insn_template i386_optab[] =
   { "vshufps", 4, 0xc6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -28540,10 +28530,10 @@ const insn_template i386_optab[] =
   { "vsqrtpd", 2, 0x6651, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28553,10 +28543,10 @@ const insn_template i386_optab[] =
   { "vsqrtpd", 2, 0x6651, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28566,10 +28556,10 @@ const insn_template i386_optab[] =
   { "vsqrtps", 2, 0x51, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28579,10 +28569,10 @@ const insn_template i386_optab[] =
   { "vsqrtps", 2, 0x51, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28592,10 +28582,10 @@ const insn_template i386_optab[] =
   { "vsqrtsd", 3, 0xf251, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28608,10 +28598,10 @@ const insn_template i386_optab[] =
   { "vsqrtss", 3, 0xf351, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28624,20 +28614,20 @@ const insn_template i386_optab[] =
   { "vstmxcsr", 1, 0xae, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "vsubpd", 3, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28650,10 +28640,10 @@ const insn_template i386_optab[] =
   { "vsubpd", 3, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28666,10 +28656,10 @@ const insn_template i386_optab[] =
   { "vsubps", 3, 0x5c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28682,10 +28672,10 @@ const insn_template i386_optab[] =
   { "vsubps", 3, 0x5c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28698,10 +28688,10 @@ const insn_template i386_optab[] =
   { "vsubsd", 3, 0xf25c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28714,10 +28704,10 @@ const insn_template i386_optab[] =
   { "vsubss", 3, 0xf35c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28730,10 +28720,10 @@ const insn_template i386_optab[] =
   { "vtestpd", 2, 0x660f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28743,10 +28733,10 @@ const insn_template i386_optab[] =
   { "vtestpd", 2, 0x660f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28756,10 +28746,10 @@ const insn_template i386_optab[] =
   { "vtestps", 2, 0x660e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28769,10 +28759,10 @@ const insn_template i386_optab[] =
   { "vtestps", 2, 0x660e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28782,10 +28772,10 @@ const insn_template i386_optab[] =
   { "vucomisd", 2, 0x662e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28795,10 +28785,10 @@ const insn_template i386_optab[] =
   { "vucomiss", 2, 0x2e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -28808,10 +28798,10 @@ const insn_template i386_optab[] =
   { "vunpckhpd", 3, 0x6615, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28824,10 +28814,10 @@ const insn_template i386_optab[] =
   { "vunpckhpd", 3, 0x6615, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28840,10 +28830,10 @@ const insn_template i386_optab[] =
   { "vunpckhps", 3, 0x15, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28856,10 +28846,10 @@ const insn_template i386_optab[] =
   { "vunpckhps", 3, 0x15, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28872,10 +28862,10 @@ const insn_template i386_optab[] =
   { "vunpcklpd", 3, 0x6614, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28888,10 +28878,10 @@ const insn_template i386_optab[] =
   { "vunpcklpd", 3, 0x6614, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28904,10 +28894,10 @@ const insn_template i386_optab[] =
   { "vunpcklps", 3, 0x14, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28920,10 +28910,10 @@ const insn_template i386_optab[] =
   { "vunpcklps", 3, 0x14, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28936,10 +28926,10 @@ const insn_template i386_optab[] =
   { "vxorpd", 3, 0x6657, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28952,10 +28942,10 @@ const insn_template i386_optab[] =
   { "vxorpd", 3, 0x6657, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -28968,10 +28958,10 @@ const insn_template i386_optab[] =
   { "vxorps", 3, 0x57, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -28984,10 +28974,10 @@ const insn_template i386_optab[] =
   { "vxorps", 3, 0x57, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29000,30 +28990,30 @@ const insn_template i386_optab[] =
   { "vzeroall", 0, 0x77, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vzeroupper", 0, 0x77, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vbroadcasti128", 2, 0x665A, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29033,10 +29023,10 @@ const insn_template i386_optab[] =
   { "vpblendd", 4, 0x6602, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29052,10 +29042,10 @@ const insn_template i386_optab[] =
   { "vpblendd", 4, 0x6602, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29071,10 +29061,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastb", 2, 0x6678, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29084,10 +29074,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastb", 2, 0x6678, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29097,10 +29087,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastd", 2, 0x6658, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29110,10 +29100,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastd", 2, 0x6658, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29123,10 +29113,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastq", 2, 0x6659, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29136,10 +29126,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastq", 2, 0x6659, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29149,10 +29139,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastw", 2, 0x6679, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29162,10 +29152,10 @@ const insn_template i386_optab[] =
   { "vpbroadcastw", 2, 0x6679, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -29175,10 +29165,10 @@ const insn_template i386_optab[] =
   { "vperm2i128", 4, 0x6646, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29194,10 +29184,10 @@ const insn_template i386_optab[] =
   { "vpermd", 3, 0x6636, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29210,10 +29200,10 @@ const insn_template i386_optab[] =
   { "vpermpd", 3, 0x6601, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29226,10 +29216,10 @@ const insn_template i386_optab[] =
   { "vpermps", 3, 0x6616, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29242,10 +29232,10 @@ const insn_template i386_optab[] =
   { "vpermq", 3, 0x6600, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29258,10 +29248,10 @@ const insn_template i386_optab[] =
   { "vextracti128", 3, 0x6639, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29274,10 +29264,10 @@ const insn_template i386_optab[] =
   { "vinserti128", 4, 0x6638, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29293,10 +29283,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovd", 3, 0x668e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29309,10 +29299,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovd", 3, 0x668e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29325,10 +29315,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovd", 3, 0x668c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29341,10 +29331,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovd", 3, 0x668c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29357,10 +29347,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovq", 3, 0x668e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29373,10 +29363,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovq", 3, 0x668e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29389,10 +29379,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovq", 3, 0x668c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29405,10 +29395,10 @@ const insn_template i386_optab[] =
   { "vpmaskmovq", 3, 0x668c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29421,10 +29411,10 @@ const insn_template i386_optab[] =
   { "vpsllvd", 3, 0x6647, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29437,10 +29427,10 @@ const insn_template i386_optab[] =
   { "vpsllvd", 3, 0x6647, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29453,10 +29443,10 @@ const insn_template i386_optab[] =
   { "vpsllvq", 3, 0x6647, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29469,10 +29459,10 @@ const insn_template i386_optab[] =
   { "vpsllvq", 3, 0x6647, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29485,10 +29475,10 @@ const insn_template i386_optab[] =
   { "vpsravd", 3, 0x6646, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29501,10 +29491,10 @@ const insn_template i386_optab[] =
   { "vpsravd", 3, 0x6646, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29517,10 +29507,10 @@ const insn_template i386_optab[] =
   { "vpsrlvd", 3, 0x6645, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29533,10 +29523,10 @@ const insn_template i386_optab[] =
   { "vpsrlvd", 3, 0x6645, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29549,10 +29539,10 @@ const insn_template i386_optab[] =
   { "vpsrlvq", 3, 0x6645, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29565,10 +29555,10 @@ const insn_template i386_optab[] =
   { "vpsrlvq", 3, 0x6645, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -29581,10 +29571,10 @@ const insn_template i386_optab[] =
   { "vgatherdpd", 3, 0x6692, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29597,10 +29587,10 @@ const insn_template i386_optab[] =
   { "vgatherdpd", 3, 0x6692, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29613,10 +29603,10 @@ const insn_template i386_optab[] =
   { "vgatherdps", 3, 0x6692, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29629,10 +29619,10 @@ const insn_template i386_optab[] =
   { "vgatherdps", 3, 0x6692, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29645,10 +29635,10 @@ const insn_template i386_optab[] =
   { "vgatherqpd", 3, 0x6693, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29661,10 +29651,10 @@ const insn_template i386_optab[] =
   { "vgatherqpd", 3, 0x6693, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29677,10 +29667,10 @@ const insn_template i386_optab[] =
   { "vgatherqps", 3, 0x6693, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29693,10 +29683,10 @@ const insn_template i386_optab[] =
   { "vgatherqps", 3, 0x6693, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29709,10 +29699,10 @@ const insn_template i386_optab[] =
   { "vpgatherdd", 3, 0x6690, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29725,10 +29715,10 @@ const insn_template i386_optab[] =
   { "vpgatherdd", 3, 0x6690, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29741,10 +29731,10 @@ const insn_template i386_optab[] =
   { "vpgatherdq", 3, 0x6690, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29757,10 +29747,10 @@ const insn_template i386_optab[] =
   { "vpgatherdq", 3, 0x6690, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29773,10 +29763,10 @@ const insn_template i386_optab[] =
   { "vpgatherqd", 3, 0x6691, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29789,10 +29779,10 @@ const insn_template i386_optab[] =
   { "vpgatherqd", 3, 0x6691, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29805,10 +29795,10 @@ const insn_template i386_optab[] =
   { "vpgatherqq", 3, 0x6691, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29821,10 +29811,10 @@ const insn_template i386_optab[] =
   { "vpgatherqq", 3, 0x6691, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29837,10 +29827,10 @@ const insn_template i386_optab[] =
   { "vaesdec", 3, 0x66de, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29853,10 +29843,10 @@ const insn_template i386_optab[] =
   { "vaesdeclast", 3, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29869,10 +29859,10 @@ const insn_template i386_optab[] =
   { "vaesenc", 3, 0x66dc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29885,10 +29875,10 @@ const insn_template i386_optab[] =
   { "vaesenclast", 3, 0x66dd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29901,10 +29891,10 @@ const insn_template i386_optab[] =
   { "vaesimc", 2, 0x66db, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29914,10 +29904,10 @@ const insn_template i386_optab[] =
   { "vaeskeygenassist", 3, 0x66df, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29930,10 +29920,10 @@ const insn_template i386_optab[] =
   { "vpclmulqdq", 4, 0x6644, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -29949,10 +29939,10 @@ const insn_template i386_optab[] =
   { "vpclmullqlqdq", 3, 0x6644, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29965,10 +29955,10 @@ const insn_template i386_optab[] =
   { "vpclmulhqlqdq", 3, 0x6644, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29981,10 +29971,10 @@ const insn_template i386_optab[] =
   { "vpclmullqhqdq", 3, 0x6644, 0x10, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -29997,10 +29987,10 @@ const insn_template i386_optab[] =
   { "vpclmulhqhqdq", 3, 0x6644, 0x11, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30013,60 +30003,60 @@ const insn_template i386_optab[] =
   { "rdfsbase", 1, 0xf30fae, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rdgsbase", 1, 0xf30fae, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rdrand", 1, 0xfc7, 0x6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "wrfsbase", 1, 0xf30fae, 0x2, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "wrgsbase", 1, 0xf30fae, 0x3, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vcvtph2ps", 2, 0x6613, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30076,10 +30066,10 @@ const insn_template i386_optab[] =
   { "vcvtph2ps", 2, 0x6613, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30089,10 +30079,10 @@ const insn_template i386_optab[] =
   { "vcvtps2ph", 3, 0x661d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -30105,10 +30095,10 @@ const insn_template i386_optab[] =
   { "vcvtps2ph", 3, 0x661d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -30121,10 +30111,10 @@ const insn_template i386_optab[] =
   { "vfmadd132pd", 3, 0x6698, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30137,10 +30127,10 @@ const insn_template i386_optab[] =
   { "vfmadd132pd", 3, 0x6698, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30153,10 +30143,10 @@ const insn_template i386_optab[] =
   { "vfmadd132ps", 3, 0x6698, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30169,10 +30159,10 @@ const insn_template i386_optab[] =
   { "vfmadd132ps", 3, 0x6698, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30185,10 +30175,10 @@ const insn_template i386_optab[] =
   { "vfmadd213pd", 3, 0x66a8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30201,10 +30191,10 @@ const insn_template i386_optab[] =
   { "vfmadd213pd", 3, 0x66a8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30217,10 +30207,10 @@ const insn_template i386_optab[] =
   { "vfmadd213ps", 3, 0x66a8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30233,10 +30223,10 @@ const insn_template i386_optab[] =
   { "vfmadd213ps", 3, 0x66a8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30249,10 +30239,10 @@ const insn_template i386_optab[] =
   { "vfmadd231pd", 3, 0x66b8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30265,10 +30255,10 @@ const insn_template i386_optab[] =
   { "vfmadd231pd", 3, 0x66b8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30281,10 +30271,10 @@ const insn_template i386_optab[] =
   { "vfmadd231ps", 3, 0x66b8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30297,10 +30287,10 @@ const insn_template i386_optab[] =
   { "vfmadd231ps", 3, 0x66b8, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30313,10 +30303,10 @@ const insn_template i386_optab[] =
   { "vfmadd132sd", 3, 0x6699, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30329,10 +30319,10 @@ const insn_template i386_optab[] =
   { "vfmadd132ss", 3, 0x6699, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30345,10 +30335,10 @@ const insn_template i386_optab[] =
   { "vfmadd213sd", 3, 0x66a9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30361,10 +30351,10 @@ const insn_template i386_optab[] =
   { "vfmadd213ss", 3, 0x66a9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30377,10 +30367,10 @@ const insn_template i386_optab[] =
   { "vfmadd231sd", 3, 0x66b9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30393,10 +30383,10 @@ const insn_template i386_optab[] =
   { "vfmadd231ss", 3, 0x66b9, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -30409,10 +30399,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub132pd", 3, 0x6696, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30425,10 +30415,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub132pd", 3, 0x6696, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30441,10 +30431,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub132ps", 3, 0x6696, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30457,10 +30447,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub132ps", 3, 0x6696, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30473,10 +30463,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub213pd", 3, 0x66a6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30489,10 +30479,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub213pd", 3, 0x66a6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30505,10 +30495,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub213ps", 3, 0x66a6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30521,10 +30511,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub213ps", 3, 0x66a6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30537,10 +30527,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub231pd", 3, 0x66b6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30553,10 +30543,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub231pd", 3, 0x66b6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30569,10 +30559,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub231ps", 3, 0x66b6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30585,10 +30575,10 @@ const insn_template i386_optab[] =
   { "vfmaddsub231ps", 3, 0x66b6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30601,10 +30591,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd132pd", 3, 0x6697, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30617,10 +30607,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd132pd", 3, 0x6697, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30633,10 +30623,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd132ps", 3, 0x6697, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30649,10 +30639,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd132ps", 3, 0x6697, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30665,10 +30655,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd213pd", 3, 0x66a7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30681,10 +30671,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd213pd", 3, 0x66a7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30697,10 +30687,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd213ps", 3, 0x66a7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30713,10 +30703,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd213ps", 3, 0x66a7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30729,10 +30719,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd231pd", 3, 0x66b7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30745,10 +30735,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd231pd", 3, 0x66b7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30761,10 +30751,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd231ps", 3, 0x66b7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30777,10 +30767,10 @@ const insn_template i386_optab[] =
   { "vfmsubadd231ps", 3, 0x66b7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30793,10 +30783,10 @@ const insn_template i386_optab[] =
   { "vfmsub132pd", 3, 0x669a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30809,10 +30799,10 @@ const insn_template i386_optab[] =
   { "vfmsub132pd", 3, 0x669a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30825,10 +30815,10 @@ const insn_template i386_optab[] =
   { "vfmsub132ps", 3, 0x669a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30841,10 +30831,10 @@ const insn_template i386_optab[] =
   { "vfmsub132ps", 3, 0x669a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30857,10 +30847,10 @@ const insn_template i386_optab[] =
   { "vfmsub213pd", 3, 0x66aa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30873,10 +30863,10 @@ const insn_template i386_optab[] =
   { "vfmsub213pd", 3, 0x66aa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30889,10 +30879,10 @@ const insn_template i386_optab[] =
   { "vfmsub213ps", 3, 0x66aa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30905,10 +30895,10 @@ const insn_template i386_optab[] =
   { "vfmsub213ps", 3, 0x66aa, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30921,10 +30911,10 @@ const insn_template i386_optab[] =
   { "vfmsub231pd", 3, 0x66ba, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30937,10 +30927,10 @@ const insn_template i386_optab[] =
   { "vfmsub231pd", 3, 0x66ba, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30953,10 +30943,10 @@ const insn_template i386_optab[] =
   { "vfmsub231ps", 3, 0x66ba, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -30969,10 +30959,10 @@ const insn_template i386_optab[] =
   { "vfmsub231ps", 3, 0x66ba, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -30985,10 +30975,10 @@ const insn_template i386_optab[] =
   { "vfmsub132sd", 3, 0x669b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31001,10 +30991,10 @@ const insn_template i386_optab[] =
   { "vfmsub132ss", 3, 0x669b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31017,10 +31007,10 @@ const insn_template i386_optab[] =
   { "vfmsub213sd", 3, 0x66ab, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31033,10 +31023,10 @@ const insn_template i386_optab[] =
   { "vfmsub213ss", 3, 0x66ab, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31049,10 +31039,10 @@ const insn_template i386_optab[] =
   { "vfmsub231sd", 3, 0x66bb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31065,10 +31055,10 @@ const insn_template i386_optab[] =
   { "vfmsub231ss", 3, 0x66bb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31081,10 +31071,10 @@ const insn_template i386_optab[] =
   { "vfnmadd132pd", 3, 0x669c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31097,10 +31087,10 @@ const insn_template i386_optab[] =
   { "vfnmadd132pd", 3, 0x669c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31113,10 +31103,10 @@ const insn_template i386_optab[] =
   { "vfnmadd132ps", 3, 0x669c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31129,10 +31119,10 @@ const insn_template i386_optab[] =
   { "vfnmadd132ps", 3, 0x669c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31145,10 +31135,10 @@ const insn_template i386_optab[] =
   { "vfnmadd213pd", 3, 0x66ac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31161,10 +31151,10 @@ const insn_template i386_optab[] =
   { "vfnmadd213pd", 3, 0x66ac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31177,10 +31167,10 @@ const insn_template i386_optab[] =
   { "vfnmadd213ps", 3, 0x66ac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31193,10 +31183,10 @@ const insn_template i386_optab[] =
   { "vfnmadd213ps", 3, 0x66ac, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31209,10 +31199,10 @@ const insn_template i386_optab[] =
   { "vfnmadd231pd", 3, 0x66bc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31225,10 +31215,10 @@ const insn_template i386_optab[] =
   { "vfnmadd231pd", 3, 0x66bc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31241,10 +31231,10 @@ const insn_template i386_optab[] =
   { "vfnmadd231ps", 3, 0x66bc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31257,10 +31247,10 @@ const insn_template i386_optab[] =
   { "vfnmadd231ps", 3, 0x66bc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31273,10 +31263,10 @@ const insn_template i386_optab[] =
   { "vfnmadd132sd", 3, 0x669d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31289,10 +31279,10 @@ const insn_template i386_optab[] =
   { "vfnmadd132ss", 3, 0x669d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31305,10 +31295,10 @@ const insn_template i386_optab[] =
   { "vfnmadd213sd", 3, 0x66ad, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31321,10 +31311,10 @@ const insn_template i386_optab[] =
   { "vfnmadd213ss", 3, 0x66ad, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31337,10 +31327,10 @@ const insn_template i386_optab[] =
   { "vfnmadd231sd", 3, 0x66bd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31353,10 +31343,10 @@ const insn_template i386_optab[] =
   { "vfnmadd231ss", 3, 0x66bd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31369,10 +31359,10 @@ const insn_template i386_optab[] =
   { "vfnmsub132pd", 3, 0x669e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31385,10 +31375,10 @@ const insn_template i386_optab[] =
   { "vfnmsub132pd", 3, 0x669e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31401,10 +31391,10 @@ const insn_template i386_optab[] =
   { "vfnmsub132ps", 3, 0x669e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31417,10 +31407,10 @@ const insn_template i386_optab[] =
   { "vfnmsub132ps", 3, 0x669e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31433,10 +31423,10 @@ const insn_template i386_optab[] =
   { "vfnmsub213pd", 3, 0x66ae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31449,10 +31439,10 @@ const insn_template i386_optab[] =
   { "vfnmsub213pd", 3, 0x66ae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31465,10 +31455,10 @@ const insn_template i386_optab[] =
   { "vfnmsub213ps", 3, 0x66ae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31481,10 +31471,10 @@ const insn_template i386_optab[] =
   { "vfnmsub213ps", 3, 0x66ae, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31497,10 +31487,10 @@ const insn_template i386_optab[] =
   { "vfnmsub231pd", 3, 0x66be, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31513,10 +31503,10 @@ const insn_template i386_optab[] =
   { "vfnmsub231pd", 3, 0x66be, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31529,10 +31519,10 @@ const insn_template i386_optab[] =
   { "vfnmsub231ps", 3, 0x66be, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31545,10 +31535,10 @@ const insn_template i386_optab[] =
   { "vfnmsub231ps", 3, 0x66be, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31561,10 +31551,10 @@ const insn_template i386_optab[] =
   { "vfnmsub132sd", 3, 0x669f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31577,10 +31567,10 @@ const insn_template i386_optab[] =
   { "vfnmsub132ss", 3, 0x669f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31593,10 +31583,10 @@ const insn_template i386_optab[] =
   { "vfnmsub213sd", 3, 0x66af, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31609,10 +31599,10 @@ const insn_template i386_optab[] =
   { "vfnmsub213ss", 3, 0x66af, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31625,10 +31615,10 @@ const insn_template i386_optab[] =
   { "vfnmsub231sd", 3, 0x66bf, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31641,10 +31631,10 @@ const insn_template i386_optab[] =
   { "vfnmsub231ss", 3, 0x66bf, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31654,73 +31644,13 @@ const insn_template i386_optab[] =
       { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
-  { "xacquire", 0, 0xf2, None, 1,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
-  { "xrelease", 0, 0xf3, None, 1,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
-  { "xabort", 1, 0xc6f8, None, 2,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
-  { "xbegin", 1, 0xc7f8, None, 2,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
-  { "xend", 0, 0xf01d5, None, 3,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
-  { "xtest", 0, 0xf01d6, None, 3,
-    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0 } },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	  0, 0, 0, 0, 0, 0 } } } },
   { "bzhi", 3, 0xf5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31733,10 +31663,10 @@ const insn_template i386_optab[] =
   { "mulx", 3, 0xf2f6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31749,10 +31679,10 @@ const insn_template i386_optab[] =
   { "pdep", 3, 0xf2f5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31765,10 +31695,10 @@ const insn_template i386_optab[] =
   { "pext", 3, 0xf3f5, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -31781,10 +31711,10 @@ const insn_template i386_optab[] =
   { "rorx", 3, 0xf2f0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31797,10 +31727,10 @@ const insn_template i386_optab[] =
   { "sarx", 3, 0xf3f7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31813,10 +31743,10 @@ const insn_template i386_optab[] =
   { "shlx", 3, 0x66f7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31829,10 +31759,10 @@ const insn_template i386_optab[] =
   { "shrx", 3, 0xf2f7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31845,10 +31775,10 @@ const insn_template i386_optab[] =
   { "vfmaddpd", 4, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31864,10 +31794,10 @@ const insn_template i386_optab[] =
   { "vfmaddpd", 4, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31883,10 +31813,10 @@ const insn_template i386_optab[] =
   { "vfmaddpd", 4, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31902,10 +31832,10 @@ const insn_template i386_optab[] =
   { "vfmaddpd", 4, 0x6669, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31921,10 +31851,10 @@ const insn_template i386_optab[] =
   { "vfmaddps", 4, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -31940,10 +31870,10 @@ const insn_template i386_optab[] =
   { "vfmaddps", 4, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31959,10 +31889,10 @@ const insn_template i386_optab[] =
   { "vfmaddps", 4, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -31978,10 +31908,10 @@ const insn_template i386_optab[] =
   { "vfmaddps", 4, 0x6668, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -31997,10 +31927,10 @@ const insn_template i386_optab[] =
   { "vfmaddsd", 4, 0x666b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -32016,10 +31946,10 @@ const insn_template i386_optab[] =
   { "vfmaddsd", 4, 0x666b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32035,10 +31965,10 @@ const insn_template i386_optab[] =
   { "vfmaddss", 4, 0x666a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -32054,10 +31984,10 @@ const insn_template i386_optab[] =
   { "vfmaddss", 4, 0x666a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32073,10 +32003,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubpd", 4, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32092,10 +32022,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubpd", 4, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32111,10 +32041,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubpd", 4, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32130,10 +32060,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubpd", 4, 0x665d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32149,10 +32079,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubps", 4, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32168,10 +32098,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubps", 4, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32187,10 +32117,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubps", 4, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32206,10 +32136,10 @@ const insn_template i386_optab[] =
   { "vfmaddsubps", 4, 0x665c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32225,10 +32155,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddpd", 4, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32244,10 +32174,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddpd", 4, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32263,10 +32193,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddpd", 4, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32282,10 +32212,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddpd", 4, 0x665f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32301,10 +32231,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddps", 4, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32320,10 +32250,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddps", 4, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32339,10 +32269,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddps", 4, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32358,10 +32288,10 @@ const insn_template i386_optab[] =
   { "vfmsubaddps", 4, 0x665e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32377,10 +32307,10 @@ const insn_template i386_optab[] =
   { "vfmsubpd", 4, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32396,10 +32326,10 @@ const insn_template i386_optab[] =
   { "vfmsubpd", 4, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32415,10 +32345,10 @@ const insn_template i386_optab[] =
   { "vfmsubpd", 4, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32434,10 +32364,10 @@ const insn_template i386_optab[] =
   { "vfmsubpd", 4, 0x666d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32453,10 +32383,10 @@ const insn_template i386_optab[] =
   { "vfmsubps", 4, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32472,10 +32402,10 @@ const insn_template i386_optab[] =
   { "vfmsubps", 4, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32491,10 +32421,10 @@ const insn_template i386_optab[] =
   { "vfmsubps", 4, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32510,10 +32440,10 @@ const insn_template i386_optab[] =
   { "vfmsubps", 4, 0x666c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32529,10 +32459,10 @@ const insn_template i386_optab[] =
   { "vfmsubsd", 4, 0x666f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -32548,10 +32478,10 @@ const insn_template i386_optab[] =
   { "vfmsubsd", 4, 0x666f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32567,10 +32497,10 @@ const insn_template i386_optab[] =
   { "vfmsubss", 4, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -32586,10 +32516,10 @@ const insn_template i386_optab[] =
   { "vfmsubss", 4, 0x666e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32605,10 +32535,10 @@ const insn_template i386_optab[] =
   { "vfnmaddpd", 4, 0x6679, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32624,10 +32554,10 @@ const insn_template i386_optab[] =
   { "vfnmaddpd", 4, 0x6679, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32643,10 +32573,10 @@ const insn_template i386_optab[] =
   { "vfnmaddpd", 4, 0x6679, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32662,10 +32592,10 @@ const insn_template i386_optab[] =
   { "vfnmaddpd", 4, 0x6679, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32681,10 +32611,10 @@ const insn_template i386_optab[] =
   { "vfnmaddps", 4, 0x6678, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32700,10 +32630,10 @@ const insn_template i386_optab[] =
   { "vfnmaddps", 4, 0x6678, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32719,10 +32649,10 @@ const insn_template i386_optab[] =
   { "vfnmaddps", 4, 0x6678, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32738,10 +32668,10 @@ const insn_template i386_optab[] =
   { "vfnmaddps", 4, 0x6678, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32757,10 +32687,10 @@ const insn_template i386_optab[] =
   { "vfnmaddsd", 4, 0x667b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -32776,10 +32706,10 @@ const insn_template i386_optab[] =
   { "vfnmaddsd", 4, 0x667b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32795,10 +32725,10 @@ const insn_template i386_optab[] =
   { "vfnmaddss", 4, 0x667a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -32814,10 +32744,10 @@ const insn_template i386_optab[] =
   { "vfnmaddss", 4, 0x667a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32833,10 +32763,10 @@ const insn_template i386_optab[] =
   { "vfnmsubpd", 4, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32852,10 +32782,10 @@ const insn_template i386_optab[] =
   { "vfnmsubpd", 4, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32871,10 +32801,10 @@ const insn_template i386_optab[] =
   { "vfnmsubpd", 4, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32890,10 +32820,10 @@ const insn_template i386_optab[] =
   { "vfnmsubpd", 4, 0x667d, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32909,10 +32839,10 @@ const insn_template i386_optab[] =
   { "vfnmsubps", 4, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -32928,10 +32858,10 @@ const insn_template i386_optab[] =
   { "vfnmsubps", 4, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32947,10 +32877,10 @@ const insn_template i386_optab[] =
   { "vfnmsubps", 4, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -32966,10 +32896,10 @@ const insn_template i386_optab[] =
   { "vfnmsubps", 4, 0x667c, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -32985,10 +32915,10 @@ const insn_template i386_optab[] =
   { "vfnmsubsd", 4, 0x667f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -33004,10 +32934,10 @@ const insn_template i386_optab[] =
   { "vfnmsubsd", 4, 0x667f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33023,10 +32953,10 @@ const insn_template i386_optab[] =
   { "vfnmsubss", 4, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -33042,10 +32972,10 @@ const insn_template i386_optab[] =
   { "vfnmsubss", 4, 0x667e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33061,10 +32991,10 @@ const insn_template i386_optab[] =
   { "vfrczpd", 2, 0x81, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33074,10 +33004,10 @@ const insn_template i386_optab[] =
   { "vfrczpd", 2, 0x81, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -33087,10 +33017,10 @@ const insn_template i386_optab[] =
   { "vfrczps", 2, 0x80, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33100,10 +33030,10 @@ const insn_template i386_optab[] =
   { "vfrczps", 2, 0x80, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -33113,10 +33043,10 @@ const insn_template i386_optab[] =
   { "vfrczsd", 2, 0x83, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -33126,10 +33056,10 @@ const insn_template i386_optab[] =
   { "vfrczss", 2, 0x82, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -33139,10 +33069,10 @@ const insn_template i386_optab[] =
   { "vpcmov", 4, 0xa2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33158,10 +33088,10 @@ const insn_template i386_optab[] =
   { "vpcmov", 4, 0xa2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33177,10 +33107,10 @@ const insn_template i386_optab[] =
   { "vpcmov", 4, 0xa2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33196,10 +33126,10 @@ const insn_template i386_optab[] =
   { "vpcmov", 4, 0xa2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 1, 1, 0, 0, 0 } },
@@ -33215,10 +33145,10 @@ const insn_template i386_optab[] =
   { "vpcomb", 4, 0xcc, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33234,10 +33164,10 @@ const insn_template i386_optab[] =
   { "vpcomd", 4, 0xce, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33253,10 +33183,10 @@ const insn_template i386_optab[] =
   { "vpcomq", 4, 0xcf, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33272,10 +33202,10 @@ const insn_template i386_optab[] =
   { "vpcomub", 4, 0xec, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33291,10 +33221,10 @@ const insn_template i386_optab[] =
   { "vpcomud", 4, 0xee, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33310,10 +33240,10 @@ const insn_template i386_optab[] =
   { "vpcomuq", 4, 0xef, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33329,10 +33259,10 @@ const insn_template i386_optab[] =
   { "vpcomuw", 4, 0xed, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33348,10 +33278,10 @@ const insn_template i386_optab[] =
   { "vpcomw", 4, 0xcd, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -33367,10 +33297,10 @@ const insn_template i386_optab[] =
   { "vpermil2pd", 5, 0x6649, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33389,10 +33319,10 @@ const insn_template i386_optab[] =
   { "vpermil2pd", 5, 0x6649, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33411,10 +33341,10 @@ const insn_template i386_optab[] =
   { "vpermil2pd", 5, 0x6649, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33433,10 +33363,10 @@ const insn_template i386_optab[] =
   { "vpermil2pd", 5, 0x6649, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33455,10 +33385,10 @@ const insn_template i386_optab[] =
   { "vpermil2ps", 5, 0x6648, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33477,10 +33407,10 @@ const insn_template i386_optab[] =
   { "vpermil2ps", 5, 0x6648, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33499,10 +33429,10 @@ const insn_template i386_optab[] =
   { "vpermil2ps", 5, 0x6648, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33521,10 +33451,10 @@ const insn_template i386_optab[] =
   { "vpermil2ps", 5, 0x6648, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 
-      1, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 
+      2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 1, 0 } },
@@ -33543,10 +33473,10 @@ const insn_template i386_optab[] =
   { "vpcomltb", 3, 0xcc, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33559,10 +33489,10 @@ const insn_template i386_optab[] =
   { "vpcomltd", 3, 0xce, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33575,10 +33505,10 @@ const insn_template i386_optab[] =
   { "vpcomltq", 3, 0xcf, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33591,10 +33521,10 @@ const insn_template i386_optab[] =
   { "vpcomltub", 3, 0xec, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33607,10 +33537,10 @@ const insn_template i386_optab[] =
   { "vpcomltud", 3, 0xee, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33623,10 +33553,10 @@ const insn_template i386_optab[] =
   { "vpcomltuq", 3, 0xef, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33639,10 +33569,10 @@ const insn_template i386_optab[] =
   { "vpcomltuw", 3, 0xed, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33655,10 +33585,10 @@ const insn_template i386_optab[] =
   { "vpcomltw", 3, 0xcd, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33671,10 +33601,10 @@ const insn_template i386_optab[] =
   { "vpcomleb", 3, 0xcc, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33687,10 +33617,10 @@ const insn_template i386_optab[] =
   { "vpcomled", 3, 0xce, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33703,10 +33633,10 @@ const insn_template i386_optab[] =
   { "vpcomleq", 3, 0xcf, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33719,10 +33649,10 @@ const insn_template i386_optab[] =
   { "vpcomleub", 3, 0xec, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33735,10 +33665,10 @@ const insn_template i386_optab[] =
   { "vpcomleud", 3, 0xee, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33751,10 +33681,10 @@ const insn_template i386_optab[] =
   { "vpcomleuq", 3, 0xef, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33767,10 +33697,10 @@ const insn_template i386_optab[] =
   { "vpcomleuw", 3, 0xed, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33783,10 +33713,10 @@ const insn_template i386_optab[] =
   { "vpcomlew", 3, 0xcd, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33799,10 +33729,10 @@ const insn_template i386_optab[] =
   { "vpcomgtb", 3, 0xcc, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33815,10 +33745,10 @@ const insn_template i386_optab[] =
   { "vpcomgtd", 3, 0xce, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33831,10 +33761,10 @@ const insn_template i386_optab[] =
   { "vpcomgtq", 3, 0xcf, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33847,10 +33777,10 @@ const insn_template i386_optab[] =
   { "vpcomgtub", 3, 0xec, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33863,10 +33793,10 @@ const insn_template i386_optab[] =
   { "vpcomgtud", 3, 0xee, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33879,10 +33809,10 @@ const insn_template i386_optab[] =
   { "vpcomgtuq", 3, 0xef, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33895,10 +33825,10 @@ const insn_template i386_optab[] =
   { "vpcomgtuw", 3, 0xed, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33911,10 +33841,10 @@ const insn_template i386_optab[] =
   { "vpcomgtw", 3, 0xcd, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33927,10 +33857,10 @@ const insn_template i386_optab[] =
   { "vpcomgeb", 3, 0xcc, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33943,10 +33873,10 @@ const insn_template i386_optab[] =
   { "vpcomged", 3, 0xce, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33959,10 +33889,10 @@ const insn_template i386_optab[] =
   { "vpcomgeq", 3, 0xcf, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33975,10 +33905,10 @@ const insn_template i386_optab[] =
   { "vpcomgeub", 3, 0xec, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -33991,10 +33921,10 @@ const insn_template i386_optab[] =
   { "vpcomgeud", 3, 0xee, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34007,10 +33937,10 @@ const insn_template i386_optab[] =
   { "vpcomgeuq", 3, 0xef, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34023,10 +33953,10 @@ const insn_template i386_optab[] =
   { "vpcomgeuw", 3, 0xed, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34039,10 +33969,10 @@ const insn_template i386_optab[] =
   { "vpcomgew", 3, 0xcd, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34055,10 +33985,10 @@ const insn_template i386_optab[] =
   { "vpcomeqb", 3, 0xcc, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34071,10 +34001,10 @@ const insn_template i386_optab[] =
   { "vpcomeqd", 3, 0xce, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34087,10 +34017,10 @@ const insn_template i386_optab[] =
   { "vpcomeqq", 3, 0xcf, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34103,10 +34033,10 @@ const insn_template i386_optab[] =
   { "vpcomequb", 3, 0xec, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34119,10 +34049,10 @@ const insn_template i386_optab[] =
   { "vpcomequd", 3, 0xee, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34135,10 +34065,10 @@ const insn_template i386_optab[] =
   { "vpcomequq", 3, 0xef, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34151,10 +34081,10 @@ const insn_template i386_optab[] =
   { "vpcomequw", 3, 0xed, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34167,10 +34097,10 @@ const insn_template i386_optab[] =
   { "vpcomeqw", 3, 0xcd, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34183,10 +34113,10 @@ const insn_template i386_optab[] =
   { "vpcomneqb", 3, 0xcc, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34199,10 +34129,10 @@ const insn_template i386_optab[] =
   { "vpcomneqd", 3, 0xce, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34215,10 +34145,10 @@ const insn_template i386_optab[] =
   { "vpcomneqq", 3, 0xcf, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34231,10 +34161,10 @@ const insn_template i386_optab[] =
   { "vpcomnequb", 3, 0xec, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34247,10 +34177,10 @@ const insn_template i386_optab[] =
   { "vpcomnequd", 3, 0xee, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34263,10 +34193,10 @@ const insn_template i386_optab[] =
   { "vpcomnequq", 3, 0xef, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34279,10 +34209,10 @@ const insn_template i386_optab[] =
   { "vpcomnequw", 3, 0xed, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34295,10 +34225,10 @@ const insn_template i386_optab[] =
   { "vpcomneqw", 3, 0xcd, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34311,10 +34241,10 @@ const insn_template i386_optab[] =
   { "vpcomfalseb", 3, 0xcc, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34327,10 +34257,10 @@ const insn_template i386_optab[] =
   { "vpcomfalsed", 3, 0xce, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34343,10 +34273,10 @@ const insn_template i386_optab[] =
   { "vpcomfalseq", 3, 0xcf, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34359,10 +34289,10 @@ const insn_template i386_optab[] =
   { "vpcomfalseub", 3, 0xec, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34375,10 +34305,10 @@ const insn_template i386_optab[] =
   { "vpcomfalseud", 3, 0xee, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34391,10 +34321,10 @@ const insn_template i386_optab[] =
   { "vpcomfalseuq", 3, 0xef, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34407,10 +34337,10 @@ const insn_template i386_optab[] =
   { "vpcomfalseuw", 3, 0xed, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34423,10 +34353,10 @@ const insn_template i386_optab[] =
   { "vpcomfalsew", 3, 0xcd, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34439,10 +34369,10 @@ const insn_template i386_optab[] =
   { "vpcomtrueb", 3, 0xcc, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34455,10 +34385,10 @@ const insn_template i386_optab[] =
   { "vpcomtrued", 3, 0xce, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34471,10 +34401,10 @@ const insn_template i386_optab[] =
   { "vpcomtrueq", 3, 0xcf, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34487,10 +34417,10 @@ const insn_template i386_optab[] =
   { "vpcomtrueub", 3, 0xec, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34503,10 +34433,10 @@ const insn_template i386_optab[] =
   { "vpcomtrueud", 3, 0xee, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34519,10 +34449,10 @@ const insn_template i386_optab[] =
   { "vpcomtrueuq", 3, 0xef, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34535,10 +34465,10 @@ const insn_template i386_optab[] =
   { "vpcomtrueuw", 3, 0xed, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34551,10 +34481,10 @@ const insn_template i386_optab[] =
   { "vpcomtruew", 3, 0xcd, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 
-      1, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 
+      1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34567,10 +34497,10 @@ const insn_template i386_optab[] =
   { "vphaddbd", 2, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34580,10 +34510,10 @@ const insn_template i386_optab[] =
   { "vphaddbq", 2, 0xc3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34593,10 +34523,10 @@ const insn_template i386_optab[] =
   { "vphaddbw", 2, 0xc1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34606,10 +34536,10 @@ const insn_template i386_optab[] =
   { "vphadddq", 2, 0xcb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34619,10 +34549,10 @@ const insn_template i386_optab[] =
   { "vphaddubd", 2, 0xd2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34632,10 +34562,10 @@ const insn_template i386_optab[] =
   { "vphaddubq", 2, 0xd3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34645,10 +34575,10 @@ const insn_template i386_optab[] =
   { "vphaddubw", 2, 0xd1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34658,10 +34588,10 @@ const insn_template i386_optab[] =
   { "vphaddudq", 2, 0xdb, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34671,10 +34601,10 @@ const insn_template i386_optab[] =
   { "vphadduwd", 2, 0xd6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34684,10 +34614,10 @@ const insn_template i386_optab[] =
   { "vphadduwq", 2, 0xd7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34697,10 +34627,10 @@ const insn_template i386_optab[] =
   { "vphaddwd", 2, 0xc6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34710,10 +34640,10 @@ const insn_template i386_optab[] =
   { "vphaddwq", 2, 0xc7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34723,10 +34653,10 @@ const insn_template i386_optab[] =
   { "vphsubbw", 2, 0xe1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34736,10 +34666,10 @@ const insn_template i386_optab[] =
   { "vphsubdq", 2, 0xe3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34749,10 +34679,10 @@ const insn_template i386_optab[] =
   { "vphsubwd", 2, 0xe2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -34762,10 +34692,10 @@ const insn_template i386_optab[] =
   { "vpmacsdd", 4, 0x9e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34781,10 +34711,10 @@ const insn_template i386_optab[] =
   { "vpmacsdqh", 4, 0x9f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34800,10 +34730,10 @@ const insn_template i386_optab[] =
   { "vpmacsdql", 4, 0x97, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34819,10 +34749,10 @@ const insn_template i386_optab[] =
   { "vpmacssdd", 4, 0x8e, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34838,10 +34768,10 @@ const insn_template i386_optab[] =
   { "vpmacssdqh", 4, 0x8f, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34857,10 +34787,10 @@ const insn_template i386_optab[] =
   { "vpmacssdql", 4, 0x87, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34876,10 +34806,10 @@ const insn_template i386_optab[] =
   { "vpmacsswd", 4, 0x86, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34895,10 +34825,10 @@ const insn_template i386_optab[] =
   { "vpmacssww", 4, 0x85, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34914,10 +34844,10 @@ const insn_template i386_optab[] =
   { "vpmacswd", 4, 0x96, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34933,10 +34863,10 @@ const insn_template i386_optab[] =
   { "vpmacsww", 4, 0x95, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34952,10 +34882,10 @@ const insn_template i386_optab[] =
   { "vpmadcsswd", 4, 0xa6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34971,10 +34901,10 @@ const insn_template i386_optab[] =
   { "vpmadcswd", 4, 0xb6, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -34990,10 +34920,10 @@ const insn_template i386_optab[] =
   { "vpperm", 4, 0xa3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35009,10 +34939,10 @@ const insn_template i386_optab[] =
   { "vpperm", 4, 0xa3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      1, 2, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
+      2, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35028,10 +34958,10 @@ const insn_template i386_optab[] =
   { "vprotb", 3, 0x90, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35044,10 +34974,10 @@ const insn_template i386_optab[] =
   { "vprotb", 3, 0x90, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35060,10 +34990,10 @@ const insn_template i386_optab[] =
   { "vprotb", 3, 0xc0, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35076,10 +35006,10 @@ const insn_template i386_optab[] =
   { "vprotd", 3, 0x92, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35092,10 +35022,10 @@ const insn_template i386_optab[] =
   { "vprotd", 3, 0x92, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35108,10 +35038,10 @@ const insn_template i386_optab[] =
   { "vprotd", 3, 0xc2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35124,10 +35054,10 @@ const insn_template i386_optab[] =
   { "vprotq", 3, 0x93, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35140,10 +35070,10 @@ const insn_template i386_optab[] =
   { "vprotq", 3, 0x93, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35156,10 +35086,10 @@ const insn_template i386_optab[] =
   { "vprotq", 3, 0xc3, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35172,10 +35102,10 @@ const insn_template i386_optab[] =
   { "vprotw", 3, 0x91, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35188,10 +35118,10 @@ const insn_template i386_optab[] =
   { "vprotw", 3, 0x91, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35204,10 +35134,10 @@ const insn_template i386_optab[] =
   { "vprotw", 3, 0xc1, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35220,10 +35150,10 @@ const insn_template i386_optab[] =
   { "vpshab", 3, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35236,10 +35166,10 @@ const insn_template i386_optab[] =
   { "vpshab", 3, 0x98, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35252,10 +35182,10 @@ const insn_template i386_optab[] =
   { "vpshad", 3, 0x9a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35268,10 +35198,10 @@ const insn_template i386_optab[] =
   { "vpshad", 3, 0x9a, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35284,10 +35214,10 @@ const insn_template i386_optab[] =
   { "vpshaq", 3, 0x9b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35300,10 +35230,10 @@ const insn_template i386_optab[] =
   { "vpshaq", 3, 0x9b, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35316,10 +35246,10 @@ const insn_template i386_optab[] =
   { "vpshaw", 3, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35332,10 +35262,10 @@ const insn_template i386_optab[] =
   { "vpshaw", 3, 0x99, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35348,10 +35278,10 @@ const insn_template i386_optab[] =
   { "vpshlb", 3, 0x94, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35364,10 +35294,10 @@ const insn_template i386_optab[] =
   { "vpshlb", 3, 0x94, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35380,10 +35310,10 @@ const insn_template i386_optab[] =
   { "vpshld", 3, 0x96, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35396,10 +35326,10 @@ const insn_template i386_optab[] =
   { "vpshld", 3, 0x96, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35412,10 +35342,10 @@ const insn_template i386_optab[] =
   { "vpshlq", 3, 0x97, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35428,10 +35358,10 @@ const insn_template i386_optab[] =
   { "vpshlq", 3, 0x97, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35444,10 +35374,10 @@ const insn_template i386_optab[] =
   { "vpshlw", 3, 0x95, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35460,10 +35390,10 @@ const insn_template i386_optab[] =
   { "vpshlw", 3, 0x95, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      2, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 0, 1, 0, 0, 0 } },
@@ -35476,50 +35406,50 @@ const insn_template i386_optab[] =
   { "llwpcb", 1, 0x12, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "llwpcb", 1, 0x12, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "slwpcb", 1, 0x12, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
+      1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "slwpcb", 1, 0x12, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      0, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
+      2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "lwpval", 3, 0x12, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      3, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 
+      1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35532,10 +35462,10 @@ const insn_template i386_optab[] =
   { "lwpval", 3, 0x12, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      3, 2, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 3, 
+      2, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35548,10 +35478,10 @@ const insn_template i386_optab[] =
   { "lwpins", 3, 0x12, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 
-      3, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 
+      1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35564,10 +35494,10 @@ const insn_template i386_optab[] =
   { "lwpins", 3, 0x12, 0x0, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-      3, 2, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 3, 
+      2, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35580,10 +35510,10 @@ const insn_template i386_optab[] =
   { "andn", 3, 0xf2, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35596,10 +35526,10 @@ const insn_template i386_optab[] =
   { "bextr", 3, 0xf7, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35612,10 +35542,10 @@ const insn_template i386_optab[] =
   { "bextr", 3, 0x10, None, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 
+      0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -35628,10 +35558,10 @@ const insn_template i386_optab[] =
   { "blsi", 2, 0xf3, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35641,10 +35571,10 @@ const insn_template i386_optab[] =
   { "blsmsk", 2, 0xf3, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35654,10 +35584,10 @@ const insn_template i386_optab[] =
   { "blsr", 2, 0xf3, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35667,10 +35597,10 @@ const insn_template i386_optab[] =
   { "tzcnt", 2, 0xf30fbc, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35680,10 +35610,10 @@ const insn_template i386_optab[] =
   { "blcfill", 2, 0x01, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35693,10 +35623,10 @@ const insn_template i386_optab[] =
   { "blci", 2, 0x02, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35706,10 +35636,10 @@ const insn_template i386_optab[] =
   { "blcic", 2, 0x01, 0x5, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35719,10 +35649,10 @@ const insn_template i386_optab[] =
   { "blcmsk", 2, 0x02, 0x1, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35732,10 +35662,10 @@ const insn_template i386_optab[] =
   { "blcs", 2, 0x01, 0x3, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35745,10 +35675,10 @@ const insn_template i386_optab[] =
   { "blsfill", 2, 0x01, 0x2, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35758,10 +35688,10 @@ const insn_template i386_optab[] =
   { "blsic", 2, 0x01, 0x6, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35771,10 +35701,10 @@ const insn_template i386_optab[] =
   { "t1mskc", 2, 0x01, 0x7, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35784,10 +35714,10 @@ const insn_template i386_optab[] =
   { "tzmsk", 2, 0x01, 0x4, 1,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 
-      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 
-      2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 
+      0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35797,40 +35727,40 @@ const insn_template i386_optab[] =
   { "prefetch", 1, 0xf0d, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "prefetchw", 1, 0xf0d, 0x1, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 1, 0, 0, 0 } } } },
   { "femms", 0, 0xf0e, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "pavgusb", 2, 0xf0f, 0xbf, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35840,10 +35770,10 @@ const insn_template i386_optab[] =
   { "pf2id", 2, 0xf0f, 0x1d, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35853,10 +35783,10 @@ const insn_template i386_optab[] =
   { "pf2iw", 2, 0xf0f, 0x1c, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35866,10 +35796,10 @@ const insn_template i386_optab[] =
   { "pfacc", 2, 0xf0f, 0xae, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35879,10 +35809,10 @@ const insn_template i386_optab[] =
   { "pfadd", 2, 0xf0f, 0x9e, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35892,10 +35822,10 @@ const insn_template i386_optab[] =
   { "pfcmpeq", 2, 0xf0f, 0xb0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35905,10 +35835,10 @@ const insn_template i386_optab[] =
   { "pfcmpge", 2, 0xf0f, 0x90, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35918,10 +35848,10 @@ const insn_template i386_optab[] =
   { "pfcmpgt", 2, 0xf0f, 0xa0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35931,10 +35861,10 @@ const insn_template i386_optab[] =
   { "pfmax", 2, 0xf0f, 0xa4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35944,10 +35874,10 @@ const insn_template i386_optab[] =
   { "pfmin", 2, 0xf0f, 0x94, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35957,10 +35887,10 @@ const insn_template i386_optab[] =
   { "pfmul", 2, 0xf0f, 0xb4, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35970,10 +35900,10 @@ const insn_template i386_optab[] =
   { "pfnacc", 2, 0xf0f, 0x8a, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35983,10 +35913,10 @@ const insn_template i386_optab[] =
   { "pfpnacc", 2, 0xf0f, 0x8e, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -35996,10 +35926,10 @@ const insn_template i386_optab[] =
   { "pfrcp", 2, 0xf0f, 0x96, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36009,10 +35939,10 @@ const insn_template i386_optab[] =
   { "pfrcpit1", 2, 0xf0f, 0xa6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36022,10 +35952,10 @@ const insn_template i386_optab[] =
   { "pfrcpit2", 2, 0xf0f, 0xb6, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36035,10 +35965,10 @@ const insn_template i386_optab[] =
   { "pfrsqit1", 2, 0xf0f, 0xa7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36048,10 +35978,10 @@ const insn_template i386_optab[] =
   { "pfrsqrt", 2, 0xf0f, 0x97, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36061,10 +35991,10 @@ const insn_template i386_optab[] =
   { "pfsub", 2, 0xf0f, 0x9a, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36074,10 +36004,10 @@ const insn_template i386_optab[] =
   { "pfsubr", 2, 0xf0f, 0xaa, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36087,10 +36017,10 @@ const insn_template i386_optab[] =
   { "pi2fd", 2, 0xf0f, 0xd, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36100,10 +36030,10 @@ const insn_template i386_optab[] =
   { "pi2fw", 2, 0xf0f, 0xc, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36113,10 +36043,10 @@ const insn_template i386_optab[] =
   { "pmulhrw", 2, 0xf0f, 0xb7, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36126,10 +36056,10 @@ const insn_template i386_optab[] =
   { "pswapd", 2, 0xf0f, 0xbb, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36139,90 +36069,90 @@ const insn_template i386_optab[] =
   { "syscall", 0, 0xf05, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "syscall", 0, 0xf05, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "sysret", 0, 0xf07, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "sysret", 0, 0xf07, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "swapgs", 0, 0xf01, 0xf8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "rdtscp", 0, 0xf01, 0xf9, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "clgi", 0, 0xf01, 0xdd, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "invlpga", 0, 0xf01, 0xdf, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "invlpga", 2, 0xf01, 0xdf, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36232,110 +36162,110 @@ const insn_template i386_optab[] =
   { "skinit", 0, 0xf01, 0xde, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "skinit", 1, 0xf01, 0xde, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "stgi", 0, 0xf01, 0xdc, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmload", 0, 0xf01, 0xda, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmload", 1, 0xf01, 0xda, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmmcall", 0, 0xf01, 0xd9, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmrun", 0, 0xf01, 0xd8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmrun", 1, 0xf01, 0xd8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmsave", 0, 0xf01, 0xdb, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "vmsave", 1, 0xf01, 0xdb, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "movntsd", 2, 0xf20f2b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36345,10 +36275,10 @@ const insn_template i386_optab[] =
   { "movntss", 2, 0xf30f2b, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36358,10 +36288,10 @@ const insn_template i386_optab[] =
   { "extrq", 3, 0x660f78, 0x0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36374,10 +36304,10 @@ const insn_template i386_optab[] =
   { "extrq", 2, 0x660f79, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36387,10 +36317,10 @@ const insn_template i386_optab[] =
   { "insertq", 2, 0xf20f79, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36400,10 +36330,10 @@ const insn_template i386_optab[] =
   { "insertq", 4, 0xf20f78, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 
       1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } },
@@ -36419,10 +36349,10 @@ const insn_template i386_optab[] =
   { "popcnt", 2, 0xf30fb8, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36432,10 +36362,10 @@ const insn_template i386_optab[] =
   { "lzcnt", 2, 0xf30fbd, None, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 
       0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 
 	  0, 0, 1, 0, 0, 0 } },
@@ -36445,170 +36375,170 @@ const insn_template i386_optab[] =
   { "xstore-rng", 0, 0xfa7, 0xc0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcrypt-ecb", 0, 0xf30fa7, 0xc8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcrypt-cbc", 0, 0xf30fa7, 0xd0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcrypt-ctr", 0, 0xf30fa7, 0xd8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcrypt-cfb", 0, 0xf30fa7, 0xe0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcrypt-ofb", 0, 0xf30fa7, 0xe8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "montmul", 0, 0xf30fa6, 0xc0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xsha1", 0, 0xf30fa6, 0xc8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xsha256", 0, 0xf30fa6, 0xd0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xstorerng", 0, 0xfa7, 0xc0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcryptecb", 0, 0xf30fa7, 0xc8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcryptcbc", 0, 0xf30fa7, 0xd0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcryptctr", 0, 0xf30fa7, 0xd8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcryptcfb", 0, 0xf30fa7, 0xe0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xcryptofb", 0, 0xf30fa7, 0xe8, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { "xstore", 0, 0xfa7, 0xc0, 2,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 
-      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } },
   { NULL, 0, 0, 0, 0,
     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	  0, 0, 0, 0, 0, 0 } } } }
diff --git a/opcodes/m68k-opc.c b/opcodes/m68k-opc.c
index 8347ef1e58..9463668976 100644
--- a/opcodes/m68k-opc.c
+++ b/opcodes/m68k-opc.c
@@ -1553,10 +1553,10 @@ const struct m68k_opcode m68k_opcodes[] =
 {"moveml", 4,	one(0044300),	one(0177700), "#w>s", m68000up },
 {"moveml", 4,	one(0046300),	one(0177700), "<sLw", m68000up },
 {"moveml", 4,	one(0046300),	one(0177700), "<s#w", m68000up },
-{"moveml", 4,	one(0044300),	one(0177700), "Lwys", mcfisa_a },
-{"moveml", 4,	one(0044300),	one(0177700), "#wys", mcfisa_a },
-{"moveml", 4,	one(0046300),	one(0177700), "ysLw", mcfisa_a },
-{"moveml", 4,	one(0046300),	one(0177700), "ys#w", mcfisa_a },
+{"moveml", 4,	one(0044320),	one(0177770), "Lwys", mcfisa_a },
+{"moveml", 4,	one(0044320),	one(0177770), "#wys", mcfisa_a },
+{"moveml", 4,	one(0046320),	one(0177770), "ysLw", mcfisa_a },
+{"moveml", 4,	one(0046320),	one(0177770), "ys#w", mcfisa_a },
 
 {"movepw", 2,	one(0000410),	one(0170770), "dsDd", m68000up },
 {"movepw", 2,	one(0000610),	one(0170770), "Ddds", m68000up },
@@ -1850,11 +1850,11 @@ const struct m68k_opcode m68k_opcodes[] =
 {"pmove", 4,    two(0xf000,0x4200), two(0xffc0,0xe3ff), "28%s", m68851 },
 {"pmove", 4,    two(0xf000,0x4000), two(0xffc0,0xe3ff), "|sW8", m68030|m68851 },
 {"pmove", 4,    two(0xf000,0x4200), two(0xffc0,0xe3ff), "W8~s", m68030|m68851 },
+{"pmove", 4,    two(0xf000,0x6200), two(0xffc0,0xe3e3), "*wX3", m68851 },
+{"pmove", 4,    two(0xf000,0x6000), two(0xffc0,0xe3e3), "X3%s", m68851 },
 {"pmove", 4,    two(0xf000,0x6000), two(0xffc0,0xffff), "*wY8", m68030|m68851 },
 {"pmove", 4,    two(0xf000,0x6200), two(0xffc0,0xffff), "Y8%s", m68030|m68851 },
 {"pmove", 4,    two(0xf000,0x6600), two(0xffc0,0xffff), "Z8%s", m68851 },
-{"pmove", 4,    two(0xf000,0x6000), two(0xffc0,0xe3e3), "*wX3", m68851 },
-{"pmove", 4,    two(0xf000,0x6200), two(0xffc0,0xe3e3), "X3%s", m68851 },
 {"pmove", 4,    two(0xf000,0x0800), two(0xffc0,0xfbff), "*l38", m68030 },
 {"pmove", 4,    two(0xf000,0x0a00), two(0xffc0,0xfbff), "38%s", m68030 },
 
diff --git a/opcodes/micromips-opc.c b/opcodes/micromips-opc.c
index 251d801933..852081edc5 100644
--- a/opcodes/micromips-opc.c
+++ b/opcodes/micromips-opc.c
@@ -167,9 +167,9 @@ const struct mips_opcode micromips_opcodes[] =
 {"addu",    "md,me,ml",	    0x0400,     0xfc01,	0,			WR_md|RD_me|RD_ml,	I1	},
 {"addu",    "d,v,t",	0x00000150, 0xfc0007ff,	WR_d|RD_s|RD_t,		0,		I1	},
 {"addu",    "t,r,I",	0,    (int) M_ADDU_I,	INSN_MACRO,		0,		I1	},
-/* We have no flag to mark the read from "y", so we use NODS to disable
+/* We have no flag to mark the read from "y", so we use TRAP to disable
    delay slot scheduling of ALNV.PS altogether.  */
-{"alnv.ps", "D,V,T,y",	0x54000019, 0xfc00003f,	NODS|WR_D|RD_S|RD_T|FP_D, 0,		I1	},
+{"alnv.ps", "D,V,T,y",	0x54000019, 0xfc00003f,	TRAP|WR_D|RD_S|RD_T|FP_D, 0,		I1	},
 {"and",     "mf,mt,mg",	    0x4480,     0xffc0,	0,			WR_mf|RD_mf|RD_mg,	I1	},
 {"and",     "mf,mg,mx",	    0x4480,     0xffc0,	0,			WR_mf|RD_mf|RD_mg,	I1	},
 {"and",     "d,v,t",	0x00000250, 0xfc0007ff,	WR_d|RD_s|RD_t,		0,		I1	},
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 6651daad7c..4e18d8ab22 100644
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -605,28 +605,12 @@ const struct mips_arch_choice mips_arch_choices[] =
     ISA_MIPS64R2 | INSN_OCTEON, mips_cp0_names_numeric, NULL, 0,
     mips_hwr_names_numeric },
 
-  { "octeon+",   1, bfd_mach_mips_octeonp, CPU_OCTEONP,
-    ISA_MIPS64R2 | INSN_OCTEONP, mips_cp0_names_numeric,
-    NULL, 0, mips_hwr_names_numeric },
-
-  { "octeon2",   1, bfd_mach_mips_octeon2, CPU_OCTEON2,
-    ISA_MIPS64R2 | INSN_OCTEON2, mips_cp0_names_numeric,
-    NULL, 0, mips_hwr_names_numeric },
-
   { "xlr", 1, bfd_mach_mips_xlr, CPU_XLR,
     ISA_MIPS64 | INSN_XLR,
     mips_cp0_names_xlr,
     mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
     mips_hwr_names_numeric },
 
-  /* XLP is mostly like XLR, with the prominent exception it is being
-     MIPS64R2.  */
-  { "xlp", 1, bfd_mach_mips_xlr, CPU_XLR,
-    ISA_MIPS64R2 | INSN_XLR,
-    mips_cp0_names_xlr,
-    mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr),
-    mips_hwr_names_numeric },
-
   /* This entry, mips16, is here only for ISA/processor selection; do
      not print its name.  */
   { "",		1, bfd_mach_mips16, CPU_MIPS16, ISA_MIPS3,
@@ -2276,7 +2260,7 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
 static int
 print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 {
-  const fprintf_ftype infprintf = info->fprintf_func;
+  const fprintf_ftype iprintf = info->fprintf_func;
   const struct mips_opcode *op, *opend;
   unsigned int lsb, msbd, msb;
   void *is = info->stream;
@@ -2323,7 +2307,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
       status = (*info->read_memory_func) (memaddr + 2, buffer, 2, info);
       if (status != 0)
 	{
-	  infprintf (is, "micromips 0x%x", higher);
+	  iprintf (is, "micromips 0x%x", higher);
 	  (*info->memory_error_func) (status, memaddr + 2, info);
 	  return -1;
 	}
@@ -2336,7 +2320,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
       status = (*info->read_memory_func) (memaddr + 4, buffer, 2, info);
       if (status != 0)
 	{
-	  infprintf (is, "micromips 0x%x", higher);
+	  iprintf (is, "micromips 0x%x", higher);
 	  (*info->memory_error_func) (status, memaddr + 4, info);
 	  return -1;
 	}
@@ -2344,7 +2328,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 	insn = bfd_getb16 (buffer);
       else
 	insn = bfd_getl16 (buffer);
-      infprintf (is, "0x%x%04x (48-bit insn)", higher, insn);
+      iprintf (is, "0x%x%04x (48-bit insn)", higher, insn);
 
       info->insn_type = dis_noninsn;
       return 6;
@@ -2357,7 +2341,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
       status = (*info->read_memory_func) (memaddr + 2, buffer, 2, info);
       if (status != 0)
 	{
-	  infprintf (is, "micromips 0x%x", higher);
+	  iprintf (is, "micromips 0x%x", higher);
 	  (*info->memory_error_func) (status, memaddr + 2, info);
 	  return -1;
 	}
@@ -2387,9 +2371,9 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 	{
 	  const char *s;
 
-	  infprintf (is, "%s", op->name);
+	  iprintf (is, "%s", op->name);
 	  if (op->args[0] != '\0')
-	    infprintf (is, "\t");
+	    iprintf (is, "\t");
 
 	  for (s = op->args; *s != '\0'; s++)
 	    {
@@ -2398,37 +2382,37 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		case ',':
 		case '(':
 		case ')':
-		  infprintf (is, "%c", *s);
+		  iprintf (is, "%c", *s);
 		  break;
 
 		case '.':
 		  delta = GET_OP (insn, OFFSET10);
 		  if (delta & 0x200)
 		    delta |= ~0x3ff;
-		  infprintf (is, "%d", delta);
+		  iprintf (is, "%d", delta);
 		  break;
 
 		case '1':
-		  infprintf (is, "0x%lx", GET_OP (insn, STYPE));
+		  iprintf (is, "0x%lx", GET_OP (insn, STYPE));
 		  break;
 
 		case '<':
-		  infprintf (is, "0x%lx", GET_OP (insn, SHAMT));
+		  iprintf (is, "0x%lx", GET_OP (insn, SHAMT));
 		  break;
 
 		case '\\':
-		  infprintf (is, "0x%lx", GET_OP (insn, 3BITPOS));
+		  iprintf (is, "0x%lx", GET_OP (insn, 3BITPOS));
 		  break;
 
 		case '|':
-		  infprintf (is, "0x%lx", GET_OP (insn, TRAP));
+		  iprintf (is, "0x%lx", GET_OP (insn, TRAP));
 		  break;
 
 		case '~':
 		  delta = GET_OP (insn, OFFSET12);
 		  if (delta & 0x800)
 		    delta |= ~0x7ff;
-		  infprintf (is, "%d", delta);
+		  iprintf (is, "%d", delta);
 		  break;
 
 		case 'a':
@@ -2449,34 +2433,34 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		case 'r':
 		case 's':
 		case 'v':
-		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS)]);
+		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS)]);
 		  break;
 
 		case 'c':
-		  infprintf (is, "0x%lx", GET_OP (insn, CODE));
+		  iprintf (is, "0x%lx", GET_OP (insn, CODE));
 		  break;
 
 		case 'd':
-		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RD)]);
+		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RD)]);
 		  break;
 
 		case 'h':
-		  infprintf (is, "0x%lx", GET_OP (insn, PREFX));
+		  iprintf (is, "0x%lx", GET_OP (insn, PREFX));
 		  break;
 
 		case 'i':
 		case 'u':
-		  infprintf (is, "0x%lx", GET_OP (insn, IMMEDIATE));
+		  iprintf (is, "0x%lx", GET_OP (insn, IMMEDIATE));
 		  break;
 
 		case 'j': /* Same as i, but sign-extended.  */
 		case 'o':
 		  delta = (GET_OP (insn, DELTA) ^ 0x8000) - 0x8000;
-		  infprintf (is, "%d", delta);
+		  iprintf (is, "%d", delta);
 		  break;
 
 		case 'k':
-		  infprintf (is, "0x%x", GET_OP (insn, CACHE));
+		  iprintf (is, "0x%x", GET_OP (insn, CACHE));
 		  break;
 
 		case 'n':
@@ -2488,26 +2472,26 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		    if (s_reg_encode != 0)
 		      {
 			if (s_reg_encode == 1)
-			  infprintf (is, "%s", mips_gpr_names[16]);
+			  iprintf (is, "%s", mips_gpr_names[16]);
 			else if (s_reg_encode < 9)
-			  infprintf (is, "%s-%s",
+			  iprintf (is, "%s-%s",
 				   mips_gpr_names[16],
 				   mips_gpr_names[15 + s_reg_encode]);
 			else if (s_reg_encode == 9)
-			  infprintf (is, "%s-%s,%s",
+			  iprintf (is, "%s-%s,%s",
 				   mips_gpr_names[16],
 				   mips_gpr_names[23],
 				   mips_gpr_names[30]);
 			else
-			  infprintf (is, "UNKNOWN");
+			  iprintf (is, "UNKNOWN");
 		      }
 
 		    if (immed & 0x10) /* For ra.  */
 		      {
 			if (s_reg_encode == 0)
-			  infprintf (is, "%s", mips_gpr_names[31]);
+			  iprintf (is, "%s", mips_gpr_names[31]);
 			else
-			  infprintf (is, ",%s", mips_gpr_names[31]);
+			  iprintf (is, ",%s", mips_gpr_names[31]);
 		      }
 		    break;
 		  }
@@ -2520,32 +2504,32 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		  break;
 
 		case 'q':
-		  infprintf (is, "0x%lx", GET_OP (insn, CODE2));
+		  iprintf (is, "0x%lx", GET_OP (insn, CODE2));
 		  break;
 
 		case 't':
 		case 'w':
-		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RT)]);
+		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RT)]);
 		  break;
 
 		case 'y':
-		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS3)]);
+		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS3)]);
 		  break;
 
 		case 'z':
-		  infprintf (is, "%s", mips_gpr_names[0]);
+		  iprintf (is, "%s", mips_gpr_names[0]);
 		  break;
 
 		case 'B':
-		  infprintf (is, "0x%lx", GET_OP (insn, CODE10));
+		  iprintf (is, "0x%lx", GET_OP (insn, CODE10));
 		  break;
 
 		case 'C':
-		  infprintf (is, "0x%lx", GET_OP (insn, COPZ));
+		  iprintf (is, "0x%lx", GET_OP (insn, COPZ));
 		  break;
 
 		case 'D':
-		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FD)]);
+		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FD)]);
 		  break;
 
 		case 'E':
@@ -2556,7 +2540,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		    'T' format.  Therefore, until we gain understanding of
 		    cp2 register names, we can simply print the register
 		    numbers.  */
-		  infprintf (is, "$%ld", GET_OP (insn, RT));
+		  iprintf (is, "$%ld", GET_OP (insn, RT));
 		  break;
 
 		case 'G':
@@ -2575,44 +2559,44 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		    case 0x000002fc:				/* mtc0  */
 		    case 0x580000fc:				/* dmfc0 */
 		    case 0x580002fc:				/* dmtc0 */
-		      infprintf (is, "%s", mips_cp0_names[GET_OP (insn, RS)]);
+		      iprintf (is, "%s", mips_cp0_names[GET_OP (insn, RS)]);
 		      break;
 		    default:
-		      infprintf (is, "$%ld", GET_OP (insn, RS));
+		      iprintf (is, "$%ld", GET_OP (insn, RS));
 		      break;
 		    }
 		  break;
 
 		case 'H':
-		  infprintf (is, "%ld", GET_OP (insn, SEL));
+		  iprintf (is, "%ld", GET_OP (insn, SEL));
 		  break;
 
 		case 'K':
-		  infprintf (is, "%s", mips_hwr_names[GET_OP (insn, RS)]);
+		  iprintf (is, "%s", mips_hwr_names[GET_OP (insn, RS)]);
 		  break;
 
 		case 'M':
-		  infprintf (is, "$fcc%ld", GET_OP (insn, CCC));
+		  iprintf (is, "$fcc%ld", GET_OP (insn, CCC));
 		  break;
 
 		case 'N':
-		  infprintf (is,
+		  iprintf (is,
 			   (op->pinfo & (FP_D | FP_S)) != 0
 			   ? "$fcc%ld" : "$cc%ld",
 			   GET_OP (insn, BCC));
 		  break;
 
 		case 'R':
-		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FR)]);
+		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FR)]);
 		  break;
 
 		case 'S':
 		case 'V':
-		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FS)]);
+		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FS)]);
 		  break;
 
 		case 'T':
-		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FT)]);
+		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FT)]);
 		  break;
 
 		case '+':
@@ -2622,18 +2606,18 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		    {
 		    case 'A':
 		      lsb = GET_OP (insn, EXTLSB);
-		      infprintf (is, "0x%x", lsb);
+		      iprintf (is, "0x%x", lsb);
 		      break;
 
 		    case 'B':
 		      msb = GET_OP (insn, INSMSB);
-		      infprintf (is, "0x%x", msb - lsb + 1);
+		      iprintf (is, "0x%x", msb - lsb + 1);
 		      break;
 
 		    case 'C':
 		    case 'H':
 		      msbd = GET_OP (insn, EXTMSBD);
-		      infprintf (is, "0x%x", msbd + 1);
+		      iprintf (is, "0x%x", msbd + 1);
 		      break;
 
 		    case 'D':
@@ -2653,30 +2637,30 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 						     mips_cp0sel_names_len,
 						     cp0reg, sel);
 			if (n != NULL)
-			  infprintf (is, "%s", n->name);
+			  iprintf (is, "%s", n->name);
 			else
-			  infprintf (is, "$%d,%d", cp0reg, sel);
+			  iprintf (is, "$%d,%d", cp0reg, sel);
 			break;
 		      }
 
 		    case 'E':
 		      lsb = GET_OP (insn, EXTLSB) + 32;
-		      infprintf (is, "0x%x", lsb);
+		      iprintf (is, "0x%x", lsb);
 		      break;
 
 		    case 'F':
 		      msb = GET_OP (insn, INSMSB) + 32;
-		      infprintf (is, "0x%x", msb - lsb + 1);
+		      iprintf (is, "0x%x", msb - lsb + 1);
 		      break;
 
 		    case 'G':
 		      msbd = GET_OP (insn, EXTMSBD) + 32;
-		      infprintf (is, "0x%x", msbd + 1);
+		      iprintf (is, "0x%x", msbd + 1);
 		      break;
 
 		    default:
 		      /* xgettext:c-format */
-		      infprintf (is,
+		      iprintf (is,
 			       _("# internal disassembler error, "
 				 "unrecognized modifier (+%c)"),
 			       *s);
@@ -2690,111 +2674,111 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		  switch (*s)
 		    {
 		    case 'a':	/* global pointer.  */
-		      infprintf (is, "%s", mips_gpr_names[28]);
+		      iprintf (is, "%s", mips_gpr_names[28]);
 		      break;
 
 		    case 'b':
 		      regno = micromips_to_32_reg_b_map[GET_OP (insn, MB)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'c':
 		      regno = micromips_to_32_reg_c_map[GET_OP (insn, MC)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'd':
 		      regno = micromips_to_32_reg_d_map[GET_OP (insn, MD)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'e':
 		      regno = micromips_to_32_reg_e_map[GET_OP (insn, ME)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'f':
 		      /* Save lastregno for "mt" to print out later.  */
 		      lastregno = micromips_to_32_reg_f_map[GET_OP (insn, MF)];
-		      infprintf (is, "%s", mips_gpr_names[lastregno]);
+		      iprintf (is, "%s", mips_gpr_names[lastregno]);
 		      break;
 
 		    case 'g':
 		      regno = micromips_to_32_reg_g_map[GET_OP (insn, MG)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'h':
 		      regno = micromips_to_32_reg_h_map[GET_OP (insn, MH)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'i':
 		      regno = micromips_to_32_reg_i_map[GET_OP (insn, MI)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'j':
-		      infprintf (is, "%s", mips_gpr_names[GET_OP (insn, MJ)]);
+		      iprintf (is, "%s", mips_gpr_names[GET_OP (insn, MJ)]);
 		      break;
 
 		    case 'l':
 		      regno = micromips_to_32_reg_l_map[GET_OP (insn, ML)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'm':
 		      regno = micromips_to_32_reg_m_map[GET_OP (insn, MM)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'n':
 		      regno = micromips_to_32_reg_n_map[GET_OP (insn, MN)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'p':
 		      /* Save lastregno for "mt" to print out later.  */
 		      lastregno = GET_OP (insn, MP);
-		      infprintf (is, "%s", mips_gpr_names[lastregno]);
+		      iprintf (is, "%s", mips_gpr_names[lastregno]);
 		      break;
 
 		    case 'q':
 		      regno = micromips_to_32_reg_q_map[GET_OP (insn, MQ)];
-		      infprintf (is, "%s", mips_gpr_names[regno]);
+		      iprintf (is, "%s", mips_gpr_names[regno]);
 		      break;
 
 		    case 'r':	/* program counter.  */
-		      infprintf (is, "$pc");
+		      iprintf (is, "$pc");
 		      break;
 
 		    case 's':	/* stack pointer.  */
 		      lastregno = 29;
-		      infprintf (is, "%s", mips_gpr_names[29]);
+		      iprintf (is, "%s", mips_gpr_names[29]);
 		      break;
 
 		    case 't':
-		      infprintf (is, "%s", mips_gpr_names[lastregno]);
+		      iprintf (is, "%s", mips_gpr_names[lastregno]);
 		      break;
 
 		    case 'z':	/* $0.  */
-		      infprintf (is, "%s", mips_gpr_names[0]);
+		      iprintf (is, "%s", mips_gpr_names[0]);
 		      break;
 
 		    case 'A':
 		      /* Sign-extend the immediate.  */
 		      immed = ((GET_OP (insn, IMMA) ^ 0x40) - 0x40) << 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'B':
 		      immed = micromips_imm_b_map[GET_OP (insn, IMMB)];
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'C':
 		      immed = micromips_imm_c_map[GET_OP (insn, IMMC)];
-		      infprintf (is, "0x%lx", immed);
+		      iprintf (is, "0x%lx", immed);
 		      break;
 
 		    case 'D':
@@ -2813,50 +2797,50 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 
 		    case 'F':
 		      immed = GET_OP (insn, IMMF);
-		      infprintf (is, "0x%x", immed);
+		      iprintf (is, "0x%x", immed);
 		      break;
 
 		    case 'G':
 		      immed = (insn >> MICROMIPSOP_SH_IMMG) + 1;
 		      immed = (immed & MICROMIPSOP_MASK_IMMG) - 1;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'H':
 		      immed = GET_OP (insn, IMMH) << 1;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'I':
 		      immed = (insn >> MICROMIPSOP_SH_IMMI) + 1;
 		      immed = (immed & MICROMIPSOP_MASK_IMMI) - 1;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'J':
 		      immed = GET_OP (insn, IMMJ) << 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'L':
 		      immed = GET_OP (insn, IMML);
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'M':
 		      immed = (insn >> MICROMIPSOP_SH_IMMM) - 1;
 		      immed = (immed & MICROMIPSOP_MASK_IMMM) + 1;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'N':
 		      immed = GET_OP (insn, IMMN);
 		      if (immed == 0)
-			infprintf (is, "%s,%s",
+			iprintf (is, "%s,%s",
 				 mips_gpr_names[16],
 				 mips_gpr_names[31]);
 		      else
-			infprintf (is, "%s-%s,%s",
+			iprintf (is, "%s-%s,%s",
 				 mips_gpr_names[16],
 				 mips_gpr_names[16 + immed],
 				 mips_gpr_names[31]);
@@ -2864,35 +2848,35 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 
 		    case 'O':
 		      immed = GET_OP (insn, IMMO);
-		      infprintf (is, "0x%x", immed);
+		      iprintf (is, "0x%x", immed);
 		      break;
 
 		    case 'P':
 		      immed = GET_OP (insn, IMMP) << 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'Q':
 		      /* Sign-extend the immediate.  */
 		      immed = (GET_OP (insn, IMMQ) ^ 0x400000) - 0x400000;
 		      immed <<= 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'U':
 		      immed = GET_OP (insn, IMMU) << 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'W':
 		      immed = GET_OP (insn, IMMW) << 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'X':
 		      /* Sign-extend the immediate.  */
 		      immed = (GET_OP (insn, IMMX) ^ 0x8) - 0x8;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    case 'Y':
@@ -2901,12 +2885,12 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 		      if (immed >= -2 && immed <= 1)
 			immed ^= 0x100;
 		      immed = immed << 2;
-		      infprintf (is, "%d", immed);
+		      iprintf (is, "%d", immed);
 		      break;
 
 		    default:
 		      /* xgettext:c-format */
-		      infprintf (is,
+		      iprintf (is,
 			       _("# internal disassembler error, "
 				 "unrecognized modifier (m%c)"),
 			       *s);
@@ -2916,7 +2900,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
 
 		default:
 		  /* xgettext:c-format */
-		  infprintf (is,
+		  iprintf (is,
 			   _("# internal disassembler error, "
 			     "unrecognized modifier (%c)"),
 			   *s);
@@ -2953,7 +2937,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
     }
 #undef GET_OP
 
-  infprintf (is, "0x%x", insn);
+  iprintf (is, "0x%x", insn);
   info->insn_type = dis_noninsn;
 
   return length;
diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
index 4083c1a624..7adf3370c5 100644
--- a/opcodes/mips-opc.c
+++ b/opcodes/mips-opc.c
@@ -121,9 +121,7 @@
 #define N5	(INSN_5400 | INSN_5500)
 #define N54	INSN_5400
 #define N55	INSN_5500
-#define IOCT	(INSN_OCTEON | INSN_OCTEONP | INSN_OCTEON2)
-#define IOCTP	(INSN_OCTEONP | INSN_OCTEON2)
-#define IOCT2	INSN_OCTEON2
+#define IOCT	INSN_OCTEON
 #define XLR     INSN_XLR
 
 #define G1      (T3             \
@@ -819,29 +817,10 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"jal",     "a",	0x0c000000, 0xfc000000,	UBD|WR_31,		0,		I1	},
 {"jalx",    "a",	0x74000000, 0xfc000000, UBD|WR_31,		0,		I1	},
 {"la",      "t,A(b)",	0,    (int) M_LA_AB,	INSN_MACRO,		0,		I1	},
-{"laa",     "d,(b),t",	0x7000049f, 0xfc0007ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"laad",    "d,(b),t",	0x700004df, 0xfc0007ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"lac",     "d,(b)",	0x7000039f, 0xfc1f07ff, LDD|SM|WR_d|RD_b,	0,		IOCT2	},
-{"lacd",    "d,(b)",	0x700003df, 0xfc1f07ff, LDD|SM|WR_d|RD_b,	0,		IOCT2	},
-{"lad",     "d,(b)",	0x7000019f, 0xfc1f07ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"ladd",    "d,(b)",	0x700001df, 0xfc1f07ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"lai",     "d,(b)",	0x7000009f, 0xfc1f07ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"laid",    "d,(b)",	0x700000df, 0xfc1f07ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"las",     "d,(b)",	0x7000029f, 0xfc1f07ff, LDD|SM|WR_d|RD_b,	0,		IOCT2	},
-{"lasd",    "d,(b)",	0x700002df, 0xfc1f07ff, LDD|SM|WR_d|RD_b,	0,		IOCT2	},
-{"law",	    "d,(b),t",	0x7000059f, 0xfc0007ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"lawd",    "d,(b),t",	0x700005df, 0xfc0007ff, LDD|SM|WR_d|RD_t|RD_b,	0,		IOCT2	},
 {"lb",      "t,o(b)",	0x80000000, 0xfc000000,	LDD|RD_b|WR_t,		0,		I1	},
 {"lb",      "t,A(b)",	0,    (int) M_LB_AB,	INSN_MACRO,		0,		I1	},
 {"lbu",     "t,o(b)",	0x90000000, 0xfc000000,	LDD|RD_b|WR_t,		0,		I1	},
 {"lbu",     "t,A(b)",	0,    (int) M_LBU_AB,	INSN_MACRO,		0,		I1	},
-{"lbx",     "d,t(b)",	0x7c00058a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"lbux",    "d,t(b)",	0x7c00018a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D32|IOCT2},
-{"ldx",     "d,t(b)",	0x7c00020a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D64|IOCT2},
-{"lhx",     "d,t(b)",	0x7c00010a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D32|IOCT2},
-{"lhux",    "d,t(b)",	0x7c00050a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		IOCT2	},
-{"lwx",     "d,t(b)",	0x7c00000a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D32|IOCT2},
-{"lwux",    "d,t(b)",	0x7c00040a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		IOCT2	},
 {"lca",     "t,A(b)",	0,    (int) M_LCA_AB,	INSN_MACRO,		0,		I1	},
 /* The macro has to be first to handle o32 correctly.  */
 {"ld",      "t,o(b)",	0,    (int) M_LD_OB,	INSN_MACRO,		0,		I1	},
@@ -1189,7 +1168,6 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"ori",     "t,r,i",	0x34000000, 0xfc000000,	WR_t|RD_s,		0,		I1	},
 {"pabsdiff.ob", "X,Y,Q",0x78000009, 0xfc20003f,	WR_D|RD_S|RD_T|FP_D,	0,		SB1	},
 {"pabsdiffc.ob", "Y,Q",	0x78000035, 0xfc2007ff,	RD_S|RD_T|FP_D,		WR_MACC,	SB1	},
-{"pause",   "",		0x00000140, 0xffffffff, TRAP,			0,		I33	},
 {"pavg.ob", "X,Y,Q",	0x78000008, 0xfc20003f,	WR_D|RD_S|RD_T|FP_D,	0,		SB1	},
 {"pickf.ob", "X,Y,Q",	0x78000002, 0xfc20003f,	WR_D|RD_S|RD_T|FP_D,	0,		MX|SB1	},
 {"pickf.ob", "D,S,T",	0x4ac00002, 0xffe0003f,	WR_D|RD_S|RD_T,		0,		N54	},
@@ -1208,14 +1186,6 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"pul.ps",  "D,V,T",	0x46c0002e, 0xffe0003f,	WR_D|RD_S|RD_T|FP_D,	0,		I5_33	},
 {"puu.ps",  "D,V,T",	0x46c0002f, 0xffe0003f,	WR_D|RD_S|RD_T|FP_D,	0,		I5_33	},
 {"pperm",   "s,t",	0x70000481, 0xfc00ffff,	MOD_HILO|RD_s|RD_t,	0,		SMT	},
-{"qmac.00", "s,t",	0x70000412, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmac.01", "s,t",	0x70000452, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmac.02", "s,t",	0x70000492, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmac.03", "s,t",	0x700004d2, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmacs.00", "s,t",	0x70000012, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmacs.01", "s,t",	0x70000052, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmacs.02", "s,t",	0x70000092, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
-{"qmacs.03", "s,t",	0x700000d2, 0xfc00ffff, MOD_HILO|RD_s|RD_t,	0,		IOCT2	},
 {"rach.ob", "X",	0x7a00003f, 0xfffff83f,	WR_D|FP_D,		RD_MACC,	MX|SB1	},
 {"rach.ob", "D",	0x4a00003f, 0xfffff83f,	WR_D,			0,		N54	},
 {"rach.qh", "X",	0x7a20003f, 0xfffff83f,	WR_D|FP_D,		RD_MACC,	MX	},
@@ -1277,12 +1247,6 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"rzu.ob",  "X,Q",	0x78000020, 0xfc20f83f,	WR_D|RD_T|FP_D,		RD_MACC,	MX|SB1	},
 {"rzu.ob",  "D,k",	0x4bc00020, 0xffe0f83f,	WR_D|RD_S|RD_T,		0,		N54	},
 {"rzu.qh",  "X,Q",	0x78200020, 0xfc20f83f,	WR_D|RD_T|FP_D,		RD_MACC,	MX	},
-{"saa",	    "t,o(b)",	0,    (int) M_SAA_OB,	INSN_MACRO,		0,		IOCTP	},
-{"saa",	    "t,A(b)",	0,    (int) M_SAA_AB,	INSN_MACRO,		0,		IOCTP	},
-{"saa",	    "t,(b)",	0x70000018, 0xfc00ffff, SM|RD_t|RD_b,		0,		IOCTP	},
-{"saad",    "t,o(b)",	0,    (int) M_SAAD_OB,	INSN_MACRO,		0,		IOCTP	},
-{"saad",    "t,A(b)",	0,    (int) M_SAAD_AB,	INSN_MACRO,		0,		IOCTP	},
-{"saad",    "t,(b)",	0x70000019, 0xfc00ffff,	SM|RD_t|RD_b,		0,		IOCTP	},
 {"sb",      "t,o(b)",	0xa0000000, 0xfc000000,	SM|RD_t|RD_b,		0,		I1	},
 {"sb",      "t,A(b)",	0,    (int) M_SB_AB,	INSN_MACRO,		0,		I1	},
 {"sc",	    "t,o(b)",	0xe0000000, 0xfc000000, SM|RD_t|WR_t|RD_b,	0,		I2	},
@@ -1546,8 +1510,6 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"xori",    "t,r,i",	0x38000000, 0xfc000000,	WR_t|RD_s,		0,		I1	},
 {"yield",   "s",	0x7c000009, 0xfc1fffff, NODS|RD_s,		0,		MT32	},
 {"yield",   "d,s",	0x7c000009, 0xfc1f07ff, NODS|WR_d|RD_s,		0,		MT32	},
-{"zcb",     "(b)",	0x7000071f, 0xfc1fffff, SM|RD_b,		0,		IOCT2   },
-{"zcbt",    "(b)",	0x7000075f, 0xfc1fffff, SM|RD_b,		0,		IOCT2   },
 
 /* User Defined Instruction.  */
 {"udi0",     "s,t,d,+1",0x70000010, 0xfc00003f,	WR_d|RD_s|RD_t,		0,		I33	},
@@ -1760,7 +1722,10 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"extrv.w", "t,7,s",	0x7c000078, 0xfc00e7ff, WR_t|RD_a|RD_s,		0,		D32	},
 {"extr.w",  "t,7,6",	0x7c000038, 0xfc00e7ff, WR_t|RD_a,		0,		D32	},
 {"insv",    "t,s",	0x7c00000c, 0xfc00ffff, WR_t|RD_s,		0,		D32	},
-/* lbux, ldx, lhx and lwx are the basic instruction section.  */
+{"lbux",    "d,t(b)",	0x7c00018a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D32	},
+{"ldx",     "d,t(b)",	0x7c00020a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D64	},
+{"lhx",     "d,t(b)",	0x7c00010a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D32	},
+{"lwx",     "d,t(b)",	0x7c00000a, 0xfc0007ff, LDD|WR_d|RD_t|RD_b,	0,		D32	},
 {"maq_sa.w.phl", "7,s,t", 0x7c000430, 0xfc00e7ff, MOD_a|RD_s|RD_t,	0,		D32	},
 {"maq_sa.w.phr", "7,s,t", 0x7c0004b0, 0xfc00e7ff, MOD_a|RD_s|RD_t,	0,		D32	},
 {"maq_sa.w.qhll", "7,s,t", 0x7c000434, 0xfc00e7ff, MOD_a|RD_s|RD_t,	0,		D64	},
diff --git a/opcodes/mt-dis.c b/opcodes/mt-dis.c
index 3767be2dac..28f4655e26 100644
--- a/opcodes/mt-dis.c
+++ b/opcodes/mt-dis.c
@@ -72,7 +72,7 @@ print_dollarhex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  info->fprintf_func (info->stream, "$%lx", value & 0xffffffff);
+  info->fprintf_func (info->stream, "$%lx", value);
 
   if (0)
     print_normal (cd, dis_info, value, attrs, pc, length);
diff --git a/opcodes/po/POTFILES.in b/opcodes/po/POTFILES.in
index 2721951686..bf9bf046b6 100644
--- a/opcodes/po/POTFILES.in
+++ b/opcodes/po/POTFILES.in
@@ -24,13 +24,6 @@ dis-buf.c
 dis-init.c
 disassemble.c
 dlx-dis.c
-epiphany-asm.c
-epiphany-desc.c
-epiphany-desc.h
-epiphany-dis.c
-epiphany-ibld.c
-epiphany-opc.c
-epiphany-opc.h
 fr30-asm.c
 fr30-desc.c
 fr30-desc.h
@@ -128,7 +121,6 @@ mep-opc.c
 mep-opc.h
 microblaze-dis.c
 microblaze-opc.h
-micromips-opc.c
 mips-dis.c
 mips-opc.c
 mips16-opc.c
@@ -160,8 +152,6 @@ pj-dis.c
 pj-opc.c
 ppc-dis.c
 ppc-opc.c
-rl78-decode.c
-rl78-dis.c
 rx-decode.c
 rx-dis.c
 s390-dis.c
diff --git a/opcodes/po/es.po b/opcodes/po/es.po
index a59417ede6..05ca986188 100644
--- a/opcodes/po/es.po
+++ b/opcodes/po/es.po
@@ -1,14 +1,14 @@
-# Mensajes en español para opcodes-2.21.53.
+# Mensajes en español para opcodes-2.20.90.
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
 # Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: opcodes 2.21.53\n"
+"Project-Id-Version: opcodes 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-25 20:50-0500\n"
+"POT-Creation-Date: 2010-11-05 11:32+0100\n"
+"PO-Revision-Date: 2011-08-24 11:53-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -110,23 +110,23 @@ msgstr "la dirección de ramificación no está en un límite de 4 bytes"
 msgid "must specify .jd or no nullify suffix"
 msgstr "se debe especificar un sufijo .jd o no nullify"
 
-#: arm-dis.c:1994
+#: arm-dis.c:1990
 msgid "<illegal precision>"
 msgstr "<precisión ilegal>"
 
 #. XXX - should break 'option' at following delimiter.
-#: arm-dis.c:4376
+#: arm-dis.c:4357
 #, c-format
 msgid "Unrecognised register name set: %s\n"
 msgstr "No se reconoce el conjunto de nombres de registro: %s\n"
 
 #. XXX - should break 'option' at following delimiter.
-#: arm-dis.c:4384
+#: arm-dis.c:4365
 #, c-format
 msgid "Unrecognised disassembler option: %s\n"
 msgstr "No se reconoce la opción de desensamblador: %s\n"
 
-#: arm-dis.c:4976
+#: arm-dis.c:4950
 #, c-format
 msgid ""
 "\n"
@@ -137,17 +137,17 @@ msgstr ""
 "Las siguientes opciones de desensamblador específicas de ARM se admiten\n"
 "para usarse con el interruptor -M:\n"
 
-#: avr-dis.c:115 avr-dis.c:135
+#: avr-dis.c:115 avr-dis.c:125
 #, c-format
 msgid "undefined"
 msgstr "sin definir"
 
-#: avr-dis.c:197
+#: avr-dis.c:187
 #, c-format
 msgid "Internal disassembler error"
 msgstr "Error interno del desensamblador"
 
-#: avr-dis.c:250
+#: avr-dis.c:236
 #, c-format
 msgid "unknown constraint `%c'"
 msgstr "restricción `%c' desconocida"
@@ -382,11 +382,11 @@ msgstr "no se puede lidiar con insert %d\n"
 msgid "%02x\t\t*unknown*"
 msgstr "%02x\t\t*desconocido*"
 
-#: i386-dis.c:10774
+#: i386-dis.c:10671
 msgid "<internal disassembler error>"
 msgstr "<error interno del desensamblador>"
 
-#: i386-dis.c:11071
+#: i386-dis.c:10968
 #, c-format
 msgid ""
 "\n"
@@ -397,32 +397,32 @@ msgstr ""
 "Se admiten las siguientes opciones de desensamblador específicas de i386/x86-64\n"
 "con el interruptor -M (las opciones múltiples se deben separar con comas):\n"
 
-#: i386-dis.c:11075
+#: i386-dis.c:10972
 #, c-format
 msgid "  x86-64      Disassemble in 64bit mode\n"
 msgstr "  x86-64      Desensambla en modo 64bit\n"
 
-#: i386-dis.c:11076
+#: i386-dis.c:10973
 #, c-format
 msgid "  i386        Disassemble in 32bit mode\n"
 msgstr "  i386        Desensambla en modo 32bit\n"
 
-#: i386-dis.c:11077
+#: i386-dis.c:10974
 #, c-format
 msgid "  i8086       Disassemble in 16bit mode\n"
 msgstr "  i8086       Desensambla en modo 16bit\n"
 
-#: i386-dis.c:11078
+#: i386-dis.c:10975
 #, c-format
 msgid "  att         Display instruction in AT&T syntax\n"
 msgstr "  att         Muestra las instrucciones con sintaxis AT&T\n"
 
-#: i386-dis.c:11079
+#: i386-dis.c:10976
 #, c-format
 msgid "  intel       Display instruction in Intel syntax\n"
 msgstr "  intel       Muestra las instrucciones con sintaxis Intel\n"
 
-#: i386-dis.c:11080
+#: i386-dis.c:10977
 #, c-format
 msgid ""
 "  att-mnemonic\n"
@@ -431,7 +431,7 @@ msgstr ""
 "  att-mnemonic\n"
 "              Muestra las instrucciones con mnemónicos AT&T\n"
 
-#: i386-dis.c:11082
+#: i386-dis.c:10979
 #, c-format
 msgid ""
 "  intel-mnemonic\n"
@@ -440,87 +440,87 @@ msgstr ""
 "  intel-mnemonic\n"
 "              Muestra las instrucciones con mnemónicos Intel\n"
 
-#: i386-dis.c:11084
+#: i386-dis.c:10981
 #, c-format
 msgid "  addr64      Assume 64bit address size\n"
 msgstr "  addr64      Asume un tamaño de dirección de 64bit\n"
 
-#: i386-dis.c:11085
+#: i386-dis.c:10982
 #, c-format
 msgid "  addr32      Assume 32bit address size\n"
 msgstr "  addr32      Asume un tamaño de dirección de 32bit\n"
 
-#: i386-dis.c:11086
+#: i386-dis.c:10983
 #, c-format
 msgid "  addr16      Assume 16bit address size\n"
 msgstr "  addr16      Asume un tamaño de dirección de 16bit\n"
 
-#: i386-dis.c:11087
+#: i386-dis.c:10984
 #, c-format
 msgid "  data32      Assume 32bit data size\n"
 msgstr "  data32      Asume un tamaño de datos de 32bit\n"
 
-#: i386-dis.c:11088
+#: i386-dis.c:10985
 #, c-format
 msgid "  data16      Assume 16bit data size\n"
 msgstr "  data16      Asume un tamaño de datos de 16bit\n"
 
-#: i386-dis.c:11089
+#: i386-dis.c:10986
 #, c-format
 msgid "  suffix      Always display instruction suffix in AT&T syntax\n"
 msgstr "  suffix      Siempre muestra el sufijo de instrucción con sintaxis AT&T\n"
 
-#: i386-gen.c:467 ia64-gen.c:307
+#: i386-gen.c:459 ia64-gen.c:307
 #, c-format
 msgid "%s: Error: "
 msgstr "%s: Error: "
 
-#: i386-gen.c:599
+#: i386-gen.c:591
 #, c-format
 msgid "%s: %d: Unknown bitfield: %s\n"
 msgstr "%s: %d: Campo de bits desconocido: %s\n"
 
-#: i386-gen.c:601
+#: i386-gen.c:593
 #, c-format
 msgid "Unknown bitfield: %s\n"
 msgstr "Campo de bits desconocido: %s\n"
 
-#: i386-gen.c:657
+#: i386-gen.c:649
 #, c-format
 msgid "%s: %d: Missing `)' in bitfield: %s\n"
 msgstr "%s: %d: Falta un `)' en el campo de bits: %s\n"
 
-#: i386-gen.c:922
+#: i386-gen.c:914
 #, c-format
 msgid "can't find i386-opc.tbl for reading, errno = %s\n"
 msgstr "no se puede encontrar i386-opc.tbl para lectura, errno =%s\n"
 
-#: i386-gen.c:1053
+#: i386-gen.c:1045
 #, c-format
 msgid "can't find i386-reg.tbl for reading, errno = %s\n"
 msgstr "no se puede encontrar i386-reg.tbl para lectura, errno = %s\n"
 
-#: i386-gen.c:1130
+#: i386-gen.c:1122
 #, c-format
 msgid "can't create i386-init.h, errno = %s\n"
 msgstr "no se puede crear i386-init.h, errno = %s\n"
 
-#: i386-gen.c:1219 ia64-gen.c:2820
+#: i386-gen.c:1211 ia64-gen.c:2820
 #, c-format
 msgid "unable to change directory to \"%s\", errno = %s\n"
 msgstr "no se puede cambiar el directorio a \"%s\", errno = %s\n"
 
-#: i386-gen.c:1226
+#: i386-gen.c:1218
 #, c-format
 msgid "%d unused bits in i386_cpu_flags.\n"
 msgstr "%d bits sin usar en i386_cpu_flags.\n"
 
-#: i386-gen.c:1233
+#: i386-gen.c:1225
 #, c-format
 msgid "%d unused bits in i386_operand_type.\n"
 msgstr "%d bits sin usar en i386_operand_type.\n"
 
-#: i386-gen.c:1247
+#: i386-gen.c:1239
 #, c-format
 msgid "can't create i386-tbl.h, errno = %s\n"
 msgstr "no se puede crear i386-tbl.h, errno = %s\n"
@@ -840,26 +840,26 @@ msgstr "El inmediato está fuera del rango -128 a 127"
 msgid "Value is not aligned enough"
 msgstr "El valor no está suficientemente alineado"
 
-#: mips-dis.c:845
+#: mips-dis.c:841
 msgid "# internal error, incomplete extension sequence (+)"
 msgstr "# error interno, secuencia de extensión incompleta (+)"
 
-#: mips-dis.c:1011
+#: mips-dis.c:975
 #, c-format
 msgid "# internal error, undefined extension sequence (+%c)"
 msgstr "# error interno, secuencia de extensión sin definir (+%c)"
 
-#: mips-dis.c:1371
+#: mips-dis.c:1335
 #, c-format
 msgid "# internal error, undefined modifier (%c)"
 msgstr "# error interno, modificador (%c) sin definir"
 
-#: mips-dis.c:1975
+#: mips-dis.c:1939
 #, c-format
 msgid "# internal disassembler error, unrecognised modifier (%c)"
 msgstr "# error interno del desensamblador, no se reconoce el modificador (%c)"
 
-#: mips-dis.c:2213
+#: mips-dis.c:2177
 #, c-format
 msgid ""
 "\n"
@@ -870,7 +870,7 @@ msgstr ""
 "Las siguientes opciones de desensamblador específicas de MIPS se admiten\n"
 "para usarse con el interruptor -M (las opciones múltiples se deben separar con comas):\n"
 
-#: mips-dis.c:2217
+#: mips-dis.c:2181
 #, c-format
 msgid ""
 "\n"
@@ -881,7 +881,7 @@ msgstr ""
 "  gpr-names=ABI            Muestra los nombres GPR de acuerdo a la ABI especificada.\n"
 "                           Por defecto: basado en el binario a desensamblar.\n"
 
-#: mips-dis.c:2221
+#: mips-dis.c:2185
 #, c-format
 msgid ""
 "\n"
@@ -892,7 +892,7 @@ msgstr ""
 "  fpr-names=ABI            Muestra los nombres FPR de acuerdo a la ABI especificada.\n"
 "                           Por defecto: numérico.\n"
 
-#: mips-dis.c:2225
+#: mips-dis.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -905,7 +905,7 @@ msgstr ""
 "                           la arquitectura especificada.\n"
 "                           Por defecto: basado en el binario a desensamblar.\n"
 
-#: mips-dis.c:2230
+#: mips-dis.c:2194
 #, c-format
 msgid ""
 "\n"
@@ -918,7 +918,7 @@ msgstr ""
 "                           especificada.\n"
 "                           Por defecto: basado en el binario a desensamblar.\n"
 
-#: mips-dis.c:2235
+#: mips-dis.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -929,7 +929,7 @@ msgstr ""
 "  reg-names=ABI            Muestra los nombres GPR y FPR de acuerdo a\n"
 "                           la ABI especificada.\n"
 
-#: mips-dis.c:2239
+#: mips-dis.c:2203
 #, c-format
 msgid ""
 "\n"
@@ -940,7 +940,7 @@ msgstr ""
 "  reg-names=ARCH           Muestra el registro CP0 y los nombres HWR de acuerdo a\n"
 "                           la arquitectura especificada.\n"
 
-#: mips-dis.c:2243
+#: mips-dis.c:2207
 #, c-format
 msgid ""
 "\n"
@@ -951,12 +951,12 @@ msgstr ""
 "  Para las opciones anteriores, se admiten los siguientes valores de \"ABI\":\n"
 "   "
 
-#: mips-dis.c:2248 mips-dis.c:2256 mips-dis.c:2258
+#: mips-dis.c:2212 mips-dis.c:2220 mips-dis.c:2222
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: mips-dis.c:2250
+#: mips-dis.c:2214
 #, c-format
 msgid ""
 "\n"
@@ -1037,43 +1037,43 @@ msgstr ""
 "Las siguientes opciones de desensamblador específicas de PPC se admiten con\n"
 "el interruptor -M:\n"
 
-#: ppc-opc.c:879 ppc-opc.c:907
+#: ppc-opc.c:878 ppc-opc.c:906
 msgid "invalid conditional option"
 msgstr "opción condicional inválida"
 
-#: ppc-opc.c:909
+#: ppc-opc.c:908
 msgid "attempt to set y bit when using + or - modifier"
 msgstr "intento de establecer el bit y al usar el modificador + ó -"
 
-#: ppc-opc.c:941
+#: ppc-opc.c:940
 msgid "invalid mask field"
 msgstr "campo de máscara inválido"
 
-#: ppc-opc.c:967
+#: ppc-opc.c:966
 msgid "ignoring invalid mfcr mask"
 msgstr "se descarta la máscara mfcr inválida"
 
-#: ppc-opc.c:1017 ppc-opc.c:1052
+#: ppc-opc.c:1016 ppc-opc.c:1051
 msgid "illegal bitmask"
 msgstr "máscara de bits ilegal"
 
-#: ppc-opc.c:1172
+#: ppc-opc.c:1171
 msgid "index register in load range"
 msgstr "registro índice en el rango de carga"
 
-#: ppc-opc.c:1188
+#: ppc-opc.c:1187
 msgid "source and target register operands must be different"
 msgstr "los operandos de registros fuente y objetivo deben ser diferentes"
 
-#: ppc-opc.c:1203
+#: ppc-opc.c:1202
 msgid "invalid register operand when updating"
 msgstr "operando de registro inválido al actualizar"
 
-#: ppc-opc.c:1282
+#: ppc-opc.c:1281
 msgid "invalid sprg number"
 msgstr "número sprg inválido"
 
-#: ppc-opc.c:1452
+#: ppc-opc.c:1451
 msgid "invalid constant"
 msgstr "constante inválida"
 
@@ -1124,12 +1124,12 @@ msgstr "Error interno: sparc-opcode.h erróneo: \"%s\" == \"%s\"\n"
 msgid "unknown"
 msgstr "desconocida"
 
-#: v850-dis.c:372
+#: v850-dis.c:365
 #, c-format
 msgid "unknown operand shift: %x\n"
 msgstr "operando de desplazamiento desconocido: %x\n"
 
-#: v850-dis.c:384
+#: v850-dis.c:377
 #, c-format
 msgid "unknown reg: %d\n"
 msgstr "registro desconocido: %d\n"
diff --git a/opcodes/po/fi.po b/opcodes/po/fi.po
index 82e3ff6ef6..c0f2afb280 100644
--- a/opcodes/po/fi.po
+++ b/opcodes/po/fi.po
@@ -1,17 +1,16 @@
 # Finnish messages for opcodes
-# Copyright © 2005, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright © 2005, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the binutils package.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2006-2011.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2006-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: opcodes 2.21.53\n"
+"Project-Id-Version: opcodes 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-09-23 11:44+0200\n"
+"POT-Creation-Date: 2010-11-05 11:32+0100\n"
+"PO-Revision-Date: 2010-11-09 16:40+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -115,23 +114,23 @@ msgstr "haaroitusosoite ei ole 4-tavurajalla"
 msgid "must specify .jd or no nullify suffix"
 msgstr "on määriteltävä .jd tai nollattava suffiksi"
 
-#: arm-dis.c:1994
+#: arm-dis.c:1990
 msgid "<illegal precision>"
 msgstr "<virheellinen tarkkuus>"
 
 #. XXX - should break 'option' at following delimiter.
-#: arm-dis.c:4376
+#: arm-dis.c:4357
 #, c-format
 msgid "Unrecognised register name set: %s\n"
-msgstr "Tunnistamaton rekisterinimijoukko: %s\n"
+msgstr "Tuntematon rekisterinimijoukko: %s\n"
 
 #. XXX - should break 'option' at following delimiter.
-#: arm-dis.c:4384
+#: arm-dis.c:4365
 #, c-format
 msgid "Unrecognised disassembler option: %s\n"
 msgstr "Tunnistamaton disassembler-valinta: %s\n"
 
-#: arm-dis.c:4976
+#: arm-dis.c:4950
 #, c-format
 msgid ""
 "\n"
@@ -142,17 +141,17 @@ msgstr ""
 "Seuraavia ARM-kohtaisia disassembler-valintoja tuetaan käytössä\n"
 "-M -valinnan kanssa:\n"
 
-#: avr-dis.c:115 avr-dis.c:135
+#: avr-dis.c:115 avr-dis.c:125
 #, c-format
 msgid "undefined"
 msgstr "määrittelemätön"
 
-#: avr-dis.c:197
+#: avr-dis.c:187
 #, c-format
 msgid "Internal disassembler error"
 msgstr "Sisäinen disassembler-virhe"
 
-#: avr-dis.c:250
+#: avr-dis.c:236
 #, c-format
 msgid "unknown constraint `%c'"
 msgstr "tuntematon rajoite �%c�"
@@ -387,11 +386,11 @@ msgstr "kohteen %d sijoittamisesta ei selviydytty\n"
 msgid "%02x\t\t*unknown*"
 msgstr "%02x\t\t*tuntematon*"
 
-#: i386-dis.c:10774
+#: i386-dis.c:10671
 msgid "<internal disassembler error>"
 msgstr "<sisäinen disassembler-virhe>"
 
-#: i386-dis.c:11071
+#: i386-dis.c:10968
 #, c-format
 msgid ""
 "\n"
@@ -402,32 +401,32 @@ msgstr ""
 "Seuraavat i386/x86-64-kohtaiset disassembler-valinnat ovat tuettuja käyttöön\n"
 "-M -valinnan kanssa (monivalinnat pitää erottaa pilkulla):\n"
 
-#: i386-dis.c:11075
+#: i386-dis.c:10972
 #, c-format
 msgid "  x86-64      Disassemble in 64bit mode\n"
 msgstr "  x86-64      Disassembloi 64-bittitilassa\n"
 
-#: i386-dis.c:11076
+#: i386-dis.c:10973
 #, c-format
 msgid "  i386        Disassemble in 32bit mode\n"
 msgstr "  i386        Disassembloi 32-bittitilassa\n"
 
-#: i386-dis.c:11077
+#: i386-dis.c:10974
 #, c-format
 msgid "  i8086       Disassemble in 16bit mode\n"
 msgstr "  i8086       Disassembloi 16-bittitilassa\n"
 
-#: i386-dis.c:11078
+#: i386-dis.c:10975
 #, c-format
 msgid "  att         Display instruction in AT&T syntax\n"
 msgstr "  att         Näyttää käskyn AT&T-syntaksissa\n"
 
-#: i386-dis.c:11079
+#: i386-dis.c:10976
 #, c-format
 msgid "  intel       Display instruction in Intel syntax\n"
 msgstr "  intel       Näyttää käskyn Intel-syntaksissa\n"
 
-#: i386-dis.c:11080
+#: i386-dis.c:10977
 #, c-format
 msgid ""
 "  att-mnemonic\n"
@@ -436,7 +435,7 @@ msgstr ""
 "  att-mnemonic\n"
 "              Näyttää käskyn AT&T-syntaksissa\n"
 
-#: i386-dis.c:11082
+#: i386-dis.c:10979
 #, c-format
 msgid ""
 "  intel-mnemonic\n"
@@ -445,87 +444,87 @@ msgstr ""
 "  intel-mnemonic\n"
 "              Näyttää käskyn Intel-syntaksissa\n"
 
-#: i386-dis.c:11084
+#: i386-dis.c:10981
 #, c-format
 msgid "  addr64      Assume 64bit address size\n"
 msgstr "  addr64      Otaksuu osoitekooksi 64 bittiä\n"
 
-#: i386-dis.c:11085
+#: i386-dis.c:10982
 #, c-format
 msgid "  addr32      Assume 32bit address size\n"
 msgstr "  addr32      Otaksuu osoitekooksi 32 bittiä\n"
 
-#: i386-dis.c:11086
+#: i386-dis.c:10983
 #, c-format
 msgid "  addr16      Assume 16bit address size\n"
 msgstr "  addr16      Otaksuu osoitekooksi 16 bittiä\n"
 
-#: i386-dis.c:11087
+#: i386-dis.c:10984
 #, c-format
 msgid "  data32      Assume 32bit data size\n"
 msgstr "  data32      Otaksuu datakooksi 32 bittiä\n"
 
-#: i386-dis.c:11088
+#: i386-dis.c:10985
 #, c-format
 msgid "  data16      Assume 16bit data size\n"
 msgstr "  data16      Otaksuu datakooksi 16 bittiä\n"
 
-#: i386-dis.c:11089
+#: i386-dis.c:10986
 #, c-format
 msgid "  suffix      Always display instruction suffix in AT&T syntax\n"
 msgstr "  suffix      Näyttää käskysuffiksin aina AT&T-syntaksissa\n"
 
-#: i386-gen.c:467 ia64-gen.c:307
+#: i386-gen.c:459 ia64-gen.c:307
 #, c-format
 msgid "%s: Error: "
 msgstr "%s: Virhe: "
 
-#: i386-gen.c:599
+#: i386-gen.c:591
 #, c-format
 msgid "%s: %d: Unknown bitfield: %s\n"
 msgstr "%s: %d: Tuntematon bittikenttä: %s\n"
 
-#: i386-gen.c:601
+#: i386-gen.c:593
 #, c-format
 msgid "Unknown bitfield: %s\n"
 msgstr "Tuntematon bittikenttä: %s\n"
 
-#: i386-gen.c:657
+#: i386-gen.c:649
 #, c-format
 msgid "%s: %d: Missing `)' in bitfield: %s\n"
 msgstr "%s: %d: Puuttuva �)� bittikentässä: %s\n"
 
-#: i386-gen.c:922
+#: i386-gen.c:914
 #, c-format
 msgid "can't find i386-opc.tbl for reading, errno = %s\n"
 msgstr "i386-opc.tbl ei löytynyt luettavaksi, virhenumero = %s\n"
 
-#: i386-gen.c:1053
+#: i386-gen.c:1045
 #, c-format
 msgid "can't find i386-reg.tbl for reading, errno = %s\n"
 msgstr "i386-reg.tbl ei löytynyt luettavaksi, virhenumero = %s\n"
 
-#: i386-gen.c:1130
+#: i386-gen.c:1122
 #, c-format
 msgid "can't create i386-init.h, errno = %s\n"
 msgstr "ei voi luoda tiedostoa i386-init.h, virhenumero = %s\n"
 
-#: i386-gen.c:1219 ia64-gen.c:2820
+#: i386-gen.c:1211 ia64-gen.c:2820
 #, c-format
 msgid "unable to change directory to \"%s\", errno = %s\n"
 msgstr "vaihtaminen hakemistoon �%s� ei onnistu, virhenumero = %s\n"
 
-#: i386-gen.c:1226
+#: i386-gen.c:1218
 #, c-format
 msgid "%d unused bits in i386_cpu_flags.\n"
 msgstr "%d käyttämätöntä bittiä i386_cpu_flags-lipussa.\n"
 
-#: i386-gen.c:1233
+#: i386-gen.c:1225
 #, c-format
 msgid "%d unused bits in i386_operand_type.\n"
 msgstr "%d käyttämätöntä bittiä i386_operand_type-lipussa.\n"
 
-#: i386-gen.c:1247
+#: i386-gen.c:1239
 #, c-format
 msgid "can't create i386-tbl.h, errno = %s\n"
 msgstr "ei voi luoda tiedostoa i386-tbl.h, virhenumero = %s\n"
@@ -667,7 +666,7 @@ msgstr "operandi ei ole rajojen sisällä (ei 1:n ja 255:n välillä)"
 #. Something is very wrong. opindex has to be one of the above.
 #: ip2k-asm.c:242
 msgid "parse_addr16: invalid opindex."
-msgstr "parse_addr16: virheellinen käskyindeksi."
+msgstr "parse_addr16: virheellinen käskyindeksi"
 
 #: ip2k-asm.c:296
 msgid "Byte address required. - must be even."
@@ -679,7 +678,7 @@ msgstr "cgen_parse_address palautti symbolin. Vaaditaan literaali."
 
 #: ip2k-asm.c:360
 msgid "percent-operator operand is not a symbol"
-msgstr "prosenttioperaattori-operandi ei ole symboli"
+msgstr "prosenttioperaattori-operandi ei ole symboli."
 
 #: ip2k-asm.c:413
 msgid "Attempt to find bit index of 0"
@@ -845,26 +844,26 @@ msgstr "Suora muistiosoitusarvo ei ole rajojen -128 ... 127 sisällä"
 msgid "Value is not aligned enough"
 msgstr "Uudelleensijoitusarvo ei ole tasarajalla"
 
-#: mips-dis.c:845
+#: mips-dis.c:841
 msgid "# internal error, incomplete extension sequence (+)"
 msgstr "# sisäinen virhe, epätäydellinen laajennussekvenssi (+)"
 
-#: mips-dis.c:1011
+#: mips-dis.c:975
 #, c-format
 msgid "# internal error, undefined extension sequence (+%c)"
 msgstr "# sisäinen virhe, määrittelemätön laajennussekvenssi (+%c)"
 
-#: mips-dis.c:1371
+#: mips-dis.c:1335
 #, c-format
 msgid "# internal error, undefined modifier (%c)"
 msgstr "# sisäinen virhe, määrittelemätön määrite (%c)"
 
-#: mips-dis.c:1975
+#: mips-dis.c:1939
 #, c-format
 msgid "# internal disassembler error, unrecognised modifier (%c)"
 msgstr "# sisäinen disassembler-virhe, tunnistamaton määrite (%c)"
 
-#: mips-dis.c:2213
+#: mips-dis.c:2177
 #, c-format
 msgid ""
 "\n"
@@ -875,7 +874,7 @@ msgstr ""
 "Seuraavat MIPS-kohtaiset disassembler-valinnat ovat tuettuja käyttöön\n"
 "-M -valinnan kanssa (monivalinnat pitää erottaa pilkulla):\n"
 
-#: mips-dis.c:2217
+#: mips-dis.c:2181
 #, c-format
 msgid ""
 "\n"
@@ -886,7 +885,7 @@ msgstr ""
 "  gpr-names=ABI            Tulosta GPR-nimet määritellyn ABI:n mukaisesti.\n"
 "                           Oletus: perustuu disassembloitavaan binääritiedostoon.\n"
 
-#: mips-dis.c:2221
+#: mips-dis.c:2185
 #, c-format
 msgid ""
 "\n"
@@ -897,7 +896,7 @@ msgstr ""
 "  fpr-names=ABI            Tulosta FPR-nimet määritellyn ABI:n mukaisesti.\n"
 "                           Oletus: numeerinen.\n"
 
-#: mips-dis.c:2225
+#: mips-dis.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -910,7 +909,7 @@ msgstr ""
 "                           määritellyn arkkitehtuurin mukaisesti.\n"
 "                           Oletus: perustuu disassemloitavaan binääritiedostoon.\n"
 
-#: mips-dis.c:2230
+#: mips-dis.c:2194
 #, c-format
 msgid ""
 "\n"
@@ -923,7 +922,7 @@ msgstr ""
 "\t\t\t   arkkitehtuurin mukaisesti.\n"
 "                           Oletus: perustuu disassembloitavaan binääritiedostoon.\n"
 
-#: mips-dis.c:2235
+#: mips-dis.c:2199
 #, c-format
 msgid ""
 "\n"
@@ -934,7 +933,7 @@ msgstr ""
 "  reg-names=ABI            Tulosta GPR- ja FPR-nimet määritellyn\n"
 "                           ABI:n mukaisesti.\n"
 
-#: mips-dis.c:2239
+#: mips-dis.c:2203
 #, c-format
 msgid ""
 "\n"
@@ -945,7 +944,7 @@ msgstr ""
 "  reg-names=ARCH           Tulosta CP0-rekisteri ja HWR-nimet määritellyn\n"
 "                           arkkitehtuurin mukaisesti.\n"
 
-#: mips-dis.c:2243
+#: mips-dis.c:2207
 #, c-format
 msgid ""
 "\n"
@@ -956,12 +955,12 @@ msgstr ""
 "  Ylläolevista valinnoista �ABI� tukee seuraavia arvoja:\n"
 "   "
 
-#: mips-dis.c:2248 mips-dis.c:2256 mips-dis.c:2258
+#: mips-dis.c:2212 mips-dis.c:2220 mips-dis.c:2222
 #, c-format
 msgid "\n"
 msgstr "\n"
 
-#: mips-dis.c:2250
+#: mips-dis.c:2214
 #, c-format
 msgid ""
 "\n"
@@ -1042,43 +1041,43 @@ msgstr ""
 "Seuraavia PPC-kohtaisia disassembler-valintoja tuetaan käytössä\n"
 "-M -valinnan kanssa:\n"
 
-#: ppc-opc.c:879 ppc-opc.c:907
+#: ppc-opc.c:878 ppc-opc.c:906
 msgid "invalid conditional option"
 msgstr "virheellinen ehdollinen valinta"
 
-#: ppc-opc.c:909
+#: ppc-opc.c:908
 msgid "attempt to set y bit when using + or - modifier"
 msgstr "yritys asettaa y-bitti kun käytetään + tai - määritettä"
 
-#: ppc-opc.c:941
+#: ppc-opc.c:940
 msgid "invalid mask field"
 msgstr "virheellinen peitekenttä"
 
-#: ppc-opc.c:967
+#: ppc-opc.c:966
 msgid "ignoring invalid mfcr mask"
 msgstr "virheellistä mfcr-peitettä ei oteta huomioon"
 
-#: ppc-opc.c:1017 ppc-opc.c:1052
+#: ppc-opc.c:1016 ppc-opc.c:1051
 msgid "illegal bitmask"
 msgstr "virheellinen bittipeite"
 
-#: ppc-opc.c:1172
+#: ppc-opc.c:1171
 msgid "index register in load range"
 msgstr "indeksirekisteri on latauslukurajojen sisällä"
 
-#: ppc-opc.c:1188
+#: ppc-opc.c:1187
 msgid "source and target register operands must be different"
 msgstr "lähde- ja kohderekisterin kohdemuuttujien on oltava erilaiset"
 
-#: ppc-opc.c:1203
+#: ppc-opc.c:1202
 msgid "invalid register operand when updating"
 msgstr "rekisterin operandi virheellinen päivitettäessä"
 
-#: ppc-opc.c:1282
+#: ppc-opc.c:1281
 msgid "invalid sprg number"
 msgstr "virheellinen sprg-numero"
 
-#: ppc-opc.c:1452
+#: ppc-opc.c:1451
 msgid "invalid constant"
 msgstr "virheellinen vakio"
 
@@ -1128,12 +1127,12 @@ msgstr "Sisäinen virhe: virheellinen sparc-opcode.h: �%s� == �%s�\n"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: v850-dis.c:372
+#: v850-dis.c:365
 #, c-format
 msgid "unknown operand shift: %x\n"
 msgstr "tuntematon operandin siirto: %x\n"
 
-#: v850-dis.c:384
+#: v850-dis.c:377
 #, c-format
 msgid "unknown reg: %d\n"
 msgstr "tuntematon rekisteri: %d\n"
diff --git a/opcodes/po/opcodes.pot b/opcodes/po/opcodes.pot
index 846f2a3d4d..ecdb232edd 100644
--- a/opcodes/po/opcodes.pot
+++ b/opcodes/po/opcodes.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2011-11-02 12:03+0000\n"
+"POT-Creation-Date: 2011-06-02 14:30+0100\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"
@@ -111,23 +111,23 @@ msgstr ""
 msgid "must specify .jd or no nullify suffix"
 msgstr ""
 
-#: arm-dis.c:2000
+#: arm-dis.c:1994
 msgid "<illegal precision>"
 msgstr ""
 
 #. XXX - should break 'option' at following delimiter.
-#: arm-dis.c:4395
+#: arm-dis.c:4376
 #, c-format
 msgid "Unrecognised register name set: %s\n"
 msgstr ""
 
 #. XXX - should break 'option' at following delimiter.
-#: arm-dis.c:4403
+#: arm-dis.c:4384
 #, c-format
 msgid "Unrecognised disassembler option: %s\n"
 msgstr ""
 
-#: arm-dis.c:4995
+#: arm-dis.c:4976
 #, c-format
 msgid ""
 "\n"
@@ -135,25 +135,25 @@ msgid ""
 "the -M switch:\n"
 msgstr ""
 
-#: avr-dis.c:115 avr-dis.c:136
+#: avr-dis.c:115 avr-dis.c:135
 #, c-format
 msgid "undefined"
 msgstr ""
 
-#: avr-dis.c:198
+#: avr-dis.c:197
 #, c-format
 msgid "Internal disassembler error"
 msgstr ""
 
-#: avr-dis.c:251
+#: avr-dis.c:250
 #, c-format
 msgid "unknown constraint `%c'"
 msgstr ""
 
-#: cgen-asm.c:336 epiphany-ibld.c:201 fr30-ibld.c:201 frv-ibld.c:201
-#: ip2k-ibld.c:201 iq2000-ibld.c:201 lm32-ibld.c:201 m32c-ibld.c:201
-#: m32r-ibld.c:201 mep-ibld.c:201 mt-ibld.c:201 openrisc-ibld.c:201
-#: xc16x-ibld.c:201 xstormy16-ibld.c:201
+#: cgen-asm.c:336 fr30-ibld.c:201 frv-ibld.c:201 ip2k-ibld.c:201
+#: iq2000-ibld.c:201 lm32-ibld.c:201 m32c-ibld.c:201 m32r-ibld.c:201
+#: mep-ibld.c:201 mt-ibld.c:201 openrisc-ibld.c:201 xc16x-ibld.c:201
+#: xstormy16-ibld.c:201
 #, c-format
 msgid "operand out of range (%ld not between %ld and %ld)"
 msgstr ""
@@ -179,58 +179,36 @@ msgstr ""
 msgid "Address 0x%s is out of bounds.\n"
 msgstr ""
 
-#: epiphany-asm.c:68
-msgid "register unavailable for short instructions"
-msgstr ""
-
-#: epiphany-asm.c:115
-msgid "register name used as immediate value"
-msgstr ""
-
-#. Don't treat "mov ip,ip" as a move-immediate.
-#: epiphany-asm.c:178 epiphany-asm.c:234
-msgid "register source in immediate move"
-msgstr ""
-
-#: epiphany-asm.c:187
-msgid "byte relocation unsupported"
+#: fr30-asm.c:93 m32c-asm.c:872 m32c-asm.c:879
+msgid "Register number is not valid"
 msgstr ""
 
-#. -- assembler routines inserted here.
-#. -- asm.c
-#: epiphany-asm.c:193 frv-asm.c:972 iq2000-asm.c:56 lm32-asm.c:95
-#: lm32-asm.c:127 lm32-asm.c:157 lm32-asm.c:187 lm32-asm.c:217 lm32-asm.c:247
-#: m32c-asm.c:140 m32c-asm.c:235 m32c-asm.c:276 m32c-asm.c:334 m32c-asm.c:355
-#: m32r-asm.c:53 mep-asm.c:241 mep-asm.c:259 mep-asm.c:274 mep-asm.c:289
-#: mep-asm.c:301 openrisc-asm.c:54
-msgid "missing `)'"
+#: fr30-asm.c:95
+msgid "Register must be between r0 and r7"
 msgstr ""
 
-#: epiphany-asm.c:270
-msgid "ABORT: unknown operand"
+#: fr30-asm.c:97
+msgid "Register must be between r8 and r15"
 msgstr ""
 
-#: epiphany-asm.c:296
-msgid "Not a pc-relative address."
+#: fr30-asm.c:116 m32c-asm.c:910
+msgid "Register list is not valid"
 msgstr ""
 
-#: epiphany-asm.c:455 fr30-asm.c:310 frv-asm.c:1263 ip2k-asm.c:511
-#: iq2000-asm.c:459 lm32-asm.c:349 m32c-asm.c:1584 m32r-asm.c:328
-#: mep-asm.c:1286 mt-asm.c:595 openrisc-asm.c:241 xc16x-asm.c:376
-#: xstormy16-asm.c:276
+#: fr30-asm.c:310 frv-asm.c:1263 ip2k-asm.c:511 iq2000-asm.c:459
+#: lm32-asm.c:349 m32c-asm.c:1584 m32r-asm.c:328 mep-asm.c:1286 mt-asm.c:595
+#: openrisc-asm.c:241 xc16x-asm.c:376 xstormy16-asm.c:276
 #, c-format
 msgid "Unrecognized field %d while parsing.\n"
 msgstr ""
 
-#: epiphany-asm.c:506 fr30-asm.c:361 frv-asm.c:1314 ip2k-asm.c:562
-#: iq2000-asm.c:510 lm32-asm.c:400 m32c-asm.c:1635 m32r-asm.c:379
-#: mep-asm.c:1337 mt-asm.c:646 openrisc-asm.c:292 xc16x-asm.c:427
-#: xstormy16-asm.c:327
+#: fr30-asm.c:361 frv-asm.c:1314 ip2k-asm.c:562 iq2000-asm.c:510
+#: lm32-asm.c:400 m32c-asm.c:1635 m32r-asm.c:379 mep-asm.c:1337 mt-asm.c:646
+#: openrisc-asm.c:292 xc16x-asm.c:427 xstormy16-asm.c:327
 msgid "missing mnemonic in syntax string"
 msgstr ""
 
 #. We couldn't parse it.
-#: epiphany-asm.c:641 epiphany-asm.c:645 epiphany-asm.c:734 epiphany-asm.c:841
 #: fr30-asm.c:496 fr30-asm.c:500 fr30-asm.c:589 fr30-asm.c:696 frv-asm.c:1449
 #: frv-asm.c:1453 frv-asm.c:1542 frv-asm.c:1649 ip2k-asm.c:697 ip2k-asm.c:701
 #: ip2k-asm.c:790 ip2k-asm.c:897 iq2000-asm.c:645 iq2000-asm.c:649
@@ -246,147 +224,116 @@ msgstr ""
 msgid "unrecognized instruction"
 msgstr ""
 
-#: epiphany-asm.c:688 fr30-asm.c:543 frv-asm.c:1496 ip2k-asm.c:744
-#: iq2000-asm.c:692 lm32-asm.c:582 m32c-asm.c:1817 m32r-asm.c:561
-#: mep-asm.c:1519 mt-asm.c:828 openrisc-asm.c:474 xc16x-asm.c:609
-#: xstormy16-asm.c:509
+#: fr30-asm.c:543 frv-asm.c:1496 ip2k-asm.c:744 iq2000-asm.c:692
+#: lm32-asm.c:582 m32c-asm.c:1817 m32r-asm.c:561 mep-asm.c:1519 mt-asm.c:828
+#: openrisc-asm.c:474 xc16x-asm.c:609 xstormy16-asm.c:509
 #, c-format
 msgid "syntax error (expected char `%c', found `%c')"
 msgstr ""
 
-#: epiphany-asm.c:698 fr30-asm.c:553 frv-asm.c:1506 ip2k-asm.c:754
-#: iq2000-asm.c:702 lm32-asm.c:592 m32c-asm.c:1827 m32r-asm.c:571
-#: mep-asm.c:1529 mt-asm.c:838 openrisc-asm.c:484 xc16x-asm.c:619
-#: xstormy16-asm.c:519
+#: fr30-asm.c:553 frv-asm.c:1506 ip2k-asm.c:754 iq2000-asm.c:702
+#: lm32-asm.c:592 m32c-asm.c:1827 m32r-asm.c:571 mep-asm.c:1529 mt-asm.c:838
+#: openrisc-asm.c:484 xc16x-asm.c:619 xstormy16-asm.c:519
 #, c-format
 msgid "syntax error (expected char `%c', found end of instruction)"
 msgstr ""
 
-#: epiphany-asm.c:728 fr30-asm.c:583 frv-asm.c:1536 ip2k-asm.c:784
-#: iq2000-asm.c:732 lm32-asm.c:622 m32c-asm.c:1857 m32r-asm.c:601
-#: mep-asm.c:1559 mt-asm.c:868 openrisc-asm.c:514 xc16x-asm.c:649
-#: xstormy16-asm.c:549
+#: fr30-asm.c:583 frv-asm.c:1536 ip2k-asm.c:784 iq2000-asm.c:732
+#: lm32-asm.c:622 m32c-asm.c:1857 m32r-asm.c:601 mep-asm.c:1559 mt-asm.c:868
+#: openrisc-asm.c:514 xc16x-asm.c:649 xstormy16-asm.c:549
 msgid "junk at end of line"
 msgstr ""
 
-#: epiphany-asm.c:840 fr30-asm.c:695 frv-asm.c:1648 ip2k-asm.c:896
-#: iq2000-asm.c:844 lm32-asm.c:734 m32c-asm.c:1969 m32r-asm.c:713
-#: mep-asm.c:1671 mt-asm.c:980 openrisc-asm.c:626 xc16x-asm.c:761
-#: xstormy16-asm.c:661
+#: fr30-asm.c:695 frv-asm.c:1648 ip2k-asm.c:896 iq2000-asm.c:844
+#: lm32-asm.c:734 m32c-asm.c:1969 m32r-asm.c:713 mep-asm.c:1671 mt-asm.c:980
+#: openrisc-asm.c:626 xc16x-asm.c:761 xstormy16-asm.c:661
 msgid "unrecognized form of instruction"
 msgstr ""
 
-#: epiphany-asm.c:854 fr30-asm.c:709 frv-asm.c:1662 ip2k-asm.c:910
-#: iq2000-asm.c:858 lm32-asm.c:748 m32c-asm.c:1983 m32r-asm.c:727
-#: mep-asm.c:1685 mt-asm.c:994 openrisc-asm.c:640 xc16x-asm.c:775
-#: xstormy16-asm.c:675
+#: fr30-asm.c:709 frv-asm.c:1662 ip2k-asm.c:910 iq2000-asm.c:858
+#: lm32-asm.c:748 m32c-asm.c:1983 m32r-asm.c:727 mep-asm.c:1685 mt-asm.c:994
+#: openrisc-asm.c:640 xc16x-asm.c:775 xstormy16-asm.c:675
 #, c-format
 msgid "bad instruction `%.50s...'"
 msgstr ""
 
-#: epiphany-asm.c:857 fr30-asm.c:712 frv-asm.c:1665 ip2k-asm.c:913
-#: iq2000-asm.c:861 lm32-asm.c:751 m32c-asm.c:1986 m32r-asm.c:730
-#: mep-asm.c:1688 mt-asm.c:997 openrisc-asm.c:643 xc16x-asm.c:778
-#: xstormy16-asm.c:678
+#: fr30-asm.c:712 frv-asm.c:1665 ip2k-asm.c:913 iq2000-asm.c:861
+#: lm32-asm.c:751 m32c-asm.c:1986 m32r-asm.c:730 mep-asm.c:1688 mt-asm.c:997
+#: openrisc-asm.c:643 xc16x-asm.c:778 xstormy16-asm.c:678
 #, c-format
 msgid "bad instruction `%.50s'"
 msgstr ""
 
 #. Default text to print if an instruction isn't recognized.
-#: epiphany-dis.c:41 fr30-dis.c:41 frv-dis.c:41 ip2k-dis.c:41 iq2000-dis.c:41
-#: lm32-dis.c:41 m32c-dis.c:41 m32r-dis.c:41 mep-dis.c:41 mmix-dis.c:277
-#: mt-dis.c:41 openrisc-dis.c:41 xc16x-dis.c:41 xstormy16-dis.c:41
+#: fr30-dis.c:41 frv-dis.c:41 ip2k-dis.c:41 iq2000-dis.c:41 lm32-dis.c:41
+#: m32c-dis.c:41 m32r-dis.c:41 mep-dis.c:41 mmix-dis.c:277 mt-dis.c:41
+#: openrisc-dis.c:41 xc16x-dis.c:41 xstormy16-dis.c:41
 msgid "*unknown*"
 msgstr ""
 
-#: epiphany-dis.c:277 fr30-dis.c:299 frv-dis.c:396 ip2k-dis.c:288
-#: iq2000-dis.c:189 lm32-dis.c:147 m32c-dis.c:891 m32r-dis.c:279
-#: mep-dis.c:1187 mt-dis.c:290 openrisc-dis.c:135 xc16x-dis.c:420
-#: xstormy16-dis.c:168
+#: fr30-dis.c:299 frv-dis.c:396 ip2k-dis.c:288 iq2000-dis.c:189 lm32-dis.c:147
+#: m32c-dis.c:891 m32r-dis.c:279 mep-dis.c:1187 mt-dis.c:290
+#: openrisc-dis.c:135 xc16x-dis.c:420 xstormy16-dis.c:168
 #, c-format
 msgid "Unrecognized field %d while printing insn.\n"
 msgstr ""
 
-#: epiphany-ibld.c:164 fr30-ibld.c:164 frv-ibld.c:164 ip2k-ibld.c:164
-#: iq2000-ibld.c:164 lm32-ibld.c:164 m32c-ibld.c:164 m32r-ibld.c:164
-#: mep-ibld.c:164 mt-ibld.c:164 openrisc-ibld.c:164 xc16x-ibld.c:164
-#: xstormy16-ibld.c:164
+#: fr30-ibld.c:164 frv-ibld.c:164 ip2k-ibld.c:164 iq2000-ibld.c:164
+#: lm32-ibld.c:164 m32c-ibld.c:164 m32r-ibld.c:164 mep-ibld.c:164
+#: mt-ibld.c:164 openrisc-ibld.c:164 xc16x-ibld.c:164 xstormy16-ibld.c:164
 #, c-format
 msgid "operand out of range (%ld not between %ld and %lu)"
 msgstr ""
 
-#: epiphany-ibld.c:185 fr30-ibld.c:185 frv-ibld.c:185 ip2k-ibld.c:185
-#: iq2000-ibld.c:185 lm32-ibld.c:185 m32c-ibld.c:185 m32r-ibld.c:185
-#: mep-ibld.c:185 mt-ibld.c:185 openrisc-ibld.c:185 xc16x-ibld.c:185
-#: xstormy16-ibld.c:185
+#: fr30-ibld.c:185 frv-ibld.c:185 ip2k-ibld.c:185 iq2000-ibld.c:185
+#: lm32-ibld.c:185 m32c-ibld.c:185 m32r-ibld.c:185 mep-ibld.c:185
+#: mt-ibld.c:185 openrisc-ibld.c:185 xc16x-ibld.c:185 xstormy16-ibld.c:185
 #, c-format
 msgid "operand out of range (0x%lx not between 0 and 0x%lx)"
 msgstr ""
 
-#: epiphany-ibld.c:872 fr30-ibld.c:727 frv-ibld.c:853 ip2k-ibld.c:604
-#: iq2000-ibld.c:710 lm32-ibld.c:631 m32c-ibld.c:1728 m32r-ibld.c:662
-#: mep-ibld.c:1205 mt-ibld.c:746 openrisc-ibld.c:630 xc16x-ibld.c:749
-#: xstormy16-ibld.c:675
+#: fr30-ibld.c:727 frv-ibld.c:853 ip2k-ibld.c:604 iq2000-ibld.c:710
+#: lm32-ibld.c:631 m32c-ibld.c:1728 m32r-ibld.c:662 mep-ibld.c:1205
+#: mt-ibld.c:746 openrisc-ibld.c:630 xc16x-ibld.c:749 xstormy16-ibld.c:675
 #, c-format
 msgid "Unrecognized field %d while building insn.\n"
 msgstr ""
 
-#: epiphany-ibld.c:1166 fr30-ibld.c:932 frv-ibld.c:1170 ip2k-ibld.c:679
-#: iq2000-ibld.c:885 lm32-ibld.c:735 m32c-ibld.c:2889 m32r-ibld.c:799
-#: mep-ibld.c:1804 mt-ibld.c:966 openrisc-ibld.c:730 xc16x-ibld.c:969
-#: xstormy16-ibld.c:821
+#: fr30-ibld.c:932 frv-ibld.c:1170 ip2k-ibld.c:679 iq2000-ibld.c:885
+#: lm32-ibld.c:735 m32c-ibld.c:2889 m32r-ibld.c:799 mep-ibld.c:1804
+#: mt-ibld.c:966 openrisc-ibld.c:730 xc16x-ibld.c:969 xstormy16-ibld.c:821
 #, c-format
 msgid "Unrecognized field %d while decoding insn.\n"
 msgstr ""
 
-#: epiphany-ibld.c:1309 fr30-ibld.c:1078 frv-ibld.c:1448 ip2k-ibld.c:753
-#: iq2000-ibld.c:1016 lm32-ibld.c:824 m32c-ibld.c:3506 m32r-ibld.c:912
-#: mep-ibld.c:2274 mt-ibld.c:1166 openrisc-ibld.c:807 xc16x-ibld.c:1190
-#: xstormy16-ibld.c:931
+#: fr30-ibld.c:1078 frv-ibld.c:1448 ip2k-ibld.c:753 iq2000-ibld.c:1016
+#: lm32-ibld.c:824 m32c-ibld.c:3506 m32r-ibld.c:912 mep-ibld.c:2274
+#: mt-ibld.c:1166 openrisc-ibld.c:807 xc16x-ibld.c:1190 xstormy16-ibld.c:931
 #, c-format
 msgid "Unrecognized field %d while getting int operand.\n"
 msgstr ""
 
-#: epiphany-ibld.c:1434 fr30-ibld.c:1206 frv-ibld.c:1708 ip2k-ibld.c:809
-#: iq2000-ibld.c:1129 lm32-ibld.c:895 m32c-ibld.c:4105 m32r-ibld.c:1007
-#: mep-ibld.c:2726 mt-ibld.c:1348 openrisc-ibld.c:866 xc16x-ibld.c:1393
-#: xstormy16-ibld.c:1023
+#: fr30-ibld.c:1206 frv-ibld.c:1708 ip2k-ibld.c:809 iq2000-ibld.c:1129
+#: lm32-ibld.c:895 m32c-ibld.c:4105 m32r-ibld.c:1007 mep-ibld.c:2726
+#: mt-ibld.c:1348 openrisc-ibld.c:866 xc16x-ibld.c:1393 xstormy16-ibld.c:1023
 #, c-format
 msgid "Unrecognized field %d while getting vma operand.\n"
 msgstr ""
 
-#: epiphany-ibld.c:1566 fr30-ibld.c:1337 frv-ibld.c:1975 ip2k-ibld.c:868
-#: iq2000-ibld.c:1249 lm32-ibld.c:973 m32c-ibld.c:4692 m32r-ibld.c:1108
-#: mep-ibld.c:3139 mt-ibld.c:1537 openrisc-ibld.c:932 xc16x-ibld.c:1597
-#: xstormy16-ibld.c:1122
+#: fr30-ibld.c:1337 frv-ibld.c:1975 ip2k-ibld.c:868 iq2000-ibld.c:1249
+#: lm32-ibld.c:973 m32c-ibld.c:4692 m32r-ibld.c:1108 mep-ibld.c:3139
+#: mt-ibld.c:1537 openrisc-ibld.c:932 xc16x-ibld.c:1597 xstormy16-ibld.c:1122
 #, c-format
 msgid "Unrecognized field %d while setting int operand.\n"
 msgstr ""
 
-#: epiphany-ibld.c:1688 fr30-ibld.c:1458 frv-ibld.c:2232 ip2k-ibld.c:917
-#: iq2000-ibld.c:1359 lm32-ibld.c:1041 m32c-ibld.c:5269 m32r-ibld.c:1199
-#: mep-ibld.c:3542 mt-ibld.c:1716 openrisc-ibld.c:988 xc16x-ibld.c:1791
-#: xstormy16-ibld.c:1211
+#: fr30-ibld.c:1458 frv-ibld.c:2232 ip2k-ibld.c:917 iq2000-ibld.c:1359
+#: lm32-ibld.c:1041 m32c-ibld.c:5269 m32r-ibld.c:1199 mep-ibld.c:3542
+#: mt-ibld.c:1716 openrisc-ibld.c:988 xc16x-ibld.c:1791 xstormy16-ibld.c:1211
 #, c-format
 msgid "Unrecognized field %d while setting vma operand.\n"
 msgstr ""
 
-#: fr30-asm.c:93 m32c-asm.c:872 m32c-asm.c:879
-msgid "Register number is not valid"
-msgstr ""
-
-#: fr30-asm.c:95
-msgid "Register must be between r0 and r7"
-msgstr ""
-
-#: fr30-asm.c:97
-msgid "Register must be between r8 and r15"
-msgstr ""
-
-#: fr30-asm.c:116 m32c-asm.c:910
-msgid "Register list is not valid"
-msgstr ""
-
 #: frv-asm.c:608
 msgid "missing `]'"
 msgstr ""
@@ -403,6 +350,15 @@ msgstr ""
 msgid "register number must be even"
 msgstr ""
 
+#. -- assembler routines inserted here.
+#. -- asm.c
+#: frv-asm.c:972 iq2000-asm.c:56 lm32-asm.c:95 lm32-asm.c:127 lm32-asm.c:157
+#: lm32-asm.c:187 lm32-asm.c:217 lm32-asm.c:247 m32c-asm.c:140 m32c-asm.c:235
+#: m32c-asm.c:276 m32c-asm.c:334 m32c-asm.c:355 m32r-asm.c:53 mep-asm.c:241
+#: mep-asm.c:259 mep-asm.c:274 mep-asm.c:289 mep-asm.c:301 openrisc-asm.c:54
+msgid "missing `)'"
+msgstr ""
+
 #: h8300-dis.c:314
 #, c-format
 msgid "Hmmmm 0x%x"
@@ -424,11 +380,11 @@ msgstr ""
 msgid "%02x\t\t*unknown*"
 msgstr ""
 
-#: i386-dis.c:10504
+#: i386-dis.c:10774
 msgid "<internal disassembler error>"
 msgstr ""
 
-#: i386-dis.c:10801
+#: i386-dis.c:11071
 #, c-format
 msgid ""
 "\n"
@@ -437,126 +393,126 @@ msgid ""
 "with the -M switch (multiple options should be separated by commas):\n"
 msgstr ""
 
-#: i386-dis.c:10805
+#: i386-dis.c:11075
 #, c-format
 msgid "  x86-64      Disassemble in 64bit mode\n"
 msgstr ""
 
-#: i386-dis.c:10806
+#: i386-dis.c:11076
 #, c-format
 msgid "  i386        Disassemble in 32bit mode\n"
 msgstr ""
 
-#: i386-dis.c:10807
+#: i386-dis.c:11077
 #, c-format
 msgid "  i8086       Disassemble in 16bit mode\n"
 msgstr ""
 
-#: i386-dis.c:10808
+#: i386-dis.c:11078
 #, c-format
 msgid "  att         Display instruction in AT&T syntax\n"
 msgstr ""
 
-#: i386-dis.c:10809
+#: i386-dis.c:11079
 #, c-format
 msgid "  intel       Display instruction in Intel syntax\n"
 msgstr ""
 
-#: i386-dis.c:10810
+#: i386-dis.c:11080
 #, c-format
 msgid ""
 "  att-mnemonic\n"
 "              Display instruction in AT&T mnemonic\n"
 msgstr ""
 
-#: i386-dis.c:10812
+#: i386-dis.c:11082
 #, c-format
 msgid ""
 "  intel-mnemonic\n"
 "              Display instruction in Intel mnemonic\n"
 msgstr ""
 
-#: i386-dis.c:10814
+#: i386-dis.c:11084
 #, c-format
 msgid "  addr64      Assume 64bit address size\n"
 msgstr ""
 
-#: i386-dis.c:10815
+#: i386-dis.c:11085
 #, c-format
 msgid "  addr32      Assume 32bit address size\n"
 msgstr ""
 
-#: i386-dis.c:10816
+#: i386-dis.c:11086
 #, c-format
 msgid "  addr16      Assume 16bit address size\n"
 msgstr ""
 
-#: i386-dis.c:10817
+#: i386-dis.c:11087
 #, c-format
 msgid "  data32      Assume 32bit data size\n"
 msgstr ""
 
-#: i386-dis.c:10818
+#: i386-dis.c:11088
 #, c-format
 msgid "  data16      Assume 16bit data size\n"
 msgstr ""
 
-#: i386-dis.c:10819
+#: i386-dis.c:11089
 #, c-format
 msgid "  suffix      Always display instruction suffix in AT&T syntax\n"
 msgstr ""
 
-#: i386-gen.c:483 ia64-gen.c:307
+#: i386-gen.c:467 ia64-gen.c:307
 #, c-format
 msgid "%s: Error: "
 msgstr ""
 
-#: i386-gen.c:615
+#: i386-gen.c:599
 #, c-format
 msgid "%s: %d: Unknown bitfield: %s\n"
 msgstr ""
 
-#: i386-gen.c:617
+#: i386-gen.c:601
 #, c-format
 msgid "Unknown bitfield: %s\n"
 msgstr ""
 
-#: i386-gen.c:673
+#: i386-gen.c:657
 #, c-format
 msgid "%s: %d: Missing `)' in bitfield: %s\n"
 msgstr ""
 
-#: i386-gen.c:938
+#: i386-gen.c:922
 #, c-format
 msgid "can't find i386-opc.tbl for reading, errno = %s\n"
 msgstr ""
 
-#: i386-gen.c:1069
+#: i386-gen.c:1053
 #, c-format
 msgid "can't find i386-reg.tbl for reading, errno = %s\n"
 msgstr ""
 
-#: i386-gen.c:1146
+#: i386-gen.c:1130
 #, c-format
 msgid "can't create i386-init.h, errno = %s\n"
 msgstr ""
 
-#: i386-gen.c:1235 ia64-gen.c:2820
+#: i386-gen.c:1219 ia64-gen.c:2820
 #, c-format
 msgid "unable to change directory to \"%s\", errno = %s\n"
 msgstr ""
 
-#: i386-gen.c:1242
+#: i386-gen.c:1226
 #, c-format
 msgid "%d unused bits in i386_cpu_flags.\n"
 msgstr ""
 
-#: i386-gen.c:1249
+#: i386-gen.c:1233
 #, c-format
 msgid "%d unused bits in i386_operand_type.\n"
 msgstr ""
 
-#: i386-gen.c:1263
+#: i386-gen.c:1247
 #, c-format
 msgid "can't create i386-tbl.h, errno = %s\n"
 msgstr ""
@@ -874,41 +830,26 @@ msgstr ""
 msgid "Value is not aligned enough"
 msgstr ""
 
-#: mips-dis.c:947
+#: mips-dis.c:845
 msgid "# internal error, incomplete extension sequence (+)"
 msgstr ""
 
-#: mips-dis.c:1113
+#: mips-dis.c:1011
 #, c-format
 msgid "# internal error, undefined extension sequence (+%c)"
 msgstr ""
 
-#: mips-dis.c:1485
+#: mips-dis.c:1371
 #, c-format
 msgid "# internal error, undefined modifier (%c)"
 msgstr ""
 
-#: mips-dis.c:2089
+#: mips-dis.c:1975
 #, c-format
 msgid "# internal disassembler error, unrecognised modifier (%c)"
 msgstr ""
 
-#: mips-dis.c:2664
-#, c-format
-msgid "# internal disassembler error, unrecognized modifier (+%c)"
-msgstr ""
-
-#: mips-dis.c:2894
-#, c-format
-msgid "# internal disassembler error, unrecognized modifier (m%c)"
-msgstr ""
-
-#: mips-dis.c:2904
-#, c-format
-msgid "# internal disassembler error, unrecognized modifier (%c)"
-msgstr ""
-
-#: mips-dis.c:3052
+#: mips-dis.c:2213
 #, c-format
 msgid ""
 "\n"
@@ -916,7 +857,7 @@ msgid ""
 "with the -M switch (multiple options should be separated by commas):\n"
 msgstr ""
 
-#: mips-dis.c:3056
+#: mips-dis.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -924,7 +865,7 @@ msgid ""
 "                           Default: based on binary being disassembled.\n"
 msgstr ""
 
-#: mips-dis.c:3060
+#: mips-dis.c:2221
 #, c-format
 msgid ""
 "\n"
@@ -932,7 +873,7 @@ msgid ""
 "                           Default: numeric.\n"
 msgstr ""
 
-#: mips-dis.c:3064
+#: mips-dis.c:2225
 #, c-format
 msgid ""
 "\n"
@@ -941,7 +882,7 @@ msgid ""
 "                           Default: based on binary being disassembled.\n"
 msgstr ""
 
-#: mips-dis.c:3069
+#: mips-dis.c:2230
 #, c-format
 msgid ""
 "\n"
@@ -950,7 +891,7 @@ msgid ""
 "                           Default: based on binary being disassembled.\n"
 msgstr ""
 
-#: mips-dis.c:3074
+#: mips-dis.c:2235
 #, c-format
 msgid ""
 "\n"
@@ -958,7 +899,7 @@ msgid ""
 "                           specified ABI.\n"
 msgstr ""
 
-#: mips-dis.c:3078
+#: mips-dis.c:2239
 #, c-format
 msgid ""
 "\n"
@@ -966,7 +907,7 @@ msgid ""
 "                           specified architecture.\n"
 msgstr ""
 
-#: mips-dis.c:3082
+#: mips-dis.c:2243
 #, c-format
 msgid ""
 "\n"
@@ -974,12 +915,12 @@ msgid ""
 "   "
 msgstr ""
 
-#: mips-dis.c:3087 mips-dis.c:3095 mips-dis.c:3097
+#: mips-dis.c:2248 mips-dis.c:2256 mips-dis.c:2258
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: mips-dis.c:3089
+#: mips-dis.c:2250
 #, c-format
 msgid ""
 "\n"
@@ -1054,51 +995,43 @@ msgid ""
 "the -M switch:\n"
 msgstr ""
 
-#: ppc-opc.c:906 ppc-opc.c:936
+#: ppc-opc.c:879 ppc-opc.c:907
 msgid "invalid conditional option"
 msgstr ""
 
-#: ppc-opc.c:908 ppc-opc.c:938
-msgid "invalid counter access"
-msgstr ""
-
-#: ppc-opc.c:940
+#: ppc-opc.c:909
 msgid "attempt to set y bit when using + or - modifier"
 msgstr ""
 
-#: ppc-opc.c:972
+#: ppc-opc.c:941
 msgid "invalid mask field"
 msgstr ""
 
-#: ppc-opc.c:998
+#: ppc-opc.c:967
 msgid "ignoring invalid mfcr mask"
 msgstr ""
 
-#: ppc-opc.c:1048 ppc-opc.c:1083
+#: ppc-opc.c:1017 ppc-opc.c:1052
 msgid "illegal bitmask"
 msgstr ""
 
-#: ppc-opc.c:1170
-msgid "address register in load range"
-msgstr ""
-
-#: ppc-opc.c:1223
+#: ppc-opc.c:1172
 msgid "index register in load range"
 msgstr ""
 
-#: ppc-opc.c:1239 ppc-opc.c:1295
+#: ppc-opc.c:1188
 msgid "source and target register operands must be different"
 msgstr ""
 
-#: ppc-opc.c:1254
+#: ppc-opc.c:1203
 msgid "invalid register operand when updating"
 msgstr ""
 
-#: ppc-opc.c:1349
+#: ppc-opc.c:1282
 msgid "invalid sprg number"
 msgstr ""
 
-#: ppc-opc.c:1519
+#: ppc-opc.c:1452
 msgid "invalid constant"
 msgstr ""
 
@@ -1125,23 +1058,23 @@ msgstr ""
 msgid "<illegal instruction>"
 msgstr ""
 
-#: sparc-dis.c:285
+#: sparc-dis.c:283
 #, c-format
 msgid "Internal error:  bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n"
 msgstr ""
 
-#: sparc-dis.c:296
+#: sparc-dis.c:294
 #, c-format
 msgid "Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n"
 msgstr ""
 
-#: sparc-dis.c:346
+#: sparc-dis.c:344
 #, c-format
 msgid "Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n"
 msgstr ""
 
 #. Mark as non-valid instruction.
-#: sparc-dis.c:1028
+#: sparc-dis.c:1015
 msgid "unknown"
 msgstr ""
 
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index da72fcf1d7..8771f95b15 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -1,6 +1,6 @@
 /* ppc-dis.c -- Disassemble PowerPC instructions
    Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   2008, 2009, 2010 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
    This file is part of the GNU opcodes library.
@@ -38,7 +38,7 @@ struct dis_private
 {
   /* Stash the result of parsing disassembler_options here.  */
   ppc_cpu_t dialect;
-} private;
+};
 
 #define POWERPC_DIALECT(INFO) \
   (((struct dis_private *) ((INFO)->private_data))->dialect)
@@ -114,18 +114,6 @@ struct ppc_mopt ppc_opts[] = {
 		| PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_POWER5
 		| PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7),
     0 },
-  { "e5500",    (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
-		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
-		| PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_POWER4
-		| PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
-		| PPC_OPCODE_POWER7),
-    0 },
-  { "e6500",   (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
-		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
-		| PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_ALTIVEC
-		| PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_E6500 | PPC_OPCODE_POWER4
-		| PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7),
-    0 },
   { "e500x2",  (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE
 		| PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
 		| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
@@ -217,7 +205,7 @@ ppc_parse_cpu (ppc_cpu_t ppc_cpu, const char *arg)
 
 /* Determine which set of machines to disassemble for.  */
 
-static void
+static int
 powerpc_init_dialect (struct disassemble_info *info)
 {
   ppc_cpu_t dialect = 0;
@@ -225,7 +213,7 @@ powerpc_init_dialect (struct disassemble_info *info)
   struct dis_private *priv = calloc (sizeof (*priv), 1);
 
   if (priv == NULL)
-    priv = &private;
+    return FALSE;
 
   arg = info->disassembler_options;
   while (arg != NULL)
@@ -263,37 +251,8 @@ powerpc_init_dialect (struct disassemble_info *info)
 
   info->private_data = priv;
   POWERPC_DIALECT(info) = dialect;
-}
-
-static unsigned short powerpc_opcd_indices[65];
-
-/* Calculate opcode table indices to speed up disassembly,
-   and init dialect.  */
-
-void
-disassemble_init_powerpc (struct disassemble_info *info)
-{
-  int i;
-  unsigned short last;
-
-  i = powerpc_num_opcodes;
-  while (--i >= 0)
-    {
-      unsigned op = PPC_OP (powerpc_opcodes[i].opcode);
-
-      powerpc_opcd_indices[op] = i;
-    }
-
-  last = powerpc_num_opcodes;
-  for (i = 64; i > 0; --i)
-    {
-      if (powerpc_opcd_indices[i] == 0)
-	powerpc_opcd_indices[i] = last;
-      last = powerpc_opcd_indices[i];
-    }
 
-  if (info->arch == bfd_arch_powerpc)
-    powerpc_init_dialect (info);
+  return TRUE;
 }
 
 /* Print a big endian PowerPC instruction.  */
@@ -301,6 +260,8 @@ disassemble_init_powerpc (struct disassemble_info *info)
 int
 print_insn_big_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 {
+  if (info->private_data == NULL && !powerpc_init_dialect (info))
+    return -1;
   return print_insn_powerpc (memaddr, info, 1, POWERPC_DIALECT(info));
 }
 
@@ -309,6 +270,8 @@ print_insn_big_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 int
 print_insn_little_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 {
+  if (info->private_data == NULL && !powerpc_init_dialect (info))
+    return -1;
   return print_insn_powerpc (memaddr, info, 0, POWERPC_DIALECT(info));
 }
 
@@ -370,52 +333,6 @@ skip_optional_operands (const unsigned char *opindex,
   return 1;
 }
 
-/* Find a match for INSN in the opcode table, given machine DIALECT.
-   A DIALECT of -1 is special, matching all machine opcode variations.  */
-   
-static const struct powerpc_opcode *
-lookup_powerpc (unsigned long insn, ppc_cpu_t dialect)
-{
-  const struct powerpc_opcode *opcode;
-  const struct powerpc_opcode *opcode_end;
-  unsigned long op;
-
-  /* Get the major opcode of the instruction.  */
-  op = PPC_OP (insn);
-
-  /* Find the first match in the opcode table for this major opcode.  */
-  opcode_end = powerpc_opcodes + powerpc_opcd_indices[op + 1];
-  for (opcode = powerpc_opcodes + powerpc_opcd_indices[op];
-       opcode < opcode_end;
-       ++opcode)
-    {
-      const unsigned char *opindex;
-      const struct powerpc_operand *operand;
-      int invalid;
-
-      if ((insn & opcode->mask) != opcode->opcode
-	  || (dialect != (ppc_cpu_t) -1
-	      && ((opcode->flags & dialect) == 0
-		  || (opcode->deprecated & dialect) != 0)))
-	continue;
-
-      /* Check validity of operands.  */
-      invalid = 0;
-      for (opindex = opcode->operands; *opindex != 0; opindex++)
-	{
-	  operand = powerpc_operands + *opindex;
-	  if (operand->extract)
-	    (*operand->extract) (insn, dialect, &invalid);
-	}
-      if (invalid)
-	continue;
-
-      return opcode;
-    }
-
-  return NULL;
-}
-
 /* Print a PowerPC or POWER instruction.  */
 
 static int
@@ -428,6 +345,9 @@ print_insn_powerpc (bfd_vma memaddr,
   int status;
   unsigned long insn;
   const struct powerpc_opcode *opcode;
+  const struct powerpc_opcode *opcode_end;
+  unsigned long op;
+  ppc_cpu_t dialect_orig = dialect;
 
   status = (*info->read_memory_func) (memaddr, buffer, 4, info);
   if (status != 0)
@@ -441,18 +361,48 @@ print_insn_powerpc (bfd_vma memaddr,
   else
     insn = bfd_getl32 (buffer);
 
-  opcode = lookup_powerpc (insn, dialect);
-  if (opcode == NULL && (dialect & PPC_OPCODE_ANY) != 0)
-    opcode = lookup_powerpc (insn, (ppc_cpu_t) -1);
+  /* Get the major opcode of the instruction.  */
+  op = PPC_OP (insn);
 
-  if (opcode != NULL)
+  /* Find the first match in the opcode table.  We could speed this up
+     a bit by doing a binary search on the major opcode.  */
+  opcode_end = powerpc_opcodes + powerpc_num_opcodes;
+ again:
+  for (opcode = powerpc_opcodes; opcode < opcode_end; opcode++)
     {
+      unsigned long table_op;
       const unsigned char *opindex;
       const struct powerpc_operand *operand;
+      int invalid;
       int need_comma;
       int need_paren;
       int skip_optional;
 
+      table_op = PPC_OP (opcode->opcode);
+      if (op < table_op)
+	break;
+      if (op > table_op)
+	continue;
+
+      if ((insn & opcode->mask) != opcode->opcode
+	  || (opcode->flags & dialect) == 0
+	  || (opcode->deprecated & dialect_orig) != 0)
+	continue;
+
+      /* Make two passes over the operands.  First see if any of them
+	 have extraction functions, and, if they do, make sure the
+	 instruction is valid.  */
+      invalid = 0;
+      for (opindex = opcode->operands; *opindex != 0; opindex++)
+	{
+	  operand = powerpc_operands + *opindex;
+	  if (operand->extract)
+	    (*operand->extract) (insn, dialect, &invalid);
+	}
+      if (invalid)
+	continue;
+
+      /* The instruction is valid.  */
       if (opcode->operands[0] != 0)
 	(*info->fprintf_func) (info->stream, "%-7s ", opcode->name);
       else
@@ -553,6 +503,12 @@ print_insn_powerpc (bfd_vma memaddr,
       return 4;
     }
 
+  if ((dialect & PPC_OPCODE_ANY) != 0)
+    {
+      dialect = ~(ppc_cpu_t) PPC_OPCODE_ANY;
+      goto again;
+    }
+
   /* We could not find a match.  */
   (*info->fprintf_func) (info->stream, ".long 0x%lx", insn);
 
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index b11b5b2cc7..950a5afb4f 100644
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -1,6 +1,6 @@
 /* ppc-opc.c -- PowerPC opcode list
    Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
@@ -53,7 +53,6 @@ static unsigned long insert_boe (unsigned long, long, ppc_cpu_t, const char **);
 static long extract_boe (unsigned long, ppc_cpu_t, int *);
 static unsigned long insert_fxm (unsigned long, long, ppc_cpu_t, const char **);
 static long extract_fxm (unsigned long, ppc_cpu_t, int *);
-static unsigned long insert_ls (unsigned long, long, ppc_cpu_t, const char **);
 static unsigned long insert_mbe (unsigned long, long, ppc_cpu_t, const char **);
 static long extract_mbe (unsigned long, ppc_cpu_t, int *);
 static unsigned long insert_mb6 (unsigned long, long, ppc_cpu_t, const char **);
@@ -478,7 +477,6 @@ const struct powerpc_operand powerpc_operands[] =
      lower 5 bits are stored in the upper 5 and vice- versa.  */
 #define SPR SISIGNOPT + 1
 #define PMR SPR
-#define TMR SPR
 #define SPR_MASK (0x3ff << 11)
   { 0x3ff, 11, insert_spr, extract_spr, 0 },
 
@@ -501,12 +499,8 @@ const struct powerpc_operand powerpc_operands[] =
 #define T STRM
   { 0x3, 21, NULL, NULL, 0 },
 
-  /* The ESYNC field in an X (sync) form instruction.  */
-#define ESYNC STRM + 1
-  { 0xf, 16, insert_ls, NULL, PPC_OPERAND_OPTIONAL },
-
   /* The SV field in a POWER SC form instruction.  */
-#define SV ESYNC + 1
+#define SV STRM + 1
   { 0x3fff, 2, NULL, NULL, 0 },
 
   /* The TBR field in an XFX form instruction.  This is like the SPR
@@ -548,7 +542,6 @@ const struct powerpc_operand powerpc_operands[] =
 
   /* The UIMM field in a VX form instruction.  */
 #define UIMM SIMM + 1
-#define DCTL UIMM
   { 0x1f, 16, NULL, NULL, 0 },
 
   /* The SHB field in a VA form instruction.  */
@@ -755,15 +748,13 @@ extract_bba (unsigned long insn,
    extract_bdp always occur in pairs.  One or the other will always
    be valid.  */
 
-#define ISA_V2 (PPC_OPCODE_POWER4 | PPC_OPCODE_E500MC | PPC_OPCODE_TITAN)
-
 static unsigned long
 insert_bdm (unsigned long insn,
 	    long value,
 	    ppc_cpu_t dialect,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if ((dialect & ISA_V2) == 0)
+  if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
       if ((value & 0x8000) != 0)
 	insn |= 1 << 21;
@@ -783,7 +774,7 @@ extract_bdm (unsigned long insn,
 	     ppc_cpu_t dialect,
 	     int *invalid)
 {
-  if ((dialect & ISA_V2) == 0)
+  if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
       if (((insn & (1 << 21)) == 0) != ((insn & (1 << 15)) == 0))
 	*invalid = 1;
@@ -808,7 +799,7 @@ insert_bdp (unsigned long insn,
 	    ppc_cpu_t dialect,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if ((dialect & ISA_V2) == 0)
+  if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
       if ((value & 0x8000) == 0)
 	insn |= 1 << 21;
@@ -828,7 +819,7 @@ extract_bdp (unsigned long insn,
 	     ppc_cpu_t dialect,
 	     int *invalid)
 {
-  if ((dialect & ISA_V2) == 0)
+  if ((dialect & PPC_OPCODE_POWER4) == 0)
     {
       if (((insn & (1 << 21)) == 0) == ((insn & (1 << 15)) == 0))
 	*invalid = 1;
@@ -843,41 +834,52 @@ extract_bdp (unsigned long insn,
   return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
 }
 
-static inline int
-valid_bo_pre_v2 (long value)
-{
-  /* Certain encodings have bits that are required to be zero.
-     These are (z must be zero, y may be anything):
-	 0000y 
-	 0001y 
-	 001zy
-	 0100y 
-	 0101y 
-	 011zy
-	 1z00y
-	 1z01y
-	 1z1zz
-  */
-  if ((value & 0x14) == 0)
-    return 1;
-  else if ((value & 0x14) == 0x4)
-    return (value & 0x2) == 0;
-  else if ((value & 0x14) == 0x10)
-    return (value & 0x8) == 0;
-  else
-    return value == 0x14;
-}
+/* Check for legal values of a BO field.  */
 
-static inline int
-valid_bo_post_v2 (long value)
+static int
+valid_bo (long value, ppc_cpu_t dialect, int extract)
 {
+  if ((dialect & PPC_OPCODE_POWER4) == 0)
+    {
+      int valid;
+      /* Certain encodings have bits that are required to be zero.
+	 These are (z must be zero, y may be anything):
+	     001zy
+	     011zy
+	     1z00y
+	     1z01y
+	     1z1zz
+      */
+      switch (value & 0x14)
+	{
+	default:
+	case 0:
+	  valid = 1;
+	  break;
+	case 0x4:
+	  valid = (value & 0x2) == 0;
+	  break;
+	case 0x10:
+	  valid = (value & 0x8) == 0;
+	  break;
+	case 0x14:
+	  valid = value == 0x14;
+	  break;
+	}
+      /* When disassembling with -Many, accept power4 encodings too.  */
+      if (valid
+	  || (dialect & PPC_OPCODE_ANY) == 0
+	  || !extract)
+	return valid;
+    }
+
   /* Certain encodings have bits that are required to be zero.
      These are (z must be zero, a & t may be anything):
 	 0000z
 	 0001z
-	 001at
 	 0100z
 	 0101z
+	 001at
 	 011at
 	 1a00t
 	 1a01t
@@ -891,24 +893,6 @@ valid_bo_post_v2 (long value)
     return 1;
 }
 
-/* Check for legal values of a BO field.  */
-
-static int
-valid_bo (long value, ppc_cpu_t dialect, int extract)
-{
-  int valid_y = valid_bo_pre_v2 (value);
-  int valid_at = valid_bo_post_v2 (value);
-
-  /* When disassembling with -Many, accept either encoding on the
-     second pass through opcodes.  */
-  if (extract && dialect == ~(ppc_cpu_t) PPC_OPCODE_ANY)
-    return valid_y || valid_at;
-  if ((dialect & ISA_V2) == 0)
-    return valid_y;
-  else
-    return valid_at;
-}
-
 /* The BO field in a B form instruction.  Warn about attempts to set
    the field to an illegal value.  */
 
@@ -1043,32 +1027,6 @@ extract_fxm (unsigned long insn,
   return mask;
 }
 
-/* The LS field in a sync instruction that accepts 2 operands
-   Values 2 and 3 are reserved,
-     must be treated as 0 for future compatibility
-   Values 0 and 1 can be accepted, if field ESYNC is zero
-   Otherwise L = complement of ESYNC-bit2 (1<<18) */
-
-static unsigned long
-insert_ls (unsigned long insn,
-	   long value,
-	   ppc_cpu_t dialect ATTRIBUTE_UNUSED,
-	   const char **errmsg ATTRIBUTE_UNUSED)
-{
-  unsigned long ls;
-
-  ls = (insn >> 21) & 0x03;
-  if (value == 0)
-    {
-      if (ls > 1)
-	return insn & ~(0x3 << 21);
-      return insn;
-    }
-  if ((value & 0x2) != 0)
-    return (insn & ~(0x3 << 21)) | ((value & 0xf) << 16);
-  return (insn & ~(0x3 << 21)) | (0x1 << 21) | ((value & 0xf) << 16);
-}
-
 /* The MB and ME fields in an M form instruction expressed as a single
    operand which is itself a bitmask.  The extraction function always
    marks it as invalid, since we never want to recognize an
@@ -1837,9 +1795,6 @@ extract_dm (unsigned long insn,
 /* An X form sync instruction with everything filled in except the LS field.  */
 #define XSYNC_MASK (0xff9fffff)
 
-/* An X form sync instruction with everything filled in except the L and E fields.  */
-#define XSYNCLE_MASK (0xff90ffff)
-
 /* An X_MASK, but with the EH bit clear.  */
 #define XEH_MASK (X_MASK & ~((unsigned long )1))
 
@@ -2034,7 +1989,6 @@ extract_dm (unsigned long insn,
 #define PPC860	PPC
 #define PPCPS	PPC_OPCODE_PPCPS
 #define PPCVEC	PPC_OPCODE_ALTIVEC
-#define PPCVEC2	PPC_OPCODE_ALTIVEC2
 #define PPCVSX	PPC_OPCODE_VSX
 #define POWER	PPC_OPCODE_POWER
 #define POWER2	PPC_OPCODE_POWER | PPC_OPCODE_POWER2
@@ -2053,7 +2007,6 @@ extract_dm (unsigned long insn,
 #define PPCEFS	PPC_OPCODE_EFS
 #define PPCBRLK PPC_OPCODE_BRLOCK
 #define PPCPMR	PPC_OPCODE_PMR
-#define PPCTMR  PPC_OPCODE_TMR
 #define PPCCHLK PPC_OPCODE_CACHELCK
 #define PPCRFMCI	PPC_OPCODE_RFMCI
 #define E500MC  PPC_OPCODE_E500MC
@@ -2061,20 +2014,18 @@ extract_dm (unsigned long insn,
 #define TITAN   PPC_OPCODE_TITAN  
 #define MULHW   PPC_OPCODE_405 | PPC_OPCODE_440 | TITAN
 #define E500	PPC_OPCODE_E500
-#define E6500	PPC_OPCODE_E6500
 
 /* The opcode table.
 
    The format of the opcode table is:
 
-   NAME		OPCODE		MASK	     FLAGS	ANTI		{OPERANDS}
+   NAME		OPCODE		MASK	     FLAGS	{OPERANDS}
 
    NAME is the name of the instruction.
    OPCODE is the instruction opcode.
    MASK is the opcode mask; this is used to tell the disassembler
      which bits in the actual opcode must match OPCODE.
-   FLAGS are flags indicating which processors support the instruction.
-   ANTI indicates which processors don't support the instruction.
+   FLAGS are flags indicated what processors support the instruction.
    OPERANDS is the list of operands.
 
    The disassembler reads the table in order and prints the first
@@ -2228,14 +2179,12 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"machhwsu",	XO (4,	76,0,0),XO_MASK,     MULHW, 	PPCNONE,	{RT, RA, RB}},
 {"machhwsu.",	XO (4,	76,0,1),XO_MASK,     MULHW, 	PPCNONE,	{RT, RA, RB}},
 {"ps_cmpo1",	X  (4,	96), X_MASK|(3<<21), PPCPS,	PPCNONE,	{BF, FRA, FRB}},
-{"vabsdub",	VX (4, 192),	VX_MASK,     PPCVEC2,	PPCNONE,	{VD, VA, VB}},
 {"vcmpeqfp",	VXR(4, 198,0),	VXR_MASK,    PPCVEC,	PPCNONE,	{VD, VA, VB}},
 {"vpkuwus",	VX (4, 206),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
 {"machhws",	XO (4, 108,0,0),XO_MASK,     MULHW, 	PPCNONE,	{RT, RA, RB}},
 {"machhws.",	XO (4, 108,0,1),XO_MASK,     MULHW,	PPCNONE,	{RT, RA, RB}},
 {"nmachhws",	XO (4, 110,0,0),XO_MASK,     MULHW,	PPCNONE,	{RT, RA, RB}},
 {"nmachhws.",	XO (4, 110,0,1),XO_MASK,     MULHW,	PPCNONE,	{RT, RA, RB}},
-{"vabsduh",	VX (4, 256),	VX_MASK,     PPCVEC2,	PPCNONE,	{VD, VA, VB}},
 {"vmaxsb",	VX (4, 258),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
 {"vslb",	VX (4, 260),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
 {"vmulosb",	VX (4, 264),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
@@ -2248,7 +2197,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mulchwu.",	XRC(4, 136,1),	X_MASK,      MULHW,	PPCNONE,	{RT, RA, RB}},
 {"macchwu",	XO (4, 140,0,0),XO_MASK,     MULHW,	PPCNONE,	{RT, RA, RB}},
 {"macchwu.",	XO (4, 140,0,1),XO_MASK,     MULHW,	PPCNONE,	{RT, RA, RB}},
-{"vabsduw",	VX (4, 320),	VX_MASK,     PPCVEC2,	PPCNONE,	{VD, VA, VB}},
 {"vmaxsh",	VX (4, 322),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
 {"vslh",	VX (4, 324),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
 {"vmulosh",	VX (4, 328),	VX_MASK,     PPCVEC,	PPCNONE,	{VD, VA, VB}},
@@ -2944,29 +2892,29 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"bunla+",   BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCNONE,	{CR, BDPA}},
 {"bunla",    BBOCB(16,BOT,CBSO,1,1),	BBOATCB_MASK,  PPCCOM,	 PPCNONE,	{CR, BDA}},
 
-{"bdnzf-",   BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdnzf+",   BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdnzf-",   BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdnzf+",   BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdnzf",    BBO(16,BODNZF,0,0),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdnzfl-",  BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdnzfl+",  BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdnzfl-",  BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdnzfl+",  BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdnzfl",   BBO(16,BODNZF,0,1),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdnzfa-",  BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdnzfa+",  BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdnzfa-",  BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdnzfa+",  BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdnzfa",   BBO(16,BODNZF,1,0),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
-{"bdnzfla-", BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdnzfla+", BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdnzfla-", BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdnzfla+", BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdnzfla",  BBO(16,BODNZF,1,1),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
-{"bdzf-",    BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdzf+",    BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdzf-",    BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdzf+",    BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdzf",     BBO(16,BODZF,0,0),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdzfl-",   BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdzfl+",   BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdzfl-",   BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdzfl+",   BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdzfl",    BBO(16,BODZF,0,1),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdzfa-",   BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdzfa+",   BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdzfa-",   BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdzfa+",   BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdzfa",    BBO(16,BODZF,1,0),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
-{"bdzfla-",  BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdzfla+",  BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdzfla-",  BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdzfla+",  BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdzfla",   BBO(16,BODZF,1,1),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
 
 {"bf-",      BBO(16,BOF,0,0),		BBOAT_MASK,    PPCCOM,	 PPCNONE,	{BI, BDM}},
@@ -2986,29 +2934,29 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"bfla",     BBO(16,BOF,1,1),		BBOAT_MASK,    PPCCOM,	 PPCNONE,	{BI, BDA}},
 {"bbfla",    BBO(16,BOF,1,1),		BBOAT_MASK,    PWRCOM,	 PPCNONE,	{BI, BDA}},
 
-{"bdnzt-",   BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdnzt+",   BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdnzt-",   BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdnzt+",   BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdnzt",    BBO(16,BODNZT,0,0),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdnztl-",  BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdnztl+",  BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdnztl-",  BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdnztl+",  BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdnztl",   BBO(16,BODNZT,0,1),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdnzta-",  BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdnzta+",  BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdnzta-",  BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdnzta+",  BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdnzta",   BBO(16,BODNZT,1,0),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
-{"bdnztla-", BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdnztla+", BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdnztla-", BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdnztla+", BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdnztla",  BBO(16,BODNZT,1,1),	BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
-{"bdzt-",    BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdzt+",    BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdzt-",    BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdzt+",    BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdzt",     BBO(16,BODZT,0,0),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdztl-",   BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDM}},
-{"bdztl+",   BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDP}},
+{"bdztl-",   BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDM}},
+{"bdztl+",   BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDP}},
 {"bdztl",    BBO(16,BODZT,0,1),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BD}},
-{"bdzta-",   BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdzta+",   BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdzta-",   BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdzta+",   BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdzta",    BBO(16,BODZT,1,0),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
-{"bdztla-",  BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDMA}},
-{"bdztla+",  BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,   ISA_V2,	{BI, BDPA}},
+{"bdztla-",  BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDMA}},
+{"bdztla+",  BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,   POWER4,	{BI, BDPA}},
 {"bdztla",   BBO(16,BODZT,1,1),		BBOY_MASK,     PPCCOM,	 PPCNONE,	{BI, BDA}},
 
 {"bt-",      BBO(16,BOT,0,0),		BBOAT_MASK,    PPCCOM,	 PPCNONE,	{BI, BDM}},
@@ -3055,219 +3003,219 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mcrf",      XL(19,0), XLBB_MASK|(3<<21)|(3<<16), COM,	PPCNONE,	{BF, BFA}},
 
 {"bdnzlr",   XLO(19,BODNZ,16,0),	XLBOBIBB_MASK, PPCCOM,	 PPCNONE,	{0}},
-{"bdnzlr-",  XLO(19,BODNZ,16,0),	XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
+{"bdnzlr-",  XLO(19,BODNZ,16,0),	XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
 {"bdnzlrl",  XLO(19,BODNZ,16,1),	XLBOBIBB_MASK, PPCCOM,	 PPCNONE,	{0}},
-{"bdnzlrl-", XLO(19,BODNZ,16,1),	XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
-{"bdnzlr+",  XLO(19,BODNZP,16,0),	XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
-{"bdnzlrl+", XLO(19,BODNZP,16,1),	XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
+{"bdnzlrl-", XLO(19,BODNZ,16,1),	XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
+{"bdnzlr+",  XLO(19,BODNZP,16,0),	XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
+{"bdnzlrl+", XLO(19,BODNZP,16,1),	XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
 {"bdzlr",    XLO(19,BODZ,16,0),		XLBOBIBB_MASK, PPCCOM,	 PPCNONE,	{0}},
-{"bdzlr-",   XLO(19,BODZ,16,0),		XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
+{"bdzlr-",   XLO(19,BODZ,16,0),		XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
 {"bdzlrl",   XLO(19,BODZ,16,1),		XLBOBIBB_MASK, PPCCOM,	 PPCNONE,	{0}},
-{"bdzlrl-",  XLO(19,BODZ,16,1),		XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
-{"bdzlr+",   XLO(19,BODZP,16,0),	XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
-{"bdzlrl+",  XLO(19,BODZP,16,1),	XLBOBIBB_MASK, PPCCOM,   ISA_V2,	{0}},
+{"bdzlrl-",  XLO(19,BODZ,16,1),		XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
+{"bdzlr+",   XLO(19,BODZP,16,0),	XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
+{"bdzlrl+",  XLO(19,BODZP,16,1),	XLBOBIBB_MASK, PPCCOM,   POWER4,	{0}},
 {"blr",      XLO(19,BOU,16,0),		XLBOBIBB_MASK, PPCCOM,	 PPCNONE,	{0}},
 {"br",	     XLO(19,BOU,16,0),		XLBOBIBB_MASK, PWRCOM,	 PPCNONE,	{0}},
 {"blrl",     XLO(19,BOU,16,1),		XLBOBIBB_MASK, PPCCOM,	 PPCNONE,	{0}},
 {"brl",      XLO(19,BOU,16,1),		XLBOBIBB_MASK, PWRCOM,	 PPCNONE,	{0}},
-{"bdnzlr-",  XLO(19,BODNZM4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdnzlrl-", XLO(19,BODNZM4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdnzlr+",  XLO(19,BODNZP4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdnzlrl+", XLO(19,BODNZP4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdzlr-",   XLO(19,BODZM4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdzlrl-",  XLO(19,BODZM4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdzlr+",   XLO(19,BODZP4,16,0),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
-{"bdzlrl+",  XLO(19,BODZP4,16,1),	XLBOBIBB_MASK, ISA_V2,	 PPCNONE,	{0}},
+{"bdnzlr-",  XLO(19,BODNZM4,16,0),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdnzlrl-", XLO(19,BODNZM4,16,1),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdnzlr+",  XLO(19,BODNZP4,16,0),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdnzlrl+", XLO(19,BODNZP4,16,1),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdzlr-",   XLO(19,BODZM4,16,0),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdzlrl-",  XLO(19,BODZM4,16,1),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdzlr+",   XLO(19,BODZP4,16,0),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
+{"bdzlrl+",  XLO(19,BODZP4,16,1),	XLBOBIBB_MASK, POWER4,	 PPCNONE,	{0}},
 
 {"bgelr",    XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgelr-",   XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgelr-",   XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bger",     XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnllr",    XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnllr-",   XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnllr-",   XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnlr",     XLOCB(19,BOF,CBLT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bgelrl",   XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgelrl-",  XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgelrl-",  XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bgerl",    XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnllrl",   XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnllrl-",  XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnllrl-",  XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnlrl",    XLOCB(19,BOF,CBLT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"blelr",    XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"blelr-",   XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"blelr-",   XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bler",     XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnglr",    XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnglr-",   XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnglr-",   XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bngr",     XLOCB(19,BOF,CBGT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"blelrl",   XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"blelrl-",  XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"blelrl-",  XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"blerl",    XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnglrl",   XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnglrl-",  XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnglrl-",  XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bngrl",    XLOCB(19,BOF,CBGT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnelr",    XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnelr-",   XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnelr-",   XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bner",     XLOCB(19,BOF,CBEQ,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnelrl",   XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnelrl-",  XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnelrl-",  XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnerl",    XLOCB(19,BOF,CBEQ,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnslr",    XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnslr-",   XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnslr-",   XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnsr",     XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnulr",    XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnulr-",   XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnulr-",   XLOCB(19,BOF,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnslrl",   XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnslrl-",  XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnslrl-",  XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnsrl",    XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bnulrl",   XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnulrl-",  XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgelr+",   XLOCB(19,BOFP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnllr+",   XLOCB(19,BOFP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgelrl+",  XLOCB(19,BOFP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnllrl+",  XLOCB(19,BOFP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"blelr+",   XLOCB(19,BOFP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnglr+",   XLOCB(19,BOFP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"blelrl+",  XLOCB(19,BOFP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnglrl+",  XLOCB(19,BOFP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnelr+",   XLOCB(19,BOFP,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnelrl+",  XLOCB(19,BOFP,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnslr+",   XLOCB(19,BOFP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnulr+",   XLOCB(19,BOFP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnslrl+",  XLOCB(19,BOFP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnulrl+",  XLOCB(19,BOFP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgelr-",   XLOCB(19,BOFM4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnllr-",   XLOCB(19,BOFM4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgelrl-",  XLOCB(19,BOFM4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnllrl-",  XLOCB(19,BOFM4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blelr-",   XLOCB(19,BOFM4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnglr-",   XLOCB(19,BOFM4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blelrl-",  XLOCB(19,BOFM4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnglrl-",  XLOCB(19,BOFM4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnelr-",   XLOCB(19,BOFM4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnelrl-",  XLOCB(19,BOFM4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnslr-",   XLOCB(19,BOFM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnulr-",   XLOCB(19,BOFM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnslrl-",  XLOCB(19,BOFM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnulrl-",  XLOCB(19,BOFM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgelr+",   XLOCB(19,BOFP4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnllr+",   XLOCB(19,BOFP4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgelrl+",  XLOCB(19,BOFP4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnllrl+",  XLOCB(19,BOFP4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blelr+",   XLOCB(19,BOFP4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnglr+",   XLOCB(19,BOFP4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blelrl+",  XLOCB(19,BOFP4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnglrl+",  XLOCB(19,BOFP4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnelr+",   XLOCB(19,BOFP4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnelrl+",  XLOCB(19,BOFP4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnslr+",   XLOCB(19,BOFP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnulr+",   XLOCB(19,BOFP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnslrl+",  XLOCB(19,BOFP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnulrl+",  XLOCB(19,BOFP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
+{"bnulrl-",  XLOCB(19,BOF,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgelr+",   XLOCB(19,BOFP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnllr+",   XLOCB(19,BOFP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgelrl+",  XLOCB(19,BOFP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnllrl+",  XLOCB(19,BOFP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"blelr+",   XLOCB(19,BOFP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnglr+",   XLOCB(19,BOFP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"blelrl+",  XLOCB(19,BOFP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnglrl+",  XLOCB(19,BOFP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnelr+",   XLOCB(19,BOFP,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnelrl+",  XLOCB(19,BOFP,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnslr+",   XLOCB(19,BOFP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnulr+",   XLOCB(19,BOFP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnslrl+",  XLOCB(19,BOFP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnulrl+",  XLOCB(19,BOFP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgelr-",   XLOCB(19,BOFM4,CBLT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnllr-",   XLOCB(19,BOFM4,CBLT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgelrl-",  XLOCB(19,BOFM4,CBLT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnllrl-",  XLOCB(19,BOFM4,CBLT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blelr-",   XLOCB(19,BOFM4,CBGT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnglr-",   XLOCB(19,BOFM4,CBGT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blelrl-",  XLOCB(19,BOFM4,CBGT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnglrl-",  XLOCB(19,BOFM4,CBGT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnelr-",   XLOCB(19,BOFM4,CBEQ,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnelrl-",  XLOCB(19,BOFM4,CBEQ,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnslr-",   XLOCB(19,BOFM4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnulr-",   XLOCB(19,BOFM4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnslrl-",  XLOCB(19,BOFM4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnulrl-",  XLOCB(19,BOFM4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgelr+",   XLOCB(19,BOFP4,CBLT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnllr+",   XLOCB(19,BOFP4,CBLT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgelrl+",  XLOCB(19,BOFP4,CBLT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnllrl+",  XLOCB(19,BOFP4,CBLT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blelr+",   XLOCB(19,BOFP4,CBGT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnglr+",   XLOCB(19,BOFP4,CBGT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blelrl+",  XLOCB(19,BOFP4,CBGT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnglrl+",  XLOCB(19,BOFP4,CBGT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnelr+",   XLOCB(19,BOFP4,CBEQ,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnelrl+",  XLOCB(19,BOFP4,CBEQ,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnslr+",   XLOCB(19,BOFP4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnulr+",   XLOCB(19,BOFP4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnslrl+",  XLOCB(19,BOFP4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnulrl+",  XLOCB(19,BOFP4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
 {"bltlr",    XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bltlr-",   XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bltlr-",   XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bltr",     XLOCB(19,BOT,CBLT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bltlrl",   XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bltlrl-",  XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bltlrl-",  XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bltrl",    XLOCB(19,BOT,CBLT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bgtlr",    XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgtlr-",   XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgtlr-",   XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bgtr",     XLOCB(19,BOT,CBGT,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bgtlrl",   XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgtlrl-",  XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgtlrl-",  XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bgtrl",    XLOCB(19,BOT,CBGT,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"beqlr",    XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"beqlr-",   XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"beqlr-",   XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"beqr",     XLOCB(19,BOT,CBEQ,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"beqlrl",   XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"beqlrl-",  XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"beqlrl-",  XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"beqrl",    XLOCB(19,BOT,CBEQ,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bsolr",    XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bsolr-",   XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bsolr-",   XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bsor",     XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bunlr",    XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bunlr-",   XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bunlr-",   XLOCB(19,BOT,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bsolrl",   XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bsolrl-",  XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bsolrl-",  XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bsorl",    XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PWRCOM,	 PPCNONE,	{CR}},
 {"bunlrl",   XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bunlrl-",  XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bltlr+",   XLOCB(19,BOTP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bltlrl+",  XLOCB(19,BOTP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgtlr+",   XLOCB(19,BOTP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgtlrl+",  XLOCB(19,BOTP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"beqlr+",   XLOCB(19,BOTP,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"beqlrl+",  XLOCB(19,BOTP,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bsolr+",   XLOCB(19,BOTP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bunlr+",   XLOCB(19,BOTP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bsolrl+",  XLOCB(19,BOTP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bunlrl+",  XLOCB(19,BOTP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bltlr-",   XLOCB(19,BOTM4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bltlrl-",  XLOCB(19,BOTM4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtlr-",   XLOCB(19,BOTM4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtlrl-",  XLOCB(19,BOTM4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqlr-",   XLOCB(19,BOTM4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqlrl-",  XLOCB(19,BOTM4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsolr-",   XLOCB(19,BOTM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunlr-",   XLOCB(19,BOTM4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsolrl-",  XLOCB(19,BOTM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunlrl-",  XLOCB(19,BOTM4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bltlr+",   XLOCB(19,BOTP4,CBLT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bltlrl+",  XLOCB(19,BOTP4,CBLT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtlr+",   XLOCB(19,BOTP4,CBGT,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtlrl+",  XLOCB(19,BOTP4,CBGT,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqlr+",   XLOCB(19,BOTP4,CBEQ,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqlrl+",  XLOCB(19,BOTP4,CBEQ,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsolr+",   XLOCB(19,BOTP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunlr+",   XLOCB(19,BOTP4,CBSO,16,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsolrl+",  XLOCB(19,BOTP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunlrl+",  XLOCB(19,BOTP4,CBSO,16,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
+{"bunlrl-",  XLOCB(19,BOT,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bltlr+",   XLOCB(19,BOTP,CBLT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bltlrl+",  XLOCB(19,BOTP,CBLT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgtlr+",   XLOCB(19,BOTP,CBGT,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgtlrl+",  XLOCB(19,BOTP,CBGT,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"beqlr+",   XLOCB(19,BOTP,CBEQ,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"beqlrl+",  XLOCB(19,BOTP,CBEQ,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bsolr+",   XLOCB(19,BOTP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bunlr+",   XLOCB(19,BOTP,CBSO,16,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bsolrl+",  XLOCB(19,BOTP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bunlrl+",  XLOCB(19,BOTP,CBSO,16,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bltlr-",   XLOCB(19,BOTM4,CBLT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bltlrl-",  XLOCB(19,BOTM4,CBLT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtlr-",   XLOCB(19,BOTM4,CBGT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtlrl-",  XLOCB(19,BOTM4,CBGT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqlr-",   XLOCB(19,BOTM4,CBEQ,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqlrl-",  XLOCB(19,BOTM4,CBEQ,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsolr-",   XLOCB(19,BOTM4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunlr-",   XLOCB(19,BOTM4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsolrl-",  XLOCB(19,BOTM4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunlrl-",  XLOCB(19,BOTM4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bltlr+",   XLOCB(19,BOTP4,CBLT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bltlrl+",  XLOCB(19,BOTP4,CBLT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtlr+",   XLOCB(19,BOTP4,CBGT,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtlrl+",  XLOCB(19,BOTP4,CBGT,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqlr+",   XLOCB(19,BOTP4,CBEQ,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqlrl+",  XLOCB(19,BOTP4,CBEQ,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsolr+",   XLOCB(19,BOTP4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunlr+",   XLOCB(19,BOTP4,CBSO,16,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsolrl+",  XLOCB(19,BOTP4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunlrl+",  XLOCB(19,BOTP4,CBSO,16,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
 
 {"bdnzflr",  XLO(19,BODNZF,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdnzflr-", XLO(19,BODNZF,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdnzflr-", XLO(19,BODNZF,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bdnzflrl", XLO(19,BODNZF,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdnzflrl-",XLO(19,BODNZF,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdnzflr+", XLO(19,BODNZFP,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdnzflrl+",XLO(19,BODNZFP,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdnzflrl-",XLO(19,BODNZF,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdnzflr+", XLO(19,BODNZFP,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdnzflrl+",XLO(19,BODNZFP,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bdzflr",   XLO(19,BODZF,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdzflr-",  XLO(19,BODZF,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdzflr-",  XLO(19,BODZF,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bdzflrl",  XLO(19,BODZF,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdzflrl-", XLO(19,BODZF,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdzflr+",  XLO(19,BODZFP,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdzflrl+", XLO(19,BODZFP,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdzflrl-", XLO(19,BODZF,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdzflr+",  XLO(19,BODZFP,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdzflrl+", XLO(19,BODZFP,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bflr",     XLO(19,BOF,16,0),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bflr-",    XLO(19,BOF,16,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bflr-",    XLO(19,BOF,16,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bbfr",     XLO(19,BOF,16,0),		XLBOBB_MASK,   PWRCOM,	 PPCNONE,	{BI}},
 {"bflrl",    XLO(19,BOF,16,1),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bflrl-",   XLO(19,BOF,16,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bflrl-",   XLO(19,BOF,16,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bbfrl",    XLO(19,BOF,16,1),		XLBOBB_MASK,   PWRCOM,	 PPCNONE,	{BI}},
-{"bflr+",    XLO(19,BOFP,16,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bflrl+",   XLO(19,BOFP,16,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bflr-",    XLO(19,BOFM4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"bflrl-",   XLO(19,BOFM4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"bflr+",    XLO(19,BOFP4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"bflrl+",   XLO(19,BOFP4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
+{"bflr+",    XLO(19,BOFP,16,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bflrl+",   XLO(19,BOFP,16,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bflr-",    XLO(19,BOFM4,16,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"bflrl-",   XLO(19,BOFM4,16,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"bflr+",    XLO(19,BOFP4,16,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"bflrl+",   XLO(19,BOFP4,16,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
 {"bdnztlr",  XLO(19,BODNZT,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdnztlr-", XLO(19,BODNZT,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdnztlr-", XLO(19,BODNZT,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bdnztlrl", XLO(19,BODNZT,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdnztlrl-",XLO(19,BODNZT,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdnztlr+", XLO(19,BODNZTP,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdnztlrl+",XLO(19,BODNZTP,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdnztlrl-",XLO(19,BODNZT,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdnztlr+", XLO(19,BODNZTP,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdnztlrl+",XLO(19,BODNZTP,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bdztlr",   XLO(19,BODZT,16,0),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdztlr-",  XLO(19,BODZT,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdztlr-",  XLO(19,BODZT,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bdztlrl",  XLO(19,BODZT,16,1),	XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bdztlrl-", XLO(19,BODZT,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdztlr+",  XLO(19,BODZTP,16,0),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bdztlrl+", XLO(19,BODZTP,16,1),	XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bdztlrl-", XLO(19,BODZT,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdztlr+",  XLO(19,BODZTP,16,0),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bdztlrl+", XLO(19,BODZTP,16,1),	XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"btlr",     XLO(19,BOT,16,0),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"btlr-",    XLO(19,BOT,16,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"btlr-",    XLO(19,BOT,16,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bbtr",     XLO(19,BOT,16,0),		XLBOBB_MASK,   PWRCOM,	 PPCNONE,	{BI}},
 {"btlrl",    XLO(19,BOT,16,1),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"btlrl-",   XLO(19,BOT,16,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"btlrl-",   XLO(19,BOT,16,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bbtrl",    XLO(19,BOT,16,1),		XLBOBB_MASK,   PWRCOM,	 PPCNONE,	{BI}},
-{"btlr+",    XLO(19,BOTP,16,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"btlrl+",   XLO(19,BOTP,16,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"btlr-",    XLO(19,BOTM4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"btlrl-",   XLO(19,BOTM4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"btlr+",    XLO(19,BOTP4,16,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"btlrl+",   XLO(19,BOTP4,16,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
+{"btlr+",    XLO(19,BOTP,16,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"btlrl+",   XLO(19,BOTP,16,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"btlr-",    XLO(19,BOTM4,16,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"btlrl-",   XLO(19,BOTM4,16,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"btlr+",    XLO(19,BOTP4,16,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"btlrl+",   XLO(19,BOTP4,16,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
 
 {"bclr-",    XLYLK(19,16,0,0),		XLYBB_MASK,    PPCCOM,	 PPCNONE,	{BOE, BI}},
 {"bclrl-",   XLYLK(19,16,0,1),		XLYBB_MASK,    PPCCOM,	 PPCNONE,	{BOE, BI}},
@@ -3327,146 +3275,146 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"bctrl",   XLO(19,BOU,528,1),		XLBOBIBB_MASK, COM,	 PPCNONE,	{0}},
 
 {"bgectr",  XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgectr-", XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgectr-", XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnlctr",  XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnlctr-", XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnlctr-", XLOCB(19,BOF,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bgectrl", XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgectrl-",XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgectrl-",XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnlctrl", XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnlctrl-",XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnlctrl-",XLOCB(19,BOF,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"blectr",  XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"blectr-", XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"blectr-", XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bngctr",  XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bngctr-", XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bngctr-", XLOCB(19,BOF,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"blectrl", XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"blectrl-",XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"blectrl-",XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bngctrl", XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bngctrl-",XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bngctrl-",XLOCB(19,BOF,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnectr",  XLOCB(19,BOF,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnectr-", XLOCB(19,BOF,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnectr-", XLOCB(19,BOF,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnectrl", XLOCB(19,BOF,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnectrl-",XLOCB(19,BOF,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnectrl-",XLOCB(19,BOF,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnsctr",  XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnsctr-", XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnsctr-", XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnuctr",  XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnuctr-", XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnuctr-", XLOCB(19,BOF,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnsctrl", XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnsctrl-",XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bnsctrl-",XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bnuctrl", XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bnuctrl-",XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgectr+", XLOCB(19,BOFP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnlctr+", XLOCB(19,BOFP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgectrl+",XLOCB(19,BOFP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnlctrl+",XLOCB(19,BOFP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"blectr+", XLOCB(19,BOFP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bngctr+", XLOCB(19,BOFP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"blectrl+",XLOCB(19,BOFP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bngctrl+",XLOCB(19,BOFP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnectr+", XLOCB(19,BOFP,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnectrl+",XLOCB(19,BOFP,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnsctr+", XLOCB(19,BOFP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnuctr+", XLOCB(19,BOFP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnsctrl+",XLOCB(19,BOFP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bnuctrl+",XLOCB(19,BOFP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgectr-", XLOCB(19,BOFM4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnlctr-", XLOCB(19,BOFM4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgectrl-",XLOCB(19,BOFM4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnlctrl-",XLOCB(19,BOFM4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blectr-", XLOCB(19,BOFM4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bngctr-", XLOCB(19,BOFM4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blectrl-",XLOCB(19,BOFM4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bngctrl-",XLOCB(19,BOFM4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnectr-", XLOCB(19,BOFM4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnectrl-",XLOCB(19,BOFM4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnsctr-", XLOCB(19,BOFM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnuctr-", XLOCB(19,BOFM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnsctrl-",XLOCB(19,BOFM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnuctrl-",XLOCB(19,BOFM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgectr+", XLOCB(19,BOFP4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnlctr+", XLOCB(19,BOFP4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgectrl+",XLOCB(19,BOFP4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnlctrl+",XLOCB(19,BOFP4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blectr+", XLOCB(19,BOFP4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bngctr+", XLOCB(19,BOFP4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"blectrl+",XLOCB(19,BOFP4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bngctrl+",XLOCB(19,BOFP4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnectr+", XLOCB(19,BOFP4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnectrl+",XLOCB(19,BOFP4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnsctr+", XLOCB(19,BOFP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnuctr+", XLOCB(19,BOFP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnsctrl+",XLOCB(19,BOFP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bnuctrl+",XLOCB(19,BOFP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
+{"bnuctrl-",XLOCB(19,BOF,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgectr+", XLOCB(19,BOFP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnlctr+", XLOCB(19,BOFP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgectrl+",XLOCB(19,BOFP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnlctrl+",XLOCB(19,BOFP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"blectr+", XLOCB(19,BOFP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bngctr+", XLOCB(19,BOFP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"blectrl+",XLOCB(19,BOFP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bngctrl+",XLOCB(19,BOFP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnectr+", XLOCB(19,BOFP,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnectrl+",XLOCB(19,BOFP,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnsctr+", XLOCB(19,BOFP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnuctr+", XLOCB(19,BOFP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnsctrl+",XLOCB(19,BOFP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bnuctrl+",XLOCB(19,BOFP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgectr-", XLOCB(19,BOFM4,CBLT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnlctr-", XLOCB(19,BOFM4,CBLT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgectrl-",XLOCB(19,BOFM4,CBLT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnlctrl-",XLOCB(19,BOFM4,CBLT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blectr-", XLOCB(19,BOFM4,CBGT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bngctr-", XLOCB(19,BOFM4,CBGT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blectrl-",XLOCB(19,BOFM4,CBGT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bngctrl-",XLOCB(19,BOFM4,CBGT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnectr-", XLOCB(19,BOFM4,CBEQ,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnectrl-",XLOCB(19,BOFM4,CBEQ,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnsctr-", XLOCB(19,BOFM4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnuctr-", XLOCB(19,BOFM4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnsctrl-",XLOCB(19,BOFM4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnuctrl-",XLOCB(19,BOFM4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgectr+", XLOCB(19,BOFP4,CBLT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnlctr+", XLOCB(19,BOFP4,CBLT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgectrl+",XLOCB(19,BOFP4,CBLT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnlctrl+",XLOCB(19,BOFP4,CBLT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blectr+", XLOCB(19,BOFP4,CBGT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bngctr+", XLOCB(19,BOFP4,CBGT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"blectrl+",XLOCB(19,BOFP4,CBGT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bngctrl+",XLOCB(19,BOFP4,CBGT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnectr+", XLOCB(19,BOFP4,CBEQ,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnectrl+",XLOCB(19,BOFP4,CBEQ,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnsctr+", XLOCB(19,BOFP4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnuctr+", XLOCB(19,BOFP4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnsctrl+",XLOCB(19,BOFP4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bnuctrl+",XLOCB(19,BOFP4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
 {"bltctr",  XLOCB(19,BOT,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bltctr-", XLOCB(19,BOT,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bltctr-", XLOCB(19,BOT,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bltctrl", XLOCB(19,BOT,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bltctrl-",XLOCB(19,BOT,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bltctrl-",XLOCB(19,BOT,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bgtctr",  XLOCB(19,BOT,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgtctr-", XLOCB(19,BOT,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgtctr-", XLOCB(19,BOT,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bgtctrl", XLOCB(19,BOT,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bgtctrl-",XLOCB(19,BOT,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bgtctrl-",XLOCB(19,BOT,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"beqctr",  XLOCB(19,BOT,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"beqctr-", XLOCB(19,BOT,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"beqctr-", XLOCB(19,BOT,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"beqctrl", XLOCB(19,BOT,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"beqctrl-",XLOCB(19,BOT,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"beqctrl-",XLOCB(19,BOT,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bsoctr",  XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bsoctr-", XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bsoctr-", XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bunctr",  XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bunctr-", XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bunctr-", XLOCB(19,BOT,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bsoctrl", XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bsoctrl-",XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
+{"bsoctrl-",XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
 {"bunctrl", XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,	 PPCNONE,	{CR}},
-{"bunctrl-",XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bltctr+", XLOCB(19,BOTP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bltctrl+",XLOCB(19,BOTP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgtctr+", XLOCB(19,BOTP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bgtctrl+",XLOCB(19,BOTP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"beqctr+", XLOCB(19,BOTP,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"beqctrl+",XLOCB(19,BOTP,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bsoctr+", XLOCB(19,BOTP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bunctr+", XLOCB(19,BOTP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bsoctrl+",XLOCB(19,BOTP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bunctrl+",XLOCB(19,BOTP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   ISA_V2,	{CR}},
-{"bltctr-", XLOCB(19,BOTM4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bltctrl-",XLOCB(19,BOTM4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtctr-", XLOCB(19,BOTM4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtctrl-",XLOCB(19,BOTM4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqctr-", XLOCB(19,BOTM4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqctrl-",XLOCB(19,BOTM4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsoctr-", XLOCB(19,BOTM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunctr-", XLOCB(19,BOTM4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsoctrl-",XLOCB(19,BOTM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunctrl-",XLOCB(19,BOTM4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bltctr+", XLOCB(19,BOTP4,CBLT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bltctrl+",XLOCB(19,BOTP4,CBLT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtctr+", XLOCB(19,BOTP4,CBGT,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bgtctrl+",XLOCB(19,BOTP4,CBGT,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqctr+", XLOCB(19,BOTP4,CBEQ,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"beqctrl+",XLOCB(19,BOTP4,CBEQ,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsoctr+", XLOCB(19,BOTP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunctr+", XLOCB(19,BOTP4,CBSO,528,0),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bsoctrl+",XLOCB(19,BOTP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
-{"bunctrl+",XLOCB(19,BOTP4,CBSO,528,1),	XLBOCBBB_MASK, ISA_V2,	 PPCNONE,	{CR}},
+{"bunctrl-",XLOCB(19,BOT,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bltctr+", XLOCB(19,BOTP,CBLT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bltctrl+",XLOCB(19,BOTP,CBLT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgtctr+", XLOCB(19,BOTP,CBGT,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bgtctrl+",XLOCB(19,BOTP,CBGT,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"beqctr+", XLOCB(19,BOTP,CBEQ,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"beqctrl+",XLOCB(19,BOTP,CBEQ,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bsoctr+", XLOCB(19,BOTP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bunctr+", XLOCB(19,BOTP,CBSO,528,0),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bsoctrl+",XLOCB(19,BOTP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bunctrl+",XLOCB(19,BOTP,CBSO,528,1),	XLBOCBBB_MASK, PPCCOM,   POWER4,	{CR}},
+{"bltctr-", XLOCB(19,BOTM4,CBLT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bltctrl-",XLOCB(19,BOTM4,CBLT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtctr-", XLOCB(19,BOTM4,CBGT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtctrl-",XLOCB(19,BOTM4,CBGT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqctr-", XLOCB(19,BOTM4,CBEQ,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqctrl-",XLOCB(19,BOTM4,CBEQ,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsoctr-", XLOCB(19,BOTM4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunctr-", XLOCB(19,BOTM4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsoctrl-",XLOCB(19,BOTM4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunctrl-",XLOCB(19,BOTM4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bltctr+", XLOCB(19,BOTP4,CBLT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bltctrl+",XLOCB(19,BOTP4,CBLT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtctr+", XLOCB(19,BOTP4,CBGT,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bgtctrl+",XLOCB(19,BOTP4,CBGT,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqctr+", XLOCB(19,BOTP4,CBEQ,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"beqctrl+",XLOCB(19,BOTP4,CBEQ,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsoctr+", XLOCB(19,BOTP4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunctr+", XLOCB(19,BOTP4,CBSO,528,0),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bsoctrl+",XLOCB(19,BOTP4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
+{"bunctrl+",XLOCB(19,BOTP4,CBSO,528,1),	XLBOCBBB_MASK, POWER4,	 PPCNONE,	{CR}},
 
 {"bfctr",   XLO(19,BOF,528,0),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bfctr-",  XLO(19,BOF,528,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"bfctr-",  XLO(19,BOF,528,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"bfctrl",  XLO(19,BOF,528,1),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"bfctrl-", XLO(19,BOF,528,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bfctr+",  XLO(19,BOFP,528,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bfctrl+", XLO(19,BOFP,528,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"bfctr-",  XLO(19,BOFM4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"bfctrl-", XLO(19,BOFM4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"bfctr+",  XLO(19,BOFP4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"bfctrl+", XLO(19,BOFP4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
+{"bfctrl-", XLO(19,BOF,528,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bfctr+",  XLO(19,BOFP,528,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bfctrl+", XLO(19,BOFP,528,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"bfctr-",  XLO(19,BOFM4,528,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"bfctrl-", XLO(19,BOFM4,528,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"bfctr+",  XLO(19,BOFP4,528,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"bfctrl+", XLO(19,BOFP4,528,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
 {"btctr",   XLO(19,BOT,528,0),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"btctr-",  XLO(19,BOT,528,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
+{"btctr-",  XLO(19,BOT,528,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
 {"btctrl",  XLO(19,BOT,528,1),		XLBOBB_MASK,   PPCCOM,	 PPCNONE,	{BI}},
-{"btctrl-", XLO(19,BOT,528,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"btctr+",  XLO(19,BOTP,528,0),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"btctrl+", XLO(19,BOTP,528,1),		XLBOBB_MASK,   PPCCOM,   ISA_V2,	{BI}},
-{"btctr-",  XLO(19,BOTM4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"btctrl-", XLO(19,BOTM4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"btctr+",  XLO(19,BOTP4,528,0),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
-{"btctrl+", XLO(19,BOTP4,528,1),	XLBOBB_MASK,   ISA_V2,	 PPCNONE,	{BI}},
+{"btctrl-", XLO(19,BOT,528,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"btctr+",  XLO(19,BOTP,528,0),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"btctrl+", XLO(19,BOTP,528,1),		XLBOBB_MASK,   PPCCOM,   POWER4,	{BI}},
+{"btctr-",  XLO(19,BOTM4,528,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"btctrl-", XLO(19,BOTM4,528,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"btctr+",  XLO(19,BOTP4,528,0),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
+{"btctrl+", XLO(19,BOTP4,528,1),	XLBOBB_MASK,   POWER4,	 PPCNONE,	{BI}},
 
 {"bcctr-",  XLYLK(19,528,0,0),		XLYBB_MASK,    PPCCOM,	 PPCNONE,	{BOE, BI}},
 {"bcctrl-", XLYLK(19,528,0,1),		XLYBB_MASK,    PPCCOM,	 PPCNONE,	{BOE, BI}},
@@ -3732,8 +3680,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lbepx",	X(31,95),	X_MASK,   E500MC|PPCA2,	PPCNONE,	{RT, RA, RB}},
 
-{"dni",		XRC(31,97,1),	XRB_MASK,    E6500,	PPCNONE,	{DUI, DCTL}},
-
 {"lvx",		X(31,103),	X_MASK,      PPCVEC,	PPCNONE,	{VD, RA, RB}},
 {"lqfcmx",	APU(31,103,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
@@ -3743,8 +3689,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mul",		XO(31,107,0,0),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
 {"mul.",	XO(31,107,0,1),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
 
-{"mvidsplt",	X(31,110),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA, RB}},
-
 {"mtsrdin",	X(31,114),	XRA_MASK,    PPC64,	PPCNONE,	{RS, RB}},
 
 {"lharx",	X(31,116),	XEH_MASK,    POWER7,	PPCNONE,	{RT, RA0, RB, EH}},
@@ -3779,9 +3723,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"adde.",	XO(31,138,0,1),	XO_MASK,     PPCCOM,	PPCNONE,	{RT, RA, RB}},
 {"ae.",		XO(31,138,0,1),	XO_MASK,     PWRCOM,	PPCNONE,	{RT, RA, RB}},
 
-{"mviwsplt",	X(31,142),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA, RB}},
-
-{"dcbtstlse",	X(31,142),	X_MASK,      PPCCHLK,	E500MC,		{CT, RA, RB}},
+{"dcbtstlse",	X(31,142),	X_MASK,      PPCCHLK,	PPCNONE,	{CT, RA, RB}},
 
 {"mtcr",	XFXM(31,144,0xff,0), XRARB_MASK, COM,	PPCNONE,	{RS}},
 {"mtcrf",	XFXM(31,144,0,0), XFXFXM_MASK, COM,	PPCNONE,	{FXM, RS}},
@@ -3818,7 +3760,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"stvehx",	X(31,167),	X_MASK,      PPCVEC,	PPCNONE,	{VS, RA, RB}},
 {"sthfcmx",	APU(31,167,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
-{"dcbtlse",	X(31,174),	X_MASK,      PPCCHLK,	E500MC,		{CT, RA, RB}},
+{"dcbtlse",	X(31,174),	X_MASK,      PPCCHLK,	PPCNONE,	{CT, RA, RB}},
 
 {"mtmsrd",	X(31,178),	XRLARB_MASK, PPC64,	PPCNONE,	{RS, A_L}},
 
@@ -3836,8 +3778,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"prtyd",	X(31,186),	XRB_MASK, POWER6|PPCA2,	PPCNONE,	{RA, RS}},
 
-{"icblq.",	XRC(31,198,1),	X_MASK,      E6500,	PPCNONE,	{CT, RA0, RB}},
-
 {"stvewx",	X(31,199),	X_MASK,      PPCVEC,	PPCNONE,	{VS, RA, RB}},
 {"stwfcmx",	APU(31,199,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
@@ -3915,12 +3855,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mfdcrx",	X(31,259),	X_MASK, BOOKE|PPCA2|PPC476, TITAN,	{RS, RA}},
 {"mfdcrx.",	XRC(31,259,1),	X_MASK,      PPCA2,	PPCNONE,	{RS, RA}},
 
-{"lvexbx",	X(31,261),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"icbt",	X(31,262),	XRT_MASK,    PPC403,	PPCNONE,	{RA, RB}},
 
-{"lvepxl",	X(31,263),	X_MASK,      PPCVEC2,   PPCNONE,	{VD, RA0, RB}},
-
 {"ldfcmx",	APU(31,263,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 {"doz",		XO(31,264,0,0),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
 {"doz.",	XO(31,264,0,1),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
@@ -3954,9 +3890,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"mfdcrux",	X(31,291),	X_MASK,      PPC464,	PPCNONE,	{RS, RA}},
 
-{"lvexhx",	X(31,293),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-{"lvepx",	X(31,295),	X_MASK,      PPCVEC2,   PPCNONE,	{VD, RA0, RB}},
-
 {"tlbie",	X(31,306),	XRTLRA_MASK, PPC,	TITAN,  	{RB, L}},
 {"tlbi",	X(31,306),	XRT_MASK,    POWER,	PPCNONE,	{RA0, RB}},
 
@@ -4008,8 +3941,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mfdcr",	X(31,323), X_MASK, PPC403|BOOKE|PPCA2|PPC476, TITAN,	{RT, SPR}},
 {"mfdcr.",	XRC(31,323,1),	X_MASK,      PPCA2,	PPCNONE,	{RT, SPR}},
 
-{"lvexwx",	X(31,325),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"dcread",	X(31,326),	X_MASK,  PPC476|TITAN,	PPCNONE,	{RT, RA, RB}},
 
 {"div",		XO(31,331,0,0),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
@@ -4018,7 +3949,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"lxvdsx",	X(31,332),	XX1_MASK,    PPCVSX,	PPCNONE,	{XT6, RA, RB}},
 
 {"mfpmr",	X(31,334),	X_MASK, PPCPMR|PPCE300,	PPCNONE,	{RT, PMR}},
-{"mftmr",	X(31,366),	X_MASK,	PPCTMR|E6500,	PPCNONE,	{RT, TMR}},
 
 {"mfmq",	XSPR(31,339,  0), XSPR_MASK, M601,	PPCNONE,	{RT}},
 {"mfxer",	XSPR(31,339,  1), XSPR_MASK, COM,	PPCNONE,	{RT}},
@@ -4249,8 +4179,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mtdcrx",	X(31,387),	X_MASK, BOOKE|PPCA2|PPC476, TITAN,	{RA, RS}},
 {"mtdcrx.",	XRC(31,387,1),	X_MASK,      PPCA2,	PPCNONE,	{RA, RS}},
 
-{"stvexbx",	X(31,389),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"dcblc",	X(31,390),	X_MASK, PPCCHLK|PPC476|TITAN, PPCNONE,	{CT, RA, RB}},
 {"stdfcmx",	APU(31,391,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
@@ -4259,7 +4187,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"divweu",	XO(31,395,0,0),	XO_MASK,  POWER7|PPCA2,	PPCNONE,	{RT, RA, RB}},
 {"divweu.",	XO(31,395,0,1),	XO_MASK,  POWER7|PPCA2,	PPCNONE,	{RT, RA, RB}},
 
-{"dcblce",	X(31,398),	X_MASK,      PPCCHLK,	E500MC,		{CT, RA, RB}},
+{"dcblce",	X(31,398),	X_MASK,      PPCCHLK,	PPCNONE,	{CT, RA, RB}},
 
 {"slbmte",	X(31,402),	XRA_MASK,    PPC64,	PPCNONE,	{RS, RB}},
 
@@ -4275,10 +4203,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"mtdcrux",	X(31,419),	X_MASK,      PPC464,	PPCNONE,	{RA, RS}},
 
-{"stvexhx",	X(31,421),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
-{"dcblq.",	XRC(31,422,1),	X_MASK,      E6500,	PPCNONE,	{CT, RA0, RB}},
-
 {"divde",	XO(31,425,0,0),	XO_MASK,  POWER7|PPCA2,	PPCNONE,	{RT, RA, RB}},
 {"divde.",	XO(31,425,0,1),	XO_MASK,  POWER7|PPCA2,	PPCNONE,	{RT, RA, RB}},
 {"divwe",	XO(31,427,0,0),	XO_MASK,  POWER7|PPCA2,	PPCNONE,	{RT, RA, RB}},
@@ -4292,8 +4216,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"mdors",	0x7f9ce378,	0xffffffff,  E500MC,	PPCNONE,	{0}},
 
-{"miso",	0x7f5ad378,	0xffffffff,  E6500,	PPCNONE,	{0}},
-
 {"mr",		XRC(31,444,0),	X_MASK,      COM,	PPCNONE,	{RA, RS, RBS}},
 {"or",		XRC(31,444,0),	X_MASK,      COM,	PPCNONE,	{RA, RS, RB}},
 {"mr.",		XRC(31,444,1),	X_MASK,      COM,	PPCNONE,	{RA, RS, RBS}},
@@ -4336,8 +4258,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mtdcr",	X(31,451), X_MASK, PPC403|BOOKE|PPCA2|PPC476, TITAN,	{SPR, RS}},
 {"mtdcr.",	XRC(31,451,1), X_MASK,       PPCA2,	PPCNONE,	{SPR, RS}},
 
-{"stvexwx",	X(31,453),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"dccci",	X(31,454), XRT_MASK, PPC403|PPC440|TITAN|PPCA2, PPCNONE, {RAOPT, RBOPT}},
 {"dci",		X(31,454),	XRARB_MASK, PPCA2|PPC476, PPCNONE,	{CT}},
 
@@ -4348,7 +4268,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"divwu.",	XO(31,459,0,1),	XO_MASK,     PPC,	PPCNONE,	{RT, RA, RB}},
 
 {"mtpmr",	X(31,462),	X_MASK, PPCPMR|PPCE300,	PPCNONE,	{PMR, RS}},
-{"mttmr",	X(31,494),	X_MASK,	PPCTMR|E6500,	PPCNONE,	{TMR, RS}},
 
 {"mtmq",	XSPR(31,467,  0), XSPR_MASK, M601,	PPCNONE,	{RS}},
 {"mtxer",	XSPR(31,467,  1), XSPR_MASK, COM,	PPCNONE,	{RS}},
@@ -4534,7 +4453,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"divw",	XO(31,491,0,0),	XO_MASK,     PPC,	PPCNONE,	{RT, RA, RB}},
 {"divw.",	XO(31,491,0,1),	XO_MASK,     PPC,	PPCNONE,	{RT, RA, RB}},
 
-{"icbtlse",	X(31,494),	X_MASK,      PPCCHLK,	E500MC,		{CT, RA, RB}},
+{"icbtlse",	X(31,494),	X_MASK,      PPCCHLK,	PPCNONE,	{CT, RA, RB}},
 
 {"slbia",	X(31,498),	0xffffffff,  PPC64,	PPCNONE,	{0}},
 
@@ -4593,8 +4512,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lhdx",	X(31,547),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
 
-{"lvtrx",	X(31,549),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"bbelr",	X(31,550),	X_MASK,      PPCBRLK,	PPCNONE,	{0}},
 
 {"lvrx",	X(31,551),	X_MASK,      CELL,	PPCNONE,	{VD, RA0, RB}},
@@ -4611,8 +4528,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lwdx",	X(31,579),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
 
-{"lvtlx",	X(31,581),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"lwfcmux",	APU(31,583,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
 {"lxsdx",	X(31,588),	XX1_MASK,    PPCVSX,	PPCNONE,	{XT6, RA, RB}},
@@ -4624,10 +4539,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lwsync",	XSYNC(31,598,1), 0xffffffff, PPC,	E500,		{0}},
 {"ptesync",	XSYNC(31,598,2), 0xffffffff, PPC64,	PPCNONE,	{0}},
-{"sync",	X(31,598),	XSYNCLE_MASK,E6500,	PPCNONE,	{LS, ESYNC}},
 {"sync",	X(31,598),	XSYNC_MASK,  PPCCOM,	BOOKE|PPC476,	{LS}},
 {"msync",	X(31,598),	0xffffffff, BOOKE|PPCA2|PPC476, PPCNONE, {0}},
-{"sync",	X(31,598),	0xffffffff, BOOKE|PPC476, E6500,	{0}},
+{"sync",	X(31,598),	0xffffffff, BOOKE|PPC476, PPCNONE, {0}},
 {"lwsync",	X(31,598),	0xffffffff, E500,	PPCNONE,	{0}},
 {"dcs",		X(31,598),	0xffffffff,  PWRCOM,	PPCNONE,	{0}},
 
@@ -4638,8 +4552,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lddx",	X(31,611),	X_MASK,      E500MC,	PPCNONE,	{RT, RA, RB}},
 
-{"lvswx",	X(31,613),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"lqfcmux",	APU(31,615,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
 {"nego",	XO(31,104,1,0),	XORB_MASK,   COM,	PPCNONE,	{RT, RA}},
@@ -4689,8 +4601,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"sthdx",	X(31,675),	X_MASK,      E500MC,	PPCNONE,	{RS, RA, RB}},
 
-{"stvfrx",	X(31,677),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"stvrx",	X(31,679),	X_MASK,      CELL,	PPCNONE,	{VS, RA0, RB}},
 {"sthfcmux",	APU(31,679,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
@@ -4703,8 +4613,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"stwdx",	X(31,707),	X_MASK,      E500MC,	PPCNONE,	{RS, RA, RB}},
 
-{"stvflx",	X(31,709),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"stwfcmux",	APU(31,711,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
 {"stxsdx",	X(31,716),	XX1_MASK,    PPCVSX,	PPCNONE,	{XS6, RA, RB}},
@@ -4737,8 +4645,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"stddx",	X(31,739),	X_MASK,      E500MC,	PPCNONE,	{RS, RA, RB}},
 
-{"stvswx",	X(31,741),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"stqfcmux",	APU(31,743,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
 {"subfmeo",	XO(31,232,1,0),	XORB_MASK,   PPCCOM,	PPCNONE,	{RT, RA}},
@@ -4767,8 +4673,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"srliq",	XRC(31,760,0),	X_MASK,      M601,	PPCNONE,	{RA, RS, SH}},
 {"srliq.",	XRC(31,760,1),	X_MASK,      M601,	PPCNONE,	{RA, RS, SH}},
 
-{"lvsm",	X(31,773),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-{"stvepxl",	X(31,775),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
 {"lvlxl",	X(31,775),	X_MASK,      CELL,	PPCNONE,	{VD, RA0, RB}},
 {"ldfcmux",	APU(31,775,0), 	APU_MASK,    PPC405,	PPCNONE,	{FCRT, RA, RB}},
 
@@ -4801,8 +4705,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lfddx",	X(31,803),	X_MASK,      E500MC,	PPCNONE,	{FRT, RA, RB}},
 
-{"lvtrxl",	X(31,805),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-{"stvepx",	X(31,807),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
 {"lvrxl",	X(31,807),	X_MASK,      CELL,	PPCNONE,	{VD, RA0, RB}},
 
 {"rac",		X(31,818),	X_MASK,      M601,	PPCNONE,	{RT, RA, RB}},
@@ -4823,8 +4725,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"sradi",	XS(31,413,0),	XS_MASK,     PPC64,	PPCNONE,	{RA, RS, SH6}},
 {"sradi.",	XS(31,413,1),	XS_MASK,     PPC64,	PPCNONE,	{RA, RS, SH6}},
 
-{"lvtlxl",	X(31,837),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"divo",	XO(31,331,1,0),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
 {"divo.",	XO(31,331,1,1),	XO_MASK,     M601,	PPCNONE,	{RT, RA, RB}},
 
@@ -4843,8 +4743,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"lfiwax",	X(31,855),	X_MASK, POWER6|PPCA2|PPC476, PPCNONE,	{FRT, RA0, RB}},
 
-{"lvswxl",	X(31,869),	X_MASK,      PPCVEC2,	PPCNONE,	{VD, RA0, RB}},
-
 {"abso",	XO(31,360,1,0),	XORB_MASK,   M601,	PPCNONE,	{RT, RA}},
 {"abso.",	XO(31,360,1,1),	XORB_MASK,   M601,	PPCNONE,	{RT, RA}},
 
@@ -4890,8 +4788,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"stfddx",	X(31,931),	X_MASK,      E500MC,	PPCNONE,	{FRS, RA, RB}},
 
-{"stvfrxl",	X(31,933),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"wclrone",	XOPL2(31,934,2),XRT_MASK,    PPCA2,	PPCNONE,	{RA0, RB}},
 {"wclrall",	X(31,934),	XRARB_MASK,  PPCA2,	PPCNONE,	{L}},
 {"wclr",	X(31,934),	X_MASK,	     PPCA2,	PPCNONE,	{L, RA0, RB}},
@@ -4920,8 +4816,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"extsb",	XRC(31,954,0),	XRB_MASK,    PPC,	PPCNONE,	{RA, RS}},
 {"extsb.",	XRC(31,954,1),	XRB_MASK,    PPC,	PPCNONE,	{RA, RS}},
 
-{"stvflxl",	X(31,965),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"iccci",	X(31,966), XRT_MASK, PPC403|PPC440|TITAN|PPCA2, PPCNONE, {RAOPT, RBOPT}},
 {"ici",		X(31,966),	XRARB_MASK,  PPCA2|PPC476, PPCNONE,	{CT}},
 
@@ -4949,8 +4843,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"icbiep",	XRT(31,991,0),	XRT_MASK, E500MC|PPCA2,	PPCNONE,	{RA, RB}},
 
-{"stvswxl",	X(31,997),	X_MASK,      PPCVEC2,	PPCNONE,	{VS, RA0, RB}},
-
 {"icread",	X(31,998), XRT_MASK, PPC403|PPC440|PPC476|TITAN, PPCNONE, {RA, RB}},
 
 {"nabso",	XO(31,488,1,0),	XORB_MASK,   M601,	PPCNONE,	{RT, RA}},
diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 58b54d1313..be44e907e7 100644
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -372,7 +372,7 @@ b278 stcke S_RD "store clock extended" g5 esa,zarch
 b2a5 tre RRE_RER "translate extended" g5 esa,zarch
 eb000000008e mvclu RSE_RERERD "move long unicode" g5 esa,zarch
 e9 pka SS_L2RDRD "pack ascii" g5 esa,zarch
-e1 pku SS_L2RDRD "pack unicode" g5 esa,zarch
+e1 pku SS_L0RDRD "pack unicode" g5 esa,zarch
 b993 troo RRE_RER "translate one to one" g5 esa,zarch
 b992 trot RRE_RER "translate one to two" g5 esa,zarch
 b991 trto RRE_RER "translate two to one" g5 esa,zarch
@@ -960,17 +960,6 @@ b9a2 ptf RRE_R0 "perform topology function" z10 zarch
 b9af pfmf RRE_RR "perform frame management function" z10 zarch
 b9bf trte RRF_M0RER "translate and test extended" z10 zarch
 b9bd trtre RRF_M0RER "translate and test reverse extended" z10 zarch
-b2ed ecpga RRE_RR "extract coprocessor-group address" z10 zarch
-b2e4 ecctr RRE_RR "extract cpu counter" z10 zarch
-b2e5 epctr RRE_RR "extract peripheral counter" z10 zarch
-b284 lcctl S_RD "load cpu-counter-set controls" z10 zarch
-b285 lpctl S_RD "load peripheral-counter-set controls" z10 zarch
-b287 lsctl S_RD "load sampling controls" z10 zarch
-b28e qctri S_RD "query counter information" z10 zarch
-b286 qsi S_RD "query sampling information" z10 zarch
-b2e0 scctr RRE_RR "set cpu counter" z10 zarch
-b2e1 spctr RRE_RR "set peripheral counter" z10 zarch
-b280 lpp S_RD "load program parameter" z10 zarch
 b9c8 ahhhr RRF_R0RR2 "add high high" z196 zarch
 b9d8 ahhlr RRF_R0RR2 "add high low" z196 zarch
 cc08 aih RIL_RI "add immediate high" z196 zarch
diff --git a/opcodes/sparc-opc.c b/opcodes/sparc-opc.c
index a2096c5a90..5cfb4d563e 100644
--- a/opcodes/sparc-opc.c
+++ b/opcodes/sparc-opc.c
@@ -1849,10 +1849,8 @@ SLCBCC("cbnefr", 15),
 { "fnhadds",	F3F(2, 0x34, 0x071), F3F(~2, ~0x34, ~0x071), "e,f,g", F_FLOAT|F_HPC, v9b },
 { "fnhaddd",	F3F(2, 0x34, 0x072), F3F(~2, ~0x34, ~0x072), "v,B,H", F_FLOAT|F_HPC, v9b },
 { "fnsmuld",	F3F(2, 0x34, 0x079), F3F(~2, ~0x34, ~0x079), "e,f,H", F_FLOAT|F_HPC, v9b },
-{ "fpmaddx",	F3(2, 0x37, 0)|OPF_LOW4(0), F3(~2, ~0x37, 0)|OPF_LOW4(~0), "v,B,5,H", F_FLOAT|F_IMA, v9b },
 { "fmadds",	F3(2, 0x37, 0)|OPF_LOW4(1), F3(~2, ~0x37, 0)|OPF_LOW4(~1), "e,f,4,g", F_FLOAT|F_FMAF, v9b },
 { "fmaddd",	F3(2, 0x37, 0)|OPF_LOW4(2), F3(~2, ~0x37, 0)|OPF_LOW4(~2), "v,B,5,H", F_FLOAT|F_FMAF, v9b },
-{ "fpmaddxhi",	F3(2, 0x37, 0)|OPF_LOW4(4), F3(~2, ~0x37, 0)|OPF_LOW4(~4), "v,B,5,H", F_FLOAT|F_IMA, v9b },
 { "fmsubs",	F3(2, 0x37, 0)|OPF_LOW4(5), F3(~2, ~0x37, 0)|OPF_LOW4(~5), "e,f,4,g", F_FLOAT|F_FMAF, v9b },
 { "fmsubd",	F3(2, 0x37, 0)|OPF_LOW4(6), F3(~2, ~0x37, 0)|OPF_LOW4(~6), "v,B,5,H", F_FLOAT|F_FMAF, v9b },
 { "fnmsubs",	F3(2, 0x37, 0)|OPF_LOW4(9), F3(~2, ~0x37, 0)|OPF_LOW4(~9), "e,f,4,g", F_FLOAT|F_FMAF, v9b },
@@ -1869,7 +1867,7 @@ SLCBCC("cbnefr", 15),
 { "fnumaddd",	F3(2, 0x3f, 0)|OPF_LOW4(14), F3(~2, ~0x3f, 0)|OPF_LOW4(~14), "v,B,5,H", F_FLOAT|F_FJFMAU, v9b },
 { "addxc",	F3F(2, 0x36, 0x011), F3F(~2, ~0x36, ~0x011), "1,2,d", F_VIS3, v9b },
 { "addxccc",	F3F(2, 0x36, 0x013), F3F(~2, ~0x36, ~0x013), "1,2,d", F_VIS3, v9b },
-{ "random",	F3F(2, 0x36, 0x015), F3F(~2, ~0x36, ~0x015), "H", F_FLOAT|F_RANDOM, v9b },
+{ "random",	F3F(2, 0x36, 0x015), F3F(~2, ~0x36, ~0x015), "d", F_RANDOM, v9b },
 { "umulxhi",	F3F(2, 0x36, 0x016), F3F(~2, ~0x36, ~0x016), "1,2,d", F_VIS3, v9b },
 { "lzd",	F3F(2, 0x36, 0x017), F3F(~2, ~0x36, ~0x017), "2,d", F_VIS3, v9b },
 { "cmask8",	F3F(2, 0x36, 0x01b), F3F(~2, ~0x36, ~0x01b), "2", F_VIS3, v9b },
diff --git a/opcodes/tilegx-opc.c b/opcodes/tilegx-opc.c
index 682dd1b1aa..4f97019337 100644
--- a/opcodes/tilegx-opc.c
+++ b/opcodes/tilegx-opc.c
@@ -41,7 +41,7 @@
 #include <stddef.h>
 #endif
 
-const struct tilegx_opcode tilegx_opcodes[336] =
+const struct tilegx_opcode tilegx_opcodes[334] =
 {
  { "bpt", TILEGX_OPC_BPT, 0x2, 0, TREG_ZERO, 0,
     { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
@@ -100,46 +100,8 @@ const struct tilegx_opcode tilegx_opcodes[336] =
     }
 #endif
   },
-  { "ld4s_tls", TILEGX_OPC_LD4S_TLS, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
-#ifndef DISASM_ONLY
-    {
-      0ULL,
-      0xfffff80000000000ULL,
-      0ULL,
-      0ULL,
-      0ULL
-    },
-    {
-      -1ULL,
-      0x1858000000000000ULL,
-      -1ULL,
-      -1ULL,
-      -1ULL
-    }
-#endif
-  },
-  { "ld_tls", TILEGX_OPC_LD_TLS, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
-#ifndef DISASM_ONLY
-    {
-      0ULL,
-      0xfffff80000000000ULL,
-      0ULL,
-      0ULL,
-      0ULL
-    },
-    {
-      -1ULL,
-      0x18a0000000000000ULL,
-      -1ULL,
-      -1ULL,
-      -1ULL
-    }
-#endif
-  },
   { "move", TILEGX_OPC_MOVE, 0xf, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 6, 7 }, { 10, 11 }, { 12, 13 }, { 0, } },
+    { { 6, 7 }, { 8, 9 }, { 10, 11 }, { 12, 13 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -158,7 +120,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "movei", TILEGX_OPC_MOVEI, 0xf, 2, TREG_ZERO, 1,
-    { { 8, 0 }, { 6, 1 }, { 10, 2 }, { 12, 3 }, { 0, } },
+    { { 6, 0 }, { 8, 1 }, { 10, 2 }, { 12, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00fc0ULL,
@@ -177,7 +139,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "moveli", TILEGX_OPC_MOVELI, 0x3, 2, TREG_ZERO, 1,
-    { { 8, 4 }, { 6, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 4 }, { 8, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc000000070000fc0ULL,
@@ -196,7 +158,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch", TILEGX_OPC_PREFETCH, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -329,7 +291,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch_l1", TILEGX_OPC_PREFETCH_L1, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -348,7 +310,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch_l1_fault", TILEGX_OPC_PREFETCH_L1_FAULT, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -367,7 +329,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch_l2", TILEGX_OPC_PREFETCH_L2, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -386,7 +348,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch_l2_fault", TILEGX_OPC_PREFETCH_L2_FAULT, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -405,7 +367,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch_l3", TILEGX_OPC_PREFETCH_L3, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -424,7 +386,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "prefetch_l3_fault", TILEGX_OPC_PREFETCH_L3_FAULT, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 14 } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -462,7 +424,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "add", TILEGX_OPC_ADD, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -481,7 +443,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "addi", TILEGX_OPC_ADDI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -500,7 +462,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "addli", TILEGX_OPC_ADDLI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 4 }, { 6, 7, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 4 }, { 8, 9, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc000000070000000ULL,
@@ -519,7 +481,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "addx", TILEGX_OPC_ADDX, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -538,7 +500,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "addxi", TILEGX_OPC_ADDXI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -557,7 +519,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "addxli", TILEGX_OPC_ADDXLI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 4 }, { 6, 7, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 4 }, { 8, 9, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc000000070000000ULL,
@@ -576,7 +538,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "addxsc", TILEGX_OPC_ADDXSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -595,7 +557,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "and", TILEGX_OPC_AND, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -614,7 +576,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "andi", TILEGX_OPC_ANDI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -633,7 +595,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "beqz", TILEGX_OPC_BEQZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -652,7 +614,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "beqzt", TILEGX_OPC_BEQZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -671,7 +633,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bfexts", TILEGX_OPC_BFEXTS, 0x1, 4, TREG_ZERO, 1,
-    { { 8, 9, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007f000000ULL,
@@ -690,7 +652,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bfextu", TILEGX_OPC_BFEXTU, 0x1, 4, TREG_ZERO, 1,
-    { { 8, 9, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007f000000ULL,
@@ -709,7 +671,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bfins", TILEGX_OPC_BFINS, 0x1, 4, TREG_ZERO, 1,
-    { { 23, 9, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007f000000ULL,
@@ -728,7 +690,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bgez", TILEGX_OPC_BGEZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -747,7 +709,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bgezt", TILEGX_OPC_BGEZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -766,7 +728,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bgtz", TILEGX_OPC_BGTZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -785,7 +747,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bgtzt", TILEGX_OPC_BGTZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -804,7 +766,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "blbc", TILEGX_OPC_BLBC, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -823,7 +785,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "blbct", TILEGX_OPC_BLBCT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -842,7 +804,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "blbs", TILEGX_OPC_BLBS, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -861,7 +823,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "blbst", TILEGX_OPC_BLBST, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -880,7 +842,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "blez", TILEGX_OPC_BLEZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -899,7 +861,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "blezt", TILEGX_OPC_BLEZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -918,7 +880,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bltz", TILEGX_OPC_BLTZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -937,7 +899,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bltzt", TILEGX_OPC_BLTZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -956,7 +918,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bnez", TILEGX_OPC_BNEZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -975,7 +937,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "bnezt", TILEGX_OPC_BNEZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -994,7 +956,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "clz", TILEGX_OPC_CLZ, 0x5, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -1013,7 +975,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmoveqz", TILEGX_OPC_CMOVEQZ, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1032,7 +994,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmovnez", TILEGX_OPC_CMOVNEZ, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1051,7 +1013,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpeq", TILEGX_OPC_CMPEQ, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1070,7 +1032,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpeqi", TILEGX_OPC_CMPEQI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -1089,7 +1051,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpexch", TILEGX_OPC_CMPEXCH, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1108,7 +1070,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpexch4", TILEGX_OPC_CMPEXCH4, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1127,7 +1089,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmples", TILEGX_OPC_CMPLES, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1146,7 +1108,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpleu", TILEGX_OPC_CMPLEU, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1165,7 +1127,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmplts", TILEGX_OPC_CMPLTS, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1184,7 +1146,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpltsi", TILEGX_OPC_CMPLTSI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -1203,7 +1165,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpltu", TILEGX_OPC_CMPLTU, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1222,7 +1184,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpltui", TILEGX_OPC_CMPLTUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -1241,7 +1203,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmpne", TILEGX_OPC_CMPNE, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1260,7 +1222,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmul", TILEGX_OPC_CMUL, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1279,7 +1241,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmula", TILEGX_OPC_CMULA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1298,7 +1260,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmulaf", TILEGX_OPC_CMULAF, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1317,7 +1279,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmulf", TILEGX_OPC_CMULF, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1336,7 +1298,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmulfr", TILEGX_OPC_CMULFR, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1355,7 +1317,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmulh", TILEGX_OPC_CMULH, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1374,7 +1336,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "cmulhr", TILEGX_OPC_CMULHR, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1393,7 +1355,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "crc32_32", TILEGX_OPC_CRC32_32, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1412,7 +1374,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "crc32_8", TILEGX_OPC_CRC32_8, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1431,7 +1393,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ctz", TILEGX_OPC_CTZ, 0x5, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -1450,7 +1412,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "dblalign", TILEGX_OPC_DBLALIGN, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1469,7 +1431,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "dblalign2", TILEGX_OPC_DBLALIGN2, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1488,7 +1450,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "dblalign4", TILEGX_OPC_DBLALIGN4, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1507,7 +1469,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "dblalign6", TILEGX_OPC_DBLALIGN6, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1545,7 +1507,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "dtlbpr", TILEGX_OPC_DTLBPR, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1564,7 +1526,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "exch", TILEGX_OPC_EXCH, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1583,7 +1545,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "exch4", TILEGX_OPC_EXCH4, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1602,7 +1564,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_add_flags", TILEGX_OPC_FDOUBLE_ADD_FLAGS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1621,7 +1583,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_addsub", TILEGX_OPC_FDOUBLE_ADDSUB, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1640,7 +1602,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_mul_flags", TILEGX_OPC_FDOUBLE_MUL_FLAGS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1659,7 +1621,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_pack1", TILEGX_OPC_FDOUBLE_PACK1, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1678,7 +1640,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_pack2", TILEGX_OPC_FDOUBLE_PACK2, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1697,7 +1659,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_sub_flags", TILEGX_OPC_FDOUBLE_SUB_FLAGS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1716,7 +1678,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_unpack_max", TILEGX_OPC_FDOUBLE_UNPACK_MAX, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1735,7 +1697,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fdouble_unpack_min", TILEGX_OPC_FDOUBLE_UNPACK_MIN, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -1754,7 +1716,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchadd", TILEGX_OPC_FETCHADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1773,7 +1735,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchadd4", TILEGX_OPC_FETCHADD4, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1792,7 +1754,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchaddgez", TILEGX_OPC_FETCHADDGEZ, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1811,7 +1773,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchaddgez4", TILEGX_OPC_FETCHADDGEZ4, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1830,7 +1792,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchand", TILEGX_OPC_FETCHAND, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1849,7 +1811,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchand4", TILEGX_OPC_FETCHAND4, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1868,7 +1830,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchor", TILEGX_OPC_FETCHOR, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1887,7 +1849,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fetchor4", TILEGX_OPC_FETCHOR4, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1906,7 +1868,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "finv", TILEGX_OPC_FINV, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1925,7 +1887,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "flush", TILEGX_OPC_FLUSH, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1982,7 +1944,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_add1", TILEGX_OPC_FSINGLE_ADD1, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2001,7 +1963,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_addsub2", TILEGX_OPC_FSINGLE_ADDSUB2, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2020,7 +1982,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_mul1", TILEGX_OPC_FSINGLE_MUL1, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2039,7 +2001,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_mul2", TILEGX_OPC_FSINGLE_MUL2, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2058,7 +2020,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_pack1", TILEGX_OPC_FSINGLE_PACK1, 0x5, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -2077,7 +2039,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_pack2", TILEGX_OPC_FSINGLE_PACK2, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2096,7 +2058,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "fsingle_sub1", TILEGX_OPC_FSINGLE_SUB1, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2115,7 +2077,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "icoh", TILEGX_OPC_ICOH, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2153,7 +2115,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "inv", TILEGX_OPC_INV, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2229,7 +2191,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "jalr", TILEGX_OPC_JALR, 0xa, 1, TREG_LR, 1,
-    { { 0, }, { 7 }, { 0, }, { 13 }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2248,7 +2210,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "jalrp", TILEGX_OPC_JALRP, 0xa, 1, TREG_LR, 1,
-    { { 0, }, { 7 }, { 0, }, { 13 }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2267,7 +2229,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "jr", TILEGX_OPC_JR, 0xa, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 13 }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2286,7 +2248,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "jrp", TILEGX_OPC_JRP, 0xa, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 13 }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2305,7 +2267,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld", TILEGX_OPC_LD, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2324,7 +2286,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld1s", TILEGX_OPC_LD1S, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2343,7 +2305,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld1s_add", TILEGX_OPC_LD1S_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2362,7 +2324,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld1u", TILEGX_OPC_LD1U, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2381,7 +2343,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld1u_add", TILEGX_OPC_LD1U_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2400,7 +2362,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld2s", TILEGX_OPC_LD2S, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2419,7 +2381,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld2s_add", TILEGX_OPC_LD2S_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2438,7 +2400,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld2u", TILEGX_OPC_LD2U, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2457,7 +2419,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld2u_add", TILEGX_OPC_LD2U_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2476,7 +2438,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld4s", TILEGX_OPC_LD4S, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2495,7 +2457,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld4s_add", TILEGX_OPC_LD4S_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2514,7 +2476,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld4u", TILEGX_OPC_LD4U, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 26, 14 } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2533,7 +2495,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld4u_add", TILEGX_OPC_LD4U_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2552,7 +2514,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ld_add", TILEGX_OPC_LD_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2571,7 +2533,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldna", TILEGX_OPC_LDNA, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2590,7 +2552,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldna_add", TILEGX_OPC_LDNA_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2609,7 +2571,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt", TILEGX_OPC_LDNT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2628,7 +2590,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt1s", TILEGX_OPC_LDNT1S, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2647,7 +2609,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt1s_add", TILEGX_OPC_LDNT1S_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2666,7 +2628,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt1u", TILEGX_OPC_LDNT1U, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2685,7 +2647,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt1u_add", TILEGX_OPC_LDNT1U_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2704,7 +2666,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt2s", TILEGX_OPC_LDNT2S, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2723,7 +2685,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt2s_add", TILEGX_OPC_LDNT2S_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2742,7 +2704,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt2u", TILEGX_OPC_LDNT2U, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2761,7 +2723,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt2u_add", TILEGX_OPC_LDNT2U_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2780,7 +2742,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt4s", TILEGX_OPC_LDNT4S, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2799,7 +2761,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt4s_add", TILEGX_OPC_LDNT4S_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2818,7 +2780,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt4u", TILEGX_OPC_LDNT4U, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2837,7 +2799,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt4u_add", TILEGX_OPC_LDNT4U_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2856,7 +2818,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ldnt_add", TILEGX_OPC_LDNT_ADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 6, 15, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2875,7 +2837,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "lnk", TILEGX_OPC_LNK, 0xa, 1, TREG_ZERO, 1,
-    { { 0, }, { 6 }, { 0, }, { 12 }, { 0, } },
+    { { 0, }, { 8 }, { 0, }, { 12 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2913,7 +2875,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mfspr", TILEGX_OPC_MFSPR, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 6, 27 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 8, 27 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2932,7 +2894,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mm", TILEGX_OPC_MM, 0x1, 4, TREG_ZERO, 1,
-    { { 23, 9, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007f000000ULL,
@@ -2951,7 +2913,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mnz", TILEGX_OPC_MNZ, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -2970,7 +2932,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mtspr", TILEGX_OPC_MTSPR, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 28, 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 28, 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2989,7 +2951,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hs_hs", TILEGX_OPC_MUL_HS_HS, 0x5, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3008,7 +2970,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hs_hu", TILEGX_OPC_MUL_HS_HU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3027,7 +2989,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hs_ls", TILEGX_OPC_MUL_HS_LS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3046,7 +3008,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hs_lu", TILEGX_OPC_MUL_HS_LU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3065,7 +3027,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hu_hu", TILEGX_OPC_MUL_HU_HU, 0x5, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3084,7 +3046,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hu_ls", TILEGX_OPC_MUL_HU_LS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3103,7 +3065,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_hu_lu", TILEGX_OPC_MUL_HU_LU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3122,7 +3084,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_ls_ls", TILEGX_OPC_MUL_LS_LS, 0x5, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3141,7 +3103,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_ls_lu", TILEGX_OPC_MUL_LS_LU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3160,7 +3122,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mul_lu_lu", TILEGX_OPC_MUL_LU_LU, 0x5, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3179,7 +3141,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hs_hs", TILEGX_OPC_MULA_HS_HS, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3198,7 +3160,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hs_hu", TILEGX_OPC_MULA_HS_HU, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3217,7 +3179,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hs_ls", TILEGX_OPC_MULA_HS_LS, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3236,7 +3198,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hs_lu", TILEGX_OPC_MULA_HS_LU, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3255,7 +3217,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hu_hu", TILEGX_OPC_MULA_HU_HU, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3274,7 +3236,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hu_ls", TILEGX_OPC_MULA_HU_LS, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3293,7 +3255,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_hu_lu", TILEGX_OPC_MULA_HU_LU, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3312,7 +3274,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_ls_ls", TILEGX_OPC_MULA_LS_LS, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3331,7 +3293,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_ls_lu", TILEGX_OPC_MULA_LS_LU, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3350,7 +3312,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mula_lu_lu", TILEGX_OPC_MULA_LU_LU, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3369,7 +3331,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mulax", TILEGX_OPC_MULAX, 0x5, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3388,7 +3350,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mulx", TILEGX_OPC_MULX, 0x5, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3407,7 +3369,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "mz", TILEGX_OPC_MZ, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3464,7 +3426,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "nor", TILEGX_OPC_NOR, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3483,7 +3445,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "or", TILEGX_OPC_OR, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3502,7 +3464,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "ori", TILEGX_OPC_ORI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -3521,7 +3483,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "pcnt", TILEGX_OPC_PCNT, 0x5, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -3540,7 +3502,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "revbits", TILEGX_OPC_REVBITS, 0x5, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -3559,7 +3521,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "revbytes", TILEGX_OPC_REVBYTES, 0x5, 2, TREG_ZERO, 1,
-    { { 8, 9 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -3578,7 +3540,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "rotl", TILEGX_OPC_ROTL, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3597,7 +3559,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "rotli", TILEGX_OPC_ROTLI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3616,7 +3578,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl", TILEGX_OPC_SHL, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3635,7 +3597,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl16insli", TILEGX_OPC_SHL16INSLI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 4 }, { 6, 7, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 4 }, { 8, 9, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc000000070000000ULL,
@@ -3654,7 +3616,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl1add", TILEGX_OPC_SHL1ADD, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3673,7 +3635,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl1addx", TILEGX_OPC_SHL1ADDX, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3692,7 +3654,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl2add", TILEGX_OPC_SHL2ADD, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3711,7 +3673,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl2addx", TILEGX_OPC_SHL2ADDX, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3730,7 +3692,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl3add", TILEGX_OPC_SHL3ADD, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3749,7 +3711,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shl3addx", TILEGX_OPC_SHL3ADDX, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3768,7 +3730,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shli", TILEGX_OPC_SHLI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3787,7 +3749,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shlx", TILEGX_OPC_SHLX, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3806,7 +3768,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shlxi", TILEGX_OPC_SHLXI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3825,7 +3787,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shrs", TILEGX_OPC_SHRS, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3844,7 +3806,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shrsi", TILEGX_OPC_SHRSI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3863,7 +3825,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shru", TILEGX_OPC_SHRU, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3882,7 +3844,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shrui", TILEGX_OPC_SHRUI, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3901,7 +3863,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shrux", TILEGX_OPC_SHRUX, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3920,7 +3882,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shruxi", TILEGX_OPC_SHRUXI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3939,7 +3901,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "shufflebytes", TILEGX_OPC_SHUFFLEBYTES, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -3958,7 +3920,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "st", TILEGX_OPC_ST, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 14, 33 } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -3977,7 +3939,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "st1", TILEGX_OPC_ST1, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 14, 33 } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4015,7 +3977,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "st2", TILEGX_OPC_ST2, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 14, 33 } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4053,7 +4015,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "st4", TILEGX_OPC_ST4, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 14, 33 } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4110,7 +4072,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "stnt", TILEGX_OPC_STNT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4129,7 +4091,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "stnt1", TILEGX_OPC_STNT1, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4167,7 +4129,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "stnt2", TILEGX_OPC_STNT2, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4205,7 +4167,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "stnt4", TILEGX_OPC_STNT4, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -4262,7 +4224,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "sub", TILEGX_OPC_SUB, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4281,7 +4243,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "subx", TILEGX_OPC_SUBX, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4300,7 +4262,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "subxsc", TILEGX_OPC_SUBXSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4395,7 +4357,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "tblidxb0", TILEGX_OPC_TBLIDXB0, 0x5, 2, TREG_ZERO, 1,
-    { { 23, 9 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -4414,7 +4376,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "tblidxb1", TILEGX_OPC_TBLIDXB1, 0x5, 2, TREG_ZERO, 1,
-    { { 23, 9 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -4433,7 +4395,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "tblidxb2", TILEGX_OPC_TBLIDXB2, 0x5, 2, TREG_ZERO, 1,
-    { { 23, 9 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -4452,7 +4414,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "tblidxb3", TILEGX_OPC_TBLIDXB3, 0x5, 2, TREG_ZERO, 1,
-    { { 23, 9 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffff000ULL,
@@ -4471,7 +4433,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1add", TILEGX_OPC_V1ADD, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4490,7 +4452,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1addi", TILEGX_OPC_V1ADDI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -4509,7 +4471,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1adduc", TILEGX_OPC_V1ADDUC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4528,7 +4490,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1adiffu", TILEGX_OPC_V1ADIFFU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4547,7 +4509,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1avgu", TILEGX_OPC_V1AVGU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4566,7 +4528,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpeq", TILEGX_OPC_V1CMPEQ, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4585,7 +4547,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpeqi", TILEGX_OPC_V1CMPEQI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -4604,7 +4566,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmples", TILEGX_OPC_V1CMPLES, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4623,7 +4585,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpleu", TILEGX_OPC_V1CMPLEU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4642,7 +4604,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmplts", TILEGX_OPC_V1CMPLTS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4661,7 +4623,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpltsi", TILEGX_OPC_V1CMPLTSI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -4680,7 +4642,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpltu", TILEGX_OPC_V1CMPLTU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4699,7 +4661,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpltui", TILEGX_OPC_V1CMPLTUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -4718,7 +4680,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1cmpne", TILEGX_OPC_V1CMPNE, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4737,7 +4699,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1ddotpu", TILEGX_OPC_V1DDOTPU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4756,7 +4718,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1ddotpua", TILEGX_OPC_V1DDOTPUA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4775,7 +4737,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1ddotpus", TILEGX_OPC_V1DDOTPUS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4794,7 +4756,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1ddotpusa", TILEGX_OPC_V1DDOTPUSA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4813,7 +4775,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1dotp", TILEGX_OPC_V1DOTP, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4832,7 +4794,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1dotpa", TILEGX_OPC_V1DOTPA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4851,7 +4813,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1dotpu", TILEGX_OPC_V1DOTPU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4870,7 +4832,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1dotpua", TILEGX_OPC_V1DOTPUA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4889,7 +4851,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1dotpus", TILEGX_OPC_V1DOTPUS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4908,7 +4870,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1dotpusa", TILEGX_OPC_V1DOTPUSA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4927,7 +4889,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1int_h", TILEGX_OPC_V1INT_H, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4946,7 +4908,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1int_l", TILEGX_OPC_V1INT_L, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4965,7 +4927,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1maxu", TILEGX_OPC_V1MAXU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -4984,7 +4946,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1maxui", TILEGX_OPC_V1MAXUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5003,7 +4965,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1minu", TILEGX_OPC_V1MINU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5022,7 +4984,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1minui", TILEGX_OPC_V1MINUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5041,7 +5003,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1mnz", TILEGX_OPC_V1MNZ, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5060,7 +5022,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1multu", TILEGX_OPC_V1MULTU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5079,7 +5041,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1mulu", TILEGX_OPC_V1MULU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5098,7 +5060,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1mulus", TILEGX_OPC_V1MULUS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5117,7 +5079,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1mz", TILEGX_OPC_V1MZ, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5136,7 +5098,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1sadau", TILEGX_OPC_V1SADAU, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5155,7 +5117,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1sadu", TILEGX_OPC_V1SADU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5174,7 +5136,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1shl", TILEGX_OPC_V1SHL, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5193,7 +5155,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1shli", TILEGX_OPC_V1SHLI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5212,7 +5174,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1shrs", TILEGX_OPC_V1SHRS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5231,7 +5193,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1shrsi", TILEGX_OPC_V1SHRSI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5250,7 +5212,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1shru", TILEGX_OPC_V1SHRU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5269,7 +5231,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1shrui", TILEGX_OPC_V1SHRUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5288,7 +5250,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1sub", TILEGX_OPC_V1SUB, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5307,7 +5269,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v1subuc", TILEGX_OPC_V1SUBUC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5326,7 +5288,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2add", TILEGX_OPC_V2ADD, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5345,7 +5307,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2addi", TILEGX_OPC_V2ADDI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5364,7 +5326,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2addsc", TILEGX_OPC_V2ADDSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5383,7 +5345,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2adiffs", TILEGX_OPC_V2ADIFFS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5402,7 +5364,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2avgs", TILEGX_OPC_V2AVGS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5421,7 +5383,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpeq", TILEGX_OPC_V2CMPEQ, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5440,7 +5402,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpeqi", TILEGX_OPC_V2CMPEQI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5459,7 +5421,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmples", TILEGX_OPC_V2CMPLES, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5478,7 +5440,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpleu", TILEGX_OPC_V2CMPLEU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5497,7 +5459,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmplts", TILEGX_OPC_V2CMPLTS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5516,7 +5478,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpltsi", TILEGX_OPC_V2CMPLTSI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5535,7 +5497,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpltu", TILEGX_OPC_V2CMPLTU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5554,7 +5516,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpltui", TILEGX_OPC_V2CMPLTUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5573,7 +5535,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2cmpne", TILEGX_OPC_V2CMPNE, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5592,7 +5554,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2dotp", TILEGX_OPC_V2DOTP, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5611,7 +5573,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2dotpa", TILEGX_OPC_V2DOTPA, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5630,7 +5592,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2int_h", TILEGX_OPC_V2INT_H, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5649,7 +5611,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2int_l", TILEGX_OPC_V2INT_L, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5668,7 +5630,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2maxs", TILEGX_OPC_V2MAXS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5687,7 +5649,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2maxsi", TILEGX_OPC_V2MAXSI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5706,7 +5668,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2mins", TILEGX_OPC_V2MINS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5725,7 +5687,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2minsi", TILEGX_OPC_V2MINSI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -5744,7 +5706,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2mnz", TILEGX_OPC_V2MNZ, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5763,7 +5725,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2mulfsc", TILEGX_OPC_V2MULFSC, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5782,7 +5744,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2muls", TILEGX_OPC_V2MULS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5801,7 +5763,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2mults", TILEGX_OPC_V2MULTS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5820,7 +5782,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2mz", TILEGX_OPC_V2MZ, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5839,7 +5801,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2packh", TILEGX_OPC_V2PACKH, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5858,7 +5820,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2packl", TILEGX_OPC_V2PACKL, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5877,7 +5839,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2packuc", TILEGX_OPC_V2PACKUC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5896,7 +5858,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2sadas", TILEGX_OPC_V2SADAS, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5915,7 +5877,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2sadau", TILEGX_OPC_V2SADAU, 0x1, 3, TREG_ZERO, 1,
-    { { 23, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5934,7 +5896,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2sads", TILEGX_OPC_V2SADS, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5953,7 +5915,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2sadu", TILEGX_OPC_V2SADU, 0x1, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5972,7 +5934,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shl", TILEGX_OPC_V2SHL, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -5991,7 +5953,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shli", TILEGX_OPC_V2SHLI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6010,7 +5972,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shlsc", TILEGX_OPC_V2SHLSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6029,7 +5991,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shrs", TILEGX_OPC_V2SHRS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6048,7 +6010,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shrsi", TILEGX_OPC_V2SHRSI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6067,7 +6029,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shru", TILEGX_OPC_V2SHRU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6086,7 +6048,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2shrui", TILEGX_OPC_V2SHRUI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 29 }, { 6, 7, 30 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6105,7 +6067,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2sub", TILEGX_OPC_V2SUB, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6124,7 +6086,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v2subsc", TILEGX_OPC_V2SUBSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6143,7 +6105,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4add", TILEGX_OPC_V4ADD, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6162,7 +6124,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4addsc", TILEGX_OPC_V4ADDSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6181,7 +6143,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4int_h", TILEGX_OPC_V4INT_H, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6200,7 +6162,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4int_l", TILEGX_OPC_V4INT_L, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6219,7 +6181,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4packsc", TILEGX_OPC_V4PACKSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6238,7 +6200,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4shl", TILEGX_OPC_V4SHL, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6257,7 +6219,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4shlsc", TILEGX_OPC_V4SHLSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6276,7 +6238,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4shrs", TILEGX_OPC_V4SHRS, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6295,7 +6257,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4shru", TILEGX_OPC_V4SHRU, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6314,7 +6276,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4sub", TILEGX_OPC_V4SUB, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6333,7 +6295,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "v4subsc", TILEGX_OPC_V4SUBSC, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6352,7 +6314,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "wh64", TILEGX_OPC_WH64, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -6371,7 +6333,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "xor", TILEGX_OPC_XOR, 0xf, 3, TREG_ZERO, 1,
-    { { 8, 9, 16 }, { 6, 7, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ffc0000ULL,
@@ -6390,7 +6352,7 @@ const struct tilegx_opcode tilegx_opcodes[336] =
 #endif
   },
   { "xori", TILEGX_OPC_XORI, 0x3, 3, TREG_ZERO, 1,
-    { { 8, 9, 0 }, { 6, 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0xc00000007ff00000ULL,
@@ -6710,7 +6672,7 @@ static const unsigned short decode_X0_fsm[936] =
   TILEGX_OPC_INFOL,
 };
 
-static const unsigned short decode_X1_fsm[1266] =
+static const unsigned short decode_X1_fsm[1206] =
 {
   BITFIELD(53, 9) /* index 0 */,
   CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
@@ -6756,8 +6718,8 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_BLEZT, TILEGX_OPC_BLEZ, TILEGX_OPC_BLEZ, TILEGX_OPC_BLTZT,
   TILEGX_OPC_BLTZT, TILEGX_OPC_BLTZ, TILEGX_OPC_BLTZ, TILEGX_OPC_BNEZT,
   TILEGX_OPC_BNEZT, TILEGX_OPC_BNEZ, TILEGX_OPC_BNEZ, CHILD(528), CHILD(578),
-  CHILD(598), CHILD(703), CHILD(723), CHILD(728), CHILD(753), CHILD(758),
-  CHILD(763), CHILD(768), CHILD(773), CHILD(778), TILEGX_OPC_NONE,
+  CHILD(598), CHILD(663), CHILD(683), CHILD(688), CHILD(693), CHILD(698),
+  CHILD(703), CHILD(708), CHILD(713), CHILD(718), TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
@@ -6785,8 +6747,8 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
   TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
   TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
-  CHILD(783), CHILD(800), CHILD(832), CHILD(849), CHILD(1168), CHILD(1185),
-  CHILD(1202), TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  CHILD(723), CHILD(740), CHILD(772), CHILD(789), CHILD(1108), CHILD(1125),
+  CHILD(1142), TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
@@ -6800,7 +6762,7 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
-  TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(1219), TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(1159), TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
@@ -6816,20 +6778,20 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
-  TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236), CHILD(1236),
-  CHILD(1236),
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176),
   BITFIELD(37, 2) /* index 513 */,
   TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, CHILD(518),
   BITFIELD(39, 2) /* index 518 */,
@@ -6889,96 +6851,68 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD,
   TILEGX_OPC_PREFETCH_ADD_L2,
   BITFIELD(31, 2) /* index 648 */,
-  CHILD(653), CHILD(653), CHILD(653), CHILD(673),
-  BITFIELD(43, 2) /* index 653 */,
-  CHILD(658), TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD,
-  BITFIELD(45, 2) /* index 658 */,
-  CHILD(663), TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD,
-  BITFIELD(47, 2) /* index 663 */,
-  CHILD(668), TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD,
-  BITFIELD(49, 2) /* index 668 */,
-  TILEGX_OPC_LD4S_TLS, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD,
-  TILEGX_OPC_LD4S_ADD,
+  TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, CHILD(653),
+  BITFIELD(33, 2) /* index 653 */,
+  TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, CHILD(658),
+  BITFIELD(35, 2) /* index 658 */,
+  TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
+  BITFIELD(51, 2) /* index 663 */,
+  CHILD(668), TILEGX_OPC_LDNT1S_ADD, TILEGX_OPC_LDNT1U_ADD,
+  TILEGX_OPC_LDNT2S_ADD,
+  BITFIELD(31, 2) /* index 668 */,
+  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, CHILD(673),
   BITFIELD(33, 2) /* index 673 */,
-  CHILD(653), CHILD(653), CHILD(653), CHILD(678),
+  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, CHILD(678),
   BITFIELD(35, 2) /* index 678 */,
-  CHILD(653), CHILD(653), CHILD(653), CHILD(683),
-  BITFIELD(43, 2) /* index 683 */,
-  CHILD(688), TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  TILEGX_OPC_PREFETCH_ADD_L3_FAULT, TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  BITFIELD(45, 2) /* index 688 */,
-  CHILD(693), TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  TILEGX_OPC_PREFETCH_ADD_L3_FAULT, TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  BITFIELD(47, 2) /* index 693 */,
-  CHILD(698), TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  TILEGX_OPC_PREFETCH_ADD_L3_FAULT, TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  BITFIELD(49, 2) /* index 698 */,
-  TILEGX_OPC_LD4S_TLS, TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  TILEGX_OPC_PREFETCH_ADD_L3_FAULT, TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
-  BITFIELD(51, 2) /* index 703 */,
-  CHILD(708), TILEGX_OPC_LDNT1S_ADD, TILEGX_OPC_LDNT1U_ADD,
-  TILEGX_OPC_LDNT2S_ADD,
-  BITFIELD(31, 2) /* index 708 */,
-  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, CHILD(713),
-  BITFIELD(33, 2) /* index 713 */,
-  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, CHILD(718),
-  BITFIELD(35, 2) /* index 718 */,
   TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD,
   TILEGX_OPC_PREFETCH_ADD_L3,
-  BITFIELD(51, 2) /* index 723 */,
+  BITFIELD(51, 2) /* index 683 */,
   TILEGX_OPC_LDNT2U_ADD, TILEGX_OPC_LDNT4S_ADD, TILEGX_OPC_LDNT4U_ADD,
   TILEGX_OPC_LDNT_ADD,
-  BITFIELD(51, 2) /* index 728 */,
-  CHILD(733), TILEGX_OPC_LDNA_ADD, TILEGX_OPC_MFSPR, TILEGX_OPC_MTSPR,
-  BITFIELD(43, 2) /* index 733 */,
-  CHILD(738), TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD,
-  BITFIELD(45, 2) /* index 738 */,
-  CHILD(743), TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD,
-  BITFIELD(47, 2) /* index 743 */,
-  CHILD(748), TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD,
-  BITFIELD(49, 2) /* index 748 */,
-  TILEGX_OPC_LD_TLS, TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD, TILEGX_OPC_LD_ADD,
-  BITFIELD(51, 2) /* index 753 */,
+  BITFIELD(51, 2) /* index 688 */,
+  TILEGX_OPC_LD_ADD, TILEGX_OPC_LDNA_ADD, TILEGX_OPC_MFSPR, TILEGX_OPC_MTSPR,
+  BITFIELD(51, 2) /* index 693 */,
   TILEGX_OPC_ORI, TILEGX_OPC_ST1_ADD, TILEGX_OPC_ST2_ADD, TILEGX_OPC_ST4_ADD,
-  BITFIELD(51, 2) /* index 758 */,
+  BITFIELD(51, 2) /* index 698 */,
   TILEGX_OPC_STNT1_ADD, TILEGX_OPC_STNT2_ADD, TILEGX_OPC_STNT4_ADD,
   TILEGX_OPC_STNT_ADD,
-  BITFIELD(51, 2) /* index 763 */,
+  BITFIELD(51, 2) /* index 703 */,
   TILEGX_OPC_ST_ADD, TILEGX_OPC_V1ADDI, TILEGX_OPC_V1CMPEQI,
   TILEGX_OPC_V1CMPLTSI,
-  BITFIELD(51, 2) /* index 768 */,
+  BITFIELD(51, 2) /* index 708 */,
   TILEGX_OPC_V1CMPLTUI, TILEGX_OPC_V1MAXUI, TILEGX_OPC_V1MINUI,
   TILEGX_OPC_V2ADDI,
-  BITFIELD(51, 2) /* index 773 */,
+  BITFIELD(51, 2) /* index 713 */,
   TILEGX_OPC_V2CMPEQI, TILEGX_OPC_V2CMPLTSI, TILEGX_OPC_V2CMPLTUI,
   TILEGX_OPC_V2MAXSI,
-  BITFIELD(51, 2) /* index 778 */,
+  BITFIELD(51, 2) /* index 718 */,
   TILEGX_OPC_V2MINSI, TILEGX_OPC_XORI, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
-  BITFIELD(49, 4) /* index 783 */,
+  BITFIELD(49, 4) /* index 723 */,
   TILEGX_OPC_NONE, TILEGX_OPC_ADDXSC, TILEGX_OPC_ADDX, TILEGX_OPC_ADD,
   TILEGX_OPC_AND, TILEGX_OPC_CMPEQ, TILEGX_OPC_CMPEXCH4, TILEGX_OPC_CMPEXCH,
   TILEGX_OPC_CMPLES, TILEGX_OPC_CMPLEU, TILEGX_OPC_CMPLTS, TILEGX_OPC_CMPLTU,
   TILEGX_OPC_CMPNE, TILEGX_OPC_DBLALIGN2, TILEGX_OPC_DBLALIGN4,
   TILEGX_OPC_DBLALIGN6,
-  BITFIELD(49, 4) /* index 800 */,
+  BITFIELD(49, 4) /* index 740 */,
   TILEGX_OPC_EXCH4, TILEGX_OPC_EXCH, TILEGX_OPC_FETCHADD4,
   TILEGX_OPC_FETCHADDGEZ4, TILEGX_OPC_FETCHADDGEZ, TILEGX_OPC_FETCHADD,
   TILEGX_OPC_FETCHAND4, TILEGX_OPC_FETCHAND, TILEGX_OPC_FETCHOR4,
   TILEGX_OPC_FETCHOR, TILEGX_OPC_MNZ, TILEGX_OPC_MZ, TILEGX_OPC_NOR,
-  CHILD(817), TILEGX_OPC_ROTL, TILEGX_OPC_SHL1ADDX,
-  BITFIELD(43, 2) /* index 817 */,
-  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(822),
-  BITFIELD(45, 2) /* index 822 */,
-  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(827),
-  BITFIELD(47, 2) /* index 827 */,
+  CHILD(757), TILEGX_OPC_ROTL, TILEGX_OPC_SHL1ADDX,
+  BITFIELD(43, 2) /* index 757 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(762),
+  BITFIELD(45, 2) /* index 762 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(767),
+  BITFIELD(47, 2) /* index 767 */,
   TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_MOVE,
-  BITFIELD(49, 4) /* index 832 */,
+  BITFIELD(49, 4) /* index 772 */,
   TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL2ADDX, TILEGX_OPC_SHL2ADD,
   TILEGX_OPC_SHL3ADDX, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHLX, TILEGX_OPC_SHL,
   TILEGX_OPC_SHRS, TILEGX_OPC_SHRUX, TILEGX_OPC_SHRU, TILEGX_OPC_ST1,
   TILEGX_OPC_ST2, TILEGX_OPC_ST4, TILEGX_OPC_STNT1, TILEGX_OPC_STNT2,
   TILEGX_OPC_STNT4,
-  BITFIELD(46, 7) /* index 849 */,
+  BITFIELD(46, 7) /* index 789 */,
   TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT,
   TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT,
   TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST,
@@ -6988,8 +6922,8 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUBX,
   TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUB,
   TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB,
-  TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB, CHILD(978), CHILD(987),
-  CHILD(1066), CHILD(1150), CHILD(1159), TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB, CHILD(918), CHILD(927),
+  CHILD(1006), CHILD(1090), CHILD(1099), TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC,
   TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC,
   TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADD,
@@ -7016,122 +6950,122 @@ static const unsigned short decode_X1_fsm[1266] =
   TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L,
   TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L,
   TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L,
-  BITFIELD(43, 3) /* index 978 */,
+  BITFIELD(43, 3) /* index 918 */,
   TILEGX_OPC_NONE, TILEGX_OPC_DRAIN, TILEGX_OPC_DTLBPR, TILEGX_OPC_FINV,
   TILEGX_OPC_FLUSHWB, TILEGX_OPC_FLUSH, TILEGX_OPC_FNOP, TILEGX_OPC_ICOH,
-  BITFIELD(43, 3) /* index 987 */,
-  CHILD(996), TILEGX_OPC_INV, TILEGX_OPC_IRET, TILEGX_OPC_JALRP,
-  TILEGX_OPC_JALR, TILEGX_OPC_JRP, TILEGX_OPC_JR, CHILD(1051),
-  BITFIELD(31, 2) /* index 996 */,
-  CHILD(1001), CHILD(1026), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(33, 2) /* index 1001 */,
-  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_ILL, CHILD(1006),
-  BITFIELD(35, 2) /* index 1006 */,
-  TILEGX_OPC_ILL, CHILD(1011), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(37, 2) /* index 1011 */,
-  TILEGX_OPC_ILL, CHILD(1016), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(39, 2) /* index 1016 */,
-  TILEGX_OPC_ILL, CHILD(1021), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(41, 2) /* index 1021 */,
+  BITFIELD(43, 3) /* index 927 */,
+  CHILD(936), TILEGX_OPC_INV, TILEGX_OPC_IRET, TILEGX_OPC_JALRP,
+  TILEGX_OPC_JALR, TILEGX_OPC_JRP, TILEGX_OPC_JR, CHILD(991),
+  BITFIELD(31, 2) /* index 936 */,
+  CHILD(941), CHILD(966), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(33, 2) /* index 941 */,
+  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_ILL, CHILD(946),
+  BITFIELD(35, 2) /* index 946 */,
+  TILEGX_OPC_ILL, CHILD(951), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(37, 2) /* index 951 */,
+  TILEGX_OPC_ILL, CHILD(956), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(39, 2) /* index 956 */,
+  TILEGX_OPC_ILL, CHILD(961), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(41, 2) /* index 961 */,
   TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_BPT, TILEGX_OPC_ILL,
-  BITFIELD(33, 2) /* index 1026 */,
-  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_ILL, CHILD(1031),
-  BITFIELD(35, 2) /* index 1031 */,
-  TILEGX_OPC_ILL, CHILD(1036), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(37, 2) /* index 1036 */,
-  TILEGX_OPC_ILL, CHILD(1041), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(39, 2) /* index 1041 */,
-  TILEGX_OPC_ILL, CHILD(1046), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
-  BITFIELD(41, 2) /* index 1046 */,
+  BITFIELD(33, 2) /* index 966 */,
+  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_ILL, CHILD(971),
+  BITFIELD(35, 2) /* index 971 */,
+  TILEGX_OPC_ILL, CHILD(976), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(37, 2) /* index 976 */,
+  TILEGX_OPC_ILL, CHILD(981), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(39, 2) /* index 981 */,
+  TILEGX_OPC_ILL, CHILD(986), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(41, 2) /* index 986 */,
   TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_RAISE, TILEGX_OPC_ILL,
-  BITFIELD(31, 2) /* index 1051 */,
-  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(1056),
-  BITFIELD(33, 2) /* index 1056 */,
-  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(1061),
-  BITFIELD(35, 2) /* index 1061 */,
+  BITFIELD(31, 2) /* index 991 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(996),
+  BITFIELD(33, 2) /* index 996 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(1001),
+  BITFIELD(35, 2) /* index 1001 */,
   TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S,
   TILEGX_OPC_PREFETCH_L1_FAULT,
-  BITFIELD(43, 3) /* index 1066 */,
-  CHILD(1075), CHILD(1090), CHILD(1105), CHILD(1120), CHILD(1135),
+  BITFIELD(43, 3) /* index 1006 */,
+  CHILD(1015), CHILD(1030), CHILD(1045), CHILD(1060), CHILD(1075),
   TILEGX_OPC_LDNA, TILEGX_OPC_LDNT1S, TILEGX_OPC_LDNT1U,
-  BITFIELD(31, 2) /* index 1075 */,
-  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(1080),
-  BITFIELD(33, 2) /* index 1080 */,
-  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(1085),
-  BITFIELD(35, 2) /* index 1085 */,
+  BITFIELD(31, 2) /* index 1015 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(1020),
+  BITFIELD(33, 2) /* index 1020 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(1025),
+  BITFIELD(35, 2) /* index 1025 */,
   TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_PREFETCH,
-  BITFIELD(31, 2) /* index 1090 */,
-  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(1095),
-  BITFIELD(33, 2) /* index 1095 */,
-  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(1100),
-  BITFIELD(35, 2) /* index 1100 */,
+  BITFIELD(31, 2) /* index 1030 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(1035),
+  BITFIELD(33, 2) /* index 1035 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(1040),
+  BITFIELD(35, 2) /* index 1040 */,
   TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S,
   TILEGX_OPC_PREFETCH_L2_FAULT,
-  BITFIELD(31, 2) /* index 1105 */,
-  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(1110),
-  BITFIELD(33, 2) /* index 1110 */,
-  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(1115),
-  BITFIELD(35, 2) /* index 1115 */,
+  BITFIELD(31, 2) /* index 1045 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(1050),
+  BITFIELD(33, 2) /* index 1050 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(1055),
+  BITFIELD(35, 2) /* index 1055 */,
   TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_PREFETCH_L2,
-  BITFIELD(31, 2) /* index 1120 */,
-  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(1125),
-  BITFIELD(33, 2) /* index 1125 */,
-  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(1130),
-  BITFIELD(35, 2) /* index 1130 */,
+  BITFIELD(31, 2) /* index 1060 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(1065),
+  BITFIELD(33, 2) /* index 1065 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(1070),
+  BITFIELD(35, 2) /* index 1070 */,
   TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S,
   TILEGX_OPC_PREFETCH_L3_FAULT,
-  BITFIELD(31, 2) /* index 1135 */,
-  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(1140),
-  BITFIELD(33, 2) /* index 1140 */,
-  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(1145),
-  BITFIELD(35, 2) /* index 1145 */,
+  BITFIELD(31, 2) /* index 1075 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(1080),
+  BITFIELD(33, 2) /* index 1080 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(1085),
+  BITFIELD(35, 2) /* index 1085 */,
   TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_PREFETCH_L3,
-  BITFIELD(43, 3) /* index 1150 */,
+  BITFIELD(43, 3) /* index 1090 */,
   TILEGX_OPC_LDNT2S, TILEGX_OPC_LDNT2U, TILEGX_OPC_LDNT4S, TILEGX_OPC_LDNT4U,
   TILEGX_OPC_LDNT, TILEGX_OPC_LD, TILEGX_OPC_LNK, TILEGX_OPC_MF,
-  BITFIELD(43, 3) /* index 1159 */,
+  BITFIELD(43, 3) /* index 1099 */,
   TILEGX_OPC_NAP, TILEGX_OPC_NOP, TILEGX_OPC_SWINT0, TILEGX_OPC_SWINT1,
   TILEGX_OPC_SWINT2, TILEGX_OPC_SWINT3, TILEGX_OPC_WH64, TILEGX_OPC_NONE,
-  BITFIELD(49, 4) /* index 1168 */,
+  BITFIELD(49, 4) /* index 1108 */,
   TILEGX_OPC_V1MAXU, TILEGX_OPC_V1MINU, TILEGX_OPC_V1MNZ, TILEGX_OPC_V1MZ,
   TILEGX_OPC_V1SHL, TILEGX_OPC_V1SHRS, TILEGX_OPC_V1SHRU, TILEGX_OPC_V1SUBUC,
   TILEGX_OPC_V1SUB, TILEGX_OPC_V2ADDSC, TILEGX_OPC_V2ADD, TILEGX_OPC_V2CMPEQ,
   TILEGX_OPC_V2CMPLES, TILEGX_OPC_V2CMPLEU, TILEGX_OPC_V2CMPLTS,
   TILEGX_OPC_V2CMPLTU,
-  BITFIELD(49, 4) /* index 1185 */,
+  BITFIELD(49, 4) /* index 1125 */,
   TILEGX_OPC_V2CMPNE, TILEGX_OPC_V2INT_H, TILEGX_OPC_V2INT_L,
   TILEGX_OPC_V2MAXS, TILEGX_OPC_V2MINS, TILEGX_OPC_V2MNZ, TILEGX_OPC_V2MZ,
   TILEGX_OPC_V2PACKH, TILEGX_OPC_V2PACKL, TILEGX_OPC_V2PACKUC,
   TILEGX_OPC_V2SHLSC, TILEGX_OPC_V2SHL, TILEGX_OPC_V2SHRS, TILEGX_OPC_V2SHRU,
   TILEGX_OPC_V2SUBSC, TILEGX_OPC_V2SUB,
-  BITFIELD(49, 4) /* index 1202 */,
+  BITFIELD(49, 4) /* index 1142 */,
   TILEGX_OPC_V4ADDSC, TILEGX_OPC_V4ADD, TILEGX_OPC_V4INT_H,
   TILEGX_OPC_V4INT_L, TILEGX_OPC_V4PACKSC, TILEGX_OPC_V4SHLSC,
   TILEGX_OPC_V4SHL, TILEGX_OPC_V4SHRS, TILEGX_OPC_V4SHRU, TILEGX_OPC_V4SUBSC,
   TILEGX_OPC_V4SUB, TILEGX_OPC_XOR, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE, TILEGX_OPC_NONE,
-  BITFIELD(49, 4) /* index 1219 */,
+  BITFIELD(49, 4) /* index 1159 */,
   TILEGX_OPC_NONE, TILEGX_OPC_ROTLI, TILEGX_OPC_SHLI, TILEGX_OPC_SHLXI,
   TILEGX_OPC_SHRSI, TILEGX_OPC_SHRUI, TILEGX_OPC_SHRUXI, TILEGX_OPC_V1SHLI,
   TILEGX_OPC_V1SHRSI, TILEGX_OPC_V1SHRUI, TILEGX_OPC_V2SHLI,
   TILEGX_OPC_V2SHRSI, TILEGX_OPC_V2SHRUI, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
   TILEGX_OPC_NONE,
-  BITFIELD(31, 2) /* index 1236 */,
+  BITFIELD(31, 2) /* index 1176 */,
   TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
-  CHILD(1241),
-  BITFIELD(33, 2) /* index 1241 */,
+  CHILD(1181),
+  BITFIELD(33, 2) /* index 1181 */,
   TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
-  CHILD(1246),
-  BITFIELD(35, 2) /* index 1246 */,
+  CHILD(1186),
+  BITFIELD(35, 2) /* index 1186 */,
   TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
-  CHILD(1251),
-  BITFIELD(37, 2) /* index 1251 */,
+  CHILD(1191),
+  BITFIELD(37, 2) /* index 1191 */,
   TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
-  CHILD(1256),
-  BITFIELD(39, 2) /* index 1256 */,
+  CHILD(1196),
+  BITFIELD(39, 2) /* index 1196 */,
   TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
-  CHILD(1261),
-  BITFIELD(41, 2) /* index 1261 */,
+  CHILD(1201),
+  BITFIELD(41, 2) /* index 1201 */,
   TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
   TILEGX_OPC_INFOL,
 };
@@ -7394,22 +7328,22 @@ const struct tilegx_operand tilegx_operands[35] =
   {
     TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 0, 1, 0, 0,
-    create_Dest_X1, get_Dest_X1
+    create_Dest_X0, get_Dest_X0
   },
   {
     TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 1, 0, 0, 0,
-    create_SrcA_X1, get_SrcA_X1
+    create_SrcA_X0, get_SrcA_X0
   },
   {
     TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 0, 1, 0, 0,
-    create_Dest_X0, get_Dest_X0
+    create_Dest_X1, get_Dest_X1
   },
   {
     TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 1, 0, 0, 0,
-    create_SrcA_X0, get_SrcA_X0
+    create_SrcA_X1, get_SrcA_X1
   },
   {
     TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
diff --git a/opcodes/tilepro-opc.c b/opcodes/tilepro-opc.c
index 9158d0e790..c3f6be4b46 100644
--- a/opcodes/tilepro-opc.c
+++ b/opcodes/tilepro-opc.c
@@ -41,7 +41,7 @@
 #include <stddef.h>
 #endif
 
-const struct tilepro_opcode tilepro_opcodes[397] =
+const struct tilepro_opcode tilepro_opcodes[395] =
 {
  { "bpt", TILEPRO_OPC_BPT, 0x2, 0, TREG_ZERO, 0,
     { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
@@ -138,46 +138,8 @@ const struct tilepro_opcode tilepro_opcodes[397] =
     }
 #endif
   },
-  { "lw_tls", TILEPRO_OPC_LW_TLS, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
-#ifndef DISASM_ONLY
-    {
-      0ULL,
-      0xfffff80000000000ULL,
-      0ULL,
-      0ULL,
-      0ULL
-    },
-    {
-      -1ULL,
-      0x30d0000000000000ULL,
-      -1ULL,
-      -1ULL,
-      -1ULL
-    }
-#endif
-  },
-  { "lw_tls.sn", TILEPRO_OPC_LW_TLS_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
-#ifndef DISASM_ONLY
-    {
-      0ULL,
-      0xfffff80000000000ULL,
-      0ULL,
-      0ULL,
-      0ULL
-    },
-    {
-      -1ULL,
-      0x34d0000000000000ULL,
-      -1ULL,
-      -1ULL,
-      -1ULL
-    }
-#endif
-  },
   { "move", TILEPRO_OPC_MOVE, 0xf, 2, TREG_ZERO, 1,
-    { { 9, 10 }, { 7, 8 }, { 11, 12 }, { 13, 14 }, { 0, } },
+    { { 7, 8 }, { 9, 10 }, { 11, 12 }, { 13, 14 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -196,7 +158,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "move.sn", TILEPRO_OPC_MOVE_SN, 0x3, 2, TREG_SN, 1,
-    { { 9, 10 }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8 }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -215,7 +177,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "movei", TILEPRO_OPC_MOVEI, 0xf, 2, TREG_ZERO, 1,
-    { { 9, 0 }, { 7, 1 }, { 11, 2 }, { 13, 3 }, { 0, } },
+    { { 7, 0 }, { 9, 1 }, { 11, 2 }, { 13, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00fc0ULL,
@@ -234,7 +196,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "movei.sn", TILEPRO_OPC_MOVEI_SN, 0x3, 2, TREG_SN, 1,
-    { { 9, 0 }, { 7, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 0 }, { 9, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00fc0ULL,
@@ -253,7 +215,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "moveli", TILEPRO_OPC_MOVELI, 0x3, 2, TREG_ZERO, 1,
-    { { 9, 4 }, { 7, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 4 }, { 9, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000fc0ULL,
@@ -272,7 +234,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "moveli.sn", TILEPRO_OPC_MOVELI_SN, 0x3, 2, TREG_SN, 1,
-    { { 9, 4 }, { 7, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 4 }, { 9, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000fc0ULL,
@@ -291,7 +253,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "movelis", TILEPRO_OPC_MOVELIS, 0x3, 2, TREG_SN, 1,
-    { { 9, 4 }, { 7, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 4 }, { 9, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000fc0ULL,
@@ -310,7 +272,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "prefetch", TILEPRO_OPC_PREFETCH, 0x12, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 15 } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 15 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -348,7 +310,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "add", TILEPRO_OPC_ADD, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -367,7 +329,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "add.sn", TILEPRO_OPC_ADD_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -386,7 +348,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addb", TILEPRO_OPC_ADDB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -405,7 +367,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addb.sn", TILEPRO_OPC_ADDB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -424,7 +386,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addbs_u", TILEPRO_OPC_ADDBS_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -443,7 +405,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addbs_u.sn", TILEPRO_OPC_ADDBS_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -462,7 +424,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addh", TILEPRO_OPC_ADDH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -481,7 +443,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addh.sn", TILEPRO_OPC_ADDH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -500,7 +462,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addhs", TILEPRO_OPC_ADDHS, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -519,7 +481,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addhs.sn", TILEPRO_OPC_ADDHS_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -538,7 +500,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addi", TILEPRO_OPC_ADDI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -557,7 +519,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addi.sn", TILEPRO_OPC_ADDI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -576,7 +538,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addib", TILEPRO_OPC_ADDIB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -595,7 +557,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addib.sn", TILEPRO_OPC_ADDIB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -614,7 +576,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addih", TILEPRO_OPC_ADDIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -633,7 +595,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addih.sn", TILEPRO_OPC_ADDIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -652,7 +614,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addli", TILEPRO_OPC_ADDLI, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 4 }, { 7, 8, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 4 }, { 9, 10, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000000ULL,
@@ -671,7 +633,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addli.sn", TILEPRO_OPC_ADDLI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 4 }, { 7, 8, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 4 }, { 9, 10, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000000ULL,
@@ -690,7 +652,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "addlis", TILEPRO_OPC_ADDLIS, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 4 }, { 7, 8, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 4 }, { 9, 10, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000000ULL,
@@ -709,7 +671,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "adds", TILEPRO_OPC_ADDS, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -728,7 +690,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "adds.sn", TILEPRO_OPC_ADDS_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -747,7 +709,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "adiffb_u", TILEPRO_OPC_ADIFFB_U, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -766,7 +728,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "adiffb_u.sn", TILEPRO_OPC_ADIFFB_U_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -785,7 +747,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "adiffh", TILEPRO_OPC_ADIFFH, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -804,7 +766,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "adiffh.sn", TILEPRO_OPC_ADIFFH_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -823,7 +785,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "and", TILEPRO_OPC_AND, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -842,7 +804,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "and.sn", TILEPRO_OPC_AND_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -861,7 +823,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "andi", TILEPRO_OPC_ANDI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -880,7 +842,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "andi.sn", TILEPRO_OPC_ANDI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -899,7 +861,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "auli", TILEPRO_OPC_AULI, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 4 }, { 7, 8, 5 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 4 }, { 9, 10, 5 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000000ULL,
@@ -918,7 +880,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "avgb_u", TILEPRO_OPC_AVGB_U, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -937,7 +899,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "avgb_u.sn", TILEPRO_OPC_AVGB_U_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -956,7 +918,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "avgh", TILEPRO_OPC_AVGH, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -975,7 +937,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "avgh.sn", TILEPRO_OPC_AVGH_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -994,7 +956,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbns", TILEPRO_OPC_BBNS, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1013,7 +975,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbns.sn", TILEPRO_OPC_BBNS_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1032,7 +994,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbnst", TILEPRO_OPC_BBNST, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1051,7 +1013,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbnst.sn", TILEPRO_OPC_BBNST_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1070,7 +1032,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbs", TILEPRO_OPC_BBS, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1089,7 +1051,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbs.sn", TILEPRO_OPC_BBS_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1108,7 +1070,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbst", TILEPRO_OPC_BBST, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1127,7 +1089,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bbst.sn", TILEPRO_OPC_BBST_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1146,7 +1108,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgez", TILEPRO_OPC_BGEZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1165,7 +1127,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgez.sn", TILEPRO_OPC_BGEZ_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1184,7 +1146,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgezt", TILEPRO_OPC_BGEZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1203,7 +1165,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgezt.sn", TILEPRO_OPC_BGEZT_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1222,7 +1184,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgz", TILEPRO_OPC_BGZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1241,7 +1203,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgz.sn", TILEPRO_OPC_BGZ_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1260,7 +1222,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgzt", TILEPRO_OPC_BGZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1279,7 +1241,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bgzt.sn", TILEPRO_OPC_BGZT_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1298,7 +1260,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bitx", TILEPRO_OPC_BITX, 0x5, 2, TREG_ZERO, 1,
-    { { 9, 10 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1317,7 +1279,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bitx.sn", TILEPRO_OPC_BITX_SN, 0x1, 2, TREG_SN, 1,
-    { { 9, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1336,7 +1298,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blez", TILEPRO_OPC_BLEZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1355,7 +1317,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blez.sn", TILEPRO_OPC_BLEZ_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1374,7 +1336,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blezt", TILEPRO_OPC_BLEZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1393,7 +1355,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blezt.sn", TILEPRO_OPC_BLEZT_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1412,7 +1374,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blz", TILEPRO_OPC_BLZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1431,7 +1393,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blz.sn", TILEPRO_OPC_BLZ_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1450,7 +1412,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blzt", TILEPRO_OPC_BLZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1469,7 +1431,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "blzt.sn", TILEPRO_OPC_BLZT_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1488,7 +1450,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bnz", TILEPRO_OPC_BNZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1507,7 +1469,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bnz.sn", TILEPRO_OPC_BNZ_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1526,7 +1488,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bnzt", TILEPRO_OPC_BNZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1545,7 +1507,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bnzt.sn", TILEPRO_OPC_BNZT_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1564,7 +1526,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bytex", TILEPRO_OPC_BYTEX, 0x5, 2, TREG_ZERO, 1,
-    { { 9, 10 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1583,7 +1545,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bytex.sn", TILEPRO_OPC_BYTEX_SN, 0x1, 2, TREG_SN, 1,
-    { { 9, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1602,7 +1564,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bz", TILEPRO_OPC_BZ, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1621,7 +1583,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bz.sn", TILEPRO_OPC_BZ_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1640,7 +1602,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bzt", TILEPRO_OPC_BZT, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1659,7 +1621,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "bzt.sn", TILEPRO_OPC_BZT_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 8, 20 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10, 20 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1678,7 +1640,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "clz", TILEPRO_OPC_CLZ, 0x5, 2, TREG_ZERO, 1,
-    { { 9, 10 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1697,7 +1659,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "clz.sn", TILEPRO_OPC_CLZ_SN, 0x1, 2, TREG_SN, 1,
-    { { 9, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1716,7 +1678,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "crc32_32", TILEPRO_OPC_CRC32_32, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -1735,7 +1697,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "crc32_32.sn", TILEPRO_OPC_CRC32_32_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -1754,7 +1716,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "crc32_8", TILEPRO_OPC_CRC32_8, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -1773,7 +1735,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "crc32_8.sn", TILEPRO_OPC_CRC32_8_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -1792,7 +1754,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "ctz", TILEPRO_OPC_CTZ, 0x5, 2, TREG_ZERO, 1,
-    { { 9, 10 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1811,7 +1773,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "ctz.sn", TILEPRO_OPC_CTZ_SN, 0x1, 2, TREG_SN, 1,
-    { { 9, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -1849,7 +1811,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "dtlbpr", TILEPRO_OPC_DTLBPR, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1868,7 +1830,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "dword_align", TILEPRO_OPC_DWORD_ALIGN, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -1887,7 +1849,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "dword_align.sn", TILEPRO_OPC_DWORD_ALIGN_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -1906,7 +1868,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "finv", TILEPRO_OPC_FINV, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1925,7 +1887,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "flush", TILEPRO_OPC_FLUSH, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -1963,7 +1925,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "icoh", TILEPRO_OPC_ICOH, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2001,7 +1963,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "inthb", TILEPRO_OPC_INTHB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2020,7 +1982,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "inthb.sn", TILEPRO_OPC_INTHB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2039,7 +2001,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "inthh", TILEPRO_OPC_INTHH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2058,7 +2020,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "inthh.sn", TILEPRO_OPC_INTHH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2077,7 +2039,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "intlb", TILEPRO_OPC_INTLB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2096,7 +2058,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "intlb.sn", TILEPRO_OPC_INTLB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2115,7 +2077,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "intlh", TILEPRO_OPC_INTLH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2134,7 +2096,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "intlh.sn", TILEPRO_OPC_INTLH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2153,7 +2115,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "inv", TILEPRO_OPC_INV, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2229,7 +2191,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "jalr", TILEPRO_OPC_JALR, 0x2, 1, TREG_LR, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2248,7 +2210,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "jalrp", TILEPRO_OPC_JALRP, 0x2, 1, TREG_LR, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2305,7 +2267,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "jr", TILEPRO_OPC_JR, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2324,7 +2286,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "jrp", TILEPRO_OPC_JRP, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2343,7 +2305,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lb", TILEPRO_OPC_LB, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 23, 15 } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 23, 15 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2362,7 +2324,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lb.sn", TILEPRO_OPC_LB_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2381,7 +2343,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lb_u", TILEPRO_OPC_LB_U, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 23, 15 } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 23, 15 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2400,7 +2362,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lb_u.sn", TILEPRO_OPC_LB_U_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2419,7 +2381,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lbadd", TILEPRO_OPC_LBADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2438,7 +2400,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lbadd.sn", TILEPRO_OPC_LBADD_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2457,7 +2419,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lbadd_u", TILEPRO_OPC_LBADD_U, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2476,7 +2438,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lbadd_u.sn", TILEPRO_OPC_LBADD_U_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2495,7 +2457,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lh", TILEPRO_OPC_LH, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 23, 15 } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 23, 15 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2514,7 +2476,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lh.sn", TILEPRO_OPC_LH_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2533,7 +2495,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lh_u", TILEPRO_OPC_LH_U, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 23, 15 } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 23, 15 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2552,7 +2514,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lh_u.sn", TILEPRO_OPC_LH_U_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2571,7 +2533,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lhadd", TILEPRO_OPC_LHADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2590,7 +2552,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lhadd.sn", TILEPRO_OPC_LHADD_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2609,7 +2571,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lhadd_u", TILEPRO_OPC_LHADD_U, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2628,7 +2590,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lhadd_u.sn", TILEPRO_OPC_LHADD_U_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2647,7 +2609,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lnk", TILEPRO_OPC_LNK, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2666,7 +2628,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lnk.sn", TILEPRO_OPC_LNK_SN, 0x2, 1, TREG_SN, 1,
-    { { 0, }, { 7 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2685,7 +2647,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lw", TILEPRO_OPC_LW, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 23, 15 } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 23, 15 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2704,7 +2666,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lw.sn", TILEPRO_OPC_LW_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2723,7 +2685,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lw_na", TILEPRO_OPC_LW_NA, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2742,7 +2704,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lw_na.sn", TILEPRO_OPC_LW_NA_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2761,7 +2723,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lwadd", TILEPRO_OPC_LWADD, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2780,7 +2742,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lwadd.sn", TILEPRO_OPC_LWADD_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2799,7 +2761,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lwadd_na", TILEPRO_OPC_LWADD_NA, 0x2, 3, TREG_ZERO, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2818,7 +2780,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "lwadd_na.sn", TILEPRO_OPC_LWADD_NA_SN, 0x2, 3, TREG_SN, 1,
-    { { 0, }, { 7, 24, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 24, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -2837,7 +2799,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxb_u", TILEPRO_OPC_MAXB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2856,7 +2818,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxb_u.sn", TILEPRO_OPC_MAXB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2875,7 +2837,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxh", TILEPRO_OPC_MAXH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2894,7 +2856,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxh.sn", TILEPRO_OPC_MAXH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -2913,7 +2875,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxib_u", TILEPRO_OPC_MAXIB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -2932,7 +2894,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxib_u.sn", TILEPRO_OPC_MAXIB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -2951,7 +2913,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxih", TILEPRO_OPC_MAXIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -2970,7 +2932,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "maxih.sn", TILEPRO_OPC_MAXIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -3008,7 +2970,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mfspr", TILEPRO_OPC_MFSPR, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 25 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 25 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -3027,7 +2989,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minb_u", TILEPRO_OPC_MINB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3046,7 +3008,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minb_u.sn", TILEPRO_OPC_MINB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3065,7 +3027,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minh", TILEPRO_OPC_MINH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3084,7 +3046,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minh.sn", TILEPRO_OPC_MINH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3103,7 +3065,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minib_u", TILEPRO_OPC_MINIB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -3122,7 +3084,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minib_u.sn", TILEPRO_OPC_MINIB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -3141,7 +3103,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minih", TILEPRO_OPC_MINIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -3160,7 +3122,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "minih.sn", TILEPRO_OPC_MINIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -3179,7 +3141,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mm", TILEPRO_OPC_MM, 0x3, 5, TREG_ZERO, 1,
-    { { 9, 10, 16, 26, 27 }, { 7, 8, 17, 28, 29 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16, 26, 27 }, { 9, 10, 17, 28, 29 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x8000000070000000ULL,
@@ -3198,7 +3160,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mnz", TILEPRO_OPC_MNZ, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3217,7 +3179,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mnz.sn", TILEPRO_OPC_MNZ_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3236,7 +3198,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mnzb", TILEPRO_OPC_MNZB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3255,7 +3217,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mnzb.sn", TILEPRO_OPC_MNZB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3274,7 +3236,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mnzh", TILEPRO_OPC_MNZH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3293,7 +3255,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mnzh.sn", TILEPRO_OPC_MNZH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3312,7 +3274,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mtspr", TILEPRO_OPC_MTSPR, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 30, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 30, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -3331,7 +3293,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhh_ss", TILEPRO_OPC_MULHH_SS, 0x5, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3350,7 +3312,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhh_ss.sn", TILEPRO_OPC_MULHH_SS_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3369,7 +3331,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhh_su", TILEPRO_OPC_MULHH_SU, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3388,7 +3350,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhh_su.sn", TILEPRO_OPC_MULHH_SU_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3407,7 +3369,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhh_uu", TILEPRO_OPC_MULHH_UU, 0x5, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3426,7 +3388,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhh_uu.sn", TILEPRO_OPC_MULHH_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3445,7 +3407,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhha_ss", TILEPRO_OPC_MULHHA_SS, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3464,7 +3426,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhha_ss.sn", TILEPRO_OPC_MULHHA_SS_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3483,7 +3445,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhha_su", TILEPRO_OPC_MULHHA_SU, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3502,7 +3464,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhha_su.sn", TILEPRO_OPC_MULHHA_SU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3521,7 +3483,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhha_uu", TILEPRO_OPC_MULHHA_UU, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3540,7 +3502,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhha_uu.sn", TILEPRO_OPC_MULHHA_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3559,7 +3521,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhhsa_uu", TILEPRO_OPC_MULHHSA_UU, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3578,7 +3540,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhhsa_uu.sn", TILEPRO_OPC_MULHHSA_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3597,7 +3559,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_ss", TILEPRO_OPC_MULHL_SS, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3616,7 +3578,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_ss.sn", TILEPRO_OPC_MULHL_SS_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3635,7 +3597,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_su", TILEPRO_OPC_MULHL_SU, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3654,7 +3616,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_su.sn", TILEPRO_OPC_MULHL_SU_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3673,7 +3635,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_us", TILEPRO_OPC_MULHL_US, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3692,7 +3654,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_us.sn", TILEPRO_OPC_MULHL_US_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3711,7 +3673,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_uu", TILEPRO_OPC_MULHL_UU, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3730,7 +3692,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhl_uu.sn", TILEPRO_OPC_MULHL_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3749,7 +3711,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_ss", TILEPRO_OPC_MULHLA_SS, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3768,7 +3730,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_ss.sn", TILEPRO_OPC_MULHLA_SS_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3787,7 +3749,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_su", TILEPRO_OPC_MULHLA_SU, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3806,7 +3768,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_su.sn", TILEPRO_OPC_MULHLA_SU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3825,7 +3787,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_us", TILEPRO_OPC_MULHLA_US, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3844,7 +3806,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_us.sn", TILEPRO_OPC_MULHLA_US_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3863,7 +3825,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_uu", TILEPRO_OPC_MULHLA_UU, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3882,7 +3844,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhla_uu.sn", TILEPRO_OPC_MULHLA_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3901,7 +3863,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhlsa_uu", TILEPRO_OPC_MULHLSA_UU, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3920,7 +3882,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulhlsa_uu.sn", TILEPRO_OPC_MULHLSA_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3939,7 +3901,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulll_ss", TILEPRO_OPC_MULLL_SS, 0x5, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3958,7 +3920,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulll_ss.sn", TILEPRO_OPC_MULLL_SS_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3977,7 +3939,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulll_su", TILEPRO_OPC_MULLL_SU, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -3996,7 +3958,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulll_su.sn", TILEPRO_OPC_MULLL_SU_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4015,7 +3977,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulll_uu", TILEPRO_OPC_MULLL_UU, 0x5, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 11, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4034,7 +3996,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulll_uu.sn", TILEPRO_OPC_MULLL_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4053,7 +4015,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mullla_ss", TILEPRO_OPC_MULLLA_SS, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4072,7 +4034,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mullla_ss.sn", TILEPRO_OPC_MULLLA_SS_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4091,7 +4053,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mullla_su", TILEPRO_OPC_MULLLA_SU, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4110,7 +4072,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mullla_su.sn", TILEPRO_OPC_MULLLA_SU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4129,7 +4091,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mullla_uu", TILEPRO_OPC_MULLLA_UU, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4148,7 +4110,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mullla_uu.sn", TILEPRO_OPC_MULLLA_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4167,7 +4129,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulllsa_uu", TILEPRO_OPC_MULLLSA_UU, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4186,7 +4148,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mulllsa_uu.sn", TILEPRO_OPC_MULLLSA_UU_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4205,7 +4167,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mvnz", TILEPRO_OPC_MVNZ, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4224,7 +4186,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mvnz.sn", TILEPRO_OPC_MVNZ_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4243,7 +4205,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mvz", TILEPRO_OPC_MVZ, 0x5, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 31, 12, 18 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4262,7 +4224,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mvz.sn", TILEPRO_OPC_MVZ_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4281,7 +4243,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mz", TILEPRO_OPC_MZ, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4300,7 +4262,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mz.sn", TILEPRO_OPC_MZ_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4319,7 +4281,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mzb", TILEPRO_OPC_MZB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4338,7 +4300,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mzb.sn", TILEPRO_OPC_MZB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4357,7 +4319,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mzh", TILEPRO_OPC_MZH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4376,7 +4338,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "mzh.sn", TILEPRO_OPC_MZH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4433,7 +4395,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "nor", TILEPRO_OPC_NOR, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4452,7 +4414,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "nor.sn", TILEPRO_OPC_NOR_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4471,7 +4433,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "or", TILEPRO_OPC_OR, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4490,7 +4452,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "or.sn", TILEPRO_OPC_OR_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4509,7 +4471,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "ori", TILEPRO_OPC_ORI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -4528,7 +4490,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "ori.sn", TILEPRO_OPC_ORI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -4547,7 +4509,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packbs_u", TILEPRO_OPC_PACKBS_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4566,7 +4528,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packbs_u.sn", TILEPRO_OPC_PACKBS_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4585,7 +4547,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packhb", TILEPRO_OPC_PACKHB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4604,7 +4566,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packhb.sn", TILEPRO_OPC_PACKHB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4623,7 +4585,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packhs", TILEPRO_OPC_PACKHS, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4642,7 +4604,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packhs.sn", TILEPRO_OPC_PACKHS_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4661,7 +4623,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packlb", TILEPRO_OPC_PACKLB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4680,7 +4642,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "packlb.sn", TILEPRO_OPC_PACKLB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4699,7 +4661,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "pcnt", TILEPRO_OPC_PCNT, 0x5, 2, TREG_ZERO, 1,
-    { { 9, 10 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 11, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -4718,7 +4680,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "pcnt.sn", TILEPRO_OPC_PCNT_SN, 0x1, 2, TREG_SN, 1,
-    { { 9, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -4737,7 +4699,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "rl", TILEPRO_OPC_RL, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4756,7 +4718,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "rl.sn", TILEPRO_OPC_RL_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4775,7 +4737,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "rli", TILEPRO_OPC_RLI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -4794,7 +4756,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "rli.sn", TILEPRO_OPC_RLI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -4813,7 +4775,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "s1a", TILEPRO_OPC_S1A, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4832,7 +4794,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "s1a.sn", TILEPRO_OPC_S1A_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4851,7 +4813,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "s2a", TILEPRO_OPC_S2A, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4870,7 +4832,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "s2a.sn", TILEPRO_OPC_S2A_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4889,7 +4851,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "s3a", TILEPRO_OPC_S3A, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4908,7 +4870,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "s3a.sn", TILEPRO_OPC_S3A_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4927,7 +4889,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadab_u", TILEPRO_OPC_SADAB_U, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4946,7 +4908,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadab_u.sn", TILEPRO_OPC_SADAB_U_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4965,7 +4927,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadah", TILEPRO_OPC_SADAH, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -4984,7 +4946,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadah.sn", TILEPRO_OPC_SADAH_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5003,7 +4965,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadah_u", TILEPRO_OPC_SADAH_U, 0x1, 3, TREG_ZERO, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5022,7 +4984,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadah_u.sn", TILEPRO_OPC_SADAH_U_SN, 0x1, 3, TREG_SN, 1,
-    { { 21, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5041,7 +5003,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadb_u", TILEPRO_OPC_SADB_U, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5060,7 +5022,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadb_u.sn", TILEPRO_OPC_SADB_U_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5079,7 +5041,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadh", TILEPRO_OPC_SADH, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5098,7 +5060,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadh.sn", TILEPRO_OPC_SADH_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5117,7 +5079,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadh_u", TILEPRO_OPC_SADH_U, 0x1, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5136,7 +5098,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sadh_u.sn", TILEPRO_OPC_SADH_U_SN, 0x1, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5155,7 +5117,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sb", TILEPRO_OPC_SB, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 17 }, { 0, }, { 0, }, { 15, 36 } },
+    { { 0, }, { 10, 17 }, { 0, }, { 0, }, { 15, 36 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -5193,7 +5155,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seq", TILEPRO_OPC_SEQ, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5212,7 +5174,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seq.sn", TILEPRO_OPC_SEQ_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5231,7 +5193,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqb", TILEPRO_OPC_SEQB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5250,7 +5212,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqb.sn", TILEPRO_OPC_SEQB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5269,7 +5231,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqh", TILEPRO_OPC_SEQH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5288,7 +5250,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqh.sn", TILEPRO_OPC_SEQH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5307,7 +5269,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqi", TILEPRO_OPC_SEQI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -5326,7 +5288,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqi.sn", TILEPRO_OPC_SEQI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -5345,7 +5307,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqib", TILEPRO_OPC_SEQIB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -5364,7 +5326,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqib.sn", TILEPRO_OPC_SEQIB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -5383,7 +5345,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqih", TILEPRO_OPC_SEQIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -5402,7 +5364,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "seqih.sn", TILEPRO_OPC_SEQIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -5421,7 +5383,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sh", TILEPRO_OPC_SH, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 17 }, { 0, }, { 0, }, { 15, 36 } },
+    { { 0, }, { 10, 17 }, { 0, }, { 0, }, { 15, 36 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -5459,7 +5421,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shl", TILEPRO_OPC_SHL, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5478,7 +5440,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shl.sn", TILEPRO_OPC_SHL_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5497,7 +5459,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlb", TILEPRO_OPC_SHLB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5516,7 +5478,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlb.sn", TILEPRO_OPC_SHLB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5535,7 +5497,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlh", TILEPRO_OPC_SHLH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5554,7 +5516,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlh.sn", TILEPRO_OPC_SHLH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5573,7 +5535,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shli", TILEPRO_OPC_SHLI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5592,7 +5554,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shli.sn", TILEPRO_OPC_SHLI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5611,7 +5573,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlib", TILEPRO_OPC_SHLIB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5630,7 +5592,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlib.sn", TILEPRO_OPC_SHLIB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5649,7 +5611,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlih", TILEPRO_OPC_SHLIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5668,7 +5630,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shlih.sn", TILEPRO_OPC_SHLIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5687,7 +5649,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shr", TILEPRO_OPC_SHR, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5706,7 +5668,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shr.sn", TILEPRO_OPC_SHR_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5725,7 +5687,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrb", TILEPRO_OPC_SHRB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5744,7 +5706,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrb.sn", TILEPRO_OPC_SHRB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5763,7 +5725,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrh", TILEPRO_OPC_SHRH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5782,7 +5744,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrh.sn", TILEPRO_OPC_SHRH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5801,7 +5763,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shri", TILEPRO_OPC_SHRI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5820,7 +5782,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shri.sn", TILEPRO_OPC_SHRI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5839,7 +5801,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrib", TILEPRO_OPC_SHRIB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5858,7 +5820,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrib.sn", TILEPRO_OPC_SHRIB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5877,7 +5839,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrih", TILEPRO_OPC_SHRIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5896,7 +5858,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "shrih.sn", TILEPRO_OPC_SHRIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -5915,7 +5877,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slt", TILEPRO_OPC_SLT, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5934,7 +5896,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slt.sn", TILEPRO_OPC_SLT_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5953,7 +5915,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slt_u", TILEPRO_OPC_SLT_U, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5972,7 +5934,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slt_u.sn", TILEPRO_OPC_SLT_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -5991,7 +5953,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltb", TILEPRO_OPC_SLTB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6010,7 +5972,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltb.sn", TILEPRO_OPC_SLTB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6029,7 +5991,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltb_u", TILEPRO_OPC_SLTB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6048,7 +6010,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltb_u.sn", TILEPRO_OPC_SLTB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6067,7 +6029,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slte", TILEPRO_OPC_SLTE, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6086,7 +6048,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slte.sn", TILEPRO_OPC_SLTE_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6105,7 +6067,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slte_u", TILEPRO_OPC_SLTE_U, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6124,7 +6086,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slte_u.sn", TILEPRO_OPC_SLTE_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6143,7 +6105,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteb", TILEPRO_OPC_SLTEB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6162,7 +6124,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteb.sn", TILEPRO_OPC_SLTEB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6181,7 +6143,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteb_u", TILEPRO_OPC_SLTEB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6200,7 +6162,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteb_u.sn", TILEPRO_OPC_SLTEB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6219,7 +6181,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteh", TILEPRO_OPC_SLTEH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6238,7 +6200,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteh.sn", TILEPRO_OPC_SLTEH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6257,7 +6219,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteh_u", TILEPRO_OPC_SLTEH_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6276,7 +6238,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slteh_u.sn", TILEPRO_OPC_SLTEH_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6295,7 +6257,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slth", TILEPRO_OPC_SLTH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6314,7 +6276,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slth.sn", TILEPRO_OPC_SLTH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6333,7 +6295,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slth_u", TILEPRO_OPC_SLTH_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6352,7 +6314,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slth_u.sn", TILEPRO_OPC_SLTH_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6371,7 +6333,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slti", TILEPRO_OPC_SLTI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6390,7 +6352,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slti.sn", TILEPRO_OPC_SLTI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6409,7 +6371,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slti_u", TILEPRO_OPC_SLTI_U, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 11, 12, 2 }, { 13, 14, 3 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6428,7 +6390,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "slti_u.sn", TILEPRO_OPC_SLTI_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6447,7 +6409,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltib", TILEPRO_OPC_SLTIB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6466,7 +6428,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltib.sn", TILEPRO_OPC_SLTIB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6485,7 +6447,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltib_u", TILEPRO_OPC_SLTIB_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6504,7 +6466,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltib_u.sn", TILEPRO_OPC_SLTIB_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6523,7 +6485,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltih", TILEPRO_OPC_SLTIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6542,7 +6504,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltih.sn", TILEPRO_OPC_SLTIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6561,7 +6523,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltih_u", TILEPRO_OPC_SLTIH_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6580,7 +6542,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sltih_u.sn", TILEPRO_OPC_SLTIH_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -6599,7 +6561,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sne", TILEPRO_OPC_SNE, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6618,7 +6580,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sne.sn", TILEPRO_OPC_SNE_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6637,7 +6599,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sneb", TILEPRO_OPC_SNEB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6656,7 +6618,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sneb.sn", TILEPRO_OPC_SNEB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6675,7 +6637,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sneh", TILEPRO_OPC_SNEH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6694,7 +6656,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sneh.sn", TILEPRO_OPC_SNEH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6713,7 +6675,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sra", TILEPRO_OPC_SRA, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6732,7 +6694,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sra.sn", TILEPRO_OPC_SRA_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6751,7 +6713,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "srab", TILEPRO_OPC_SRAB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6770,7 +6732,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "srab.sn", TILEPRO_OPC_SRAB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6789,7 +6751,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "srah", TILEPRO_OPC_SRAH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6808,7 +6770,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "srah.sn", TILEPRO_OPC_SRAH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6827,7 +6789,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "srai", TILEPRO_OPC_SRAI, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 11, 12, 34 }, { 13, 14, 35 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -6846,7 +6808,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "srai.sn", TILEPRO_OPC_SRAI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -6865,7 +6827,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sraib", TILEPRO_OPC_SRAIB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -6884,7 +6846,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sraib.sn", TILEPRO_OPC_SRAIB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -6903,7 +6865,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sraih", TILEPRO_OPC_SRAIH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -6922,7 +6884,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sraih.sn", TILEPRO_OPC_SRAIH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 32 }, { 7, 8, 33 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 32 }, { 9, 10, 33 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffe0000ULL,
@@ -6941,7 +6903,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sub", TILEPRO_OPC_SUB, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6960,7 +6922,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sub.sn", TILEPRO_OPC_SUB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6979,7 +6941,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subb", TILEPRO_OPC_SUBB, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -6998,7 +6960,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subb.sn", TILEPRO_OPC_SUBB_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7017,7 +6979,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subbs_u", TILEPRO_OPC_SUBBS_U, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7036,7 +6998,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subbs_u.sn", TILEPRO_OPC_SUBBS_U_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7055,7 +7017,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subh", TILEPRO_OPC_SUBH, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7074,7 +7036,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subh.sn", TILEPRO_OPC_SUBH_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7093,7 +7055,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subhs", TILEPRO_OPC_SUBHS, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7112,7 +7074,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subhs.sn", TILEPRO_OPC_SUBHS_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7131,7 +7093,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subs", TILEPRO_OPC_SUBS, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7150,7 +7112,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "subs.sn", TILEPRO_OPC_SUBS_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7169,7 +7131,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "sw", TILEPRO_OPC_SW, 0x12, 2, TREG_ZERO, 1,
-    { { 0, }, { 8, 17 }, { 0, }, { 0, }, { 15, 36 } },
+    { { 0, }, { 10, 17 }, { 0, }, { 0, }, { 15, 36 } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -7283,7 +7245,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb0", TILEPRO_OPC_TBLIDXB0, 0x5, 2, TREG_ZERO, 1,
-    { { 21, 10 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7302,7 +7264,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb0.sn", TILEPRO_OPC_TBLIDXB0_SN, 0x1, 2, TREG_SN, 1,
-    { { 21, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7321,7 +7283,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb1", TILEPRO_OPC_TBLIDXB1, 0x5, 2, TREG_ZERO, 1,
-    { { 21, 10 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7340,7 +7302,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb1.sn", TILEPRO_OPC_TBLIDXB1_SN, 0x1, 2, TREG_SN, 1,
-    { { 21, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7359,7 +7321,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb2", TILEPRO_OPC_TBLIDXB2, 0x5, 2, TREG_ZERO, 1,
-    { { 21, 10 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7378,7 +7340,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb2.sn", TILEPRO_OPC_TBLIDXB2_SN, 0x1, 2, TREG_SN, 1,
-    { { 21, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7397,7 +7359,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb3", TILEPRO_OPC_TBLIDXB3, 0x5, 2, TREG_ZERO, 1,
-    { { 21, 10 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 31, 12 }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7416,7 +7378,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tblidxb3.sn", TILEPRO_OPC_TBLIDXB3_SN, 0x1, 2, TREG_SN, 1,
-    { { 21, 10 }, { 0, }, { 0, }, { 0, }, { 0, } },
+    { { 21, 8 }, { 0, }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffff000ULL,
@@ -7435,7 +7397,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tns", TILEPRO_OPC_TNS, 0x2, 2, TREG_ZERO, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -7454,7 +7416,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "tns.sn", TILEPRO_OPC_TNS_SN, 0x2, 2, TREG_SN, 1,
-    { { 0, }, { 7, 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 9, 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -7473,7 +7435,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "wh64", TILEPRO_OPC_WH64, 0x2, 1, TREG_ZERO, 1,
-    { { 0, }, { 8 }, { 0, }, { 0, }, { 0, } },
+    { { 0, }, { 10 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0ULL,
@@ -7492,7 +7454,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "xor", TILEPRO_OPC_XOR, 0xf, 3, TREG_ZERO, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 11, 12, 18 }, { 13, 14, 19 }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7511,7 +7473,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "xor.sn", TILEPRO_OPC_XOR_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 16 }, { 7, 8, 17 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 16 }, { 9, 10, 17 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ffc0000ULL,
@@ -7530,7 +7492,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "xori", TILEPRO_OPC_XORI, 0x3, 3, TREG_ZERO, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -7549,7 +7511,7 @@ const struct tilepro_opcode tilepro_opcodes[397] =
 #endif
   },
   { "xori.sn", TILEPRO_OPC_XORI_SN, 0x3, 3, TREG_SN, 1,
-    { { 9, 10, 0 }, { 7, 8, 1 }, { 0, }, { 0, }, { 0, } },
+    { { 7, 8, 0 }, { 9, 10, 1 }, { 0, }, { 0, }, { 0, } },
 #ifndef DISASM_ONLY
     {
       0x800000007ff00000ULL,
@@ -7973,7 +7935,7 @@ static const unsigned short decode_X0_fsm[1153] =
   TILEPRO_OPC_TBLIDXB3_SN, TILEPRO_OPC_NONE,
 };
 
-static const unsigned short decode_X1_fsm[1580] =
+static const unsigned short decode_X1_fsm[1540] =
 {
   BITFIELD(54, 9) /* index 0 */,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
@@ -8017,7 +7979,7 @@ static const unsigned short decode_X1_fsm[1580] =
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  CHILD(961), CHILD(970), CHILD(994), CHILD(1003), TILEPRO_OPC_NONE,
+  CHILD(941), CHILD(950), CHILD(974), CHILD(983), TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_MM,
@@ -8028,11 +7990,11 @@ static const unsigned short decode_X1_fsm[1580] =
   TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM,
   TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM,
   TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM,
-  TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM, CHILD(1032),
+  TILEPRO_OPC_MM, TILEPRO_OPC_MM, TILEPRO_OPC_MM, CHILD(992),
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, CHILD(1374),
+  TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, CHILD(1334),
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
@@ -8261,62 +8223,43 @@ static const unsigned short decode_X1_fsm[1580] =
   TILEPRO_OPC_SLTI, TILEPRO_OPC_SLTI_U, TILEPRO_OPC_XORI, TILEPRO_OPC_LBADD,
   TILEPRO_OPC_LBADD_U,
   BITFIELD(51, 3) /* index 932 */,
-  TILEPRO_OPC_LHADD, TILEPRO_OPC_LHADD_U, CHILD(941), TILEPRO_OPC_LWADD_NA,
-  TILEPRO_OPC_SBADD, TILEPRO_OPC_SHADD, TILEPRO_OPC_SWADD, TILEPRO_OPC_NONE,
-  BITFIELD(43, 2) /* index 941 */,
-  CHILD(946), TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD,
-  BITFIELD(45, 2) /* index 946 */,
-  CHILD(951), TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD,
-  BITFIELD(47, 2) /* index 951 */,
-  CHILD(956), TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD,
-  BITFIELD(49, 2) /* index 956 */,
-  TILEPRO_OPC_LW_TLS, TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD, TILEPRO_OPC_LWADD,
-  BITFIELD(51, 3) /* index 961 */,
+  TILEPRO_OPC_LHADD, TILEPRO_OPC_LHADD_U, TILEPRO_OPC_LWADD,
+  TILEPRO_OPC_LWADD_NA, TILEPRO_OPC_SBADD, TILEPRO_OPC_SHADD,
+  TILEPRO_OPC_SWADD, TILEPRO_OPC_NONE,
+  BITFIELD(51, 3) /* index 941 */,
   TILEPRO_OPC_NONE, TILEPRO_OPC_ADDIB_SN, TILEPRO_OPC_ADDIH_SN,
   TILEPRO_OPC_ADDI_SN, TILEPRO_OPC_ANDI_SN, TILEPRO_OPC_MAXIB_U_SN,
   TILEPRO_OPC_MAXIH_SN, TILEPRO_OPC_MFSPR,
-  BITFIELD(51, 3) /* index 970 */,
-  TILEPRO_OPC_MINIB_U_SN, TILEPRO_OPC_MINIH_SN, TILEPRO_OPC_MTSPR, CHILD(979),
+  BITFIELD(51, 3) /* index 950 */,
+  TILEPRO_OPC_MINIB_U_SN, TILEPRO_OPC_MINIH_SN, TILEPRO_OPC_MTSPR, CHILD(959),
   TILEPRO_OPC_SEQIB_SN, TILEPRO_OPC_SEQIH_SN, TILEPRO_OPC_SEQI_SN,
   TILEPRO_OPC_SLTIB_SN,
-  BITFIELD(37, 2) /* index 979 */,
-  TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, CHILD(984),
-  BITFIELD(39, 2) /* index 984 */,
-  TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, CHILD(989),
-  BITFIELD(41, 2) /* index 989 */,
+  BITFIELD(37, 2) /* index 959 */,
+  TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, CHILD(964),
+  BITFIELD(39, 2) /* index 964 */,
+  TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, CHILD(969),
+  BITFIELD(41, 2) /* index 969 */,
   TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN, TILEPRO_OPC_ORI_SN,
   TILEPRO_OPC_MOVEI_SN,
-  BITFIELD(51, 3) /* index 994 */,
+  BITFIELD(51, 3) /* index 974 */,
   TILEPRO_OPC_SLTIB_U_SN, TILEPRO_OPC_SLTIH_SN, TILEPRO_OPC_SLTIH_U_SN,
   TILEPRO_OPC_SLTI_SN, TILEPRO_OPC_SLTI_U_SN, TILEPRO_OPC_XORI_SN,
   TILEPRO_OPC_LBADD_SN, TILEPRO_OPC_LBADD_U_SN,
-  BITFIELD(51, 3) /* index 1003 */,
-  TILEPRO_OPC_LHADD_SN, TILEPRO_OPC_LHADD_U_SN, CHILD(1012),
+  BITFIELD(51, 3) /* index 983 */,
+  TILEPRO_OPC_LHADD_SN, TILEPRO_OPC_LHADD_U_SN, TILEPRO_OPC_LWADD_SN,
   TILEPRO_OPC_LWADD_NA_SN, TILEPRO_OPC_SBADD, TILEPRO_OPC_SHADD,
   TILEPRO_OPC_SWADD, TILEPRO_OPC_NONE,
-  BITFIELD(43, 2) /* index 1012 */,
-  CHILD(1017), TILEPRO_OPC_LWADD_SN, TILEPRO_OPC_LWADD_SN,
-  TILEPRO_OPC_LWADD_SN,
-  BITFIELD(45, 2) /* index 1017 */,
-  CHILD(1022), TILEPRO_OPC_LWADD_SN, TILEPRO_OPC_LWADD_SN,
-  TILEPRO_OPC_LWADD_SN,
-  BITFIELD(47, 2) /* index 1022 */,
-  CHILD(1027), TILEPRO_OPC_LWADD_SN, TILEPRO_OPC_LWADD_SN,
-  TILEPRO_OPC_LWADD_SN,
-  BITFIELD(49, 2) /* index 1027 */,
-  TILEPRO_OPC_LW_TLS_SN, TILEPRO_OPC_LWADD_SN, TILEPRO_OPC_LWADD_SN,
-  TILEPRO_OPC_LWADD_SN,
-  BITFIELD(46, 7) /* index 1032 */,
+  BITFIELD(46, 7) /* index 992 */,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  CHILD(1161), CHILD(1161), CHILD(1161), CHILD(1161), CHILD(1164),
-  CHILD(1164), CHILD(1164), CHILD(1164), CHILD(1167), CHILD(1167),
-  CHILD(1167), CHILD(1167), CHILD(1170), CHILD(1170), CHILD(1170),
-  CHILD(1170), CHILD(1173), CHILD(1173), CHILD(1173), CHILD(1173),
-  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1179),
-  CHILD(1179), CHILD(1179), CHILD(1179), CHILD(1182), CHILD(1182),
-  CHILD(1182), CHILD(1182), CHILD(1185), CHILD(1185), CHILD(1185),
-  CHILD(1185), CHILD(1188), CHILD(1188), CHILD(1188), CHILD(1188),
-  CHILD(1191), CHILD(1282), CHILD(1330), CHILD(1363), TILEPRO_OPC_NONE,
+  CHILD(1121), CHILD(1121), CHILD(1121), CHILD(1121), CHILD(1124),
+  CHILD(1124), CHILD(1124), CHILD(1124), CHILD(1127), CHILD(1127),
+  CHILD(1127), CHILD(1127), CHILD(1130), CHILD(1130), CHILD(1130),
+  CHILD(1130), CHILD(1133), CHILD(1133), CHILD(1133), CHILD(1133),
+  CHILD(1136), CHILD(1136), CHILD(1136), CHILD(1136), CHILD(1139),
+  CHILD(1139), CHILD(1139), CHILD(1139), CHILD(1142), CHILD(1142),
+  CHILD(1142), CHILD(1142), CHILD(1145), CHILD(1145), CHILD(1145),
+  CHILD(1145), CHILD(1148), CHILD(1148), CHILD(1148), CHILD(1148),
+  CHILD(1151), CHILD(1242), CHILD(1290), CHILD(1323), TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
@@ -8337,130 +8280,130 @@ static const unsigned short decode_X1_fsm[1580] =
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1161 */,
+  BITFIELD(53, 1) /* index 1121 */,
   TILEPRO_OPC_RLI, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1164 */,
+  BITFIELD(53, 1) /* index 1124 */,
   TILEPRO_OPC_SHLIB, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1167 */,
+  BITFIELD(53, 1) /* index 1127 */,
   TILEPRO_OPC_SHLIH, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1170 */,
+  BITFIELD(53, 1) /* index 1130 */,
   TILEPRO_OPC_SHLI, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1173 */,
+  BITFIELD(53, 1) /* index 1133 */,
   TILEPRO_OPC_SHRIB, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1176 */,
+  BITFIELD(53, 1) /* index 1136 */,
   TILEPRO_OPC_SHRIH, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1179 */,
+  BITFIELD(53, 1) /* index 1139 */,
   TILEPRO_OPC_SHRI, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1182 */,
+  BITFIELD(53, 1) /* index 1142 */,
   TILEPRO_OPC_SRAIB, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1185 */,
+  BITFIELD(53, 1) /* index 1145 */,
   TILEPRO_OPC_SRAIH, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1188 */,
+  BITFIELD(53, 1) /* index 1148 */,
   TILEPRO_OPC_SRAI, TILEPRO_OPC_NONE,
-  BITFIELD(43, 3) /* index 1191 */,
-  TILEPRO_OPC_NONE, CHILD(1200), CHILD(1203), CHILD(1206), CHILD(1209),
-  CHILD(1212), CHILD(1215), CHILD(1218),
-  BITFIELD(53, 1) /* index 1200 */,
+  BITFIELD(43, 3) /* index 1151 */,
+  TILEPRO_OPC_NONE, CHILD(1160), CHILD(1163), CHILD(1166), CHILD(1169),
+  CHILD(1172), CHILD(1175), CHILD(1178),
+  BITFIELD(53, 1) /* index 1160 */,
   TILEPRO_OPC_DRAIN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1203 */,
+  BITFIELD(53, 1) /* index 1163 */,
   TILEPRO_OPC_DTLBPR, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1206 */,
+  BITFIELD(53, 1) /* index 1166 */,
   TILEPRO_OPC_FINV, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1209 */,
+  BITFIELD(53, 1) /* index 1169 */,
   TILEPRO_OPC_FLUSH, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1212 */,
+  BITFIELD(53, 1) /* index 1172 */,
   TILEPRO_OPC_FNOP, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1215 */,
+  BITFIELD(53, 1) /* index 1175 */,
   TILEPRO_OPC_ICOH, TILEPRO_OPC_NONE,
-  BITFIELD(31, 2) /* index 1218 */,
-  CHILD(1223), CHILD(1251), CHILD(1279), CHILD(1279),
-  BITFIELD(53, 1) /* index 1223 */,
-  CHILD(1226), TILEPRO_OPC_NONE,
-  BITFIELD(33, 2) /* index 1226 */,
-  TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, CHILD(1231),
-  BITFIELD(35, 2) /* index 1231 */,
-  TILEPRO_OPC_ILL, CHILD(1236), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
-  BITFIELD(37, 2) /* index 1236 */,
-  TILEPRO_OPC_ILL, CHILD(1241), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
-  BITFIELD(39, 2) /* index 1241 */,
-  TILEPRO_OPC_ILL, CHILD(1246), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
-  BITFIELD(41, 2) /* index 1246 */,
+  BITFIELD(31, 2) /* index 1178 */,
+  CHILD(1183), CHILD(1211), CHILD(1239), CHILD(1239),
+  BITFIELD(53, 1) /* index 1183 */,
+  CHILD(1186), TILEPRO_OPC_NONE,
+  BITFIELD(33, 2) /* index 1186 */,
+  TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, CHILD(1191),
+  BITFIELD(35, 2) /* index 1191 */,
+  TILEPRO_OPC_ILL, CHILD(1196), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
+  BITFIELD(37, 2) /* index 1196 */,
+  TILEPRO_OPC_ILL, CHILD(1201), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
+  BITFIELD(39, 2) /* index 1201 */,
+  TILEPRO_OPC_ILL, CHILD(1206), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
+  BITFIELD(41, 2) /* index 1206 */,
   TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, TILEPRO_OPC_BPT, TILEPRO_OPC_ILL,
-  BITFIELD(53, 1) /* index 1251 */,
-  CHILD(1254), TILEPRO_OPC_NONE,
-  BITFIELD(33, 2) /* index 1254 */,
-  TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, CHILD(1259),
-  BITFIELD(35, 2) /* index 1259 */,
-  TILEPRO_OPC_ILL, CHILD(1264), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
-  BITFIELD(37, 2) /* index 1264 */,
-  TILEPRO_OPC_ILL, CHILD(1269), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
-  BITFIELD(39, 2) /* index 1269 */,
-  TILEPRO_OPC_ILL, CHILD(1274), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
-  BITFIELD(41, 2) /* index 1274 */,
+  BITFIELD(53, 1) /* index 1211 */,
+  CHILD(1214), TILEPRO_OPC_NONE,
+  BITFIELD(33, 2) /* index 1214 */,
+  TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, CHILD(1219),
+  BITFIELD(35, 2) /* index 1219 */,
+  TILEPRO_OPC_ILL, CHILD(1224), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
+  BITFIELD(37, 2) /* index 1224 */,
+  TILEPRO_OPC_ILL, CHILD(1229), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
+  BITFIELD(39, 2) /* index 1229 */,
+  TILEPRO_OPC_ILL, CHILD(1234), TILEPRO_OPC_ILL, TILEPRO_OPC_ILL,
+  BITFIELD(41, 2) /* index 1234 */,
   TILEPRO_OPC_ILL, TILEPRO_OPC_ILL, TILEPRO_OPC_RAISE, TILEPRO_OPC_ILL,
-  BITFIELD(53, 1) /* index 1279 */,
+  BITFIELD(53, 1) /* index 1239 */,
   TILEPRO_OPC_ILL, TILEPRO_OPC_NONE,
-  BITFIELD(43, 3) /* index 1282 */,
-  CHILD(1291), CHILD(1294), CHILD(1297), CHILD(1315), CHILD(1318),
-  CHILD(1321), CHILD(1324), CHILD(1327),
-  BITFIELD(53, 1) /* index 1291 */,
+  BITFIELD(43, 3) /* index 1242 */,
+  CHILD(1251), CHILD(1254), CHILD(1257), CHILD(1275), CHILD(1278),
+  CHILD(1281), CHILD(1284), CHILD(1287),
+  BITFIELD(53, 1) /* index 1251 */,
   TILEPRO_OPC_INV, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1294 */,
+  BITFIELD(53, 1) /* index 1254 */,
   TILEPRO_OPC_IRET, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1297 */,
-  CHILD(1300), TILEPRO_OPC_NONE,
-  BITFIELD(31, 2) /* index 1300 */,
-  TILEPRO_OPC_LB, TILEPRO_OPC_LB, TILEPRO_OPC_LB, CHILD(1305),
-  BITFIELD(33, 2) /* index 1305 */,
-  TILEPRO_OPC_LB, TILEPRO_OPC_LB, TILEPRO_OPC_LB, CHILD(1310),
-  BITFIELD(35, 2) /* index 1310 */,
+  BITFIELD(53, 1) /* index 1257 */,
+  CHILD(1260), TILEPRO_OPC_NONE,
+  BITFIELD(31, 2) /* index 1260 */,
+  TILEPRO_OPC_LB, TILEPRO_OPC_LB, TILEPRO_OPC_LB, CHILD(1265),
+  BITFIELD(33, 2) /* index 1265 */,
+  TILEPRO_OPC_LB, TILEPRO_OPC_LB, TILEPRO_OPC_LB, CHILD(1270),
+  BITFIELD(35, 2) /* index 1270 */,
   TILEPRO_OPC_LB, TILEPRO_OPC_LB, TILEPRO_OPC_LB, TILEPRO_OPC_PREFETCH,
-  BITFIELD(53, 1) /* index 1315 */,
+  BITFIELD(53, 1) /* index 1275 */,
   TILEPRO_OPC_LB_U, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1318 */,
+  BITFIELD(53, 1) /* index 1278 */,
   TILEPRO_OPC_LH, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1321 */,
+  BITFIELD(53, 1) /* index 1281 */,
   TILEPRO_OPC_LH_U, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1324 */,
+  BITFIELD(53, 1) /* index 1284 */,
   TILEPRO_OPC_LW, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1327 */,
+  BITFIELD(53, 1) /* index 1287 */,
   TILEPRO_OPC_MF, TILEPRO_OPC_NONE,
-  BITFIELD(43, 3) /* index 1330 */,
-  CHILD(1339), CHILD(1342), CHILD(1345), CHILD(1348), CHILD(1351),
-  CHILD(1354), CHILD(1357), CHILD(1360),
-  BITFIELD(53, 1) /* index 1339 */,
+  BITFIELD(43, 3) /* index 1290 */,
+  CHILD(1299), CHILD(1302), CHILD(1305), CHILD(1308), CHILD(1311),
+  CHILD(1314), CHILD(1317), CHILD(1320),
+  BITFIELD(53, 1) /* index 1299 */,
   TILEPRO_OPC_NAP, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1342 */,
+  BITFIELD(53, 1) /* index 1302 */,
   TILEPRO_OPC_NOP, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1345 */,
+  BITFIELD(53, 1) /* index 1305 */,
   TILEPRO_OPC_SWINT0, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1348 */,
+  BITFIELD(53, 1) /* index 1308 */,
   TILEPRO_OPC_SWINT1, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1351 */,
+  BITFIELD(53, 1) /* index 1311 */,
   TILEPRO_OPC_SWINT2, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1354 */,
+  BITFIELD(53, 1) /* index 1314 */,
   TILEPRO_OPC_SWINT3, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1357 */,
+  BITFIELD(53, 1) /* index 1317 */,
   TILEPRO_OPC_TNS, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1360 */,
+  BITFIELD(53, 1) /* index 1320 */,
   TILEPRO_OPC_WH64, TILEPRO_OPC_NONE,
-  BITFIELD(43, 2) /* index 1363 */,
-  CHILD(1368), TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  BITFIELD(45, 1) /* index 1368 */,
-  CHILD(1371), TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1371 */,
+  BITFIELD(43, 2) /* index 1323 */,
+  CHILD(1328), TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
+  BITFIELD(45, 1) /* index 1328 */,
+  CHILD(1331), TILEPRO_OPC_NONE,
+  BITFIELD(53, 1) /* index 1331 */,
   TILEPRO_OPC_LW_NA, TILEPRO_OPC_NONE,
-  BITFIELD(46, 7) /* index 1374 */,
+  BITFIELD(46, 7) /* index 1334 */,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  CHILD(1503), CHILD(1503), CHILD(1503), CHILD(1503), CHILD(1506),
-  CHILD(1506), CHILD(1506), CHILD(1506), CHILD(1509), CHILD(1509),
-  CHILD(1509), CHILD(1509), CHILD(1512), CHILD(1512), CHILD(1512),
-  CHILD(1512), CHILD(1515), CHILD(1515), CHILD(1515), CHILD(1515),
-  CHILD(1518), CHILD(1518), CHILD(1518), CHILD(1518), CHILD(1521),
-  CHILD(1521), CHILD(1521), CHILD(1521), CHILD(1524), CHILD(1524),
-  CHILD(1524), CHILD(1524), CHILD(1527), CHILD(1527), CHILD(1527),
-  CHILD(1527), CHILD(1530), CHILD(1530), CHILD(1530), CHILD(1530),
-  CHILD(1191), CHILD(1533), CHILD(1557), CHILD(1569), TILEPRO_OPC_NONE,
+  CHILD(1463), CHILD(1463), CHILD(1463), CHILD(1463), CHILD(1466),
+  CHILD(1466), CHILD(1466), CHILD(1466), CHILD(1469), CHILD(1469),
+  CHILD(1469), CHILD(1469), CHILD(1472), CHILD(1472), CHILD(1472),
+  CHILD(1472), CHILD(1475), CHILD(1475), CHILD(1475), CHILD(1475),
+  CHILD(1478), CHILD(1478), CHILD(1478), CHILD(1478), CHILD(1481),
+  CHILD(1481), CHILD(1481), CHILD(1481), CHILD(1484), CHILD(1484),
+  CHILD(1484), CHILD(1484), CHILD(1487), CHILD(1487), CHILD(1487),
+  CHILD(1487), CHILD(1490), CHILD(1490), CHILD(1490), CHILD(1490),
+  CHILD(1151), CHILD(1493), CHILD(1517), CHILD(1529), TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
@@ -8481,49 +8424,49 @@ static const unsigned short decode_X1_fsm[1580] =
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
   TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1503 */,
+  BITFIELD(53, 1) /* index 1463 */,
   TILEPRO_OPC_RLI_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1506 */,
+  BITFIELD(53, 1) /* index 1466 */,
   TILEPRO_OPC_SHLIB_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1509 */,
+  BITFIELD(53, 1) /* index 1469 */,
   TILEPRO_OPC_SHLIH_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1512 */,
+  BITFIELD(53, 1) /* index 1472 */,
   TILEPRO_OPC_SHLI_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1515 */,
+  BITFIELD(53, 1) /* index 1475 */,
   TILEPRO_OPC_SHRIB_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1518 */,
+  BITFIELD(53, 1) /* index 1478 */,
   TILEPRO_OPC_SHRIH_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1521 */,
+  BITFIELD(53, 1) /* index 1481 */,
   TILEPRO_OPC_SHRI_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1524 */,
+  BITFIELD(53, 1) /* index 1484 */,
   TILEPRO_OPC_SRAIB_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1527 */,
+  BITFIELD(53, 1) /* index 1487 */,
   TILEPRO_OPC_SRAIH_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1530 */,
+  BITFIELD(53, 1) /* index 1490 */,
   TILEPRO_OPC_SRAI_SN, TILEPRO_OPC_NONE,
-  BITFIELD(43, 3) /* index 1533 */,
-  CHILD(1291), CHILD(1294), CHILD(1542), CHILD(1545), CHILD(1548),
-  CHILD(1551), CHILD(1554), CHILD(1327),
-  BITFIELD(53, 1) /* index 1542 */,
+  BITFIELD(43, 3) /* index 1493 */,
+  CHILD(1251), CHILD(1254), CHILD(1502), CHILD(1505), CHILD(1508),
+  CHILD(1511), CHILD(1514), CHILD(1287),
+  BITFIELD(53, 1) /* index 1502 */,
   TILEPRO_OPC_LB_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1545 */,
+  BITFIELD(53, 1) /* index 1505 */,
   TILEPRO_OPC_LB_U_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1548 */,
+  BITFIELD(53, 1) /* index 1508 */,
   TILEPRO_OPC_LH_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1551 */,
+  BITFIELD(53, 1) /* index 1511 */,
   TILEPRO_OPC_LH_U_SN, TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1554 */,
+  BITFIELD(53, 1) /* index 1514 */,
   TILEPRO_OPC_LW_SN, TILEPRO_OPC_NONE,
-  BITFIELD(43, 3) /* index 1557 */,
-  CHILD(1339), CHILD(1342), CHILD(1345), CHILD(1348), CHILD(1351),
-  CHILD(1354), CHILD(1566), CHILD(1360),
-  BITFIELD(53, 1) /* index 1566 */,
+  BITFIELD(43, 3) /* index 1517 */,
+  CHILD(1299), CHILD(1302), CHILD(1305), CHILD(1308), CHILD(1311),
+  CHILD(1314), CHILD(1526), CHILD(1320),
+  BITFIELD(53, 1) /* index 1526 */,
   TILEPRO_OPC_TNS_SN, TILEPRO_OPC_NONE,
-  BITFIELD(43, 2) /* index 1569 */,
-  CHILD(1574), TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
-  BITFIELD(45, 1) /* index 1574 */,
-  CHILD(1577), TILEPRO_OPC_NONE,
-  BITFIELD(53, 1) /* index 1577 */,
+  BITFIELD(43, 2) /* index 1529 */,
+  CHILD(1534), TILEPRO_OPC_NONE, TILEPRO_OPC_NONE, TILEPRO_OPC_NONE,
+  BITFIELD(45, 1) /* index 1534 */,
+  CHILD(1537), TILEPRO_OPC_NONE,
+  BITFIELD(53, 1) /* index 1537 */,
   TILEPRO_OPC_LW_NA_SN, TILEPRO_OPC_NONE,
 };
 
@@ -9415,22 +9358,22 @@ const struct tilepro_operand tilepro_operands[43] =
   {
     TILEPRO_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 0, 1, 0, 0,
-    create_Dest_X1, get_Dest_X1
+    create_Dest_X0, get_Dest_X0
   },
   {
     TILEPRO_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 1, 0, 0, 0,
-    create_SrcA_X1, get_SrcA_X1
+    create_SrcA_X0, get_SrcA_X0
   },
   {
     TILEPRO_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 0, 1, 0, 0,
-    create_Dest_X0, get_Dest_X0
+    create_Dest_X1, get_Dest_X1
   },
   {
     TILEPRO_OP_TYPE_REGISTER, BFD_RELOC(NONE),
     6, 0, 1, 0, 0, 0,
-    create_SrcA_X0, get_SrcA_X0
+    create_SrcA_X1, get_SrcA_X1
   },
   {
     TILEPRO_OP_TYPE_REGISTER, BFD_RELOC(NONE),
diff --git a/opcodes/v850-opc.c b/opcodes/v850-opc.c
index 4ba20d392e..67ba562f9d 100644
--- a/opcodes/v850-opc.c
+++ b/opcodes/v850-opc.c
@@ -1,6 +1,6 @@
 /* Assemble V850 instructions.
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007, 2010,
-   2012 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007, 2010
+   Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -259,7 +259,7 @@ insert_v8 (unsigned long insn, long value, const char ** errmsg)
 static unsigned long
 extract_v8 (unsigned long insn, int * invalid)
 {
-  unsigned long ret = (insn & 0x1f) | ((insn >> (27-5)) & 0xe0);
+  unsigned long ret = (insn & 0x1f) | ((insn & 0x38000000) >> (27-5));
 
   if (invalid != 0)
     *invalid = 0;
@@ -285,9 +285,10 @@ insert_d9 (unsigned long insn, long value, const char ** errmsg)
 static unsigned long
 extract_d9 (unsigned long insn, int * invalid)
 {
-  signed long ret = ((insn >> 7) & 0x1f0) | ((insn >> 3) & 0x0e);
+  unsigned long ret = ((insn & 0xf800) >> 7) | ((insn & 0x0070) >> 3);
 
-  ret = (ret ^ 0x100) - 0x100;
+  if ((insn & 0x8000) != 0)
+    ret -= 0x0200;
 
   if (invalid != 0)
     *invalid = 0;
@@ -340,9 +341,8 @@ insert_d16_15 (unsigned long insn, long value, const char ** errmsg)
 static unsigned long
 extract_d16_15 (unsigned long insn, int * invalid)
 {
-  signed long ret = (insn >> 16) & 0xfffe;
-
-  ret = (ret ^ 0x8000) - 0x8000;
+  signed long ret = (insn & 0xfffe0000);
+  ret >>= 16;
 
   if (invalid != 0)
     *invalid = 0;
@@ -361,9 +361,9 @@ insert_d16_16 (unsigned long insn, signed long value, const char ** errmsg)
 static unsigned long
 extract_d16_16 (unsigned long insn, int * invalid)
 {
-  signed long ret = ((insn >> 16) & 0xfffe) | ((insn >> 5) & 1);
-
-  ret = (ret ^ 0x8000) - 0x8000;
+  signed long ret = insn & 0xfffe0000;
+  ret >>= 16;
+  ret |= ((insn & 0x20) >> 5);
 
   if (invalid != 0)
     *invalid = 0;
@@ -382,9 +382,9 @@ insert_d17_16 (unsigned long insn, long value, const char ** errmsg)
 static unsigned long
 extract_d17_16 (unsigned long insn, int * invalid)
 {
-  signed long ret = ((insn >> 16) & 0xfffe) | ((insn << (16 - 4)) & 0x10000);
-
-  ret = (ret ^ 0x10000) - 0x10000;
+  signed long ret = (insn >> 16) & 0xfffe;
+  ret |= (insn << (16 - 4)) & 0x10000;
+  ret = (ret << ((sizeof ret)*8 - 17)) >> ((sizeof ret)*8 - 17);
 
   if (invalid != 0)
     *invalid = 0;
@@ -410,9 +410,9 @@ insert_d22 (unsigned long insn, long value, const char ** errmsg)
 static unsigned long
 extract_d22 (unsigned long insn, int * invalid)
 {
-  signed long ret = ((insn >> 16) & 0xfffe) | ((insn << 16) & 0x3f0000);
+  signed long ret = ((insn & 0xfffe0000) >> 16) | ((insn & 0x3f) << 16);
 
-  ret = (ret ^ 0x200000) - 0x200000;
+  ret = (ret << ((sizeof ret)*8 - 22)) >> ((sizeof ret)*8 - 22);
 
   if (invalid != 0)
     *invalid = 0;
@@ -423,7 +423,7 @@ static unsigned long
 insert_d23 (unsigned long insn, long value, const char ** errmsg)
 {
   if (value > 0x3fffff || value < -0x400000)
-    * errmsg = out_of_range;
+	* errmsg = out_of_range;
 
   return insn | ((value & 0x7f) << 4) | ((value & 0x7fff80) << (16-7));
 }
@@ -431,9 +431,9 @@ insert_d23 (unsigned long insn, long value, const char ** errmsg)
 static unsigned long
 extract_d23 (unsigned long insn, int * invalid)
 {
-  signed long ret = ((insn >> 4) & 0x7f) | ((insn >> (16-7)) & 0x7fff80);
+  signed long ret = ((insn >> 4) & 0x7f) | ((insn >> (16-7)) & 0x7fffff80);
 
-  ret = (ret ^ 0x400000) - 0x400000;
+  ret = ((ret << ((sizeof ret)*8 - 23)) >> ((sizeof ret)*8 - 23));
 
   if (invalid != 0)
     *invalid = 0;
@@ -452,9 +452,11 @@ insert_i9 (unsigned long insn, signed long value, const char ** errmsg)
 static unsigned long
 extract_i9 (unsigned long insn, int * invalid)
 {
-  signed long ret = ((insn >> 13) & 0x1e0) | (insn & 0x1f);
+  signed long ret = insn & 0x003c0000;
 
-  ret = (ret ^ 0x100) - 0x100;
+  ret <<= 10;
+  ret >>= 23;
+  ret |= (insn & 0x1f);
 
   if (invalid != 0)
     *invalid = 0;
@@ -475,7 +477,11 @@ insert_u9 (unsigned long insn, long v, const char ** errmsg)
 static unsigned long
 extract_u9 (unsigned long insn, int * invalid)
 {
-  unsigned long ret = ((insn >> 13) & 0x1e0) | (insn & 0x1f);
+  unsigned long ret = insn & 0x003c0000;
+
+  ret >>= 13;
+
+  ret |= (insn & 0x1f);
 
   if (invalid != 0)
     *invalid = 0;
@@ -490,7 +496,7 @@ insert_spe (unsigned long insn, long v, const char ** errmsg)
   if (value != 3)
     * errmsg = _("invalid register for stack adjustment");
 
-  return insn & ~0x180000;
+  return insn & (~ 0x180000);
 }
 
 static unsigned long
@@ -518,7 +524,9 @@ insert_r4 (unsigned long insn, long v, const char ** errmsg)
 static unsigned long
 extract_r4 (unsigned long insn, int * invalid)
 {
-  unsigned long ret = ((insn >> (23-4)) & 0x10) | ((insn >> 17) & 0x0f);
+  unsigned long ret;
+  ret = (insn >> 17) & 0xf;
+  ret |= (insn >> (23-4)) & 0x10;
 
   if (invalid != 0)
     *invalid = 0;